Index: trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/metadata/tsar_xbar_cluster.sd
===================================================================
--- trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/metadata/tsar_xbar_cluster.sd	(revision 396)
+++ trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/metadata/tsar_xbar_cluster.sd	(revision 428)
@@ -2,92 +2,102 @@
 # -*- python -*-
 
-Module('caba:tsar_xbar_cluster', 
+Module('caba:tsar_xbar_cluster',
     classname = 'soclib::caba::TsarXbarCluster',
-	tmpl_parameters = [
-		parameter.Int('dspin_cmd_width'),
-		parameter.Int('dspin_rsp_width'),
+
+    tmpl_parameters = [
+        parameter.Int('dspin_cmd_width'),
+        parameter.Int('dspin_rsp_width'),
         parameter.Module('vci_param_int'),
-        parameter.Module('vci_param_ext'),
-        ],
+        parameter.Module('vci_param_ext',
+            cell_size = parameter.Reference('cell_size_ext')
+        ),
+    ],
 
-	header_files = [ '../source/include/tsar_xbar_cluster.h', ],
-	implementation_files = [ '../source/src/tsar_xbar_cluster.cpp', ],
+    header_files = [ '../source/include/tsar_xbar_cluster.h', ],
 
-	uses = [
-		Uses('caba:base_module'),
-		Uses('common:mapping_table'),
-		Uses('common:iss2'),
-              
-		Uses('caba:vci_cc_vcache_wrapper', 
-              vci_param       = parameter.Reference('vci_param_int'),
-              dspin_in_width  = parameter.Reference('dspin_cmd_width'),
-              dspin_out_width = parameter.Reference('dspin_rsp_width'),
-              iss_t           = 'common:gdb_iss', 
-              gdb_iss_t       = 'common:mips32el'),
+    implementation_files = [ '../source/src/tsar_xbar_cluster.cpp', ],
 
-		Uses('caba:vci_simple_ram',
-              vci_param       = parameter.Reference('vci_param_int')),
+    uses = [
+        Uses('caba:base_module'),
+        Uses('common:mapping_table'),
+        Uses('common:iss2'),
 
-		Uses('caba:vci_simple_ram',
-              vci_param       = parameter.Reference('vci_param_ext')),
+        Uses('caba:vci_cc_vcache_wrapper',
+            vci_param       = parameter.Reference('vci_param_int'),
+            dspin_in_width  = parameter.Reference('dspin_cmd_width'),
+            dspin_out_width = parameter.Reference('dspin_rsp_width'),
+            iss_t           = 'common:gdb_iss',
+            gdb_iss_t       = 'common:mips32el'
+        ),
+        Uses('caba:vci_simple_ram',
+            vci_param       = parameter.Reference('vci_param_int')
+        ),
+        Uses('caba:vci_simple_ram',
+            vci_param       = parameter.Reference('vci_param_ext'),
+            cell_size       = parameter.Reference('cell_size_ext'),
+        ),
+        Uses('caba:vci_xicu',
+            vci_param       = parameter.Reference('vci_param_int')
+        ),
+        Uses('caba:dspin_local_crossbar',
+            flit_width      = parameter.Reference('dspin_cmd_width')
+        ),
+        Uses('caba:dspin_local_crossbar',
+            flit_width      = parameter.Reference('dspin_rsp_width')
+        ),
+        Uses('caba:virtual_dspin_router',
+            flit_width      = parameter.Reference('dspin_cmd_width')
+        ),
+        Uses('caba:virtual_dspin_router',
+            flit_width      = parameter.Reference('dspin_rsp_width')
+        ),
+        Uses('caba:vci_multi_tty',
+            vci_param       = parameter.Reference('vci_param_int')
+        ),
+        Uses('caba:vci_framebuffer',
+            vci_param       = parameter.Reference('vci_param_int')
+        ),
+        Uses('caba:vci_multi_nic',
+            vci_param       = parameter.Reference('vci_param_int')
+        ),
+        Uses('caba:vci_block_device_tsar',
+            vci_param       = parameter.Reference('vci_param_int')
+        ),
+        Uses('caba:vci_multi_dma',
+            vci_param       = parameter.Reference('vci_param_int')
+        ),
+        Uses('caba:vci_dspin_target_wrapper',
+            vci_param       = parameter.Reference('vci_param_int')
+        ),
+        Uses('caba:vci_dspin_initiator_wrapper',
+            vci_param       = parameter.Reference('vci_param_int')
+        ),
+        Uses('caba:vci_mem_cache',
+            dspin_in_width     = parameter.Reference('dspin_rsp_width'),
+            dspin_out_width    = parameter.Reference('dspin_cmd_width'),
+            memc_cell_size_int = parameter.Reference('cell_size'),
+            memc_cell_size_ext = parameter.Reference('cell_size_ext')
+        ),
 
-        Uses('caba:vci_xicu',
-              vci_param       = parameter.Reference('vci_param_int')),
+        Uses('common:elf_file_loader'),
+    ],
 
-        Uses('caba:dspin_local_crossbar', 
-              flit_width      = parameter.Reference('dspin_cmd_width')),
+    ports = [
+        Port('caba:bit_in', 'p_resetn', auto = 'resetn'),
+        Port('caba:clock_in', 'p_clk', auto = 'clock'),
 
-        Uses('caba:dspin_local_crossbar', 
-              flit_width      = parameter.Reference('dspin_rsp_width')),
-
-        Uses('caba:virtual_dspin_router', 
-              flit_width      = parameter.Reference('dspin_cmd_width')),
-
-        Uses('caba:virtual_dspin_router', 
-              flit_width      = parameter.Reference('dspin_rsp_width')),
-            
-        Uses('caba:vci_multi_tty',
-              vci_param       = parameter.Reference('vci_param_int')),
-
-        Uses('caba:vci_framebuffer',
-              vci_param       = parameter.Reference('vci_param_int')),
-
-        Uses('caba:vci_multi_nic',
-              vci_param       = parameter.Reference('vci_param_int')),
-
-		Uses('caba:vci_block_device_tsar',
-              vci_param       = parameter.Reference('vci_param_int')),
-
-		Uses('caba:vci_multi_dma',
-              vci_param       = parameter.Reference('vci_param_int')),
-
-        Uses('caba:vci_dspin_target_wrapper',
-              vci_param       = parameter.Reference('vci_param_int')),
-
-        Uses('caba:vci_dspin_initiator_wrapper',
-              vci_param       = parameter.Reference('vci_param_int')),
-
-		Uses('caba:vci_mem_cache',
-              vci_param_int   = 'caba:vci_param',
-              vci_param_ext   = 'caba:vci_param_bis',
-              dspin_in_width  = parameter.Reference('dspin_rsp_width'),
-              dspin_out_width = parameter.Reference('dspin_cmd_width')),
-
-		Uses('common:elf_file_loader'),
-		],
-
-	ports = [
-		Port('caba:bit_in', 'p_resetn', auto = 'resetn'),
-		Port('caba:clock_in', 'p_clk', auto = 'clock'),
-		Port('caba:dspin_output', 'p_cmd_out', [2, 4], 
-              dspin_data_size = parameter.Reference('dspin_cmd_width')),
-		Port('caba:dspin_input', 'p_cmd_in', [2, 4], 
-              dspin_data_size = parameter.Reference('dspin_cmd_width')),
-		Port('caba:dspin_output', 'p_rsp_out', [2, 4], 
-              dspin_data_size = parameter.Reference('dspin_rsp_width')), 
-		Port('caba:dspin_input', 'p_rsp_in', [2, 4], 
-              dspin_data_size = parameter.Reference('dspin_rsp_width')),
-		],
+        Port('caba:dspin_output', 'p_cmd_out', [2, 4],
+            dspin_data_size = parameter.Reference('dspin_cmd_width')
+        ),
+        Port('caba:dspin_input', 'p_cmd_in', [2, 4],
+            dspin_data_size = parameter.Reference('dspin_cmd_width')
+        ),
+        Port('caba:dspin_output', 'p_rsp_out', [2, 4],
+            dspin_data_size = parameter.Reference('dspin_rsp_width')
+        ),
+        Port('caba:dspin_input', 'p_rsp_in', [2, 4],
+            dspin_data_size = parameter.Reference('dspin_rsp_width')
+        ),
+    ],
 )
 
-
Index: trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h
===================================================================
--- trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h	(revision 396)
+++ trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h	(revision 428)
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
 // File: tsar_xbar_cluster.h
-// Author: Alain Greiner 
+// Author: Alain Greiner
 // Copyright: UPMC/LIP6
 // Date : march 2013
@@ -38,7 +38,7 @@
 ///////////////////////////////////////////////////////////////////////////
 template<size_t dspin_cmd_width,
-         size_t dspin_rsp_width, 
+         size_t dspin_rsp_width,
          typename vci_param_int,
-         typename vci_param_ext>  class TsarXbarCluster 
+         typename vci_param_ext>  class TsarXbarCluster
 ///////////////////////////////////////////////////////////////////////////
     : public soclib::caba::BaseModule
@@ -46,82 +46,82 @@
     public:
 
-	// Ports
-    sc_in<bool>                             		p_clk;
-    sc_in<bool>                             		p_resetn;
-	soclib::caba::DspinOutput<dspin_cmd_width>   	**p_cmd_out;
-	soclib::caba::DspinInput<dspin_cmd_width>    	**p_cmd_in;
-    soclib::caba::DspinOutput<dspin_rsp_width>     	**p_rsp_out;
-    soclib::caba::DspinInput<dspin_rsp_width>      	**p_rsp_in;
+    // Ports
+    sc_in<bool>                                     p_clk;
+    sc_in<bool>                                     p_resetn;
+    soclib::caba::DspinOutput<dspin_cmd_width>      **p_cmd_out;
+    soclib::caba::DspinInput<dspin_cmd_width>       **p_cmd_in;
+    soclib::caba::DspinOutput<dspin_rsp_width>      **p_rsp_out;
+    soclib::caba::DspinInput<dspin_rsp_width>       **p_rsp_in;
 
     // interrupt signals
-	sc_signal<bool>     	signal_false;
-	sc_signal<bool> 		signal_proc_it[8];
-	sc_signal<bool> 		signal_irq_mdma[8];
-	sc_signal<bool>			signal_irq_mtty[23];
-	sc_signal<bool> 		signal_irq_mnic_rx[8];	// unused
-	sc_signal<bool> 		signal_irq_mnic_tx[8];	// unused
-	sc_signal<bool> 		signal_irq_bdev;
-	
-	// DSPIN signals between DSPIN routers and local_crossbars
-	DspinSignals<dspin_cmd_width> 	signal_dspin_cmd_l2g_d; 
-	DspinSignals<dspin_cmd_width> 	signal_dspin_cmd_g2l_d; 
-	DspinSignals<dspin_cmd_width> 	signal_dspin_m2p_l2g_c;
-	DspinSignals<dspin_cmd_width> 	signal_dspin_m2p_g2l_c; 
-	DspinSignals<dspin_rsp_width> 	signal_dspin_rsp_l2g_d; 
-	DspinSignals<dspin_rsp_width> 	signal_dspin_rsp_g2l_d; 
-	DspinSignals<dspin_rsp_width> 	signal_dspin_p2m_l2g_c;
-	DspinSignals<dspin_rsp_width> 	signal_dspin_p2m_g2l_c;
-
-	// Direct VCI signals to VCI/DSPIN wrappers
-	VciSignals<vci_param_int> 		signal_vci_ini_proc[8]; 
-	VciSignals<vci_param_int>  		signal_vci_ini_mdma; 
-	VciSignals<vci_param_int>  		signal_vci_ini_bdev; 
-
-	VciSignals<vci_param_int>		signal_vci_tgt_memc;
-	VciSignals<vci_param_int> 		signal_vci_tgt_xicu;
-	VciSignals<vci_param_int> 		signal_vci_tgt_mdma;
-	VciSignals<vci_param_int> 		signal_vci_tgt_mtty;
-	VciSignals<vci_param_int> 		signal_vci_tgt_bdev;
-	VciSignals<vci_param_int> 		signal_vci_tgt_brom;
-	VciSignals<vci_param_int> 		signal_vci_tgt_fbuf;
-	VciSignals<vci_param_int> 		signal_vci_tgt_mnic;
-
-	// Direct DSPIN signals to local crossbars
-	DspinSignals<dspin_cmd_width>     signal_dspin_cmd_proc_i[8];
-	DspinSignals<dspin_rsp_width>     signal_dspin_rsp_proc_i[8];
-	DspinSignals<dspin_cmd_width>     signal_dspin_cmd_mdma_i;
-	DspinSignals<dspin_rsp_width>     signal_dspin_rsp_mdma_i;
-	DspinSignals<dspin_cmd_width>     signal_dspin_cmd_bdev_i;
-	DspinSignals<dspin_rsp_width>     signal_dspin_rsp_bdev_i;
-
-	DspinSignals<dspin_cmd_width>     signal_dspin_cmd_memc_t;
-	DspinSignals<dspin_rsp_width>     signal_dspin_rsp_memc_t;
-	DspinSignals<dspin_cmd_width>     signal_dspin_cmd_xicu_t;
-	DspinSignals<dspin_rsp_width>     signal_dspin_rsp_xicu_t;
-	DspinSignals<dspin_cmd_width>     signal_dspin_cmd_mdma_t;
-	DspinSignals<dspin_rsp_width>     signal_dspin_rsp_mdma_t;
-	DspinSignals<dspin_cmd_width>     signal_dspin_cmd_mtty_t;
-	DspinSignals<dspin_rsp_width>     signal_dspin_rsp_mtty_t;
-	DspinSignals<dspin_cmd_width>     signal_dspin_cmd_bdev_t;
-	DspinSignals<dspin_rsp_width>     signal_dspin_rsp_bdev_t;
-	DspinSignals<dspin_cmd_width>     signal_dspin_cmd_brom_t;
-	DspinSignals<dspin_rsp_width>     signal_dspin_rsp_brom_t;
-	DspinSignals<dspin_cmd_width>     signal_dspin_cmd_fbuf_t;
-	DspinSignals<dspin_rsp_width>     signal_dspin_rsp_fbuf_t;
-	DspinSignals<dspin_cmd_width>     signal_dspin_cmd_mnic_t;
-	DspinSignals<dspin_rsp_width>     signal_dspin_rsp_mnic_t;
-
-	// Coherence DSPIN signals to local crossbar
-	DspinSignals<dspin_cmd_width>     signal_dspin_m2p_memc;
-	DspinSignals<dspin_rsp_width>     signal_dspin_p2m_memc;
-	DspinSignals<dspin_cmd_width>     signal_dspin_m2p_proc[8];
-	DspinSignals<dspin_rsp_width>     signal_dspin_p2m_proc[8];
-
-	// external RAM to MEMC VCI signal
-	VciSignals<vci_param_ext>         signal_vci_xram;
-	
+    sc_signal<bool>         signal_false;
+    sc_signal<bool>         signal_proc_it[8];
+    sc_signal<bool>         signal_irq_mdma[8];
+    sc_signal<bool>         signal_irq_mtty[23];
+    sc_signal<bool>         signal_irq_mnic_rx[8];  // unused
+    sc_signal<bool>         signal_irq_mnic_tx[8];  // unused
+    sc_signal<bool>         signal_irq_bdev;
+
+    // DSPIN signals between DSPIN routers and local_crossbars
+    DspinSignals<dspin_cmd_width>   signal_dspin_cmd_l2g_d;
+    DspinSignals<dspin_cmd_width>   signal_dspin_cmd_g2l_d;
+    DspinSignals<dspin_cmd_width>   signal_dspin_m2p_l2g_c;
+    DspinSignals<dspin_cmd_width>   signal_dspin_m2p_g2l_c;
+    DspinSignals<dspin_rsp_width>   signal_dspin_rsp_l2g_d;
+    DspinSignals<dspin_rsp_width>   signal_dspin_rsp_g2l_d;
+    DspinSignals<dspin_rsp_width>   signal_dspin_p2m_l2g_c;
+    DspinSignals<dspin_rsp_width>   signal_dspin_p2m_g2l_c;
+
+    // Direct VCI signals to VCI/DSPIN wrappers
+    VciSignals<vci_param_int>       signal_vci_ini_proc[8];
+    VciSignals<vci_param_int>       signal_vci_ini_mdma;
+    VciSignals<vci_param_int>       signal_vci_ini_bdev;
+
+    VciSignals<vci_param_int>       signal_vci_tgt_memc;
+    VciSignals<vci_param_int>       signal_vci_tgt_xicu;
+    VciSignals<vci_param_int>       signal_vci_tgt_mdma;
+    VciSignals<vci_param_int>       signal_vci_tgt_mtty;
+    VciSignals<vci_param_int>       signal_vci_tgt_bdev;
+    VciSignals<vci_param_int>       signal_vci_tgt_brom;
+    VciSignals<vci_param_int>       signal_vci_tgt_fbuf;
+    VciSignals<vci_param_int>       signal_vci_tgt_mnic;
+
+    // Direct DSPIN signals to local crossbars
+    DspinSignals<dspin_cmd_width>     signal_dspin_cmd_proc_i[8];
+    DspinSignals<dspin_rsp_width>     signal_dspin_rsp_proc_i[8];
+    DspinSignals<dspin_cmd_width>     signal_dspin_cmd_mdma_i;
+    DspinSignals<dspin_rsp_width>     signal_dspin_rsp_mdma_i;
+    DspinSignals<dspin_cmd_width>     signal_dspin_cmd_bdev_i;
+    DspinSignals<dspin_rsp_width>     signal_dspin_rsp_bdev_i;
+
+    DspinSignals<dspin_cmd_width>     signal_dspin_cmd_memc_t;
+    DspinSignals<dspin_rsp_width>     signal_dspin_rsp_memc_t;
+    DspinSignals<dspin_cmd_width>     signal_dspin_cmd_xicu_t;
+    DspinSignals<dspin_rsp_width>     signal_dspin_rsp_xicu_t;
+    DspinSignals<dspin_cmd_width>     signal_dspin_cmd_mdma_t;
+    DspinSignals<dspin_rsp_width>     signal_dspin_rsp_mdma_t;
+    DspinSignals<dspin_cmd_width>     signal_dspin_cmd_mtty_t;
+    DspinSignals<dspin_rsp_width>     signal_dspin_rsp_mtty_t;
+    DspinSignals<dspin_cmd_width>     signal_dspin_cmd_bdev_t;
+    DspinSignals<dspin_rsp_width>     signal_dspin_rsp_bdev_t;
+    DspinSignals<dspin_cmd_width>     signal_dspin_cmd_brom_t;
+    DspinSignals<dspin_rsp_width>     signal_dspin_rsp_brom_t;
+    DspinSignals<dspin_cmd_width>     signal_dspin_cmd_fbuf_t;
+    DspinSignals<dspin_rsp_width>     signal_dspin_rsp_fbuf_t;
+    DspinSignals<dspin_cmd_width>     signal_dspin_cmd_mnic_t;
+    DspinSignals<dspin_rsp_width>     signal_dspin_rsp_mnic_t;
+
+    // Coherence DSPIN signals to local crossbar
+    DspinSignals<dspin_cmd_width>     signal_dspin_m2p_memc;
+    DspinSignals<dspin_rsp_width>     signal_dspin_p2m_memc;
+    DspinSignals<dspin_cmd_width>     signal_dspin_m2p_proc[8];
+    DspinSignals<dspin_rsp_width>     signal_dspin_p2m_proc[8];
+
+    // external RAM to MEMC VCI signal
+    VciSignals<vci_param_ext>         signal_vci_xram;
+
     // Components
 
-    VciCcVCacheWrapper<vci_param_int, 
+    VciCcVCacheWrapper<vci_param_int,
                        dspin_cmd_width,
                        dspin_rsp_width,
@@ -132,7 +132,7 @@
                              dspin_rsp_width>*    wi_proc[8];
 
-    VciMemCache<vci_param_int, 
-                vci_param_ext, 
-                dspin_rsp_width, 
+    VciMemCache<vci_param_int,
+                vci_param_ext,
+                dspin_rsp_width,
                 dspin_cmd_width>*                 memc;
 
@@ -201,8 +201,8 @@
     VirtualDspinRouter<dspin_rsp_width>*          router_rsp;
 
-	TsarXbarCluster( sc_module_name                     insname,
-                     size_t                             nb_procs,      // processors 
-                     size_t                             nb_ttys,       // TTY terminals 
-                     size_t                             nb_dmas,       //  DMA channels 
+    TsarXbarCluster( sc_module_name                     insname,
+                     size_t                             nb_procs,      // processors
+                     size_t                             nb_ttys,       // TTY terminals
+                     size_t                             nb_dmas,       //  DMA channels
                      size_t                             x,             // x coordinate
                      size_t                             y,             // y coordinate
@@ -210,9 +210,9 @@
                      const soclib::common::MappingTable &mtd,          // internal
                      const soclib::common::MappingTable &mtx,          // external
-                     size_t	                            x_width,       // x field bits
-                     size_t	                            y_width,       // y field bits
-                     size_t	                            l_width,       // l field bits
-                     size_t	                            tgtid_memc,
-                     size_t	                            tgtid_xicu,
+                     size_t                             x_width,       // x field bits
+                     size_t                             y_width,       // y field bits
+                     size_t                             l_width,       // l field bits
+                     size_t                             tgtid_memc,
+                     size_t                             tgtid_xicu,
                      size_t                             tgtid_mdma,
                      size_t                             tgtid_fbuf,
@@ -224,22 +224,22 @@
                      size_t                             memc_sets,
                      size_t                             l1_i_ways,
-                     size_t                             l1_i_sets, 
+                     size_t                             l1_i_sets,
                      size_t                             l1_d_ways,
-                     size_t                             l1_d_sets,  
-                     size_t                             xram_latency,  // external ram 
-                     bool                               io,	           // I/O cluster
+                     size_t                             l1_d_sets,
+                     size_t                             xram_latency,  // external ram
+                     bool                               io,            // I/O cluster
                      size_t                             xfb,           // fbf pixels
                      size_t                             yfb,           // fbf lines
-                     char*                              disk_name,     // virtual disk 
-                     size_t                             block_size,    // block size 
+                     char*                              disk_name,     // virtual disk
+                     size_t                             block_size,    // block size
                      size_t                             nic_channels,  // number channels
-                     char*                              nic_rx_name,   // filename rx 
-                     char*                              nic_tx_name,   // filename tx 
-                     uint32_t							nic_timeout,   // cycles
-			         const Loader                       &loader,       
-                     uint32_t                           frozen_cycles, 
+                     char*                              nic_rx_name,   // filename rx
+                     char*                              nic_tx_name,   // filename tx
+                     uint32_t                           nic_timeout,   // cycles
+                     const Loader                       &loader,
+                     uint32_t                           frozen_cycles,
                      uint32_t                           start_debug_cycle,
-                     bool                               memc_debug_ok, 
-                     bool                               proc_debug_ok); 
+                     bool                               memc_debug_ok,
+                     bool                               proc_debug_ok);
 
 };
