Changeset 215 for soft/giet_vm/xml/xml_driver.c

Timestamp:

Sep 17, 2012, 10:47:46 AM (12 years ago)

Author:

karaoui

Message:

New components are now mandotory in the XML description:

• Timer/Icu? or Xicu
• Dma

The files giet_vsegs.ld and hard_config.h are now autogenerated by the xml2bin tool.

File:

• soft/giet_vm/xml/xml_driver.c (modified) (3 diffs)

soft/giet_vm/xml/xml_driver.c

@@ -57 +57 @@
     const char* periph_type[] =
     {
+        "ICU",
+        "TIM",
+        "XICU",
+        "DMA",
         "IOC",
         "TTY",
-        "TIM",
-        "DMA",
         "FBF",
         "NIC",
@@ -220 +222 @@
     fprintf( fpout, "<mapping_info signature = \"0x%x\" ", header->signature);
     fprintf( fpout, " name = \"%s\" ", header->name);
-    fprintf( fpout, " clusters = \"%d\" ", header->clusters);
+    fprintf( fpout, " cluster_x = \"%d\" ", header->cluster_x);
+    fprintf( fpout, " cluster_y = \"%d\" ", header->cluster_y);
     fprintf( fpout, " vspaces = \"%d\" >\n\n", header->vspaces);
 
@@ -241 +244 @@
     ///////////////////// processors /////////////////////////////////////////////
 
+        unsigned int proc_index = 0;
         for ( proc_id = cluster[cluster_id].proc_offset ; 
               proc_id < cluster[cluster_id].proc_offset + cluster[cluster_id].procs ;
               proc_id++ )
         {
-            fprintf( fpout, "            <proc index = \"%d\" >\n", proc_id);
+            fprintf( fpout, "            <proc index = \"%d\" >\n", proc_index);
             for ( irq_id = proc[proc_id].irq_offset ; 
                   irq_id < proc[proc_id].irq_offset + proc[proc_id].irqs ;