Changeset 249 for soft/giet_vm/xml

Timestamp:

Jul 18, 2013, 6:33:38 PM (11 years ago)

Author:

alain

Message:

Various modifications to support IO Bridge,
and MEMC configuration interface.

Location:

soft/giet_vm/xml

Files:

• mapping_info.h (modified) (1 diff)
• xml_parser.c (modified) (9 diffs)

soft/giet_vm/xml/mapping_info.h

@@ -81 +81 @@
     PERIPH_TYPE_TIM       = 1,
     PERIPH_TYPE_DMA       = 2,
-    PERIPH_TYPE_CMA       = 3,
-    PERIPH_TYPE_IOC       = 4,
-    PERIPH_TYPE_TTY       = 5,
-    PERIPH_TYPE_FBF       = 6,
-    PERIPH_TYPE_NIC       = 7,
-    PERIPH_TYPE_IOB       = 8,
-    PERIPH_TYPE_GCD       = 9,
-    PERIPH_TYPE_MAX_VALUE = 10,
+    PERIPH_TYPE_MMC       = 3,
+
+    PERIPH_TYPE_CMA       = 4,
+    PERIPH_TYPE_IOC       = 5,
+    PERIPH_TYPE_TTY       = 6,
+    PERIPH_TYPE_FBF       = 7,
+    PERIPH_TYPE_NIC       = 8,
+    PERIPH_TYPE_IOB       = 9,
+    PERIPH_TYPE_GCD       = 10,
+
+    PERIPH_TYPE_MAX_VALUE = 11,
 };
 

soft/giet_vm/xml/xml_parser.c

@@ -99 +99 @@
 //////////////////////////////
 char found_timer = 0;
-char found_icu = 0;
-char found_dma = 0;
+char found_icu   = 0;
+char found_dma   = 0;
+char found_mmc   = 0;
 
 
@@ -120 +121 @@
 unsigned int cma_channels     = 0; // total number of channels in first CMA
 
-unsigned int io_mmu_active    = 0; // using IOB component
+unsigned int use_iob          = 0; // using IOB component
 unsigned int use_xicu         = 0; // using XICU (not ICU)
 
@@ -1205 +1206 @@
         {
             periph[periph_index]->type = PERIPH_TYPE_IOB;
-            io_mmu_active = 1;
+            use_iob = 1;
             if (header->iob_cluster == 0xFFFFFFFF)  
             {
@@ -1219 +1220 @@
             }
         }
-        // The TIM, ICU, XICU, DMA peripherals are replicated in all clusters
+        // The TIM, ICU, XICU, DMA, MEMC peripherals are replicated in all clusters
         // but only one component per cluster
         else if (strcmp(str, "TIM") == 0 ) 
@@ -1255 +1256 @@
             if (dma_channels < periph[periph_index]->channels)
                 dma_channels = periph[periph_index]->channels;
+        }
+        else if (strcmp(str, "MMC") == 0) 
+        {
+            periph[periph_index]->type = PERIPH_TYPE_MMC;
+            if (found_mmc)  error = 1; 
+            found_mmc = 1;
+            if ( periph[periph_index]->channels != 1 ) error = 1;
         }
         else 
@@ -1650 +1658 @@
     // for replicated periph
     found_timer = 0;
-    found_icu = 0;
-    found_dma = 0;
+    found_icu   = 0;
+    found_dma   = 0;
+    found_mmc   = 0;
 
     if (xmlTextReaderNodeType(reader) == XML_READER_TYPE_END_ELEMENT) {
@@ -2179 +2188 @@
 
     def_int_write(fdout, "USE_XICU          ", use_xicu);
-    def_int_write(fdout, "IOMMU_ACTIVE      ", io_mmu_active);
+    def_int_write(fdout, "USE_IOB           ", use_iob);
 
     file_write(fdout, epil);
@@ -2265 +2274 @@
 
     // non replicated peripherals
-    ld_write(fdout, "\nseg_fbf_base            ", periph_vbase_array[PERIPH_TYPE_FBF]);
+    ld_write(fdout, "seg_cma_base            ",   periph_vbase_array[PERIPH_TYPE_CMA]);
     ld_write(fdout, "seg_ioc_base            ",   periph_vbase_array[PERIPH_TYPE_IOC]);
+    ld_write(fdout, "seg_tty_base            ",   periph_vbase_array[PERIPH_TYPE_TTY]);
+    ld_write(fdout, "seg_fbf_base            ",   periph_vbase_array[PERIPH_TYPE_FBF]);
     ld_write(fdout, "seg_nic_base            ",   periph_vbase_array[PERIPH_TYPE_NIC]);
-    ld_write(fdout, "seg_tty_base            ",   periph_vbase_array[PERIPH_TYPE_TTY]);
+    ld_write(fdout, "seg_iob_base            ",   periph_vbase_array[PERIPH_TYPE_IOB]);
     ld_write(fdout, "seg_gcd_base            ",   periph_vbase_array[PERIPH_TYPE_GCD]);
-    ld_write(fdout, "seg_iob_base            ",   periph_vbase_array[PERIPH_TYPE_IOB]);
 
     file_write(fdout, "\n");
@@ -2276 +2286 @@
     // replicated peripherals
     ld_write(fdout, "seg_icu_base            ",   periph_vbase_array[PERIPH_TYPE_ICU]);
+    ld_write(fdout, "seg_tim_base            ",   periph_vbase_array[PERIPH_TYPE_TIM]);
     ld_write(fdout, "seg_dma_base            ",   periph_vbase_array[PERIPH_TYPE_DMA]);
-    ld_write(fdout, "seg_tim_base            ",   periph_vbase_array[PERIPH_TYPE_TIM]);
+    ld_write(fdout, "seg_mmc_base            ",   periph_vbase_array[PERIPH_TYPE_MMC]);
 
     close(fdout);