Changeset 286 for branch/giet_vm_ioc_drivers/giet_xml

Timestamp:

Jan 31, 2014, 5:05:21 PM (11 years ago)

Author:

cfuguet

Message:

• Modifying HBA driver to respect new IOC driver interface.

• Modifying XML parser and XML driver to manage the HBA controller as an IOC subtype.

Location:

branch/giet_vm_ioc_drivers/giet_xml

Files:

• mapping_info.h (modified) (2 diffs)
• xml_driver.c (modified) (1 diff)
• xml_parser.c (modified) (3 diffs)

branch/giet_vm_ioc_drivers/giet_xml/mapping_info.h

@@ -104 +104 @@
     PERIPH_TYPE_DMA       = 1,
     PERIPH_TYPE_FBF       = 2,
-    PERIPH_TYPE_HBA       = 3,
-    PERIPH_TYPE_ICU       = 4,
-    PERIPH_TYPE_IOB       = 5,
-    PERIPH_TYPE_IOC       = 6,
-    PERIPH_TYPE_MMC       = 7,
-    PERIPH_TYPE_MWR       = 8,
-    PERIPH_TYPE_NIC       = 9,
-    PERIPH_TYPE_ROM       = 10,
-    PERIPH_TYPE_SIM       = 11,
-    PERIPH_TYPE_TIM       = 12,
-    PERIPH_TYPE_TTY       = 13,
-    PERIPH_TYPE_XCU       = 14,
-
-    PERIPH_TYPE_MAX_VALUE = 15,
+    PERIPH_TYPE_ICU       = 3,
+    PERIPH_TYPE_IOB       = 4,
+    PERIPH_TYPE_IOC       = 5,
+    PERIPH_TYPE_MMC       = 6,
+    PERIPH_TYPE_MWR       = 7,
+    PERIPH_TYPE_NIC       = 8,
+    PERIPH_TYPE_ROM       = 9,
+    PERIPH_TYPE_SIM       = 10,
+    PERIPH_TYPE_TIM       = 11,
+    PERIPH_TYPE_TTY       = 12,
+    PERIPH_TYPE_XCU       = 13,
+
+    PERIPH_TYPE_MAX_VALUE = 14,
 };
 
@@ -153 +152 @@
     unsigned int fbf_cluster;        // index of cluster containing FBF controler
     unsigned int fbf_cluster_bis;    // index of cluster containing second FBF controler
-
-    unsigned int hba_cluster;        // index of cluster containing HBA controler
-    unsigned int hba_cluster_bis;    // index of cluster containing second HBA controler
 
     unsigned int iob_cluster;        // index of cluster containing IOB controler

branch/giet_vm_ioc_drivers/giet_xml/xml_driver.c

@@ -62 +62 @@
         "DMA",
         "FBF",
-        "HBA",
         "ICU",
         "IOB",

branch/giet_vm_ioc_drivers/giet_xml/xml_parser.c

@@ -1302 +1302 @@
         }
         /////////////////////////////////
-        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) 
         {
@@ -2353 +2332 @@
     header->fbf_cluster     = 0xFFFFFFFF;
     header->fbf_cluster_bis = 0xFFFFFFFF;
-
-    header->hba_cluster     = 0xFFFFFFFF;
-    header->hba_cluster_bis = 0xFFFFFFFF;
 
     header->iob_cluster     = 0xFFFFFFFF;
@@ -2750 +2726 @@
     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]);