Index: /trunk/lib/vci_ring_initiator/caba/source/include/vci_ring_initiator.h
===================================================================
--- /trunk/lib/vci_ring_initiator/caba/source/include/vci_ring_initiator.h	(revision 14)
+++ /trunk/lib/vci_ring_initiator/caba/source/include/vci_ring_initiator.h	(revision 15)
@@ -71,6 +71,6 @@
 #include <systemc.h>
 
-#define I_DEBUG
-#define IR_DEBUG
+//#define I_DEBUG
+//#define IR_DEBUG
 //#define I_DEBUG_FSM
 
@@ -222,9 +222,11 @@
 
 #ifdef I_DEBUG_FSM
-    std::cout << "--------------------------------------------" << std::endl;
-    std::cout             << " vci cmd fsm  = " << vci_cmd_fsm_state_str_i[r_vci_cmd_fsm] << std::endl
-                          << " vci rsp fsm  = " << vci_rsp_fsm_state_str_i[r_vci_rsp_fsm] << std::endl
-                          << " ring cmd fsm = " << ring_cmd_fsm_state_str_i[r_ring_cmd_fsm] << std::endl
-                          << " ring rsp fsm = " << ring_rsp_fsm_state_str_i[r_ring_rsp_fsm] << std::endl;
+if( trace(sc_time_stamp()))
+    std::cout << sc_time_stamp() << " - " << m_name
+                                 << " - vci cmd = " << vci_cmd_fsm_state_str_i[r_vci_cmd_fsm]
+                                 << " - vci rsp = " << vci_rsp_fsm_state_str_i[r_vci_rsp_fsm]
+                                 << " - ring cmd = " << ring_cmd_fsm_state_str_i[r_ring_cmd_fsm] 
+                                 << " - ring rsp = " << ring_rsp_fsm_state_str_i[r_ring_rsp_fsm]
+                                 << std::endl;
 #endif
 //////////// VCI CMD FSM /////////////////////////
@@ -256,12 +258,9 @@
                                         if ((p_vci.address.read() & 0x3) == 0x3)     
                                         {
-#ifdef I_DEBUG
-if( trace(sc_time_stamp()))
-std::cout << sc_time_stamp() << " -- " << m_name << " -- " << " broadcast " << std::endl;
-#endif
+
                                               cmd_fifo_data = cmd_fifo_data | ((uint64_t) 0x1) |
-                                                                              (((uint64_t) 0x0F0F) << 1) | 
-                                                                              (((uint64_t) p_vci.srcid.read()) << 21) | 
-                                                                              (((uint64_t) (p_vci.trdid.read() & 0xF)) << 17);
+                                                                              (((uint64_t) 0x5) << 1) | 
+                                                                              (((uint64_t) p_vci.srcid.read()) << 20) | 
+                                                                              (((uint64_t) (p_vci.trdid.read() & 0xF)) << 16);
 
                                               r_vci_cmd_fsm = WDATA;
@@ -281,7 +280,4 @@
 		case CMD_SECOND_HEADER:
 
-
-			if ( p_vci.cmdval.read() && m_cmd_fifo.wok() ) 
-			{
 #ifdef I_DEBUG
 if( trace(sc_time_stamp()))
@@ -294,4 +290,7 @@
               << std::endl;
 #endif
+			if ( p_vci.cmdval.read() && m_cmd_fifo.wok() ) 
+			{
+
 				cmd_fifo_put  = true;
 				cmd_fifo_data =  (((uint64_t) p_vci.srcid.read()) << 20)| 
@@ -318,8 +317,5 @@
 		case WDATA:  
 
-  
-			if ( p_vci.cmdval.read() && m_cmd_fifo.wok() ) 
-			{
-#ifdef I_DEBUG
+ #ifdef I_DEBUG
 if( trace(sc_time_stamp()))
          std::cout << sc_time_stamp() << " -- " << m_name  
@@ -331,5 +327,8 @@
               << " -- vci_eop : " << p_vci.eop.read()             
               << std::endl;
-#endif
+#endif 
+			if ( p_vci.cmdval.read() && m_cmd_fifo.wok() ) 
+			{
+
 
 
@@ -373,11 +372,10 @@
 
 		case RSP_DATA:
-
-			if ( p_vci.rspack.read() && m_rsp_fifo.rok() ) 
-			{
 #ifdef I_DEBUG
 if( trace(sc_time_stamp()))
-         std::cout << sc_time_stamp() << " -- " << m_name  
+         std::cout << sc_time_stamp() << " -- " << m_name 
               << " -- r_vci_rsp_fsm -- RSP_DATA "
+              << " -- fifo rok : " << m_rsp_fifo.rok()
+	      << " -- rspack : " <<  p_vci.rspack.read()
               << " -- rsrcid : " << std::hex << r_srcid_save.read()
               << " -- rdata : " <<  m_rsp_fifo.read()
@@ -385,4 +383,7 @@
               << std::endl;
 #endif
+			if ( p_vci.rspack.read() && m_rsp_fifo.rok() ) 
+			{
+
 				rsp_fifo_get = true;            
 				if(((m_rsp_fifo.read()  >> 32) & 0x1) == 0x1)