Changeset 963 for branches/reconfiguration/platforms

Timestamp:

Apr 2, 2015, 1:18:56 PM (10 years ago)

Author:

cfuguet

Message:

reconf: consider the IRQ_PER_PROCESSOR constant when connecting XICU
irqs.

Location:

branches/reconfiguration/platforms/tsar_generic_iob

Files:

• top.cpp (modified) (1 diff)
• tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h (modified) (1 diff)
• tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp (modified) (2 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

@@ -1160 +1160 @@
                 XCU_NB_WTI,
                 XCU_NB_OUT,
+                IRQ_PER_PROCESSOR,
 
                 distributed_boot,

branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h

@@ -237 +237 @@
                     size_t                             xcu_nb_wti,
                     size_t                             xcu_nb_out,
+                    size_t                             irq_per_proc,
 
                     bool                               distboot,

branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

@@ -77 +77 @@
         size_t                             xcu_nb_wti,
         size_t                             xcu_nb_out,
+        size_t                             irq_per_proc,
 
         bool                               distboot,
@@ -536 +537 @@
         for ( size_t j = 0 ; j < 6 ; j++)
         {
-            if ( j < 4 ) proc[p]->p_irq[j]       (signal_proc_it[4*p + j]);
-            else         proc[p]->p_irq[j]       (signal_false);
+            if ( j < irq_per_proc )
+            {
+                proc[p]->p_irq[j]                (signal_proc_it[irq_per_proc*p + j]);
+            }
+            else
+            {
+                proc[p]->p_irq[j]                (signal_false);
+            }
         }
     }