Changeset 205 for soft

Timestamp:

Aug 15, 2012, 10:22:29 AM (12 years ago)

Author:

karaoui

Message:

adding the possibilité of having 0 DMA.

Location:

soft/giet_vm

Files:

• boot/boot_init.c (modified) (2 diffs)
• sys/drivers.c (modified) (2 diffs)

soft/giet_vm/boot/boot_init.c

@@ -1345 +1345 @@
 #if BOOT_DEBUG_PERI
 boot_puts("[BOOT] mwmr coproc initialisation of ");
-boot_putx((unsigned int) coproc[coproc_id].name);
+boot_puts((unsigned int) coproc[coproc_id].name);
 boot_puts(", nb ports");
 boot_putd((unsigned int)coproc[coproc_id].ports);
@@ -1355 +1355 @@
                   cp_port_id++ )
             {
-                //FIXME: should the same for all ports: put it in the coproc
+                //FIXME: the vspace_id should be the same for all ports: put it in the coproc?
                 unsigned int vspace_id  = cp_port[cp_port_id].vspaceid; 
                 unsigned int vobj_id    = cp_port[cp_port_id].vobjlocid + vspace[vspace_id].vobj_offset;

soft/giet_vm/sys/drivers.c

@@ -72 +72 @@
 
 #if !defined(NB_DMAS_MAX)
-# error: You must define NB_DMAS_MAX in 'giet_config.h' file
-#endif
-
-#if (NB_DMAS_MAX < 1)
-# error: NB_DMAS_MAX cannot be 0!
+#define NB_DMAS_MAX 0
 #endif
 
 #if !defined(NB_TIMERS_MAX)
-# error: You must define NB_TIMERS_MAX in 'giet_config.h' file 
+#define NB_TIMERS_MAX 0
 #endif
 
@@ -718 +714 @@
 //////////////////////////////////////////////////////////////////////////////////
 
-#if  (NB_DMAS_MAX > 0) 
-in_unckdata unsigned int                        _dma_lock[NB_DMAS_MAX * NB_CLUSTERS]
-                                       = { [0 ... (NB_DMAS_MAX * NB_CLUSTERS)-1] = 0 };
-
-in_unckdata volatile unsigned int       _dma_done[NB_DMAS_MAX * NB_CLUSTERS]
-                                       = { [0 ... (NB_DMAS_MAX * NB_CLUSTERS)-1] = 0 };
-
-in_unckdata volatile unsigned int       _dma_status[NB_DMAS_MAX * NB_CLUSTERS];
+//+1: for the case where the NB_DMAS_MAX == 0
+in_unckdata unsigned int                        _dma_lock[(NB_DMAS_MAX+1) * NB_CLUSTERS]
+                                       = { [0 ... ((NB_DMAS_MAX+1) * NB_CLUSTERS)-1] = 0 };
+
+in_unckdata volatile unsigned int       _dma_done[(NB_DMAS_MAX+1) * NB_CLUSTERS]
+                                       = { [0 ... ((NB_DMAS_MAX+1) * NB_CLUSTERS)-1] = 0 };
+
+in_unckdata volatile unsigned int       _dma_status[(NB_DMAS_MAX+1) * NB_CLUSTERS];
 
 in_unckdata unsigned int                        _dma_iommu_ix1 = 1;
 
-in_unckdata unsigned int            _dma_iommu_npages[NB_DMAS_MAX * NB_CLUSTERS];
-#endif
+in_unckdata unsigned int            _dma_iommu_npages[(NB_DMAS_MAX+1) * NB_CLUSTERS];
 
 //////////////////////////////////////////////////////////////////////////////////