[Feature][Modem]Update MTK MODEM V1.6 baseline version: MOLY.NR15.R3.MD700.IVT.MP1MR3.MP.V1.6

MTK modem version: MT2735_IVT_MOLY.NR15.R3.MD700.IVT.MP1MR3.MP.V1.6.tar.gz
RF  modem version: NA

Change-Id: I45a4c2752fa9d1a618beacd5d40737fb39ab64fb
diff --git a/mcu/interface/sap/svc/ccci_ipc_msgid.h b/mcu/interface/sap/svc/ccci_ipc_msgid.h
new file mode 100644
index 0000000..bb3e59b
--- /dev/null
+++ b/mcu/interface/sap/svc/ccci_ipc_msgid.h
@@ -0,0 +1,140 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2012
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   ccci_ipc_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   CCCI_IPC msgid define.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 11 29 2019 cheng-dao.lee
+ * [MOLY00447835] [Petrus] [MCIF] Feature check-in
+ * 	Data path patch back from 1001.DEV (SWRD)
+ *
+ * 11 04 2019 cheng-dao.lee
+ * [MOLY00447835] [Petrus] [MCIF] Feature check-in
+ * [MCIF] interface
+ *
+ * 07 18 2019 actory.ou
+ * [MOLY00422579] [MDDP] DPFM porting to VMOLY
+ * [VMOLY][OA] support MDDP & rename to DPFM
+ *
+ * 07 11 2017 chien-hui.lu
+ * [MOLY00263060] [CCCI_IPC] change CCCI IPC message ID file format
+ * [CCCI IPC] change message ID configuration format.
+ *
+ * 07 10 2017 chien-hui.lu
+ * [MOLY00263060] [CCCI_IPC] change CCCI IPC message ID file format
+ * [CCCI IPC] change message ID configuration format.
+ *
+ * 04 05 2017 chien-hui.lu
+ * [MOLY00239611] [CCCI_IPC][CCCI] add CCCI IPC and runtime feature
+ * [CCCI_IPC][CCCI] add CCCI IPC config for WIPC.
+ *
+ * 04 05 2017 chien-hui.lu
+ * [MOLY00239611] [CCCI_IPC][CCCI] add CCCI IPC and runtime feature
+ * [CCCI][CCCI_IPC] add runtime feature and IPC config for MDT.
+ *
+ * 06 08 2015 hsin-jun.tang
+ * [MOLY00117873] [CCCI IPC] L4 msg id reduction
+ * [CCCI IPC] L4 msg id reduction
+ *
+ * 11 25 2014 cs.huang
+ * [MOLY00084258] [MT6795][Modem][Feature]Please support Garbage filter from network
+ * [CCCI IPC] Add CCCI IPC msgid for garbage filter
+ *
+ * [MOLY00084258] [MT6795][Modem][Feature]Please support Garbage filter from network
+ * [CCCI IPC] Add CCCI IPC msgid for garbage filter
+ *
+ * 11 12 2014 cs.huang
+ * [MOLY00084091] [MT6795] [SYSTEM SERVICE] [CLIB] porting C time function to MD
+ * [CCCI IPC] Support Clibtime feature
+ *
+ * 11 01 2013 ap.wang
+ * [MOLY00044721] [CCCI_IPC] Modify msg_id for IDC integration
+ * 	ccci_ipc msg_id for IDC
+ ****************************************************************************/
+
+
+#ifndef __CCCI_IPC_MSGID_H__
+#define __CCCI_IPC_MSGID_H__
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN(MSG_ID_CCCI_MSG_CODE_BEGIN) 
+    MSG_ID_IPC_INVALID_TYPE = MSG_ID_CCCI_MSG_CODE_BEGIN,
+    MSG_ID_IPC_L4C_INVALID = MSG_ID_CCCI_MSG_CODE_BEGIN,
+    #include "l4_ipc_msgid_source.h"
+    MSG_ID_IPC_L4C_END,
+    MSG_ID_IPC_EL1_INVALID = MSG_ID_IPC_L4C_INVALID + 0x40,
+    #include "el1_ipc_msgid_source.h"
+    MSG_ID_IPC_EL1_END,
+    MSG_ID_IPC_CCCIIPC_INVALID = MSG_ID_IPC_EL1_INVALID + 0x20,
+    MSG_ID_CCCIIPC_CLIB_TIME_REQ, // for clib time msg id
+    MSG_ID_CCCIIPC_AP_MD_UT_MSG,
+    MSG_ID_IPC_CCCIIPC_END,
+    MSG_ID_IPC_IPCORE_INVALID = MSG_ID_IPC_CCCIIPC_INVALID + 0x10,
+    #include "pfm_msgid_source.h"
+    MSG_ID_IPC_IPCORE_END,
+    MSG_ID_IPC_DPFM_INVALID = MSG_ID_IPC_IPCORE_INVALID + 0x8,
+    #include "dpfm_msgid_source.h"
+    MSG_ID_IPC_DPFM_END,
+    MSG_ID_IPC_UFPM_INVALID = MSG_ID_IPC_DPFM_INVALID + 0x8,
+    #include "ufpm_msgid_source.h"
+    MSG_ID_IPC_UFPM_END,
+    MSG_ID_IPC_IWLAN_INVALID = MSG_ID_IPC_UFPM_INVALID + 0x18,
+    #include "iwlan_ipc_msgid_source.h"
+    MSG_ID_IPC_IWLAN_END,
+    MSG_ID_IPC_NEXT_NEW_USER_INVALID = MSG_ID_IPC_IWLAN_INVALID + 0x10,
+    MSG_ID_IPC_END,
+MODULE_MSG_END(MSG_ID_CCCI_MSG_CODE_TAIL)
+
+#endif  /* !__CCCI_IPC_MSGID_H__ */
diff --git a/mcu/interface/sap/svc/crypto_msgid.h b/mcu/interface/sap/svc/crypto_msgid.h
new file mode 100644
index 0000000..59f412a
--- /dev/null
+++ b/mcu/interface/sap/svc/crypto_msgid.h
@@ -0,0 +1,120 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2012
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   crypto_msgid.h
+ *
+ * Project:
+ * --------
+ *   UMOLYE
+ *
+ * Description:
+ * ------------
+ *   CRYPTO msgid define.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 08 08 2019 digvijay.arya
+ * [MOLY00401209] [VMOLY]Submarine Crypto module checkin
+ * 	
+ * 	Pachback post M2 changes to VMOLY
+ *
+ * 07 08 2019 digvijay.arya
+ * [MOLY00401209] [VMOLY]Submarine Crypto module checkin
+ * 	
+ * 	[M2] Crypto patchback to VMOLY
+ *
+ * 12 16 2018 inderpreet.singh
+ * [MOLY00370462] Gen97 Submarine Crypto module checkin
+ * 	
+ * 	Async interface.
+ *
+ *
+ ****************************************************************************/
+
+
+#ifndef __CRYPTO_MSGID_H__
+#define __CRYPTO_MSGID_H__
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN(MSG_ID_CRYPTO_CODE_BEGIN)
+
+/* FROM:  */
+    MSG_ID_CRPTBRG_RANGE_BEGIN = MSG_ID_CRYPTO_CODE_BEGIN,
+        MSG_ID_CRPTBRG_CIPHER_ENCRYPT_REQ,
+        MSG_ID_CRPTBRG_CIPHER_ENCRYPT_CNF,
+        MSG_ID_CRPTBRG_CIPHER_DECRYPT_REQ,
+        MSG_ID_CRPTBRG_CIPHER_DECRYPT_CNF,
+        MSG_ID_CRPTBRG_GENERATE_HMAC_REQ,
+        MSG_ID_CRPTBRG_GENERATE_HMAC_CNF,
+        MSG_ID_CRPTBRG_GENERATE_CMAC_REQ,
+        MSG_ID_CRPTBRG_GENERATE_CMAC_CNF,
+        MSG_ID_CRPTBRG_GENERATE_PRN_REQ,
+        MSG_ID_CRPTBRG_GENERATE_PRN_CNF,
+        MSG_ID_CRPTBRG_VERIFY_SIGNATURE_REQ,
+        MSG_ID_CRPTBRG_VERIFY_SIGNATURE_CNF,
+        MSG_ID_CRPTBRG_GENERATE_DH_KEY_REQ,
+        MSG_ID_CRPTBRG_GENERATE_DH_KEY_CNF,
+        MSG_ID_CRPTBRG_COMPUTE_DH_SECRET_REQ,
+        MSG_ID_CRPTBRG_COMPUTE_DH_SECRET_CNF,
+        MSG_ID_CRPTBRG_ABORT_DH_KEY_IND,
+
+/* TO:  */
+    MSG_ID_CRPTBRG_RANGE_END,
+	
+/* For additional internal crypto task for slow operations */
+/* FROM: */    
+    MSG_ID_CRYPTO_INTERNAL_RANGE_BEGIN = MSG_ID_CRPTBRG_RANGE_END,
+    MSG_ID_CRYPTO_INTERNAL_GENERATE_DH_KEY_REQ,
+    MSG_ID_CRYPTO_INTERNAL_COMPUTE_DH_SECRET_REQ,
+    MSG_ID_CRYPTO_INTERNAL_RANGE_END,
+
+/* FOR CAL TP */
+    MSG_ID_CALTP_TEST_RUN_REQ,
+    MSG_ID_CALTP_TEST_RUN_CNF,
+
+MODULE_MSG_END(MSG_ID_CRYPTO_CODE_TAIL)
+
+#endif  /* !__TCPIP_MSGID_H__ */
diff --git a/mcu/interface/sap/svc/custom_msgid.h b/mcu/interface/sap/svc/custom_msgid.h
new file mode 100644
index 0000000..9251c82
--- /dev/null
+++ b/mcu/interface/sap/svc/custom_msgid.h
@@ -0,0 +1,78 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2012
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   custom_msgid.h
+ *
+ * Project:
+ * --------
+ *   VMOLY
+ *
+ * Description:
+ * ------------
+ *   custom msgid define.
+ *
+ * Author:
+ * -------
+ *   
+ *
+ *
+ * ==========================================================================
+ *             HISTORY
+ * Below this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *------------------------------------------------------------------------------
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+
+
+#ifndef __CUSTOM_MSGID_H__
+#define __CUSTOM_MSGID_H__
+
+#ifdef __TC01__ 
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_CUSTOM_CODE_BEGIN )
+MSG_ID_CUSTOM1_CUSTOM2  =  MSG_ID_CUSTOM_CODE_BEGIN,
+MSG_ID_CUSTOM2_CUSTOM1,
+MODULE_MSG_END( MSG_ID_CUSTOM_CODE_TAIL )
+#endif
+
+#endif  /* !__CUSTOM_MSGID_H__ */
diff --git a/mcu/interface/sap/svc/dns_msgid.h b/mcu/interface/sap/svc/dns_msgid.h
new file mode 100644
index 0000000..531dbb2
--- /dev/null
+++ b/mcu/interface/sap/svc/dns_msgid.h
@@ -0,0 +1,82 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2012
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   dns_msgid.h
+ *
+ * Project:
+ * --------
+ *   UMOLYE
+ *
+ * Description:
+ * ------------
+ *   Modem DNS message ID definitions.
+ *
+ * Author:
+ * -------
+ *
+ *
+ * ==========================================================================
+ *
+ ****************************************************************************/
+
+
+#ifndef __DNS_MSGID_H__
+#define __DNS_MSGID_H__
+
+#include "module_msg_range.h"
+
+
+MODULE_MSG_BEGIN(MSG_ID_DNS_CODE_BEGIN)
+    MSG_ID_DNS_MSG_ID_BEGIN = MSG_ID_DNS_CODE_BEGIN,
+
+    /* user --> DNS */
+    MSG_ID_DNS_GET_HOST_BY_NAME_REQ,
+    MSG_ID_DNS_GET_HOST_BY_NAPTR_REQ,
+    MSG_ID_DNS_GET_HOST_BY_SRV_REQ,
+
+    /* DNS --> user */
+    MSG_ID_DNS_GET_HOST_BY_NAME_CNF,
+    MSG_ID_DNS_GET_HOST_BY_NAPTR_CNF,
+    MSG_ID_DNS_GET_HOST_BY_SRV_CNF,
+
+    MSG_ID_DNS_CODE_END,
+
+MODULE_MSG_END(MSG_ID_DNS_CODE_TAIL)
+
+#endif  /* __DNS_MSGID_H__ */
diff --git a/mcu/interface/sap/svc/ethsvc_msgid.h b/mcu/interface/sap/svc/ethsvc_msgid.h
new file mode 100644
index 0000000..e17bd70
--- /dev/null
+++ b/mcu/interface/sap/svc/ethsvc_msgid.h
@@ -0,0 +1,76 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2019
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   ethservice_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   Ethernet Service message ID definitions.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ *
+ ****************************************************************************/
+
+
+#ifndef __ETHSVC_MSGID_H__
+#define __ETHSVC_MSGID_H__
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN(MSG_ID_ETHSVC_CODE_BEGIN)
+
+    MSG_ID_MCIF_ETHSVC_TX_REQ,
+    MSG_ID_MCIF_ETHSVC_TX_READY_IND,
+
+    MSG_ID_MCIF_ETHSVC_WLAN_IDX_MAP_IND,
+
+    MSG_ID_STKBRG_ETHSVC_CONFIG_REQ,
+    MSG_ID_STKBRG_ETHSVC_CONFIG_CNF,
+
+MODULE_MSG_END(MSG_ID_ETHSVC_CODE_TAIL)
+
+#endif  /* __ETHSVC_MSGID_H__ */
diff --git a/mcu/interface/sap/svc/fs_msgid.h b/mcu/interface/sap/svc/fs_msgid.h
new file mode 100644
index 0000000..2bc3aba
--- /dev/null
+++ b/mcu/interface/sap/svc/fs_msgid.h
@@ -0,0 +1,125 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2005
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   fs_sap.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   File System Task related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *============================================================================
+ *             HISTORY
+ * Below this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *------------------------------------------------------------------------------
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef FS_MSGID_H
+#define FS_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_FS_CODE_BEGIN )
+    MSG_ID_FS_STARTUP_REQ = MSG_ID_FS_CODE_BEGIN,
+
+    //--- Service Request ---
+    MSG_ID_FS_SERVICE_REQ_BEGIN = MSG_ID_FS_STARTUP_REQ,
+
+    MSG_ID_FS_ABORT_REQ,
+    MSG_ID_FS_OPEN_REQ,
+    MSG_ID_FS_GET_FOLDER_SIZE_REQ,
+    MSG_ID_FS_WRITE_REQ,
+    MSG_ID_FS_DELETE_REQ,
+    MSG_ID_FS_READ_REQ,
+    MSG_ID_FS_SEEK_REQ,
+    MSG_ID_FS_FIND_FIRST_REQ,
+    MSG_ID_FS_FIND_FIRST_N_REQ,
+
+    MSG_ID_FS_SERVICE_REQ_END   = MSG_ID_FS_FIND_FIRST_N_REQ,
+
+    //--- Service Response ---
+    MSG_ID_FS_SERVICE_RSP_BEGIN = MSG_ID_FS_SERVICE_REQ_END + 1,
+
+    MSG_ID_FS_OPEN_RSP,
+    MSG_ID_FS_GET_FOLDER_SIZE_RSP,
+    MSG_ID_FS_WRITE_RSP,
+    MSG_ID_FS_DELETE_RSP,
+    MSG_ID_FS_READ_RSP,
+    MSG_ID_FS_SEEK_RSP,
+    MSG_ID_FS_FIND_FIRST_RSP,
+    MSG_ID_FS_FIND_FIRST_N_RSP,
+
+    MSG_ID_FS_SERVICE_RSP_END   = MSG_ID_FS_FIND_FIRST_N_RSP,
+
+    MSG_ID_FS_CODE_END,
+MODULE_MSG_END( MSG_ID_FS_CODE_TAIL )
+#endif  //FS_MSGID_H	
diff --git a/mcu/interface/sap/svc/hif_ipc_msgid.h b/mcu/interface/sap/svc/hif_ipc_msgid.h
new file mode 100644
index 0000000..8cd6e8c
--- /dev/null
+++ b/mcu/interface/sap/svc/hif_ipc_msgid.h
@@ -0,0 +1 @@
+MSG_ID_CCCI_AP_MD_CTIME_IND,
diff --git a/mcu/interface/sap/svc/hif_svc_msgid.h b/mcu/interface/sap/svc/hif_svc_msgid.h
new file mode 100644
index 0000000..3ceed13
--- /dev/null
+++ b/mcu/interface/sap/svc/hif_svc_msgid.h
@@ -0,0 +1,172 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2005
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE. 
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*******************************************************************************
+ * Filename:
+ * ---------
+ *   hif_svc_msgid.h
+ *
+ * Project:
+ * --------
+ *   TATAKA
+ *
+ * Description:
+ * ------------
+ *   HIF service related message identity definition
+ *
+ * Author:
+ * -------
+ *
+ *==============================================================================
+ *                 HISTORY
+ * Below this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *------------------------------------------------------------------------------
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ *
+ * removed!
+ * removed!
+ * removed!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+
+#ifndef __INC_HIF_SVC_MSGID_H
+#define __INC_HIF_SVC_MSGID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_HIF_SVC_CODE_BEGIN )
+
+    MSG_ID_HMU_CODE_BEGIN,
+    MSG_ID_HMU_CODE_TAIL = MSG_ID_HMU_CODE_BEGIN + 20,
+	
+    MSG_ID_CCCISRV_CODE_BEGIN,
+	/* L1Core -> Pcore -> AP */
+	MSG_ID_CCCI_SYSMSG_IND,
+    MSG_ID_CCCI_IPC_IND,
+    MSG_ID_CCCI_IPC_RSP,
+	MSG_ID_CCCI_RPC_IND,
+    MSG_ID_CCCI_RPC_RSP,
+    MSG_ID_CCCI_CTRL_READY_TO_READ_IND,
+    MSG_ID_CCCI_CTRL_READY_TO_WRITE_IND,
+
+	/* AP -> PCore -> L1Core */
+	//MSG_ID_AP_L1C_CCCIIPC_REQ, // AP to MD ipc is send by CCILM
+    
+	/* Reserved for L1Core CCCI Service IT */
+    MSG_ID_CCCI_IT_RPC_REQ,
+    MSG_ID_CCCI_IT_RPC_CNF,
+	MSG_ID_CCCI_IT_IPC_REQ,
+    MSG_ID_CCCI_IT_IPC_CNF,
+    MSG_ID_CCCI_IT_SYSMSG_REQ,
+    MSG_ID_CCCI_IT_SYSMSG_CNF,
+    MSG_ID_CCCI_IT_CCCIFS_IT_IND,
+    MSG_ID_CCCISRV_CODE_TAIL = MSG_ID_CCCISRV_CODE_BEGIN + 20,
+
+    MSG_ID_CCCI_CODE_BEGIN,
+    MSG_ID_CCCI_DEBUG_QUERY_MD_STATUS,
+    MSG_ID_CCCI_SHM_BM_POLLING_NOTIFY,
+    MSG_ID_CCCI_SHM_BM_RECEIVE_NOTIFY,
+    MSG_ID_CCCI_SHM_BM_HMU_WRITE_NOTIFY, //for IT
+    MSG_ID_CCCI_SHM_BM_HMU_CB_NOTIFY,    //for IT
+    MSG_ID_CCCI_UT_WAKE_CH_NOTIFY,       //for NCCCI UT
+    MSG_ID_CCCI_UT_START_MULTI_TEST_CASE,//for NCCCI UT
+    MSG_ID_CCCI_UT_START_MULTI_TEST_CASE_FINISH,//for NCCCI UT
+    
+    MSG_ID_CCCI_USR_ULCB_IND,            //notify CCCI_USR to do UL callback
+    MSG_ID_CCCI_USR_DLCB_IND,            //notify CCCI_USR to do DL callback
+    MSG_ID_CCCI_CODE_TAIL = MSG_ID_CCCI_CODE_BEGIN + 40,
+
+MODULE_MSG_END( MSG_ID_HIF_SVC_CODE_TAIL )
+
+#endif /* __INC_HIF_SVC_MSGID_H */
diff --git a/mcu/interface/sap/svc/intctrl_msgid.h b/mcu/interface/sap/svc/intctrl_msgid.h
new file mode 100644
index 0000000..b693506
--- /dev/null
+++ b/mcu/interface/sap/svc/intctrl_msgid.h
@@ -0,0 +1,88 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2013
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   intctrl_msgid.h
+ *
+ * Project:
+ * --------
+ *	 UMOLYE 
+ *
+ * Description:
+ * ------------
+ * This module defines the messgae IDs for INTCTRL.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ ****************************************************************************/
+#ifndef _INTCTRL_MSG_ID_H
+#define _INTCTRL_MSG_ID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_INTCTRL_CODE_BEGIN )
+
+/****************************************************************************
+*                 <1> Desitnation: INTCTRL
+****************************************************************************/
+
+    MSG_ID_INTCTRL_INTERNET_INFO_REGISTER_REQ = MSG_ID_INTCTRL_CODE_BEGIN,
+    MSG_ID_INTCTRL_INTERNET_LOCK_ACQUIRE_REQ,
+    MSG_ID_INTCTRL_INTERNET_LOCK_RELEASE_REQ,
+    MSG_ID_INTCTRL_INTERNET_INFO_QUERY_REQ,
+    MSG_ID_DDM_INTCTRL_INTERNET_INFO_IND,
+
+
+    /****************************************************************************
+    *                 <2> Desitnation: INTCTRL's USER
+    ****************************************************************************/
+    MSG_ID_INTCTRL_INTERNET_INFO_REGISTER_CNF,
+    MSG_ID_INTCTRL_INTERNET_LOCK_ACQUIRE_CNF,
+    MSG_ID_INTCTRL_INTERNET_LOCK_RELEASE_CNF,
+    MSG_ID_INTCTRL_INTERNET_INFO_QUERY_CNF,
+    MSG_ID_INTCTRL_INTERNET_INFO_UPDATE_IND,
+    MSG_ID_DDM_INTCTRL_INTERNET_LOCK_NOTIFY,
+    MSG_ID_DDM_INTCTRL_INTERNET_UNLOCK_NOTIFY,
+    /******************************************************************************
+     *                                MSG END                                     *
+      ******************************************************************************/
+    MODULE_MSG_END( MSG_ID_INTCTRL_CODE_TAIL )
+
+#endif  //_INTCTRL_MSG_ID_H
diff --git a/mcu/interface/sap/svc/ipsec_msgid.h b/mcu/interface/sap/svc/ipsec_msgid.h
new file mode 100644
index 0000000..1231641
--- /dev/null
+++ b/mcu/interface/sap/svc/ipsec_msgid.h
@@ -0,0 +1,75 @@
+#include "module_msg_range.h"
+
+#ifndef _IPSEC_MSGID_H
+#define _IPSEC_MSGID_H
+
+
+MODULE_MSG_BEGIN( MSG_ID_IPSEC_CODE_BEGIN )
+    MSG_ID_IPSEC_MSG_ID_BEGIN = MSG_ID_IPSEC_CODE_BEGIN,
+
+    /******************************Data Plane User*******************************/
+    /* TCPIP --> IPSEC */
+    MSG_ID_TCPIP_IPSEC_ENCAP_REQ,
+    MSG_ID_TCPIP_IPSEC_DECAP_REQ,
+
+    /* IPSEC --> TCPIP */
+    MSG_ID_TCPIP_IPSEC_ENCAP_RSP,
+    MSG_ID_TCPIP_IPSEC_DECAP_RSP,
+    MSG_ID_TCPIP_IPSEC_SA_CREATION_IND,
+    MSG_ID_TCPIP_IPSEC_SA_DELETION_IND,
+    MSG_ID_TCPIP_IPSEC_MULTI_SA_DELETION_IND,
+
+    /* WTUNNEL --> IPSEC */
+    MSG_ID_WTUNNEL_IPSEC_ENCAP_REQ,
+    MSG_ID_WTUNNEL_IPSEC_DECAP_REQ,
+    MSG_ID_IPSEC_WTUNNEL_PMTU_UPDATE_IND,
+
+    /* IPSEC --> WTUNNEL */
+    MSG_ID_WTUNNEL_IPSEC_ENCAP_RSP,
+    MSG_ID_WTUNNEL_IPSEC_DECAP_RSP,
+    MSG_ID_IPSEC_WTUNNEL_PMTU_REGISTER_REQ,
+
+    /*******************************Control Plane User****************************/
+    /* user --> IPSEC */
+    MSG_ID_IPSEC_SA_ADD_REQ,
+    MSG_ID_IPSEC_SP_ADD_REQ,
+    MSG_ID_IPSEC_SA_DELETE_REQ,
+    MSG_ID_IPSEC_SP_DELETE_REQ,
+    MSG_ID_IPSEC_MULTI_SA_SP_DELETE_REQ,
+    MSG_ID_IPSEC_SP_SAID_UPDATE_REQ,
+    MSG_ID_IPSEC_SA_TUNNEL_UPDATE_REQ,
+    MSG_ID_IPSEC_SPI_ALLOC_REQ,
+    MSG_ID_IPSEC_SPI_FREE_REQ,
+    MSG_ID_IPSEC_MULTI_SPI_FREE_REQ,
+
+    /* IPSEC --> user */
+    MSG_ID_IPSEC_SA_ADD_CNF,
+    MSG_ID_IPSEC_SP_ADD_CNF,
+    MSG_ID_IPSEC_SA_DELETE_CNF,
+    MSG_ID_IPSEC_SP_DELETE_CNF,
+    MSG_ID_IPSEC_MULTI_SA_SP_DELETE_CNF,
+    MSG_ID_IPSEC_SP_SAID_UPDATE_CNF,
+    MSG_ID_IPSEC_SA_TUNNEL_UPDATE_CNF,
+    MSG_ID_IPSEC_REKEY_IND,
+    MSG_ID_IPSEC_SA_DEL_IND,
+    MSG_ID_IPSEC_SPI_ALLOC_CNF,
+    MSG_ID_IPSEC_SPI_FREE_CNF,
+    MSG_ID_IPSEC_MULTI_SPI_FREE_CNF,
+MSG_ID_IPSEC_SPI_ALLOC_START_IND,
+
+    /*********************************AP***************************************/
+    /* IPSEC <-- ATP */
+    MSG_ID_IPSEC_ATP_SPI_ALLOC_CNF,
+    MSG_ID_IPSEC_ATP_SPI_FREE_CNF,
+    MSG_ID_ATP_IPSEC_SPI_QUERY_REQ,
+    MSG_ID_IPSEC_ATP_MULTI_SPI_FREE_CNF,
+    
+
+    //MSG_ID_TIMER_EXPIRY,
+    
+    MSG_ID_IPSEC_CODE_END,
+    
+MODULE_MSG_END( MSG_ID_IPSEC_CODE_TAIL )
+
+
+#endif
diff --git a/mcu/interface/sap/svc/maif_msgid.h b/mcu/interface/sap/svc/maif_msgid.h
new file mode 100644
index 0000000..3b03140
--- /dev/null
+++ b/mcu/interface/sap/svc/maif_msgid.h
@@ -0,0 +1,47 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2005
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE. 
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _MAIF_MSG_H
+#define _MAIF_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_MAIF_CODE_BEGIN )
+
+MSG_ID_MAIF_MODEL_TEST_REQ = MSG_ID_MAIF_CODE_BEGIN,
+MSG_ID_MAIF_MODEL_TEST_CNF,
+
+MODULE_MSG_END( MSG_ID_MAIF_CODE_TAIL )
+
+#endif  //_MAIF_MSG_H
\ No newline at end of file
diff --git a/mcu/interface/sap/svc/mcf_msgid.h b/mcu/interface/sap/svc/mcf_msgid.h
new file mode 100644
index 0000000..a18514f
--- /dev/null
+++ b/mcu/interface/sap/svc/mcf_msgid.h
@@ -0,0 +1,105 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2018
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   mcf_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLYA
+ *
+ * Description:
+ * ------------
+ *   MCF msgid definition.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 06 26 2019 peiyi.liu
+ * [MOLY00416383] [MCF] MCF UT Framework and Fix UTMD trace API setting error
+ * [MCF] porting MCF UT FWK
+ *
+ * 05 09 2019 peiyi.liu
+ * [MOLY00404134] [MCF] MCF UT Framework
+ * [MCF] MCF UT Framework
+ *
+ * 05 09 2019 peiyi.liu
+ * [MOLY00404134] [MCF] MCF UT Framework
+ * 	
+ * 	[MCF] MCF UT Framework
+ *
+ * 08 10 2018 jun-quan.chen
+ * [MOLY00344880] [MCF] Set MCF OP-OTA file and apply it at runtime
+ * MCF trigger DSBP while receive AT+EMCFC=3
+ *
+ ****************************************************************************/
+
+
+#ifndef __MCF_MSGID_H
+#define __MCF_MSGID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN(MSG_ID_MCF_CODE_BEGIN)
+    MSG_ID_MCF_L4BSBP_BEGIN = MSG_ID_MCF_CODE_BEGIN,
+    MSG_ID_MCF_L4BSBP_TRIGGER_DSBP_IND,
+    MSG_ID_MCF_L4BSBP_TRIGGER_DSBP_CNF,
+    MSG_ID_MCF_L4BSBP_TRIGGER_DSBP_RESULT_IND,
+    MSG_ID_MCF_L4BSBP_END,
+    MSG_ID_MCF_L4C_BEGIN = MSG_ID_MCF_L4BSBP_BEGIN + 0x10,
+    MSG_ID_MCF_L4C_REPORT_STATE_IND,
+    MSG_ID_MCF_L4C_END,
+    MSG_ID_MCF_UTFWK_BEGIN = MSG_ID_MCF_L4C_BEGIN + 0x10,
+    MSG_ID_MCF_UTFWK_INITIAL_ENV_REQ,
+    MSG_ID_MCF_UTFWK_INITIAL_ENV_RESP,
+    MSG_ID_MCF_UTFWK_INITIAL_DSBP_CALLBACK_REQ,
+    MSG_ID_MCF_UTFWK_INITIAL_DSBP_CALLBACK_RESP,
+    MSG_ID_MCF_UTFWK_EXECUTE_REQ,
+    MSG_ID_MCF_UTFWK_EXECUTE_RESP,
+    MSG_ID_MCF_UTFWK_DUMP_RESULT_REQ,
+    MSG_ID_MCF_UTFWK_DUMP_RESULT_RESP,
+    MSG_ID_MCF_UTFWK_RESET_REQ,
+    MSG_ID_MCF_UTFWK_RESET_RESP,
+    MSG_ID_MCF_UTFWK_END,
+MODULE_MSG_END(MSG_ID_MCF_CODE_TAIL)
+
+#endif  /* !__MCF_MSGID_H */
diff --git a/mcu/interface/sap/svc/mcif_msgid.h b/mcu/interface/sap/svc/mcif_msgid.h
new file mode 100644
index 0000000..3b42ceb
--- /dev/null
+++ b/mcu/interface/sap/svc/mcif_msgid.h
@@ -0,0 +1,101 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2012
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*******************************************************************************
+ * Filename:
+ * ---------
+ *   mcif_sap.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   define mcif messages
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 07 18 2019 i-chih.lu
+ * [MOLY00422942] [MCIF] Patch back - Interface
+ * mcif interface patch back.
+ *
+ * 10 19 2018 cheng-dao.lee
+ * [MOLY00359819] [MCIF] TX interrupt enhancement for MD/Consys Power ON/OFF
+ * patch back
+ *
+ * 07 17 2018 cheng-dao.lee
+ * [MOLY00310254] [6295] IDC feature development
+ * MCIF part
+ *
+ * 07 17 2018 cheng-dao.lee
+ * [MOLY00310254] [6295] IDC feature development (MCIF part)
+ *
+ * 07 12 2018 cheng-dao.lee
+ * [MOLY00310254] [6295] IDC feature development 
+ * [MCIF] patch back
+ *
+ * 07 03 2018 kevin.tseng
+ * [MCIF] MxSIM UT
+ * 	- LR13.R0.MP_CL5906485.idc.xL1SIM.regression
+ *
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef MCIF_MSGID_H
+#define MCIF_MSGID_H
+
+MODULE_MSG_BEGIN(MSG_ID_MCIF_BEGIN)
+
+    MSG_ID_MCIF_STATE_CHANGE_EVENT,
+    MSG_ID_MCIF_RX_REQ,
+    MSG_ID_MCIF_RX_EVENT,
+    MSG_ID_MCIF_TX_REQ,
+    MSG_ID_MCIF_RESET_REQ,
+
+    /* For UT/IT */
+    MSG_ID_MCIF_IT_CTRL,
+    MSG_ID_MCIF_UT_RUN_REQ,
+    MSG_ID_MCIF_UT_RUN_CNF,
+
+MODULE_MSG_END(MSG_ID_MCIF_TAIL)
+
+#endif  //	_CCISMCORE_MSGID_H_ 
diff --git a/mcu/interface/sap/svc/mdfpm_msgid.h b/mcu/interface/sap/svc/mdfpm_msgid.h
new file mode 100644
index 0000000..d512732
--- /dev/null
+++ b/mcu/interface/sap/svc/mdfpm_msgid.h
@@ -0,0 +1,91 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2012
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _MDFPM_MSGID_H
+#define _MDFPM_MSGID_H
+
+MODULE_MSG_BEGIN(MSG_ID_MDFPM_CODE_BEGIN)
+    MSG_ID_MDFPM_PROCESS_TX_QUEUE_REQ,
+
+    MSG_ID_MDFPM_USER_MSG_BEGIN,
+
+    MSG_ID_DPFM_DATA_USAGE_CMD,
+    MSG_ID_DPFM_SET_CT_TIMEOUT_VALUE_REQ,
+    MSG_ID_DPFM_SET_CT_TIMEOUT_VALUE_RSP,
+    MSG_ID_DPFM_CT_TIMEOUT_IND,
+
+    MSG_ID_WFPM_ENABLE_FAST_PATH_REQ,
+    MSG_ID_WFPM_ENABLE_FAST_PATH_RSP,
+    MSG_ID_WFPM_DISABLE_FAST_PATH_REQ,
+    MSG_ID_WFPM_DISABLE_FAST_PATH_RSP,
+    MSG_ID_WFPM_DEACTIVATE_FAST_PATH_REQ,
+    MSG_ID_WFPM_DEACTIVATE_FAST_PATH_RSP,
+    MSG_ID_WFPM_DEACTIVATE_FAST_PATH_IND,
+    MSG_ID_WFPM_ACTIVATE_FAST_PATH_REQ,
+    MSG_ID_WFPM_ACTIVATE_FAST_PATH_RSP,
+    MSG_ID_WFPM_SEND_TXD_NOTIFY,
+    MSG_ID_WFPM_DRV_NOTIFY,
+    MSG_ID_WFPM_MD_NOTIFY,
+    MSG_ID_WFPM_RESET_IND,
+
+    MSG_ID_UFPM_NOTIFY_MD_BUS_EVENT_REQ,
+    MSG_ID_UFPM_NOTIFY_MD_BUS_EVENT_RSP,
+    MSG_ID_UFPM_SEND_MD_USB_EP0_REQ,
+    MSG_ID_UFPM_SEND_MD_USB_EP0_RSP,
+    MSG_ID_UFPM_SEND_MD_USB_EP0_IND,
+    MSG_ID_UFPM_SEND_AP_USB_EP0_IND,
+    MSG_ID_UFPM_ENABLE_MD_FAST_PATH_REQ,
+    MSG_ID_UFPM_ENABLE_MD_FAST_PATH_RSP,
+    MSG_ID_UFPM_DISABLE_MD_FAST_PATH_REQ,
+    MSG_ID_UFPM_DISABLE_MD_FAST_PATH_RSP,
+    MSG_ID_UFPM_DEACTIVATE_MD_FAST_PATH_REQ,
+    MSG_ID_UFPM_DEACTIVATE_MD_FAST_PATH_RSP,
+    MSG_ID_UFPM_DEACTIVATE_MD_FAST_PATH_IND,
+    MSG_ID_UFPM_ACTIVATE_MD_FAST_PATH_REQ,
+    MSG_ID_UFPM_ACTIVATE_MD_FAST_PATH_RSP,
+
+    MSG_ID_MDFPM_EM_TEST_REQ,
+    MSG_ID_MDFPM_SUSPEND_TAG_IND,
+    MSG_ID_MDFPM_SUSPEND_TAG_ACK,
+    MSG_ID_MDFPM_RESUME_TAG_IND,
+    MSG_ID_MDFPM_RESUME_TAG_ACK,
+    
+    MSG_ID_WFPM_SEND_SMEM_LAYOUT_NOTIFY,
+
+MODULE_MSG_END(MSG_ID_MDFPM_CODE_TAIL)
+
+#endif  /* _MDFPM_MSGID_H */
diff --git a/mcu/interface/sap/svc/nal_msgid.h b/mcu/interface/sap/svc/nal_msgid.h
new file mode 100644
index 0000000..ba788e8
--- /dev/null
+++ b/mcu/interface/sap/svc/nal_msgid.h
@@ -0,0 +1,70 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2012
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   nal_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   NAL message ID definitions.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ *
+ ****************************************************************************/
+
+
+#ifndef __NAL_MSGID_H__
+#define __NAL_MSGID_H__
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN(MSG_ID_NAL_CODE_BEGIN)
+
+    MSG_ID_NAL_SOCKET_EVENT_IND,
+
+MODULE_MSG_END(MSG_ID_NAL_CODE_TAIL)
+
+#endif  /* __NAL_MSGID_H__ */
diff --git a/mcu/interface/sap/svc/nvram_msgid.h b/mcu/interface/sap/svc/nvram_msgid.h
new file mode 100644
index 0000000..aa6712e
--- /dev/null
+++ b/mcu/interface/sap/svc/nvram_msgid.h
@@ -0,0 +1,635 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2005
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE. 
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+ /*******************************************************************************
+ *  Copyright Statement:
+ *  --------------------
+ *  This software is protected by Copyright and the information contained
+ *  herein is confidential. The software may not be copied and the information
+ *  contained herein may not be used or disclosed except with the written
+ *  permission of MediaTek Inc. (C) 2001
+ *
+ *******************************************************************************/
+
+ /*******************************************************************************
+ * Filename:
+ * ---------
+ *   nvram.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   NVRAM related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *==============================================================================
+ *             HISTORY
+ * Below this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *------------------------------------------------------------------------------
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _NVRAM_MSG_H
+#define _NVRAM_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_NVRAM_CODE_BEGIN )
+#ifdef __BUILD_DOM__
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  This message is used to get NVRAM state so that L4C could go on the protocol
+ *  startup procedure.
+ * </pre>
+ * Note
+ *   L4C -> NVRAM
+ * See Also
+ *   Local Parameter: nvram_startup_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_STARTUP_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  If initialization failed, NVRAM will response NVRAM_STARTUP_CNF primitive
+ *  along with an error number described the reason. Otherwise, NVRAM keeps silent.
+ * </pre>
+ * Note
+ *   NVRAM -> L4C
+ * See Also
+ *   Local Parameter: nvram_startup_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_STARTUP_CNF
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  NVRAM_RESET_REQ should be sent to NVRAM task to reset data items, i.e., logical data items,
+ *  could be a single data item or a certain category of data item.
+ * </pre>
+ * Note
+ *   APP -> NVRAM
+ * See Also
+ *   Local Parameter: nvram_reset_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_RESET_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  NVRAM_RESET_CNF returns the result of NVRAM_RESET_REQ. The return status is encoded in errno.
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_reset_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_RESET_CNF
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Reads a data item given by its logical data item ID. For linear fixed EF, a valid
+ *  record index must be provided.
+ *  PS. The index of first record is 1
+ * </pre>
+ * Note
+ *   APP -> NVRAM
+ * See Also
+ *   Local Parameter: nvram_read_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_READ_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Returns actual content of the specified data item. Result of the corresponding
+ *  read primitive is also returned in errno.
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_read_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_READ_CNF
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Writes a transparent EF given by its logical data item ID. For linear fixed EF,
+ *  a valid record index must be provided.
+ *  1.  For linear fixed EF, the index of first record is 1.
+ *  2.  NVRAM Layer frees the buffer immediately after written.
+ * </pre>
+ * Note
+ *   APP -> NVRAM
+ * See Also
+ *   Local Parameter: nvram_write_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_WRITE_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Returns the result of the corresponding write primitive. Return status is encoded in errno.
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_write_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_WRITE_CNF
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ * </pre>
+ * Note
+ *   APP -> NVRAM
+ * See Also
+ *   Local Parameter: nvram_write_imei_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_WRITE_IMEI_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_write_imei_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_WRITE_IMEI_CNF
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ * </pre>
+ * Note
+ *   APP -> NVRAM
+ * See Also
+ *   Local Parameter: nvram_read_sm_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_READ_SM_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_read_sm_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_READ_SM_CNF
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ * </pre>
+ * Note
+ *   APP -> NVRAM
+ * See Also
+ *   Local Parameter: nvram_write_sm_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_WRITE_SM_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_write_sm_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_WRITE_SM_CNF
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Turn on or turn off the NVRAM software lock.
+ * </pre>
+ * Note
+ *   APP -> NVRAM
+ * See Also
+ *   Local Parameter: nvram_set_lock_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_SET_LOCK_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Returns the result of the corresponding SET LOCK primitive. Return status is encoded
+ *  in following ENUM
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_set_lock_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_SET_LOCK_CNF
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  1. Create a backup image of nvram into backup partition
+ *  2. Clear the data in backup partition
+ * </pre>
+ * Note
+ *   App -> NVRAM
+ * See Also
+ *   Local Parameter: nvram_create_image_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_CREATE_IMAGE_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Returns the result of the corresponding CREATE IMAGE primitive.
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_create_image_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_CREATE_IMAGE_CNF
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Recover the data in backup partition back to NVRAM
+ * </pre>
+ * Note
+ *   App -> NVRAM
+ * See Also
+ *   Local Parameter: nvram_recover_image_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_RECOVER_IMAGE_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Returns the result of the corresponding RECOVER IMAGE primitive.
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_recover_image_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_RECOVER_IMAGE_CNF
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Verify the data in backup partition to check the data integrity.
+ *  There are three steps.
+ *  1. Check the status of image (close or broken)
+ *  2. Check the checksum of image.
+ *  3. Compare the value with NVRAM's
+ *  NVRAM also provides a fast mode to execute the step 1 only.
+ * </pre>
+ * Note
+ *   App -> NVRAM
+ * See Also
+ *   Local Parameter: nvram_verify_image_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_VERIFY_IMAGE_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Returns the result of the corresponding VERIFY IMAGE primitive.
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_verify_image_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_VERIFY_IMAGE_CNF
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Suspend the NVRAM task, you can assign the time in structure
+ *  ex:
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_suspend_req_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_SUSPEND_REQ
+
+/**************************************************************************************
+ * Description
+ * <pre>
+ *  Returns the result of the suspend request.
+ * </pre>
+ * Note
+ *   NVRAM -> App
+ * See Also
+ *   Local Parameter: nvram_suspend_cnf_struct
+ **************************************************************************************/
+#define MSG_ID_NVRAM_SUSPEND_CNF
+
+/**************************************************************************************
+* Description
+* <pre>
+*  Backup FAT data items to SDS
+* </pre>
+* Note
+*   App -> NVRAM
+* See Also
+*   Local Parameter: nvram_sds_req_struct
+**************************************************************************************/
+#define MSG_ID_NVRAM_SDS_REQ
+
+
+/**************************************************************************************
+* Description
+* <pre>
+*  Returns the result of the backup to SDS request.
+* </pre>
+* Note
+*   NVRAM -> App
+* See Also
+*   Local Parameter: nvram_sds_cnf_struct
+**************************************************************************************/
+#define MSG_ID_NVRAM_SDS_CNF
+
+/**************************************************************************************
+* Description
+* <pre>
+*  Backup FAT data items to SDS
+* </pre>
+* Note
+*   App -> NVRAM
+* See Also
+*   Local Parameter: nvram_bin_region_req_struct
+**************************************************************************************/
+#define MSG_ID_NVRAM_BIN_REGION_REQ
+
+/**************************************************************************************
+* Description
+* <pre>
+*  Returns the result of the backup to AP BIN region request.
+* </pre>
+* Note
+*   NVRAM -> App
+* See Also
+*   Local Parameter: nvram_bin_region_cnf_struct
+**************************************************************************************/
+#define MSG_ID_NVRAM_BIN_REGION_CNF
+
+/**************************************************************************************
+* Description
+* <pre>
+*  Dummy message just for wakeup nvram task if nvram task is waiting for extq msg
+* </pre>
+* Note
+*   App -> NVRAM
+* See Also
+*   Local Parameter: nvram_callback_req_struct
+**************************************************************************************/
+#define MSG_ID_NVRAM_CALLBACK_REQ
+
+/**************************************************************************************
+* Description
+* <pre>
+*  Register the NVRAM monitor function of a LID for C2K
+* </pre>
+* Note
+*   App -> NVRAM
+* See Also
+*   Local Parameter: nvram_read_req_struct
+**************************************************************************************/
+#define MSG_ID_NVRAM_REG_NOTIFY_REQ
+
+/**************************************************************************************
+* Description
+* <pre>
+*  Deregister the NVRAM monitor function of a LID for C2K
+* </pre>
+* Note
+*   App -> NVRAM
+* See Also
+*   Local Parameter: nvram_read_req_struct
+**************************************************************************************/
+#define MSG_ID_NVRAM_DEREG_NOTIFY_REQ
+
+#else
+
+    MSG_ID_NVRAM_STARTUP_REQ = MSG_ID_NVRAM_CODE_BEGIN,
+    MSG_ID_NVRAM_STARTUP_CNF,
+    MSG_ID_NVRAM_RESET_REQ,
+    MSG_ID_NVRAM_RESET_CNF,
+    MSG_ID_NVRAM_READ_REQ,
+    MSG_ID_NVRAM_READ_CNF,
+    MSG_ID_NVRAM_WRITE_REQ,
+    MSG_ID_NVRAM_WRITE_CNF,
+    MSG_ID_NVRAM_WRITE_IMEI_REQ,
+    MSG_ID_NVRAM_WRITE_IMEI_CNF,
+    MSG_ID_NVRAM_READ_SM_REQ,
+    MSG_ID_NVRAM_READ_SM_CNF,
+    MSG_ID_NVRAM_WRITE_SM_REQ,
+    MSG_ID_NVRAM_WRITE_SM_CNF,
+    MSG_ID_NVRAM_SET_LOCK_REQ,
+    MSG_ID_NVRAM_SET_LOCK_CNF,
+    MSG_ID_NVRAM_CREATE_IMAGE_REQ,
+    MSG_ID_NVRAM_CREATE_IMAGE_CNF,
+    MSG_ID_NVRAM_RECOVER_IMAGE_REQ,
+    MSG_ID_NVRAM_RECOVER_IMAGE_CNF,
+    MSG_ID_NVRAM_VERIFY_IMAGE_REQ,
+    MSG_ID_NVRAM_VERIFY_IMAGE_CNF,
+    MSG_ID_NVRAM_SUSPEND_REQ,
+    MSG_ID_NVRAM_SUSPEND_CNF,
+    MSG_ID_NVRAM_SDS_REQ,
+    MSG_ID_NVRAM_SDS_CNF,
+    MSG_ID_NVRAM_BIN_REGION_REQ,
+    MSG_ID_NVRAM_BIN_REGION_CNF,
+    MSG_ID_NVRAM_CALLBACK_REQ,
+    MSG_ID_NVRAM_REG_NOTIFY_REQ,
+    MSG_ID_NVRAM_DEREG_NOTIFY_REQ,
+    MSG_ID_NVRAM_READ_DEFAULT_REQ,
+    MSG_ID_NVRAM_READ_DEFAULT_CNF,
+    MSG_ID_NVRAM_RESERVED_4,
+    MSG_ID_NVRAM_RESERVED_5,
+    MSG_ID_NVRAM_RESERVED_6,
+    MSG_ID_NVRAM_MAX,
+    MSG_ID_NVRAM_CODE_END = MSG_ID_NVRAM_MAX,
+
+#endif
+MODULE_MSG_END( MSG_ID_NVRAM_CODE_TAIL )
+
+#if defined (__NVRAM_UT_TEST__)
+
+MODULE_MSG_BEGIN( MSG_ID_NVRAM_TEST_CODE_BEGIN )
+#ifdef __BUILD_DOM__
+/**************************************************************************************
+ This is used to ELT send test case and start flag to Ttask1
+ **************************************************************************************/
+#define MSG_ID_NVRAM_TEST_REQ
+
+/**************************************************************************************
+ This is used to Ttask1 send SMP stress test1 to Ttask2~Ttask4
+ **************************************************************************************/
+#define MSG_ID_NVRAM_STRESS_TEST1_REQ
+
+/**************************************************************************************
+ This is used to Ttask2~Ttask4 to return test result to Ttask1
+ **************************************************************************************/
+#define MSG_ID_NVRAM_STRESS_TEST1_CNF
+
+#else
+
+    MSG_ID_NVRAM_TEST_REQ = MSG_ID_NVRAM_TEST_CODE_BEGIN,
+    MSG_ID_NVRAM_STRESS_TEST1_REQ,
+    MSG_ID_NVRAM_STRESS_TEST1_CNF,
+
+
+#endif
+MODULE_MSG_END( MSG_ID_NVRAM_TEST_CODE_TAIL )
+
+#endif /*#if defined (__NVRAM_UT_TEST__)*/
+
+
+#endif  //_NVRAM_MSG_H
diff --git a/mcu/interface/sap/svc/sap_relayer_msgid.h b/mcu/interface/sap/svc/sap_relayer_msgid.h
new file mode 100644
index 0000000..f79f9fe
--- /dev/null
+++ b/mcu/interface/sap/svc/sap_relayer_msgid.h
@@ -0,0 +1,50 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2005
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE. 
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _SAP_RELAYER_MSG_H
+#define _SAP_RELAYER_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_SAP_REALYER_CODE_BEGIN )
+
+MSG_ID_SAP_RELAYER_LOGGING,
+MSG_ID_SAP_RELAYER_CTRL_DATA,
+MSG_ID_SAP_RELAYER_CMD_FORWARD,
+MSG_ID_NCCCI_DATAPORT_READY_TO_READ,
+MSG_ID_NCCCI_CTRLPORT_READY_TO_READ,
+
+MODULE_MSG_END( MSG_ID_SAP_REALYER_CODE_TAIL )
+
+#endif  //_SAP_RELAYER_MSG_H
diff --git a/mcu/interface/sap/svc/sysservice_msgid.h b/mcu/interface/sap/svc/sysservice_msgid.h
new file mode 100644
index 0000000..bef8ad0
--- /dev/null
+++ b/mcu/interface/sap/svc/sysservice_msgid.h
@@ -0,0 +1,65 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2005
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE. 
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+#ifndef SYS__SERVICE_MSG_H
+#define SYS__SERVICE_MSG_H
+
+#include "module_msg_range.h"
+
+#define MAX_CUSTOM_MESSAGE_ID  20000   /* Maximum custom message ID */
+
+MODULE_MSG_BEGIN( MSG_ID_SYSDEBUG_CODE_BEGIN )
+MSG_ID_INVALID_TYPE = 0,
+MSG_ID_TIMER_EXPIRY = MSG_ID_SYSDEBUG_CODE_BEGIN,
+#ifdef MTK_SYSSERV_DEBUG
+MSG_ID_SSDBG1_SSDBG2_EXTQ_REQ,
+MSG_ID_SSDBG2_SSDBG2_INTQ_REQ,
+MSG_ID_CUSTOM_SSDBG2_EXTQ_REQ,
+#endif
+MSG_ID_STACK_SIM_TIMER_START,
+MSG_ID_STACK_SIM_TIMER_STOP,
+MSG_ID_STACK_SIM_TIMER_EXPIRY,
+MSG_ID_MDDBG_REQ,
+MSG_ID_MDDBG_RESPONSE,
+MSG_ID_CBS_P2L,
+MSG_ID_ELT_PMC_SETTING_TO_MDDBG_CMD,
+MSG_ID_ELT_PMC_SETTING_TO_MDDBG_ACK,
+MSG_ID_ATCMD_PMC_SETTING_TO_MDDBG_CMD,
+MSG_ID_ATCMD_SETTNG_INIT_ADDON_CMD,
+MSG_ID_KAL_HIGH_PRIORITY_SERVICE,
+MSG_ID_MDDBG_AFFINITY_EVSHED,
+MODULE_MSG_END( MSG_ID_SYSDEBUG_CODE_TAIL )
+
+#endif //SYS__SERVICE_MSG_H
+
diff --git a/mcu/interface/sap/svc/tcpip_msgid.h b/mcu/interface/sap/svc/tcpip_msgid.h
new file mode 100644
index 0000000..fade037
--- /dev/null
+++ b/mcu/interface/sap/svc/tcpip_msgid.h
@@ -0,0 +1,177 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2012
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   tcpip_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   TCPIP msgid define.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 08 06 2021 ot_srishti.sharma
+ * [MOLY00640309] 【1229859】【20131】【河南荥阳】【市场反馈】CMCC+CMCC主卡(IMS+IMS)卡1副卡MT通话失败
+ * 	
+ * 	Interface changes
+ *
+ * 12 11 2020 konark.mehra
+ * [MOLY00605016] RSRA Colgin MD700.MP check-ins
+ * 	
+ * 	RSRA check-ins to MD700.MP (SWRD)
+ *
+ * 09 09 2019 th.cheng
+ * [MOLY00437096] [Petrus] [MT6297] Gen97 D2/DDM feature in (D2/USIR/EDATASIM/EIAAPN).
+ *
+ * 05 09 2019 ari.simonen
+ * [MOLY00405097] [Gen97][Submarine][TCPIP][ATP] Port and SPI reservation support
+ * 	
+ * 	ATP port and SPI allocation features, SWRD files
+ *
+ * 08 11 2017 hsuan-yu.chiang
+ * [MOLY00266862] [TCP/IP stack]
+ * dump device info when pdn related msg or dump request received
+ *
+ * 07 19 2017 hsuan-yu.chiang
+ * [MOLY00256722] [UMOLYA][TCP/IP stack] linux UT framework
+ * add statistic for filter
+ *
+ * 05 18 2017 christine-pl.tsai
+ * [MOLY00250731] [MT6763][Bianco] Register message IDs for NAL module.
+ * 	
+ * 	Add message ID for NAL test case.
+ *
+ * 04 01 2017 i-chih.lu
+ * [MOLY00227941] [MT6293][TCPIP]
+ * tcpip: support AT+STKPKTSIZE=xxx
+ * 	part1: tcpip internal
+ *
+ * 03 21 2017 i-chih.lu
+ * [MOLY00227941] [MT6293][TCPIP]
+ * tcpip: change interface with D2CM.
+ *
+ * 03 13 2017 i-chih.lu
+ * [MOLY00227941] [MT6293][TCPIP]
+ * tcpip: STKEVTD change to use kal queue. part 1
+ *
+ * 03 03 2017 i-chih.lu
+ * [MOLY00227941] [MT6293][TCPIP]
+ * tcpip: interface for packet dumping.
+ *
+ * 03 02 2017 i-chih.lu
+ * [MOLY00227941] [MT6293][TCPIP]
+ * tcpip: interface to d2: interface only.
+ *
+ * 03 01 2017 I-Chih Lu
+ *  TCPIP msg id check-in
+ *
+ ****************************************************************************/
+
+
+#ifndef __TCPIP_MSGID_H__
+#define __TCPIP_MSGID_H__
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN(MSG_ID_TCPIP_BEGIN)
+
+/* FROM: D2 */
+    MSG_ID_D2CM_STKBRG_PDN_RANGE_BEGIN = MSG_ID_TCPIP_BEGIN,
+        MSG_ID_D2CM_STKBRG_ESTABLISHPDN_REQ,
+        MSG_ID_D2CM_STKBRG_ESTABLISHPDN_CNF,
+        MSG_ID_D2CM_STKBRG_IFCHANGE_REQ,
+        MSG_ID_D2CM_STKBRG_IFCHANGE_CNF,
+        MSG_ID_D2CM_STKBRG_GLBADDR_REQ,
+        MSG_ID_D2CM_STKBRG_GLBADDR_CNF,
+        MSG_ID_D2CM_STKBRG_DISCONNECTPDN_REQ,
+        MSG_ID_D2CM_STKBRG_DISCONNECTPDN_CNF,
+    MSG_ID_D2CM_STKBRG_PDN_RANGE_END,
+	MSG_ID_D2_STKBRG_PDN_RANGE_BEGIN,
+        MSG_ID_D2_STKBRG_ESTABLISHPDN_REQ,
+        MSG_ID_D2_STKBRG_ESTABLISHPDN_CNF,
+        MSG_ID_D2_STKBRG_IFCHANGE_REQ,
+        MSG_ID_D2_STKBRG_IFCHANGE_CNF,
+        MSG_ID_D2_STKBRG_DISCONNECTPDN_REQ,
+        MSG_ID_D2_STKBRG_DISCONNECTPDN_CNF,
+        MSG_ID_IMS_STKBRG_MTU_SET_REQ,
+        MSG_ID_IMS_STKBRG_MTU_SET_CNF,
+    MSG_ID_D2_STKBRG_PDN_RANGE_END,
+
+/* TO: DHL for packet dumping */
+    MSG_ID_STKBRG_DHL_PKTDUMP_REQ,
+
+/* FROM: ATP to STKBRG */
+    MSG_ID_ATP_STKBRG_ATCMD_RANGE_BEGIN,
+        MSG_ID_ATP_STKBRG_STKPKTSIZE_IND,
+        MSG_ID_STKBRG_ATP_PORT_ALLOC_CNF,
+        MSG_ID_STKBRG_ATP_PORT_FREE_CNF,
+    MSG_ID_ATP_STKBRG_ATCMD_RANGE_END,
+
+/* FROM task TO Event dispatcher */
+    MSG_ID_TCPIP_EQ_TIMEOUT_IND,
+    MSG_ID_TCPIP_EQ_EVENT_REQ,
+
+/* FOR NAL TP */
+    MSG_ID_NALTP_TEST_RUN_REQ,
+    MSG_ID_NALTP_TEST_RUN_CNF,
+
+/* FOR statistic dump */
+    MSG_ID_STAT_STKBRG_DUMP_RANGE_BEGIN,
+        MSG_ID_STAT_STKBRG_DUMP_IND,
+    MSG_ID_STAT_STKBRG_DUMP_RANGE_END,
+	
+/* FOR RSRA */
+    MSG_ID_STKBRG_RSRA_RANGE_BEGIN,
+        MSG_ID_STKBRG_RA_PROCESS_IND,
+        MSG_ID_STKBRG_D2_RA_IF_ADD_IND,
+        MSG_ID_RSRA_STKBRG_IP_UPDATE_IND,
+    MSG_ID_STKBRG_RSRA_RANGE_END,
+	
+MODULE_MSG_END(MSG_ID_TCPIP_TAIL)
+
+#endif  /* !__TCPIP_MSGID_H__ */
diff --git a/mcu/interface/sap/svc/tst_msgid.h b/mcu/interface/sap/svc/tst_msgid.h
new file mode 100644
index 0000000..5a3480c
--- /dev/null
+++ b/mcu/interface/sap/svc/tst_msgid.h
@@ -0,0 +1,166 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2005
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE. 
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _TST_MSG_H
+#define _TST_MSG_H
+
+MODULE_MSG_BEGIN( TST_MSG_CODE_BEGIN )
+#if defined (__DHL_MODULE__)
+MSG_ID_DHL_INJECT_STRING = TST_MSG_CODE_BEGIN,
+MSG_ID_TST_INJECT_STRING,
+MSG_ID_DHL_IND_READ_VARIABLE_RETURN,
+MSG_ID_DHL_IND_READ_MEMORY_REPORT,
+MSG_ID_DHL_USB_MEMORY_DUMP_DATA_ILM,
+MSG_ID_DHL_START_DUMP_MEMORY_TYPE,
+MSG_ID_DHL_END_DUMP_MEMORY_TYPE,
+MSG_ID_DHL_USB_MEMORY_DUMP_START_ILM,
+MSG_ID_DHL_USB_MEMORY_DUMP_FINISH_ILM,
+MSG_ID_DHL_IND_QUERY_MEMORY_RANGE,
+MSG_ID_DHL_IND_NVRAM_READ_CNF,
+MSG_ID_DHL_IND_NVRAM_RESET_CNF,
+MSG_ID_DHL_IND_NVRAM_WRITE_CNF,
+MSG_ID_DHL_IND_STACK_STATISTICS,
+MSG_ID_DHL_IND_FILE_TRANSFER_REPORT,
+MSG_ID_DHL_IND_FILE_SAVE_REPORT,
+MSG_ID_DHL_IND_QUERY_BUF_MONITOR_REPORT,
+MSG_ID_DHL_TO_ETSTM,
+MSG_ID_DHL_TO_EL1,
+MSG_ID_ETSTM_TO_DHL,
+MSG_ID_EL1_TO_DHL,
+MSG_ID_DHL_TO_EL1TST,
+MSG_ID_DHL_TO_CL1TST,
+MSG_ID_DHL_IND_GENERAL_QUERY_CMD_ACK,
+MSG_ID_DHL_TEST,
+MSG_ID_HELLO_GPD,
+MSG_ID_HELLO_PTR_ARRAY,
+MSG_ID_HELLO_INLINE_ILM,
+MSG_ID_HELLO_INLINE_ILM2,
+MSG_ID_DHL_DRIVER_STATE_CHANGE,
+MSG_ID_DHL_TTY_RX_DONE,
+MSG_ID_DHL_REDUMP_END_WARN,
+MSG_ID_DHL_CMD_NVRAM,
+MSG_ID_DHL_CMD_READ_STACK_STATISTICS,
+MSG_ID_DHL_CMD_QUERY_CTRL_BUF_MONITOR_DATA,
+MSG_ID_DHL_CMD_QUERY_FLC_BUF_MONITOR_DATA,
+MSG_ID_DHL_CMD_MSG_BKPT,
+MSG_ID_DHL_CMD_INJECT_AT_CMD,
+MSG_ID_DHL_CMD_SWLA_EMI_MONITOR_MASTER_SELECT,
+MSG_ID_DHLDBG_MSG_BREAK,
+MSG_ID_DHL_IND_VIRTUAL_CHANNEL,
+MSG_ID_DHL_IND_UBDB,
+MSG_ID_TST_R8_DL_PKT_SINGLE_GPD_IND,
+MSG_ID_TST_L2COPRO_FILTER_RETRIEVAL,
+MSG_ID_TST_L2COPRO_FILTER_SAVE,
+MSG_ID_DHL_CMD_SET_DHL_MUX_FILTER,
+MSG_ID_DHL_CMD_ENABLE_23G_DSP_LOGGING,
+MSG_ID_DHL_CMD_DISABLE_23G_DSP_LOGGING,
+MSG_ID_DHL_CMD_LOOP_BACK_RESPONSE,
+MSG_ID_DHL_AUTO_MEMORY_DUMP_IN_ILM,
+MSG_ID_DHL_IND_CUSTOM_READ_MEMORY_REPORT,
+MSG_ID_DHL_TO_DHL_SLAVE_RELAY,
+MSG_ID_DHL_L2COPRO_UL_IP_HEADER_LOG,
+MSG_ID_DHL_L2COPRO_DL_IP_HEADER_LOG,
+MSG_ID_DHL_L2COPRO_LOG_DMA_CONFIG,
+MSG_ID_DHL_REAPPEAR_EXCEPTION_LOG_START,
+MSG_ID_DHL_REAPPEAR_EXCEPTION_LOG_END,
+//MSG_ID_DHL_CMD_SET_MDL_FILTER,
+MSG_ID_DHL_CMD_SET_DSP_FILTER,
+MSG_ID_DHL_UPCM_IMS_UL_RAW_DATA,
+MSG_ID_DHL_UPCM_IMS_DL_RAW_DATA,
+MSG_ID_DHL_SAVE_SLAVE_L1_FILTER,
+MSG_ID_L2_TRACE_OPEN,
+MSG_ID_L2_TRACE_CLOSE,
+MSG_ID_DHL_PLS_FLUSH_END,
+MSG_ID_DHL_META_MODE_LOG_ENABLE,
+MSG_ID_DHL_CMD_READ_STACK_STATISTICS_SLAVE,
+MSG_ID_DHL_IND_STACK_STATISTICS_SLAVE,
+MSG_ID_DHL_REDUMP_START_WARN,
+MSG_ID_DHL_LOAD_MDL_FILTER_FROM_NVRAM,
+/* SWLA/SWTR MESSAGE ID -Start- */
+MSG_ID_DHL_IND_SWLA_QUERY_HEADER_REPORT,
+MSG_ID_DHL_IND_ASM_QUERY_HEADER_REPORT,
+MSG_ID_DHL_CMD_ASM_START,
+MSG_ID_DHL_CMD_ASM_STOP,
+MSG_ID_DHL_CMD_ASM_CONFIG_PMC,
+MSG_ID_DHL_IND_ASM_CMD_ACK,
+/* SWLA/SWTR MESSAGE ID -End- */
+MSG_ID_DHL_LBS_POS_IND,
+
+MSG_ID_DHL_EVENT_NOTIFY,
+MSG_ID_MCORE_VCORE_ULSP_INFO_T_DEBUG,
+MSG_ID_CXIF_ULSP_INFO_T_DEBUG,
+MSG_ID_DHL_ICD_UT,
+MSG_ID_DHL_UT,
+
+#if defined(UNIT_TEST) || defined(__UE_SIMULATOR__)
+MSG_ID_DHL_IND_CMD_REBOOT_ACK,  // resetm response
+#endif
+
+#else
+MSG_ID_TST_INJECT_STRING = TST_MSG_CODE_BEGIN,
+MSG_ID_TST_GET_GPRS_POOL_STATUS,
+MSG_ID_TST_POOL_QUERY_TIME_EXPIRY,
+MSG_ID_TST_MSG_FROM_DSP,
+MSG_ID_TST_STREAM_FROM_DSP,
+MSG_ID_TST_UT_MSG1,
+MSG_ID_TST_L2COPRO_FILTER_RETRIEVAL,
+MSG_ID_TST_L2COPRO_FILTER_SAVE,
+MSG_ID_TST_MSG_FROM_AP,
+MSG_ID_TST_UT_CCCI_MSG,
+MSG_ID_TST_TR_INTERNAL,
+MSG_ID_TST_MINI_LOG_STATIC_INFO,
+MSG_ID_TST_R8_DL_PKT_SINGLE_GPD_IND,
+#endif
+MSG_ID_DHL_LOG_MODE_CTRL_SET_REQ,
+MSG_ID_DHL_LOG_MODE_CTRL_SET_CNF,
+MSG_ID_DHL_LOG_MODE_CTRL_GET_REQ,
+MSG_ID_DHL_LOG_MODE_CTRL_GET_CNF,
+MSG_ID_DHL_LOG_LEVEL_CTRL_SET_REQ,
+MSG_ID_DHL_LOG_LEVEL_CTRL_SET_CNF,
+MSG_ID_DHL_LOG_LEVEL_CTRL_GET_REQ,
+MSG_ID_DHL_LOG_LEVEL_CTRL_GET_CNF,
+MSG_ID_DHL_LOCATION_LOG_CTRL_SET_REQ,
+MSG_ID_DHL_LOCATION_LOG_CTRL_SET_CNF,
+MSG_ID_DHL_LOCATION_LOG_CTRL_GET_REQ,
+MSG_ID_DHL_LOCATION_LOG_CTRL_GET_CNF,
+MSG_ID_DHL_LOG_FLUSH_INTERVAL_SET_REQ,
+MSG_ID_DHL_LOG_FLUSH_INTERVAL_SET_CNF,
+MSG_ID_DHL_LOG_FLUSH_INTERVAL_GET_REQ,
+MSG_ID_DHL_LOG_FLUSH_INTERVAL_GET_CNF,
+MSG_ID_DHL_SWITCH_MODE_REQ,
+MODULE_MSG_END( MSG_ID_TST_CODE_TAIL )
+
+#endif  //_TST_MSG_H
diff --git a/mcu/interface/sap/svc/wfpm_msgid.h b/mcu/interface/sap/svc/wfpm_msgid.h
new file mode 100644
index 0000000..f69ab19
--- /dev/null
+++ b/mcu/interface/sap/svc/wfpm_msgid.h
@@ -0,0 +1,45 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2005
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE. 
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _WFPM_MSG_H
+#define _WFPM_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_WFPM_CODE_BEGIN )
+MODULE_MSG_END( MSG_ID_WFPM_CODE_TAIL )
+
+#endif  /* _WFPM_MSG_H */
+
diff --git a/mcu/interface/sap/svc/wlc_msgid.h b/mcu/interface/sap/svc/wlc_msgid.h
new file mode 100644
index 0000000..ffb352c
--- /dev/null
+++ b/mcu/interface/sap/svc/wlc_msgid.h
@@ -0,0 +1,108 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2013
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   wlc_msgid.h
+ *
+ * Project:
+ * --------
+ *	 UMOLYE 
+ *
+ * Description:
+ * ------------
+ * This module defines the messgae IDs for WLC.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ ****************************************************************************/
+#ifndef _WLC_MSG_ID_H
+#define _WLC_MSG_ID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_WLC_CODE_BEGIN )
+
+/****************************************************************************
+*                 <1> Desitnation: WLC
+****************************************************************************/
+// <1.1> From ATP
+    MSG_ID_ATP_WLC_EIMSGEO_REQ = MSG_ID_WLC_CODE_BEGIN,
+    MSG_ID_ATP_WLC_EWIFIEN_REQ,
+    MSG_ID_ATP_WLC_EWIFIADDR_REQ,
+    MSG_ID_ATP_WLC_EWIFIASC_REQ,    
+    MSG_ID_ATP_WLC_EWIFISIGLVL_REQ,
+    MSG_ID_ATP_WLC_EWIFIMAC_REQ,
+	MSG_ID_ATP_WLC_OFFLOAD_KEEP_ALIVE_REQ,
+	MSG_ID_ATP_WLC_EWIFIRSSITHR_REQ,
+	MSG_ID_ATP_WLC_EWIFIRSSIVER_REQ,
+// <1.2> From User
+    MSG_ID_WLC_WIFI_INFO_QUERY_REQ,
+    MSG_ID_WLC_WIFI_INFO_REGISTER_REQ,
+    MSG_ID_WLC_WIFI_RSSI_THR_CONFIG_IND,
+    MSG_ID_WLC_UPDATE_PRIORITY_REQ,
+    MSG_ID_WLC_WIFI_LOCK_ACQUIRE_REQ,
+    MSG_ID_WLC_WIFI_LOCK_RELEASE_REQ,
+    MSG_ID_WLC_IP_MAC_ADDR_LOOKUP_REQ,
+    MSG_ID_WLC_OFFLOAD_KEEP_ALIVE_REQ,
+
+// <1.2> From TCPIP
+    MSG_ID_WLC_TCPIP_WIFI_STATUS_IND,
+
+/****************************************************************************
+*                 <2> Desitnation: WLC's USER
+****************************************************************************/
+    MSG_ID_WLC_WIFI_INFO_QUERY_CNF,
+    MSG_ID_WLC_WIFI_INFO_REGISTER_CNF,
+    MSG_ID_WLC_WIFI_RSSI_THR_CONFIG_REQ,
+    MSG_ID_WLC_WIFI_RSSI_THR_CONFIG_CNF,
+    MSG_ID_WLC_WIFI_LOCK_ACQUIRE_CNF,
+    MSG_ID_WLC_WIFI_LOCK_RELEASE_CNF,
+    MSG_ID_WLC_WIFI_INFO_UPDATE_IND,
+    MSG_ID_WLC_IP_MAC_ADDR_LOOKUP_CNF,
+    MSG_ID_WLC_OFFLOAD_KEEP_ALIVE_CNF,
+
+/******************************************************************************
+ *                                MSG END                                     *
+ ******************************************************************************/
+MODULE_MSG_END( MSG_ID_WLC_CODE_TAIL )
+
+#endif  //_WLC_MSG_ID_H
+
+
diff --git a/mcu/interface/sap/svc/wrpm_msgid.h b/mcu/interface/sap/svc/wrpm_msgid.h
new file mode 100644
index 0000000..9cb02d3
--- /dev/null
+++ b/mcu/interface/sap/svc/wrpm_msgid.h
@@ -0,0 +1,47 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2005
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE. 
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _WRPM_MSG_H
+#define _WRPM_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_WRPM_CODE_BEGIN )
+    /* Timer event */
+    MSG_ID_WRPM_PERIODIC_EXPIRED,
+MODULE_MSG_END( MSG_ID_WRPM_CODE_TAIL )
+
+#endif  /* _WRPM_MSG_H */
+
diff --git a/mcu/interface/sap/svc/wsvc_msgid.h b/mcu/interface/sap/svc/wsvc_msgid.h
new file mode 100644
index 0000000..131ba99
--- /dev/null
+++ b/mcu/interface/sap/svc/wsvc_msgid.h
@@ -0,0 +1,141 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2012
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*******************************************************************************
+ * Filename:
+ * ---------
+ *   mcif_sap.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   define mcif messages
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 11 25 2020 jun-yi.li
+ * [MOLY00599489] [MT6891][Petrus-P][R0][MP7][MDDP-WH][HQ][KS][TestApp][N78] power consumption issue
+ * 	
+ * 	[WSVC][MPD] t-put th
+ *
+ * 09 23 2019 sheng-lung.liu
+ * [MOLY00439580] [VMOLY][MCIF] Support Multiple CONSYS
+ * 	
+ * 	[MCIF_DRV] Support Multiple Sys
+ *
+ * 07 24 2019 i-chih.lu
+ * [MOLY00424516] [MCIF][Submarine] Submarine issue fix patch back
+ * wsvc update
+ *
+ * 07 19 2019 kevin.tseng
+ * [MOLY00423298] [MDDP][GEN97] patch back MDDP-WH
+ * 	
+ * 	- interface part
+ *
+ * 04 02 2019 cheng-dao.lee
+ * [MOLY00396317] [MCIF] patch back
+ * [MCIF] SAP
+ *
+ * 02 25 2019 kevin.tseng
+ * [MOLY00374148] [WSVC] MDDP-WH support
+ * 	
+ * 	- reset WSVC/PDMA driver when deactivating
+ *
+ * 02 19 2019 cheng-dao.lee
+ * [MOLY00372728] [MCIF] PDMA development
+ * SER support
+ *
+ * 01 24 2019 kevin.tseng
+ * [MOLY00374148] [WSVC] MDDP-WH support
+ * 	
+ * 	- add dump RX
+ * 	- update mac dequeue
+ * 	- fix IT port issue
+ *
+ * 01 11 2019 kevin.tseng
+ * [MOLY00374148] [WSVC] MDDP-WH support
+ * 	
+ * 	- MSDU id/report handling
+ * 	- remove depenency of mcif_hal_shm_alloc() and MCIF handshake
+ * 	- add timeout ilm modid check
+ *
+ *
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef WSVC_MSGID_H
+#define WSVC_MSGID_H
+
+MODULE_MSG_BEGIN(MSG_ID_WSVC_BEGIN)
+
+    /* WFPM --> WSVC */
+    MSG_ID_WSVC_TXD_UPDATE_IND,
+    MSG_ID_WSVC_NET_STAT_ADDR_REQ,
+    MSG_ID_WSVC_NET_STAT_ADDR_CNF,
+    MSG_ID_WSVC_MAC_REQ,
+    MSG_ID_WSVC_MAC_CNF,
+
+    /* User --> WSVC */
+    MSG_ID_WSVC_TX_EVENT,
+    MSG_ID_WSVC_TX_DID_EVENT,
+    MSG_ID_WSVC_MAC_UPDATE_EVENT,
+    MSG_ID_WSVC_DEREG_CB_EVENT,
+
+    /* PDMA DRV --> WSVC */
+    MSG_ID_WSVC_RX_EVENT,
+    MSG_ID_WSVC_HAL_EVENT,
+
+    /* WSVC --> DHL */
+    MSG_ID_WSVC_DHL_PKTDUMP_REQ,
+
+    /* User --> RX module */
+    MSG_ID_WSVC_FORCE_REL_SHM_EVENT,
+    MSG_ID_WSVC_IPF_RULE_DEL_EVENT,
+
+    /* WSVC --> RWSVC */
+    MSG_ID_WSVC_RWSVC_EVENT,
+
+MODULE_MSG_END(MSG_ID_WSVC_TAIL)
+
+#endif  //	_WSVC_MSGID_H_