Index: /branches/reconfiguration/communication/dspin_dhccp_param/caba/source/include/dspin_dhccp_param.h
===================================================================
--- /branches/reconfiguration/communication/dspin_dhccp_param/caba/source/include/dspin_dhccp_param.h	(revision 866)
+++ /branches/reconfiguration/communication/dspin_dhccp_param/caba/source/include/dspin_dhccp_param.h	(revision 867)
@@ -202,6 +202,4 @@
     static const uint8_t  P2M_BC_SHIFT                 = 0;
     static const uint64_t P2M_BC_MASK                  = 1;
-    static const uint8_t  P2M_TEST_SHIFT               = 5;
-    static const uint64_t P2M_TEST_MASK                = 1;
 
     static const uint8_t  CLEANUP_DEST_SHIFT           = 22;
@@ -220,4 +218,13 @@
     static const uint8_t  MULTI_ACK_UPDT_INDEX_SHIFT   = 3;
     static const uint64_t MULTI_ACK_UPDT_INDEX_MASK    = ((1ULL<<UPDT_INDEX_WIDTH)-1);
+
+    static const uint8_t  CC_TEST_DEST_SHIFT           = 22;
+    static const uint64_t CC_TEST_DEST_MASK            = ((1ULL<<GLOBALID_WIDTH)-1);
+    static const uint8_t  CC_TEST_SRCID_SHIFT          = 8;
+    static const uint64_t CC_TEST_SRCID_MASK           = ((1ULL<<SRCID_WIDTH)-1);
+    static const uint8_t  CC_TEST_TEST_SHIFT           = 5;
+    static const uint64_t CC_TEST_TEST_MASK            = 1;
+    static const uint8_t  CC_TEST_SIGNATURE_SHIFT      = 0;
+    static const uint64_t CC_TEST_SIGNATURE_MASK       = ((1ULL<<DATA_WIDTH)-1);
 
     static const uint8_t  M2P_TYPE_SHIFT               = 1;
@@ -325,4 +332,9 @@
       MULTI_ACK_UPDT_INDEX,
 
+      CC_TEST_DEST,
+      CC_TEST_SRCID,
+      CC_TEST_TEST,
+      CC_TEST_SIGNATURE,
+
       M2P_TYPE,
       M2P_EOP,
@@ -361,5 +373,4 @@
         GET_FIELD(flit,P2M_EOP);
         GET_FIELD(flit,P2M_BC);
-        GET_FIELD(flit,P2M_TEST);
         GET_FIELD(flit,CLEANUP_DEST);
         GET_FIELD(flit,CLEANUP_SRCID);
@@ -369,4 +380,8 @@
         GET_FIELD(flit,MULTI_ACK_DEST);
         GET_FIELD(flit,MULTI_ACK_UPDT_INDEX);
+        GET_FIELD(flit,CC_TEST_DEST);
+        GET_FIELD(flit,CC_TEST_SRCID);
+        GET_FIELD(flit,CC_TEST_TEST);
+        GET_FIELD(flit,CC_TEST_SIGNATURE);
         GET_FIELD(flit,M2P_TYPE);
         GET_FIELD(flit,M2P_EOP);
@@ -403,5 +418,4 @@
         SET_FIELD(flit,value,P2M_EOP);
         SET_FIELD(flit,value,P2M_BC);
-        SET_FIELD(flit,value,P2M_TEST);
         SET_FIELD(flit,value,CLEANUP_DEST);
         SET_FIELD(flit,value,CLEANUP_SRCID);
@@ -411,4 +425,8 @@
         SET_FIELD(flit,value,MULTI_ACK_DEST);
         SET_FIELD(flit,value,MULTI_ACK_UPDT_INDEX);
+        SET_FIELD(flit,value,CC_TEST_DEST);
+        SET_FIELD(flit,value,CC_TEST_SRCID);
+        SET_FIELD(flit,value,CC_TEST_TEST);
+        SET_FIELD(flit,value,CC_TEST_SIGNATURE);
         SET_FIELD(flit,value,M2P_TYPE);
         SET_FIELD(flit,value,M2P_EOP);