Changeset 439 for soft/giet_vm/giet_xml

Timestamp:

Nov 3, 2014, 10:58:31 AM (10 years ago)

Author:

alain

Message:

Removing the use_tty, use_nic, use_tim, use_cma, etc.) in the mapping.
These static constructs are replaced by new system calls in the stdio library.

Location:

soft/giet_vm/giet_xml

Files:

• mapping_info.h (modified) (2 diffs)
• xml_driver.c (modified) (3 diffs)
• xml_parser.c (modified) (1 diff)

soft/giet_vm/giet_xml/mapping_info.h

@@ -103 +103 @@
     PERIPH_TYPE_DMA       = 1,
     PERIPH_TYPE_FBF       = 2,
-    PERIPH_TYPE_ICU       = 3,
-    PERIPH_TYPE_IOB       = 4,
-    PERIPH_TYPE_IOC       = 5,
-    PERIPH_TYPE_MMC       = 6,
-    PERIPH_TYPE_MWR       = 7,
-    PERIPH_TYPE_NIC       = 8,
-    PERIPH_TYPE_ROM       = 9,
-    PERIPH_TYPE_SIM       = 10,
-    PERIPH_TYPE_TIM       = 11,
-    PERIPH_TYPE_TTY       = 12,
-    PERIPH_TYPE_XCU       = 13,
-    PERIPH_TYPE_PIC       = 14,
-
-    PERIPH_TYPE_MAX_VALUE = 15,
+    PERIPH_TYPE_IOB       = 3,
+    PERIPH_TYPE_IOC       = 4,
+    PERIPH_TYPE_MMC       = 5,
+    PERIPH_TYPE_MWR       = 6,
+    PERIPH_TYPE_NIC       = 7,
+    PERIPH_TYPE_ROM       = 8,
+    PERIPH_TYPE_SIM       = 9,
+    PERIPH_TYPE_TIM       = 10,
+    PERIPH_TYPE_TTY       = 11,
+    PERIPH_TYPE_XCU       = 12,
+    PERIPH_TYPE_PIC       = 13,
+
+    PERIPH_TYPE_MAX_VALUE = 14,
 };
 
@@ -237 +236 @@
     unsigned int    heap_vobj_id;    // global index for vobj containing heap
     unsigned int    startid;         // index in start_vector 
-    unsigned int    use_tty;         // TTY channel required (global)
-    unsigned int    use_nic;         // NIC channel required (global)
-    unsigned int    use_cma;         // CMA channel required (global)
-    unsigned int    use_hba;         // IOC channel required (global)
-    unsigned int    use_tim;         // user timer required (local)
 } mapping_task_t;
 

soft/giet_vm/giet_xml/xml_driver.c

@@ -76 +76 @@
         "DMA",
         "FBF",
-        "ICU",
         "IOB",
         "IOC",
@@ -327 +326 @@
             fprintf(fpout, " arg=\"%d\" >\n",  periph[periph_id].arg);
             if ( (periph[periph_id].type == PERIPH_TYPE_PIC) ||
-                 (periph[periph_id].type == PERIPH_TYPE_XCU) ||
-                 (periph[periph_id].type == PERIPH_TYPE_ICU) )
+                 (periph[periph_id].type == PERIPH_TYPE_XCU) )
             {
                 for (irq_id = periph[periph_id].irq_offset; 
@@ -454 +452 @@
             }
             fprintf(fpout, " startid = \"%d\"", task[task_id].startid);
-            if( task[task_id].use_tty ) fprintf(fpout, " usetty=\"1\"");
-            if( task[task_id].use_nic ) fprintf(fpout, " usenic=\"1\"");
-            if( task[task_id].use_cma ) fprintf(fpout, " usecma=\"1\"");
-            if( task[task_id].use_tim ) fprintf(fpout, " usetim=\"1\"");
-            if( task[task_id].use_hba ) fprintf(fpout, " usehba=\"1\"");
             fprintf(fpout, " />\n");
         }

soft/giet_vm/giet_xml/xml_parser.c

@@ -714 +714 @@
     }
 
-    /////////// get use_tty  attribute (optionnal : 0 if missing)
-    value = getIntValue(reader, "usetty", &ok);
-#if XML_PARSER_DEBUG
-printf("      usetty = %x\n", value);
-#endif
-    task[task_index]->use_tty = (ok)? value : 0;
-
-    /////////// get use_nic  attribute (optionnal : 0 if missing)
-    value = getIntValue(reader, "usenic", &ok);
-#if XML_PARSER_DEBUG
-printf("      usenic = %x\n", value);
-#endif
-    task[task_index]->use_nic = (ok)? value : 0;
-
-    /////////// get use_tim attribute (optionnal : 0 if missing)
-    value = getIntValue(reader, "usetim", &ok);
-#if XML_PARSER_DEBUG
-printf("      usetim = %x\n", value);
-#endif
-    task[task_index]->use_tim = (ok)? value : 0;
-
-    /////////// get use_hba  attribute (optionnal : 0 if missing)
-    value = getIntValue(reader, "usehba", &ok);
-#if XML_PARSER_DEBUG
-printf("      usehba = %x\n", value);
-#endif
-    task[task_index]->use_hba = (ok)? value : 0;
-
-    /////////// get usecma  attribute (optionnal : 0 if missing)
-    value = getIntValue(reader, "usecma", &ok);
-#if XML_PARSER_DEBUG
-printf("      usecma = %x\n", value);
-#endif
-    task[task_index]->use_cma = (ok)? value : 0;
-
     task_index++;
     task_loc_index++;