Index: /trunk/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h
===================================================================
--- /trunk/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h	(revision 916)
+++ /trunk/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h	(revision 917)
@@ -635,5 +635,4 @@
 
       sc_signal<int>      r_config_fsm;               // FSM state
-      sc_signal<bool>     r_config_lock;              // lock protecting exclusive access
       sc_signal<int>      r_config_cmd;               // config request type  
       sc_signal<addr_t>   r_config_address;           // target buffer physical address
Index: /trunk/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp
===================================================================
--- /trunk/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp	(revision 916)
+++ /trunk/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp	(revision 917)
@@ -1674,5 +1674,6 @@
                         m_cpt_ll_cost += 5 * req_distance(p_vci_tgt.srcid.read());
                     }
-                    else {
+                    else
+                    {
                         if (is_local_req(p_vci_tgt.srcid.read()))
                         {
@@ -1711,5 +1712,6 @@
                     cmd_write_fifo_put = true;
                     // <Activity counters>
-                    if (p_vci_tgt.cmd.read() != vci_param_int::CMD_NOP) {
+                    if (p_vci_tgt.cmd.read() != vci_param_int::CMD_NOP)
+                    {
                         if (is_local_req(p_vci_tgt.srcid.read()))
                         {
@@ -1740,5 +1742,6 @@
                             }
                         }
-                        else {
+                        else
+                        {
                             // Writes
                             // (burst_size + 1 (CMD) + 1 (RSP)) flits VCI => 2 + burst_size + 1 flits dspin
@@ -2862,5 +2865,6 @@
                     m_heap.write_free_entry(heap_entry);
                     m_heap.write_free_ptr(r_read_next_ptr.read());
-                    if (r_read_last_free.read())  {
+                    if (r_read_last_free.read())
+                    {
                         m_heap.set_full();
                     }
@@ -6328,5 +6332,6 @@
                         data_vector.push_back(m_cmd_cas_wdata_fifo.read());
                     }
-                    else {
+                    else
+                    {
                         // unmodified words
                         data_vector.push_back(r_cas_data[i].read());
@@ -7205,5 +7210,6 @@
                     m_cpt_cleanup_local++;
                 }
-                else {
+                else
+                {
                     m_cpt_cleanup_remote++;
                 }
@@ -8841,5 +8847,6 @@
                         p_vci_tgt.rdata = r_xram_rsp_to_tgt_rsp_ll_key.read();
                     }
-                    else {
+                    else
+                    {
                         // LL response second flit or READ response
                         p_vci_tgt.rdata = r_xram_rsp_to_tgt_rsp_data[r_tgt_rsp_cpt.read()].read();