Changeset 320 for soft/giet_vm/giet_drivers/tim_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/tim_driver.c (modified) (6 diffs)

soft/giet_vm/giet_drivers/tim_driver.c

@@ -19 +19 @@
 //
 // The NB_PROCS_MAX and NB_TIM_CHANNELS values must be defined in hard_config.h file.
-/////////////////////////////////////////////////////////////////////////////////////
+//
 // The virtual base address of the segment associated to a channel is:
-//
-//     seg_tim_base + cluster_xy * vseg_cluster_increment + TIMER_SPAN * timer_id
-//
-// The seg_tim_base and vseg_cluster_increment values must be defined 
-// in the giet_vsegs.ld file.
+//     SEG_TIM_BASE + cluster_xy * VSEG_CLUSTER_INCREMENT + TIMER_SPAN * timer_id
+//
+// The SEG_TIM_BASE and VSEG_CLUSTER_INCREMENT must be defined in hard_config.h.
 /////////////////////////////////////////////////////////////////////////////////////
 
@@ -33 +31 @@
 #include <tty_driver.h>
 #include <utils.h>
+
+#if !defined(SEG_TIM_BASE)
+# error: You must define SEG_TIM_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
 
 #if !defined(X_SIZE) 
@@ -92 +98 @@
     }
 
-    unsigned int* timer_address = (unsigned int *) ((unsigned int)&seg_tim_base + 
-                                  (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    unsigned int* timer_address = (unsigned int *) ( SEG_TIM_BASE +
+                                  (cluster_xy * VSEG_CLUSTER_INCREMENT) );
 
     timer_address[local_id * TIMER_SPAN + TIMER_PERIOD] = period;
@@ -123 +129 @@
     }
 
-    unsigned int* timer_address = (unsigned int *) ((unsigned int)&seg_tim_base + 
-                                  (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    unsigned int* timer_address = (unsigned int *) ( SEG_TIM_BASE +
+                                  (cluster_xy * VSEG_CLUSTER_INCREMENT) );
 
     timer_address[local_id * TIMER_SPAN + TIMER_MODE] = 0;
@@ -155 +161 @@
     }
 
-    unsigned int * timer_address = (unsigned int *) ((unsigned int)&seg_tim_base + 
-                                   (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    unsigned int* timer_address = (unsigned int *) ( SEG_TIM_BASE +
+                                  (cluster_xy * VSEG_CLUSTER_INCREMENT) );
 
     timer_address[local_id * TIMER_SPAN + TIMER_RESETIRQ] = 0;
@@ -189 +195 @@
 
     // We suppose that the TIMER_MODE register value is 0x3
-    unsigned int * timer_address = (unsigned int *) ((unsigned int)&seg_tim_base + 
-                                   (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    unsigned int* timer_address = (unsigned int *) ( SEG_TIM_BASE +
+                                  (cluster_xy * VSEG_CLUSTER_INCREMENT) );
 
     unsigned int period = timer_address[local_id * TIMER_SPAN + TIMER_PERIOD];