Changeset 175 for soft/giet_vm/libs/srl.h

Timestamp:

Jul 21, 2012, 10:20:47 AM (12 years ago)

Author:

karaoui

Message:

+ Adding the init attribute to the mwmr to specify the width of the mwmr channel
+ Fixing bugs in kernels_init

File:

• soft/giet_vm/libs/srl.h (modified) (1 diff)

soft/giet_vm/libs/srl.h

@@ -22 +22 @@
 //#include "libsrl/srl_mwmr_sys.h"
 
-/* port, APP_NAME, TASK */
-# define GET_MWMR(port)                                                                       \
+#define GET_MWMR(port) GET_ARG(port, VOBJ_TYPE_MWMR)
+/* port, APP_NAME, TASK, #task_name, alias */
+# define SRL_GET_ARG(task_name, port, type)                                                                       \
 ({                                                                                            \
-    srl_mwmr_t  _mwmr;                                                                      \
-    if( vobj_get_vbase( APP_NAME , #port, MWMR, (unsigned int*)&_mwmr ) )                   \
+    srl_mwmr_t  _mwmr;                                                                      \
+    if( giet_vobj_get_vbase( APP_NAME , alias_##task_name.port, type, (unsigned int*)&_mwmr ) )                   \
     {                                                                                         \
-        srl_log_printf( NONE, "\n[ERROR] in "TASK" task :\n");                              \
-        srl_log_printf( NONE, "          undefined <"#port"> channel: %d\n", _mwmr);           \
+        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 );                 \
-        exit();/*srl?*/                                                                     \
+        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,#port, (unsigned int)_mwmr ); \
+        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;\
 })
 
+
+
+
 #endif