Index: branches/v5/modules/vci_cc_vcache_wrapper_dspin_coherence/caba/source/include/vci_cc_vcache_wrapper_dspin_coherence.h
===================================================================
--- branches/v5/modules/vci_cc_vcache_wrapper_dspin_coherence/caba/source/include/vci_cc_vcache_wrapper_dspin_coherence.h	(revision 331)
+++ branches/v5/modules/vci_cc_vcache_wrapper_dspin_coherence/caba/source/include/vci_cc_vcache_wrapper_dspin_coherence.h	(revision 346)
@@ -1,3 +1,4 @@
 /* -*- c++ -*-
+ *
  * File : vci_cc_vcache_wrapper.h
  * Copyright (c) UPMC, Lip6, SoC
@@ -285,39 +286,35 @@
     sc_in<bool>                             p_resetn;
     sc_in<bool>                             p_irq[iss_t::n_irq];
-    soclib::caba::VciInitiator<vci_param>   p_vci_ini_d;
-    soclib::caba::DspinInput <40> p_dspin_in;
-    soclib::caba::DspinOutput<33> p_dspin_out;
+    soclib::caba::VciInitiator<vci_param>   p_vci;
+    soclib::caba::DspinInput <40>           p_dspin_in;
+    soclib::caba::DspinOutput<33>           p_dspin_out;
 
 private:
 
     // STRUCTURAL PARAMETERS
-    soclib::common::AddressDecodingTable<uint32_t, bool>    	m_cacheability_table;
-    const soclib::common::Segment                           	m_segment;
-    const vci_srcid_t                                       	m_srcid_d;
-    const vci_srcid_t                                       	m_srcid_c;
-
+    soclib::common::AddressDecodingTable<uint32_t, bool> m_cacheability_table;
+
+    const vci_srcid_t                   m_srcid;
+    const size_t                        m_cc_global_id;
+    const size_t                        m_nline_width;
     const size_t  						m_itlb_ways;
     const size_t  						m_itlb_sets;
-
     const size_t  						m_dtlb_ways;
     const size_t  						m_dtlb_sets;
-
     const size_t  						m_icache_ways;
     const size_t  						m_icache_sets;
     const paddr_t 						m_icache_yzmask;
     const size_t  						m_icache_words;
-
     const size_t  						m_dcache_ways;
     const size_t  						m_dcache_sets;
     const paddr_t 						m_dcache_yzmask;
     const size_t  						m_dcache_words;
-
     const size_t                        m_x_width;
     const size_t                        m_y_width;
-
-    const size_t                        m_memory_cache_local_id;
     const size_t                        m_proc_id;
     const uint32_t						m_max_frozen_cycles;
     const size_t  						m_paddr_nbits;
+    uint32_t                            m_debug_start_cycle;
+    bool                                m_debug_ok;
 
     ////////////////////////////////////////
@@ -332,6 +329,4 @@
     // debug variables (for each FSM)
     /////////////////////////////////////////////
-    uint32_t                            m_debug_start_cycle;
-    bool                                m_debug_ok;
     bool                                m_debug_previous_hit;
     bool                                m_idebug_previous_hit;
@@ -686,29 +681,26 @@
 public:
     VciCcVCacheWrapper(
-        sc_module_name insname,
-        int proc_id,
-        const soclib::common::MappingTable &mtp,
-        const soclib::common::MappingTable &mtc,
-        const soclib::common::IntTab &initiator_index_d,
-        const soclib::common::IntTab &initiator_index_c,
-        const soclib::common::IntTab &target_index_d,
-        size_t   itlb_ways,
-        size_t   itlb_sets,
-        size_t   dtlb_ways,
-        size_t   dtlb_sets,
-        size_t   icache_ways,
-        size_t   icache_sets,
-        size_t   icache_words,
-        size_t   dcache_ways,
-        size_t   dcache_sets,
-        size_t   dcache_words,
-        size_t   wbuf_nlines,
-        size_t   wbuf_nwords,
-        size_t   x_width,
-        size_t   y_width,
-        uint32_t memory_cache_local_id,
-        uint32_t max_frozen_cycles,
-        uint32_t debug_start_cycle,
-        bool     debug_ok);
+        sc_module_name                      name,
+        const int                           proc_id,
+        const soclib::common::MappingTable  &mtd,
+        const soclib::common::IntTab        &srcid,
+        const size_t                        cc_global_id,
+        const size_t                        itlb_ways,
+        const size_t                        itlb_sets,
+        const size_t                        dtlb_ways,
+        const size_t                        dtlb_sets,
+        const size_t                        icache_ways,
+        const size_t                        icache_sets,
+        const size_t                        icache_words,
+        const size_t                        dcache_ways,
+        const size_t                        dcache_sets,
+        const size_t                        dcache_words,
+        const size_t                        wbuf_nlines,
+        const size_t                        wbuf_nwords,
+        const size_t                        x_width,
+        const size_t                        y_width,
+        const uint32_t                      max_frozen_cycles,
+        const uint32_t                      debug_start_cycle,
+        const bool                          debug_ok );
 
     ~VciCcVCacheWrapper();
