Index: /trunk/lib/vci_ring_target/caba/source/include/vci_ring_target.h
===================================================================
--- /trunk/lib/vci_ring_target/caba/source/include/vci_ring_target.h	(revision 43)
+++ /trunk/lib/vci_ring_target/caba/source/include/vci_ring_target.h	(revision 44)
@@ -105,17 +105,17 @@
        
         // 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_signal<int>		r_vci_cmd_fsm;	    // vci command packet FSM
-        sc_signal<int>		r_vci_rsp_fsm;	    // vci response packet FSM
-        
-        sc_signal<sc_uint<vci_param::S> >      r_srcid;
-        sc_signal<sc_uint<2> >                 r_cmd;
-        sc_signal<sc_uint<vci_param::T> >      r_trdid;
-        sc_signal<sc_uint<vci_param::P> >      r_pktid;
-        sc_signal<sc_uint<vci_param::K> >      r_plen;
-        sc_signal<sc_uint<1> >                 r_contig;
-        sc_signal<sc_uint<1> >                 r_const;
-        sc_signal<sc_uint<vci_param::N> >      r_addr;
+        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
+        sc_core::sc_signal<int>		r_vci_cmd_fsm;	    // vci command packet FSM
+        sc_core::sc_signal<int>		r_vci_rsp_fsm;	    // vci response packet FSM
+        
+        sc_core::sc_signal<sc_dt::sc_uint<vci_param::S> >      r_srcid;
+        sc_core::sc_signal<sc_dt::sc_uint<2> >                 r_cmd;
+        sc_core::sc_signal<sc_dt::sc_uint<vci_param::T> >      r_trdid;
+        sc_core::sc_signal<sc_dt::sc_uint<vci_param::P> >      r_pktid;
+        sc_core::sc_signal<sc_dt::sc_uint<vci_param::K> >      r_plen;
+        sc_core::sc_signal<sc_dt::sc_uint<1> >                 r_contig;
+        sc_core::sc_signal<sc_dt::sc_uint<1> >                 r_const;
+        sc_core::sc_signal<sc_dt::sc_uint<vci_param::N> >      r_addr;
             
         // internal fifos 
@@ -224,12 +224,12 @@
                                 if (m_cmd_fifo.read() & 0x1 == 0x1) // broadcast
                                 {
-                                        r_addr   = (sc_uint<vci_param::N>) 0x3;     
-                                        r_srcid  = (sc_uint<vci_param::S>) (m_cmd_fifo.read() >> 20); 
- 					r_cmd    = (sc_uint<2>)  0x2; 
- 					r_contig = (sc_uint<1>)  0x1; 
- 					r_const  = (sc_uint<1>)  0x0; 
- 					r_plen   = (sc_uint<vci_param::K>) 0x04; 
- 					r_pktid  = (sc_uint<vci_param::P>) 0x0; 
- 					r_trdid  = (sc_uint<vci_param::T>) ((m_cmd_fifo.read() >> 16) & 0xF); 
+                                        r_addr   = (sc_dt::sc_uint<vci_param::N>) 0x3;     
+                                        r_srcid  = (sc_dt::sc_uint<vci_param::S>) (m_cmd_fifo.read() >> 20); 
+ 					r_cmd    = (sc_dt::sc_uint<2>)  0x2; 
+ 					r_contig = (sc_dt::sc_uint<1>)  0x1; 
+ 					r_const  = (sc_dt::sc_uint<1>)  0x0; 
+ 					r_plen   = (sc_dt::sc_uint<vci_param::K>) 0x04; 
+ 					r_pktid  = (sc_dt::sc_uint<vci_param::P>) 0x0; 
+ 					r_trdid  = (sc_dt::sc_uint<vci_param::T>) ((m_cmd_fifo.read() >> 16) & 0xF); 
 
                                         r_vci_cmd_fsm = WDATA; 
@@ -237,5 +237,5 @@
                                 else
                                 {
-                                        r_addr = (sc_uint<vci_param::N>) (m_cmd_fifo.read() << 1);
+                                        r_addr = (sc_dt::sc_uint<vci_param::N>) (m_cmd_fifo.read() << 1);
                                         r_vci_cmd_fsm = CMD_SECOND_HEADER; 
                                 }
@@ -273,11 +273,11 @@
 
  					cmd_fifo_get =  true;
- 					r_srcid  = (sc_uint<vci_param::S>)  (m_cmd_fifo.read() >> 20) ; 
- 					r_cmd    = (sc_uint<2>)  ((m_cmd_fifo.read() >> 18) & 0x3); 
- 					r_contig = (sc_uint<1>)  ((m_cmd_fifo.read() >> 17) & 0x1); 
- 					r_const =  (sc_uint<1>)  ((m_cmd_fifo.read() >> 16) & 0x1); 
- 					r_plen  =  (sc_uint<vci_param::K>) ((m_cmd_fifo.read() >> 8) & 0xFF); 
- 					r_pktid  = (sc_uint<vci_param::P>) ((m_cmd_fifo.read() >> 4) & 0xF); 
- 					r_trdid  = (sc_uint<vci_param::T>) (m_cmd_fifo.read()  & 0xF); 
+ 					r_srcid  = (sc_dt::sc_uint<vci_param::S>)  (m_cmd_fifo.read() >> 20) ; 
+ 					r_cmd    = (sc_dt::sc_uint<2>)  ((m_cmd_fifo.read() >> 18) & 0x3); 
+ 					r_contig = (sc_dt::sc_uint<1>)  ((m_cmd_fifo.read() >> 17) & 0x1); 
+ 					r_const =  (sc_dt::sc_uint<1>)  ((m_cmd_fifo.read() >> 16) & 0x1); 
+ 					r_plen  =  (sc_dt::sc_uint<vci_param::K>) ((m_cmd_fifo.read() >> 8) & 0xFF); 
+ 					r_pktid  = (sc_dt::sc_uint<vci_param::P>) ((m_cmd_fifo.read() >> 4) & 0xF); 
+ 					r_trdid  = (sc_dt::sc_uint<vci_param::T>) (m_cmd_fifo.read()  & 0xF); 
  					r_vci_cmd_fsm = WDATA;
 				}                                          
