Changeset 213 for soft/giet_vm/libs

Timestamp:

Aug 26, 2012, 8:16:34 PM (12 years ago)

Author:

karaoui

Message:

fixing the case where NB_DMA_MAX==0
updating the libsrl.

Location:

soft/giet_vm/libs/libsrl

Files:

• srl_args.h (modified) (1 diff)
• srl_mwmr.h (modified) (1 diff)

soft/giet_vm/libs/libsrl/srl_args.h

@@ -4 +4 @@
 
 
-#define SRL_GET_MWMR(port)      APP_GET_ARG(port, VOBJ_TYPE_MWMR)
+#define SRL_GET_MWMR(port)      (srl_mwmr_t) APP_GET_ARG(port, VOBJ_TYPE_MWMR)
 #define SRL_GET_BARRIER(port)   APP_GET_ARG(port, VOBJ_TYPE_BARRIER)
 #define SRL_GET_LOCK(port)      APP_GET_ARG(port, VOBJ_TYPE_LOCK)
-#define SRL_GET_BUFFER(port)    APP_GET_ARG(port, VOBJ_TYPE_BUFFER)
+//#define SRL_GET_MEMSPACE(port)  APP_GET_ARG(port, VOBJ_TYPE_BUFFER) TODO
+#define SRL_GET_MEMSPACE        #error "SRL_GET_MEMSPACE is not implemented"//
 
 
-/* port, APP_NAME, TASK, #task_name, alias */
-# define SRL_GET_ARG(task_name, port, type)                                                         \
+# define SRL_GET_VBASE(task_name, port, type)                                                         \
 ({                                                                                                  \
-    srl_mwmr_t  _mwmr;                                                                              \
-    if( giet_vobj_get_vbase( APP_NAME , alias_##task_name.port, type, (unsigned int*)&_mwmr ) )     \
+    unsigned int  vbase;                                                                           \
+    if( giet_vobj_get_vbase( APP_NAME , alias_##task_name.port, type, &vbase ) )                    \
     {                                                                                               \
         srl_log_printf( NONE, "\n[ERROR] in "#task_name" task :\n");                                \
         srl_log_printf( NONE, "          undefined port <"#port"> for channel(%s): %d\n",           \
-                                                                alias_##task_name.port,_mwmr);      \
-        srl_log_printf( TRACE, "*** &"#port" = %x\n\n", (unsigned int)_mwmr );                      \
+                                                                alias_##task_name.port,vbase);      \
+        srl_log_printf( TRACE, "*** &"#port" = %x\n\n", vbase );                                    \
         srl_exit();                                                                                 \
     }else                                                                                           \
         srl_log_printf( TRACE, "%s:%d: arg of %s for %s,from %s; &"#port" = %x\n\n",                \
-                            __FILE__, __LINE__, APP_NAME, #task_name,#port, (unsigned int)_mwmr );  \
-    _mwmr;\
+                            __FILE__, __LINE__, APP_NAME, #task_name,#port, vbase );                \
+    vbase;\
 })
 

soft/giet_vm/libs/libsrl/srl_mwmr.h

@@ -6 +6 @@
 typedef  mwmr_channel_t* srl_mwmr_t;
 
-#define srl_mwmr_write(a, b, c) mwmr_write(a, b, c)
-#define srl_mwmr_read(a, b, c) mwmr_read(a, b, c)  
+#define srl_mwmr_write(a, b, c) mwmr_write(a, (unsigned int*) b, (unsigned int)c)
+#define srl_mwmr_read(a, b, c) mwmr_read(a, (unsigned int*) b, (unsigned int)c)