Changeset 961 for branches/reconfiguration/platforms

Timestamp:

Mar 30, 2015, 11:26:28 AM (10 years ago)

Author:

cfuguet

Message:

reconf: merge commit 959 concerning parameters of the XICU

• All four parameters (HWI, PTI, WTI and IRQ) has their own width constant in the hard_config.h.

Location:

branches/reconfiguration/platforms/tsar_generic_iob

Files:

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

branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

@@ -85 +85 @@
 // - FBUF_X_SIZE      : width of frame buffer (pixels)
 // - FBUF_Y_SIZE      : heigth of frame buffer (lines)
-// - XCU_NB_INPUTS    : number of HWIs = number of WTIs = number of PTIs
+// - XCU_NB_HWI       : number of HWIs
+// - XCU_NB_PTI       : number of PTIs
+// - XCU_NB_WTI       : number of WTIs
+// - XCU_NB_OUT       : number of OUTs
 //
 // Some secondary hardware parameters must be defined in this top.cpp file:
@@ -1153 +1156 @@
                 L1_DSETS,
                 XRAM_LATENCY,
-                XCU_NB_INPUTS,
+                XCU_NB_HWI,
+                XCU_NB_PTI,
+                XCU_NB_WTI,
+                XCU_NB_OUT,
 
                 distributed_boot,

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

@@ -233 +233 @@
                     size_t                             l1_d_sets,
                     size_t                             xram_latency,
-                    size_t                             xcu_nb_inputs,
+                    size_t                             xcu_nb_hwi,
+                    size_t                             xcu_nb_pti,
+                    size_t                             xcu_nb_wti,
+                    size_t                             xcu_nb_out,
 
                     bool                               distboot,

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

@@ -73 +73 @@
         size_t                             l1_d_sets,
         size_t                             xram_latency,
-        size_t                             xcu_nb_inputs,
+        size_t                             xcu_nb_hwi,
+        size_t                             xcu_nb_pti,
+        size_t                             xcu_nb_wti,
+        size_t                             xcu_nb_out,
 
         bool                               distboot,
@@ -193 +196 @@
                      mt_int,                              // mapping table INT network
                      IntTab(cluster_id, int_xicu_tgt_id), // TGTID direct space
-                     xcu_nb_inputs,                       // number of timer IRQs
-                     xcu_nb_inputs,                       // number of hard IRQs
-                     xcu_nb_inputs,                       // number of soft IRQs
-                     16,                                  // number of output IRQs
+                     xcu_nb_pti,                          // number of timer IRQs
+                     xcu_nb_hwi,                          // number of hard IRQs
+                     xcu_nb_wti,                          // number of soft IRQs
+                     xcu_nb_out,                          // number of output IRQs
                      5);                                  // number of config regs
 
@@ -542 +545 @@
     xicu->p_resetn                               (this->p_resetn);
     xicu->p_vci                                  (signal_int_vci_tgt_xicu);
-    for ( size_t i=0 ; i < 16  ; i++)
+    for ( size_t i=0 ; i < xcu_nb_out ; i++)
     {
         xicu->p_irq[i]                           (signal_proc_it[i]);
     }
-    for ( size_t i=0 ; i < xcu_nb_inputs ; i++)
+    for ( size_t i=0 ; i < xcu_nb_hwi ; i++)
     {
         if      ( i == 0 )       xicu->p_hwi[i]  (signal_irq_memc);