Index: trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp
===================================================================
--- trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp	(revision 396)
+++ trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp	(revision 428)
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
 // File: tsar_xbar_cluster.cpp
-// Author: Alain Greiner 
+// Author: Alain Greiner
 // Copyright: UPMC/LIP6
 // Date : march 2011
@@ -7,6 +7,6 @@
 //////////////////////////////////////////////////////////////////////////////
 // This file define a TSAR cluster architecture with virtual memory:
-// - It uses two virtual_dspin_router as distributed global interconnect 
-// - It uses four dspin_local_crossbar as local interconnect 
+// - It uses two virtual_dspin_router as distributed global interconnect
+// - It uses four dspin_local_crossbar as local interconnect
 // - It uses the vci_cc_vcache_wrapper
 // - It uses the vci_mem_cache
@@ -16,10 +16,10 @@
 // - It uses the vci_xicu interrupt controller
 // - The peripherals MTTY, BDEV, FBUF, MNIC and BROM are in cluster (0,0)
-// - The Multi-TTY component controls up to 15 terminals. 
+// - The Multi-TTY component controls up to 15 terminals.
 // - Each Multi-DMA component controls up to 8 DMA channels.
 // - The DMA IRQs are connected to IRQ_IN[8]...IRQ_IN[15]
 // - The TTY IRQs are connected to IRQ_IN[16]...IRQ_IN[30]
 // - The BDEV IRQ is connected to IRQ_IN[31]
