Changeset 253 for soft/giet_vm/xml/mapping_info.h

Timestamp:

Aug 14, 2013, 11:19:29 PM (11 years ago)

Author:

alain

Message:

1/ introducing support to display images on the frame buffer
with the vci_chbuf_dma (in stdio.c and drivers.c)
2/ introducing support for mem_cache configuration segment
as the memory cache is considered as another addressable peripheral type
(in drivers.c)
3/ Introducing the new "increment" parameter in the mapping header.
This parameter define the virtual address increment for the vsegs
associated to the replicated peripherals (ICU, XICU, MDMA, TIMER, MMC).
This parameter is mandatory, and all map.xml files the "mappings"
directory have been updated.

File:

• soft/giet_vm/xml/mapping_info.h (modified) (7 diffs)

soft/giet_vm/xml/mapping_info.h

@@ -5 +5 @@
 // Copyright (c) UPMC-LIP6
 ////////////////////////////////////////////////////////////////////////////
-// The MAPPING_INFO data structure can be used with the GIET.
-// It contains the mapping directive for one or several virtual spaces.
-// Ech virtual space contains a variable number of virtual segments
+// The MAPPING_INFO data structure, used by the GIET_VM kernel contains:
+// 
+// 1) a description of a clusterized hardware architecture.
+// The number of cluster is variable (can be one). The number of processors
+// per cluster is variable (can be one). The number of peripherals per cluser
+// and coprocessor per cluster is variable. The number of physical memory
+// banks per cluster is variable.
+//
+// 2/ a description of the applications (called vspaces) to be - statically - 
+// launched on the platform. The number of parallel tasks per application is
+// variable (can be one). Multi-Writer/Multi-Reader communication channels
+// betwwen tasks are supported. Each vspace contains a variable number 
+// of virtual segments (called vsegs).
+//
+// 3/ the mapping directives: both tasks on processors, and software objects 
+// (vobjs and vsegs) on the physical memory banks (called psegs).
 // and a variable number of tasks. The number of virtual space can be one.
 //
-// The mapping table data structure is organised as the concatenation of
-// a fixed size header, and 6 variable size arrays:
+// The mapping_info data structure is organised as the concatenation of
+// a fixed size header, and 11 variable size arrays:
 //
 // - mapping_cluster_t  cluster[]  
@@ -19 +32 @@
 // - mapping_vseg_t     vobj[]    
 // - mapping_task_t     task[]  
-// - mapping_irq_t      irq[irqs]   
+// - mapping_proc_t     proc[]  
+// - mapping_irq_t      irq[]   
 // - mapping_coproc_t   coproc[]
 // - mapping_cp_port_t  cp_port[] 
 // - mapping_periph_t   periph[]
 //
-// It is intended to be stored in the boot ROM at address MAPPING_BOOT_BASE. 
+// It is intended to be stored in memory at address MAPPING_BOOT_BASE. 
 ////////////////////////////////////////////////////////////////////////////
 
@@ -75 +89 @@
 };
 
+// The enum definitions for psegType and periphType must be kept
+// consistent with the definitions in the xml_driver.c file...
 
 enum periphType 
@@ -82 +98 @@
     PERIPH_TYPE_DMA       = 2,
     PERIPH_TYPE_MMC       = 3,
-
     PERIPH_TYPE_CMA       = 4,
     PERIPH_TYPE_IOC       = 5,
@@ -90 +105 @@
     PERIPH_TYPE_IOB       = 9,
     PERIPH_TYPE_GCD       = 10,
-
-    PERIPH_TYPE_MAX_VALUE = 11,
+    PERIPH_TYPE_XCU       = 11,
+
+    PERIPH_TYPE_MAX_VALUE = 12,
 };
 
@@ -112 +128 @@
     unsigned int globals;            // number of vsegs mapped in all vspaces
     unsigned int vspaces;            // number of virtual spaces
+    unsigned int increment;          // vseg cluster increment for replicated periphs
 
     unsigned int tty_cluster;        // index of cluster containing TTY controler
@@ -270 +287 @@
 typedef struct __attribute__((packed))  mapping_periph_s 
 {
-    unsigned int type;           // IOC / TTY / TIM / DMA / FBF / NIC / IOB
+    unsigned int type;         
     unsigned int psegid;         // pseg index in cluster
     unsigned int channels;       // number of channels