Changeset 216 for soft/giet_vm/sys/drivers.c

Timestamp:

Sep 18, 2012, 6:38:49 PM (12 years ago)

Author:

karaoui

Message:

• updating irq_handler.c/drivers.c to support the nex affectations of timers
• When using an xicu the number of timer is set to 32

File:

• soft/giet_vm/sys/drivers.c (modified) (5 diffs)

soft/giet_vm/sys/drivers.c

@@ -78 +78 @@
 #endif
 
-#if ( (NB_TIMERS_MAX + NB_PROCS_MAX) > 32 )
+#if ( (NB_TIMERS_MAX) > 32 )
 # error: NB_TIMERS_MAX + NB_PROCS_MAX cannot be larger than 32
 #endif
@@ -111 +111 @@
 //   local_id in [0, NB_PROCS_MAX-1],
 // - "user" timers : requested by the task in the mapping_info data structure.
-//   local_id in [NB_PROC_MAX, NB_PROCS_MAX + NB_TIMERS_MAX - 1]
 //   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_TIMERS_MAX) + local_id
@@ -136 +135 @@
 {
     // parameters checking 
-    if ( cluster_id >= NB_CLUSTERS)                                     return 1;
-    if ( local_id >= NB_TIMERS_MAX + NB_PROCS_MAX ) return 1;
+    if ( cluster_id >= NB_CLUSTERS)     return 1;
+    if ( local_id >= NB_TIMERS_MAX) return 2;
 
 #if USE_XICU
@@ -164 +163 @@
 {
     // parameters checking 
-    if ( cluster_id >= NB_CLUSTERS)                                     return 1;
-    if ( local_id >= NB_TIMERS_MAX + NB_PROCS_MAX ) return 1;
+    if ( cluster_id >= NB_CLUSTERS)      return 1;
+    if ( local_id >= NB_TIMERS_MAX ) return 2;
 
 #if USE_XICU
@@ -193 +192 @@
 {
     // parameters checking 
-    if ( cluster_id >= NB_CLUSTERS)                                     return 1;
-    if ( local_id >= NB_TIMERS_MAX + NB_PROCS_MAX ) return 1;
+    if ( cluster_id >= NB_CLUSTERS)      return 1;
+    if ( local_id >= NB_TIMERS_MAX ) return 2;
 
 #if USE_XICU