@@ -300,5 +300,5 @@
 
 				cmd_fifo_get = true; 
-				sc_uint<1> contig = r_contig;
+				sc_dt::sc_uint<1> contig = r_contig;
 				if(contig == 0x1)    
 					r_addr = r_addr.read() + vci_param::B ;                        
@@ -633,19 +633,19 @@
 			{
 				p_vci.cmdval = m_cmd_fifo.rok(); 
-				p_vci.address = (sc_uint<vci_param::N>) r_addr.read();
-				p_vci.cmd = (sc_uint<2>)  ((m_cmd_fifo.read() >> 18) & 0x3);
+				p_vci.address = (sc_dt::sc_uint<vci_param::N>) r_addr.read();
+				p_vci.cmd = (sc_dt::sc_uint<2>)  ((m_cmd_fifo.read() >> 18) & 0x3);
                                 p_vci.be    = 0xF;
 				p_vci.wdata = 0;
-				p_vci.pktid = (sc_uint<vci_param::P>) ((m_cmd_fifo.read() >> 4) & 0xF);
-				p_vci.srcid = (sc_uint<vci_param::S>)  (m_cmd_fifo.read() >> 20) ;
-				p_vci.trdid = (sc_uint<vci_param::T>)  (m_cmd_fifo.read() & 0xF);
-				p_vci.plen =  (sc_uint<vci_param::K>)  ((m_cmd_fifo.read() >> 8) & 0xFF);
+				p_vci.pktid = (sc_dt::sc_uint<vci_param::P>) ((m_cmd_fifo.read() >> 4) & 0xF);
+				p_vci.srcid = (sc_dt::sc_uint<vci_param::S>)  (m_cmd_fifo.read() >> 20) ;
+				p_vci.trdid = (sc_dt::sc_uint<vci_param::T>)  (m_cmd_fifo.read() & 0xF);
+				p_vci.plen =  (sc_dt::sc_uint<vci_param::K>)  ((m_cmd_fifo.read() >> 8) & 0xFF);
 				p_vci.eop = true;         
-				sc_uint<1> cons = (sc_uint<1>)  ((m_cmd_fifo.read() >> 16) & 0x1) ; 
+				sc_dt::sc_uint<1> cons = (sc_dt::sc_uint<1>)  ((m_cmd_fifo.read() >> 16) & 0x1) ; 
 				if (cons == 0x1)
 					p_vci.cons = true;
 				else
 					p_vci.cons = false;        
-				sc_uint<1> contig = (sc_uint<1>)  ((m_cmd_fifo.read() >> 17) & 0x1);
+				sc_dt::sc_uint<1> contig = (sc_dt::sc_uint<1>)  ((m_cmd_fifo.read() >> 17) & 0x1);
 				if(contig == 0x1) 
 					p_vci.contig = true;
@@ -661,18 +661,18 @@
 
 			p_vci.cmdval = m_cmd_fifo.rok();
-			p_vci.address = (sc_uint<vci_param::N>) r_addr.read();
-			p_vci.be = (sc_uint<vci_param::B>)((m_cmd_fifo.read()  >> 32) & 0xF);
+			p_vci.address = (sc_dt::sc_uint<vci_param::N>) r_addr.read();
+			p_vci.be = (sc_dt::sc_uint<vci_param::B>)((m_cmd_fifo.read()  >> 32) & 0xF);
 			p_vci.cmd = r_cmd;
-			p_vci.wdata = (sc_uint<32>)(m_cmd_fifo.read()); 
+			p_vci.wdata = (sc_dt::sc_uint<32>)(m_cmd_fifo.read()); 
 			p_vci.pktid = r_pktid;
 			p_vci.srcid = r_srcid;
 			p_vci.trdid = r_trdid;
 			p_vci.plen  = r_plen;        
-			sc_uint<1> cons = r_const;         
+			sc_dt::sc_uint<1> cons = r_const;         
 			if (cons == 0x1)
 				p_vci.cons = true;
 			else
 				p_vci.cons = false;        
-			sc_uint<1> contig = r_contig;
+			sc_dt::sc_uint<1> contig = r_contig;
 			if(contig == 0x1)                     
 				p_vci.contig = true;