[Xenomai-git] Philippe Gerum : alchemy/task: fix for pshared mode

[git repository hosting]

Module: xenomai-3
Branch: next
Commit: 5a8419295dbc562eb4b3c5ef054e38a94a1f3933
URL:    
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=5a8419295dbc562eb4b3c5ef054e38a94a1f3933

Author: Philippe Gerum <r...@xenomai.org>
Date:   Mon Jun  1 17:33:56 2015 +0200

alchemy/task: fix for pshared mode

---

 include/alchemy/task.h |    2 +-
 lib/alchemy/task.c     |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/alchemy/task.h b/include/alchemy/task.h
index cc3e3c0..c3e8671 100644
--- a/include/alchemy/task.h
+++ b/include/alchemy/task.h
@@ -52,7 +52,7 @@ typedef struct RT_TASK RT_TASK;
 struct RT_TASK_MCB {
        int flowid;
        int opcode;
-       void *data;
+       dref_type(void *) data;
        ssize_t size;
 };
 
diff --git a/lib/alchemy/task.c b/lib/alchemy/task.c
index 327e916..0fc1c33 100644
--- a/lib/alchemy/task.c
+++ b/lib/alchemy/task.c
@@ -1746,7 +1746,7 @@ ssize_t rt_task_send_timed(RT_TASK *task,
                wait->reply.data = mcb_r->data;
                wait->reply.size = mcb_r->size;
        } else {
-               wait->reply.data = NULL;
+               wait->reply.data = __moff(NULL);
                wait->reply.size = 0;
        }
 
@@ -1904,7 +1904,7 @@ int rt_task_receive_timed(RT_TASK_MCB *mcb_r,
        }
 
        if (mcb_s->size > 0)
-               memcpy(mcb_r->data, mcb_s->data, mcb_s->size);
+               memcpy(__mptr(mcb_r->data), __mptr(mcb_s->data), mcb_s->size);
 
        /* The flow identifier is always strictly positive. */
        ret = mcb_s->flowid;
@@ -2030,7 +2030,7 @@ int rt_task_reply(int flowid, RT_TASK_MCB *mcb_s)
                ret = 0;
                mcb_r->size = size;
                if (size > 0)
-                       memcpy(mcb_r->data, mcb_s->data, size);
+                       memcpy(__mptr(mcb_r->data), __mptr(mcb_s->data), size);
        }
 
        mcb_r->flowid = flowid;


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://xenomai.org/mailman/listinfo/xenomai-git