Changeset 200 for soft/giet_vm/libs

Timestamp:

Aug 12, 2012, 1:35:34 PM (12 years ago)

Author:

karaoui

Message:

+ removing some bugs from:

• xml_parser.c: check that strcmp == 0 for coproc direction
• mwmr_channel.c: mwmr->ptr to ptr.
• utils.h double definition of memcpy fonction.

+ mapping_info.h : naming the enums
+ boot_init.c: changing the order of initialisation in order

to initialise the coproc with the mwmr channel values( depth, width...).
Note that the vobjs are now physically initialised.

+ mwmr_channel.h: changing the order argument definition to suit vci_mwmr_channel Soclib componnent.
+ hwr_mapping.h: adding the register description of the vci_mwmr_controller .

Location:

soft/giet_vm/libs

Files:

• mwmr_channel.c (modified) (1 diff)
• mwmr_channel.h (modified) (1 diff)
• srl.h (modified) (2 diffs)
• utils.h (modified) (1 diff)

soft/giet_vm/libs/mwmr_channel.c

@@ -196 +196 @@
             for ( x = 0 ; x < nwords ; x++ )  
             {
-                buffer[x] = mwmr->data[mwmr->ptr];
+                buffer[x] = mwmr->data[ptr];
                 if ( (ptr + 1) == depth ) ptr = 0;
                 else                      ptr = ptr + 1;

soft/giet_vm/libs/mwmr_channel.h

@@ -19 +19 @@
     unsigned int        ptw;                    // index of the first empty slot 
     unsigned int        sts;                    // number of words available
+    unsigned int        lock;                   // exclusive access lock
     unsigned int        depth;                  // max number of words in the channel
     unsigned int        width;                  // number of words in an item   
-    unsigned int        lock;                   // exclusive access lock
     unsigned int        data[1018];             // circular buffer
 } mwmr_channel_t;

soft/giet_vm/libs/srl.h

@@ -7 +7 @@
    @short SRL Api main header
  */
+
+#include "mapping_info.h"
+#include "stdio.h"
+#include "utils.h"
 
 #include "libsrl/srl_public_types.h"
@@ -19 +23 @@
 #include "libsrl/srl_hw_helpers.h"
 
+#include "libsrl/srl_args.h"
+
 //kernel use!
 //#include "libsrl/srl_mwmr_sys.h"
 
-/* port, APP_NAME, TASK */
-# define GET_MWMR(port)                                                                       \
-({                                                                                            \
-    srl_mwmr_t  _mwmr;                                                                      \
-    if( vobj_get_vbase( APP_NAME , #port, MWMR, (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( TRACE, "*** &"#port" = %x\n\n", (unsigned int)_mwmr );                 \
-        exit();/*srl?*/                                                                     \
-    }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 ); \
-    _mwmr;\
-})
 
 #endif

soft/giet_vm/libs/utils.h

@@ -13 +13 @@
                 unsigned int    size ); 
 
-void*   memcpy( void*                   dst,
-                int                             c,
-                unsigned int    size );
- 
 #endif