Changeset 263 for soft/giet_vm/giet_drivers/tim_driver.c

Timestamp:

Dec 19, 2013, 9:36:48 AM (11 years ago)

Author:

alain

Message:

Introducing support for TSAR fixed format cluster index (cluster_xy)
We have now 4 parameters defined in map.xml:

• X_WIDTH, Y_WIDTH define the fixed format (typically X_WIDTH = 4 / Y_WIDTH = 4)
• X_SIZE, Y_SIZE define the actual TSAR 2D mesh variable size (from 1 to 16)

File:

• soft/giet_vm/giet_drivers/tim_driver.c (modified) (9 diffs)

soft/giet_vm/giet_drivers/tim_driver.c

@@ -16 +16 @@
 // - "user" timers : requested by the task in the mapping_info data structure.
 //   For each user timer, the timer_id is stored in the context of the task.
-// The global index is cluster_id * (NB_PROCS_MAX + NB_TIM_CHANNELS) + local_id
+// The global index is cluster_xy * (NB_PROCS_MAX + NB_TIM_CHANNELS) + local_id
 //
 // The NB_PROCS_MAX and NB_TIM_CHANNELS values must be defined in the
@@ -25 +25 @@
 // The virtual base address of the segment associated to a channel is:
 //
-//     seg_tim_base + cluster_id * vseg_cluster_increment + TIMER_SPAN * timer_id
+//     seg_tim_base + cluster_xy * vseg_cluster_increment + TIMER_SPAN * timer_id
 //
 // The seg_tim_base and vseg_cluster_increment values must be defined 
@@ -35 +35 @@
 #include <utils.h>
 
-#if !defined(NB_CLUSTERS) 
-# error: You must define NB_CLUSTERS in the hard_config.h file
+#if !defined(X_SIZE) 
+# error: You must define X_SIZE in the hard_config.h file
 #endif
 
-#if (NB_CLUSTERS > 256)
-# error: NB_CLUSTERS cannot be larger than 256!
+#if !defined(Y_SIZE) 
+# error: You must define X_SIZE in the hard_config.h file
+#endif
+
+#if !defined(X_WIDTH) 
+# error: You must define X_WIDTH in the hard_config.h file
+#endif
+
+#if !defined(Y_WIDTH) 
+# error: You must define X_WIDTH in the hard_config.h file
 #endif
 
 #if !defined(NB_PROCS_MAX) 
 # error: You must define NB_PROCS_MAX in the hard_config.h file
-#endif
-
-#if (NB_PROCS_MAX > 8)
-# error: NB_PROCS_MAX cannot be larger than 8!
 #endif
 
@@ -59 +63 @@
 #endif
 
-#if !defined( USE_XICU )
-# error: You must define USE_XICU in the hard_config.h file
-#endif
-
 ///////////////////  Timer global variables ////////////////////////////////////////
 
@@ -68 +68 @@
 
 #if (NB_TIM_CHANNELS > 0)
-in_unckdata volatile unsigned char _user_timer_event[NB_CLUSTERS * NB_TIM_CHANNELS] 
-                            = { [0 ... ((NB_CLUSTERS * NB_TIM_CHANNELS) - 1)] = 0 };
+in_unckdata volatile unsigned char _user_timer_event[X_SIZE*Y_SIZE*NB_TIM_CHANNELS] 
+                            = { [0 ... ((X_SIZE*Y_SIZE*NB_TIM_CHANNELS) - 1)] = 0 };
 #endif
 
@@ -80 +80 @@
 // Returns 0 if success, > 0 if error.
 //////////////////////////////////////////////////////////////////////////////
-unsigned int _timer_start( unsigned int cluster_id, 
+unsigned int _timer_start( unsigned int cluster_xy, 
                            unsigned int local_id, 
                            unsigned int period) 
 {
     // parameters checking 
-    if (cluster_id >= NB_CLUSTERS)    return 1;
+    unsigned int x = cluster_xy >> Y_WIDTH;
+    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
+    if (x >= X_SIZE)                  return 1; 
+    if (y >= Y_SIZE)                  return 1; 
     if (local_id >= NB_TIM_CHANNELS)  return 1;
 
     unsigned int* timer_address = (unsigned int *) ((unsigned int)&seg_tim_base + 
-                                  (cluster_id * (unsigned int)&vseg_cluster_increment));
+                                  (cluster_xy * (unsigned int)&vseg_cluster_increment));
 
     timer_address[local_id * TIMER_SPAN + TIMER_PERIOD] = period;
@@ -102 +105 @@
 // Returns 0 if success, > 0 if error.
 //////////////////////////////////////////////////////////////////////////////
-unsigned int _timer_stop( unsigned int cluster_id, 
+unsigned int _timer_stop( unsigned int cluster_xy, 
                           unsigned int local_id) 
 {
     // parameters checking 
-    if (cluster_id >= NB_CLUSTERS)    return 1;
+    unsigned int x = cluster_xy >> Y_WIDTH;
+    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
+    if (x >= X_SIZE)                  return 1; 
+    if (y >= Y_SIZE)                  return 1; 
     if (local_id >= NB_TIM_CHANNELS)  return 1;
 
     unsigned int* timer_address = (unsigned int *) ((unsigned int)&seg_tim_base + 
-                                  (cluster_id * (unsigned int)&vseg_cluster_increment));
+                                  (cluster_xy * (unsigned int)&vseg_cluster_increment));
 
     timer_address[local_id * TIMER_SPAN + TIMER_MODE] = 0;
@@ -124 +130 @@
 // Returns 0 if success, > 0 if error.
 //////////////////////////////////////////////////////////////////////////////
-unsigned int _timer_reset_irq( unsigned int cluster_id, 
+unsigned int _timer_reset_irq( unsigned int cluster_xy, 
                                unsigned int local_id ) 
 {
     // parameters checking 
-    if (cluster_id >= NB_CLUSTERS)    return 1;
+    unsigned int x = cluster_xy >> Y_WIDTH;
+    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
+    if (x >= X_SIZE)                  return 1; 
+    if (y >= Y_SIZE)                  return 1; 
     if (local_id >= NB_TIM_CHANNELS)  return 1;
 
     unsigned int * timer_address = (unsigned int *) ((unsigned int)&seg_tim_base + 
-                                   (cluster_id * (unsigned int)&vseg_cluster_increment));
+                                   (cluster_xy * (unsigned int)&vseg_cluster_increment));
 
     timer_address[local_id * TIMER_SPAN + TIMER_RESETIRQ] = 0;
@@ -147 +156 @@
 // This function is called during a context switch (user or preemptive)
 //////////////////////////////////////////////////////////////////////i//////
-unsigned int _timer_reset_cpt( unsigned int cluster_id, 
+unsigned int _timer_reset_cpt( unsigned int cluster_xy, 
                                unsigned int local_id) 
 {
     // parameters checking 
-    if (cluster_id >= NB_CLUSTERS)    return 1;
+    unsigned int x = cluster_xy >> Y_WIDTH;
+    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
+    if (x >= X_SIZE)                  return 1; 
+    if (y >= Y_SIZE)                  return 1; 
     if (local_id >= NB_TIM_CHANNELS)  return 1;
 
     // We suppose that the TIMER_MODE register value is 0x3
     unsigned int * timer_address = (unsigned int *) ((unsigned int)&seg_tim_base + 
-                                   (cluster_id * (unsigned int)&vseg_cluster_increment));
+                                   (cluster_xy * (unsigned int)&vseg_cluster_increment));
 
     unsigned int period = timer_address[local_id * TIMER_SPAN + TIMER_PERIOD];