Changeset 289 for soft/giet_vm/giet_xml/xml_parser.c

Timestamp:

Feb 4, 2014, 2:16:37 AM (11 years ago)

Author:

cfuguet

Message:

Modifications on GIET-VM IOC driver:

• Introducing new layer on the IOC driver. Every call to ioc_read, ioc_write, ioc_get_block_size or ioc_init

functions will call the specific driver of the used IOC
controller. Supported IOC controllers are (for now) :

1. BDV (Soclib Block Device)
2. HBA
3. SPI (SDCARD - SPI controller)

• All functions of IOC controllers drivers respect the same interface.

• To specify the used IOC controller of the platform, a subtype field has been introduced on the map.xml file. This subtype field must be declared on the IOC periph instantiation. Available subtypes (for now) : BDV, HBA or SPI.

File:

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

soft/giet_vm/giet_xml/xml_parser.c

@@ -123 +123 @@
 unsigned int use_iob          = 0; // using IOB component
 unsigned int use_xcu          = 0; // using XCU (not ICU)
+
+// These variables define the IOC peripheral subtype
 unsigned int use_hba          = 0; // using HBA
+unsigned int use_bdv          = 0; // using SoCLIB block device
+unsigned int use_spi          = 0; // using SD Card-SPI
 
 ////////////////////////////////////////////////////////////////
@@ -1252 +1256 @@
         unsigned int error = 0;
 
+        // initialize peripheral subtype
+        periph[periph_index]->subtype = 0xFFFFFFFF;
+
         // The CMA, FBF, HBA, IOB, IOC, NIC, ROM, SIM, TTY, peripherals are not 
         // replicated in all clusters but can be replicated in two clusters (fault tolerance)
@@ -1294 +1301 @@
         }
         /////////////////////////////////
-        else if (strcmp(str, "HBA") == 0) 
-        {
-            periph[periph_index]->type = PERIPH_TYPE_HBA;
-            use_hba = 1;
-            if (header->hba_cluster == 0xFFFFFFFF)
-            {
-                header->hba_cluster  = cluster_index; 
-                hba_channels = periph[periph_index]->channels;
-            }
-            else if (header->hba_cluster_bis == 0xFFFFFFFF) 
-            {
-                header->hba_cluster_bis = cluster_index;
-                assert( (hba_channels == periph[periph_index]->channels) &&
-                "[XML ERROR] unconsistent non replicated peripheral");
-            }
-            else
-            {
-                error = 1;
-            }
-        } 
-        /////////////////////////////////
         else if (strcmp(str, "IOB") == 0) 
         {
@@ -1346 +1332 @@
             else
             {
-                error = 1;
+                printf("[XML ERROR] At most two copies for non replicated "
+                        "peripheral\n");
+                exit(1);
+            }
+
+            str = getStringValue(reader, "subtype", &ok);
+    
+            if (!ok)
+            {
+                printf("[XML ERROR] IOC peripheral needs a subtype parameter: "
+                       "BDV, HBA or SPI\n");
+                exit(1);
+            } 
+
+            if (strcmp(str, "BDV") == 0)
+            { 
+                periph[periph_index]->subtype = PERIPH_SUBTYPE_BDV;
+                use_bdv = 1;
+            }
+            else if (strcmp(str, "HBA") == 0)
+            {
+                periph[periph_index]->subtype = PERIPH_SUBTYPE_HBA;
+
+                if (use_hba == 0)
+                {
+                    use_hba      = 1;
+                    hba_channels = periph[periph_index]->channels;
+                }
+                else
+                {
+                    assert( (hba_channels == periph[periph_index]->channels) &&
+                    "[XML ERROR] unconsistent non replicated peripheral");
+                }
+            }
+            else if (strcmp(str, "SPI") == 0)
+            {
+                periph[periph_index]->subtype = PERIPH_SUBTYPE_SPI;
+                use_spi = 1;
+            }
+            else
+            {
+                printf("[XML ERROR] illegal subtype for IOC peripheral\n");
+                exit(1);
             }
         } 
@@ -2325 +2353 @@
     header->fbf_cluster     = 0xFFFFFFFF;
     header->fbf_cluster_bis = 0xFFFFFFFF;
-
-    header->hba_cluster     = 0xFFFFFFFF;
-    header->hba_cluster_bis = 0xFFFFFFFF;
 
     header->iob_cluster     = 0xFFFFFFFF;
@@ -2589 +2614 @@
     def_int_write(fdout, "USE_IOB           ", use_iob);
     def_int_write(fdout, "USE_HBA           ", use_hba);
+    def_int_write(fdout, "USE_BDV           ", use_bdv);
+    def_int_write(fdout, "USE_SPI           ", use_spi);
 
     file_write(fdout, "\n");
@@ -2720 +2747 @@
     ld_write(fdout, "seg_cma_base            ",   periph_vbase_array[PERIPH_TYPE_CMA]);
     ld_write(fdout, "seg_fbf_base            ",   periph_vbase_array[PERIPH_TYPE_FBF]);
-    ld_write(fdout, "seg_hba_base            ",   periph_vbase_array[PERIPH_TYPE_HBA]);
     ld_write(fdout, "seg_iob_base            ",   periph_vbase_array[PERIPH_TYPE_IOB]);
     ld_write(fdout, "seg_ioc_base            ",   periph_vbase_array[PERIPH_TYPE_IOC]);