Changeset 295 for soft/giet_vm/giet_xml/xml_driver.c

Timestamp:

Mar 26, 2014, 6:44:44 PM (10 years ago)

Author:

alain

Message:

Introducing a major release, to suppoort the tsar_generic_leti platform
and the various (external or internal) peripherals configurations.
The map.xml format has been modified, in order to support the new
vci_iopic componentand a new policy for peripherals initialisation.
The IRQs are nom described in the XICU and IOPIC components
(and not anymore in the processors).
To enforce this major change, the map.xml file signature changed:
The signature value must be: 0xDACE2014

This new release has been tested on the tsar_generic_leti platform
for the following mappings:

• 4c_4p_sort_leti
• 4c_4p_sort_leti_ext
• 4c_4p_transpose_leti
• 4c_4p_transpose_leti_ext
• 4c_1p_four_leti_ext

File:

• soft/giet_vm/giet_xml/xml_driver.c (modified) (7 diffs)

soft/giet_vm/giet_xml/xml_driver.c

@@ -18 +18 @@
 
 //////////////////////////////////////////////////////
-void buildXml(mapping_header_t * header, FILE * fpout) {
+void buildXml(mapping_header_t * header, FILE * fpout) 
+{
+    // mnemonics defined in mapping_info.h
     const char * vobj_type[] = 
     { 
@@ -27 +29 @@
         "MWMR",       // MWMR channel
         "LOCK",       // Spin-Lock
-        "BUFFER",     // Any "no intialiasation needed" objects (stacks...)
+        "BUFFER",     // Any "no intialiasation needed" object (stacks...)
         "BARRIER",    // Barrier
         "CONST",      // Constant
@@ -34 +36 @@
     };
 
+    // mnemonics defined in mapping_info.h
     const char * pseg_type[] = 
     {
         "RAM",
-        "ROM",
+        "ROM",        // deprecated => use PERI
         "PERI",
     };
 
+    // mnemonics defined in mapping_info.h
     const char * irq_type[] =
     {
-        "HARD",
-        "SOFT",
-        "TIME",
-    };
-
+        "HWI",                      
+        "WTI",
+        "PTI",
+    };
+
+    // mnemonics defined in irq_handler.h
     const char * isr_type[] =
     {
-        "ISR_DEFAULT",
-        "ISR_SWITCH",
-        "ISR_TTY",
-        "ISR_DMA",
-        "ISR_IOC",
+        "ISR_DEFAULT", 
+        "ISR_TICK",
+        "ISR_TTY_RX",
+        "ISR_TTY_TX",
+        "ISR_BDV",
         "ISR_TIMER",
-    };
-
+        "ISR_WAKUP",
+        "ISR_NIC_RX",
+        "ISR_NIC_TX",
+        "ISR_CMA",
+    };
+
+    // mnemonics defined in mapping_info.h
     const char * periph_type[] =
     {
@@ -74 +84 @@
         "TTY",
         "XCU",
-    };
-
-    const char * periph_subtype[] =
+        "PIC",
+    };
+
+    const char * ioc_subtype[] =
     {
         "BDV",
@@ -242 +253 @@
     fprintf(fpout, "              x_width      = \"%d\"   \n" , header->x_width);
     fprintf(fpout, "              y_width      = \"%d\"   \n" , header->y_width);
-    fprintf(fpout, "              vspaces      = \"%d\"   \n" , header->vspaces);
-    fprintf(fpout, "              increment    = \"%d\"   \n" , header->vspaces);
-    fprintf(fpout, "              irq_per_proc = \"%d\" >\n\n", header->irq_per_proc);
+    fprintf(fpout, "              irq_per_proc = \"%d\"   \n" , header->irq_per_proc);
+    fprintf(fpout, "              use_ramdisk  = \"%d\"   \n" , header->use_ramdisk);
+    fprintf(fpout, "              x_io         = \"%d\"   \n" , header->x_io);
+    fprintf(fpout, "              y_io         = \"%d\" >\n\n", header->y_io);
 
     ///////////////////// clusters ///////////////////////////////////////////////
@@ -271 +283 @@
         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_index);
-            for (irq_id = proc[proc_id].irq_offset; 
-                 irq_id < proc[proc_id].irq_offset + proc[proc_id].irqs;
-                 irq_id++) 
-            {
-                fprintf(fpout, "                <irq type = \"%s\" ", irq_type[irq[irq_id].type]);
-                fprintf(fpout, " icuid = \"0x%x\" ", irq[irq_id].icuid);
-                fprintf(fpout, " isr = \"%s\" ", isr_type[irq[irq_id].isr]);
-                fprintf(fpout, " channel = \"0x%x\" />\n", irq[irq_id].channel);
-            }
-            fprintf(fpout, "            </proc>\n" );
-        }
-
+             proc_id++, proc_index++) 
+        {
+            fprintf(fpout, "            <proc index = \"%d\" />\n", proc_index);
+        }
 
         ///////////////////// coprocessors ///////////////////////////////////////////
@@ -316 +317 @@
 
             if (periph[periph_id].subtype < PERIPH_SUBTYPE_MAX_VALUE) 
-                fprintf(fpout, " subtype = \"%s\" ", periph_subtype[periph[periph_id].subtype]);
+                fprintf(fpout, " subtype = \"%s\" ", ioc_subtype[periph[periph_id].subtype]);
 
             fprintf(fpout, " psegname = \"%s\" ", pseg[periph[periph_id].psegid].name);
-            fprintf(fpout, " channels = \"%d\" />\n",  periph[periph_id].channels);
+            fprintf(fpout, " channels = \"%d\" >\n",  periph[periph_id].channels);
+            for (irq_id = periph[periph_id].irq_offset; 
+                 irq_id < periph[periph_id].irq_offset + periph[periph_id].irqs;
+                 irq_id++) 
+            {
+                fprintf(fpout, "                <irq srctype = \"%s\" ", irq_type[irq[irq_id].srctype]);
+                fprintf(fpout, " srcid = \"%d\" ", irq[irq_id].srcid);
+                fprintf(fpout, " isr = \"%s\" ", isr_type[irq[irq_id].isr]);
+                fprintf(fpout, " channel = \"%d\" ", irq[irq_id].channel);
+                fprintf(fpout, " dstx = \"%d\" ", irq[irq_id].dstx);
+                fprintf(fpout, " dsty = \"%d\" ", irq[irq_id].dsty);
+                fprintf(fpout, " dstid = \"%d\" />\n", irq[irq_id].dstid);
+            }
+            fprintf(fpout, "            </periph>\n");
         }
         fprintf(fpout, "        </cluster>\n" );