Index: /trunk/modules/vci_iox_network/caba/source/src/vci_iox_network.cpp
===================================================================
--- /trunk/modules/vci_iox_network/caba/source/src/vci_iox_network.cpp	(revision 715)
+++ /trunk/modules/vci_iox_network/caba/source/src/vci_iox_network.cpp	(revision 716)
@@ -70,6 +70,6 @@
 
     const bool            m_is_cmd;         // CMD XBAR if true
-    const size_t 		  m_inputs;         // number of inputs 
-    const size_t 		  m_outputs;        // number of outputs 
+    const size_t          m_inputs;         // number of inputs 
+    const size_t          m_outputs;        // number of outputs 
     void*                 m_rt;             // pointer on routing table (CMD or RSP)
 
@@ -84,29 +84,29 @@
             size_t nb_inputs,
             size_t nb_outputs,
-	        void*  rt )
-	: m_is_cmd( is_cmd ),
+            void*  rt )
+    : m_is_cmd( is_cmd ),
       m_inputs( nb_inputs ),
       m_outputs( nb_outputs ),
       m_rt ( rt )
-	{
-	    r_out_allocated = new sc_signal<bool>[nb_outputs];
-	    r_out_origin	= new sc_signal<size_t>[nb_outputs];
-	    r_in_allocated  = new sc_signal<bool>[nb_inputs];
-	    r_in_dest	    = new sc_signal<size_t>[nb_inputs];
-	}
+    {
+        r_out_allocated = new sc_signal<bool>[nb_outputs];
+        r_out_origin    = new sc_signal<size_t>[nb_outputs];
+        r_in_allocated  = new sc_signal<bool>[nb_inputs];
+        r_in_dest       = new sc_signal<size_t>[nb_inputs];
+    }
 
     ////////////
     void reset()
     {
-	    for (size_t i=0 ; i<m_outputs ; ++i) 
-        {
-	        r_out_origin[i]    = 0;
-	        r_out_allocated[i] = false;
-	    }
-	    for (size_t i=0 ; i<m_inputs ; ++i) 
-        {
-	        r_in_dest[i]      = 0;
-	        r_in_allocated[i] = false;
-	    }
+        for (size_t i=0 ; i<m_outputs ; ++i) 
+        {
+            r_out_origin[i]    = 0;
+            r_out_allocated[i] = false;
+        }
+        for (size_t i=0 ; i<m_inputs ; ++i) 
+        {
+            r_in_dest[i]      = 0;
+            r_in_allocated[i] = false;
+        }
     }
 
@@ -214,5 +214,5 @@
             if (r_out_allocated[out]) 
             {
-		        size_t in = r_out_origin[out];
+                size_t in = r_out_origin[out];
                 pkt_t tmp;
                 tmp.readFrom(*input_port[in]);
@@ -280,13 +280,13 @@
 ///////////////////////////////////////////////////////////////////////////
 tmpl(/**/)::VciIoxNetwork( sc_core::sc_module_name             name,
-	                       const soclib::common::MappingTable  &mt,
-				           size_t                              nb_tgt,
-				           size_t                              nb_ini )
+                           const soclib::common::MappingTable  &mt,
+                           size_t                              nb_tgt,
+                           size_t                              nb_ini )
            : BaseModule(name),
            p_clk("clk"),
            p_resetn("resetn"),
-	       p_to_tgt(soclib::common::alloc_elems<VciInitiator<vci_param> >(
+           p_to_tgt(soclib::common::alloc_elems<VciInitiator<vci_param> >(
                           "p_to_tgt", nb_tgt)),
-	       p_to_ini(soclib::common::alloc_elems<VciTarget<vci_param> >(
+           p_to_ini(soclib::common::alloc_elems<VciTarget<vci_param> >(
                           "p_to_ini", nb_ini)),
 
@@ -306,28 +306,28 @@
     dont_initialize();
     sensitive << p_clk.neg();
-	for ( size_t i=0; i<nb_ini; ++i )   sensitive << p_to_ini[i];
+    for ( size_t i=0; i<nb_ini; ++i )   sensitive << p_to_ini[i];
 
     SC_METHOD(genMealy_cmd_ack);        // controls to intiators CMDACK
     dont_initialize();
     sensitive << p_clk.neg();
-	for ( size_t i=0; i<nb_tgt; ++i )   sensitive << p_to_tgt[i];
+    for ( size_t i=0; i<nb_tgt; ++i )   sensitive << p_to_tgt[i];
 
     SC_METHOD(genMealy_rsp_val);        // controls to initiators RSPVAL
     dont_initialize();
     sensitive << p_clk.neg();
-	for ( size_t i=0; i<nb_tgt; ++i )   sensitive << p_to_tgt[i];
+    for ( size_t i=0; i<nb_tgt; ++i )   sensitive << p_to_tgt[i];
 
     SC_METHOD(genMealy_rsp_ack);        // controls to targets RSPACK
     dont_initialize();
     sensitive << p_clk.neg();
-	for ( size_t i=0; i<nb_ini; ++i )   sensitive << p_to_ini[i];
+    for ( size_t i=0; i<nb_ini; ++i )   sensitive << p_to_ini[i];
 
     // constructing CMD & RSP XBARs
-	m_rsp_xbar = new rsp_xbar_t( false,         // RSP XBAR
+    m_rsp_xbar = new rsp_xbar_t( false,         // RSP XBAR
                                  nb_tgt,
                                  nb_ini,
                                  &m_rsp_rt );
 
-	m_cmd_xbar = new cmd_xbar_t( true,          // CMD XBAR
+    m_cmd_xbar = new cmd_xbar_t( true,          // CMD XBAR
                                  nb_ini,
                                  nb_tgt,