-////////////////////////////////////////////////////////////////////////////////// 
+//////////////////////////////////////////////////////////////////////////////////
 
 #include "../include/tsar_xbar_cluster.h"
@@ -30,5 +30,5 @@
 
 ////////////////////////////////////////////////////////////////////////////////////
-template<size_t dspin_cmd_width, 
+template<size_t dspin_cmd_width,
          size_t dspin_rsp_width,
          typename vci_param_int,
@@ -46,5 +46,5 @@
          size_t                             cluster_id,
          const soclib::common::MappingTable &mtd,
-         const soclib::common::MappingTable &mtx, 
+         const soclib::common::MappingTable &mtx,
          size_t                             x_width,
          size_t                             y_width,
@@ -91,19 +91,19 @@
 
     /////////////////////////////////////////////////////////////////////////////
-    // Components definition 
+    // Components definition
     /////////////////////////////////////////////////////////////////////////////
     std::cout << "  - building proc_" << x_id << "_" << y_id << "-*" << std::endl;
 
     for (size_t p = 0; p < nb_procs; p++)
-    { 
+    {
         std::ostringstream sproc;
         sproc << "proc_" << x_id << "_" << y_id << "_" << p;
         proc[p] = new VciCcVCacheWrapper<vci_param_int,
                                          dspin_cmd_width,
-                                         dspin_rsp_width, 
+                                         dspin_rsp_width,
                                          GdbServer<Mips32ElIss> >(
                       sproc.str().c_str(),
                       cluster_id*nb_procs + p,        // GLOBAL PROC_ID
-                      mtd,                            // Mapping Table 
+                      mtd,                            // Mapping Table
                       IntTab(cluster_id,p),           // SRCID
                       (cluster_id << l_width) + p,    // CC_GLOBAL_ID
@@ -234,7 +234,7 @@
                      x_width, y_width, l_width,
                      nb_direct_initiators,         // number of local of sources
-                     nb_direct_targets,            // number of local dests 
-                     2, 2,                         // fifo depths  
-                     true,                         // use local routing table 
+                     nb_direct_targets,            // number of local dests
+                     2, 2,                         // fifo depths
+                     true,                         // use local routing table
                      false );                      // no broacast
 
@@ -247,8 +247,8 @@
                      x_id, y_id,                   // cluster coordinates
                      x_width, y_width, l_width,
-                     nb_direct_targets,            // number of local sources      
+                     nb_direct_targets,            // number of local sources
                      nb_direct_initiators,         // number of local dests
-                     2, 2,                         // fifo depths  
-                     false,                        // don't use local routing table 
+                     2, 2,                         // fifo depths
+                     false,                        // don't use local routing table
                      false );                      // no broacast
 
@@ -262,6 +262,6 @@
                      x_width, y_width, l_width,
                      1,                            // number of local sources
-                     nb_procs,                     // number of local targets 
-                     2, 2,                         // fifo depths  
+                     nb_procs,                     // number of local targets
+                     2, 2,                         // fifo depths
                      false,                        // don't use local routing table
                      true );                       // broacast
