Index: firmware/App/Common.h
===================================================================
diff -u -rfc9a9244cf4288ff0623c3e02455ac565bf60cdd -r09e6320e3f3c3c973de0b66e5799d710db8cc427
--- firmware/App/Common.h	(.../Common.h)	(revision fc9a9244cf4288ff0623c3e02455ac565bf60cdd)
+++ firmware/App/Common.h	(.../Common.h)	(revision 09e6320e3f3c3c973de0b66e5799d710db8cc427)
@@ -15,6 +15,8 @@
 // ********** public definitions **********
 
 #define NUM_OF_FW_STACKS                      2                                                         ///< Number of firmware stacks (TD, DD).
+#define FW_STACKS_RCV_MAIL_BOX_INDEX          0                                                         ///< Firmware stacks table receive mail box index.
+#define FW_STACKS_RESP_MAIL_BOX_INDEX         1                                                         ///< Firmware stacks table response mail box index.
 #define CAN_MESSAGE_FRAME_SIZE                8                                                         ///< CAN message frame size in bytes.
 #define FIRMWARE_START_ADDRESS                0x00010000                                                ///< Firmware start address.
 #define FIRMWARE_CRC_TABLE_ADDRESS            0x10020                                                   ///< The starting address of CRC table for firmware image.
@@ -140,10 +142,10 @@
 } ACK_NACK_STATUS_T;
 
 /// Software update corresponding stack mailbox
-static const SW_UPDATE_CAN_MAIL_BOX_T RECEIVE_MSG_ID[ NUM_OF_FW_STACKS ] =
+static const SW_UPDATE_CAN_MAIL_BOX_T RECEIVE_MSG_ID[ NUM_OF_FW_STACKS ][ NUM_OF_FW_STACKS ] =
 {
-     SW_UPDATE_TD_UPDATE,                                                                               ///< Software update TD.
-     SW_UPDATE_DD_UPDATE,                                                                               ///< Software update DD.
+     { SW_UPDATE_TD_UPDATE, SW_UPDATE_TD_RESP },                                                        ///< Software update TD.
+     { SW_UPDATE_DD_UPDATE, SW_UPDATE_DD_RESP },                                                        ///< Software update DD.
 };
 
 /**@}*/