Changeset 215 for soft/giet_vm/mappings

Timestamp:

Sep 17, 2012, 10:47:46 AM (12 years ago)

Author:

karaoui

Message:

New components are now mandotory in the XML description:

• Timer/Icu? or Xicu
• Dma

The files giet_vsegs.ld and hard_config.h are now autogenerated by the xml2bin tool.

Location:

soft/giet_vm/mappings

Files:

• 1c_4p_four.xml (modified) (2 diffs)
• 4c_1p_four.xml (modified) (10 diffs)
• exemple.xml (modified) (2 diffs)

soft/giet_vm/mappings/1c_4p_four.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 
-<mapping_info   signature = "0xdeadbeef" name = "1c_4p_four" clusters = "1" vspaces  = "4" >
+<mapping_info   signature = "0xdeadbeef" name = "1c_4p_four" cluster_x = "1" cluster_y = "1" vspaces  = "4" >
 
 *** This section describes an instance of the "caba_vgsb_xicu_mmu" generic architecture
@@ -71 +71 @@
             <periph type = "TTY" psegname = "PSEG_TTY" channels  = "8" /> 
             <periph type = "DMA" psegname = "PSEG_DMA" channels  = "1" /> 
+            <periph type = "TIM" psegname = "PSEG_TIM" channels  = "4" /> 
+            <periph type = "XICU" psegname = "PSEG_ICU" channels  = "5" /> 
             <periph type = "FBF" psegname = "PSEG_FBF" /> 
 

soft/giet_vm/mappings/4c_1p_four.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 
-<mapping_info signature = "0xdeadbeef" name = "C4_P1_FOUR" clusters = "4" vspaces = "4" >
+<mapping_info signature = "0xdeadbeef" name = "C4_P1_FOUR" cluster_x = "2" cluster_y = "2" vspaces = "4" >
 
     <clusterset>
@@ -8 +8 @@
 
             <pseg name = "PSEG_RAM" type = "RAM"  base = "0x00000000" length = "0x00C00000" />
-            <pseg name = "PSEG_ICU" type = "PERI" base = "0x00F00000" length = "0x00001000" />
+            <pseg name = "PSEG_XICU" type = "PERI" base = "0x00F00000" length = "0x00002000" />
             <pseg name = "PSEG_DMA" type = "PERI" base = "0x00F30000" length = "0x00008000" />
 
@@ -17 +17 @@
 
             <periph type = "DMA" psegname = "PSEG_DMA" channels = "1" />
+            <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
 
         </cluster>
@@ -22 +23 @@
 
             <pseg name = "PSEG_RAM" type = "RAM"  base = "0x40000000" length = "0x00C00000" />
-            <pseg name = "PSEG_ICU" type = "PERI" base = "0x40F00000" length = "0x00001000" />
+            <pseg name = "PSEG_XICU" type = "PERI" base = "0x40F00000" length = "0x00002000" />
             <pseg name = "PSEG_DMA" type = "PERI" base = "0x40F30000" length = "0x00008000" />
 
@@ -31 +32 @@
 
             <periph type = "DMA" psegname = "PSEG_DMA" channels = "1" />
+            <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
 
         </cluster>
@@ -36 +38 @@
 
             <pseg name = "PSEG_RAM" type = "RAM"  base = "0x80000000" length = "0x00C00000" /> 
-            <pseg name = "PSEG_ICU" type = "PERI" base = "0x80F00000" length = "0x00001000" />
+            <pseg name = "PSEG_XICU" type = "PERI" base = "0x80F00000" length = "0x00002000" />
             <pseg name = "PSEG_DMA" type = "PERI" base = "0x80F30000" length = "0x00008000" />
 
@@ -69 +71 @@
 
             <periph type = "DMA" psegname = "PSEG_DMA" channels = "1" /> 
+            <periph type = "XICU" psegname = "PSEG_XICU" channels = "18" />
             <periph type = "IOC" psegname = "PSEG_IOC" channels = "1" /> 
             <periph type = "TTY" psegname = "PSEG_TTY" channels = "8" /> 
@@ -78 +81 @@
 
             <pseg name = "PSEG_RAM" type = "RAM"  base = "0xC0000000" length = "0x00C00000" />
-            <pseg name = "PSEG_ICU" type = "PERI" base = "0xC0F00000" length = "0x00001000" />
+            <pseg name = "PSEG_XICU" type = "PERI" base = "0xC0F00000" length = "0x00001000" />
             <pseg name = "PSEG_DMA" type = "PERI" base = "0xC0F30000" length = "0x00008000" />
 
@@ -87 +90 @@
 
             <periph  type = "DMA" psegname  = "PSEG_DMA" channels = "1" />
+            <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
         </cluster>
     </clusterset>
@@ -135 +139 @@
 *** On peut aussi définir un vseg factorisé en introduisant le CLUSTER_SIZE...
 
-        <vseg name = "seg_icu_0"          vbase = "0x00F00000" mode = "__W_" clusterid = "0" psegname = "PSEG_ICU" > 
+        <vseg name = "seg_icu_0"          vbase = "0x00F00000" mode = "__W_" clusterid = "0" psegname = "PSEG_XICU" > 
             <vobj name = "icu_0"          type = "PERI" length  = "0x00001000" /> 
         </vseg>
-        <vseg name = "seg_icu_1"          vbase = "0x40F00000" mode = "__W_" clusterid = "1" psegname = "PSEG_ICU" > 
+        <vseg name = "seg_icu_1"          vbase = "0x40F00000" mode = "__W_" clusterid = "1" psegname = "PSEG_XICU" > 
             <vobj name = "icu_1"          type = "PERI" length  = "0x00001000" /> 
         </vseg>
-        <vseg name = "seg_icu_2"          vbase = "0x80F00000" mode = "__W_" clusterid = "2" psegname = "PSEG_ICU" > 
+        <vseg name = "seg_icu_2"          vbase = "0x80F00000" mode = "__W_" clusterid = "2" psegname = "PSEG_XICU" > 
             <vobj name = "icu_2"          type = "PERI" length  = "0x00001000" /> 
         </vseg>
-        <vseg name = "seg_icu_3"          vbase = "0xC0F00000" mode = "__W_" clusterid = "3" psegname = "PSEG_ICU" > 
+        <vseg name = "seg_icu_3"          vbase = "0xC0F00000" mode = "__W_" clusterid = "3" psegname = "PSEG_XICU" > 
             <vobj name = "icu_3"          type = "PERI" length  = "0x00001000" /> 
         </vseg>

soft/giet_vm/mappings/exemple.xml

@@ -3 +3 @@
 <mapping_info   signature = "0xdeadbeef" 
                 name     = "1C_4P_FOUR"
-                clusters = "1"
-                vspaces  = "4" >
+                vspaces  = "4" 
+                cluster_x = "1"
+                cluster_y = "1" >
 
         <clusterset>
@@ -212 +213 @@
                                   channels  = "8" />
 
+                         <periph  type      = "ICU"
+                                  psegname  = "PSEG_ICU"
+                                  channels  = "8" />
+
                          <periph  type      = "FBF"
                                   psegname  = "PSEG_FBF" />