@@ -277,7 +277,7 @@
                      nb_procs,                     // number of local sources
                      1,                            // number of local dests
-                     2, 2,                         // fifo depths  
+                     2, 2,                         // fifo depths
                      false,                        // don't use local routing table
-                     false );                      // no broacast 
+                     false );                      // no broacast
 
     /////////////////////////////////////////////////////////////////////////////
@@ -324,5 +324,5 @@
                      IntTab(cluster_id, tgtid_fbuf),
                      mtd,
-                     xfb, yfb); 
+                     xfb, yfb);
 
         wt_fbuf = new VciDspinTargetWrapper<vci_param_int,
@@ -388,5 +388,5 @@
                      "mtty",
                      IntTab(cluster_id, tgtid_mtty),
-                     mtd, 
+                     mtd,
                      vect_names);
 
@@ -494,5 +494,5 @@
     xbar_m2p_c->p_global_in                      (signal_dspin_m2p_g2l_c);
     xbar_m2p_c->p_local_in[0]                    (signal_dspin_m2p_memc);
-    for (size_t p = 0; p < nb_procs; p++) 
+    for (size_t p = 0; p < nb_procs; p++)
         xbar_m2p_c->p_local_out[p]               (signal_dspin_m2p_proc[p]);
 
@@ -505,5 +505,5 @@
     xbar_p2m_c->p_global_in                      (signal_dspin_p2m_g2l_c);
     xbar_p2m_c->p_local_out[0]                   (signal_dspin_p2m_memc);
