Changeset 1002 for trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h

Timestamp:

Jul 2, 2015, 3:17:14 PM (9 years ago)

Author:

alain

Message:

Introducing the BDV / SDC / HBA switch in the tsar_generic_iob plat-form

File:

• trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h (modified) (5 diffs)

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h

@@ -27 +27 @@
 #include "vci_dspin_target_wrapper.h"
 #include "dspin_router.h"
-#include "virtual_dspin_router.h"
 #include "vci_mwmr_dma.h"
 #include "vci_mem_cache.h"
@@ -62 +61 @@
 
     // These arrays of ports are used to connect the INT & RAM networks in top cell
-    soclib::caba::DspinOutput<dspin_int_cmd_width>**   p_dspin_int_cmd_out;
-    soclib::caba::DspinInput<dspin_int_cmd_width>**    p_dspin_int_cmd_in;
-    soclib::caba::DspinOutput<dspin_int_rsp_width>**   p_dspin_int_rsp_out;
-    soclib::caba::DspinInput<dspin_int_rsp_width>**    p_dspin_int_rsp_in;
+    soclib::caba::DspinOutput<dspin_int_cmd_width>*    p_dspin_int_cmd_out;
+    soclib::caba::DspinInput<dspin_int_cmd_width>*     p_dspin_int_cmd_in;
+    soclib::caba::DspinOutput<dspin_int_rsp_width>*    p_dspin_int_rsp_out;
+    soclib::caba::DspinInput<dspin_int_rsp_width>*     p_dspin_int_rsp_in;
+    soclib::caba::DspinOutput<dspin_int_cmd_width>*    p_dspin_int_m2p_out;
+    soclib::caba::DspinInput<dspin_int_cmd_width>*     p_dspin_int_m2p_in;
+    soclib::caba::DspinOutput<dspin_int_rsp_width>*    p_dspin_int_p2m_out;
+    soclib::caba::DspinInput<dspin_int_rsp_width>*     p_dspin_int_p2m_in;
+    soclib::caba::DspinOutput<dspin_int_cmd_width>*    p_dspin_int_cla_out;
+    soclib::caba::DspinInput<dspin_int_cmd_width>*     p_dspin_int_cla_in;
 
     soclib::caba::DspinOutput<dspin_ram_cmd_width>*    p_dspin_ram_cmd_out;
@@ -87 +92 @@
     DspinSignals<dspin_int_cmd_width>     signal_int_dspin_cmd_l2g_d; 
     DspinSignals<dspin_int_cmd_width>     signal_int_dspin_cmd_g2l_d; 
+
+    DspinSignals<dspin_int_rsp_width>     signal_int_dspin_rsp_l2g_d; 
+    DspinSignals<dspin_int_rsp_width>     signal_int_dspin_rsp_g2l_d; 
+
     DspinSignals<dspin_int_cmd_width>     signal_int_dspin_m2p_l2g_c;
     DspinSignals<dspin_int_cmd_width>     signal_int_dspin_m2p_g2l_c; 
-    DspinSignals<dspin_int_cmd_width>     signal_int_dspin_clack_l2g_c;
-    DspinSignals<dspin_int_cmd_width>     signal_int_dspin_clack_g2l_c;
-    DspinSignals<dspin_int_rsp_width>     signal_int_dspin_rsp_l2g_d; 
-    DspinSignals<dspin_int_rsp_width>     signal_int_dspin_rsp_g2l_d; 
+
     DspinSignals<dspin_int_rsp_width>     signal_int_dspin_p2m_l2g_c;
     DspinSignals<dspin_int_rsp_width>     signal_int_dspin_p2m_g2l_c;
+
+    DspinSignals<dspin_int_cmd_width>     signal_int_dspin_cla_l2g_c;
+    DspinSignals<dspin_int_cmd_width>     signal_int_dspin_cla_g2l_c;
 
     // INT network VCI signals between VCI components and VCI local crossbar
@@ -111 +120 @@
     // Coherence DSPIN signals between DSPIN local crossbars and CC components 
     DspinSignals<dspin_int_cmd_width>     signal_int_dspin_m2p_memc;
-    DspinSignals<dspin_int_cmd_width>     signal_int_dspin_clack_memc;
+    DspinSignals<dspin_int_cmd_width>     signal_int_dspin_cla_memc;
     DspinSignals<dspin_int_rsp_width>     signal_int_dspin_p2m_memc;
     DspinSignals<dspin_int_cmd_width>     signal_int_dspin_m2p_proc[8];
-    DspinSignals<dspin_int_cmd_width>     signal_int_dspin_clack_proc[8];
+    DspinSignals<dspin_int_cmd_width>     signal_int_dspin_cla_proc[8];
     DspinSignals<dspin_int_rsp_width>     signal_int_dspin_p2m_proc[8];
 
@@ -174 +183 @@
     DspinLocalCrossbar<dspin_int_cmd_width>*          int_xbar_clack_c;
 
-    VirtualDspinRouter<dspin_int_cmd_width>*          int_router_cmd;
-    VirtualDspinRouter<dspin_int_rsp_width>*          int_router_rsp;
+    DspinRouter<dspin_int_cmd_width>*                 int_router_cmd;
+    DspinRouter<dspin_int_rsp_width>*                 int_router_rsp;
+    DspinRouter<dspin_int_cmd_width>*                 int_router_m2p;
+    DspinRouter<dspin_int_rsp_width>*                 int_router_p2m;
+    DspinRouter<dspin_int_cmd_width>*                 int_router_cla;
 
     VciSimpleRam<vci_param_ext>*                      xram;