Changeset 213 for soft/giet_vm/sys/drivers.c

Timestamp:

Aug 26, 2012, 8:16:34 PM (12 years ago)

Author:

karaoui

Message:

fixing the case where NB_DMA_MAX==0
updating the libsrl.

File:

• soft/giet_vm/sys/drivers.c (modified) (9 diffs)

soft/giet_vm/sys/drivers.c

@@ -715 +715 @@
 
 //+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];
+#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];
 
 in_unckdata unsigned int                        _dma_iommu_ix1 = 1;
 
-in_unckdata unsigned int            _dma_iommu_npages[(NB_DMAS_MAX+1) * NB_CLUSTERS];
+in_unckdata unsigned int            _dma_iommu_npages[NB_DMAS_MAX * NB_CLUSTERS];
+#endif
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -733 +735 @@
                              unsigned int       channel_id )
 {
+#if NB_DMAS_MAX > 0
     // parameters checking 
     if ( cluster_id >= NB_CLUSTERS ) return 1;
@@ -743 +746 @@
     dma_address[channel_id*DMA_SPAN + DMA_RESET] = 0;                   
     return 0;
+#else
+    return -1;
+#endif
 }
 //////////////////////////////////////////////////////////////////////////////////
@@ -751 +757 @@
                               unsigned int* status )
 {
+#if NB_DMAS_MAX > 0
     // parameters checking 
     if ( cluster_id >= NB_CLUSTERS ) return 1;
@@ -761 +768 @@
     *status = dma_address[channel_id*DMA_SPAN + DMA_LEN];
     return 0;
+#else
+    return -1;
+#endif
 }
 
@@ -852 +862 @@
                              unsigned int   length )
 {
+#if NB_DMAS_MAX > 0
     unsigned int        ko;                             // unsuccessfull V2P translation
     unsigned int        flags;                  // protection flags
@@ -996 +1007 @@
     
     return 0;
+
+#else //NB_DMAS_MAX == 0
+    return -1;
+#endif
 }  
 //////////////////////////////////////////////////////////////////////////////////
@@ -1042 +1057 @@
 unsigned int _fb_completed()
 {
+#if NB_DMAS_MAX > 0
     unsigned int task_id = _get_current_task_id();
     unsigned int dma_id  = _get_context_slot( task_id, CTX_FBDMA_ID );
@@ -1079 +1095 @@
 
     return _dma_status[dma_id];
-}
-
+
+#else //NB_DMAS_MAX == 0
+
+    return -1;
+
+#endif
+}
+