-    for (size_t p = 0; p < nb_procs; p++) 
+    for (size_t p = 0; p < nb_procs; p++)
         xbar_p2m_c->p_local_in[p]                (signal_dspin_p2m_proc[p]);
 
@@ -535,10 +535,10 @@
 
     ///////////////////////////////////// XICU
-    xicu->p_clk                     	(this->p_clk);
-    xicu->p_resetn                  	(this->p_resetn);
-    xicu->p_vci                     	(signal_vci_tgt_xicu);
+    xicu->p_clk                        (this->p_clk);
+    xicu->p_resetn                     (this->p_resetn);
+    xicu->p_vci                        (signal_vci_tgt_xicu);
     for ( size_t p=0 ; p<nb_procs ; p++)
     {
-        xicu->p_irq[p]              	(signal_proc_it[p]);
+        xicu->p_irq[p]                 (signal_proc_it[p]);
     }
     for ( size_t i=0 ; i<32 ; i++)
@@ -547,8 +547,8 @@
         {
             if      (i < 8)                  xicu->p_hwi[i] (signal_false);
-            else if (i < (8 + nb_dmas))      xicu->p_hwi[i]	(signal_irq_mdma[i-8]);
+            else if (i < (8 + nb_dmas))      xicu->p_hwi[i] (signal_irq_mdma[i-8]);
             else if (i < 16)                 xicu->p_hwi[i] (signal_false);
             else if (i < (16 + nb_ttys))     xicu->p_hwi[i] (signal_irq_mtty[i-16]);
-            else if (i < 31)                 xicu->p_hwi[i]	(signal_false);
+            else if (i < 31)                 xicu->p_hwi[i] (signal_false);
             else                             xicu->p_hwi[i] (signal_irq_bdev);
         }
