Changeset 64

Timestamp:

Jul 21, 2010, 6:01:30 PM (14 years ago)

Author:

nipo

Message:

Use proper namespaces

File:

• trunk/modules/half_gateway_target_2/caba/source/include/half_gateway_target_2.h (modified) (11 diffs)

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

@@ -91 +91 @@
       
         // internal registers
-        sc_signal<int>          r_ring_cmd_fsm;     // ring command packet FSM 
-        sc_signal<int>          r_ring_rsp_fsm;     // ring response packet FSM
+        sc_core::sc_signal<int>         r_ring_cmd_fsm;     // ring command packet FSM 
+        sc_core::sc_signal<int>         r_ring_rsp_fsm;     // ring response packet FSM
         
             
@@ -161 +161 @@
 
 #ifdef HT_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_ht[r_ring_cmd_fsm]
                                  << " - ring rsp = " << ring_rsp_fsm_state_str_ht[r_ring_rsp_fsm] 
@@ -183 +183 @@
                 case RSP_IDLE:   
 #ifdef HT_DEBUG
-if( trace(sc_time_stamp()))
-std::cout << sc_time_stamp() << " -- " << m_name << " -- ring_rsp_fsm : RSP_IDLE"
+if( trace(sc_core::sc_time_stamp()))
+std::cout << sc_core::sc_time_stamp() << " -- " << m_name << " -- ring_rsp_fsm : RSP_IDLE"
           << " -- fifo rok : " <<  m_rsp_fifo.rok()
           << " -- ring rok : " <<  p_ring_in.rsp_w
@@ -199 +199 @@
                 case DEFAULT:  
 #ifdef HT_DEBUG
-if( trace(sc_time_stamp()))
-std::cout << sc_time_stamp() << " -- " << m_name << " --  ring_rsp_fsm : DEFAULT " 
+if( trace(sc_core::sc_time_stamp()))
+std::cout << sc_core::sc_time_stamp() << " -- " << m_name << " --  ring_rsp_fsm : DEFAULT " 
           << " -- fifo_rsp_rok : " << m_rsp_fifo.rok()
           << " -- fifo_rsp_data : " << std::hex << m_rsp_fifo.read()
@@ -220 +220 @@
                         {
 #ifdef HT_DEBUG
-if( trace(sc_time_stamp()))
-std::cout << sc_time_stamp() << " -- " << m_name << " -- ring_rsp_fsm : KEEP "
+if( trace(sc_core::sc_time_stamp()))
+std::cout << sc_core::sc_time_stamp() << " -- " << m_name << " -- ring_rsp_fsm : KEEP "
           << " -- fifo_rok : " << m_rsp_fifo.rok()
           << " -- ring_in_wok : " << p_ring_in.rsp_r
@@ -253 +253 @@
  
 #ifdef HT_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_cmd_fsm -- CMD_IDLE "
               << " - in rok : " << p_ring_in.cmd_w
@@ -302 +302 @@
 
 #ifdef HT_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_cmd_fsm -- BROADCAST_0 "
               << " -- ringin cmd rok : " << p_ring_in.cmd_w
@@ -325 +325 @@
                 {
 #ifdef HT_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_cmd_fsm -- BROADCAST_1 "
               << " -- ringin cmd rok : " << p_ring_in.cmd_w
@@ -355 +355 @@
                         bool eop = ( (int) ((p_ring_in.cmd_data >> (ring_cmd_data_size - 1) ) & 0x1) == 1);
 #ifdef HT_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_cmd_fsm -- LOCAL "
               << " -- in cmd rok : " << p_ring_in.cmd_w
@@ -391 +391 @@
                         bool eop = ( (int) ((p_ring_in.cmd_data >> (ring_cmd_data_size - 1) ) & 0x1) == 1);
 #ifdef HT_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_cmd_fsm -- RING "
               << " -- in cmd rok : " << p_ring_in.cmd_w
@@ -432 +432 @@
 {
         p_gate_target.cmd_w    = m_cmd_fifo.rok();
-        p_gate_target.cmd_data = (sc_uint<ring_cmd_data_size>) m_cmd_fifo.read();
+        p_gate_target.cmd_data = (sc_dt::sc_uint<ring_cmd_data_size>) m_cmd_fifo.read();
 
         p_gate_target.rsp_r= m_rsp_fifo.wok();