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]);
         }
 