@@ -556,6 +556,6 @@
         {
             if      (i < 8)                  xicu->p_hwi[i] (signal_false);
-            else if (i < (8 + nb_dmas))      xicu->p_hwi[i]	(signal_irq_mdma[i-8]);
-            else                             xicu->p_hwi[i]	(signal_false);
+            else if (i < (8 + nb_dmas))      xicu->p_hwi[i] (signal_irq_mdma[i-8]);
+            else                             xicu->p_hwi[i] (signal_false);
         }
     }
@@ -571,10 +571,10 @@
 
     //////////////////////////////////////////////// MEMC
-    memc->p_clk                     	(this->p_clk);
-    memc->p_resetn                  	(this->p_resetn);
-    memc->p_vci_ixr                 	(signal_vci_xram);
-    memc->p_vci_tgt                 	(signal_vci_tgt_memc);
+    memc->p_clk                        (this->p_clk);
+    memc->p_resetn                     (this->p_resetn);
+    memc->p_vci_ixr                    (signal_vci_xram);
+    memc->p_vci_tgt                    (signal_vci_tgt_memc);
     memc->p_dspin_in                   (signal_dspin_p2m_memc);
-    memc->p_dspin_out         	      (signal_dspin_m2p_memc);
+    memc->p_dspin_out                  (signal_dspin_m2p_memc);
 
     // wrapper MEMC
