Changeset 320 for soft/giet_vm/giet_drivers/dma_driver.c

Timestamp:

Jun 10, 2014, 12:33:23 PM (10 years ago)

Author:

alain

Message:

All drivers have been modified to use only the information
contained in the hard_config.h file

File:

• soft/giet_vm/giet_drivers/dma_driver.c (modified) (7 diffs)

soft/giet_vm/giet_drivers/dma_driver.c

@@ -18 +18 @@
 // there is no lock protecting exclusive access to the channel.
 // As the kernel uses a polling policy on the DMA_STATUS register to detect
-// transfer completion, the DMA IRQ is not used, and there is no DMA_ISR.
+// transfer completion, the DMA IRQ is not used.
+//
+// The virtual base address of the segment associated to a channel is:
+//    SEG_DMA_BASE + cluster_xy * vseg_cluster_increment + DMA_SPAN * channel_id
+//
+// The SEG_DMA_BASE virtual address mus be defined in the hard_config.h file.
 ////////////////////////////////////////////////////////////////////////////////////
-// The virtual base address of the segment associated to a channel is:
-//
-//    seg_dma_base + cluster_xy * vseg_cluster_increment + DMA_SPAN * channel_id
-//
-////////////////////////////////////////////////////////////////////////////////////
 
 #include <giet_config.h>
+#include <hard_config.h>
 #include <dma_driver.h>
-#include <utils.h>
 #include <tty_driver.h>
 #include <vmem.h>
+#include <utils.h>
 
 #if !defined(X_SIZE) 
@@ -50 +51 @@
 #if !defined(NB_DMA_CHANNELS) 
 # error: You must define NB_DMA_CHANNELS in the hard_config.h file
+#endif
+
+#if !defined(SEG_DMA_BASE) 
+# error: You must define SEG_DMA_BASE in the hard_config.h file
+#endif
+
+#if !defined(VSEG_CLUSTER_INCREMENT) 
+# error: You must define VSEG_CLUSTER_INCREMENT in the hard_config.h file
 #endif
 
@@ -73 +82 @@
 
     // compute DMA base address
-    unsigned int* dma_address = (unsigned int*) ((unsigned int)&seg_dma_base + 
-                                (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    unsigned int* dma_address = (unsigned int*) ( SEG_DMA_BASE + 
+                                (cluster_xy * VSEG_CLUSTER_INCREMENT) );
 
     // disable interrupt for selected channel
@@ -101 +110 @@
 
     // compute DMA base address
-    unsigned int* dma_address = (unsigned int*) ((unsigned int)&seg_dma_base + 
-                                (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    unsigned int* dma_address = (unsigned int*) ( SEG_DMA_BASE + 
+                                (cluster_xy * VSEG_CLUSTER_INCREMENT) );
 
     // reset selected channel
@@ -128 +137 @@
 
     // compute DMA base address
-    unsigned int * dma_address = (unsigned int *) ((unsigned int)&seg_dma_base + 
-                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    unsigned int * dma_address = (unsigned int *) ( SEG_DMA_BASE + 
+                                 (cluster_xy * VSEG_CLUSTER_INCREMENT) );
 
     // get selected channel status
@@ -159 +168 @@
 
     // compute DMA base address
-    unsigned int * dma_address = (unsigned int *) ((unsigned int)&seg_dma_base + 
-                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    unsigned int * dma_address = (unsigned int *) ( SEG_DMA_BASE + 
+                                 (cluster_xy * VSEG_CLUSTER_INCREMENT) );
 
     // selected channel configuration and lauching
@@ -304 +313 @@
 } // end _dma_copy
 
+///////////////////////////////////////////////////////////////////////////////
+// This ISR handles the IRQ generated by a DMA channel.
+///////////////////////////////////////////////////////////////////////////////
+void _dma_isr( unsigned int irq_type,
+               unsigned int irq_id,
+               unsigned int channel )
+{
+    _printf("\n[GIET ERROR] _dma_isr() not implemented\n");
+    _exit();
+}
+