Changeset 200 for soft/giet_vm/xml

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/xml

Files:

• mapping_info.h (modified) (5 diffs)
• xml_parser.c (modified) (2 diffs)

soft/giet_vm/xml/mapping_info.h

@@ -50 +50 @@
 #define OUT_MAPPING_SIGNATURE   0xBABEF00D
 
-enum
+enum vobjType
 {
     VOBJ_TYPE_ELF     = 0,     // loadable code/data object of elf files
@@ -62 +62 @@
 };
 
-enum
+enum psegType
 {
     PSEG_TYPE_RAM     = 0,
@@ -69 +69 @@
 };
 
-enum
+enum periphType
 {
     PERIPH_TYPE_IOC   = 0,
@@ -80 +80 @@
 };
 
-enum
+enum mwmrPortDirection
 {
     PORT_TO_COPROC    = 0,          // status register
@@ -214 +214 @@
 {
     char            name[32];       // coprocessor name
-    unsigned int    psegid;         // pseg index in cluster
+    unsigned int    psegid;         // global pseg index 
     unsigned int    ports;          // number of MWMR ports used by coprocessor
     unsigned int    port_offset;    // index of first MWMR port used by coprocessor

soft/giet_vm/xml/xml_parser.c

@@ -250 +250 @@
 printf("      direction = %s\n", str);
 #endif
-        if      ( strcmp(str, "TO_COPROC")   ) cp_port[cp_port_index]->direction = PORT_TO_COPROC;
-        else if ( strcmp(str, "FROM_COPROC") ) cp_port[cp_port_index]->direction = PORT_FROM_COPROC;
+        if      ( strcmp(str, "TO_COPROC")   ==  0 ) cp_port[cp_port_index]->direction = PORT_TO_COPROC;
+        else if ( strcmp(str, "FROM_COPROC") ==  0 ) cp_port[cp_port_index]->direction = PORT_FROM_COPROC;
         else
         {
@@ -1874 +1874 @@
 {
     unsigned int i;
+    //asign for all cp_ports the correct vspaceid and vobjid
     for(i=0; i< cp_port_index; i++)
     {