Changeset 65 for trunk

Timestamp:

Jul 21, 2010, 6:03:17 PM (14 years ago)

Author:

nipo

Message:

Use proper namespaces

File:

• trunk/modules/half_gateway_initiator_2/caba/source/include/half_gateway_initiator_2.h (modified) (10 diffs)

trunk/modules/half_gateway_initiator_2/caba/source/include/half_gateway_initiator_2.h

@@ -38 +38 @@
 namespace soclib { namespace caba {
 
-using namespace sc_core;
-
 #ifdef HI_DEBUG_FSM
 namespace {
@@ -84 +82 @@
        
         // internal registers
-        sc_signal<int>      r_ring_cmd_fsm;    // ring command packet FSM (distributed)
-        sc_signal<int>      r_ring_rsp_fsm;    // ring response packet FSM
+        sc_core::sc_signal<int>     r_ring_cmd_fsm;    // ring command packet FSM (distributed)
+        sc_core::sc_signal<int>     r_ring_rsp_fsm;    // ring response packet FSM
         
            
@@ -149 +147 @@
 
 #ifdef HI_DEBUG_FSM
-if( trace(sc_time_stamp()))
-    std::cout << sc_time_stamp() << " - " << m_name 
+if( trace(sc_core::sc_time_stamp()))
+    std::cout << sc_core::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] 
@@ -169 +167 @@
                 case CMD_IDLE:    
 #ifdef HI_DEBUG
-if( trace(sc_time_stamp()))
-std::cout << sc_time_stamp() << " -- " << m_name << " -- r_ring_cmd_fsm : CMD_IDLE "
+if( trace(sc_core::sc_time_stamp()))
+std::cout << sc_core::sc_time_stamp() << " -- " << m_name << " -- r_ring_cmd_fsm : CMD_IDLE "
           << " -- fifo ROK : " << m_cmd_fifo.rok()
           << " -- in grant : " << p_ring_in.cmd_grant
@@ -186 +184 @@
                 case DEFAULT: 
 #ifdef HI_DEBUG
-if( trace(sc_time_stamp()))
-std::cout << sc_time_stamp() << " -- " << m_name << " -- r_ring_cmd_fsm : DEFAULT "
+if( trace(sc_core::sc_time_stamp()))
+std::cout << sc_core::sc_time_stamp() << " -- " << m_name << " -- r_ring_cmd_fsm : DEFAULT "
           << " -- fifo ROK : " << m_cmd_fifo.rok()
           << " -- in grant : " << p_ring_in.cmd_grant
@@ -206 +204 @@
                 case KEEP:   
  #ifdef HI_DEBUG
-if( trace(sc_time_stamp()))
-std::cout << sc_time_stamp() << " -- " << m_name << " -- r_ring_cmd_fsm : KEEP "
+if( trace(sc_core::sc_time_stamp()))
+std::cout << sc_core::sc_time_stamp() << " -- " << m_name << " -- r_ring_cmd_fsm : KEEP "
           << " -- fifo_rok : " << m_cmd_fifo.rok()
           << " -- in grant : " << p_ring_in.cmd_grant
@@ -242 +240 @@
 
 #ifdef HI_DEBUG
-if( trace(sc_time_stamp()))
-        std::cout << sc_time_stamp() << " -- " << m_name  
+if( trace(sc_core::sc_time_stamp()))
+        std::cout << sc_core::sc_time_stamp() << " -- " << m_name  
               << " -- ring_rsp_fsm -- RSP_IDLE "
               << " -- islocal : " << islocal
@@ -275 +273 @@
                         bool reop     = ((p_ring_in.rsp_data >> (ring_rsp_data_size - 1)) & 0x1) == 1;
 #ifdef HI_DEBUG
-if( trace(sc_time_stamp()))
-         std::cout << sc_time_stamp() << " -- " << m_name  
+if( trace(sc_core::sc_time_stamp()))
+         std::cout << sc_core::sc_time_stamp() << " -- " << m_name  
               << " -- ring_rsp_fsm -- LOCAL "
               << " -- in rok : " << p_ring_in.rsp_w
@@ -308 +306 @@
 
 #ifdef I_DEBUG
-if( trace(sc_time_stamp()))
-         std::cout << sc_time_stamp() << " -- " << m_name  
+if( trace(sc_core::sc_time_stamp()))
+         std::cout << sc_core::sc_time_stamp() << " -- " << m_name  
               << " -- ring_rsp_fsm -- RING "
               << " -- in rok : " << p_ring_in.rsp_w
@@ -353 +351 @@
 {
         p_gate_initiator.rsp_w    = m_rsp_fifo.rok();
-        p_gate_initiator.rsp_data = (sc_uint<ring_rsp_data_size>) m_rsp_fifo.read();
+        p_gate_initiator.rsp_data = (sc_dt::sc_uint<ring_rsp_data_size>) m_rsp_fifo.read();
 
         p_gate_initiator.cmd_r= m_cmd_fifo.wok();