Index: trunk/modules/vci_cc_xcache_wrapper_v4/caba/source/include/vci_cc_xcache_wrapper_v4.h
===================================================================
--- trunk/modules/vci_cc_xcache_wrapper_v4/caba/source/include/vci_cc_xcache_wrapper_v4.h	(revision 166)
+++ trunk/modules/vci_cc_xcache_wrapper_v4/caba/source/include/vci_cc_xcache_wrapper_v4.h	(revision 167)
@@ -119,9 +119,4 @@
     typedef uint32_t    	be_t;
     typedef typename vci_param::fast_addr_t vci_addr_t;
-    typedef  enum
-        {
-            WRITE_THROUGH,
-            RELEASE_WRITE_THROUGH
-        } write_policy_t;
     
     enum dcache_fsm_state_e {
@@ -243,5 +238,4 @@
     const uint32_t       m_icache_words_shift;
     const size_t         m_icache_yzmask;
-    const write_policy_t m_write_policy;
     const size_t         m_cache_words; // max between m_dcache_words and m_icache_words
 
@@ -461,7 +455,5 @@
                        size_t dcache_words,
                        size_t wbuf_nwords,
-                       size_t wbuf_nlines,
-                       size_t wbuf_timeout,
-                       write_policy_t write_policy=WRITE_THROUGH
+                       size_t wbuf_nlines
                          );
 
Index: trunk/modules/vci_cc_xcache_wrapper_v4/caba/source/src/vci_cc_xcache_wrapper_v4.cpp
===================================================================
--- trunk/modules/vci_cc_xcache_wrapper_v4/caba/source/src/vci_cc_xcache_wrapper_v4.cpp	(revision 166)
+++ trunk/modules/vci_cc_xcache_wrapper_v4/caba/source/src/vci_cc_xcache_wrapper_v4.cpp	(revision 167)
@@ -196,7 +196,5 @@
                                      size_t dcache_words,
                                      size_t wbuf_nwords,
-                                     size_t wbuf_nlines,
-                                     size_t wbuf_timeout,
-                                     write_policy_t write_policy
+                                     size_t wbuf_nlines
                                      )
                : 
@@ -230,5 +228,4 @@
                m_icache_words_shift(uint32_log2(icache_words)+uint32_log2(sizeof(data_t))),
                m_icache_yzmask((~0)<<m_icache_words_shift),
-               m_write_policy(write_policy),
                m_cache_words((dcache_words)?dcache_words:icache_words),
 
@@ -466,5 +463,4 @@
       size_t _wbuf_nwords  = wbuf_nwords ;
       size_t _wbuf_nlines  = wbuf_nlines /m_nb_dcache;
-      size_t _wbuf_timeout = wbuf_timeout;
 
       r_icache = new GenericCache<vci_addr_t>  * [m_nb_icache];
@@ -479,5 +475,5 @@
         {
           r_dcache [num_cache] = new GenericCache<vci_addr_t>  ("dcache", _dcache_ways, _dcache_sets, _dcache_words);
-          r_wbuf   [num_cache] = new MultiWriteBuffer<addr_40> ("r_wbuf", _wbuf_nwords, _wbuf_nlines, _wbuf_timeout, _dcache_words);
+          r_wbuf   [num_cache] = new MultiWriteBuffer<addr_40> ("r_wbuf", _wbuf_nwords, _wbuf_nlines, _dcache_words);
         }
 
@@ -575,5 +571,4 @@
             << _wbuf_nlines  << " "        // nb_lines      
             << _wbuf_nwords  << " "        // nb_words      
-            << _wbuf_timeout << " "        // timeout       
             << m_nb_cpu      << " "        // nb_cpu        
             << 32            << " "        // size_data     
@@ -3287,5 +3282,5 @@
               ASSERT(p_vci_ini_c.reop and (p_vci_ini_c.rtrdid.read() == TYPE_DATA_CLEANUP),
                      "illegal response packet received for a cleanup transaction");
-              ASSERT(p_vci_ini_c.rerror.read()&1 == vci_param::ERR_NORMAL,
+              ASSERT((p_vci_ini_c.rerror.read()&1) == vci_param::ERR_NORMAL,
                      "error signaled in a cleanup response" );
               ASSERT(p_vci_ini_c.rpktid.read() == (sc_dt::sc_uint<vci_param::P>)r_cleanup_num_cache,
@@ -3306,5 +3301,5 @@
               ASSERT(p_vci_ini_c.reop and (p_vci_ini_c.rtrdid.read() == TYPE_INS_CLEANUP),
                      "illegal response packet received for a cleanup transaction");
-              ASSERT(p_vci_ini_c.rerror.read()&1 == vci_param::ERR_NORMAL, 
+              ASSERT((p_vci_ini_c.rerror.read()&1) == vci_param::ERR_NORMAL, 
                      "error signaled in a cleanup response" );