Index: trunk/modules/half_gateway_initiator_2/caba/source/include/half_gateway_initiator_2.h
===================================================================
--- trunk/modules/half_gateway_initiator_2/caba/source/include/half_gateway_initiator_2.h	(revision 16)
+++ trunk/modules/half_gateway_initiator_2/caba/source/include/half_gateway_initiator_2.h	(revision 17)
@@ -30,5 +30,5 @@
 #include "gate_ports_2.h"
 
-#define HI_DEBUG
+//#define HI_DEBUG
 //#define HI_DEBUG_FSM
 
@@ -146,7 +146,9 @@
 
 #ifdef HI_DEBUG_FSM
-    std::cout << "--------------------------------------------" << std::endl;
-    std::cout << " ring cmd fsm = " << ring_cmd_fsm_state_str_hi[r_ring_cmd_fsm] << std::endl;
-    std::cout << " ring rsp fsm = " << ring_rsp_fsm_state_str_hi[r_ring_rsp_fsm] << std::endl;
+if( trace(sc_time_stamp()))
+    std::cout << sc_time_stamp() << " - " << m_name 
+                                 << " - ring cmd  = " << ring_cmd_fsm_state_str_hi[r_ring_cmd_fsm] 
+                                 << " - ring rsp  = " << ring_rsp_fsm_state_str_hi[r_ring_rsp_fsm] 
+                                 << std::endl;
 #endif
 //////////// VCI CMD FSM /////////////////////////
@@ -401,5 +403,5 @@
 			int rsrcid   = (int)  ((p_ring_in.rsp_data >> 12 ) & 0x3FFF);
 			bool islocal = (m_lt[rsrcid] && m_local) || (!m_lt[rsrcid] && !m_local);
-			bool reop     = ((p_ring_in.rsp_data >> (ring_rsp_data_size - 1)) & 0x1) == 1;
+			bool reop    = ((p_ring_in.rsp_data >> (ring_rsp_data_size - 1)) & 0x1) == 1;
 
 			if(p_ring_in.rsp_w && !reop && islocal) {