Changeset 320 for soft/giet_vm/giet_drivers/nic_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/nic_driver.c (modified) (4 diffs)

soft/giet_vm/giet_drivers/nic_driver.c

@@ -24 +24 @@
 // One NIC channel and two CMA channels must be allocated to the task 
 // in the mapping_info data structure.
+//
+// The SEG_NIC_BASE address must be defined in the hard_config.h file.
 //////////////////////////////////////////////////////////////////////////////////
 
@@ -32 +34 @@
 #if !defined(GIET_USE_IOMMU) 
 # error: You must define GIET_USE_IOMMU in the giet_config.h file
+#endif
+
+#if !defined(SEG_NIC_BASE)
+# error: You must define SEG_NIC_BASE in the hard_config.h file 
 #endif
 
@@ -62 +68 @@
                                 unsigned int index )
 {
-    unsigned int* vaddr = (unsigned int*)&seg_nic_base + 
-                           NIC_CHANNEL_SPAN*channel + index;
+    unsigned int* vaddr = (unsigned int*)SEG_NIC_BASE + 
+                           NIC_CHANNEL_SPAN * channel + index;
     return _io_extended_read( vaddr );
 }
@@ -74 +80 @@
                         unsigned int value ) 
 {
-    unsigned int* vaddr = (unsigned int*)&seg_nic_base + 
-                           NIC_CHANNEL_SPAN*channel + index;
+    unsigned int* vaddr = (unsigned int*)SEG_NIC_BASE + 
+                           NIC_CHANNEL_SPAN * channel + index;
     _io_extended_write( vaddr, value );
 }