Index: /branches/v5/communication/dspin_dhccp_param/caba/source/include/dspin_dhccp_param.h
===================================================================
--- /branches/v5/communication/dspin_dhccp_param/caba/source/include/dspin_dhccp_param.h	(revision 311)
+++ /branches/v5/communication/dspin_dhccp_param/caba/source/include/dspin_dhccp_param.h	(revision 312)
@@ -14,5 +14,6 @@
  * flit 1
  * ----------------------------------------------------------------------------------------------
- * EOP:0 | DEST(10 bits) | SRCID(14 bits) | NLINE MSB(2 bits) | WAY_INDEX(4 bits)  |    TYPE:0b1X
+ * EOP:0 |    DEST    |   SRCID   | NLINE MSB(2 bits)| X | WAY_INDEX(2 bits) | TYPE:0b1X | BC:0
+ *       |  (10 bits) | (14 bits) |                  |   |                   |           |
  * ----------------------------------------------------------------------------------------------
  *                                                                                 | X: 0 DATA  |
@@ -27,5 +28,5 @@
  * flit 1
  * ----------------------------------------------------------------------------------------------
- * EOP:1 | DEST(10 bits) |                         X(16 bits) | UPDT_INDEX(4 bits) |    TYPE:0b00
+ * EOP:1 |     DEST(10 bits)     |       X(15 bits)       | UPDT_INDEX(4 bits) | TYPE:0b00 | BC:0
  * ----------------------------------------------------------------------------------------------
  */
@@ -38,5 +39,5 @@
  * flit 1
  * ----------------------------------------------------------------------------------------------
- * EOP:1 | DEST(14 bits) | X | SET_INDEX(16 bits) | WAY_INDEX(4 bits) | TYPE:0b100(3 bits) | BC:0
+ * EOP:1 | DEST(14 bits) | X(3 bits) | SET_INDEX(16 bits) | WAY_INDEX(2 bits) | TYPE:0b100 | BC:0
  * ----------------------------------------------------------------------------------------------
  *
@@ -87,5 +88,5 @@
  * flit 2
  * ----------------------------------------------------------------------------------------------
- * EOP:1 | X | UPDT_INDEX(4 bits) |                                              NLINE (34 bits)
+ * EOP:1 |        X(5 bits)       |                                              NLINE (34 bits)
  * ----------------------------------------------------------------------------------------------
  */
@@ -112,11 +113,11 @@
     static const uint8_t  SRCID_WIDTH                  = 14;
     static const uint8_t  GLOBALID_WIDTH               = 10;
-    static const uint8_t  MEMC_TYPE_WIDTH              = 3;
     static const uint8_t  WORD_INDEX_WIDTH             = 4;
     static const uint8_t  BE_WIDTH                     = 4;
     static const uint8_t  DATA_WIDTH                   = 32;
     static const uint8_t  SET_INDEX_WIDTH              = 16;
-    static const uint8_t  WAY_INDEX_WIDTH              = 4;
+    static const uint8_t  WAY_INDEX_WIDTH              = 2;
     static const uint8_t  BROADCAST_BOX_WIDTH          = 20;
+    static const uint8_t  MC_TYPE_WIDTH                = 3;
     static const uint8_t  L1_TYPE_WIDTH                = 2;
 
@@ -134,18 +135,16 @@
     static const uint8_t  CLEANUP_NLINE_MSB_SHIFT      = 6;
     static const uint64_t CLEANUP_NLINE_MSB_MASK       = ((1ULL<< 2)-1);
-    static const uint8_t  CLEANUP_WAY_INDEX_SHIFT      = 2;
+    static const uint8_t  CLEANUP_WAY_INDEX_SHIFT      = 3;
     static const uint64_t CLEANUP_WAY_INDEX_MASK       = ((1ULL<<WAY_INDEX_WIDTH)-1);
     static const uint8_t  CLEANUP_NLINE_LSB_SHIFT      = 0;
     static const uint64_t CLEANUP_NLINE_LSB_MASK       = ((1ULL<<32)-1);
 
