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

Timestamp:

Jun 10, 2014, 1:31:01 PM (10 years ago)

Author:

alain

Message:

ntroducing several modifs in the mapping_info data structure
to comply with the genmap tool.

File:

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

soft/giet_vm/giet_xml/xml_driver.c

@@ -65 +65 @@
         "ISR_NIC_TX",
         "ISR_CMA",
+        "ISR_MMC",
+        "ISR_DMA",
+        "ISR_SPI",
     };
 
@@ -92 +95 @@
         "HBA",
         "SPI",
+        "NONE",
     };
 
@@ -300 +304 @@
                  port_id++) 
             {
-                unsigned int vobj_id = cp_port[port_id].mwmr_vobjid + vspace[cp_port[port_id].vspaceid].vobj_offset; 
-                fprintf(fpout, "             <port direction=\"%s\"",  port_direction[cp_port[port_id].direction]);
+                unsigned int vobj_id = cp_port[port_id].mwmr_vobj_id; 
+                fprintf(fpout, "             <port direction=\"%s\"", port_direction[cp_port[port_id].direction]);
                 fprintf(fpout, " vspacename=\"%s\"", vspace[cp_port[port_id].vspaceid].name);
                 fprintf(fpout, " vobjname=\"%s\" />\n",  vobj[vobj_id].name);
@@ -320 +324 @@
 
             fprintf(fpout, " psegname=\"%s\"", pseg[periph[periph_id].psegid].name);
-            fprintf(fpout, " channels=\"%d\" >\n",  periph[periph_id].channels);
-            if ( periph[periph_id].type == PERIPH_TYPE_PIC )
-            {
-                for (irq_id = periph[periph_id].irq_offset; 
-                     irq_id < periph[periph_id].irq_offset + periph[periph_id].irqs;
-                     irq_id++) 
-                {
-                    fprintf(fpout, "                <irq srcid=\"%d\" ", irq[irq_id].srcid);
-                    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);
-                }
-            }
-            if ( (periph[periph_id].type == PERIPH_TYPE_XCU ) ||
-                 (periph[periph_id].type == PERIPH_TYPE_ICU ) )
+            fprintf(fpout, " channels=\"%d\"",  periph[periph_id].channels);
+            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) )
             {
                 for (irq_id = periph[periph_id].irq_offset; 
@@ -343 +337 @@
                     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, " dstid=\"%d\" />\n", irq[irq_id].dstid);
+                    fprintf(fpout, " channel=\"%d\" />\n", irq[irq_id].channel);
                 }
             }
@@ -396 +389 @@
     for (vspace_id = 0; vspace_id < header->vspaces; vspace_id++) 
     {
-        unsigned int func_id = vspace[vspace_id].vobj_offset + vspace[vspace_id].start_offset; 
+        unsigned int vobj_id = vspace[vspace_id].start_vobj_id;
         fprintf(fpout, "        <vspace name = \"%s\" ", vspace[vspace_id].name); 
-        fprintf(fpout, " startname = \"%s\" >\n", vobj[func_id].name); 
+        fprintf(fpout, " startname = \"%s\" >\n", vobj[vobj_id].name); 
 
         //////////////////// vsegs //////////////////////////////////////////////
@@ -444 +437 @@
              task_id++) 
         {
-            unsigned int stack_vobj_id = task[task_id].stack_vobjid + vspace[vspace_id].vobj_offset; 
-            unsigned int heap_vobj_id = task[task_id].heap_vobjid + vspace[vspace_id].vobj_offset; 
-            unsigned int cluster_id   = task[task_id].clusterid;
+            unsigned int stack_vobj_id = task[task_id].stack_vobj_id; 
+            unsigned int heap_vobj_id  = task[task_id].heap_vobj_id; 
+            unsigned int cluster_id    = task[task_id].clusterid;
 
             fprintf(fpout, "            <task name=\"%s\"", task[task_id].name);