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

soft/giet_vm/giet_drivers/icu_driver.c

@@ -15 +15 @@
 ////////////////////////////////////////////////////////////////////////////////
 // The virtual base address of the segment associated to the component is:
+//      SEG_ICU_BASE + cluster_xy * VSEG_CLUSTER_INCREMENT 
 //
-//      seg_icu_base + cluster_xy * vseg_cluster_increment 
-//
-// The seg_icu_base and vseg_cluster_increment values must be defined 
-// in giet_vsegs.ld file.
+// SEG_ICU_BASE and VSEG_CLUSTER_INCREMENT must be defined in hard_config.h 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -47 +45 @@
 #endif
 
-#if !defined( USE_XICU )
-# error: You must define USE_XICU in the hard_config.h file
+#if !defined( USE_XCU )
+# error: You must define USE_XCU in the hard_config.h file
+#endif
+
+#if !defined(SEG_ICU_BASE) 
+# error: You must define SEG_ICU_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
 
@@ -69 +75 @@
     if (proc_id >= NB_PROCS_MAX) return 1; 
 
-#if USE_XICU
+#if USE_XCU
     _printf("[GIET ERROR] _icu_set_mask() should not be used if USE_XICU is set\n");
     return 1;
 #else
-    unsigned int * icu_address = (unsigned int *) ((unsigned int)&seg_icu_base + 
-                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    unsigned int * icu_address = (unsigned int *) ( SEG_ICU_BASE + 
+                                 (cluster_xy * VSEG_CLUSTER_INCREMENT) );
     icu_address[proc_id * ICU_SPAN + ICU_MASK_SET] = value; 
     return 0;
@@ -97 +103 @@
     if (proc_id >= NB_PROCS_MAX) return 1;
 
-#if USE_XICU
+#if USE_XCU
     _printf("[GIET ERROR] _icu_set_mask() should not be used if USE_XICU is set\n");
     return 1;
 #else
-    unsigned int* icu_address = (unsigned int *) ((unsigned int)&seg_icu_base + 
-                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    unsigned int * icu_address = (unsigned int *) ( SEG_ICU_BASE + 
+                                 (cluster_xy * VSEG_CLUSTER_INCREMENT) );
     *buffer = icu_address[proc_id * ICU_SPAN + ICU_IT_VECTOR]; 
     return 0;