Index: /trunk/modules/vci_cc_xcache_wrapper_v1/caba/source/src/vci_cc_xcache_wrapper_v1.cpp
===================================================================
--- /trunk/modules/vci_cc_xcache_wrapper_v1/caba/source/src/vci_cc_xcache_wrapper_v1.cpp	(revision 82)
+++ /trunk/modules/vci_cc_xcache_wrapper_v1/caba/source/src/vci_cc_xcache_wrapper_v1.cpp	(revision 83)
@@ -1887,5 +1887,5 @@
                 p_vci_tgt.rtrdid  = r_tgt_trdid.read();
                 p_vci_tgt.rdata   = 0;
-                p_vci_tgt.rerror  = 0x2 & ( (1 << (vci_param::E + 1)) - 1); // Write OK
+                p_vci_tgt.rerror  = 0x2 & ( (1 << vci_param::E) - 1); // Write OK
                 p_vci_tgt.reop    = true;
                 break;
@@ -1898,5 +1898,5 @@
                 p_vci_tgt.rtrdid  = r_tgt_trdid.read();
                 p_vci_tgt.rdata   = 0;
-                p_vci_tgt.rerror  = 0x2 & ( (1 << (vci_param::E + 1)) - 1); // Write OK
+                p_vci_tgt.rerror  = 0x2 & ( (1 << vci_param::E) - 1); // Write OK
                 p_vci_tgt.reop    = true;
                 break;
@@ -1909,5 +1909,5 @@
                 p_vci_tgt.rtrdid  = r_tgt_trdid.read();
                 p_vci_tgt.rdata   = 0;
-                p_vci_tgt.rerror  = 0x2 & ( (1 << (vci_param::E + 1)) - 1); // Write OK
+                p_vci_tgt.rerror  = 0x2 & ( (1 << vci_param::E) - 1); // Write OK
                 p_vci_tgt.reop    = true;
                 break;
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 82)
+++ /trunk/modules/vci_cc_xcache_wrapper_v4/caba/source/src/vci_cc_xcache_wrapper_v4.cpp	(revision 83)
@@ -2011,5 +2011,5 @@
                 p_vci_tgt.rtrdid  = r_tgt_trdid.read();
                 p_vci_tgt.rdata   = 0;
-                p_vci_tgt.rerror  = 0x2 & ( (1 << (vci_param::E + 1)) - 1); // Write OK
+                p_vci_tgt.rerror  = 0x2 & ( (1 << vci_param::E) - 1); // Write OK
                 p_vci_tgt.reop    = true;
                 break;
@@ -2022,5 +2022,5 @@
                 p_vci_tgt.rtrdid  = r_tgt_trdid.read();
                 p_vci_tgt.rdata   = 0;
-                p_vci_tgt.rerror  = 0x2 & ( (1 << (vci_param::E + 1)) - 1); // Write OK
+                p_vci_tgt.rerror  = 0x2 & ( (1 << vci_param::E) - 1); // Write OK
                 p_vci_tgt.reop    = true;
                 break;
@@ -2033,5 +2033,5 @@
                 p_vci_tgt.rtrdid  = r_tgt_trdid.read();
                 p_vci_tgt.rdata   = 0;
-                p_vci_tgt.rerror  = 0x2 & ( (1 << (vci_param::E + 1)) - 1); // Write OK
+                p_vci_tgt.rerror  = 0x2 & ( (1 << vci_param::E) - 1); // Write OK
                 p_vci_tgt.reop    = true;
                 break;
Index: /trunk/modules/vci_mem_cache_v2/caba/source/src/vci_mem_cache_v2.cpp
===================================================================
--- /trunk/modules/vci_mem_cache_v2/caba/source/src/vci_mem_cache_v2.cpp	(revision 82)
+++ /trunk/modules/vci_mem_cache_v2/caba/source/src/vci_mem_cache_v2.cpp	(revision 83)
@@ -3700,5 +3700,5 @@
         p_vci_tgt.rtrdid   = r_write_to_tgt_rsp_trdid.read();
         p_vci_tgt.rpktid   = r_write_to_tgt_rsp_pktid.read();
-        p_vci_tgt.rerror   = 0x2 & ( (1 << (vci_param::E + 1)) - 1); // Write OK
+        p_vci_tgt.rerror   = 0x2 & ( (1 << vci_param::E) - 1); // Write OK
         p_vci_tgt.reop     = true;
         break;
@@ -3896,5 +3896,5 @@
           p_vci_tgt_cleanup.rpktid = r_cleanup_pktid.read();
           p_vci_tgt_cleanup.rtrdid = r_cleanup_trdid.read();
-          p_vci_tgt_cleanup.rerror = 0x2 & ( (1 << (vci_param::E + 1)) - 1);
+          p_vci_tgt_cleanup.rerror = 0x2 & ( (1 << vci_param::E) - 1);
           p_vci_tgt_cleanup.reop   = 1;
           break;
Index: /trunk/modules/vci_mem_cache_v3/caba/source/src/vci_mem_cache_v3.cpp
===================================================================
--- /trunk/modules/vci_mem_cache_v3/caba/source/src/vci_mem_cache_v3.cpp	(revision 82)
+++ /trunk/modules/vci_mem_cache_v3/caba/source/src/vci_mem_cache_v3.cpp	(revision 83)
@@ -4339,5 +4339,5 @@
         p_vci_tgt.rtrdid   = r_write_to_tgt_rsp_trdid.read();
         p_vci_tgt.rpktid   = r_write_to_tgt_rsp_pktid.read();
-        p_vci_tgt.rerror   = 0x2 & ( (1 << (vci_param::E + 1)) - 1); // Write OK
+        p_vci_tgt.rerror   = 0x2 & ( (1 << vci_param::E) - 1); // Write OK
         p_vci_tgt.reop     = true;
         break;
@@ -4551,5 +4551,5 @@
           p_vci_tgt_cleanup.rpktid = r_cleanup_pktid.read();
           p_vci_tgt_cleanup.rtrdid = r_cleanup_trdid.read();
-          p_vci_tgt_cleanup.rerror = 0x2 & ( (1 << (vci_param::E + 1)) - 1);
+          p_vci_tgt_cleanup.rerror = 0x2 & ( (1 << vci_param::E) - 1);
           p_vci_tgt_cleanup.reop   = 1;
           break;
Index: /trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp
===================================================================
--- /trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp	(revision 82)
+++ /trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp	(revision 83)
@@ -4249,5 +4249,5 @@
         p_vci_tgt.rtrdid   = r_write_to_tgt_rsp_trdid.read();
         p_vci_tgt.rpktid   = r_write_to_tgt_rsp_pktid.read();
-        p_vci_tgt.rerror   = 0x2 & ( (1 << (vci_param::E + 1)) - 1); // Write OK
+        p_vci_tgt.rerror   = 0x2 & ( (1 << vci_param::E) - 1); // Write OK
         p_vci_tgt.reop     = true;
         break;
@@ -4509,5 +4509,5 @@
           p_vci_tgt_cleanup.rpktid = r_cleanup_pktid.read();
           p_vci_tgt_cleanup.rtrdid = r_cleanup_trdid.read();
-          p_vci_tgt_cleanup.rerror = 0x2 & ( (1 << (vci_param::E + 1)) - 1);
+          p_vci_tgt_cleanup.rerror = 0x2 & ( (1 << vci_param::E) - 1);
           p_vci_tgt_cleanup.reop   = 1;
           break;