-    static const uint8_t  MULTI_ACK_EOP_SHIFT          = FROM_L1_EOP_SHIFT;
-    static const uint64_t MULTI_ACK_EOP_MASK           = FROM_L1_EOP_MASK;
     static const uint8_t  MULTI_ACK_DEST_SHIFT         = CLEANUP_DEST_SHIFT;
     static const uint64_t MULTI_ACK_DEST_MASK          = CLEANUP_DEST_MASK;
-    static const uint8_t  MULTI_ACK_UPDT_INDEX_SHIFT   = 2;
+    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  FROM_MC_TYPE_SHIFT           = 1;
-    static const uint64_t FROM_MC_TYPE_MASK            = ((1ULL<<MEMC_TYPE_WIDTH)-1);
+    static const uint64_t FROM_MC_TYPE_MASK            = ((1ULL<<MC_TYPE_WIDTH)-1);
     static const uint8_t  FROM_MC_EOP_SHIFT            = 39;
     static const uint64_t FROM_MC_EOP_MASK             = 1;
@@ -153,5 +152,5 @@
     static const uint64_t FROM_MC_BC_MASK              = 1;
 
-    static const uint8_t  MULTI_INVAL_DEST_SHIFT       = 26;
+    static const uint8_t  MULTI_INVAL_DEST_SHIFT       = 25;
     static const uint64_t MULTI_INVAL_DEST_MASK        = ((1ULL<<SRCID_WIDTH)-1);
     static const uint8_t  MULTI_INVAL_SRCID_SHIFT      = 8;
@@ -179,15 +178,13 @@
     static const uint8_t  CLEANUP_ACK_DEST_SHIFT       = MULTI_INVAL_DEST_SHIFT;
     static const uint64_t CLEANUP_ACK_DEST_MASK        = MULTI_INVAL_DEST_MASK;
-    static const uint8_t  CLEANUP_ACK_SET_SHIFT        = 8;
+    static const uint8_t  CLEANUP_ACK_SET_SHIFT        = 6;
     static const uint64_t CLEANUP_ACK_SET_MASK         = ((1ULL<<SET_INDEX_WIDTH)-1);
     static const uint8_t  CLEANUP_ACK_WAY_SHIFT        = 4;
     static const uint64_t CLEANUP_ACK_WAY_MASK         = ((1ULL<<WAY_INDEX_WIDTH)-1);
 
-    static const uint8_t  BROADCAST_BOX_SHIFT          = 29;
+    static const uint8_t  BROADCAST_BOX_SHIFT          = 19;
     static const uint64_t BROADCAST_BOX_MASK           = ((1ULL<<BROADCAST_BOX_WIDTH)-1);
     static const uint8_t  BROADCAST_SRCID_SHIFT        = 5;
     static const uint64_t BROADCAST_SRCID_MASK         = MULTI_INVAL_SRCID_MASK;
-    static const uint8_t  BROADCAST_UPDT_INDEX_SHIFT   = 34;
-    static const uint64_t BROADCAST_UPDT_INDEX_MASK    = MULTI_INVAL_UPDT_INDEX_MASK;
     static const uint8_t  BROADCAST_NLINE_SHIFT        = 0;
     static const uint64_t BROADCAST_NLINE_MASK         = MULTI_INVAL_NLINE_MASK;
@@ -256,5 +253,4 @@
       BROADCAST_BOX,
       BROADCAST_SRCID,
-      BROADCAST_UPDT_INDEX,
       BROADCAST_NLINE
     };
@@ -293,5 +289,4 @@
         GET_FIELD(flit,BROADCAST_BOX);
         GET_FIELD(flit,BROADCAST_SRCID);
-        GET_FIELD(flit,BROADCAST_UPDT_INDEX);
         GET_FIELD(flit,BROADCAST_NLINE);
 
@@ -333,5 +328,4 @@
         SET_FIELD(flit,value,BROADCAST_BOX);
         SET_FIELD(flit,value,BROADCAST_SRCID);
-        SET_FIELD(flit,value,BROADCAST_UPDT_INDEX);
         SET_FIELD(flit,value,BROADCAST_NLINE);