Changeset 320 for soft/giet_vm/giet_drivers/mwr_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/mwr_driver.c (modified) (3 diffs)

soft/giet_vm/giet_drivers/mwr_driver.c

@@ -9 +9 @@
 // 
 // This peripheral can be replicated (at most one component per cluster).
-///////////////////////////////////////////////////////////////////////////////////
+//
 // The (virtual) base address of the associated segment is:
+//       SEG_MWR_BASE + cluster_xy * VSEG_CLUSTER_INCREMENT
 //
-//       seg_mwr_base + cluster_xy * vseg_cluster_increment
-//
-// The seg_mwr_base and vseg_cluster_increment values must be defined 
-// in the giet_vsegs.ld file.
+// SEG_MWR_BASE and VSEG_CLUSTER_INCREMENT must be defined in hard_config.h
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <giet_config.h>
+#include <hard_config.h>
 #include <mwr_driver.h>
 #include <utils.h>
@@ -36 +35 @@
 #if !defined(Y_WIDTH) 
 # error: You must define X_WIDTH in the hard_config.h file
+#endif
+
+#if !defined(SEG_MWR_BASE)
+# error: You must define SEG_MWR_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
 
@@ -67 +74 @@
 
     // compute base address
-    unsigned int* mwr_address = (unsigned int*) ((unsigned int)&seg_mwr_base + 
-                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    unsigned int* mwr_address = (unsigned int*) ( SEG_MWR_BASE + 
+                                 (cluster_xy * VSEG_CLUSTER_INCREMENT) );
 
     unsigned int lsb = (unsigned int)channel_pbase;