Changeset 320 for soft/giet_vm/giet_drivers/cma_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/cma_driver.c (modified) (5 diffs)

soft/giet_vm/giet_drivers/cma_driver.c

@@ -12 +12 @@
 // to display images, or with the SocLib vci_multi_nic controller to tranfer
 // both RX and TX packets between NIC and memory buffers.
-///////////////////////////////////////////////////////////////////////////////////
+//
+// The SEG_DMA_BASE address must be defined in the hard_config.h file
+////////////////////////////////////////////////////////////////////////////////////
 // Implementation notes:
 // 1. The higher level access functions can be found in the fbf_driver and 
@@ -22 +24 @@
 
 #include <cma_driver.h>
-#include <utils.h>                  // for seg_cma_base
-#include <hard_config.h>            // for X_IO / Y_IO
+#include <hard_config.h>         
+#include <utils.h>
+
+#if !defined(SEG_CMA_BASE) 
+# error: You must define SEG_CMA_BASE in the hard_config.h file
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -31 +37 @@
                                 unsigned int index )
 {
-    unsigned int* vaddr = (unsigned int*)&seg_cma_base + 
+    unsigned int* vaddr = (unsigned int*)SEG_CMA_BASE + 
                            CHBUF_CHANNEL_SPAN*channel + index;
     return _io_extended_read( vaddr );
@@ -43 +49 @@
                         unsigned int value ) 
 {
-    unsigned int* vaddr = (unsigned int*)&seg_cma_base + 
+    unsigned int* vaddr = (unsigned int*)SEG_CMA_BASE + 
                            CHBUF_CHANNEL_SPAN*channel + index;
     _io_extended_write( vaddr, value );
@@ -55 +61 @@
                unsigned int channel )
 {
-    _printf("\n[GIET ERROR] _cma_isr() nor implemented\n");
+    _printf("\n[GIET ERROR] _cma_isr() not implemented\n");
     _exit();
 }