Changeset 289 for soft/giet_vm/giet_xml/mapping_info.h

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/mapping_info.h (modified) (3 diffs)

soft/giet_vm/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,
+};
+
+enum periphSubtype 
+{
+    PERIPH_SUBTYPE_BDV       = 0,
+    PERIPH_SUBTYPE_HBA       = 1,
+    PERIPH_SUBTYPE_SPI       = 2,
+
+    PERIPH_SUBTYPE_MAX_VALUE = 3,
+};
 
 enum mwmrPortDirection 
@@ -146 +153 @@
     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
@@ -320 +324 @@
 {
     unsigned int    type;         
+    unsigned int    subtype;         // periph specialization
     unsigned int    psegid;          // pseg index in cluster
     unsigned int    channels;        // number of channels