@@ -588,15 +588,15 @@
 
     /////////////////////////////////////////////// XRAM
-    xram->p_clk                     	(this->p_clk);
-    xram->p_resetn                  	(this->p_resetn);
-    xram->p_vci                 	      (signal_vci_xram);
+    xram->p_clk                        (this->p_clk);
+    xram->p_resetn                     (this->p_resetn);
+    xram->p_vci                        (signal_vci_xram);
 
     std::cout << "  - XRAM connected" << std::endl;
 
     ////////////////////////////////////////////// MDMA
-    mdma->p_clk                       	(this->p_clk);
-    mdma->p_resetn                    	(this->p_resetn);
-    mdma->p_vci_target                	(signal_vci_tgt_mdma);
-    mdma->p_vci_initiator             	(signal_vci_ini_mdma);
+    mdma->p_clk                        (this->p_clk);
+    mdma->p_resetn                     (this->p_resetn);
+    mdma->p_vci_target                 (signal_vci_tgt_mdma);
+    mdma->p_vci_initiator              (signal_vci_ini_mdma);
     for (size_t i=0 ; i<nb_dmas ; i++)
         mdma->p_irq[i]                 (signal_irq_mdma[i]);
@@ -618,10 +618,10 @@
     std::cout << "  - MDMA connected" << std::endl;
 
-	 /////////////////////////////// Components in I/O cluster
-
-	 if ( io )
-	 {
-        // BDEV            
-	     bdev->p_clk                    (this->p_clk);
+    /////////////////////////////// Components in I/O cluster
+
+    if ( io )
+    {
+        // BDEV
+        bdev->p_clk                    (this->p_clk);
         bdev->p_resetn                 (this->p_resetn);
         bdev->p_irq                    (signal_irq_bdev);
@@ -698,5 +698,5 @@
         for ( size_t i=0 ; i<nb_ttys ; i++ )
         {
-            mtty->p_irq[i]           	(signal_irq_mtty[i]);
+            mtty->p_irq[i]             (signal_irq_mtty[i]);
         }
 
