[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/drv/audio_msgid.h b/mcu/interface/sap/drv/audio_msgid.h
new file mode 100644
index 0000000..527dd86
--- /dev/null
+++ b/mcu/interface/sap/drv/audio_msgid.h
@@ -0,0 +1,326 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ * l1_sap.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   Layer 1 and Protocol Stack 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!
+ * 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 _AUIDO_MSGID_H
+#define _AUIDO_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_AUDIO_MSG_CODE_BEGIN )
+MSG_ID_AUDIO_CCCI_BEGIN = MSG_ID_AUDIO_MSG_CODE_BEGIN,
+
+MSG_ID_AUDIO_A2M_CCCI,
+MSG_ID_AUDIO_M2A_CCCI,
+MSG_ID_AUDIO_AFE_REFRESH,
+MSG_ID_AUDIO_CTM_PROCESS,
+MSG_ID_AUDIO_CTM_RX_DATA,
+MSG_ID_AUDIO_STRM_PCM4WAY_DATA,
+MSG_ID_AUDIO_STRM_BGSND_DATA_REQUEST,
+MSG_ID_AUDIO_STRM_VM_DATA_REQUEST,
+MSG_ID_AUDIO_VM_DATA_NOTIFICATION,
+
+MSG_ID_SPEECH_ON_ACK,
+MSG_ID_SPEECH_OFF_ACK,
+MSG_ID_STRM_SPEECH_DL_DATA_NOTIFY,
+MSG_ID_STRM_SPEECH_UL_DATA_REQUEST,
+// No Application Use, but code is reserved
+MSG_ID_AUDIO_STRM_PCM_DATA_REQUEST,
+MSG_ID_AUDIO_STRM_PCM_REC_DATA_NOTIFICATION,
+MSG_ID_AUDIO_AMR_DATA_NOTIFICATION,
+MSG_ID_AUDIO_BGSND_DATA_REQUEST,
+MSG_ID_AUDIO_PCM_DATA_NOTIFICATION,
+MSG_ID_AUDIO_TONE_STOP_REQUEST,
+MSG_ID_AUDIO_TONE_DETECT,
+MSG_ID_AUDIO_VM_DATA_REQUEST,
+MSG_ID_AUDIO_WAV_DATA_REQUEST,
+MSG_ID_AUDIO_WAV_DATA_NOTIFICATION,
+
+MSG_ID_AUDIO_L4C_EPOF_NOTIFY, 
+MSG_ID_AUDIO_L4C_EPOF_ACK,
+MSG_ID_AUDIO_CUST_DUMP_REQ,
+MSG_ID_AUDIO_L4C_ERTTSTR,
+
+MSG_ID_AUDIO_CCCI_TAIL,
+
+// M2M message
+MSG_ID_AUDIO_M2M_BEGIN,
+
+MSG_ID_AUDIO_M2M_VOLTE_MAC_TIMING_INFO,
+MSG_ID_AUDIO_M2M_VONR_MAC_TIMING_INFO,
+MSG_ID_L1SP_EMAC_VOLTE_NOTIFY_MODE_CHANGE,
+MSG_ID_L1SP_NMAC_VONR_NOTIFY_MODE_CHANGE,
+MSG_ID_AUDIO_M2M_CCCI,
+MSG_ID_AUDIO_M2M_VOLTE_KT_BGSND_CLOSE,
+MSG_ID_AUDIO_M2M_VOLTE_TONE_BGSND_CLOSE,
+MSG_ID_AUDIO_M2M_VOLTE_DL_KT_PLAY,
+MSG_ID_AUDIO_M2M_VOLTE_DL_KT_STOP,
+MSG_ID_AUDIO_M2M_VOLTE_UL_KT_PLAY,
+MSG_ID_AUDIO_M2M_VOLTE_UL_KT_STOP,
+MSG_ID_AUDIO_M2M_VOLTE_DL_TONE_PLAY,
+MSG_ID_AUDIO_M2M_VOLTE_DL_TONE_STOP,
+MSG_ID_AUDIO_M2M_VOLTE_UL_TONE_PLAY,
+MSG_ID_AUDIO_M2M_VOLTE_UL_TONE_STOP,
+MSG_ID_AUDIO_M2M_SP_L4C_SET_EVENT,
+MSG_ID_AUDIO_M2M_CHANGERATE_EVENT,
+MSG_ID_AUDIO_M2M_SP_UPDATE_SPEECH_ENHANCEMENT_PARAMETER,
+MSG_ID_AUDIO_M2M_SP_C2K_EVENT,
+MSG_ID_AUDIO_M2M_SP_C2K_RATE_REDUCTION, 
+MSG_ID_AUDIO_M2M_SP3G_UL_EVENT,//for 3g loopback test
+MSG_ID_AUDIO_M2M_RAMP_DONE,
+MSG_ID_AUDIO_M2M_SPC_SETLOOPBACK_DL_UL,
+MSG_ID_AUDIO_M2M_VM_START,
+MSG_ID_AUDIO_M2M_VM_STOP,
+#if defined(__ECALL_SUPPORT__)
+#if defined(__L5_SUPPORT__)
+MSG_ID_AUDIO_M2M_SP_L5ECALL_SET_EVENT,
+#endif
+#endif 
+MSG_ID_AUDIO_M2M_TAIL,
+
+// Audio Logging message
+MSG_ID_AUDIO_LOGGING_BEGIN,
+	
+MSG_ID_AUDIO_LOGGING_SPEECH,
+MSG_ID_AUDIO_LOGGING_BT_TX,
+MSG_ID_AUDIO_LOGGING_BT_RX,
+	
+MSG_ID_AUDIO_LOGGING_TAIL,
+
+// C2C message
+MSG_ID_AUDIO_L2P_BEGIN,
+
+MSG_ID_AUDIO_L2P_SP3G_UPDATE_L1_INFO,
+
+
+MSG_ID_AUDIO_L2P_TAIL,
+
+#if defined(__IPC_ADAPTER__)
+MSG_ID_TITAN_SND_BEGIN, MSG_ID_TITAN_SND_VOLUME_SET = MSG_ID_TITAN_SND_BEGIN,
+MSG_ID_TITAN_SND_MUTE_SET,
+MSG_ID_TITAN_SND_PATH_SET,
+MSG_ID_TITAN_SND_LOOPBACK_SET,
+MSG_ID_TITAN_SND_AUDIO_MODE_SET,
+MSG_ID_TITAN_SND_TWOMIC_SOL_CTRL_SET,
+MSG_ID_TITAN_SND_DHASOL_SET,
+MSG_ID_TITAN_SND_TAIL,
+#endif 
+
+
+MODULE_MSG_END( MSG_ID_AUDIO_MSG_CODE_TAIL )
+#endif  //_AUIDO_MSGID_H
diff --git a/mcu/interface/sap/drv/ccifcore_msgid.h b/mcu/interface/sap/drv/ccifcore_msgid.h
new file mode 100644
index 0000000..3cba9c5
--- /dev/null
+++ b/mcu/interface/sap/drv/ccifcore_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) 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:
+ * ---------
+ *   ccifcore_sap.h
+ *
+ * Project:
+ * --------
+ *   TATAKA
+ *
+ * Description:
+ * ------------
+ *   define ccifcore messages
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 06 03 2013 box.wu
+ * [MOLY00008961] CCIF dev
+ * CCIFCore GPD support
+ *
+ * 01 16 2013 box.wu
+ * [MOLY00008961] CCIF dev
+ * integrate CCIF drv & CCIFCore from TATAKA.
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _CCIFCORE_MSGID_H
+#define _CCIFCORE_MSGID_H
+
+
+MODULE_MSG_BEGIN(MSG_ID_CCIFCORE_CODE_BEGIN)
+    MSG_ID_CCIFCORE_ISR_REQ,
+    MSG_ID_CCIFCORE_GPD_TX_REQ,
+MODULE_MSG_END(MSG_ID_CCIFCORE_CODE_END)
+
+#endif    
diff --git a/mcu/interface/sap/drv/ccismcore_msgid.h b/mcu/interface/sap/drv/ccismcore_msgid.h
new file mode 100644
index 0000000..ba2a328
--- /dev/null
+++ b/mcu/interface/sap/drv/ccismcore_msgid.h
@@ -0,0 +1,71 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   ccismcore_sap.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   define ccismcore messages
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef CCISMCORE_MSGID_H
+#define CCISMCORE_MSGID_H
+
+MODULE_MSG_BEGIN(MSG_ID_CCISMCORE_CODE_BEGIN)
+    MSG_ID_CCISMCORE_HISR_RX_REQ,
+    MSG_ID_CCISMCORE_RELOAD_RX_REQ,
+	MSG_ID_CCISMCORE_GPD_TX_REQ,
+	MSG_ID_CCISMCORE_TRM_INIT,
+	MSG_ID_CCISMCORE_TRM_INIT_DONE,
+MODULE_MSG_END(MSG_ID_CCISMCORE_CODE_END)
+
+#endif  //	_CCISMCORE_MSGID_H_ 
diff --git a/mcu/interface/sap/drv/ccismcore_scp_msgid.h b/mcu/interface/sap/drv/ccismcore_scp_msgid.h
new file mode 100644
index 0000000..255ed65
--- /dev/null
+++ b/mcu/interface/sap/drv/ccismcore_scp_msgid.h
@@ -0,0 +1,71 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   ccismcore_scp_sap.h
+ *
+ * Project:
+ * --------
+ *   UMOLYA
+ *
+ * Description:
+ * ------------
+ *   define ccismcore messages MD<->SCP
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef CCISMCORE_SCP_MSGID_H
+#define CCISMCORE_SCP_MSGID_H
+
+MODULE_MSG_BEGIN(MSG_ID_CCISMCORE_SCP_CODE_BEGIN)
+    MSG_ID_CCISMCORE_SCP_HISR_RX_REQ,
+    MSG_ID_CCISMCORE_SCP_RELOAD_RX_REQ,
+	MSG_ID_CCISMCORE_SCP_GPD_TX_REQ,
+	MSG_ID_CCISMCORE_SCP_TRM_INIT,
+	MSG_ID_CCISMCORE_SCP_TRM_INIT_DONE,
+MODULE_MSG_END(MSG_ID_CCISMCORE_SCP_CODE_END)
+
+#endif  //	_CCISMCORE_SCP_MSGID_H_ 
diff --git a/mcu/interface/sap/drv/cldmacore_msgid.h b/mcu/interface/sap/drv/cldmacore_msgid.h
new file mode 100644
index 0000000..a43a763
--- /dev/null
+++ b/mcu/interface/sap/drv/cldmacore_msgid.h
@@ -0,0 +1,73 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   cldmacore_sap.h
+ *
+ * Project:
+ * --------
+ *   TATAKA
+ *
+ * Description:
+ * ------------
+ *   define cldmacore messages
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 12 23 2012 th.cheng
+ * [MOLY00007886] Merge CLDMACore to MOLY
+ *
+ * 12 23 2012 th.cheng
+ * [MOLY00007886] Merge CLDMACore to MOLY
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _CLDMACORE_MSGID_H
+#define _CLDMACORE_MSGID_H
+
+
+MODULE_MSG_BEGIN(MSG_ID_CLDMACORE_CODE_BEGIN)
+    MSG_ID_CLDMACORE_ISR_REQ,
+MODULE_MSG_END(MSG_ID_CLDMACORE_CODE_END)
+
+#endif    
diff --git a/mcu/interface/sap/drv/cmux_msgid.h b/mcu/interface/sap/drv/cmux_msgid.h
new file mode 100644
index 0000000..3e51f5e
--- /dev/null
+++ b/mcu/interface/sap/drv/cmux_msgid.h
@@ -0,0 +1,148 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *    cmux_sap.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file is intends for SAP of multiplexer.
+ *
+ * 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+/*CMUX*/
+#ifndef CMUX_MSGID_H
+#define CMUX_MSGID_H
+
+MODULE_MSG_BEGIN( CMUX_MSG_CODE_BEGIN )
+MSG_ID_CMUX_STARTUP_REQ = CMUX_MSG_CODE_BEGIN,
+MSG_ID_CMUX_CLOSE_DOWN_REQ,
+MSG_ID_CMUX_CLOSE_DOWN_IND,
+//MSG_ID_CMUX_TIMEOUT_IND,/*CMUX->AP*/
+MSG_ID_CMUX_DLC_CONNECT_IND,/*CMUX->AP*/
+//MSG_ID_CMUX_DLC_DISCONNECT_IND,/*CMUX->AP*/
+
+MSG_ID_CMUX_DLC_DATA_READY_REQ,
+MSG_ID_CMUX_DLC_READY_TO_RECEIVE_REQ,
+
+MSG_ID_CMUX_READY_TO_SEND_IND,
+MSG_ID_CMUX_UART_DATA_IND,
+MSG_ID_CMUX_UART_DATA_REQ,
+MSG_ID_CMUX_UART_CLOSE_DOWN_REQ,
+MSG_ID_CMUX_UART_CLOSE_DOWN_CNF,
+
+/* CMUX UT INTERFACE */
+MSG_ID_CMUX_UT_UART_DATA_IND,
+MSG_ID_CMUX_UT_UART_DATA_REQ,
+
+/* For WinMo Gemini VT only */
+MSG_ID_CMUX_VP_SET_BUFF_CONFIG_REQ,
+MSG_ID_CMUX_VP_SET_BUFF_CONFIG_CNF,
+MSG_ID_CMUX_VP_RESET_BUFF_CONFIG_REQ,
+MSG_ID_CMUX_VP_RESET_BUFF_CONFIG_CNF,
+
+/* FLC2 INTERFACE */
+MSG_ID_CMUX_FLC_DATA_RESUME_IND,
+MSG_ID_CMUX_FLC_DATA_SUSPEND_IND,
+/* STACK_TIMER_SAP */
+MODULE_MSG_END( MSG_ID_CMUX_CODE_TAIL )
+
+#endif //CMUX_MSGID_H
diff --git a/mcu/interface/sap/drv/cscdcore_msgid.h b/mcu/interface/sap/drv/cscdcore_msgid.h
new file mode 100644
index 0000000..079deb6
--- /dev/null
+++ b/mcu/interface/sap/drv/cscdcore_msgid.h
@@ -0,0 +1,74 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   cscdcore_msgid.h
+ *
+ * Project:
+ * --------
+ *   UMOLYA
+ *
+ * Description:
+ * ------------
+ *   define cscdcore messages
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef CSCDCORE_MSGID_H
+#define CSCDCORE_MSGID_H
+
+MODULE_MSG_BEGIN(MSG_ID_CSCDCORE_CODE_BEGIN)
+    MSG_ID_CSCDCORE_HISR_RX_REQ,
+    MSG_ID_CSCDCORE_RELOAD_RX_REQ,
+	MSG_ID_CSCDCORE_GPD_TX_REQ,
+	MSG_ID_CSCDCORE_IT_CSS_LB_NOTIFY,
+	MSG_ID_CSCDCORE_IT_LB_NOTIFY,
+	MSG_ID_CCISMCORE_IT2_START_PHASE2_2_2,
+	MSG_ID_CCISMCORE_IT2_START_PHASE2_4_2,
+	MSG_ID_CCISMCORE_IT2_START_PHASE2_5_2,
+MODULE_MSG_END(MSG_ID_CSCDCORE_CODE_END)
+
+#endif  //	_CSCDCORE_MSGID_H_ 
diff --git a/mcu/interface/sap/drv/dpmaif_msgid.h b/mcu/interface/sap/drv/dpmaif_msgid.h
new file mode 100644
index 0000000..8916c20
--- /dev/null
+++ b/mcu/interface/sap/drv/dpmaif_msgid.h
@@ -0,0 +1,11 @@
+#include "module_msg_range.h"
+
+#ifndef DPMAIF_MSGID_H
+#define DPMAIF_MSGID_H
+
+MODULE_MSG_BEGIN(MSG_ID_DPAMIF_CODE_BEGIN)
+MSG_ID_DPMAIF_DL_INTR_HANDLE,
+MSG_ID_DPMAIF_DL_DATA_HANDLE,
+MODULE_MSG_END(MSG_ID_DPMAIF_CODE_TAIL)
+
+#endif  //	DPMAIF_MSGID_H
diff --git a/mcu/interface/sap/drv/drv_msgid.h b/mcu/interface/sap/drv/drv_msgid.h
new file mode 100644
index 0000000..5944fbf
--- /dev/null
+++ b/mcu/interface/sap/drv/drv_msgid.h
@@ -0,0 +1,721 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *    drv_sap.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file is intends for SAP of driver.
+ *
+ * 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!
+ *
+ * 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!
+ * 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!
+ * 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 _DRV_MSGID_H
+#define _DRV_MSGID_H
+
+MODULE_MSG_BEGIN( DRIVER_MSG_CODE_BEGIN )
+/*UART*/
+MSG_ID_UART_READY_TO_READ_IND = DRIVER_MSG_CODE_BEGIN,
+MSG_ID_UART_READY_TO_WRITE_IND,
+MSG_ID_UART_DSR_CHANGE_IND,
+MSG_ID_UART_ESCAPE_DETECTED_IND,
+MSG_ID_UART_PLUGIN_IND,
+MSG_ID_UART_PLUGOUT_IND,
+/*BMT*/
+MSG_ID_BMT_CHARGER_IND,
+MSG_ID_BMT_ADC_DATA_REQ,
+MSG_ID_BMT_ADC_DATA_CONF,
+MSG_ID_BMT_LEAVE_PRECHARGE_IND,
+
+MSG_ID_BMT_ADC_MEASURE_DONE_CONF,
+MSG_ID_BMT_ADC_ADD_ITEM_REQ,
+MSG_ID_BMT_ADC_REMOVE_ITEM_REQ,
+MSG_ID_BMT_ADC_MODIFY_PARAMETERS_REQ,
+
+/*AUX*/
+MSG_ID_AUX_PLUGIN,
+MSG_ID_AUX_PLUGOUT,
+MSG_ID_AUX_DETECT,   /*old*/
+MSG_ID_AUX_CALL_SETUP_REQ_IND, 
+MSG_ID_AUX_CALL_CONNECT_REQ_IND,
+MSG_ID_AUX_CALL_DISCONNECT_REQ_IND,
+MSG_ID_AUX_ID,
+MSG_ID_READ_ALL_ADC_CHANNEL_REQ,
+MSG_ID_ADC_ALL_CHANNEL_CONF,
+MSG_ID_AUX_AUDIO_OPEN,
+MSG_ID_AUX_AUDIO_CLOSED,
+
+/*PFC*/
+MSG_ID_PPP_PFC_ENCODE_DONE_IND,
+MSG_ID_PPP_PFC_DECODE_DONE_IND,
+
+/*USB*/
+MSG_ID_USB_A_PLUGIN_IND,
+MSG_ID_USB_A_PLUGOUT_IND,
+MSG_ID_USB_B_PLUGIN_IND,
+MSG_ID_USB_B_PLUGOUT_IND,
+MSG_ID_DRVUEM_USBCFG_REQ,
+MSG_ID_DRVUEM_USBCFG_CNF,
+MSG_ID_USBD_START_HNP,
+MSG_ID_SRP_INIT,
+MSG_ID_OTG_DISPLAY_IND,
+MSG_ID_DRVMMI_MS_INIT_DONE,
+
+MSG_ID_USB_MSDRV_RESET_IND,				/* mass storage messages */
+MSG_ID_USB_MSDRV_REC_DONE_CONF,
+MSG_ID_USB_MSDRV_TRX_DONE_CONF,
+MSG_ID_USB_MSDRV_CLEAR_STALL_REQ,
+MSG_ID_USB_MSDRV_REMOUNT_REQ,
+MSG_ID_USB_MSHOST_START_IND,
+MSG_ID_USB_MSHOST_QUERY_IND,
+MSG_ID_USB_MSHOST_CLEAR_STALL_IND,
+MSG_ID_USB_HOST_ATTACH_IND,
+MSG_ID_OTG_MS_INSERT_IND,
+MSG_ID_OTG_MS_REMOVE_IND,
+MSG_ID_OTG_CARD_DETECT_IND,
+MSG_ID_OTG_HDLR_IND,
+MSG_ID_USB_FT_IND,					/* CDC ACM factory mode messages */
+MSG_ID_USB_FT_START_REQ,
+MSG_ID_USB_FT_TX_DONE_IND,
+MSG_ID_USB_FT_RX_DATA_IND,
+
+
+MSG_ID_RNDIS_USB_CONFIG_REQ,   // RNDIS
+MSG_ID_RNDIS_USB_CONFIG_CNF,
+MSG_ID_RNDIS_USB_DETACH_REQ,
+MSG_ID_RNDIS_USB_DETACH_CNF,
+MSG_ID_RNDIS_USB_ENUM_IND,
+MSG_ID_CTRL_UART_READY_TO_READ_IND,
+MSG_ID_CTRL_UART_READY_TO_WRITE_IND,
+
+MSG_ID_MBIM_USB_RESET_IND,   // MBIM
+
+
+MSG_ID_USB_LOGGING_START_IND,				/* USB LOGGING Tool */
+MSG_ID_USB_LOGGING_RESET_IND,
+MSG_ID_USB_LOGGING_CONNECT_IND,
+MSG_ID_USB_LOGGING_DISCONNECT_IND,
+
+//USB ECHO Test 
+MSG_ID_USB_TEST_START_IND,  
+
+/*USB video and media msg */
+MSG_ID_USB_MED_SET_CAMERA_ATTR_REQ,
+MSG_ID_USB_MED_SET_CAMERA_ATTR_CNF,
+MSG_ID_MED_USB_START_VIDEO_REQ, 
+MSG_ID_USB_MED_START_VIDEO_CNF,
+MSG_ID_USB_MED_CHANGE_VIDEO_IND,
+MSG_ID_USB_MED_START_STILL_IND,
+MSG_ID_USB_MED_START_VIDEO_IND,
+MSG_ID_MED_USB_DEVICE_STILL_REQ,
+MSG_ID_USB_MED_DEVICE_STILL_CNF,
+MSG_ID_MED_USB_PAUSE_REQ,
+MSG_ID_USB_MED_PAUSE_CNF,
+MSG_ID_MED_USB_RESUME_VIDEO_REQ,
+MSG_ID_USB_MED_RESUME_VIDEO_CNF,
+MSG_ID_USB_MED_STOP_IND,
+MSG_ID_USB_MED_ABORT_IND,
+MSG_ID_MED_USB_STOP_REQ,
+MSG_ID_USB_MED_STOP_CNF,
+MSG_ID_MED_USB_DISCONNECT_REQ,
+MSG_ID_MED_USB_CONNECT_REQ,
+
+
+
+/*USB video internal msg */
+MSG_ID_USB_ENUM_DONE,
+MSG_ID_USB_VIDEO_COMPLETE,
+MSG_ID_USB_VIDEO_DMA_DONE,
+MSG_ID_USB_VIDEO_CHANGE_SIZE,
+MSG_ID_USB_STILL_CAPTURE,
+MSG_ID_USB_STILL_COMPLETE,
+MSG_ID_USB_VIDEO_STILL_DMA_DONE,
+MSG_ID_USB_VIDEO_STILL_DMA_PARTIAL,
+MSG_ID_USB_VIDEO_INCALL_DMA_DONE,
+MSG_ID_USB_VIDEO_INCALL_TIMEOUT,
+MSG_ID_USB_VIDEO_INCALL_CHANGE_SIZE,
+MSG_ID_USB_VIDEO_ABORT,
+
+/* msgs between USB and MMI : PTP */
+MSG_ID_USB_MMI_DPS_DISCOVERY_IND,
+MSG_ID_USB_MMI_DPS_HREQUEST_IND,
+MSG_ID_MMI_USB_DPS_HREQUEST_CONF,
+MSG_ID_USB_MMI_DPS_HRESPONSE_IND,
+MSG_ID_MMI_USB_DPS_HRESPONSE_CONF,
+MSG_ID_MMI_USB_DPS_DREQUEST_REQ,
+MSG_ID_USB_MMI_DPS_DREQUEST_CONF,
+MSG_ID_MMI_USB_DPS_DRESPONSE_REQ,
+MSG_ID_USB_MMI_DPS_DRESPONSE_CONF,
+MSG_ID_USB_MMI_PTP_CONNECT_TO_PC_IND,
+MSG_ID_USB_MMI_PTP_OPEN_FILE_FAIL_IND,
+MSG_ID_USB_MMI_PTP_HOST_RESET_IND,
+MSG_ID_MMI_USB_PTP_HOST_RESET_CNF,
+MSG_ID_MMI_USB_START_JOB_REQ,
+MSG_ID_MMI_USB_CLOSE_JOB_REQ,
+
+/* USB image internal msg : PTP */
+MSG_ID_USB_PTPIMAGE_DATA_RX_DONE_CONF,
+MSG_ID_USB_PTPIMAGE_DATA_TX_DONE_CONF,
+MSG_ID_USB_PTPIMAGE_RESET_IND,
+
+/* msgs between USB and MTP : MTP */
+MSG_ID_USB_MTP_ENABLE_REQ,
+MSG_ID_USB_MTP_ENABLE_RSP,
+MSG_ID_USB_MTP_DISABLE_REQ,
+MSG_ID_USB_MTP_DISABLE_RSP,
+MSG_ID_USB_MTP_OPERATION_REQ,
+MSG_ID_USB_MTP_OPERATION_RSP,
+MSG_ID_USB_MTP_EVENT_IND,
+
+/* USB image internal msg : MTP */
+MSG_ID_USB_MTPIMAGE_DATA_RX_DONE_CONF,
+MSG_ID_USB_MTPIMAGE_DATA_TX_DONE_CONF,
+MSG_ID_USB_MTPIMAGE_RESET_IND,
+MSG_ID_USB_MTPIMAGE_CANCEL_IND,
+
+/*MSDC*/
+MSG_ID_MSDC_CARD_DETECT_IND,
+MSG_ID_SIM_PLUS_DETECT_IND,
+MSG_ID_MSDC2_CARD_DETECT_IND,
+MSG_ID_MSDC_CARD_DISPLAY_IND,
+
+/*USB charging*/
+MSG_ID_BMT_USB_IND,
+MSG_ID_BMT_USB_READ_CALI_DONE_IND,
+
+/*touch panel*/
+MSG_ID_TP_EVENT_IND,
+MSG_ID_TP_CALI_DONE,
+MSG_ID_TP_PEN_DOWN_IND,
+
+/*TDMB*/
+MSG_ID_TDMB_TURN_ON_REQUEST, MSG_ID_TDMB_CODE_BEGIN = MSG_ID_TDMB_TURN_ON_REQUEST,
+MSG_ID_TDMB_TURN_ON_CONFIRM,
+MSG_ID_TDMB_TURN_OFF_REQUEST,
+MSG_ID_TDMB_TURN_OFF_CONFIRM,
+MSG_ID_TDMB_SET_BAND_REQUEST,
+MSG_ID_TDMB_SET_BAND_CONFIRM,
+MSG_ID_TDMB_AUTO_SCAN_REQUEST,
+MSG_ID_TDMB_AUTO_SCAN_CONFIRM,
+MSG_ID_TDMB_STOP_AUTO_SCAN_REQUEST,
+MSG_ID_TDMB_STOP_AUTO_SCAN_CONFIRM,
+MSG_ID_TDMB_SET_FREQUENCY_REQUEST,
+MSG_ID_TDMB_SET_FREQUENCY_CONFIRM,
+MSG_ID_TDMB_SELECT_SERVICE_REQUEST,
+MSG_ID_TDMB_SELECT_SERVICE_CONFIRM,
+MSG_ID_TDMB_GET_SIGNAL_REQUEST,
+MSG_ID_TDMB_GET_SIGNAL_CONFIRM,
+MSG_ID_TDMB_START_ANNOUNCEMENT_REQUEST,
+MSG_ID_TDMB_START_ANNOUNCEMENT_CONFIRM,
+MSG_ID_TDMB_END_ANNOUNCEMENT_REQUEST,
+MSG_ID_TDMB_END_ANNOUNCEMENT_CONFIRM,
+MSG_ID_TDMB_SET_IDLE_REQUEST,
+MSG_ID_TDMB_SET_IDLE_CONFIRM,
+MSG_ID_TDMB_MCI_RECONFIG_INDICATION,
+MSG_ID_TDMB_GET_ENSEMBLE_INFO_REQUEST,
+MSG_ID_TDMB_GET_ENSEMBLE_INFO_CONFIRM,
+MSG_ID_TDMB_DEMOD_MCI_RECONFIG_INDICATION,
+MSG_ID_TDMB_DEMOD_ANNOUNCEMENT_INDICATION,
+MSG_ID_TDMB_ANNOUNCEMENT_INDICATION,
+MSG_ID_TDMB_SET_ANNOUNCEMENT_REQUEST,
+MSG_ID_TDMB_SET_ANNOUNCEMENT_CONFIRM,
+MSG_ID_TDMB_DATA_INDICATION,
+MSG_ID_TDMB_SERVICE_END_INDICATION,
+MSG_ID_TDMB_FIC_IND_INDICATION,
+MSG_ID_TDMB_MSC_IND_INDICATION,
+MSG_ID_TDMB_INT_ARRIVE,
+MSG_ID_TDMB_SIGNAL_STATUS,
+MSG_ID_TDMB_GET_TS_DATA_ERROR,
+MSG_ID_TDMB_SET_ENSEMBLE,
+MSG_ID_TDMB_CODE_END = MSG_ID_TDMB_SET_ENSEMBLE,
+
+/*CMMB*/
+MSG_ID_CMMB_TURN_ON_REQUEST, MSG_ID_CMMB_CODE_BEGIN = MSG_ID_CMMB_TURN_ON_REQUEST,
+MSG_ID_CMMB_TURN_ON_CONFIRM,
+MSG_ID_CMMB_TURN_OFF_REQUEST,
+MSG_ID_CMMB_TURN_OFF_CONFIRM,
+MSG_ID_CMMB_SET_BAND_REQUEST,
+MSG_ID_CMMB_SET_BAND_CONFIRM,
+MSG_ID_CMMB_AUTO_SCAN_REQUEST,
+MSG_ID_CMMB_AUTO_SCAN_CONFIRM,
+MSG_ID_CMMB_STOP_AUTO_SCAN_REQUEST,
+MSG_ID_CMMB_STOP_AUTO_SCAN_CONFIRM,
+MSG_ID_CMMB_SET_FREQUENCY_REQUEST,
+MSG_ID_CMMB_SET_FREQUENCY_CONFIRM,
+MSG_ID_CMMB_SELECT_SERVICE_REQUEST,
+MSG_ID_CMMB_SELECT_SERVICE_CONFIRM,
+MSG_ID_CMMB_PAUSE_SERVICE_REQUEST,
+MSG_ID_CMMB_PAUSE_SERVICE_CONFIRM,
+MSG_ID_CMMB_GET_SIGNAL_REQUEST,
+MSG_ID_CMMB_GET_SIGNAL_CONFIRM,
+MSG_ID_CMMB_GET_TABLE_REQUEST,
+MSG_ID_CMMB_GET_TABLE_CONFIRM,
+MSG_ID_CMMB_STREAM_INFO_TABLE_UPDATE_INDICATION,
+MSG_ID_CMMB_CONTROL_INFO_TABLE_UPDATE_INDICATION,
+MSG_ID_CMMB_SAVE_STREAM_TO_FILE_REQUEST,
+MSG_ID_CMMB_SAVE_STREAM_TO_FILE_CONFIRM,
+MSG_ID_CMMB_STOP_SAVE_STREAM_TO_FILE_REQUEST,
+MSG_ID_CMMB_STOP_SAVE_STREAM_TO_FILE_CONFIRM,
+MSG_ID_CMMB_GET_STREAM_FROM_FILE_REQUEST,
+MSG_ID_CMMB_GET_STREAM_FROM_FILE_CONFIRM,
+MSG_ID_CMMB_STOP_GET_STREAM_FROM_FILE_REQUEST,
+MSG_ID_CMMB_STOP_GET_STREAM_FROM_FILE_CONFIRM,
+MSG_ID_CMMB_INT_ARRIVE,
+MSG_ID_CMMB_DATA_INDICATION,
+MSG_ID_CMMB_UAM_CHECK_SUPPORT_REQUEST,
+MSG_ID_CMMB_UAM_CHECK_SUPPORT_CONFIRM,
+MSG_ID_CMMB_UAM_SET_SIMTYPE_REQUEST,
+MSG_ID_CMMB_UAM_SET_SIMTYPE_CONFIRM,
+MSG_ID_CMMB_UAM_GET_CMMBSN_REQUEST,
+MSG_ID_CMMB_UAM_GET_CMMBSN_CONFIRM,
+MSG_ID_CMMB_UAM_CHECK_GBAISNEED_REQUEST,
+MSG_ID_CMMB_UAM_CHECK_GBAISNEED_CONFIRM,
+MSG_ID_CMMB_UAM_GET_KEY_REQUEST,
+MSG_ID_CMMB_UAM_GET_KEY_CONFIRM,
+MSG_ID_CMMB_UAM_SET_KEY_REQUEST,
+MSG_ID_CMMB_UAM_SET_KEY_CONFIRM,
+MSG_ID_CMMB_UAM_CHECK_MSKISVALID_REQUEST,
+MSG_ID_CMMB_UAM_CHECK_MSKISVALID_CONFIRM,
+MSG_ID_CMMB_UAM_MSK_CHANGE_INDICATION,
+MSG_ID_CMMB_CODE_END,
+
+/*MBBMSDRV*/
+MSG_ID_MBBMS_DRV_INIT,
+MSG_ID_MBBMS_DRV_DEINIT,
+
+/*BTIF*/
+MSG_ID_BTIF_READY_TO_READ_IND,
+MSG_ID_BTIF_READY_TO_WRITE_IND,
+
+/* Prioximity - send the primitive to MMI Sensor Service */
+MSG_ID_SRV_SENSOR_PXS_DETECT_OBJECT_IND,
+
+
+/*CCCI - send the sap id to UPS */
+MSG_ID_UPS1_READY_TO_READ_IND,
+MSG_ID_UPS2_READY_TO_READ_IND,
+MSG_ID_UPS3_READY_TO_READ_IND,
+MSG_ID_UPS4_READY_TO_READ_IND,
+MSG_ID_UPS1_READY_TO_WRITE_IND,
+MSG_ID_UPS2_READY_TO_WRITE_IND,
+MSG_ID_UPS3_READY_TO_WRITE_IND,
+MSG_ID_UPS4_READY_TO_WRITE_IND,
+
+/*SDIOCORE*/
+MSG_ID_SDIOCORE_CODE_BEGIN,
+MSG_ID_SDIOCORE_ISR_REQ = MSG_ID_SDIOCORE_CODE_BEGIN,
+MSG_ID_SDIOCORE_UT_ISR_REQ,
+MSG_ID_SDIOCORE_UT_TX_REQ,
+MSG_ID_SDIOCORE_UT_RX_REQ_,
+MSG_ID_SDIOCORE_UT_LB_REQ_,
+MSG_ID_SDIOCORE_CODE_TAIL = MSG_ID_SDIOCORE_CODE_BEGIN + 20,
+
+
+
+/* IDC */
+MSG_ID_IDC_RX_DATA,
+
+/* LPM */
+MSG_ID_LPM,
+
+#if defined(IC_MODULE_TEST) || defined(__IC_SLT__)
+MSG_ID_DRVTEST_TDDSLT_START_REQ,
+MSG_ID_DRVTEST_TDDSLT_START_CNF,
+MSG_ID_DRVTEST_TDDSLT_DONE,
+#endif
+
+/* ESL */
+#if defined(__ESL_COSIM_LTE__)
+MSG_ID_IDLE_TASK_SEMAPHORE_REQ,
+#endif
+
+/* DPDL2 */
+#if defined(__DYNAMIC_POWER_DOWN_L2CACHE_WAY_SUPPORT__)
+MSG_ID_POWER_DOWN_WAY_REQ,
+MSG_ID_POWER_DOWN_LINE_REQ,
+#endif
+
+
+MODULE_MSG_END( MSG_ID_DRIVER_CODE_TAIL )
+
+#endif //_DRV_MSGID_H
diff --git a/mcu/interface/sap/drv/lhifcore_msgid.h b/mcu/interface/sap/drv/lhifcore_msgid.h
new file mode 100644
index 0000000..867cf50
--- /dev/null
+++ b/mcu/interface/sap/drv/lhifcore_msgid.h
@@ -0,0 +1,80 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   ccismcore_sap.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   define ccismcore messages
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 06 23 2017 cs.huang
+ * [MOLY00258471] [LHIFCore] Enable LHIF HW log interrupt to reduce polling times
+ * merge HMU part
+ *
+ * 03 13 2017 actory.ou
+ * [MOLY00233862] check in LHIF SLT and LHIF HW logging api
+ * [LHIFCORE] replace LHIF log api with EBS api but wrapped
+ * fix build error at DVT and MODIS due to EBS return type
+ *
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef LHIFCORE_MSGID_H
+#define LHIFCORE_MSGID_H
+
+MODULE_MSG_BEGIN(MSG_ID_LHIFCORE_CODE_BEGIN)
+MSG_ID_LHIFCORE_IT_START_GEN_DL_DATA,
+MSG_ID_LHIFCORE_IT_STOP_GEN_DL_DATA,
+MSG_ID_LHIFCORE_IT_GEN_DL_DATA_AGAIN,
+MSG_ID_LHIFCORE_LOG_DATA_DUMP,
+MSG_ID_LHIFCORE_POLLING,
+MODULE_MSG_END(MSG_ID_LHIFCORE_CODE_END)
+
+#endif  //	LHIFCORE_MSGID_H
diff --git a/mcu/interface/sap/drv/meut_msgid.h b/mcu/interface/sap/drv/meut_msgid.h
new file mode 100644
index 0000000..e6b1ad1
--- /dev/null
+++ b/mcu/interface/sap/drv/meut_msgid.h
@@ -0,0 +1,98 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *	meut_sap.h
+ *
+ * Project:
+ * --------
+ *	MAUI
+ *
+ * Description:
+ * ------------
+ *	MMI 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+	/* This is the default message type which is used to exchange most commands between host and target */
+#include "module_msg_range.h"
+
+#ifndef MEUT_MSG_H
+#define MEUT_MSG_H
+
+	/* This is the default message type which is used to exchange most commands between host and target */
+MODULE_MSG_BEGIN( MSG_ID_MEUT_MSG_CODE_BEGIN )
+ 	MSG_ID_DVT_DATA_MESSAGE = MSG_ID_MEUT_MSG_CODE_BEGIN,
+	/* This message type is used only when receiving large packet data i.e. data larger than say 1 kB */
+   MSG_ID_DVT_LARGE_DATA_MESSAGE,
+	/* This message type is used to indicate STATUS i.e. ACK or NACK */
+   MSG_ID_DVT_STATUS_MESSAGE,
+	/* This is used to request a configuration change or to request large data*/
+   MSG_ID_DVT_REQUEST_MESSAGE,
+	/* This is used to check for valid message type */
+   MSG_ID_DVT_MESSAGE_NUM,
+MODULE_MSG_END( MSG_ID_MEUT_MSG_CODE_TAIL )
+
+#endif  //MEUT_MSG_H
diff --git a/mcu/interface/sap/drv/wmt_msgid.h b/mcu/interface/sap/drv/wmt_msgid.h
new file mode 100644
index 0000000..472105e
--- /dev/null
+++ b/mcu/interface/sap/drv/wmt_msgid.h
@@ -0,0 +1,173 @@
+/*****************************************************************************
+*  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) 2007
+*
+*  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:
+ * ---------
+ *  wmt_sap.h
+ *
+ * Project:
+ * --------
+ *  MAUI
+ *
+ * Description:
+ * ------------
+ *  WMT SAP
+ *
+ * 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *==============================================================================
+ *******************************************************************************/
+/*****************************************************************************
+ * Include
+ *****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _WMT_MSG_H
+#define _WMT_MSG_H
+ 
+/****************************************************************************
+ *  Indication Messages: BT -> WMT
+ ****************************************************************************/
+
+MODULE_MSG_BEGIN( MSG_ID_WMT_MSG_CODE_BEGIN )
+MSG_ID_BT_WMT_CONN_STATUS_UPDATE_IND = MSG_ID_WMT_MSG_CODE_BEGIN,
+MSG_ID_BT_WMT_QUERY_RSSI_IND,
+MSG_ID_WMT_BT_SET_RX_RANGE_CNF,
+MSG_ID_WMT_WNDRV_SET_BWCS_IND,
+MSG_ID_WMT_BT_SET_DEFAULT_TX_POWER_CNF,
+MSG_ID_WMT_BT_UPDATE_CONN_TX_POWER_CNF,
+
+/****************************************************************************
+ *  Request Messages: WMT -> BT
+ ****************************************************************************/
+MSG_ID_WMT_BT_SET_BWCS_REQ,
+MSG_ID_WMT_BT_QUERY_RSSI_REQ,
+MSG_ID_WMT_BT_SET_RX_RANGE_REQ,
+MSG_ID_WMT_BT_SET_DEFAULT_TX_POWER_REQ,
+MSG_ID_WMT_BT_UPDATE_CONN_TX_POWER_REQ,
+/****************************************************************************
+ *  Indication Messages: WNDRV -> WMT
+ ****************************************************************************/
+MSG_ID_WNDRV_WMT_CONN_STATUS_UPDATE_IND,
+MSG_ID_WNDRV_WMT_QUERY_RSSI_IND,
+
+/****************************************************************************
+ *  Request Messages: WMT -> WNDRV
+ ****************************************************************************/
+MSG_ID_WMT_WNDRV_SET_BWCS_REQ,
+MSG_ID_WMT_WNDRV_QUERY_RSSI_REQ,
+MSG_ID_WMT_WNDRV_SET_ANT_REQ,
+MSG_ID_WMT_WNDRV_SET_FLOW_CTRL_REQ,
+MSG_ID_WMT_WNDRV_SET_FIXED_RX_GAIN_REQ,
+MSG_ID_WMT_WNDRV_SET_OMIT_LOW_RATE_REQ,
+
+/****************************************************************************
+ *  Request Messages: FM -> WMT
+ ****************************************************************************/
+MSG_ID_FM_WMT_SLEEP_REQ,
+
+/****************************************************************************
+ *  Request Messages: WMT -> FM
+ ****************************************************************************/
+MSG_ID_FM_WMT_SLEEP_CNF,
+
+/****************************************************************************
+ *  New Added Indication Messages: BT -> WMT
+ ****************************************************************************/
+MSG_ID_BT_WMT_HCI_EVENT_IND,
+MSG_ID_WMT_BT_HCI_CMD_CNF,
+
+/****************************************************************************
+*  New Added Request Messages: WMT -> BT
+****************************************************************************/
+MSG_ID_WMT_BT_HCI_CMD_REQ,
+
+/****************************************************************************
+ *  Indication Messages: WNDRV -> WMT
+ ****************************************************************************/
+MSG_ID_WNDRV_WMT_CM_MODE_UPDATE_IND,
+MODULE_MSG_END( MSG_ID_WMT_MSG_CODE_TAIL )
+
+#endif  //_WMT_MSG_H
diff --git a/mcu/interface/sap/drv_modid.h b/mcu/interface/sap/drv_modid.h
new file mode 100644
index 0000000..c2a40c8
--- /dev/null
+++ b/mcu/interface/sap/drv_modid.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) 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:
+ * ---------
+ *   drv_modid.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file provides the module index enum built.
+ *
+ * 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#ifndef DRIVER_MODULE_ID_H
+#define DRIVER_MODULE_ID_H
+
+#include "module_id_range.h"
+
+/* undef unused macro */
+#undef TASK_PRIORITY_MACRO
+#undef task_name
+#undef task_queue_name
+#undef task_priority
+#undef task_stack_size
+#undef null_task_create_entry
+#undef compatible_code
+#undef task_create_function
+#undef task_stack_internalRAM
+#undef task_external_queue_size
+#undef task_internal_queue_size
+#undef task_boot_mode
+#undef task_affinity_group
+#undef task_affinity_group_id
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+#undef task_index
+#undef task_module_map
+
+/* define all unused macros as empty */
+#define task_name(p1)
+#define task_queue_name(p1)
+#define task_priority(p1,p2)
+#define task_stack_size(p1)
+#define null_task_create_entry(p1)
+#define task_create_function(p1)
+#define task_stack_internalRAM(p1)
+#define task_external_queue_size(p1)
+#define task_internal_queue_size(p1)
+#define task_boot_mode(p1)
+#define task_affinity_group(p1)
+#define task_affinity_group_id(p1)
+#define task_index(p1)
+
+/* define the macro which provides the MOD ID*/
+#define task_module_map(task, mod)                                  mod,
+#define compatible_code(expr)                                       expr,
+#define MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM(mod)            mod,
+#define MODULE_ID_FOR_PRINT_TRACE(mod)                              mod,
+
+
+MODULE_MOD_BEGIN(MOD_ID_DRV_CODE_BEGIN)
+	#include "drv_task_config.h"
+/* customer add module id at here */
+MODULE_MOD_END(MOD_ID_DRV_CODE_TAIL)
+
+/* clean unuse defination */
+#undef task_module_map
+#undef compatible_code
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+
+
+#endif /* DRIVER_MODULE_ID_H */
diff --git a/mcu/interface/sap/drv_sap.h b/mcu/interface/sap/drv_sap.h
new file mode 100644
index 0000000..4b02545
--- /dev/null
+++ b/mcu/interface/sap/drv_sap.h
@@ -0,0 +1,63 @@
+#ifndef DRV_SAP_H
+#define DRV_SAP_H
+
+#include "sap_range.h"
+
+MODULE_SAP_BEGIN(SAP_ID_DRV_CODE_BEGIN)
+	AUDIO_SAP = SAP_ID_DRV_CODE_BEGIN,
+	BT_A2DP_SAP,
+	BT_APP_SAP,
+	BT_AVRCP_SAP,
+	BT_BIP_SAP,
+	BT_BPP_SAP,
+	BT_HFG_SAP,
+	BT_OBEX_SAP,
+	BT_PBAP_SAP,
+	BWCS_BT_SAP,	   
+	BWCS_WMT_SAP,
+	BWCS_WNDRV_SAP,
+	CAL_SAP, 
+	CAL_LOW_SAP=CAL_SAP,
+    //CAL_SAP,      
+	CMUX_UH_SAP,
+	DRVTEST_TL1_SAP,
+	DRVTEST_L4_SAP,
+	FMR_SAP,
+	FT_WNDRV_SAP,
+	GPS_FT_SAP,
+	GPS_MNL_SAP,
+	HOSTAP_ABM_SAP,
+	HOSTAP_WNDRV_SAP,
+	IRCOMM_APP_SAP,
+	IRDA_IRCOMM_SAP,
+	IRDA_OBEX_SAP,
+	MMI_NFC_SAP,
+	NFC_APP_NFC_SAP,
+	NFC_MMI_SAP,
+	NFC_NFC_APP_SAP,
+	NFC_NFC_READER_SAP,
+	NFC_READER_NFC_SAP,
+	RTC_GPS_SAP,
+	WMT_BT_SAP,
+	WMT_FMR_SAP,	   
+	WMT_WMT_SAP,
+	WMT_WNDRV_SAP,
+	WNDRV_BT_SAP,
+	WNDRV_MMI_SAP,	   
+	WNDRV_SUPC_SAP,
+	WNDRV_TCPIP_SAP,
+	WNDRV_WNDRV_SAP,
+	L1SP_LTECSR_SAP,
+#if defined(__ECALL_SUPPORT__)
+#if defined(__L5_SUPPORT__)
+	L1SP_L5UECALL_SAP,
+#endif
+#endif 
+
+#if defined(__ESL_COSIM_LTE__)
+  IDLE_SAP,
+#endif
+
+MODULE_SAP_END(SAP_ID_DRV_CODE_TAIL)
+		
+#endif /* DRV_SAP_H */
diff --git a/mcu/interface/sap/dummy.txt b/mcu/interface/sap/dummy.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/mcu/interface/sap/dummy.txt
diff --git a/mcu/interface/sap/hisr_modid.h b/mcu/interface/sap/hisr_modid.h
new file mode 100644
index 0000000..0a66556
--- /dev/null
+++ b/mcu/interface/sap/hisr_modid.h
@@ -0,0 +1,153 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   hisr_modid.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file provides the module index enum built.
+ *
+ * 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#ifndef HISR_MODULE_ID_H
+#define HISR_MODULE_ID_H
+#include "module_hisrid_range.h"
+#include "module_id_range.h"
+
+/* undef unused macro */
+#undef TASK_PRIORITY_MACRO
+#undef task_name
+#undef task_queue_name
+#undef task_priority
+#undef task_stack_size
+#undef null_task_create_entry
+#undef compatible_code
+#undef task_create_function
+#undef task_stack_internalRAM
+#undef task_external_queue_size
+#undef task_internal_queue_size
+#undef task_boot_mode
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+#undef task_index
+#undef task_module_map
+
+/* define all unused macros as empty */
+#define X_HISR_CONST_WITH_AFFINITY(a,b,c,d,e,f,g,h,i) 
+
+/* define the macro which provides the MOD ID*/
+#define X_HISR_MOD(a,h) h,
+#define MODULE_ID_FOR_PRINT_TRACE(mod) mod,
+
+
+MODULE_MOD_BEGIN(MOD_ID_HISR_CODE_BEGIN)
+    #include "hisr_config_internal.h"
+MODULE_MOD_END( MOD_ID_HISR_CODE_TAIL )
+
+
+/* clean unuse defination */
+#undef X_HISR_MOD
+#undef MODULE_ID_FOR_PRINT_TRACE
+
+#undef X_HISR_CONST_WITH_AFFINITY
+
+#endif /* HISR_MODULE_ID_H */
diff --git a/mcu/interface/sap/imcb_msgid.h b/mcu/interface/sap/imcb_msgid.h
new file mode 100644
index 0000000..c03c2d6
--- /dev/null
+++ b/mcu/interface/sap/imcb_msgid.h
@@ -0,0 +1,466 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   imcb_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 03 22 2022 yung-liang.tsou
+ * [MOLY00784440] [FeatureDevelopment][ALPSAR06354999][Gen97/98][AT&T][v21.3][CDR-LTE-1447][CDR-IMS-1210] IMS voice not available when PDN reject casue 28, 33
+ * .imcb msg id
+ *
+ * 12 16 2021 xin.ni
+ * [MOLY00774161] [mt2735][CS eCall][NG eCall][patch back] ecall patch back from NR15.R3.MD700.MP.ECAll.DEV
+ * 	
+ * 	.
+ *
+ * 12 06 2021 xin.ni
+ * [MOLY00774161] [mt2735][CS eCall][NG eCall][patch back] ecall patch back from NR15.R3.MD700.MP.ECAll.DEV
+ * 	SWRD interface Part.
+ * 	.
+ *
+ * 05 18 2021 ot_hui.tu
+ * [MOLY00389007] eCall over IMS IMC interface part
+ * 	
+ * 	.
+ *
+ * 08 26 2019 jani.manninen
+ * [MOLY00433041] [Gen97][EPSFB] IT related issues
+ * 	
+ * 	VMOLY.APOLLO.SQC - IMS 5G Voice Support Changes
+ *
+ * 08 14 2019 jani.manninen
+ * [MOLY00431826] [VONR] IMC Changes for 5G Voice Support - SAP
+ * 	
+ * 	VMOLY.V.5GVOICE.DEV - SAP - SWRD
+ *
+ * 01 08 2019 mika.leinonen
+ * [MOLY00367126] [Gen97][IMS] VoLTE porting
+ * Adding IMS interfaces to trace database.
+ *
+ * 12 31 2018 huifeng.jing
+ * [MOLY00375660] [IMS][Gen97 submarine] VTS interface developments
+ * remove build error.
+ *
+ * 12 29 2018 huifeng.jing
+ * [MOLY00375660] [IMS][Gen97 submarine] VTS interface developments
+ * ims_hif over tty.
+ *
+ * 12 21 2018 szu-chieh.chiu
+ * [MOLY00366884] [IMS][Gen97] IMCB related developments
+ * [Gen97] Tracing.
+ * 	1. DHL logging event: dump sim_context
+ *
+ * 12 18 2018 johnson.liu
+ * [MOLY00373083] [Gen97][Submarine][IMC]Pcscf address discovery via sim by imc
+ * patch back to dev.
+ *
+ * 12 11 2018 joni.huttula
+ * [MOLY00372130] [Gen97][IMS] MSG_ID change and some bug fix to run UT.
+ *
+ * 12 11 2018 joni.huttula
+ * [MOLY00372130] [Gen97][IMS] MSG_ID change and some bug fix to run UT.
+ *
+ ****************************************************************************/
+
+#ifndef _IMCB_MSGID_H_
+#define _IMCB_MSGID_H_
+
+#include "module_msg_range.h"
+
+/*------------------- IMCB_MSG_CODE_BEGIN---------------------*/
+MODULE_MSG_BEGIN( MSG_ID_IMCB_CODE_BEGIN )
+
+    MSG_ID_IMCB_BEGIN,
+
+    MSG_ID_IMCB_EX_BEGIN,
+
+    /* with IMSM */
+    MSG_ID_IMSM_IMCB_BEGIN,
+
+        MSG_ID_IMSM_IMCB_PDN_ACT_PROGRESSING_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_PDN_ACT_ACK_RSP,
+        MSG_ID_IMSM_IMCB_PDN_ACT_REJ_RSP,
+
+        MSG_ID_IMSM_IMCB_DEDICATED_BEARER_ACT_IND,
+        MSG_ID_IMSM_IMCB_DEDICATED_BEARER_ACT_ACK_RSP,
+        MSG_ID_IMSM_IMCB_DEDICATED_BEARER_ACT_REJ_RSP,
+        MSG_ID_IMSM_IMCB_DEDICATED_BEARER_ACT_NOTIFY_REQ,
+
+        MSG_ID_IMSM_IMCB_DEACT_ACK_RSP,
+        MSG_ID_IMSM_IMCB_DEACT_REJ_RSP,
+        MSG_ID_IMSM_IMCB_DEACT_NOTIFY_REQ,
+
+        MSG_ID_IMSM_IMCB_MODIFY_ACK_RSP,
+        MSG_ID_IMSM_IMCB_MODIFY_REJ_RSP,
+        MSG_ID_IMSM_IMCB_MODIFY_NOTIFY_REQ,
+
+        MSG_ID_IMSM_IMCB_PDN_BEARER_UPDATE_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_HANDOVER_START_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_HANDOVER_STOP_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_HANDOVER_IP_READY_NOTIFY_REQ,
+
+        MSG_ID_IMSM_IMCB_UPDATE_IPV4_GLOBAL_ADDR_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_UPDATE_IPV6_GLOBAL_ADDR_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_IRAT_WITHOUT_IP_CHANGE_REQ,
+
+        MSG_ID_IMSM_IMCB_PCO_UPDATE_REQ,
+
+        MSG_ID_IMSM_IMCB_RESET_SUGGESTION_TIMER_REQ,
+        MSG_ID_IMSM_IMCB_DEACT_IND,
+        MSG_ID_IMCB_IMSM_INPUT_MSG_PARA_CHECKING_FAIL_IND,
+        MSG_ID_IMSM_IMCB_MODIFY_IND,
+        MSG_ID_IMCB_IMSM_PDN_ACT_IND,
+        MSG_ID_IMSM_IMCB_PDN_ACT_IND,
+        MSG_ID_IMCB_IMSM_DEACT_IND,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_VIA_SIM_REJ_RSP,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_VIA_SIM_ACK_RSP,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_VIA_PCO_REJ_RSP,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_VIA_PCO_ACK_RSP,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_REJ_RSP,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_ACK_RSP,
+        MSG_ID_IMSM_IMCB_IND_TIMER_CANCEL,
+        MSG_ID_IMSM_IMCB_IND_TIMER_START,
+        
+    MSG_ID_IMSM_IMCB_END,
+
+    /* with IMSVT */
+    MSG_ID_IMSVT_IMCB_BEGIN,
+        /* Type4: IMSVT-IMCB TV { */
+        MSG_ID_IMSVT_IMCB_LOOP_TEST_IND,
+        MSG_ID_IMSVT_IMCB_LOOP_TEST_RSP,
+        MSG_ID_IMSVT_IMCB_COMM_ERROR,
+
+        MSG_ID_IMSVT_IMCB_GET_CAP_IND,
+        MSG_ID_IMSVT_IMCB_GET_CAP_RSP,
+
+        MSG_ID_IMSVT_IMCB_CONFIG_INIT_IND,
+        MSG_ID_IMSVT_IMCB_CONFIG_UPDATE_IND,
+        MSG_ID_IMSVT_IMCB_CONFIG_DEINIT_IND,
+
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_REQ,
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_CNF,
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_IND,
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_RSP,
+
+        MSG_ID_IMSVT_IMCB_CONFIG_INIT,
+        MSG_ID_IMSVT_IMCB_CONFIG_UPDATE,
+        MSG_ID_IMSVT_IMCB_GET_CAP_REQ,
+
+        MSG_ID_IMSVT_IMCB_MOD_BW_REQ,
+
+        MSG_ID_IMSVT_IMCB_HANDOVER_START_IND,
+        MSG_ID_IMSVT_IMCB_HANDOVER_STOP_IND,
+
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_CANCEL_REQ,
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_CANCEL_CNF,
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_CANCEL_IND,
+        MSG_ID_IMSVT_IMCB_EVENT_LOCAL_BW_READY_IND,
+
+        MSG_ID_IMSVT_IMCB_CALL_PROGRESS_IND,
+
+        MSG_ID_IMSVT_IMCB_PDN_HANDOVER_BEGIN_IND,
+        MSG_ID_IMSVT_IMCB_PDN_HANDOVER_END_IND,
+
+        /* } Type4: IMSVT-IMCB TV */
+    MSG_ID_IMSVT_IMCB_END,
+
+    /* with IMC */
+    MSG_ID_IMCB_IMC_BEGIN,
+
+        MSG_ID_IMCB_IMC_IPC_IND,
+        MSG_ID_IMCB_IMC_IPC_REQ,
+
+        MSG_ID_IMCB_IMC_LOOP_TEST_IND,
+        MSG_ID_IMCB_IMC_LOOP_TEST_RSP,
+
+        MSG_ID_IMCB_IMC_SET_TEST_MODE_REQ,
+        MSG_ID_IMCB_IMC_SET_TEST_MODE_CELL_INFO_REQ,
+
+        /* IMS SIM */
+        MSG_ID_IMCB_IMC_PCSCF_DISCOVERY_VIA_SIM_REQ,
+        MSG_ID_IMCB_IMC_PCSCF_DISCOVERY_VIA_SIM_CNF,
+        MSG_ID_IMCB_IMC_PCSCF_DISCOVERY_VIA_SIM_REJ,
+
+        /* WFC */
+        MSG_ID_IMCB_IMC_HANDOVER_START_REQ,
+        MSG_ID_IMCB_IMC_HANDOVER_STOP_REQ,
+
+        /* IMS Registration */
+        MSG_ID_IMCB_IMC_REQ_UPDATE_RT_SETTING,
+        MSG_ID_IMCB_IMC_IMS_REG_IND,
+        MSG_ID_IMCB_IMC_IMS_REG_REJ_RSP,
+        MSG_ID_IMCB_IMC_IMS_DEREG_IND,
+        MSG_ID_IMCB_IMC_IMS_REG_STATE_REQ,
+        MSG_ID_IMCB_IMC_IND_REG_AUTH_REQ,
+        MSG_ID_IMCB_IMC_REG_EMS_MODE_REQ,
+        MSG_ID_IMCB_IMC_CNF_REG_AUTH_REQ,
+        MSG_ID_IMCB_IMC_OOS_START_IND,
+        MSG_ID_IMCB_IMC_OOS_END_IND,
+        MSG_ID_IMCB_IMC_QUERY_STATE_REQ,
+        MSG_ID_IMCB_IMC_QUERY_STATE_CNF,
+        MSG_ID_IMCB_IMC_RAT_CHANGE_IND,
+        MSG_ID_IMCB_IMC_IMSVOPS_NOTIFICATION_IND,
+        MSG_ID_IMCB_IMC_RLM_EVENT_IND,
+
+        /* VILTE */
+        MSG_ID_IMCB_IMC_VT_CONNECT_REQ,
+        MSG_ID_IMCB_IMC_VT_CAP_QUERY_IND,
+        MSG_ID_IMCB_IMC_VT_CAP_QUERY_RSP,
+
+        /* SMS relay */
+        MSG_ID_IMCB_IMC_SMS_BEGIN,
+            MSG_ID_IMCB_IMC_SEND_SMS_IND,
+            MSG_ID_IMCB_IMC_SEND_SMS_RSP,
+            MSG_ID_IMCB_IMC_RECV_SMS_REQ,
+            MSG_ID_IMCB_IMC_RECV_SMS_CNF,
+            MSG_ID_IMCB_IMC_REL_SMS_IND,
+            MSG_ID_IMCB_IMC_RECV_SMS_ERROR_REQ,
+            MSG_ID_IMCB_IMC_ABORT_SEND_SMS_IND,
+            MSG_ID_IMCB_IMC_ABORT_RECV_SMS_IND,
+        MSG_ID_IMCB_IMC_SMS_END,
+
+        /* CC relay */
+        MSG_ID_IMCB_IMC_CC_BEGIN,
+            MSG_ID_IMCB_IMC_CC_CALL_PROGRESS_REQ,
+            MSG_ID_IMCB_IMC_CC_SIP_CALL_PROGRESS_IND,
+            MSG_ID_IMCB_IMC_CC_MEDIA_REQ,
+            MSG_ID_IMCB_IMC_CC_MO_CALL_IND,
+            MSG_ID_IMCB_IMC_CC_MO_CALL_RSP,
+            MSG_ID_IMCB_IMC_CC_MT_CALL_ABORT_REQ,
+            MSG_ID_IMCB_IMC_CC_MT_CALL_PRESENT_REQ,
+            MSG_ID_IMCB_IMC_CC_MT_CALL_PRESENT_CNF,
+            MSG_ID_IMCB_IMC_CC_MT_CALL_RING_REQ,
+            MSG_ID_IMCB_IMC_CC_MO_FORCE_HANGUP_IND,
+            MSG_ID_IMCB_IMC_CC_MT_ACCEPT_IND,
+            MSG_ID_IMCB_IMC_CC_MT_ACCEPT_RSP,
+            MSG_ID_IMCB_IMC_CC_MO_HANGUP_IND,
+            MSG_ID_IMCB_IMC_CC_MO_HANGUP_RSP,
+            MSG_ID_IMCB_IMC_SRVCC_STATUS_UPDATE_IND,
+            MSG_ID_IMCB_IMC_SRVCC_CONTEXT_TRANSFER_REQ,
+            MSG_ID_IMCB_IMC_CALL_CONTROL_IND,
+            MSG_ID_IMCB_IMC_CALL_CONTROL_RSP,
+            MSG_ID_IMCB_IMC_CC_MO_CONF_CALL_IND,
+            MSG_ID_IMCB_IMC_CC_MO_CONF_CALL_RSP,
+
+            /* VILTE */
+            MSG_ID_IMCB_IMC_CC_VT_ACTIVE_IND,
+            MSG_ID_IMCB_IMC_CC_MEDIA_MOD_REQ,
+            MSG_ID_IMCB_IMC_CC_VIDEO_CAP_REQ,
+
+            /* SDP info */
+            MSG_ID_IMCB_IMC_MEDIA_NEW,
+            MSG_ID_IMCB_IMC_MEDIA_UPDATE,
+            MSG_ID_IMCB_IMC_MEDIA_DEL,
+
+            /* VILTE */
+            MSG_ID_IMCB_IMC_CC_MT_VT_SPECIAL_ACCEPT_IND,
+            MSG_ID_IMCB_IMC_CC_MT_VT_SPECIAL_ACCEPT_RSP,
+			
+			/*ECALL*/
+            MSG_ID_IMCB_IMC_CC_ECALL_IN_BAND_MSD_TRANFER_RSP,
+            MSG_ID_IMCB_IMC_CC_ECALL_UPDATE_MSD_RSP,			
+        MSG_ID_IMCB_IMC_CC_END,
+
+        /* SS relay */
+        MSG_ID_IMCB_IMC_SS_BEGIN,
+            MSG_ID_IMCB_IMC_SS_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE_IND,
+            MSG_ID_IMCB_IMC_SS_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE_RSP,
+            MSG_ID_IMCB_IMC_SS_RELEASE_WAITING_OR_ALL_BG_CALLS_IND,
+            MSG_ID_IMCB_IMC_SS_RELEASE_WAITING_OR_ALL_BG_CALLS_RSP,
+            MSG_ID_IMCB_IMC_SS_RELEASE_ALL_FG_AND_RESUME_BG_CALL_IND,
+            MSG_ID_IMCB_IMC_SS_RELEASE_ALL_FG_AND_RESUME_BG_CALL_RSP,
+            MSG_ID_IMCB_IMC_SS_RELEASE_ALL_FG_AND_BG_CALLS_IND,
+            MSG_ID_IMCB_IMC_SS_RELEASE_ALL_FG_AND_BG_CALLS_RSP,
+            MSG_ID_IMCB_IMC_SS_EXPLICIT_CALL_TRANSFER_IND,
+            MSG_ID_IMCB_IMC_SS_EXPLICIT_CALL_TRANSFER_RSP,
+            MSG_ID_IMCB_IMC_SS_CREATE_CONFERENCE_CALL_IND,
+            MSG_ID_IMCB_IMC_SS_CREATE_CONFERENCE_CALL_RSP,
+            MSG_ID_IMCB_IMC_SS_ATH_REL_ALL_CALLS_IND,
+            MSG_ID_IMCB_IMC_SS_ATH_REL_ALL_CALLS_RSP,
+            MSG_ID_IMCB_IMC_SS_LIST_CURRENT_CALLS_IND,
+            MSG_ID_IMCB_IMC_SS_LIST_CURRENT_CALLS_RSP,
+            MSG_ID_IMCB_IMC_SS_PROGRESS_NOTIFY_REQ,
+            MSG_ID_IMCB_IMC_CC_NO_RTPPKT_IND,
+            MSG_ID_IMCB_IMC_CC_NO_RTPPKT_RSP,
+            MSG_ID_IMCB_IMC_SS_CONFERENCE_CONTROL_REQ,
+            MSG_ID_IMCB_IMC_SS_SUBSCRIBE_CONTROL_REQ,
+            MSG_ID_IMCB_IMC_SS_CONFERENCE_CONTROL_IND,
+            MSG_ID_IMCB_IMC_SS_CONFERENCE_CONTROL_RSP,
+            MSG_ID_IMCB_IMC_CC_INCOMING_RTPPKT_IND,
+        MSG_ID_IMCB_IMC_SS_END,
+
+        /* USSD */
+        MSG_ID_IMCB_IMC_SEND_USSD_IND,  //Send USSD Request to UA
+        MSG_ID_IMCB_IMC_SEND_USSD_RSP,  //Send USSD's Response from UA
+        MSG_ID_IMCB_IMC_RECV_USSD_REQ,  //URC from UA
+        MSG_ID_IMCB_IMC_USSD_URC_STATUS_IND, //Send URC Status to UA
+
+        /* CMCC Auto Test Tool */
+        MSG_ID_IMCB_IMC_START_EBI_FILTER_REQ,
+        MSG_ID_IMCB_IMC_STOP_EBI_FILTER_REQ,
+        MSG_ID_IMCB_IMC_START_BEARER_FILTER_REQ,
+        MSG_ID_IMCB_IMC_STOP_BEARER_FILTER_REQ,
+        MSG_ID_IMCB_IMC_REG_IPSEC_FLUSH_REQ,
+        MSG_ID_IMCB_IMC_REG_IPSEC_ADD_REQ,
+        MSG_ID_IMCB_IMC_REG_IPSEC_DELETE_REQ,
+
+        /* MD Lower Layer Error (Service request failed, AC Barred...etc) */
+        MSG_ID_IMCB_IMC_MD_LOWER_LAYER_ERR_IND,
+
+        MSG_ID_IMCB_IMC_TLV_PARA_SETTING_IND,
+
+        /* IMS Debug Information IMCB->IMC*/
+        MSG_ID_IMCB_IMC_IMS_DEBUG_INFO_REQ,
+
+        /* IMS Debug Information IMC->IMCB */
+        MSG_ID_IMCB_IMC_IMS_DEBUG_INFO_IND,
+
+        /* for ISIM read data segmentation */
+        MSG_ID_IMCB_IMC_READ_ISIM_NTF_REQ,
+
+        /* Handover event to LTECSR */
+        MSG_ID_IMCB_IMC_HANDOVER_BEGIN_REQ,
+        MSG_ID_IMCB_IMC_HANDOVER_END_REQ,
+
+        /* TTY   IMC -> IMCB */
+        MSG_ID_IMCB_IMC_CC_TTY_ENABLE_IND,
+
+        /* TTY   IMCB -> IMC */
+        MSG_ID_IMCB_IMC_CC_TTY_ENABLE_RSP,
+        MSG_ID_IMCB_IMC_CC_TTY_CAPABILITY_REQ,
+
+        /* For LTECSR, NOTIFY IMS the data plan event. */
+        MSG_ID_IMCB_IMC_CC_IMS_NOTIFY_IND,
+
+        /* IMC trigger IMCB release PDN */
+        MSG_ID_IMCB_IMC_RELEASE_PDN_IND,
+        MSG_ID_IMCB_IMC_RELEASE_PDN_RSP,
+
+        /* ECT IMC -> IMCB */
+        MSG_ID_IMCB_IMC_SS_ECT_IND,  // Send ECT request to UA
+
+        /* ECT IMCB -> IMC */
+        MSG_ID_IMCB_IMC_SS_ECT_RSP,  // Send ECT response from UA
+        MSG_ID_IMCB_IMC_SS_ECT_REQ,  // Send final ECT URC confirmation from UA
+
+        /* TLV from IMCB to IMC */
+        MSG_ID_IMCB_IMC_TLV_PARA_SETTING_REQ,
+
+        /*MO Call Domain Conflict flow*/
+        MSG_ID_IMCB_IMC_CC_MO_CALL_DOMAIN_CONFLICT_IND,
+        MSG_ID_IMCB_IMC_CC_MO_CALL_DOMAIN_CONFLICT_RSP,
+
+        /* ATCMD relay */
+        MSG_ID_IMCB_IMC_ATCMD_RELAY_REQ,
+        MSG_ID_IMCB_IMC_ATCMD_RELAY_IND,
+
+        /* RTT   IMC -> IMCB */
+        MSG_ID_IMCB_IMC_CC_RTT_OP_IND,
+
+        /* RTT   IMCB -> IMC */
+        MSG_ID_IMCB_IMC_CC_RTT_OP_RSP,
+
+        /* CDMA-less IMCB->IMC */
+        MSG_ID_IMCB_IMC_IMS_TIMER_STATUS_IND,
+
+        /* RF control message */
+        MSG_ID_IMCB_IMC_SRU_INFO_REQ,
+
+        /* PS_DATA_OFF IMC->IMCB */
+        MSG_ID_IMCB_IMC_PS_DATA_OFF_IND,
+
+        /* eVOLTE flow */
+        MSG_ID_IMCB_IMC_CC_MEDIA_ANBR_NOTIFY_IND, /* IMC -> IMCB */
+        MSG_ID_IMCB_IMC_CC_MEDIA_ANBR_NOTIFY_RSP, /* IMCB -> IMC */
+
+        /* UA query CS status from IMC */
+        MSG_ID_IMCB_IMC_CC_CS_AVAILABILITY_REQ,  /* IMCB -> IMC */
+        MSG_ID_IMCB_IMC_CC_CS_AVAILABILITY_CNF,  /* IMC -> IMCB */
+        MSG_ID_IMCB_IMC_SMS_CS_AVAILABILITY_REQ,  /* IMCB -> IMC */
+        MSG_ID_IMCB_IMC_SMS_CS_AVAILABILITY_CNF,  /* IMC -> IMCB */
+
+        MSG_ID_IMCB_IMC_IMS_RESET_SUGGESTION_TIMER_REQ, /* IMCB -> IMC */
+
+    MSG_ID_IMCB_IMC_END,
+
+    /* with NCCCI */
+    MSG_ID_WRAP_IMCB_IMCB_NCCCI_BEGIN,
+
+        MSG_ID_WRAP_IMCB_IMCB_READY_TO_WRITE_IND,
+        MSG_ID_WRAP_IMCB_IMCB_READ_DONE_IND,
+        MSG_ID_WRAP_IMCB_IMCB_COMM_ERROR,
+
+    MSG_ID_WRAP_IMCB_IMCB_NCCCI_END,
+
+    /* with ATP */
+    MSG_ID_ATP_IMCB_BEGIN,
+
+        MSG_ID_ATP_IMCB_INTER_RAT_STATUS_IND,
+
+    MSG_ID_ATP_IMCB_END,
+
+    MSG_ID_IMCB_EX_END,
+
+    MSG_ID_IMCB_IN_BEGIN,
+
+        /* IMCB Ctrl */
+        MSG_ID_IMCB_IMCB_BEGIN,
+            MSG_ID_IMCB_IMCB_DUMP_CONTEXT_IND,
+        MSG_ID_IMCB_IMCB_END,
+
+    MSG_ID_IMCB_IN_END,
+
+    MSG_ID_IMCB_END,
+
+MODULE_MSG_END( MSG_ID_IMCB_CODE_TAIL )
+
+
+#endif /* _IMCB_MSGID_H_ */
diff --git a/mcu/interface/sap/isr_modid.h b/mcu/interface/sap/isr_modid.h
new file mode 100644
index 0000000..b862a47
--- /dev/null
+++ b/mcu/interface/sap/isr_modid.h
@@ -0,0 +1,85 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   isr_modid.h
+ *
+ * Project:
+ * --------
+ *   MT6297
+ *
+ * Description:
+ * ------------
+ *   This file provides the ISR module index enum built.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *============================================================================
+ *             HISTORY
+ * Below this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *------------------------------------------------------------------------------
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#ifndef ISR_MODULE_ID_H
+#define ISR_MODULE_ID_H
+#include "module_id_range.h"
+
+/* define all unused macros as empty */
+#define X_ISR_MTWQ(a,b,c) 
+/* define the macro which provides the MOD ID*/
+#define X_ISR_CONST(a,b,c,d,e,f,g,h,mod_id,j) mod_id,
+
+MODULE_MOD_BEGIN(MOD_ID_LISR_CODE_BEGIN)
+#include "modem_isr_config.h"
+MODULE_MOD_END( MOD_ID_LISR_CODE_TAIL )
+
+/* clean unuse defination */
+#undef X_ISR_CONST
+#undef X_ISR_MTWQ
+
+#endif /* HISR_MODULE_ID_H */
diff --git a/mcu/interface/sap/md/MD95/_el2_msgid.h b/mcu/interface/sap/md/MD95/_el2_msgid.h
new file mode 100644
index 0000000..db12741
--- /dev/null
+++ b/mcu/interface/sap/md/MD95/_el2_msgid.h
@@ -0,0 +1,666 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   el2_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   
+ *
+ * Author:
+ * -------
+ *   
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 05 15 2019 tc.chang
+ * [MOLY00406246] [Gaming][KoG][L2] Gen97 Gaming enhancement.
+ *
+ * 07 18 2018 steve.kao
+ * [MOLY00339307] The handling of energy depletion attack by STMSI paging from fake cell
+ * Inactivity Detection Timer 2
+ *
+ * 07 10 2018 slifer.hsueh
+ * [MOLY00337915] [MT6295][EL2] Fast retransmission of RLC STATUS PDU upon UL HARQ failure
+ * Define message id for STATUS PDU feedback
+ *
+ * 06 29 2018 guang-yu.zheng
+ * [MOLY00335879] [MT6295] ML1S multiple TAG flow adding
+ * EMAC-ML1S sTAG TA flow development
+ *
+ * 06 20 2018 kung-hao.chung
+ * [MOLY00334174] [MT6295][EL2] Remove RB suspend/resume ILM between EPDCP and ERLCUL
+ * remove two unsused msgids
+ *
+ * 06 11 2018 jia-shi.lin
+ * [MOLY00319373] [MT6295] recommended bit rate feature
+ * recommended bit rate feature: upcm-emac interface
+ *
+ * 04 17 2018 nicole.hsu
+ * [MOLY00320104] [ICD] Patch back to UMOLYE
+ * [UMOLYE][EL2ICD] el2icd framework
+ *
+ * 04 17 2018 nicole.hsu
+ * [MOLY00320104] [ICD] Patch back to UMOLYE
+ * [UMOLYE][EL2ICD] el2icd framework
+ *
+ * 04 13 2018 slifer.hsueh
+ * [MOLY00308368] [MT6763][Bianco][O1][MP2][TMO][WW FT][United States][Seattle][Nokia][4GMM][F4L][Data][HTTP][UL] HTTP UL Average Throughput Fail by 0.186 as compared to REF LG G4 device during Datum Exp1 Round3 on 30th Jan in Poor Signal Static condition
+ * Define message id for RB poll request
+ *
+ * 03 19 2018 guang-yu.zheng
+ * [MOLY00313850] [MT6295] MML2 DVFS control feature development
+ * MML2 DVFS control and MCU DVFS re-org
+ *
+ * 01 09 2018 timothy.yao
+ * [MOLY00300298] [PVT must resolve] ·L«H??¥]ºC?? - el2 msg
+ * sending pdcp invalid control pdu to avoid entering sleep. (UMOLYA - common)
+ *
+ * 11 06 2017 mf.jhang
+ * [MOLY00272042] [MT6295][93/95 re-arch] Add EMAC ML1S interface
+ * .
+ *
+ * 08 18 2017 mf.jhang
+ * [MOLY00272042] [MT6295 Dev] Add EMAC ML1S interface
+ * add EMAC ML1S interface.
+ * 10 03 2017 jia-shi.lin
+ * [MOLY00281754] [MT6763] UL HARQ early close for volte low power enhancement
+ * early ul harq close for volte low power
+ *
+ * 10 03 2017 jia-shi.lin
+ * [MOLY00281754] [MT6763] UL HARQ early close for volte low power enhancement
+ * early ul harq close for volte low power
+ *
+ * 10 03 2017 jia-shi.lin
+ * [MOLY00281754] [MT6763] UL HARQ early close for volte low power enhancement
+ * early ul harq close for volte low power
+ *
+ * 09 20 2017 nicole.hsu
+ * [MOLY00279184] [PCT][Anritsu][CAG50C][E40][7.1.1.2] fail
+ * [TRUNK] LCID vs. support release handling
+ *
+ * 08 22 2017 cammie.yang
+ * [MOLY00269598] [Gen93]TPB/Mobility Ctrl patch check in
+ * [TRUNK][Merged from R1][EPDCP][HST] set vip bit and notify VoLTE bearer for ERLCUL
+ *
+ * 08 03 2017 wen-jiunn.liu
+ * [MOLY00268551] Task batch scheduling for LTE Low power
+ * [EL2] Task Rescheduling for Low Power Polling Tick Change
+ *
+ * 08 03 2017 wen-jiunn.liu
+ * [MOLY00268551] Task batch scheduling for LTE Low power
+ * [EL2] Task Rescheduling for Low Power Polling Tick Change
+ *
+ * 07 28 2017 nicole.hsu
+ * [MOLY00267509] [MT6763][Bianco][N1][MTBF][PHONE][Overnight][HQ][Lab][Ericsson][ASSERT] file:mcu/common/driver/dpcopro/src/dpcopro_mmu_drv.c line:1616
+ * [TRUNK] move LMAC HARQ reset to el2pow
+ *
+ * 07 24 2017 nicole.hsu
+ * [MOLY00266293] [Blocking][MT6763][Bianco][N1][India FT][Mumbai][WW FT][eMBMS][RJIO]  md1:(USIP1_USIP0) [ASSERT] file:md32/usip/brp/modem/lte/top/src/4g_top_irq.c line:2004
+ * [TRUNK] fix Poll control of TXLISR and EL2POW
+ *
+ * 07 18 2017 nicole.hsu
+ * [MOLY00263936] [BIANCO][MT6763][RDIT][PHONE][GCF][TS8980][FDD B7,TC 5.2.1]Handoff delay exceed 190ms when LTE handoff to WCDMA
+ * [TRUNK] power on Copro before TXLISR handle SCH_CLOSE (for LMAC HARQ RESET)
+ *
+ * 07 17 2017 peter.yu
+ * [MOLY00263749] [VOLTE][HST][Anite][02.v01.020][5.1.1][E39]FAIL.No MOS score returned. Error code: -5.
+ * Overwirte unreasonable RLC configuration - t-Reordering timer.
+ *
+ * 07 06 2017 slifer.hsueh
+ * [MOLY00261868] [6293]UL SIT new handling
+ * Add message id for EL2 RB sync procedure
+ *
+ * 06 01 2017 nicole.hsu
+ * [MOLY00254331] [MT6763][EM] EL2EM maintenance and EMAC EM update
+ * [EMAC] EM update
+ * [EL2EM] add trace and fix report mechanism
+ *
+ * 06 01 2017 steve.kao
+ * [MOLY00252964] [6293] API update for LTECSR VoLTE EBI indication
+ * 	
+ * 	[UMOLYA][TRUNK] API update for LTECSR VoLTE EBI indication
+ *
+ * 05 16 2017 nicole.hsu
+ * [MOLY00249804] [BIANCO][MT6763][RDIT][FT][FDD][HK][SIM1:CMHK][SIM2:SMT][Overnight][ASSERT] file:mcu/common/driver/dpcopro/src/l2_4g_dl_lmac.c line:214
+ * 1. enable el2pow
+ * 2. interface change for sch_close
+ *
+ * 04 25 2017 slifer.hsueh
+ * [MOLY00244795] [BIANCO][MT6763][RDIT][NVIOT][FDD][Nokia][4G] Assert fail: dpcopro_mmu_drv.c 1303 - IPCORE
+ * Add EL2 message id for RB lock/unlock
+ *
+ * 04 06 2017 nicole.hsu
+ * [MOLY00226654] [MT6293][EL2POW] EL2 L2Copro power control
+ * [EL2POW]
+ * - Basic function
+ * - L+X, L+L
+ * - Meta mode, L1S
+ * - UT
+ *
+ * 03 13 2017 nicole.hsu
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * ML1S
+ * - Force NEWTX when ML1S request is sent
+ *
+ * 02 24 2017 mf.jhang
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * .Add ML1S ILM handler
+ *
+ * 02 10 2017 steve.kao
+ * [MOLY00228972] [UMOLYA][EPDCP][R-SIM] Interface with ERRC for Remote SIM
+ * [EPDCP][R-SIM] Interface with ERRC for Remote SIM.
+ *
+ * 02 06 2017 peter.yu
+ * [MOLY00207733] [MT6293][EL2] ERLCDL development
+ * [M-SIM] Sync R-SIM related interfaces, remove redundant message IDs related to ERLC.
+ *
+ * 01 24 2017 nicole.hsu
+ * [MOLY00226654] [MT6293][EL2POW] EL2 L2Copro power control
+ * Add EL1 msgid and temp ilm handling
+ *
+ * 01 16 2017 eddie.wang
+ * [MOLY00210650] [MT6293][UMOLYA TRUNK] EMAC maintenance
+ * [MSIM] Add RSVAS suspend msg id
+ *
+ * 01 05 2017 nicole.hsu
+ * [MOLY00223067] [MT6293] EL2 EM implementation
+ * EL2EM framework, merge to TRUNK
+ *
+ * 12 26 2016 mf.jhang
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * merge DVFS IF code
+ *
+ * 11 14 2016 chih-cheng.yang
+ * [MOLY00213122] [MT6293][EL2] EL2 FPGA IT phase II source code integration
+ * 1. refine  RB/MBMS RSMT release
+ * 2. refine epdcp polling rsmt
+ * 2. add coverage
+ *
+ * 10 28 2016 jia-shi.lin
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * emac timing report for volte dsp
+ *
+ * 10 25 2016 chih-cheng.yang
+ * [MOLY00209240] [MT6293][EL2] EL2 FPGA IT phase 1 source codes integration
+ * new sap and message id for ERLCDL to notify EPDCP to release RSMT when releasing RB
+ *
+ * 10 06 2016 ville.pukari
+ * [MOLY00150835] ML1S Test Environment Support
+ * 	
+ * 	[UMOLYA] Sync code from UMOLY Trunk CL2228706, CL2455350, CL2529740 and CL2821387
+ *
+ * 08 25 2016 jia-shi.lin
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * EMAC EL1 interface change
+ *
+ * 08 16 2016 wen-jiunn.liu
+ * [MOLY00194298] [UMOLYA] EL2 + EMAC Code Review
+ * Sync to Latest PS.DEV (CL-2728660)
+ * 
+ * CL-2728660 - el2 vrb virtual space shortage handling framework
+ *
+ * 08 16 2016 wen-jiunn.liu
+ * [MOLY00194298] [UMOLYA] EL2 + EMAC Code Review
+ * el2 vrb virtual space shortage handling framework
+ * 08 09 2016 nicole.hsu
+ * [MOLY00196065] [MT6293][folder structure] Move EL1/EL2 files from LTE domain to SWRD domain
+ * 93 EL2 others
+ *
+ *
+ * 07 27 2016 jeremy.chen
+ * [MOLY00190683] [UMOLYA][6293] EL2 merge back to UMOLYA TRUNK & PS DEV
+ * [common][OA domain] merge from UESIM CBr
+ *
+ * 07 19 2016 eddie.wang
+ * [MOLY00191921] Sync UMOLY to UMOLYA.PS.DEV
+ * Sync el2_msgid.h from UMOLY CL2582165 CL2529014
+ *
+ * 06 28 2016 eddie.wang
+ * [MOLY00187041] Sync errc_emac_msg.h from UMOLY to UMOLYA
+ * Add MSG_ID_ERRC_EMAC_MEAS_GAP_IND
+ *
+ * 03 15 2016 ryan.ou
+ * [MOLY00162291] [MT6292] EMAC code sync from LR11 to UMOLY
+ * CL1867761, [MOLY00151000] [MT6755] SRVCC Enhancement.
+ *
+ * 01 11 2016 kathie.ho
+ * [MOLY00156229] [MT6292] Code sync from MT6291: AuDRX
+ * .
+ *
+ * 01 09 2016 nienteh.hsu
+ * [MOLY00159548] [6292] ERLC code sync from LR11 to UMOLY (2015/12) 
+ * SWRD domain part	
+ * 	.
+ *
+ * 12 30 2015 antti.karjalainen
+ * [MOLY00153335] UL bucket management for UL CA and 64QAM: EPDCP
+ *
+ * 11 27 2015 ville.pukari
+ * [MOLY00150835] ML1S Test Environment Support:
+ * 	
+ * 	EMAC support for ML1S Test Mode
+ *
+ * 07 16 2015 chen-wei.wang
+ * [MOLY00118157] [TK6291]ERLC code maintain
+ * ERLC status proh timer modification
+ *
+ * 07 06 2015 shengyi.ho
+ * [MOLY00125586] [TK6291E1][MVTV-D][4G][TDD][TDD_MIMO_7.2]assert fail : el1tx.c 731
+ * 1) add EMAC_EL2TASK_LOCK/UNLOCK_POWER_REQ
+ *
+ * 06 18 2015 mingtsung.sun
+ * [MOLY00121332] [TK6291] 4G EAS low power check in
+ * add QBM/EL2 power control messages for LogDMA
+ *
+ * 06 15 2015 sc.tung
+ * [MOLY00121440] [TK6291] eL2 development check in CR
+ * 	Add MSG_ID_ERRC_C_RNTI_RA_PROBING_REQ for probing req.
+ *
+ * 06 15 2015 mingtsung.sun
+ * [MOLY00121332] [TK6291] 4G EAS low power check in
+ * eL2 low power and ePDCP code sync: el2_msgid.h
+ *
+ * 06 03 2015 mingtsung.sun
+ * [MOLY00118161] [MT6291] EPDCP CR Sync - Early reestablishment to prevent certain kind of VoLTE call drop
+ * RD domain
+ *
+ * 03 18 2015 chen-wei.wang
+ * [MOLY00099525] [TK6291] EMAC MDT feature check-in
+ * interface file check-in
+ *
+ * 02 13 2015 mingtsung.sun
+ * [MOLY00091822] RATDM reorganization
+ * .
+ *
+ * 12 16 2014 yuting.chen
+ * [MOLY00084807] [MT6291_DEV] EL2 Low Power Flow
+ * .
+ *
+ * 12 12 2014 yk.liu
+ * [MOLY00086350] [MT6291][L234 P2P] Enable EL2 PDU drop, ping no reply after 30min
+ * 	.
+ *
+ * 11 11 2014 yiting.cheng
+ * [MOLY00084042] [UMOLY] merge UMOLY_DEV to UMOLY trunk
+ * .
+ *
+ * 10 28 2014 andrew.wu
+ * [MOLY00079018] [MT6291_DEV] ePDCP batch I UT related modification
+ * Merging
+ * 	
+ * 	//UMOLY_CBr/andrew.wu/MT6291_DEV_EPDCPDEVW1427P1/mcu/common/interface/sap/md/errc_msgid.h
+ * 	
+ * 	to //UMOLY/DEV/MT6291_DEV/mcu/common/interface/sap/md/errc_msgid.h
+ *
+ * 09 18 2014 shengyi.ho
+ * [MOLY00077592] [TK6291] code sync from CBr to TK6291_DEV - emac
+ * .
+ *
+ * 08 26 2014 sh.yang
+ * [MOLY00077290] [TK6291_DEV] ILM/Event scheduler wrapper for LISR2HISR removal
+ * .
+ *
+ * 08 22 2014 jy.ou
+ * [MOLY00076104] [TK6291] EMAC & ERLC UT framework and ERLC UT cases
+ * .
+ *
+ * 08 21 2014 mingtsung.sun
+ * [MOLY00072902] [TK6291][DEV] LTT unit test framework
+ * Merging
+ *      
+ *     //UMOLY_CBr/eric.hsieh/TK6291_DEV_ESL/mcu/common/interface/sap/...
+ *      
+ *     to //UMOLY/DEV/TK6291_DEV/mcu/common/interface/sap/...
+ *
+ * 08 14 2014 andrew.wu
+ * [MOLY00075397] [TK6291_DEV] code sync MOLY00072445 from MOLY to TK6291_DEV
+ * Interface check-in for EPDCP_EMAC_LEAVE_DRX
+ *
+ * 07 30 2014 yiting.cheng
+ * [MOLY00073830] [TK6291_DEV] check-in TK6291 modification
+ * modify sap
+ *
+ * 07 29 2014 andrew.wu
+ * [MOLY00073873] [TK6291_DEV] EPDCP-ERRC interfaces check-in
+ * add ERRC_EPDCP_MTCH_PC_REQ
+ *
+ * 07 28 2014 nienteh.hsu
+ * [MOLY00073836] [TK6291][ERRC][CHM] LTE-A CHM development code check-in
+ *     .
+ *
+ * 01 15 2014 slifer.hsueh
+ * [MOLY00053104] [MT6290E2][NAS RTD][MM][FDD] Assert fail: driver/l2copro/cipher/src/cipher_common.c 196 - L2COPRO
+ * Merge codes related to L2 copro delay power off back to MOLY TRUNK in OA domain
+ *
+ * 01 06 2014 mf.jhang
+ * [MOLY00051983] [MT6582LTE][WWFT][Germany][Vodafone]Ping RTT is more than benchmark
+ * Add HOST_DATA_READY_IND
+ *
+ * 12 03 2013 lewis.yu
+ * [MOLY00048832] power down/on in EL2 task context and refine the flow
+ * .
+ *
+ * 09 26 2013 lewis.yu
+ * [MOLY00039195] [MT6290] [Low Power] LTE L2 copro power down in LTE flight mode
+ * .
+ *
+ * 07 12 2013 stanleyhy.chen
+ * [MOLY00029602] [New Feature] NBR_CELL_INFO and TA_INFO related interfaces
+ * TA_INFO and NBR_CELL_INFO interfaces for LPP feature
+ *
+ * 05 15 2013 moja.hsu
+ * [MOLY00007625] Maintain code
+ * add el2 message for ERT task to ERT HISR.
+ *
+ * 03 20 2013 jeremy.chen
+ * [MOLY00007127] [MT7208] EL2 enhancement in MOLY
+ * add IDC-related interface
+ *
+ * 02 26 2013 jeremy.chen
+ * [MOLY00007127] [MT7208] EL2 enhancement in MOLY
+ * add MSG_ID_ERLCUL_EPDCP_SRB_DATA_CNF.
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef __EL2_MSGID_H
+#define __EL2_MSGID_H
+
+
+MODULE_MSG_BEGIN( MSG_ID_EL2_CODE_BEGIN )
+
+    /*------------------- EL2_MSG_CODE_BEGIN---------------------*/
+
+    //////////////////////////////////////////////
+    // Destination: EPDCP                       //
+    //////////////////////////////////////////////
+
+    // LTECSR --> EPDCP
+    MSG_ID_LTECSR_EPDCP_VOLTE_EBI_NTF,
+
+    // UPCM --> EPDCP
+    MSG_ID_UPCM_EPDCP_NETIF_BIND_NTF = MSG_ID_EL2_CODE_BEGIN,
+    MSG_ID_UPCM_EPDCP_NETIF_UNBIND_NTF,
+
+    // ERRC --> EPDCP
+    MSG_ID_ERRC_EPDCP_CONFIG_REQ,
+    MSG_ID_ERRC_EPDCP_SWITCH_VIRTUAL_CONNECTED_REQ,
+    MSG_ID_ERRC_EPDCP_DCCH_DATA_REQ,
+    MSG_ID_ERRC_EPDCP_DCCH_DATA_RES,
+    MSG_ID_ERRC_EPDCP_TEST_REQ,
+    MSG_ID_ERRC_EPDCP_CNTINFO_REQ,
+    //MSG_ID_ERRC_EPDCP_MTCH_PC_REQ,
+    MSG_ID_ERRC_EPDCP_DETECTION_TIMER_START_REQ,
+    MSG_ID_ERRC_EPDCP_DETECTION_TIMER_2_START_REQ,
+
+    // ERLC-UL --> EPDCP
+    MSG_ID_ERLCUL_EPDCP_SRB_DATA_CNF,
+    MSG_ID_ERLCUL_EPDCP_RELEASE_IND,
+    MSG_ID_ERLCUL_EPDCP_RB_RELEASE_IND,
+    MSG_ID_ERLCUL_EPDCP_RB_SYNC_CNF,
+    MSG_ID_ERLCUL_EPDCP_RB_LOCK_CNF,
+
+    // ERLC-DL --> EPDCP
+    MSG_ID_ERLCDL_EPDCP_MBMS_START_IND,
+    MSG_ID_ERLCDL_EPDCP_MBMS_END_IND,
+
+    // EPDCP --> EPDCP
+    //MSG_ID_EPDCP_EPDCP_CTRL_PDU_IND,
+    //MSG_ID_EPDCP_EPDCP_DL_FLUSH_DONE_IND,
+
+    // UPCM --> EPDCP
+    MSG_ID_UPCM_EPDCP_SEND_INV_CTRL_PDU,
+
+    // EMAC --> EPDCP
+    MSG_ID_EMAC_EPDCP_TDM_START_IND,
+    MSG_ID_EMAC_EPDCP_TDM_END_IND,
+    MSG_ID_EMAC_EPDCP_MAX_UL_TB_IND,
+
+    // WLAN --> EPDCP
+    MSG_ID_WLAN_EPDCP_CTRL_MSG_ID,
+    
+    // EL2 --> EPDCP
+    MSG_ID_EL2_EPDCP_VRB_VA_SHORTAGE_NTF,
+
+    //////////////////////////////////////////////
+    // Destination: ERLC-UL                     //
+    //////////////////////////////////////////////
+
+    // ERRC --> ERLC-UL
+    MSG_ID_ERRC_ERLCUL_CONFIG_REQ,
+    MSG_ID_ERRC_ERLCUL_SRB1_ACK_REQ,
+    MSG_ID_ERRC_ERLCUL_SWITCH_VIRTUAL_CONNECTED_REQ,
+
+    // EPDCP --> ERLC-UL
+    MSG_ID_EPDCP_ERLCUL_DISCARD_REQ,
+    MSG_ID_EPDCP_ERLCUL_VIP_DATA_NTF,
+    MSG_ID_EPDCP_ERLCUL_STATUS_PDU_NTF,
+    MSG_ID_EPDCP_ERLCUL_RB_SYNC_REQ,
+    MSG_ID_EPDCP_ERLCUL_RB_POLL_REQ,
+    MSG_ID_EPDCP_ERLCUL_RB_LOCK_REQ,
+    MSG_ID_EPDCP_ERLCUL_RB_UNLOCK_NTF,
+    MSG_ID_EPDCP_ERLCUL_VOLTE_RB_IDX_NTF,
+
+    // ERLCDL --> ERLC-UL
+    MSG_ID_ERLCDL_ERLCUL_STATUS_PDU_NTF,
+
+    //////////////////////////////////////////////
+    // Destination: ERLC-DL                     //
+    //////////////////////////////////////////////
+
+    // ERRC --> ERLC-DL
+    MSG_ID_ERRC_ERLCDL_CONFIG_REQ,
+    MSG_ID_ERRC_ERLCDL_SWITCH_VIRTUAL_CONNECTED_REQ,
+    MSG_ID_ERRC_ERLCDL_TEST_REQ,
+    MSG_ID_ERRC_ERLCDL_MTCH_PC_REQ,
+
+    // EL2 --> ERLC-DL
+    MSG_ID_EL2_ERLCDL_VRB_VA_SHORTAGE_NTF,
+
+    // EPDCP --> ERLC-DL
+    MSG_ID_EPDCP_ERLCDL_VOLTE_RB_IDX_NTF,
+
+    // ERLC-UL --> ERLC-DL
+    MSG_ID_ERLCUL_ERLCDL_STATUS_FBK_NTF,
+    
+    //////////////////////////////////////////////
+    // Destination: EMAC                        //
+    //////////////////////////////////////////////
+
+    MSG_ID_ERRC_EMAC_CONFIG_REQ,
+    MSG_ID_ERRC_EMAC_CCCH_DATA_REQ,
+    MSG_ID_ERRC_EMAC_TA_INFO_REQ,
+    MSG_ID_ERRC_EMAC_ESTFAIL_REPORT_REQ,
+    MSG_ID_ERRC_EMAC_C_RNTI_RA_PROBING_REQ,
+    MSG_ID_ERRC_EMAC_DRX_INC_GAP_REQ,
+    MSG_ID_ERRC_EMAC_MEAS_GAP_IND,
+    MSG_ID_ERRC_EMAC_SUPPORT_CAPABILITY_IND,
+
+    /// EPDCP --> EMAC
+    MSG_ID_EPDCP_EMAC_LEAVE_DRX,
+    MSG_ID_EPDCP_EMAC_VOLTE_RB_IDX_REQ,
+    MSG_ID_EPDCP_EMAC_VOLTE_DATA_REQ,
+
+    /// ERLCDL --> EMAC
+    MSG_ID_ERLCDL_EMAC_DL_VOLTE_NOTIFY_REQ,
+
+    // EMAC_UT --> EMAC
+    MSG_ID_EMAC_UT_EMAC_TEST_CMD,
+
+    // EL1 --> EMAC
+    MSG_ID_EMAC_EL1_PHY_INFO_IND,
+    MSG_ID_EMAC_EL1_RA_GAP_STOP_CNF,
+    MSG_ID_EMAC_EL1_RA_GAP_RESUME_CNF,
+    MSG_ID_EMAC_EL1_RNTI_UPDATE_CNF,
+    MSG_ID_EMAC_EL1_DRX_CTRL_CNF,
+    MSG_ID_EMAC_EL1_SCELL_NOTIFY_CNF,
+    MSG_ID_EMAC_EL1_HOST_DATA_CNF,
+    MSG_ID_EMAC_EL1_HOST_DATA_READY_IND,
+    MSG_ID_EMAC_EL1_RA_RESTART_IND,
+    MSG_ID_EMAC_EL1_IDC_TDM_IND,
+
+    // ML1S SW --> EMAC
+    MSG_ID_ML1S_EMAC_TEST_MODE_ENABLE_REQ,
+    MSG_ID_ML1S_EMAC_CONN_EST_RA_REQ,    
+    MSG_ID_ML1S_EMAC_DL_DATA_DISCARD_REQ,
+    MSG_ID_ML1S_EMAC_MAC_CE_TRIGGER_REQ,
+    MSG_ID_ML1S_EMAC_TBS_MISMATCH_FORCE_NEWTX_REQ,
+    MSG_ID_ML1S_EMAC_HO_RA_TRIGGER_REQ,
+    MSG_ID_ML1S_EMAC_SR_TRIGGER_REQ,
+    MSG_ID_ML1S_EMAC_STAG_TA_REQ,
+
+    // EL2 --> EMAC
+    MSG_ID_EL2_EMAC_VRB_VA_SHORTAGE_NTF,
+
+    // UPCM --> EMAC
+    MSG_ID_UPCM_EMAC_INTERNET_DISCONNECT_REQ,
+    MSG_ID_UPCM_EMAC_RBRQ_REQ,
+    MSG_ID_UPCM_EMAC_TAG_DATA_ARRIVAL_REQ,    
+
+    //////////////////////////////////////////////
+    // Destination: ERT_WPR                        //
+    //////////////////////////////////////////////
+
+    //ERT_WPR --> ERT_WPR
+    MSG_ID_ERT_WPR_ERT_WPR_ES_INSTR_PROC_NTF,
+    MSG_ID_ERT_ERLCDL_WPR_ES_INSTR_PROC_NTF,
+    //////////////////////////////////////////////
+    // Destination: EL2                         //
+    //////////////////////////////////////////////
+
+    // EVAL --> EMAC
+    MSG_ID_EMAC_AUDRX_ENABLE_REQ,
+
+    /*------------------- EL2_MSG_CODE_END-----------------------*/
+
+    /*  MT6293 EL2 MSG ID  */
+    MSG_ID_TXHISR_ERT_POLL_REQ,
+    MSG_ID_EMACDL_POLL_REQ,
+    MSG_ID_EMACDL_EMACMCH_POLL_REQ,
+    MSG_ID_EMACDL_EL2H_POLL_REQ,
+    MSG_ID_EMACDL_EL2_POLL_REQ,
+
+    /* EMACDL */
+    MSG_ID_EMAC_EMACDL_DRB_CONFIG_IND,
+    MSG_ID_EMAC_EMACDL_SUPPORT_RELEASE_IND,
+    MSG_ID_EMACDL_EMAC_MAC_CE_IND,
+    MSG_ID_EMACDL_ERLCDL_DLSCH_DATA_IND,
+    MSG_ID_EMACDL_EMACMCH_DATA_IND,
+    /* RA between EMAC and EMACDL */
+    MSG_ID_EMACDL_EMAC_RAR_PROC_REQ,
+    MSG_ID_EMAC_EMACDL_RAR_PROC_CNF,
+    MSG_ID_EMAC_EMACDL_TCRNTI_CR_PROC_REQ,
+    MSG_ID_EMACDL_EMAC_TCRNTI_CR_PROC_CNF,
+    MSG_ID_EMACDL_EMAC_CCCH_DATA_IND,
+    /* DL LMAC interrupt notification ILM */
+    MSG_ID_LMAC_EMACDL_RAR_READY_NTF,
+    MSG_ID_LMAC_EMACDL_TCRNTI_READY_NTF,
+    MSG_ID_LMAC_EMACDL_DATA_READY_NTF,
+
+    MSG_ID_EMACMCH_ERLCDL_MCH_DATA_IND,
+
+    /*  MT6293 EL2 MSG ID (sleep related)  */
+
+    //  MSG_ID_EMAC_EL1_DRX_CYCLE_NTF,
+    //  MSG_ID_EMAC_EL1_DRX_CTRL_REQ,
+    //  MSG_ID_EMAC_EL1_DRX_CTRL_CNF,
+    MSG_ID_EMAC_ERLCUL_WAKEUP_REQ,
+    MSG_ID_EMAC_ERLCDL_WAKEUP_REQ,
+    MSG_ID_EMAC_EPDCP_WAKEUP_REQ,
+    MSG_ID_EMAC_EPDCP_ENABLE_WAKEUP_REQ_IND,
+    MSG_ID_EMAC_EPDCP_DISABLE_WAKEUP_REQ_IND,
+
+    // EL1 -> EMACMCH
+    MSG_ID_EMACMCH_EL1_MCCH_RCV_MODE_CHANGE_IND,
+
+    // ERRC -> EMACMCH
+    MSG_ID_ERRC_EMACMCH_SYNCAREA_CFG_REQ,
+    MSG_ID_ERRC_EMACMCH_AREA_CFG_REQ,
+    MSG_ID_ERRC_EMACMCH_MXCH_CFG_REQ,
+    MSG_ID_ERRC_EMACMCH_MCCH_RCV_MODE_CHANGE_REQ,
+
+    // EL2EM related
+    MSG_ID_ERLC_EL2EM_EL2_INTERNAL_ON_REQ,
+    MSG_ID_ERLC_EL2EM_EL2_INTERNAL_OFF_REQ,
+    MSG_ID_EMAC_EL2EM_EL2_FEAT_DET_LONG_DRX_IND,
+    MSG_ID_EMAC_EL2EM_DL_TB_REPORT_IND,
+    MSG_ID_EMAC_EL2EM_PMCHS_INFO_IND,
+
+    // DVFS -> EMACDL
+    MSG_ID_DVFS_EMAC_IT_UP_GEAR_REQ,
+    MSG_ID_DVFS_EMAC_IT_DOWN_GEAR_REQ,
+    MSG_ID_MED_EMAC_VOLTE_TIMING_INFO_REQ,
+
+    // RSVAS <-> EL2 related PORTAL
+    MSG_ID_RSVAS_EL2HPORTAL_SUSPEND_SERVICE_REQ,
+    MSG_ID_RSVAS_EL2HPORTAL_SUSPEND_SERVICE_CNF,
+    MSG_ID_RSVAS_EMACDLPORTAL_SUSPEND_SERVICE_REQ,
+    MSG_ID_RSVAS_EMACDLPORTAL_SUSPEND_SERVICE_CNF,
+    MSG_ID_RSVAS_EL2PORTAL_SUSPEND_SERVICE_REQ,
+    MSG_ID_RSVAS_EL2PORTAL_SUSPEND_SERVICE_CNF,
+
+    // EL2POW
+    MSG_ID_EL2POW_EMACDL_EL2POW_POLL_REQ,
+    MSG_ID_EMACDL_EL2_EL2POW_POLL_REQ,
+    MSG_ID_EL1_EL2POW_L2COPRO_POWER_ON_IND,
+    MSG_ID_EL1_EL2POW_L2COPRO_POWER_OFF_IND,
+    MSG_ID_EL1_EL2POW_SCH_CLOSE_RXBRP_IDLE_NTF,
+    MSG_ID_EL2POW_USER_L2COPRO_POWER_ON_REQ,
+    MSG_ID_EL2POW_USER_L2COPRO_POWER_OFF_REQ,
+    MSG_ID_EL2_EL2POW_VRB_VA_SHORTAGE_NTF,
+    MSG_ID_EMAC_EL2POW_LMAC_HARQ_RESET_REQ,
+
+    // EL2ICD
+    MSG_ID_ICD_EL2ICD_SYSTEM_NTF,
+    MSG_ID_EL2ICD_ERTPORTAL_CTRL_NTF,
+    MSG_ID_EL2ICD_EMACDLPORTAL_CTRL_NTF,
+    MSG_ID_EL2ICD_EL2HPORTAL_CTRL_NTF,
+    MSG_ID_EL2ICD_EL2PORTAL_CTRL_NTF,
+    MSG_ID_EL2ICD_ERTPORTAL_TIMER_EXPIRY_NTF,
+    MSG_ID_EL2ICD_EMACDLPORTAL_TIMER_EXPIRY_NTF,
+    MSG_ID_EL2ICD_EL2HPORTAL_TIMER_EXPIRY_NTF,
+    MSG_ID_EL2ICD_EL2PORTAL_TIMER_EXPIRY_NTF,
+
+MODULE_MSG_END( MSG_ID_EL2_CODE_TAIL )
+
+#endif /* __EL2_MSGID_H */
diff --git a/mcu/interface/sap/md/MD97/_el2_msgid.h b/mcu/interface/sap/md/MD97/_el2_msgid.h
new file mode 100644
index 0000000..a8fb84a
--- /dev/null
+++ b/mcu/interface/sap/md/MD97/_el2_msgid.h
@@ -0,0 +1,726 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   el2_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   
+ *
+ * Author:
+ * -------
+ *   
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 09 18 2020 kathie.ho
+ * [MOLY00569504] [Gen97][MP7] LTE and NR-NSA mode sniffer type 1 submit R3 CR
+ * Sniffer (interface).
+ *
+ * 09 18 2019 kathie.ho
+ * [MOLY00439533] [Gen97][IDC] IDC feature development
+ * EMAC IDC
+ *
+ * 08 15 2019 hamilton.liang
+ * [MOLY00429893] [Gen97] DVFS code change for Gaming Latency Enhancement
+ * (SWRD domain) DVFS development for gaming enhancement
+ *
+ * 08 06 2019 ming.lee
+ * [MOLY00425839] [MT6297][Apollo][MP1][SQC][NVIOT][Nokia][Oulu][5G][Overnight]: Fatal Error (0xc0a, 0x293b332c, 0xcccccccc) - EL2
+ * ICd NR rpt.
+ *
+ * 07 19 2019 shuyu.chang
+ * [MOLY00403047] Network related optimization
+ * [SWRD][Gen95 Code sync][VMOLY] SW management.
+ *
+ * 05 15 2019 hamilton.liang
+ * [MOLY00405509] [VMOLY] VA no release framework
+ * 	
+ * 	[SWRD domain] VA no release framework implementation
+ *
+ * 05 15 2019 tc.chang
+ * [MOLY00406246] [Gaming][KoG][L2] Gen97 Gaming enhancement.
+ *
+ * 05 14 2019 chenyen.huang
+ * [MOLY00403053] [Gen97] ERLC Gen93/95 Patch Sync
+ * 	
+ * 	Rel RSMT ind (non MPD).
+ *
+ * 05 06 2019 shu-wei.ho
+ * [MOLY00402042] [Gen97][EMAC][EL1][ERLC] HRT Improvemnt, default off
+ * [EMAC][HRT] SWRD files.
+ *
+ * 04 26 2019 ming.lee
+ * [MOLY00402012] [NMAC-H] Modify HISR Queue design to a more extensible manner
+ * EWSP0000007116
+ *
+ * 04 16 2019 hamilton.liang
+ * [MOLY00395217] [Gen97] TMC development
+ * 	
+ * 	TMC development - EMAC part(SWRD domain)
+ *
+ * 04 09 2019 hamilton.liang
+ * [MOLY00332682] Gen97 relevant feature/structure change
+ * 	
+ * 	[Gen97][SWRD domain] TMC development - EMAC part
+ *
+ * 02 18 2019 hamilton.liang
+ * [MOLY00332682] Gen97 relevant feature/structure change
+ * 	
+ * 	Gen95 CL sync to Gen97(CL list: 7058369/7059677/7059792/7059797)
+ * 	=> sync information: ICD relevant & Assertion removal for EM code
+ *
+ * 12 21 2018 shu-wei.ho
+ * [MOLY00339449] [Gen97][EMAC] General development check-in
+ * [EMAC] Gemini 3.0 (SWRD part).
+ *
+ * 12 19 2018 chenyen.huang
+ * [MOLY00347658] [Gen97] eRLC development check-in
+ * 	
+ * 	Start Status Prohibit timer in DL. (non MPD)
+ *
+ * 12 13 2018 frank.song
+ * [MOLY00372469] Sync Gen95 CL 10/15~11-5
+ * .
+ *
+ * 11 29 2018 hamilton.liang
+ * [MOLY00332682] Gen97 relevant feature/structure change
+ * 	
+ * 	ENL2 ICD patch back to VMOLY TRUNK(check-in items: ENL2ICD rename modification)
+ *
+ * 10 04 2018 kathie.ho
+ * [MOLY00346626] [Gen97][EMAC] Merge Gen95 CLs on Gen97 and patch back to VMOLY TRUNK
+ * CL6267663(non-MPD) + CL6276097
+ *
+ * 10 04 2018 kathie.ho
+ * [MOLY00351549] Gen97 EMAC check-in
+ * ENDC (TDM pattern) interface
+ *
+ * 08 17 2018 kathie.ho
+ * [MOLY00346626] [Gen97][EMAC] Merge Gen95 CLs on Gen97 and patch back to VMOLY TRUNK
+ * Gen95+97
+ *
+ * 08 10 2018 jen-de.lai
+ * [MOLY00327926] [GEN97][ENPDCP] base development check-in
+ * 	Fix build fail for ICD enable
+ *
+ * 08 07 2018 peter.chiang
+ * [MOLY00326691] [MT6297] GEN97.DEV ENL2 Patch back
+ * Gen93/Gen95 to Gen97 Code Sync (July CLs)
+ * 	1. MOLY00337915
+ * 	2. MOLY00337310
+ *
+ * 06 27 2018 yiting.cheng
+ * [MOLY00327926] [GEN97][ENPDCP] base development check-in
+ * Remove un-used messages, remove MOD_SDAP and MOD_ROHC in PDCP code
+ *
+ * 03 19 2018 guang-yu.zheng
+ * [MOLY00313850] [MT6295] MML2 DVFS control feature development
+ * MML2 DVFS control and MCU DVFS re-org
+ *
+ * 01 09 2018 timothy.yao
+ * [MOLY00300298] [PVT must resolve] ·L«H??¥]ºC?? - el2 msg
+ * sending pdcp invalid control pdu to avoid entering sleep. (UMOLYA - common)
+ *
+ * 11 06 2017 mf.jhang
+ * [MOLY00272042] [MT6295][93/95 re-arch] Add EMAC ML1S interface
+ * .
+ *
+ * 08 18 2017 mf.jhang
+ * [MOLY00272042] [MT6295 Dev] Add EMAC ML1S interface
+ * add EMAC ML1S interface.
+ * 10 03 2017 jia-shi.lin
+ * [MOLY00281754] [MT6763] UL HARQ early close for volte low power enhancement
+ * early ul harq close for volte low power
+ *
+ * 10 03 2017 jia-shi.lin
+ * [MOLY00281754] [MT6763] UL HARQ early close for volte low power enhancement
+ * early ul harq close for volte low power
+ *
+ * 10 03 2017 jia-shi.lin
+ * [MOLY00281754] [MT6763] UL HARQ early close for volte low power enhancement
+ * early ul harq close for volte low power
+ *
+ * 09 20 2017 nicole.hsu
+ * [MOLY00279184] [PCT][Anritsu][CAG50C][E40][7.1.1.2] fail
+ * [TRUNK] LCID vs. support release handling
+ *
+ * 08 22 2017 cammie.yang
+ * [MOLY00269598] [Gen93]TPB/Mobility Ctrl patch check in
+ * [TRUNK][Merged from R1][EPDCP][HST] set vip bit and notify VoLTE bearer for ERLCUL
+ *
+ * 08 03 2017 wen-jiunn.liu
+ * [MOLY00268551] Task batch scheduling for LTE Low power
+ * [EL2] Task Rescheduling for Low Power Polling Tick Change
+ *
+ * 08 03 2017 wen-jiunn.liu
+ * [MOLY00268551] Task batch scheduling for LTE Low power
+ * [EL2] Task Rescheduling for Low Power Polling Tick Change
+ *
+ * 07 28 2017 nicole.hsu
+ * [MOLY00267509] [MT6763][Bianco][N1][MTBF][PHONE][Overnight][HQ][Lab][Ericsson][ASSERT] file:mcu/common/driver/dpcopro/src/dpcopro_mmu_drv.c line:1616
+ * [TRUNK] move LMAC HARQ reset to el2pow
+ *
+ * 07 24 2017 nicole.hsu
+ * [MOLY00266293] [Blocking][MT6763][Bianco][N1][India FT][Mumbai][WW FT][eMBMS][RJIO]  md1:(USIP1_USIP0) [ASSERT] file:md32/usip/brp/modem/lte/top/src/4g_top_irq.c line:2004
+ * [TRUNK] fix Poll control of TXLISR and EL2POW
+ *
+ * 07 18 2017 nicole.hsu
+ * [MOLY00263936] [BIANCO][MT6763][RDIT][PHONE][GCF][TS8980][FDD B7,TC 5.2.1]Handoff delay exceed 190ms when LTE handoff to WCDMA
+ * [TRUNK] power on Copro before TXLISR handle SCH_CLOSE (for LMAC HARQ RESET)
+ *
+ * 07 17 2017 peter.yu
+ * [MOLY00263749] [VOLTE][HST][Anite][02.v01.020][5.1.1][E39]FAIL.No MOS score returned. Error code: -5.
+ * Overwirte unreasonable RLC configuration - t-Reordering timer.
+ *
+ * 07 06 2017 slifer.hsueh
+ * [MOLY00261868] [6293]UL SIT new handling
+ * Add message id for EL2 RB sync procedure
+ *
+ * 06 01 2017 nicole.hsu
+ * [MOLY00254331] [MT6763][EM] EL2EM maintenance and EMAC EM update
+ * [EMAC] EM update
+ * [EL2EM] add trace and fix report mechanism
+ *
+ * 06 01 2017 steve.kao
+ * [MOLY00252964] [6293] API update for LTECSR VoLTE EBI indication
+ * 	
+ * 	[UMOLYA][TRUNK] API update for LTECSR VoLTE EBI indication
+ *
+ * 05 16 2017 nicole.hsu
+ * [MOLY00249804] [BIANCO][MT6763][RDIT][FT][FDD][HK][SIM1:CMHK][SIM2:SMT][Overnight][ASSERT] file:mcu/common/driver/dpcopro/src/l2_4g_dl_lmac.c line:214
+ * 1. enable el2pow
+ * 2. interface change for sch_close
+ *
+ * 04 25 2017 slifer.hsueh
+ * [MOLY00244795] [BIANCO][MT6763][RDIT][NVIOT][FDD][Nokia][4G] Assert fail: dpcopro_mmu_drv.c 1303 - IPCORE
+ * Add EL2 message id for RB lock/unlock
+ *
+ * 04 06 2017 nicole.hsu
+ * [MOLY00226654] [MT6293][EL2POW] EL2 L2Copro power control
+ * [EL2POW]
+ * - Basic function
+ * - L+X, L+L
+ * - Meta mode, L1S
+ * - UT
+ *
+ * 03 13 2017 nicole.hsu
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * ML1S
+ * - Force NEWTX when ML1S request is sent
+ *
+ * 02 24 2017 mf.jhang
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * .Add ML1S ILM handler
+ *
+ * 02 10 2017 steve.kao
+ * [MOLY00228972] [UMOLYA][EPDCP][R-SIM] Interface with ERRC for Remote SIM
+ * [EPDCP][R-SIM] Interface with ERRC for Remote SIM.
+ *
+ * 02 06 2017 peter.yu
+ * [MOLY00207733] [MT6293][EL2] ERLCDL development
+ * [M-SIM] Sync R-SIM related interfaces, remove redundant message IDs related to ERLC.
+ *
+ * 01 24 2017 nicole.hsu
+ * [MOLY00226654] [MT6293][EL2POW] EL2 L2Copro power control
+ * Add EL1 msgid and temp ilm handling
+ *
+ * 01 16 2017 eddie.wang
+ * [MOLY00210650] [MT6293][UMOLYA TRUNK] EMAC maintenance
+ * [MSIM] Add RSVAS suspend msg id
+ *
+ * 01 05 2017 nicole.hsu
+ * [MOLY00223067] [MT6293] EL2 EM implementation
+ * EL2EM framework, merge to TRUNK
+ *
+ * 12 26 2016 mf.jhang
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * merge DVFS IF code
+ *
+ * 11 14 2016 chih-cheng.yang
+ * [MOLY00213122] [MT6293][EL2] EL2 FPGA IT phase II source code integration
+ * 1. refine  RB/MBMS RSMT release
+ * 2. refine epdcp polling rsmt
+ * 2. add coverage
+ *
+ * 10 28 2016 jia-shi.lin
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * emac timing report for volte dsp
+ *
+ * 10 25 2016 chih-cheng.yang
+ * [MOLY00209240] [MT6293][EL2] EL2 FPGA IT phase 1 source codes integration
+ * new sap and message id for ERLCDL to notify EPDCP to release RSMT when releasing RB
+ *
+ * 10 06 2016 ville.pukari
+ * [MOLY00150835] ML1S Test Environment Support
+ * 	
+ * 	[UMOLYA] Sync code from UMOLY Trunk CL2228706, CL2455350, CL2529740 and CL2821387
+ *
+ * 08 25 2016 jia-shi.lin
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * EMAC EL1 interface change
+ *
+ * 08 16 2016 wen-jiunn.liu
+ * [MOLY00194298] [UMOLYA] EL2 + EMAC Code Review
+ * Sync to Latest PS.DEV (CL-2728660)
+ * 
+ * CL-2728660 - el2 vrb virtual space shortage handling framework
+ *
+ * 08 16 2016 wen-jiunn.liu
+ * [MOLY00194298] [UMOLYA] EL2 + EMAC Code Review
+ * el2 vrb virtual space shortage handling framework
+ * 08 09 2016 nicole.hsu
+ * [MOLY00196065] [MT6293][folder structure] Move EL1/EL2 files from LTE domain to SWRD domain
+ * 93 EL2 others
+ *
+ *
+ * 07 27 2016 jeremy.chen
+ * [MOLY00190683] [UMOLYA][6293] EL2 merge back to UMOLYA TRUNK & PS DEV
+ * [common][OA domain] merge from UESIM CBr
+ *
+ * 07 19 2016 eddie.wang
+ * [MOLY00191921] Sync UMOLY to UMOLYA.PS.DEV
+ * Sync el2_msgid.h from UMOLY CL2582165 CL2529014
+ *
+ * 06 28 2016 eddie.wang
+ * [MOLY00187041] Sync errc_emac_msg.h from UMOLY to UMOLYA
+ * Add MSG_ID_ERRC_EMAC_MEAS_GAP_IND
+ *
+ * 03 15 2016 ryan.ou
+ * [MOLY00162291] [MT6292] EMAC code sync from LR11 to UMOLY
+ * CL1867761, [MOLY00151000] [MT6755] SRVCC Enhancement.
+ *
+ * 01 11 2016 kathie.ho
+ * [MOLY00156229] [MT6292] Code sync from MT6291: AuDRX
+ * .
+ *
+ * 01 09 2016 nienteh.hsu
+ * [MOLY00159548] [6292] ERLC code sync from LR11 to UMOLY (2015/12) 
+ * SWRD domain part	
+ * 	.
+ *
+ * 12 30 2015 antti.karjalainen
+ * [MOLY00153335] UL bucket management for UL CA and 64QAM: EPDCP
+ *
+ * 11 27 2015 ville.pukari
+ * [MOLY00150835] ML1S Test Environment Support:
+ * 	
+ * 	EMAC support for ML1S Test Mode
+ *
+ * 07 16 2015 chen-wei.wang
+ * [MOLY00118157] [TK6291]ERLC code maintain
+ * ERLC status proh timer modification
+ *
+ * 07 06 2015 shengyi.ho
+ * [MOLY00125586] [TK6291E1][MVTV-D][4G][TDD][TDD_MIMO_7.2]assert fail : el1tx.c 731
+ * 1) add EMAC_EL2TASK_LOCK/UNLOCK_POWER_REQ
+ *
+ * 06 18 2015 mingtsung.sun
+ * [MOLY00121332] [TK6291] 4G EAS low power check in
+ * add QBM/EL2 power control messages for LogDMA
+ *
+ * 06 15 2015 sc.tung
+ * [MOLY00121440] [TK6291] eL2 development check in CR
+ * 	Add MSG_ID_ERRC_C_RNTI_RA_PROBING_REQ for probing req.
+ *
+ * 06 15 2015 mingtsung.sun
+ * [MOLY00121332] [TK6291] 4G EAS low power check in
+ * eL2 low power and ePDCP code sync: el2_msgid.h
+ *
+ * 06 03 2015 mingtsung.sun
+ * [MOLY00118161] [MT6291] EPDCP CR Sync - Early reestablishment to prevent certain kind of VoLTE call drop
+ * RD domain
+ *
+ * 03 18 2015 chen-wei.wang
+ * [MOLY00099525] [TK6291] EMAC MDT feature check-in
+ * interface file check-in
+ *
+ * 02 13 2015 mingtsung.sun
+ * [MOLY00091822] RATDM reorganization
+ * .
+ *
+ * 12 16 2014 yuting.chen
+ * [MOLY00084807] [MT6291_DEV] EL2 Low Power Flow
+ * .
+ *
+ * 12 12 2014 yk.liu
+ * [MOLY00086350] [MT6291][L234 P2P] Enable EL2 PDU drop, ping no reply after 30min
+ * 	.
+ *
+ * 11 11 2014 yiting.cheng
+ * [MOLY00084042] [UMOLY] merge UMOLY_DEV to UMOLY trunk
+ * .
+ *
+ * 10 28 2014 andrew.wu
+ * [MOLY00079018] [MT6291_DEV] ePDCP batch I UT related modification
+ * Merging
+ * 	
+ * 	//UMOLY_CBr/andrew.wu/MT6291_DEV_EPDCPDEVW1427P1/mcu/common/interface/sap/md/errc_msgid.h
+ * 	
+ * 	to //UMOLY/DEV/MT6291_DEV/mcu/common/interface/sap/md/errc_msgid.h
+ *
+ * 09 18 2014 shengyi.ho
+ * [MOLY00077592] [TK6291] code sync from CBr to TK6291_DEV - emac
+ * .
+ *
+ * 08 26 2014 sh.yang
+ * [MOLY00077290] [TK6291_DEV] ILM/Event scheduler wrapper for LISR2HISR removal
+ * .
+ *
+ * 08 22 2014 jy.ou
+ * [MOLY00076104] [TK6291] EMAC & ERLC UT framework and ERLC UT cases
+ * .
+ *
+ * 08 21 2014 mingtsung.sun
+ * [MOLY00072902] [TK6291][DEV] LTT unit test framework
+ * Merging
+ *      
+ *     //UMOLY_CBr/eric.hsieh/TK6291_DEV_ESL/mcu/common/interface/sap/...
+ *      
+ *     to //UMOLY/DEV/TK6291_DEV/mcu/common/interface/sap/...
+ *
+ * 08 14 2014 andrew.wu
+ * [MOLY00075397] [TK6291_DEV] code sync MOLY00072445 from MOLY to TK6291_DEV
+ * Interface check-in for EPDCP_EMAC_LEAVE_DRX
+ *
+ * 07 30 2014 yiting.cheng
+ * [MOLY00073830] [TK6291_DEV] check-in TK6291 modification
+ * modify sap
+ *
+ * 07 29 2014 andrew.wu
+ * [MOLY00073873] [TK6291_DEV] EPDCP-ERRC interfaces check-in
+ * add ERRC_EPDCP_MTCH_PC_REQ
+ *
+ * 07 28 2014 nienteh.hsu
+ * [MOLY00073836] [TK6291][ERRC][CHM] LTE-A CHM development code check-in
+ *     .
+ *
+ * 01 15 2014 slifer.hsueh
+ * [MOLY00053104] [MT6290E2][NAS RTD][MM][FDD] Assert fail: driver/l2copro/cipher/src/cipher_common.c 196 - L2COPRO
+ * Merge codes related to L2 copro delay power off back to MOLY TRUNK in OA domain
+ *
+ * 01 06 2014 mf.jhang
+ * [MOLY00051983] [MT6582LTE][WWFT][Germany][Vodafone]Ping RTT is more than benchmark
+ * Add HOST_DATA_READY_IND
+ *
+ * 12 03 2013 lewis.yu
+ * [MOLY00048832] power down/on in EL2 task context and refine the flow
+ * .
+ *
+ * 09 26 2013 lewis.yu
+ * [MOLY00039195] [MT6290] [Low Power] LTE L2 copro power down in LTE flight mode
+ * .
+ *
+ * 07 12 2013 stanleyhy.chen
+ * [MOLY00029602] [New Feature] NBR_CELL_INFO and TA_INFO related interfaces
+ * TA_INFO and NBR_CELL_INFO interfaces for LPP feature
+ *
+ * 05 15 2013 moja.hsu
+ * [MOLY00007625] Maintain code
+ * add el2 message for ERT task to ERT HISR.
+ *
+ * 03 20 2013 jeremy.chen
+ * [MOLY00007127] [MT7208] EL2 enhancement in MOLY
+ * add IDC-related interface
+ *
+ * 02 26 2013 jeremy.chen
+ * [MOLY00007127] [MT7208] EL2 enhancement in MOLY
+ * add MSG_ID_ERLCUL_EPDCP_SRB_DATA_CNF.
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef __MD97_EL2_MSGID_V2_H
+#define __MD97_EL2_MSGID_V2_H
+
+
+MODULE_MSG_BEGIN( MSG_ID_EL2_V2_CODE_BEGIN )
+
+    /*------------------- EL2_MSG_CODE_BEGIN---------------------*/
+
+    //////////////////////////////////////////////
+    // Destination: EPDCP                       //
+    //////////////////////////////////////////////
+
+    // LTECSR --> EPDCP
+    MSG_ID_LTECSR_EPDCP_VOLTE_EBI_NTF,
+
+    // ERLC-UL --> EPDCP
+
+    // ERLC-DL --> EPDCP
+    MSG_ID_ERLCDL_EPDCP_MBMS_START_IND,
+    MSG_ID_ERLCDL_EPDCP_MBMS_END_IND,
+
+
+    // UPCM --> EPDCP
+    MSG_ID_UPCM_EPDCP_SEND_INV_CTRL_PDU,
+
+
+    //////////////////////////////////////////////
+    // Destination: ERLC-UL                     //
+    //////////////////////////////////////////////
+
+    // ERRC --> ERLC-UL
+    MSG_ID_ERRC_ERLCUL_CONFIG_REQ,
+    MSG_ID_ERRC_ERLCUL_SRB1_ACK_REQ,
+    MSG_ID_ERRC_ERLCUL_SWITCH_VIRTUAL_CONNECTED_REQ,
+
+    // ERLCDL --> ERLC-UL
+    MSG_ID_ERLCDL_ERLCUL_STATUS_PDU_NTF,
+
+    // ERTPORTAL --> ERLCUL
+    MSG_ID_ERTPORTAL_ERLCUL_TIMER_EXPIRY_NTF,
+	
+    //////////////////////////////////////////////
+    // Destination: ERLC-DL                     //
+    //////////////////////////////////////////////
+
+    // ERRC --> ERLC-DL
+    MSG_ID_ERRC_ERLCDL_CONFIG_REQ,
+    MSG_ID_ERRC_ERLCDL_SWITCH_VIRTUAL_CONNECTED_REQ,
+    MSG_ID_ERRC_ERLCDL_TEST_REQ,
+    MSG_ID_ERRC_ERLCDL_MTCH_PC_REQ,
+
+    // EL2 --> ERLC-DL
+    MSG_ID_EL2_ERLCDL_VRB_VA_SHORTAGE_NTF,
+    MSG_ID_EL2_ERLCDL_VRB_VA_NO_RELEASE_NTF,
+
+    // ERLC-UL --> ERLC-DL
+    MSG_ID_ERLCUL_ERLCDL_STATUS_FBK_NTF,
+
+    // EMAC  --> ERLC-DL
+    MSG_ID_EMAC_ERLCDL_GEMINI_GAP_IND,
+    
+    //////////////////////////////////////////////
+    // Destination: EMAC                        //
+    //////////////////////////////////////////////
+
+    MSG_ID_ERRC_EMAC_CONFIG_REQ,
+    MSG_ID_ERRC_EMAC_CCCH_DATA_REQ,
+    MSG_ID_ERRC_EMAC_TA_INFO_REQ,
+    MSG_ID_ERRC_EMAC_ESTFAIL_REPORT_REQ,
+    MSG_ID_ERRC_EMAC_C_RNTI_RA_PROBING_REQ,
+    MSG_ID_ERRC_EMAC_DRX_INC_GAP_REQ,
+    MSG_ID_ERRC_EMAC_MEAS_GAP_IND,
+    MSG_ID_ERRC_EMAC_SUPPORT_CAPABILITY_IND,
+    MSG_ID_ERRC_EMAC_NR_PSCELL_ADD_OR_CHANGE_IND,
+    MSG_ID_ERRC_EMAC_DSP_SNIFFER_REQ,
+
+    /// ERLCDL --> EMAC
+    MSG_ID_ERLCDL_EMAC_DL_VOLTE_NOTIFY_REQ,
+
+    // EMAC_UT --> EMAC
+    MSG_ID_EMAC_UT_EMAC_TEST_CMD,
+
+    // EL1 --> EMAC
+    MSG_ID_EMAC_EL1_PHY_INFO_IND,
+    MSG_ID_EMAC_EL1_RA_GAP_STOP_CNF,
+    MSG_ID_EMAC_EL1_RA_GAP_RESUME_CNF,
+    MSG_ID_EMAC_EL1_RNTI_UPDATE_CNF,
+    MSG_ID_EMAC_EL1_DRX_CTRL_CNF,
+    MSG_ID_EMAC_EL1_SCELL_NOTIFY_CNF,
+    MSG_ID_EMAC_EL1_HOST_DATA_CNF,
+    MSG_ID_EMAC_EL1_HOST_DATA_READY_IND,
+    MSG_ID_EMAC_EL1_RA_RESTART_IND,
+    MSG_ID_EMAC_EL1_IDC_TDM_IND,
+
+    //IDC --> EMAC, when CUR_GEN >= MD_GEN97
+    MSG_ID_IDC_EMAC_TDM_IND,
+    
+    // ML1S SW --> EMAC
+    MSG_ID_ML1S_EMAC_TEST_MODE_ENABLE_REQ,
+    MSG_ID_ML1S_EMAC_CONN_EST_RA_REQ,    
+    MSG_ID_ML1S_EMAC_DL_DATA_DISCARD_REQ,
+    MSG_ID_ML1S_EMAC_MAC_CE_TRIGGER_REQ,
+    MSG_ID_ML1S_EMAC_TBS_MISMATCH_FORCE_NEWTX_REQ,
+    MSG_ID_ML1S_EMAC_HO_RA_TRIGGER_REQ,
+    MSG_ID_ML1S_EMAC_SR_TRIGGER_REQ,
+    MSG_ID_ML1S_EMAC_STAG_TA_REQ,
+
+    // EL2 --> EMAC
+    MSG_ID_EL2_EMAC_VRB_VA_SHORTAGE_NTF,
+    MSG_ID_EL2_EMAC_VRB_VA_NO_RELEASE_NTF,
+
+    // UPCM --> EMAC
+    MSG_ID_UPCM_EMAC_INTERNET_DISCONNECT_REQ,
+    MSG_ID_UPCM_EMAC_RBRQ_REQ,
+    MSG_ID_UPCM_EMAC_TAG_DATA_ARRIVAL_REQ,    
+
+    // EMAC --> EMAC
+    MSG_ID_EMAC_EMAC_RRC_CFG_DISPATCH_IND,
+
+    //////////////////////////////////////////////
+    // Destination: ERT_WPR                        //
+    //////////////////////////////////////////////
+
+    //ERT_WPR --> ERT_WPR
+    MSG_ID_ERT_WPR_ERT_WPR_ES_INSTR_PROC_NTF,
+    MSG_ID_ERT_ERLCDL_WPR_ES_INSTR_PROC_NTF,
+	
+    //////////////////////////////////////////////
+    // Destination: ERTPORTAL                   //
+    //////////////////////////////////////////////
+    MSG_ID_ERTPORTAL_ERTPORTAL_WPR_ES_INSTR_PROC_NTF,
+	
+    //////////////////////////////////////////////
+    // Destination: EL2                         //
+    //////////////////////////////////////////////
+
+    // EVAL --> EMAC
+    MSG_ID_EMAC_AUDRX_ENABLE_REQ,
+
+    // TMC  --> EMAC
+    MSG_ID_TMC_EMAC_THERMAL_CONTROL_REQ,
+#if (CUR_GEN >= MD_GEN97)
+    MSG_ID_TMC_EMAC_SESSION_BEGIN_NTF,
+    MSG_ID_TMC_EMAC_SESSION_END_NTF,
+#endif
+
+    /*------------------- EL2_MSG_CODE_END-----------------------*/
+
+    /*  MT6293 EL2 MSG ID  */
+    MSG_ID_TXHISR_ERT_POLL_REQ,
+    MSG_ID_TXLISR_ERT_MUX_REQ,
+    MSG_ID_EMACDL_POLL_REQ,
+    MSG_ID_EMACDL_EMACMCH_POLL_REQ,
+    MSG_ID_EMACDL_EL2H_POLL_REQ,
+    MSG_ID_EMACDL_EL2_POLL_REQ,
+
+    /* EMACDL */
+    MSG_ID_EMAC_EMACDL_DRB_CONFIG_IND,
+    MSG_ID_EMAC_EMACDL_SUPPORT_RELEASE_IND,
+    MSG_ID_EMACDL_EMAC_MAC_CE_IND,
+    MSG_ID_EMACDL_ERLCDL_DLSCH_DATA_IND,
+    MSG_ID_EMACDL_EMACMCH_DATA_IND,
+
+    MSG_ID_EMAC_EMACDL_ENABLE_GEAR_UP,
+    MSG_ID_EMAC_EMACDL_DISABLE_GEAR_UP,
+
+    /* RA between EMAC and EMACDL */
+    MSG_ID_EMACDL_EMAC_RAR_PROC_REQ,
+    MSG_ID_EMAC_EMACDL_RAR_PROC_CNF,
+    MSG_ID_EMAC_EMACDL_TCRNTI_CR_PROC_REQ,
+    MSG_ID_EMACDL_EMAC_TCRNTI_CR_PROC_CNF,
+    MSG_ID_EMACDL_EMAC_CCCH_DATA_IND,
+    /* High Data between EMAC and EMACDL */
+    MSG_ID_EMAC_EMACDL_DL_HDATA_STATUS_RESET_NTF,
+    MSG_ID_EMAC_EMACDL_DL_HDATA_IND,
+    /* DL LMAC interrupt notification ILM */
+    MSG_ID_LMAC_EMACDL_RAR_READY_NTF,
+    MSG_ID_LMAC_EMACDL_TCRNTI_READY_NTF,
+    MSG_ID_LMAC_EMACDL_DATA_READY_NTF,
+
+    MSG_ID_EMACMCH_ERLCDL_MCH_DATA_IND,
+
+    /*  MT6293 EL2 MSG ID (sleep related)  */
+
+    //  MSG_ID_EMAC_EL1_DRX_CYCLE_NTF,
+    //  MSG_ID_EMAC_EL1_DRX_CTRL_REQ,
+    //  MSG_ID_EMAC_EL1_DRX_CTRL_CNF,
+    MSG_ID_EMAC_ERLCUL_WAKEUP_REQ,
+    MSG_ID_EMAC_ERLCDL_WAKEUP_REQ,
+
+    // EL1 -> EMACMCH
+    MSG_ID_EMACMCH_EL1_MCCH_RCV_MODE_CHANGE_IND,
+
+    // ERRC -> EMACMCH
+    MSG_ID_ERRC_EMACMCH_SYNCAREA_CFG_REQ,
+    MSG_ID_ERRC_EMACMCH_AREA_CFG_REQ,
+    MSG_ID_ERRC_EMACMCH_MXCH_CFG_REQ,
+    MSG_ID_ERRC_EMACMCH_MCCH_RCV_MODE_CHANGE_REQ,
+
+    // EL2EM related
+    MSG_ID_ERLC_EL2EM_EL2_INTERNAL_ON_REQ,
+    MSG_ID_ERLC_EL2EM_EL2_INTERNAL_OFF_REQ,
+    MSG_ID_EMAC_EL2EM_EL2_FEAT_DET_LONG_DRX_IND,
+    MSG_ID_EMAC_EL2EM_DL_TB_REPORT_IND,
+    MSG_ID_EMAC_EL2EM_PMCHS_INFO_IND,
+
+    // DVFS -> EMACDL
+    MSG_ID_DVFS_EMAC_IT_UP_GEAR_REQ,
+    MSG_ID_DVFS_EMAC_IT_DOWN_GEAR_REQ,
+    MSG_ID_MED_EMAC_VOLTE_TIMING_INFO_REQ,
+
+    // RSVAS <-> EL2 related PORTAL
+    MSG_ID_RSVAS_EL2HPORTAL_SUSPEND_SERVICE_REQ,
+    MSG_ID_RSVAS_EL2HPORTAL_SUSPEND_SERVICE_CNF,
+    MSG_ID_RSVAS_EMACDLPORTAL_SUSPEND_SERVICE_REQ,
+    MSG_ID_RSVAS_EMACDLPORTAL_SUSPEND_SERVICE_CNF,
+    MSG_ID_RSVAS_EL2PORTAL_SUSPEND_SERVICE_REQ,
+    MSG_ID_RSVAS_EL2PORTAL_SUSPEND_SERVICE_CNF,
+
+    // EL2POW
+    MSG_ID_EL2POW_EMACDL_EL2POW_POLL_REQ,
+    MSG_ID_EMACDL_EL2_EL2POW_POLL_REQ,
+    MSG_ID_EL1_EL2POW_L2COPRO_POWER_ON_IND,
+    MSG_ID_EL1_EL2POW_L2COPRO_POWER_OFF_IND,
+    MSG_ID_EL1_EL2POW_SCH_CLOSE_RXBRP_IDLE_NTF,
+    MSG_ID_EL2POW_USER_L2COPRO_POWER_ON_REQ,
+    MSG_ID_EL2POW_USER_L2COPRO_POWER_OFF_REQ,
+    MSG_ID_EL2_EL2POW_VRB_VA_SHORTAGE_NTF,
+    MSG_ID_EL2_EL2POW_VRB_VA_NO_RELEASE_NTF,
+    MSG_ID_EMAC_EL2POW_LMAC_HARQ_RESET_REQ,
+    MSG_ID_EL2POW_EMACDL_EL2POW_OFF_NTF,
+
+    // ENL2ICD
+    MSG_ID_ICD_ENL2ICD_SYSTEM_NTF,
+    MSG_ID_ENL2ICD_ERTPORTAL_CTRL_NTF,
+    MSG_ID_ENL2ICD_EMACDLPORTAL_CTRL_NTF,
+    MSG_ID_ENL2ICD_EL2HPORTAL_CTRL_NTF,
+    MSG_ID_ENL2ICD_EL2PORTAL_CTRL_NTF,
+    MSG_ID_ENL2ICD_ERTPORTAL_TIMER_EXPIRY_NTF,
+    MSG_ID_ENL2ICD_EMACDLPORTAL_TIMER_EXPIRY_NTF,
+    MSG_ID_ENL2ICD_EL2HPORTAL_TIMER_EXPIRY_NTF,
+    MSG_ID_ENL2ICD_EL2PORTAL_TIMER_EXPIRY_NTF,
+    MSG_ID_ENL2ICD_NMAC_HYBRID_RPT_NTF,
+    MSG_ID_NMAC_ENL2ICD_NR_RECORD_RPT_REQ,
+
+    MSG_ID_EMAC_EL2PORTAL_ACTIVE_PROTOCOL_NTF,
+
+    MSG_ID_ERLCDL_EL2PORTAL_REL_RSMT_IND,
+
+    // 3rd arrow SW protection
+    MSG_ID_ATP_EMAC_3RD_ARROW_AUTH_IND,
+
+MODULE_MSG_END( MSG_ID_EL2_V2_CODE_TAIL )
+
+#endif /* __MD97_EL2_MSGID_V2_H */
diff --git a/mcu/interface/sap/md/VT_msgid.h b/mcu/interface/sap/md/VT_msgid.h
new file mode 100644
index 0000000..66f015e
--- /dev/null
+++ b/mcu/interface/sap/md/VT_msgid.h
@@ -0,0 +1,216 @@
+/*******************************************************************************
+*  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:
+ * ---------
+ *   VT_sap.h
+ *
+ * Project:
+ * --------
+ *   MONZA
+ *
+ * Description:
+ * ------------
+ *  VT related message identity definition (private)
+ *
+ * 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!
+*
+*******************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef VT_MSG_H
+#define VT_MSG_H
+
+// ----------------------------------------
+// Private
+// ----------------------------------------
+
+MODULE_MSG_BEGIN( MSG_ID_VT_CODE_BEGIN )
+
+// CSM
+MSG_ID_CSM_VT_ACTIVATE_REQ = MSG_ID_VT_CODE_BEGIN,
+MSG_ID_CSM_VT_ACTIVATE_CNF,
+MSG_ID_CSM_VT_DEACTIVATE_REQ,
+MSG_ID_CSM_VT_DEACTIVATE_CNF,
+MSG_ID_CSM_VT_DISC_IND,
+
+// CSR
+MSG_ID_VT_CSR_UPLINK_DATA_IND,
+MSG_ID_VT_CSR_START_CONSUME_DL_IND,
+
+// F_CSR
+MSG_ID_VT_F_CSR_ACTIVATE_REQ,
+MSG_ID_VT_F_CSR_DEACTIVATE_REQ,
+
+// UT
+/* Jeffery: H245 UT 1 */
+MSG_ID_VT_UT_H245_SYNC_IND,
+/* Jeffery: H245 UT 3 */
+MSG_ID_VT_UT_H245_DL_MSG,
+
+/* Jeffery: xSRP UT 3 */
+MSG_ID_VT_UT_XSRP_RX_MSG,
+/* Jeffery: xSRP UT 4 */
+MSG_ID_VT_UT_XSRP_TX_MSG,
+/* Jeffery: xSRP UT 5 */
+MSG_ID_VT_UT_XSRP_H245_DL_DATA_IND,
+/* Jeffery: xSRP UT 6 */
+MSG_ID_VT_UT_XSRP_H245_UL_DATA_REQ,
+
+/* Jeffery: H223 UT 3 - control */
+MSG_ID_VT_UT_H223_CTRL_UL_DATA_REQ,
+/* Jeffery: H223 UT 3 - audio */
+MSG_ID_VT_UT_H223_AUDIO_UL_DATA_REQ,
+/* Jeffery: H223 UT 3 - video */
+MSG_ID_VT_UT_H223_VIDEO_UL_DATA_REQ,
+/* Jeffery: H223 UT 4 - control */
+MSG_ID_VT_UT_H223_CTRL_DL_DATA_IND,
+/* Jeffery: H223 UT 4 - audio */
+MSG_ID_VT_UT_H223_AUDIO_DL_DATA_IND,
+/* Jeffery: H223 UT 4 - video */
+MSG_ID_VT_UT_H223_VIDEO_DL_DATA_IND,
+
+// VT
+MSG_ID_VT_CSR_CONSUME_DL_IND,
+MSG_ID_VT_LOOPBACK_AUDIO_DATA,
+MSG_ID_VT_LOOPBACK_VIDEO_DATA,
+MSG_ID_VT_DBG_DL_H245_MSG_IND,
+MSG_ID_VT_DBG_UL_H245_MSG_IND,
+
+// L1SP
+MSG_ID_VT_SP3G_UL_DATA_READY_IND,
+
+// MED
+MSG_ID_MED_VT_CODEC_OPEN_ACK,
+MSG_ID_MED_VT_PUT_UL_VIDEO_IND,
+
+// TVT
+MSG_ID_TVT_UT_UART_DATA_REQ,
+MODULE_MSG_END( MSG_ID_VT_CODE_TAIL )
+
+#endif  //VT_MSG_H
diff --git a/mcu/interface/sap/md/atp_msgid.h b/mcu/interface/sap/md/atp_msgid.h
new file mode 100644
index 0000000..c240557
--- /dev/null
+++ b/mcu/interface/sap/md/atp_msgid.h
@@ -0,0 +1,1377 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   atp_msgid.h
+ *
+ * Description:
+ * ------------
+ *   ATP 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!
+ *
+ * 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!
+ * 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!
+ * 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!
+ * 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!
+ * 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!
+ *
+ * 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 _ATP_MSGID_H
+#define _ATP_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_ATPIO_CODE_BEGIN )
+
+    /* ATP --> ATP_IO */
+    MSG_ID_ATP_AT_CMD_CNF, //ATP responds to ATP_IO the AT result, replace MSG_ID_PROXY_ATCI_CMD_RSP
+    MSG_ID_ATP_IO_URC_IND, //ATP requests ATP_IO to send URC, replace MSG_ID_PROXY_ATCI_URC_REQ
+    MSG_ID_ATP_IO_RE_ENQ_AT_CMD_CNF, // ATP_IO re-enque the AT result because could not call CCCI put bype function to the full buffer
+    MSG_ID_ATP_IO_RE_ENQ_URC_IND, // ATP_IO re-enque the URC because could not call CCCI put bype function to the full buffer
+    MSG_ID_ATP_IO_TARGET_RESET_IND,     // ATP requests ATP_IO to reset modem
+    MSG_ID_ATP_IO_FLUSH_UART_QUEUE_IND,
+
+    /* For UT */
+    MSG_ID_ATP_UT_UART_RTR_IND,
+    MSG_ID_ATP_UT_UART_RTW_IND,
+    MSG_ID_ATP_UT_AT_CMD_REQ,
+    MSG_ID_ATP_UT_AT_CMD_CNF,
+    MSG_ID_ATP_UT_IO_CONTEXT_REQ,
+    MSG_ID_ATPTST_AT_RESPONSE_IND, //to replace MSG_ID_L4CTST_AT_RESPONSE_IND
+    MSG_ID_ATP_UT_URC_REPORT_MODE_IND,
+
+    /* For VMMI */
+    MSG_ID_VMMI_ATP_IO_AT_CMD_REQ,
+
+MODULE_MSG_END( MSG_ID_ATPIO_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_PROXY_CODE_BEGIN )
+    /* ATP_IO --> ATP */
+    MSG_ID_ATP_AT_CMD_REQ = MSG_ID_PROXY_CODE_BEGIN, //ATP_IO notifies ATP here comes an AT command, replace MSG_ID_PROXY_ATCI_CMD_IND
+
+    /* L4B --> ATP */
+    MSG_ID_ATP_L4B_AT_CMD_CNF, //L4B responds to ATP the AT result, replace MSG_ID_PROXY_ATCI_CMD_CNF
+    MSG_ID_ATP_L4B_AT_URC_IND,
+
+    MSG_ID_ATP_L4BPWR_EFUN_CNF,
+    MSG_ID_ATP_L4BPWR_CFUN_CNF,
+    MSG_ID_ATP_L4BPWR_EPOF_CNF,
+
+    MSG_ID_ATP_L4BPWR_GET_NR_PS_CNF,
+    MSG_ID_ATP_L4BPWR_SET_NR_PS_CNF,
+
+MODULE_MSG_END( MSG_ID_PROXY_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_ATP_CODE_BEGIN )
+
+    /* IMCSMS --> ATP */
+  MSG_ID_ATP_IMCSMS_RANGE_BEGIN = MSG_ID_ATP_CODE_BEGIN,
+    MSG_ID_ATP_IMCSMS_SUBMIT_CHECK_IND,
+    MSG_ID_ATP_IMCSMS_COMMAND_CHECK_IND,
+    MSG_ID_ATP_IMCSMS_SMMA_CHECK_IND,
+    MSG_ID_ATP_IMCSMS_STK_SUBMIT_CHECK_IND,
+    MSG_ID_ATP_IMCSMS_SEND_MSG_URC_IND,
+    MSG_ID_ATP_IMCSMS_RECV_MSG_CNF,
+  MSG_ID_ATP_IMCSMS_RANGE_END,
+  
+    /* SDM --> ATP */
+  MSG_ID_SDM_ATP_RANGE_BEGIN,
+    MSG_ID_SDM_ATP_CMD_SEND_SMS_RSP,
+    MSG_ID_SDM_ATP_URC_RCV_SMS_REQ,
+    MSG_ID_SDM_ATP_CMD_SEND_SMMA_UPDATE_REQ,
+    MSG_ID_SDM_ATP_CS_SMS_SUBMIT,
+    MSG_ID_SDM_ATP_CMD_SEND_DELIVER_REPORT_RSP,
+    MSG_ID_SDM_ATP_CS_SMS_COMMAND,
+    MSG_ID_SDM_ATP_CS_SMS_SMMA,
+    MSG_ID_SDM_ATP_CMD_STK_SMS_RSP,
+    MSG_ID_SDM_ATP_STK_SMS_QUERY_REQ,
+    MSG_ID_SDM_ATP_CS_STK_SMS_REQ,
+    MSG_ID_SDM_ATP_STK_SMS_TR_REQ,
+    MSG_ID_SDM_ATP_CMD_WFC_PROFILE_RSP,
+    MSG_ID_SDM_ATP_CMD_SET_WFC_PROFILE_REQ,
+    MSG_ID_SDM_ATP_IMSI_GET_REQ,
+    MSG_ID_SDM_ATP_CMD_SEND_C2K_SMS_RSP,
+    MSG_ID_SDM_ATP_URC_RCV_C2K_SMS_REQ,
+    MSG_ID_SDM_ATP_CMD_SEND_CMSS_RSP,
+    MSG_ID_SDM_ATP_CMSS_IMS_REQ,
+    MSG_ID_SDM_ATP_CMSS_CS_REQ,
+    MSG_ID_SDM_ATP_UPDATE_MSG_BOX_REQ,
+    MSG_ID_SDM_ATP_SEND_C2K_MSG_URC_IND,
+    MSG_ID_SDM_ATP_IMS_SMS_SMART_CONGESTION_REQ,
+    MSG_ID_SDM_ATP_IMS_NORMAL_SMS_SMART_CONGESTION_START_REQ,
+    MSG_ID_SDM_ATP_IMS_STK_SMS_SMART_CONGESTION_START_REQ,
+    MSG_ID_SDM_ATP_IMS_CMSS_SMS_SMART_CONGESTION_START_REQ,
+    MSG_ID_SDM_ATP_IMS_C2K_SMS_SMART_CONGESTION_START_REQ,
+    MSG_ID_SDM_ATP_IMS_UTK_SMS_SMART_CONGESTION_START_REQ,
+    MSG_ID_SDM_ATP_IMS_SMS_SMART_CONGESTION_STOP_REQ,
+    MSG_ID_SDM_ATP_IMS_SMS_SMART_CONGESTION_URC_IND,
+    MSG_ID_SDM_ATP_SMS_DELIVER_URC_IND,
+    MSG_ID_SDM_ATP_CMD_SEND_CS_DELIVER_REPORT,
+    MSG_ID_SDM_ATP_STATUS_REPORT_URC_IND,
+    MSG_ID_SDM_ATP_ECFG_SET_CNF,
+    MSG_ID_SDM_ATP_ECFG_GET_CNF,
+    MSG_ID_SDM_ATP_SEND_SCBM_URC_IND,
+    MSG_ID_SDM_ATP_FDN_ECC_CHECK_REQ,
+    MSG_ID_SDM_ATP_C2K_SMS_DELIVER_URC_IND,    
+	MSG_ID_ATP_SDM_SMS_STATUS_URC_IND,
+	MSG_ID_SDM_ATP_REPORT_PSI_URC_IND,
+	MSG_ID_SDM_ATP_IMS_MT_SMS_END_REQ,
+
+  MSG_ID_SDM_ATP_RANGE_END,
+  
+    /* VDM --> ATP */
+  MSG_ID_VDM_ATP_RANGE_BEGIN,
+    MSG_ID_VDM_ATP_CMD_DIAL_RSP,
+    MSG_ID_VDM_ATP_CMD_DIAL_URI_RSP,
+    MSG_ID_VDM_ATP_CMD_DIAL_EMERG_RSP,
+    MSG_ID_VDM_ATP_CMD_DIAL_FROM_LINE_RSP,
+    MSG_ID_VDM_ATP_CMD_DIAL_CONF_RSP,
+    MSG_ID_VDM_ATP_CMD_CDV_RSP,
+    MSG_ID_VDM_ATP_CMD_STK_CALL_RSP,
+    MSG_ID_VDM_ATP_CMD_MT_CALL_APPROVE_RSP,
+    MSG_ID_VDM_ATP_CMD_MT_CALL_ACCEPT_RSP,
+    MSG_ID_VDM_ATP_CMD_MT_VT_SPECIAL_ACCEPT_RSP,
+    MSG_ID_VDM_ATP_CMD_HANGUP_ALL_RSP,
+    MSG_ID_VDM_ATP_CMD_FORCE_HANGUP_RSP,
+    MSG_ID_VDM_ATP_CMD_CALL_RELATED_SS_RSP,
+    MSG_ID_VDM_ATP_CMD_DTMF_RSP,
+    MSG_ID_VDM_ATP_CMD_EXT_DTMF_RSP,
+    MSG_ID_VDM_ATP_CMD_EXT_ERROR_REPORT_RSP,
+    MSG_ID_VDM_ATP_CMD_LIST_CURRENT_CALLS_RSP,
+    MSG_ID_VDM_ATP_CMD_LIST_CURRENT_CALLS_EXT_RSP,
+    MSG_ID_VDM_ATP_CMD_EMERG_SERV_CAT_RSP,
+    MSG_ID_VDM_ATP_CMD_WFC_PROFILE_RSP,
+    MSG_ID_VDM_ATP_CMD_RTT_CAPABILITY_RSP,
+    MSG_ID_VDM_ATP_CMD_SELF_ACTIVATION_RSP,
+#if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)
+    MSG_ID_VDM_ATP_CMD_DIAL_ECALL_RSP,
+#endif
+    MSG_ID_VDM_ATP_SND_ECPI_MO_CALL_ID_ALLOC_REQ,
+    MSG_ID_VDM_ATP_SND_ECPI_MT_CALL_SETUP_REQ,
+    MSG_ID_VDM_ATP_SND_ECPI_CALL_RELEASE_REQ,
+    MSG_ID_VDM_ATP_SND_MT_CALL_APPROVE_REQ,
+    MSG_ID_VDM_ATP_SND_ECPI_RTT_REDIAL_REQ,
+
+    MSG_ID_VDM_ATP_CS_CC_ECPI_TRANSLATE_RSP,
+
+    MSG_ID_VDM_ATP_C2K_CC_ECPI_TRANSLATE_RSP,
+
+    MSG_ID_VDM_ATP_SND_ADS_STATUS_REQ,
+    MSG_ID_VDM_ATP_SND_MT_CALL_RING_REQ,
+    MSG_ID_VDM_ATP_SND_URC_RELAY_REQ,
+    MSG_ID_VDM_ATP_SND_SRVCC_CONF_CALL_ID_REQ,
+    MSG_ID_VDM_ATP_SND_STK_CALL_TR_REQ,
+    MSG_ID_VDM_ATP_VDM_VOICE_STATUS_REQ,
+    MSG_ID_VDM_ATP_SND_ADS_RESULT_REPORT_REQ,
+    MSG_ID_VDM_ATP_SND_CONF_CHECK_RESULT_REQ,
+    MSG_ID_VDM_ATP_SND_DIGITS_TRN_QUERY_REQ,
+    MSG_ID_VDM_ATP_GMSS_SET_HVOLTE_MODE_REQ,
+    MSG_ID_VDM_ATP_SND_ADS_SWITCH_TO_EMERGENCY_REQ,
+    MSG_ID_VDM_ATP_GENERAL_MODEM_CONFIGURE_SET_REQ,
+    MSG_ID_VDM_ATP_SND_ENH_VOLTE_SI_CALL_STATUS_IND,
+    MSG_ID_VDM_ATP_ECFG_SET_RSP,
+    MSG_ID_VDM_ATP_CMD_SRVCC_CONTEXT_TRANSFER_RSP,
+
+    MSG_ID_ATP_VDM_SND_EMCSS_URC_REQ, // send +EMCSS URC
+    MSG_ID_ATP_VDM_SND_ECBM_URC_REQ,  // send +CIEV: 102,x URC
+    MSG_ID_ATP_VDM_CMD_EMCS_CNF,
+    MSG_ID_ATP_VDM_SND_ECNWS_URC_REQ, // send +ECNWS URC
+
+    MSG_ID_VDM_ATP_AT_CMD_TO_MD_IND,
+
+  MSG_ID_VDM_ATP_RANGE_END,
+
+    /*IMC --> ATP */
+  MSG_ID_ATP_IMC_RANGE_BEGIN,
+    MSG_ID_ATP_IMC_LOOP_TEST_IND,
+    MSG_ID_ATP_IMC_POWER_OFF_CNF,
+    MSG_ID_ATP_IMC_IMS_REG_STATUS_IND,
+    MSG_ID_ATP_IMC_IMS_ENABLE_IND,
+    MSG_ID_ATP_IMC_CALL_CONTROL_IND,
+    MSG_ID_ATP_IMC_CC_CALL_PROGRESS_IND,
+    MSG_ID_ATP_IMC_CC_PAU_IND,
+    MSG_ID_ATP_IMC_CC_IMSEMS_IND,
+    MSG_ID_ATP_IMC_CC_EVTSTATUS_IND,
+    MSG_ID_ATP_IMC_CC_ESPEECH_IND,
+    MSG_ID_ATP_IMC_SS_CONFERENCE_CONTROL_CNF,
+    MSG_ID_ATP_IMC_SS_SUBSCRIBE_CONTROL_IND,
+    MSG_ID_ATP_IMC_SS_CONFERENCE_CONTROL_IND,
+    MSG_ID_ATP_IMC_SS_PROGRESS_NOTIFY_IND,
+    MSG_ID_ATP_IMC_SS_ECT_IND,
+    MSG_ID_ATP_IMC_ECFG_SET_CNF,
+    MSG_ID_ATP_IMC_ECFG_GET_CNF,
+    MSG_ID_ATP_IMC_ECFG_RESET_CNF,
+    MSG_ID_ATP_IMC_EMOCFG_CNF,
+    MSG_ID_ATP_IMC_CC_CSSU_IND,
+    MSG_ID_ATP_IMC_QUERY_URI_TYPE_CNF,
+    MSG_ID_ATP_IMC_CALL_CONTROL_CNF,
+    MSG_ID_ATP_IMC_IMS_REG_START_IND,
+    MSG_ID_ATP_IMC_IMS_DEREG_START_IND,
+    MSG_ID_ATP_IMC_SIP_CALL_PROGRESS_IND,
+    MSG_ID_ATP_IMC_EIMS_URC_IND,
+    MSG_ID_ATP_IMC_SET_RLM_REQ,
+    MSG_ID_ATP_IMC_IMS_DEREG_CNF,
+    MSG_ID_ATP_IMC_IMS_INIT_IND,
+    MSG_ID_ATP_IMC_EPVS_SET_CNF,
+    MSG_ID_ATP_IMC_EPVS_GET_CNF,
+    MSG_ID_ATP_IMC_FDN_ECC_CHECK_REQ,
+    MSG_ID_ATP_IMC_SS_FDN_CHECK_REQ,
+    MSG_ID_ATP_IMC_IMS_EXIT_ECBM_IND,
+    MSG_ID_ATP_IMC_EIMSGEO_IND,
+    /* WFC */
+    MSG_ID_ATP_IMC_HANDOVER_START_IND,
+    MSG_ID_ATP_IMC_HANDOVER_STOP_IND,
+
+    /* VILTE */
+    MSG_ID_ATP_IMC_CC_MEDIA_MOD_IND,
+    MSG_ID_ATP_IMC_CC_VIDEO_CAP_IND,
+
+    /* USSI */
+    MSG_ID_ATP_IMC_SEND_USSD_CNF,
+    MSG_ID_ATP_IMC_RECV_USSD_IND,
+
+    /* emergency access id, requirement for AT&T */
+    MSG_ID_ATP_IMC_SET_EMERGENCY_AID_CNF,
+
+    /* AT+EWFCP */
+    MSG_ID_ATP_IMC_WFC_PROFILE_CNF,
+
+    /* AT+EIMSRCS */
+    MSG_ID_ATP_IMC_RCS_FEATURE_CNF,
+    MSG_ID_ATP_IMC_SWITCH_PREFER_RAT_CNF,
+    /* AT+ECT */
+    MSG_ID_ATP_IMC_SS_ECT_CNF,
+
+    /* AT+ESIPHEADER */
+    MSG_ID_ATP_IMC_SIP_HEADER_CNF,
+
+    /* +EIMSTCAP */
+    MSG_ID_ATP_IMC_TTY_CAPABILITY_IND,
+
+    /* AT CMD relay */
+    MSG_ID_ATP_IMC_ATCMD_RELAY_IND,
+    MSG_ID_ATP_IMC_ATCMD_RELAY_CNF,
+
+    /* AT+EGMR=0,9 */
+    MSG_ID_ATP_IMC_QUERY_IMEI_SVN_REQ,
+
+    /* AT+EIMSEVS */
+    MSG_ID_ATP_IMC_SET_EVS_SUPPORT_CNF,
+
+
+    /* MIMS capability */
+    MSG_ID_ATP_IMC_MIMS_CAPABILITY_CNF,
+
+    /* AT+EITMR */
+    MSG_ID_ATP_IMC_IMS_TIMER_STATUS_IND,
+
+    /* AT+EIMSEVENT */
+    MSG_ID_ATP_IMC_IMS_EVENT_IND,
+
+    /* RTT */
+    MSG_ID_ATP_IMC_RTT_CAPABILITY_CNF,
+    MSG_ID_ATP_IMC_CC_RTT_OP_CNF,
+
+    /* General AT command to MD, AT+EGMC=1,<configure_name>,<config1>[,<config2>...]*/
+    MSG_ID_ATP_IMC_AT_CMD_TO_MD_IND,
+	
+	/*AT+CSCM*/
+    MSG_ID_ATP_IMC_NORMAL_REG_CSCM_REQ,
+
+    /* AT+STKCALL=80/81 when STK call over IMS successfully. */
+    MSG_ID_ATP_IMC_IMS_STKCALL_IND,
+    
+    /* regua remain time to ap */
+    MSG_ID_ATP_IMC_REGUA_REMAIN_TIME_IND,
+  MSG_ID_ATP_IMC_RANGE_END, 
+
+    /*IMCB --> ATP */
+  MSG_ID_ATP_IMCB_RANGE_BEGIN,
+  MSG_ID_ATP_IMCB_RANGE_END,
+
+  /* LTECSR -> ATP */
+  MSG_ID_LTECSR_ATP_RANGE_BEGIN,
+    MSG_ID_LTECSR_ATP_RTP_TIMER_EXPIRE,
+    MSG_ID_LTECSR_ATP_PKT_INFO_URC,
+    MSG_ID_LTECSR_ATP_IMS_AUDIO_SILENCE_IND,
+    MSG_ID_ATP_LTECSR_ECFG_SET_CNF,
+    MSG_ID_ATP_LTECSR_ECFG_GET_CNF,
+  MSG_ID_LTECSR_ATP_RANGE_END,
+
+  /* D2AM --> ATP */
+  MSG_ID_ATP_D2AM_RANGE_BEGIN,
+    MSG_ID_ATP_D2AT_CFUN_CNF,           //paired with MSG_ID_ATP_D2AT_CFUN_REQ
+    MSG_ID_ATP_D2AT_EFUN_CNF,           //paired with MSG_ID_ATP_D2AT_EFUN_REQ
+    MSG_ID_ATP_D2AT_EIAAPN_CNF,         //paired with MSG_ID_ATP_D2AT_EIAAPN_REQ
+    MSG_ID_ATP_D2AT_EGDATA_CNF,         //paired with MSG_ID_ATP_D2AT_EGDATA_REQ
+    MSG_ID_ATP_D2AT_L4_CMD_CGATT_IND,      //used to send AT+CGATT to PS, paired with MSG_ID_ATP_D2AT_L4_CMD_CGATT_RSP
+    MSG_ID_ATP_D2AT_L4_CMD_EGTYPE_IND,     //used to send AT+EGTYPE to PS, paired with MSG_ID_ATP_D2AT_L4_CMD_EGTYPE_RSP
+    MSG_ID_ATP_D2AT_L4_CMD_ICCID_IND,       //used to send AT+ICCID to PS, paired with MSG_ID_ATP_D2AT_L4_CMD_ICCID_RSP
+    MSG_ID_ATP_D2AT_EDALLOW_CNF,       //paired with MSG_ID_ATP_D2AT_EDALLOW_REQ
+    MSG_ID_ATP_D2AT_L4_CMD_EGREA_IND, // used to send AT+EGREA to PS, paired with MSG_ID_ATP_D2AT_L4_CMD_EGREA_RSP
+    MSG_ID_ATP_D2AT_AP_URC_EIAREG_IND, // URC attach pdn to AP
+    MSG_ID_ATP_D2AT_EIMSTESTMODE_CNF,  //paired with MSG_ID_ATP_D2AT_EIMSTESTMODE_REQ
+    MSG_ID_ATP_D2AT_EDATASIM_CNF, // default data sim, paired with MSG_ID_ATP_D2AT_EDALLOW_REQ
+    MSG_ID_ATP_D2AT_EIAMDPREFER_CNF, // paired with MSG_ID_ATP_D2AT_EIAMDPREFER_REQ
+    MSG_ID_ATP_D2AT_EIAATTACH_CNF,    //paired with MSG_ID_ATP_D2AT_EIAATTACH_REQ
+  MSG_ID_ATP_D2AM_RANGE_END,
+
+  /* D2UX -> ATP */
+  MSG_ID_ATP_D2UX_RANGE_BEGIN,
+    MSG_ID_ATP_D2AT_EGDCACT_CNF, //paired with MSG_ID_ATP_D2AT_EGDCACT_REQ
+  MSG_ID_ATP_D2UX_RANGE_END,
+
+  /* D2AT --> ATP */
+  MSG_ID_ATP_D2AT_RANGE_BEGIN,
+    MSG_ID_ATP_D2AT_CNF,          //General CNF
+    MSG_ID_ATP_D2AT_CGACT_IND,          //paired with MSG_ID_ATP_D2AT_CGACT_REQ
+    MSG_ID_ATP_D2AT_CGACT_CNF,          //paired with MSG_ID_ATP_D2AT_CGACT_REQ
+    MSG_ID_ATP_D2AT_ACTTEST_CNF,          //paired with MSG_ID_ATP_D2AT_CGACT_REQ
+    MSG_ID_ATP_D2AT_CGDCONT_IND,          //paired with MSG_ID_ATP_D2AT_CGDCONT_REQ
+    MSG_ID_ATP_D2AT_CGDCONT_CNF,          //paired with MSG_ID_ATP_D2AT_CGDCONT_REQ
+    MSG_ID_ATP_D2AT_XGDCONT_IND,          //paired with MSG_ID_ATP_D2AT_XGDCONT_REQ, for FI***OM only.
+    MSG_ID_ATP_D2AT_CGAUTH_IND,          //paired with MSG_ID_ATP_D2AT_CGAUTH_REQ
+    MSG_ID_ATP_D2AT_CGAUTH_CNF,          //paired with MSG_ID_ATP_D2AT_CGAUTH_REQ
+    MSG_ID_ATP_D2AT_CGPADDR_IND,          //paired with MSG_ID_ATP_D2AT_CGPADDR_REQ
+    MSG_ID_ATP_D2AT_CGPADDR_CNF,          //paired with MSG_ID_ATP_D2AT_CGPADDR_REQ
+    MSG_ID_ATP_D2AT_CGCONTRDP_IND,      // paired with MSG_ID_ATP_D2AT_CGCONTRDP_IND
+    MSG_ID_ATP_D2AT_CGCONTRDP_CNF,      //paired with MSG_ID_ATP_D2AT_CGCONTRDP_REQ
+    MSG_ID_ATP_D2AT_AP_URC_CGEV_IND,
+    MSG_ID_ATP_D2AT_CMD_CNF,
+    MSG_ID_ATP_D2AT_CGDSCONT_IND,
+    MSG_ID_ATP_D2AT_CGTFT_IND,
+    MSG_ID_ATP_D2AT_CGQREQ_IND,
+    MSG_ID_ATP_D2AT_CGQMIN_IND,
+    MSG_ID_ATP_D2AT_CGEQREQ_IND,
+    MSG_ID_ATP_D2AT_CGEQMIN_IND,
+    MSG_ID_ATP_D2AT_CGSCONTRDP_IND,
+    MSG_ID_ATP_D2AT_CGTFTRDP_IND,
+    MSG_ID_ATP_D2AT_CGEQOS_IND,
+    MSG_ID_ATP_D2AT_CGEQOSRDP_IND,
+    MSG_ID_ATP_D2AT_C5GQOS_IND,
+    MSG_ID_ATP_D2AT_C5GQOSRDP_IND,
+    MSG_ID_ATP_D2AT_CGEREP_IND,
+
+    MSG_ID_ATP_D2AT_EGPCORDP_IND,
+    MSG_ID_ATP_D2AT_EGPCO_IND,
+    MSG_ID_ATP_D2AT_BGPCORDP_IND,
+    MSG_ID_ATP_D2AT_CGEQNEG_IND,
+    MSG_ID_ATP_D2AT_CGDEL_IND,
+    MSG_ID_ATP_D2AT_EGDELPF_IND,
+    MSG_ID_ATP_D2AT_EGLNKPF_IND,
+
+    MSG_ID_ATP_D2AT_AP_URC_EIF_HO_IND,
+    MSG_ID_ATP_D2AT_ESCONTIND_IND,
+    MSG_ID_ATP_D2AT_AP_URC_ESCONTIND_IND,
+    MSG_ID_ATP_D2AT_EPSI_CNF,      //paired with MSG_ID_ATP_D2AT_EPSI_REQ
+    MSG_ID_ATP_D2AT_EGURSPRDP_IND,
+    MSG_ID_ATP_D2AT_EGURSPRDP_CNF,
+    MSG_ID_ATP_D2AT_EGURSPREEVAL_URC_IND,
+    MSG_ID_ATP_D2AT_EGUEPOLICY_CNF,
+    MSG_ID_ATP_D2AT_EGUEPOLICYRDP_IND,
+    MSG_ID_ATP_D2AT_EGUEPOLICYRDP_CNF,
+    MSG_ID_ATP_D2AT_EGUEPOLICY_URC_IND,
+  MSG_ID_ATP_D2AT_RANGE_END,
+  
+  /* D2CM --> ATP */
+  MSG_ID_ATP_D2CM_RANGE_BEGIN,
+    MSG_ID_ATP_D2AT_EAPNACT_IND,        //paired with MSG_ID_ATP_D2AT_EAPNACT_REQ
+    MSG_ID_ATP_D2AT_EAPNACT_CNF,        //paired with MSG_ID_ATP_D2AT_EAPNACT_REQ
+    MSG_ID_ATP_D2AT_EIF_CNF,            //paired with MSG_ID_ATP_D2AT_EIF_REQ
+    MSG_ID_ATP_D2AT_EPDN_IND,           //paired with MSG_ID_ATP_D2AT_EPDN_REQ
+    MSG_ID_ATP_D2AT_EPDN_CNF,           //paired with MSG_ID_ATP_D2AT_EPDN_REQ
+    MSG_ID_ATP_D2AT_EGFB_CNF,           //paired with MSG_ID_ATP_D2AT_EGFB_REQ
+    MSG_ID_ATP_D2AT_EDRETRY_CNF,        //paired with MSG_ID_ATP_D2AT_EDRETRY_REQ
+    MSG_ID_ATP_D2AT_EDRETRYRDP_IND,     //paired with MSG_ID_ATP_D2AT_EDRETRYRDP_REQ
+    MSG_ID_ATP_D2AT_EDRETRYRDP_CNF,     //paired with MSG_ID_ATP_D2AT_EDRETRYRDP_REQ
+    MSG_ID_ATP_D2AT_AP_URC_EIF_IND,
+    MSG_ID_ATP_D2AT_AP_URC_EPDN_IND,
+    MSG_ID_ATP_D2AT_AP_URC_EAPNINFO_IND,
+    MSG_ID_ATP_D2AT_AP_URC_EDRETRY_IND, 
+  MSG_ID_ATP_D2CM_RANGE_END,
+  
+  /* D2PM --> ATP */
+  MSG_ID_ATP_D2PM_RANGE_BEGIN,
+    MSG_ID_ATP_D2AT_EAPNLOCK_CNF,       //paired with MSG_ID_ATP_D2AT_EAPNLOCK_REQ
+    MSG_ID_ATP_D2AT_EAPNSET_IND,        //paired with MSG_ID_ATP_D2AT_EAPNSET_REQ
+    MSG_ID_ATP_D2AT_EAPNSET_CNF,        //paired with MSG_ID_ATP_D2AT_EAPNSET_REQ
+    MSG_ID_ATP_D2AT_EAPNRESV_CNF,       //paired with MSG_ID_ATP_D2AT_EAPNRESV_REQ
+    MSG_ID_ATP_D2AT_EAID_CNF,           //paired with MSG_ID_ATP_D2AT_EAID_REQ
+  MSG_ID_ATP_D2PM_RANGE_END,
+
+  MSG_ID_ATP_D2RM_RANGE_BEGIN,
+    MSG_ID_ATP_D2RM_EWOPDNERR_IND,
+  MSG_ID_ATP_D2RM_RANGE_END,
+
+    /* DDM --> ATP */
+    MSG_ID_ATP_DDM_RANGE_BEGIN,
+    MSG_ID_ATP_DDM_CMD_CNF,
+    MSG_ID_ATP_DDM_CGDATA_CNF,
+    MSG_ID_ATP_DDM_CGDCONT_IND,
+    MSG_ID_ATP_DDM_CGDSCONT_IND,
+    MSG_ID_ATP_DDM_CGTFT_IND,
+    MSG_ID_ATP_DDM_CGQREQ_IND,
+    MSG_ID_ATP_DDM_CGQMIN_IND,
+    MSG_ID_ATP_DDM_CGEQREQ_IND,
+    MSG_ID_ATP_DDM_CGEQMIN_IND,
+    MSG_ID_ATP_DDM_CGEQNEG_IND,
+    MSG_ID_ATP_DDM_CGACT_IND,
+    MSG_ID_ATP_DDM_CGPADDR_IND,
+    MSG_ID_ATP_DDM_CGAUTO_IND,
+    MSG_ID_ATP_DDM_CGEREP_IND,
+    MSG_ID_ATP_DDM_CGCONTRDP_IND,
+    MSG_ID_ATP_DDM_CGSCONTRDP_IND,
+    MSG_ID_ATP_DDM_CGTFTRDP_IND,
+    MSG_ID_ATP_DDM_CGEQOS_IND,
+    MSG_ID_ATP_DDM_CGEQOSRDP_IND,
+    MSG_ID_ATP_DDM_C5GQOS_IND,
+    MSG_ID_ATP_DDM_C5GQOSRDP_IND,
+    MSG_ID_ATP_DDM_CGDEL_IND,
+    MSG_ID_ATP_DDM_CGAUTH_IND,
+    MSG_ID_ATP_DDM_VZWAPNETMR_IND,
+    MSG_ID_ATP_DDM_VZWAPNE_IND,
+    MSG_ID_ATP_DDM_ESCONTIND_IND,
+    MSG_ID_ATP_DDM_EGPAU_IND,
+    MSG_ID_ATP_DDM_PSBEARER_IND,
+    MSG_ID_ATP_DDM_EGFB_IND,
+    MSG_ID_ATP_DDM_EGDELPF_IND,
+    MSG_ID_ATP_DDM_EGLNKPF_IND,
+    MSG_ID_ATP_DDM_EGPCORDP_IND,
+#ifdef __TC01__
+    MSG_ID_ATP_DDM_BACKOFF_TIMER_IND,
+#endif    
+    MSG_ID_ATP_DDM_NWLIMIT_IND,
+    MSG_ID_ATP_DDM_EGPCO_IND,
+    MSG_ID_ATP_DDM_EDRETRY_IND,
+    MSG_ID_ATP_DDM_CRLADN_IND,
+    MSG_ID_ATP_DDM_CLADN_IND,
+    MSG_ID_ATP_DDM_CLADNU_IND,
+    //send CMD to L4
+    MSG_ID_ATP_DDM_L4_CMD_CGATT_IND,      //used to send AT+CGATT to PS, paired with MSG_ID_ATP_DDM_L4_CMD_CGATT_RSP
+    MSG_ID_ATP_DDM_RANGE_END,
+
+    MSG_ID_ATP_SIMMNGR_RANGE_BEGIN,
+        MSG_ID_ATP_SIMMNGR_CMEE_SET_REQ,
+        MSG_ID_ATP_SIMMNGR_CPIN_QUERY_REQ,
+        MSG_ID_ATP_SIMMNGR_ESIMS_QUERY_REQ,
+        MSG_ID_ATP_SIMMNGR_IMEI_QUERY_REQ,
+        MSG_ID_ATP_SIMMNGR_ESIMAPP_QUERY_REQ,
+    MSG_ID_ATP_SIMMNGR_RANGE_END,
+
+    /* IMSM --> ATP */
+    MSG_ID_ATP_IMSM_RANGE_BEGIN,
+        //send URC to AP
+        MSG_ID_ATP_IMSM_AP_URC_IND,
+        //send CMD to L4
+        MSG_ID_ATP_IMSM_L4_CMD_IND,      //used to send at command to PS, paired with MSG_ID_ATP_IMSM_L4_CMD_RSP
+	MSG_ID_ATP_IMSM_MTU_SIZE_IND,
+    MSG_ID_ATP_IMSM_RANGE_END,
+    
+    /* IWLAN --> ATP */
+    MSG_ID_ATP_IWLAN_RANGE_BEGIN,
+        // send CMD to L4
+        MSG_ID_ATP_IWLAN_L4_IMSCFG_IND, // used to send AT+EIMSCFG to PS, paired with MSG_ID_ATP_IWLAN_L4_IMSCFG_RSP
+        MSG_ID_ATP_IWLAN_L4_PLWTHCFG_IND,
+        MSG_ID_ATP_IWLAN_WIFIMON_CFG_IND,
+        MSG_ID_ATP_IWLAN_EWIFIPDNACT_IND,
+        MSG_ID_ATP_IWLAN_EIWLPL_IND,
+        MSG_ID_ATP_IWLAN_CEUS_REQ,
+        MSG_ID_ATP_IWLAN_EIWLCFGSET_IND,
+        MSG_ID_ATP_IWLAN_EIWLCFGGET_IND,
+        MSG_ID_ATP_IWLAN_EIMSGEO_IND,
+        MSG_ID_ATP_IWLAN_EWFCRVOUT_IND,
+        MSG_ID_ATP_IWLAN_EIWLPING_IND,
+        MSG_ID_ATP_IWLAN_EPVSSET_IND,
+        MSG_ID_ATP_IWLAN_EPVSGET_IND,
+        MSG_ID_ATP_IWLAN_EPOF_IND,
+    MSG_ID_ATP_IWLAN_RANGE_END,
+
+    /* N3EPC --> ATP */
+    MSG_ID_ATP_N3EPC_RANGE_BEGIN,
+        MSG_ID_ATP_N3EPC_EWOPDNOOS_IND,
+    MSG_ID_ATP_N3EPC_RANGE_END,
+
+    /* WO --> ATP */
+    MSG_ID_ATP_WO_RANGE_BEGIN,
+        MSG_ID_ATP_WO_EWOPDNOOS_IND,
+        MSG_ID_ATP_WO_EWOKEEPALIVE_IND,
+        MSG_ID_ATP_WO_EWIFINATT_CNF,
+        MSG_ID_ATP_WO_EWOCFGSET_CNF,
+        MSG_ID_ATP_WO_EWOCFGGET_CNF,
+    MSG_ID_ATP_WO_RANGE_END,
+
+    /* N3CF --> ATP */
+    MSG_ID_ATP_N3CF_RANGE_BEGIN,
+        MSG_ID_ATP_N3CF_EN3CFGSET_IND,
+        MSG_ID_ATP_N3CF_EN3CFGGET_CNF,
+        MSG_ID_ATP_N3CF_EPOF_IND,
+        MSG_ID_ATP_N3CF_EPVS_SET_CNF,
+    MSG_ID_ATP_N3CF_RANGE_END,
+
+    /* BIP SIM MGR --> ATP */
+    MSG_ID_ATP_BIP_SIM_MGR_RANGE_BEGIN,
+        //send URC to AP
+        MSG_ID_ATP_BIP_SIM_MGR_AP_URC_REQ,
+        //send CMD to protocol stack(PS)
+        MSG_ID_ATP_BIP_SIM_MGR_PS_CMD_REQ,
+        MSG_ID_ATP_BIP_SIM_MGR_PS_TR_REQ,
+        MSG_ID_ATP_BIP_SIM_MGR_PS_ENV_REQ,
+    MSG_ID_ATP_BIP_SIM_MGR_RANGE_END,
+
+    /* SSDS --> ATP */
+    MSG_ID_ATP_SSDS_RANGE_BEGIN,
+        MSG_ID_ATP_SSDS_SS_ATCMD_REDIRECT_REQ,          /*ATCMD redirect to protocol stack request: SSDS--->ATP--->PS*/
+        MSG_ID_ATP_SSDS_SS_URC_IND,                     /*SSDS URC to ATP: SSDS --- >ATP ---> AP*/
+        MSG_ID_ATP_SSDS_SS_ATCMD_CNF,                   /*SSDS response to ATP: SSDS --- >ATP ---> AP*/
+        MSG_ID_ATP_SSDS_EGBA_ATCMD_CNF,                 /*SSDS response to ATP: SSDS --- >ATP ---> AP*/
+        MSG_ID_ATP_SSDS_USSD_ATCMD_CNF,                 /*SSDS response to ATP: SSDS --- >ATP ---> AP*/
+        MSG_ID_ATP_SSDS_USSD_ATCMD_REDIRECT_REQ,        /*ATCMD redirect to protocol stack request: SSDS--->ATP--->PS*/
+        MSG_ID_ATP_SSDS_USSD_URC_IND,                   /*SSDS URC to ATP: SSDS --- >ATP ---> AP*/
+        MSG_ID_ATP_SSDS_EXCAPRCN_URC_IND,               /*SSDS send EXCAPRCN to ATP: SSDS --- >ATP ---> AP */
+        MSG_ID_ATP_SSDS_ERAT_QUERY_REQ,                 /*SSDS send AT+ERAT? */
+        MSG_ID_ATP_SSDS_ERAT_SET_REQ,                   /*SSDS send AT+ERAT=,,,,, */
+    MSG_ID_ATP_SSDS_RANGE_END,
+
+    /* XCAP --> ATP */
+    MSG_ID_ATP_XCAP_RANGE_BEGIN,
+        MSG_ID_ATP_XCAP_EGBA_ATCMD_CNF,                 /*XCAP response to ATP: XCAP --- >ATP ---> AP*/
+        MSG_ID_ATP_XCAP_EXCAPCFGSET_CNF,
+        MSG_ID_ATP_XCAP_EXCAPCFGGET_CNF,
+    MSG_ID_ATP_XCAP_RANGE_END,
+
+    /*L4BSBP->ATP*/
+    MSG_ID_ATP_L4BSBP_RANGE_BEGIN,
+    MSG_ID_ATP_L4BSBP_AT_CH_LOCK_REQ,
+    MSG_ID_ATP_L4BSBP_AT_CH_UNLOCK_REQ,
+    MSG_ID_ATP_L4BSBP_RANGE_END,
+
+    /* L4C --> ATP */
+    MSG_ID_ATP_L4C_RANGE_BEGIN,
+        MSG_ID_ATP_L4C_EN3GPECP_CNF,
+        MSG_ID_ATP_L4C_E5GOPT_READ_CNF,
+        MSG_ID_ATP_L4C_E5GOPT_SET_CNF,
+    MSG_ID_ATP_L4C_RANGE_END,
+
+    /* SMSAL --> ATP */
+    MSG_ID_ATP_SMSAL_RANGE_BEGIN,
+        MSG_ID_ATP_SMSAL_C5GSMS_CNF,
+    MSG_ID_ATP_SMSAL_RANGE_END,
+    
+    /* SMS --> ATP */
+    MSG_ID_ATP_SMS_RANGE_BEGIN,
+        MSG_ID_ATP_SMS_STATUS_CNF,
+        MSG_ID_ATP_SMS_STATUS_URC_IND,
+    MSG_ID_ATP_SMS_RANGE_END,
+
+    /*MT->ATP*/
+    MSG_ID_ATP_MT_DMF_CMD_CNF,
+    MSG_ID_ATP_MT_DMF_URC_IND,
+
+    /* STKBRG --> ATP */
+    MSG_ID_STKBRG_ATP_RANGE_BEGIN,
+        MSG_ID_STKBRG_ATP_PORT_ALLOC_REQ,
+        MSG_ID_STKBRG_ATP_PORT_FREE_REQ,
+    MSG_ID_STKBRG_ATP_RANGE_END,
+
+    /* IPSEC --> ATP */
+    MSG_ID_IPSEC_ATP_RANGE_BEGIN,
+        MSG_ID_IPSEC_ATP_SPI_ALLOC_REQ,
+        MSG_ID_IPSEC_ATP_SPI_FREE_REQ,
+        MSG_ID_IPSEC_ATP_MULTI_SPI_FREE_REQ,
+    MSG_ID_IPSEC_ATP_RANGE_END,
+
+    /* WLC --> ATP */
+    MSG_ID_WLC_ATP_RANGE_BEGIN,
+        MSG_ID_WLC_ATP_EWIFILOCK_IND,
+        MSG_ID_WLC_ATP_EWIFIRSSITHRCFG_IND,
+        MSG_ID_WLC_ATP_EIMSGEO_IND,
+        MSG_ID_ATP_WLC_EWIFIMAC_IND,
+        MSG_ID_WLC_ATP_OFFLOAD_KEEP_ALIVE_IND,
+    MSG_ID_WLC_ATP_RANGE_END,
+
+    /*KPALV->ATP*/
+    MSG_ID_ATP_KPALV_RANGE_BEGIN,
+        MSG_ID_ATP_KPALV_KEEPALIVE_CNF,
+        MSG_ID_ATP_KPALV_CONNECTION_STATUS_IND,
+    MSG_ID_ATP_KPALV_RANGE_END,
+
+#if defined(__IPC_ADAPTER__)
+    /* IPC_Adapter --> ATP */
+    MSG_ID_IPCA_ATP_RANGE_BEGIN,
+        MSG_ID_IPCA_ATP_CMD_REQ,
+        MSG_ID_IPCA_ATP_CMD_RSP,
+        MSG_ID_IPCA_CTRL_ATP_LOCK_RSP,
+        MSG_ID_IPCA_CTRL_ATP_UNLOCK_RSP,
+    MSG_ID_IPCA_ATP_RANGE_END,  
+#endif    
+
+MODULE_MSG_END( MSG_ID_ATP_CODE_TAIL )
+
+#endif  /* _ATP_MSGID_H */
diff --git a/mcu/interface/sap/md/bip_msgid.h b/mcu/interface/sap/md/bip_msgid.h
new file mode 100644
index 0000000..bcd846b
--- /dev/null
+++ b/mcu/interface/sap/md/bip_msgid.h
@@ -0,0 +1,204 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   bip_msgid.h
+ *
+ * Description:
+ * ------------
+ *   BIP 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!
+ *
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+
+
+#include "module_msg_range.h"
+
+#ifndef _BIP_MSGID_H
+#define _BIP_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_BIP_CODE_BEGIN )
+// MOD_BIP
+
+// MOD_SIM_MGR
+MSG_ID_BIP_SIM_MGR_BIP_CMD_IND,
+MSG_ID_BIP_SIM_MGR_BIP_CMD_CNF,
+MSG_ID_BIP_SIM_MGR_TR_REQ, 
+MSG_ID_BIP_SIM_MGR_TR_RSP,
+MSG_ID_BIP_SIM_MGR_ENVELOPE_REQ,
+MSG_ID_BIP_SIM_MGR_ENVELOPE_RSP,
+MSG_ID_BIP_SIM_MGR_SIM_ERROR_IND,
+MSG_ID_BIP_SIM_MGR_SIM_ERROR_CNF,
+MSG_ID_ATP_BIP_SIM_MGR_STK_REQ,// STK cmd
+MSG_ID_ATP_BIP_SIM_MGR_BIP_CNF_IND,// AP confirm
+MSG_ID_ATP_BIP_SIM_MGR_ECNCFG_IND, 
+MSG_ID_ATP_BIP_SIM_MGR_BIP_EN, 
+
+// MOD_CONN_MGR
+MSG_ID_BIP_CONN_MGR_CREATE_3GPP_CONNECTION_REQ,
+MSG_ID_BIP_CONN_MGR_CREATE_3GPP_CONNECTION_RSP,
+MSG_ID_BIP_CONN_MGR_CREATE_WIFI_CONNECTION_REQ,
+MSG_ID_BIP_CONN_MGR_CREATE_WIFI_CONNECTION_RSP,
+MSG_ID_BIP_CONN_MGR_CLOSE_3GPP_CONNECTION_REQ,
+MSG_ID_BIP_CONN_MGR_CLOSE_3GPP_CONNECTION_RSP,
+MSG_ID_BIP_CONN_MGR_CLOSE_WIFI_CONNECTION_REQ,
+MSG_ID_BIP_CONN_MGR_CLOSE_WIFI_CONNECTION_RSP,
+MSG_ID_BIP_CONN_MGR_CHECK_STATUS_REQ,
+MSG_ID_BIP_CONN_MGR_CHECK_STATUS_RSP,
+MSG_ID_BIP_CONN_MGR_SIM_ERROR_REQ,
+MSG_ID_BIP_CONN_MGR_SIM_ERROR_RSP,
+MSG_ID_BIP_CONN_MGR_DISCONNECT_IND,
+MSG_ID_BIP_CONN_MGR_DISCONNECT_CNF,
+// MOD_CMD_HDR
+
+// MOD_NET_MGR
+MSG_ID_BIP_NET_MGR_CREATE_CONNECTION_REQ,
+MSG_ID_BIP_NET_MGR_CREATE_CONNECTION_RSP,
+MSG_ID_BIP_NET_MGR_CLOSE_CONNECTION_REQ,
+MSG_ID_BIP_NET_MGR_CLOSE_CONNECTION_RSP,
+MSG_ID_BIP_NET_MGR_POLLING_DATA,
+MSG_ID_BIP_NET_MGR_RECEIVE_DATA_IND,
+MSG_ID_BIP_NET_MGR_RECEIVE_DATA_CNF,
+MSG_ID_BIP_NET_MGR_SEND_DATA_REQ,
+MSG_ID_BIP_NET_MGR_SEND_DATA_RSP,
+MSG_ID_BIP_NET_MGR_CHECK_STATUS_REQ,
+MSG_ID_BIP_NET_MGR_CHECK_STATUS_RSP,
+MSG_ID_BIP_NET_MGR_SIM_ERROR_REQ,
+MSG_ID_BIP_NET_MGR_SIM_ERROR_RSP,
+MSG_ID_BIP_NET_MGR_DISCONNECT_IND,
+MSG_ID_BIP_NET_MGR_DISCONNECT_CNF,
+MSG_ID_BIP_NET_MGR_CHANNEL_STATUS_IND,
+MSG_ID_BIP_NET_MGR_CHANNEL_STATUS_CNF,
+
+// MOD_UT_TEST_CASE
+MSG_ID_BIP_UT_TEST_CASE_MULTIPLE_SIM_REQ,
+MSG_ID_BIP_UT_TEST_CASE_MULTIPLE_SIM_RSP,
+
+// MOD_BIP_DS_MGR
+MSG_ID_BIP_DS_MGR_CREATE_CONNECTION_REQ,
+MSG_ID_BIP_DS_MGR_CREATE_CONNECTION_RSP,
+MSG_ID_BIP_DS_MGR_CLOSE_CONNECTION_REQ,
+MSG_ID_BIP_DS_MGR_CLOSE_CONNECTION_RSP,
+MSG_ID_BIP_DS_MGR_CREATE_CONNECTION_RETRY_PDN,
+MSG_ID_BIP_DS_MGR_CREATE_CONNECTION_RETRY_SOCKET,
+MSG_ID_BIP_DS_MGR_SIM_ERROR_REQ,
+MSG_ID_BIP_DS_MGR_SIM_ERROR_RSP,
+
+// MOD_BIP_AGENT
+MSG_ID_BIP_AGENT_SEND_ACK,
+// AP side BIP module
+MSG_ID_BIP_AP_SIDE_MODULE_START = MSG_ID_BIP_CODE_BEGIN + 60,
+
+// MOD_BIP_WIFI
+MSG_ID_AP_BIP_WIFI_QUERY_WIFI_STATUS_REQ,
+MSG_ID_AP_BIP_WIFI_QUERY_WIFI_STATUS_RSP,
+MSG_ID_AP_BIP_WIFI_CREATE_CONNECTION_REQ,
+MSG_ID_AP_BIP_WIFI_CREATE_CONNECTION_RSP,
+MSG_ID_AP_BIP_WIFI_CLOSE_CONNECTION_REQ,
+MSG_ID_AP_BIP_WIFI_CLOSE_CONNECTION_RSP,
+MSG_ID_AP_BIP_WIFI_SEND_DATA_REQ,
+MSG_ID_AP_BIP_WIFI_SEND_DATA_RSP,
+MSG_ID_AP_BIP_WIFI_RECEIVE_DATA_IND,
+MSG_ID_AP_BIP_WIFI_RECEIVE_DATA_CNF,
+MSG_ID_AP_BIP_WIFI_DISCONNECT_IND,
+MSG_ID_AP_BIP_WIFI_DISCONNECT_CNF,
+MSG_ID_AP_BIP_WIFI_SIM_ERROR_REQ,
+MSG_ID_AP_BIP_WIFI_SIM_ERROR_RSP,
+MSG_ID_AP_BIP_WIFI_TIMER_ARRIVAL,
+
+// MOD_BIP_UICC_SERVER
+MSG_ID_AP_BIP_UICC_SERVER_CREATE_CONNECTION_REQ,
+MSG_ID_AP_BIP_UICC_SERVER_CREATE_CONNECTION_RSP,
+MSG_ID_AP_BIP_UICC_SERVER_CLOSE_CONNECTION_REQ,
+MSG_ID_AP_BIP_UICC_SERVER_CLOSE_CONNECTION_RSP,
+MSG_ID_AP_BIP_UICC_SERVER_SEND_DATA_REQ,
+MSG_ID_AP_BIP_UICC_SERVER_SEND_DATA_RSP,
+MSG_ID_AP_BIP_UICC_SERVER_RECEIVE_DATA_IND,
+MSG_ID_AP_BIP_UICC_SERVER_RECEIVE_DATA_CNF,
+MSG_ID_AP_BIP_UICC_SERVER_SIM_ERROR_REQ,
+MSG_ID_AP_BIP_UICC_SERVER_SIM_ERROR_RSP,
+MSG_ID_AP_BIP_UICC_SERVER_CHANGE_LINK_IND,
+MSG_ID_AP_BIP_UICC_SERVER_CHANGE_LINK_CNF,
+MSG_ID_AP_BIP_UICC_SERVER_TIMER_ARRIVAL,
+
+
+MODULE_MSG_END( MSG_ID_BIP_CODE_TAIL )
+
+#endif  /* _BIP_MSGID_H */
diff --git a/mcu/interface/sap/md/cc_msgid.h b/mcu/interface/sap/md/cc_msgid.h
new file mode 100644
index 0000000..24b4a7d
--- /dev/null
+++ b/mcu/interface/sap/md/cc_msgid.h
@@ -0,0 +1,176 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   cc.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   CC 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef CC_MSGID_H
+#define CC_MSGID_H
+
+	/*----------------------- CC_MSG_CODE_BEGIN-----------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_CC_CODE_BEGIN )
+	MSG_ID_MNCC_SETUP_REQ = MSG_ID_CC_CODE_BEGIN,
+	MSG_ID_MNCC_SETUP_RES,
+	MSG_ID_MNCC_REJ_REQ,
+	MSG_ID_MNCC_CALL_CONF_REQ,
+	MSG_ID_MNCC_ALERT_REQ,
+	MSG_ID_MNCC_NOTIFY_REQ,
+	MSG_ID_MNCC_DISC_REQ,
+	MSG_ID_MNCC_REL_REQ,
+	MSG_ID_MNCC_REL_COMP_REQ,
+	MSG_ID_MNCC_FACILITY_REQ,
+	MSG_ID_MNCC_START_DTMF_REQ,
+	MSG_ID_MNCC_STOP_DTMF_REQ,
+	MSG_ID_MNCC_MODIFY_REQ,
+	MSG_ID_MNCC_MODIFY_RES,
+	MSG_ID_MNCC_HOLD_REQ,
+	MSG_ID_MNCC_RETRIEVE_REQ,
+	MSG_ID_MNCC_ABORT_CALL_REQ,
+	MSG_ID_MNCC_USER_INFO_REQ,
+	MSG_ID_MNCC_CCBS_EST_RES,
+	MSG_ID_MNCC_CCBS_SETUP_REQ,
+	MSG_ID_MNCC_CCBS_REJ_REQ,
+	MSG_ID_MNCC_ACM_UPDATE_REQ,
+	MSG_ID_MNCC_SRVCC_TRANSFER_REQ,
+	MSG_ID_MMCC_DATA_IND,
+	MSG_ID_MMCC_EST_CNF,
+	MSG_ID_MMCC_EST_REJ,
+	MSG_ID_MMCC_EST_INTR,
+	MSG_ID_MMCC_EST_IND,
+	MSG_ID_MMCC_REL_IND,
+	MSG_ID_MMCC_ERR_IND,
+	MSG_ID_MMCC_PROMPT_IND,
+	MSG_ID_MMCC_REEST_CNF,
+	MSG_ID_MMCC_REEST_START_IND,
+	MSG_ID_MMCC_SYNC_IND,
+	MSG_ID_MMCC_RAT_IND,
+	MSG_ID_MMCC_PLMN_INFO_IND,
+	MSG_ID_MMCC_SRVCC_HO_IND,
+	MSG_ID_MMCC_SRVCC_EST_CNF,
+	MSG_ID_MMCC_SRVCC_EST_REJ,
+	MSG_ID_CC_TIMER_EXPIRY,
+	MSG_ID_CC_CODE_END =  MSG_ID_CC_TIMER_EXPIRY,
+MODULE_MSG_END( MSG_ID_CC_CODE_TAIL )
+	/*------------------- CC_MSG_CODE_END-----------------------*/
+#endif  //CC_MSGID_H
diff --git a/mcu/interface/sap/md/cert_msgid.h b/mcu/interface/sap/md/cert_msgid.h
new file mode 100644
index 0000000..936e635
--- /dev/null
+++ b/mcu/interface/sap/md/cert_msgid.h
@@ -0,0 +1,143 @@
+/*****************************************************************************
+*  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) 2019
+ *
+ *******************************************************************************/
+
+ /*******************************************************************************
+ * Filename:
+ * ---------
+ *   cert_msgid.h
+ *
+ * Description:
+ * ------------
+ *   Certificate 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!
+ *
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+
+
+#include "module_msg_range.h"
+
+#ifndef _CERT_MSGID_H
+#define _CERT_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_CERT_CODE_BEGIN )
+
+// MOD_CERT
+MSG_ID_CERT_CERTLOAD_INIT_REQ,
+MSG_ID_CERT_CERTLOAD_INIT_CNF,
+
+// MOD_N3SAM
+MSG_ID_N3SAM_CERT_CA_CERT_GET_REQ,
+MSG_ID_N3SAM_CERT_CA_CERT_GET_CNF,
+
+MSG_ID_N3SAM_CERT_CERT_READY_IND,
+MSG_ID_N3SAM_CERT_CERT_READY_CNF,
+
+MSG_ID_N3SAM_CERT_CERT_HASH_GET_REQ,
+MSG_ID_N3SAM_CERT_CERT_HASH_GET_CNF,
+
+MSG_ID_N3SAM_CERT_CERT_PATH_VALIDATE_REQ,
+MSG_ID_N3SAM_CERT_CERT_PATH_VALIDATE_CNF,
+
+// MOD_TLS
+MSG_ID_TLS_CERT_CERT_READY_IND,
+MSG_ID_TLS_CERT_CERT_READY_CNF,
+
+MSG_ID_TLS_CERT_CERT_PATH_VALIDATE_REQ,
+MSG_ID_TLS_CERT_CERT_PATH_VALIDATE_CNF,
+
+// OCSP
+// User --> OCSP, do OCSP query action. It will trigger
+// HTTP connection for get OCSP response
+MSG_ID_OCSP_QUERY_REQ,
+// OCSP --> User, return OCSP response result to User
+MSG_ID_OCSP_QUERY_CNF,
+
+// User --> OCSP, compose OCSP requset message.
+MSG_ID_OCSP_MSG_COMPOSE_REQ,
+// OCSP --> User, return DER-encode OCSP request message
+MSG_ID_OCSP_MSG_COMPOSE_CNF,
+
+// User --> OCSP, verify one OCSP response data
+MSG_ID_OCSP_VERIFY_RESPONSE_REQ,
+// OCSP --> User, return verified result
+MSG_ID_OCSP_VERIFY_RESPONSE_CNF,
+
+// OCSP --> CERT, check issuer cert data
+MSG_ID_OCSP_CERT_GET_ISSUER_REQ,
+
+// CERT ---> OCSP return issuer cert data
+MSG_ID_OCSP_CERT_GET_ISSUER_CNF,
+
+// USER --> CRL check revocation by CRL
+MSG_ID_CRL_QUERY_REQ,
+
+// CRL --> USER return revocation result
+MSG_ID_CRL_QUERY_CNF,
+
+MODULE_MSG_END( MSG_ID_CERT_CODE_TAIL )
+
+#endif  /* _CERT_MSGID_H */
diff --git a/mcu/interface/sap/md/ciss_msgid.h b/mcu/interface/sap/md/ciss_msgid.h
new file mode 100644
index 0000000..83cf997
--- /dev/null
+++ b/mcu/interface/sap/md/ciss_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) 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:
+ * ---------
+ *   cc.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   CISS 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef CISS_MSGID_H
+#define CISS_MSGID_H
+
+	/*----------------- CISS_MSG_CODE_BEGIN---------------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_CISS_CODE_BEGIN )
+    MSG_ID_MNSS_BEGIN_REQ = MSG_ID_CISS_CODE_BEGIN,
+    MSG_ID_MNSS_FAC_REQ,
+    MSG_ID_MNSS_END_REQ,
+    MSG_ID_MMSS_DATA_IND,
+    MSG_ID_MMSS_EST_CNF,
+    MSG_ID_MMSS_EST_REJ,
+    MSG_ID_MMSS_EST_INTR,
+    MSG_ID_MMSS_EST_IND,
+    MSG_ID_MMSS_REL_IND,
+    MSG_ID_MMSS_ERR_IND,
+    MSG_ID_MMSS_RAT_IND,
+    MSG_ID_CISS_EVAL_DATA_CNF,
+    MSG_ID_CISS_EVAL_DATA_IND,
+    MSG_ID_CISS_TIMER_EXPIRY,
+    MSG_ID_CISS_UT_VERIFY_STRING,
+    MSG_ID_CISS_L4C_ECC_END_IND,
+    MSG_ID_CISS_CODE_END = MSG_ID_CISS_L4C_ECC_END_IND,
+MODULE_MSG_END( MSG_ID_CISS_CODE_TAIL )
+	/*----------------- CISS_MSG_CODE_END-----------------------*/
+#endif //CISS_MSGID_H
diff --git a/mcu/interface/sap/md/cl1tst_l1ps_msgid.h b/mcu/interface/sap/md/cl1tst_l1ps_msgid.h
new file mode 100644
index 0000000..1734e82
--- /dev/null
+++ b/mcu/interface/sap/md/cl1tst_l1ps_msgid.h
@@ -0,0 +1,147 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   cl1tst_msgid.h
+ *
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 09 18 2020 sally.tao
+ * [MOLY00504600] [97][TITAN] IPCA EM: C2K RFPD feature
+ * 	
+ * 	patch back from TC10.SP.
+ *
+ * 09 15 2020 sally.tao
+ * [MOLY00504600] [97][TITAN] IPCA EM: C2K RFPD feature
+ * 	
+ * 	patch back from NR15.R3.TC10.SP.
+ *
+ * 09 19 2019 elon.zhang
+ * [MOLY00439320] [CODE SYNC][VMOLY]×ÔÓÉÌìÏßÇé¿öÏ£¬ÈçºÎ»ñÈ¡µ±Ç°Ê¹ÓõÄÊÇÄĸùÌìÏß
+ * 	
+ * 	.
+ *
+ * 05 06 2019 elon.zhang
+ * [MOLY00343499] ¡¾Ð¹¦ÄÜÐèÇó¡¿×Ô¸ÉÈÅɨÃè²âÊÔ
+ * 	
+ * 	.
+ *
+ * 03 21 2018 sally.tao
+ * [MOLY00313591] ¸÷ÖÆÊ½ÐÅÁîÏÂÌá¸ß×î´ó·¢É书ÂÊÐèÇó
+ * 	
+ * 	C2k Do Max TxPower Adjust(merge from R3)
+ *
+ * 05 10 2017 elon.zhang
+ * [MOLY00245025] [MT6763][C2K][EVDO]update RF desense
+ *
+ * 03 28 2017 sally.tao
+ * [MOLY00229697] [93-BIANCO][C2K][EVDO]EVL1 EM Design
+ * 	
+ * 	em design phase2
+ *
+ * 03 24 2017 lin.cao
+ * [MOLY00229774] [6293]C2K FHC report Fail [MEID/UBIN/FHC RX on ahead/Disable sort done in META mode ]
+ *
+ * 02 15 2017 sally.tao
+ * [MOLY00229697] [93-BIANCO][C2K][EVDO]EVL1 EM Design
+ * 	
+ * 	Add EVL1 EM Components
+ *
+ * 01 05 2017 sue.zhong
+ * [MOLY00218409] [6293][C2K]Sync C2K code to UMOLYA TRUNK from C2K CBr (W1701)
+ * merge xxx_msgid.h
+ *
+ * 12 15 2016 sue.zhong
+ * [MOLY00217270] [6293][C2K]Sync C2K code to UMOLYA TRUNK from C2K CBr (W51)
+ * dhl database
+ *
+  * .
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _CL1TST_L1PS_MSGID_H
+#define _CL1TST_L1PS_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_CL1TST_L1PS_CODE_BEGIN )
+    MSG_ID_CL1TST_VAL_RX_TEST_MODE_MSG = MSG_ID_CL1TST_L1PS_CODE_BEGIN,
+    MSG_ID_CL1TST_VAL_RXTX_PWR_DETECT_MSG,
+#ifdef __RF_SCAN_FOR_DESENSE_TEST__  
+    MSG_ID_CL1TST_VAL_RX_SCAN_MSG,
+#endif
+    MSG_ID_FHC_CL1TST_REPORT_MSG,
+#if (defined(MTK_PLT_ON_PC_IT))||(defined(MTK_C2K_L1_TST))    
+    MSG_ID_SH_PHYUT_REPORT_MSG,
+#endif    
+
+    MSG_ID_CL1TST_NST_POWER_UP_CNF_MSG ,   
+    MSG_ID_CL1TST_NST_TCH_FER_CFG_CNF_MSG,    
+    MSG_ID_CL1TST_NST_RX_PWR_MEAS_CFG_CNF_MSG,    
+    MSG_ID_CL1TST_NST_TX_PWR_MEAS_CFG_CNF_MSG,    
+    MSG_ID_CL1TST_NST_LIST_SET_CFG_CNF_MSG, 
+    
+    MSG_ID_CL1TST_SET_MOBILE_ID_RSP_MSG,
+    MSG_ID_CL1TST_GET_MOBILE_ID_RSP_MSG,
+    MSG_ID_CL1TST_VAL_GET_ANT_INFO_REQ_MSG,
+    MSG_ID_CL1TST_TAS_MAIN_PATH_SWITCH_INFO_MSG,
+#ifdef MTK_DEV_ENGINEER_MODE
+    MSG_ID_CL1TST_RCP_TX_TRANSMIT_CTRL_MSG,
+#endif 
+
+#ifdef __EM_MAX_TX_POWER_SUPPORT__
+    MSG_ID_CL1TST_VAL_MAX_TX_PWR_SET_MSG,
+#endif
+
+#ifdef __EVL1_EM_MODE__
+    MSG_ID_EM_EVL1_GENERAL_REPORT_MSG,
+    MSG_ID_EM_EVL1_TIMING_TRACK_STATUS_REPORT_MSG,
+    MSG_ID_EM_EVL1_TXAGC_POWER_REPORT_MSG,
+#ifdef __TC10_IPC_CDMA_SUPPORT__
+    MSG_ID_EM_EVL1_TXAGC_RFPD_ABNORMAL_REPORT_MSG,
+#endif
+    MSG_ID_EM_EVL1_CSM_INFO_REPORT_MSG,
+    MSG_ID_EM_EVL1_RXAGC_REPORT_MSG,
+    MSG_ID_EM_EVL1_AFC_REPORT_MSG,
+    MSG_ID_EM_EVL1_ACC_DATA_RATE_REPORT_MSG,
+    MSG_ID_EM_EVL1_TRFFIC_RRI_VALUE_REPORT_MSG,
+#endif
+
+MODULE_MSG_END( MSG_ID_CL1TST_L1PS_CODE_TAIL )
+
+#endif /* _CL1TST_L1PS_MSGID_H */
+
diff --git a/mcu/interface/sap/md/cl1tst_msgid.h b/mcu/interface/sap/md/cl1tst_msgid.h
new file mode 100644
index 0000000..51adb39
--- /dev/null
+++ b/mcu/interface/sap/md/cl1tst_msgid.h
@@ -0,0 +1,63 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   cl1tst_msgid.h
+ *
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 01 05 2017 sue.zhong
+ * [MOLY00218409] [6293][C2K]Sync C2K code to UMOLYA TRUNK from C2K CBr (W1701)
+ * merge xxx_msgid.h
+ *
+  * .
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _CL1TST_MSGID_H
+#define _CL1TST_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_CL1TST_CODE_BEGIN )
+    MSG_ID_CL1TST_TO_DHL = MSG_ID_CL1TST_CODE_BEGIN,
+
+MODULE_MSG_END( MSG_ID_CL1TST_CODE_TAIL )
+
+#endif /* _CL1TST_MSGID_H */
+
+
diff --git a/mcu/interface/sap/md/css_msgid.h b/mcu/interface/sap/md/css_msgid.h
new file mode 100644
index 0000000..87459c5
--- /dev/null
+++ b/mcu/interface/sap/md/css_msgid.h
@@ -0,0 +1,253 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+
+  FILE NAME:  css_msgid.h
+
+  DESCRIPTION:
+
+    This file contains the defenitions of all the CSS msg id's.
+
+*****************************************************************************/
+
+#ifndef _CSS_MSGID_H_
+#define _CSS_MSGID_H_
+
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN(MSG_ID_CSS_CODE_BEGIN)
+
+/* CSS Signals defination */
+    MSG_ID_CSS_1X_SELECT_REQ_MSG = MSG_ID_CSS_CODE_BEGIN,  /* 0 */
+    MSG_ID_CSS_1X_VALIDATE_REQ_MSG,
+    MSG_ID_CSS_1X_OOSA_WAKEUP_IND_MSG,
+    MSG_ID_CSS_1X_ACQ_ABORT_RSP_MSG,
+    MSG_ID_CSS_1XDO_HANDOFF_IND_MSG,
+    MSG_ID_CSS_1X_REG_ACCEPTED_MSG,
+    MSG_ID_CSS_1X_E911MODE_START_MSG,
+    MSG_ID_CSS_1X_E911MODE_STOP_MSG,
+    MSG_ID_CSS_1X_NAM_UPDATED_MSG,
+    MSG_ID_CSS_1X_UPDATE_ACTIVE_NAM_MSG,
+    MSG_ID_CSS_1X_SET_RETURN_CHANNEL_MSG,
+    MSG_ID_CSS_1X_SET_CALL_PENDING_MSG,
+    MSG_ID_CSS_1X_SYS_PARMS_UPDATE_MSG,
+    MSG_ID_CSS_1X_REPORT_CP_EVENT_MSG,
+    MSG_ID_CSS_1X_CLEAR_MRU_MSG,
+    MSG_ID_CSS_1X_SAVE_LAST_SYS_IN_MRU_MSG,
+    MSG_ID_CSS_1X_SAVE_CHANNEL_MSG,
+    MSG_ID_CSS_1X_MPSS_TIMEOUT_MSG,
+    MSG_ID_CSS_DO_SELECT_REQ_MSG,
+    MSG_ID_CSS_DO_VALIDATE_REQ_MSG,
+    MSG_ID_CSS_DO_REDIRECT_REQ_MSG,
+    MSG_ID_CSS_DO_OOSA_WAKEUP_IND_MSG,
+    MSG_ID_CSS_DO_CONN_START_IND_MSG,
+    MSG_ID_CSS_DO_CONN_RELEASE_IND_MSG,
+    MSG_ID_CSS_DO_ACQ_ABORT_RSP_MSG,
+    MSG_ID_CSS_DO1X_HANDOFF_IND_MSG,
+    MSG_ID_CSS_DO_MPSS_TIMEOUT_MSG,
+    MSG_ID_CSS_DO_REDIRECT_CHANNEL_LIST_MSG,
+    MSG_ID_CSS_DO_NTWK_ACQD_MSG,
+    MSG_ID_CSS_DO_CHAN_CHANGED_IND_MSG,
+    MSG_ID_CSS_DO_SESSION_OPENED_MSG,
+    MSG_ID_CSS_DO_SESSION_CLOSED_MSG,
+    MSG_ID_CSS_DO_CLEAR_MRU_MSG,
+    MSG_ID_CSS_DO_REPORT_CP_EVENT_MSG,
+    MSG_ID_CSS_CP_POWER_CTRL_MSG,
+    MSG_ID_CSS_PERIODICAL_SEARCH_CYCLE_SET_MSG,
+    MSG_ID_CSS_DO_DEFAULT_BAND_SET_MSG,
+    MSG_ID_CSS_DO_ACM_APERSIS_IND_MSG,
+    MSG_ID_CSS_DO_AUTH_FAIL_IND,
+    MSG_ID_CSS_UIM_GET_PRL_RSP_MSG,
+    MSG_ID_CSS_UIM_STATUS_NOTIFY_MSG,
+    MSG_ID_CSS_UIM_GET_NAM_DATA_MSG,
+
+    MSG_ID_CSS_SVC_STATUS_REQ_MSG = 43+MSG_ID_CSS_CODE_BEGIN,        /* 43 */
+    MSG_ID_CSS_FORCE_DOSCAN_REQ_MSG,
+    MSG_ID_CSS_CLEAR_MRU_MSG,
+    MSG_ID_CSS_PRL_UPDATED_MSG,
+    MSG_ID_CSS_MMSS_FILE_UPDATED_MSG,
+    MSG_ID_CSS_TEST_MANUAL_BAND_CHNL_MSG,
+
+    MSG_ID_CSS_MARK_CURRENT_1X_SYSTEM_AS_NEGATIVE_MSG,
+    MSG_ID_CSS_1X_REDIR_IND_MSG,
+    MSG_ID_CSS_1X_OVERHEAD_CURRENT_MSG,
+    MSG_ID_CSS_TIMER_EXPIRED_MSG,
+    MSG_ID_CSS_UPDATE_SYS_SELECT_RSP_MSG,
+    MSG_ID_IRAT_L1D_TX_PWR_RSP,
+
+    MSG_ID_CSS_DO_ACCESS_STATUS_IND,
+    MSG_ID_CSS_DO_ERR_IND,
+    MSG_ID_CSS_DATA_TCH_SETUP_STATUS_MSG,
+    MSG_ID_CSS_PSW_1X_REG_STATUS_IND,
+    MSG_ID_CSS_PSW_1X_DO_OVERLAP_IND,
+    MSG_ID_CSS_HLP_SESS_VERIF_FAIL_IND,
+    MSG_ID_CSS_1X_UPDATE_LAST_SAVED_ECIO_RXPWR_MSG,
+    MSG_ID_CSS_DBM_INIT_NVRAM_TO_DEFAULT_MSG,
+    MSG_ID_CSS_SET_PARM_MSG,
+    MSG_ID_CSS_GET_PARM_MSG,
+    MSG_ID_CSS_HLP_NETWORK_CONN_RSP,
+    MSG_ID_CSS_HLP_EPS_ACTIVATE_RSP,
+    MSG_ID_CSS_HLP_NETWORK_REL_RSP,
+    MSG_ID_CSS_HLP_NETWK_REL_IND,
+    MSG_ID_CSS_HLP_EPS_BEARER_SETUP_RSP,
+    MSG_ID_CSS_HLP_EPS_BEARER_DISCONN_RSP,
+    MSG_ID_CSS_HLP_EPS_BEARER_DISCONN_IND,
+    MSG_ID_CSS_HLP_EPS_BEARER_SETUP_IND,
+    MSG_ID_CSS_HLP_EPS_DEFAULT_BEARER_DISCONN_IND,
+    MSG_ID_CSS_HLP_PPP_OPEN_REQ_RCVD_IND,
+    MSG_ID_CSS_VAL_PPP_CONN_STATUS_IND,
+    MSG_ID_CSS_VAL_DATA_STATE_IND,
+    MSG_ID_IRAT_OMP_RAT_INFO_IND,
+    MSG_ID_IRAT_OMP_MCC_RSP,
+    MSG_ID_IRAT_OMP_MCC_CHANGE_IND,
+    MSG_ID_IRAT_RCP_TX_PWR_RSP,
+    MSG_ID_IRAT_PSW_RAT_INFO_IND,
+    MSG_ID_IRAT_PSW_MCC_RSP,
+    MSG_ID_IRAT_PSW_MCC_CHANGE_IND,
+    MSG_ID_IRAT_PSW_CUR_SYS_WEAK_IND,
+    MSG_ID_IRAT_PSW_CUR_SYS_MEAS_RSP,
+    MSG_ID_IRAT_OMP_CELLID_IND,
+    MSG_ID_IRAT_PSW_CELLID_IND,
+    MSG_ID_CSS_IRAT_EVENT_MSG,
+
+    MSG_ID_IRATUT_CSS_CONFIGURE_REQ,
+    /* IRATM to CSS. */
+    MSG_ID_CSS_IRATM_WAKEUP_FOR_IRAT_MEAS_IND,
+    MSG_ID_CSS_IRATM_TO_LTE_MEAS_CTRL_CNF,
+    MSG_ID_CSS_IRATM_TO_LTE_RESEL_IND,
+    MSG_ID_CSS_IRATM_SUSPEND_CNF,
+    MSG_ID_CSS_IRATM_VIRTUAL_SUSPEND_CNF,
+    MSG_ID_CSS_IRATM_PLMN_LIST_UPDATE_RSP,
+    MSG_ID_CSS_IRATM_SET_RAT_CNF,
+    /*IDP to CSS*/
+    MSG_ID_CSS_IDP_RSVAS_VIRTUAL_SUSPEND_CNF_MSG,
+    /*INSP to CSS*/
+    MSG_ID_CSS_INSP_RSVAS_SUSPEND_COMP_MSG,
+    MSG_ID_CSS_INSP_DEEP_SLEEP_CNF_MSG,
+    /* PSW to CSS */
+    MSG_ID_CSS_PSW_RSVAS_SUSPEND_REQ_MSG,
+    MSG_ID_CSS_PSW_RSVAS_RESUME_REQ_MSG,
+    MSG_ID_CSS_PSW_RSVAS_DO_VRTL_SUSP_REQ_MSG,
+    MSG_ID_CSS_PSW_RSVAS_DO_RESUME_REQ_MSG,
+    MSG_ID_CSS_PSW_RSVAS_VRTL_RESUME_REQ_MSG,
+    MSG_ID_CSS_PSW_RSVAS_EVENT_REPORT_MSG,
+    MSG_ID_IRAT_CSS_PSW_RSVAS_CS_OCCUPY_IND,
+    MSG_ID_CSS_PSW_RSVAS_CS_SERV_START_IND,
+    MSG_ID_CSS_PSW_RSVAS_CS_SERV_FINISH_IND,
+    MSG_ID_CSS_PSW_OOSA_SLEEP_CNF_MSG,
+
+    MSG_ID_CSS_IRATM_PARAM_UPDATE_IND,
+    MSG_ID_CSS_IRATM_POWER_CTRL_CNF,
+
+    MSG_ID_CSS_VAL_L2C_RESEL_REQ,
+    MSG_ID_CSS_VAL_L2C_REDIRECT_REQ,
+    MSG_ID_CSS_VAL_L2C_CMP_REQ,
+    MSG_ID_CSS_VAL_C2L_RESEL_RSP,
+    MSG_ID_CSS_VAL_DATA_DEACTIVATE_RSP,
+    MSG_ID_CSS_VAL_IRAT_POWER_CTRL_REQ,
+    MSG_ID_CSS_VAL_ATTACH_STATE_IND_MSG,
+    MSG_ID_CSS_VAL_ELEVATOR_MODE_IND_MSG,
+    MSG_ID_CSS_VAL_SIM_INFO_CHANGED_IND_MSG,
+    MSG_ID_CSS_VAL_DEEP_SLEEP_MODE_REQ_MSG,
+    MSG_ID_CSS_VAL_LTE_DISABLED_REQ_MSG,
+    MSG_ID_CSS_VAL_IRAT_POWER_CTRL_UT_REQ,
+    MSG_ID_CSS_CLC_MAJOR_OCCUPY_LLA_REQ,
+    MSG_ID_CSS_CLC_RELEASE_LLA_REQ,
+    MSG_ID_CSS_VAL_UIM_PRL_READ_REQ,
+    
+    /* C2K_MRS_SAP */
+    MSG_ID_MRS_CAS_LOWER_LAYER_AVAILABILITY_UPDATE_IND,
+    /* GMSS_CSS_SAP */
+    //MSG_ID_GMSS_CSS_MCC_SEARCH_REQ           ,
+    MSG_ID_GMSS_CSS_SYS_ACQUIRE_REQ          ,
+   // MSG_ID_GMSS_CSS_CS_REG_REQ               ,
+    //MSG_ID_GMSS_CSS_PS_REG_REQ               ,
+    //MSG_ID_GMSS_CSS_DEACTIVATE_REQ           ,
+    MSG_ID_GMSS_CSS_RAT_CHANGE_REQ           ,
+    MSG_ID_NAS_SV_CSS_PS_DEREG_REQ             ,
+    MSG_ID_GMSS_CSS_ACTIVE_SIM_INFO_REQ      ,
+    MSG_ID_GMSS_CSS_SET_RAT_MODE_REQ         ,
+    MSG_ID_GMSS_CSS_MMSS_LIST_SYNC_REQ       ,
+    MSG_ID_GMSS_CSS_3GPP_NORMAL_SERVICE_REQ  ,
+    /* messages for VZW ECC call */
+    MSG_ID_GMSS_CSS_EMC_SESSION_START_REQ    ,
+    MSG_ID_GMSS_CSS_EMC_SESSION_STOP_REQ     ,
+    MSG_ID_GMSS_CSS_EMC_LOCAL_DETACH_REQ     ,
+    MSG_ID_GMSS_CSS_SIM_PLMN_INFO_IND        ,
+    MSG_ID_GMSS_CSS_MSPL_SEARCH_EXHAUSTED    ,
+    MSG_ID_GMSS_CSS_CS_RESUME_REQ            ,
+    MSG_ID_GMSS_CSS_ELEVATOR_MODE_REQ     ,
+    MSG_ID_GMSS_CSS_ECC_RESET_SEARCH_RESULT_REQ    , 
+    MSG_ID_GMSS_CSS_ROAMING_IND		         ,
+    /* RSVAC_CSS_SAP  */
+    MSG_ID_RSVAC_CSS_FREQUENCY_SCAN_ACCEPT_IND,
+    MSG_ID_RSVAC_CSS_FREQUENCY_SCAN_PREEMPT_IND,
+    MSG_ID_EAS_CSS_SYS_SNIFFER_CNF           ,
+
+    /* MTK_PLT_ON_PC_UT */
+    MSG_ID_CSS_SYS_UT_TIMER_START_REQ,
+    MSG_ID_CSS_SYS_UT_TIMER_STOP_REQ,
+    MSG_ID_CSS_SYS_UT_TIMER_EXPIRED_IND,
+
+    MSG_ID_CSS_CPSM_1X_SCAN_TIMEOUT,
+    MSG_ID_CSS_UIM_NAM_GET_TIMEOUT,
+    MSG_ID_CSS_UIM_RSP_TIMEOUT,
+    MSG_ID_CSS_NVRAM_RSP_TIMEOUT,
+    MSG_ID_CSS_VAL_RAT_MODE_CHG_CNF_MSG,
+    MSG_ID_CSS_L1D_RSSI_SCAN_CNF_MSG,
+    MSG_ID_CSS_UT_DUMMY_REQ,
+    MSG_ID_CSS_UT_DUMMY_CNF,
+    MSG_ID_CSS_POWER_UP_SET_RAT_REQ,
+    MSG_ID_CSS_POWER_DOWN_SET_RAT_REQ,
+    MSG_ID_CSS_VS_CNTD_IND_MSG,
+    MSG_ID_CSS_VAL_VOICE_CALL_REL_IND_MSG,
+    MSG_ID_CSS_UIM_GET_PRL_IND_MSG,
+    MSG_ID_CSS_DO_SESSION_NEGO_MODE_MSG,
+    MSG_ID_CSS_VAL_RAT_MODE_CHG_REQ,
+    MSG_ID_CSS_DSBP_GET_NVRAM_DATA_IND,
+	MSG_ID_CSS_HSC_SET_RAT_GAP_STOP_CNF,
+    MSG_ID_CSS_NUM_MSG_IDS,
+ 
+MODULE_MSG_END(MSG_ID_CSS_CODE_TAIL)
+
+
+/*****************************************************************************
+* End of File
+*****************************************************************************/
+#endif
diff --git a/mcu/interface/sap/md/d2_msgid.h b/mcu/interface/sap/md/d2_msgid.h
new file mode 100644
index 0000000..6b5970c
--- /dev/null
+++ b/mcu/interface/sap/md/d2_msgid.h
@@ -0,0 +1,464 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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 _D2_MSGID_H
+#define _D2_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_D2_CODE_BEGIN )
+    MSG_ID_ATP_D2AT_MSG_FROM_ATP_BEGIN,
+        // intercept CMD to D2
+        MSG_ID_ATP_D2AT_CFUN_REQ,
+        MSG_ID_ATP_D2AT_EFUN_REQ,
+        MSG_ID_ATP_D2AT_CGACT_REQ,
+        MSG_ID_ATP_D2AT_CGDCONT_REQ,
+        MSG_ID_ATP_D2AT_XGDCONT_REQ,
+        MSG_ID_ATP_D2AT_CGAUTH_REQ, 
+        MSG_ID_ATP_D2AT_CGPADDR_REQ, 
+        MSG_ID_ATP_D2AT_CGCONTRDP_REQ,
+        MSG_ID_ATP_D2AT_EGPCORDP_REQ,
+        MSG_ID_ATP_D2AT_EGPCO_REQ,
+        MSG_ID_ATP_D2AT_BGPCORDP_REQ,
+        MSG_ID_ATP_D2AT_CGEREP_REQ,
+        MSG_ID_ATP_D2AT_EAPNLOCK_REQ,
+        MSG_ID_ATP_D2AT_EAPNSET_REQ,
+        MSG_ID_ATP_D2AT_EAPNACT_REQ,
+        MSG_ID_ATP_D2AT_EAPNRESV_REQ,
+        MSG_ID_ATP_D2AT_EIF_REQ,
+        MSG_ID_ATP_D2AT_EIF_IND,
+        MSG_ID_ATP_D2AT_EPDN_REQ,
+        MSG_ID_ATP_D2AT_EGFB_REQ,
+        MSG_ID_ATP_D2AT_EDRETRY_REQ,
+        MSG_ID_ATP_D2AT_EDRETRYRDP_REQ,
+        MSG_ID_ATP_D2AT_EAID_REQ,
+        MSG_ID_ATP_D2AT_EIAAPN_REQ,
+        MSG_ID_ATP_D2AT_EGDATA_REQ,
+        MSG_ID_ATP_D2AT_CGPIAF_REQ,
+
+        MSG_ID_ATP_D2AT_CGDSCONT_REQ,
+        MSG_ID_ATP_D2AT_CGTFT_REQ,
+        MSG_ID_ATP_D2AT_CGQREQ_REQ,
+        MSG_ID_ATP_D2AT_CGQMIN_REQ,
+        MSG_ID_ATP_D2AT_CGEQREQ_REQ,
+        MSG_ID_ATP_D2AT_CGEQMIN_REQ,
+        MSG_ID_ATP_D2AT_CGCMOD_REQ,
+        MSG_ID_ATP_D2AT_CGSCONTRDP_REQ,
+        MSG_ID_ATP_D2AT_CGTFTRDP_REQ,
+        MSG_ID_ATP_D2AT_CGEQOS_REQ,
+        MSG_ID_ATP_D2AT_CGEQOSRDP_REQ,
+        MSG_ID_ATP_D2AT_C5GQOS_REQ,
+        MSG_ID_ATP_D2AT_C5GQOSRDP_REQ,
+        MSG_ID_ATP_D2AT_ACTTEST_REQ,
+
+        MSG_ID_ATP_D2AT_EDALLOW_REQ,
+        MSG_ID_ATP_D2AT_CGANS_REQ,
+        MSG_ID_ATP_D2AT_CGEQNEG_REQ,
+        MSG_ID_ATP_D2AT_CGDATA_REQ,
+        MSG_ID_ATP_D2AT_CGSDATA_REQ,
+        MSG_ID_ATP_D2AT_CGDEL_REQ,
+        MSG_ID_ATP_D2AT_EGACT_REQ,
+        MSG_ID_ATP_D2AT_EGDCONT_REQ,
+        MSG_ID_ATP_D2AT_EGDELPF_REQ,
+        MSG_ID_ATP_D2AT_EGLD_REQ,
+        MSG_ID_ATP_D2AT_EGLNKPF_REQ,
+        MSG_ID_ATP_D2AT_EGPAU_REQ,
+        MSG_ID_ATP_D2AT_ESIMMAP_REQ,
+        MSG_ID_ATP_D2AT_EPSMAP_REQ,
+        MSG_ID_ATP_D2AT_EIMSTESTMODE_REQ,  // ims test mode
+        MSG_ID_ATP_D2AT_LGDCONT_REQ,
+        MSG_ID_ATP_D2AT_ENSSAI_REQ,
+        MSG_ID_ATP_D2AT_EDATASIM_REQ, // default data sim
+        MSG_ID_ATP_D2AT_EIAMDPREFER_REQ, // +EIAMDPREFER=1/0
+        MSG_ID_ATP_D2AT_EGDCACT_REQ,
+        MSG_ID_ATP_D2AT_EIAATTACH_REQ,
+        MSG_ID_ATP_D2AT_EPSI_REQ,
+        MSG_ID_ATP_D2AT_ESCONTIND_REQ,
+        MSG_ID_ATP_D2AT_RSTIAAPN_REQ,
+        MSG_ID_ATP_D2AT_EGURSPRDP_REQ,
+        MSG_ID_ATP_D2AT_EGUEPOLICY_REQ, 
+        MSG_ID_ATP_D2AT_EGUEPOLICYRDP_REQ, 
+        MSG_ID_D2AT_IPCA_GPRS_RESET_IA_APN_REQ,
+
+        //DDM -> D2AT
+        MSG_ID_D2AT_DDM_CMD_CNF,
+        MSG_ID_D2AT_DDM_CGDSCONT_IND,
+        MSG_ID_D2AT_DDM_CGTFT_IND,
+        MSG_ID_D2AT_DDM_CGQREQ_IND,
+        MSG_ID_D2AT_DDM_CGQMIN_IND,
+        MSG_ID_D2AT_DDM_CGEQREQ_IND,
+        MSG_ID_D2AT_DDM_CGEQMIN_IND,
+        MSG_ID_D2AT_DDM_CGSCONTRDP_IND,
+        MSG_ID_D2AT_DDM_CGTFTRDP_IND,
+        MSG_ID_D2AT_DDM_CGEQOS_IND,
+        MSG_ID_D2AT_DDM_CGEQOSRDP_IND,
+        MSG_ID_D2AT_DDM_C5GQOS_IND,
+        MSG_ID_D2AT_DDM_C5GQOSRDP_IND,
+
+        MSG_ID_D2AT_DDM_CGACT_IND,
+        MSG_ID_D2AT_DDM_CGDCONT_IND,
+        MSG_ID_D2AT_DDM_CGAUTH_IND,
+        MSG_ID_D2AT_DDM_CGCONTRDP_IND,
+        MSG_ID_D2AT_DDM_CGPADDR_IND,
+
+        MSG_ID_D2AT_DDM_EGPCO_IND,
+        MSG_ID_D2AT_DDM_EGPCORDP_IND,
+        MSG_ID_D2AT_DDM_CGEQNEG_IND,
+        MSG_ID_D2AT_DDM_CGDEL_IND,
+        MSG_ID_D2AT_DDM_EGDELPF_IND,
+        MSG_ID_D2AT_DDM_EGLNKPF_IND,
+        MSG_ID_D2AT_DDM_ESCONTIND_IND,
+
+        // AT respone to D2
+        MSG_ID_ATP_D2AT_L4_CMD_CGATT_RSP,
+        MSG_ID_ATP_D2AT_L4_CMD_EGTYPE_RSP,
+        MSG_ID_ATP_D2AT_L4_CMD_ICCID_RSP,
+        MSG_ID_ATP_D2AT_L4_CMD_ICCID_OK_RSP,
+        MSG_ID_ATP_D2AT_L4_CMD_EGREA_RSP,
+
+        // notify URC to D2
+        MSG_ID_ATP_D2AT_L4_URC_ESIMS_IND,
+        MSG_ID_ATP_D2AT_L4_URC_EGREG_IND,
+        MSG_ID_ATP_D2AT_L4_URC_EUSIM_IND,
+        MSG_ID_D2AM_D2_CMD_RETRY_IND,
+    MSG_ID_ATP_D2AT_MSG_FROM_ATP_END,
+
+   // DDM to D2
+    MSG_ID_D2PM_DDM_MSG_FROM_DDM_BEGIN,
+#if 0
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif
+#if 0
+/* under construction !*/
+/* under construction !*/
+#endif
+    MSG_ID_D2PM_DDM_MSG_FROM_DDM_END,
+
+    // IMSM to D2
+    MSG_ID_IMSM_D2_MSG_FROM_IMSM_BEGIN,
+        MSG_ID_IMSM_D2CM_ACT_DATA_CALL_REQ, 
+        MSG_ID_IMSM_D2CM_DEACT_DATA_CALL_REQ, 
+        MSG_ID_IMSM_D2CM_ACT_DATA_CALL_RSP, 
+        MSG_ID_IMSM_D2CM_DEACT_DATA_CALL_RSP, 
+        MSG_ID_IMSM_D2CM_ABORT_DATA_CALL_REQ, 
+        MSG_ID_IMSM_IMSM_GET_CELL_INFO_REQ,
+    MSG_ID_IMSM_D2_MSG_FROM_IMSM_END, 
+// D2 to IMSM
+    MSG_ID_IMSM_D2_FROM_D2_BEGIN,
+        MSG_ID_IMSM_D2CM_ACT_DATA_CALL_CNF, 
+        MSG_ID_IMSM_D2CM_DEACT_DATA_CALL_CNF, 
+        MSG_ID_IMSM_D2CM_ACT_DATA_CALL_IND, 
+        MSG_ID_IMSM_D2CM_DEACT_DATA_CALL_IND, 
+        MSG_ID_IMSM_D2CM_MOD_DATA_CALL_IND, 
+        MSG_ID_IMSM_D2CM_ABORT_DATA_CALL_CNF, 
+        MSG_ID_IMSM_IMSM_GET_CELL_INFO_CNF,
+        MSG_ID_IMSM_D2CM_EAPNLOCK_IND,
+        MSG_ID_IMSM_DAST_EAPNLOCK_IND,
+    MSG_ID_IMSM_D2_FROM_D2_END,
+    // ATP to IMSM
+    MSG_ID_ATP_IMSM_FROM_ATP_BEGIN,
+        //AT indication to IMSM
+        MSG_ID_ATP_IMSM_L4_CMD_INT,
+        //AT respone to IMSM
+        MSG_ID_ATP_IMSM_L4_CMD_RSP,
+        //AT cmd to IMSM
+        MSG_ID_ATP_IMSM_EIMSPDN_RSP,
+        //AT cmd to IMSM 
+        MSG_ID_ATP_IMSM_EWIFIASC_IND,
+        //AT cmd to IMSM
+        MSG_ID_ATP_IMSM_EWOPDNOOS_IND,
+    MSG_ID_ATP_IMSM_FROM_ATP_END,
+
+    // D2
+    MSG_ID_D2_BEGIN,
+        // => Data Call
+        MSG_ID_D2_ACT_DATA_CALL_REQ, 
+        MSG_ID_D2_ACT_DATA_CALL_CNF, 
+        MSG_ID_D2_ACT_DATA_CALL_IND, 
+        MSG_ID_D2_ACT_DATA_CALL_RSP,
+        MSG_ID_D2_DEACT_DATA_CALL_REQ, 
+        MSG_ID_D2_DEACT_DATA_CALL_CNF, 
+        MSG_ID_D2_DEACT_DATA_CALL_IND, 
+        MSG_ID_D2_DEACT_DATA_CALL_RSP,
+        MSG_ID_D2_ABORT_DATA_CALL_REQ, 
+        MSG_ID_D2_ABORT_DATA_CALL_CNF,
+        MSG_ID_D2_ABORT_DATA_CALL_IND,
+        MSG_ID_D2_MOD_DATA_CALL_IND, 
+		MSG_ID_D2_SET_PROFILE_STATUS_REQ,
+		MSG_ID_D2_SET_PROFILE_STATUS_CNF, 		
+        // => Query
+        MSG_ID_D2_GET_PDX_PROFILE_REQ, 
+        MSG_ID_D2_GET_PDX_PROFILE_IND, 
+        MSG_ID_D2_GET_PDX_PROFILE_CNF, 
+        MSG_ID_D2_GET_DATA_CALL_LIST_REQ,
+        MSG_ID_D2_GET_DATA_CALL_LIST_IND,
+        MSG_ID_D2_GET_DATA_CALL_LIST_CNF,
+        MSG_ID_D2_GET_DYNAMIC_PARAM_REQ,
+        MSG_ID_D2_GET_DYNAMIC_PARAM_IND,
+        MSG_ID_D2_GET_DYNAMIC_PARAM_CNF,
+        MSG_ID_D2_GET_IP_INFO_REQ,
+        MSG_ID_D2_GET_IP_INFO_CNF,
+        MSG_ID_D2_GET_PDN_RAN_REQ,
+        MSG_ID_D2_GET_PDN_RAN_IND,
+        MSG_ID_D2_GET_PDN_RAN_CNF,
+        MSG_ID_D2_GET_IF_ID_REQ,
+        MSG_ID_D2_GET_IF_ID_CNF,
+
+        // => Notification
+        MSG_ID_D2_EVENT_IND, 
+    MSG_ID_D2_END = MSG_ID_D2_EVENT_IND, 
+
+    // D2APN
+    MSG_ID_D2APN_BEGIN,
+        MSG_ID_D2APN_SET_APNS_INFO_REQ, 
+        MSG_ID_D2APN_SET_APNS_INFO_CNF,
+        MSG_ID_D2APN_SET_APNS_REQ, 
+        MSG_ID_D2APN_SET_APNS_CNF, 
+        MSG_ID_D2APN_RESET_APNS_INFO_REQ, 
+        MSG_ID_D2APN_RESET_APNS_INFO_CNF, 
+        MSG_ID_D2APN_RESET_APNS_REQ, 
+        MSG_ID_D2APN_RESET_APNS_CNF, 
+        MSG_ID_D2APN_COPY_APNS_TBL_REQ, 
+        MSG_ID_D2APN_COPY_APNS_TBL_CNF, 
+        MSG_ID_D2APN_GET_APNS_INFO_REQ, 
+        MSG_ID_D2APN_GET_APNS_INFO_IND,
+        MSG_ID_D2APN_GET_APNS_INFO_CNF, 
+        MSG_ID_D2APN_GET_APNS_REQ,
+        MSG_ID_D2APN_GET_APNS_IND, 
+        MSG_ID_D2APN_GET_APNS_CNF, 
+        MSG_ID_D2APN_APNS_CHG_IND,
+    MSG_ID_D2APN_END = MSG_ID_D2APN_APNS_CHG_IND, 
+
+    // D2PM
+    MSG_ID_D2PM_BEGIN,
+        // => D2
+        MSG_ID_D2_D2PM_ACT_DATA_CALL_REQ, 
+        MSG_ID_D2_D2PM_ACT_DATA_CALL_CNF, 
+        MSG_ID_D2_D2PM_ACT_DATA_CALL_IND, 
+        MSG_ID_D2_D2PM_ACT_DATA_CALL_RSP,
+        MSG_ID_D2_D2PM_DEACT_DATA_CALL_REQ, 
+        MSG_ID_D2_D2PM_DEACT_DATA_CALL_CNF,
+        MSG_ID_D2_D2PM_DEACT_DATA_CALL_IND, 
+        MSG_ID_D2_D2PM_DEACT_DATA_CALL_RSP,
+        MSG_ID_D2_D2PM_ABORT_DATA_CALL_REQ, 
+        MSG_ID_D2_D2PM_ABORT_DATA_CALL_CNF, 
+        MSG_ID_D2_D2PM_ABORT_DATA_CALL_IND,
+        MSG_ID_D2_D2PM_MOD_DATA_CALL_IND, 
+    MSG_ID_D2PM_END = MSG_ID_D2_D2PM_MOD_DATA_CALL_IND, 
+
+    // D2CM
+    MSG_ID_D2CM_BEGIN,
+        MSG_ID_D2CM_GET_PDN_PROFILE_REQ, 
+        MSG_ID_D2CM_GET_PDN_PROFILE_IND, 
+        MSG_ID_D2CM_GET_PDN_PROFILE_CNF, 
+        MSG_ID_D2CM_ACT_DATA_CALL_REQ, 
+        MSG_ID_D2CM_ACT_DATA_CALL_CNF, 
+        MSG_ID_D2CM_ACT_DATA_CALL_IND, 
+        MSG_ID_D2CM_ACT_DATA_CALL_RSP,
+        MSG_ID_D2CM_ACT_DATA_CALL_REJ,
+        MSG_ID_D2CM_DEACT_DATA_CALL_REQ, 
+        MSG_ID_D2CM_DEACT_DATA_CALL_CNF, 
+        MSG_ID_D2CM_DEACT_DATA_CALL_IND, 
+        MSG_ID_D2CM_DEACT_DATA_CALL_RSP,
+        MSG_ID_D2CM_DEACT_DATA_CALL_REJ,
+        MSG_ID_D2CM_ABORT_DATA_CALL_REQ, 
+        MSG_ID_D2CM_ABORT_DATA_CALL_CNF, 
+        MSG_ID_D2CM_ABORT_DATA_CALL_IND,
+        MSG_ID_D2CM_ABORT_DATA_CALL_REJ,
+        MSG_ID_D2CM_MOD_DATA_CALL_IND, 
+        MSG_ID_D2CM_HO_IND, 
+        MSG_ID_D2CM_DATA_CALL_INFO_IND, 
+        MSG_ID_D2CM_GET_RETRY_TMR_REQ, 
+        MSG_ID_D2CM_GET_RETRY_TMR_CNF, 
+        MSG_ID_D2CM_RESET_RETRY_TMR_REQ, 
+        MSG_ID_D2CM_RESET_RETRY_TMR_CNF, 
+        MSG_ID_D2CM_RESET_RETRY_TMR_IND,
+        MSG_ID_D2CM_VOLTE_CFG_CHANGE_IND, 
+        MSG_ID_D2CM_EVENT_IND, 
+        MSG_ID_D2CM_BYPASS_REQ, 
+        MSG_ID_D2CM_BYPASS_CNF, 
+        MSG_ID_D2CM_BYPASS_IND, 
+        MSG_ID_D2CM_BYPASS_RSP,
+        MSG_ID_D2CM_NETIF_SEND_IMSM_INTERMEDIATE_CNF,
+    MSG_ID_D2CM_END, 
+
+// D2RM
+    MSG_ID_D2RM_BEGIN,
+        MSG_ID_ATP_D2RM_EWIFIEN_REQ,
+        MSG_ID_ATP_D2RM_EIFCONFIG_REQ,
+        MSG_ID_ATP_D2RM_EIF_HO_REQ,
+    MSG_ID_D2RM_END, 
+
+    //D2PM -> D2RM
+    MSG_ID_D2PM_D2RM_APNCAPA_UPDATE_REQ,
+    MSG_ID_D2PM_D2RM_ACT_DATA_CALL_REQ,
+    MSG_ID_D2PM_D2RM_DEACT_DATA_CALL_REQ,
+    MSG_ID_D2PM_D2RM_ABORT_DATA_CALL_REQ,
+    MSG_ID_D2PM_D2RM_MOD_DATA_CALL_REQ,
+    MSG_ID_D2PM_D2RM_GET_DATA_CALL_LIST_REQ,
+    MSG_ID_D2PM_D2RM_GET_DYNAMIC_PARAM_REQ,
+    MSG_ID_D2PM_D2RM_GET_PDP_ADDRESS_REQ,
+    MSG_ID_D2PM_D2RM_GET_SECONDARY_DYNAMIC_PARAM_REQ,
+    MSG_ID_D2PM_D2RM_GET_QOS_REQ,
+    MSG_ID_D2PM_D2RM_GET_TFT_REQ,
+    MSG_ID_D2PM_D2RM_SET_PACKET_FILTER_REQ,
+    MSG_ID_D2PM_D2RM_GET_PACKET_FILTER_REQ,
+//    MSG_ID_D2PM_D2RM_GET_PDN_PROFILE_RSP,
+//    MSG_ID_D2PM_D2RM_GET_PDN_PROFILE_REJECT_RSP,
+    MSG_ID_D2PM_D2RM_SET_RETRYTMR_REQ,
+    MSG_ID_D2PM_D2RM_VZWAPNETMR_REQ,
+    MSG_ID_D2PM_D2RM_VZWAPNE_REQ,
+
+    //IWLAN -> D2RM
+    MSG_ID_D2RM_IWLAN_WANS_RPL_UPDATE_IND,
+
+    //D2PM <- D2RM
+    MSG_ID_D2PM_D2RM_ACT_DATA_CALL_CNF,
+    MSG_ID_D2PM_D2RM_ABORT_DATA_CALL_CNF,
+    MSG_ID_D2PM_D2RM_ACT_DATA_CALL_REJECT_CNF,
+    MSG_ID_D2PM_D2RM_DEACT_DATA_CALL_CNF,
+    MSG_ID_D2PM_D2RM_DEACT_DATA_CALL_REJECT_CNF,
+    MSG_ID_D2PM_D2RM_ABORT_DATA_CALL_REJECT_CNF,
+    MSG_ID_D2PM_D2RM_MOD_DATA_CALL_CNF,
+    MSG_ID_D2PM_D2RM_GET_DATA_CALL_LIST_CNF,
+    MSG_ID_D2PM_D2RM_GET_DYNAMIC_PARAM_CNF,
+    MSG_ID_D2PM_D2RM_GET_PDP_ADDRESS_CNF,
+    MSG_ID_D2PM_D2RM_GET_SECONDARY_DYNAMIC_PARAM_CNF,
+    MSG_ID_D2PM_D2RM_GET_QOS_CNF,
+    MSG_ID_D2PM_D2RM_GET_TFT_CNF,
+    MSG_ID_D2PM_D2RM_GET_PACKET_FILTER_CNF,
+    MSG_ID_D2PM_D2RM_SET_PACKET_FILTER_CNF,
+    MSG_ID_D2PM_D2RM_SET_RETRYTMR_CNF,
+    //MSG_ID_D2PM_D2RM_VZWAPNETMR_CNF,
+    //MSG_ID_D2PM_D2RM_VZWAPNE_CNF,
+    MSG_ID_D2PM_D2RM_ACT_DATA_CALL_IND,
+    MSG_ID_D2PM_D2RM_PDN_NW_ACT_IND,
+    MSG_ID_D2PM_D2RM_PDN_NW_DEACT_IND,
+    MSG_ID_D2PM_D2RM_MOD_DATA_CALL_IND,
+    MSG_ID_D2PM_D2RM_URC_CGEV_IND,
+    MSG_ID_D2PM_D2RM_GET_DATA_CALL_LIST_IND,
+    MSG_ID_D2PM_D2RM_GET_DYNAMIC_PARAM_IND,
+    MSG_ID_D2PM_D2RM_GET_PDP_ADDRESS_IND,
+    MSG_ID_D2PM_D2RM_GET_SECONDARY_DYNAMIC_PARAM_IND,
+    MSG_ID_D2PM_D2RM_GET_QOS_IND,
+    MSG_ID_D2PM_D2RM_GET_TFT_IND,
+    MSG_ID_D2PM_D2RM_GET_PACKET_FILTER_IND,
+//    MSG_ID_D2PM_D2RM_GET_PDN_PROFILE_IND,
+    MSG_ID_D2PM_D2RM_PDN_HO_NOTIFY_IND,
+    MSG_ID_D2PM_D2RM_RST_RETRYTMR_IND,
+    MSG_ID_D2PM_D2RM_VOLTE_CFG_CHANGE_IND,
+
+    //D2RM -> D2RM
+    MSG_ID_D2RM_D2RM_PDN_ACCSEL_IND,
+    
+    //DATA BINDER
+    MSG_ID_D2RM_DB_BEGIN,
+        MSG_ID_D2RM_DB_TEST_REQ,
+        MSG_ID_D2RM_DB_TEST_CNF,
+        MSG_ID_D2RM_DB_DUMP_ALL_IND,
+        MSG_ID_D2RM_DB_DUMP_INFO_IND,
+    MSG_ID_D2RM_DB_END,
+
+    // D2AM
+    MSG_ID_D2AM_BEGIN,
+        MSG_ID_D2AM_MDALLOW_REQ,
+        MSG_ID_D2AM_MDALLOW_CNF,
+        MSG_ID_D2AM_EAPNABORT_REQ,
+        MSG_ID_D2RM_D2AM_HANDOVER_ATTACH_REQ,
+        MSG_ID_D2RM_D2AM_HANDOVER_ATTACH_CNF,
+        MSG_ID_D2AM_EIAREG_IND,
+        MSG_ID_D2AM_EIAERR_IND,
+    MSG_ID_D2AM_END,
+
+    MSG_ID_IMC_D2_MSG_FROM_IMC_BEGIN,
+        MSG_ID_D2_IMC_IMS_DEREG_CNF,
+        MSG_ID_D2_IMC_IMS_CALL_STATUS_IND,
+        MSG_ID_D2_IMC_IMS_ROAMING_IND,
+    MSG_ID_IMC_D2_MSG_FROM_IMC_END,
+
+    // D2UT
+    MSG_ID_D2UT_BEGIN,
+        MSG_ID_D2UT_TEST_REQ,
+    MSG_ID_D2UT_END,
+
+    // URSP
+    MSG_ID_URSP_BEGIN,
+        MSG_ID_URSP_GET_ROUTE_PROFILE_REQ,
+        MSG_ID_URSP_GET_ROUTE_PROFILE_IND,
+        MSG_ID_URSP_GET_ROUTE_SUPP_PROFILE_IND,
+        MSG_ID_URSP_GET_ROUTE_PROFILE_CNF,
+        MSG_ID_URSP_REEVAL_REQ,
+        MSG_ID_URSP_REEVAL_CNF,
+        MSG_ID_URSP_REEVAL_IND,
+        MSG_ID_URSP_SET_PRECONF_UE_POLICY_REQ,
+        MSG_ID_URSP_SET_PRECONF_UE_POLICY_CNF,
+        MSG_ID_URSP_SET_USIM_UE_POLICY_REQ,
+        MSG_ID_URSP_SET_USIM_UE_POLICY_CNF,
+        MSG_ID_URSP_GET_UE_POLICY_REQ,
+        MSG_ID_URSP_GET_UE_POLICY_IND,
+        MSG_ID_URSP_GET_UE_POLICY_CNF,
+        MSG_ID_URSP_UE_POLICY_CHG_IND,
+        MSG_ID_URSP_RULE_TBL_DUMP_IND,
+    MSG_ID_URSP_END,
+
+    MSG_ID_D2_NETIF_API_DUMP_IND,
+    MSG_ID_D2_NETIF_CONTEXT_DUMP_IND,
+    MSG_ID_D2_NETIF_CONTEXT_DUMP_START_IND,
+    MSG_ID_D2_NETIF_CONTEXT_DUMP_END_IND,
+
+    // D2UX
+    MSG_ID_D2UX_BEGIN,
+    MSG_ID_D2UX_END,
+
+    // D2SSC
+    MSG_ID_D2SSC_BEGIN,
+    MSG_ID_D2SSC_END,
+
+    MSG_ID_D2_GET_RETRYTMR_REQ,
+    MSG_ID_D2_GET_RETRYTMR_IND,
+    MSG_ID_D2_GET_RETRYTMR_CNF,
+
+    MSG_ID_L5_D2_MSG_BEGIN,
+        MSG_ID_L5UPDN_D2AM_SET_IA_APN_REQ,
+        MSG_ID_L5UPDN_D2AM_SET_IA_APN_CNF,
+    MSG_ID_L5_D2_MSG_END,
+
+MODULE_MSG_END( MSG_ID_D2_CODE_TAIL )
+
+#endif /* _DDM_MSGID_H */
diff --git a/mcu/interface/sap/md/data_msgid.h b/mcu/interface/sap/md/data_msgid.h
new file mode 100644
index 0000000..aee7cf8
--- /dev/null
+++ b/mcu/interface/sap/md/data_msgid.h
@@ -0,0 +1,262 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   data.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   DATA 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _DATA_MSGID_H
+#define _DATA_MSGID_H
+
+/*------------------- DATA_MSG_CODE_BEGIN -------------------*/
+
+	/*------------------- TDT Messages -------------------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_TDT_CODE_BEGIN )
+   MSG_ID_CSM_TDT_ACTIVATE_REQ = MSG_ID_TDT_CODE_BEGIN,
+   MSG_ID_CSM_TDT_DEACTIVATE_REQ,
+   MSG_ID_CSM_TDT_UART_SETOWNER_REQ,
+   MSG_ID_CSM_TDT_ESC_OFF_REQ, 
+   MSG_ID_PPP_TDT_DATA_REQ,
+   MSG_ID_TDT_CODE_END = MSG_ID_PPP_TDT_DATA_REQ,
+MODULE_MSG_END( MSG_ID_TDT_CODE_TAIL )
+
+	/*------------------- T30 Messages -------------------------*/
+MODULE_MSG_BEGIN( MSG_ID_T30_CODE_BEGIN )
+   MSG_ID_CSM_T30_ACTIVATE_REQ = MSG_ID_T30_CODE_BEGIN,
+   MSG_ID_CSM_T30_DEACTIVATE_REQ,
+   MSG_ID_CSM_T30_FAX_RATE_REQ,
+
+   MSG_ID_L4C_T30_RW_STR_PARAM_REQ,
+   MSG_ID_L4C_T30_RW_PARAM_REQ,
+   MSG_ID_L4C_T30_TX_MSG_REQ, 
+   MSG_ID_L4C_T30_RX_MSG_REQ,
+   MSG_ID_L4C_T30_TX_BCS_REQ,
+   MSG_ID_L4C_T30_RX_BCS_REQ,
+   MSG_ID_L4C_T30_TX_SILENCE_REQ,
+   MSG_ID_L4C_T30_RX_SILENCE_REQ,
+   MSG_ID_L4C_T30_TRANSFER_UART_REQ,
+   MSG_ID_L4C_T30_TX_PPM_REQ,
+
+   MSG_ID_FA_T30_ACTIVATE_CNF,
+   MSG_ID_FA_T30_DEACTIVATE_CNF,
+   MSG_ID_FA_T30_TX_DATA_CNF, 
+   MSG_ID_FA_T30_RX_DATA_CNF, 
+   MSG_ID_FA_T30_DISC_IND,
+   MSG_ID_FA_T30_CMD_CNF,
+
+   MSG_ID_FA_T30_CMD_IND,
+   MSG_ID_FA_T30_DATA_IND,
+   MSG_ID_FA_T30_GET_CMD_IND,
+   MSG_ID_FA_T30_GET_DATA_IND,
+
+   MSG_ID_FA_T30_TX_DATA_END_IND,
+   MSG_ID_FA_T30_RX_DATA_END_IND,
+   MSG_ID_FA_T30_TX_CMD_END_IND, 
+   MSG_ID_FA_T30_RX_CMD_END_IND, 
+
+   MSG_ID_FA_T30_GETMORE_DATA_IND,
+   MSG_ID_FA_T30_OVERFLOW_IND,
+   MSG_ID_FA_T30_DATA_AVAILABLE_IND,
+   MSG_ID_FA_T30_RATE_CHANGE_IND,
+   MSG_ID_FA_T30_HDLC_IND,
+   MSG_ID_T30_CODE_END = MSG_ID_FA_T30_HDLC_IND,
+MODULE_MSG_END( MSG_ID_T30_CODE_TAIL)
+
+	/*------------------- FA Messages -------------------------*/
+MODULE_MSG_BEGIN( MSG_ID_FA_CODE_BEGIN)
+   MSG_ID_T30_FA_ACTIVATE_REQ = MSG_ID_FA_CODE_BEGIN,
+   MSG_ID_T30_FA_DEACTIVATE_REQ, 
+   MSG_ID_T30_FA_CMD_REQ, 
+   MSG_ID_T30_FA_DATA_REQ,   
+   MSG_ID_T30_FA_TX_DATA_REQ, 
+   MSG_ID_T30_FA_RX_DATA_REQ, 
+   MSG_ID_T30_FA_FAX_RATE_REQ,  
+   MSG_ID_T30_FA_SEND_DATA_REQ, 
+   MSG_ID_FA_T30_HDLC_REQ,
+
+   MSG_ID_RA_FA_PROCESS_CMD_IND,
+
+   MSG_ID_RA_FA_ACTIVATE_CNF, 
+   MSG_ID_RA_FA_DL_Q_FULL_IND, 
+   MSG_ID_RA_FA_DL_Q_OVERFLOW_IND, 
+   MSG_ID_RA_FA_UL_Q_UNDERFLOW_IND, 
+   MSG_ID_RA_FA_TX_DATA_CNF, 
+   MSG_ID_RA_FA_RX_DATA_CNF, 
+   MSG_ID_RA_FA_RX_DATA_END_IND, 
+   MSG_ID_RA_FA_TX_DATA_END_IND, 
+   MSG_ID_RA_FA_RX_CMD_END_IND, 
+   MSG_ID_RA_FA_TX_CMD_END_IND, 
+   MSG_ID_RA_FA_RX_MSG_REC_IND, 
+   MSG_ID_RA_FA_RATE_CHANGE_IND,
+   MSG_ID_FA_CODE_END = MSG_ID_RA_FA_RATE_CHANGE_IND, 
+MODULE_MSG_END( MSG_ID_FA_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_L2R_CODE_BEGIN )
+	/*------------------- L2R Messages -------------------------*/
+   MSG_ID_CSM_L2R_ACTIVATE_REQ = MSG_ID_L2R_CODE_BEGIN,
+   MSG_ID_CSM_L2R_DEACTIVATE_REQ,
+   MSG_ID_CSM_L2R_UART_SETOWNER_REQ,
+   MSG_ID_CSM_L2R_ESC_OFF_REQ,
+   MSG_ID_PPP_L2R_DATA_REQ,
+   MSG_ID_SMU_L2R_DATA_REQ,
+
+   MSG_ID_L2R_RLP_CONN_CNF,
+   MSG_ID_L2R_RLP_CONN_IND,
+   MSG_ID_L2R_RLP_XID_IND,
+   MSG_ID_L2R_RLP_TEST_CNF,          /* test cnf */
+   MSG_ID_L2R_RLP_UNITDATA_IND,   /* ui */
+   MSG_ID_L2R_RLP_DISC_CNF,
+   MSG_ID_L2R_RLP_DISC_IND,
+   MSG_ID_L2R_RLP_DETACH_CNF,
+   MSG_ID_L2R_RLP_ERROR_IND,
+   MSG_ID_L2R_RLP_RESET_CNF,
+   MSG_ID_L2R_RLP_RESET_IND,
+   MSG_ID_L2R_RLP_DATA_IND,
+   MSG_ID_L2R_RLP_READY_IND,
+   MSG_ID_L2R_RLP_CHANGE_RATE_IND,
+   MSG_ID_L2R_RLP_PREPARE_REMAP_IND,
+   MSG_ID_L2R_RLP_REMAP_IND,
+   MSG_ID_FLC_CSD_DL_APPDU_RESUME,
+   MSG_ID_L2R_CODE_END = MSG_ID_L2R_RLP_REMAP_IND,
+MODULE_MSG_END( MSG_ID_L2R_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_RLP_CODE_BEGIN )
+   /*------------------- RLP Messages -------------------------*/
+	MSG_ID_L2R_RLP_ATTACH_REQ = MSG_ID_RLP_CODE_BEGIN,
+   MSG_ID_L2R_RLP_DATA_REQ,
+   MSG_ID_L2R_RLP_CONN_REQ,
+   MSG_ID_L2R_RLP_CONN_RESP,
+   MSG_ID_L2R_RLP_RESET_RESP,
+   MSG_ID_L2R_RLP_RESET_REQ,
+   MSG_ID_L2R_RLP_DISC_REQ,
+   MSG_ID_L2R_RLP_UNITDATA_REQ,
+   MSG_ID_L2R_RLP_XID_REQ,
+   MSG_ID_L2R_RLP_TEST_REQ,
+   MSG_ID_L2R_RLP_PREPARE_REMAP_RESP,
+   MSG_ID_L2R_RLP_REMAP_RESP,
+   MSG_ID_L2R_RLP_DETACH_REQ,
+   MSG_ID_RLP_RA_DATA_REQ,
+   MSG_ID_RLP_RA_DATA_IND,
+   MSG_ID_FLC_RLP_RR_REQ,
+   MSG_ID_FLC_RLP_RNR_REQ,
+   MSG_ID_L2R_RLP_ABOVE_UP_THRESHOLD_IND,
+   MSG_ID_L2R_RLP_BELOW_UP_THRESHOLD_IND,
+
+   MSG_ID_CSD_UART_READY_TO_READ,
+   MSG_ID_CSD_UART_READY_TO_WRITE,
+   MSG_ID_CSD_UART_DATA_REQ,
+   MSG_ID_CSD_UART_FULL_IND,
+   MSG_ID_CSD_ACTIVATE_REQ,
+   MSG_ID_CSD_DEACTIVATE_REQ,
+   MSG_ID_CSD_RA_DATA_REQ,
+   MSG_ID_CSD_RA_DATA_IND,
+   MSG_ID_CSD_CEEL_CHANGE_START_IND,
+   MSG_ID_CSD_CEEL_CHANGE_FINIDSH_IND,
+   MSG_ID_CSD_UPLINK_TICK_IND,
+   MSG_ID_CSD_DOWNLINK_TICK_IND,
+   MSG_ID_RLP_CODE_END = MSG_ID_CSD_DOWNLINK_TICK_IND,
+MODULE_MSG_END( MSG_ID_RLP_CODE_TAIL )
+
+/*------------------- DATA_MSG_CODE_END ---------------------*/
+#endif //_DATA_MSGID_H
diff --git a/mcu/interface/sap/md/ddm_msgid.h b/mcu/interface/sap/md/ddm_msgid.h
new file mode 100644
index 0000000..31f0b36
--- /dev/null
+++ b/mcu/interface/sap/md/ddm_msgid.h
@@ -0,0 +1,295 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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 _DDM_MSGID_H
+#define _DDM_MSGID_H
+#if 0
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif
+MODULE_MSG_BEGIN( MSG_ID_DDM_CODE_BEGIN )
+    //DAST to DDM
+    MSG_ID_D2_DDM_MSG_FROM_DAST_BEGIN,
+        MSG_ID_D2AM_DDM_DEFINE_ATTACH_PDN_RSP,
+        MSG_ID_D2AM_DDM_L4BNW_EDALLOW_REQ,
+        MSG_ID_D2AM_DDM_EDALLOW_REQ,	
+        MSG_ID_D2AM_DDM_EVZWAPFCIA_REQ,
+        MSG_ID_D2PM_DDM_SET_SBP_ID_REQ,
+        MSG_ID_D2AM_DDM_PS_TYPE_CONFIG_REQ,
+        MSG_ID_D2AM_DDM_PS_REATTACH_CONFIG_REQ,
+        MSG_ID_D2AM_DDM_EUTRAN_DISABLE_CHECK_RSP, /*D2AM -> DDM -> NWSEL : RSP*/	
+        MSG_ID_D2PM_DDM_ESCONTIND_IND,
+    MSG_ID_D2_DDM_MSG_FROM_DAST_END,
+
+    //D2RM to DDM
+    MSG_ID_D2RM_DDM_MSG_FROM_D2RM_BEGIN,
+        MSG_ID_D2RM_DDM_ACT_DATA_CALL_REQ,
+        MSG_ID_D2RM_DDM_DEACT_DATA_CALL_REQ,
+        MSG_ID_D2RM_DDM_GET_DYNAMIC_PARAM_REQ,
+        MSG_ID_D2RM_DDM_GET_DATA_CALL_LIST_REQ,
+        MSG_ID_D2RM_DDM_GET_PDP_ADDRESS_REQ,
+        MSG_ID_D2RM_DDM_GET_SECONDARY_DYNAMIC_PARAM_REQ,
+        MSG_ID_D2RM_DDM_GET_TFT_REQ,
+        MSG_ID_D2RM_DDM_SET_PACKET_FILTER_REQ,
+        MSG_ID_D2RM_DDM_GET_PACKET_FILTER_REQ,
+        MSG_ID_D2RM_DDM_MODIFY_DATA_CALL_REQ,
+        MSG_ID_D2RM_DDM_ABORT_DATA_CALL_REQ,
+        MSG_ID_D2RM_DDM_GET_RETRYTMR_REQ,
+        MSG_ID_D2RM_DDM_SET_RETRYTMR_REQ,
+        MSG_ID_D2RM_DDM_GET_EPDG_INFO_REQ,
+        MSG_ID_D2RM_DDM_VZWAPNETMR_REQ,
+        MSG_ID_D2RM_DDM_VZWAPNE_REQ,
+        MSG_ID_D2RM_DDM_PDN_BIND_REQ,
+        MSG_ID_D2RM_DDM_PDN_UNBIND_REQ,
+    MSG_ID_D2RM_DDM_MSG_FROM_D2RM_END,
+
+    //DDM to DAST
+    MSG_ID_D2_DDM_MSG_FROM_DDM_BEGIN,
+        MSG_ID_D2AM_DDM_DEFINE_ATTACH_PDN_IND,
+        MSG_ID_D2AM_DDM_NEED_DETACH_PDN_IND,
+        MSG_ID_D2AM_DDM_ATTACHED_RAT_IND,
+        MSG_ID_D2AM_DDM_ATTACH_PDN_ACTIVATE_SUCCESS_IND,
+        MSG_ID_D2AM_DDM_ATTACH_PDN_ACTIVATE_FAILURE_IND,
+        MSG_ID_D2AM_DDM_ECNCFG_REQ_IND,
+        MSG_ID_D2AM_DDM_EVZWAPFCIA_IND,
+        MSG_ID_D2AM_DDM_EDALLOW_CNF,
+        MSG_ID_D2PM_DDM_ACT_DATA_CALL_CNF,
+        MSG_ID_D2PM_DDM_GET_DYNAMIC_PARAM_CNF,
+        MSG_ID_D2PM_DDM_GET_DATA_CALL_LIST_CNF,
+        MSG_ID_D2AM_DDM_EVZWAPFCIA_CNF,
+        MSG_ID_D2PM_DDM_URC_CGEV_IND,
+        MSG_ID_D2AM_DDM_PS_TYPE_CONFIG_CNF,
+        MSG_ID_D2AM_DDM_RELEASE_FB_CID_IND,
+        MSG_ID_D2AM_DDM_EUTRAN_DISABLE_CHECK_IND, /*NWSEL -> DDM -> D2AM : IND*/
+        MSG_ID_D2AM_DDM_PS_EVENT_REPORT_IND,
+        MSG_ID_D2AM_DDM_L4BNW_EDALLOW_CNF,
+        MSG_ID_D2RM_DDM_PDN_BIND_CNF,
+        MSG_ID_D2RM_DDM_PDN_UNBIND_CNF,
+        MSG_ID_D2AM_DDM_T3402_STOP_IND,
+    MSG_ID_D2_DDM_MSG_FROM_DDM_END,
+
+    //DDM to D2RM
+    MSG_ID_D2RM_DDM_MSG_FROM_DDM_BEGIN,
+        MSG_ID_D2RM_DDM_ACT_DATA_CALL_CNF,
+        MSG_ID_D2RM_DDM_DEACT_DATA_CALL_CNF,
+        MSG_ID_D2RM_DDM_ABORT_DATA_CALL_CNF,
+        MSG_ID_D2RM_DDM_GET_DYNAMIC_PARAM_CNF,
+        MSG_ID_D2RM_DDM_GET_DATA_CALL_LIST_CNF,
+        MSG_ID_D2RM_DDM_GET_PDP_ADDRESS_CNF,
+        MSG_ID_D2RM_DDM_GET_SECONDARY_DYNAMIC_PARAM_CNF,
+        MSG_ID_D2RM_DDM_GET_QOS_CNF,
+        MSG_ID_D2RM_DDM_GET_TFT_CNF,
+        MSG_ID_D2RM_DDM_SET_PACKET_FILTER_CNF,
+        MSG_ID_D2RM_DDM_GET_PACKET_FILTER_CNF,
+        MSG_ID_D2RM_DDM_MODIFY_DATA_CALL_CNF,
+        MSG_ID_D2RM_DDM_GET_RETRYTMR_CNF,
+        MSG_ID_D2RM_DDM_SET_RETRYTMR_CNF,
+        MSG_ID_D2RM_DDM_GET_EPDG_INFO_CNF,
+        //MSG_ID_D2RM_DDM_VZWAPNETMR_CNF,
+        //MSG_ID_D2RM_DDM_VZWAPNE_CNF,
+        MSG_ID_D2RM_DDM_URC_CGEV_IND,
+        MSG_ID_D2RM_DDM_ACT_DATA_CALL_IND,
+        MSG_ID_D2RM_DDM_GET_DATA_CALL_LIST_IND,
+        MSG_ID_D2RM_DDM_GET_DYNAMIC_PARAM_IND,
+        MSG_ID_D2RM_DDM_GET_PDP_ADDRESS_IND,
+        MSG_ID_D2RM_DDM_GET_SECONDARY_DYNAMIC_PARAM_IND,
+        MSG_ID_D2RM_DDM_GET_QOS_IND,
+        MSG_ID_D2RM_DDM_GET_TFT_IND,
+        MSG_ID_D2RM_DDM_GET_PACKET_FILTER_IND,
+        MSG_ID_D2RM_DDM_MOD_DATA_CALL_IND,
+        MSG_ID_D2RM_DDM_RST_RETRYTMR_IND,
+        MSG_ID_D2RM_DDM_GET_EPDG_INFO_IND,
+    MSG_ID_D2RM_DDM_MSG_FROM_DDM_END,
+    //ATP to DDM
+    MSG_ID_ATP_DDM_FROM_ATP_BEGIN,
+        MSG_ID_ATP_DDM_CGDCONT_REQ,
+        MSG_ID_ATP_DDM_CGDSCONT_REQ,
+        MSG_ID_ATP_DDM_CGTFT_REQ,
+        MSG_ID_ATP_DDM_CGQREQ_REQ,
+        MSG_ID_ATP_DDM_CGQMIN_REQ,
+        MSG_ID_ATP_DDM_CGEQREQ_REQ,
+        MSG_ID_ATP_DDM_CGEQMIN_REQ,
+        MSG_ID_ATP_DDM_CGEQNEG_REQ,
+        MSG_ID_ATP_DDM_CGACT_REQ,
+        MSG_ID_ATP_DDM_CGCMOD_REQ,
+        MSG_ID_ATP_DDM_CGDATA_REQ,
+        MSG_ID_ATP_DDM_CGPADDR_REQ,
+        MSG_ID_ATP_DDM_CGAUTO_REQ,
+        MSG_ID_ATP_DDM_CGANS_REQ,
+        MSG_ID_ATP_DDM_CGEREP_REQ,
+        MSG_ID_ATP_DDM_CGCONTRDP_REQ,
+        MSG_ID_ATP_DDM_CGSCONTRDP_REQ,
+        MSG_ID_ATP_DDM_CGTFTRDP_REQ,
+        MSG_ID_ATP_DDM_CGEQOS_REQ,
+        MSG_ID_ATP_DDM_CGEQOSRDP_REQ,
+        MSG_ID_ATP_DDM_C5GQOS_REQ,
+        MSG_ID_ATP_DDM_C5GQOSRDP_REQ,
+        MSG_ID_ATP_DDM_CGDEL_REQ,
+        MSG_ID_ATP_DDM_CGAUTH_REQ,
+        MSG_ID_ATP_DDM_ECNCFG_REQ,
+        MSG_ID_ATP_DDM_EGDCONT_REQ,
+        MSG_ID_ATP_DDM_VZWAPNETMR_REQ,
+        MSG_ID_ATP_DDM_VZWAPNE_REQ,
+        MSG_ID_ATP_DDM_EGPAU_REQ,
+        MSG_ID_ATP_DDM_EGACT_REQ,
+        MSG_ID_ATP_DDM_CGSDATA_REQ,
+        MSG_ID_ATP_DDM_ACTTEST_REQ,
+        MSG_ID_ATP_DDM_PSBEARER_REQ,
+        MSG_ID_ATP_DDM_EGFB_REQ,
+        MSG_ID_ATP_DDM_EGLD_REQ,
+        MSG_ID_ATP_DDM_EGDELPF_REQ,
+        MSG_ID_ATP_DDM_EGLNKPF_REQ,
+        MSG_ID_ATP_DDM_EGPCORDP_REQ,
+        MSG_ID_ATP_DDM_EGPCO_REQ,
+        MSG_ID_ATP_DDM_EDALLOW_REQ,
+        MSG_ID_ATP_DDM_EDRETRY_REQ,
+        MSG_ID_ATP_DDM_EIMSCFG_REQ,
+        MSG_ID_ATP_DDM_EGQOS_REQ,
+        MSG_ID_ATP_DDM_CRLADN_REQ,
+        MSG_ID_ATP_DDM_CLADN_REQ,
+        MSG_ID_ATP_DDM_ELADN_REQ,
+        MSG_ID_ATP_DDM_ESCONTIND_REQ,
+        //AT respone to DDM
+        MSG_ID_ATP_DDM_L4_CMD_CGATT_RSP,
+    MSG_ID_ATP_DDM_FROM_ATP_END,
+        
+        //D2AT -> DDM
+    MSG_ID_ATP_DDM_FROM_D2AT_BEGIN,
+        MSG_ID_D2AT_DDM_CGDSCONT_REQ,
+        MSG_ID_D2AT_DDM_CGTFT_REQ,
+        MSG_ID_D2AT_DDM_CGQREQ_REQ,
+        MSG_ID_D2AT_DDM_CGQMIN_REQ,
+        MSG_ID_D2AT_DDM_CGEQREQ_REQ,
+        MSG_ID_D2AT_DDM_CGEQMIN_REQ,
+        MSG_ID_D2AT_DDM_CGEREP_REQ,
+        MSG_ID_D2AT_DDM_CGSCONTRDP_REQ,
+        MSG_ID_D2AT_DDM_CGTFTRDP_REQ,
+        MSG_ID_D2AT_DDM_CGEQOS_REQ,
+        MSG_ID_D2AT_DDM_CGEQOSRDP_REQ,
+        MSG_ID_D2AT_DDM_C5GQOS_REQ,
+        MSG_ID_D2AT_DDM_C5GQOSRDP_REQ,
+        MSG_ID_D2AT_DDM_CGCMOD_REQ,
+        MSG_ID_D2AT_DDM_CGPADDR_REQ,
+
+        MSG_ID_D2AT_DDM_CGACT_REQ,
+        MSG_ID_D2AT_DDM_CGDCONT_REQ,
+        MSG_ID_D2AT_DDM_CGAUTH_REQ,
+        MSG_ID_D2AT_DDM_CGCONTRDP_REQ,
+
+        MSG_ID_D2AT_DDM_EDALLOW_REQ,
+        MSG_ID_D2AT_DDM_EGPCO_REQ,
+        MSG_ID_D2AT_DDM_EGPCORDP_REQ,
+        MSG_ID_D2AT_DDM_ACTTEST_REQ,
+        MSG_ID_D2AT_DDM_CGANS_REQ,
+        MSG_ID_D2AT_DDM_CGEQNEG_REQ,
+        MSG_ID_D2AT_DDM_CGDATA_REQ,
+        MSG_ID_D2AT_DDM_CGSDATA_REQ,
+        MSG_ID_D2AT_DDM_CGDEL_REQ,
+        MSG_ID_D2AT_DDM_EGACT_REQ,
+        MSG_ID_D2AT_DDM_EGDCONT_REQ,
+        MSG_ID_D2AT_DDM_EGDELPF_REQ,
+        MSG_ID_D2AT_DDM_EGLD_REQ,
+        MSG_ID_D2AT_DDM_EGLNKPF_REQ,
+        MSG_ID_D2AT_DDM_EGPAU_REQ,
+        MSG_ID_D2AT_DDM_ESCONTIND_REQ,
+
+    MSG_ID_ATP_DDM_FROM_D2AT_END,
+
+        //DDM to IMSM
+    MSG_ID_IMSM_DDM_MSG_FROM_DDM_BEGIN,
+        MSG_ID_IMSM_DDM_PCO_UPDATE_IND,
+        MSG_ID_IMSM_DDM_FALLBACK_IPV4_IND,
+    MSG_ID_IMSM_DDM_MSG_FROM_DDM_END,
+    //DDM to VDM
+    MSG_ID_VDM_DDM_MSG_FROM_DDM_BEGIN,
+        MSG_ID_VDM_DDM_PCO_UPDATE_IND,
+    MSG_ID_VDM_DDM_MSG_FROM_DDM_END,    
+
+    //NWSEL to DDM
+    MSG_ID_DDM_NWSEL_MSG_FROM_DDM_BEGIN,
+        MSG_ID_DDM_NWSEL_EUTRAN_DISABLE_CHECK_IND,
+    MSG_ID_DDM_NWSEL_MSG_FROM_DDM_END,
+
+    //VGMM to DDM
+    MSG_ID_DDM_VGMM_MSG_FROM_VGMM_BEGIN,
+        MSG_ID_DDM_VGMM_CRLADN_CNF,
+        MSG_ID_DDM_VGMM_CABTSRI_IND,
+        MSG_ID_DDM_VGMM_DEACT_PDUS_INFO_UPDATE_IND,
+    MSG_ID_DDM_VGMM_MSG_FROM_VGMM_END,
+
+    MSG_ID_DDM_BEGIN,
+        MSG_ID_DDM_DSBP_READY_IND,
+    MSG_ID_DDM_END,
+
+    //D2UX->DDM
+    MSG_ID_D2UX_DDM_MSG_FROM_D2UX_BEGIN,
+        MSG_ID_D2UX_DDM_NOTIFY_PDN_TYPE_REQ,
+    MSG_ID_D2UX_DDM_MSG_FROM_D2UX_END,
+
+    //DDM->D2UX
+    MSG_ID_D2UX_DDM_MSG_FROM_DDM_BEGIN,
+        MSG_ID_D2UX_DDM_NOTIFY_PDN_TYPE_CNF,
+    MSG_ID_D2UX_DDM_MSG_FROM_DDM_END,
+
+    //D2APNB->DDM
+    MSG_ID_D2APNB_DDM_MSG_FROM_DDM_BEGIN,
+        MSG_ID_D2APNB_DDM_VZW_APN_NTF,
+    MSG_ID_D2APNB_DDM_MSG_FROM_DDM_END,
+  
+MODULE_MSG_END( MSG_ID_DDM_CODE_TAIL )
+
+#endif /* _DDM_MSGID_H */
diff --git a/mcu/interface/sap/md/dispatcher_msgid.h b/mcu/interface/sap/md/dispatcher_msgid.h
new file mode 100644
index 0000000..cd37e70
--- /dev/null
+++ b/mcu/interface/sap/md/dispatcher_msgid.h
@@ -0,0 +1,75 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   dispatcher_msgid.h
+ *
+ * Project:
+ * --------
+ *   VMOLY
+ *
+ * Description:
+ * ------------
+ *   Dispatcher message id declaration
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _DISPATCHER_MSGID_H
+#define _DISPATCHER_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_DISPATCHER_CODE_BEGIN )
+
+MSG_ID_N3EPC_DISPATCHER_BEARER_ACT_REQ = MSG_ID_DISPATCHER_CODE_BEGIN, // TODO: no need!
+MSG_ID_N3EPC_DISPATCHER_BEARER_DEACT_REQ,
+
+MSG_ID_N3EPC_DISPATCHER_PDN_BIND_REQ,
+MSG_ID_N3EPC_DISPATCHER_PDN_BIND_CNF,
+MSG_ID_N3EPC_DISPATCHER_PDN_UNBIND_REQ,
+MSG_ID_N3EPC_DISPATCHER_PDN_UNBIND_CNF,
+
+MSG_ID_IPCORE_DISPATCHER_PDN_BIND_IND,
+MSG_ID_IPCORE_DISPATCHER_PDN_BIND_RSP,
+MSG_ID_IPCORE_DISPATCHER_PDN_UNBIND_IND,
+
+MODULE_MSG_END( MSG_ID_DISPATCHER_CODE_TAIL )
+
+#endif /* _DISPATCHER_MSGID_H */
diff --git a/mcu/interface/sap/md/do_clc_msgid.h b/mcu/interface/sap/md/do_clc_msgid.h
new file mode 100644
index 0000000..c78fc3e
--- /dev/null
+++ b/mcu/interface/sap/md/do_clc_msgid.h
@@ -0,0 +1,302 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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) 2015
+*
+*  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).
+*
+*************************************************************/
+/*****************************************************************************
+*
+* FILE NAME   : do_clc_msgid.h
+*
+* DESCRIPTION : Message ID definition for CLC (Connection Layer Control) task.
+*
+* HISTORY     :
+*****************************************************************************/
+#ifndef _DO_CLC_MSGID_H_
+#define _DO_CLC_MSGID_H_
+
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+
+MODULE_MSG_BEGIN(MSG_ID_CLC_CODE_BEGIN)
+
+    /* CLC task segment*/
+    MSG_ID_CLC_XXX_CMD_MSG = MSG_ID_CLC_CODE_BEGIN,
+    MSG_ID_CLC_TIMER_EXPIRED_MSG,
+    MSG_ID_DO_PARM_SET_MSG,
+    MSG_ID_DO_PARM_GET_MSG,
+
+    /* ALMP segment */
+    MSG_ID_CLC_CMD_MSGID_ALMP_START,
+    MSG_ID_ALMP_PSW_POWER_MSG,
+    MSG_ID_ALMP_INSP_NTWK_ACQD_MSG,
+    MSG_ID_ALMP_IDP_CONN_OPENED_MSG,
+    MSG_ID_ALMP_IDP_CONN_FAILED_MSG,
+    MSG_ID_ALMP_IDP_PAGE_REQ_MSG,
+    MSG_ID_ALMP_IDP_FASTCONN_INITIATED_MSG,
+    MSG_ID_ALMP_CSP_CONN_CLOSED_MSG,
+    MSG_ID_ALMP_OMP_AN_REDIRECT_MSG,
+    MSG_ID_ALMP_OMP_SUPERVSN_FAIL_MSG,
+    MSG_ID_ALMP_CCM_SUPERVSN_FAIL_MSG,
+    MSG_ID_ALMP_ACM_SUPERVSN_FAIL_MSG,
+    MSG_ID_ALMP_RTM_SUPERVSN_FAIL_MSG,
+    MSG_ID_ALMP_FTM_SUPERVSN_FAIL_MSG,
+    MSG_ID_ALMP_RUP_NTWK_LOST_MSG,
+    MSG_ID_ALMP_RUP_ASSGN_REJ_MSG,
+    MSG_ID_ALMP_CSS_RE_INIT_MSG,
+    MSG_ID_ALMP_HLP_REL_CONN_MSG,
+    MSG_ID_ALMP_HLP_CLOSE_CONN_MSG,
+    MSG_ID_ALMP_HLP_OPEN_CONN_MSG,
+    MSG_ID_ALMP_FTAP_OPEN_CONN_MSG,
+    MSG_ID_ALMP_FTAP_REL_CONN_MSG,
+    MSG_ID_ALMP_FTAP_CLOSE_CONN_MSG,
+    MSG_ID_ALMP_RTAP_OPEN_CONN_MSG,
+    MSG_ID_ALMP_RTAP_REL_CONN_MSG,
+    MSG_ID_ALMP_RTAP_CLOSE_CONN_MSG,
+    MSG_ID_ALMP_SCP_OPEN_CONN_MSG,
+    MSG_ID_ALMP_SCP_REL_CONN_MSG,
+    MSG_ID_ALMP_SCP_CLOSE_CONN_MSG,
+    MSG_ID_ALMP_OMP_UPDATE_CMD_MSG,
+    MSG_ID_ALMP_SMP_CLOSE_CONN_MSG,
+    MSG_ID_ALMP_SCP_RECONFIGURED_MSG,
+    MSG_ID_ALMP_CSS_SYS_ACQ_REQ_MSG,
+    MSG_ID_ALMP_CSS_OOSA_WAKEUP_REQ_MSG,
+    MSG_ID_ALMP_HSC_NTWK_LOST_MSG,
+    MSG_ID_ALMP_DSAR_QUEUE_FULL_MSG,
+    MSG_ID_ALMP_IDP_THAW_MSG,
+    MSG_ID_ALMP_IDP_ACCESS_FAIL_MSG,
+    MSG_ID_ALMP_CSS_SYSTEM_VALIDATED_MSG,
+    MSG_ID_ALMP_SMP_POWERDOWN_CNF_MSG,
+    MSG_ID_ALMP_IRATM_TO_LTE_MEAS_CTRL_CNF,
+    MSG_ID_ALMP_NOTIFY_SRV_STATUS_TO_UPPER_LAYER_MSG,
+    MSG_ID_ALMP_VAL_FLIGHT_MODE_MSG,
+
+    /* INSP segment */
+    MSG_ID_CLC_CMD_MSGID_INSP_START,
+    MSG_ID_INSP_ALMP_ACTIVATE_MSG,
+    MSG_ID_INSP_ALMP_DEACTIVATE_MSG,
+    MSG_ID_INSP_RMC_PILOT_ACQ_RSP_MSG,
+    MSG_ID_INSP_RMC_SYNC_OK_MSG,
+    MSG_ID_INSP_RMC_NETWORK_RESET_DONE_MSG,
+    MSG_ID_INSP_1XASSIST_DOACQ_MSG,
+    MSG_ID_INSP_CSS_FREQ_RSP_MSG,
+    MSG_ID_INSP_CSS_OOSA_SLEEP_REQ_MSG,
+    MSG_ID_INSP_CSS_OOSA_CONT_SLEEP_REQ_MSG,
+    MSG_ID_INSP_CSS_ACQ_ABORT_REQ_MSG,
+    MSG_ID_INSP_HSC_OOSA_WAKEUP_IND_MSG,
+    MSG_ID_CLC_HSC_OOSA_SLEEP_CNF_MSG,
+    MSG_ID_INSP_RMC_RF_STATUS_MSG,
+    MSG_ID_INSP_HSC_SUSPEND_SLEEP_CNF_MSG,
+    MSG_ID_INSP_OMP_QC_REDIRECT,
+    MSG_ID_INSP_RMC_ICS_GAP_EXHAUST_MSG,
+
+    /* IDP segment */
+    MSG_ID_CLC_CMD_MSGID_IDP_START,
+    MSG_ID_IDP_ALMP_ACTIVATE_MSG,
+    MSG_ID_IDP_ALMP_DEACTIVATE_MSG,
+    MSG_ID_IDP_ALMP_CLOSE_MSG,
+    MSG_ID_IDP_ALMP_OPEN_CONN_MSG,
+    MSG_ID_IDP_RUP_CONNECTION_INITIATED_MSG,
+    MSG_ID_IDP_RUP_CONNECTION_OPENED_MSG,
+    MSG_ID_IDP_RUP_IHO_RESULT_MSG,
+    MSG_ID_IDP_HSC_FREEZE_MSG,
+    MSG_ID_IDP_HSC_THAW_MSG,
+    MSG_ID_IDP_HSC_WAKEUP_IND_MSG,
+    MSG_ID_IDP_HSC_RESYNC_IND_MSG,
+    MSG_ID_IDP_HSC_RESYNC_DENIED_MSG,
+    MSG_ID_IDP_ACM_TX_STARTED_MSG,
+    MSG_ID_IDP_ACM_TX_ENDED_MSG,
+    MSG_ID_IDP_CCM_SLEEP_CAPSULE_DONE_MSG,
+    MSG_ID_IDP_SMP_SESSION_OPENED_MSG,
+    MSG_ID_IDP_SMP_SESSION_CLOSED_MSG,
+    MSG_ID_IDP_OMP_UPDATED_MSG,
+    MSG_ID_IDP_CSP_SUSPEND_PERIOD_STATUS_MSG,
+    MSG_ID_IDP_CSP_CONNECTION_CLOSED_MSG,
+    MSG_ID_IDP_AMP_SESSIONSEED_MSG,
+    MSG_ID_IDP_CCM_OFFSET_MSG,
+    MSG_ID_IDP_SLOTTED_MODE_SET_MSG,
+    MSG_ID_IDP_1XPS_PAGINGMASK_SET_MSG,
+    MSG_ID_IDP_SCP_RECONFIGURED_MSG,
+    MSG_ID_IDP_SCP_COMMITTED_MSG,
+    MSG_ID_IDP_ALMP_SYSINFO_UPDATE_MSG,
+    MSG_ID_IDP_DSAR_ACCESS_STARTED_MSG,
+    MSG_ID_IDP_DSAR_ACCESS_ENDED_MSG,
+    MSG_ID_IDP_PREF_CC_CYCLE_SET_MSG,
+    MSG_ID_IDP_EXTENDED_SLOTCYCLE_SET_MSG,
+    MSG_ID_IDP_RUP_CHANNEL_CHANGED_IND_MSG,
+    MSG_ID_IDP_RUP_FORCE_IHO_RSP_MSG,
+  
+    MSG_ID_IDP_OMP_OTHERRAT_UPDATED_MSG,
+    MSG_ID_IDP_SMP_SESSION_STATUS_MSG,
+    MSG_ID_IDP_HSC_TX_AVAILABLE_IND,
+    MSG_ID_IDP_RUP_DFS_END_MSG,
+    MSG_ID_IDP_DFS_TIMER_SET_MSG,
+    MSG_ID_IDP_RMC_FREEZE_MSG,
+    MSG_ID_IDP_RMC_THAW_MSG,
+    MSG_ID_IDP_CSS_RSVAS_VIRTUAL_SUSPEND_REQ_MSG,
+    MSG_ID_IDP_CSS_RSVAS_RESUME_REQ_MSG,
+    MSG_ID_IDP_PSW_RSVAS_SERVICE_OCCUPY_CNF_MSG,
+    MSG_ID_IDP_PSW_RSVAS_SERVICE_OCCUPY_IND_MSG,
+    MSG_ID_IDP_VAL_PDN_SETUP_STATUS_NOTIFY_IND_MSG,
+    MSG_ID_IDP_RMC_INTER_HO_CNF_MSG,
+    MSG_ID_CLC_RMC_IDLE_MODE_CFG_CNF_MSG,
+    MSG_ID_IDP_RMC_IHO_WAKE_REDUCTION_STATE_CNF_MSG,
+    MSG_ID_IDP_RMC_FORCE_ACQ_OVHD_IND_MSG,
+    MSG_ID_IDP_PSW_1XRTT_PAGE_POSITION_CHANGE_IND_MSG,
+    MSG_ID_IDP_DSAR_CONNECTION_CLOSE_MSG_SEND_COMPLETE_MSG,
+    MSG_ID_IDP_ACM_PROBE_TXING_PROTECT_IND_MSG,
+    MSG_ID_IDP_DSAR_SIGNAL_INTERACTIVE_COMPLETE_MSG,
+
+    /* CSP segment */
+    MSG_ID_CLC_CMD_MSGID_CSP_START,
+    MSG_ID_CSP_ALMP_ACTIVATE_MSG,
+    MSG_ID_CSP_ALMP_DEACTIVATE_MSG,
+    MSG_ID_CSP_ALMP_CLOSE_CONN_MSG,
+    MSG_ID_CLC_CMD_MSGID_CSP_LAST,
+
+    /* OMP segment */
+    MSG_ID_CLC_CMD_MSGID_OMP_START,
+    MSG_ID_OMP_IDP_ACTIVATE_MSG,
+    MSG_ID_OMP_CSP_ACTIVATE_MSG,
+    MSG_ID_OMP_IDP_DEACTIVATE_MSG,
+    MSG_ID_OMP_ALMP_DEACTIVATE_MSG,
+    MSG_ID_OMP_RUP_IDLE_HANDOFF_MSG,
+    MSG_ID_OMP_CSP_CONN_CLOSED_MSG,
+    MSG_ID_OMP_SCP_RECONFIGURED_MSG,
+    MSG_ID_OMP_SCP_COMMITTED_MSG,
+    MSG_ID_OMP_ACM_SYS_PARMS_UPD_REQ,
+    MSG_ID_OMP_IRAT_MCC_REQ,
+    MSG_ID_OMP_CSS_SYSTEM_VALIDATED_MSG,
+    MSG_ID_OMP_RCP_ACCESS_INITIATE_MSG,
+
+    /* IRATM segment */
+    MSG_ID_CLC_CMD_MSGID_IRATM_START,
+    MSG_ID_IRATM_OMP_OTHERRAT_UPDATED_MSG,
+    MSG_ID_IRATM_RUP_IDLE_HANDOFF_MSG,
+    MSG_ID_IRATM_RMC_CCELL_MEASUREMENT_CNF,
+    MSG_ID_IRATM_RMC_SYNC_MSG_ACQ_START_IND,
+    MSG_ID_IRATM_RMC_SYNC_MSG_ACQ_TMR_OUT,
+    MSG_ID_IRATM_RMC_CCELL_MEAS_IND,
+    MSG_ID_IRATM_RMC_ACQ_CGI_CNF,
+    MSG_ID_IRATM_RMC_CGI_ACQ_START_IND,
+    MSG_ID_IRATM_RMC_CGI_ACQ_TMR_OUT,
+    MSG_ID_IRATM_RMC_PILOT_ACQ_FAILED_IND,
+    MSG_ID_IRATM_RMC_SET_RAT_CNF,
+    MSG_ID_IRATM_CSS_SET_RAT_REQ,
+    MSG_ID_IRATM_CSS_SUSPEND_REQ,
+    MSG_ID_IRATM_CSS_VIRTUAL_SUSPEND_REQ,
+    MSG_ID_IRATM_RUP_CUR_SECTOR_MEAS_CNF,
+    MSG_ID_IRATM_RUP_CUR_SECTOR_SIG_CHANGED_IND,
+    MSG_ID_IRATM_CSS_TO_LTE_MEAS_CTRL_REQ,
+    MSG_ID_IRATM_CSS_PLMN_LIST_UPDATE_REQ,
+    MSG_ID_IRATM_CSS_TO_LTE_RESEL_FAIL_INFO,
+    MSG_ID_IRATM_CSS_WAKEUP_CMP_RSP,
+    MSG_ID_IRATM_ALMP_TO_LTE_MEAS_CTRL_REQ,
+    MSG_ID_IRATM_TIMER_EXPIRED_CMD_MSG,
+    MSG_ID_IRATM_RMC_RX_STOP_IND,
+    MSG_ID_IRATM_CSS_SUSPEND_RESUME_REQ,
+    MSG_ID_IRATM_CSS_VIRTUAL_SUSPEND_RESUME_REQ,
+    MSG_ID_IRATM_CSS_POWER_CTRL_REQ,
+    MSG_ID_CLC_CMD_MSGID_IRATM_LAST,
+
+    /* OTA segment */
+    MSG_ID_CLC_OTAMSG_MSGID_START,
+    MSG_ID_ALMP_DSA_OTA_MSG,
+    MSG_ID_CLC_OTA_MSG_MSGID_LAST,
+
+    /* UT segment */
+    MSG_ID_UT_CLC_DSAF_FWD_MSG,
+    MSG_ID_UT_SET_1XRTT_SYSTEM_TIME_ST_MSG,
+    MSG_ID_UT_CLC_CONFIG_SBP_MSG,
+
+    /* IRAT segment */
+    MSG_ID_EAS_CAS_LTE_POWER_ON_IND,
+    MSG_ID_EAS_CAS_LTE_POWER_OFF_IND,
+    MSG_ID_CAS_EAS_LTE_MEASUREMENT_CNF,
+    MSG_ID_CAS_EAS_LTE_MEASUREMENT_IND,
+    MSG_ID_CAS_EAS_EVALUATE_ECELL_CNF,
+    MSG_ID_CAS_EAS_EVALUATE_ECELL_STOP_CNF,
+    MSG_ID_CAS_EAS_ACTIVATE_ECELL_CNF,
+    MSG_ID_EAS_CAS_CONFIG_CCELL_MEAS_REQ,
+    MSG_ID_EAS_CAS_REPORT_CGI_REQ,
+    MSG_ID_EAS_CAS_ACTIVATE_CCELL_REQ,
+    MSG_ID_EAS_CAS_PARAM_UPDATE_IND,
+    MSG_ID_ERRC_CLC_LTE_SCAN_C2K_ACTIVE_PARAMS_IND,
+    MSG_ID_C2K_MRS_CAS_OCCUPY_LLA_REQ,
+    MSG_ID_C2K_MRS_CAS_RELEASE_LLA_REQ,
+    MSG_ID_C2K_MRS_CAS_GET_LLA_OCCUPY_RAT_REQ,
+
+    MSG_ID_CLC_CMD_MSGID_NUM,
+
+MODULE_MSG_END(MSG_ID_CLC_CODE_TAIL)
+
+/*****************************************************************************
+* End of File
+*****************************************************************************/
+#endif
+
diff --git a/mcu/interface/sap/md/do_fcp_msgid.h b/mcu/interface/sap/md/do_fcp_msgid.h
new file mode 100644
index 0000000..bdd1bc5
--- /dev/null
+++ b/mcu/interface/sap/md/do_fcp_msgid.h
@@ -0,0 +1,232 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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 CONSKAL_TRUED 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 2016
+*
+*  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 CONSKAL_TRUED 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.
+*
+*****************************************************************************/
+
+/*****************************************************************************
+
+  FILE NAME:  fcp_msgid.h
+
+  DESCRIPTION:
+
+    This file contains the defenitions of all the FCP msg id's.
+    
+  HISTORY     :    
+    1.File Create by atlas.xu, 2016,1,27    
+
+*****************************************************************************/
+
+#ifndef _FCP_MSG_ID_H
+#define _FCP_MSG_ID_H
+
+
+/*----------------------------------------------------------------------------
+     Command Message IDs, for FCP task, for FCP_CMD_MAILBOX, EXE_MAILBOX_1_ID
+     The message IDs for components shall also be put in here.
+     Satya: Add all the PKT_SIM related messages into the area that is defined
+     between #ifdef/#endif..Contact me, if you need any clarifications!.
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+
+MODULE_MSG_BEGIN(MSG_ID_FCP_CODE_BEGIN)
+
+    MSG_ID_FCP_CMD_MSG = MSG_ID_FCP_CODE_BEGIN,
+    MSG_ID_FCP_TST_CCM_INITIALIZE,
+    MSG_ID_FCP_TST_CCM_ACTIVATE,
+    MSG_ID_FCP_TST_CCM_DEACTIVATE,
+    MSG_ID_FCP_TST_MAC_PKT_LIST_INTEGRITY,
+    MSG_ID_FCP_TST_CONN_LAYER_PKT_LIST_INTEGRITY,
+    MSG_ID_FCP_START_PCPF_OPERATIONS,
+    MSG_ID_FCP_START_STREAM_LAYER_OPERATIONS,
+    MSG_ID_FCP_BRP_FWD_PKT_MSG,
+    MSG_ID_FCP_RMC_4_SLOT_IND_MSG,    
+    MSG_ID_FCP_CMD_MSG_LAST,     // = FCP_CMD_MSGID_END 
+
+    /* FCP common EXE messages segment */
+    MSG_ID_FTM_MSG,
+    MSG_ID_FTM_RUP_ACTIVATE_MSG,
+    MSG_ID_FTM_RUP_DEACTIVATE_MSG,
+    MSG_ID_FTM_RUP_TCA_MSG,
+    MSG_ID_FTM_FTAP_DRC_ACK_CONFIG_MSG,    
+    MSG_ID_FTM_MSG_LAST,   
+  
+    /* All CCM Messages..  */
+    MSG_ID_CCM_MSG,
+    MSG_ID_CCM_AMP_ATILIST_MSG,
+    MSG_ID_CCM_SCM_SESSION_OPENED_MSG,
+    MSG_ID_CCM_SCM_SESSION_CLOSED_MSG,
+    MSG_ID_CCM_SCM_KEEPALIVE_RESET_MSG,
+    MSG_ID_CCM_SCM_KEEPALIVE_CFG_MSG,
+    MSG_ID_CCM_INSP_ACTIVATE_CMD,
+    MSG_ID_CCM_INSP_DEACTIVATE_CMD,  
+    MSG_ID_CCM_ALMP_DEACTIVATE_CMD, 
+    MSG_ID_CCM_IDP_ACTIVATE_CMD, 
+    MSG_ID_CCM_IDP_DEACTIVATE_CMD, 
+    MSG_ID_CCM_CSP_ACTIVATE_CMD, 
+    MSG_ID_CCM_CLC_SUP_TIMER_RST_CMD,
+    MSG_ID_CCM_MSG_LAST,
+  
+    /* All PCPF Messages  */
+    MSG_ID_PCPF_MSG,
+    MSG_ID_PCPF_MSG_LAST,    
+    MSG_ID_FCP_RCP_STREAM_CONFIG_MSG,
+    
+    /* All DSAF Messages */
+    MSG_ID_DSAF_MSG,
+    MSG_ID_DSAF_FWD_MSG,
+    MSG_ID_DSA_CCM_INTERRUPTED_IND,
+    MSG_ID_DSAF_RUP_CONNECTION_INIT_MSG,
+    MSG_ID_DSAF_RTM_LINK_ACQ_MSG,
+  
+    MSG_ID_DSAF_MSG_LAST,    
+  
+    /*All PAF Message */
+    MSG_ID_PAF_MSG,
+    MSG_ID_PAF_IDP_CONN_OPENED_MSG,
+    MSG_ID_PAF_CSP_CONN_CLOSED_MSG,
+    MSG_ID_PAF_HLP_FLOW_CTRL_MSG,
+    MSG_ID_PAF_RCP_SESSION_CONFIG_MSG,
+    MSG_ID_PAF_TIMER_EXPIRED_MSG,
+    MSG_ID_PAF_RLP_RESET_REQ_MSG,
+#ifdef PKT_TEST
+    MSG_ID_PAF_OTTS_FWD_DATA_IND_MSG,
+#endif
+  
+    MSG_ID_PAF_RUP_NETWORK_LOST_MSG,
+    MSG_ID_PAF_HLP_STOP_SVCSTRM_XOFF_MSG,
+    MSG_ID_FCP_CMD_MSGID_DPAR_LAST,
+  
+    /* MTK_PLT_ON_PC_UT */
+    MSG_ID_FCP_TEST_DSAR_REV_MSG,
+    MSG_ID_FCP_TEST_PAF_DATA_IND_MSG,
+    MSG_ID_FCP_TEST_REV_DATA_REQ_MSG,
+    MSG_ID_FCP_TEST_RM_DATA_REV_MSG,
+    MSG_ID_FCP_TEST_RTM_DATA_IND_MSG,
+    MSG_ID_RCP_TEST_DSAR_REV_MSG,
+  
+    /*FTAPF message*/
+    MSG_ID_FTAP_CCM_FIRST_SYNC_CC_MSG,
+    MSG_ID_FTAP_RUP_IDLEHO_MSG,
+    MSG_ID_FTAP_RUP_SERVING_SECTOR_MSG,
+    MSG_ID_FTAP_RUP_TRAFFICCHANASSIGN_MSG,
+    MSG_ID_FTAP_ALMP_ST_UPDATE_MSG,
+    MSG_ID_FTAP_ALMP_CONN_OPENED_MSG,
+    MSG_ID_FTAP_ALMP_CONN_RELEASED_MSG,
+    MSG_ID_FTAP_ALMP_CONN_CLOSED_MSG,
+    MSG_ID_FTAP_ALMP_CONN_FAILED_MSG,
+    MSG_ID_FTAP_FTAPR_INIT_MSG,
+    MSG_ID_FCP_ETS_FTAP_STATS_CLR_REQ_MSG,
+    MSG_ID_FCP_ETS_FTAP_STATS_GET_REQ_MSG,
+    MSG_ID_FCP_CMD_MSGID_FTAP_LAST,
+  
+    MSG_ID_FTAP_TEST_TIMER_EXP_MSG,
+    MSG_ID_FTAP_TEST_START_MSG,
+    MSG_ID_FTAP_TEST_CLOSE_MSG,    
+    MSG_ID_FCP_DATA_MSGID_LAST,
+  
+    /* All OTA messages: Satya: Am really not sure for the need for this */
+    MSG_ID_FCP_OTA_MSG,
+    MSG_ID_FCP_OTA_MSGID_LAST,
+  
+    /* ON_PC_UT */
+    MSG_ID_UT_CCM_AMP_ATILIST_MSG,
+    MSG_ID_UT_FCP_CCM_COMMIT_MSG,
+    MSG_ID_UT_FCP_FWD_DATA_IND_MSG,
+    MSG_ID_UT_FCP_DSAF_FWD_MSG,
+    MSG_ID_UT_FCP_HLP_REV_DATA_REQ_MSG,
+    MSG_ID_UT_FCP_FTM_SET_ATTRIB_MSG,
+    MSG_ID_UT_FCP_FTM_GET_ATTRIB_MSG,  
+    MSG_ID_UT_FCP_FTM_GET_ATTRIB_RSP_MSG,    
+    MSG_ID_UT_FCP_CCM_EFUSE_ERROR_MSG,
+  
+    MSG_ID_FCP_ETS_SEND_MACPKT_MSG,
+    MSG_ID_FCP_ETS_CCM_ACTIVATE,
+    MSG_ID_FCP_ETS_CCM_DEACTIVATE,
+    MSG_ID_FCP_ETS_FWD_OTA_MSG,
+    MSG_ID_FCP_ETS_FWD_TEST_MODE_MSG,
+    MSG_ID_FCP_ETS_SEND_OVERHEAD_MSG,
+    MSG_ID_FCP_ETS_SEND_HW_TRIG_MSG,
+    MSG_ID_FCP_ETS_DESIGNATE_DRC_MSG,
+    MSG_ID_FCP_ETS_PACKET_PERF_STAT_RESET_MSG,
+    MSG_ID_FCP_ETS_MSG_BLOCK_CFG_MSG,
+  
+    /* MTK_DEV_OPTIMIZE_EVL1 */
+    MSG_ID_FCP_ETS_FIX_DRCVAL_MSG,
+  
+    /* MTK_DEV_OPTIMIZE_EVL2 */
+    MSG_ID_FCP_ETS_SET_STAT_PERIOD_MSG,
+        
+    MSG_ID_DSAF_SLP_BUF_FREE_MSG,
+
+    MSG_ID_FCP_RCP_ACCESS_INITIATE_MSG,
+
+MODULE_MSG_END(MSG_ID_FCP_CODE_TAIL)
+
+#endif
+
+
diff --git a/mcu/interface/sap/md/do_rcp_msgid.h b/mcu/interface/sap/md/do_rcp_msgid.h
new file mode 100644
index 0000000..f6cb8fe
--- /dev/null
+++ b/mcu/interface/sap/md/do_rcp_msgid.h
@@ -0,0 +1,305 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+*
+* FILE NAME   :do_rcp_msgid.h
+*
+* DESCRIPTION :
+*
+*
+*
+* HISTORY     :
+*     See Log at end of file
+*
+*****************************************************************************/
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#ifndef _DO_RCP_MSG_ID_H
+#define _DO_RCP_MSG_ID_H
+
+#include "module_msg_range.h"
+
+#ifdef  HWD_MSG_ID_MISMATCH_DETECT
+#define  RCPValidMsgIdList HwdRcpValidMsgIdList
+#else
+#define  RCPValidMsgIdList RcpValidMsgIdList
+#endif
+
+
+MODULE_MSG_BEGIN( MSG_ID_RCP_CODE_BEGIN )
+
+    /*---------------*/
+    /* RCP Task Msgs */
+    /*---------------*/
+    MSG_ID_RCP_RMC_RFREADY_MSG = MSG_ID_RCP_CODE_BEGIN,
+    MSG_ID_RCP_RMC_RFRELEASE_MSG,
+    MSG_ID_RCP_SH_RFRELEASE_MSG,
+    MSG_ID_RCP_SH_RFREADY_MSG,
+    MSG_ID_RCP_SCP_RECONFIGURED_IND,
+    MSG_ID_RCP_AMP_ATILIST_MSG,
+    MSG_ID_STR_SCP_COMMITTED_MSG,
+    MSG_ID_STR1_SCP_COMMITTED_MSG,
+    MSG_ID_STR2_SCP_COMMITTED_MSG,
+    MSG_ID_STR3_SCP_COMMITTED_MSG,
+    MSG_ID_STR_SCP_RECONFIGURED_MSG,
+    MSG_ID_STR1_SCP_RECONFIGURED_MSG,
+    MSG_ID_STR2_SCP_RECONFIGURED_MSG,
+    MSG_ID_STR3_SCP_RECONFIGURED_MSG,
+    MSG_ID_RCP_APP_TO_NEG_SET_MSG,
+
+    MSG_ID_RCP_CSM_ACTIVE_MSG,
+    MSG_ID_RCP_CSM_DEACTIVE_MSG,
+    MSG_ID_RCP_CSM_SECTOR_INFO_REQ_MSG,
+    MSG_ID_RCP_CSM_SECTOR_INFO_UPDATE_MSG,
+    MSG_ID_RCP_CSM_SECTOR_C2I_UPDATE_MSG,
+    MSG_ID_RCP_CSM_DONE_MSG,
+    MSG_ID_RCP_CSM_FORCE_DEDICATE_COVER_MSG,
+    MSG_ID_RCP_CSM_HSC_PREEMPT_MSG,
+    MSG_ID_RCP_CSM_HSC_RESUME_MSG,
+    MSG_ID_RCP_CSM_TX_FREEZE_MSG,
+    MSG_ID_RCP_CSM_TX_UNFREEZE_MSG,
+    MSG_ID_RCP_CSM_TCA_IND_MSG,
+    MSG_ID_RCP_CSM_C2I_RD_MSG,
+    MSG_ID_RCP_CSM_SUSPEND_MSG,
+    MSG_ID_RCP_CSM_RESUME_MSG,
+    MSG_ID_RCP_CSM_CELLSWRDY_MSG,
+    MSG_ID_RCP_CSM_HSC_PREEMPT_TIME_UP_MSG,
+    MSG_ID_RCP_RF_TST_POWER_CONTROL_MSG,
+    MSG_ID_RCP_TXAGC_RTC_PWR_REF_PARAM_MSG,
+    MSG_ID_RCP_ADJ_UPDATE_MSG,
+
+    /*-----------------------*/
+    /* ACM (ACMAC) component */
+    /*-----------------------*/
+    MSG_ID_ACM_RUP_ACTIVATE_MSG,
+    MSG_ID_ACM_RUP_DEACTIVATE_MSG,
+    MSG_ID_ACM_RUP_ACCESS_HO_IND_MSG,
+    MSG_ID_ACM_OMP_SECTORPARMS_UPDATED_MSG,
+    MSG_ID_ACM_DSA_ADD_BYTE_MSG,
+    MSG_ID_ACM_TIMER_EXPIRED_MSG,
+    MSG_ID_ACM_SCP_RECONFIGURED_MSG,
+    MSG_ID_ACM_SCP_COMMITTED_MSG,
+    MSG_ID_ACM_PROT_STOP_ACCESS_MSG,
+    MSG_ID_ELT_ACM_SUPERVISION_EXPIRED_CMD_MSG,
+    MSG_ID_RCP_CMD_MSGID_ACM_LAST,
+
+
+    /*------------------------*/
+    /* RTM (RTCMAC) component */
+    /*------------------------*/
+    MSG_ID_RTM_RUP_ACTIVATE_MSG,
+    MSG_ID_RTM_RUP_DEACTIVATE_MSG,
+    MSG_ID_RTM_RUP_TCHASSIGN_MSG,
+    MSG_ID_RTM_AMP_TXATI_UPDATE_MSG,
+    MSG_ID_RTM_OMP_SECTORPARMS_MSG,
+    MSG_ID_RTM_FTM_CFG_DATA_MSG,
+    MSG_ID_RTM_SMP_SESSION_OPEN_MSG,
+    MSG_ID_RTM_CSS_SEARCH_END_MSG,
+    MSG_ID_RTM_RTAP_MODE_MSG,
+    MSG_ID_RTM_TMR_EXPIRED_MSG,
+    MSG_ID_RTM_SCP_RECONFIGURED_MSG,
+    MSG_ID_RTM_SCP_COMMITTED_MSG,
+    MSG_ID_RTM_DRC_TX_CONTROL_MSG, /* DRC supervision process Tx control Msg */
+    MSG_ID_RTM_TXOFF_INIT_BUFFER_MSG,
+    MSG_ID_RCP_IRAT_TX_PWR_REQ,
+    MSG_ID_RCP_CMD_MSGID_RTM_LAST,
+
+    /*----------------*/
+    /* DSAR component */
+    /*----------------*/
+    MSG_ID_DSAR_REV_MSG,
+    MSG_ID_DSAR_TX_STATUS_MSG,
+    MSG_ID_DSAR_DSAF_ACK_MSG,
+    MSG_ID_DSAR_DSAF_ACK_REQ_MSG,
+    MSG_ID_DSAR_TIME_EXP_MSG,
+    MSG_ID_DSAR_DSAF_RESET_MSG,
+    MSG_ID_DSAR_RUP_CONNECTION_INIT_MSG,
+    MSG_ID_DSAR_RTM_LINK_ACQ_MSG,
+    MSG_ID_DSAR_ALMP_CONNECTION_CLOSED_MSG,
+    MSG_ID_DSAR_ALMP_DEL_MSG,
+    MSG_ID_DSAR_AMP_RESET_MSG,
+    MSG_ID_DSAR_RUP_IDLE_HHO_MSG,
+    MSG_ID_DSAR_RUP_DEL_MSG,
+    MSG_ID_DSAR_ALMP_POWER_DOWN_MSG,
+    MSG_ID_DSAR_CSS_CHAN_SCAN_START_MSG,
+    MSG_ID_DSAR_CSS_CHAN_SCAN_DONE_MSG,
+    MSG_ID_DSAR_IDP_TX_AVAIL_MSG,
+    MSG_ID_DSAR_IDP_TX_UNAVAIL_MSG,
+    MSG_ID_DSAR_IDP_TX_UPDATE_MSG,
+    MSG_ID_DSAR_SENT_IND_MSG,
+    MSG_ID_DSAR_NOT_SENT_IND_MSG,
+    MSG_ID_DSAR_REV_MULTI_MSG,
+    MSG_ID_DSAR_OTA_MSG,
+
+    MSG_ID_RCP_CMD_MSGID_DSAR_LAST,
+
+    /*------------------------*/
+    /* PAR component */
+    /*------------------------*/
+    MSG_ID_PAR_HLP_DATA_TX_MSG,
+    MSG_ID_PAR_ACCESS_TIMER_EXPIRE_MSG,
+    MSG_ID_PAR_SERVICE_TIMER_EXPIRE_MSG,
+    MSG_ID_PAR_DSA_FWD_MSG,
+    MSG_ID_PAR_PAF_FLOWCTL_STATUS_MSG,
+    MSG_ID_PAR_PAF_RLP_RESET_REQ_MSG,
+    MSG_ID_PAR_IDP_CONN_OPENED_MSG,
+    MSG_ID_PAR_CSP_CONN_CLOSE_MSG,
+    MSG_ID_PAR_HLP_DOS_TX_MSG,
+    MSG_ID_PAR_RESERVATION_TRANSITION_TIMER_EXPIRE_MSG,
+    MSG_ID_PAR_GAUP_TM_EXPIRE_MSG,
+    MSG_ID_PAR_QOM_RESERVATION_REQ_MSG,
+    MSG_ID_PAR_QOM_SEND_QOSREQUEST_MSG,
+
+    /*EMFPA*/
+    MSG_ID_PAR_PAF_RSP_STATUS_MSG,
+    MSG_ID_PAR_LUP_UNSOLICITED_CFG_MSG,
+    MSG_ID_PAR_HLP_CLEANUP_QUEUE_MSG,
+    /*------------------------*/
+    /* RTAP component */
+    /*------------------------*/
+    MSG_ID_RTAP_ALMP_CONN_OPENED_MSG,
+    MSG_ID_RTAP_ALMP_CONN_RELEASED_MSG,
+    MSG_ID_RTAP_ALMP_CONN_CLOSED_MSG,
+    MSG_ID_RTAP_ALMP_CONN_FAILED_MSG,
+    MSG_ID_RTAP_TIMER_EXPIRED_MSG,
+    MSG_ID_RTAP_BURSTTIMER_EXPIRED_MSG,
+    MSG_ID_RTAP_DSA_FWD_MSG,
+
+    /*----------------*/
+    /* FTAP component */
+    /*------------------------*/
+    MSG_ID_FTAPR_FTAPF_LOOPBACK_STATUS_MSG,
+    MSG_ID_FTAPR_FTAPF_TEST_PKT_MSG,
+    MSG_ID_FTAPR_RTM_STATUS_MSG, /*If RTM is OK, this messge will be used any more.*/
+#ifdef OTTS
+    MSG_ID_FTAPR_TEST_PKT_MSG,
+#endif
+
+
+#if defined (PKT_SIM) || defined (MTK_PLT_ON_PC)
+    MSG_ID_RCP_TST_CREATE_MAC_FLOW_LIST,
+    MSG_ID_RCP_TST_MAC_FLOW_LIST_INTEGRITY,
+    MSG_ID_RCP_TST_COMMIT_APP_FN_PTRS,
+    MSG_ID_RCP_TST_ADD_MSG_TO_QUE,
+    MSG_ID_RCP_TST_PRINT_APP_QUES,
+    MSG_ID_RCP_TST_GRANT_MSG,
+    MSG_ID_RCP_TST_PRINT_ASSEMBLED_PKT_LIST,
+    MSG_ID_RCP_TST_PKT_SENT,
+    MSG_ID_RCP_TST_PKT_NOT_SENT,
+    MSG_ID_RCP_TST_PHY_TRAFFIC_ACKED,
+    MSG_ID_RCP_TST_PHY_TRAFFIC_MISSED,
+    MSG_ID_ACM_PKTSIM_RET_ACM_SEC_PKT_CMD_MSG,
+    MSG_ID_RCP_PKTSIM_SEND_PKT_LIST_EXE_MSG_CMD_MSG,  /*_MsgStruct PktSimSendPktListExeMsgT*/
+    MSG_ID_RCP_PKTSIM_SEND_PAYLAOD_CMD_MSG,
+    MSG_ID_RCP_PKTSIM_SEND_DATAPKT_CMD_MSG,           /*_MsgStruct PktSimFormDataPktMsgT*/
+#endif
+    MSG_ID_AUTH_SHA_KEP_RPCAUTHKEY_MSG,
+    MSG_ID_AUTH_UPDATE_SECTORID_MSG,
+
+    /* RCP UT Msgs */
+    MSG_ID_UT_DSAR_REV_MSG,
+    MSG_ID_UT_PAR_HLP_DATA_TX_MSG,
+    MSG_ID_UT_RCP_DSAF_FWD_MSG,
+    MSG_ID_UT_RCP_DMA_DATA_REQ_MSG,
+    MSG_ID_UT_RCP_RTM_COMMIT_MSG,
+    MSG_ID_UT_STREAM_COMMIT_MSG,
+    MSG_ID_UT_STREAM1_COMMIT_MSG,
+    MSG_ID_UT_STREAM2_COMMIT_MSG,
+    MSG_ID_UT_STREAM3_COMMIT_MSG,
+    MSG_ID_UT_SET_STDO_MSG,
+    MSG_ID_UT_MBP_MAC_BITS_OUTPUT_MSG,
+    MSG_ID_UT_ACM_LOG_OUT_SIGNAL_MSG,
+    MSG_ID_UT_RCP_ACM_COMMIT_MSG,
+    MSG_ID_UT_PAR_DSA_FWD_MSG,
+    MSG_ID_UT_PAR_QOM_SEND_QOSREQUEST_MSG,
+    MSG_ID_UT_RTM_SWEEP_MODE_ACTIVATE_MSG,
+    MSG_ID_UT_RTM_SWEEP_MODE_DEACTIVATE_MSG,
+    /* Access */
+    MSG_ID_UT_ACM_PREAMBLE_START_MSG,
+    MSG_ID_UT_ACM_DATA_REQ_MSG,
+    MSG_ID_UT_ACM_TRANS_STOP_MSG,
+    /* Traffic */
+    MSG_ID_UT_RTM_PARAM_INIT_MSG,
+    MSG_ID_UT_RTM_PARAM_RECFG_MSG,
+    MSG_ID_UT_RTM_TRANS_START_MSG,
+    MSG_ID_UT_RTM_DATA_REQ_MSG,
+    MSG_ID_UT_RTM_TRANS_STOP_MSG,
+
+    /* AUTH segment */
+    MSG_ID_AUTH_SCP_RECONFIGURED_MSG,
+    MSG_ID_AUTH_SCP_COMMITTED_MSG,
+
+    /* SEC seqment*/
+    MSG_ID_SEC_SCP_RECONFIGURED_MSG,
+    MSG_ID_SEC_SCP_COMMITTED_MSG,
+    MSG_ID_RCP_CMD_MSGID_SL_LAST,
+
+
+    MSG_ID_RCP_TASK_SIGNAL,
+    MSG_ID_ACM_PREAMBLE_SIGNAL,
+    MSG_ID_ACM_DATA_SIGNAL,
+    MSG_ID_ACM_PST_DELAY_SIGNAL,
+    MSG_ID_ACM_INTER_SEQUENCE_SIGNAL,
+    MSG_ID_ACM_TXOFF_CB_SIGNAL,
+    MSG_ID_ACM_TXON_CB_SIGNAL,
+    MSG_ID_PAR_HLP_DATA_TX_SIGNAL,
+    MSG_ID_PAR_HLP_DATA_TX2_SIGNAL,
+    MSG_ID_PAR_PHYMISSEDLIST_UPDATE_SIGNAL,
+    MSG_ID_RCP_SIGNAL_MSGID_LAST,
+
+    MSG_ID_RCP_SH_CRCREADY_MSG,
+    MSG_ID_RCP_TST_TX_CDMA_CTRL_MSG,
+    MSG_ID_RCP_TST_TX_AGC_CTRL_MSG,
+    MSG_ID_RCP_ACC_RTB_MSG,
+
+    MSG_ID_RCP_CP_BUF_LIST_MSG,
+    MSG_ID_RCP_PKT_INFO_MSG,
+
+    MSG_ID_EM_RCP_TRAFFIC_INFO_TRANS_MSG,
+    MSG_ID_EM_ACM_STATE_INFO_TRANS_MSG,
+    MSG_ID_EM_RTM3_T2P_INFO_TRANS_MSG,
+
+    MSG_ID_UTS_RCP_RI_MSG_TO_RCP_MSG,
+
+    /* add commit msg to avoid RCP SMP issue */
+    MSG_ID_SLC_RTM_COMMIT_MSG,
+
+MODULE_MSG_END( MSG_ID_RCP_CODE_TAIL )
+
+
+#endif
+
diff --git a/mcu/interface/sap/md/do_rmc_msgid.h b/mcu/interface/sap/md/do_rmc_msgid.h
new file mode 100644
index 0000000..be1906b
--- /dev/null
+++ b/mcu/interface/sap/md/do_rmc_msgid.h
@@ -0,0 +1,325 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+
+  FILE NAME:  do_rmc_msgid.h
+
+  DESCRIPTION:
+
+    This file contains the defenitions of all the RMC msg id's.
+
+*****************************************************************************/
+
+#ifndef _DO_RMC_MSGID_H_
+#define _DO_RMC_MSGID_H_
+
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+#undef MSGID_SET
+#undef MSGID_NEXT
+
+
+
+
+/* Messages handled by RMC task
+   NOTE: Following messages are processed by RMC but defined as MPA messages(in MpaCmdIdT)
+         since they are used also by L1D
+   MPA_RF_ANTENNA_RELEASE_REQ_MSG,
+   MPA_RF_ANTENNA_ASSIGN_MSG,
+*/
+MODULE_MSG_BEGIN(MSG_ID_RMC_CODE_BEGIN)
+
+
+    /* RMC segment */
+    MSG_ID_RMC_INSP_PILOT_ACQ_MSG = MSG_ID_RMC_CODE_BEGIN,
+    MSG_ID_RMC_INSP_1XASSIST_DOACQ_MSG,
+    MSG_ID_RMC_ALMP_NETWORK_RESET_MSG,
+    MSG_ID_RMC_RESERVED1_MSG,  //Place-holder for a deprecated msg. Ensures succeeding MSGIDs  dont change numeric values. Can be used for adding new MSG in the future
+    MSG_ID_RMC_MPA_RF_PREEMPT_REQ_MSG,
+    MSG_ID_RMC_MPA_RF_SHUTOFF_REQ_MSG,
+    MSG_ID_RMC_FMP_MODE_CHANGE_MSG,
+    MSG_ID_RMC_HSC_RXACTIVATE_MSG,
+    MSG_ID_RMC_HSC_STOP_CMD_MSG,
+    MSG_ID_RMC_RF_DIV_REQ_MSG,
+    MSG_ID_RMC_INSP_NETWORK_RESET_MSG,
+    MSG_ID_RMC_INSP_POWER_DOWN_IND,
+    MSG_ID_RMC_RESERVED2_MSG,  //Place-holder for a deprecated msg. Ensures succeeding MSGIDs  dont change numeric values. Can be used for adding new MSG in the future
+    MSG_ID_RMC_RUP_RXDEACTIVATE_MSG,
+    MSG_ID_RMC_RUP_RXACTIVATE_MSG,
+    MSG_ID_RMC_ETS_PREEMPT_MSG,
+    MSG_ID_RMC_ETS_RXACTIVATE_MSG,
+    MSG_ID_RMC_HSC_STOP_TX_MSG,
+    MSG_ID_RMC_HWD_RESET_ACK_MSG,
+    MSG_ID_RMC_RSSI_REPORT_ACK_MSG,
+    MSG_ID_RMC_IDP_DDL_CHANGE_MSG,
+    MSG_ID_RMC_RUP_DDL_CHANGE_MSG,
+    MSG_ID_RMC_FH_RAKE_DDL_DONE_MSG,
+    /* ON_PC */
+    MSG_ID_RMC_TEMP_ADJ_UPDATE_MSG,
+    MSG_ID_RMC_FREQ_ADJ_UPDATE_MSG,
+
+    MSG_ID_RMC_LEC_MOBSYSTEMOFFSET_QUERY_MSG,
+    MSG_ID_RMC_HSC_SLEEP_OVER_MSG,
+    MSG_ID_RMC_TOP_CMD_MSGID_LAST,
+    /* MTK_DEV_RF_CUSTOMIZE */
+    MSG_ID_RMC_RX_DIV_CTRL_AFTER_RF_CUST_GET_MSG,
+
+    /*IRAT*/
+    MSG_ID_RMC_RUP_DFS_INFO_MSG,
+    MSG_ID_RMC_IRATM_CCELL_MEAS_REQ,
+    MSG_ID_RMC_IRATM_SYNC_MSG,
+    MSG_ID_RMC_IRATM_ACQ_CGI_REQ,
+    MSG_ID_RMC_IRATM_SET_RAT_REQ,
+    MSG_ID_RMC_CLC_IDLE_MODE_CFG_MSG,
+    MSG_ID_RMC_IDP_ACCESS_PROTECTION_MSG,
+    MSG_ID_RMC_IDP_TRAFFIC_PROTECTION_MSG,
+
+    /* SCH segment */
+    MSG_ID_SCH_RUP_SEARCHPARMS_UPDATE_MSG, /*_MsgStruct SchParmUpdateMsgT*/
+    MSG_ID_SCH_RUP_PILOT_UPDATE_MSG,       /*_MsgStruct SchPilotUpdateMsgT*/
+
+    /* SYS_OPTION_SINGLECHIP_MULTIMODE, ASPEN IRAT LTE Idle and Active DO measurement */
+    MSG_ID_RMC_IRAT_DO_EARLY_WAKEUP_REQ,
+    MSG_ID_RMC_IRAT_SRCH_CFG_MSG,
+    MSG_ID_RMC_CDMAL1_DOMEAS_ABORT_REQ,
+    MSG_ID_RMC_IRAT_DOMEAS_ABORT_CNF,
+    MSG_ID_RMC_IRAT_DO_INACTIVATE_REQ,
+
+    /* FMP segment */
+    MSG_ID_FMP_INSP_SYNC_MSG,
+    MSG_ID_FMP_ALMP_CONNECTION_CLOSED_MSG,
+    MSG_ID_FMP_CCM_CCSHORTPKTIND_MSG,
+    MSG_ID_RMC_SH_FINGER_RESET_MSG,
+    MSG_ID_RMC_SH_RAKE_FNG_CFG_DONE_MSG,
+    MSG_ID_RMC_SH_DRC_CHTYPE_ESTIMATE_MSG,
+    MSG_ID_RMC_BRP_DRC_RATE_DETERMINATE_MSG,
+    MSG_ID_RMC_FH_RAT_UPDATE_MSG,
+    MSG_ID_RMC_FH_DFS_PILOT_UPDATE_MSG,
+    MSG_ID_RMC_SH_SCH_START_IND,
+    MSG_ID_RMC_RUP_DFS_CFG_MSG,
+    MSG_ID_RMC_RUP_DFS_ABORT_MSG,
+    MSG_ID_RMC_RUP_INTER_HO_MSG,    
+    MSG_ID_RMC_IDP_INTER_HO_CMD_MSG,
+    MSG_ID_RMC_RCP_ACCESS_START_IND_MSG,
+    MSG_ID_RMC_RCP_RTAP_CFG_MSG,
+    MSG_ID_RMC_FCP_FTAP_CFG_MSG,
+    MSG_ID_RMC_FH_MODEM_STATE_UPDATE_MSG,
+    MSG_ID_RMC_FCP_FTM_STATE_UPDATE_MSG,
+    MSG_ID_RMC_FCP_DRC_ACTIVE_MSG,
+    MSG_ID_RMC_FCP_DRC_DEFAULT_ATTRI_UPDATE_MSG,
+    MSG_ID_RMC_FCP_DRC_ENHANCE_ATTRI_UPDATE_MSG,
+    MSG_ID_DRC_CSM_CELL_SWITCH_REQED_MSG,
+    MSG_ID_DRC_CSM_CELL_SWITCH_OCCUR_MSG,
+
+    /* RUP segment */
+    MSG_ID_RUP_SCH_RESULT_RPT_MSG,          /*_MsgStruct RupSearchResultRptMsgT*/
+    MSG_ID_RUP_OMP_UPDATE_CMD_MSG,         /*_MsgStruct RupOmpUpdatedMsgGT*/
+    MSG_ID_RUP_OMP_SNROUTEUPDATE_CMD_MSG,
+    MSG_ID_RUP_ACM_TXSTART_CMD_MSG,
+    MSG_ID_RUP_ACM_TXEND_CMD_MSG,
+    MSG_ID_RUP_ALMP_ACTIVATE_CMD_MSG,           /*_MsgStruct RupAlmpActiveMsgGT*/
+    MSG_ID_RUP_ALMP_DEACTIVATE_CMD_MSG,
+    MSG_ID_RUP_ALMP_CLOSE_CMD_MSG,
+    MSG_ID_RUP_CSP_CLOSE_CMD_MSG,
+    MSG_ID_RUP_IDP_CONNST_TMSTATE_CMD_MSG,
+    MSG_ID_RUP_IDP_FREEZE_MSG,
+    MSG_ID_RUP_IDP_THAW_MSG,
+    MSG_ID_RUP_RTM_LINKACQ_CMD_MSG,
+    MSG_ID_RUP_TIMER_EXPIRED_CMD_MSG,
+    MSG_ID_RUP_RMC_CAMP_ON_CHANNEL_COMPLETE_MSG,
+    MSG_ID_RUP_RMC_INTER_HO_NOTIFY_MSG,
+
+    MSG_ID_RUP_SCP_RECONFIGURED_MSG,
+    MSG_ID_RUP_SCP_COMMITTED_MSG,
+    MSG_ID_RUP_ACM_ACCESS_HO_ENABLE_MSG,
+    MSG_ID_RUP_ACM_ACCESS_HO_DISABLE_MSG,
+
+    MSG_ID_RUP_IDP_STOP_REM_MSG,
+    MSG_ID_RUP_OMP_IHO_ENABLED_MSG,
+    MSG_ID_RUP_IDP_FORCE_IHO_REQ_MSG,
+
+    MSG_ID_RUP_IRAT_CUR_SYS_MEAS_REQ,
+    MSG_ID_RUP_IRAT_RAT_SIG_MON_REQ,
+    MSG_ID_RUP_RCP_ACCESS_INITIATE_MSG,
+
+    /*IRAT*/
+    MSG_ID_RMC_CMD_MSGID_RUP_LAST,
+
+    MSG_ID_RMC_RF_DIV_RELEASE_MSG,
+
+    MSG_ID_RMC_CSS_DOSCAN_SLOTNUM_IND,
+    MSG_ID_RUP_IDP_DFS_START_MSG,
+    MSG_ID_RUP_IDP_DFS_ABORT_MSG,
+    MSG_ID_RUP_CLC_DFS_SETTINGS_MSG,
+    MSG_ID_RUP_IOP_GET_DFS_INFO_MSG,
+
+    /* LL1A segment */
+    MSG_ID_EVSTANDBY_LL1A_GAP_NOTIFY_IND_MSG,
+    MSG_ID_EVSTANDBY_LL1A_GAP_STOP_REQ_MSG,
+    MSG_ID_EVSTANDBY_LL1A_AUTO_GAP_CNF_MSG,
+    MSG_ID_EVSTANDBY_LL1A_AUTO_GAP_STOP_IND_MSG,
+    MSG_ID_RMC_LL1A_SET_RAT_CNF_MSG,
+    MSG_ID_RUP_IRATM_CUR_SECTOR_MEAS_REQ,
+    MSG_ID_RUP_IRATM_CUR_SECTOR_SIG_MON_REQ,
+    MSG_ID_RUP_IRATM_DFS_FREQ_NUM_SENT_REQ,
+    MSG_ID_RUP_CSS_IHO_DISABLE_REQ,
+    MSG_ID_RUP_CSS_IHO_ENABLE_REQ,
+
+    /** RTBA Segment.*/
+    MSG_ID_RMC_RTBA_RF_RESERVE_END_IND_MSG,
+
+    /* EVDO RMC Signals --do_rmcapi.h */
+    MSG_ID_RMC_TASK_SIGNAL,
+    MSG_ID_RMC_SRCH_RESULTS_RDY_SIGNAL,
+    MSG_ID_RMC_GENERATE_DECIMATED_TRACE_INFO_SIGNAL,
+    MSG_ID_RMC_PROC_DELAYED_SCH_RESULT_SIGNAL,
+    MSG_ID_RMC_GENERATE_DECIMATED_TRACE_INFO1_SIGNAL,
+    MSG_ID_RMC_SCH_LOGIQ_SIGNAL,
+    MSG_ID_RMC_IDP_IHO_WAKE_REDUCTION_STATE_REQ_MSG,
+
+    MSG_ID_RMC_CMD_MSGID_LAST,
+
+    /*---------------*/
+    /* SCH Test Msgs */
+    /*---------------*/
+    MSG_ID_RMC_TEST_MSGID_START,
+    MSG_ID_SCH_ETS_CAPTURE_INPUT_BUFFER_MSG = MSG_ID_RMC_TEST_MSGID_START, //MSG_ID_RMC_TEST_MSGID_START,
+    MSG_ID_SCH_MINIACQ_WINSIZE_MSG,
+
+    /*---------------*/
+    /* RFC Test Msgs */
+    /*---------------*/
+    /*---------------*/
+    /* FMP Test Msgs */
+    /*---------------*/
+    MSG_ID_FMP_TEST_HWTESTMODE_MSG,
+    MSG_ID_FMP_TEST_UPDATEFINGERS_MSG,
+    MSG_ID_FMP_TEST_UPDATEMACFINGERS_MSG,
+    MSG_ID_FMP_TEST_INSP_SYNC_MSG,
+    MSG_ID_FMP_TEST_SCHPROC_MSG,
+    MSG_ID_FMP_TEST_SCHPROGFNG_CALLBK_MSG,
+    MSG_ID_FMP_TEST_SLOTFOUND_MSG,
+    MSG_ID_FMP_TEST_UPDATEPWR_MSG,
+    MSG_ID_FMP_TEST_UPDATEFNGPOS_MSG,
+    MSG_ID_FMP_TEST_INITACQFNGASSIGN_CALLBK_MSG,
+    MSG_ID_FMP_TEST_CONNSETUP_CALLBK_MSG,
+    MSG_ID_FMP_TEST_FNHW_MSG,
+    MSG_ID_FMP_FNALGOPARMS_GET_CMD,
+    MSG_ID_FMP_FNALGOPARMS_SET_CMD,
+    MSG_ID_FMP_FINGER_SCAN_CMD,
+    MSG_ID_FMP_FINGER_COMB_CFG_CMD,
+#if defined(MTK_CBP) && (!defined(MTK_PLT_ON_PC))
+    MSG_ID_FMP_FINGER_ANTCOMB_CFG_CMD,
+#endif
+    MSG_ID_FMP_EQFNALGOPARMS_SET_CMD,
+    MSG_ID_FMP_EQFEATURE_SET_CMD,
+    MSG_ID_FMP_EQ_MANUAL_ASSIGN_CMD,
+
+    /*-------------------------------*/
+    /* FMP MMSE MRC Ctrl Config Cmds */
+    /*-------------------------------*/
+    MSG_ID_CP_RMC_MAC_TARGET_TEST_CMD,
+
+
+    /*---------------*/
+    /* RUP Msgs */
+    /*---------------*/
+    MSG_ID_RUP_ETS_TCA_MSG,
+    MSG_ID_RUP_ETS_SET_SUPPORT_CDMACHAN_MSG,
+    MSG_ID_RUP_ETS_SET_SIMPLE_ATTR_MSG,
+    MSG_ID_RUP_ETS_SET_SEARCH_PARM_MSG,
+    MSG_ID_RUP_ETS_SET_MANCHAN_PARM_MSG,
+    MSG_ID_RUP_ETS_OTA_MSG,
+    MSG_ID_RUP_TST_SN_TCA_MSG,
+    MSG_ID_RUP_SNROUTEUPDATE_CMD_MSG,
+    MSG_ID_RUP_ETS_SET_PNPHASE,
+    MSG_ID_RUP_ETS_SET_MAC_PARM,
+
+    MSG_ID_RMC_TEST_RMC_DEACTIVATE_CMD,
+    MSG_ID_RMC_TEST_RMC_SPY_DECI_CMD,
+    MSG_ID_RMC_TEST_DO_DFS_CMD,
+    MSG_ID_RMC_TEST_CTRL,
+    MSG_ID_RMC_TST_UT_REQ,
+#ifdef MTK_CBP
+    MSG_ID_RMC_TEST_DO_DFS_SERVCH_CMD,
+    MSG_ID_RMC_TEST_FMP_MD_CHG_AFT_RXDEACT_CMD,
+    MSG_ID_RMC_TEST_DO_SET_DFS_CHCNT_CMD,
+#if defined (MTK_DEV_C2K_IRAT) && defined (MTK_DEV_C2K_SRLTE_L1)
+    MSG_ID_RMC_TEST_DO_DFS_MEET_1X_WAKEUP_CMD,
+#endif
+#endif
+    /*---------------*/
+    /* RMC IMD Msgs */
+    /*---------------*/
+    MSG_ID_CP_RMC_IMD_CONFIG_SET_MSG,
+    MSG_ID_CP_RMC_IMD_CONFIG_GET_MSG,
+
+    /*---------------*/
+    /* RMC EQ Msgs */
+    /*---------------*/
+    MSG_ID_CP_RMC_EQ_W_WL_SELECT_SET_MSG,
+    MSG_ID_CP_RMC_EQ_W_WL_SELECT_GET_MSG,
+
+    /*---------------*/
+    /* MBP Msgs */
+    /*---------------*/
+    MSG_ID_MBP_ETS_PROC_MCD_RPC_TH,
+    MSG_ID_MBP_ETS_PROC_MCD_RPC_TH_C2I,
+
+    /*-----Adaptive RX power mode ----*/
+    MSG_ID_RMC_ETS_DO_ADAPTIVE_RX_CFG_CMD,
+
+    MSG_ID_RMC_AFC_ON_MSG,
+    MSG_ID_RMC_AFC_STATE_SET_MSG,
+    MSG_ID_RMC_AFC_FNG_FOE_UPDATE_MSG,
+    MSG_ID_RMC_VAL_DO_RX_TX_TIME_INFO_DATA_REQ,
+    MSG_ID_VAL_RMC_DO_RX_TX_TIME_INFO_DATA_RSP,
+    MSG_ID_FH_MODE_CHANGE_REQ,
+    MSG_ID_FH_STB_MEAS_IND_MSG,
+    MSG_ID_RMC_TEST_MSGID_LAST,
+    MSG_ID_RMC_VAL_DO_DAT_CFG_MSG,
+
+
+MODULE_MSG_END(MSG_ID_RMC_CODE_TAIL)
+
+
+/*****************************************************************************
+* End of File
+*****************************************************************************/
+#endif
diff --git a/mcu/interface/sap/md/do_sec_msgid.h b/mcu/interface/sap/md/do_sec_msgid.h
new file mode 100644
index 0000000..f1ef0b4
--- /dev/null
+++ b/mcu/interface/sap/md/do_sec_msgid.h
@@ -0,0 +1,100 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+
+  FILE NAME:  do_sec_msgid.h
+
+  DESCRIPTION:
+
+    This file contains the defenitions of all the SEC msg id's.
+
+*****************************************************************************/
+/*----------------------------------------------------------------------------
+Include Files
+----------------------------------------------------------------------------*/
+#ifndef _DO_SEC_MSGID_H_
+#define _DO_SEC_MSGID_H_
+
+
+#include "module_msg_range.h"
+
+
+#undef MSGID_SET
+#undef MSGID_NEXT
+
+#define MSGID_SET(name, val) MSG_ID_##name = val
+#define MSGID_NEXT(name) MSG_ID_##name
+
+MODULE_MSG_BEGIN(MSG_ID_SEC_CODE_BEGIN)
+
+   /* SEC AKA segment*/
+    MSGID_SET(SEC_AKA_AUTH_REQ_MSG, MSG_ID_SEC_CODE_BEGIN),
+    MSGID_NEXT(SEC_AKA_DERIVEMK_REQ_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVEREAUTHXKEY_REQ_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVEMSK_REQ_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVEMAC_REQ_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVEPMK_REQ_MSG),
+    MSGID_NEXT(SEC_AKA_AESCRYPT_REQ_MSG),
+    MSGID_NEXT(SEC_AKA_AUTH_REQ_TEST_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVEMK_REQ_TEST_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVEREAUTHXKEY_REQ_TEST_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVEMSK_REQ_TEST_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVEMAC_REQ_TEST_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVEPMK_REQ_TEST_MSG),
+    MSGID_NEXT(SEC_AKA_AESCRYPT_REQ_TEST_MSG),
+    MSGID_NEXT(SEC_AKA_PRIME_SQN_INIT_MSG),
+
+    /* SEC AKA PRIME MSg */
+    MSGID_NEXT(SEC_AKA_PRIME_DERIVEMK_REQ_MSG),
+    MSGID_NEXT(SEC_AKA_PRIME_DERIVEREAUTHMK_REQ_MSG),
+    MSGID_NEXT(SEC_VAL_AESCRYPT_REQ_MSG),
+    MSGID_NEXT(SEC_CMD_MSGID_NUM),
+
+    /* SEC SPY ON PC UT */
+    MSGID_NEXT(SEC_AKA_AUTH_SPY_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVE_MK_SPY_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVE_REAUTHXKEY_SPY_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVE_MSK_SPY_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVE_MAC_SPY_MSG),
+    MSGID_NEXT(SEC_AKA_DERIVE_PMK_SPY_MSG),
+    MSGID_NEXT(SEC_AKA_AES_CRYPT_SPY_MSG),
+
+MODULE_MSG_END(MSG_ID_SEC_CODE_TAIL)
+
+/*****************************************************************************
+ * End of File
+*****************************************************************************/
+#endif
diff --git a/mcu/interface/sap/md/do_slc_msgid.h b/mcu/interface/sap/md/do_slc_msgid.h
new file mode 100644
index 0000000..0c1d368
--- /dev/null
+++ b/mcu/interface/sap/md/do_slc_msgid.h
@@ -0,0 +1,181 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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 CONSKAL_TRUED 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) 2015
+*
+*  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 CONSKAL_TRUED 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).
+*
+*************************************************************/
+/*****************************************************************************
+*
+* FILE NAME   : do_slc_msgid.h
+*
+* DESCRIPTION : Message ID definition for SLC (Session Layer Control) task.
+*
+* HISTORY     :
+*****************************************************************************/
+#ifndef _DO_SLC_MSGID_H_
+#define _DO_SLC_MSGID_H_
+
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+
+
+MODULE_MSG_BEGIN(MSG_ID_SLC_CODE_BEGIN)
+
+    /* SLC segment */
+    MSG_ID_SLC_XXX_CMD_MSG = MSG_ID_SLC_CODE_BEGIN,
+    MSG_ID_SLC_TIMER_EXPIRED_MSG,
+    MSG_ID_DHKEP_TIMER_EXPIRED_MSG,
+    MSG_ID_DHKEP_KEYCAL_RSP_MSG,
+    MSG_ID_DHKEP_SCP_RECONFIGURED_MSG,
+
+    /* SMP segment */
+    MSG_ID_SLC_CMD_MSGID_SMP_START,
+    MSG_ID_SMP_CSS_ACTIVATE_MSG,
+    MSG_ID_SMP_CSS_MPS_INPROGRESS_MSG,
+    MSG_ID_SMP_SCP_CONFIGURATION_FAILED_MSG,
+    MSG_ID_SMP_SCP_SESSION_INFO_MSG,
+    MSG_ID_SMP_SCP_ACTIVATE_CNF_MSG,
+    MSG_ID_SMP_SCP_GAUP_PRIOR_SESSION_CNF_MSG,
+    MSG_ID_SMP_AMP_OPENED_MSG,
+    MSG_ID_SMP_AMP_FAILURE_MSG,
+    MSG_ID_SMP_AMP_UATI_RCV_MSG,
+    MSG_ID_SMP_OMP_PRIOR_SESSION_GAUP_UPDATE_MSG,
+    MSG_ID_SMP_CCM_PERFORM_KEEPALIVE_TRANS_MSG,
+    MSG_ID_SMP_SCP_RECONFIGURED_MSG,
+    MSG_ID_SMP_SCP_COMMITTED_MSG,
+    MSG_ID_SMP_DSAR_TX_STATUS_MSG,
+    MSG_ID_SMP_ALMP_CONN_CLOSED_MSG,
+    MSG_ID_SMP_SESSION_CLOSE_ETS_CMD,
+    MSG_ID_SMP_ALMP_POWER_DOWN_MSG,
+    MSG_ID_SMP_ALMP_CONN_OPENED_MSG,
+    MSG_ID_SMP_SCP_PROT_RESET_DONE_MSG,
+    MSG_ID_SMP_SCP_SESSION_COMMITTING_IND,
+    MSG_ID_SMP_CSS_1X_CONNECTION_ST_IND, 
+    MSG_ID_SMP_VAL_1X_PS_CHANGE_TO_EVDO_NOTIFY,    
+    /* MTK_DEV_C2K_IRAT */
+    MSG_ID_SMP_OMP_DEACTIVATE_MSG,
+    MSG_ID_SMP_CSS_EHRPD_SESSION_MSG,
+    MSG_ID_SMP_CSS_HRPD_SESSION_MSG,
+
+    /* SCP segment */
+    MSG_ID_SLC_CMD_MSGID_SCP_START,
+    MSG_ID_SCP_SMP_ACTIVATE_MSG,
+    MSG_ID_SCP_SMP_DEACTIVATE_MSG,
+    MSG_ID_SCP_IDP_CONNECTION_OPENED_MSG,
+    MSG_ID_SCP_CSP_CONNECTION_CLOSED_MSG,
+    MSG_ID_SCP_RUP_CONNECTION_LOST_MSG,
+    MSG_ID_SCP_PROT_CONFIG_REQ_MSG,
+    MSG_ID_SCP_PROT_RECONFIGURED_MSG,
+    MSG_ID_SCP_PROT_RECONFIG_CNF_MSG,
+    MSG_ID_SCP_PROT_CONFIG_FAIL_MSG,
+    MSG_ID_SCP_PROT_CONFIG_PAUSE_MSG,
+    MSG_ID_SCP_PROT_CONFIG_RESUME_MSG,
+    MSG_ID_SCP_SCP_NEGO_START_MSG,
+    MSG_ID_SCP_SCP_NEGO_CONTINUE_MSG,
+    MSG_ID_SCP_DSAR_TX_STATUS_MSG,
+    MSG_ID_SCP_ALMP_CONN_OPENED_MSG,
+    MSG_ID_SCP_ALMP_CONN_CLOSED_MSG,
+    MSG_ID_SCP_ALMP_CONN_RELEASED_MSG,
+    MSG_ID_SCP_ALMP_CONN_FAILED_MSG,
+    MSG_ID_SCP_CONFIG_ETS_CMD,
+    MSG_ID_SCP_SMP_SESSION_CLOSING_IND,
+    MSG_ID_SCP_EHRPD_DISABLE_ETS_CMD,
+    MSG_ID_SCP_EHRPD_ENABLE_ETS_CMD,
+
+    /* AMP segment */
+    MSG_ID_SLC_CMD_MSGID_AMP_START,
+    MSG_ID_AMP_SMP_FAILED_MSG,
+    MSG_ID_AMP_SMP_ACTIVATE_MSG,
+    MSG_ID_AMP_SMP_DEACTIVATE_MSG,
+    MSG_ID_AMP_RUP_IDLEHO_MSG,
+    MSG_ID_AMP_OMP_UPDATED_MSG,
+    MSG_ID_AMP_CSP_CONN_CLOSED_MSG,
+    MSG_ID_AMP_INSP_NETWORK_ACQ_MSG,
+    MSG_ID_AMP_DSAR_TX_STATUS_MSG,
+    MSG_ID_AMP_SCP_RECONFIGURED_MSG,
+    MSG_ID_AMP_SCP_COMMITTED_MSG,
+    MSG_ID_AMP_SMP_SESSION_CLOSING_IND,
+    MSG_ID_AMP_CSS_DATA_WAITING_MSG,
+    MSG_ID_AMP_IDP_CHAN_CHANGED_COMPLETE_MSG,
+    MSG_ID_AMP_IDP_ASSEMBLE_UATICMPL_AND_HWIDRSP_MSG,
+
+    /* SLC UT Msgs */
+    MSG_ID_UT_SLC_DSAF_FWD_MSG, 
+    MSG_ID_UT_SLC_SET_SBP_ID_MSG,
+    MSG_ID_UT_SLC_CONF_SBP_FEATURE_MSG,
+
+    MSG_ID_AMP_CMD_MSGID_NUM,
+
+MODULE_MSG_END(MSG_ID_SLC_CODE_TAIL)
+
+/*****************************************************************************
+* End of File
+*****************************************************************************/
+#endif
+
diff --git a/mcu/interface/sap/md/dps_msgid.h b/mcu/interface/sap/md/dps_msgid.h
new file mode 100644
index 0000000..4cf81e3
--- /dev/null
+++ b/mcu/interface/sap/md/dps_msgid.h
@@ -0,0 +1,241 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   dps_sap.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   Dummy Protocol Stack, SAP 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+
+#ifndef _DPS_MSGID_H
+#define _DPS_MSGID_H
+
+#if defined(DUMMY_PROTOCOL) && defined(__GSM_RAT__)
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN(MSG_ID_DPS_CODE_BEGIN)
+MSG_ID_DPS_POWER_SCAN_REQ = MSG_ID_DPS_CODE_BEGIN,
+MSG_ID_DPS_STRONGEST_ARFCN_FB_SEARCH_REQ,
+MSG_ID_DPS_REPEATED_FB_SEARCH_REQ ,
+MSG_ID_DPS_SPECIFIC_BCCH_RX_REQ ,
+MSG_ID_DPS_START_IDLE_REQ ,
+MSG_ID_DPS_REPEATED_IDLE_REQ ,
+MSG_ID_DPS_CBCH_RX_REQ   ,
+MSG_ID_DPS_SC_TEST_REQ	,
+MSG_ID_DPS_LOCATION_UPDATE_REQ ,
+MSG_ID_DPS_MT_CALL_REQ   ,
+MSG_ID_DPS_MO_CALL_REQ   ,
+MSG_ID_DPS_TEST_START_REQ   ,
+MSG_ID_DPS_TEST_STOP_REQ  ,
+MSG_ID_DPS_TEST_STOP2_REQ  ,
+MSG_ID_DPS_CCCH_NC_MEAS_REQ  ,
+MSG_ID_DPS_CCCH_EXT_MEAS_REQ ,
+MSG_ID_DPS_CCCH_PKT_IDLE_SC_TEST_REQ ,
+MSG_ID_DPS_CCCH_GPRS_ATTACH_ONE_PHASE_REQ ,
+MSG_ID_DPS_CCCH_GPRS_ATTACH_TWO_PHASE_REQ ,
+MSG_ID_DPS_CCCH_PACKET_IDLE1_REQ ,
+MSG_ID_DPS_CCCH_PACKET_IDLE2_REQ ,
+MSG_ID_DPS_CCCH_TBF_SC_TEST_REQ ,
+MSG_ID_DPS_CCCH_PACKET_IDLE_PBCCH_READ_REQ ,
+MSG_ID_DPS_PCCCH_PACKET_IDLE_REQ ,
+MSG_ID_DPS_PCCCH_PACKET_IDLE_PBCCH_UPDATE_REQ ,
+MSG_ID_DPS_PCCCH_PKT_IDLE_SC_TEST_REQ ,
+MSG_ID_DPS_PCCCH_PKT_IDLE_SC_TEST_PBCCH_UPDATE_REQ ,
+MSG_ID_DPS_PCCCH_PKT_IDLE_NC_MEAS_REQ ,
+MSG_ID_DPS_PCCCH_EXT_MEAS_REQ ,
+MSG_ID_DPS_PCCCH_GPRS_ATTACH_ONE_PHASE_REQ ,
+MSG_ID_DPS_PCCCH_GPRS_ATTACH_TWO_PHASE_REQ ,
+MSG_ID_DPS_SERVING_PBCCH_UPDATE_DURING_TBF_REQ ,
+MSG_ID_DPS_PCCCH_NBR_PSI_UPDATE_DURING_TBF_REQ ,
+MSG_ID_DPS_CCCH_NBR_PSI_UPDATE_DURING_TBF_REQ ,
+MSG_ID_RLC_DATA_REQ,
+MSG_ID_GRR_RLC_EST_IND,
+MSG_ID_GRR_RLC_EST_REQ_CNF,
+MSG_ID_GRR_RLC_REL_REQ,
+MSG_ID_L1_RLC_PDTCH_CNF,
+MSG_ID_L1_RLC_PACCH_IND,
+MSG_ID_L1_RLC_PACCH_CNF,
+MSG_ID_L1_RLC_PDTCH_IND,
+MSG_ID_RLC_GRR_DATA_IND,
+MSG_ID_RLC_GRR_REL_IND,
+MSG_ID_RLC_GRR_REL_CNF,
+MSG_ID_RR_FRAMETICK,
+MSG_ID_MPAL_FRAMETICK,
+MSG_ID_L1D_LOOPBACK_REQ,
+MSG_ID_DPS_CCCH_ICMP_REQ,
+MSG_ID_DPS_CCCH_GPRS_NONSIGNALING_REQ,
+MSG_ID_DPS_CCCH_GPRS_NONSIG_FT_REQ,
+MSG_ID_DPS_POWER_SCAN_WITH_STORED_LIST_REQ,
+MSG_ID_DPS_CCCH_COMB_PAGE_REORG_REQ,
+MSG_ID_DPS_CCCH_EGPRS_ATTACH_ONE_PHASE_REQ,
+MSG_ID_DPS_CCCH_EGPRS_ATTACH_TWO_PHASE_REQ,
+MSG_ID_DPS_PCCCH_EGPRS_ATTACH_ONE_PHASE_REQ,
+MSG_ID_DPS_PCCCH_EGPRS_ATTACH_TWO_PHASE_REQ,
+MSG_ID_DPS_CCCH_EGPRS_TBF_NBCCH_REQ,
+MSG_ID_DPS_CCCH_EGPRS_TBF_NPBCCH_REQ,
+MSG_ID_DPS_PCCCH_EGPRS_TBF_NPBCCH_REQ,
+MSG_ID_RLC_MPAL_EGPRS_SRB_REQ,
+MSG_ID_DPS_UNIT_TEST_DL_CALLBACK,
+MSG_ID_DPS_UNIT_TEST_INIT,
+MSG_ID_DPS_UNIT_TEST_TRACE_PRINTER,
+MSG_ID_DPS_TRACE_PRINTER_UPDATE_VN,
+
+/* For Dual DPS */ /* With "MSG_ID_DPS_xxx_REQ" */
+/* 2G Standby 3G Active: start from UDPS */
+MSG_ID_DPS_UDPS_GSM_MEAS_IN_NULL_REQ, /* GM1 */
+MSG_ID_DPS_UDPS_GSM_MEAS_IN_IDLE_REQ, /* GM2 */
+MSG_ID_DPS_UDPS_GSM_MEAS_IN_FACH_REQ, /* GM3 */
+MSG_ID_DPS_UDPS_GSM_REPORTING_DELAY_REQ, /* GM4 */
+MSG_ID_DPS_UDPS_GSM_REPORTING_DELAY_NO_BSIC_REQ, /* GM5 */
+MSG_ID_DPS_UDPS_ABS_GSM_CARRIER_RSSI_REQ, /* GM6 */
+
+/* 2G Active 3G Standby: still start from UDPS */
+MSG_ID_DPS_UDPS_UMTS_MEAS_IN_SCAN_REQ, /*UM1*/
+MSG_ID_DPS_UDPS_UMTS_MEAS_IN_IDLE_REQ, /*UM2*/
+MSG_ID_DPS_UDPS_UMTS_MEAS_IN_DEDI_REQ, /*UM3*/
+MSG_ID_DPS_UDPS_UMTS_MEAS_IN_PIDLE_REQ, /*UM4*/
+MSG_ID_DPS_UDPS_UMTS_MEAS_IN_PTX_REQ, /*UM5*/
+MSG_ID_DPS_UDPS_RECURSIVE_TCS_IN_2G_IDLE_REQ, /* UM6 = CS12(CSD) and CS13(CSD) */
+MSG_ID_DPS_UDPS_RECURSIVE_TCS_IN_2G_DEDI_REQ, /* UM7 = CS8(CSD) and CS9(CSD) */
+
+MSG_ID_DPS_UDPS_GSM_CRS_TO_UMTS_REQ, /*IRT1*/
+MSG_ID_DPS_UDPS_UMTS_CRS_TO_GSM_REQ, /*IRT2*/
+MSG_ID_DPS_UDPS_GSM_HHO_TO_UMTS_REQ, /*IRT3*/
+MSG_ID_DPS_UDPS_UMTS_HHO_TO_GSM_REQ, /*IRT4*/
+
+
+MSG_ID_DPS_UDPS_TRIGGER_DPS_REQ,           /* common usage */
+MSG_ID_DPS_RESPONSE_TO_UDPS_CNF, /* common usage */
+
+/* Copy from uas_gas_sap.h for the activity between DPS and UDPS */
+MSG_ID_UAS_GAS_CONFIG_GCELL_MEAS_REQ,
+
+MSG_ID_GAS_UAS_CONFIG_UCELL_MEAS_CNF,
+MSG_ID_GAS_UAS_UCELL_MEAS_IND,
+
+MSG_ID_UAS_GAS_CONFIG_GCELL_MEAS_CNF,
+MSG_ID_UAS_GAS_GCELL_MEAS_IND,
+MSG_ID_UAS_GAS_GCELL_BSIC_IND,
+MSG_ID_GAS_UAS_CONFIG_UCELL_MEAS_REQ,
+
+/* For Dual DPS */
+MODULE_MSG_END(MSG_ID_DPS_CODE_TAIL)
+
+#endif
+
+#endif  //_DPS_MSGID_H
+
diff --git a/mcu/interface/sap/md/eap_msgid.h b/mcu/interface/sap/md/eap_msgid.h
new file mode 100644
index 0000000..142f619
--- /dev/null
+++ b/mcu/interface/sap/md/eap_msgid.h
@@ -0,0 +1,55 @@
+/******************************************************************************
+*  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).
+*
+*******************************************************************************/
+
+#ifndef _EAP_MSG_ID_H
+#define _EAP_MSG_ID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_EAP_CODE_BEGIN )
+
+// From User
+    MSG_ID_EAP_CONVERSATION_START_REQ = MSG_ID_EAP_CODE_BEGIN,
+    MSG_ID_EAP_CONVERSATION_STOP_REQ,
+    MSG_ID_EAP_DECODE_REQ,
+
+// To User
+    MSG_ID_EAP_CONVERSATION_START_CNF,
+    MSG_ID_EAP_CONVERSATION_STOP_CNF,
+    MSG_ID_EAP_DECODE_CNF,
+
+MODULE_MSG_END( MSG_ID_EAP_CODE_TAIL )
+
+#endif  //_EAP_MSG_ID_H
\ No newline at end of file
diff --git a/mcu/interface/sap/md/el1_ipc_msgid_source.h b/mcu/interface/sap/md/el1_ipc_msgid_source.h
new file mode 100644
index 0000000..8882da1
--- /dev/null
+++ b/mcu/interface/sap/md/el1_ipc_msgid_source.h
@@ -0,0 +1,49 @@
+//below are EL1 IPC messages sent from AP
+MSG_ID_IPC_EL1_CONSYS_ALLOW_TX_NTF,        // is not used
+MSG_ID_IPC_EL1_CONSYS_DEFAULT_PARAM_NTF,
+MSG_ID_IPC_EL1_CONSYS_OPER_FREQ_NTF,
+MSG_ID_IPC_EL1_CONSYS_FREQ_IDX_TABLE_NTF,  // is not used 
+MSG_ID_IPC_EL1_CONSYS_PROFILE_NTF,         // is not used
+
+//below are EL1 messages sent to AP
+MSG_ID_IPC_EL1_LTE_DEFAULT_PARAM_IND,
+MSG_ID_IPC_EL1_LTE_CA_OPER_FREQ_IND,
+MSG_ID_IPC_EL1_LTE_WIFI_PWR_IND,           // is not used
+MSG_ID_IPC_EL1_LTE_TX_IND,                 // is not used
+MSG_ID_IPC_EL1_LTE_CONNECTION_STATUS_IND,  // is not used
+
+//below are EL1 IPC messages sent from AP
+MSG_ID_IPC_EL1_CONSYS_PIN_TYPE_NTF,       // is not used
+
+//below are EL1 messages sent to AP
+MSG_ID_IPC_EL1_LTE_HW_INTERFACE_IND,      // is not used
+
+//below are EL1 IPC messages sent from AP
+MSG_ID_IPC_EL1_CONSYS_TDM_ASSIT_INFO_NTF,
+
+//below are EL1 messages sent to AP
+MSG_ID_IPC_EL1_LTE_DRX_RPT_CFG_IND,       // is not used
+MSG_ID_IPC_EL1_LTE_DRX_PATTERN_IND,
+MSG_ID_IPC_EL1_LTE_DRX_MAPPING_IND,
+MSG_ID_IPC_EL1_LTE_R11_IDC_PARAM_IND,
+MSG_ID_IPC_EL1_LTE_IDC_INFO_IND,
+MSG_ID_IPC_EL1_LTE_WIFIBT_UNSAFE_FREQ_BMP_IND,
+MSG_ID_IPC_EL1_LTE_WIFIBT_DBDC_B0_UNSAFE_FREQ_BMP_IND,
+
+//below are EL1 IPC messages sent from AP
+MSG_ID_IPC_EL1_CONSYS_MAX_PWR_BACKOFF_NTF,
+MSG_ID_IPC_EL1_CONSYS_SEND_SW_MSG_CNF,
+
+//below are EL1 messages sent to AP
+MSG_ID_IPC_EL1_LTE_SEND_SW_MSG_CNF,
+MSG_ID_IPC_EL1_LTE_WIFIBT_DBDC_B1_UNSAFE_FREQ_BMP_IND,
+
+//below are reserved EL1 messages
+MSG_ID_EL1_DUMMY25_IND,
+MSG_ID_EL1_DUMMY26_IND, 
+MSG_ID_EL1_DUMMY27_IND,
+MSG_ID_EL1_DUMMY28_IND, 
+MSG_ID_EL1_DUMMY29_IND,
+MSG_ID_EL1_DUMMY30_IND,
+MSG_ID_EL1_DUMMY31_IND,
+MSG_ID_EL1_DUMMY32_IND,
diff --git a/mcu/interface/sap/md/el1_msgid.h b/mcu/interface/sap/md/el1_msgid.h
new file mode 100644
index 0000000..9dd69ff
--- /dev/null
+++ b/mcu/interface/sap/md/el1_msgid.h
@@ -0,0 +1,1359 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   el1_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   LTE Layer 1 and Protocol Stack related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 03 22 2022 divyaprakash.tiwari
+ * [MOLY00715605] [PISSARRO-5490] FT_K16_Nanchang_??? 1??5GVOLTE,???2??GSM,?????1???5GVOLTE NSA
+ * ENDC info list pathcback ..
+ *
+ * 01 21 2022 shashikanth.kotakonda
+ * [MOLY00756057] [Gen97][MT6893][Pertus-P][R0][R3][SA][CMCC][LiveNW]][21H1 CMCC Chip Benchmark][Beijing]TAS optimization Check in CR
+ * 	[EWSP0000396338]merge CL from R3.MP to MD700.DEV
+ *
+ * 07 23 2021 tanuj.bahuguna
+ * [MOLY00640702] Inform cell time change to IRT - Interface file for new MSG_ID
+ *
+ * 03 29 2021 pradeep.thanneeru
+ * [MOLY00592450] [WN??DTS2020110905H0SYP1200]WN??beta?? modem crash?[ASSERT] file:mcu/l1/nl1/internal/md97/src/ctrl/nr_ctrl_irt.c line:3643??MTK?????
+ * 	
+ * 	ENDC Auto GAP (MPD700) branch
+ *
+ * 01 21 2021 pradeep.thanneeru
+ * [MOLY00592450] [WN??DTS2020110905H0SYP1200]WN??beta?? modem crash?[ASSERT] file:mcu/l1/nl1/internal/md97/src/ctrl/nr_ctrl_irt.c line:3643??MTK?????
+ * 	
+ * 	ENDC Auto GAP FLow change (R3.MP Branch)
+ *
+ * 11 26 2020 pradeep.thanneeru
+ * [MOLY00593942] [MT6893][Petrus-P][5G][NSA][CMCC][FT][R0][MP7][R3][SQC][3rd round][5G-FT-NSA-1.4][Beijing]DUT HO to 2G when make MO voice call.
+ * 	
+ * 	MRDC CHANGE
+ *
+ * 11 06 2020 vend_mtb_mobiveil019
+ * [MOLY00581006] [Gen97] DR-DSDS 3.0
+ *
+ * 09 18 2020 aditya.rachakonda
+ * [MOLY00569504] [Gen97][MP7] LTE and NR-NSA mode sniffer type 1 submit R3 CR
+ * 	
+ * 	EL1C-PHS and EL1C-CH part (non MPD files).
+ *
+ * 09 09 2020 aswani.pabbathi
+ * [MOLY00566955] [VTF][MT6875][Margaux][Q0][MP6][SQC][5GMM][NLO FT][5G ???][RT][Guangzhou][????][CT+CMCC][NSA][Metro]Externel (EE),0,0,99,/data/vendor/core/,1,modem,[ASSERT] file:mcu/protocol/lte_sec/errc/evth/src/errc_evth.c line:2350
+ * 	
+ * 	.
+ *
+ * 06 30 2020 pradeep.thanneeru
+ * [MOLY00535120] [Gen97] Intra-Band DR-DSDS
+ * 	
+ * 	IntraBand ENDC Changes
+ *
+ * 06 19 2020 aswani.pabbathi
+ * [MOLY00534712] [MT6853][Mouton][MT6190][R3][MP5][Q0][SQC][China][Shantou][5GMM][NSA][Internal][FT][NSA Self-Cer][TCID:NSA_Self-Cer_FT_02_002][CU+CMCC][error times:1][Fatal error(MPU_NOT_ALLOW)] err_code1:0x0000001D err_code2:0x90CE30BE err_code3:0x29D0DF20
+ * 	
+ * 	EL1 to wait for NR SCG_REL in case of ERRC informs EL1 to wait in SCH_close case
+ *
+ * 06 02 2020 aditya.rachakonda
+ * [MOLY00516314] [CAYMAN][SPR] OMADM node to control ./LTE/QAM/Downlink ./LTE/QAM/Uplink ./LTE/TDD/TM9: ./LTE/FDD/TM9: ./LTE/B25/4x4MIMO:./LTE/B41/4x4MIMO:
+ * 	
+ * 	[MOLY00516314] [EWSP0000117521] [CAYMAN][SPR] OMADM node to control ./LTE/QAM/Downlink ./LTE/QAM/Uplink ./LTE/TDD/TM9: ./LTE/FDD/TM9: ./LTE/B25/4x4MIMO:./LTE/B41/4x4MIMO:
+ * 	
+ * 	Enable/disable 4x4 MIMO support for band 25 and band 41 based on OMADM request sent by L4 to EL1C.
+ *
+ * 06 01 2020 pratik.devikar
+ * [MOLY00526982][EWSP0000117405]Nbr cell will be locked during Nbr event ongoing, so that MPC doesnot make that Nbr cell as fake cell
+ *
+ * 05 19 2020 louis-tw.huang
+ * [MOLY00525237] [MT6853][Mouton][MT6190][MP5][R3][Q0][SQC] LAA coex related code defect bug fix
+ * [EWSP0000113711].
+ *
+ * 04 16 2020 ching-wen.hu
+ * [MOLY00509305] [LAA] Force CQI = 0 when WIFI is in STA mode and LTE connects to LAA cell
+ * [IDC][LAA] notify EL1C_RX of wifi station mode status.
+ *
+ * 04 15 2020 deepti.varadarajan
+ * [MOLY00503192][CODESYNC][DH30_TRF][PROTOCOL][ATT][10776]  Interface : LTE-BTR-5-4102 is failed
+ *
+ * 04 10 2020 pradeep.thanneeru
+ * [MOLY00511180] [MT6875][Margaux][Q0][MP3][SQC][Internal][Function][China][Shenzhen][MDST][SWIFT][CT+CU][ASSERT] file:mcu/driver/sleep_drv/internal/src/MD_TOPSM.c line:1886
+ * 	
+ * 	ENDC status Interface
+ *
+ * 02 25 2020 rahul.g
+ * [MOLY00501786] [MT6873][Margaux][Q0][MP2][SQC][HQ][MTBF][Lab][Ericsson][ErrorTimes:5]md1:Modem Warning: +EWARNING: [1][1542] nr_lpwr_sm.c #642;
+ * 	
+ * 	DL Change Abort during RSVAS suspend
+ *
+ * 02 05 2020 rahul.g
+ * [MOLY00475432] [MT6873][Margaux][MP2][SQC][CT][NSIOT][HQ][KS][N78][SA][CTC_PC_SA_6.2.2.2_2T4R][TC-MF_5G_POWER-12002]VPA control fix in CDRX for low power consumption
+ * 	
+ * 	UE in volte call or not
+ *
+ * 12 02 2019 aswani.pabbathi
+ * [MOLY00462280] [GNSS] Code changes for LTE EL1C GNSS
+ * 	
+ * 	GNSS interface changes.
+ *
+ * 11 05 2019 smita.solanki
+ * [MOLY00442138] [Top Issue][MT6297][Apollo][MP1][LTE][GCF][TS8980][FDD B3,TC 5.1.1.4Rx] UE Reestablishment at the iteration when NBR PCI mod 6 = 3
+ * 	
+ * 	[MOLY00442138][EWSP0000057392][EL1C Meas] Patchback from Gen95
+ *
+ * 09 26 2019 ching-wen.hu
+ * [MOLY00443062] [Gemini] SA+L DR-DSDS/DSDA
+ * [EL1C][RX] DR-DSDS/DSDA feature.
+ *
+ * 09 23 2019 ching-wen.hu
+ * [MOLY00439533] [Gen97][IDC] IDC feature development
+ * [EWSP0000046233][EL1C][RX] IDC feature.
+ *
+ * 09 18 2019 wade.chen
+ * [MOLY00347940] [Gen97][MT6297] tstm_meta development
+ * 	
+ * 	[EWSP0000044138][VMOLY]LTE META non-sync NSFT & query HPUE route info (interface part)
+ *
+ * 09 18 2019 smita.solanki
+ * [MOLY00434474] log reduction enhancement
+ *
+ * 09 18 2019 harshit.khandelwal
+ * [MOLY00439485] [MT6297] DAT development
+ * [EWSP0000043088]md_sap files
+ *
+ * 09 06 2019 kuo-wei.hung
+ * [MOLY00378998] [VMOLY] NL1 framework development
+ * [MML1][FWK][VMOLY] Change ENL1 msg ID (SWRD)
+ * 	[EWSP0000039758]
+ *
+ * 09 06 2019 alex.chung
+ * [MOLY00436210] [6297][TAS] TAS development Porting
+ * [SCHED] TAS development
+ *
+ * 08 26 2019 ching-wen.hu
+ * [MOLY00434739] [6297][ENDC][SLEEP] ENDC common gap framework modification for sleep mode
+ * [EWSP0000035957][EL1C][RX] (1) notify lock/unlock peer sim sm when common rfdb needs to be updated (2) when joint_rf is TRUE, 1st dl change RAT should suspend srv trx until 2nd dl change RAT finishes.
+ *
+ * 07 31 2019 rahul.g
+ * [MOLY00420140] [TOP Issue][MT6297][Apollo][MP1][SQC][SH]Assert fail: lrftxcontrol.c 584 0x28 0x27 0x0 - (LISR)EL1_D_TX
+ *
+ * 	.
+ *
+ * 07 24 2019 smita.solanki
+ * [MOLY00424137][Gen97] LPP IRAT RSTD modifications
+ * 	- Timer defination fix
+ *
+ * 07 04 2019 yamin.chen
+ * [MOLY00419170] SFTD feature develop
+ * [EWSP0000023412]
+ * 	.
+ *
+ * 07 01 2019 shih-hsuan.wei
+ * [MOLY00399224] [GEN97][UTAS] UTAS related development. [EWSP0000021769].
+ *
+ * 06 26 2019 yamin.chen
+ * [MOLY00415561] [Gen97][PHS] PLMN List Control
+ * rollback.
+ *
+ * 05 30 2019 ching-wen.hu
+ * [MOLY00351864] [MT6297] EL1C Rx development
+ * [EWSP0000013682] gaming enhancement (porting from CL#6233842, CL#6357956).
+ *
+ * 05 30 2019 jasneetkaur.bhullar
+ * [MOLY00384666] [6297][IRAT-RSTD] [MP2] 6293 MP2 Feature, IRAT RSTD related changes
+ * IRAT_RSTD feature changes: RTP handling & PRS_GAP_PATTERN
+ *
+ * 05 13 2019 yamin.chen
+ * [MOLY00405162] [Gen97] Force Gap for SFTD
+ * 	[EWSP0000009711]
+ * 	.
+ *
+ * 04 30 2019 steven-yx.hu
+ * [MOLY00401569] [MT6297] New RRM gap distribution algorithm. [EWSP0000007414]
+ * 	[EL1C][RX] msg id.
+ *
+ * 04 15 2019 po-chun.chiu
+ * [MOLY00377483] [MT6779][Lafite][P0][BSP+][MP2][HQ][MTBF][Lab][Ericsson][Gemini][ErrorTimes:1][OPPO]Modem Warning: +EWARNING: [1][1279] lrxdsprpt.c #9919; (time
+ *
+ * 	[EWSP0000004377] Transfer L1D_RPT to MPC task and handle it - SAP part.
+ *
+ * 03 29 2019 jasneetkaur.bhullar
+ * [MOLY00384666] [6297][IRAT-RSTD] [MP2] 6293 MP2 Feature, IRAT RSTD related changes
+ * LPP_IRT_IRAT MP2 feature, Interface part. [EWSP0000002370]
+ *
+ * 03 29 2019 jasneetkaur.bhullar
+ * [MOLY00384666] [6297][IRAT-RSTD] [MP2] 6293 MP2 Feature, IRAT RSTD related changes
+ * LPP_IRT_IRAT MP2 feature, Interface part. [EWSP0000002370]
+ *
+ * 03 18 2019 nelsonhe.huang
+ * [MOLY00384666] [6297][IRAT-RSTD] [MP2] 6293 MP2 Feature, IRAT RSTD related changes
+ *
+ * 	[ERS00031525]IRAT-RSTD function-SWRD
+ *
+ * 03 12 2019 nelsonhe.huang
+ * [MOLY00384666] [6297][IRAT-RSTD] [MP2] 6293 MP2 Feature, IRAT RSTD related changes
+ * 	reverse for Gen95
+ *
+ * 03 12 2019 nelsonhe.huang
+ * [MOLY00384666] [6297][IRAT-RSTD] [MP2] 6293 MP2 Feature, IRAT RSTD related changes
+ *
+ * 	[MOLY00384666][ERS00031150] [6297][IRAT-RSTD] [MP2] 6293 MP2 Feature, IRAT RSTD related changes
+ *
+ * 	the interface for I-RAT RSTD for GEN97 MP2 feature
+ *
+ * 01 19 2019 kuan-ting.lee
+ * [MOLY00376904] [NR][MM][MLL1/MPC/CTRL] NR inter-rat development
+ * Add ilm for SFTD timing calculation. [ERS00027996]
+ *
+ * 01 09 2019 ching-wen.hu
+ * [MOLY00378154] [MT6297] ENDC auto gap ctrl + EL1 SCS flow enhancement
+ * [ERS00026693] ENDC auto gap ctrl.
+ *
+ * 12 28 2018 mars-sh.cheng
+ * [MOLY00356007] [SMO][Debug&Trace] logging rate adjustment
+ * [SMO][6297] MCU triggering DSP streaming logging - interface
+ *
+ * 10 31 2018 ching-wen.hu
+ * [MOLY00361478] [Gen97] Gemini Compile Option Clean Up
+ *
+ * 	[ERS00019708] gemini compile option clean up.
+ *
+ * 10 31 2018 ching-wen.hu
+ * [MOLY00361478] [Gen97] Gemini Compile Option Clean Up
+ * [ERS00019708] gemini compile option clean up.
+ *
+ * 10 05 2018 carol.lin
+ * [MOLY00345150] [Gen97][EL1C][CH] ENDC feature development.
+ * add interface for ENDC_PRE_DB_READY_IND
+ *
+ * 08 22 2018 c-h.huang
+ * [MOLY00335588] [Gen97][EL1C][PHS] ENDC feature development.
+ * Add auto gap message between EL1/NL1.
+ *
+ * 08 22 2018 david.tang
+ * [MOLY00347617] [NR][NL1][CTRL] merge CTRL-IRT module to VMOLY
+ * .[NR][CTRL] CTRL-IRT merge to VMOLY from 97DEV
+ *
+ * 08 21 2018 david.tang
+ * [MOLY00343936] [NR][NL1][CTRL] ctrl_task irt sub-module development
+ * .[NR][CTRL] el1-nl1 interface change
+ *
+ * 06 22 2018 c-h.huang
+ * [MOLY00333408] [Gen97][EL1C][RX] Code sync from UMOLYE to GEN97.DEV
+ * CL5709688, CL5841404, CL5841023.
+ *
+ * 06 20 2018 chun-yen.yang
+ * [MOLY00331286] [MT6295][L+L+L][LTE] paging conflict CM handling
+ * New tick to MPC when paging conflict (UMOLYE)
+ *
+ * 03 29 2018 po-chun.chiu
+ * [MOLY00316691] [MT6295][UMOLYE][EL1][MEAS] Replace all "__MD95__"  with  "(CUR_GEN >= MD_GEN95)" for EL1 related files.
+ *
+ * 	.
+ *
+ * 03 28 2018 po-chun.chiu
+ * [MOLY00316691] [MT6295][UMOLYE][EL1][MEAS] Replace all "__MD95__"  with  "(CUR_GEN >= MD_GEN95)" for EL1 related files.
+ *
+ * 	Replace all "__MD95__"  with  "(CUR_GEN >= MD_GEN95) for Gen97.
+ *
+ * 03 28 2018 po-chun.chiu
+ * [MOLY00316691] [MT6295][UMOLYE][EL1][MEAS] Replace all "__MD95__"  with  "(CUR_GEN >= MD_GEN95)" for EL1 related files.
+ *
+ * 	.
+ *
+ * 03 08 2018 mika.suokas
+ * [MOLY00260071] [6295] EL1C Rx development
+ * 	.
+ *
+ * 02 27 2018 tommi.tauriainen
+ * [MOLY00298703] [MT6295] EL1 LAA development
+ * Added MSG_ID_EL1MPC_EL1_MEAS_CH_INTER_RMTC_UPDATE_IND
+ *
+ * 02 14 2018 tommi.tauriainen
+ * [MOLY00306227] [MT6295] LL1 gap assignment redesign implementation
+ * [INTERFACE][SAP] Added MSG_ID_EL1_EL1MPC_IRT_MEAS_RPG_GAP_NOTIFY_IND
+ *
+ * 01 02 2018 meng-hsuan.lin
+ * [MOLY00296032] [MT6763][Bianco][O1][MP2][TMO][WW FT][United States][Seattle][Nokia][EE][ASSERT] file:mcu/pcore/modem/lte_sec/errc/assert/errc_el1_assert_csr.c line:86
+ *
+ * 	[MOLY00296032] csr scheduling
+ *
+ * 01 02 2018 meng-hsuan.lin
+ * [MOLY00296032] [MT6763][Bianco][O1][MP2][TMO][WW FT][United States][Seattle][Nokia][EE][ASSERT] file:mcu/pcore/modem/lte_sec/errc/assert/errc_el1_assert_csr.c line:86
+ *
+ * 	[MOLY00296032] csr scheduling
+ *
+ * 11 28 2017 ching-wen.hu
+ * [MOLY00287784] [MT6295] tstm_meta development
+ * update cap info to tool from errc.
+ *
+ * 11 21 2017 jocobrian.chang
+ * [MOLY00288671] [MT6295][MML1 DCLC] Dynamic cache lock central control development.
+ *
+ * 11 03 2017 alex.chung
+ * [MOLY00286880] [MT6763][IDC] Workaround for WMT Defect
+ * Record all CCCI msg content and then handle them once to prevent WMT dequeue too much MSG
+ *
+ * 09 25 2017 aric.chiu
+ * [MOLY00279410] [IRAT PERF VTF] EL1C speed up CS/CM scheduling in HSR mode
+ * [errc-el1mpc] add RCM hsr freq interface/RCM hsr mode interface.
+ *
+ * 09 20 2017 lawrence.chen
+ * [MOLY00278366]LPP OTDOA new procedure architecture development.
+ *
+ * 09 13 2017 aric.chiu
+ * [MOLY00277703] [MT6293][LR12A.R2] speed up inter-freq. measurement by MEASURE_CFG_NTF.
+ * [errc-el1mpc] add interface for MEASURE_CFG_NTF.
+ *
+ * 08 29 2017 pei-xuan.qiu
+ * [MOLY00260508] [EL1_MEAS_Development]
+ *
+ * 	Remove MEAS pathloss (UMOLYA).
+ *
+ * 08 28 2017 gary.liu
+ * [MOLY00266605] Verizon' ota antenna infos Porting 91 [VZW] feature to 93
+ * [EL1 PHS] bypass VZW cmd for MPC
+ *
+ * 08 24 2017 nelsonhe.huang
+ * [MOLY00273588] [MOLY00269598] [Gen93] TPB/Mobility Ctrl patch check in -> Meas part : Revise ilm naming
+ *
+ * 08 24 2017 hyper.wang
+ * [MOLY00176045] [UMOLYA][EL1 MEAS Development] Refine SINR calculation
+ *
+ * 08 21 2017 masc.cheng
+ * [MOLY00269598] [Gen93]TPB/Mobility Ctrl patch check in
+ * [TPB]EL1C Tx part
+ *
+ * 08 21 2017 gary.liu
+ * [MOLY00207413] EL1C 6293 development
+ *
+ * 	[EL1 CH] add new message to tell TX IDLE DRX config for TAS
+ *
+ * 08 16 2017 yu-chun.chen
+ * [MOLY00233456] [Bianco_SMT][UMOLYA] 93 TSTM_META Development
+ * Fix MSGID for TSTM
+ *
+ * 08 07 2017 yu-chun.chen
+ * [MOLY00233456] [Bianco_SMT][UMOLYA] 93 TSTM_META Development
+ * move TSTM xl1sim case from code to xl1sim script
+ *
+ * 07 28 2017 gary.liu
+ * [MOLY00266852] [Bianco/Zion] fre sw check-in
+ * [EL1] B71 efuse
+ *
+ * 07 07 2017 jung-ching.hsieh
+ * [MOLY00262750][PH1 VZW] Regarding Antenna Testing interface modify
+ *
+ * 06 30 2017 alex.chung
+ * [MOLY00260703] [TE-MTBF][Airtel IMS][Bianco][N1]Externel (EE),0,0,99,/data/core/,1,modem,Trigger time:[2017-06-23 06:18:24.250319] md1:(MCU_core1.vpe0.tc0(VPE2)) [Fatal error(task)] err_code1:0x00000604 err_code2:0xFFFFFFDE err_code3:0xCCCCCCCC MD Offender:EL1
+ * MOD_EL1_MPC sends ILM to update volte and inter-frequency state
+ *
+ * 06 28 2017 alex.chung
+ * [MOLY00260337] [BIANCO] Enable L+L IDC
+ * Enable L+L IDC
+ *
+ * 06 28 2017 hyper.wang
+ * [MOLY00257930] [6293] Special Patch for VoLTE
+ * 1. Remove MSG_ID_EL1MPC_EL1_MEAS_PHS_CM_PROC_REQ/MSG_ID_EL1_EL1MPC_PHS_MEAS_CM_PROC_CNF
+ * 2. Remove MEAS_IND_CELL_STATE_VALID_BIT
+ *
+ * 05 26 2017 hyper.wang
+ * [MOLY00240604] [SE2 Internal Test][MT6293][UMOLYA][20170406][Overnight Result] Assert fail: el1_meas_phy.c 1104 - EL1_MPC
+ * 	(Consider cross-term flag in APD)
+ * 	.
+ *
+ * 05 16 2017 gary.liu
+ * [MOLY00249575] [6293][EL1C] SW feature check
+ * [EL1C] SW feature check
+ *
+ * 04 20 2017 jy.pan
+ * [MOLY00237418] [EL1D CS]CSHW hang workaround
+ * [EL1D CS]CSHW hang workaround.
+ *
+ * 04 08 2017 hyper.wang
+ * [MOLY00176045] [UMOLYA][EL1 MEAS Development]
+ * 	Enable MEAS/PHS interface: MSG_ID_EL1MPC_EL1_MEAS_PHS_MEASURE_TYPE_NTF
+ *
+ * 03 29 2017 alex.chung
+ * [MOLY00226028] [UMOLYA][EL1] EL1 RX development
+ * Porting IDC from Gen92 to Gen93
+ *
+ * 03 29 2017 ali.su
+ * [MOLY00237873] [6293][EL1] Gemini L+L
+ * (UMOLYA TRUNK) 6293 EL1: L+L (CH).
+ *
+ * 03 21 2017 lewis.yu
+ * [MOLY00182864] [6293] EL1C RX development
+ * L+L development.
+ *
+ * 03 15 2017 popcafa.shih
+ * [MOLY00222760] [Gen 93][UMOLY to UMOLYA sync] el1tx part
+ * ML1S TRX Feature for phy test.
+ *
+ * 02 16 2017 luhung.hsu
+ * [MOLY00186994] 93 New PHS code
+ * [EL1 PHS]Refine 4G stby flow
+ *
+ * 02 02 2017 johnny.chiang
+ * [MOLY00202329] [UMOLYA] 93 TSTM_META Development
+ *
+ * 	.
+ *
+ * 01 25 2017 gary.liu
+ * [MOLY00207413] EL1C 6293 development
+ * [EL1 CH] L1ADT porting
+ *
+ * 01 17 2017 ali.su
+ * [MOLY00203235] [6293][EL1]EL1_RX/MLL1 development
+ * (UMOLYA) EL1C ue_category_ind implementation.
+ *
+ * 01 13 2017 ali.su
+ * [MOLY00203235] [6293][EL1]EL1_RX/MLL1 development
+ * (UMOLYA) ERRC-EL1 ue_category interface.
+ *
+ * 01 10 2017 luhung.hsu
+ * [MOLY00186994] 93 New PHS code
+ * [EL1 PHS]Combine two stopSrvPresync flag to one
+ *
+ * 01 04 2017 ali.su
+ * [MOLY00203235] [6293][EL1]EL1_RX/MLL1 development
+ * (UMOLYA)ERRC-EL1  M-PS, R-SIM interface.
+ *
+ * 01 04 2017 luhung.hsu
+ * [MOLY00186994] 93 New PHS code
+ * Rename scs result ilm msg
+ *
+ * 12 25 2016 johnny.chiang
+ * [MOLY00202329] [UMOLYA] 93 TSTM_META Development
+ *
+ * 	.93 tstm_meta patch back
+ *
+ * 12 08 2016 gary.liu
+ * [MOLY00207413] EL1C 6293 development
+ * [EL1 IDC] add message
+ *
+ * 12 07 2016 aric.chiu
+ * [MOLY00185561] [UMOLYA][TRUNK][UMOLYA][EL1/EL1_MPC]
+ * [el1] rename MSG_ID_EL1_EL1MPC_CH_MEAS_CELL_INFO_UPDATE_IND to MSG_ID_EL1_EL1MPC_CH_MEAS_CELL_INFO_UPDT_IND.
+ *
+ * 12 06 2016 kuan-ting.lee
+ * [MOLY00176045] [UMOLYA][EL1 MEAS Development]
+ * Add: MSG_ID_ERRC_EL1MPC_MEASUREMENT_INFO_NTF.
+ *
+ * 11 24 2016 kuan-ting.lee
+ * [MOLY00176045] [UMOLYA][EL1 MEAS Development]
+ *
+ * 	IcSp: 1. sync code from 92
+ * 	          2. Design change: Rx qual report
+ * 	          3. Feicic antenna port information.
+ * 	          4. Misc
+ *
+ * 11 16 2016 popcafa.shih
+ * [MOLY00196065] [MT6293][folder structure] Move EL1/EL2 files from LTE domain to SWRD domain
+ * modify MOLY00173949 & MOLY00172964 for IS_EL1_ANDROID_M_LCE_REPORT_SUPPORT 0.
+ *
+ * 11 16 2016 yuanwei.fan
+ * [MOLY00213386] [EL1D][CM] report buffer save related modify
+ * [EL1D][CM] report buffer related modiy (to save buffer)
+ *
+ * 11 15 2016 ali.su
+ * [MOLY00203235] [6293][EL1]EL1_RX/MLL1 development
+ * (UMOLYA)EL1: remove SGLTE legacy code.
+ *
+ * 11 11 2016 ali.su
+ * [MOLY00203235] [6293][EL1]EL1_RX/MLL1 development
+ * (UMOLYA) EL1 Gemini: RSVAS (part 1).
+ *
+ * 11 07 2016 yuanwei.fan
+ * [MOLY00211822] [EL1C][CM] MBSFN report related modify rollback
+ * [EL1D][CM] MBSFN report related modify rollback
+ *
+ * 11 03 2016 gary.liu
+ * [MOLY00207413] EL1C 6293 development
+ * [6293] roll back for el1b
+ *
+ * 11 02 2016 luhung.hsu
+ * [MOLY00186994] 93 New PHS code
+ * [EL1 PHS]SCell flow refine
+ *
+ * 10 20 2016 ali.su
+ * [MOLY00208519] [MT6293][VzW]LTE SIB8/16 for AGPS fine time aiding (code sync from UMOLY)
+ * (UMOLYA) AGPS sync feature (EL1).
+ *
+ * 10 18 2016 hyper.wang
+ * [MOLY00203310] [PS_DEV][6293] ERRC MBSFN MDT check in
+ *
+ * 10 14 2016 ali.su
+ * [MOLY00203235] [6293][EL1]EL1_RX/MLL1 development
+ * (UMOLYA) add note.
+ *
+ * 10 05 2016 kuan-ting.lee
+ * [MOLY00176045] [UMOLYA][EL1 MEAS Development]
+ * Meas force mode change.
+ *
+ * 09 28 2016 kuan-ting.lee
+ * [MOLY00176045] [UMOLYA][EL1 MEAS Development]
+ * Add new ilm: MSG_ID_EL1MPC_EL1_MEAS_TX_SRV_RLT_IND.
+ *
+ * 09 26 2016 hyper.wang
+ * [MOLY00203310] [PS_DEV][6293] ERRC MBSFN MDT check in
+ *
+ * 09 26 2016 lewis.yu
+ * [MOLY00182864] [6293] EL1C RX development
+ * add TX/MEAS RX CMD ind.
+ *
+ * 09 26 2016 luhung.hsu
+ * [MOLY00186994] 93 New PHS code
+ * [EL1 PHS]Add SRVCC enhancement flow
+ *
+ * 09 23 2016 eddie.wang
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * Sync PS.DEV to TRUNK up to CL2868873
+ *
+ * 08 16 2016 eddie.wang
+ * [MOLY00197177] Code maintenance on UMOLYA.PS.DEV
+ * [EMACMCH]Remove MCCH_RCV_MODE_CHANGE_COMPLETE_NTF and related struct
+ * 09 07 2016 ali.su
+ * [MOLY00181051] [6293][EL1]EL1_CH/EL1_IRT development
+ * (UMOLYA) merge EL1_CH code from UMOLY, CL#2302597, CL#2639880, CL#2663669, CL#2667971, CL#2690148, CL#2706232.
+ *
+ * 09 02 2016 yuanwei.fan
+ * [MOLY00200903] [EL1D][CM] SCM and tp related modify
+ * [EL1D][CM] SCM  RSSI/PHASE Report for VzW OTA Test
+ *
+ * 08 24 2016 shihyao.wang
+ * [MOLY00175997] [EL1C] umolya code sync
+ * drx control & event scheduling
+ *
+ * 08 22 2016 hyper.wang
+ * [MOLY00176045] [UMOLYA][EL1 MEAS Development]
+ * 	add MSG ID
+ * 	.
+ *
+ * 08 10 2016 gary.liu
+ * [MOLY00194267] add new feature
+ * Merging
+ *
+ * 	//UMOLYA_CBr/aric.chiu/UMOLYA_W16.31.LTE.p1.el1FolderMove/
+ *
+ * 	to //UMOLYA/TRUNK/UMOLYA/
+ *
+ * 08 10 2016 kuan-ting.lee
+ * [MOLY00176045] [UMOLYA][EL1 MEAS Development]
+ * send specific measurement ilm to CSR instead of MEAS
+ *
+ * 08 09 2016 aric.chiu
+ * [MOLY00196065] [MT6293][folder structure] Move EL1/EL2 files from LTE domain to SWRD domain
+ * [fldr_str][el1] merge common file from Cbr.
+ *
+ * 07 11 2016 gary.liu
+ * [MOLY00190027] UMOLYA build error
+ * fix build error
+ *
+ * 06 28 2016 lawrence.chen
+ * [MOLY00183642] new task EL1_MPC definition for 6293
+ * Rename MSG Id for the new EL1_MPC task.
+ *
+ * 06 28 2016 aric.chiu
+ * [MOLY00185561] [UMOLYA][TRUNK][UMOLYA][EL1/EL1_MPC]
+ * add MSG_ID_EL1_TX_MEAS_TX_RX_DIFF_IND.
+ *
+ * 06 28 2016 aric.chiu
+ * [MOLY00185561] [UMOLYA][TRUNK][UMOLYA][EL1/EL1_MPC]
+ * add lost msg_id.
+ *
+ * 06 28 2016 johnny.chiang
+ * [MOLY00174069] [UMOLYA] fix build error
+ *
+ * 	.update csr irt interface
+ *
+ * 06 28 2016 aric.chiu
+ * [MOLY00185561] [UMOLYA][TRUNK][UMOLYA][EL1/EL1_MPC]
+ * fix redeclaration of enumerator.
+ *
+ * 06 28 2016 aric.chiu
+ * [MOLY00185561] [UMOLYA][TRUNK][UMOLYA][EL1/EL1_MPC]
+ * msg_id modify between el1_mpc & el1_phs
+ *
+ * 06 28 2016 gary.liu
+ * [MOLY00186977] merge el1c code to umolya
+ *
+ * 	add new message id and change msg range for el1
+ *
+ * 06 27 2016 johnny.chiang
+ * [MOLY00174069] [UMOLYA] fix build error
+ *
+ * 	.
+ *
+ * 06 27 2016 lawrence.chen
+ * [MOLY00183642] new task EL1_MPC definition for 6293
+ * MSG Id rename for the new task EL1_MPC.
+ *
+ * 06 22 2016 johnny.chiang
+ * [MOLY00181800] [UMOLYA] 93 CSR Development
+ *
+ * 	. add new scm message id
+ *
+ * 06 13 2016 johnny.chiang
+ * [MOLY00181800] [UMOLYA] 93 CSR Development
+ *
+ * 	.
+ *
+ * 06 13 2016 johnny.chiang
+ * [MOLY00181800] [UMOLYA] 93 CSR Development
+ *
+ * 	.add new primitive
+ *
+ * 06 08 2016 kuan-ting.lee
+ * [MOLY00176045] [UMOLYA][EL1 MEAS Development]
+ * Add Meas SCS procedure .
+ *
+ * 06 08 2016 ali.su
+ * [MOLY00181051] [6293][EL1]EL1_CH/EL1_IRT development
+ * (UMOLYA) EMAC-EL1 interface update (msg).
+ *
+ * 06 08 2016 ali.su
+ * [MOLY00181051] [6293][EL1]EL1_CH/EL1_IRT development
+ * (UMOLYA) ERRC-EL1 interface update (msg).
+ *
+ * 06 03 2016 ali.su
+ * [MOLY00181051] [6293][EL1]EL1_CH/EL1_IRT development
+ * (UMOLYA) EL1 SCS flow change: (OA) interface.
+ *
+ * 05 24 2016 ali.su
+ * [MOLY00181051] [6293][EL1]EL1_CH/EL1_IRT development
+ * (UMOLYA) CH-MEAS flow change: add message.
+ *
+ * 04 26 2016 shihyao.wang
+ * [MOLY00175997] [EL1C] umolya code sync
+ * 93 code sync from panu cbr (label=UMOLY_92L1Dev.W1617.p4).
+ *
+ * 03 16 2016 panu.peisa
+ * [MOLY00147611] MT6292 EL1 code merge from UMOLY_92L1Dev CBr to UMOLY
+ * Integrated mcu/common and mcu/make changes from 2124898 to 2168172.
+ *
+ * 03 04 2016 panu.peisa
+ * [MOLY00147611] MT6292 EL1 code merge from UMOLY_92L1Dev CBr to UMOLY
+ * Integrated mcu/common, mcu/make and mcu/pcore changes form 2108356 to 2124898 ( swrd part ).
+ *
+ * 02 04 2016 panu.peisa
+ * [MOLY00147611] MT6292 EL1 code merge from UMOLY_92L1Dev CBr to UMOLY
+ * Integrated mcu/common, mcu/make and mcu/pcore changes from 2019297 to 2043298 ( swrd part ).
+ *
+ * 02 03 2016 antti.tormanen
+ * [MOLY00133325] 6291plus development
+ *
+ * 	Interface updates for feature port & sync
+ * 	Port LR11 new features:
+ * 	MOLY00139263 - specific cell delete
+ * 	MOLY00155307 - eMBMS enhancement
+ * 	MOLY00154368 - Change handover abort interface to REQ/CNF
+ * 	AUDRX support
+ * 	MIB spare bit interface.
+ *
+ * 01 22 2016 panu.peisa
+ * [MOLY00147611] MT6292 EL1 code merge from UMOLY_92L1Dev CBr to UMOLY
+ * Integrated mcu/make, mcu/common mcu/pcore changes from 1985248 to 2011226 ( swrd part).
+ *
+ * 01 19 2016 panu.peisa
+ * [MOLY00147611] MT6292 EL1 code merge from UMOLY_92L1Dev CBr to UMOLY
+ * Integrated common and mcu/common changes from 1946091 to 1985248 .
+ *
+ * 11 16 2015 panu.peisa
+ * [MOLY00147611] MT6292 EL1 code merge from UMOLY_92L1Dev CBr to UMOLY
+ * Integrated mcu/common, mcu/make and mcu/pcore changes between 1809051 and 1826317 ( swrd part ).
+ *
+ * 11 12 2015 panu.peisa
+ * [MOLY00147611] MT6292 EL1 code merge from UMOLY_92L1Dev CBr to UMOLY
+ *
+ * 	Integrated common, mcu/common and mcu/make changes between 1788771 to 1808878.
+ *
+ * 10 30 2015 panu.peisa
+ * [MOLY00147611] MT6292 EL1 code merge from UMOLY_92L1Dev CBr to UMOLY
+ *
+ * 	mcu/common changes integrated from UMOLY_92L1Dev_15w43 CBr.
+ *
+ * 09 15 2015 yenchih.yang
+ * [MOLY00099648] [VoLTE] Voice quality patch - ERRC
+ * .
+ *
+ * 08 05 2015 yr.chiang
+ * [MOLY00087893] [MT6291] Merge EL1C/EL1D from xL1SIM to MT6291_DEV
+ * update ADT header files
+ *
+ * 08 03 2015 carol.lin
+ * [MOLY00134637] [Jade][TK6291][New Feature][ADT] Check in ADT new feature into LR11
+ * ADT.
+ *
+ * 08 01 2015 yr.chiang
+ * [MOLY00087893] [MT6291] Merge EL1C/EL1D from xL1SIM to MT6291_DEV
+ * 91 L1S TPC info acquisition
+ *
+ * 05 28 2015 hyper.wang
+ * [MOLY00074164] 6291 IDC Development
+ * 	.
+ *
+ * 04 28 2015 shihyao.wang
+ * [MOLY00109540] [EL1IT] 91 MoDIS IT code
+ * 91 MoDIS integration.
+ *
+ * 03 02 2015 ms.lin
+ * [MOLY00070265] MT6291 code change: add new sap id
+ * 	.
+ *
+ * 10 27 2014 daron.lu
+ * [MOLY00081763] [MT6291] Merge EL1C/EL1D to UMOLY
+ * 	.
+ *
+ * 08 07 2014 yr.chiang
+ * [MOLY00072292] 6291 EL1C Development
+ * sync MOLY to UMOLY
+ *
+ * 08 04 2014 lewis.yu
+ * [MOLY00073990] [LPP CP] LPP code check-in for OTDOA feature
+ * .
+ *
+ * 07 15 2014 kuan-ting.lee
+ * [MOLY00055217] EL1 IDC development
+ * IDC msg : pin type lte con, and lte con timer
+ *
+ * 06 23 2014 popcafa.shih
+ * [MOLY00069383] [VoLTE][Low power improvement]
+ * move recal to task.
+ *
+ * 06 13 2014 popcafa.shih
+ * [MOLY00069383] [VoLTE][Low power improvement]
+ * add new sap.
+ *
+ * 05 21 2014 dennis.weng
+ * [MOLY00066251] ICS may camp on a cell not having largest RSRP in TDD mode
+ * specific measurement el1 sap
+ *
+ * 04 28 2014 lewis.yu
+ * [MOLY00063876] [MT6595] MT6595 DVFS support
+ * .
+ *
+ * 02 20 2014 lewis.yu
+ * [MOLY00056695] [LTE R9] disallow sleep (prevent power down L2 copro) during evaluation phase of HO/CCR/IRCR/redirection from LTE
+ * .
+ *
+ * 02 11 2014 yr.chiang
+ * [MOLY00055707] [MOLY00054538] [MT6290E2][EL1] EL1 Trace update for EM Customer Release (phase 2)
+ * .
+ *
+ * 01 29 2014 carol.lin
+ * [MOLY00054688] [MT6290E2][TDD] inter-cell HO took too much time
+ *
+ * 01 22 2014 c-h.huang
+ * [MOLY00054324] [4G Gemini][Merge] MOLY.MM.GEMINI.DEV Merge back to MOLY
+ * .
+ *
+ * 12 03 2013 lewis.yu
+ * [MOLY00048832] power down/on in EL2 task context and refine the flow
+ * .
+ *
+ * 11 25 2013 vend_david.tang
+ * [MOLY00047275] [MT6290E2][EL1 CH] CPHY_CFG_REQ/CNF guard timer.
+ * Add a 1s guard timer for cphy_cfg_req/cnf.
+ *
+ * 11 13 2013 ty.shen
+ * [MOLY00046027] [MT6290E1][MMDS_DC] MMDC feature patch back to MOLY trunk
+ * .
+ *
+ * 11 06 2013 yr.chiang
+ * [MOLY00045089] [MT6290E1][IOT][Huawei][LTE][Uu_ANR_001] Assert: l2lmac_drv.c 234 -L2COPRO
+ * add csi_srs_admission_2nd_ntf for EMAC
+ *
+ * 11 01 2013 vend_hyper.wang
+ * [MOLY00014152] EL1 IDC development
+ * 	(Revise IPC messages).
+ *
+ * 10 30 2013 vend_hyper.wang
+ * [MOLY00014152] EL1 IDC development
+ * Add new SW message ID
+ *
+ * 10 29 2013 ms.lin
+ * [MOLY00041363] [MT6290E1][Design Change] Neighbor BCCH flow change
+ *  .
+ *
+ * 10 11 2013 lewis.yu
+ * [MOLY00040824] [MT6290][EL1] PHS suspend IRT gap for MAC_DRX_TRACK
+ * .
+ *
+ * 10 11 2013 ms.lin
+ * [MOLY00040824] [MT6290][EL1] PHS suspend IRT gap for MAC_DRX_TRACK
+ *  .
+ *
+ * 08 26 2013 carol.lin
+ * [MOLY00034285] [MT6290E1][EL2 RTD] Assert fail: modem/lte_sec/el1/meas/src/el1_meas_ctrl.c 5783 after attach and pinging
+ * HOST_DATA_REQ is rcv by CH
+ *
+ * 08 16 2013 c-h.huang
+ * [MOLY00033989] [MT6290][EL1] MSG ID naming typo error fix
+ * .
+ *
+ * 08 15 2013 daron.lu
+ * [MOLY00031340] [MT6290E1][GCF][RRM][36521-3][TC 9.1.1/9.1.3]config long DRX, UE can't measure intra/inter freq cell
+ * .
+ *
+ * 08 15 2013 daron.lu
+ * [MOLY00031340] [MT6290E1][GCF][RRM][36521-3][TC 9.1.1/9.1.3]config long DRX, UE can't measure intra/inter freq cell
+ * .
+ *
+ * 07 04 2013 vend_hyper.wang
+ * [MOLY00026065] EL1 IDC unit test case development
+ * (add new msgid).
+ *
+ * 05 22 2013 vend_david.tang
+ * [MOLY00007804] [EL1 CH]
+ * add timer expiry msg for sch.
+ *
+ * 05 07 2013 vend_hyper.wang
+ * [MOLY00006577] EL1 MEAS development (update MODIS AUTO EL1 IT).
+ *
+ * 03 30 2013 jerry.ho
+ * [MOLY00010951] LTE L1S relative files merge to MOLY
+ *
+ * 03 05 2013 elly.wei
+ * [MOLY00007073] [MT7208][EL1] Sleep mode support
+ * <saved by Perforce>
+ * Re-arrange the MSG ID for sleep mode related messages.
+ *
+ * 03 04 2013 ms.lin
+ * [MOLY00006061] [Design change]LTE EL1 DRV/TSTM/PHS code change
+ * .
+ *
+ * 01 28 2013 ms.lin
+ * [MOLY00006061] [Design change]LTE EL1 DRV/TSTM/PHS code change
+ * .
+ *
+ * 11 08 2012 ms.lin
+ * [MOLY00005322] TATAKA merge to MOLY
+ * .
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _EL1_MSGID_H
+#define _EL1_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_EL1_CODE_BEGIN )
+
+/****************************************************************************
+ *                          Destination: CH
+ ****************************************************************************/
+MSG_ID_ERRC_EL1_CPHY_CFG_REQ            = MSG_ID_EL1_CODE_BEGIN,
+MSG_ID_EL1_CH_MSG_START                 = MSG_ID_ERRC_EL1_CPHY_CFG_REQ,
+MSG_ID_ERRC_EL1_RL_MONITOR_REQ,
+MSG_ID_ERRC_EL1_SPECIFIC_CELL_SEARCH_REQ,
+#if defined (__GEMINI__)
+MSG_ID_ERRC_EL1_VIRTUAL_MODE_REQ,
+#endif
+#if 1 /* To be removed once ERRC supports */
+MSG_ID_ERRC_EL1_ABORT_HO_NTF,
+#endif
+MSG_ID_ERRC_EL1_ABORT_HO_REQ,
+MSG_ID_ERRC_EL1_L1S_TEST_PARA_REQ,
+MSG_ID_ERRC_EL1_L1S_TEST_PARA_CNF,
+MSG_ID_ERRC_EL1_T312_START_REQ,
+MSG_ID_ERRC_EL1_TX_ENHANCE_NTF,
+MSG_ID_ERRC_EL1_PCH_RCV_NTF,
+MSG_ID_ERRC_EL1_RX_POLL_DATA_IND,
+MSG_ID_ERRC_EL1_SIB_FRAME_SYNC_REQ,  // SIB for AGPS.
+MSG_ID_ERRC_EL1_UE_CATEGORY_IND,
+MSG_ID_ERRC_EL1_DSP_SNIFFER_REQ,
+MSG_ID_EMAC_EL1_RA_GAP_STOP_REQ,
+MSG_ID_EMAC_EL1_RA_GAP_RESUME_REQ,
+MSG_ID_EMAC_EL1_DRX_CTRL_REQ,
+MSG_ID_EMAC_EL1_DRX_CYCLE_NTF,
+MSG_ID_EMAC_EL1_HOST_DATA_REQ,
+MSG_ID_EMAC_EL1_MSI_NOTIFY,  // to be removed in 6293.
+MSG_ID_ETMR_EL1_DRX_SLEEP_TMR_EXPIRY,
+MSG_ID_ETMR_EL1_UE_CATEGORY_TMR_EXPIRY,
+MSG_ID_ETMR_EL1_B71_TMR_EXPIRY,
+MSG_ID_ETMR_EL1_GEMINI_FEATURE_TMR_EXPIRY,
+MSG_ID_ETMR_EL1_CPHY_CFG_TMR_EXPIRY,
+MSG_ID_GAS_EL1_ENABLE_B39_REQ,       // SGLTE legacy code, not used in 6293.
+MSG_ID_GAS_EL1_DISABLE_B39_REQ,      // SGLTE legacy code, not used in 6293.
+MSG_ID_HAL_EL1_GPS_TIME_SYNC_REQ,
+MSG_ID_HAL_EL1_GPS_TIME_SYNC_IND,
+#if (CUR_GEN >= MD_GEN97)
+MSG_ID_NL1_EL1_ENDC_STATUS_IND,
+MSG_ID_ETMR_EL1_RFDB_LOCK_RETRY_TMR_EXPIRY,
+MSG_ID_ETMR_EL1_CH_PHS_SHARED_LOCK_RETRY_TMR_EXPIRY,
+MSG_ID_ETMR_EL1_ENDC_AUTO_GAP_RETRY_TMR_EXPIRY,
+MSG_ID_NL1_EL1_ENDC_GAP_CTRL_REQ,
+MSG_ID_NL1_EL1_ENDC_GAP_CTRL_DONE_IND,
+MSG_ID_NL1_EL1_MML1_ENDC_PRE_DB_READY_IND,
+MSG_ID_NL1_EL1_SPECIFIC_DL_CHNG_NTF,
+MSG_ID_NL1_EL1_UNLOCK_NR_RFDB_NTF,
+MSG_ID_LL1_EL1_ENDC_AUTO_GAP_CNF,
+MSG_ID_NL1_EL1MPC_NR_RTP_IND,        // __EL1_LPP_INTER_RAT_RSTD_SUPPORT_
+MSG_ID_NL1_EL1_FORCE_GAP_NTF,
+MSG_ID_NL1_EL1_SCG_REL_NOTIFY_IND,
+MSG_ID_NL1_EL1_UDC_CONFIG_UPDATE_NTF,
+#endif
+
+/* Internal message */
+MSG_ID_EL1_IRT_CH_PARAM_CHG_CNF,
+MSG_ID_EL1_IRT_CH_GAP_SUSP_CNF,
+MSG_ID_EL1_IRT_CH_BCCH_CNF,
+MSG_ID_EL1_IRT_CH_AUTO_GAP_STOP_REQ,
+MSG_ID_EL1_IRT_CH_AUTO_GAP_AVAIL_IND,
+MSG_ID_EL1_PHS_CH_DL_BC_ASSIGN_RLT,
+MSG_ID_EL1_PHS_CH_CTRL_CNF,
+MSG_ID_EL1_PHS_CH_DL_CHNG_SET_CNF,
+MSG_ID_EL1_PHS_CH_DL_CHNG_RPT,
+MSG_ID_EL1_PHS_CH_GEMINI_CONFLICT_IND,
+MSG_ID_EL1_PHS_CH_REL_ALL_IND,
+MSG_ID_EL1_PHS_CH_VIRTUAL_MODE_CNF,
+MSG_ID_EL1_PHS_CH_NBR_AUTO_GAP_END_IND,
+MSG_ID_EL1_PHS_CH_MIB_RPT,
+MSG_ID_EL1_PHS_CH_DRX_SLEEP_NTF,
+#if (CUR_GEN >= MD_GEN97)
+MSG_ID_EL1_PHS_CH_COMMON_RFDB_LTE_UPDT_DONE_NTF,
+MSG_ID_ERRC_EL1_VOLTE_CALL_STATUS_IND,
+MSG_ID_EL1_PHS_CH_RSVAS_CANCEL_DL_CHANGE_IND,
+#endif
+MSG_ID_EL1MPC_EL1_MEAS_CH_NBR_PARAM_UPDATE_IND,
+MSG_ID_EL1MPC_EL1_MEAS_CH_SCS_START_CNF,
+MSG_ID_EL1MPC_EL1_MEAS_CH_SCS_CELL_INFO_IND,
+MSG_ID_EL1MPC_EL1_MEAS_CH_SCS_STOP_CNF,
+MSG_ID_EL1MPC_EL1_MEAS_CH_INTER_RMTC_UPDATE_IND,
+MSG_ID_EL1MPC_EL1_LPP_CH_PRS_INFO_UPDT_NTF,
+MSG_ID_EL1MPC_EL1_LPP_IRT_MEASURE_NTF,                   // __EL1_LPP_INTER_RAT_RSTD_SUPPORT__
+MSG_ID_EL1MPC_EL1_CSR_CH_FAKE_SRV_ADD_REQ,
+
+
+/****************************************************************************
+ *                          Destination: PHS
+ ****************************************************************************/
+MSG_ID_ERRC_EL1_CHANNEL_PROTECT_START_REQ,
+MSG_ID_EL1_PHS_MSG_START                = MSG_ID_ERRC_EL1_CHANNEL_PROTECT_START_REQ,
+MSG_ID_ERRC_EL1_CHANNEL_PROTECT_STOP_REQ,
+MSG_ID_ERRC_EL1_DATA_SERVICE_IND,
+MSG_ID_AP_MD_LTE_AUTO_GAP_REQ,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_CD_CTRL_REQ,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_CD_CTRL_STOP_REQ,
+MSG_ID_EL1MPC_CS_ABORT_IND,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_OC_CMD,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_CSI_HO_CMD,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_RSRP_FILTERING_CMD,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_OC_MEAS_CMD,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_RX_OC_CONDITION_CMD,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_RX_VZW_CMD_IND,
+MSG_ID_EL1_EL1MPC_PHS_L1DCS_ABORT_IND,
+MSG_ID_EL1_PHS_TASK_SUSPEND_IND,
+MSG_ID_EL1_PHS_SCH_HIGH_PRIO_IND,
+MSG_ID_EL1_PHS_HOST_DATA_REQ,
+MSG_ID_EL1_PHS_TASK_WAKE_IND,
+MSG_ID_EL1_EL1_TSTM_META_REQ,
+MSG_ID_EL1_EL1_TSTM_TOOL_CNF,
+MSG_ID_EL1_ERRC_FACTORY_CAPABILITY_RSP,
+MSG_ID_ENL1_UTAS_PHS_TAS_IND,
+#if (CUR_GEN >= MD_GEN97)
+MSG_ID_NL1_EL1_SFTD_TIMING_REQ,
+MSG_ID_NL1_EL1_TAS_GAP_IND,
+MSG_ID_NL1_EL1_TAS_GAP_ABORT_IND,
+MSG_ID_NL1_EL1_TAS_GAP_ABORT_RSP,
+MSG_ID_GNSS_TC_EL1_SYNC_REQ,
+MSG_ID_GNSS_TC_EL1_TIME_INFO_RSP, 
+MSG_ID_ERRC_EL1_GCI_IND,
+#endif
+
+/* Internal message */
+MSG_ID_EL1_CH_PHS_DL_CHNG_REQ,
+MSG_ID_EL1_CH_PHS_SCH_RNTI_IND,
+MSG_ID_EL1_CH_PHS_DRX_CTRL_REQ,
+MSG_ID_EL1_CH_PHS_CTRL_REQ,
+MSG_ID_EL1_CH_PHS_RRC_CONFIG_IND,
+MSG_ID_EL1_CH_PHS_UE_CATEGORY_IND,
+MSG_ID_EL1_CH_PHS_SIB1_CRC_NOTIFY_IND,
+MSG_ID_EL1_CH_PHS_LMAC_LOCK_IND,
+MSG_ID_EL1_CH_PHS_RSVAS_SUSPEND_REQ,
+MSG_ID_EL1_CH_PHS_RSVAS_SUSPEND_DONE_IND,
+MSG_ID_EL1_CH_PHS_VIRTUAL_MODE_REQ,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_CTRL_REQ,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_CTRL_STOP_REQ,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_SF_PATTERN_IND,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_SRV_MEASURE_CFG_NTF,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_SCELL_KNOWN_IND,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_IRT_CTRL_REQ,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_IRT_CTRL_STOP_REQ,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_PSIM_SWAP_CNF,
+#if (CUR_GEN >= MD_GEN95)
+MSG_ID_EL1MPC_EL1_MEAS_PHS_DRX_MEAS_GAP_REQ,
+MSG_ID_EL1MPC_EL1_MEAS_PHS_TIMING_CONFIG_IND,
+#endif /* #if (CUR_GEN >= MD_GEN95) */
+MSG_ID_EL1MPC_EL1_CSR_PHS_CTRL_REQ,
+MSG_ID_EL1MPC_EL1_CSR_PHS_CTRL_STOP_REQ,
+MSG_ID_EL1MPC_EL1_LPP_PHS_PRS_CTRL_REQ,
+MSG_ID_EL1MPC_EL1_LPP_PHS_PRS_STOP_REQ,
+MSG_ID_EL1MPC_EL1_LPP_PHS_PRS_ACTIVATE_REQ,
+MSG_ID_EL1MPC_EL1_LPP_PHS_PRS_DEACTIVATE_REQ,
+MSG_ID_EL1_CH_PHS_MSI_NOTIFY,
+MSG_ID_EL1_IRT_PHS_RAT_CHG_REQ,
+MSG_ID_EL1_IRT_PHS_GAP_CANCEL_CNF,
+MSG_ID_EL1_IRT_PHS_AUTO_GAP_CANCEL_CNF,
+MSG_ID_EL1_IRT_PHS_MEAS_GAP_REQ,
+MSG_ID_EL1_IRT_PHS_AUTO_GAP_IND,
+MSG_ID_EL1_IRT_PHS_AUTO_GAP_END_IND,
+MSG_ID_EL1_IRT_PHS_CANCEL_AUTO_GAP_IND, // to force PHS reuturn AUTO_GAP_RES immediately (for SRVCC)
+MSG_ID_EL1_IRT_PHS_GAP_CTRL_REQ,
+MSG_ID_EL1_IRT_PHS_GAP_CANCEL_REQ,
+MSG_ID_EL1_IRT_PHS_GAP_RESUME_IND,
+MSG_ID_EL1_IRT_PHS_GAP_CLEAR_IND,
+MSG_ID_EL1_IRT_PHS_GAP_SUSPEND_CNF,
+MSG_ID_EL1_PHS_MBMS_INFO_IND,
+MSG_ID_EL1_TX_PHS_PSIM_SWAP_CNF,
+#if (CUR_GEN >= MD_GEN97)
+MSG_ID_EL1_EL1_GNSS_TIME_SYNC_REQ,
+MSG_ID_EL1_EL1_GNSS_TIME_SYNC_CNF,
+MSG_ID_EL1_EL1_GNSS_TIME_INFO_RSP,
+MSG_ID_IDC_EL1_PHS_PSIM_SWAP_CNF,
+MSG_ID_IDC_EL1_PHS_RX_GAP_SUSP_REQ,
+MSG_ID_IDC_EL1_PHS_RX_GAP_RESU_IND,
+MSG_ID_IDC_EL1_PHS_WIFI_5G_STATUS_IND,
+#else
+MSG_ID_EL1_IDC_PHS_PSIM_SWAP_CNF,
+#endif
+MSG_ID_EL1_IRT_PHS_ACTV_GAP_IND,
+MSG_ID_EL1_CH_PHS_MRDC_STATUS_IND,
+/****************************************************************************
+ *                          Destination: IRT
+ ****************************************************************************/
+MSG_ID_ERRC_EL1_SET_RAT_REQ,
+MSG_ID_EL1_IRT_MSG_START                = MSG_ID_ERRC_EL1_SET_RAT_REQ,
+MSG_ID_ERRC_EL1_AUTO_GAP_ON_REQ,
+MSG_ID_ERRC_EL1_AUTO_GAP_OFF_REQ,
+MSG_ID_ERRC_EL1_LOCK_SLEEP_NTF,
+
+/* Internal message */
+MSG_ID_EL1MPC_EL1_CSR_IRT_GAP_REQ,
+MSG_ID_EL1_PHS_IRT_RAT_CHG_CNF,
+MSG_ID_EL1_CH_IRT_PARAM_CHG_REQ,
+MSG_ID_EL1_CH_IRT_RECONFIG_DONE_IND,
+MSG_ID_EL1_CH_IRT_GAP_SUSP_REQ,
+MSG_ID_EL1_CH_IRT_GAP_RESUME_IND,
+MSG_ID_EL1_CH_IRT_BCCH_REQ,
+MSG_ID_EL1_CH_IRT_AUTO_GAP_STOP_CNF,
+MSG_ID_EL1MPC_EL1_MEAS_IRT_MEASURE_REQ,
+MSG_ID_EL1MPC_EL1_MEAS_IRT_MEASURE_DONE_IND,
+MSG_ID_EL1MPC_EL1_MEAS_IRT_GAP_SUSP_REQ,
+MSG_ID_EL1MPC_EL1_MEAS_IRT_GAP_RESUME_IND,
+MSG_ID_EL1MPC_EL1_LPP_IRT_IRAT_GAP_PATTERN,
+MSG_ID_EL1_PHS_IRT_DRX_TICK_IND,
+MSG_ID_EL1_PHS_IRT_GAP_PERIOD_IND,
+MSG_ID_EL1_PHS_IRT_GAP_CANCEL_REQ,
+MSG_ID_EL1_PHS_IRT_AUTO_GAP_CANCEL_REQ,
+MSG_ID_EL1_PHS_IRT_GAP_CTRL_CNF,
+MSG_ID_EL1_PHS_IRT_GAP_CANCEL_CNF,
+MSG_ID_EL1_PHS_IRT_AUTO_GAP_RES,
+MSG_ID_EL1_PHS_IRT_GAP_SUSPEND_REQ,
+MSG_ID_EL1_PHS_IRT_GAP_RESUME_IND,
+MSG_ID_EL1_PHS_IRT_STBY_GAP_END_IND,
+MSG_ID_EL1_PHS_IRT_ACTV_GAP_END_IND,
+MSG_ID_EL1_PHS_IRT_TIMING_UPDATE_IND,
+
+/****************************************************************************
+ *                          Destination: MEAS
+ ****************************************************************************/
+MSG_ID_ERRC_EL1MPC_RADIO_MEASURE_REQ,
+MSG_ID_EL1MPC_MEAS_MSG_START               = MSG_ID_ERRC_EL1MPC_RADIO_MEASURE_REQ,
+MSG_ID_ERRC_EL1MPC_SPECIFIC_CELL_DELETE_NTF,
+MSG_ID_ERRC_EL1MPC_HPS_QUALIFY_CELL_NTF,
+MSG_ID_ERRC_EL1MPC_MEASURE_EVENT_NTF,
+MSG_ID_ERRC_EL1MPC_OOS_TRIG_SEARCH_NTF,
+MSG_ID_ERRC_EL1MPC_MBSFN_MEASURE_REQ,
+MSG_ID_ERRC_EL1MPC_MBSFN_MEASURE_NTF,
+MSG_ID_ERRC_EL1MPC_SPB_NTF,
+MSG_ID_ERRC_EL1MPC_MEASUREMENT_INFO_NTF,
+MSG_ID_ERRC_EL1MPC_MEASURE_CFG_NTF,
+MSG_ID_ERRC_EL1MPC_HSR_FREQ_NTF,
+MSG_ID_ERRC_EL1MPC_HSR_MODE_NTF,
+MSG_ID_ETMR_EL1MPC_SRV_TMR_EXPIRY,
+MSG_ID_ETMR_EL1MPC_IRAT_LPP_REF_CD_TMR_EXPIRY,    // __EL1_LPP_INTER_RAT_RSTD_SUPPORT__
+MSG_ID_ETMR_EL1MPC_LIFE_TMR_EXPIRY,
+MSG_ID_ETMR_EL1_VZW_TMR_EXPIRY,
+#ifdef __LOGGING_RATE_ADJ__
+MSG_ID_ERRC_EL1MPC_ADJUST_LOG_INFO,
+#endif /*__LOGGING_RATE_ADJ__*/
+
+/* Internal message */
+MSG_ID_EL1_EL1MPC_IRT_MEAS_GAP_CFG_IND,
+MSG_ID_EL1_EL1MPC_IRT_MEAS_MEAS_GAP_REQ,
+MSG_ID_EL1_EL1MPC_IRT_MEAS_BASE_TIME_IND,
+MSG_ID_EL1_EL1MPC_IRT_MEAS_MODE_CHNG_NTF,
+MSG_ID_EL1_EL1MPC_IRT_MEAS_GAP_SUSP_CNF,
+MSG_ID_EL1_EL1MPC_IRT_MEAS_RAT_STATUS_IND,
+#if (CUR_GEN >= MD_GEN95)
+MSG_ID_EL1_EL1MPC_IRT_MEAS_RPG_GAP_NOTIFY_IND,
+#endif /* #if (CUR_GEN >= MD_GEN95) */
+
+//MSG_ID_EL1_PHS_MEAS_SCHDL_IND,
+//MSG_ID_EL1_PHS_MEAS_CTRL_CNF,
+//MSG_ID_EL1_PHS_MEAS_CONFLICT_IND,
+MSG_ID_EL1_EL1MPC_PHS_MEAS_ABORT_IND,
+MSG_ID_EL1_EL1MPC_PHS_MEAS_SCELL_STATUS_IND,
+MSG_ID_EL1_EL1MPC_PHS_MEAS_CD_CTRL_CNF,
+MSG_ID_EL1_EL1MPC_PHS_MEAS_CD_CTRL_STOP_CNF,
+MSG_ID_EL1_EL1MPC_PHS_MEAS_STB_TRX_FORCE_REPORT_NTF,
+MSG_ID_EL1_EL1MPC_PHS_MEAS_IRT_CTRL_CNF,
+MSG_ID_EL1_EL1MPC_PHS_MEAS_IRT_CTRL_STOP_CNF,
+MSG_ID_EL1_EL1MPC_PHS_MEAS_CTRL_STOP_CNF,
+MSG_ID_EL1_EL1MPC_PHS_MEAS_CTRL_CNF,
+MSG_ID_EL1_EL1MPC_PHS_MEAS_SCHDL_IND,
+#if (CUR_GEN >= MD_GEN95)
+MSG_ID_EL1_EL1MPC_PHS_MEAS_PAGING_IND,
+#endif
+MSG_ID_EL1_EL1MPC_PHS_MEAS_REL_EL1D_BUFF_IND,
+MSG_ID_EL1_EL1MPC_PHS_MEAS_PSIM_SWAP_REQ,
+#if (CUR_GEN >= MD_GEN95)
+MSG_ID_EL1_EL1MPC_PHS_MEAS_DRX_MEAS_GAP_CNF,
+#endif /* #if (CUR_GEN >= MD_GEN95) */
+
+//MSG_ID_EL1_EL1MPC_CH_MEAS_RL_PROBLEM_NTF,
+//MSG_ID_EL1_EL1MPC_CH_MEAS_RL_RECOVER_NTF,
+MSG_ID_EL1_EL1MPC_CH_MEAS_MEAS_MODE_CHNG_IND,
+MSG_ID_EL1_EL1MPC_CH_MEAS_MAIN_CH_STATUS_IND,
+MSG_ID_EL1_EL1MPC_CH_MEAS_DRX_PARAMS_IND,
+MSG_ID_EL1_EL1MPC_CH_MEAS_GAP_PARAMS_IND,
+MSG_ID_EL1_EL1MPC_CH_MEAS_SUBFRAME_CONFIG_IND,
+MSG_ID_EL1_EL1MPC_CH_MEAS_COMMON_PARAMS_IND,
+MSG_ID_EL1_EL1MPC_CH_MEAS_SCELL_CONFIG_IND,
+MSG_ID_EL1_EL1MPC_CH_MEAS_SCELL_STATUS_IND,
+MSG_ID_EL1_EL1MPC_CH_MEAS_EARFCN_UPDATE_IND,
+MSG_ID_EL1_EL1MPC_CH_MEAS_SCS_START_REQ,
+MSG_ID_EL1_EL1MPC_CH_MEAS_SCS_STOP_REQ,
+MSG_ID_EL1_EL1MPC_CH_MEAS_CELL_IND, // should  be removed.
+MSG_ID_EL1_EL1MPC_CH_MEAS_CELL_INFO_UPDT_IND,
+MSG_ID_EL1_EL1MPC_CH_MEAS_IC_ASSIST_CONFIG_IND,
+MSG_ID_EL1_EL1MPC_CH_MPC_RESET_IND,
+MSG_ID_EL1_EL1MPC_CH_MPC_RSVAS_SUSPEND_IND,
+MSG_ID_EL1_EL1MPC_CH_MPC_RSVAS_RESUME_IND,
+MSG_ID_EL1_EL1MPC_TX_MEAS_TX_RX_DIFF_IND,
+MSG_ID_EL1_EL1MPC_RX_TICK_NTF,
+MSG_ID_EL1_EL1MPC_EL1D_RPT_AFC_FWS_ABNORMAL,
+MSG_ID_EL1_EL1MPC_EL1D_RPT_MAX_SRV_RX_NUM,
+MSG_ID_EL1_EL1MPC_CH_MEAS_NBCCH_INFO_UPDT_IND,
+
+
+
+/****************************************************************************
+ *                          Destination: LPP
+ ****************************************************************************/
+MSG_ID_ERRC_EL1MPC_OTDOA_MEAS_REQ,
+MSG_ID_EL1MPC_LPP_MSG_START               = MSG_ID_ERRC_EL1MPC_OTDOA_MEAS_REQ,
+MSG_ID_ERRC_EL1MPC_OTDOA_CTRL_REQ,
+MSG_ID_ETMR_EL1MPC_OTDOA_TMR_EXPIRY,
+MSG_ID_EL1_EL1MPC_PHS_LPP_PRS_CTRL_CNF,
+MSG_ID_EL1_EL1MPC_PHS_LPP_PRS_STOP_CNF,
+MSG_ID_EL1_EL1MPC_PHS_LPP_PRS_ACTIVATE_CNF,
+MSG_ID_EL1_EL1MPC_PHS_LPP_PRS_DEACTIVATE_CNF,
+MSG_ID_EL1_EL1MPC_PHS_LPP_PRS_SCHED_IND,
+MSG_ID_EL1_EL1MPC_IRT_LPP_GAP_CONFIG_IND,    // __EL1_LPP_INTER_RAT_RSTD_SUPPORT__
+
+
+/* Internal message */
+
+/****************************************************************************
+ *                          Destination: CSR
+ ****************************************************************************/
+MSG_ID_ERRC_EL1MPC_CARRIER_SEARCH_REQ,
+MSG_ID_EL1MPC_CSR_MSG_START                = MSG_ID_ERRC_EL1MPC_CARRIER_SEARCH_REQ,
+MSG_ID_ERRC_EL1MPC_SPECIFIC_MEASURE_REQ,
+MSG_ID_ERRC_EL1MPC_RSSI_SNIFFER_REQ,
+MSG_ID_EL1_EL1MPC_PHS_CSR_CTRL_CNF,
+MSG_ID_EL1_EL1MPC_PHS_CSR_CTRL_STOP_CNF,
+MSG_ID_EL1MPC_EL1MPC_BAND_FLT_CONT_NTF,
+MSG_ID_EL1_EL1MPC_CH_CSR_FAKE_SRV_ADD_CNF,
+MSG_ID_ERRC_EL1_ENDC_LIST_INFO,
+
+
+/****************************************************************************
+ *                          Destination: IDC
+ ****************************************************************************/
+#if !(CUR_GEN >= MD_GEN97)
+MSG_ID_EL1_PHS_IDC_PSIM_SWAP_REQ,
+MSG_ID_EL1_IDC_MSG_START                     = MSG_ID_EL1_PHS_IDC_PSIM_SWAP_REQ,
+MSG_ID_ETMR_EL1_TDM_TX_ENABLE_TMR_EXPIRY,
+MSG_ID_ETMR_EL1_TDM_TX_DISABLE_TMR_EXPIRY,
+MSG_ID_ETMR_EL1_IDC_IND_TMR_EXPIRY,
+MSG_ID_ETMR_EL1_IDC_SWMSG_RESEND_TMR_EXPIRY,
+MSG_ID_ETMR_EL1_IDC_SWMSG_DELAY_TMR_EXPIRY,
+MSG_ID_ERRC_EL1_IDC_LTE_PROTECT_NTF,
+MSG_ID_EL1MPC_EL1_IDC_MEAS_OBJECT_NTF,
+MSG_ID_EL1MPC_EL1_IDC_VOLTE_NTF,
+MSG_ID_EL1_EL1_IDC_POST_PROCESS_NTF,
+MSG_ID_EL1_IDC_MSG_END,
+#endif
+
+/****************************************************************************
+ *                          Destination: EL1 TAS
+ ****************************************************************************/
+MSG_ID_ENL1_UTAS_EL1_TAS_INFO_IND,
+MSG_ID_ENL1_UTAS_EL1_RAS_CNF_IND,
+MSG_ID_ENL1_UTAS_EL1_DAT_CNF_IND,
+MSG_ID_ENL1_UTAS_EL1_FM_INFO_IND,
+
+/****************************************************************************
+ *                          Destination: TX
+ ****************************************************************************/
+MSG_ID_EL1_TX_MSG_START,
+MSG_ID_EL1_CH_TX_PDSCH_RPT_FREE_IND,      //add in 6293. (to replace the command queue architecture.)
+MSG_ID_EL1_CH_TX_SETUP_MAX_PWR_IND,       //add in 6293. (to replace the command queue architecture.)
+MSG_ID_EL1_CH_TX_CLEAR_MAX_PWR_IND,       //add in 6293. (to replace the command queue architecture.)
+MSG_ID_EL1_CH_TX_FORCE_MAX_PWR_IND,       //add in 6293. (to replace the command queue architecture.)
+MSG_ID_EL1_CH_TX_DRX_CTRL_IND,            //add in 6293. (to replace the command queue architecture.), rename from CH_TX_DRX_CTRL_REQ
+MSG_ID_EL1_CH_TX_DRX_CYCLE_SLEEP_EN_IND,  //add in 6293. (to replace the command queue architecture.)
+MSG_ID_EL1_CH_TX_INFO_IND,                //add in 6293. (to replace the command queue architecture.) // not used now.
+MSG_ID_EL1_CH_TX_SCH_CLOSE_IND,           //add in 6293. (to replace the command queue architecture.)
+MSG_ID_EL1_CH_TX_GAP_INFO_IND,            //add in 6293. (to replace the command queue architecture.)
+MSG_ID_EL1_CH_TX_DRX_PARAMS_IND,
+MSG_ID_EL1_IRT_TX_AUTO_GAP_IND,           //add in 6293. (to replace the command queue architecture.)
+MSG_ID_EL1MPC_EL1_MEAS_MAIN_SPB_INFO_NTF,
+MSG_ID_EL1MPC_EL1_MEAS_TSTM_SRV_RLT_IND,
+MSG_ID_EL1_PHS_TX_SCELL_ACT_DONE_IND,     //add in 6293. (to replace the command queue architecture.)
+MSG_ID_EL1_PHS_TX_PSIM_SWAP_REQ,          //add in 6293. (to replace the command queue architecture.)
+MSG_ID_EL1_CH_TX_DSP_SNIFFER_IND,         // add in 6297
+MSG_ID_EL1_MSG_END,                       //END of EL1 Messages
+MSG_ID_EL1_TX_TX_CFG_IND,
+
+
+/****************************************************************************
+ *                          EMAC -> EL1-TX
+ ****************************************************************************/
+
+
+/****************************************************************************
+ *                          Destination: EL1_IT
+ ****************************************************************************/
+MSG_ID_ETMR_XL1_GAP_TMR,
+MSG_ID_EL1_TX_IT_CC_INTERRUPT_IND,
+MSG_ID_TC_AUTO_TIMER_EXPIRY_IND,
+
+/****************************************************************************
+ *                          Tool <-> EL1-MAIN
+ ****************************************************************************/
+MSG_ID_EL1_TEST_MODE_ENABLE_REQ,
+MSG_ID_ML1S_EL1_TRX_FEATURE_REQ,
+
+/****************************************************************************/
+
+/****************************************************************************
+ *                          EL1D <-> EL1C
+ ****************************************************************************/
+MSG_ID_EL1_EL1_TASK_WAKE_IND,
+MSG_ID_EL1_L1ADT_ENTER_CONNECTED_REQ,
+MSG_ID_EL1_L1ADT_ENTER_CONNECTED_CNF,
+MSG_ID_EL1_L1ADT_LEAVE_CONNECTED_REQ,
+MSG_ID_EL1_L1ADT_LEAVE_CONNECTED_CNF,
+MSG_ID_EL1_L1ADT_SET_RAT_IND,
+MSG_ID_EL1MPC_CS_RESULTS_IND,
+MSG_ID_EL1MPC_CS_GCC_RESULTS_IND,
+MSG_ID_EL1MPC_CS_ADD_FREQ_REQ,
+MSG_ID_EL1MPC_CS_DELETE_FREQS_REQ,
+MSG_ID_EL1MPC_CS_CSHW_HANG_IND,
+MSG_ID_EL1MPC_CM_NBR_RESULTS_IND,
+MSG_ID_EL1MPC_CM_SRV_RESULTS_IND,
+MSG_ID_EL1MPC_CM_AFC_RESULTS_IND,
+MSG_ID_EL1MPC_CM_MIB_RESULTS_IND,
+MSG_ID_EL1MPC_CM_VZW_RESULTS_IND,
+MSG_ID_EL1MPC_CM_MBSFN_MEAS_RESULTS_IND,
+MSG_ID_EL1MPC_CM_MBSFN_CRC_RESULTS_IND,
+MSG_ID_EL1MPC_POS_RESULTS_IND,
+MSG_ID_EL1MPC_PS_RESULTS_IND,
+MSG_ID_EL1MPC_SCM_RESULTS_IND,
+MSG_ID_EL1_32K_LESS_MEAS_CELL_SFBD_ADJUST_IND,
+MSG_ID_EL1C_EL1_RX_RSSI_VERIFY_IND,
+
+/****************************************************************************
+ *                          EL4C <-> EL1C
+ ****************************************************************************/
+MSG_ID_L4C_EL1_LCE_REPORT_START_REQ,
+MSG_ID_L4C_EL1_LCE_REPORT_STOP_REQ,
+MSG_ID_L4C_EL1_LCE_REPORT_PULLDATA_REQ,
+MSG_ID_L4C_EL1_LCE_REPORT_CNF,
+MSG_ID_L4C_EL1_LCE_REPORT_IND,
+MSG_ID_L4C_EL1_OMADM_UPDATE_REQ,
+
+/****************************************************************************
+ *                          UPCM <-> EL1C
+ ****************************************************************************/
+#if defined(__MTK_INTERNAL_ENG_USER__) || defined(__GAME_LATENCY_OPT_1ST_ARROW__)
+MSG_ID_UPCM_EL1_KG_PATCH_RESET,
+#endif
+/****************************************************************************
+ *                          XL1sim TSTM
+ ****************************************************************************/
+
+MSG_ID_EL1_EL1_ENTER_FACTORY_MODE_REQ,
+MSG_ID_EL1_EL1_ENTER_NORMAL_MODE_REQ,
+
+/****************************************************************************
+ *                          EL1D <-> DCLC(Dynamic Cache Lock Control)
+ ****************************************************************************/
+#if defined(__DYNAMIC_CACHE_LOCK_CENTRAL_CONTROL_SUPPORT__)
+MSG_ID_EL1_DCLC_LOCK_UNLOCK_IND,
+#endif
+
+/****************************************************************************
+ *                          EL1 (TG1_HISR) <-> ENL1
+ ****************************************************************************/
+MSG_ID_EL1_ENL1_NOTIFY_IND,
+
+/****************************************************************************
+ * MT6293
+ ****************************************************************************/
+
+
+MODULE_MSG_END( MSG_ID_EL1_CODE_TAIL )
+
+#endif /* _EL1_MSGID_H */
+
diff --git a/mcu/interface/sap/md/el1_phs_msgid.h b/mcu/interface/sap/md/el1_phs_msgid.h
new file mode 100644
index 0000000..93ef4ff
--- /dev/null
+++ b/mcu/interface/sap/md/el1_phs_msgid.h
@@ -0,0 +1,126 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   el1_phs_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   LTE Layer 1 and Protocol Stack related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 06 28 2016 gary.liu
+ * [MOLY00186977] merge el1c code to umolya
+ * 	
+ * 	add new message id and change msg range for el1
+ *
+ * 06 27 2016 lawrence.chen
+ * [MOLY00183642] new task EL1_MPC definition for 6293
+ * MSG Id rename for the new task EL1_MPC.
+ *
+ * 04 26 2016 shihyao.wang
+ * [MOLY00175997] [EL1C] umolya code sync
+ * 93 code sync from panu cbr (label=UMOLY_92L1Dev.W1617.p4).
+ *
+ * 01 22 2016 panu.peisa
+ * [MOLY00147611] MT6292 EL1 code merge from UMOLY_92L1Dev CBr to UMOLY
+ * Integrated mcu/make, mcu/common mcu/pcore changes from 1985248 to 2011226 ( swrd part).
+ *
+ * 11 16 2015 panu.peisa
+ * [MOLY00147611] MT6292 EL1 code merge from UMOLY_92L1Dev CBr to UMOLY
+ * Integrated mcu/common, mcu/make and mcu/pcore changes between 1809051 and 1826317 ( swrd part ).
+ *
+  ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _EL1_PHS_MSGID_H
+#define _EL1_PHS_MSGID_H
+
+/****************************************************************************
+ *                          PHS TASK definitions
+****************************************************************************/
+#if 0
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif
+#endif /* _EL1_MSGID_H */
+
diff --git a/mcu/interface/sap/md/el1_tx_msgid.h b/mcu/interface/sap/md/el1_tx_msgid.h
new file mode 100644
index 0000000..2b52c5e
--- /dev/null
+++ b/mcu/interface/sap/md/el1_tx_msgid.h
@@ -0,0 +1,80 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   el1_tx_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   LTE Layer 1 and Protocol Stack related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 06 28 2016 chialin.wu
+ * [MOLY00176078] [EL1C] UMOLYA code sync
+ * .
+ *
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _EL1_TX_MSGID_H
+#define _EL1_TX_MSGID_H
+
+/****************************************************************************
+ *                          TX TASK definitions
+****************************************************************************/
+
+MODULE_MSG_BEGIN( MSG_ID_EL1_TX_CODE_BEGIN )
+
+/****************************************************************************
+ *                          Destination: TX
+ ****************************************************************************/
+/* Internal message */
+
+MODULE_MSG_END( MSG_ID_EL1_TX_CODE_TAIL )
+
+#endif /* _EL1_MSGID_H */
+
diff --git a/mcu/interface/sap/md/el1b_msgid.h b/mcu/interface/sap/md/el1b_msgid.h
new file mode 100644
index 0000000..6142992
--- /dev/null
+++ b/mcu/interface/sap/md/el1b_msgid.h
@@ -0,0 +1,71 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *  el1b_msgid.h
+ *
+ * Project:
+ * --------
+ *  U4G adaptor
+ *
+ * Description:
+ * ------------
+ *  EL1B message id definitions
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ *
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef EL1B_MSGID_H
+#define EL1B_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_EL1B_CODE_BEGIN )
+/****************************************************************************/
+
+MSG_ID_U4G_TICK_IND                = MSG_ID_EL1B_CODE_BEGIN,
+
+/****************************************************************************/
+MODULE_MSG_END( MSG_ID_EL1B_CODE_TAIL )
+
+#endif /* EL1B_MSGID_H */
diff --git a/mcu/interface/sap/md/el1tst_msgid.h b/mcu/interface/sap/md/el1tst_msgid.h
new file mode 100644
index 0000000..f1bb980
--- /dev/null
+++ b/mcu/interface/sap/md/el1tst_msgid.h
@@ -0,0 +1,82 @@
+/*******************************************************************************
+*  Modification Notice:
+*  --------------------------
+*  This software is modified by MediaTek Inc. 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:
+ * ---------
+ * el1tst_msgid.h
+ *
+ * Project:
+ * --------
+ *   MT6291
+ *
+ * Description:
+ * ------------
+ *   el1tst_msgid.h
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *============================================================================
+ *             HISTORY
+ * Below this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *------------------------------------------------------------------------------
+ * 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 _EL1TST_MSGID_H
+#define _EL1TST_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_EL1TST_CODE_BEGIN )
+MSG_ID_EL1TST_TO_DHL = MSG_ID_EL1TST_CODE_BEGIN,
+MSG_ID_EL1TASK_WAKEUP,
+MODULE_MSG_END( MSG_ID_EL1TST_CODE_TAIL )
+
+#endif  //_EL1TST_MSGID_H
diff --git a/mcu/interface/sap/md/el2_msgid.h b/mcu/interface/sap/md/el2_msgid.h
new file mode 100644
index 0000000..b3adf70
--- /dev/null
+++ b/mcu/interface/sap/md/el2_msgid.h
@@ -0,0 +1,429 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   el2_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   
+ *
+ * Author:
+ * -------
+ *   
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 12 17 2018 mingtsung.sun
+ * [MOLY00372769] [VMOLY] enable ENL2 on Gen95 HW platform
+ * ENL2 migration - interface
+ *
+ * 09 07 2018 yuri.huang
+ * [MOLY00344924] [VMOLY][BuildEnv] merge back from Gen97 Dev to VMOLY
+ * 	
+ * 	.
+ *
+ * 08 27 2018 yk.liu
+ * [MOLY00327926] [GEN97][ENPDCP] base development check-in
+ * CUR_GEN >= MD_GEN97
+ *
+ * 08 15 2018 yk.liu
+ * [MOLY00327926] [GEN97][ENPDCP] base development check-in
+ * .
+ *
+ * 07 18 2018 steve.kao
+ * [MOLY00339307] The handling of energy depletion attack by STMSI paging from fake cell
+ * Inactivity Detection Timer 2
+ *
+ * 07 10 2018 slifer.hsueh
+ * [MOLY00337915] [MT6295][EL2] Fast retransmission of RLC STATUS PDU upon UL HARQ failure
+ * Define message id for STATUS PDU feedback
+ *
+ * 06 29 2018 guang-yu.zheng
+ * [MOLY00335879] [MT6295] ML1S multiple TAG flow adding
+ * EMAC-ML1S sTAG TA flow development
+ *
+ * 06 20 2018 kung-hao.chung
+ * [MOLY00334174] [MT6295][EL2] Remove RB suspend/resume ILM between EPDCP and ERLCUL
+ * remove two unsused msgids
+ *
+ * 06 11 2018 jia-shi.lin
+ * [MOLY00319373] [MT6295] recommended bit rate feature
+ * recommended bit rate feature: upcm-emac interface
+ *
+ * 04 17 2018 nicole.hsu
+ * [MOLY00320104] [ICD] Patch back to UMOLYE
+ * [UMOLYE][EL2ICD] el2icd framework
+ *
+ * 04 17 2018 nicole.hsu
+ * [MOLY00320104] [ICD] Patch back to UMOLYE
+ * [UMOLYE][EL2ICD] el2icd framework
+ *
+ * 04 13 2018 slifer.hsueh
+ * [MOLY00308368] [MT6763][Bianco][O1][MP2][TMO][WW FT][United States][Seattle][Nokia][4GMM][F4L][Data][HTTP][UL] HTTP UL Average Throughput Fail by 0.186 as compared to REF LG G4 device during Datum Exp1 Round3 on 30th Jan in Poor Signal Static condition
+ * Define message id for RB poll request
+ *
+ * 03 19 2018 guang-yu.zheng
+ * [MOLY00313850] [MT6295] MML2 DVFS control feature development
+ * MML2 DVFS control and MCU DVFS re-org
+ *
+ * 01 09 2018 timothy.yao
+ * [MOLY00300298] [PVT must resolve] ·L«H??¥]ºC?? - el2 msg
+ * sending pdcp invalid control pdu to avoid entering sleep. (UMOLYA - common)
+ *
+ * 11 06 2017 mf.jhang
+ * [MOLY00272042] [MT6295][93/95 re-arch] Add EMAC ML1S interface
+ * .
+ *
+ * 08 18 2017 mf.jhang
+ * [MOLY00272042] [MT6295 Dev] Add EMAC ML1S interface
+ * add EMAC ML1S interface.
+ * 10 03 2017 jia-shi.lin
+ * [MOLY00281754] [MT6763] UL HARQ early close for volte low power enhancement
+ * early ul harq close for volte low power
+ *
+ * 10 03 2017 jia-shi.lin
+ * [MOLY00281754] [MT6763] UL HARQ early close for volte low power enhancement
+ * early ul harq close for volte low power
+ *
+ * 10 03 2017 jia-shi.lin
+ * [MOLY00281754] [MT6763] UL HARQ early close for volte low power enhancement
+ * early ul harq close for volte low power
+ *
+ * 09 20 2017 nicole.hsu
+ * [MOLY00279184] [PCT][Anritsu][CAG50C][E40][7.1.1.2] fail
+ * [TRUNK] LCID vs. support release handling
+ *
+ * 08 22 2017 cammie.yang
+ * [MOLY00269598] [Gen93]TPB/Mobility Ctrl patch check in
+ * [TRUNK][Merged from R1][EPDCP][HST] set vip bit and notify VoLTE bearer for ERLCUL
+ *
+ * 08 03 2017 wen-jiunn.liu
+ * [MOLY00268551] Task batch scheduling for LTE Low power
+ * [EL2] Task Rescheduling for Low Power Polling Tick Change
+ *
+ * 08 03 2017 wen-jiunn.liu
+ * [MOLY00268551] Task batch scheduling for LTE Low power
+ * [EL2] Task Rescheduling for Low Power Polling Tick Change
+ *
+ * 07 28 2017 nicole.hsu
+ * [MOLY00267509] [MT6763][Bianco][N1][MTBF][PHONE][Overnight][HQ][Lab][Ericsson][ASSERT] file:mcu/common/driver/dpcopro/src/dpcopro_mmu_drv.c line:1616
+ * [TRUNK] move LMAC HARQ reset to el2pow
+ *
+ * 07 24 2017 nicole.hsu
+ * [MOLY00266293] [Blocking][MT6763][Bianco][N1][India FT][Mumbai][WW FT][eMBMS][RJIO]  md1:(USIP1_USIP0) [ASSERT] file:md32/usip/brp/modem/lte/top/src/4g_top_irq.c line:2004
+ * [TRUNK] fix Poll control of TXLISR and EL2POW
+ *
+ * 07 18 2017 nicole.hsu
+ * [MOLY00263936] [BIANCO][MT6763][RDIT][PHONE][GCF][TS8980][FDD B7,TC 5.2.1]Handoff delay exceed 190ms when LTE handoff to WCDMA
+ * [TRUNK] power on Copro before TXLISR handle SCH_CLOSE (for LMAC HARQ RESET)
+ *
+ * 07 17 2017 peter.yu
+ * [MOLY00263749] [VOLTE][HST][Anite][02.v01.020][5.1.1][E39]FAIL.No MOS score returned. Error code: -5.
+ * Overwirte unreasonable RLC configuration - t-Reordering timer.
+ *
+ * 07 06 2017 slifer.hsueh
+ * [MOLY00261868] [6293]UL SIT new handling
+ * Add message id for EL2 RB sync procedure
+ *
+ * 06 01 2017 nicole.hsu
+ * [MOLY00254331] [MT6763][EM] EL2EM maintenance and EMAC EM update
+ * [EMAC] EM update
+ * [EL2EM] add trace and fix report mechanism
+ *
+ * 06 01 2017 steve.kao
+ * [MOLY00252964] [6293] API update for LTECSR VoLTE EBI indication
+ * 	
+ * 	[UMOLYA][TRUNK] API update for LTECSR VoLTE EBI indication
+ *
+ * 05 16 2017 nicole.hsu
+ * [MOLY00249804] [BIANCO][MT6763][RDIT][FT][FDD][HK][SIM1:CMHK][SIM2:SMT][Overnight][ASSERT] file:mcu/common/driver/dpcopro/src/l2_4g_dl_lmac.c line:214
+ * 1. enable el2pow
+ * 2. interface change for sch_close
+ *
+ * 04 25 2017 slifer.hsueh
+ * [MOLY00244795] [BIANCO][MT6763][RDIT][NVIOT][FDD][Nokia][4G] Assert fail: dpcopro_mmu_drv.c 1303 - IPCORE
+ * Add EL2 message id for RB lock/unlock
+ *
+ * 04 06 2017 nicole.hsu
+ * [MOLY00226654] [MT6293][EL2POW] EL2 L2Copro power control
+ * [EL2POW]
+ * - Basic function
+ * - L+X, L+L
+ * - Meta mode, L1S
+ * - UT
+ *
+ * 03 13 2017 nicole.hsu
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * ML1S
+ * - Force NEWTX when ML1S request is sent
+ *
+ * 02 24 2017 mf.jhang
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * .Add ML1S ILM handler
+ *
+ * 02 10 2017 steve.kao
+ * [MOLY00228972] [UMOLYA][EPDCP][R-SIM] Interface with ERRC for Remote SIM
+ * [EPDCP][R-SIM] Interface with ERRC for Remote SIM.
+ *
+ * 02 06 2017 peter.yu
+ * [MOLY00207733] [MT6293][EL2] ERLCDL development
+ * [M-SIM] Sync R-SIM related interfaces, remove redundant message IDs related to ERLC.
+ *
+ * 01 24 2017 nicole.hsu
+ * [MOLY00226654] [MT6293][EL2POW] EL2 L2Copro power control
+ * Add EL1 msgid and temp ilm handling
+ *
+ * 01 16 2017 eddie.wang
+ * [MOLY00210650] [MT6293][UMOLYA TRUNK] EMAC maintenance
+ * [MSIM] Add RSVAS suspend msg id
+ *
+ * 01 05 2017 nicole.hsu
+ * [MOLY00223067] [MT6293] EL2 EM implementation
+ * EL2EM framework, merge to TRUNK
+ *
+ * 12 26 2016 mf.jhang
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * merge DVFS IF code
+ *
+ * 11 14 2016 chih-cheng.yang
+ * [MOLY00213122] [MT6293][EL2] EL2 FPGA IT phase II source code integration
+ * 1. refine  RB/MBMS RSMT release
+ * 2. refine epdcp polling rsmt
+ * 2. add coverage
+ *
+ * 10 28 2016 jia-shi.lin
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * emac timing report for volte dsp
+ *
+ * 10 25 2016 chih-cheng.yang
+ * [MOLY00209240] [MT6293][EL2] EL2 FPGA IT phase 1 source codes integration
+ * new sap and message id for ERLCDL to notify EPDCP to release RSMT when releasing RB
+ *
+ * 10 06 2016 ville.pukari
+ * [MOLY00150835] ML1S Test Environment Support
+ * 	
+ * 	[UMOLYA] Sync code from UMOLY Trunk CL2228706, CL2455350, CL2529740 and CL2821387
+ *
+ * 08 25 2016 jia-shi.lin
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * EMAC EL1 interface change
+ *
+ * 08 16 2016 wen-jiunn.liu
+ * [MOLY00194298] [UMOLYA] EL2 + EMAC Code Review
+ * Sync to Latest PS.DEV (CL-2728660)
+ * 
+ * CL-2728660 - el2 vrb virtual space shortage handling framework
+ *
+ * 08 16 2016 wen-jiunn.liu
+ * [MOLY00194298] [UMOLYA] EL2 + EMAC Code Review
+ * el2 vrb virtual space shortage handling framework
+ * 08 09 2016 nicole.hsu
+ * [MOLY00196065] [MT6293][folder structure] Move EL1/EL2 files from LTE domain to SWRD domain
+ * 93 EL2 others
+ *
+ *
+ * 07 27 2016 jeremy.chen
+ * [MOLY00190683] [UMOLYA][6293] EL2 merge back to UMOLYA TRUNK & PS DEV
+ * [common][OA domain] merge from UESIM CBr
+ *
+ * 07 19 2016 eddie.wang
+ * [MOLY00191921] Sync UMOLY to UMOLYA.PS.DEV
+ * Sync el2_msgid.h from UMOLY CL2582165 CL2529014
+ *
+ * 06 28 2016 eddie.wang
+ * [MOLY00187041] Sync errc_emac_msg.h from UMOLY to UMOLYA
+ * Add MSG_ID_ERRC_EMAC_MEAS_GAP_IND
+ *
+ * 03 15 2016 ryan.ou
+ * [MOLY00162291] [MT6292] EMAC code sync from LR11 to UMOLY
+ * CL1867761, [MOLY00151000] [MT6755] SRVCC Enhancement.
+ *
+ * 01 11 2016 kathie.ho
+ * [MOLY00156229] [MT6292] Code sync from MT6291: AuDRX
+ * .
+ *
+ * 01 09 2016 nienteh.hsu
+ * [MOLY00159548] [6292] ERLC code sync from LR11 to UMOLY (2015/12) 
+ * SWRD domain part	
+ * 	.
+ *
+ * 12 30 2015 antti.karjalainen
+ * [MOLY00153335] UL bucket management for UL CA and 64QAM: EPDCP
+ *
+ * 11 27 2015 ville.pukari
+ * [MOLY00150835] ML1S Test Environment Support:
+ * 	
+ * 	EMAC support for ML1S Test Mode
+ *
+ * 07 16 2015 chen-wei.wang
+ * [MOLY00118157] [TK6291]ERLC code maintain
+ * ERLC status proh timer modification
+ *
+ * 07 06 2015 shengyi.ho
+ * [MOLY00125586] [TK6291E1][MVTV-D][4G][TDD][TDD_MIMO_7.2]assert fail : el1tx.c 731
+ * 1) add EMAC_EL2TASK_LOCK/UNLOCK_POWER_REQ
+ *
+ * 06 18 2015 mingtsung.sun
+ * [MOLY00121332] [TK6291] 4G EAS low power check in
+ * add QBM/EL2 power control messages for LogDMA
+ *
+ * 06 15 2015 sc.tung
+ * [MOLY00121440] [TK6291] eL2 development check in CR
+ * 	Add MSG_ID_ERRC_C_RNTI_RA_PROBING_REQ for probing req.
+ *
+ * 06 15 2015 mingtsung.sun
+ * [MOLY00121332] [TK6291] 4G EAS low power check in
+ * eL2 low power and ePDCP code sync: el2_msgid.h
+ *
+ * 06 03 2015 mingtsung.sun
+ * [MOLY00118161] [MT6291] EPDCP CR Sync - Early reestablishment to prevent certain kind of VoLTE call drop
+ * RD domain
+ *
+ * 03 18 2015 chen-wei.wang
+ * [MOLY00099525] [TK6291] EMAC MDT feature check-in
+ * interface file check-in
+ *
+ * 02 13 2015 mingtsung.sun
+ * [MOLY00091822] RATDM reorganization
+ * .
+ *
+ * 12 16 2014 yuting.chen
+ * [MOLY00084807] [MT6291_DEV] EL2 Low Power Flow
+ * .
+ *
+ * 12 12 2014 yk.liu
+ * [MOLY00086350] [MT6291][L234 P2P] Enable EL2 PDU drop, ping no reply after 30min
+ * 	.
+ *
+ * 11 11 2014 yiting.cheng
+ * [MOLY00084042] [UMOLY] merge UMOLY_DEV to UMOLY trunk
+ * .
+ *
+ * 10 28 2014 andrew.wu
+ * [MOLY00079018] [MT6291_DEV] ePDCP batch I UT related modification
+ * Merging
+ * 	
+ * 	//UMOLY_CBr/andrew.wu/MT6291_DEV_EPDCPDEVW1427P1/mcu/common/interface/sap/md/errc_msgid.h
+ * 	
+ * 	to //UMOLY/DEV/MT6291_DEV/mcu/common/interface/sap/md/errc_msgid.h
+ *
+ * 09 18 2014 shengyi.ho
+ * [MOLY00077592] [TK6291] code sync from CBr to TK6291_DEV - emac
+ * .
+ *
+ * 08 26 2014 sh.yang
+ * [MOLY00077290] [TK6291_DEV] ILM/Event scheduler wrapper for LISR2HISR removal
+ * .
+ *
+ * 08 22 2014 jy.ou
+ * [MOLY00076104] [TK6291] EMAC & ERLC UT framework and ERLC UT cases
+ * .
+ *
+ * 08 21 2014 mingtsung.sun
+ * [MOLY00072902] [TK6291][DEV] LTT unit test framework
+ * Merging
+ *      
+ *     //UMOLY_CBr/eric.hsieh/TK6291_DEV_ESL/mcu/common/interface/sap/...
+ *      
+ *     to //UMOLY/DEV/TK6291_DEV/mcu/common/interface/sap/...
+ *
+ * 08 14 2014 andrew.wu
+ * [MOLY00075397] [TK6291_DEV] code sync MOLY00072445 from MOLY to TK6291_DEV
+ * Interface check-in for EPDCP_EMAC_LEAVE_DRX
+ *
+ * 07 30 2014 yiting.cheng
+ * [MOLY00073830] [TK6291_DEV] check-in TK6291 modification
+ * modify sap
+ *
+ * 07 29 2014 andrew.wu
+ * [MOLY00073873] [TK6291_DEV] EPDCP-ERRC interfaces check-in
+ * add ERRC_EPDCP_MTCH_PC_REQ
+ *
+ * 07 28 2014 nienteh.hsu
+ * [MOLY00073836] [TK6291][ERRC][CHM] LTE-A CHM development code check-in
+ *     .
+ *
+ * 01 15 2014 slifer.hsueh
+ * [MOLY00053104] [MT6290E2][NAS RTD][MM][FDD] Assert fail: driver/l2copro/cipher/src/cipher_common.c 196 - L2COPRO
+ * Merge codes related to L2 copro delay power off back to MOLY TRUNK in OA domain
+ *
+ * 01 06 2014 mf.jhang
+ * [MOLY00051983] [MT6582LTE][WWFT][Germany][Vodafone]Ping RTT is more than benchmark
+ * Add HOST_DATA_READY_IND
+ *
+ * 12 03 2013 lewis.yu
+ * [MOLY00048832] power down/on in EL2 task context and refine the flow
+ * .
+ *
+ * 09 26 2013 lewis.yu
+ * [MOLY00039195] [MT6290] [Low Power] LTE L2 copro power down in LTE flight mode
+ * .
+ *
+ * 07 12 2013 stanleyhy.chen
+ * [MOLY00029602] [New Feature] NBR_CELL_INFO and TA_INFO related interfaces
+ * TA_INFO and NBR_CELL_INFO interfaces for LPP feature
+ *
+ * 05 15 2013 moja.hsu
+ * [MOLY00007625] Maintain code
+ * add el2 message for ERT task to ERT HISR.
+ *
+ * 03 20 2013 jeremy.chen
+ * [MOLY00007127] [MT7208] EL2 enhancement in MOLY
+ * add IDC-related interface
+ *
+ * 02 26 2013 jeremy.chen
+ * [MOLY00007127] [MT7208] EL2 enhancement in MOLY
+ * add MSG_ID_ERLCUL_EPDCP_SRB_DATA_CNF.
+ ****************************************************************************/
+
+#ifndef _EL2_MSGID_H
+#define _EL2_MSGID_H
+
+#ifdef __EL2_ARCH_V2__  
+#include "MD97/_el2_msgid.h"
+#else
+#include "MD95/_el2_msgid.h"
+#endif /* __EL2_ARCH_V2__ */
+
+
+#endif /* _EL2_MSGID_H */
diff --git a/mcu/interface/sap/md/el2_v2_msgid.h b/mcu/interface/sap/md/el2_v2_msgid.h
new file mode 100644
index 0000000..245037d
--- /dev/null
+++ b/mcu/interface/sap/md/el2_v2_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) 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).
+*
+*****************************************************************************/
+
+#ifndef _EL2_V2_MSGID_H
+#define _EL2_V2_MSGID_H
+
+#ifdef __EL2_ARCH_V2__
+#include "MD97/_el2_msgid.h"
+#else
+#include "MD95/_el2_msgid.h"
+#endif
+
+#endif /* _EL2_V2_MSGID_H */
diff --git a/mcu/interface/sap/md/elt_msgid.h b/mcu/interface/sap/md/elt_msgid.h
new file mode 100644
index 0000000..a2aadc7
--- /dev/null
+++ b/mcu/interface/sap/md/elt_msgid.h
@@ -0,0 +1,949 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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 _ELT_MSG_ID_H
+#define _ELT_MSG_ID_H
+
+/*****************************************************************************
+*
+* FILE NAME   :elt_msgid.h
+*
+* DESCRIPTION :
+*
+*
+*
+* HISTORY     :
+*     See Log at end of file
+*
+*****************************************************************************/
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+#include "do_rmc_msgid.h"
+#include  "do_clc_msgid.h"
+
+#undef MSGID_SET
+#undef MSGID_NEXT
+
+#define MSGID_SET(name, val) name = val + MSG_ID_ELT_CODE_BEGIN
+#define MSGID_NEXT(name) name
+
+
+MODULE_MSG_BEGIN( MSG_ID_ELT_CODE_BEGIN )
+    /*** 1xRTT LMD ***/
+    MSGID_SET( MSG_ID_UTS_LMD_FWD_FCH_CFG_MSG , 0),
+    MSGID_NEXT(MSG_ID_UTS_LMD_REV_FCH_CFG_MSG),
+    MSGID_NEXT(MSG_ID_UTS_LMD_SVC_FSCH_CFG_MSG),
+    MSGID_NEXT(MSG_ID_UTS_LMD_SVC_RSCH_CFG_MSG),
+    MSGID_NEXT(MSG_ID_UTS_LMD_FWD_TRAFFIC_BAD_FRAME_MSG),
+    MSGID_NEXT(MSG_ID_UTS_LMD_FWD_FER_STATS_MSG),
+    MSGID_NEXT(MSG_ID_UTS_LMD_FWD_STATS_MSG),
+
+    MSGID_NEXT(MSG_ID_UTS_LMD_TDSO_FCH_RX_STATS_MSG),
+    MSGID_NEXT(MSG_ID_UTS_LMD_TDSO_FCH_TX_STATS_MSG),
+    MSGID_NEXT(MSG_ID_UTS_LMD_TDSO_SUPP_TX_STATS_MSG),
+    MSGID_NEXT(MSG_ID_UTS_LMD_TDSO_SUPP_RX_STATS_MSG),
+    MSGID_NEXT(MSG_ID_UTS_LMD_TDSO_SUPP_PDU_RX_STATS_MSG),
+
+    /*** 1xRTT RLP ***/
+    MSGID_NEXT(MSG_ID_UTS_XRLP_FWD_FRAME_MSG),
+    MSGID_NEXT(MSG_ID_UTS_XRLP_REV_FRAME_MSG),
+    MSGID_NEXT(MSG_ID_UTS_XRLP_EVENT_STATS_MSG),
+
+    /*** 1xRTT PSW ***/
+    MSGID_NEXT(MSG_ID_UTS_PSW_LOC_TX_MSG),
+    MSGID_NEXT(MSG_ID_UTS_PSW_LOC_RX_MSG),
+    MSGID_NEXT(MSG_ID_UTS_PE_ERI_VAL_MSG),
+    MSGID_NEXT(MSG_ID_UTS_PE_QPCH_MEAS_MSG),
+    MSGID_NEXT(MSG_ID_UTS_SCC_PS_PKT_HAT_HT_TMR_MSG),
+    MSGID_NEXT(MSG_ID_UTS_SCC_PS_PKT_ZONE_LIST_MSG),
+    MSGID_NEXT(MSG_ID_UTS_PE_MSG_WAITING_MSG),
+    MSGID_NEXT(MSG_ID_UTS_PE_SIGNAL_INFO_RECORD_MSG),
+    MSGID_NEXT(MSG_ID_UTS_PSW_REPORT_EVENT_MSG),
+    MSGID_NEXT(MSG_ID_UTS_PS_SMS_SUCC_BS_SMS_ACK_MSG),
+    MSGID_NEXT(MSG_ID_UTS_SMS_ETS_API_MSG),
+    MSGID_NEXT(MSG_ID_UTS_OTASP_UPDATE_DATA_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_STATE_MSG),
+    MSGID_NEXT(MSG_ID_UTS_PSW_MEASUREMENT_RESULT_MSG),
+    MSGID_NEXT(MSG_ID_UTS_PSW_IGNORE_MATCHED_PAGE_PARAM_MSG),
+
+    /*** L1D ***/
+    MSGID_NEXT(MSG_ID_UTS_L1D_SEARCH_RESULTS_MSG),
+    MSGID_NEXT(MSG_ID_UTS_L1D_TX_RESULTS_MSG),
+    MSGID_NEXT(MSG_ID_UTS_L1D_RPC_REPORT_MSG),
+
+    /*RMC SCH PHY UT*/
+    MSGID_NEXT(MSG_ID_UTS_RMC_SEARCH_RESULTS_CHECK_MSG),
+
+    /*** HWD ***/
+    MSGID_NEXT(MSG_ID_UTS_HWD_FREQ_CHAN_MSG),
+
+    /*** EVDO ***/
+    /** FCP **/
+    /* DSAF */
+    //MSGID_NEXT(MSG_ID_UTS_CP_FCP_OHD_MSG),
+    //MSGID_NEXT(MSG_ID_UTS_CP_FCP_OTA_MSG),
+    //MSGID_NEXT(MSG_ID_UTS_CP_FCP_SLPD_HDR_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_FCP_SNP_RAW_DATA_MSG),
+    /* PAF */
+    MSGID_NEXT(MSG_ID_UTS_CP_FCP_PAF_DPARLP_STAT_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_FCP_PAF_MFPARLP_STAT_MSG),
+
+    /* FTM */
+    MSGID_NEXT(MSG_ID_UTS_CP_FCP_DRC_TABLE_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_FCP_PACKET_REC_CDM_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_FCP_PERF_STAT_MSG),
+
+    /* CCM */
+    MSGID_NEXT(MSG_ID_ELT_CCM_SUPERVISION_EXPIRED_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CCM_SUPERVISION_EXPIRED_RSP_MSG),
+
+    /** RCP **/
+    /* DSAR */
+    //MSGID_NEXT(MSG_ID_UTS_CP_RCP_OTA_MSG),
+    //MSGID_NEXT(MSG_ID_UTS_CP_FCP_SLPD_HDR_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_RCP_SNP_RAW_DATA_MSG),
+    /* PAR */
+    MSGID_NEXT(MSG_ID_UTS_CP_RCP_PAR_RLP_STAT_MSG),
+    /* RTM */
+    MSGID_NEXT(MSG_ID_UTS_CP_RCP_RTM3_PACKET_INFO_STATES_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_RCP_RTM3_STATES_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_RCP_RTM3_T2P_STAT_STATES_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_RCP_RTM_GRANT7_MSG),
+    /* TXH */
+    MSGID_NEXT(MSG_ID_UTS_CP_RCP_TXAGC_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_RCP_CRCRESULTS_MSG),
+
+    /** HLP spy **/
+    MSGID_NEXT(MSG_ID_UTS_CP_HLP_RM_FWD_PPP_FRAME_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_HLP_RM_REV_PPP_FRAME_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_HLP_UM_FWD_PPP_FRAME_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_HLP_UM_REV_PPP_FRAME_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_HLP_A12_FWD_PPP_FRAME_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_HLP_A12_REV_PPP_FRAME_MSG),
+
+    /** RUP **/
+    MSGID_NEXT(MSG_ID_UTS_CP_RMC_RUP_PILOT_SEARCH_STATUS_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_RMC_RUP_PILOT_SET_STATUS_MSG),
+    MSGID_NEXT(MSG_ID_ELT_RUP_PILOT_SUPERVISION_EXPIRED_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_RUP_PILOT_SUPERVISION_EXPIRED_RSP_MSG),
+
+    /** RMC **/
+    MSGID_NEXT(MSG_ID_UTS_CP_RMC_DO_RFC_RXTX_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_RMC_FMP_MAC_POSITION_MSG),
+
+    /** CLC **/
+    MSGID_NEXT(MSG_ID_UTS_CP_CLC_L3_STATE_MSG),
+
+    /** SLC **/
+    MSGID_NEXT(MSG_ID_UTS_CP_SLC_SESSION_STATE_MSG),
+
+    /** VAL **/
+    MSGID_NEXT(MSG_ID_UTS_CP_VAL_GPS_LOC_UPDATE_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CP_VAL_GPS_SEARCH_EVENT_MSG),
+
+    /* DSPM(CPH) Trace Or Spy Msg*/
+    MSGID_NEXT(MSG_ID_UTS_CPH_FPC_CONFIG_SPY_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CPH_FPC_OUT_LP_SPY_MSG),
+    MSGID_NEXT(MSG_ID_UTS_CPH_SCH_FNGR_STATUS_SPY_MSG),
+
+    MSGID_NEXT(MSG_ID_UTS_CPH_RX_TX_PWR_INFO_SPY_MSG),
+
+    /* TRACE SPY end */
+
+
+    /* ELT CMD and RSP start */
+    MSGID_NEXT(MSG_ID_ELT_VAL_ALL_DATA_INIT_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_POWER_CTRL_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_GET_ALERT_STATUS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_GET_ALERT_STATUS_RSP_MSG),
+
+    /** HLP trace **/
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_ACT_PROFILE_ID_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_ACT_PROFILE_ID_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_ACT_PROFILE_ID_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_ACT_PROFILE_ID_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_AN_NAI_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_AN_NAI_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_AN_NAI_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_AN_NAI_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_AN_PASSWORD_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_AN_PASSWORD_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_AN_PASSWORD_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_AN_PASSWORD_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_AN_BINARY_PASSWORD_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_AN_BINARY_PASSWORD_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_QNC_ENABLED_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_QNC_ENABLED_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_QNC_ENABLED_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_QNC_ENABLED_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_DATA_SO_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_DATA_SO_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_DATA_SO_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_DATA_SO_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_DORMANT_TIMER_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_DORMANT_TIMER_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_DORMANT_TIMER_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_DORMANT_TIMER_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_HSPD_PROFILE_DATA_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_HSPD_PROFILE_DATA_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_HSPD_PROFILE_DATA_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_HSPD_PROFILE_DATA_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_HSPD_SECURE_SEG_PROFILE_DATA_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_HSPD_SECURE_SEG_PROFILE_DATA_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_HSPD_SECURE_SEG_PROFILE_BYTE_DATA_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_HSPD_SECURE_SEG_PROFILE_BYTE_DATA_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_MIP_BINARY_PASSWORD_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_MIP_BINARY_PASSWORD_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_MIP_BINARY_PASSWORD_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_MIP_BINARY_PASSWORD_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_REG_BACKOFF_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_REG_BACKOFF_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_REG_BACKOFF_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_REG_BACKOFF_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_NUM_REG_RETRIES_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_NUM_REG_RETRIES_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_NUM_REG_RETRIES_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_NUM_REG_RETRIES_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_MIP_MODE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_MIP_MODE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_MIP_MODE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_MIP_MODE_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_MN_HA_AUTH_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_MN_HA_AUTH_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_MN_HA_AUTH_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_MN_HA_AUTH_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_NPKOID_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_NPKOID_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_NPKOID_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_NPKOID_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_NUM_PROFILE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_NUM_PROFILE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_NUM_PROFILE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_NUM_PROFILE_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_SIP_NAI_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_SIP_NAI_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_SIP_NAI_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_SIP_NAI_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_SIP_DUN_NAI_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_SIP_DUN_NAI_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_SIP_DUN_NAI_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_SIP_DUN_NAI_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_SIP_BINARY_PASSWORD_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_SIP_BINARY_PASSWORD_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_SIP_BINARY_PASSWORD_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_SIP_BINARY_PASSWORD_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_DATA_PPP_UM_CONFIG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_GET_DATA_PPP_UM_CONFIG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_DATA_PPP_UM_CONFIG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HLP_SET_DATA_PPP_UM_CONFIG_RSP_MSG),
+
+    /*LMD task*/
+    MSGID_NEXT(MSG_ID_ELT_LMD_CLEAR_FER_CMD_MSG),
+    //MSGID_NEXT(MSG_ID_ELT_LMD_CLEAR_FER_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_LMD_CLEAR_MARKOV_STATS_CMD_MSG),
+    //MSGID_NEXT(MSG_ID_ELT_LMD_CLEAR_MARKOV_STATS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_LMD_CLEAR_TDSO_STATS_CMD_MSG),
+    //MSGID_NEXT(MSG_ID_ELT_LMD_CLEAR_TDSO_STATS_RSP_MSG),
+
+    /* PSW task */
+    MSGID_NEXT(MSG_ID_ELT_PSW_CALL_HANGUP_CMD_MSG),
+    //MSGID_NEXT(MSG_ID_ELT_PSW_CALL_HANGUP_RSP_MSG),no rsp
+    MSGID_NEXT(MSG_ID_ELT_PSW_CLEAR_MRU_CMD_MSG),
+    //MSGID_NEXT(MSG_ID_ELT_PSW_CLEAR_MRU_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_CURRENT_TIME_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_CURRENT_TIME_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_ACTIVE_NAM_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_ACTIVE_NAM_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_RETRIEVABLE_STATISTICS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_RETRIEVABLE_STATISTICS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_SPC_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_SPC_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_SSD_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_SSD_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_P_REV_IN_USE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_P_REV_IN_USE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_READ_RAW_IMSI_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_READ_RAW_IMSI_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SELECT_ACTIVE_NAM_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SELECT_ACTIVE_NAM_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SET_PKZID_HYSTERESIS_TIMER_CMD_MSG),
+    //MSGID_NEXT(MSG_ID_ELT_PSW_SET_PKZID_HYSTERESIS_TIMER_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SET_PRIVACY_MODE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SET_PRIVACY_MODE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_VOICE_PRIVACY_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_VOICE_PRIVACY_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SET_RETRIEVABLE_STATISTICS_CMD_MSG),
+    //MSGID_NEXT(MSG_ID_ELT_PSW_SET_RETRIEVABLE_STATISTICS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SET_SERVICE_OPTION_CMD_MSG),
+    //MSGID_NEXT(MSG_ID_ELT_PSW_SET_SERVICE_OPTION_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SET_SPC_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SET_SPC_RSP_MSG),
+    /* MSG_ID_ELT_PSW_GET_SLOTTED_MODE_ALLOWED_CMD_MSG) */ /* Include in ELT_PSW_PARM_GET_CMD */
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SLOTTED_MODE_ALLOWED_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SLOTTED_MODE_ALLOWED_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_STATUS_REQUEST_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_STATUS_REQUEST_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_TEST_MODE_CMD_MSG),
+    //MSGID_NEXT(MSG_ID_ELT_PSW_TEST_MODE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_ACCESS_OVERLOAD_CLASS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_ACCESS_OVERLOAD_CLASS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_CDMA_PREF_AORB_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_CDMA_PREF_AORB_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_DISTANCE_BASED_PARMS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_DISTANCE_BASED_PARMS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_ENCODED_MSID_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_ENCODED_MSID_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_ESN_MEID_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_ESN_MEID_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_FOREIGN_NID_REG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_FOREIGN_NID_REG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_FOREIGN_SID_REG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_FOREIGN_SID_REG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_HOME_SYS_REG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_HOME_SYS_REG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_IMSI_S1_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_IMSI_S1_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_IMSI_S2_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_IMSI_S2_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_MDN_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_MDN_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_MSID_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_MSID_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_POSITIVE_SID_NID_LIST_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_POSITIVE_SID_NID_LIST_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_PREF_HOME_MO_SO_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_PREF_HOME_MO_SO_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_PREF_HOME_MT_SO_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_PREF_HOME_MT_SO_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_PREF_ROAM_MO_SO_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_PREF_ROAM_MO_SO_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_PREV_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_PREV_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_PRL_INFO_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_PRL_INFO_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SCM_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SCM_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SO_SUPPORT_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SO_SUPPORT_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SID_NID_LIST_SP_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SID_NID_LIST_SP_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SLOT_CYCLE_INDEX_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SLOT_CYCLE_INDEX_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SPC_CHANGE_ENABLE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SPC_CHANGE_ENABLE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SYSTEM_SELECT_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_GET_SYSTEM_SELECT_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_ACCESS_OVERLOAD_CLASS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_ACCESS_OVERLOAD_CLASS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_AKEY_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_AKEY_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_CDMA_PREF_AORB_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_CDMA_PREF_AORB_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_ENCODED_MSID_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_ENCODED_MSID_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_FOREIGN_NID_REG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_FOREIGN_NID_REG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_FOREIGN_SID_REG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_FOREIGN_SID_REG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_HOME_SYS_REG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_HOME_SYS_REG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_IMSI_S1_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_IMSI_S1_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_IMSI_S2_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_IMSI_S2_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_MDN_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_MDN_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_MSID_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_MSID_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_POSITIVE_SID_NID_LIST_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_POSITIVE_SID_NID_LIST_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_PREF_HOME_MO_SO_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_PREF_HOME_MO_SO_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_PREF_HOME_MT_SO_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_PREF_HOME_MT_SO_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_PREF_ROAM_MO_SO_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_PREF_ROAM_MO_SO_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_PREV_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_PREV_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SCM_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SCM_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SO_SUPPORT_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SO_SUPPORT_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SID_NID_LIST_SP_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SID_NID_LIST_SP_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SLOT_CYCLE_INDEX_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SLOT_CYCLE_INDEX_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SPC_CHANGE_ENABLE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SPC_CHANGE_ENABLE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SYSTEM_SELECT_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_PARM_SET_SYSTEM_SELECT_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_CP_BC_TO_CDMA_BC_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_GET_CP_BC_TO_CDMA_BC_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SET_IMSI_M_VALID_STATUS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SET_IMSI_M_VALID_STATUS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_NST_POWERUP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_NST_TRANSMIT_TCH_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_NST_EXIT_TEST_MODE_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_NST_RX_PWR_REQ_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_NST_TX_PWR_LEVEL_SET_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SET_MOBILE_ID_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PSW_SET_MOBILE_ID_RSP_MSG),
+
+    /* CLC TASK START */
+    /* msg for UTS */
+    MSG_ID_ELT_CLC_INITACQ_CMD_MSG,
+    MSG_ID_ELT_CLC_INITACQ_RSP_MSG,
+    MSG_ID_ELT_CLC_GET_L3_STATUS_CMD_MSG,
+    MSG_ID_ELT_CLC_GET_L3_STATUS_RSP_MSG,
+
+    MSG_ID_ELT_CLC_DO_EHRPD_MODE_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_EHRPD_MODE_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_EHRPD_MODE_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_EHRPD_MODE_SET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_EXT_SLOT_CYCLE_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_EXT_SLOT_CYCLE_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_EXT_SLOT_CYCLE_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_EXT_SLOT_CYCLE_SET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_FORCE_R0_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_FORCE_R0_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_FORCE_R0_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_FORCE_R0_SET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_FT_MAC_DRC_GATING_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_FT_MAC_DRC_GATING_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_FT_MAC_DRC_GATING_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_FT_MAC_DRC_GATING_SET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_HYBRID_MODE_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_HYBRID_MODE_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_HYBRID_MODE_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_HYBRID_MODE_SET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_LUP_UNSOLICITED_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_LUP_UNSOLICITED_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_LUP_UNSOLICITED_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_LUP_UNSOLICITED_SET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_NOT_DISTURB_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_NOT_DISTURB_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_NOT_DISTURB_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_NOT_DISTURB_SET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_PREF_CC_CYCLE_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_PREF_CC_CYCLE_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_PREF_CC_CYCLE_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_PREF_CC_CYCLE_SET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_PREF_MODE_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_PREF_MODE_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_PREF_MODE_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_PREF_MODE_SET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_RX_DIVERSITY_CTRL_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_RX_DIVERSITY_CTRL_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_RX_DIVERSITY_CTRL_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_RX_DIVERSITY_CTRL_SET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_STREAM_CONFIG_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_STREAM_CONFIG_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_DO_STREAM_CONFIG_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_DO_STREAM_CONFIG_SET_RSP_MSG,
+
+    MSG_ID_ELT_CLC_IDP_DO_SYS_STATUS_GET_CMD_MSG,
+    MSG_ID_ELT_CLC_IDP_DO_SYS_STATUS_GET_RSP_MSG,
+    MSG_ID_ELT_CLC_IDP_SLOTTED_MODE_SET_CMD_MSG,
+    MSG_ID_ELT_CLC_IDP_SLOTTED_MODE_SET_RSP_MSG,
+    /*msg for internal use.*/
+    MSG_ID_ELT_CLC_ALMP_OPEN_CONN_CMD_MSG,
+    MSG_ID_ELT_CLC_ALMP_OPEN_CONN_RSP_MSG,
+    MSG_ID_ELT_CLC_ALMP_REL_CONN_CMD_MSG,
+    MSG_ID_ELT_CLC_ALMP_REL_CONN_RSP_MSG,
+    MSG_ID_ELT_CLC_IDP_HANDOFF_CMD_MSG,
+    MSG_ID_ELT_CLC_IDP_HANDOFF_RSP_MSG,
+    MSG_ID_ELT_CLC_NST_CMD_MSG,
+    MSG_ID_ELT_CLC_NST_RSP_MSG,
+    MSG_ID_ELT_CLC_CONNREQ_CMD_MSG,
+    MSG_ID_ELT_CLC_CONNREQ_RSP_MSG,
+    MSG_ID_ELT_OMP_SUPERVISION_EXPIRED_CMD_MSG,
+    /* CLC TASK END */
+
+    /* SLC TASK START */
+    MSG_ID_ELT_SLC_STATE_GET_CMD_MSG,
+    MSG_ID_ELT_SLC_STATE_GET_RSP_MSG,
+    MSG_ID_ELT_SLC_SMP_SESSION_CLOSE_CMD_MSG,
+    MSG_ID_ELT_SLC_SMP_SESSION_CLOSE_RSP_MSG,
+    /* SLC TASK END */
+
+    /* RMC RUP ELT related */
+    MSG_ID_ELT_RUP_TCA_CMD_MSG,
+    MSG_ID_ELT_RUP_TCA_RSP_MSG,
+    MSG_ID_ELT_RMC_INTRA_IHO_MSG,
+
+#if (defined(MTK_PLT_ON_PC_IT))||(defined(MTK_C2K_L1_TST))
+    /* PHY UT test */
+    MSG_ID_ELT_C2K_PHYUT_CMD_MSG,
+    MSG_ID_ELT_C2K_PHYUT_RPT_MSG,
+    MSG_ID_ELT_C2K_L1_UT_CMD_MSG,
+    MSG_ID_ELT_C2K_L1_UT_RPT_MSG,
+#endif
+
+#ifdef MTK_PLT_ON_PC_IT
+    MSG_ID_ELT_RMC_EFUSE_CFG_CMD_MSG,
+    MSG_ID_ELT_RMC_EFUSE_CFG_RSP_MSG,
+    MSG_ID_ELT_L1_DO_EFUSE_SYNC_CHECK_MSG,
+    MSG_ID_ELT_L1_DO_EFUSE_FMP_CHECK_MSG,
+    MSG_ID_ELT_L1_DO_EFUSE_ERR_CHECK_MSG,
+#endif
+
+    MSG_ID_ELT_C2K_PHYUT_RX_CASE_RPT_MSG,
+    MSG_ID_ELT_FCP_FIX_DRCVAL_MSG,
+
+    MSG_ID_ELT_RMC_POWER_MODE_TEST_MODE_CMD_MSG,
+    MSG_ID_ELT_RMC_POWER_MODE_TEST_MODE_RSP_MSG,
+    MSG_ID_ELT_RMC_RSSI_POWER_MODE_QUERY_CMD_MSG,
+    MSG_ID_ELT_RMC_RSSI_POWER_MODE_QUERY_RSP_MSG,
+    MSG_ID_ELT_RMC_RX_DIV_CTRL_MSG,
+    MSG_ID_ELT_RESULT_CHECK_RESP_MSG,
+    MSG_ID_ELT_RMC_MODIFY_FOE_CMD_MSG,
+    MSG_ID_ELT_RMC_MODIFY_FOE_RSP_MSG,
+    MSG_ID_ELT_RMC_FOE_QUERY_CMD_MSG,
+    MSG_ID_ELT_RMC_FOE_QUERY_RSP_MSG,
+    MSG_ID_ELT_RUP_CLC_DFS_SETTINGS_MSG,
+    MSG_ID_ELT_RUP_IDP_DFS_START_CMD_MSG,
+    MSG_ID_ELT_RUP_IDP_DFS_ABORT_CMD_MSG,
+    MSG_ID_ELT_RMC_DO_DFS_SERVCH_CMD_MSG,
+    MSG_ID_ELT_RMC_DO_DFS_SERVCH_RSP_MSG,
+    MSG_ID_ELT_RMC_TEST_DO_SET_DFS_CHCNT_CMD_MSG,
+    MSG_ID_ELT_RMC_TEST_DO_SET_DFS_CHCNT_RSP_MSG,
+    MSG_ID_ELT_RMC_DO_INTRA_MEAS_CMD_MSG,
+    MSG_ID_ELT_RMC_DO_INTRA_MEAS_RSP_MSG,
+    MSG_ID_ELT_RMC_RUP_DFS_START_CMD_MSG,
+    MSG_ID_ELT_RMC_RUP_DFS_ABORT_CMD_MSG,
+    MSG_ID_ELT_RMC_MMAFC_STATE_QUERY_CMD_MSG,
+    MSG_ID_ELT_RMC_MMAFC_STATE_QUERY_RSP_MSG,
+    MSG_ID_ELT_CSM_TEST_CELL_SWITCH_MSG,
+    MSG_ID_ELT_RMC_SET_FIXED_DRC_MSG,
+	MSG_ID_ELT_RMC_SET_DRC_RANGE_MSG,
+    /* RF test */
+    MSG_ID_ELT_GET_RF_PLAT_INFO_CMD_MSG,
+    MSG_ID_ELT_GET_RF_PLAT_INFO_RSP_MSG,
+    MSG_ID_ELT_RFD_TEST_MODE_REQ_CMD_MSG,
+    MSG_ID_ELT_RFD_TEST_MODE_REQ_RSP_MSG,
+    MSG_ID_ELT_RFD_INIT_REQ_CMD_MSG,
+    MSG_ID_ELT_RFD_INIT_REQ_RSP_MSG,
+    MSG_ID_ELT_SET_MIPI_CW_CMD_MSG,
+    MSG_ID_ELT_SET_MIPI_CW_RSP_MSG,
+    MSG_ID_ELT_GET_MIPI_CW_CMD_MSG,
+    MSG_ID_ELT_GET_MIPI_CW_RSP_MSG,
+    MSG_ID_ELT_SET_SPI_DATA_CMD_MSG,
+    MSG_ID_ELT_SET_SPI_DATA_RSP_MSG,
+    MSG_ID_ELT_GET_SPI_DATA_CMD_MSG,
+    MSG_ID_ELT_GET_SPI_DATA_RSP_MSG,
+    MSG_ID_ELT_SET_TPC_MIPI_CW_CMD_MSG,
+    MSG_ID_ELT_SET_TPC_MIPI_CW_RSP_MSG,
+    MSG_ID_ELT_GET_TPC_MIPI_CW_CMD_MSG,
+    MSG_ID_ELT_GET_TPC_MIPI_CW_RSP_MSG,
+    MSG_ID_ELT_TRANSMIT_CTRL_CMD_MSG,
+    MSG_ID_ELT_TRANSMIT_CTRL_CMD_PHYUT_MSG,
+    MSG_ID_ELT_TRANSMIT_CTRL_RSP_MSG,
+    MSG_ID_ELT_META_TRANSMIT_CTRL_CMD_MSG,
+    MSG_ID_ELT_RECEIVE_CTRL_CMD_MSG,
+    MSG_ID_ELT_RECEIVE_CTRL_RSP_MSG,
+    MSG_ID_ELT_AFC_CONFIG_CMD_MSG,
+    MSG_ID_ELT_AFC_CONFIG_RSP_MSG,
+    MSG_ID_ELT_TX_AGC_CONFIG_CMD_MSG,
+    MSG_ID_ELT_TX_AGC_CONFIG_RSP_MSG,
+    MSG_ID_ELT_TX_POWER_QUERY_CMD_MSG,
+    MSG_ID_ELT_TX_POWER_QUERY_RSP_MSG,
+    MSG_ID_ELT_RX_AGC_CONFIG_CMD_MSG,
+    MSG_ID_ELT_RX_AGC_CONFIG_RSP_MSG,
+    MSG_ID_ELT_RX_RSSI_QUERY_CMD_MSG,
+    MSG_ID_ELT_RX_RSSI_QUERY_RSP_MSG,
+    MSG_ID_ELT_RX_SNR_QUERY_CMD_MSG,
+    MSG_ID_ELT_RX_SNR_QUERY_RSP_MSG,
+    MSG_ID_ELT_RX_EC_IO_QUERY_CMD_MSG,
+    MSG_ID_ELT_RX_EC_IO_QUERY_RSP_MSG,
+    MSG_ID_ELT_AFC_CAL_DATA_SET_CMD_MSG,
+    MSG_ID_ELT_AFC_CAL_DATA_SET_RSP_MSG,
+    MSG_ID_ELT_AFC_CAL_DATA_GET_CMD_MSG,
+    MSG_ID_ELT_AFC_CAL_DATA_GET_RSP_MSG,
+    MSG_ID_ELT_RX_CAL_DATA_SET_CMD_MSG,
+    MSG_ID_ELT_RX_CAL_DATA_SET_RSP_MSG,
+    MSG_ID_ELT_RX_CAL_DATA_GET_CMD_MSG,
+    MSG_ID_ELT_RX_CAL_DATA_GET_RSP_MSG,
+    MSG_ID_ELT_TX_CAL_DATA_SET_CMD_MSG,
+    MSG_ID_ELT_TX_CAL_DATA_SET_RSP_MSG,
+    MSG_ID_ELT_TX_CAL_DATA_GET_CMD_MSG,
+    MSG_ID_ELT_TX_CAL_DATA_GET_RSP_MSG,
+#ifndef __MD93__
+    MSG_ID_ELT_RX_LNA_PWR_RANGE_GET_CMD_MSG,
+    MSG_ID_ELT_RX_LNA_PWR_RANGE_GET_RSP_MSG,
+#endif
+#if (!defined(__MD93__)) && (!defined(__MD95__))
+    MSG_ID_ELT_RX_GAIN_GET_CMD_MSG,
+    MSG_ID_ELT_RX_GAIN_GET_RSP_MSG,
+    MSG_ID_ELT_TX_GAIN_GET_CMD_MSG,
+    MSG_ID_ELT_TX_GAIN_GET_RSP_MSG,
+    MSG_ID_ELT_SET_BPI_DATA_CMD_MSG,
+    MSG_ID_ELT_SET_BPI_DATA_RSP_MSG,
+    MSG_ID_ELT_GET_BPI_DATA_CMD_MSG,
+    MSG_ID_ELT_GET_BPI_DATA_RSP_MSG,
+    MSG_ID_ELT_RX_AGC_FIX_MANUAL_CONFIG_CMD_MSG,
+    MSG_ID_ELT_RX_AGC_FIX_MANUAL_CONFIG_RSP_MSG,
+#endif
+    MSG_ID_ELT_FHC_START_CMD_MSG,
+    MSG_ID_ELT_FHC_START_RSP_MSG,
+    MSG_ID_ELT_TEMP_BACKOFF_SET_CMD_MSG,
+    MSG_ID_ELT_TEMP_BACKOFF_SET_RSP_MSG,
+    MSG_ID_ELT_TEMP_BACKOFF_GET_CMD_MSG,
+    MSG_ID_ELT_TEMP_BACKOFF_GET_RSP_MSG,
+    MSG_ID_ELT_RCP_TX_AGC_CTRL_CMD_MSG,
+    MSG_ID_ELT_L1D_TX_AGC_CTRL_CMD_MSG,
+    MSG_ID_ELT_L1D_TX_AGC_CTRL_RSP_MSG,
+    MSG_ID_ELT_L1D_CFS_COMPLETE_MSG,    
+    MSG_ID_ELT_L1D_MINIACQ_FAIL_MSG,
+    MSG_ID_ELT_TXDFE_BB_TONE_CFG_CMD_MSG,
+    MSG_ID_ELT_TXDFE_BB_TONE_CFG_RSP_MSG,
+    MSG_ID_ELT_TXDFE_BB_NCO_CFG_RSP_MSG,
+    MSG_ID_ELT_TXDFE_BB_NCO_CFG_CMD_MSG,
+    MSG_ID_ELT_RCP_TX_AGC_CTRL_RSP_MSG,
+    MSG_ID_ELT_RMC_ICS_TST_CASEID_CFG_MSG,
+    MSG_ID_ELT_RMC_ICS_TST_CHECKRPT_MSG,
+    MSG_ID_ELT_RMC_DFS_MEAS_DONE_MSG,
+    MSG_ID_ELT_RMC_INTERHO_TST_CFG_MSG,
+    MSG_ID_ELT_RMC_INTRAHO_TST_CFG_MSG,
+    MSG_ID_ELT_TST_STB_DOSIGNAL_CFG_MSG,
+    MSG_ID_ELT_TST_STB_TIMING_CFG_MSG,
+    MSG_ID_ELT_CL1D_RF_TST_CASE_MSG,
+    MSG_ID_ELT_CL1D_RF_TST_CASE_RSP_MSG,
+    MSG_ID_ELT_CL1D_RF_TST_RX_CASE_MSG,
+    MSG_ID_ELT_CL1D_RF_TST_TXDFE_CASE_MSG,
+    MSG_ID_ELT_CL1D_RF_TST_TXDFE_RESULT_CHECK_MSG,
+    MSG_ID_ELT_CL1D_RF_TST_RX_RESULT_CHECK_MSG,
+    MSG_ID_ELT_CL1D_RF_TST_TX_CASE_MSG,
+    MSG_ID_ELT_CL1D_RF_TST_TX_RESULT_CHECK_MSG,
+    MSG_ID_ELT_RMC_RX_TX_ACT_SLOT_QUERY_CMD_MSG,
+    MSG_ID_ELT_RMC_RX_TX_ACT_SLOT_QUERY_RSP_MSG,
+    MSG_ID_ELT_TST_RX_ANTENNA_TESTMODE_SET_MSG,
+    MSG_ID_ELT_TST_RX_ANTENNA_TESTMODE_SET_RSP_MSG,
+    MSG_ID_ELT_TST_AT_SIM_RX_RSSI_MSG,
+    MSG_ID_ELT_TST_AT_SIM_RX_RSSI_RSP_MSG,
+    MSG_ID_ELT_TST_TEMP_READ_MSG,
+    MSG_ID_ELT_TST_TEMP_READ_RSP_MSG,
+    MSG_ID_ELT_TST_MCD_DEBUG_MSG,
+    MSG_ID_ELT_TST_CUIF_CFG_MSG,
+    MSG_ID_ELT_TST_SLEEP_CTRL_MSG,
+    MSG_ID_ELT_TST_CFG_MSG,
+    MSG_ID_ELT_TST_RSP_MSG,
+    MSG_ID_ELT_SET_STBONLY_MODE_MSG,
+    MSG_ID_ELT_TST_RC_CTRL_MSG,
+    /* HSC task*/
+    MSG_ID_ELT_RBS_DENY_PATTERN_CONFIG_IND,
+    MSG_ID_ELT_HSC_SHDR_ENABLE_CONFIG,
+    MSG_ID_ELT_HSC_PREEMPT_TRIG_CONFIG_IND,
+    MSG_ID_ELT_LL1A_LTE_ACTIVE_CONFIG_CMD_MSG,
+    MSG_ID_ELT_RBS_SCENARIO_CONTROL_CONFIG_IND_MSG,
+    MSG_ID_ELT_RBS_SCENARIO_CONTROL_TRIGGERED_IND_MSG,
+    MSG_ID_ELT_RBS_SCENARIO_CONTROL_RPT_IND_MSG,
+    MSG_ID_ELT_LL1A_STANDBY_GAP_LENGTH_IND_MSG,
+
+    /* RCP task*/
+    MSG_ID_ELT_RCP_ACC_RTB_CMD_MSG,
+    MSG_ID_ELT_RCP_ACC_RTB_RSP_MSG,
+    MSG_ID_ELT_CLC_ALMP_REL_CONN_SHDR_CMD_MSG,
+    MSG_ID_ELT_CLC_ALMP_REL_CONN_SHDR_RSP_MSG,
+
+   /* Test message*/
+    MSG_ID_ELT_L1_IT_STEP_PASS_MSG,
+    MSG_ID_ELT_L1_IT_1XSYNC_PASS_MSG,
+#if !defined(MTK_PLT_ON_PC)
+    MSG_ID_ELT_L1D_EFUSE_MSG,
+#endif
+    /* CSS task */
+    MSGID_NEXT(MSG_ID_ELT_CSS_DBM_INIT_NVRAM_TO_DEFAULT_CMD_MSG), /* rsp msg not needed */
+    MSGID_NEXT(MSG_ID_ELT_CSS_TEST_CFG_CMD_MSG), /* rsp msg not needed */
+    MSGID_NEXT(MSG_ID_ELT_CSS_1X_CLEAR_MRU_CMD_MSG), /* rsp msg not needed */
+    MSGID_NEXT(MSG_ID_ELT_CSS_DO_CLEAR_MRU_CMD_MSG), /* rsp msg not needed */
+    MSGID_NEXT(MSG_ID_ELT_CSS_GET_PRL_ID_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_GET_PRL_ID_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_SET_PARMS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_SET_PARMS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_GET_PARMS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_GET_PARMS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_SET_ENABLE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_SET_ENABLE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_GET_ENABLE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_GET_ENABLE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_SET_NUM_PHASES_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_SET_NUM_PHASES_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_GET_NUM_PHASES_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_GET_NUM_PHASES_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_SET_CURRENT_STAGE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_SET_CURRENT_STAGE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_GET_CURRENT_STAGE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_OOSA_GET_CURRENT_STAGE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_GET_MCC_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_GET_MCC_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_GET_ERI_VERSION_NUMBER_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_GET_ERI_VERSION_NUMBER_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_SET_PARM_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_SET_PARM_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_GET_PARM_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CSS_GET_PARM_RSP_MSG),
+    /* CSS task end */
+
+    /* DSPM(CPH) Cmd and Rsp Msg*/
+    MSGID_NEXT(MSG_ID_ELT_CPH_FWD_CHNL_SCRAMBLE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CPH_FWD_CHNL_SCRAMBLE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CPH_TXAGC_CLOSED_LOOP_ST_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_CPH_TXAGC_CLOSED_LOOP_ST_RSP_MSG),
+
+
+    /* GPS */
+    MSGID_NEXT(MSG_ID_ELT_GPS_LOC_TCP_CONN_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_LOC_TCP_CONN_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_LOC_TCP_CLOSE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_LOC_TCP_CLOSE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_NMEA_CFG_SET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_NMEA_CFG_SET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_NMEA_CFG_GET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_NMEA_CFG_GET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_OPEN_DEVICE_HW_INIT_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_OPEN_DEVICE_HW_INIT_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CLOSE_DEVICE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CLOSE_DEVICE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_POSITION_GET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_POSITION_GET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_START_FIX_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_START_FIX_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_QUERY_FIX_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_QUERY_FIX_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_STOP_FIX_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_STOP_FIX_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CONFIG_FIX_MODE_SET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CONFIG_FIX_MODE_SET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CONFIG_FIX_RATE_SET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CONFIG_FIX_RATE_SET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CONFIG_QOS_SET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CONFIG_QOS_SET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_WRITE_SERVER_CONFIG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_WRITE_SERVER_CONFIG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_SERVER_CONFIG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_SERVER_CONFIG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_ENABLE_SECURITY_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_ENABLE_SECURITY_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_WRITE_SECURITY_CONFIG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_WRITE_SECURITY_CONFIG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_SECURITY_CONFIG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_SECURITY_CONFIG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_SECURITY_CONFIG_W_STATUS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_SECURITY_CONFIG_W_STATUS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_ENCRYPT_CONFIG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_ENCRYPT_CONFIG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_ENCRYPT_CONFIG_W_STATUS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_ENCRYPT_CONFIG_W_STATUS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_LBS_PRIVACY_SETTING_GET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_LBS_PRIVACY_SETTING_GET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_LBS_PRIVACY_SETTING_SET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_LBS_PRIVACY_SETTING_SET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_BASESSD_GET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_BASESSD_GET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_BASESSD_SET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_BASESSD_SET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CT_MPC_USERNME_PSWRD_CFG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CT_MPC_USERNME_PSWRD_CFG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_TEST_MODE_SET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_TEST_MODE_SET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_START_MODE_SET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_START_MODE_SET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPSLBS_STATE_GET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPSLBS_STATE_GET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_RAND_PERIOD_SET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_RAND_PERIOD_SET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_RESET_ASSIST_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_RESET_ASSIST_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_RESTART_FIX_CMD_MSG) ,
+    MSGID_NEXT(MSG_ID_ELT_GPS_RESTART_FIX_RSP_MSG) ,
+    MSGID_NEXT(MSG_ID_ELT_GPS_SEC_SET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_SEC_SET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CONFIG_TECH_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CONFIG_TECH_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PGPS_CFG_SET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PGPS_CFG_SET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PGPS_CFG_GET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PGPS_CFG_GET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PGPS_START_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_PGPS_START_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_WRITE_OFFSET_INFO_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_WRITE_OFFSET_INFO_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_OFFSET_INFO_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_READ_OFFSET_INFO_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_NMEA_OUTPUT_SETTING_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_NMEA_OUTPUT_SETTING_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CONFIG_FIX_RATE_GET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CONFIG_FIX_RATE_GET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CT_MPC_IP_CFG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CT_MPC_IP_CFG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CP_VAL_MPC_MSG),
+    MSGID_NEXT(MSG_ID_ELT_GPS_CP_LOC_RESP_MSG),	
+	MSGID_NEXT(MSG_ID_ELT_GPS_LOC_STATE_MSG),
+
+    /*LEC*/
+    MSGID_NEXT(MSG_ID_ELT_LEC_TST_GPS_PGPS_ON_OFF_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_LEC_TST_GPS_PGPS_ON_OFF_RSP_MSG),
+
+
+    /* UI */
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_GET_AUTO_ANSWER_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_GET_AUTO_ANSWER_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_GET_AUTO_REDIAL_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_GET_AUTO_REDIAL_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_GET_DTMF_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_GET_DTMF_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_GET_LOCK_CODE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_GET_LOCK_CODE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_GET_VOICE_PRIVACY_ALERT_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_GET_VOICE_PRIVACY_ALERT_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_AUTO_ANSWER_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_AUTO_ANSWER_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_AUTO_REDIAL_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_AUTO_REDIAL_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_DTMF_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_DTMF_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_LOCK_CODE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_LOCK_CODE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_VOICE_PRIVACY_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_VOICE_PRIVACY_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_VOICE_PRIVACY_ALERT_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_PARM_SET_VOICE_PRIVACY_ALERT_RSP_MSG),
+
+    /* NOW is VAL,next will be move to UI */
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_CP_DISPLAY_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_UI_CP_KEY_PRESS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SET_SMS_CH_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SET_SMS_CH_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_DEL_ALL_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_DEL_ALL_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_DEL_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_DEL_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_GET_FIRST_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_GET_FIRST_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_GET_COUNT_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_GET_COUNT_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_GET_NEXT_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_GET_NEXT_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_SEND_INDEX_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_SEND_INDEX_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_SEND_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_SEND_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_SET_STATUS_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_SET_STATUS_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_WRITE_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_VAL_SMS_WRITE_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_L1D_TST_DIAG_MONITOR_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_L1D_TST_DIAG_MONITOR_RSP_MSG),
+
+    MSGID_NEXT(MSG_ID_ELT_HWD_TST_PLL_CHANNEL_CONFIG_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HWD_TST_PLL_CHANNEL_CONFIG_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HWD_TST_PLL_CHANNEL_GET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_HWD_TST_PLL_CHANNEL_GET_RSP_MSG),
+    /* RCP */
+    MSGID_NEXT(MSG_ID_ELT_RCP_RTM_TEST_TXCHANSTAT_GET_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_RCP_RTM_TEST_TXCHANSTAT_GET_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_SYS_C2K_FRC_SYNC),
+    /* ETS */
+    MSGID_NEXT(MSG_ID_ELT_C2K_VERSION_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_C2K_VERSION_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_UIM_SET_FACTORY_MODE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_UIM_GET_FACTORY_MODE_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_C2K_LOOPBACK_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_C2K_LOOPBACK_RSP_MSG),
+    MSGID_NEXT(MSG_ID_ELT_C2K_CONFIGURATION_CMD_MSG),
+    MSGID_NEXT(MSG_ID_ELT_C2K_CONFIGURATION_RSP_MSG),
+    
+	MSGID_NEXT(MSG_ID_UTS_CP_VAL_GPS_SESS_EVENT_MSG),
+	MSGID_NEXT(MSG_ID_UTS_CP_VAL_GPS_LOC_RESP_MSG),
+	MSGID_NEXT(MSG_ID_UTS_CP_VAL_GPS_CP_LOC_RESP_MSG),
+	MSGID_NEXT(MSG_ID_ELT_GPS_IS801_FLOW_MS_RSP_MSG),
+	MSGID_NEXT(MSG_ID_ELT_GPS_IS801_FLOW_MS_REQ_MSG),
+	MSGID_NEXT(MSG_ID_ELT_GPS_IS801_FLOW_BS_REQ_MSG),
+	MSGID_NEXT(MSG_ID_ELT_GPS_IS801_FLOW_BS_RSP_MSG),
+
+	MSG_ID_ELT_L1D_GET_AGPS_GROUP_DELAY_CMD_MSG,
+	MSG_ID_ELT_L1D_GET_AGPS_GROUP_DELAY_RSP_MSG,
+	MSG_ID_ELT_L1D_SET_AGPS_GROUP_DELAY_CMD_MSG,
+	MSG_ID_ELT_L1D_SET_AGPS_GROUP_DELAY_RSP_MSG,
+MODULE_MSG_END( MSG_ID_ELT_CODE_TAIL )
+
+
+#undef MSGID_SET
+#undef MSGID_NEXT
+
+#define MSGID_SET(name, val) name = val + MSG_ID_ELT_OTA_CODE_BEGIN
+#define MSGID_NEXT(name) name
+
+MODULE_MSG_BEGIN( MSG_ID_ELT_OTA_CODE_BEGIN )
+     MSGID_SET( MSG_ID_ELT_OTA_CODE_START, 0),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_PE_ENG_LAYER2_TR_13_13),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_PE_ENG_PAGE_TR_20_52),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_PE_ENG_CP_TR_23_4),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_PE_ENG_LAYER2_TR_13_57),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_LOCATION_IS801_MSG),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_PE_ENG_ACCESS_PROC_TR_1_40),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_PE_ENG_RTC_TR_29_34),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_PE_ENG_LAYER2_TR_13_15),
+
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_FCP_OHD_MSG),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_FCP_OTA_MSG),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_FCP_SLPD_ACK_MSG),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_RCP_SLPD_ACK_MSG),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CP_RCP_OTA_MSG),
+     MSGID_NEXT(MSG_ID_ELT_OTA_CODE_END),
+MODULE_MSG_END( MSG_ID_ELT_OTA_CODE_TAIL )
+
+
+
+#endif
diff --git a/mcu/interface/sap/md/em_msgid.h b/mcu/interface/sap/md/em_msgid.h
new file mode 100644
index 0000000..28f7a0f
--- /dev/null
+++ b/mcu/interface/sap/md/em_msgid.h
@@ -0,0 +1,1143 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   em_sap.h
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   Engineer mode 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!
+ * 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!
+ * 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!
+ *
+ * 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!
+ * 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!
+ * 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!
+ * 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!!
+ *==============================================================================
+ *******************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef EM_MSGID_H
+#define EM_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_EM_CODE_BEGIN )
+ 	/* Engineer mode message begin */
+ 	/* Send to PS */
+	MSG_ID_L4CPS_EM_UPDATE_REQ = MSG_ID_EM_CODE_BEGIN,
+
+	/*Byron: 2006/02/15: Suspend or resume the cell reselection*/
+	MSG_ID_L4CPS_EM_CELL_RESEL_SUSPEND_REQ,  /* Suspend cell reselection */
+	MSG_ID_L4CPS_EM_CELL_RESEL_SUSPEND_CNF,  /* Suspend cell reselection */
+
+	MSG_ID_L4CPS_EM_CELL_RESEL_RESUME_REQ,    /* Resume cell reselection */
+	MSG_ID_L4CPS_EM_CELL_RESEL_RESUME_CNF,    /* Resume cell reselection */
+
+       /*Byron: 2006/08/06: Add for cell lock functionality from MMI EM*/
+	MSG_ID_L4CPS_EM_SET_CELL_LOCK_REQ,
+       MSG_ID_L4CPS_EM_SET_CELL_LOCK_CNF,
+
+	MSG_ID_L4CPS_EM_GET_CELL_LOCK_REQ,
+       MSG_ID_L4CPS_EM_GET_CELL_LOCK_CNF,
+
+	/*Byron: 2007/03/14: Add for Pure Command request*/
+	MSG_ID_L4CPS_EM_FEATURE_COMMAND_REQ,
+	MSG_ID_L4CPS_EM_FEATURE_COMMAND_CNF,
+
+/* brwang, 20070727, [EM Cell ID Lock function] { */
+
+   /* Send to PS */
+   MSG_ID_L4CPS_EM_SET_CELL_ID_LOCK_REQ,
+   /* Received from PS */
+   MSG_ID_L4CPS_EM_SET_CELL_ID_LOCK_CNF,
+
+/* brwang, 20070727, [EM Cell ID Lock function]  } */
+
+#if 0
+/* under construction !*/
+/* under construction !*/
+#else
+    /* Received from DHL */
+	MSG_ID_DHLL4C_EM_UPDATE_REQ,
+    MSG_ID_MTFL4C_EM_UPDATE_REQ,
+#endif
+
+	/*mtk00924: 061106 add for network event notify*/
+	MSG_ID_L4CPS_EM_NW_EVENT_NOTIFY_REQ,
+	MSG_ID_L4CPS_EM_NW_EVENT_NOTIFY_CNF,
+	MSG_ID_L4CPS_EM_NW_EVENT_NOTIFY_IND,
+
+	/* Received from PS */
+        MSG_ID_L4CPS_EM_UPDATE_CNF,
+      #if ((defined(__SM_UT__)) && (!defined(__MTK_TARGET__)))
+      MSG_ID_L4CPS_CHECK_SM_EM_STATUS_CONTENT, // used for check parameter correctness in SM UT
+      #endif // ~ #if ((defined(__SM_UT__)) && (!defined(__MTK_TARGET__)))
+      #if ((!defined(__MTK_TARGET__)) && defined(__TCM_UT__))
+      /* MSG_ID_L4CPS_CHECK_TCM_MMI_EM_INFO, // used for check parameter correctness in TCM UT */
+      #endif // ~ ((!defined(__MTK_TARGET__)) && defined(__TCM_UT__))
+
+    /* VT Engineer Mode */
+    MSG_ID_L4C_VT_EM_GET_CONFIG_REQ,
+    MSG_ID_L4C_VT_EM_GET_CONFIG_CNF,
+    MSG_ID_L4C_VT_EM_SET_CONFIG_REQ,
+
+    /* EM request: GSM RF test */
+    MSG_ID_L4CL1_EM_RF_TEST_GSM_STOP_REQ,
+    MSG_ID_L4CL1_EM_RF_TEST_GSM_TX_TEST_REQ,
+    MSG_ID_L4CL1_EM_RF_TEST_GSM_RX_TEST_REQ,
+	MSG_ID_L4CL1_EM_RF_TEST_GSM_RX_TEST_TWO_PATH_REQ,
+    MSG_ID_L4CL1_EM_RF_TEST_GSM_POWER_SCAN_REQ,
+    MSG_ID_L4CL1_EM_RF_TEST_GSM_POWER_SCAN_CNF,
+    MSG_ID_L4CL1_EM_TST_CONTROL_REQ,
+    MSG_ID_L4CL1_EM_TST_CONTROL_CNF,
+    MSG_ID_L4CL1_EM_TX_REPORT_IND,      
+
+    /* EL1 RF TEMPURATURE */
+    MSG_ID_L4CEL1_GET_RF_TEMPERATURE_REQ,
+    MSG_ID_L4CEL1_GET_RF_TEMPERATURE_CNF,
+    MSG_ID_L4CEL1_MONITOR_RF_TEMPERATURE_REQ,
+    MSG_ID_L4CEL1_MONITOR_RF_TEMPERATURE_CNF,
+    MSG_ID_L4CEL1_MONITOR_RF_TEMPERATURE_IND,
+
+    /* EL1 RX PATH */
+    MSG_ID_L4CEL1_SET_RX_PATH_REQ,
+    MSG_ID_L4CEL1_SET_RX_PATH_CNF,
+#ifdef __TX_PWR_EXTENSION__
+    MSG_ID_L4CUL1_GET_TX_POWER_REQ,
+    MSG_ID_L4CUL1_GET_TX_POWER_CNF,
+    MSG_ID_L4CNL1_GET_TX_POWER_REQ,
+    MSG_ID_L4CNL1_GET_TX_POWER_CNF,
+#endif
+    MSG_ID_L4C_CCCI_GET_THERMAL_INFO_REQ,
+    /* UL1 RX PATH */
+    MSG_ID_L4CUL1_SET_RX_PATH_REQ,
+    MSG_ID_L4CUL1_SET_RX_PATH_CNF,
+
+    /* EL1 RX RSSI VERIFY */
+    MSG_ID_L4CEL1_RX_RSSI_VERIFY_REQ,
+    MSG_ID_L4CEL1_RX_RSSI_VERIFY_IND,
+
+    /* EL1 TX POWER */
+    MSG_ID_L4CEL1_GET_TX_POWER_REQ,
+    MSG_ID_L4CEL1_GET_TX_POWER_CNF,
+
+    /* EL1 EB3INFO AT-CMD */
+    MSG_ID_L4CEL1_B3_INFO_REQ,
+    MSG_ID_L4CEL1_B3_INFO_CNF,
+
+    /* EL1 VzW OTA TEST REQ */
+    MSG_ID_L4CEL1_ANTENNA_INFORMATION_REQ,
+    MSG_ID_L4CEL1_ANTENNA_INFORMATION_CNF,
+    MSG_ID_L4CEL1_ANTENNA_CONFIG_REQ,
+    MSG_ID_L4CEL1_ANTENNA_CONFIG_CNF,
+    MSG_ID_L4CEL1_ANTENNA_CONFIG_STATUS_REQ,
+    MSG_ID_L4CEL1_ANTENNA_CONFIG_STATUS_CNF,
+
+    MSG_ID_L1_GSM_MAX_TX_PWR_RED_REQ,
+    MSG_ID_UL1_UMTS_MAX_TX_PWR_RED_REQ,
+    MSG_ID_NL1_NR_MAX_TX_PWR_RED_REQ,
+
+    /* RF TEST result from L1 */
+    MSG_ID_L4CL1_EM_RF_TEST_GSM_RX_TEST_IND,
+	MSG_ID_L4CL1_EM_RF_TEST_GSM_RX_TEST_TWO_PATH_IND,
+    MSG_ID_TL1_UMTS_MAX_TX_PWR_RED_REQ,
+    MSG_ID_EL1_LTE_MAX_TX_PWR_RED_REQ,
+
+    MSG_ID_L4CL1_GET_RF_TEMPERATURE_REQ,
+    MSG_ID_L4CL1_GET_RF_TEMPERATURE_CNF,
+
+    MSG_ID_L4CUL1_GET_RF_TEMPERATURE_REQ,
+    MSG_ID_L4CUL1_GET_RF_TEMPERATURE_CNF,
+
+    MSG_ID_L4CTL1_GET_RF_TEMPERATURE_REQ,
+    MSG_ID_L4CTL1_GET_RF_TEMPERATURE_CNF,
+    
+    MSG_ID_L4CNL1_GET_RF_TEMPERATURE_REQ,
+    MSG_ID_L4CNL1_GET_RF_TEMPERATURE_CNF,
+    
+    MSG_ID_L4CL1_EM_RF_TEST_GSM_TX_TEST_IND,
+
+    /* TAS Force Tx Ant Index */
+    MSG_ID_L4CUL1_FORCE_TX_ANT_REQ,
+    MSG_ID_L4CUL1_FORCE_TX_ANT_CNF,
+
+    MSG_ID_L4CL1_FORCE_TX_ANT_REQ,
+    MSG_ID_L4CL1_FORCE_TX_ANT_CNF,
+
+    MSG_ID_L4CTL1_FORCE_TX_ANT_REQ,
+    MSG_ID_L4CTL1_FORCE_TX_ANT_CNF,
+
+    MSG_ID_L4CEL1_FORCE_TX_ANT_REQ,
+    MSG_ID_L4CEL1_FORCE_TX_ANT_CNF,
+    
+    MSG_ID_L4CNL1_FORCE_TX_ANT_REQ,
+    MSG_ID_L4CNL1_FORCE_TX_ANT_CNF,
+
+    MSG_ID_L4C_NL1_DAT_REQ,
+    MSG_ID_L4C_NL1_DAT_CNF,
+
+    MSG_ID_ENL1_UTAS_NL1_DAT_CNF_IND,
+    MSG_ID_L4C_C2K_CL1_FORCE_TX_ANT_REQ,
+    MSG_ID_L4C_C2K_CL1_FORCE_TX_ANT_CNF,
+
+    /* EL1_EM_MODE */
+    MSG_ID_L4C_EL1_EM_TST_CONTROL_REQ,
+    MSG_ID_L4C_EL1_EM_TST_CONTROL_CNF,
+    MSG_ID_L4C_EL1_EM_TX_REPORT_IND,
+
+    /* EM request: UL1 RF test */
+    MSG_ID_L4CUL1_RSSI_MEASUREMENT_IND,
+
+    /* EM request: UL1 TX power dector measurement */
+    MSG_ID_L4CUL1_EM_TX_REPORT_IND,
+
+    /* TL1 Rx test*/
+    MSG_ID_L4CTL1_RSSI_MEASUREMENT_IND,
+    /* TL1 Tx test*/
+    MSG_ID_L4CTL1_EM_TX_REPORT_IND,
+
+    /* AP Sensor Info for TAS 2.0 */
+    MSG_ID_L4CUL1_APINFO_UPDATE_REQ,
+    MSG_ID_L4CL1_APINFO_UPDATE_REQ,
+    MSG_ID_L4CTL1_APINFO_UPDATE_REQ,
+    MSG_ID_L4CEL1_APINFO_UPDATE_REQ,
+
+    /* to get Tx Rx active time from L1 */
+    MSG_ID_L4CL1_TXRX_ACTIVE_TIME_REQ,
+    MSG_ID_L4CL1_TXRX_ACTIVE_TIME_CNF,
+
+    MSG_ID_L4CUL1_TXRX_ACTIVE_TIME_REQ,
+    MSG_ID_L4CUL1_TXRX_ACTIVE_TIME_CNF,
+
+    MSG_ID_L4CTL1_TXRX_ACTIVE_TIME_REQ,
+    MSG_ID_L4CTL1_TXRX_ACTIVE_TIME_CNF,
+
+    MSG_ID_L4CEL1_TXRX_ACTIVE_TIME_REQ,
+    MSG_ID_L4CEL1_TXRX_ACTIVE_TIME_CNF,
+
+    MSG_ID_L4CMMRF_TEMPERATURE_REQ,
+    MSG_ID_L4CMMRF_TEMPERATURE_CNF,
+
+    /* MMRF MIPI/BPI read or write action */
+    MSG_ID_L4CMMRF_EM_MIPI_ACTION_REQ,
+    MSG_ID_L4CMMRF_EM_MIPI_ACTION_CNF,
+
+    MSG_ID_L4CMMRF_EM_BPI_ACTION_REQ,
+    MSG_ID_L4CMMRF_EM_BPI_ACTION_CNF,
+
+    MSG_ID_L4CMMRF_AP_RFIDX_UPDATE_REQ,
+    MSG_ID_L4CMMRF_AP_RFIDX_UPDATE_CNF,
+
+    MSG_ID_L4CUL1_AP_RFIDX_UPDATE_REQ,
+    MSG_ID_L4CUL1_AP_RFIDX_UPDATE_CNF,
+
+    MSG_ID_L4CEL1_AP_RFIDX_UPDATE_REQ,
+    MSG_ID_L4CEL1_AP_RFIDX_UPDATE_CNF,
+
+	MSG_ID_L4CNL1_AP_RFIDX_UPDATE_REQ,
+	MSG_ID_L4CNL1_AP_RFIDX_UPDATE_CNF,
+
+    MSG_ID_L4C_C2K_CL1_AP_RFIDX_UPDATE_REQ,
+    MSG_ID_L4C_C2K_CL1_AP_RFIDX_UPDATE_CNF,
+
+    MSG_ID_L4CPS_EVENT_REPORT_REQ,
+    MSG_ID_L4CPS_EVENT_REPORT_CNF,
+    MSG_ID_L4CPS_MD_EVENT_IND,
+
+    MSG_ID_L4CL1_GSM_EM_TX_PWR_CTRL_REQ,
+    MSG_ID_L4CL1_GSM_EM_TX_PWR_CTRL_CNF,
+
+    /* EM MAX TX POWER SUPPORT*/
+	MSG_ID_L4CEL1_SET_MAX_TX_POWER_REQ,
+	MSG_ID_L4CEL1_SET_MAX_TX_POWER_CNF,
+#ifdef __TX_PWR_EXTENSION__
+	MSG_ID_L4CEL1_SET_EXCL_MAX_TX_POWER_REQ,
+	MSG_ID_L4CEL1_SET_EXCL_MAX_TX_POWER_CNF,
+	MSG_ID_L4CEL1_GET_EXCL_MAX_TX_POWER_REQ,
+	MSG_ID_L4CEL1_GET_EXCL_MAX_TX_POWER_CNF,
+#endif
+	MSG_ID_L4CUL1_SET_MAX_TX_POWER_REQ,
+	MSG_ID_L4CUL1_SET_MAX_TX_POWER_CNF,
+#ifdef __TX_PWR_EXTENSION__
+	MSG_ID_L4CUL1_SET_EXCL_MAX_TX_POWER_REQ,
+	MSG_ID_L4CUL1_SET_EXCL_MAX_TX_POWER_CNF,
+	MSG_ID_L4CUL1_GET_EXCL_MAX_TX_POWER_REQ,
+	MSG_ID_L4CUL1_GET_EXCL_MAX_TX_POWER_CNF,
+#endif
+    MSG_ID_L4CTL1_SET_MAX_TX_POWER_REQ,
+	MSG_ID_L4CTL1_SET_MAX_TX_POWER_CNF,
+
+	MSG_ID_L4CL1_SET_MAX_TX_POWER_REQ,
+	MSG_ID_L4CL1_SET_MAX_TX_POWER_CNF,
+#ifdef __TX_PWR_EXTENSION__
+    MSG_ID_L4CNL1_SET_MAX_TX_POWER_OFFSET_REQ,
+    MSG_ID_L4CNL1_SET_MAX_TX_POWER_OFFSET_CNF,
+    MSG_ID_L4CNL1_SET_ABS_MAX_TX_POWER_REQ,
+    MSG_ID_L4CNL1_SET_ABS_MAX_TX_POWER_CNF,
+    MSG_ID_L4CNL1_GET_ABS_MAX_TX_POWER_REQ,
+    MSG_ID_L4CNL1_GET_ABS_MAX_TX_POWER_CNF,
+#endif
+    /* GL1 RX PATH */
+    MSG_ID_L4CL1_SET_RX_PATH_REQ,
+    MSG_ID_L4CL1_SET_RX_PATH_CNF,
+    /* RF scan related */
+#ifdef __RF_SCAN_FOR_DESENSE_TEST__
+	MSG_ID_L4CL1_EM_RF_SCAN_REQ,
+	MSG_ID_L4CL1_EM_RF_SCAN_CNF,
+
+    MSG_ID_L4CUL1_EM_RF_SCAN_REQ,
+    MSG_ID_L4CUL1_EM_RF_SCAN_CNF,
+
+    MSG_ID_L4CTL1_EM_RF_SCAN_REQ,
+    MSG_ID_L4CTL1_EM_RF_SCAN_CNF,
+
+    MSG_ID_L4CEL1_EM_RF_SCAN_REQ,
+    MSG_ID_L4CEL1_EM_RF_SCAN_CNF,
+
+    MSG_ID_L4C_C2K_CL1_EM_RF_SCAN_REQ,
+    MSG_ID_L4C_C2K_CL1_EM_RF_SCAN_CNF,
+
+    /* C2K RSSI indication for RF scan request*/
+    MSG_ID_L4C_VAL_C2K_RF_SCAN_IND,  
+#endif /*__RF_SCAN_FOR_DESENSE_TEST__*/
+
+    /* Msg id for MCF configuration*/
+	MSG_ID_L4C_MCF_SET_CONFIG_REQ,
+	MSG_ID_L4C_MCF_SET_CONFIG_CNF,
+
+    MSG_ID_L4C_MCF_GET_CONFIG_REQ,
+	MSG_ID_L4C_MCF_GET_CONFIG_CNF,
+
+    MSG_ID_L4C_MCF_DUMP_DATA_REQ,
+    MSG_ID_L4C_MCF_DUMP_DATA_CNF,
+
+    MSG_ID_L4C_MCF_UPDATE_OTA_FILE_REQ,
+    MSG_ID_L4C_MCF_UPDATE_OTA_FILE_CNF,
+
+    MSG_ID_L4C_MCF_CONFIG_REQ,
+    MSG_ID_L4C_MCF_CONFIG_CNF,
+
+    MSG_ID_L4C_MCF_CONFIG_LID_VARIABLE_OPERATION_REQ,
+    MSG_ID_L4C_MCF_CONFIG_LID_VARIABLE_OPERATION_CNF,
+    MSG_ID_L4C_MCF_VARIABLE_VALUE_OPERATION_REQ,
+    MSG_ID_L4C_MCF_VARIABLE_VALUE_OPERATION_CNF,
+	
+#ifdef __MCF_COMBINE_FILE_SUPPORT__   	
+	MSG_ID_L4C_MCF_ASSIGN_COMBINED_FILE_PATH_REQ,
+    MSG_ID_L4C_MCF_ASSIGN_COMBINED_FILE_PATH_CNF,
+#endif /* __MFC_COMBINE_FILE_SUPPORT__ */
+
+    /* Gen Antenna feature*/
+    MSG_ID_L4CGL1_GET_ANT_INFO_REQ,
+    MSG_ID_L4CGL1_GET_ANT_INFO_CNF,
+
+    MSG_ID_L4CUL1_GET_ANT_INFO_REQ,
+    MSG_ID_L4CUL1_GET_ANT_INFO_CNF,
+
+    MSG_ID_L4CTL1_GET_ANT_INFO_REQ,
+    MSG_ID_L4CTL1_GET_ANT_INFO_CNF,
+
+    MSG_ID_L4CEL1_GET_ANT_INFO_REQ,
+    MSG_ID_L4CEL1_GET_ANT_INFO_CNF,
+
+    MSG_ID_L4CGL1_GET_ANT_INFO_IND,
+    MSG_ID_L4CUL1_GET_ANT_INFO_IND,
+    MSG_ID_L4CEL1_GET_ANT_INFO_IND,
+    MSG_ID_L4CTL1_GET_ANT_INFO_IND,
+
+    /* Extended LCE support for Android P */
+    MSG_ID_L4C_NL1_EXTENDED_LCE_REPORT_REQ,
+    MSG_ID_L4C_EL1_EXTENDED_LCE_REPORT_REQ,
+    MSG_ID_L4C_UL1_EXTENDED_LCE_REPORT_REQ,
+    MSG_ID_L4C_UMAC_EXTENDED_LCE_REPORT_REQ,
+    MSG_ID_L4C_MAC_EXTENDED_LCE_REPORT_REQ,
+
+    MSG_ID_L4C_NL1_EXTENDED_LCE_REPORT_IND,
+    MSG_ID_L4C_EL1_EXTENDED_LCE_REPORT_IND,
+    MSG_ID_L4C_UL1_EXTENDED_LCE_REPORT_IND,
+    MSG_ID_L4C_UMAC_EXTENDED_LCE_REPORT_IND,
+    MSG_ID_L4C_MAC_EXTENDED_LCE_REPORT_IND,
+    
+    MSG_ID_L4CGL1_LCM_HOPPING_IND,
+    MSG_ID_L4CUL1_LCM_HOPPING_IND,
+    MSG_ID_L4CRTTL3_LCM_HOPPING_IND,
+    MSG_ID_L4CEVDOL3_LCM_HOPPING_IND,
+    MSG_ID_L4CEL1_LCM_HOPPING_IND,
+    MSG_ID_L4CNL1_LCM_HOPPING_IND,
+
+    MSG_ID_L4C_MMRF_TX_POWER_STATUS_IND,
+
+
+    /* If the message is not to send EM information to AP or Logging tool,
+     * please add before MSG_ID_EM_STATUS_BEGIN. Below are EM messages to
+     * report to AP or Logging tool
+     */
+    MSG_ID_EM_STATUS_BEGIN,
+    MSG_ID_L4CPS_EM_STATUS_IND = MSG_ID_EM_STATUS_BEGIN,
+    /* DO NOT add any message after MSG_ID_EM_STATUS_BEGIN manualy
+       messages below shall be expand from em_info.h
+    */
+
+#define EM_INFO(EM_SRV,X,Y,X_BM,Y_BM,MSGID) MSGID,
+
+    #include "em_info.h"
+
+#undef EM_INFO
+
+#if 0
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif
+    MSG_ID_EM_CODE_END, /* end tag. please add your new EM msg ID before this tag */
+    /* Engineer mode message end */
+MODULE_MSG_END( MSG_ID_EM_CODE_TAIL )
+
+#endif  //EM_MSGID_H
diff --git a/mcu/interface/sap/md/emac_ml1s_msg.h b/mcu/interface/sap/md/emac_ml1s_msg.h
new file mode 100644
index 0000000..93a79b2
--- /dev/null
+++ b/mcu/interface/sap/md/emac_ml1s_msg.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) 2015
+*
+*  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:
+ * ---------
+ *   emac_ml1s_msg.h
+ *
+ * Project:
+ * --------
+ *   UMOLY
+ *
+ * Description:
+ * ------------
+ *   Interface header for EMAC-ML1S interface
+ *
+ * Author:
+ * -------
+ * -------
+ *   
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 06 29 2018 guang-yu.zheng
+ * [MOLY00335879] [MT6295] ML1S multiple TAG flow adding
+ * EMAC-ML1S sTAG TA flow development
+ *
+ * 03 30 2017 nicole.hsu
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * [TRUNK] Modify Force NEWTX interface as ML1S request
+ *
+ * 03 15 2017 mf.jhang
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * . add emac_ml1s_msg.h to libParseDbModem
+ *
+ * 03 13 2017 nicole.hsu
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * ML1S
+ * - Force NEWTX when ML1S request is sent
+ *
+ * 02 24 2017 mf.jhang
+ * [MOLY00194987] [MT6293][UMOLYA/PS DEV] EMAC maintenance
+ * .Add ML1S ILM handler
+ *
+ ****************************************************************************/
+#ifndef  EMAC_ML1S_MSG_H
+#define  EMAC_ML1S_MSG_H
+
+// MSG_ID_ML1S_EMAC_STAG_TA_REQ
+typedef struct 
+{
+    LOCAL_PARA_HDR
+    kal_uint16 stag_ta_value[3]; 
+} ml1s_emac_stag_ta_req_struct;
+
+
+// MSG_ID_ML1S_EMAC_CONN_EST_RA_REQ
+typedef struct 
+{
+    LOCAL_PARA_HDR
+
+    kal_uint16    c_rnti; /* 1 - 65523 */
+    kal_uint16    ptag_ta_value; /* 1 - 1282 */
+} ml1s_emac_conn_est_ra_req_struct;
+
+
+typedef struct
+{
+    LOCAL_PARA_HDR
+    kal_uint8 lcid;
+    kal_uint8 mac_ce_content[3];
+} ml1s_emac_mac_ce_trigger_req_struct;
+
+
+#endif   /* ----- #ifndef EMAC_ML1S_MSG  ----- */
diff --git a/mcu/interface/sap/md/emm_msgid.h b/mcu/interface/sap/md/emm_msgid.h
new file mode 100644
index 0000000..b4a38f3
--- /dev/null
+++ b/mcu/interface/sap/md/emm_msgid.h
@@ -0,0 +1,2298 @@
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   emm_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   LTE NAS EMM (EPS Mobility Management) 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!
+ * 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!
+ *
+ * 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!
+ * 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!
+ * 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!
+ *
+ * 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!
+ * 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!
+ *
+ * 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!
+ * 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!
+ * 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!
+ * 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 _EMM_MSGID_H
+#define _EMM_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_EMM_CODE_BEGIN )
+
+/****************************************************************************
+ *                          Destination: EMM (EVAL to EMM) 
+ ****************************************************************************/
+MSG_ID_EVAL_EMM_SET_RAT_MODE_REQ  = MSG_ID_EMM_CODE_BEGIN,
+MSG_ID_EVAL_EMM_ATTACH_REQ,
+MSG_ID_EVAL_EMM_DETACH_REQ,
+MSG_ID_EVAL_EMM_EMC_ATTACH_REQ, // for IMS
+MSG_ID_EVAL_EMM_INIT_REQ,
+MSG_ID_EVAL_EMM_RFOFF_REQ,
+MSG_ID_EVAL_EMM_UEMODE_PARAM_UPDATE_REQ,
+MSG_ID_EVAL_EMM_PLMN_SEARCH_REQ,
+MSG_ID_EVAL_EMM_PLMN_LIST_STATUS_UPDATE_REQ,
+MSG_ID_EVAL_EMM_DEACTIVATE_REQ,
+MSG_ID_EVAL_EMM_NAS_CTXT_TRANSFER_REQ,
+//MSG_ID_EVAL_EMM_L2C_TRANSFER_REQ,  // for C2K
+MSG_ID_EVAL_EMM_SEARCH_STATUS_UPDATE_REQ,
+MSG_ID_EVAL_EMM_SYS_INFO_UPDATE_REQ,
+MSG_ID_EVAL_EMM_REGN_STATUS_UPDATE_REQ,
+MSG_ID_EVAL_EMM_PLMN_LIST_REQ,
+MSG_ID_EVAL_EMM_PLMN_LIST_STOP_REQ,
+MSG_ID_EVAL_EMM_CSG_LIST_REQ,
+MSG_ID_EVAL_EMM_CSG_LIST_STOP_REQ,
+MSG_ID_EVAL_EMM_EMC_FPLMN_LIST_UPDATE_REQ, // for IMS
+MSG_ID_EVAL_EMM_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_EVAL_EMM_RPLMN_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_EVAL_EMM_HPLMN_INFO_UPDATE_REQ,
+MSG_ID_EVAL_EMM_SMS_EST_REQ,
+MSG_ID_EVAL_EMM_SMS_UNITDATA_REQ,
+MSG_ID_EVAL_EMM_LCS_DATA_REQ, // for LPP
+MSG_ID_EVAL_EMM_LPP_DATA_REQ, // for LPP
+MSG_ID_EVAL_EMM_SIM_READY_REQ,
+MSG_ID_EVAL_EMM_AUTHENTICATE_RSP,
+MSG_ID_EVAL_EMM_SIM_ERROR_REQ,
+MSG_ID_EVAL_EMM_SIM_FILE_UPDATE_REQ,
+MSG_ID_EVAL_EMM_SEARCH_PREFERENCE_UPDATE_REQ, // for IMS
+MSG_ID_EVAL_EMM_RESELECT_SHARED_NW_RSP, // for IMS __6293DEV__
+MSG_ID_EVAL_EMM_RESUME_REQ,
+MSG_ID_EVAL_EMM_ACTIVE_SIM_INFO_REQ,// TODO: remove with EACTS
+MSG_ID_EVAL_EMM_SET_IMS_VOICE_AVAILABILITY_REQ, // for IMS
+MSG_ID_EVAL_EMM_SET_IMS_VOICE_TERMINATION_REQ, // for IMS
+MSG_ID_EVAL_EMM_INVALID_SIM_RECOVER_REQ, // for __REL10__: t3245
+MSG_ID_EVAL_EMM_VDM_VOICE_STATUS_REQ, // IMS call start (first) / end (last)
+MSG_ID_EVAL_EMM_DUPLEX_MODE_CHANGE_REQ, //for C2K
+MSG_ID_EVAL_EMM_CLEAR_T3346_EPLMN_REQ,
+MSG_ID_EVAL_EMM_C2K_CSFB_REQ,
+MSG_ID_EVAL_EMM_C2K_CSFB_STOP_REQ,
+MSG_ID_EVAL_EMM_FACTORY_RESET_REQ,
+MSG_ID_EVAL_EMM_IMS_REG_STATUS_UPDATE_REQ, //for VZ_REQ_LTEB13NAC_6482
+MSG_ID_EVAL_EMM_DRX_UPDATE_REQ,
+MSG_ID_EVAL_EMM_GLOBAL_MODE_CHANGE_START_REQ,
+MSG_ID_EVAL_EMM_IMS_SCM_INFO_REQ, // for REL12 feature SCM
+MSG_ID_EVAL_EMM_ACDC_STATUS_UPDATE_REQ,
+MSG_ID_EVAL_EMM_C2K_FORCE_TO_LOCAL_DETACH_REQ, //for C2K when OP12 project
+MSG_ID_EVAL_EMM_HVOLTE_MODE_CHANGE_REQ, //[ALPS02585002] for VZ hVoLTE, E911 test 
+MSG_ID_EVAL_EMM_CALL_STATUS_IND,
+MSG_ID_EVAL_EMM_DATA_ALLOW_REQ,         // __MULTIPLE_PS__
+MSG_ID_EVAL_EMM_CLEAR_FORBIDDEN_TA_LIST_REQ,
+MSG_ID_EVAL_EMM_GMSS_IRAT_START_IND, // for C2K
+MSG_ID_EVAL_EMM_GMSS_IRAT_FINISH_IND, // for C2K
+
+MSG_ID_EVAL_EMM_SET_PGCHECK_REQ, // for LG new AT command
+MSG_ID_EVAL_EMM_EPS_LOCI_CLEAR_REQ, //MSG_ID_EVAL_EMM_GUTI_IN_NV_CLEAR_REQ,
+MSG_ID_EVAL_EMM_IMS_HANDOVER_ATTACH_REQ,
+MSG_ID_EVAL_EMM_SET_MS_SV_REQ,
+MSG_ID_EVAL_EMM_GENERAL_MODEM_CONFIGURE_SET_REQ,
+MSG_ID_EVAL_EMM_ME_RECONFIGURE_REQ,
+MSG_ID_EVAL_EMM_START_RELEASE_DRB_SESSION_TIMER_IND,
+MSG_ID_EVAL_EMM_RAT_DISABLE_CONFIG_REQ,
+MSG_ID_EVAL_EMM_SMS_STATUS_REQ,
+MSG_ID_EVAL_EMM_MT_SMS_OVER_IMS_STATUS_REQ,
+MSG_ID_EVAL_EMM_NOTIFY_SIM_SWITCH_RFOFF_REQ,
+MSG_ID_EVAL_EMM_REJECT_CAUSE_MAPPING_IND,
+MSG_ID_EVAL_EMM_MANUAL_SEARCH_STOP_REQ, 
+
+// Remote SIM
+MSG_ID_EVAL_EMM_RSIM_AKA_STATUS_REQ,
+MSG_ID_EVAL_EMM_RSIM_AKA_RSIM_ACCESS_FOR_AUTH_DOWNLOAD_REQ,
+MSG_ID_EVAL_EMM_RSIM_AUTH_ABORT_REQ,
+
+// eCall
+MSG_ID_EVAL_EMM_ECALL_TEST_CALL_ATTACH_REQ,
+MSG_ID_EVAL_EMM_ECALL_ABORT_TEST_CALL_ATTACH_REQ,
+MSG_ID_EVAL_EMM_ECALL_END_IND,
+MSG_ID_EVAL_EMM_SET_TIMER_REQ,
+
+//TMO-US GID-MTRREQ-245903 
+MSG_ID_EVAL_EMM_CS_SERVICE_NOTIFICATION_RSP,
+
+MSG_ID_EVAL_EMM_ECBM_START_REQ,
+MSG_ID_EVAL_EMM_ECBM_STOP_REQ,
+MSG_ID_EVAL_EMM_SEND_DAN_SMS_IND,
+MSG_ID_EVAL_EMM_DISCARD_SYS_INFO_UPDATE_REQ,
+/****************************************************************************
+ *                          Destination: EMM (ESM to EMM) 
+ ****************************************************************************/
+/* From ESM */
+MSG_ID_ESM_EMM_ATTACH_NEEDED_GET_ESM_MSG_RSP,
+MSG_ID_ESM_EMM_GET_ESM_CAUSE_RSP,
+MSG_ID_ESM_EMM_SYNC_EPSB_STATUS_REQ,
+MSG_ID_ESM_EMM_GET_EPSB_STATUS_RSP,
+MSG_ID_ESM_EMM_DETACH_REQ,
+MSG_ID_ESM_EMM_ISR_DEACT_REQ,
+MSG_ID_ESM_EMM_QOS_UPDATE_REQ,
+MSG_ID_ESM_EMM_DATA_REQ,
+MSG_ID_ESM_EMM_REEST_REQ,
+MSG_ID_ESM_EMM_ABORT_REQ,
+MSG_ID_ESM_EMM_RAT_CHANGE_RSP,
+MSG_ID_ESM_EMM_RAT_CHANGE_REQ,
+MSG_ID_ESM_EMM_RAT_CHANGE_EPSB_STATUS_REQ,
+MSG_ID_ESM_EMM_EMC_BEARER_STATUS_REQ, // for IMS
+MSG_ID_ESM_EMM_UPDATE_EPSB_STATUS_RSP, // for IMS
+MSG_ID_ESM_EMM_ENTER_EMC_ATTACH_RSP,  // for IMS
+MSG_ID_ESM_EMM_QUERY_UL_DATA_STATUS_RSP,
+MSG_ID_ESM_EMM_C2K_IRAT_COMPLETE_REQ,
+MSG_ID_ESM_EMM_NOTIFY_ESM_EVENT_REQ, //VzW
+MSG_ID_ESM_EMM_SESSION_BEGIN_REQ,    // __MULTIPLE_PS__
+MSG_ID_ESM_EMM_SESSION_END_REQ,      // __MULTIPLE_PS__
+MSG_ID_ESM_EMM_PERSISTENT_EPSBC_UPDATE_REQ,    //__PERSIST_EPSBC__ 
+MSG_ID_ESM_EMM_EPS_BEARER_INFO_REQ,
+MSG_ID_ESM_EMM_VDM_IMS_VOICE_STATUS_REQ,
+MSG_ID_ESM_EMM_IA_APN_CHANGE_REQ,
+
+/****************************************************************************
+ *                          Destination: EMM (ERRC to EMM) 
+ ****************************************************************************/
+
+/* From ERRC */ 
+MSG_ID_EMM_ERRC_ACTIVATION_CNF,
+MSG_ID_EMM_ERRC_RAT_BAND_CNF,
+MSG_ID_EMM_ERRC_ESTABLISH_CNF,
+MSG_ID_EMM_ERRC_RELEASE_CNF,
+MSG_ID_EMM_ERRC_RELEASE_IND,
+MSG_ID_EMM_ERRC_DATA_CNF,
+MSG_ID_EMM_ERRC_DATA_IND,
+MSG_ID_EMM_ERRC_DATA_ABORT_CNF,
+MSG_ID_EMM_ERRC_EPSBEARER_DATA_IND,
+MSG_ID_EMM_ERRC_AC_STATUS_IND,
+MSG_ID_EMM_ERRC_KEY_UPDATE_CNF,
+MSG_ID_EMM_ERRC_TEST_CNF,
+MSG_ID_EMM_ERRC_MBMS_PACKET_COUNTER_CNF,
+MSG_ID_EMM_ERRC_OOS_IND,
+MSG_ID_EMM_ERRC_CELLSELECT_CNF,
+MSG_ID_EMM_ERRC_CELLSELECT_IND,
+MSG_ID_EMM_ERRC_PLMN_FOUND_IND,
+MSG_ID_EMM_ERRC_PLMNLIST_CNF,
+MSG_ID_EMM_ERRC_RESUME_CNF,
+MSG_ID_EMM_ERRC_PAGE_IND,
+MSG_ID_EMM_ERRC_EXCLUSIVE_CONTROL_CNF,
+MSG_ID_EMM_ERRC_RAT_CHANGE_CNF,
+MSG_ID_EMM_ERRC_RAT_CHANGE_IND,
+MSG_ID_EMM_ERRC_CSFB_FAILURE_IND,
+MSG_ID_EMM_ERRC_STANDBY_CNF,
+MSG_ID_EMM_ERRC_STANDBY_IND,
+MSG_ID_EMM_ERRC_PARAM_UPDATE_CNF,
+MSG_ID_EMM_ERRC_QOS_UPDATE_CNF,
+MSG_ID_EMM_ERRC_SIGNAL_APPEAR_IND,
+MSG_ID_EMM_ERRC_CSG_LIST_CNF,
+MSG_ID_EMM_ERRC_CSG_LIST_STOP_CNF,
+MSG_ID_EMM_ERRC_STATUS_UPDATE_CNF,
+MSG_ID_EMM_ERRC_SKIP_IRCCO_STAGE2_IND,
+MSG_ID_EMM_ERRC_CELL_CHANGE_IND,
+MSG_ID_EMM_ERRC_GEMINI_SUSPEND_IND,
+MSG_ID_EMM_ERRC_OOS_SEARCH_IND,
+MSG_ID_EMM_ERRC_DUPLEX_MODE_CHANGE_CNF, //for C2K
+MSG_ID_EMM_ERRC_GEMINI_VIRTUAL_MODE_IND,
+MSG_ID_EMM_ERRC_EARLY_OOS_DISPLAY_IND,
+MSG_ID_EMM_ERRC_NEED_DUPLEX_MODE_CHG_IND,
+MSG_ID_EMM_ERRC_LOCAL_RELEASE_TRIGGER_IND,
+MSG_ID_EMM_ERRC_SET_ACTIVE_RAT_CNF,
+MSG_ID_EMM_ERRC_UE_CAP_ENQUIRY_EUTRA_NTF,
+MSG_ID_EMM_ERRC_CAPABILITY_CHANGE_IND,
+
+/****************************************************************************
+ *                          Destination: EMM (MM to EMM)
+ ****************************************************************************/
+
+/* From MM */
+MSG_ID_MM_EMM_INIT_NAS_CTXT_RSP,
+MSG_ID_MM_EMM_GMM_UPDATE_REGISTRATION_REQ,
+MSG_ID_MM_EMM_GMM_UPDATE_DEREGISTRATION_REQ,
+MSG_ID_MM_EMM_MM_UPDATE_REGISTRATION_REQ,
+MSG_ID_MM_EMM_MM_UPDATE_DEREGISTRATION_REQ,
+MSG_ID_MM_EMM_CSFB_REQ,
+MSG_ID_MM_EMM_CSFB_STOP_REQ,
+MSG_ID_MM_EMM_CSFB_PAGE_RSP,
+MSG_ID_MM_EMM_CSFB_PAGE_CONFIG_REQ,
+MSG_ID_MM_EMM_ISR_UPDATE_REQ,
+MSG_ID_MM_EMM_UPDATE_SECURITY_STATUS_IND,
+MSG_ID_MM_EMM_NAS_CTXT_TRANSFER_REQ,
+
+/****************************************************************************
+ *                          Destination: EMM (ENPDCP to EMM) 
+ ****************************************************************************/
+/* From ENPDCP */
+MSG_ID_EMM_ENPDCP_DETECTION_TIMER3_TIMEOUT_IND,
+
+/****************************************************************************
+ *                          Destination: EMM (NAS_SV to EMM)
+ ****************************************************************************/
+
+/* From NAS_SV */
+MSG_ID_NAS_SV_EMM_SET_IMS_VOICE_AVAILABILITY_REQ,
+MSG_ID_NAS_SV_EMM_SET_IMS_VOICE_TERMINATION_REQ, 
+MSG_ID_NAS_SV_EMM_INIT_REQ,
+MSG_ID_NAS_SV_EMM_UEMODE_PARAM_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_PLMN_LIST_STATUS_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_INVALID_SIM_RECOVER_REQ,
+MSG_ID_NAS_SV_EMM_SYS_INFO_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_REGN_STATUS_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_GLOBAL_MODE_CHANGE_START_REQ,
+MSG_ID_NAS_SV_EMM_RESUME_REQ,
+MSG_ID_NAS_SV_EMM_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_RPLMN_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_EMC_FPLMN_LIST_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_SEARCH_PREFERENCE_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_HVOLTE_MODE_CHANGE_REQ,
+MSG_ID_NAS_SV_EMM_SMS_EST_REQ,
+MSG_ID_NAS_SV_EMM_SMS_UNITDATA_REQ,
+MSG_ID_NAS_SV_EMM_LCS_DATA_REQ,
+MSG_ID_NAS_SV_EMM_LPP_DATA_REQ,
+MSG_ID_NAS_SV_EMM_ACTIVE_SIM_INFO_REQ,
+MSG_ID_NAS_SV_EMM_C2K_CSFB_REQ,
+MSG_ID_NAS_SV_EMM_C2K_CSFB_STOP_REQ,
+MSG_ID_NAS_SV_EMM_C2K_FORCE_TO_LOCAL_DETACH_REQ, 
+MSG_ID_NAS_SV_EMM_CLEAR_FORBIDDEN_TA_LIST_REQ,
+MSG_ID_NAS_SV_EMM_FACTORY_RESET_REQ,
+MSG_ID_NAS_SV_EMM_IMS_REG_STATUS_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_CLEAR_T3346_EPLMN_REQ,
+MSG_ID_NAS_SV_EMM_SET_PGCHECK_REQ,
+MSG_ID_NAS_SV_EMM_DATA_ALLOW_REQ, 
+MSG_ID_NAS_SV_EMM_DRX_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_IMS_SCM_INFO_REQ,
+MSG_ID_NAS_SV_EMM_ACDC_STATUS_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_IA_APN_CHANGE_REQ,
+MSG_ID_NAS_SV_EMM_GENERAL_MODEM_CONFIGURE_SET_REQ,
+MSG_ID_NAS_SV_EMM_RAT_DISABLE_CONFIG_REQ,
+MSG_ID_NAS_SV_EMM_SET_MS_SV_REQ, 
+MSG_ID_NAS_SV_EMM_NOTIFY_SIM_SWITCH_RFOFF_REQ,
+MSG_ID_NAS_SV_EMM_HPLMN_INFO_UPDATE_REQ,
+MSG_ID_NAS_SV_EMM_RSIM_AKA_STATUS_REQ,
+MSG_ID_NAS_SV_EMM_RSIM_AKA_RSIM_ACCESS_FOR_AUTH_DOWNLOAD_REQ,
+MSG_ID_NAS_SV_EMM_RSIM_AUTH_ABORT_REQ,
+MSG_ID_NAS_SV_EMM_SET_ACTIVE_RAT_REQ,
+
+/****************************************************************************
+ *                          Destination: EMM_CALL
+ ****************************************************************************/
+MSG_ID_EMM_ESMIF_CALL_DATA_REQ,
+MSG_ID_EMM_ESMIF_CALL_REEST_REQ,
+MSG_ID_EMM_ESMIF_CALL_BEARER_IND,
+MSG_ID_EMM_ESMIF_CALL_ABORT_REQ,
+MSG_ID_EMM_ESMIF_CALL_SESSION_BEGIN_REQ,   // __MULTIPLE_PS__
+MSG_ID_EMM_ESMIF_CALL_SESSION_END_REQ,     // __MULTIPLE_PS__
+MSG_ID_EMM_ERRCIF_CALL_STMSI_PAGE_IND,
+MSG_ID_EMM_ERRCIF_CALL_CS_PAGE_IND,
+MSG_ID_EMM_ERRCIF_CALL_CSFB_FAILURE_IND,
+MSG_ID_EMM_ERRCIF_CALL_RCV_EPSBEARER_IND,
+MSG_ID_EMM_ERRCIF_CALL_SND_NASMSG_CNF,
+MSG_ID_EMM_ERRCIF_CALL_NEED_DUPLEX_MODE_CHG_IND,
+MSG_ID_EMM_MMIF_CALL_CSFB_REQ,
+MSG_ID_EMM_MMIF_CALL_CSFB_STOP_REQ,
+MSG_ID_EMM_MMIF_CALL_CSFB_PAGE_RSP,
+MSG_ID_EMM_MMIF_CALL_CSFB_PAGE_CONFIG_REQ,
+MSG_ID_EMM_EVALIF_CALL_SMS_EST_REQ,
+MSG_ID_EMM_EVALIF_CALL_SMS_UNITDATA_REQ,
+MSG_ID_EMM_EVALIF_CALL_LCS_DATA_REQ, // for LPP
+MSG_ID_EMM_EVALIF_CALL_LPP_DATA_REQ, // for LPP
+MSG_ID_EMM_EVALIF_CALL_DISABLE_INFO_UPDATE_NTF,
+MSG_ID_EMM_EVALIF_CALL_SET_PGCHECK_REQ, // for LG new AT command
+MSG_ID_EMM_EVALIF_CALL_C2K_CSFB_REQ,
+MSG_ID_EMM_EVALIF_CALL_C2K_CSFB_STOP_REQ,
+MSG_ID_EMM_EVALIF_CALL_IMS_SCM_INFO_REQ, // for REL12 feature SCM
+MSG_ID_EMM_EVALIF_CALL_SMS_STATUS_REQ,
+MSG_ID_EMM_EVALIF_CALL_MT_SMS_OVER_IMS_STATUS_REQ,
+MSG_ID_EMM_EVALIF_CALL_NOTIFY_SIM_SWITCH_RFOFF_REQ,
+MSG_ID_EMM_EVALIF_CALL_CS_SERVICE_NOTIFICATION_RSP, //TMO-US GID-MTRREQ-245903
+MSG_ID_EMM_EVALIF_CALL_START_RELEASE_DRB_SESSION_TIMER_IND,
+MSG_ID_EMM_EVALIF_CALL_GENERAL_MODEM_CONFIGURE_SET_REQ,
+MSG_ID_EMM_TIMERMNG_CALL_T_RELEASE_DRB_SESSION_TIMEOUT_IND,
+MSG_ID_EMM_EVALIF_CALL_CALL_STATUS_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T3417EXT_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T3417EXT_MT_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_CSFB_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T3417_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T3442_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_SR_NOT_ALLOW_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_SERVICE_REQUEST_PROTECT_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_PS_PAGING_PROTECT_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_CALL_REL_CS_SEMAPHORE_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_STMSI_PAGE_RETRY_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_CSFB_USER_RSP_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_IGNORE_SAME_NUMBER_OF_CS_SERVICE_NOTIFICATION_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_OBSERVATION_PAGING_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_DELAY_SEND_PDN_REQUEST_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_QUEUE_PS_PAGING_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CALL_T_ACTIVE_QUEUE_PS_PAGING_TIMEOUT_IND,
+MSG_ID_EMM_REG_CALL_ATTACH_RESULT_IND,
+MSG_ID_EMM_REG_CALL_CS_NW_DETACH_IND,
+MSG_ID_EMM_REG_CALL_REL_EPSB_CTXT_IND,
+MSG_ID_EMM_REG_CALL_SND_ESMMSG_CNF,
+MSG_ID_EMM_REG_CALL_TAU_PENDING_IND,
+MSG_ID_EMM_REG_CALL_SUSPEND_SR_REQ,
+MSG_ID_EMM_REG_CALL_RESUME_SR_REQ,
+MSG_ID_EMM_REG_CALL_UE_DETACH_IND,
+MSG_ID_EMM_REG_CALL_LR_SUCCESS_IND,
+MSG_ID_EMM_REG_CALL_RSIM_AUTH_ABORT_REQ, // Remote SIM
+MSG_ID_EMM_PLMNSEL_CALL_CONOOS_LEAVELTE_IND,
+MSG_ID_EMM_PLMNSEL_CALL_CELL_INFO_IND,
+MSG_ID_EMM_PLMNSEL_CALL_NO_CELL_INFO_IND,
+MSG_ID_EMM_PLMNSEL_CALL_CAMPON_2G3G_IND,
+MSG_ID_EMM_PLMNSEL_CALL_GEMINI_SUSPEND_IND,
+MSG_ID_EMM_PLMNSEL_CALL_OOS_SEARCH_IND,
+MSG_ID_EMM_PLMNSEL_CALL_GEMINI_VIRTUAL_MODE_IND,
+MSG_ID_EMM_RATCHG_CALL_RAT_LTESBY_IND,      // need to remove
+MSG_ID_EMM_RATCHG_CALL_RAT_E2UG_FAIL_IND,   // need to remove
+MSG_ID_EMM_RATCHG_CALL_AS_CONTROL_CNF,      // need to remove
+MSG_ID_EMM_PLMNSEL_CALL_EMC_STATUS_UPDATE_IND, // for IMS
+MSG_ID_EMM_RATCHG_CALL_IRAT_E2UG_COMP_IND,
+MSG_ID_EMM_RATCHG_CALL_IRAT_E2UG_FAIL_IND,
+MSG_ID_EMM_RATCHG_CALL_INTER_SYSTEM_E2V_COMP_IND,
+MSG_ID_EMM_RATCHG_CALL_INTER_SYSTEM_E2V_FAIL_IND,
+MSG_ID_EMM_RATCHG_CALL_INTER_SYSTEM_V2E_COMP_IND,
+MSG_ID_EMM_RATCHG_CALL_IRAT_UG2E_COMP_IND,
+MSG_ID_EMM_RATCHG_CALL_IRAT_E2C_COMP_IND, // for C2K
+MSG_ID_EMM_RATCHG_CALL_IRAT_E2C_FAIL_IND, // for C2K
+MSG_ID_EMM_RATCHG_CALL_STANDBY_IND, // for C2K
+MSG_ID_EMM_RATBAND_CALL_SET_RAT_ABORT_PROC_REQ, // abort procedure for skip detach in set RAT
+MSG_ID_EMM_RATBAND_CALL_SET_RAT_MODE_IND,
+MSG_ID_EMM_CONN_CALL_REL_IND,
+MSG_ID_EMM_CONN_CALL_EST_CNF,
+MSG_ID_EMM_CONN_CALL_AC_STATUS_IND,
+MSG_ID_EMM_CONN_CALL_ACDC_STATUS_CHANGE_IND,
+MSG_ID_EMM_NASMSG_CALL_RCV_CS_SERVICE_NOTIFICATION_IND,
+MSG_ID_EMM_NASMSG_CALL_RCV_SERVICE_REJ_IND,
+MSG_ID_EMM_NASMSG_CALL_SND_NASMSG_CNF,
+MSG_ID_EMM_EVTCTRL_CALL_ABORT_REQ,
+//MSG_ID_EMM_EVTCTRL_CALL_SUSPEND_REQ, //remove SUSP_SUSP conflict resolution
+//MSG_ID_EMM_EVTCTRL_CALL_RESUME_REQ,  //remove SUSP_SUSP conflict resolution
+MSG_ID_EMM_EVTCTRL_CALL_CONTINUE_REQ,
+MSG_ID_EMM_EVTCTRL_CALL_WDT_POLLING_REQ,
+MSG_ID_EMM_SEC_CALL_SMC_FAILURE_IND,
+MSG_ID_EMM_SEC_CALL_RSIM_AUTH_IND,
+MSG_ID_EMM_SV_CALL_IMS_OCCUPY_HPS_REQ,
+MSG_ID_EMM_CALL_UT_CFG_REQ,
+
+/****************************************************************************
+ *                          Destination: EMM_CMNPROC
+ ****************************************************************************/
+MSG_ID_EMM_ERRCIF_CMNPROC_SND_NASMSG_CNF,
+MSG_ID_EMM_NASMSG_CMNPROC_RCV_IDENTITY_REQUEST_IND,
+MSG_ID_EMM_NASMSG_CMNPROC_RCV_EMM_INFORMATION_IND,
+MSG_ID_EMM_NASMSG_CMNPROC_RCV_EMM_STATUS_IND,
+MSG_ID_EMM_NASMSG_CMNPROC_RCV_GUTI_REALLOC_CMD_IND,
+MSG_ID_EMM_NASMSG_CMNPROC_SND_NASMSG_CNF,
+MSG_ID_EMM_PLMNSEL_CMNPROC_CELL_INFO_IND,
+MSG_ID_EMM_ANY_CMNPROC_UT_CONFIG_REQ,
+/****************************************************************************
+ *                          Destination: EMM_CONN
+ ****************************************************************************/
+MSG_ID_EMM_CALL_CONN_REL_REQ,
+MSG_ID_EMM_CALL_CONN_EST_REQ,
+MSG_ID_EMM_ERRCIF_CONN_ESTABLISH_CNF,
+MSG_ID_EMM_ERRCIF_CONN_RELEASE_IND,
+MSG_ID_EMM_ERRCIF_CONN_RELEASE_CNF,
+MSG_ID_EMM_ERRCIF_CONN_AC_STATUS_IND,
+MSG_ID_EMM_EVALIF_CONN_ACDC_STATUS_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_CONN_REL_REQ,
+MSG_ID_EMM_NASMSG_CONN_T3440_STOP_REQ,
+MSG_ID_EMM_PLMNSEL_CONN_CELL_INFO_IND,
+MSG_ID_EMM_PLMNSEL_CONN_REL_REQ,
+MSG_ID_EMM_PLMNSEL_CONN_GEMINI_SUSPEND_IND,
+MSG_ID_EMM_PLMNSEL_CONN_GEMINI_VIRTUAL_MODE_IND,
+MSG_ID_EMM_RATCHG_CONN_EST_REQ,
+MSG_ID_EMM_RATCHG_CONN_REL_REQ,
+MSG_ID_EMM_RATCHG_CONN_IRAT_E2UG_COMP_IND,
+MSG_ID_EMM_RATCHG_CONN_INTER_SYSTEM_E2V_COMP_IND,
+MSG_ID_EMM_RATCHG_CONN_INTER_SYSTEM_HO_V2E_COMP_IND,
+MSG_ID_EMM_RATCHG_CONN_STANDBY_IND,
+MSG_ID_EMM_RATCHG_CONN_RAT_HO_U2E_COMP_IND,
+MSG_ID_EMM_RATCHG_CONN_IRAT_E2C_COMP_IND, // for C2K
+MSG_ID_EMM_REG_CONN_REL_REQ,
+MSG_ID_EMM_REG_CONN_EST_REQ,
+MSG_ID_EMM_REG_CONN_T3440_STOP_REQ,
+MSG_ID_EMM_REG_CONN_WAIT_REL_CON_REQ,
+MSG_ID_EMM_REG_CONN_DEREG_COMP_IND,
+MSG_ID_EMM_SEC_CONN_REL_REQ,
+MSG_ID_EMM_TIMERMNG_CONN_T3440_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CONN_DEREG_REL_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_CONN_T3324_TIMEOUT_IND, //REL12 PSM
+MSG_ID_EMM_PLMNSEL_CONN_PSM_REQ_IND, //REL12 PSM
+MSG_ID_EMM_SV_CONN_SIM_ERROR_IND,
+MSG_ID_EMM_CONN_UT_SETTING_CHANGE_IND,
+MSG_ID_EMM_EVALIF_CONN_DATA_ALLOW_REQ,           // __MULTIPLE_PS__
+MSG_ID_EMM_TIMERMNG_CONN_T_MPS_REL_TIMEOUT_IND,   // __MULTIPLE_PS__
+MSG_ID_EMM_TIMERMNG_CONN_T_IGNORE_PS_PAGING_TIMEOUT_IND,   // __MULTIPLE_PS__
+
+/****************************************************************************
+ *                          Destination: EMM_ERRCIF
+ ****************************************************************************/
+MSG_ID_EMM_REG_ERRCIF_PARAM_UPDATE_REQ,
+MSG_ID_EMM_REG_ERRCIF_CSG_WHITE_LIST_UPDT_REQ,
+MSG_ID_EMM_REG_ERRCIF_REG_STATUS_UPDATE_REQ, //__REL10__ CR0894 + for C2K
+MSG_ID_EMM_REG_ERRCIF_PROC_RESULT_UPDATE_REQ, //VZ_REQ_LTEDATARETRY_39861
+MSG_ID_EMM_REG_ERRCIF_NAS_FAIL_HANDLE_REQ,
+MSG_ID_EMM_REG_ERRCIF_SYNC_CONNECTION_STATUS_NTF,
+MSG_ID_EMM_CALL_ERRCIF_CSG_WHITE_LIST_UPDT_REQ,
+MSG_ID_EMM_CALL_ERRCIF_PARAM_UPDATE_REQ,
+MSG_ID_EMM_CALL_ERRCIF_CSFB_NTF,
+MSG_ID_EMM_CALL_ERRCIF_PROC_RESULT_UPDATE_REQ, //VZ_REQ_LTEDATARETRY_39861
+MSG_ID_EMM_CALL_ERRCIF_NAS_FAIL_HANDLE_REQ,
+MSG_ID_EMM_CALL_ERRCIF_DATA_ABORT_REQ,
+MSG_ID_EMM_CALL_ERRCIF_SYNC_CONNECTION_STATUS_NTF,
+MSG_ID_EMM_PLMNSEL_ERRCIF_PLMNLIST_REQ,
+MSG_ID_EMM_PLMNSEL_ERRCIF_CSG_LIST_REQ,
+MSG_ID_EMM_PLMNSEL_ERRCIF_CSG_LIST_STOP_REQ,
+MSG_ID_EMM_PLMNSEL_ERRCIF_CELLSELECT_REQ,
+MSG_ID_EMM_PLMNSEL_ERRCIF_NWSEL_STATUS_UPDATE_REQ,
+MSG_ID_EMM_PLMNSEL_ERRCIF_PLMN_LIST_STATUS_UPDATE_REQ,
+MSG_ID_EMM_PLMNSEL_ERRCIF_PARAM_UPDATE_REQ,
+MSG_ID_EMM_PLMNSEL_ERRCIF_SEARCH_PREFERENCE_UPDATE_REQ, // for IMS
+MSG_ID_EMM_PLMNSEL_ERRCIF_CSG_WHITE_LIST_UPDT_REQ, // modified with IMS
+MSG_ID_EMM_PLMNSEL_ERRCIF_CHECK_SERVING_SUITABILITY_REQ, // for IMS
+MSG_ID_EMM_PLMNSEL_ERRCIF_STANDBY_REQ,
+MSG_ID_EMM_PLMNSEL_ERRCIF_RAT_DISABLE_CONFIG_REQ,
+MSG_ID_EMM_PLMNSEL_ERRCIF_HPLMN_INFO_UPDATE_REQ,
+MSG_ID_EMM_RATCHG_ERRCIF_RAT_CHANGE_REQ,
+MSG_ID_EMM_RATCHG_ERRCIF_RAT_CHANGE_RSP,
+MSG_ID_EMM_RATCHG_ERRCIF_STANDBY_REQ,
+MSG_ID_EMM_RATCHG_ERRCIF_RESUME_REQ,
+MSG_ID_EMM_RATCHG_ERRCIF_REG_STATUS_UPDATE_REQ,
+MSG_ID_EMM_RATCHG_ERRCIF_RAT_CHANGE_CAUSE_UPDATE_REQ,
+MSG_ID_EMM_RATCHG_ERRCIF_C2K_IRAT_COMPLETE_REQ,
+MSG_ID_EMM_RATCHG_ERRCIF_SET_ACTIVE_RAT_REQ,
+MSG_ID_EMM_SEC_ERRCIF_KEY_UPDATE_REQ,
+MSG_ID_EMM_SEC_ERRCIF_PARAM_UPDATE_REQ,
+MSG_ID_EMM_SEC_ERRCIF_NULL_SECURITY_ACCEPT_REQ,
+MSG_ID_EMM_SEC_ERRCIF_DATA_ABORT_REQ,
+MSG_ID_EMM_CONN_ERRCIF_ESTABLISH_REQ,
+MSG_ID_EMM_CONN_ERRCIF_RELEASE_REQ,
+MSG_ID_EMM_CONN_ERRCIF_RELEASE_RSP,
+MSG_ID_EMM_CONN_ERRCIF_PARAM_UPDATE_REQ,
+MSG_ID_EMM_CONN_ERRCIF_NAS_FAIL_HANDLE_REQ,
+MSG_ID_EMM_CONN_ERRCIF_DATA_ALLOW_REQ,             // __MULTIPLE_PS__
+MSG_ID_EMM_CONN_ERRCIF_PROC_RESULT_UPDATE_REQ, //VZ_REQ_LTEDATARETRY_39861
+MSG_ID_EMM_CMNPROC_ERRCIF_PARAM_UPDATE_REQ,
+MSG_ID_EMM_NASMSG_ERRCIF_DATA_REQ,
+MSG_ID_EMM_NASMSG_ERRCIF_SENSITIVE_DATA_REQ,
+MSG_ID_EMM_ESMIF_ERRCIF_QOS_UPDATE_REQ,
+MSG_ID_EMM_ESMIF_ERRCIF_EPS_BEARER_INFO_REQ,
+MSG_ID_EMM_ESMIF_ERRCIF_VDM_IMS_VOICE_STATUS_REQ,
+MSG_ID_EMM_EVALIF_ERRCIF_SYNC_CONNECTION_STATUS_NTF,
+MSG_ID_EMM_SV_ERRCIF_ACTIVATION_REQ,
+MSG_ID_EMM_SV_ERRCIF_REG_STATUS_UPDATE_REQ,
+MSG_ID_EMM_SV_ERRCIF_CSG_WHITE_LIST_UPDT_REQ,
+MSG_ID_EMM_SV_ERRCIF_SIM_FILE_UPDATE_REQ,
+MSG_ID_EMM_SV_ERRCIF_PARAM_UPDATE_REQ,
+MSG_ID_EMM_RATBAND_ERRCIF_RAT_BAND_REQ,
+MSG_ID_EMM_RATBAND_ERRCIF_DUPLEX_MODE_CHANGE_REQ, //for C2K
+MSG_ID_EMM_ETCIF_ERRCIF_TEST_REQ,
+MSG_ID_EMM_ETCIF_ERRCIF_MBMS_PACKET_COUNTER_REQ,
+MSG_ID_EMM_ETCIF_ERRCIF_UPDATE_UE_LOCATION_INFORMATION_REQ,
+MSG_ID_EMM_CALL_ERRCIF_GEMINI_CSFB_STATUS_REQ,
+MSG_ID_EMM_CALL_ERRCIF_SET_PGCHECK_REQ, // for LG new AT command
+MSG_ID_EMM_EVTCTRL_ERRCIF_LOCAL_RELEASE_TRIGGER_RSP,
+MSG_ID_EMM_ERRCIF_UT_CONFIG_REQ,
+MSG_ID_EMM_ERRCIF_UT_STATUS_IND,
+
+/****************************************************************************
+ *                          Destination: EMM_ESMIF 
+ ****************************************************************************/
+MSG_ID_EMM_REG_ESMIF_GET_EPSB_STATUS_IND,
+MSG_ID_EMM_REG_ESMIF_DATA_RESUME_IND,
+MSG_ID_EMM_REG_ESMIF_DATA_SUSPEND_IND,
+MSG_ID_EMM_REG_ESMIF_ATTACH_NEEDED_GET_ESM_MSG_IND,
+MSG_ID_EMM_REG_ESMIF_UPDATE_EPSB_STATUS_IND,
+MSG_ID_EMM_REG_ESMIF_DEREG_IND,
+MSG_ID_EMM_REG_ESMIF_GET_ESM_CAUSE_IND,
+MSG_ID_EMM_REG_ESMIF_QUERY_UL_DATA_STATUS_IND,
+MSG_ID_EMM_REG_ESMIF_EMC_ATTACH_REJ_IND, // for IMS
+MSG_ID_EMM_REG_ESMIF_EMC_DATA_FAIL_IND, // for IMS
+MSG_ID_EMM_REG_ESMIF_STOP_T3396_IND, // for __REL10__: t3396
+MSG_ID_EMM_REG_ESMIF_STOP_PDN_THROTT_TIMER_IND,
+MSG_ID_EMM_REG_ESMIF_T3402_START_IND,
+MSG_ID_EMM_REG_ESMIF_T3402_STOP_IND,
+MSG_ID_EMM_REG_ESMIF_T3402_CHANGE_IND,
+MSG_ID_EMM_CALL_ESMIF_DATA_CNF,
+MSG_ID_EMM_CALL_ESMIF_DATA_SEND_IND,
+MSG_ID_EMM_CALL_ESMIF_REEST_REJ,
+MSG_ID_EMM_CALL_ESMIF_ABORT_CNF,
+MSG_ID_EMM_CALL_ESMIF_AC_BAR_ALLEVIATE_IND,
+MSG_ID_EMM_RATCHG_ESMIF_RAT_CHANGE_IND,
+MSG_ID_EMM_RATCHG_ESMIF_RAT_CHANGE_CNF,
+MSG_ID_EMM_CONN_ESMIF_CONN_RELEASE_IND,
+MSG_ID_EMM_NASMSG_ESMIF_EPSBEARER_DATA_IND,
+MSG_ID_EMM_NASMSG_ESMIF_DATA_IND,
+MSG_ID_EMM_SEC_ESMIF_ENTER_EMC_ATTACH_IND, // for IMS
+MSG_ID_EMM_SV_ESMIF_IMS_REG_STATUS_UPDATE_IND,
+MSG_ID_EMM_TIMERMNG_ESMIF_T3402_STOP_IND,
+MSG_ID_EMM_PLMNSEL_ESMIF_GEMINI_SUSPEND_IND,
+MSG_ID_EMM_PLMNSEL_ESMIF_GEMINI_RESUME_IND,
+MSG_ID_EMM_PLMNSEL_ESMIF_CELL_INFO_IND,
+
+/****************************************************************************
+ *                          Destination: EMM_ETCIF
+ ****************************************************************************/
+MSG_ID_EMM_ERRCIF_ETCIF_DATA_CNF,
+MSG_ID_EMM_NASMSG_ETCIF_DATA_IND,
+MSG_ID_EMM_NASMSG_ETCIF_DATA_CNF,
+MSG_ID_EMM_ERRCIF_ETCIF_TEST_CNF,
+MSG_ID_EMM_ERRCIF_ETCIF_MBMS_PACKET_COUNTER_CNF,
+MSG_ID_EMM_REG_ETCIF_DETACH_IND,
+MSG_ID_EMM_CONN_ETCIF_REL_IND,
+
+/****************************************************************************
+ *                          Destination: EMM_EVALIF
+ ****************************************************************************/
+MSG_ID_EMM_REG_EVALIF_DETACH_IND,
+MSG_ID_EMM_REG_EVALIF_ATTACH_CNF,
+MSG_ID_EMM_REG_EVALIF_NW_ECC_IND,
+MSG_ID_EMM_REG_EVALIF_NON_3GPP_NW_POLICIES_IND,
+MSG_ID_EMM_REG_EVALIF_REGN_RESULT_IND,
+MSG_ID_EMM_REG_EVALIF_BROADCAST_REGN_RESULT_IND,
+MSG_ID_EMM_REG_EVALIF_DISABLE_NW_LOSS_OPTIMIZE_IND,
+MSG_ID_EMM_REG_EVALIF_NW_REJECT_IND,
+MSG_ID_EMM_REG_EVALIF_NW_FEATURE_SUPPORT_IND, // for IMS
+MSG_ID_EMM_REG_EVALIF_EMC_ATTACH_CNF, // for IMS
+MSG_ID_EMM_REG_EVALIF_EMC_DETACH_IND, // for IMS
+MSG_ID_EMM_REG_EVALIF_T3402_CHANGE_IND, // __REL10__: t3402
+MSG_ID_EMM_REG_EVALIF_T3402_STOP_IND,
+MSG_ID_EMM_REG_EVALIF_PERSISTENT_EPSB_REL_IND, // __REL10__: persistent EPSB
+MSG_ID_EMM_REG_EVALIF_PLMN_RESTRICTION_CHANGE_IND,
+MSG_ID_EMM_REG_EVALIF_C2K_IRAT_ATTACH_RESULT_IND, // for C2K
+MSG_ID_EMM_REG_EVALIF_UPDATE_EMC_PDN_STATUS_IND,
+MSG_ID_EMM_REG_EVALIF_RSIM_AUTH_ABORT_CNF, // Remote SIM
+MSG_ID_EMM_REG_EVALIF_IMS_HANDOVER_NEED_SEARCH_IND,
+MSG_ID_EMM_REG_EVALIF_IA_APN_CHANGE_IND,
+MSG_ID_EMM_REG_EVALIF_IA_APN_NOT_READY_IND,
+// eCall
+MSG_ID_EMM_REG_EVALIF_ECALL_TEST_CALL_ATTACH_CNF,
+MSG_ID_EMM_REG_EVALIF_ECALL_ABORT_TEST_CALL_ATTACH_CNF,
+MSG_ID_EMM_REG_EVALIF_ECALL_REGISTRATION_STATE_IND,
+MSG_ID_EMM_CALL_EVALIF_CSFB_FAIL_IND,
+MSG_ID_EMM_CALL_EVALIF_SMS_EST_CNF,
+MSG_ID_EMM_CALL_EVALIF_SMS_EST_REJ,
+MSG_ID_EMM_CALL_EVALIF_SMS_ERR_IND,
+MSG_ID_EMM_CALL_EVALIF_LCS_DATA_CNF, // for LPP
+MSG_ID_EMM_CALL_EVALIF_LPP_DATA_CNF, // for LPP
+MSG_ID_EMM_CALL_EVALIF_SMS_UNITDATA_CNF,
+MSG_ID_EMM_CALL_EVALIF_SR_FAILURE_IND,
+MSG_ID_EMM_CALL_EVALIF_SR_REJECT_IND,
+MSG_ID_EMM_CALL_EVALIF_RACH_REJECT_IND,
+MSG_ID_EMM_CALL_EVALIF_IMS_SCM_INFO_CNF,
+MSG_ID_EMM_CALL_EVALIF_PLMN_RESTRICTION_CHANGE_IND,
+MSG_ID_EMM_CALL_EVALIF_C2K_CSFB_CNF,
+MSG_ID_EMM_CALL_EVALIF_C2K_CSFB_STOP_CNF,
+MSG_ID_EMM_CALL_EVALIF_C2K_CSFB_START_IND,
+MSG_ID_EMM_CALL_EVALIF_C2K_CSFB_EST_IND,
+MSG_ID_EMM_CALL_EVALIF_C2K_CSFB_STOP_IND,
+MSG_ID_EMM_CALL_EVALIF_NEED_DUPLEX_MODE_CHG_IND,
+MSG_ID_EMM_CALL_EVALIF_MT_PAGE_IND,
+MSG_ID_EMM_CALL_EVALIF_SEND_ESR_IND,
+MSG_ID_EMM_CALL_EVALIF_CAUSE_INFO_IND,
+MSG_ID_EMM_CALL_EVALIF_CS_SERVICE_NOTIFICATION_IND, //TMO-US GID-MTRREQ-245903 
+MSG_ID_EMM_CALL_EVALIF_DRB_SESSION_STATUS_NTF,
+MSG_ID_EMM_CALL_EVALIF_PAGING_PROTECTED_TIMER_MAX_IND,
+MSG_ID_EMM_CALL_EVALIF_GENERAL_MODEM_CONFIGURE_SET_CNF,
+MSG_ID_EMM_CONN_EVALIF_BARRING_STATUS_IND,
+MSG_ID_EMM_CONN_EVALIF_ESTABLISHMENT_IND,
+MSG_ID_EMM_CONN_EVALIF_CONNECTION_INFO_IND,
+MSG_ID_EMM_CONN_EVALIF_ACDC_STATUS_UPDATE_CNF,
+MSG_ID_EMM_CONN_EVALIF_ANY_OPERATION_ALLOW_CNF,
+MSG_ID_EMM_CONN_EVALIF_ANY_OPERATION_ALLOW_NO_ACTION_IND,
+MSG_ID_EMM_EVTCTRL_EVALIF_ANY_OPERATION_CNF,
+MSG_ID_EMM_CONN_EVALIF_LOCAL_RELEASE_RECOVERY_CNF,
+MSG_ID_EMM_PLMNSEL_EVALIF_PLMN_LIST_CNF,
+MSG_ID_EMM_PLMNSEL_EVALIF_PLMN_LIST_STOP_CNF,
+MSG_ID_EMM_PLMNSEL_EVALIF_PLMN_SEARCH_CNF,
+MSG_ID_EMM_PLMNSEL_EVALIF_PLMN_SEARCH_IND,
+MSG_ID_EMM_PLMNSEL_EVALIF_SYS_INFO_IND,
+MSG_ID_EMM_PLMNSEL_EVALIF_PLMN_LOSS_IND,
+MSG_ID_EMM_PLMNSEL_EVALIF_OUT_OF_SERVICE_IND,
+MSG_ID_EMM_PLMNSEL_EVALIF_NO_ACTION_IND,
+MSG_ID_EMM_PLMNSEL_EVALIF_PLMN_FOUND_IND,
+MSG_ID_EMM_PLMNSEL_EVALIF_CSG_LIST_CNF,
+MSG_ID_EMM_PLMNSEL_EVALIF_CSG_LIST_STOP_CNF,
+MSG_ID_EMM_PLMNSEL_EVALIF_SIGNAL_APPEAR_IND,
+MSG_ID_EMM_PLMNSEL_EVALIF_CLEAR_FORBIDDEN_TA_NEED_SEARCH_IND,
+MSG_ID_EMM_PLMNSEL_EVALIF_REGN_RESULT_IND,
+MSG_ID_EMM_PLMNSEL_EVALIF_CELL_INFO_UPDATE_IND,
+MSG_ID_EMM_PLMNSEL_EVALIF_DETACH_IND,
+MSG_ID_EMM_PLMNSEL_EVALIF_EMERGENCY_STATUS_UPDATE_IND, // for IMS
+MSG_ID_EMM_PLMNSEL_EVALIF_RESELECT_SHARED_NW_IND, // for IMS __6293DEV__
+MSG_ID_EMM_PLMNSEL_EVALIF_RESUME_NEEDED_IND,
+MSG_ID_EMM_RATCHG_EVALIF_DEACTIVATE_CNF,
+MSG_ID_EMM_RATCHG_EVALIF_NAS_CTXT_TRANSFER_CNF,
+//MSG_ID_EMM_RATCHG_EVALIF_L2C_TRANSFER_CNF,  // for C2K
+MSG_ID_EMM_RATCHG_EVALIF_SRVCC_STATUS_UPDATE_IND, // for IMS
+MSG_ID_EMM_RATCHG_EVALIF_IRAT_C2L_SUCCESS_NOTIFY_IND, // for C2K
+MSG_ID_EMM_RATCHG_EVALIF_SEARCH_INTERRUPT_EVENT_IND,
+MSG_ID_EMM_RATCHG_EVALIF_SET_ACTIVE_RAT_CNF,
+MSG_ID_EMM_RATCHG_EVALIF_ANY_EVENT_UPDATE_IND,
+MSG_ID_EMM_SEC_EVALIF_RSIM_AUTH_FINISH_IND, // R-SIM
+MSG_ID_EMM_SEC_EVALIF_AUTHENTICATE_IND,
+MSG_ID_EMM_CMNPROC_EVALIF_NW_INFO_IND,
+MSG_ID_EMM_RATBAND_EVALIF_BROADCAST_DETACH_REQUIRED_IND,
+MSG_ID_EMM_RATBAND_EVALIF_SET_RAT_MODE_CNF,
+MSG_ID_EMM_RATBAND_EVALIF_RFOFF_CNF,
+MSG_ID_EMM_RATBAND_EVALIF_DUPLEX_MODE_CHANGE_CNF,   //for C2K
+MSG_ID_EMM_NASMSG_EVALIF_SMS_UNITDATA_IND,
+MSG_ID_EMM_NASMSG_EVALIF_LPP_DATA_IND, // for LPP
+MSG_ID_EMM_NASMSG_EVALIF_LCS_DATA_IND, // for LPP
+MSG_ID_EMM_CONN_EVALIF_RELEASE_IND,
+MSG_ID_EMM_TIMERMNG_EVALIF_PLMN_RESTRICTION_CHANGE_IND,
+MSG_ID_EMM_TIMERMNG_EVALIF_SR_FAILURE_IND,
+MSG_ID_EMM_TIMERMNG_EVALIF_CABTSRI_IND,
+MSG_ID_EMM_TIMERMNG_EVALIF_BROADCAST_TIMER_STATUS_IND,
+MSG_ID_EMM_TIMERMNG_EVALIF_T3402_STOP_IND,
+MSG_ID_EMM_SV_EVALIF_PLMN_RESTRICTION_CHANGE_IND,
+MSG_ID_EMM_SV_EVALIF_SIM_RESET_COMPLETE_IND,
+MSG_ID_EMM_SV_EVALIF_ME_RECONFIGURE_CNF,
+MSG_ID_EMM_EVALIF_REG_DRX_UPDATE_CNF,
+MSG_ID_EMM_EVALIF_REG_DRX_UPDATE_IND,
+
+
+MSG_ID_EMM_RATCHG_EVALIF_AS_PARAM_UPDATE_IND,
+
+MSG_ID_EMM_EVALIF_REG_CELL_BAND_INFO_UPDATE_IND,  // For VzW (VZ_REQ_e911_30203)
+MSG_ID_EMM_REG_EVALIF_EMM_MSG_IND,                // For VzW VoWifi TC3.2
+MSG_ID_EMM_REG_EVALIF_CS_DOMAIN_NOT_AVAILABLE_IND,
+MSG_ID_EMM_REG_EVALIF_CAUSE_INFO_IND,
+MSG_ID_EMM_REG_EVALIF_TAU_FAILURE_IND,
+
+MSG_ID_EMM_SV_EVALIF_GENERAL_MODEM_CONFIGURE_SET_CNF,
+MSG_ID_EMM_REG_EVALIF_ANY_GENERAL_MODEM_CONFIGURE_SET_CNF,
+
+/****************************************************************************
+* 						 Destination: EMM_MSPMIF
+****************************************************************************/
+ MSG_ID_EMM_CALL_MSPMIF_SESSION_START_NTF,
+ MSG_ID_EMM_CALL_MSPMIF_SESSION_END_NTF,
+ MSG_ID_EMM_REG_MSPMIF_SESSION_START_NTF,
+ MSG_ID_EMM_REG_MSPMIF_SESSION_END_NTF,
+ MSG_ID_EMM_SEC_MSPMIF_SESSION_START_NTF,
+ MSG_ID_EMM_SEC_MSPMIF_SESSION_END_NTF,
+
+ /****************************************************************************
+ *                          Destination: EMM_EVTCTRL
+ ****************************************************************************/
+/* END_IND */
+MSG_ID_EMM_SV_EVTCTRL_END_IND,
+MSG_ID_EMM_RATBAND_EVTCTRL_END_IND,
+MSG_ID_EMM_RATCHG_EVTCTRL_END_IND,
+MSG_ID_EMM_REG_EVTCTRL_END_IND,
+MSG_ID_EMM_CALL_EVTCTRL_END_IND,
+MSG_ID_EMM_PLMNSEL_EVTCTRL_END_IND,
+/* ABORT_CNF */
+MSG_ID_EMM_SV_EVTCTRL_ABORT_CNF,
+MSG_ID_EMM_RATBAND_EVTCTRL_ABORT_CNF,
+MSG_ID_EMM_RATCHG_EVTCTRL_ABORT_CNF,
+MSG_ID_EMM_REG_EVTCTRL_ABORT_CNF,
+MSG_ID_EMM_CALL_EVTCTRL_ABORT_CNF,
+MSG_ID_EMM_PLMNSEL_EVTCTRL_ABORT_CNF,
+/* SUSPEND_CNF */
+#if 0 //remove SUSP_SUSP conflict resolution
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif
+/* TIMERMNG */
+MSG_ID_EMM_TIMERMNG_EVTCTRL_WDT_TIMEOUT_IND,
+/*ERRCIF*/
+MSG_ID_EMM_ERRCIF_EVTCTRL_LOCAL_RELEASE_TRIGGER_IND,
+/*CONN*/
+MSG_ID_EMM_CONN_EVTCTRL_REL_IND,
+/*EVALIF*/
+MSG_ID_EMM_EVALIF_CONN_ANY_OPERATION_ALLOW_REQ,
+/* For UT */
+MSG_ID_EMM_EVTCTRL_UT_START_REQ,
+MSG_ID_EMM_EVTCTRL_UT_STOP_REQ,
+MSG_ID_EMM_EVTCTRL_UT_STATE_SET_REQ,
+MSG_ID_EMM_EVTCTRL_UT_EVENT_START_REQ,
+MSG_ID_EMM_EVTCTRL_UT_PUBLIC_API_REQ,
+MSG_ID_EMM_EVTCTRL_UT_PUBLIC_API_CNF,
+
+/****************************************************************************
+ *                          Destination: EMM_MMIF
+ ****************************************************************************/
+MSG_ID_EMM_REG_MMIF_ISR_UPDATE_IND,
+MSG_ID_EMM_REG_MMIF_EMM_UPDATE_REGISTRATION_IND,
+MSG_ID_EMM_REG_MMIF_EMM_UPDATE_DEREGISTRATION_IND,
+MSG_ID_EMM_CALL_MMIF_CSFB_CNF,
+MSG_ID_EMM_CALL_MMIF_CSFB_PAGE_IND,
+MSG_ID_EMM_CALL_MMIF_CSFB_RESULT_IND,
+MSG_ID_EMM_RATCHG_MMIF_INIT_NAS_CTXT_IND,
+MSG_ID_EMM_RATCHG_MMIF_NAS_CTXT_TRANSFER_REQ,
+
+/****************************************************************************
+ *                          Destination: EMM_NASMSG
+ ****************************************************************************/
+MSG_ID_EMM_CALL_NASMSG_SND_NASMSG_REQ,
+MSG_ID_EMM_CALL_NASMSG_SND_SERV_REQ,
+MSG_ID_EMM_REG_NASMSG_SND_NASMSG_REQ,
+MSG_ID_EMM_REG_NASMSG_SND_ESM_MSG_REQ,
+MSG_ID_EMM_REG_NASMSG_ACCEPT_FAILURE_IND,
+MSG_ID_EMM_SEC_NASMSG_SND_NASMSG_REQ,
+MSG_ID_EMM_SEC_NASMSG_EXCHG_REEST_CNF,
+MSG_ID_EMM_CMNPROC_NASMSG_SND_NASMSG_REQ,
+MSG_ID_EMM_ERRCIF_NASMSG_EPSBEARER_DATA_IND,
+MSG_ID_EMM_ERRCIF_NASMSG_DATA_IND,
+MSG_ID_EMM_ERRCIF_NASMSG_DATA_CNF,
+MSG_ID_EMM_NASMSG_UT_SETTING_CHANGE_IND,
+MSG_ID_EMM_ETCIF_NASMSG_DATA_REQ,
+MSG_ID_EMM_PLMNSEL_NASMSG_CELL_INFO_IND,
+MSG_ID_EMM_ERRCIF_NASMSG_CELL_CHANGE_IND,
+MSG_ID_EMM_CONN_NASMSG_REL_IND,
+
+/****************************************************************************
+ *                          Destination: EMM_PLMNSEL
+ ****************************************************************************/
+MSG_ID_EMM_EVALIF_PLMNSEL_PLMN_LIST_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_PLMN_LIST_STOP_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_PLMN_LIST_STATUS_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_PLMN_SEARCH_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_SYS_INFO_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_SEARCH_STATUS_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_CSG_LIST_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_CSG_LIST_STOP_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_EMC_FPLMN_LIST_UPDATE_REQ, // for IMS
+MSG_ID_EMM_EVALIF_PLMNSEL_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_RPLMN_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_HPLMN_INFO_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_REGN_STATUS_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_SEARCH_PREFERENCE_UPDATE_REQ, // for IMS
+MSG_ID_EMM_EVALIF_PLMNSEL_CLEAR_FORBIDDEN_TA_LIST_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_RESELECT_SHARED_NW_RSP, // for IMS __6293DEV__
+MSG_ID_EMM_EVALIF_PLMNSEL_RESUME_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_GLOBAL_MODE_CHANGE_START_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_RAT_DISABLE_CONFIG_REQ,
+MSG_ID_EMM_EVALIF_PLMNSEL_DISCARD_SYS_INFO_UPDATE_REQ,
+MSG_ID_EMM_ERRCIF_PLMNSEL_PLMNLIST_CNF,
+MSG_ID_EMM_ERRCIF_PLMNSEL_CSG_LIST_CNF,
+MSG_ID_EMM_ERRCIF_PLMNSEL_CSG_LIST_STOP_CNF,
+MSG_ID_EMM_ERRCIF_PLMNSEL_CELLSELECT_CNF,
+MSG_ID_EMM_ERRCIF_PLMNSEL_CELLSELECT_IND,
+MSG_ID_EMM_ERRCIF_PLMNSEL_PLMN_FOUND_IND,
+MSG_ID_EMM_ERRCIF_PLMNSEL_OOS_IND,
+MSG_ID_EMM_ERRCIF_PLMNSEL_SIGNAL_APPEAR_IND,
+MSG_ID_EMM_ERRCIF_PLMNSEL_EARLY_OOS_DISPLAY_IND,
+MSG_ID_EMM_ERRCIF_PLMNSEL_OOS_SEARCH_IND,
+MSG_ID_EMM_ERRCIF_PLMNSEL_GEMINI_VIRTUAL_MODE_IND,
+MSG_ID_EMM_ERRCIF_PLMNSEL_STANDBY_CNF, //REL12 PSM
+MSG_ID_EMM_ESMIF_PLMNSEL_EMC_BEARER_STATUS_REQ, // for IMS
+MSG_ID_EMM_ERRCIF_PLMNSEL_GEMINI_SUSPEND_IND,
+MSG_ID_EMM_RATCHG_PLMNSEL_AS_CONTROL_CNF,
+//MSG_ID_EMM_RATCHG_PLMNSEL_RAT_HO_E2U_IND,   // unused
+//MSG_ID_EMM_RATCHG_PLMNSEL_PROC_ASSBY_IND,   // unused
+//MSG_ID_EMM_RATCHG_PLMNSEL_IRAT_UG2E_IND,    // unused
+//MSG_ID_EMM_RATCHG_PLMNSEL_REDIR_E2UG_FAIL_IND,  // unused
+//MSG_ID_EMM_RATCHG_PLMNSEL_RAT_LTESBY_IND,       // unused
+MSG_ID_EMM_RATCHG_PLMNSEL_IRAT_E2UG_COMP_IND,
+MSG_ID_EMM_RATCHG_PLMNSEL_INTER_SYSTEM_E2V_COMP_IND,
+MSG_ID_EMM_RATCHG_PLMNSEL_STANDBY_IND,
+MSG_ID_EMM_RATCHG_PLMNSEL_NO_ACTION_IND,
+MSG_ID_EMM_RATCHG_PLMNSEL_IRAT_E2C_COMP_IND, // for C2K
+//MSG_ID_EMM_RATCHG_PLMNSEL_IRAT_C2E_COMP_IND, // for C2K
+//MSG_ID_EMM_RATCHG_PLMNSEL_IRAT_C2E_FINISH_IND, // for C2K
+MSG_ID_EMM_CALL_PLMNSEL_SEARCH_2G3G_REQ,
+MSG_ID_EMM_CALL_PLMNSEL_SR_END_IND,
+MSG_ID_EMM_CALL_PLMNSEL_SR_CAUSE_IND, // modified with IMS
+MSG_ID_EMM_REG_PLMNSEL_REGISTRATION_END_IND,
+MSG_ID_EMM_REG_PLMNSEL_REGISTRATION_SUCCESS_IND,
+MSG_ID_EMM_REG_PLMNSEL_REGISTRATION_CAUSE_IND, // modified with IMS
+MSG_ID_EMM_REG_PLMNSEL_RESELECT_SHARED_NW_REQ, // for IMS
+MSG_ID_EMM_CONN_PLMNSEL_REL_IND,
+MSG_ID_EMM_CONN_PLMNSEL_PSM_ACTIVATE_REQ, //REL12 PSM
+MSG_ID_EMM_PLMNSEL_PSM_DEACTIVATE_REQ, //REL12 PSM
+MSG_ID_EMM_EVTCTRL_PLMNSEL_ABORT_REQ,
+//MSG_ID_EMM_EVTCTRL_PLMNSEL_SUSPEND_REQ, //remove SUSP_SUSP conflict resolution
+//MSG_ID_EMM_EVTCTRL_PLMNSEL_RESUME_REQ,  //remove SUSP_SUSP conflict resolution
+MSG_ID_EMM_EVTCTRL_PLMNSEL_CONTINUE_REQ,
+MSG_ID_EMM_EVTCTRL_PLMNSEL_WDT_POLLING_REQ,
+MSG_ID_EMM_TIMERMNG_PLMNSEL_FTAI_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_PLMNSEL_FTAI_REJ15_TIMEOUT_IND,
+MSG_ID_EMM_SV_PLMNSEL_SIM_ERROR_IND,
+MSG_ID_EMM_SV_PLMNSEL_POWEROFF_IND,
+MSG_ID_EMM_SV_PLMNSEL_SIM_READY_IND,
+MSG_ID_EMM_SV_PLMNSEL_SIM_VALID_IND,
+MSG_ID_EMM_SV_PLMNSEL_SIM_READY_CANCELED_IND,
+MSG_ID_EMM_RATBAND_PLMNSEL_SET_RAT_MODE_IND,
+MSG_ID_EMM_PLMNSEL_UT_CONFIG_REQ,
+MSG_ID_EMM_PLMNSEL_UT_CHECK_PUBLIC_FUNCTION_REQ,
+MSG_ID_EMM_PLMNSEL_UT_CHECK_PUBLIC_FUNCTION_CNF,
+MSG_ID_EMM_PLMNSEL_SELF_UT_REQ, // modified with IMS
+
+/****************************************************************************
+ *                          Destination: EMM_RATBAND
+ ****************************************************************************/
+MSG_ID_EMM_EVTCTRL_RATBAND_ABORT_REQ,
+//MSG_ID_EMM_EVTCTRL_RATBAND_SUSPEND_REQ, //remove SUSP_SUSP conflict resolution
+//MSG_ID_EMM_EVTCTRL_RATBAND_RESUME_REQ,  //remove SUSP_SUSP conflict resolution
+MSG_ID_EMM_EVTCTRL_RATBAND_CONTINUE_REQ,
+MSG_ID_EMM_EVALIF_RATBAND_RFOFF_REQ,
+MSG_ID_EMM_EVALIF_RATBAND_SET_RAT_MODE_REQ,
+MSG_ID_EMM_EVALIF_RATBAND_DUPLEX_MODE_CHANGE_REQ,   //for C2K
+MSG_ID_EMM_ERRCIF_RATBAND_RAT_BAND_CNF,
+MSG_ID_EMM_ERRCIF_RATBAND_DUPLEX_MODE_CHANGE_CNF,   //for C2K
+MSG_ID_EMM_REG_RATBAND_DETACH_CNF,
+MSG_ID_EMM_RATCHG_RATBAND_AS_CONTROL_CNF,
+MSG_ID_EMM_ANY_RATBAND_UT_CONFIG_REQ,
+MSG_ID_EMM_RATBAND_UT_STATUS_IND,
+MSG_ID_EMM_EVTCTRL_RATBAND_WDT_POLLING_REQ,
+MSG_ID_EMM_CONN_RATBAND_REL_IND,
+MSG_ID_EMM_TIMERMNG_RATBAND_REL_CONN_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_RATBAND_DETACH_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_RATBAND_DEFER_SET_RAT_TIMEOUT_IND,
+MSG_ID_EMM_SV_RATBAND_IMS_REG_STATUS_UPDATE_REQ,
+
+
+/****************************************************************************
+ *                          Destination: EMM_RATCHG
+ ****************************************************************************/ 
+//MSG_ID_EMM_CALL_RATCHG_AS_CONTROL_REQ,
+MSG_ID_EMM_PLMNSEL_RATCHG_AS_CONTROL_REQ,
+MSG_ID_EMM_PLMNSEL_RATCHG_CELL_INFO_IND,
+MSG_ID_EMM_PLMNSEL_RATCHG_ABORT_NAS_CTXT_TRANSFER_REQ,
+MSG_ID_EMM_CONN_RATCHG_EST_CNF,
+MSG_ID_EMM_CONN_RATCHG_REDIRECTION_IND,
+MSG_ID_EMM_CONN_RATCHG_REL_PEND_IND,
+MSG_ID_EMM_CONN_RATCHG_REL_IND,
+MSG_ID_EMM_ESMIF_RATCHG_RAT_CHANGE_REQ,
+MSG_ID_EMM_ESMIF_RATCHG_RAT_CHANGE_RSP,
+MSG_ID_EMM_ESMIF_RATCHG_C2K_IRAT_COMPLETE_REQ, // for C2K
+MSG_ID_EMM_ESMIF_RATCHG_RAT_CHANGE_EPSB_STATUS_REQ,
+//MSG_ID_EMM_EVALIF_RATCHG_L2C_TRANSFER_REQ,  // for C2K
+MSG_ID_EMM_EVALIF_RATCHG_DEACTIVATE_REQ,
+MSG_ID_EMM_EVALIF_RATCHG_GMSS_IRAT_START_IND, // for C2K
+MSG_ID_EMM_EVALIF_RATCHG_GMSS_IRAT_FINISH_IND, // for C2K
+MSG_ID_EMM_EVALIF_RATCHG_SET_ACTIVE_RAT_REQ,
+MSG_ID_EMM_MMIF_RATCHG_INIT_NAS_CTXT_RSP,
+MSG_ID_EMM_MMIF_RATCHG_NAS_CTXT_TRANSFER_REQ, // NAS-SV IRAT
+MSG_ID_EMM_MMIF_RATCHG_UPDATE_SECURITY_STATUS_IND,
+MSG_ID_EMM_EVALIF_RATCHG_NAS_CTXT_TRANSFER_REQ,
+MSG_ID_EMM_EVALIF_RATCHG_ANY_RAT_CHANGE_START_IND,
+MSG_ID_EMM_EVALIF_RATCHG_ANY_RAT_CHANGE_FINISH_IND,
+MSG_ID_EMM_EVALIF_RATCHG_AS_PARAM_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_RATCHG_ANY_EVENT_UPDATE_REQ,
+MSG_ID_EMM_ERRCIF_RATCHG_RAT_CHANGE_IND,
+MSG_ID_EMM_ERRCIF_RATCHG_RAT_CHANGE_CNF,
+MSG_ID_EMM_ERRCIF_RATCHG_STANDBY_CNF,
+MSG_ID_EMM_ERRCIF_RATCHG_STANDBY_IND,
+MSG_ID_EMM_ERRCIF_RATCHG_RESUME_CNF,
+MSG_ID_EMM_ERRCIF_RATCHG_SKIP_IRCCO_STAGE2_IND,
+MSG_ID_EMM_ERRCIF_RATCHG_SET_ACTIVE_RAT_CNF,
+MSG_ID_EMM_RATBAND_RATCHG_AS_CONTROL_REQ,
+MSG_ID_EMM_RATBAND_RATCHG_C2K_RAT_DISABLE_IND, // for C2K
+MSG_ID_EMM_SV_RATCHG_SIM_READY_IND,
+MSG_ID_EMM_SV_RATCHG_SIM_DETACH_IND,
+MSG_ID_EMM_EVTCTRL_RATCHG_ABORT_REQ,
+//MSG_ID_EMM_EVTCTRL_RATCHG_SUSPEND_REQ,  //remove SUSP_SUSP conflict resolution
+//MSG_ID_EMM_EVTCTRL_RATCHG_RESUME_REQ,   //remove SUSP_SUSP conflict resolution
+MSG_ID_EMM_EVTCTRL_RATCHG_CONTINUE_REQ,
+MSG_ID_EMM_EVTCTRL_RATCHG_WDT_POLLING_REQ,
+MSG_ID_EMM_ANY_RATCHG_UT_CONFIG_REQ,
+MSG_ID_EMM_RATCHG_UT_STATUS_IND,
+
+
+/****************************************************************************
+ *                          Destination: EMM_REG
+ ****************************************************************************/ 
+/* from CALL */
+MSG_ID_EMM_CALL_REG_RCV_SERVICE_REJECT_IND,
+MSG_ID_EMM_CALL_REG_TAU_INIT_REQ,
+MSG_ID_EMM_CALL_REG_EXSR_SEND_IND,
+MSG_ID_EMM_CALL_REG_SND_ESMMSG_REQ,
+MSG_ID_EMM_CALL_REG_BEARER_IND,
+MSG_ID_EMM_CALL_REG_WAITEPSINFO_START_REQ,
+MSG_ID_EMM_CALL_REG_ATTACH_INIT_REQ,
+MSG_ID_EMM_CALL_REG_SUSPEND_TAU_REQ,
+MSG_ID_EMM_CALL_REG_RESUME_TAU_REQ,
+MSG_ID_EMM_CALL_REG_SR_PENDING_IND,
+MSG_ID_EMM_CALL_REG_SR_STATUS_IND, // for IMS
+MSG_ID_EMM_CALL_REG_SR_MAX_ATTEMPT_IND,
+MSG_ID_EMM_CALL_REG_SR_RACH_FAIL_IND,
+MSG_ID_EMM_CALL_REG_SR_ABNORMAL_IND,
+MSG_ID_EMM_CALL_REG_C2K_CSFB_IND, //for C2K + SRLTE
+MSG_ID_EMM_CALL_REG_C2K_CSFB_STOP_IND, //for C2K + SRLTE
+MSG_ID_EMM_CALL_REG_SMS_EST_IND,
+/* from PLMNSEL */
+MSG_ID_EMM_PLMNSEL_REG_NO_CELL_INFO_IND,
+MSG_ID_EMM_PLMNSEL_REG_CELL_INFO_IND,
+MSG_ID_EMM_PLMNSEL_REG_PLMN_LIST_STATUS_UPDATE_REQ,
+MSG_ID_EMM_PLMNSEL_REG_PLMNSEARCH_END_IND,
+MSG_ID_EMM_PLMNSEL_REG_OOS_FIRST_ROUND_FAIL_IND,
+MSG_ID_EMM_PLMNSEL_REG_EMC_STATUS_UPDATE_IND, // for IMS
+MSG_ID_EMM_PLMNSEL_REG_RESELECT_SHARED_NW_CNF, // for IMS
+MSG_ID_EMM_PLMNSEL_REG_PLMN_SEARCH_LIST_START_IND, // for IMS
+MSG_ID_EMM_PLMNSEL_REG_GEMINI_SUSPEND_IND,
+MSG_ID_EMM_PLMNSEL_REG_GLOBAL_MODE_CHANGE_START_REQ,
+MSG_ID_EMM_PLMNSEL_REG_GEMINI_VIRTUAL_MODE_IND,
+MSG_ID_EMM_PLMNSEL_REG_LEAVE_VIRTUAL_IDLE_MODE_IND,
+MSG_ID_EMM_PLMNSEL_REG_DISCARD_SYS_INFO_UPDATE_REQ,
+/* from CMNPROC */
+MSG_ID_EMM_CMNPROC_REG_REG_REINIT_REQ,
+/* from CONN */
+MSG_ID_EMM_CONN_REG_EST_CNF,
+MSG_ID_EMM_CONN_REG_REL_IND,
+MSG_ID_EMM_CONN_REG_AC_STATUS_IND,
+MSG_ID_EMM_CONN_REG_EST_IND,
+MSG_ID_EMM_CONN_REG_T3440_STOP_CNF,
+MSG_ID_EMM_CONN_REG_ACDC_STATUS_CHANGE_IND,
+/* from ESMIF */
+MSG_ID_EMM_ESMIF_REG_ATTACH_NEEDED_GET_ESM_MSG_RSP,
+MSG_ID_EMM_ESMIF_REG_GET_EPSB_STATUS_RSP,
+MSG_ID_EMM_ESMIF_REG_SYNC_EPSB_STATUS_REQ,
+MSG_ID_EMM_ESMIF_REG_DETACH_REQ,
+MSG_ID_EMM_ESMIF_REG_ISR_DEACT_REQ,
+MSG_ID_EMM_ESMIF_REG_GET_ESM_CAUSE_RSP,
+MSG_ID_EMM_ESMIF_REG_QUERY_UL_DATA_STATUS_RSP,
+MSG_ID_EMM_ESMIF_REG_UPDATE_EPSB_STATUS_RSP, // for IMS
+MSG_ID_EMM_ESMIF_REG_QOS_UPDATE_REQ,
+MSG_ID_EMM_ESMIF_REG_PERSISTENT_EPSBC_UPDATE_REQ,  // for __REL10__: persistent EPSB
+MSG_ID_EMM_ESMIF_REG_NOTIFY_ESM_EVENT_REQ, //VzW
+MSG_ID_EMM_ESMIF_REG_EPS_BEARER_INFO_REQ,
+MSG_ID_EMM_ESMIF_REG_IA_APN_CHANGE_REQ,
+/* from EVALIF */
+MSG_ID_EMM_EVALIF_REG_DETACH_REQ,
+MSG_ID_EMM_EVALIF_REG_ATTACH_REQ,
+MSG_ID_EMM_EVALIF_REG_UEMODE_PARAM_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_REG_CAPABILITY_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_REG_EMC_ATTACH_REQ, // for IMS
+MSG_ID_EMM_EVALIF_REG_ACTIVE_SIM_INFO_REQ, // TODO: remove with EACTS
+MSG_ID_EMM_EVALIF_REG_SET_IMS_VOICE_AVAILABILITY_REQ, // for IMS
+MSG_ID_EMM_EVALIF_REG_SET_IMS_VOICE_TERMINATION_REQ, // for IMS
+MSG_ID_EMM_EVALIF_REG_VDM_VOICE_STATUS_REQ, // IMS call start (first) / end (last)
+MSG_ID_EMM_EVALIF_REG_DRX_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_REG_C2K_FORCE_TO_LOCAL_DETACH_REQ, //for C2K
+MSG_ID_EMM_EVALIF_REG_EMC_SESSION_START_REQ,
+MSG_ID_EMM_EVALIF_REG_EMC_SESSION_STOP_REQ,
+MSG_ID_EMM_EVALIF_REG_HVOLTE_MODE_CHANGE_REQ, //[ALPS02585002] for VZ hVoLTE, E911 test
+MSG_ID_EMM_EVALIF_REG_EPS_LOCI_CLEAR_REQ,	//MSG_ID_EMM_EVALIF_REG_GUTI_IN_NV_CLEAR_REQ,
+MSG_ID_EMM_EVALIF_REG_IMS_HANDOVER_ATTACH_REQ,
+MSG_ID_EMM_EVALIF_REG_MANUAL_SEARCH_STOP_REQ,
+MSG_ID_EMM_EVALIF_REG_ANY_BROADCAST_REGN_RESULT_IND,
+MSG_ID_EMM_EVALIF_REG_ANY_GENERAL_MODEM_CONFIGURE_SET_REQ,
+MSG_ID_EMM_EVALIF_REG_DISABLE_INFO_UPDATE_NTF,
+
+// Remote SIM
+MSG_ID_EMM_EVALIF_REG_RSIM_AKA_STATUS_REQ,
+MSG_ID_EMM_EVALIF_REG_RSIM_AKA_RSIM_ACCESS_FOR_AUTH_DOWNLOAD_REQ,
+MSG_ID_EMM_EVALIF_REG_RSIM_AUTH_ABORT_REQ,
+
+// eCall
+MSG_ID_EMM_EVALIF_REG_ECALL_TEST_CALL_ATTACH_REQ,
+MSG_ID_EMM_EVALIF_REG_ECALL_ABORT_TEST_CALL_ATTACH_REQ,
+MSG_ID_EMM_EVALIF_REG_ECALL_END_IND,
+
+MSG_ID_EMM_EVALIF_REG_ECBM_START_REQ,
+MSG_ID_EMM_EVALIF_REG_ECBM_STOP_REQ,
+MSG_ID_EMM_EVALIF_REG_SEND_DAN_SMS_IND,
+
+/* from MMIF */
+MSG_ID_EMM_MMIF_REG_GMM_UPDATE_REGISTRATION_REQ,
+MSG_ID_EMM_MMIF_REG_GMM_UPDATE_DEREGISTRATION_REQ,
+MSG_ID_EMM_MMIF_REG_MM_UPDATE_REGISTRATION_REQ,
+MSG_ID_EMM_MMIF_REG_MM_UPDATE_DEREGISTRATION_REQ,
+MSG_ID_EMM_MMIF_REG_ISR_UPDATE_REQ,
+/* from ERRCIF */
+MSG_ID_EMM_ERRCIF_REG_SND_NASMSG_CNF, // no use?
+MSG_ID_EMM_ERRCIF_REG_IMSI_PAGE_IND,
+MSG_ID_EMM_ERRCIF_REG_ACTIVE_EPSBEARER_IND, // for __REL10__: persistent EPSB
+MSG_ID_EMM_ERRCIF_REG_DETECTION_TIMER3_TIMEOUT_IND,
+MSG_ID_EMM_ERRCIF_REG_UE_CAP_ENQUIRY_EUTRA_NTF,
+MSG_ID_EMM_ERRCIF_REG_CAPABILITY_CHANGE_IND,
+/* from EVTCTRL */
+MSG_ID_EMM_EVTCTRL_REG_ABORT_REQ,
+//MSG_ID_EMM_EVTCTRL_REG_SUSPEND_REQ, //remove SUSP_SUSP conflict resolution
+//MSG_ID_EMM_EVTCTRL_REG_RESUME_REQ,  //remove SUSP_SUSP conflict resolution
+MSG_ID_EMM_EVTCTRL_REG_CONTINUE_REQ,
+MSG_ID_EMM_EVTCTRL_REG_WDT_POLLING_REQ,
+/* from NASMSG */
+MSG_ID_EMM_NASMSG_REG_RCV_ATTACH_ACCEPT_IND,
+MSG_ID_EMM_NASMSG_REG_RCV_ATTACH_REJECT_IND,
+MSG_ID_EMM_NASMSG_REG_RCV_TAU_ACCEPT_IND,
+MSG_ID_EMM_NASMSG_REG_RCV_TAU_REJECT_IND,
+MSG_ID_EMM_NASMSG_REG_RCV_DETACH_REQUEST_IND,
+MSG_ID_EMM_NASMSG_REG_RCV_DETACH_ACCEPT_IND,
+MSG_ID_EMM_NASMSG_REG_SND_NASMSG_CNF,
+MSG_ID_EMM_NASMSG_REG_RCV_GUTI_REALLOC_CMD_IND,
+
+/* from SEC */
+MSG_ID_EMM_SEC_REG_REG_REINIT_REQ,
+MSG_ID_EMM_SEC_REG_ATTACH_TRIGGER_IND,
+MSG_ID_EMM_SEC_REG_RCV_AUTH_REJECT_IND,
+MSG_ID_EMM_SEC_REG_SMC_FAILURE_IND,
+MSG_ID_EMM_SEC_REG_AUTH_TRIGGER_END_DETACH_REQ,
+MSG_ID_EMM_SEC_REG_RSIM_AUTH_IND,
+
+/* from TIMERMNG */
+MSG_ID_EMM_TIMERMNG_REG_T3402_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T3411_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T3412_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T3430_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T3410_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T3421_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T_DETACH_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T3423_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T3346_TIMEOUT_IND, // for __REL10__: t3346
+MSG_ID_EMM_TIMERMNG_REG_ABN_REG_GUARD_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T_PLMNLIST_REL_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_THROTTLING_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T_WAIT_HIGH_PS_REL_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T_FTAI_ABNORMAL_MAX_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_NAS_RECOVERY_BACKOFF_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T_NW_DET_ENH_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T_REUSE_CONN_FOR_EMC_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T_PROTECT_ERRC_FAKE_PROCEDURE_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T_SMART_IDLE_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T_MONITOR_UE_CAP_ENQUIRY_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T_LIMIT_SYNC_TAU_TIMEOUT_IND,
+#ifdef __NG_ECALL_SUPPORT__ 
+MSG_ID_EMM_TIMERMNG_REG_T3444_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_REG_T3445_TIMEOUT_IND,
+#endif
+
+/* from SV */
+MSG_ID_EMM_SV_REG_SIM_READY_IND,
+MSG_ID_EMM_SV_REG_DETACH_REQ,
+MSG_ID_EMM_SV_REG_SIM_READY_CANCELED_IND,
+MSG_ID_EMM_SV_REG_SIM_VALID_IND, // for __REL10__: t3245 
+/* from RATBAND */
+MSG_ID_EMM_RATBAND_REG_DETACH_REQ,
+MSG_ID_EMM_RATBAND_REG_FORCE_LOCAL_DETACH_REQ,
+MSG_ID_EMM_RATBAND_REG_SET_RAT_ABORT_PROC_REQ, // abort procedure for skip detach in set RAT
+MSG_ID_EMM_RATBAND_REG_SET_RAT_MODE_IND,
+/* from RATCHG */
+MSG_ID_EMM_RATCHG_REG_IRAT_E2UG_COMP_IND,
+MSG_ID_EMM_RATCHG_REG_IRAT_UG2E_COMP_IND,
+MSG_ID_EMM_RATCHG_REG_IRAT_E2UG_FAIL_IND,
+MSG_ID_EMM_RATCHG_REG_IRAT_UG2E_FAIL_IND,
+MSG_ID_EMM_RATCHG_REG_IRAT_E2UG_INIT_IND,
+MSG_ID_EMM_RATCHG_REG_INTER_SYSTEM_E2V_COMP_IND,
+MSG_ID_EMM_RATCHG_REG_INTER_SYSTEM_E2V_FAIL_IND,
+MSG_ID_EMM_RATCHG_REG_INTER_SYSTEM_E2V_INIT_IND,
+MSG_ID_EMM_RATCHG_REG_INTER_SYSTEM_V2E_COMP_IND,
+MSG_ID_EMM_RATCHG_REG_INTER_SYSTEM_V2E_FAIL_IND,
+MSG_ID_EMM_RATCHG_REG_STANDBY_IND, // for C2K
+MSG_ID_EMM_RATCHG_REG_IRAT_E2C_COMP_IND, // for C2K
+MSG_ID_EMM_RATCHG_REG_IRAT_C2E_COMP_IND, // for C2K
+
+/* from MSPMIF*/
+MSG_ID_EMM_MSPMIF_REG_RF_OWNER_PRIORITY_CHANGE_NTF,
+
+/* for UT*/
+MSG_ID_EMM_REG_UT_CONFIG_REQ,
+
+/****************************************************************************
+ *                          Destination: EMM_SEC
+ ****************************************************************************/
+MSG_ID_EMM_PLMNSEL_SEC_CAMPON_PLMN_CHG_IND,
+MSG_ID_EMM_PLMNSEL_SEC_CELL_INFO_IND,
+MSG_ID_EMM_PLMNSEL_SEC_VIRTUAL_MODE_STATUS_UPDATE_IND, // R-SIM
+MSG_ID_EMM_CALL_SEC_AUTH_DATA_DEL_REQ,
+MSG_ID_EMM_CALL_SEC_DELETE_KSI_REQ,
+MSG_ID_EMM_CALL_SEC_INITIAL_NAS_PROC_IND,
+MSG_ID_EMM_REG_SEC_DELETE_KSI_REQ,
+MSG_ID_EMM_REG_SEC_AUTH_DATA_DEL_REQ,
+MSG_ID_EMM_REG_SEC_REG_INIT_IND,
+MSG_ID_EMM_REG_SEC_DEREG_COMP_IND,
+MSG_ID_EMM_REG_SEC_INITIAL_NAS_PROC_IND,
+MSG_ID_EMM_REG_SEC_APPLY_IDLE_KASME_IND,
+//MSG_ID_EMM_RATCHG_SEC_RATLTESBY_IND,    // need to remove
+//MSG_ID_EMM_RATCHG_SEC_RAT_HO_U2E_IND,   // need to remove
+//MSG_ID_EMM_RATCHG_SEC_RAT_IDLE_U2E_IND, // need to remove 
+MSG_ID_EMM_RATCHG_SEC_IRAT_E2UG_COMP_IND,
+MSG_ID_EMM_RATCHG_SEC_INTER_SYSTEM_E2V_COMP_IND,
+MSG_ID_EMM_RATCHG_SEC_INTER_SYSTEM_HO_V2E_COMP_IND,
+MSG_ID_EMM_RATCHG_SEC_INTER_SYSTEM_IDLE_V2E_COMP_IND,
+MSG_ID_EMM_RATCHG_SEC_RAT_IDLE_UG2E_COMP_IND,
+MSG_ID_EMM_RATCHG_SEC_RAT_HO_U2E_COMP_IND,
+MSG_ID_EMM_RATCHG_SEC_RAT_HO_U2E_FAIL_IND,
+MSG_ID_EMM_RATCHG_SEC_WRAP_AROUND_IND,
+MSG_ID_EMM_RATCHG_SEC_IRAT_E2C_COMP_IND, // for C2K
+MSG_ID_EMM_CONN_SEC_REL_IND,
+MSG_ID_EMM_CONN_SEC_EST_IND,
+MSG_ID_EMM_EVALIF_SEC_AUTHENTICATE_RSP,
+MSG_ID_EMM_NASMSG_SEC_RCV_AUTH_REQ_IND,
+MSG_ID_EMM_NASMSG_SEC_RCV_AUTH_REJ_IND,
+MSG_ID_EMM_NASMSG_SEC_RCV_SECURITY_CMD_IND,
+MSG_ID_EMM_NASMSG_SEC_WRAP_AROUND_IND,
+//MSG_ID_EMM_NASMSG_SEC_EXCHG_REEST_REQ,
+MSG_ID_EMM_NASMSG_SEC_SND_NASMSG_CNF,
+MSG_ID_EMM_ERRCIF_SEC_SND_NASMSG_CNF,
+MSG_ID_EMM_ERRCIF_SEC_RCV_EPSBEARER_IND,
+MSG_ID_EMM_ESMIF_SEC_ENTER_EMC_ATTACH_RSP, // for IMS
+MSG_ID_EMM_TIMERMNG_SEC_T3416_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_SEC_T3418_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_SEC_T3420_TIMEOUT_IND,
+MSG_ID_EMM_TIMERMNG_SEC_T_RESEND_AUTH_TIMEOUT_IND, // R-SIM
+MSG_ID_EMM_SV_SEC_SIM_READY_IND,
+MSG_ID_EMM_SV_SEC_SIM_DETACH_IND,
+MSG_ID_EMM_SV_SEC_DELETE_KSI_REQ,
+MSG_ID_EMM_ANY_SEC_UT_CONFIG_REQ,
+
+/****************************************************************************
+ *                          Destination: EMM_SV
+ ****************************************************************************/
+MSG_ID_EMM_EVALIF_SV_INIT_REQ,
+MSG_ID_EMM_EVALIF_SV_SET_MS_SV_REQ,
+MSG_ID_EMM_EVALIF_SV_SIM_READY_REQ,
+MSG_ID_EMM_EVALIF_SV_SIM_ERROR_REQ,
+MSG_ID_EMM_EVALIF_SV_DETACH_REQ,
+MSG_ID_EMM_EVALIF_SV_SIM_FILE_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_SV_SIM_VALID_REQ, // for __REL10__: t3245
+MSG_ID_EMM_EVALIF_SV_FACTORY_RESET_REQ,
+MSG_ID_EMM_EVALIF_SV_IMS_REG_STATUS_UPDATE_REQ,
+MSG_ID_EMM_EVALIF_SV_REJECT_CAUSE_MAPPING_IND,
+MSG_ID_EMM_EVALIF_SV_ME_RECONFIGURE_REQ,
+MSG_ID_EMM_EVALIF_SV_SMS_STATUS_REQ,
+MSG_ID_EMM_ERRCIF_SV_ACTIVATION_CNF,
+MSG_ID_EMM_REG_SV_SIM_INVALID_IND,
+MSG_ID_EMM_REG_SV_DETACH_CNF,
+MSG_ID_EMM_CALL_SV_SIM_INVALID_IND,
+MSG_ID_EMM_SEC_SV_SIM_INVALID_IND,
+MSG_ID_EMM_EVTCTRL_SV_ABORT_REQ,
+//MSG_ID_EMM_EVTCTRL_SV_SUSPEND_REQ, //remove SUSP_SUSP conflict resolution
+//MSG_ID_EMM_EVTCTRL_SV_RESUME_REQ,  //remove SUSP_SUSP conflict resolution
+MSG_ID_EMM_EVTCTRL_SV_CONTINUE_REQ,
+MSG_ID_EMM_EVTCTRL_SV_WDT_POLLING_REQ,
+MSG_ID_EMM_ANY_SV_UT_CONFIG_REQ,
+MSG_ID_EMM_SV_UT_STATUS_IND,
+MSG_ID_EMM_RATBAND_SV_SET_RAT_MODE_IND,
+MSG_ID_EMM_EVALIF_SV_GENERAL_MODEM_CONFIGURE_SET_REQ,
+MSG_ID_EMM_PLMNSEL_SV_PLMN_SEARCH_IND,
+MSG_ID_EMM_PLMNSEL_SV_GEMINI_SUSPEND_IND,
+MSG_ID_EMM_TIMERMNG_SV_T_SIM_DETACH_WAIT_IMS_DEREG_TIMEOUT_IND,
+
+/****************************************************************************
+ *                          Destination: EMM_TIMERMNG
+ ****************************************************************************/
+MSG_ID_EMM_RATCHG_TIMERMNG_IRAT_E2UG_INIT_IND,
+MSG_ID_EMM_RATCHG_TIMERMNG_IRAT_E2UG_COMP_IND,
+MSG_ID_EMM_RATCHG_TIMERMNG_IRAT_E2UG_FAIL_IND,
+MSG_ID_EMM_RATCHG_TIMERMNG_INTER_SYSTEM_E2V_INIT_IND,
+MSG_ID_EMM_RATCHG_TIMERMNG_INTER_SYSTEM_E2V_COMP_IND,
+MSG_ID_EMM_RATCHG_TIMERMNG_INTER_SYSTEM_E2V_FAIL_IND,
+MSG_ID_EMM_RATCHG_TIMERMNG_IRAT_E2C_INIT_IND, // for C2K
+MSG_ID_EMM_RATCHG_TIMERMNG_IRAT_E2C_COMP_IND, // for C2K
+MSG_ID_EMM_RATCHG_TIMERMNG_IRAT_E2C_FAIL_IND, // for C2K
+MSG_ID_EMM_EVALIF_TIMERMNG_CLEAR_T3346_EPLMN_REQ,
+MSG_ID_EMM_EVALIF_TIMERMNG_ANY_BROADCAST_TIMER_STATUS_IND,
+MSG_ID_EMM_EVALIF_TIMERMNG_SET_TIMER_REQ,	  // eCall
+
+/* For TimerMng UT */
+MSG_ID_EMM_TIMERMNG_UT_REQ,
+MSG_ID_EMM_TIMERMNG_UT_IND,
+
+/* Special Usage: Set current test mode for EMM */
+MSG_ID_EMM_MOD_GLOBAL_VAR_REQ,
+
+/* Engineer Mode Config Message */
+MSG_ID_EMM_EM_CONFIG_REQ,
+
+MSG_ID_EMM_TIMERMNG_CALL_T_STMSI_CS_PAGE_RETRY_TIMEOUT_IND,
+
+/* from MSPMIF*/
+MSG_ID_EMM_MSPMIF_CALL_RF_OWNER_PRIORITY_CHANGE_NTF,
+
+MSG_ID_EMM_RATBAND_REG_TAU_REQ,
+
+MSG_ID_EMM_CODE_END,
+
+MODULE_MSG_END( MSG_ID_EMM_CODE_TAIL )
+
+#endif /* _EMM_SAP_H */
diff --git a/mcu/interface/sap/md/enl2_msgid.h b/mcu/interface/sap/md/enl2_msgid.h
new file mode 100644
index 0000000..bbd5c3d
--- /dev/null
+++ b/mcu/interface/sap/md/enl2_msgid.h
@@ -0,0 +1,445 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   enl2_msgid.h
+ *
+ * Project:
+ * --------
+ *
+ *
+ * Description:
+ * ------------
+ *   
+ *
+ * Author:
+ * -------
+ *   
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 01 19 2022 changjun.ji
+ * [MOLY00601075] [MT6885][Petrus][NSA][From KS][5G][PCT][Keysight][V64][20WK38][38.523-1][SIM1] - PDCP duplication TC 7.1.3.5.5 failure Step #9
+ * 	
+ * 	<saved by Perforce>
+ *
+ * 12 13 2021 ashton.liao
+ * [MOLY00601075] [MT6885][Petrus][NSA][From KS][5G][PCT][Keysight][V64][20WK38][38.523-1][SIM1] - PDCP duplication TC 7.1.3.5.5 failure Step #9
+ * 	Porting dup disc to Gen97 from Gen98 (MOLY00554738).
+ * 10 21 2021 atlas.xu
+ * [MOLY00656491] ?21041? ?EVT????????5G-SA?????????14?38?  21041CT+CU??5G?????????MT??3??3/50?
+ * 	
+ *
+ * 	
+ * 	.
+ *
+ * 05 26 2021 atlas.xu
+ * [MOLY00626874] [CMCC 1T2R VTF] PDCP t-ro enhancement during VC
+ * 	[MCRS000899]
+ * 	.
+ *
+ * 12 11 2020 yiting.cheng
+ * [MOLY00602558] [Gaming][SF][VTF][MT6893][Petrus-P][R3][MP7][SQC][5GMM][NLO FT][Guangzhou][5G¤T¤ä½b][¤ýªÌ?Ä£][CT+CMCC][SA][Weak][Huawei Mate 30]Petrus-P ON and Petrus-P OFF High latency¥[?©M lose Huawei Mate 30¡]2 vs 5 vs 1¡^
+ * .
+ *
+ * 10 16 2020 ashton.liao
+ * [MOLY00571287] ¡i20075¡j¡iQOE??¡j¡i?Õu¡j20075 CMCC 5G SA??®z«H??¹Ò¤U¡A¨Ï¥Î¦Û??¥Î°Ó©±¤U?¤ýªÌ?Ä£¡A?ºÝ¤U???°ª¤_19161¡B¤Í°ÓAÉó¾¹
+ * 	
+ * 	.
+ *
+ * 08 12 2020 chin-wei.hsu
+ * [MOLY00550553] [MT6875][Margaux][Q0][R3][MP6][ChangeSelf][CT][IODT][5G][­Ý®e©Ê??][Compatibility_01001_S4_1] Cell handover with data from SA to NSA
+ * queue internet data.
+ *
+ * 07 24 2020 yi-lin.lee
+ * [MOLY00542784] [MT6885][Petrus][MP1][IODT][Ericsson][Lab][BJ][SA] Video streaming issue during VoLTE call and need UE provide related output trace
+ * 	
+ * 	rohc compression ratio logging
+ *
+ * 07 08 2020 yi-lin.lee
+ * [MOLY00517169] [MT6885][Petrus][MP1][IODT][Ericsson][FT][Suzhou][SA]EM tool requirement for EPSFB&VoLTE Test need add PDCP trace on PS Integrate[part 3].
+ * 	
+ * 	ENPDCP DL timestamp
+ *
+ * 05 08 2020 chih-cheng.yang
+ * [MOLY00518935] [1.7 VTF][MT6873][Margaux][Q0][MP2][SQC][5G FT][NSA][5GMM][China][CMCC][FT][CMCC FT][Chip Test][RT][5G-FT-NSA-1.7][Beijing]MT6873 DL average TPUT(229.99Mbps) is worse than MT6889(264.9Mbps) when DL parallel testing.
+ * [NRLCUL] close zombie HARQ when ACK PRB full (interface)
+ *
+ * 04 15 2020 nancy.chang
+ * [MOLY00505240] [6297] EN-DC gaming HO enhancement
+ * . (OA)
+ *
+ * 04 15 2020 chin-wei.hsu
+ * [MOLY00508864] [VMOLY] Gen97 SW design to achieve lossless 45G DL HW path
+ * [RD] EPSB fallback.
+ *
+ * 03 30 2020 chih-cheng.yang
+ * [MOLY00508613] [BLOCKING][MT6885][Petrus][MP3][NVIOT][Nokia][Dallas][NR_MB][TCID83] After leg switch from NR only to LTE only, Data stuck and can't recovery.
+ * 	
+ * 	[NRLCUL] interface for SIT full handling
+ *
+ * 03 23 2020 yiting.cheng
+ * [MOLY00502844] 2713368¡G¡i19165¡j¡iMP¡j¡i¤WÊI¡j²¾?¥dª`?5G¡A?ªk¤WÊI
+ * .
+ *
+ * 03 12 2020 andy-wc.chang
+ * [MOLY00502630] [Blocking][MT6873][Margaux][MP2][LTE][GCF][TS8980][FDD 1A_3A_20A, TC 8.7.1.1.H3] PDU loss but DL BLER is 0%
+ * 	
+ * 	[VMOLY][ENPDCP] poll RLC SIT and add pretx opportunity - swrd
+ *
+ * 02 10 2020 i-feng.chen
+ * [MOLY00499003] ¯Ê³´(Bugs) 2770481¡G¡i19165¡j¡iMP¡j¡i5G¡j¡i¤W®ü¡j19165CT+CU(NR-IMS+IMS),CTspeedtest§]¦R¶q??,¤U¦æ³t²v?ºC¡AµM¦Z¥X?¤@ª½¤£¯à¤WÊI(5/5)
+ * 	
+ * 	[VMOLY] NSA PDCP HFN Desync Handle - new ilm (MSG_ID_ENPDCP_BOGUS_IP_PDU_IND)
+ *
+ * 02 10 2020 yiting.cheng
+ * [MOLY00495934] [MT6873][Margaux][Q0][MP2][SQC][China][Shanghai][4GMM][Internal][FT][MDST][CAT][Moving][CT+CMCC]md1:(MCU_core0.vpe1.tc2(VPE1)) [ASSERT] file:mcu/driver/dpcopro/src/dpcopro_hisr.c line:775
+ * .
+ *
+ * 11 25 2019 che-wei.hsu
+ * [MOLY00460829] [MT6885][Petrus][MP1][SQC][CT][NSIOT][HQ][KS][N78][SA][CTC_DP_6.2.3][TC-MF_NR_DT-02003]SA UL256QAM Tput not as expected
+ * 	
+ * 	nl1 sit update msg
+ * 	[EWSP0000062206]
+ * 	
+ * 	DDZ:5074D635-2CAD-4526-9045-0A31D23C9F2C
+ *
+ * 11 16 2019 yi-lin.lee
+ * [MOLY00459700] ?[MT6885][Petrus][MP1][SQC][EM][ELT][5G][PDCP]?some ELT EM value display fail
+ * 	
+ * 	ICD request log cmd
+ *
+ * 11 09 2019 ken.li
+ * [MOLY00458199] [MT6885][Petrus][MP1][SQC][IODT][Ericsson][Lab][BJ][NSA]Assert fail: dpcopro_hisr.c 734 - (LISR)NRL2 EXCEP
+ * 	
+ * 	add handler for xRLC re-est but ENPDCP in susp - msgid
+ *
+ * 10 31 2019 peter.chiang
+ * [MOLY00455715] [FT Focus][MT6885][Petrus][MP1][SQC][CTC][FT][NSA][5G FT][China][Shanghai][Operator FT][TC-MF_IOTFT-12002]idle mo call fail
+ * [ERLCUL]Fix RBID mismatch after HO, cause PDCP can't preTx problem
+ *
+ * 10 14 2019 yiting.cheng
+ * [MOLY00440627] [Gen97] Modem´¼¯à«ÝÉófeature - NSA part (Common interface/structure)
+ * .
+ *
+ * 09 23 2019 mingtsung.sun
+ * [MOLY00441318] [Gen97] ENL2 VRB runtime profiling trace
+ * VRB runtime usage trace - interface
+ *
+ * 09 18 2019 yiting.cheng
+ * [MOLY00440986] [Gen97][ENPDCP/NRLCUL/NMAC] NL2 UL grant size guess mechanism for bi-directional FTP
+ * .
+ *
+ * 08 27 2019 chi-pin.yeh
+ * [MOLY00434865] [Gen97][Gaming] 3rd arrow porting
+ * [OA] gaming interface
+ *
+ * 08 14 2019 ken.li
+ * [MOLY00416707] [MT6297][Apollo][IODT][MP0.5][Huawei][FT][5GSM][China][Hangzhou][CMRI][NSA]06/25_¥ª®a?_[1][core0,vpe1,tc2(vpe1)] Assert fail: dpcopro_hisr.c 726 - (LISR)NRL2 EXCEP
+ * 	
+ * 	fix NPDCP re-establish xRLCDL flush - msgid
+ *
+ * 08 01 2019 yiting.cheng
+ * [MOLY00427246] [Gen97][ENPDCP] ENPDCP-NRLCUL ghost packet for gaming
+ * .
+ *
+ * 07 19 2019 yiting.cheng
+ * [MOLY00403047] Network related optimization
+ * .
+ *
+ * 07 11 2019 jia-shi.lin
+ * [MOLY00413574] [MT6297][Apollo][IODT][MP0.5][Anritsu][RTD][v7.0.4][5G][BangBang_NRRC_MEAS_015_NR_N78_A3_measurement]Fatal Error (0x1d, 0x903ce148, 0x903ce126) - EL2, Caller Address: 0x903ce148
+ * cdb update hook/unhook process (RD domain)
+ *
+ * 07 02 2019 yiting.cheng
+ * [MOLY00414772] [Gen97][UNITE][5G][SA][HEAT][R15_SA_RRC_paging_3] During Paging: No reply from ENPDCP for MSG_ID_NRRC_ENPDCP_CONFIG_REQ
+ * .
+ *
+ * 05 15 2019 hamilton.liang
+ * [MOLY00405509] [VMOLY] VA no release framework
+ * 	
+ * 	[SWRD domain] VA no release framework implementation
+ *
+ * 05 15 2019 chi-pin.yeh
+ * [MOLY00406246] [Gaming][KoG][L2] Gen97 Gaming enhancement
+ * [OA] add new interface for gaming optimization
+ *
+ * 05 03 2019 nancy.chang
+ * [MOLY00403327] [6297] update XRLC-DL timers to CDB and early NACK handling
+ * .
+ *
+ * 04 16 2019 tc.chang
+ * [MOLY00395158] [Gen97] Sync Gen95 UMOLYE bug fix
+ * [UPCM] ICD and some bug fix.
+ *
+ * 04 12 2019 yiting.cheng
+ * [MOLY00396701] [Gen97][ENPDCP] check-in bug fix for ENPDCP
+ * voice RB_IDX notification in L2
+ *
+ * 02 15 2019 nancy.chang
+ * [MOLY00384711] [6297] NRLC abnormal handling and UL SIT adjustment
+ * .
+ *
+ * 01 02 2019 yiting.cheng
+ * [MOLY00375968] [GEN97][ENPDCP] VoLTE/VoNR ENPDCP development
+ * .
+ *
+ * 01 02 2019 yiting.cheng
+ * [MOLY00375968] [GEN97][ENPDCP] VoLTE/VoNR ENPDCP development
+ * .
+ *
+ * 10 17 2018 wonder.lee
+ * [MOLY00359134] [Gen97] NRLCUL Trace Refinement
+ * 	
+ * 	.
+ *
+ * 10 09 2018 wonder.lee
+ * [MOLY00357054] [Gen97][KS-IODT][4G][5G][R15_ENDC_ATT_2_10_june]No UL data
+ * 	
+ * 	.
+ *
+ * 08 27 2018 head.hsu
+ * [MOLY00327926] [GEN97][ENPDCP] base development check-in
+ * PDCP max-tb-size & pretx factor coding
+ *
+ * 08 17 2018 yk.liu
+ * [MOLY00327926] [GEN97][ENPDCP] base development check-in
+ * merge EMOLY CLs to VMOLY
+ *
+ * 07 09 2018 peter.chiang
+ * [MOLY00326691] [MT6297] GEN97.DEV ENL2 Patch back
+ * 1. fix discard index boundary check
+ * 2. change msgid from epdcp to enpdcp
+ * [Protocol build tag]
+ * [Is CL self testable: YES]
+ * [Group CL list: NO]
+ *
+ * 06 27 2018 yiting.cheng
+ * [MOLY00327926] [GEN97][ENPDCP] base development check-in
+ * Remove un-used messages, remove MOD_SDAP and MOD_ROHC in PDCP code
+ *
+ * 06 26 2018 yiting.cheng
+ * [MOLY00327926] [GEN97][ENPDCP] base development check-in
+ * UL buffer ctrl and UL VA shortage
+ *
+ * 06 13 2018 nienteh.hsu
+ * [MOLY00326691] [MT6297] GEN97.DEV ENL2 Patch back - Sync ERLC patch from Gen93/95 & modify VoLTE RB index notify primieitve.
+ * 	
+ * 	[Protocol build tag]
+ * 	[Is CL self testable: YES]
+ * 	[Group CL list: NO]
+ *
+ * 06 01 2018 chen-wei.wang
+ * [MOLY00326691] [MT6297] GEN97.DEV ENL2 Patch back
+ * .
+ *
+ * 05 18 2018 head.hsu
+ * [MOLY00326691] [MT6297] GEN97.DEV ENL2 Patch back
+ * 	port latest interface and code on Gen97.DEV (interface)
+ *
+ * 04 27 2018 yiting.cheng
+ * [MOLY00320629] [6297] PS.DEV patch back to GEN97.DEV
+ * Check-in NRRC-ENPDCP message ID
+ *
+ * 04 27 2018 yiting.cheng
+ * Check-in NRRC-ENPDCP message ID
+ *
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _ENL2_MSGID_H
+#define _ENL2_MSGID_H
+
+
+MODULE_MSG_BEGIN( MSG_ID_ENPDCP_CODE_BEGIN )
+
+    /*------------------- MSG_ID_ENPDCP_CODE_BEGIN ---------------------*/
+
+    //////////////////////////////////////////////
+    // Destination: ENPDCP                       //
+    //////////////////////////////////////////////
+    MSG_ID_ERRC_ENPDCP_CONFIG_REQ,
+    MSG_ID_ERRC_ENPDCP_KEY_UPDATE_DONE_REQ,
+    MSG_ID_ERRC_ENPDCP_SWITCH_VIRTUAL_CONNECTED_REQ,
+    MSG_ID_ERRC_ENPDCP_DCCH_DATA_REQ,
+    MSG_ID_ERRC_ENPDCP_DCCH_DATA_RSP,
+    MSG_ID_ERRC_ENPDCP_TEST_REQ,
+    MSG_ID_ERRC_ENPDCP_CNTINFO_REQ,
+    MSG_ID_ERRC_ENPDCP_DETECTION_TIMER_START_REQ,
+    MSG_ID_ERRC_ENPDCP_DETECTION_TIMER_2_START_REQ,
+    MSG_ID_ERRC_ENPDCP_DETECTION_TIMER_3_START_REQ,
+    
+    MSG_ID_NRRC_ENPDCP_CONFIG_REQ,
+    MSG_ID_NRRC_ENPDCP_KEY_UPDATE_DONE_REQ,
+    MSG_ID_NRRC_ENPDCP_DCCH_DATA_REQ,
+    MSG_ID_NRRC_ENPDCP_DCCH_DATA_RSP,
+    MSG_ID_NRRC_ENPDCP_TEST_REQ,
+
+    // TODO: RBM - need these?
+    MSG_ID_NRRC_ENPDCP_SWITCH_VIRTUAL_CONNECTED_REQ,
+    MSG_ID_NRRC_ENPDCP_CNTINFO_REQ,
+    MSG_ID_NRRC_ENPDCP_DETECTION_TIMER_START_REQ,
+    MSG_ID_NRRC_ENPDCP_DETECTION_TIMER_2_START_REQ,
+    MSG_ID_NRRC_ENPDCP_DETECTION_TIMER_3_START_REQ,
+    MSG_ID_NRRC_ENPDCP_DETECTION_TIMER_4_START_REQ,
+
+    MSG_ID_EL2_EPDCP_VRB_VA_SHORTAGE_NTF, // should be removed later
+    MSG_ID_EL2_EPDCP_VRB_VA_NO_RELEASE_NTF,
+    MSG_ID_EL2_ENPDCP_VRB_VA_SHORTAGE_NTF = MSG_ID_EL2_EPDCP_VRB_VA_SHORTAGE_NTF,
+    MSG_ID_EL2_ENPDCP_VRB_VA_NO_RELEASE_NTF = MSG_ID_EL2_EPDCP_VRB_VA_NO_RELEASE_NTF,
+    MSG_ID_LTECSR_ENPDCP_VOICE_BEARER_IND,
+
+    MSG_ID_UPCM_ENPDCP_BEARER_APP_REQ, // 95: MSG_ID_UPCM_EPDCP_EPSB_APP_NTF
+    MSG_ID_UPCM_ENPDCP_SEND_INV_CTRL_PDU_REQ, // 95: MSG_ID_UPCM_EPDCP_SEND_INV_CTRL_PDU, gaming
+    MSG_ID_UPCM_ENPDCP_IMS_FILTER_DONE_REQ,
+    MSG_ID_UPCM_ENPDCP_NON_IMS_FILTER_DONE_REQ,
+    //////////////////////////////////////////////
+    // Gen97 ENPDCP, ENRLC, ENL2_FREE           //
+    //////////////////////////////////////////////
+    MSG_ID_ENL2FREE_SET_FREE_EVENT,
+    MSG_ID_ENL2FREE_ENPDCP_FREESIT_IND,
+	MSG_ID_ENL2FREE_ENPDCP_DUP_DISC_IND,
+    MSG_ID_ENPDCP_ERLCUL_DISCARD_REQ,
+    MSG_ID_ERLCUL_ENPDCP_SDU_RETURN_IND,
+    MSG_ID_ERLCUL_ENPDCP_SIT_UPDATE_IND,
+    MSG_ID_ENPDCP_ERLCUL_SIT_HOOK_REQ,
+    MSG_ID_ENPDCP_ERLCUL_SIT_HOOK_CNF,
+	MSG_ID_ENPDCP_ERLCUL_RB_INFO_UPDATE_IND,
+    MSG_ID_ENPDCP_ERLCUL_SIT_UNHOOK_REQ,
+    MSG_ID_ENPDCP_ERLCUL_SIT_UNHOOK_CNF,
+    MSG_ID_ERLCUL_ENPDCP_GHOST_DATA_AMOUNT_IND,
+    MSG_ID_ERLCDL_ENPDCP_VRB_VA_NO_RELEASE_IND,
+    MSG_ID_ENPDCP_ERLCUL_LONG_DELAY_REQ,
+    MSG_ID_ENPDCP_ERLCUL_RB_LOCK_REQ,
+    MSG_ID_ENPDCP_ERLCUL_RB_LOCK_CNF,
+    MSG_ID_ENPDCP_ERLCUL_RB_UNLOCK_REQ,
+    MSG_ID_ENPDCP_ERLCUL_VOLTE_RB_IDX_REQ,
+    MSG_ID_ENPDCP_ERLCUL_RB_APP_NTF,
+    MSG_ID_ENPDCP_ERLCUL_L4_NTF,
+    MSG_ID_ENPDCP_ERLCUL_GHOST_DATA_REQ,
+    MSG_ID_ENPDCP_ERLCDL_VOLTE_RB_IDX_REQ,
+    MSG_ID_ENPDCP_ERLCDL_RB_APP_NTF,
+    MSG_ID_ENPDCP_ERLCUL_RB_POLL_REQ,
+    MSG_ID_ENPDCP_ERLCDL_RB_NACK_REQ,
+    MSG_ID_ENPDCP_ERLCDL_REESTABLISH_REQ,
+    MSG_ID_ERLCDL_ENPDCP_REESTABLISH_IND,
+    MSG_ID_ENPDCP_VRB_USAGE_REPORT_IND,
+	MSG_ID_ENPDCP_BOGUS_IP_PDU_IND,
+	MSG_ID_ENPDCP_SIT_UPDATE_IND,
+	MSG_ID_ENPDCP_DL_TIMESTAMP_IND,
+	
+    /* MSGs from ENPDCP to NRLCUL */
+    MSG_ID_ENPDCP_NRLCUL_DISCARD_REQ,
+    MSG_ID_ENPDCP_NRLCUL_NEWTX_DATA_REQ,
+    MSG_ID_ENPDCP_NRLCUL_LONG_DELAY_REQ,
+    MSG_ID_ENPDCP_NRLCUL_DUPLICATION_REQ,
+    MSG_ID_ENPDCP_NRLCUL_RB_LOCK_REQ,
+    MSG_ID_ENPDCP_NRLCUL_RB_UNLOCK_REQ,
+    MSG_ID_ENPDCP_NRLCUL_RB_POLL_REQ,
+    MSG_ID_ENPDCP_NRLCUL_VONR_RB_IDX_REQ,
+    MSG_ID_ENPDCP_NRLCUL_SIT_HOOK_CNF,
+    MSG_ID_ENPDCP_NRLCUL_SIT_UNHOOK_CNF,
+    MSG_ID_ENPDCP_NRLCUL_RB_APP_NTF,
+    MSG_ID_ENPDCP_NRLCUL_L4_NTF,
+    MSG_ID_ENPDCP_NRLCUL_GHOST_DATA_REQ,
+    MSG_ID_ENPDCP_NRLCUL_NAS_SIT_FULL_NTF,
+    MSG_ID_ENPDCP_NRLCUL_BKT_SIT_FULL_NTF,
+    MSG_ID_ENPDCP_NRLCUL_SIT_FULL_RELIEVE_NTF,
+
+    /* MSGs from LHIF to NRLCUL */
+    MSG_ID_LHIF_NRLCUL_PRB_FULL_NTF,
+
+    /* MSGs from ENPDCP to NRLCDL */
+    MSG_ID_ENPDCP_NRLCDL_VONR_RB_IDX_REQ,
+    MSG_ID_ENPDCP_NRLCDL_RB_APP_NTF,
+    MSG_ID_ENPDCP_NRLCDL_RB_NACK_REQ,
+    MSG_ID_ENPDCP_NRLCDL_REESTABLISH_REQ,
+    MSG_ID_NRLCDL_ENPDCP_REESTABLISH_IND,
+
+    /* MSGs from NRLCUL to ENPDCP */
+    MSG_ID_ENPDCP_NRLCUL_SDU_RETURN_IND,
+    MSG_ID_ENPDCP_NRLCUL_SIT_UPDATE_IND,
+    MSG_ID_ENPDCP_NRLCUL_ENABLE_DATA_IND,
+    MSG_ID_ENPDCP_NRLCUL_SIT_HOOK_REQ,
+    MSG_ID_ENPDCP_NRLCUL_SIT_UNHOOK_REQ,
+    MSG_ID_ENPDCP_NRLCUL_RB_LOCK_CNF,
+    MSG_ID_NRLCUL_ENPDCP_GHOST_DATA_AMOUNT_IND,
+
+    //////////////////////////////////////////////
+    // Gen97 ENPDCP, EMAC, NMAC                 //
+    //////////////////////////////////////////////
+    MSG_ID_ENPDCP_EMAC_UL_TOTAL_TB_SIZE_IND,
+    MSG_ID_ENPDCP_NMAC_UL_TOTAL_TB_SIZE_IND,
+    MSG_ID_ENPDCP_NMAC_SIT_UPDATE_IND,
+    MSG_ID_EPDCP_EMAC_VOLTE_RB_IDX_REQ, // should be removed later
+    MSG_ID_ENPDCP_EMAC_VOLTE_RB_IDX_REQ = MSG_ID_EPDCP_EMAC_VOLTE_RB_IDX_REQ,
+    MSG_ID_ENPDCP_NMAC_VONR_RB_IDX_REQ,
+    MSG_ID_ENPDCP_NMAC_INTERNET_RB_IDX_REQ,
+    MSG_ID_EPDCP_EMAC_VOLTE_DATA_REQ, // should be removed later
+    MSG_ID_ENPDCP_EMAC_VOLTE_DATA_REQ = MSG_ID_EPDCP_EMAC_VOLTE_DATA_REQ,
+    MSG_ID_ENPDCP_NMAC_VONR_DATA_REQ,
+    MSG_ID_ENPDCP_EMAC_CUT_CELL_IND,
+    MSG_ID_ENPDCP_NMAC_CUT_CELL_IND,
+
+    MSG_ID_EMAC_EPDCP_WAKEUP_REQ, // should be removed later
+    MSG_ID_EMAC_ENPDCP_WAKEUP_REQ = MSG_ID_EMAC_EPDCP_WAKEUP_REQ,
+    MSG_ID_EMAC_EPDCP_ENABLE_WAKEUP_REQ_IND, // should be removed later
+    MSG_ID_EMAC_ENPDCP_ENABLE_WAKEUP_REQ_IND = MSG_ID_EMAC_EPDCP_ENABLE_WAKEUP_REQ_IND,
+    MSG_ID_EMAC_EPDCP_DISABLE_WAKEUP_REQ_IND, // should be removed later
+    MSG_ID_EMAC_ENPDCP_DISABLE_WAKEUP_REQ_IND = MSG_ID_EMAC_EPDCP_DISABLE_WAKEUP_REQ_IND,
+    MSG_ID_EMAC_ENPDCP_3RD_ARROW_AUTH_IND,
+
+    MSG_ID_NMAC_ENPDCP_WAKEUP_REQ,
+    MSG_ID_NMAC_ENPDCP_ENABLE_WAKEUP_REQ_IND,
+    MSG_ID_NMAC_ENPDCP_DISABLE_WAKEUP_REQ_IND,
+    MSG_ID_ICD_ENPDCP_REQUEST_LOG_NTF,
+
+    //////////////////////////////////////////////
+    // Gen97 NL1                                //
+    //////////////////////////////////////////////
+    MSG_ID_ENPDCP_NL1_SIT_UPDATE_IND,
+    MSG_ID_ENPDCP_NL1_GEMINI_GAP_STATE_IND,
+
+    //////////////////////////////////////////////
+    // Gen97 ROHC                               //
+    //////////////////////////////////////////////
+    MSG_ID_ROHC_CMPRS_RATIO_INFO_IND,
+
+MODULE_MSG_END( MSG_ID_ENPDCP_CODE_TAIL )
+
+#endif /* _ENL2_MSGID_H */
diff --git a/mcu/interface/sap/md/errc_msgid.h b/mcu/interface/sap/md/errc_msgid.h
new file mode 100644
index 0000000..779a144
--- /dev/null
+++ b/mcu/interface/sap/md/errc_msgid.h
@@ -0,0 +1,1730 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   errc_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   LTE Layer 1 and Protocol Stack related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 02 21 2022 anusha.prakash
+ * [MOLY00724003] CU+CT(SA+SA)???????NSA+SA???????1?SA?????1min-
+ * .
+ *
+ * 11 09 2021 ashik.tj
+ * [MOLY00686649] [Gen97] NR EPS Voice Fallback Indicator (Porting from GEN98 MOLY00604278 )
+ *
+ * 10 18 2021 sapna.ks
+ * [MOLY00572177] Bar cell????
+ * .
+ *
+ * 03 23 2021 yung-chun.lin
+ * [MOLY00576678] ??§U?¦ô??SA¥\¯Óɬ¤Æ±µ¤f
+ * 	
+ * 	[SA Slience Mode] ERRC Interface Id(OA)
+ *
+ * 03 16 2021 chi-lun.wu
+ * [MOLY00591171] DUT¥d1²¾?¥dSA¡A§@¥D¥s°_©I¦Û?¬E?
+ *
+ * 03 12 2021 chi-lun.wu
+ * [MOLY00591171] DUT¥d1²¾?¥dSA¡A§@¥D¥s°_©I¦Û?¬E?
+ * 	
+ * 	MD700.PRECHECKIN.DEV
+ *
+ * 11 02 2020 yung-chun.lin
+ * [MOLY00584170] 5G SA elevator mode
+ * 	
+ * 	[Elevator Mode][SA_5G4] Interface (OA)
+ * 	- NAS_SV - ERRC
+ * 	   = SA mode notification
+ * 	- ERRC-NL1
+ * 	   = connected mode AFR Freq measurement
+ *
+ * 10 21 2020 chi-lun.wu
+ * [MOLY00531571] [self]503±¼???«ù?ɬ¤Æ
+ *
+ * 09 18 2020 yuhhwang.yu
+ * [MOLY00569504] [Gen97][MP7] LTE and NR-NSA mode sniffer type 1 submit R3 CR
+ * . errc interface
+ *
+ * 07 17 2020 helen.hsieh
+ * [MOLY00534361] ¡i19420¡j¡iUK¡j¡iEE¡j¡iFT¡j¡iEVT¡jDUT can't always stay on NR while activating small data in the background
+ * 	
+ * 	.
+ *
+ * 06 30 2020 hoho.chen
+ * [MOLY00536587] [Gen97][MP6][AFR] feature check-in,  (check-in approved:?item_233) )
+ * .
+ *
+ * 06 29 2020 yenchih.yang
+ * [MOLY00536718] [Gen97][STO][MP7 feature] ?MCC Recognition
+ * 	
+ * 	.
+ *
+ * 06 10 2020 chin-chia.chang
+ * [MOLY00532350] [For Mouton][R3][MT6875][Margaux][Q0][MP5][SQC][China][Quzhou][5GMM][NSA][Internal][FT][NSA Self-Cer][MDST][CAT][Moving][CMCC+CMCC] Modem Warning: +EWARNING: [1][723] errc_chm_main.c #5658
+ * 	
+ * 	[R3_MP] [OA] IRAT_TO_LTE_ABORT_IND to CHM, to reset CHM CNTX
+ *
+ * 06 01 2020 wayne-wc.chen
+ * [MOLY00526942] [MT6853][Mouton][MT6190][MP5][R3][Q0][SQC][Performance Test][SA][CT][Live][Shenzhen]md1:(MCU_core0.vpe0.tc0(VPE0)) [ASSERT] file:mcu/protocol/enl2/pdcp/common/src/epdcp_ul_proc.c line:9098
+ *
+ * 04 01 2020 jack.chu
+ * [MOLY00509082] [MT6873][Margaux][Q0][MP2][SQC][Performance Test][Legacy][CMCC][Live][Beijing][Perf_Attach_05_TDD]Margaux LTE Attach time lose Mate30(3.11s vs 1.93s)
+ * 	
+ * 	.
+ *
+ * 03 26 2020 chih-chien.lin
+ * [MOLY00507206] [MT6873][Margaux][Q0][MP3][SQC][India][Delhi][5GMM][FDD][AIRTEL][RJIO][Auto][Android Linux Script][SST][STATIC][Error Times:1][ASSERT] file:mcu/protocol/lte_sec/errc/chm/src/errc_chm_main.c line:6709
+ * add msg
+ *
+ * 03 23 2020 hoho.chen
+ * [MOLY00502844] 2713368¡G¡i19165¡j¡iMP¡j¡i¤WÊI¡j²¾?¥dª`?5G¡A?ªk¤WÊI
+ * .
+ *
+ * 03 16 2020 stanley.su
+ * [MOLY00501928] ??¦£²¾´ÓMOLY00426939
+ * VSIM PLMN list(SWRD)
+ *
+ * 03 16 2020 ming.shen
+ * [MOLY00504146] [5G-A][5G Modem·sfeature]ɬ¤Æ5G±µ¤J±±¨î
+ * 	
+ * 	- CEL
+ *
+ * 03 03 2020 jack.chu
+ * [MOLY00502626] [MT6873][Margaux] Margaux Big EU VTF: mrdc_lte_standalone_band_combination_supported
+ * 	
+ * 	.
+ *
+ * 01 06 2020 stanley.su
+ * [MOLY00464829] [Gen97]stored frequency API
+ * Stored frequency API(MSG_ID)
+ *
+ * 01 02 2020 mandy.zheng
+ * [MOLY00468917] 2663847----²¾?¥dª`?2G¡A¦Ó¤£¬O4G ¡A???¦æ¼Ò¦¡´N¥i¥Hª`?4G ÊI?¡]1/10¡^
+ * 	
+ * 	.
+ *
+ * 12 09 2019 helen.hsieh
+ * [MOLY00463601] [Gen97] Modify SASE module
+ *
+ * 12 09 2019 lorenz.lin
+ * [MOLY00464526] [MT6885][Petrus][MP1][SQC][India][Delhi][5GMM][FDD][RJIO][Vodafone][Auto][Android Linux Script][SST][ARS][Error Times:1] [ASSERT] file:mcu/protocol/lte_sec/errc/evth/src/errc_evth.c line:2117 p1:0x00005ae3 p2:0x00000005 p3:0x00000004
+ * .
+ *
+ * 10 14 2019 yung-chun.lin
+ * [MOLY00440627] [Gen97] Modem´¼¯à«ÝÉófeature - NSA part (Common interface/structure)
+ * 	
+ * 		[ERRC][MOB] Smart Idle (Interface; OA)
+ *
+ * 09 26 2019 bo-yao.tsai
+ * [MOLY00443062] [Gemini] SA+L DR-DSDS/DSDA
+ *
+ * 09 25 2019 sh.pan
+ * [MOLY00442136] [Gen97][ERRC] HST game mode enhancement
+ * 	
+ * 	.
+ *
+ * 09 23 2019 yung-chun.lin
+ * [MOLY00440886] [Gen97] DSDA-like feature check in
+ * 	
+ * 	[ERRC][MOB][97] DSDA-like feature (OA)
+ *
+ * 09 23 2019 charley-cc.cheng
+ * [MOLY00439533] [Gen97][IDC] IDC feature development
+ * 	
+ * 	[CHM/CONN] MSG ID for MRDC IDC feature development
+ *
+ * 09 17 2019 tereasa.huang
+ * [MOLY00440649] [Gen97][NL1_MOB][NRRC_MEAS] Gaming cell list for mobility enhancement
+ * [NL1_MOB] Gaming List (Interface).
+ *
+ * 08 15 2019 helen.hsieh
+ * [MOLY00427072] [Gen97][NSA] Deactivate ENDC feature
+ * 	
+ * 	- ERRC-L4C interface
+ *
+ * 07 30 2019 wayne-wc.chen
+ * [MOLY00426206] [VMOLY][ERRC][RCM] Pre-build UE capability when entering connected mode
+ * 	
+ * 	- inform RCM that errc enters connected state (OA)
+ *
+ * 07 24 2019 shih-han.lin
+ * [MOLY00424396] [CODE SYNC] ?ªA?¤U¥\¯Óɬ¤Æ¤§·jÊIµ¦²¤
+ * 	
+ * 	(CEL OA part)
+ *
+ * 07 17 2019 maruco.tu
+ * [MOLY00422869] [6297][Interface][Code Sync] To provide API to control 4G fake cell feature
+ * 	
+ * 	[Interface]1363192¡G4G fake cell new feature requirements.
+ * 	(OA domain)
+ *
+ * 07 09 2019 yenchih.yang
+ * [MOLY00418072] [Gen97] Adv. Cell Search Feature
+ * 	
+ * 	Background band learning interface.
+ *
+ * 07 09 2019 yenchih.yang
+ * [MOLY00418072] [Gen97] Adv. Cell Search Feature
+ * ERRC-CEL Inter-RAT Power Scan Interface.
+ *
+ * 07 03 2019 farming.tseng
+ * [MOLY00417695] [Gen97][VMOLY] Protocol Assert Remove phase 1 - ERRC
+ * from MOLY00398433, perf ERRC part. OA domain
+ *
+ * 07 01 2019 po-yu.huang
+ * [MOLY00415629] [Gen97][ERRC][MOB] IRAT OTDOA/ECID feature
+ * 	
+ * 	.
+ *
+ * 07 01 2019 sabrina.hsu
+ * [MOLY00417541] [RCM][6297] LTE CA change
+ * [VMOLY] add CA API dhl log primitive
+ *
+ * 06 17 2019 shih-che.chou
+ * [MOLY00413860] [NAS_SV/ xMM/ xAS] S1/ N1 mode update
+ * .
+ *
+ * 06 04 2019 yenchih.yang
+ * [MOLY00365764] [Gen97][NWSIM][4G][TC_6_4_3][TC_8_3_4_4] Fail in case preamble (before camp on LTE cell 1.
+ * 	ERRC-CEL interface.
+ *
+ * 05 30 2019 wayne-wc.chen
+ * [MOLY00402003] [VMOLY] GEMINI N+L DSDS
+ * 	
+ * 	[ERRC-SPV] DRDA/DRDS development (OA)
+ *
+ * 05 14 2019 helen.hsieh
+ * [MOLY00392646] [MT6297][Phone Call][NSA FullStack][Huawei MWC Demo][Shanghai][5G][VMOLY]UE didn't send eventB1_NR report to NW after Attach complete
+ * 	
+ * 	- errc-nl1 and errc-mob/chm interface for basic SFTD and gapless meas (fake SFTD)
+ *
+ * 04 25 2019 wayne-wc.chen
+ * [MOLY00383711] [MT6297][Apollo][PreSQC][MP0.5][NVIOT][Nokia][Oulu][4G]: Assert Fail: dpcopro_hisr.c 713 - (LISR)mml2_excep_lisr
+ * 	
+ * 	.
+ *
+ * 04 22 2019 wayne-wc.chen
+ * [MOLY00383711] [MT6297][Apollo][PreSQC][MP0.5][NVIOT][Nokia][Oulu][4G]: Assert Fail: dpcopro_hisr.c 713 - (LISR)mml2_excep_lisr
+ * 	
+ * 	roll back
+ *
+ * 04 22 2019 wayne-wc.chen
+ * [MOLY00383711] [MT6297][Apollo][PreSQC][MP0.5][NVIOT][Nokia][Oulu][4G]: Assert Fail: dpcopro_hisr.c 713 - (LISR)mml2_excep_lisr
+ * 	
+ * 	[ERRC-CHM] pdcp rlf interface (OA)
+ *
+ * 03 29 2019 ming.shen
+ * [MOLY00395487] [ERRC] InterRAT-RSTD - CEL/MOB interface
+ *
+ * 03 28 2019 hoho.chen
+ * [MOLY00379215] [MT6297][EN-DC] Scenario where SRB1 is configured to use NR PDCP before the initial security configuration does not work
+ * .
+ *
+ * 03 28 2019 morton.lin
+ * [MOLY00393767] [MT6297] TS 36.331 2018 December baseline migration
+ * [ERRC][NVRAM] ASN.1 2018DEC version upgrading + Interface (SWRD)
+ *
+ * 03 26 2019 chin-chia.chang
+ * [MOLY00394187] [VMOLY] [ERRC] [SCG]: (R2-1817620) Introducing procedure for reporting RLC failures
+ * 	
+ * 	[NRRC SCG] [RLC failure]
+ * 	
+ * 	2
+ *
+ * 02 18 2019 farming.tseng
+ * [MOLY00381966] [Gen97] AFR to NR: development
+ * COMMON part check in.
+ *
+ * 12 24 2018 lorenz.lin
+ * [MOLY00374379] [ERRC][CEL] 5G4 RCGI development
+ * 5G4 RCGI related interface (OA).
+ *
+ * 12 20 2018 yi-han.chung
+ * [MOLY00369446] [MT3967][Eiger][O1][MP1][Performance Test][Lab][RTD][HQ][SIM1:Anritsu][4GMM][051_FastRoaming_4G_HPLMN_2G_VPLMN_no_flight_mode]
+ *
+ * 	Sync patch (CL#6501277 + CL#6501229)
+ *
+ * 	errc_msgid + sbp_feature (SBP_LTE_EARLY_OOS_SEARCH_ENH)
+ *
+ * 12 20 2018 farming.tseng
+ * [MOLY00373070] [VMOLY] CONN SA IRAT HO - interface part.
+ *
+ * 12 18 2018 po-yu.huang
+ * [MOLY00370464] [Gen97][ERRC][MOB] NR development on VMOLY.EVB.SEPT.DEV
+ *
+ * 	.
+ *
+ * 12 17 2018 charley-cc.cheng
+ * [MOLY00372638] [Gen97][EVTH/CHM] ENL2 Migration
+ *
+ * 	MSG ID update for ENL2 migration
+ *
+ * 12 11 2018 sh.pan
+ * [MOLY00371905] [Gen97]data prefer V3.0 -- large bandwidth prefer
+ *
+ * 	.interface
+ *
+ * 11 29 2018 po-yu.huang
+ * [MOLY00368762] [Gen97][ERRC][MOB] VMOLY.FPGA.SEP.DEV to VMOLY
+ *
+ * 	NR RCGI & ENDC auto gap IF
+ *
+ * 11 29 2018 otto.liu
+ * [MOLY00368748] [GEN97][CEL] SEP.DEV to VMOLY integrating
+ *
+ * 	SA to VMOLY IF
+ *
+ * 10 25 2018 sabrina.hsu
+ * [MOLY00345267] [6297][ERRC][RCM] LTE new feature
+ *
+ * 	[ERRC RCM]. ERRC_RCM_API_TEST msg
+ *
+ * 10 23 2018 hoho.chen
+ * [MOLY00355911] [Code Sync] Gen93/Gen95 porting to VMOLY
+ * .
+ *
+ * 10 18 2018 yenchih.yang
+ * [MOLY00346658] [VMOLY] Gen97 ERRC-CEL modifications
+ * ERRC-CEL Sniff.
+ *
+ * 10 03 2018 otto.liu
+ * [MOLY00356286] [Gen97] background search feature
+ *
+ * 	.
+ *
+ * 10 01 2018 doug.shih
+ * [MOLY00326355] [6297][ERRC] SPV development
+ * NAS_SV capability change feature - SPV interface.
+ *
+ * 09 27 2018 shin.chen
+ * [MOLY00351256] [Gen97][KS-IODT][5G][R15_ENDC_RRC_SRB1_2s_1_2]SRB NR configuration [1] Assert fail: epdcp_rbm.c 4464 - EL2 [1] Expression: RB_ST_NONE == p_srb->cmn.state
+ * .
+ *
+ * 08 30 2018 morton.lin
+ * [MOLY00348952] [Gen97]June Version ASN.1 migration patch back
+ * [INTERFACE][UTILITY][NVRAM][SBP][CUSTOM] Gen97 NSA/SA development phase-in
+ *
+ * 08 17 2018 helen.hsieh
+ * [MOLY00346576] [6297][ERRC][MOB] NSA development GEN97.DEV patch back to VMOLY
+ *
+ * 	- CONN, SCG, NL1 interface with MOB
+ *
+ * 08 17 2018 james-chi-ju.chang
+ * [MOLY00306148] [NAS] pangu giant CR
+ * interface
+ *
+ * 08 17 2018 lorenz.lin
+ * [MOLY00346579] [Gen97] RRC-PDCP interface check-in
+ * .
+ *
+ * 08 17 2018 shin.chen
+ * [MOLY00324797] [6297][ERRC] CHM development
+ * .
+ *
+ * 08 17 2018 doug.shih
+ * [MOLY00326355] [6297][ERRC] SPV development
+ * GEN97.DEV patch back to VMOLY.
+ * NAS_SV RAT CHANGE interface change.
+ *
+ * 08 16 2018 nicky.chou
+ * [MOLY00346252] [6297][ERRC][CONN] GEN97.DEV patch back to VMOLY
+ * .
+ *
+ * 08 06 2018 yung-chun.chang
+ * [MOLY00344274] [HUAWEI][ONTIM][Dura][DT]?���� LTE ROHC Profiles?VOLTE��ï»*
+ * 	for LR13.R0 sbp+oa part.
+ *
+ * 07 24 2018 ke-ting.lee
+ * [MOLY00335777] [EIGER][MT3967][RDIT][Phone][in-house FTA][36.523-1][LTE][FDD][E01][SIM1][CMW500][8.2.1.5] Test case fail at step 4 HARQ error for UL transmission in latency test
+ * -procedure delay
+ *
+ * 07 18 2018 maruco.tu
+ * [MOLY00339307] The handling of energy depletion attack by STMSI paging from fake cell
+ * [Interface] new message of STMSI paging attack
+ *
+ * 07 17 2018 aaroh.yang
+ * [MOLY00338205] [EIGER][MT3967][RDIT][FT][TDD][CMCC][HZ][TDL][VoLTE-FT-001][1.1.1] call keeping time is different between two DUT[FOCUS]
+ * [LR13.R0][ERRC/SPV] Re-arch VDM_IMS_VOICE_STATUS_REQ - interface part (OA)
+ *
+ * 07 12 2018 yung-chun.lin
+ * [MOLY00337991] [Gemini][L+L][Gen95] A2 trigger network release
+ *
+ * 	[FakeA2][ERRC] New Msg Id for FakeA2 connection release triggering
+ * 	- EMM->ERRC notification for connection release triggering
+ * 	- IMS EPS bearer update info (especially for IMS dedicated bearer)
+ *
+ * 06 20 2018 peter.chien
+ * [MOLY00334080] [ERRC][SSI][MT6763][Bianco][O1][MP2][AT&T][simulator-P18_1][in-house][R&S][ATTACH/RESTART][LTE-BTR-1-8268] UE failed at step15; RRCConnectionRequest TimeOut
+ *
+ * 	.
+ *
+ * 06 11 2018 otto.liu
+ * [MOLY00331816] [LR13] RCM patch back
+ *
+ * 	.
+ *
+ * 06 08 2018 ke-ting.lee
+ * [MOLY00332445] [EIGER][MT3967][CAT16][RDIT][PHONE][CMW500_MLAPI][TC, FDD, 0.4.1.2.A-1] Scell active fail in Add/Active cmd reversed
+ * -reduce procedure delay
+ *
+ * 06 08 2018 ke-ting.lee
+ * [MOLY00332445] [EIGER][MT3967][CAT16][RDIT][PHONE][CMW500_MLAPI][TC, FDD, 0.4.1.2.A-1] Scell active fail in Add/Active cmd reversed
+ *
+ * 	- Reduce procedure delay part1
+ *
+ * 05 15 2018 aaroh.yang
+ * [MOLY00326014] [Gen95][MSPM] SW changes check in UMOLYE
+ * [ERRC/SPV&CONN] Rearch for MSPM - Interface part (OA)
+ *
+ * 05 15 2018 chester-zd.huang
+ * [MOLY00326014] [Gen95][MSPM] SW changes check in UMOLYE
+ * -  RSVAS interface
+ *
+ * 04 10 2018 cynthia.chen
+ * [MOLY00312314] [Gen95][R14]DelayBudgetReport - add inject and new msg @OA
+ *
+ * 03 31 2018 yung-chun.lin
+ * [MOLY00317494] [Code Sync from R2.SP][ALPS03767621]�ihigh�j�iIN_FT_DC066�j �iR1_EVT1�j �iL�j �iFree_Test�j �iIndore�j  DUT fails to initiate call while performing SRVCC from VoLTE to 3G for Airtel (VoLTE) Operator. (9/15)
+ *
+ * 	[ERRC] New Interface for SRVCC allowence notification
+ *
+ * 03 13 2018 cynthia.chen
+ * [MOLY00312314] [Gen95][R14]DelayBudgetReport
+ * - add errc msg id @OA
+ *
+ * 02 12 2018 aaroh.yang
+ * [MOLY00307329] [UMOLYE][Volunteer Patch][IMS]Dual IMS registration enhacement
+ * [UMOLYE][ERRC/SPV] Occupy HPS/CS during IMS Service, Occupy CS during ESM Service - interface part (OA)
+ *
+ * 02 06 2018 tsung-ming.lee
+ * [MOLY00299866] [UMOLYE][ERRC/El2][R13]FeMDT UL PDCP delay measurement report
+ *
+ * 	-msg id.
+ *
+ * 01 16 2018 aaroh.yang
+ * [MOLY00302107] [MT6763][Bianco][N1][India FT][Chennai][WW FT][RCOM][TATA DOCOMO][TC_MTK_P1_4G_Gemini_13] [MP1.5] DUT long SMS to sim2 fails (ERRC part)
+ * [R3][ERRC][SPV] SMS procedure with CS semaphore - EVAL/ERRC Interface (OA).
+ *
+ * 12 11 2017 morton.lin
+ * [MOLY00295077] [Gen93][ERRC][RCM] LTE support band and CA combination customization re-arch
+ * Common IF and MRS part (LR12A.R3.MP) (Not in V-List)
+ *
+ * 12 08 2017 charley-cc.cheng
+ * [MOLY00294013] [ERRC][CHM] UT Test Code
+ *
+ * 	@R3 [CHM UT Test Code] New Proposal - CHM self-contained, edit and execute with one single primitive (OA domain)
+ *
+ * 12 07 2017 ke-ting.lee
+ * [MOLY00294778] [Sylvia][O1][SRLTE][CT 6M C][VoLTE][FT][GZ][HW][CAT][Fatal error(buf)] err_code1:0x00000823 err_code2:0x00004000 err_code3:0xCCCCCCCC MD Offender:ERRC
+ * -SI sharing
+ *
+ * 11 29 2017 tereasa.huang
+ * [MOLY00290347] 238721�i�~??�O�j�d1?�H4G�n�J��?���ů¿½{���n?�c�X?�I?460�n5s���k���`???2�x��A2�x3����?�@�X?16��?(ERRC Interface)
+ * R3 Interface (OA Domain).
+ *
+ * 11 29 2017 shih-chieh.liao
+ * [MOLY00292082] [Gen93][TMO] 2G disable with ecc enable
+ * .
+ *
+ * 11 28 2017 yung-chun.chang
+ * [MOLY00287784] [MT6295] tstm_meta development
+ * TSTM_META rcm oa part
+ *
+ * 11 21 2017 aaroh.yang
+ * [MOLY00289523] [Zion][N1][Free Test][MCD][TEMoving]make a vilte call,the picture is unclear(5/5)
+ * [ERRC/SPV] add MSG_ID_EVAL_ERRC_IMS_STATUS_UPDATE_REQ MSG ID
+ *
+ * 11 02 2017 aaroh.yang
+ * [MOLY00286082] [6293 Gemini][All  .h file]: New Semaphore "MPS" for MO data & Solution for TAU ping-pong
+ * [ERRC/SPV] add MSG_ID_EMM_ERRC_DATA_ALLOW_REQ msg ID for MedPS
+ *
+ * 10 17 2017 bo-yao.tsai
+ * [MOLY00281973] �iTOP�j�i�s?�w�{�j?�d?�q�A�d2�D�d�A?��Z�`?3G�A�`?4G�A����?�{���S�^��3G�I?�A�����`4G�]3\10�^
+ *
+ * 09 20 2017 lawrence.chen
+ * [MOLY00278366]LPP OTDOA new procedure architecture development.
+ *
+ * 09 14 2017 tereasa.huang
+ * [MOLY00277986] [UMOLYA][MOB][Code]SRVCC����
+ *
+ * 08 22 2017 adeline.chang
+ * [MOLY00269598] [Gen93]TPB/Mobility Ctrl patch check in
+ * .
+ *
+ * 08 17 2017 emily.lu
+ * [MOLY00271227] [UMOLYA] [Rose][Vinson][N1]The ECC call will can't be dial out success.(5/5)
+ *
+ * 	. code sync CL4160021
+ *
+ * 07 07 2017 cynthia.chen
+ * [MOLY00261827] [UMOYLA] LPPe development - ERRC part @OA
+ *
+ * 05 31 2017 vivian.chen
+ * [MOLY00217129] [MT6293] code sync from UMOLY (Phase4)
+ * .sync[MOLY00248424]CL#3883171.add msg_id MSG_ID_ERRC_EL1_GAP_STATUS_IND
+ *
+ * 04 19 2017 louis.lu
+ * [MOLY00243476] [MT6293]Rel-12 WLAN offload ERRC patch due to L4 M3 modification
+ *
+ * 	Rel-12 LWI modification due to L4 M3 patch (OA domain)
+ *
+ * 03 02 2017 maruco.tu
+ * [MOLY00226504] [ERRC][LCEL] LCEL enhancement after code presentation
+ * remove unused LCEL_EM_UPDATE_REQ
+ *
+ * 02 17 2017 ke-ting.lee
+ * [MOLY00196550] [6293] ERRC CSR development
+ * - Remove msg_sibx_stored_data
+ *
+ * 02 09 2017 dennis.weng
+ * [MOLY00228585] [MT6293][ERRC/CEL] Gemini suspend cmpl_subband improvement
+ * add carrier_search_status_ind msgid
+ *
+ * 01 19 2017 rainee.yeh
+ * [MOLY00207311] [MT6293][ERRC][CONN] UMOLY sync to UMOLYA
+ * -CL 3370203, (L+L) add SIM_SWITCH_REQ message
+ *
+ * 12 14 2016 louis.lu
+ * [MOLY00211184] [6293] LWA phase2 design
+ *
+ * 	Check -in interface for MSG_ID_ERRC_CONN_MOB_WLAN_LOST_IND,OA Domain part
+ *
+ * 12 08 2016 shih-chieh.liao
+ * [MOLY00217129] [MT6293] code sync from UMOLY (Phase4)
+ * .
+ *
+ * 11 09 2016 jed.lee
+ * [MOLY00210762] [MT6293][ERRC][CONN] UMOLY sync to UMOLYA
+ * -CL2683928.
+ *
+ * 11 08 2016 menghau.wu
+ * [MOLY00211184] [6293] LWA phase2 design
+ * add MSG_ID_IWLAN_ERRC_WLAN_CAPABILITY_REQ related processing (OA domain)
+ *
+ * 11 07 2016 shih-chieh.liao
+ * [MOLY00211184] [6293] LWA phase2 design
+ * .
+ *
+ * 11 04 2016 tsung-ming.lee
+ * [MOLY00210784] [MT6293] code sync form UMOLY
+ * 	CR [MOLY00193300] Porting of NW BAND Info from LR9 to LR11 TC01
+ * 	CL2706217
+ * 	CL2704969.
+ *
+ * 11 03 2016 danny.kuo
+ * [MOLY00193300] Porting of NW BAND Info from LR9 to LR11 TC01
+ * .
+ *
+ * 11 03 2016 danny.kuo
+ * [MOLY00193300] Porting of NW BAND Info from LR9 to LR11 TC01
+ * .
+ *
+ * 11 03 2016 louis.lu
+ * [MOLY00211184] [6293] LWA phase2 design
+ * 	.
+ * 	Introduce new msg MSG_ID_ERRC_CHM_MOB_LWA_CFG_IND (OA domain)
+ *
+ * 11 02 2016 cynthia.chen
+ * [MOLY00211038] [MT6293][ERRC][CONN] UMOLY sync to UMOLYA
+ * -CL2925236 in OA
+ *
+ * 11 02 2016 emily.lu
+ * [MOLY00210784] [MT6293] code sync form UMOLY
+ * [MOLY00093206][C90] new AT command (AT%PGCHECK)
+ *
+ * 11 01 2016 jed.lee
+ * [MOLY00210762] [MT6293][ERRC][CONN] UMOLY sync to UMOLYA
+ * CL2683928.
+ *
+ * 11 01 2016 jed.lee
+ * [MOLY00210762] [MT6293][ERRC][CONN] UMOLY sync to UMOLYA
+ * CL2683928.
+ *
+ * 10 31 2016 menghau.wu
+ * [MOLY00207053] [MT6293] code sync form UMOLY
+ * L+L/M-PS/R-SIM interface
+ *
+ * 10 20 2016 rachel.liu
+ * [MOLY00208519] [MT6293][VzW]LTE SIB8/16 for AGPS fine time aiding (code sync from UMOLY)
+ *
+ * 10 19 2016 vivian.chen
+ * [MOLY00207053] [MT6293] code sync form UMOLY
+ * .[MOLY00193868] [MT6292][New feature][R12][VzW] VZ_REQ_LTEDATARETRY_39861 - ERRC implementation. CL2655445
+ *
+ * 10 18 2016 peter.chien
+ * [MOLY00207197] [MT6293][ERRC] UMOLY sync to UMOLYA
+ * .
+ *
+ * 10 17 2016 ke-ting.lee
+ * [MOLY00207053] [MT6293] code sync form UMOLY - MOLY00186029-CL2632451 errc_msgid.h
+ *
+ * 09 26 2016 shih-chieh.liao
+ * [MOLY00205093] [UMOLYA] merge CR from mw.hsu CBr
+ * .
+ *
+ * 08 09 2016 adeline.chang
+ * [MOLY00194730] [UMOLYA][6293] ERRC CHM MBMS re-arc itmes
+ * .
+ *
+ * 08 09 2016 maruco.tu
+ * [MOLY00196065] [MT6293][folder structure] Move EL1/EL2 files from LTE domain to SWRD domain
+ * [LCEL re-arch](CONFIG files) (OA domain)
+ * 	1.modify SAP file
+ * 	2.Add new message for dhl/mcddll
+ * 	3.disable LCEL in las_create.c
+ * 	4.check in el1/errc/las_msgid.h
+ * 	5.Remove las/lcel path and add errc/lcel path in lte_def.mak
+ *
+ * 07 27 2016 jui-chih.chin
+ * [MOLY00193618] [6293][LMOB Removel] Code Merge from CBr to UMOLYA TRUNK and UMOLYA PS DEV
+ *
+ * 	LMOB removal (OA)
+ *
+ * 06 27 2016 jui-chih.chin
+ * [MOLY00183642] new task EL1_MPC definition for 6293
+ *
+ * 	.
+ *
+ * 06 27 2016 dennis.weng
+ * [MOLY00183642] new task EL1_MPC definition for 6293
+ * specific measure cnf
+ *
+ * 06 27 2016 dennis.weng
+ * [MOLY00183642] new task EL1_MPC definition for 6293
+ * .
+ *
+ * 06 24 2016 ke-ting.lee
+ * [MOLY00185901] UMOLYA errc relevant latest code sync from UMOLY- errc_msgid.h merge
+ *
+ * 06 20 2016 elle.sun
+ * [MOLY00184906] [MOB][VzW EM] MDMI EM code check-in
+ *
+ * 	.
+ *
+ * 06 14 2016 antti.kaisto
+ * [MOLY00180588] [MT6292][New feature] RRC for LWA
+ * ERRC CHM changes to 'LTE - WLAN Aggregation'.
+ *
+ * 06 14 2016 ivy.wang
+ * [MOLY00165236] [PH1_VZW][FLD][Radio_Protocol] VZ_REQ_LTEDATA_37821 Autonomous Gaps
+ * .
+ *
+ * 05 23 2016 antti.karjalainen
+ * [MOLY00180588] [MT6292][New feature] RRC for LWA:
+ * L4C-ERRC interface
+ *
+ * 05 23 2016 gui-liu.wang
+ * [MOLY00180690] [MT6755][Jade L6][MP2][RTD][34G][Performance Index][19][4G3 Reselection]
+ *
+ * 	.
+ *
+ * 05 17 2016 mark.ng
+ * [MOLY00179023] Allowable Registration Area List Feature V2 Check In
+ * ARAL 2.0 interface
+ *
+ * 04 26 2016 chih-chien.lin
+ * [MOLY00167983] [MT6755][Jade L6][MP2][CSFB DSDS][HSR][FDD][HSR][4G_Moving][Case Fail][LAT2]PLMN List time is lose to reference phone
+ * fast list
+ *
+ * 04 26 2016 ming.shen
+ * [MOLY00150211] [VzW][VZ_REQ_LTEMMO_38695] LTE Scanning Enhancement
+ * .
+ *
+ * 04 26 2016 ming.shen
+ * [MOLY00144447] Operator Feature/Requirement
+ *
+ * 	.
+ *
+ * 04 15 2016 yi-han.chung
+ * [MOLY00165778] [ERRC][CEL] Add stop control for specific measure req  - interface (oa domain)
+ *
+ * 04 01 2016 ming.shen
+ * [MOLY00142775] [ERRC][CEL] LTE code sync
+ * .
+ *
+ * 03 17 2016 kun-lin.wu
+ * [MOLY00167477] [PH1_VZW][joint-camp][Radio_Protocol][eMBMS] VZW LC TC 2.5 - eMBMS Channel Capacity
+ *
+ * 03 16 2016 bo-yao.tsai
+ * [MOLY00164081] �iCA�j�b�t�m��?�i�E�X��?��???�u�I?�A???���M?��4G+
+ * OPPO 4G+ icon
+ * - add MSG_ID_ERRC_EMAC_CA_ACTIVATE_IND
+ *
+ * 03 15 2016 tereasa.huang
+ * [MOLY00167830] [MT6291][VoLTE][SRVCC] SRVCC CDRX Enhancement Patch - ERRC Enhancement 2G Priority
+ * .
+ *
+ * 03 10 2016 morton.lin
+ * [MOLY00165954] [6291 HSR] Protocol / Lower Layer Common Header/Interface
+ * CMCC requirement: HSFR CTRL (L1 PS Header / Interface)
+ *
+ * 03 10 2016 morton.lin
+ * [MOLY00165947] [6291 HSR] Protocol Enhancement (Header/Interface)
+ * CMCC requirement: HSFR CTRL (SBP, NVRAM and MRS) (Protocol Header / Interface)
+ *
+ * 03 10 2016 chester-zd.huang
+ * [MOLY00165954] [6291 HSR] Protocol / Lower Layer Common Header/Interface-ERRC COMMON Part(UMOLY).
+ *
+ * 03 09 2016 sabrina.hsu
+ * [MOLY00155801] [CA] Enable/Disable CA by AT+ECASW (ERRC)
+ * merge UMOLY version
+ *
+ * 03 03 2016 ethan.han
+ * [MOLY00166584] LTE code sync 2016
+ *
+ * 	.
+ *
+ * 02 17 2016 sabrina.hsu
+ * [MOLY00156230] [6292] ERRC code sync LR11 to UMOLY
+ * [ERRC][RCM] Inject fake UE EUTRA Capability phase-in
+ *
+ * 02 17 2016 sam.tsai
+ * [MOLY00156025] MOB/LMOB code sync from LR11 to UMOLY
+ *
+ * 02 17 2016 sam.tsai
+ * [MOLY00156025] MOB/LMOB code sync from LR11 to UMOLY
+ * .[MOLY00156440] [LGE request] Signal Strength Monitoring Across Threshold
+ *
+ * 02 17 2016 sam.tsai
+ * [MOLY00156025] MOB/LMOB code sync from LR11 to UMOLY
+ * .[MOLY00153524] [6291] Vivo BlackList feature
+ * .[ERRC][MOB] Clear black cell list.
+ *
+ * 02 17 2016 sam.tsai
+ * [MOLY00156025] MOB/LMOB code sync from LR11 to UMOLY
+ * .[MOLY00149628] MD1/MD3 power down procedure - AS workaround handshake flow
+ *
+ * 02 16 2016 nicky.chou
+ * [MOLY00160414] [ERRC][CONN] sync from LR11 to UMOLY
+ * [CL1959167][MOLY00154368] [MT6755][L+W][Overnight][FDD][MTBF][L1CORE] Assert fail: errc_conn_main.c 849 0x22 0x0 0x0 V ERRC.
+ *
+ * 02 15 2016 kun-lin.wu
+ * [MOLY00144901] [ERRC] bCSFB feature check-in for TMO-US
+ *
+ * 11 27 2015 ville.pukari
+ * [MOLY00150835] ML1S Test Environment Support:
+ *
+ * 	ERRC support for ML1S Test Mode
+ *
+ * 09 25 2015 mark.ng
+ * [MOLY00143156] [MT6755][E1][GCF][Anite][3G][FDD][CSG][6.3.1.1] Test Fail
+ * manual csg search on UMOLY
+ *
+ * 09 15 2015 yenchih.yang
+ * [MOLY00099648] [VoLTE] Voice quality patch - ERRC
+ * .
+ *
+ * 09 10 2015 panu.peisa
+ * [MOLY00141214] DE6 code merge from LR11_VzW CBr to UMOLY trunk
+ * 	[MOLY00141214] DE6 code merge form LR11_VzW CBr to UMOLY trunk
+ * 	Integrated CL 1584603 from VzW CBr.  SWRD domain changes needed by ERRC_SYS for Extended Access Barring.
+ * 	CL have dependency to lte_sec part.
+ *
+ * 09 04 2015 ethan.han
+ * [MOLY00139861] [MT6291][SBM] New Feature : Disable LTE B41 for roaming out side of Japan.
+ * 	.
+ *
+ * 08 21 2015 sheng-lung.liu
+ * [MOLY00097009] [WFC][Volunteer patch] LTECSR_network init
+ * Roll back for ERRC not ready call drop enhancement, keep RoHC confidence enable
+ *
+ * 08 21 2015 henry.lai
+ * [MOLY00138170] [MT6291] MBMS Scell Self-Finding Mechanism
+ * 	.
+ *
+ * 08 20 2015 sheng-lung.liu
+ * [MOLY00097009] [WFC][Volunteer patch] LTECSR_network init
+ * Enable RoHC confidence, ERRC Notify
+ *
+ * 08 12 2015 roland.li
+ * [MOLY00129071] [ERRC][RCM] Dynamic SBP
+ * .
+ * fix code gen error
+ *
+ * 08 04 2015 roland.li
+ * [MOLY00129071] [ERRC][RCM] Dynamic SBP
+ * .
+ *
+ * 06 17 2015 esko.oikarinen
+ * [MOLY00118255] [MT6291] ERRC message identifier for DABUWAN code merge
+ *
+ * 06 16 2015 henry.lai
+ * [MOLY00113082] [MT6291] ERRC CEL development
+ * .
+ *
+ * 06 05 2015 morton.lin
+ * [MOLY00095623] [eRRC] Gemini virtual mode
+ * [6291][ERRC][SPV] eMBMS Gemini 2PS feature improvements
+ *
+ * 06 01 2015 henry.lai
+ * [MOLY00092508] [MT6291][LTE-C2K] AS Inter RAT feature
+ * .
+ *
+ * 05 22 2015 chun-fan.tsai
+ * [MOLY00098916] [MT6291] MBMS reception on SCELL
+ * eRRC CONN MBMS on SCELL (Phase 1)(OA Domain)
+ *
+ * 05 19 2015 cooper.lin
+ * [MOLY00114149] [MT6291][L234 NW-UE SIM][4G][LTE-A MDT] FDD MDT 8.6.2.3a failed due to RRCConnectionSetupComplete content mismatch
+ * Add loggedMeasCfg MSG ID for EVTH to use
+ *
+ * 04 28 2015 george.chang
+ * [MOLY00109714] [6291] MOB MDT check in to UMOLY TRUNK
+ * 	.
+ *
+ * 04 16 2015 doug.shih
+ * [MOLY00092508] [MT6291][LTE-C2K] AS Inter RAT feature
+ * Merge C2K AS IRAT - CEL Part (OA domain).
+ *
+ * 04 09 2015 chun-fan.tsai
+ * [MOLY00098916] [MT6291] MBMS reception on SCELL
+ * CONN/CEL new interface - MBMS_SCELL_REQ/CNF
+ *
+ * 04 09 2015 chun-fan.tsai
+ * [MOLY00098916] [MT6291] MBMS reception on SCELL
+ * ERRC/EL1 new interface - SCELL_FOUND_IND
+ *
+ * 04 07 2015 ming.shen
+ * [MOLY00106111] [6291] Sync MOLY to UMOLY - SPV W1510-13
+ *
+ * 03 09 2015 cooper.lin
+ * [MOLY00090532] [MT6291] Change Feature Check-in
+ * EM, Mode Switch interface check-in
+ *
+ * 03 09 2015 george.chang
+ * [MOLY00098177] [6291] MDT check in to UMOLY TRUNK
+ * 	.
+ *
+ * 02 16 2015 tereasa.huang
+ * [MOLY00095623] [eRRC] Gemini virtual mode
+ * Virtual mode interface.
+ *
+ * 02 12 2015 cooper.lin
+ * [MOLY00090532] [MT6291] Change Feature Check-in
+ * MDT check-in
+ *
+ * 02 05 2015 cooper.lin
+ * [MOLY00090532] [MT6291] Change Feature Check-in
+ * Code sync from MOLY (W15.06)
+ *
+ * 01 16 2015 david.niu
+ * [MOLY00087934] [MT6291][LPP OTDOA Development] Inter-freq RSTD measurement indication
+ * .
+ *
+ * 12 19 2014 birui.li
+ * [MOLY00087677] [U3G][TDD][UAS RRCE] modifications for U3G
+ * merge from peng-an CBr.
+ *
+ * 12 16 2014 claud.li
+ * [MOLY00087795] [MEME] universal bin check in
+ * [Universal bin][FDD][MEME/EAS/GAS] interface
+ *
+ * 12 12 2014 yuhhwang.yu
+ * [MOLY00087211] [CISE] add CSG fingerprint compile option and bug fix
+ * . CISE codes
+ *
+ * 11 12 2014 cooper.lin
+ * [MOLY00068710] [MT6291_DEV] Sync MOLY to MT6291_DEV
+ * Merge MT6291_DEV code to UMOLY trunk.
+ *
+ * 11 12 2014 chi-chung.lin
+ * [MOLY00068710] [MT6291_DEV] Sync MOLY to MT6291_DEV
+ * [CHM] code sync from MT6291_DEV to UMOLY
+ *
+ * 11 12 2014 yingwei.huang
+ * [MOLY00073932] [MT6291_DEV] EDDA implementation -- interface part.	.
+ *
+ * 11 12 2014 henry.lai
+ * [MOLY00079071] [MT6291][U4G] Low Power Modification for CEL Paging
+ * .
+ *
+ * 07 21 2014 william.chang
+ * [MOLY00072876] [WW FT][K95 V1.2][4G Gemini][FT][Hangzhou]Externel (EE),0,0,99,/data/core/,1,modem,md0:[ASSERT] file:rsvas_fsm.c line:3776
+ * .
+ *
+ * 05 28 2014 william.chang
+ * [MOLY00067209] [LTE Gemini] Add interface for EMM to occupy CS semaphore for Attach procedure
+ * .
+ *
+ * 05 28 2014 william.chang
+ * [MOLY00067209] [LTE Gemini] Add interface for EMM to occupy CS semaphore for Attach procedure
+ * .
+ *
+ * 04 30 2014 william.chang
+ * [MOLY00064308] Modify EVAL ERRC msg name for VOLTE gemini
+ * .
+ *
+ * 04 02 2014 cookie.chen
+ * [MOLY00060012] AT+ECBMR to remove modem CB records
+ * .
+ *
+ * 03 28 2014 william.chang
+ * [MOLY00061184] [4G Gemini] Notify AS when IRCCO stage2 cause is updated by NASu1rwduu`wvpghlqg|rliildh+fmdkb
+ *
+ * 03 28 2014 jasper.chen
+ * [MOLY00060988] [LPP CP] LPP code check-in for A-GNSS and eCID feature
+ * 	Check in ECID ERRC modifications (OA domain)
+ *
+ * 03 06 2014 aaron.liu
+ * [MOLY00056483] [MT6582LTE][SGLTE][CMCC FT][GZ]
+ * Add PLMN SEARCH Abort Interface:
+ * 1.MSG_ID_EVAL_ERRC_PLMN_SEARCH_ABORT_REQ
+ * 2.MSG_ID_NWSEL_EVAL_PLMN_SEARCH_ABORT_REQ
+ *
+ * 03 03 2014 peter.chien
+ * [MOLY00058082] [CEL][CONN] Change IDLE_CNF to CH_STATUS_CNF
+ * Merging
+ *
+ * 	//MOLY_CBr/cookie.chen/MOLY_W14.09.LTE.p1/mcu/interface/sap/md/errc_msgid.h
+ *
+ * 	to //MOLY/TRUNK/MOLY/mcu/interface/sap/md/errc_msgid.h
+ *
+ * 01 22 2014 jeremy.chen
+ * [MOLY00054589] [MT6290E2] add RLF indication from ERLC-DL
+ * reaname ERRC_ERLCUL_STATUS_IND to ERRC_ERLC_RLF_IND
+ *
+ * 01 22 2014 william.chang
+ * [MOLY00054324] [4G Gemini][Merge] MOLY.MM.GEMINI.DEV Merge back to MOLY
+ * . Check-in Interface part of LTE GEMINI
+ *
+ * 01 13 2014 aaron.liu
+ * [MOLY00053379] [MT6290][VOLTE][ERRC]New feature : IMS emergency
+ * Add ERRC Interface.
+ *
+ * 12 30 2013 menghau.wu
+ * [MOLY00051454] [ERRC][CEL] write PLMN list stored cell into NVRAM
+ * Add Stored cell info related NVRAM context
+ *
+ * 11 29 2013 menghau.wu
+ * [MOLY00048344] [MT6290][ERRC] Add learned mcc info context to NVRAM/RCM
+ * 	add nvram file for learned mcc info
+ *
+ * 11 13 2013 jed.lee
+ * [MOLY00046027] [MT6290E1][MMDS_DC] MMDC feature patch back to MOLY trunk
+ * B3&B39 conn part.
+ *
+ * 11 13 2013 adeline.chang
+ * [MOLY00046027] [MT6290E1][MMDS_DC] MMDC feature patch back to MOLY trunk
+ * .
+ *
+ * 10 21 2013 hong-yuan.yang
+ * [MOLY00040050] [MultiMode] Dynamic band selection
+ * .
+ *
+ * 10 02 2013 maruco.tu
+ * [MOLY00039031] [ERRC][CEL]Inject implement
+ * remove leave_4g.
+ *
+ * 09 25 2013 maruco.tu
+ * [MOLY00039031] [ERRC][CEL]Inject implement
+ * inject message(new message:MSG_ID_ERRC_CEL_INJECT_LEAVE_LTE_IND)
+ *
+ * 09 24 2013 peter.chien
+ * [MOLY00038599] ERRC MOB CONN inject message feature
+ * .Add interface
+ *
+ * 08 06 2013 adeline.chang
+ * [MOLY00031695] Modify CHM/RCM code for UT enhancement .
+ * .
+ *
+ * 08 01 2013 dennis.weng
+ * [MOLY00032020] [ERRC][CEL] new carrier search flow check-in
+ * .
+ *
+ * 07 24 2013 dennis.weng
+ * [MOLY00031020] [MMDS_DC] Merge MMDC interface to MOLY
+ * merge GAS_EAS_EARFCN_LIST_UPDATE_REQ
+ *
+ * 07 22 2013 stanleyhy.chen
+ * [MOLY00029602] [New Feature] NBR_CELL_INFO and TA_INFO related interfaces
+ * Add ERRC_EMAC_TA_INFO_INVALID_IND
+ *
+ * 07 12 2013 stanleyhy.chen
+ * [MOLY00029602] [New Feature] NBR_CELL_INFO and TA_INFO related interfaces
+ * TA_INFO and NBR_CELL_INFO interfaces for LPP feature
+ *
+ * 05 27 2013 jed.lee
+ * [MOLY00023911] TDS MoDIS MM IT code merge
+ * .
+ *
+ * 05 13 2013 shih-chieh.liao
+ * [MOLY00022028] LTE MM.IT errc merge to MOLY
+ * merge mrs
+ *
+ * 04 01 2013 shih-chieh.liao
+ * [MOLY00011934] LTE MM IT CBr merge to MOLY
+ * .asn1 replacement
+ *
+ * 01 24 2013 william.chang
+ * [MOLY00009163] LTE Multimode merge back to MOLY
+ * .Merge from MM preIT CBr
+ *
+ * 01 23 2013 hong-yuan.yang
+ * [MOLY00009163] LTE Multimode merge back to MOLY
+ * LTE multimode merge back to moly
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _ERRC_MSGID_H
+#define _ERRC_MSGID_H
+
+
+MODULE_MSG_BEGIN( MSG_ID_ERRC_CODE_BEGIN )
+
+
+MSG_ID_EXEVT_RCV_BEGIN = MSG_ID_ERRC_CODE_BEGIN,
+MSG_ID_EMM_ERRC_ACTIVATION_REQ,
+MSG_ID_EMM_ERRC_RAT_BAND_REQ,
+MSG_ID_EMM_ERRC_ESTABLISH_REQ,
+MSG_ID_EMM_ERRC_RELEASE_REQ,
+MSG_ID_EMM_ERRC_RELEASE_RSP,
+MSG_ID_EMM_ERRC_LOCAL_RELEASE_TRIGGER_RSP,
+MSG_ID_EMM_ERRC_DATA_REQ,
+MSG_ID_EMM_ERRC_KEY_UPDATE_REQ,
+MSG_ID_EMM_ERRC_TEST_REQ,
+MSG_ID_EMM_ERRC_CELLSELECT_REQ,
+MSG_ID_NAS_SV_ERRC_POWER_SCAN_REQ,
+MSG_ID_EMM_ERRC_SET_ACTIVE_RAT_REQ,
+MSG_ID_NAS_SV_ERRC_CHECK_ACTIVE_RAT_REQ,
+MSG_ID_NAS_SV_ERRC_SNIFFER_START_REQ,
+MSG_ID_NAS_SV_ERRC_SNIFFER_STOP_REQ,
+MSG_ID_EMM_ERRC_PLMNLIST_REQ,
+MSG_ID_EMM_ERRC_PLMN_LIST_STATUS_UPDATE_REQ,
+MSG_ID_EMM_ERRC_RESUME_REQ,
+MSG_ID_EMM_ERRC_NWSEL_STATUS_UPDATE_REQ,
+MSG_ID_EMM_ERRC_REG_STATUS_UPDATE_REQ,
+MSG_ID_NAS_SV_ERRC_RAT_CHANGE_REQ,
+MSG_ID_NAS_SV_ERRC_RAT_CHANGE_RSP,
+MSG_ID_EMM_ERRC_STANDBY_REQ,
+MSG_ID_EMM_ERRC_PARAM_UPDATE_REQ,
+MSG_ID_EMM_ERRC_QOS_UPDATE_REQ,
+MSG_ID_EMM_ERRC_CSG_LIST_REQ,
+MSG_ID_EMM_ERRC_CSG_LIST_STOP_REQ,
+MSG_ID_EMM_ERRC_NULL_SECURITY_ACCEPT_REQ,
+MSG_ID_EMM_ERRC_CSG_WHITE_LIST_UPDT_REQ,
+MSG_ID_EMM_ERRC_SIM_FILE_UPDATE_REQ,
+MSG_ID_EMM_ERRC_CSFB_NTF,
+MSG_ID_EMM_ERRC_CSFB_STATUS_REQ,
+MSG_ID_EMM_ERRC_CHECK_SERVING_SUITABILITY_REQ,
+MSG_ID_EMM_ERRC_SEARCH_PREFERENCE_UPDATE_REQ,
+MSG_ID_EMM_ERRC_RAT_CHANGE_CAUSE_UPDATE_REQ,
+MSG_ID_EMM_ERRC_GEMINI_LR_REQ,
+MSG_ID_EMM_ERRC_GEMINI_SERVICE_REQ,
+MSG_ID_EMM_ERRC_MBMS_PACKET_COUNTER_REQ,
+MSG_ID_EMM_ERRC_DUPLEX_MODE_CHANGE_REQ,
+MSG_ID_EMM_ERRC_UPDATE_UE_LOCATION_INFORMATION_REQ,
+MSG_ID_EMM_ERRC_RAT_DISABLE_CONFIG_REQ,
+MSG_ID_EMM_ERRC_DATA_ALLOW_REQ,
+MSG_ID_ERRC_LBS_GNSS_POS_IND,
+MSG_ID_LBS_ERRC_READ_TIME_SIB_REQ,
+MSG_ID_EMM_ERRC_PROC_RESULT_UPDATE_REQ,
+MSG_ID_EMM_ERRC_SET_PGCHECK_REQ,
+MSG_ID_EMM_ERRC_HPLMN_INFO_UPDATE_REQ,
+MSG_ID_EMM_ERRC_DATA_ABORT_REQ,
+MSG_ID_EVAL_ERRC_ADJUST_MEAS_REQ,
+MSG_ID_EVAL_ERRC_ETWS_SETTING_REQ,
+MSG_ID_EVAL_ERRC_CBCH_REQ,
+MSG_ID_EVAL_ERRC_CB_UPDATE_REQ,
+MSG_ID_EVAL_ERRC_MMDC_MODE_UPDATE_REQ,
+MSG_ID_EVAL_ERRC_LTE_NEIGHBOR_CELL_INFO_REQ,
+MSG_ID_EVAL_ERRC_C2K_NORMAL_SERVICE_REQ,
+MSG_ID_EVAL_ERRC_NBR_CELL_INFO_START_REQ,
+MSG_ID_EVAL_ERRC_NBR_CELL_INFO_STOP_REQ,
+MSG_ID_EVAL_ERRC_GET_SSAC_PARAM_REQ,
+MSG_ID_EMM_ERRC_VDM_IMS_VOICE_STATUS_REQ,
+MSG_ID_EVAL_ERRC_IMS_STATUS_UPDATE_REQ,
+MSG_ID_EVAL_ERRC_PLMN_SEARCH_ABORT_REQ,
+MSG_ID_EVAL_ERRC_CB_MSG_REMOVAL_REQ,
+MSG_ID_EVAL_ERRC_MRU_UPDATE_REQ,
+MSG_ID_EVAL_ERRC_CSG_AUTO_SEARCH_MODE_REQ,
+MSG_ID_MBMSAL_ERRC_MBMS_CONFIG_REQ,
+MSG_ID_NAS_SV_ERRC_PLMN_LIST_ABORT_REQ,
+MSG_ID_EVAL_ERRC_ERLM_CONTROL_REQ,
+MSG_ID_EVAL_ERRC_CALL_STATUS_IND,
+MSG_ID_EVAL_ERRC_ARAL_UPDATE_REQ,
+MSG_ID_EVAL_ERRC_NW_BAND_INFO_START_REQ,
+MSG_ID_EVAL_ERRC_NW_BAND_INFO_STOP_REQ,
+MSG_ID_EVAL_ERRC_SMS_STATUS_REQ,
+MSG_ID_EVAL_ERRC_SEMAPHORE_SERVICE_STATUS_REQ,
+MSG_ID_EVTH_ERRC_SEMAPHORE_SERVICE_STATUS_REQ,
+MSG_ID_EMM_ERRC_SEMAPHORE_SERVICE_STATUS_REQ,
+MSG_ID_EVTH_ERRC_FEATURE_CONFIG_REQ,
+MSG_ID_EVTH_ERRC_FEATURE_QUERY_REQ,
+MSG_ID_EVTH_ERRC_HST_GAME_IND,
+MSG_ID_IMS_ERRC_CALL_STATUS_SRVCC_IND,
+MSG_ID_IMS_ERRC_EARLY_CONN_REL_IND,
+MSG_ID_EMM_ERRC_SYNC_CONNECTION_STATUS_NTF,
+MSG_ID_EMM_ERRC_EPS_BEARER_INFO_REQ,
+MSG_ID_ERRC_SIM_PROTECT_REQ,
+MSG_ID_SAT_EAS_NMR_REQ,
+MSG_ID_EVAL_ERRC_INACTIVE_MODE_CONFIGURATION_REQ,
+MSG_ID_EVAL_ERRC_SERVICE_RECOVERY_ROUND_UPDATE_REQ,
+MSG_ID_EVAL_ERRC_SCREEN_ON_REQ,
+MSG_ID_EVAL_ERRC_SCREEN_OFF_REQ,
+MSG_ID_ERRC_EL1_SET_RAT_CNF,
+MSG_ID_ERRC_EL1_AFC_FWS_ABNORMAL_IND,
+MSG_ID_ERRC_EL1MPC_CARRIER_SEARCH_CNF,
+MSG_ID_ERRC_EL1MPC_CARRIER_SEARCH_IND,
+MSG_ID_ERRC_EL1MPC_CARRIER_SEARCH_STATUS_IND,
+MSG_ID_ERRC_EL1MPC_SPECIFIC_MEASURE_CNF,
+MSG_ID_ERRC_EL1MPC_SPECIFIC_MEASURE_IND,
+MSG_ID_ERRC_EL1MPC_RADIO_MEASURE_CNF,
+MSG_ID_ERRC_EL1MPC_RADIO_MEASURE_IND,
+MSG_ID_ERRC_EL1MPC_OTDOA_MEAS_CNF,
+MSG_ID_ERRC_EL1MPC_OTDOA_CTRL_CNF,
+MSG_ID_ERRC_EL1MPC_PRS_GAP_IND,
+MSG_ID_ERRC_EL1MPC_NBRCELL_EM_INFO,
+MSG_ID_ERRC_EL1MPC_MBSFN_MEASURE_CNF,
+MSG_ID_ERRC_EL1MPC_MBSFN_MEASURE_IND,
+MSG_ID_LMOB_MOB_POWER_LEVEL_IND,
+MSG_ID_LMOB_MOB_RADIO_MEASURE_IND,
+MSG_ID_LMOB_MOB_NBRCELL_EM_INFO,
+MSG_ID_LMOB_MOB_CEL_RESEL_IND,
+MSG_ID_LMOB_MOB_CEL_OOS_IND,
+MSG_ID_LMOB_MOB_CEL_NEED_IR_CHANGE_STATUS_IND,
+MSG_ID_LMOB_MOB_SCSI_INFO_IND,
+MSG_ID_LMOB_MOB_REJ_INFO_IND,
+MSG_ID_LMOB_MOB_RADIO_MEASURE_CNF,
+MSG_ID_LMOB_MOB_OOS_SCSI_INFO_REQ,
+MSG_ID_LMOB_MOB_NBR_CELL_INFO_IND,
+MSG_ID_LMOB_MOB_CONFIG_UCELL_MEAS_REQ,
+MSG_ID_LMOB_MOB_CONFIG_UCELL_PRIO_MEAS_REQ,
+MSG_ID_LMOB_MOB_UCELL_MEAS_IND,
+MSG_ID_LMOB_MOB_CONFIG_GCELL_MEAS_REQ,
+MSG_ID_LMOB_MOB_CONFIG_GCELL_PRIO_MEAS_REQ,
+MSG_ID_LMOB_MOB_GCELL_MEAS_IND,
+MSG_ID_LMOB_MOB_GCELL_BSIC_IND,
+MSG_ID_LMOB_MOB_CONFIG_CCELL_MEAS_REQ,
+MSG_ID_LMOB_MOB_CONFIG_CCELL_PRIO_MEAS_REQ,
+MSG_ID_LMOB_MOB_CCELL_MEAS_IND,
+MSG_ID_LMOB_MOB_UAS_LTE_MEASUREMENT_CNF,
+MSG_ID_LMOB_MOB_GAS_LTE_MEASUREMENT_CNF,
+MSG_ID_LMOB_MOB_CAS_LTE_MEASUREMENT_CNF,
+MSG_ID_LMOB_MOB_MEAS_INTRARAT_INFO_IND,
+MSG_ID_LMOB_MOB_MEAS_INTERRAT_UTRAN_INFO_IND,
+MSG_ID_LMOB_MOB_MEAS_INTERRAT_GERAN_INFO_IND,
+MSG_ID_LMOB_MOB_MEAS_INTERRAT_C2K_INFO_IND,
+MSG_ID_LMOB_MOB_SYNCH_STATUS_CNF,
+MSG_ID_LMOB_MOB_CONN_FAKE_IRCCO_GCELL_IND,
+MSG_ID_LMOB_MOB_PRS_GAP_IND,
+MSG_ID_LMOB_MOB_GCELL_BSIC_ENH_IND,
+MSG_ID_MOB_LMOB_MEAS_LOGGING_IND,
+MSG_ID_MOB_LMOB_ESTFAIL_REPORT_CNF,
+MSG_ID_ERRC_EL1_PAGING_IND,
+MSG_ID_ERRC_EL1_BUFFER_CHECK_IND,
+MSG_ID_ERRC_EL1_CPHY_CFG_CNF,
+MSG_ID_ERRC_EL1_RL_MONITOR_CNF,
+MSG_ID_ERRC_EL1_RLF_IND,
+MSG_ID_ERRC_EL1_BCCH_IND,
+MSG_ID_ERRC_EL1_BCCH_SYS_INFO_IND,
+MSG_ID_ERRC_EL1MPC_NBR_BCCH_MEAS_IND,
+MSG_ID_ERRC_EL1_SPECIFIC_CELL_SEARCH_CNF,
+MSG_ID_ERRC_CEL_SPECIFIC_CELL_SRCH_CNF,
+MSG_ID_ERRC_CONN_SPECIFIC_CELL_SRCH_CNF,
+MSG_ID_ERRC_EL1_SPECIFIC_CELL_SEARCH_IND,
+MSG_ID_ERRC_CEL_SPECIFIC_CELL_SRCH_IND,
+MSG_ID_ERRC_CONN_SPECIFIC_CELL_SRCH_IND,
+MSG_ID_ERRC_EL1MPC_RSSI_SNIFFER_CNF,
+MSG_ID_ERRC_EL1MPC_RSSI_SNIFFER_IND,
+MSG_ID_ERRC_EL1MPC_RSSI_SNIFFER_BAND_COMPLETE_IND,
+MSG_ID_ERRC_EL1_SIB_FRAME_SYNC_IND,
+MSG_ID_ERRC_EL1_PCH_CRCNG_IND, /* Need to remove for TK6291 U4G */
+MSG_ID_ERRC_EL1_AUTO_GAP_ON_CNF,
+MSG_ID_ERRC_EL1_AUTO_GAP_OFF_CNF,
+MSG_ID_ERRC_EL1_ACTIVE_AFC_IND,
+MSG_ID_ERRC_EL1_HST_IND,
+MSG_ID_ERRC_EL1_IDC_IND,
+MSG_ID_ERRC_IDC_IDC_IND,
+MSG_ID_ERRC_EL1_SCELL_FOUND_IND,
+MSG_ID_ERRC_EL1_ABORT_HO_CNF,
+MSG_ID_ERRC_EL1_VIRTUAL_MODE_CNF,
+MSG_ID_ERRC_EL1_GAP_STATUS_IND, /* VzW MMO C2K GAP */
+MSG_ID_ERRC_EL1_DSP_SNIFFER_CNF,
+MSG_ID_PERF_ERRC_REESTABLISHMENT_RECOVERY_REQ,
+MSG_ID_ERRC_EMAC_CONTENTION_IND,
+MSG_ID_ERRC_EMAC_RA_ERROR_IND,
+MSG_ID_ERRC_EMAC_ESTFAIL_REPORT_CNF,
+MSG_ID_ERRC_CONN_RRC_TRIGER_RAERR,
+MSG_ID_ERRC_EVTH_CHM_NON_RRC_TRIGER_RAERR,
+MSG_ID_ERRC_EMAC_CONFIG_CNF,
+MSG_ID_ERRC_EMACMCH_SYNCAREA_CFG_CNF,
+MSG_ID_ERRC_EMACMCH_AREA_CFG_CNF,
+MSG_ID_ERRC_EMACMCH_MXCH_CFG_CNF,
+MSG_ID_ERRC_EMACMCH_MCCH_RCV_MODE_CHANGE_CNF,
+MSG_ID_ERRC_EMACMCH_MTCH_SUSPEND_IND,
+MSG_ID_ERRC_EMAC_L1_UL_REL_IND,
+MSG_ID_ERRC_EMAC_RA_INFO_IND,
+MSG_ID_ERRC_EMAC_SI_IND,
+MSG_ID_ERRC_EMAC_TA_INFO_CNF,
+MSG_ID_ERRC_EMAC_TA_INFO_IND,
+MSG_ID_ERRC_EMAC_TA_INFO_INVALID_IND,
+MSG_ID_LPP_ERRC_ECID_MEAS_REQ,
+MSG_ID_LPP_ERRC_ECID_MEAS_ABORT_REQ,
+MSG_ID_LPP_ERRC_IRAT_ECID_MEAS_REQ,
+MSG_ID_LPP_ERRC_OTDOA_MEAS_REQ,
+MSG_ID_LPP_ERRC_OTDOA_MEAS_ABORT_REQ,
+MSG_ID_LPP_ERRC_SRB_STATUS_REQ,
+MSG_ID_ERRC_EVTH_SYS_SI,
+MSG_ID_ERRC_EVTH_SYS_SIB1,
+MSG_ID_ERRC_EVTH_SYS_BCCH_ASN1_DEC_ERR,
+MSG_ID_ERRC_EVTH_SYS_BCCH_UNDEFINE,
+MSG_ID_ERRC_EMAC_CCCH_DATA_IND,
+MSG_ID_ERRC_EMAC_CA_ACTIVATE_IND,
+MSG_ID_ERRC_EVTH_CONN_CONN_REEST,
+MSG_ID_ERRC_EVTH_CONN_CONN_REEST_REJ,
+MSG_ID_ERRC_EVTH_CONN_CONN_REJ,
+MSG_ID_ERRC_EVTH_CONN_CONN_SETUP,
+MSG_ID_ERRC_EVTH_CONN_CCCH_ASN1_DEC_ERR,
+MSG_ID_ERRC_EVTH_CONN_CCCH_UNDEFINE,
+MSG_ID_ERRC_EVTH_CONN_MBSFN_AREA_CFG,
+MSG_ID_ERRC_EVTH_CONN_MBMS_CNT_REQ,
+MSG_ID_ERRC_ERLCUL_CONFIG_CNF,
+MSG_ID_ERRC_ERLCDL_CONFIG_CNF,
+MSG_ID_ERRC_ERLC_RLF_IND,
+MSG_ID_ERRC_ERLCUL_SRB1_ACK_CNF,
+MSG_ID_ERRC_ERLC_VIP_DATA_STATUS_IND,
+MSG_ID_ERRC_ENPDCP_RLC_INFOTRANS_ACK_IND,
+MSG_ID_ERRC_ENPDCP_RLC_UEINFO_ACK_IND,
+MSG_ID_ERRC_ENPDCP_RLC_MOB_ACK_IND,
+MSG_ID_ERRC_EVTH_CONN_DL_INFO_TRANS,
+MSG_ID_ERRC_EVTH_CONN_MOB_FROM_EUTRA_CMD,
+MSG_ID_ERRC_EVTH_CONN_CONN_RECONF,
+MSG_ID_ERRC_EVTH_CONN_RECONF_PRECHK,
+MSG_ID_ERRC_EVTH_CONN_CONN_REL,
+MSG_ID_ERRC_EVTH_CONN_SECURITY_MODE_CMD,
+MSG_ID_ERRC_EVTH_RCM_UE_CAPA_ENQ,
+MSG_ID_EL1_ERRC_FACTORY_CAPABILITY_IND,
+MSG_ID_ERRC_EVTH_CONN_COUNTER_CHECK,
+MSG_ID_ERRC_EVTH_CONN_UE_INFO_REQ,
+MSG_ID_ERRC_EVTH_CONN_DCCH_ASN1_DEC_ERR,
+MSG_ID_ERRC_EVTH_CONN_IRAT_DCCH_ASN1_DEC_ERR,
+MSG_ID_ERRC_EVTH_CONN_IRAT_NR_DCCH_ASN1_DEC_ERR,
+MSG_ID_ERRC_EVTH_CONN_DCCH_INTG_CHK_ERR,
+MSG_ID_ERRC_EVTH_CONN_DCCH_UNDEFINE,
+MSG_ID_ERRC_EVTH_MOB_LOGGED_MEAS_CFG,
+MSG_ID_ERRC_ERLCDL_TEST_CNF,
+MSG_ID_ERRC_EPDCP_CNTINFO_CNF,
+MSG_ID_ERRC_EPDCP_DETECTION_TIMER_TIMEOUT_IND,
+MSG_ID_ERRC_EPDCP_PS_DATA_INACTIVE_TIME_IND,
+MSG_ID_ERRC_EPDCP_MTCH_PC_CNF,
+MSG_ID_ERRC_ERLCDL_MTCH_PC_CNF,
+MSG_ID_ERRC_TIMER_TRIG_TIMEOUT_REQ,
+MSG_ID_ERRC_EVTH_RCM_CSG_WHITE_LIST_UPDATE_IND,
+MSG_ID_ERRC_EVTH_RCM_NVRAM_READ_CNF,
+MSG_ID_ERRC_EVTH_RCM_NVRAM_WRITE_CNF,
+MSG_ID_ERRC_EVTH_RCM_BAND_UPDATE_IND,
+MSG_ID_ERRC_EVTH_RCM_SBP_RECONFIG_REQ,
+MSG_ID_ERRC_EVTH_RCM_SIM_SWITCH_REQ,
+MSG_ID_ERRC_EVTH_CEL_LOWER_LAYER_AVAILABILITY_UPDATE_IND,
+MSG_ID_ERRC_EVTH_RCM_DISABLE_B39_IND,
+MSG_ID_ERRC_EVTH_RCM_ENABLE_B39_IND,
+MSG_ID_ERRC_EVTH_RCM_BAND_CTRL_IND,
+MSG_ID_CLC_EAS_EARFCN_LIST_UPDATE_REQ,
+MSG_ID_UAS_EAS_HANDOVER_ECELL_REQ,
+MSG_ID_NRRC_ERRC_HANDOVER_ECELL_REQ,
+MSG_ID_ERRC_EVTH_CONN_IRAT_RECONF,
+MSG_ID_ERRC_EVTH_CONN_IRAT_NR_RECONF,
+MSG_ID_UAS_EAS_ABORT_HO_ECELL_REQ,
+MSG_ID_NRRC_ERRC_ABORT_HANDOVER_ECELL_REQ,
+MSG_ID_MRS_EAS_UMTS_HO_INFO_IND,
+MSG_ID_MRS_EAS_CLEAR_BLACK_CELL_IND,
+MSG_ID_MRS_EAS_AFR_ALL_SESSION_END_IND,
+MSG_ID_EAS_UAS_HANDOVER_UCELL_CNF,
+MSG_ID_EAS_GAS_HANDOVER_GCELL_CNF,
+MSG_ID_ERRC_NRRC_HANDOVER_NRCELL_CNF,
+MSG_ID_EAS_UAS_HO_ACTIVATE_UCELL_CNF,
+MSG_ID_EAS_GAS_HO_ACTIVATE_GCELL_CNF,
+MSG_ID_GAS_EAS_EVALUATE_ECELL_REQ,
+MSG_ID_UAS_EAS_EVALUATE_ECELL_REQ,
+MSG_ID_NRRC_ERRC_EVALUATE_ECELL_REQ,
+MSG_ID_CAS_EAS_EVALUATE_ECELL_REQ,
+MSG_ID_GAS_EAS_EVALUATE_ECELL_STOP_REQ,
+MSG_ID_UAS_EAS_EVALUATE_ECELL_STOP_REQ,
+MSG_ID_NRRC_ERRC_EVALUATE_ECELL_STOP_REQ,
+MSG_ID_CAS_EAS_EVALUATE_ECELL_STOP_REQ,
+MSG_ID_EAS_GAS_EVALUATE_GCELL_CNF,
+MSG_ID_EAS_UAS_EVALUATE_UCELL_CNF,
+MSG_ID_ERRC_NRRC_EVALUATE_NRCELL_CNF,
+MSG_ID_EAS_GAS_EVALUATE_GCELL_STOP_CNF,
+MSG_ID_EAS_UAS_EVALUATE_UCELL_STOP_CNF,
+MSG_ID_ERRC_NRRC_EVALUATE_NRCELL_STOP_CNF,
+MSG_ID_EAS_GAS_ACTIVATE_GCELL_CNF,
+MSG_ID_EAS_UAS_ACTIVATE_UCELL_CNF,
+MSG_ID_ERRC_NRRC_ACTIVATE_NRCELL_CNF,
+MSG_ID_EAS_CAS_ACTIVATE_CCELL_CNF,
+MSG_ID_GAS_EAS_READY_TIMER_STATUS_IND,
+MSG_ID_GAS_EAS_EVALUATE_CSG_ECELL_REQ,
+MSG_ID_UAS_EAS_EVALUATE_CSG_ECELL_REQ,
+MSG_ID_GAS_EAS_SEARCH_CSG_ECELL_REQ,
+MSG_ID_UAS_EAS_SEARCH_CSG_ECELL_REQ,
+MSG_ID_EAS_UAS_EVALUATE_CSG_UCELL_CNF,
+MSG_ID_EAS_UAS_SEARCH_CSG_UCELL_CNF,
+MSG_ID_UAS_EAS_LTE_MEASUREMENT_REQ,
+MSG_ID_GAS_EAS_LTE_MEASUREMENT_REQ,
+MSG_ID_CAS_EAS_LTE_MEASUREMENT_REQ,
+MSG_ID_EAS_CAS_CCELL_MEAS_IND,
+MSG_ID_UAS_EAS_LTE_HPS_QUALIFY_CELL_IND,
+MSG_ID_GAS_EAS_LTE_HPS_QUALIFY_CELL_IND,
+MSG_ID_CAS_EAS_LTE_HPS_QUALIFY_CELL_IND,
+MSG_ID_EAS_FDD_UAS_CONFIG_UCELL_MEAS_CNF,
+MSG_ID_EAS_TDD_UAS_CONFIG_UCELL_MEAS_CNF,
+MSG_ID_EAS_GAS_CONFIG_GCELL_MEAS_CNF,
+MSG_ID_EAS_CAS_CONFIG_CCELL_MEAS_CNF,
+MSG_ID_EAS_FDD_UAS_CONFIG_UCELL_PRIO_MEAS_CNF,
+MSG_ID_EAS_TDD_UAS_CONFIG_UCELL_PRIO_MEAS_CNF,
+MSG_ID_EAS_GAS_CONFIG_GCELL_PRIO_MEAS_CNF,
+MSG_ID_EAS_FDD_UAS_UCELL_MEAS_IND,
+MSG_ID_EAS_TDD_UAS_UCELL_MEAS_IND,
+MSG_ID_EAS_GAS_GCELL_MEAS_IND,
+MSG_ID_EAS_GAS_GCELL_BSIC_IND,
+MSG_ID_EAS_UAS_REPORT_CGI_CNF,
+MSG_ID_EAS_GAS_REPORT_CGI_CNF,
+MSG_ID_EAS_CAS_REPORT_CGI_CNF,
+MSG_ID_UAS_EAS_BACKGROUND_SEARCH_START_REQ,
+MSG_ID_UAS_EAS_BACKGROUND_SEARCH_STOP_REQ,
+MSG_ID_GAS_EAS_BACKGROUND_SEARCH_START_REQ,
+MSG_ID_GAS_EAS_BACKGROUND_SEARCH_STOP_REQ,
+MSG_ID_ERRC_NRRC_BACKGROUND_SEARCH_FOUND_IND,
+MSG_ID_ERRC_NRRC_BACKGROUND_SEARCH_START_CNF,
+MSG_ID_UAS_EAS_BUILD_FINGERPRINT_REQ,
+MSG_ID_UAS_EAS_ABORT_FINGERPRINT_IND,
+MSG_ID_EAS_UAS_BUILD_FINGERPRINT_CNF,
+MSG_ID_EAS_GAS_BUILD_FINGERPRINT_CNF,
+MSG_ID_GAS_EAS_EARFCN_LIST_UPDATE_REQ,
+MSG_ID_EVTH_ERRC_MSPM_AS_SESSION_START_CNF,
+MSG_ID_RSVAS_EAS_SUSPEND_SERVICE_REQ,
+MSG_ID_RSVAS_EAS_RESUME_SERVICE_REQ,
+MSG_ID_RSVAS_EAS_ABORT_SERVICE_REQ,
+MSG_ID_RSVAS_EAS_ABORT_SERVICE_COMPLETE_IND,
+MSG_ID_RSVAS_EAS_VIRTUAL_SUSPEND_SERVICE_REQ,
+MSG_ID_RSVAS_EAS_VIRTUAL_SUSPEND_SERVICE_COMPLETE_IND,
+MSG_ID_RSVAS_EAS_VIRTUAL_RESUME_SERVICE_REQ,
+MSG_ID_RSVAS_EAS_VIRTUAL_MODE_UPDATE_REQ,
+MSG_ID_CAS_EAS_C2K_POWER_ON_IND,
+MSG_ID_CAS_EAS_C2K_POWER_OFF_IND,
+MSG_ID_RSVAE_EAS_FREQUENCY_SCAN_ACCEPT_IND,
+MSG_ID_RSVAE_EAS_FREQUENCY_SCAN_PREEMPT_IND,
+MSG_ID_LTECSR_ERRC_VOLTE_STATUS_NTF,
+MSG_ID_EVAL_ERRC_IMS_CALL_STATUS_REQ,
+MSG_ID_LTECSR_ERRC_VOLTE_CALL_SILENCE_NTF,
+MSG_ID_LTECSR_ERRC_DELAY_BUDGET_RPT_CNF,
+MSG_ID_LTECSR_ERRC_DELAY_BUDGET_RPT_IND,
+MSG_ID_EVAL_ERRC_DELAY_BUDGET_RPT_REQ,
+MSG_ID_EVAL_ERRC_EDDA_REQ,
+MSG_ID_EVAL_ERRC_LTECA_MODE_SETTING_REQ,
+MSG_ID_EVAL_ERRC_OMADM_UPDATE_REQ,
+MSG_ID_EVAL_ERRC_LTE_TM9_FDD_TDD_SETTING_REQ,
+MSG_ID_EVAL_ERRC_CA_BAND_COMB_LIST_REQ,
+MSG_ID_ML1S_ERRC_TEST_MODE_ENABLE_REQ,
+MSG_ID_L4C_CELL_POWER_THRESHOLD_CONFIG_REQ,
+MSG_ID_L4C_ERRC_CUSTOM_BAR_LIST_REQ,
+MSG_ID_L4C_ERRC_IMS_CONFIG_IND,
+MSG_ID_IWLAN_ERRC_WLAN_CAPABILITY_REQ,
+MSG_ID_IWLAN_ERRC_WLAN_LWA_CONNECT_RSP,
+MSG_ID_IWLAN_ERRC_WLAN_LWA_LOST_REQ,
+MSG_ID_IWLAN_ERRC_WLAN_LWA_DISCONNECT_RSP,
+MSG_ID_IWLAN_ERRC_WLAN_MEASUREMENT_REQ,
+MSG_ID_IWLAN_ERRC_LWI_STEER_STATUS_REQ,
+MSG_ID_CLC_ERRC_EVDO_PS_CONNECTION_STATUS_IND,
+MSG_ID_PSW_ERRC_1XRTT_PS_CONNECTION_STATUS_IND,
+MSG_ID_EAS_GAS_BSIC_ENH_IND,
+MSG_ID_EVAL_ERRC_HQ_SERVICE_STATUS_REQ,
+MSG_ID_ERRC_ERLCUL_SWITCH_VIRTUAL_CONNECTED_CNF,
+MSG_ID_ERRC_ERLCDL_SWITCH_VIRTUAL_CONNECTED_CNF,
+MSG_ID_RSVAS_EAS_VIRTUAL_CONNECTED_SUSPEND_REQ,
+MSG_ID_RSVAS_EAS_VIRTUAL_CONNECTED_RESUME_REQ,
+MSG_ID_EMM_ERRC_NAS_FAIL_HANDLE_REQ,
+MSG_ID_ERRC_ENPDCP_EXCESS_DELAY_IND,
+MSG_ID_MM_ERRC_NO_DATA_DETECT_IND,
+MSG_ID_ERRC_ENPDCP_DETECTION_TIMER_2_TIMEOUT_IND,
+MSG_ID_ERRC_ENPDCP_DETECTION_TIMER_3_TIMEOUT_IND,
+MSG_ID_ERRC_EMAC_HDATA_IND,
+MSG_ID_ERRC_EMAC_DSP_SNIFFER_CNF,
+MSG_ID_ERRC_NRRC_SRB3_CONFIG_IND,
+MSG_ID_ERRC_NRRC_IE_CHECK_CNF,
+MSG_ID_ERRC_NRRC_CONFIG_CNF,
+MSG_ID_ERRC_NRRC_CONFIG_CONTINUE_CNF,
+MSG_ID_ERRC_NRRC_SUSPEND_CNF,
+MSG_ID_ERRC_NRRC_RELEASE_CNF,
+MSG_ID_ERRC_NRRC_SCG_FAILURE_IND,
+MSG_ID_ERRC_NRRC_QOS_UPDATE_CNF,
+MSG_ID_ERRC_NRRC_SRB1_SEC_ACTIVATE_CNF,
+MSG_ID_ERRC_NRRC_CONFIG_IND,
+MSG_ID_NRRC_ERRC_PDCP_CONFIG_REQ,
+MSG_ID_NRRC_ERRC_PDCP_SWITCH_VIRTUAL_CONNECTED_REQ,
+MSG_ID_NRRC_ERRC_REPORT_CGI_REQ,
+MSG_ID_ERRC_NRRC_RB_REVERT_FORGET_CNF,
+MSG_ID_ERRC_NRRC_MEAS_REPORT_IND,
+MSG_ID_ERRC_NRRC_FAILURE_INFO_IND,
+MSG_ID_ERRC_NRRC_REPORT_CGI_CNF,
+MSG_ID_NRRC_ERRC_CGI_CONFLICT_JUDGE_REQ,
+MSG_ID_ERRC_NRRC_CGI_CONFLICT_FINISH_IND,
+MSG_ID_NRRC_ERRC_AUTO_GAP_ON_REQ,
+MSG_ID_NRRC_ERRC_AUTO_GAP_OFF_REQ,
+MSG_ID_NRRC_ERRC_AUTO_GAP_OFF_RSP,
+MSG_ID_NRRC_ERRC_OTDOA_MEAS_REQ,
+MSG_ID_NRRC_ERRC_OTDOA_MEAS_ABORT_REQ,
+MSG_ID_ERRC_ENPDCP_CONFIG_CNF,
+MSG_ID_ERRC_ENPDCP_RLF_IND,
+MSG_ID_ERRC_ENPDCP_MCCH_DATA_IND,
+MSG_ID_ERRC_ENPDCP_DCCH_DATA_CNF,
+MSG_ID_ERRC_ENPDCP_DCCH_DATA_IND,
+MSG_ID_ERRC_ENPDCP_SWITCH_VIRTUAL_CONNECTED_CNF,
+MSG_ID_ERRC_ENPDCP_TEST_CNF,
+MSG_ID_ERRC_ENPDCP_CNTINFO_CNF,
+MSG_ID_ERRC_ENPDCP_DETECTION_TIMER_TIMEOUT_IND,
+MSG_ID_ERRC_ENPDCP_PS_DATA_INACTIVE_TIME_IND,
+MSG_ID_ERRC_ENPDCP_CUT_CELL_IND,
+MSG_ID_ERRC_NRRC_VIRTUAL_CONNECTED_SUSPEND_CNF,
+MSG_ID_ERRC_NRRC_VIRTUAL_CONNECTED_RESUME_CNF,
+MSG_ID_ERRC_NL1_RADIO_MEAS_CNF,
+MSG_ID_ERRC_NL1_RADIO_MEAS_IND,
+MSG_ID_ERRC_NL1_RADIO_MEAS_SBI_IND,
+MSG_ID_ERRC_NL1_SFTD_CNF,
+MSG_ID_ERRC_NL1_SFTD_IND,
+MSG_ID_NAS_SV_ERRC_NR_NORMAL_SERVICE_LOSS_UPDATE_REQ,
+MSG_ID_NL1_ERRC_LTE_MEASUREMENT_REQ,
+MSG_ID_NL1_ERRC_LTE_HPS_QUALIFY_CELL_IND,
+MSG_ID_NAS_SV_ERRC_CAP_UPDATE_REQ,
+MSG_ID_NAS_SV_ERRC_BACKGROUND_BAND_LEARNING_REQ,
+MSG_ID_NAS_SV_ERRC_BACKGROUND_BAND_LEARNING_STOP_REQ,
+MSG_ID_EMM_ERRC_BAR_LTE_CELL_REQ,
+MSG_ID_SASE_ERRC_ENDC_ACTIVATE_REQ,
+MSG_ID_SASE_ERRC_ENDC_DEACTIVATE_REQ,
+MSG_ID_SASE_ERRC_SA_SILENCE_CTRL_REQ,
+MSG_ID_ERRC_ERLCUL_GAMING_CELL_INFO_NTF,
+MSG_ID_ERRC_NL1MOB_GAMING_CELL_INFO_NTF,
+MSG_ID_NAS_SV_ERRC_REGN_RESULT_IND,
+MSG_ID_NRRC_ERRC_CELL_REJ_IND,
+MSG_ID_L4C_ERRC_SET_PLMN_STORED_FREQ_REQ,
+MSG_ID_ERRC_ENPDCP_RLC_CAPA_RES_ACK_IND,
+MSG_ID_ANY_ERRC_CELL_REJ_IND,
+MSG_ID_L4C_ERRC_SET_SIGNAL_REPORTING_CRITERIA_REQ,
+MSG_ID_L4C_ERRC_IMS_CC_CALL_PROGRESS_IND,
+MSG_ID_NAS_SV_ERRC_ANY_SEARCH_STATUS_UPDATE_REQ,
+MSG_ID_EXEVT_RCV_END,
+MSG_ID_INEVT_BEGIN,
+MSG_ID_ERRC_SPV_RCM_INIT_REQ,
+MSG_ID_ERRC_SPV_RCM_INIT_CNF,
+MSG_ID_ERRC_SPV_RCM_RAT_BAND_REQ,
+MSG_ID_ERRC_SPV_RCM_RAT_BAND_CNF,
+MSG_ID_ERRC_SPV_RCM_USIM_REQ,
+MSG_ID_ERRC_SPV_RCM_USIM_CNF,
+MSG_ID_ERRC_ANY_RCM_CONTEXT_WRITE_IND,
+MSG_ID_ERRC_ANY_SPV_CHANGE_STATE_REQ,
+MSG_ID_ERRC_ANY_SPV_CHANGE_STATE_CNF,
+MSG_ID_ERRC_SPV_RCM_PARAM_REQ,
+MSG_ID_ERRC_SPV_RCM_PARAM_CNF,
+MSG_ID_ERRC_SPV_CEL_PARAM_REQ,
+MSG_ID_ERRC_SPV_CEL_PARAM_CNF,
+MSG_ID_ERRC_SPV_CONN_KEY_UPDT_REQ,
+MSG_ID_ERRC_SPV_CONN_KEY_UPDT_CNF,
+MSG_ID_ERRC_SPV_CONN_MBMS_SERVSESS_REQ,
+MSG_ID_ERRC_SPV_CONN_MBMS_SERVSESS_CNF,
+MSG_ID_ERRC_SPV_CONN_TEST_REQ,
+MSG_ID_ERRC_SPV_CONN_TEST_CNF,
+MSG_ID_ERRC_SPV_ANY_MBMS_EVENT_IND,
+MSG_ID_ERRC_ANY_SPV_MBMS_EVENT_IND,
+MSG_ID_ERRC_SPV_CONN_STATUS_UPDATE_REQ,
+MSG_ID_ERRC_SPV_ANY_STBY_REQ,
+MSG_ID_ERRC_SPV_ANY_STBY_CNF,
+MSG_ID_ERRC_SPV_ANY_STANDBY_CMPL_IND,
+MSG_ID_ERRC_SPV_ANY_RAT_CHANGE_REQ,
+MSG_ID_ERRC_SPV_ANY_RAT_CHANGE_CNF,
+MSG_ID_ERRC_ANY_SPV_RAT_CHANGE_IND,
+MSG_ID_ERRC_ANY_SPV_RAT_CHANGE_RES,
+MSG_ID_ERRC_SPV_CONN_RAT_CHANGE_ABORT_REQ,
+MSG_ID_ERRC_SPV_CONN_RAT_CHANGE_ABORT_CNF,
+MSG_ID_ERRC_CONN_CHM_IRAT_TO_LTE_ABORT_IND,
+MSG_ID_ERRC_SPV_ANY_FLIGHT_MODE_REQ,
+MSG_ID_ERRC_SPV_ANY_FLIGHT_MODE_CNF,
+MSG_ID_ERRC_SPV_ANY_IRTOLTE_SUCCESS_IND,
+MSG_ID_ERRC_SPV_CONN_SERVICE_RES_OCCUPY_IND,
+MSG_ID_ERRC_SPV_ANY_GEMINI_SUSPEND_REQ,
+MSG_ID_ERRC_SPV_ANY_GEMINI_SUSPEND_CNF,
+MSG_ID_ERRC_SPV_ANY_GEMINI_RESUME_REQ,
+MSG_ID_ERRC_SPV_ANY_GEMINI_RESUME_CNF,
+MSG_ID_ERRC_SPV_ANY_GEMINI_RESUME_COMPLETE_IND,
+MSG_ID_ERRC_SPV_ANY_GEMINI_VIRTUAL_SUSPEND_REQ,
+MSG_ID_ERRC_SPV_ANY_GEMINI_VIRTUAL_SUSPEND_CNF,
+MSG_ID_ERRC_SPV_ANY_GEMINI_VIRTUAL_SUSPEND_COMPLETE_IND,
+MSG_ID_ERRC_SPV_ANY_GEMINI_VIRTUAL_RESUME_REQ,
+MSG_ID_ERRC_SPV_ANY_GEMINI_ABORT_REQ,
+MSG_ID_ERRC_SPV_ANY_GEMINI_ABORT_CNF,
+MSG_ID_ERRC_SPV_ANY_GEMINI_ABORT_COMPLETE_IND,
+MSG_ID_ERRC_SPV_ANY_GEMINI_VIRTUAL_MODE_UPDATE_REQ,
+MSG_ID_ERRC_SPV_ANY_GEMINI_VIRTUAL_MODE_UPDATE_CNF,
+MSG_ID_ERRC_SPV_ANY_MSPM_AS_SESSION_RESULT_IND,
+MSG_ID_ERRC_SPV_RCM_DUPLEX_MODE_CHANGE_REQ,
+MSG_ID_ERRC_SPV_RCM_DUPLEX_MODE_CHANGE_CNF,
+MSG_ID_ERRC_SPV_ANY_NAS_CAPABILITY_CHANGE_REQ,
+MSG_ID_ERRC_SPV_ANY_NAS_CAPABILITY_CHANGE_CNF,
+MSG_ID_ERRC_SPV_ANY_STATE_CHANGE_IND,
+MSG_ID_ERRC_CEL_SYS_BCCH_ACT_REQ,
+MSG_ID_ERRC_CEL_SYS_BCCH_ACT_CNF,
+MSG_ID_ERRC_CEL_SYS_BCCH_DEACT_IND,
+MSG_ID_ERRC_SYS_CEL_BCCH_RCVD_IND,
+MSG_ID_ERRC_CEL_SYS_DB_UPDT_IND,
+MSG_ID_ERRC_CEL_SYS_SOFT_IDX_CHG_IND,
+MSG_ID_ERRC_CEL_SYS_PWS_ACT_IND,
+MSG_ID_ERRC_CEL_SYS_PWS_DEACT_IND,
+MSG_ID_ERRC_SYS_CEL_PWS_RCVD_IND,
+MSG_ID_ERRC_SYS_CEL_BCCH_EXPR_IND,
+MSG_ID_ERRC_CEL_SYS_CLEAR_DEDICATED_SIB,
+MSG_ID_ERRC_CEL_CONN_IDLE_IND,
+MSG_ID_ERRC_CONN_CEL_IDLE_RSP,
+MSG_ID_ERRC_CONN_CEL_RRC_CONNECTED_REQ,
+MSG_ID_ERRC_CONN_CEL_RRC_CONNECTED_CNF,
+MSG_ID_ERRC_CONN_CEL_IDLE_REQ,
+MSG_ID_ERRC_CEL_CONN_CH_STATUS_IND,
+MSG_ID_ERRC_CONN_CEL_REEST_REQ,
+MSG_ID_ERRC_CONN_CEL_REEST_CNF,
+MSG_ID_ERRC_CONN_CEL_BCCH_CTRL_FINISH_IND,
+MSG_ID_ERRC_CONN_CEL_HO_UPDATE_CELL_IND,
+MSG_ID_ERRC_CONN_CEL_HO_SUCCESS_IND,
+MSG_ID_ERRC_CEL_CONN_UPDT_MIB_IND,
+MSG_ID_ERRC_CEL_CONN_UPDT_SIB_IND,
+MSG_ID_ERRC_CONN_CEL_CNCT_NG_IND,
+MSG_ID_ERRC_CEL_CONN_CELL_NO_SUITABLE_IND,
+MSG_ID_ERRC_CONN_CEL_REEST_CMPL_REQ,
+MSG_ID_ERRC_CONN_CEL_REEST_CMPL_CNF,
+MSG_ID_ERRC_CONN_CEL_EST_JDG_REQ,
+MSG_ID_ERRC_CONN_CEL_EST_JDG_CNF,
+MSG_ID_ERRC_CONN_CEL_CCO_RESULT_IND,
+MSG_ID_ERRC_CONN_CEL_MBMS_SCELL_REQ,
+MSG_ID_ERRC_CONN_CEL_MBMS_SCELL_CNF,
+MSG_ID_ERRC_CONN_CEL_HO_FAIL_SRCH_CELL_REQ,
+MSG_ID_ERRC_CONN_CEL_HO_FAIL_SRCH_CELL_CNF,
+MSG_ID_ERRC_ANY_CEL_MODIFY_CELL_RESEL_PRIORITY_IND,
+MSG_ID_ERRC_CONN_MOB_ESTFAIL_REPORT_REQ,
+MSG_ID_ERRC_CONN_MOB_ESTFAIL_REPORT_CNF,
+MSG_ID_ERRC_CONN_MOB_WLAN_LOST_IND,
+MSG_ID_ERRC_CONN_MOB_NR_STATUS_NTF,
+MSG_ID_ERRC_CEL_CONN_IRCCO_ABORT_EST_IND,
+MSG_ID_ERRC_CEL_CONN_STATE_UNSYNC_IND,
+MSG_ID_ERRC_CEL_MOB_KCELLS_REQ,
+MSG_ID_ERRC_CEL_MOB_KCELLS_CNF,
+MSG_ID_ERRC_MOB_CEL_RESEL_IND,
+MSG_ID_ERRC_MOB_CEL_OOS_IND,
+MSG_ID_ERRC_MOB_CEL_EARLY_OOS_IND,
+MSG_ID_ERRC_CEL_MOB_CELL_REJ_IND,
+MSG_ID_ERRC_CEL_MOB_CELL_RJCT_CLR_IND,
+MSG_ID_ERRC_CEL_MOB_SERVCELL_LOW_PRIORITY_STATUS_UPDATE_NTF,
+MSG_ID_ERRC_MOB_CEL_REST_LIST_IND,
+MSG_ID_ERRC_MOB_CEL_NEED_IR_CHANGE_STATUS_IND,
+MSG_ID_ERRC_CEL_MOB_UPDATE_CAUSE_IND,
+MSG_ID_ERRC_RCM_MOB_USIM_IND,
+MSG_ID_ERRC_MOB_CEL_SI_MEAS_IND,
+MSG_ID_ERRC_ANY_MOB_MEAS_PRE_CTRL_REQ,
+MSG_ID_ERRC_ANY_MOB_MEAS_PRE_CTRL_CNF,
+MSG_ID_ERRC_ANY_MOB_MEAS_POST_CTRL_REQ,
+MSG_ID_ERRC_ANY_MOB_MEAS_POST_CTRL_CNF,
+MSG_ID_ERRC_ANY_MOB_OTDOA_PRE_CTRL_REQ,
+MSG_ID_ERRC_ANY_MOB_OTDOA_PRE_CTRL_CNF,
+MSG_ID_ERRC_ANY_MOB_OTDOA_POST_CTRL_REQ,
+MSG_ID_ERRC_ANY_MOB_OTDOA_POST_CTRL_CNF,
+MSG_ID_ERRC_MOB_CONN_GAP_INTERNAL_CHG_IND,
+MSG_ID_ERRC_MOB_CONN_GAP_INTERNAL_CHG_RSP,
+MSG_ID_ERRC_CEL_MOB_MEAS_REQ,
+MSG_ID_ERRC_CEL_MOB_MEAS_CNF,
+MSG_ID_ERRC_MOB_CEL_RPT_CGI_REQ,
+MSG_ID_ERRC_MOB_CEL_RPT_CGI_CNF,
+MSG_ID_ERRC_MOB_CEL_OTDOA_REF_CELL_REQ,
+MSG_ID_ERRC_MOB_CEL_OTDOA_REF_CELL_CNF,
+MSG_ID_ERRC_CEL_MOB_CSG_STATUS_IND,
+MSG_ID_ERRC_CEL_MOB_EMERGENCY_STATUS_IND,
+MSG_ID_ERRC_ANY_MOB_IR_MEAS_CTRL_REQ,
+MSG_ID_ERRC_CEL_MOB_IR_REDIRECT_TO_LTE_IND,
+MSG_ID_ERRC_CEL_MOB_MBMS_SCELL_SEARCH_REQ,
+MSG_ID_ERRC_CEL_MOB_MBMS_SCELL_SEARCH_CNF,
+MSG_ID_ERRC_CEL_MOB_MBMS_SCELL_SEARCH_IND,
+MSG_ID_ERRC_CHM_MOB_LWA_CFG_IND,
+MSG_ID_ERRC_LCEL_CEL_PAGING_IND,
+MSG_ID_ERRC_ANY_CHM_CH_CTRL_REQ,
+MSG_ID_ERRC_ANY_CHM_CH_CTRL_CNF,
+MSG_ID_ERRC_CHM_CONN_L1_CTRLING_IND,
+MSG_ID_ERRC_CHM_CONN_RLF_IND,
+MSG_ID_ERRC_CHM_SYS_BCCH_DL_SYNC_FAIL_IND,
+MSG_ID_ERRC_CONN_CHM_LPBK_REQ,
+MSG_ID_ERRC_CONN_CHM_LPBK_CNF,
+MSG_ID_ERRC_CONN_ANY_SUS_REQ,
+MSG_ID_ERRC_CONN_ANY_SUS_CNF,
+MSG_ID_ERRC_CONN_ANY_RSM_REQ,
+MSG_ID_ERRC_CONN_ANY_RSM_CNF,
+MSG_ID_ERRC_ANY_CONN_REEST_IND,
+MSG_ID_ERRC_TIMER_EXPR_IND,
+MSG_ID_ERRC_TIMER_START_IND,
+MSG_ID_ERRC_TIMER_STOP_IND,
+MSG_ID_ERRC_RCM_CONN_PWS_CAPA_UPDT_IND,
+MSG_ID_ERRC_RCM_ANY_CSG_WHITELIST_UPDATE_IND,
+MSG_ID_ERRC_RCM_ANY_ACC_UPDATE_IND,
+MSG_ID_ERRC_RCM_ANY_DISABLE_B39_IND,
+MSG_ID_ERRC_RCM_ANY_ENABLE_B39_IND,
+MSG_ID_ERRC_RCM_CEL_START_HSR_SNIFFER,
+MSG_ID_ERRC_RCM_CEL_STOP_HSR_SNIFFER,
+MSG_ID_ERRC_RCM_LCEL_USIM_REQ,
+MSG_ID_ERRC_RCM_LCEL_STMSI_UPDATE_REQ,
+MSG_ID_ERRC_MOD_GLOBAL_VAR,
+MSG_ID_ERRC_GET_VAR_ADDR,
+MSG_ID_ERRC_RETURN_VAR_ADDR,
+MSG_ID_ERRC_CHK_DL_DCCH_MSG_IE_IND,
+MSG_ID_ERRC_CHK_DL_CCCH_MSG_IE_IND,
+MSG_ID_ERRC_CHK_MCCH_MSG_IE_IND,
+MSG_ID_ERRC_BCCH_SIB_PTR,
+MSG_ID_ERRC_LSYS_NOPDCCH_DATA,
+MSG_ID_ERRC_LSYS_SYS_BCCH_IND,
+MSG_ID_ERRC_LSYS_SYS_SI_IND,
+MSG_ID_ERRC_LSYS_SYS_BCCH_ASN1_DEC_ERR,
+MSG_ID_ERRC_LSYS_SYS_BCCH_UNDEFINE,
+MSG_ID_ERRC_LSYS_SYS_NOPDCCH_IND,
+MSG_ID_ERRC_MIB_DATA,
+MSG_ID_ERRC_SIB1_DATA,
+MSG_ID_ERRC_SIB2_DATA,
+MSG_ID_ERRC_SIB3_DATA,
+MSG_ID_ERRC_SIB4_DATA,
+MSG_ID_ERRC_SIB4_CSG_DATA,
+MSG_ID_ERRC_SIB5_DATA,
+MSG_ID_ERRC_SIB6_DATA,
+MSG_ID_ERRC_SIB7_DATA,
+MSG_ID_ERRC_SIB8_DATA,
+MSG_ID_ERRC_SIB9_DATA,
+MSG_ID_ERRC_SIB10_DATA,
+MSG_ID_ERRC_SIB11_DATA,
+MSG_ID_ERRC_SIB12_DATA,
+MSG_ID_ERRC_SIB13_DATA,
+MSG_ID_ERRC_SIB14_DATA,
+MSG_ID_ERRC_SIB15_DATA,
+MSG_ID_ERRC_SIB16_DATA,
+MSG_ID_ERRC_SIB17_DATA,
+MSG_ID_ERRC_SIB24_DATA,
+MSG_ID_ERRC_SYS_STS_TBL,
+MSG_ID_ERRC_SYS_BCCH_TBL_CTRL_INF,
+MSG_ID_ERRC_SYS_PWS_RECEPTION_TBL,
+MSG_ID_ERRC_SYS_STORED_INF,
+MSG_ID_ERRC_SYS_DLIST_HEAD_INF,
+MSG_ID_ERRC_NVM_TBL,
+MSG_ID_ERRC_SIM_INFO,
+MSG_ID_ERRC_UE_CAPA_MNG_TBL,
+MSG_ID_ERRC_PWS_SETTING_TBL,
+MSG_ID_ERRC_SPV_TBL,
+MSG_ID_ERRC_CHM_CTRL_TBL,
+MSG_ID_ERRC_CHM_L1_TABLE,
+MSG_ID_ERRC_CHM_L2_TABLE,
+MSG_ID_ERRC_MBMS_CONFIG,
+MSG_ID_ERRC_FINGERPRINT_RECORD,
+MSG_ID_ERRC_LEARNED_MCC_RECORD,
+MSG_ID_ERRC_STORED_CELL_INF,
+MSG_ID_ERRC_STORED_CARR_DATA,
+MSG_ID_ERRC_RCM_TEST,
+MSG_ID_ERRC_MRS_API_RESULT,
+MSG_ID_ERRC_CHM_API_RESULT,
+MSG_ID_ERRC_SPV_API_RESULT,
+MSG_ID_ERRC_COMMON_API_RESULT,
+MSG_ID_ERRC_CONN_LEAVE_CONNECTED_MODE_IND,
+MSG_ID_ERRC_MOB_CONN_FAKE_IRCCO_GCELL_IND,
+MSG_ID_ERRC_MRU_TABLE,
+MSG_ID_ERRC_MBMS_TBL,
+MSG_ID_ERRC_SPV_ANY_C2K_POWER_ON_IND,
+MSG_ID_ERRC_SPV_ANY_C2K_POWER_OFF_IND,
+MSG_ID_ERRC_RCM_UE_EUTRA_CAP_INFO,
+MSG_ID_ERRC_RCM_UE_CAPABILITY_ENQUIRY_FROM_NR,
+MSG_ID_ERRC_RCM_UE_CA_COMB_INFO,
+MSG_ID_ERRC_RCM_UE_PRE_CA_COMB_INFO,
+MSG_ID_ERRC_SYS_CEL_DEDICATED_SIB1_IND,
+MSG_ID_ERRC_SPV_CEL_RSIM_RESUME_CMPL_IND,
+MSG_ID_ERRC_CHM_LWA_CONFIGURATION,
+MSG_ID_ERRC_ANY_CARRS_UPDATE_IND,
+MSG_ID_ERRC_SPV_CONN_VIRTUAL_CONNECTED_SUSPEND_REQ,
+MSG_ID_ERRC_SPV_CONN_VIRTUAL_CONNECTED_SUSPEND_CNF,
+MSG_ID_ERRC_SPV_CONN_VIRTUAL_CONNECTED_RESUME_REQ,
+MSG_ID_ERRC_SPV_CONN_VIRTUAL_CONNECTED_RESUME_CNF,
+MSG_ID_ERRC_CONN_CNCL_CON_REQ,
+MSG_ID_ERRC_CONN_CNCL_CON_CNF,
+MSG_ID_ERRC_CONN_CON_REL_IND,
+MSG_ID_ERRC_CONN_CON_REEST_IND,
+MSG_ID_ERRC_EVTH_CONN_T300_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_T301_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_T302_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_T303_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_T304_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_T305_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_T311_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_TRAERR_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_AFR_TIMER_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_NFR_TIMER_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_TVALID_RAERR_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_TUEINFO_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_TREL_EXPR_IND,
+MSG_ID_ERRC_EVTH_EVTH_RLC_ACK_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_TSTA_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_T306_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_T340_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_EDDA_QUERY_TX_EXPR_IND,
+MSG_ID_ERRC_CONN_MBMS_UPDT_IND,
+MSG_ID_ERRC_EVTH_CONN_TUEINFO_ESTFAIL_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_T351_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_TMOBIL_HIST_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_TVC_VALID_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_REEST_RECONFIG_PROCTECT_EXPR_IND,
+MSG_ID_ERRC_CONN_CON_GEMINI_ABORT_IND,
+MSG_ID_ERRC_EVTH_CONN_TMPS_CH_PROTECT_REL_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_T342_EXPR_IND,
+MSG_ID_ERRC_EVTH_CONN_DBR_QUERY_EXPR_IND,
+MSG_ID_ERRC_RCM_API_RESULT,
+MSG_ID_ERRC_RCM_API_CHK_CA_SPECIFIC_CAPA_INFO,
+MSG_ID_ERRC_ANY_UT_CHECK,
+MSG_ID_ERRC_CONN_RCM_PROCEDURE_OCCUR_IND,
+MSG_ID_ERRC_RCM_MRDC_LTE_STANDALONE_BC_LIST,
+MSG_ID_INEVT_END,
+
+MODULE_MSG_END( MSG_ID_ERRC_CODE_TAIL )
+
+#endif /* _ERRC_MSGID_H */
diff --git a/mcu/interface/sap/md/esm_msgid.h b/mcu/interface/sap/md/esm_msgid.h
new file mode 100644
index 0000000..324de9f
--- /dev/null
+++ b/mcu/interface/sap/md/esm_msgid.h
@@ -0,0 +1,421 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   esm_sap.h
+ *
+ * Project:
+ * --------
+ *   TATAKA
+ *
+ * Description:
+ * ------------
+ *   LTE NAS ESM related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 03 04 2020 mike.lu
+ * [MOLY00502864] [MT6873][Margaux][MP2][SQC][ICD] VGSM/ESM ICD parameter incorrect
+ * 	
+ * 	[ICD Component].
+ *
+ * 12 04 2019 bo-hun.chen
+ * [MOLY00462977] [MT6885][Petrus][MP1][IODT][CTC][FT][SA][5G FT][China][Shenzhen][Huawei][Operator FT] Modem warning: [1][341] esm_rat_manager.c #1623; (timestamp: 25362050)
+ * 	
+ * 	.VMOLY SWRD
+ *
+ * 07 25 2019 poying.chuang
+ * [MOLY00423200] [VMOLY] L4 PS Gen93/Gen95 CR sync to Gen97
+ * 	
+ * 	- [SWRD] L4 interface .
+ *
+ * 04 19 2019 mike.lu
+ * [MOLY00399993] interworking withN26 features
+ * 	(SWRD-Domain file)
+ *
+ * 03 26 2019 mike.lu
+ * [MOLY00393456] [Gen97][VMOLY] 45G InterRAT & interSystem feature
+ * 	
+ * 	.
+ *
+ * 02 18 2019 mike.lu
+ * [MOLY00365007] [Gen97][NWSIM][4G][TC_6_2_2_5] [KAL][UE] Assert fail: protocol/lte_sec/enas/esm/esm_event_mng.c 595 - NAS
+ * 	
+ * 	[Relay VDM Voice Status Req].
+ *
+ * 02 15 2019 mike.lu
+ * [MOLY00361576] TS24.301 R15.4 Aligment
+ * 	
+ * 	Verify input arguments to ICD API..
+ *
+ * 08 17 2018 mike.lu
+ * [MOLY00346729] VMOLY_CBr patch back to VMOLY TRUNK
+ * 	
+ * 	VMOLY_CBr patch back to VMOLY.
+ *
+ * 07 17 2018 tongkun.zhang
+ * [MOLY00338205] [EIGER][MT3967][RDIT][FT][TDD][CMCC][HZ][TDL][VoLTE-FT-001][1.1.1] call keeping time is different between two DUT[FOCUS]
+ * 	
+ * 	[ALPS03959176][ESM 1s timer] to protect the dedicated bearer release after call end.
+ *
+ * 06 05 2018 yu-hsin.lin
+ * [MOLY00325101] [UMOLYE][MT6761][Merlot][O1][MP3][MTBF][HQ][4GMM][Lab][Ericsson][Fatal error(task)] err_code1:0x00000305 err_code2:0x888802DA err_code3:0xCCCCCCCC
+ * [interface] is_emergency_bearer, enum, and msg struct for esm_ratdm_ac_bar_alleviate_req;
+ *
+ * 05 31 2018 renhuang.liu
+ * [MOLY00330073] [Gen95] ESM UT Timer Expire Immediately
+ * Add MSG_ID_ESM_UT_TIMER_EXPIRY_IMMEDIATELY
+ *
+ * 05 15 2018 renhuang.liu
+ * [MOLY00326014] [Gen95][MSPM] SW changes check in UMOLYE
+ * Add ESM MSPM handling
+ *
+ * 02 12 2018 yu-hsin.lin
+ * [MOLY00307329] [UMOLYE][Volunteer Patch][IMS]Dual IMS registration enhacement
+ * msgid for gemini_failure_start and end
+ *
+ * 12 08 2017 yu-hsin.lin
+ * [MOLY00294894] [ATT][RnS][LTE-BTR-1-8909]#30: FAIL - EMERGENCY PDN connection establishment over WLAN is performed.
+ * [Interface]Add ESM EMM interface MSG_ID_ESM_EMM_IMS_REG_STATUS_UPDATE_IND.
+ *
+ * 11 09 2016 vera.yeh
+ * [MOLY00185907] [MT6293] [ENAS] UMOLY merge to UMOLYA
+ * [ESM][re-arch] interface change for __RENAME_URGE_TO_EST__.
+ * 	1) Define new msg ATTACH_NEEDED_GET_ESM_MSG_IND to replace URGE_TO_EST_IND/URGE_TO_EMC_IND
+ * 	2) Replace EST_REQ as ATTACH_NEEDED_GET_ESM_MSG_RSP
+ *
+ * 09 26 2016 vera.yeh
+ * [MOLY00205116] [6293][ESM][TFTLIB] new feature/re-arch item porting to UMOLYA trunk
+ * [ESM][OA] PS.DEV proting to UMOLYA.Trunk.
+ * 	1. wlan offload IEI/interface/enum/structure
+ * 	2. iLM rename for GEMINI_suspend/resume
+ * 	3. LTE QCI default value
+ *
+ * 06 27 2016 vera.yeh
+ * [MOLY00185907] [MT6293] [ENAS] UMOLY merge to UMOLYA
+ * [ESM][OA] proting from UMOLY Trunk up to MOLY00180729(CL2412641).
+ *
+ * 09 23 2015 tc.chang
+ * [MOLY00141130] [ESM] element size reduction.
+ *
+ * 09 08 2015 tc.chang
+ * [MOLY00139612] AT&T requirement - <CDR-DAM-2120> and <CDR-DAM-2130>.
+ *
+ * 08 18 2015 panu.peisa
+ * [MOLY00121007] VZ_REQ_LTEDATARETRY_7743 to 6291
+ * 	Integrated CL 1463334 to UMOLY. VzW fix: remove unused message PAM_ESM_T3402_START_IND.
+ *
+ * 07 16 2015 matti.moisanen
+ * [MOLY00121007] VZ_REQ_LTEDATARETRY_7743 to 6291
+ * 	VzW fix: remove unused message PAM_ESM_T3402_START_IND
+ *
+ * 06 18 2015 panu.peisa
+ * [MOLY00122487] EMM, ESM & PAM module VzW feature porting from 6290 to 6291
+ * 	SWRD part, change have dependency to LTE_SEC parts.
+ *
+ * 06 17 2015 matti.moisanen
+ * VZ_REQ_LTEDATARETRY_7782 to UMOLY_DEV_VxW, SWRD part
+ *
+ * 06 17 2015 teemu.partanen
+ * [VZ_REQ_LTEDATARETRY_7736] From Moly to UMOLY Cbr 1/2 (SWRD).
+ *
+ * 06 14 2015 mika.kaikkonen
+ * [VZ_REQ_LTEDATARETRY_7789] Throttling state of an attach PDN - PAM implementation and new message ID's.
+ *
+ * 06 13 2015 mika.kaikkonen
+ * [VZ_REQ_LTEDATARETRY_7785] Preparation: VzW specifc utility functions and interface updates
+ *
+ * 04 16 2015 carlson.lin
+ * [MOLY00091769] [GEMINI] Trigger TAU/SR after GEMINI resume
+ * Add iterface (OA Domain)
+ *
+ * 02 23 2015 bob.chiang
+ * [MOLY00096607] Sync C2K CR
+ * .
+ *
+ * 02 13 2015 carlson.lin
+ * [MOLY00091822] RATDM reorganization
+ * RATDM merge LTM, SM and ESM related interface checkin
+ *
+ * 11 12 2014 carlson.lin
+ * [MOLY00084165] [UMOLY][R10][R11] NAS check-in from 6291_DEV to UMOLY Trunk
+ * (Sync from MT6291_DEV upto CL 869855)
+ *
+ * 11 11 2014 carlson.lin
+ * [MOLY00078264] [UMOLY][R10][R11] NAS check-in from CBr to 6291_DEV
+ * Sync MTC CBr to CL 863378
+ *
+ * 10 24 2014 joe.chang
+ * [MOLY00081578] [K2][8430][EMC IT][Assert] esm_session_mng.c line:2602
+ * [ESM] Add msgid for emergency call preference setting
+ *
+ * 10 15 2014 carlson.lin
+ * [MOLY00078264] [UMOLY][R10][R11] NAS check-in from CBr to 6291_DEV
+ * <saved by Perforce>
+ *
+ * 09 10 2014 carlson.lin
+ * [MOLY00078264] [UMOLY][R10][R11] NAS check-in from CBr to 6291_DEV
+ * <saved by Perforce>
+ *
+ * 08 15 2014 roy.lin
+ * [MOLY00075547] [4G Gemini] Gemini Suspend/Resume interface for fast SIM1 UL data resume
+ * [ESM] Add GEMINI suspend/resume related msg id
+ *
+ * 06 04 2014 carlson.lin
+ * [MOLY00067710] [ESM] Sync latest ESM code to TK6291_DEV
+ * <saved by Perforce>
+ *
+ * 02 17 2014 roy.lin
+ * [MOLY00055341] [MP1 Post MP Patch][MT6290E2][LTE attach PDN] UE doesn't perform LTE attach due to TCM cmd conflict
+ * Add EVAL_ESM_EPS_ATTACH_NEEDED_REJ_RSP msg id.
+ *
+ * 01 21 2014 wcpuser_integrator
+ * [MOLY00054475] SGLTE option rename
+ * .
+ *
+ * 01 13 2014 joe.chang
+ * [MOLY00053423] [MT6290_VOLTE] VoLTE development merge back to MOLY
+ * [ESM] MSGID check-in
+ *
+ * 01 13 2014 allen.keh
+ * [MOLY00053328] [MT6290E2][VoLTE] VoLTE development merge back to TRUNK.
+ * 	Add message ids & SAP ids
+ *
+ * 10 18 2013 joe.chang
+ * [MOLY00041595] [MT6290E1][MMDS_DC] MMDC feature patch back to MOLY trunk
+ * [ESM] Merge from MMDC pre-build CBr
+ *
+ * 10 16 2013 joe.chang
+ * [MOLY00041280] [MT6290E1][MMDS_DC][82LTEv1][L+G] esm assert: esm_session_mng.c 460
+ * Check in missing patch for esm_msgid.h
+ *
+ * 07 24 2013 joe.chang
+ * [MOLY00031020] [MMDS_DC] Merge MMDC interface to MOLY
+ * check in esm_msgid.h
+ *
+ * 06 06 2013 chewen.wu
+ * [MOLY00025266] ESM EM support
+ * ESM EM Development.
+ *
+ * 11 07 2012 roy.lin
+ * [MOLY00005322] TATAKA merge to MOLY
+ * Add ESM related interface(msgid, struct, enum).
+ ****************************************************************************/
+
+#ifndef _ESM_SAP_H
+#define _ESM_SAP_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_ESM_CODE_BEGIN )
+/****************************************************************************
+ *                          Destination: ESM (EVAL to ESM)
+ ****************************************************************************/
+// All EVAL MSG_ID has been removed from ESM
+
+/****************************************************************************
+ *                          Destination: ESM (L4C to ESM)
+ ****************************************************************************/
+MSG_ID_ESM_L4C2ESM_BEGIN,
+MSG_ID_L4C_ESM_VDM_IMS_VOICE_STATUS_REQ,
+
+/****************************************************************************
+ *                          Destination: ESM (ETCM to ESM)
+ ****************************************************************************/
+MSG_ID_ESM_TCM2ESM_BEGIN,
+MSG_ID_ESMREG_PDN_CONN_EST_REQ,
+MSG_ID_EVAL_ESM_PDN_CONN_EST_REQ = MSG_ID_ESMREG_PDN_CONN_EST_REQ,
+MSG_ID_ESMREG_BEARER_RSC_ALLOC_REQ,
+MSG_ID_EVAL_ESM_BEARER_RSC_ALLOC_REQ = MSG_ID_ESMREG_BEARER_RSC_ALLOC_REQ,
+MSG_ID_ESMREG_BEARER_RSC_MOD_REQ,
+MSG_ID_EVAL_ESM_BEARER_RSC_MOD_REQ = MSG_ID_ESMREG_BEARER_RSC_MOD_REQ,
+MSG_ID_ESMREG_EPSB_DEACT_REQ,
+MSG_ID_EVAL_ESM_EPSB_DEACT_REQ = MSG_ID_ESMREG_EPSB_DEACT_REQ,
+MSG_ID_ESMREG_PDN_CONN_EST_RSP,
+MSG_ID_EVAL_ESM_PDN_CONN_EST_RSP = MSG_ID_ESMREG_PDN_CONN_EST_RSP,
+MSG_ID_ESMREG_PDN_CONN_UPDATE_RSP,
+MSG_ID_EVAL_ESM_PDN_CONN_UPDATE_RSP = MSG_ID_ESMREG_PDN_CONN_UPDATE_RSP,
+
+/****************************************************************************
+ *                          Destination: ESM (PAM to ESM)
+ ****************************************************************************/
+MSG_ID_ESMREG_DUAL_PRIORITY_CONFIG_REQ,
+MSG_ID_PAM_ESM_AVAILABLE_APN_INFO_REQ,
+MSG_ID_PAM_ESM_IA_APN_CHANGE_REQ,
+
+/****************************************************************************
+ *                          Destination: ESM (EMM to ESM)
+ ****************************************************************************/
+MSG_ID_ESM_EMM2ESM_BEGIN,
+//[6293 re-arch] __RENAME_URGE_TO_EST__
+//MSG_ID_ESM_EMM_URGE_TO_EST_IND,
+MSG_ID_ESM_EMM_ATTACH_NEEDED_GET_ESM_MSG_IND,
+MSG_ID_ESM_EMM_DEREG_IND,
+MSG_ID_ESM_EMM_GET_ESM_CAUSE_IND,
+MSG_ID_ESM_EMM_GET_EPSB_STATUS_IND,
+MSG_ID_ESM_EMM_UPDATE_EPSB_STATUS_IND,
+MSG_ID_ESM_EMM_DATA_SUSPEND_IND,
+MSG_ID_ESM_EMM_DATA_RESUME_IND,
+MSG_ID_ESM_EMM_EPSBEARER_DATA_IND,
+MSG_ID_ESM_EMM_DATA_IND,
+MSG_ID_ESM_EMM_DATA_SEND_IND,
+MSG_ID_ESM_EMM_DATA_CNF,
+MSG_ID_ESM_EMM_CONN_RELEASE_IND,
+MSG_ID_ESM_EMM_REEST_REJ,
+MSG_ID_ESM_EMM_ABORT_CNF,
+MSG_ID_ESM_EMM_QUERY_UL_DATA_STATUS_IND,
+MSG_ID_ESM_EMM_GEMINI_SUSPEND_AND_NO_CELL_IND,
+MSG_ID_ESM_EMM_GEMINI_RESUME_AND_WAIT_CELL_TO_PROCEED_IND,
+MSG_ID_ESM_EMM_AC_BAR_ALLEVIATE_IND,
+
+// Destination: ESM (EMM to ESM) (For MMDC use)
+// Destination: ESM (EMM to ESM) (For IMS use)
+MSG_ID_ESM_EMM_EMC_ATTACH_REJ_IND,
+//[6293 re-arch] __RENAME_URGE_TO_EST__
+//MSG_ID_ESM_EMM_URGE_TO_EMC_EST_IND,
+MSG_ID_ESM_EMM_EMC_DATA_FAIL_IND,
+MSG_ID_ESM_EMM_ENTER_EMC_ATTACH_IND,
+MSG_ID_ESM_EMM_STOP_T3396_IND,
+
+/************ (EMM -> ESM: For VzW usage) ************/
+MSG_ID_ESM_EMM_T3402_STOP_IND,  // __VZW__ __VZW_3__
+MSG_ID_ESM_EMM_STOP_PDN_THROTT_TIMER_IND, // __VZW__ __VZW_10__
+MSG_ID_ESM_EMM_CELL_INFO_IND,  // __VZW__ __VZW_4__
+
+/************ (EMM -> ESM: For AT&T usage) ************/
+MSG_ID_ESM_EMM_T3402_CHANGE_IND, // __ATnT__
+MSG_ID_ESM_EMM_IMS_REG_STATUS_UPDATE_IND, // __ATnT__ WIFI calling
+
+
+MSG_ID_ESM_ESM_DATA_CNF, // __5G_iRAT__, Equivalent to ESM_EMM_DATA_CNF, send back to ESM itself when receiving ESM_EMM_DATA_CNF(success) for a EPSB for the 1st time.
+
+/****************************************************************************
+ *                          Destination: ESM (LTM/RATDM to ESM)
+ ****************************************************************************/
+/* RATDM -> ESM */
+MSG_ID_ESM_RATDM2ESM_BEGIN,
+MSG_ID_ESM_LTM2ESM_BEGIN = MSG_ID_ESM_RATDM2ESM_BEGIN,
+MSG_ID_ESM_RATDM_IDLE_LEAVE_IND,
+MSG_ID_ESM_LTM_IDLE_LEAVE_IND = MSG_ID_ESM_RATDM_IDLE_LEAVE_IND,
+MSG_ID_ESM_RATDM_QUERY_UL_DATA_STATUS_CNF,
+MSG_ID_ESM_LTM_QUERY_UL_DATA_STATUS_CNF = MSG_ID_ESM_RATDM_QUERY_UL_DATA_STATUS_CNF,
+
+
+/****************************************************************************
+ *                          Destination: ESM (SM to ESM)
+ ****************************************************************************/
+MSG_ID_ESM_SM2ESM_BEGIN,
+MSG_ID_SM_ESM_IRAT_INFO_TRANSFER_REQ,
+MSG_ID_ESM_SM_IRAT_INFO_TRANSFER_CNF,
+
+
+/****************************************************************************
+ *                          Destination: ESM (VGSM to ESM)
+ ****************************************************************************/
+/* VGSM -> ESM */
+MSG_ID_VGSM_ESM_CONTEXT_TRANSFER_REQ_NTF,
+
+
+/****************************************************************************
+ *                          Destination: ESM (ESM internal use)
+ ****************************************************************************/
+MSG_ID_ESM_MOD_GLOBAL_VAR_REQ,
+MSG_ID_ESM_STATUS_REPORT_IND,
+MSG_ID_ESM_STATUS_REPORT_RSP,
+MSG_ID_ESM_SET_EMC_DOMAIN_PREFERENCE_REQ,
+MSG_ID_ESM_UT_TIMER_EXPIRY_IMMEDIATELY,
+
+MSG_ID_ESM_UT_CALL_MOD_API,
+MSG_ID_ESM_UT_SET_FAKE_SMIC_CONTEXT, // Set context for fake SMIC API
+
+/****************************************************************************
+ *                          Destination: ESM (For EM use)
+ ****************************************************************************/
+
+MSG_ID_ESM_ENABLE_EM_INFO_IND_REQ,
+
+/****************************************************************************
+ *                          Destination: NIL (For ESM UT Checking GV use)
+ ****************************************************************************/
+
+MSG_ID_ESM_EPSBC_CHECK_GV,
+
+MSG_ID_ESM_PT_CHECK_GV,
+
+MSG_ID_ESM_DPC_CHECK_GV,
+MSG_ID_ESM_DPC_CHECK_CERTAIN_EBI_DRB_GV,
+
+MSG_ID_ESM_IMS_CHECK_GV,
+
+MSG_ID_ESM_RAT_CHECK_GV,
+
+MSG_ID_ESM_MISC_CHECK_GV,
+
+MSG_ID_ESM_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REJECT_CHECK_GV,
+MSG_ID_ESM_ACTIVATE_DEDICATED_EPS_BEARER_CONTEXT_REJECT_CHECK_GV,
+MSG_ID_ESM_PDN_CONNECTIVITY_REQUEST_CHECK_GV,
+MSG_ID_ESM_PDN_DISCONNECT_REQUEST_CHECK_GV,
+MSG_ID_ESM_BEARER_RESOURCE_ALLOCATION_REQUEST_CHECK_GV,
+MSG_ID_ESM_BEARER_RESOURCE_MODIFICATION_REQUEST_CHECK_GV,
+MSG_ID_ESM_ESM_INFORMATION_RESPONSE_CHECK_GV,
+
+/****************************************************************************
+ *                          Destination: DHL (ESM ELT Log Debug Message)
+ ****************************************************************************/
+
+MSG_ID_ESM_LOG_ESM_EVENT_ERR_STS, // for logging NW Air Message: esm_event_err_sts_struct
+MSG_ID_ESM_LOG_ESM_EVENT_ESM_MSG, // for logging NW Air Message: esm_event_esm_msg_struct
+MSG_ID_ESM_LOG_TFT_INFO,
+MSG_ID_ESM_LOG_TCMESM_PCO,
+MSG_ID_ESM_LOG_ICD_ESM_INFO,
+MSG_ID_ESM_LOG_5G_CONFIG_OPTION_LIST,
+MSG_ID_ESM_LOG_ARGS_OF_SMIC_API, // for loggin in/out args to SMIC API call
+MSG_ID_ESM_LOG_PUBLIC_API_5G4_PRECHECK, // for logging the output of esm_public_api_for_smic_5g4_precheck
+MSG_ID_ESM_LOG_ICD_ESM_TIMER_START,
+MSG_ID_ESM_LOG_ICD_ESM_TIMER_EXPIRY,
+MSG_ID_ESM_LOG_ICD_ESM_FAILURE_EVENT_CAUSE,
+MSG_ID_ESM_LOG_ICD_ESM_OTA_EVENT,
+MSG_ID_ESM_CODE_END,
+
+MODULE_MSG_END( MSG_ID_ESM_CODE_TAIL )
+
+#endif
diff --git a/mcu/interface/sap/md/etc_msgid.h b/mcu/interface/sap/md/etc_msgid.h
new file mode 100644
index 0000000..46e1c83
--- /dev/null
+++ b/mcu/interface/sap/md/etc_msgid.h
@@ -0,0 +1,151 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   etc_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   LTE ETC (evolved test control) related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 08 14 2020 jerry-kirk.yang
+ * [MOLY00546671] [SCI][CMCC][Anritsu IoDT][MT6875][Margaux][MBJ][PCT][SA][N41][9.1.5.1.3a]5GMM_Deregistion_request¥¼¤U?
+ * [R3.MP][SWRD] MSG_ID for NSSAI delete function.
+ *
+ * 06 12 2019 jerry-kirk.yang
+ * [MOLY00408311] [MT6297][PCT IODT][SA FullStack][StarPoint][PCT 7.1.2.2.1] unknown message
+ * 	
+ * 	[ETC][VGMM] Add ETC handling - SWRD part.
+ *
+ * 06 05 2019 jerry-kirk.yang
+ * [MOLY00408311] [MT6297][PCT IODT][SA FullStack][StarPoint][PCT 7.1.2.2.1] unknown message
+ * 	
+ * 	[ETC][VGMM] Add ETC handling - SWRD part.
+ *
+ * 01 07 2019 esko.oikarinen
+ * [MOLY00311681] [6297][NRRC] MAIN module changes
+ * 	NR domain part for test loop ETC-NRRC IF changes
+ *
+ * 03 09 2015 yc.chen
+ * [MOLY00098177] [6291] MDT check in to UMOLY TRUNK
+ *
+ * 11 10 2014 yc.chen
+ * [MOLY00074510] [ETC] mode B and mode C revise
+ *
+ * 03 28 2014 jinghan.wang
+ * [MOLY00060988] [LPP CP] LPP code check-in for A-GNSS and eCID feature
+ * Check in LPP CP interfaces & capability for EMM (OA domain)
+ ****************************************************************************/
+
+#ifndef _ETC_MSGID_H
+#define _ETC_MSGID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_ETC_CODE_BEGIN )
+/****************************************************************************
+ *                          Destination: ETC (UPCM to ETC) 
+ ****************************************************************************/
+MSG_ID_ETC_UPCM_TESTMODE_CNF              = MSG_ID_ETC_CODE_BEGIN,
+MSG_ID_ETC_UPCM_TESTLOOP_CNF,
+
+/****************************************************************************
+ *                          Destination: UPCM (ETC to UPCM) 
+ ****************************************************************************/
+MSG_ID_ETC_UPCM_TESTMODE_REQ,
+MSG_ID_ETC_UPCM_TESTLOOP_REQ,
+
+
+/****************************************************************************
+ *                          Destination: ETC (EMM to ETC) 
+ ****************************************************************************/
+MSG_ID_ETC_EMM_TESTMODE_CNF,
+MSG_ID_ETC_EMM_TESTLOOP_CNF,
+MSG_ID_ETC_EMM_MBMS_PACKET_COUNTER_CNF,
+MSG_ID_ETC_EMM_DATA_IND,
+MSG_ID_ETC_EMM_DETACH_IND,
+MSG_ID_ETC_EMM_RELEASE_IND,
+
+
+/****************************************************************************
+ *                          Destination: EMM (ETC to EMM) 
+ ****************************************************************************/
+MSG_ID_ETC_EMM_TESTMODE_REQ,
+MSG_ID_ETC_EMM_TESTLOOP_REQ,
+MSG_ID_ETC_EMM_MBMS_PACKET_COUNTER_REQ,
+MSG_ID_ETC_EMM_DATA_REQ,
+MSG_ID_ETC_EMM_NW_RESET_UE_STORED_POS_INFO_IND, // for LPP
+MSG_ID_ETC_EMM_UPDATE_UE_LOCATION_INFORMATION_REQ,
+
+/****************************************************************************
+ *                          Destination: ETC (VGMM to ETC) 
+ ****************************************************************************/
+//MSG_ID_ETC_VGMM_TESTMODE_CNF,
+//MSG_ID_ETC_VGMM_TESTLOOP_CNF,
+MSG_ID_ETC_VGMM_DATA_IND,
+MSG_ID_ETC_VGMM_DETACH_IND,
+MSG_ID_ETC_VGMM_RELEASE_IND,
+
+/****************************************************************************
+ *                          Destination: EMM (ETC to VGMM) 
+ ****************************************************************************/
+//MSG_ID_ETC_VGMM_TESTMODE_REQ,
+//MSG_ID_ETC_VGMM_TESTLOOP_REQ,
+MSG_ID_ETC_VGMM_DATA_REQ,
+MSG_ID_ETC_VGMM_NSSAI_DELETE_REQ,
+
+/****************************************************************************
+ *                          Destination: ETC (NRRC to ETC) 
+ ****************************************************************************/
+MSG_ID_ETC_NRRC_TESTLOOP_CNF,
+
+MSG_ID_ETC_CODE_END,
+
+MODULE_MSG_END( MSG_ID_ETC_CODE_TAIL )
+
+#endif 
diff --git a/mcu/interface/sap/md/eval_msgid.h b/mcu/interface/sap/md/eval_msgid.h
new file mode 100644
index 0000000..7056559
--- /dev/null
+++ b/mcu/interface/sap/md/eval_msgid.h
@@ -0,0 +1,1055 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   eval_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   LTE NAS EVAL (EVNAS Adaptation Layer) related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 12 16 2021 rahamtulla.mulla
+ * [MOLY00774161] [mt2735][CS eCall][NG eCall][patch back] ecall patch back from NR15.R3.MD700.MP.ECAll.DEV
+ * MD700.MP
+ *
+ * 03 17 2021 sw.yeh
+ * [MOLY00585299] FT:LA:MX:2:F:N1:N1 - MUT is not receiving the commands via OTA
+ * 	
+ * 	MT_SMS_OVER_IMS_STATUS_REQ(interface).
+ *
+ * 03 11 2021 sw.yeh
+ * [MOLY00585299] FT:LA:MX:2:F:N1:N1 - MUT is not receiving the commands via OTA
+ * 	
+ * 	MT_SMS_OVER_IMS_STATUS_REQ(interface).
+ *
+ * 10 22 2020 chengyu.chen
+ * [MOLY00582161] EMMàD?DDM??internet PDN for garbage paging feature
+ * 	[OA] EMM garbage paging
+ *
+ * 10 21 2020 chi-lun.wu
+ * [MOLY00531571] [self]503±¼???«ù?ɬ¤Æ
+ *
+ * 09 18 2020 chengyu.chen
+ * [MOLY00570287] [Gen97] VzW T_VzW and T_eps_fallback timer Implementation
+ * [NR15.R3.MP][In TC10 Vlist][Out of T700 Vlist]
+ *
+ * 	
+ * 	EWSP0000213264
+ *
+ * 	Report DL256QAM and MIMO 4x4 information to upper layer for icon display
+ *
+ * 01 15 2021 sw.yeh
+ * [MOLY00585299] FT:LA:MX:2:F:N1:N1 - MUT is not receiving the commands via OTA
+ * 	
+ * 	MT_SMS_OVER_IMS_STATUS_REQ(interface) for PRECHECKINDEV
+ *
+ * 10 22 2020 chengyu.chen
+ * [MOLY00582161] EMMàD?DDM??internet PDN for garbage paging feature
+ * [OA] EMM Garbage Paging
+ *
+ * 07 30 2020 chengyu.chen
+ * [MOLY00545502] [MT6853][Mouton][MP6][R3][Q0][SQC][China][Shanghai][CU FT][NSA][MDST][SWIFT]mtkrild:AT command pending too long. assert!!! AT cmd: EPSCONFIG
+ * [OA][EMM] Handle pending event as NWSEL discard the receibed cell info from EMM
+ *
+ * 05 19 2020 chengyu.chen
+ * [MOLY00524216] [Gen97][VZW][E2E] Code sync request from Gen93 to Gen97
+ * [OA][SIPCI CBr][R3.MP] ECBM re-arch on Gen97
+ *
+ * 05 07 2020 stanley.su
+ * [MOLY00511199] (VMOLY)[A21 NA][MTK] Please implement the feature for IPC_NET_NETWORK_SCAN
+ * [CODE SYNC]IPC_NET_NETWORK_SCAN (SWRD, NR15.R3.MP)
+ *
+ * 03 16 2020 ming.shen
+ * [MOLY00504146] [5G-A][5G Modem·sfeature]ɬ¤Æ5G±µ¤J±±¨î
+ * 	
+ * 	- CEL
+ *
+ * 02 24 2020 rex.li
+ * [MOLY00500160] [ontim][Moto][M3901-P][bug][EKBALI-1951]Orange SK:DUT fall backs to 3G when registered onto VoWiFI, cannot recover to 4G
+ * Sync MOLY00434902
+ *
+ * 02 07 2020 chengyu.chen
+ * [MOLY00486860] 2752924¡G¡i19165¡j¡i?¥~³¡?¥Î¡j¡i??¥ý?¡j¡i²Ä¤T¤è¡j¡i²y²y¤j§@?¡j²y²y¤j§@?´å??µ{¤¤¡A¥X?­«·s?±µ
+ * [OA][Feature Extension] Local release RRC connection by DL data type
+ * 	1. Delete code related to SBP_EMM_NO_DL_DATA_RELEASE_PAGING_SEMAPHORE (Release RRC connection directly after DRB is established but haven't received any DL data for 100ms)
+ * 	2. Apply "Local Release RRC connection by DL data type" to MSPM_EMM_TAU_DRB
+ * 	3. Compile some duplicate code, merge them into  a common function
+ * 	4. Rename the original structure of the feature (Local release RRC connection by DL data type), make it a common function to request UPCM whenever DRB is established and the connection should be released ASAP
+ * 	5. Due to VC guard timer is set as 15 seconds in Gen97, skip additional check designed for the case regarding VC guard timer as 3s
+ *
+ * 01 20 2020 chengyu.chen
+ * [MOLY00474623] [VMOLY][Huawei][M&J][MT6765/MT6761]?¤_¥D?¤W?©R¥OAT+EACMTªº?®i»Ý¨D
+ * [Huawei Patch to VMOLY][OA] ALPS04223696
+ *
+ * 12 06 2019 chun-yu.chien
+ * [MOLY00464222] OSTD function location of callee in L4B fixed
+ * 	
+ * 	[Code Sync][AT+ECACOMB] complete the design from L4 to ERRC - interface
+ *
+ * 12 05 2019 youru.chen
+ * [MOLY00462646] [Gen97][Code Sync] LG code sync from VMOLY.1001.DEV to VMOLY.TRUNK
+ * [OA]fix build error
+ *
+ * 12 05 2019 youru.chen
+ * [MOLY00462646] [Gen97][Code Sync] LG code sync from VMOLY.1001.DEV to VMOLY.TRUNK
+ * [OA]porting CL 8473571 :[MOLY00414581] [EMM part][GATING][MT6771][Sylvia][P0][R3][IOT][Japan][KDDI][VoWiFi][Pre-Test][ST-22.2] UE shall not do INITIAL ATTACH of IMS on LTE while IMS registered on WiFi
+ *
+ * 12 05 2019 chengyu.chen
+ * [MOLY00446861] [Gen97][Code Sync] [B190414-819]¤ýªÌ?Ä£´å??µ{¥d?¡AÊI?©µ?450 (?±`¥X?¡A©Î?¤é¦h¦¸Î`?) According to data type to release HPS for paging
+ *
+ * 12 03 2019 chengyu.chen
+ * [MOLY00456600] [Gen97] NR Map Feature
+ * [EMM][OA] PLMN_SEARCH_IND message routing re-arch
+ *
+ * 09 06 2019 chengyu.chen
+ * [MOLY00438427] [Gen97][US_DEV][TMO][2019Q2] TMOUS_2019Q2_GID-MTRREQ-245903
+ * [OA][TMO] 80006659, 8006537, 9127044
+ *
+ * 07 29 2019 chun-yu.chien
+ * [MOLY00424591] [Code Sync][INTERFACE][US_DEV][TMO][2019Q2] TMOUS_2019Q2_GID-MTRREQ-245903
+ *
+ * 07 25 2019 youru.chen
+ * [MOLY00423200] [VMOLY][D2/L4/NAS] Gen93/Gen95 CR sync to Gen97
+ * [OA][VMOLY][CodeSync] IAAPN: MOLY00371641(CL:6977856, 6977858)
+ * 	8738050,8736639,8736398,8737866,8736637,8737099,8736554,8736437,8736743,8736719
+ *
+ * 07 24 2019 norman.chang
+ * [MOLY00424396] [CODE SYNC] ?ªA?¤U¥\¯Óɬ¤Æ¤§·jÊIµ¦²¤
+ * .
+ *
+ * 07 24 2019 keith.xu
+ * [MOLY00423197] [Gen97][Header Part]Resume data service asap after peer SIM has received MT SMS
+ * [MOLY00423196] [Gen97][Interface Part]Resume data service asap after peer SIM has received MT SMS
+ *
+ * 12 14 2018 kay.lin
+ * [MOLY00371641] [Gen95][Re-arch] IAAPN change flow - header part
+ * 	
+ * 	.EVAL msg id
+ *
+ * 02 18 2019 mike.lu
+ * [MOLY00365007] [Gen97][NWSIM][4G][TC_6_2_2_5] [KAL][UE] Assert fail: protocol/lte_sec/enas/esm/esm_event_mng.c 595 - NAS
+ * 	
+ * 	[Relay VDM Voice Status Req].
+ *
+ * 10 24 2018 chinte.chen
+ * [MOLY00360557] [VMOLY][CODE_SYNC] UMOLY code sync to VMOLY
+ * .
+ *
+ * 10 24 2018 chinte.chen
+ * [MOLY00360557] [VMOLY][CODE_SYNC] UMOLY code sync to VMOLY
+ * .
+ *
+ * 08 17 2018 james-chi-ju.chang
+ * [MOLY00306148] [NAS] pangu giant CR
+ * interface
+ *
+ * 06 21 2018 kuan-hua.lin
+ * [MOLY00333953] [Gen93][MP3][RD IT][VSIM 3.0] Modem EE after rsim enables (errc_conn_main)
+ * 	
+ * 	[AKA SIM for L+L] Add msgid.
+ *
+ * 06 21 2018 kuan-hua.lin
+ * [MOLY00333953] [Gen93][MP3][RD IT][VSIM 3.0] Modem EE after rsim enables (errc_conn_main)
+ * 	
+ * 	[AKA SIM for L+L] Add msgid.
+ *
+ * 06 14 2018 zanya.peng
+ * [MOLY00331933] [LR13.R0][Telephony PPM][Merlot][TC163]T1: network registration time is worse than ref phone and not stable
+ * 	
+ * 	.
+ *
+ * 06 11 2018 otto.liu
+ * [MOLY00316147] [UMOLYE] RCM patch sync
+ * 	
+ * 	.
+ *
+ * 06 01 2018 prasad.hugar
+ * [MOLY00330321] [CODE SYNC] [CV7A SPR][Protocol] API for controlling LTE TDD/FDD TM9 separately.
+ * New AT command to enable/disable the TDD/FDD TM9 separately.
+ *
+ * 03 28 2018 kelly.lo
+ * [MOLY00316571] [95 feature] non-3gpp NW policies
+ * 	
+ * 	interface
+ *
+ * 01 16 2018 ian-yw.chen
+ * [MOLY00302109] [MT6763][Bianco][N1][India FT][Chennai][WW FT][RCOM][TATA DOCOMO][TC_MTK_P1_4G_Gemini_13] [MP1.5] DUT long SMS to sim2 fails (common interface part)
+ *  SMS/EVAL
+ *
+ * 01 04 2018 zanya.peng
+ * [MOLY00298830] [MT6763][R3]implement backoff-time report for T3396 & T3346
+ * 	
+ * 	.
+ *
+ * 12 11 2017 morton.lin
+ * [MOLY00295077] [Gen93][ERRC][RCM] LTE support band and CA combination customization re-arch
+ * Common IF and MRS part (LR12A.R3.MP) (Not in V-List)
+ *
+ * 12 01 2017 po-hung.lin
+ * [MOLY00292291] [LR12A.R3.MP] Change IMEISV during RF OFF state
+ * relay IMEISV to EMM/MM
+ *
+ * 11 29 2017 lucien.li
+ * [MOLY00290361] 203604 i??ii??~??i??Oi??ji??i???i??Gi??d1i??i???4Gi??Bi??d2?i??H4Gi??n??i??d2?i??ui??ni??i??i?A¢Gi??i????i??{i??i??[L4C][.src]
+ * [R3][L4C] AT+EMRO - gaming optimization
+ *
+ * 11 28 2017 chien-li.chou
+ * [MOLY00292082] [Gen93][TMO] 2G disable with ecc enable
+ * Dummy check-in for auto-sync
+ *
+ * 11 28 2017 chien-li.chou
+ * [MOLY00292082] [Gen93][TMO] 2G disable with ecc enable
+ * 2G disable (NWSEL interface and SBP part)
+ *
+ * 11 28 2017 zanya.peng
+ * [MOLY00287971] RB test mode_ETC part
+ * 	
+ * 	.
+ *
+ * 11 21 2017 kuan-wei.chen
+ * [MOLY00289580] [L4-EVAL interface] extend AT+EIREG:...,<ims_rat> extend AT+EVIVS:...,<rat>
+ * [LR12A.R3.MP]
+ * 	L4-EVAL msgid and structure:
+ * 	extend AT+EIREG:...,<ims_rat>
+ * 	extend AT+EVIVS:...,<rat>
+ *
+ * 11 16 2017 kuan-hua.lin
+ * [MOLY00289945] [LR12A.R2.MP] L+L New Feature: Occupy HPS for IMS RE-REG (EMM-Common interface)
+ * 	
+ * 	EVAL/EMM msg id.
+ *
+ * 11 06 2017 harry.chang
+ * [MOLY00287761] [CDMA-less][Gen92] Sniff feature change for ERRC_CEL
+ * .
+ *
+ * 11 02 2017 morning.lee
+ * [MOLY00286282] [Gen93][Network Search+CDMA-less+plmn-loss Optimization] Code merge from LR12 to LR12A.R3
+ * 	
+ * 	.
+ *
+ * 08 29 2017 harry.chang
+ * [MOLY00274167] [Copy MOLY00262171][CDMA-less][LR12] main CR
+ * NWSEL part
+ *
+ * 08 24 2017 kelly.lo
+ * [MOLY00273395] [Bianco][N1][MTK FT][SRLTE][CT 6M C][SH][Random]APN protocol changing issue(TRUNK & R2)
+ * 	
+ * 	ia_apn_change (interface) (OA)
+ *
+ * 08 17 2017 morning.lee
+ * [MOLY00271227] [UMOLYA] [Rose][Vinson][N1]The ECC call will can't be dial out success.(5/5)
+ * 	
+ * 	.
+ *
+ * 07 03 2017 morning.lee
+ * [MOLY00261208] [Copy MOLY00200593]Multiple-PS MP5
+ * 	
+ * 	.
+ *
+ * 06 27 2017 morning.lee
+ * [MOLY00259599] [Copy MOLY00195196]cause #18 from EMM to change UE mode first
+ * 	
+ * 	.
+ *
+ * 04 26 2017 morning.lee
+ * [MOLY00245171] [Copy MOLY00224343]VOLTEi??Ui??Qi??si??i???i??i??GSMi??Z?i??i??E?i??Ai??i???i??^4G??i??i??HD??i??Ai??u??i??U?Si??i??
+ * 	
+ * 	.
+ *
+ * 04 05 2017 morning.lee
+ * [MOLY00210986] [6293] Merge back from UMOLY to UMOLYA
+ * 	
+ * 	.
+ *
+ * 04 05 2017 hong.yu
+ * [MOLY00239308] [Gen93] L4 M3 check in
+ * merge L4BNW and L4BPWR M3
+ *
+ * 04 05 2017 allen.keh
+ * [MOLY00195775] [MT6293] [ENAS] feature & re-arch development
+ * 	
+ * 	.add C2K related message ids
+ *
+ * 03 27 2017 allen.keh
+ * [MOLY00195775] [MT6293] [ENAS] feature & re-arch development
+ * 	
+ * 	.add R-SIM message ids
+ *
+ * 02 21 2017 kelly.lo
+ * [MOLY00203953] [MT6293][EMM] check-in UMOLYA
+ * 	
+ * 	remove unused emm msg (OA part)
+ *
+ * 02 13 2017 morning.lee
+ * [MOLY00228924] [copy MOLY00224596][LR12][CMCC]Keeping IMS registered state for MT CSFB
+ * 	
+ * 	.
+ *
+ * 02 09 2017 morning.lee
+ * [MOLY00228375] [copy MOLY00220113][6292][Gemini][LG+WG] SBP_CSFB_DUPLEX_CHG_FOR_LG_MODE / SBP_DUPLEX_MODE_CHG_AFTER_CSFB / AT+ETWMODE -EVAL part
+ * 	
+ * 	.
+ *
+ * 01 05 2017 zanya.peng
+ * [MOLY00205094] [MT6293] [ENAS] UMOLYA.PS.DEV merge to UMOLYA.TRUNK ([EVALIF] add IMS SCM INFO CNF)
+ * 	
+ * 	.
+ *
+ * 11 11 2016 danny.kuo
+ * [MOLY00212922] New Feature UL64QAM switcher
+ * .
+ *
+ * 11 03 2016 danny.kuo
+ * [MOLY00193300] Porting of NW BAND Info from LR9 to LR11 TC01
+ * .
+ *
+ * 11 03 2016 danny.kuo
+ * 	
+ * 	.
+ *
+ * [MOLY00159801] [K7] Request the URC for reporting the rrc connection establishment failure
+ * 	
+ * 	.
+ *
+ * 11 03 2016 danny.kuo
+ * .check-in for MOLY00093206
+ *
+ * 10 18 2016 benjamin.kuo
+ * [MOLY00205591] [6293][EVAL] development
+ * sync for MOLY00193865.
+ *
+ *
+ * 09 26 2016 joe.chang
+ * [MOLY00205244] [6293] PS.DEV merge back to UMOLYA trunk
+ * msgid part
+ *
+ * 09 26 2016 sh.yeh
+ * [MOLY00205082] EMM_REG merge from UMOLYA-PS-DEV to UMOLYA
+ * .
+ *
+ * 09 26 2016 allen.keh
+ * [MOLY00204967] [MT6293] [ENAS] UMOLYA.PS.DEV merge to UMOLYA.TRUNK
+ * .PS.DEV merge OA domain
+ *
+ * 07 27 2016 allen.keh
+ * [MOLY00193617] [MT6293] [ENAS] CBr merge to UMOLYA.PS.DEV
+ * .CBr merge to UMOLYA.PS.DEV (OA domain)
+ * 08 22 2016 shih-che.chou
+ * [MOLY00187953] AT+ECMSID=<n> to clear GUTI/P-TMSI
+ * .
+ *
+ * 07 26 2016 joe.chang
+ * [MOLY00193429] [UMOLYA] 93 CBr patch back to PS.DEV
+ * Merge EVAL and EMM msgid
+ *
+ * 07 25 2016 sh.yeh
+ * [MOLY00191864] [UMOLA PS DEV] EMM_REG merge from UMOLY
+ * .merge from PSD5 CBr to DEV, emm and eval message id, add wait_emc_pdn_status in update_eplmn_struct
+ *
+ * 07 19 2016 sh.yeh
+ * [MOLY00191864] [UMOLA PS DEV] EMM_REG merge from UMOLY
+ * .sync MOLY183559 CL2526832, up to #53 version by UMOLY
+ *
+ * 06 24 2016 zanya.peng
+ * [MOLY00185907] [MT6293] [ENAS] UMOLY merge to UMOLYA
+ * 	
+ * 	.
+ *
+ * 06 14 2016 ivy.wang
+ * [MOLY00165236] [PH1_VZW][FLD][Radio_Protocol] VZ_REQ_LTEDATA_37821 Autonomous Gaps
+ * .
+ *
+ * 06 08 2016 bart.liang
+ * [MOLY00169240] [PH1_VZW][Radio_Protocol][UNSOL] LTE NETWORK INFORMATION
+ *
+ * 05 27 2016 jerry-yh.chang
+ * [MOLY00170799] [PH1_VZW][joint-camp][Radio_Protocol][hVoLTE] TC 2.2.9.3 fail: at step13, TAU timeout
+ * OA domain Interface check in
+ *
+ * 05 17 2016 mark.ng
+ * [MOLY00179023] Allowable Registration Area List Feature V2 Check In
+ * ARAL 2.0 interface
+ *
+ * 04 26 2016 sherry.kuo
+ * [MOLY00175925] sync LR11 to UMOLY
+ * .
+ *
+ * 04 26 2016 tim.huang
+ * [MOLY00167450] [PH1_VZW][joint-camp][Radio][hVoLTE][Blocking] TC 2.1.10.2 - At step5, in the TAU Request message, there is not "UE radio capability information update needed" field
+ * .
+ *
+ * 04 26 2016 ming.shen
+ * [MOLY00150211] [VzW][VZ_REQ_LTEMMO_38695] LTE Scanning Enhancement
+ * .
+ *
+ * 03 09 2016 sabrina.hsu
+ * [MOLY00155801] [CA] Enable/Disable CA by AT+ECASW (ERRC)
+ * merge UMOLY version
+ *
+ * 03 03 2016 jerry-yh.chang
+ * [EMM] merge MOLY00152757 and MOLY00152764 (non-LTE)
+ *
+ * 02 15 2016 kun-lin.wu
+ * [MOLY00144901] [ERRC] bCSFB feature check-in for TMO-US
+ *
+ * 01 25 2016 yc.chen
+ * [MOLY00146327] [VzW] hVoLTE implementation (non-LTE)
+ *
+ * 01 13 2016 hong.yu
+ * [MOLY00156229] [MT6292] Code sync from MT6291: AuDRX
+ * [EVAL] patch MOLY00097750 to UMOLY
+ *
+ * 12 11 2015 mika.kaikkonen
+ * [MOLY00145451] [R12][CR1962] Handling of SCM at NAS layer - EVAL - EMM interface MSG IDs
+ *
+ * 11 23 2015 jerry-yh.chang
+ * [MOLY00150096] [Jade-M][Spirent][IR]TC-LTEIRLAB-DCMP-09003 FAIL
+ * Add handling for GLOBAL_MODE_CHANGE_START_REQ(interface check in OA domain)
+ *
+ * 11 17 2015 yc.chen
+ * [MOLY00149445] [UMOLY] Sync DoCoMo MOLY CR to related branch (MOLY00123677)(non-LTE)
+ *
+ * 10 26 2015 yingfui.hung
+ * [MOLY00141134] [Copy CR][Porting to LR11][TMO][IMS] bCSFB - L4 ERLQ, ERLM changes (without switch)
+ * 	
+ * 	.
+ *
+ * 10 19 2015 yc.chen
+ * [MOLY00145708] [Jade-L][SRLTE][CT OM 6M][LTE IOT][FT][SH][ALU][Random]?Y|b3GUAX??PSMCS??
+ * 	.
+ *
+ * 10 08 2015 allen.hsu
+ * [MOLY00133440] [ERRC][RCM]Configurable CA combination
+ * add LTE CA band settings feature related interface.
+ *
+ * 10 07 2015 yc.chen
+ * [MOLY00141417] [Jade-L][SRLTE][LTE IOT][FT][SH][ZTE][random]mHZ? EE,0,0,99,/data/core/,1,modem,md1
+ * 	.
+ *
+ * 10 07 2015 doug.shih
+ * [MOLY00144181] [ERRC][SPV] LR11 build warning scan and fix (also legacy C2K code cleanup)
+ * [CEL] phase out early OOS ind for SVLTE (OA domain).
+ *
+ * 10 05 2015 panu.peisa
+ * [MOLY00142657] [VzW][VZ_REQ_e911_30203] RAL and MRU cell band info update implementation to 6291
+ * 	Integrated CLs 1690397 and 1690428 from LR11_VzW.
+ *
+ * 10 02 2015 panu.peisa
+ * [MOLY00141224] [VzW][VZ_REQ_LTEDATA_6800] UE specific DRX setting
+ * 	Integrated CL 1669033 from LR11_VzW CBr.
+ *
+ * 10 02 2015 hong.yu
+ * [MOLY00139482] [VzW] [VZ_REQ_LTEDATA_6800] Dynamic UE specific DRX setting
+ * [VzW] UE specific DRX
+ *
+ * 09 30 2015 marko.akselin
+ * [MOLY00142657][VzW][VZ_REQ_e911_30203] Add new message IDs for RAL and MRU cell band info updating into EMM - EVAL - NWSEL interfaces.
+ * 	.
+ *
+ * 09 25 2015 james-chi-ju.chang
+ * [MOLY00143156] [MT6755][E1][GCF][Anite][3G][FDD][CSG][6.3.1.1] Test Fail
+ * .
+ *
+ * 09 22 2015 teemu.partanen
+ * [VZ_REQ_LTEDATA_6800] UE Specific DRX setting. SWRD part.
+ *
+ * 08 27 2015 bob.chiang
+ * [MOLY00138281] [EMM] Sync MOLY CR to 2015/08/20
+ * : CONN - MOLY00129803
+ *
+ * 08 27 2015 bob.chiang
+ * [MOLY00139385] [JADE][SRLTE][inHouseIT][Lab Spirent][TC-LTEIRLAB-SCMP-03006] Moible failed to registered in gsm network!
+ * : REG/EVAL - inform NWSEL when SIM removal handling is completed
+ *
+ * 07 20 2015 allen.keh
+ * [MOLY00129803] [Denali][ATT][VoLTE][Anritsu CAT] TC LTE-BTR-1-8220 (-8248) On a voice call the Detach procedure after the ISIM refresh should only be started when returned to Idle state
+ * .add MSG_ID_EVAL_EMM_CONNECTION_INFO_IND
+ *
+ * 07 18 2015 cooper.lin
+ * [MOLY00090532] [MT6291] Change Feature Check-in
+ * Uplink Data Shaping
+ *
+ * 07 17 2015 shih-che.chou
+ * [MOLY00129720] [VzW][Merge to UMOLY] Porting RAC part from MOLY to UMOLY
+ * .
+ *
+ * 07 03 2015 tim.huang
+ * [MOLY00125845] [JADE] SRLTE related design
+ * .
+ *
+ * 06 18 2015 jerry-yh.chang
+ * [MOLY00122048] [6795] Request new feature to improve registration time of roaming case
+ * .
+ *
+ * 06 18 2015 panu.peisa
+ * [MOLY00122487] EMM, ESM & PAM module VzW feature porting from 6290 to 6291
+ * 	SWRD part, change have dependency to LTE_SEC parts.
+ *
+ * 06 16 2015 tim.huang
+ * [MOLY00083439] [MUSE] IMS Development for requirment 1-15 - get the information of MO Data Barring and SSAC barring
+ * .
+ *
+ * 06 16 2015 kuan-wei.chen
+ * [MOLY00115378] SS code revise
+ * merge from MOLY to UMOLY
+ *
+ * 06 10 2015 teemu.partanen
+ * [VZ_REQ_LTEDATARETRY_7733] Throttling timer related new message identifiers, enumerations and structures for EMM - NWSEL communication
+ *
+ * 05 29 2015 ye.yuan
+ * [MOLY00116932] [UMOLY] [NAS]compile option modify
+ * .
+ *
+ * 05 29 2015 shih-che.chou
+ * [MOLY00117190] PLMN List in CONNECTED Mode
+ * RAC part
+ *
+ * 05 29 2015 kun-lin.wu
+ * [MOLY00117190] PLMN List in CONNECTED Mode
+ *
+ * 05 29 2015 kun-lin.wu
+ * [MOLY00115617] [6291] Dynamic SIM switch without modem reset
+ *
+ * 05 26 2015 chun-fan.tsai
+ * [MOLY00097098] [6291][CONN] Code Sync from MOLY to UMOLY
+ * MOLY00097502
+ *
+ * 05 07 2015 cooper.lin
+ * [MOLY00090532] [MT6291] Change Feature Check-in
+ * Report CA Info to support 4G Plus Icon
+ *
+ * 05 06 2015 kuan-wei.chen
+ * [MOLY00098019] [VzW][Merge to MOLY] MRU revise / MRU AT command
+ * add AT+VZWMRUC, AT+VZWMRUE
+ *
+ * 04 23 2015 mark.chung
+ * [MOLY00095378] Amazon Requirement
+ * 	.
+ *
+ * 04 21 2015 edwin.liu
+ * [MOLY00091774] [VzW][Merge to MOLY] Clear GUTI when doing factory reset
+ * 	.
+ *
+ * 04 16 2015 tim.huang
+ * [MOLY00107801] NAS 6291 DEV
+ * .
+ *
+ * 04 16 2015 james-chi-ju.chang
+ * [MOLY00078264] [UMOLY][R10][R11] NAS check-in from CBr to 6291_DEV
+ * 	.
+ *
+ * 02 23 2015 bob.chiang
+ * [MOLY00096607] Sync C2K CR
+ * .
+ *
+ * 02 05 2015 morton.lin
+ * [MOLY00084695] [6291] Code merged from MOLY to UMOLY TRUNK
+ * [6291][ERRC][SPV] Code sync from MOLY (W15.06)
+ *
+ * 12 17 2014 james-chi-ju.chang
+ * [MOLY00078264] [UMOLY][R10][R11] NAS check-in from CBr to 6291_DEV
+ * 	.
+ *
+ * 11 12 2014 yingwei.huang
+ * [MOLY00073932] [MT6291_DEV] EDDA implementation -- interface part.	.
+ *
+ * 11 12 2014 carlson.lin
+ * [MOLY00084165] [UMOLY][R10][R11] NAS check-in from 6291_DEV to UMOLY Trunk
+ * (Sync from MT6291_DEV upto CL 869855)
+ *
+ * 11 10 2014 robert.wu
+ * [MOLY00083874] [UMOLY][R10][R11] EMM MTC sync code from 6291_DEV to UMOLY trunk
+ *
+ * 07 07 2014 benjamin.kuo
+ * [MOLY00071459] Add Mobility Management for IMS Voice Termination
+ * MMIVT2MOLY
+ *
+ * 07 02 2014 shaowu.huang
+ * [MOLY00070824] [4G Gemini][FT][BJ][CSFB test][case5.1.1][SIM1 CMCC+SIM2 CMCC][4G,3G,2G¡Ñ¢Fi??i??E¡Ói??O?i??I3i??]
+ * .
+ *
+ * 06 13 2014 aaron.liu
+ * [MOLY00067559] [MT6592LTE][CSFB][Single USIM][CMCC FT][case5.1.1][4G,3G,2Gi??`??i??i??i??i????]
+ * .EVAL interface part.
+ *
+ * 05 16 2014 lt.chang
+ * [MOLY00065658] [sglte dsds]ps detach and attach redesign
+ * .check in actvie sim info req interface
+ *
+ * 04 23 2014 tehuang.liu
+ * [MOLY00063538] [6290E2][VoLTE][VDM] Support VoLTE Gemini architecture
+ * Check in VoLTE+Gemini related interfaces for VDM, IMSP, L4C, EVAL, and ERRC
+ *
+ * 04 02 2014 cookie.chen
+ * [MOLY00060012] AT+ECBMR to remove modem CB records
+ * .
+ *
+ * 03 28 2014 jinghan.wang
+ * [MOLY00060988] [LPP CP] LPP code check-in for A-GNSS and eCID feature
+ * Check in LPP CP interfaces & capability for EMM (OA domain)
+ *
+ * 03 06 2014 aaron.liu
+ * [MOLY00056483] [MT6582LTE][SGLTE][CMCC FT][GZ]i??b?i??i??2G3Gi??i????i??i??b3Gi??Ji??I???
+ * Add PLMN SEARCH Abort Interface:
+ * 1.MSG_ID_EVAL_ERRC_PLMN_SEARCH_ABORT_REQ
+ * 2.MSG_ID_NWSEL_EVAL_PLMN_SEARCH_ABORT_REQ
+ *
+ * 03 06 2014 joe.chang
+ * [MOLY00058412] [MOLY] TFT validate revision
+ * [ESM/TFTLIB] Modification fot "TFT validate" and "PS init deactivation"
+ *
+ * 03 05 2014 benjamin.kuo
+ * [MOLY00050602] [SAT] support Network Rejection Event
+ * .
+ *
+ * 02 17 2014 benjamin.kuo
+ * [MOLY00055341] [MP1 Post MP Patch][MT6290E2][LTE attach PDN] UE doesn't perform LTE attach due to TCM cmd conflict
+ * MOLY
+ *
+ * 01 22 2014 jinghan.wang
+ * [MOLY00054514] [LTE Gemini] Feature check in MOLY trunk for EMM PLMNSEL and related EMM interfaces
+ *
+ * 01 21 2014 wcpuser_integrator
+ * [MOLY00054475] SGLTE option rename
+ * .
+ *
+ * 01 13 2014 allen.keh
+ * [MOLY00053328] [MT6290E2][VoLTE] VoLTE development merge back to TRUNK.
+ * 	Add message ids & SAP ids
+ *
+ * 11 13 2013 adeline.chang
+ * [MOLY00046027] [MT6290E1][MMDS_DC] MMDC feature patch back to MOLY trunk
+ * .
+ *
+ * 10 18 2013 shih-chieh.liao
+ * [MOLY00041595] [MT6290E1][MMDS_DC] MMDC feature patch back to MOLY trunk
+ * integrate EAS_TO_PEER_INFO_IND.
+ *
+ * 10 18 2013 hc.chu
+ * [MOLY00041414] [MT6290E1][WWFT][HK][3HK] Voice domain preference encode error
+ * merge prebuild cbr back to trunk.
+ *
+ * 08 23 2013 shih-chieh.liao
+ * [MOLY00034931] [MMDC] change EAS_STATE_IND to TO_PEER_INFO_IND
+ * .
+ *
+ * 08 30 2013 hc.chu
+ * [MOLY00036036] [MMDS_DC] Add EVAL_ESM_PS_SWITCH_COMPLETE_IND related handing
+ * [MMDS_DC] Add EVAL_ESM_PS_SWITCH_COMPLETE_IND related handing.
+ *
+ * 08 23 2013 shih-chieh.liao
+ * [MOLY00034931] [MMDC] change EAS_STATE_IND to TO_PEER_INFO_IND
+ * .
+ *
+ * 08 23 2013 hc.chu
+ * [MOLY00034663] MMDC RAC code check-in
+ * remove unused mmdc rac codes
+ *
+ * 07 24 2013 benjamin.kuo
+ * [MOLY00031020] [MMDS_DC] Merge MMDC interface to MOLY
+ * <saved by Perforce>
+ *
+ * 04 01 2013 benjamin.kuo
+ * [MOLY00011934] LTE MM IT CBr merge to MOLY
+ * add __MMDC__ for message/structure.
+ *
+ * 03 27 2013 benjamin.kuo
+ * [MOLY00011934] LTE MM IT CBr merge to MOLY
+ * .
+ *
+ * 03 15 2013 benjamin.kuo
+ * [MOLY00011934] LTE MM IT CBr merge to MOLY
+ * MM IT merge back to MOLY.
+ *
+ * 03 14 2013 benjamin.kuo
+ * [MOLY00011934] LTE MM IT CBr merge to MOLY
+ * common file: EVAL part.
+ *
+ * 01 22 2013 benjamin.kuo
+ * [MOLY00009163] LTE Multimode merge back to MOLY
+ *
+ * 01 22 2013 benjamin.kuo
+ * [MOLY00009163] LTE Multimode merge back to MOLY
+ *
+ * 01 22 2013 benjamin.kuo
+ * [MOLY00009163] LTE Multimode merge back to MOLY
+ * MOLY_CBr to MOLY.
+ *
+ * 11 06 2012 yu.huang
+ * [MOLY00005322] TATAKA merge to MOLY
+ * [EVAL] Add EVAL related interfaces and common strust
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _EVAL_MSGID_H
+#define _EVAL_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_EVAL_CODE_BEGIN )
+
+/****************************************************************************
+ *                          Destination: EVAL (L4C to EVAL) 
+ ****************************************************************************/
+MSG_ID_L4C_EVAL_RAT_CHANGE_REQ              = MSG_ID_EVAL_CODE_BEGIN,
+MSG_ID_L4C_EVAL_RAT_CHANGE_RSP,
+MSG_ID_L4C_EVAL_ETWS_SETTING_REQ,
+MSG_ID_L4C_EVAL_GET_SSAC_PARAM_REQ,
+
+/* defined in l4_msgid.h for maintenance
+ * MSG_ID_L4C_EVAL_ADJUST_MEAS_REQ,
+ */
+
+MSG_ID_L4C_EVAL_NBR_CELL_INFO_START_REQ,
+MSG_ID_L4C_EVAL_NBR_CELL_INFO_STOP_REQ,
+
+MSG_ID_L4C_EVAL_LTE_NEIGHBOR_CELL_INFO_REQ,
+
+MSG_ID_L4C_EVAL_VDM_VOICE_STATUS_REQ,
+
+
+MSG_ID_L4C_EVAL_ERLM_CONTROL_REQ,
+
+MSG_ID_L4C_EVAL_EDDA_REQ,
+MSG_ID_L4C_EVAL_FACTORY_RESET_REQ,
+MSG_ID_L4C_EVAL_MRU_UPDATE_REQ,
+MSG_ID_L4C_EVAL_LTECA_BAND_SETTING_REQ,
+MSG_ID_L4C_EVAL_DRX_UPDATE_REQ,
+MSG_ID_L4C_EVAL_LTECA_MODE_SETTING_REQ,
+MSG_ID_L4C_EVAL_AUDRX_ENABLE_REQ,
+MSG_ID_L4C_EVAL_OMADM_UPDATE_REQ,
+MSG_ID_L4C_EVAL_MODULATION_UPDATE_REQ,
+MSG_ID_L4C_EVAL_GUTI_IN_NV_CLEAR_REQ,
+MSG_ID_L4C_EVAL_IMS_CALL_STATUS_REQ,
+MSG_ID_L4C_EVAL_IMS_STATUS_UPDATE_REQ,
+MSG_ID_L4C_EVAL_HQ_SERVICE_STATUS_REQ,
+MSG_ID_L4C_EVAL_LTE_TM9_FDD_TDD_SETTING_REQ,
+MSG_ID_L4C_EVAL_NOTIFY_SIM_SWITCH_RFOFF_REQ,
+MSG_ID_L4C_EVAL_CS_SERVICE_NOTIFICATION_RSP, //TMO-US GID-MTRREQ-245903 
+MSG_ID_L4C_EVAL_CA_BAND_COMB_LIST_REQ,
+MSG_ID_L4C_EVAL_ERRC_CELL_REJ_IND,
+// eCall
+MSG_ID_L4C_EVAL_ECALL_TEST_CALL_ATTACH_REQ,
+MSG_ID_L4C_EVAL_ECALL_ABORT_TEST_CALL_ATTACH_REQ,
+/****************************************************************************
+ *                          Destination: EVAL (ERAC to EVAL) 
+ ****************************************************************************/
+MSG_ID_EMMREG_INIT_REQ,
+MSG_ID_EMMREG_EMC_ATTACH_REQ, // for IMS
+MSG_ID_EMMREG_EPS_ATTACH_NEEDED_REJ_RSP,
+MSG_ID_EMMREG_SET_IMS_VOICE_AVAILABILITY_REQ, // for IMS
+MSG_ID_EMMREG_SET_IMS_VOICE_TERMINATION_REQ, // for IMS
+#ifdef __GEMINI__
+MSG_ID_EMMREG_DATA_ALLOW_REQ,
+#endif
+MSG_ID_EMMREG_IMS_SCM_INFO_REQ, // for REL12 feature SCM
+
+
+MSG_ID_EMMREG_ACTIVE_SIM_INFO_REQ,
+MSG_ID_EMMREG_SET_PGCHECK_REQ,
+MSG_ID_EMMREG_IMS_REG_STATUS_UPDATE_REQ,
+MSG_ID_EMMREG_IMS_CALL_REG_INFO_REQ,
+MSG_ID_EMMREG_SET_MS_SV_REQ,
+MSG_ID_EMMREG_REJECT_CAUSE_MAPPING_REQ,
+
+// Remote SIM
+MSG_ID_EMMREG_RSIM_AKA_STATUS_REQ,
+MSG_ID_EMMREG_RSIM_AKA_RSIM_ACCESS_FOR_AUTH_DOWNLOAD_REQ,
+MSG_ID_EMMREG_RSIM_AUTH_ABORT_REQ,
+
+/****************************************************************************
+ *                          Destination: EVAL (NWSEL to EVAL) 
+ ****************************************************************************/
+MSG_ID_NWSEL_EVAL_SEARCH_STATUS_UPDATE_REQ,
+MSG_ID_NWSEL_EVAL_PLMN_LIST_STATUS_UPDATE_REQ,
+MSG_ID_NWSEL_EVAL_SYS_INFO_UPDATE_REQ,
+MSG_ID_NWSEL_EVAL_REGN_STATUS_UPDATE_REQ,
+MSG_ID_NWSEL_EVAL_PLMN_LIST_REQ,
+MSG_ID_NWSEL_EVAL_PLMN_LIST_STOP_REQ,
+MSG_ID_NWSEL_EVAL_CSG_LIST_REQ,
+MSG_ID_NWSEL_EVAL_CSG_LIST_STOP_REQ,
+MSG_ID_NWSEL_EVAL_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_NWSEL_EVAL_HPLMN_INFO_UPDATE_REQ,
+MSG_ID_NWSEL_EVAL_UEMODE_PARAM_UPDATE_REQ,
+MSG_ID_NWSEL_EVAL_PLMN_SEARCH_PREFERENCE_UPDATE_REQ, // for IMS
+MSG_ID_NWSEL_EVAL_EMC_FPLMN_LIST_UPDATE_REQ, // for IMS
+MSG_ID_NWSEL_EVAL_RESUME_REQ,
+MSG_ID_NWSEL_EVAL_EUTRAN_CAP_UPDATE_REQ,
+MSG_ID_NWSEL_EVAL_INVALID_SIM_RECOVER_REQ,  // for __REL10__: t3245
+MSG_ID_NWSEL_EVAL_C2K_IRAT_COMPLETE_REQ,    // for C2K
+MSG_ID_NWSEL_EVAL_C2K_NORMAL_SERVICE_REQ,
+MSG_ID_NWSEL_EVAL_PLMN_SEARCH_ABORT_REQ,
+MSG_ID_NWSEL_EVAL_POWER_ON_PROTECTION_REQ,
+MSG_ID_NWSEL_EVAL_CLEAR_T3346_EPLMN_REQ,
+MSG_ID_NWSEL_EVAL_SET_MRU_REQ,
+MSG_ID_NWSEL_EVAL_CLEAR_MRU_REQ,
+MSG_ID_NWSEL_EVAL_CSG_AUTO_SEARCH_MODE_REQ,
+MSG_ID_NWSEL_EVAL_C2K_FORCE_TO_LOCAL_DETACH_REQ, //for C2K when OP12 project
+MSG_ID_NWSEL_EVAL_GLOBAL_MODE_CHANGE_START_REQ,
+MSG_ID_NWSEL_EVAL_HVOLTE_MODE_CHANGE_REQ,
+MSG_ID_NWSEL_EVAL_ARAL_UPDATE_REQ,
+MSG_ID_NWSEL_EVAL_CLEAR_FORBIDDEN_TA_LIST_REQ,
+MSG_ID_NWSEL_EVAL_CALL_STATUS_IND,
+MSG_ID_NWSEL_EVAL_GMSS_IRAT_START_IND, // for C2K
+MSG_ID_NWSEL_EVAL_GMSS_IRAT_FINISH_IND, // for C2K
+MSG_ID_NWSEL_EVAL_RAT_DISABLE_CONFIG_REQ, 
+MSG_ID_NWSEL_EVAL_MANUAL_SEARCH_STOP_REQ,
+MSG_ID_NWSEL_EVAL_INACTIVE_MODE_CONFIGURATION_REQ,
+MSG_ID_NWSEL_EVAL_SERVICE_RECOVERY_ROUND_UPDATE_REQ,
+MSG_ID_NWSEL_EVAL_SCREEN_ON_REQ,
+MSG_ID_NWSEL_EVAL_SCREEN_OFF_REQ,
+MSG_ID_NWSEL_EVAL_ECBM_START_REQ,
+MSG_ID_NWSEL_EVAL_ECBM_STOP_REQ,
+MSG_ID_NWSEL_EVAL_SEND_DAN_SMS_IND,
+MSG_ID_NWSEL_EVAL_DISCARD_SYS_INFO_UPDATE_REQ,
+
+/****************************************************************************
+ *                          Destination: EVAL (SMS to EVAL) 
+ ****************************************************************************/
+MSG_ID_SMS_EVAL_EST_REQ,
+MSG_ID_SMS_EVAL_UNITDATA_REQ,
+MSG_ID_SMS_EVAL_SMS_STATUS_REQ,
+MSG_ID_IMCSMS_EVAL_MT_SMS_OVER_IMS_STATUS_REQ,
+
+/****************************************************************************
+ *                          Destination: EVAL (SMSAL to EVAL) 
+ ****************************************************************************/
+MSG_ID_SMSAL_EVAL_CBCH_REQ,
+MSG_ID_SMSAL_EVAL_CB_UPDATE_REQ,
+MSG_ID_SMSAL_EVAL_CB_MSG_REMOVAL_REQ,
+
+/****************************************************************************
+ *                          Destination: EVAL (ETC to EVAL)
+ ****************************************************************************/
+MSG_ID_EVAL_ETC_NW_RESET_UE_STORED_POS_INFO_IND, // for LPP
+MSG_ID_EVAL_ETC_LBM_INFO_IND, // for L4C
+
+
+/****************************************************************************
+ *                          Destination: EVAL (EMM to EVAL) 
+ ****************************************************************************/
+MSG_ID_EVAL_EMM_CELL_INFO_UPDATE_IND,
+MSG_ID_EVAL_EMM_NW_INFO_IND,
+MSG_ID_EVAL_EMM_NW_ECC_IND,
+MSG_ID_EVAL_EMM_NON_3GPP_NW_POLICIES_IND,
+MSG_ID_EVAL_EMM_REGN_RESULT_IND,
+MSG_ID_EVAL_EMM_DISABLE_NW_LOSS_OPTIMIZE_IND,
+MSG_ID_EVAL_EMM_PLMN_LIST_CNF,
+MSG_ID_EVAL_EMM_PLMN_LIST_STOP_CNF,
+MSG_ID_EVAL_EMM_CSG_LIST_CNF,
+MSG_ID_EVAL_EMM_CSG_LIST_STOP_CNF,
+MSG_ID_EVAL_EMM_OUT_OF_SERVICE_IND,
+MSG_ID_EVAL_EMM_OUT_OF_SERVICE_FINISH_IND,
+MSG_ID_EVAL_EMM_PLMN_LOSS_IND,
+MSG_ID_EVAL_EMM_CSFB_FAIL_IND,
+MSG_ID_EVAL_EMM_SMS_EST_CNF,
+MSG_ID_EVAL_EMM_SMS_EST_REJ,
+MSG_ID_EVAL_EMM_SMS_UNITDATA_IND,
+MSG_ID_EVAL_EMM_SMS_ERR_IND,
+MSG_ID_EVAL_EMM_LPP_DATA_CNF, // for LPP
+MSG_ID_EVAL_EMM_LPP_DATA_IND, // for LPP
+MSG_ID_EVAL_EMM_LCS_DATA_CNF, // for LPP
+MSG_ID_EVAL_EMM_LCS_DATA_IND, // for LPP
+MSG_ID_EVAL_EMM_SIM_EPSNSC_INFO_IND,
+MSG_ID_EVAL_EMM_SIM_EPSLOCI_INFO_IND,
+MSG_ID_EVAL_EMM_AUTHENTICATE_IND,
+MSG_ID_EVAL_EMM_SIGNAL_APPEAR_IND,
+MSG_ID_EVAL_EMM_EMERGENCY_STATUS_UPDATE_IND, // for IMS
+MSG_ID_EVAL_EMM_EMC_ATTACH_CNF, // for IMS
+MSG_ID_EVAL_EMM_EMC_DETACH_IND, // for IMS
+MSG_ID_EVAL_EMM_NW_FEATURE_SUPPORT_IND, // for IMS
+MSG_ID_EVAL_EMM_SRVCC_STATUS_UPDATE_IND, // for IMS
+MSG_ID_EVAL_EMM_NW_REJECT_IND,
+MSG_ID_EVAL_EMM_T3402_CHANGE_IND, // __REL10__: t3402
+MSG_ID_EVAL_EMM_PERSISTENT_EPSB_REL_IND, // __REL10__: persistent EPSB
+//MSG_ID_EVAL_EMM_L2C_TRANSFER_CNF,  // for C2K
+MSG_ID_EVAL_EMM_C2K_IRAT_ATTACH_RESULT_IND, // for C2K
+MSG_ID_EVAL_EMM_REL_IND,
+MSG_ID_EVAL_EMM_SMS_UNITDATA_CNF,
+MSG_ID_EVAL_EMM_SR_FAILURE_IND,
+MSG_ID_EVAL_EMM_TAU_FAILURE_IND,
+MSG_ID_EVAL_EMM_CABTSRI_IND,
+MSG_ID_EVAL_EMM_SR_REJECT_IND,
+MSG_ID_EVAL_EMM_RACH_REJECT_IND,
+MSG_ID_EVAL_EMM_CONNECTION_INFO_IND,
+MSG_ID_EVAL_EMM_1XCSFB_CNF, //for C2K
+MSG_ID_EVAL_EMM_1XCSFB_STOP_CNF, //for C2K
+MSG_ID_EVAL_EMM_BARRING_STATUS_IND,
+MSG_ID_EVAL_EMM_ESTABLISHMENT_IND,
+MSG_ID_EVAL_EMM_PLMN_RESTRICTION_CHANGE_IND,
+MSG_ID_EVAL_EMM_C2K_CSFB_CNF, //for C2K
+MSG_ID_EVAL_EMM_C2K_CSFB_STOP_CNF, //for C2K
+MSG_ID_EVAL_EMM_C2K_CSFB_START_IND,
+MSG_ID_EVAL_EMM_C2K_CSFB_EST_IND,
+MSG_ID_EVAL_EMM_C2K_CSFB_STOP_IND,
+MSG_ID_EVAL_EMM_MT_PAGE_IND,
+MSG_ID_EVAL_EMM_SEND_ESR_IND,
+MSG_ID_EVAL_EMM_IRAT_C2L_SUCCESS_NOTIFY_IND, //for C2K
+MSG_ID_EVAL_EMM_SEARCH_INTERRUPT_EVENT_IND,
+
+MSG_ID_EVAL_EMM_SIM_RESET_COMPLETE_IND,
+MSG_ID_EVAL_EMM_DRX_UPDATE_CNF,
+MSG_ID_EVAL_EMM_DRX_UPDATE_IND,
+MSG_ID_EVAL_EMM_ACDC_STATUS_UPDATE_CNF,
+MSG_ID_EVAL_EMM_UPDATE_EMC_PDN_STATUS_IND,
+MSG_ID_EVAL_EMM_IMS_SCM_INFO_CNF, //REL12 feature SCM
+MSG_ID_EVAL_EMM_CLEAR_FORBIDDEN_TA_NEED_SEARCH_IND,
+MSG_ID_EVAL_EMM_IMS_HANDOVER_NEED_SEARCH_IND,
+MSG_ID_EVAL_EMM_CELL_BAND_INFO_UPDATE_IND,  // For VzW (VZ_REQ_e911_30203)
+MSG_ID_EVAL_EMM_EMM_MSG_IND,                // For VzW VoWifi TC3.2
+MSG_ID_EVAL_EMM_NEED_DUPLEX_MODE_CHG_IND,
+MSG_ID_EVAL_EMM_RSIM_AUTH_FINISH_IND,   //R-SIM
+MSG_ID_EVAL_EMM_RSIM_ABORT_CNF, //R-SIM
+MSG_ID_EVAL_EMM_GENERAL_MODEM_CONFIGURE_SET_CNF,
+MSG_ID_EVAL_EMM_ME_RECONFIGURE_CNF,
+MSG_ID_EVAL_EMM_DRB_SESSION_STATUS_NTF,
+MSG_ID_EVAL_EMM_CAUSE_INFO_IND,
+
+MSG_ID_EVAL_EMM_RSIM_AUTH_ABORT_CNF, // Remote SIM
+
+MSG_ID_EVAL_EMM_CS_DOMAIN_NOT_AVAILABLE_IND,
+MSG_ID_EVAL_EMM_IA_APN_CHANGE_IND,
+MSG_ID_EVAL_EMM_CS_SERVICE_NOTIFICATION_IND, //TMO-US GID-MTRREQ-245903 
+MSG_ID_EVAL_EMM_IA_APN_NOT_READY_IND,
+MSG_ID_EVAL_EMM_PAGING_PROTECTED_TIMER_MAX_IND,
+// eCall
+MSG_ID_EVAL_EMM_ECALL_TEST_CALL_ATTACH_CNF,
+MSG_ID_EVAL_EMM_ECALL_ABORT_TEST_CALL_ATTACH_CNF,
+MSG_ID_EVAL_EMM_ECALL_REGISTRATION_STATE_IND,
+
+/****************************************************************************
+ *                          Destination: EVAL (ESM to EVAL) 
+ ****************************************************************************/
+MSG_ID_EVAL_ESM_EPS_ATTACH_NEEDED_IND,
+MSG_ID_EVAL_ESM_EMC_ATTACH_IND, // for IMS
+MSG_ID_EVAL_ESM_SRVCC_STATUS_UPDATE_IND, // for IMS
+
+
+/****************************************************************************
+ *                          Destination: EVAL (ERRC to EVAL) 
+ ****************************************************************************/
+MSG_ID_EVAL_ERRC_CB_RECONFIG_IND,
+MSG_ID_EVAL_ERRC_CB_GS_CHANGE_IND,
+MSG_ID_EVAL_ERRC_CELL_POWER_LEVEL_IND,
+MSG_ID_EVAL_ERRC_REPORT_SIGNAL_LEVEL_IND,
+MSG_ID_EVAL_ERRC_ADJUST_MEAS_CNF,
+MSG_ID_EVAL_ERRC_PWS_INFORMATION_IND,
+MSG_ID_EVAL_ERRC_NBR_CELL_INFO_START_CNF,
+MSG_ID_EVAL_ERRC_NBR_CELL_INFO_IND,
+MSG_ID_EVAL_ERRC_NBR_CELL_INFO_STOP_CNF,
+MSG_ID_EVAL_ERRC_GET_SSAC_PARAM_CNF, // for IMS
+MSG_ID_EVAL_ERRC_CONNECTED_DRB_IND,
+MSG_ID_EVAL_ERRC_TIME_INFO_IND,
+#ifdef __VOLTE_SUPPORT__ 
+MSG_ID_EVAL_ERRC_IMS_SYS_INFO_IND, //__TC01__
+#endif
+MSG_ID_EVAL_ERRC_EDDA_CNF,
+MSG_ID_EVAL_ERRC_LTECA_MODE_SETTING_CNF,
+MSG_ID_EVAL_ERRC_OMADM_UPDATE_CNF,
+MSG_ID_EVAL_ERRC_LTE_TM9_FDD_TDD_SETTING_CNF,
+MSG_ID_EVAL_ERRC_CA_BAND_COMB_LIST_CNF,
+
+//#ifdef __VOLTE_SUPPORT__ 
+MSG_ID_EVAL_ERRC_SRVCC_STATUS_UPDATE_IND, // for IMS
+#ifdef __BCSFB__
+MSG_ID_EVAL_ERRC_ERLM_REPORT_IND,
+MSG_ID_EVAL_ERRC_ERLQ_REPORT_IND,
+#endif
+//#endif
+
+MSG_ID_EVAL_ERRC_STATE_IND,
+MSG_ID_EVAL_ERRC_MRU_UPDATE_CNF,
+
+//#ifdef __LTE_R11__
+MSG_ID_EVAL_ERRC_CA_INFO_IND,
+//#endif
+
+MSG_ID_EVAL_ERRC_PCELL_INFO_IND,
+
+MSG_ID_EVAL_ERRC_EVDO_PS_CONNECTION_STATUS_IND,
+MSG_ID_EVAL_ERRC_1XRTT_PS_CONNECTION_STATUS_IND,
+
+MSG_ID_EVAL_ERRC_NW_BAND_INFO_IND,
+MSG_ID_EVAL_ERRC_OTHER_RAT_START_SEARCH_IND,
+MSG_ID_EVAL_ERRC_SSAC_RESEL_RESULT_IND,
+MSG_ID_EVAL_ERRC_PLMN_SCAN_IND,
+MSG_ID_EVAL_ERRC_PHY_CFG_INFO_IND,
+
+
+/****************************************************************************
+ *                          Destination: EVAL (CISS to EVAL) 
+ ****************************************************************************/
+MSG_ID_CISS_EVAL_DATA_REQ,
+
+
+/****************************************************************************
+ *                          Destination: EVAL (CPSW to EVAL) 
+ ****************************************************************************/
+MSG_ID_C2K_LTE_CSFB_REQ,
+MSG_ID_C2K_LTE_CSFB_STOP_REQ,
+
+/****************************************************************************
+ *                          Destination: EVAL (UPCM to EVAL) 
+ ****************************************************************************/
+MSG_ID_EVAL_UPCM_START_RELEASE_DRB_SESSION_TIMER_IND,
+
+/****************************************************************************
+ *                          Destination: EVAL (DDM to EVAL) 
+ ****************************************************************************/
+MSG_ID_DDM_EVAL_IMS_HANDOVER_ATTACH_REQ,
+
+/****************************************************************************
+ *                          Destination: EVAL (VDM to EVAL) 
+ ****************************************************************************/
+// eCall
+MSG_ID_VDM_EVAL_ECALL_END_IND,
+
+/****************************************************************************/
+MSG_ID_EVAL_CODE_END,
+
+MODULE_MSG_END( MSG_ID_EVAL_CODE_TAIL )
+
+#endif /* _EVAL_MSGID_H */
diff --git a/mcu/interface/sap/md/ext_modem_msgid.h b/mcu/interface/sap/md/ext_modem_msgid.h
new file mode 100644
index 0000000..23b1f2f
--- /dev/null
+++ b/mcu/interface/sap/md/ext_modem_msgid.h
@@ -0,0 +1,109 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   ext_modem_sap.h
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   ext_modem 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+ /*------------- EXT_MODEM_MSG_CODE_BEGIN----------------*/
+  /* EXT_MODEM <--> L4C */
+#include "module_msg_range.h"
+
+#ifndef L4C_EXT_MSGID_H
+#define L4C_EXT_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_EXT_MODEM_CODE_BEGIN )
+  MSG_ID_L4C_EXT_MODEM_SETUP_REQ = MSG_ID_EXT_MODEM_CODE_BEGIN,
+  MSG_ID_L4C_EXT_MODEM_DISC_REQ,
+  MSG_ID_EXT_MODEM_CODE_END = MSG_ID_L4C_EXT_MODEM_DISC_REQ,
+MODULE_MSG_END( MSG_ID_EXT_MODEM_CODE_TAIL )
+  /*------------- EXT_MODEM_MSG_CODE_END----------------*/
+ #endif  //L4C_EXT_MSGID_H
diff --git a/mcu/interface/sap/md/fcs_msgid.h b/mcu/interface/sap/md/fcs_msgid.h
new file mode 100644
index 0000000..f8a1856
--- /dev/null
+++ b/mcu/interface/sap/md/fcs_msgid.h
@@ -0,0 +1,77 @@
+
+/*****************************************************************************
+*  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:
+ * ---------
+ *   fcs_msgid.h
+ *
+ * Description:
+ * ------------
+ *   FCS (field capture system) related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *
+ *
+ ****************************************************************************/
+
+
+#include "module_msg_range.h"
+
+#ifndef _FCS_MSGID_H
+#define _FCS_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_FCS_CODE_BEGIN ) 
+// MOD_FCS
+MSG_ID_FCS_PERIODIC_TRIGGER_SEND,
+MSG_ID_FCS_USER_TRIGGER_SEND,
+MSG_ID_L4CRAC_REG_STATE_IND_TO_FCS,
+
+MODULE_MSG_END( MSG_ID_FCS_CODE_TAIL )
+
+#endif  /* _FCS_MSGID_H */
diff --git a/mcu/interface/sap/md/gmss_msgid.h b/mcu/interface/sap/md/gmss_msgid.h
new file mode 100644
index 0000000..ce1bfbf
--- /dev/null
+++ b/mcu/interface/sap/md/gmss_msgid.h
@@ -0,0 +1,807 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   gmss_msgid.h
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   NWSEL 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!
+ * 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!
+ *
+ * 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!
+ * 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!
+ * 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 _GMSS_MSGID_H_
+#define _GMSS_MSGID_H_
+
+#include "module_msg_range.h"
+
+/*----------------------- GMSS_MSG_CODE_BEGIN------------------*/
+MODULE_MSG_BEGIN( MSG_ID_GMSS_CODE_BEGIN )
+/* messages received from RAC at RAC_GMSS_SAP */
+    MSG_ID_RAC_GMSS_ATTACH_REQ = MSG_ID_GMSS_CODE_BEGIN,
+    MSG_ID_RAC_GMSS_DETACH_REQ,
+    MSG_ID_RAC_GMSS_PLMN_SEARCH_REQ,
+    MSG_ID_RAC_GMSS_INIT_REQ,
+    MSG_ID_RAC_GMSS_RFOFF_REQ,
+    MSG_ID_RAC_GMSS_SEL_MODE_REQ,
+    MSG_ID_RAC_GMSS_SET_ROAMING_MODE_REQ,
+    MSG_ID_RAC_GMSS_SET_PREFER_RAT_REQ,
+    MSG_ID_RAC_GMSS_GET_PREFER_RAT_REQ,
+    MSG_ID_RAC_GMSS_ELEVATOR_MODE_CONFIG_REQ,
+    MSG_ID_RAC_GMSS_PLMN_LIST_REQ,
+    MSG_ID_RAC_GMSS_PLMN_LIST_STOP_REQ,
+    MSG_ID_RAC_GMSS_PLMN_LIST_ABORT_REQ, /*for VSIM*/
+    MSG_ID_RAC_GMSS_ARAL_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_CSG_LIST_REQ,
+    MSG_ID_RAC_GMSS_CSG_LIST_STOP_REQ,
+    MSG_ID_RAC_GMSS_UPDATE_UEMODE_REQ, /* should be replaced by the following MSG_ID_RAC_GMSS_UEMODE_PARAM_UPDATE_REQ */
+    MSG_ID_RAC_GMSS_UEMODE_PARAM_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_SUSP_RESU_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_ABORT_EMERGENCY_PLMN_SEARCH_REQ,
+    /* add for 6291 MTC */
+    MSG_ID_RAC_GMSS_IMS_CALL_INFO_REQ,
+    /* add for 6291 MTC */
+    MSG_ID_RAC_GMSS_MMDC_RECOVERY_SEARCH_REQ,
+    MSG_ID_RAC_GMSS_SET_RECOVERY_SEARCH_TIMER_REQ,
+    MSG_ID_RAC_GMSS_GET_RECOVERY_SEARCH_TIMER_REQ,
+    MSG_ID_RAC_GMSS_CUSTOM_PLMN_LIST_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_GET_CUSTOM_PLMN_LIST_REQ,
+    MSG_ID_RAC_GMSS_SET_UTRAN_VOICE_DOMAIN_PREFERENCE_REQ,
+    MSG_ID_RAC_GMSS_DATA_SERVICE_STATUS_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_MD_SIM_CONFIG_REQ,
+    MSG_ID_RAC_GMSS_ACTIVE_SIM_INFO_REQ,
+    MSG_ID_RAC_GMSS_RAT_CHANGE_SUCCESS_NOTIFY_REQ,
+    MSG_ID_RAC_GMSS_DUPLEX_MODE_CHANGE_FINISH_REQ,
+    MSG_ID_RAC_GMSS_SET_CT_MODE_REQ,
+    MSG_ID_RAC_GMSS_DISABLE_EUTRAN_REQ,
+    MSG_ID_RAC_GMSS_ROAMING_DATA_CONFIG_REQ,
+    MSG_ID_RAC_GMSS_SET_WM_POLICY_REQ,
+    MSG_ID_RAC_GMSS_SET_AUX_PLMN_REQ,
+    MSG_ID_RAC_GMSS_SET_MRU_REQ,
+    MSG_ID_RAC_GMSS_CLEAR_MRU_REQ,
+    MSG_ID_RAC_GMSS_CSG_AUTO_SEARCH_MODE_REQ,
+    MSG_ID_RAC_GMSS_DUPLEX_MODE_REQUIRED_REQ,
+    MSG_ID_RAC_GMSS_CALL_STATUS_REQ,
+    MSG_ID_RAC_GMSS_SET_FIRST_CAMP_ON_PREFER_RAT_REQ,
+    MSG_ID_RAC_GMSS_OMADM_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_VZWMRU_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_SET_HVOLTE_MODE_REQ,
+    MSG_ID_RAC_GMSS_INVALID_SIM_RECOVER_RSP,
+
+/* messages for VZW ECC call */
+    MSG_ID_RAC_GMSS_ECBM_START_REQ,
+    MSG_ID_RAC_GMSS_ECBM_STOP_REQ,
+    MSG_ID_RAC_GMSS_EMC_SERVICE_SCAN_REQ,
+    MSG_ID_RAC_GMSS_EMC_BAR_NETWORK_REQ,
+
+    MSG_ID_RAC_GMSS_PLMN_LIST_STATUS_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_FPLMN_ACTION_REQ,
+    MSG_ID_RAC_GMSS_VZW_ADMIN_APN_CHANGE_REQ,
+    MSG_ID_RAC_GMSS_1XRTT_CELL_LIST_REQ,
+    MSG_ID_RAC_GMSS_SCREEN_ON_REQ,
+    MSG_ID_RAC_GMSS_LOCATION_INFO_REQ,
+
+    MSG_ID_RAC_GMSS_SET_TW_MODE_REQ,
+    MSG_ID_RAC_GMSS_VOLTE_STATUS_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_GET_LAST_RAT_SELECT_IND_REQ,
+    MSG_ID_RAC_GMSS_DATA_ALLOW_REQ,
+    MSG_ID_RAC_GMSS_SUSPEND_EGREG_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_HIGH_PRIO_SEARCH_TIMER_CONFIG_REQ,
+
+/* CDMA less */
+    MSG_ID_RAC_GMSS_ABORT_ENWSEL_SEARCH_REQ,
+    MSG_ID_RAC_GMSS_IMS_REG_STATUS_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_IMS_TIMER_STATUS_UPDATE_REQ,
+    MSG_ID_RAC_GMSS_SET_IMS_ROAMING_CONFIG_REQ,
+    MSG_ID_RAC_GMSS_SET_PLMN_BARRING_TIMER_REQ,
+    MSG_ID_RAC_GMSS_GET_PLMN_BARRING_TIMER_REQ,
+
+/* mtk13782: TMO diable 2G */
+    MSG_ID_RAC_GMSS_RAT_DISABLE_CONFIG_REQ,
+    MSG_ID_RAC_GMSS_PLMN_SEARCH_STOP_REQ,
+    MSG_ID_RAC_GMSS_INACTIVE_MODE_CONFIGURATION_REQ,
+    MSG_ID_RAC_GMSS_SCREEN_OFF_REQ,
+
+/* messages for allowed MCC list */
+    MSG_ID_RAC_GMSS_SET_ALLOWED_MCC_LIST_REQ,
+
+/* messages received from NWSEL at GMSS_NWSEL_SAP */
+    MSG_ID_GMSS_NWSEL_SET_RECOVERY_SEARCH_TIMER_CNF,
+    MSG_ID_GMSS_NWSEL_GET_RECOVERY_SEARCH_TIMER_CNF,
+    MSG_ID_GMSS_NWSEL_RFOFF_CNF,
+    MSG_ID_GMSS_NWSEL_SET_ROAMING_MODE_CNF, /* 3G */
+    MSG_ID_GMSS_NWSEL_SET_PREFER_RAT_CNF,
+    MSG_ID_GMSS_NWSEL_GET_PREFER_RAT_CNF,
+    MSG_ID_GMSS_NWSEL_SET_RAT_MODE_CNF,
+    MSG_ID_GMSS_NWSEL_RAC_PLMN_SEARCH_CNF,
+    MSG_ID_GMSS_NWSEL_RAC_PLMN_LIST_CNF,
+    MSG_ID_GMSS_NWSEL_RAC_PLMN_LIST_STOP_CNF,
+    MSG_ID_GMSS_NWSEL_RAC_CSG_LIST_CNF,
+    MSG_ID_GMSS_NWSEL_RAC_CSG_LIST_STOP_CNF,
+    MSG_ID_GMSS_NWSEL_PLMN_STATUS_IND,
+    MSG_ID_GMSS_NWSEL_SUSPEND_STATUS_IND,
+    MSG_ID_GMSS_NWSEL_PLMN_LIST_IND,
+    MSG_ID_GMSS_NWSEL_SUSP_RESU_UPDATE_CNF,
+    MSG_ID_GMSS_NWSEL_RAC_PLMN_SCAN_IND,
+    MSG_ID_GMSS_NWSEL_IMS_SERVICE_IND,
+    MSG_ID_GMSS_NWSEL_RESTART_CLEAR_CODE_33_PROC_IND,
+    MSG_ID_GMSS_NWSEL_CS_DOMAIN_AVAILABILITY_IND,
+    MSG_ID_GMSS_NWSEL_SUSPEND_IND,
+    MSG_ID_GMSS_NWSEL_RESUME_IND,
+    MSG_ID_GMSS_NWSEL_VIRTUAL_MODE_IND,
+    MSG_ID_GMSS_NWSEL_LIMITED_VIRTUAL_IDLE_IND,
+    MSG_ID_GMSS_NWSEL_PLMN_SEARCH_CNF,
+    MSG_ID_GMSS_NWSEL_MCC_SEARCH_CNF,
+    MSG_ID_GMSS_NWSEL_PLMN_LIST_CNF,
+    MSG_ID_GMSS_NWSEL_PLMN_LIST_STOP_CNF,
+    MSG_ID_GMSS_NWSEL_OUT_OF_SERVICE_IND,
+    MSG_ID_GMSS_NWSEL_CLASS_RAT_IND,
+    MSG_ID_GMSS_NWSEL_SIGNAL_APPEAR_IND,
+    MSG_ID_GMSS_NWSEL_IC_MODULE_TEST_FINISH_IND,
+    MSG_ID_GMSS_NWSEL_EVENT_IND,
+    MSG_ID_GMSS_NWSEL_C2K_IRAT_ATTACH_RESULT_IND,
+    MSG_ID_GMSS_NWSEL_PLMN_INFO_IND,
+    MSG_ID_GMSS_NWSEL_DUPLEX_MODE_CHANGE_CNF,
+    MSG_ID_GMSS_NWSEL_SET_AUX_PLMN_CNF,
+    MSG_ID_GMSS_NWSEL_SET_MRU_CNF,
+    MSG_ID_GMSS_NWSEL_CLEAR_MRU_CNF,
+    MSG_ID_GMSS_NWSEL_EARLY_OOS_IND,
+    MSG_ID_GMSS_NWSEL_IRAT_C2L_SUCCESS_NOTIFY_IND,
+    MSG_ID_GMSS_NWSEL_NO_ACTION_IND,
+    MSG_ID_GMSS_NWSEL_GET_CUSTOM_PLMN_LIST_CNF,
+    MSG_ID_GMSS_NWSEL_CAMPING_INFO_IND,
+    MSG_ID_GMSS_NWSEL_PLMN_RESTRICTION_CHANGE_IND, //T3402 or throttilng timer status
+    MSG_ID_GMSS_NWSEL_NVRAM_WRITE_CNF,
+    MSG_ID_GMSS_NWSEL_EVDO_PS_CONNECTION_STATUS_IND,
+    MSG_ID_GMSS_NWSEL_1XRTT_PS_CONNECTION_STATUS_IND,
+    MSG_ID_GMSS_NWSEL_C2K_CSFB_START_IND,
+    MSG_ID_GMSS_NWSEL_C2K_CSFB_EST_IND,
+    MSG_ID_GMSS_NWSEL_C2K_CSFB_STOP_IND,
+    MSG_ID_GMSS_NWSEL_IMS_VOPS_SUPPORT_STATUS_IND,
+    MSG_ID_GMSS_NWSEL_SYS_INFO_UPDATE_IND,
+//#ifdef __KOR_CUSTOMIZATION__
+    MSG_ID_GMSS_NWSEL_RPLMN_IND,    /* Get RPLMN */
+//#endif
+    // Reporting NW abnormal reject causes
+    MSG_ID_GMSS_NWSEL_NW_REG_REJ_IND,
+    MSG_ID_GMSS_NWSEL_SIM_READY_CNF,
+    MSG_ID_GMSS_NWSEL_PLMN_FOUND_IND,
+//#if defined(__FAST_ROAMING_SEARCH__)
+    MSG_ID_GMSS_NWSEL_RAC_PLMN_FOUND_IND,
+//#endif
+    MSG_ID_GMSS_NWSEL_TRY_SWITCH_RAT_RESULT_IND,
+
+
+/* CDMA less */
+    MSG_ID_GMSS_NWSEL_SET_PLMN_BARRING_TIMER_CNF,
+    MSG_ID_GMSS_NWSEL_GET_PLMN_BARRING_TIMER_CNF,
+    MSG_ID_GMSS_NWSEL_IMS_CALL_END_STATUS_IND,
+
+    MSG_ID_GMSS_NWSEL_RAC_INVALID_SIM_RECOVER_IND,
+    MSG_ID_GMSS_NWSEL_WAIT_FOR_IMS_REG_STATUS_IND,
+    MSG_ID_GMSS_NWSEL_ILLEGAL_ME_IND,
+
+/* messaged received from NWSEL for relaying */
+    MSG_ID_GMSS_NWSEL_CSS_MCC_SEARCH_CNF,
+    MSG_ID_GMSS_NWSEL_CSS_CS_REG_CNF,
+    MSG_ID_GMSS_NWSEL_CSS_PS_REG_CNF,
+    MSG_ID_GMSS_NWSEL_CSS_PS_DEREG_CNF,
+
+/* messages for voice selection */
+    MSG_ID_GMSS_NWSEL_SERVICE_SCAN_CNF,
+
+#ifdef __MBIM_MS_NETWORK_BLACKLIST__
+/* messages for MS BLACK LIST */
+    MSG_ID_GMSS_NWSEL_FPLMN_ACTION_CNF,
+    MSG_ID_GMSS_NWSEL_NW_BLACK_LIST_STATE_IND,
+#endif
+
+/* messages for allowed MCC list */
+    MSG_ID_GMSS_NWSEL_SET_ALLOWED_MCC_LIST_CNF,
+
+/* messages for +ECAMPUI */
+    MSG_ID_RAC_GMSS_CAMP_UI_IND,
+
+/* messages received from CSS at GMSS_CSS_SAP */
+    //MSG_ID_GMSS_CSS_MCC_SEARCH_CNF,
+    MSG_ID_GMSS_CSS_SYS_ACQUIRE_CNF,
+    MSG_ID_GMSS_CSS_READY_IND,
+    MSG_ID_GMSS_CSS_NOT_READY_IND,
+    MSG_ID_GMSS_CSS_SYS_LOST_IND,
+    MSG_ID_GMSS_CSS_SYS_RECOVERY_IND,
+    MSG_ID_GMSS_CSS_1X_CONN_STATUS_IND,
+    MSG_ID_GMSS_CSS_MMSS_FILE_UPDATE_IND,
+    MSG_ID_GMSS_CSS_PS_CHANGE_IND,
+    MSG_ID_GMSS_CSS_PS_CONN_STATUS_IND,
+    MSG_ID_GMSS_CSS_MCC_CHANGE_IND,
+    MSG_ID_GMSS_CSS_SUSPEND_STATUS_IND,
+    MSG_ID_GMSS_CSS_SIM_PLMN_INFO_RSP,
+    MSG_ID_GMSS_CSS_CAMPING_INFO_IND,
+    MSG_ID_GMSS_CSS_CELL_INFO_IND,
+    MSG_ID_GMSS_CSS_CS_SUSPEND_IND,
+    MSG_ID_GMSS_CSS_SET_RAT_MODE_CNF,
+    MSG_ID_GMSS_CSS_C2K_SERVICE_IND,
+    MSG_ID_GMSS_CSS_ILLEGAL_ME_IND,
+    MSG_ID_GMSS_CSS_ELEVATOR_MODE_IND,
+
+/* messages from CVAL */
+    MSG_ID_GMSS_CVAL_SEND_DAN_SMS_IND,
+    MSG_ID_GMSS_NWSEL_SEND_DAN_SMS_IND,
+
+/* messages for UT test */
+    MSG_ID_GMSS_UT_CONFIG_REQ,
+    MSG_ID_GMSS_UT_CONFIG_RSP,
+    MSG_ID_GMSS_NWSEL_REG_STATUS_IND,
+    MSG_ID_GMSS_DUMP_CONTEXT_IND,
+    MSG_ID_GMSS_DUMP_MCC_POOL_IND,
+    MSG_ID_GMSS_DUMP_MCC_LIST_IND,
+    MSG_ID_GMSS_DUMP_GEO_CONTEXT_IND,
+    MSG_ID_GMSS_DUMP_GEO_SUB_LIST_IND,
+    MSG_ID_GMSS_DUMP_23G4_SUCCESS_IND,
+
+/* messages from VDM*/
+    MSG_ID_VDM_GMSS_EMC_SERVICE_SCAN_REQ,
+    MSG_ID_VDM_GMSS_EMC_BAR_NETWORK_REQ,
+    MSG_ID_VDM_GMSS_SERVICE_SCAN_REQ,
+    MSG_ID_VDM_GMSS_ECBM_MODE_START_REQ,
+    MSG_ID_VDM_GMSS_ECBM_MODE_STOP_REQ,
+
+/* messages from NRRC */
+    MSG_ID_GMSS_NRRC_NR_AVAIL_UPDATE_IND,
+
+/* messages to ANY */
+    MSG_ID_GMSS_NR_AVAIL_UPDATE_REQ,
+
+/* messages from GMSS */
+    MSG_ID_GMSS_WORLD_PHONE_EVENT_IND,
+    MSG_ID_GMSS_PRIMARY_SIM_DUPLEX_MODE_CHANGE_IND,
+    MSG_ID_GMSS_DUPLEX_MODE_SWITCH_QUERY_REQ,
+    MSG_ID_GMSS_DUPLEX_MODE_SWITCH_QUERY_CNF,
+
+    MSG_ID_GMSS_CODE_END = MSG_ID_GMSS_DUPLEX_MODE_SWITCH_QUERY_CNF,
+MODULE_MSG_END( MSG_ID_GMSS_CODE_TAIL )
+/*----------------------- GMSS_MSG_CODE_END--------------------*/
+
+#endif // _GMSS_MSGID_H_
+
diff --git a/mcu/interface/sap/md/hal_l1_msgid.h b/mcu/interface/sap/md/hal_l1_msgid.h
new file mode 100644
index 0000000..4cfd204
--- /dev/null
+++ b/mcu/interface/sap/md/hal_l1_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) 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:
+ * ---------
+ * hal_l1_sap.h
+ *
+ * Project:
+ * --------
+ *   GSM_Software
+ *
+ * Description:
+ * ------------
+ *   2G Layer 1 and Protocol Stack related message identity definition for MMI/Middleware
+ *
+ * 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 _HAL_L1_MSGID_H
+#define _HAL_L1_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_HAL_L1_CODE_BEGIN )
+#if defined(__L1_GPS_REF_TIME_SUPPORT__) || defined(__L1_GPS_AUTO_TIMING_SYNC_SUPPORT__)
+/* Shihyao, add it to support GPS time sync procedure*/
+MSG_ID_HAL_L1_GPS_TIME_SYNC_REQ = MSG_ID_HAL_L1_CODE_BEGIN,
+MSG_ID_HAL_L1_GPS_TIME_SYNC_IND,
+#endif
+MODULE_MSG_END( MSG_ID_HAL_L1_CODE_TAIL )
+
+#endif  //_HAL_L1_MSGID_H
+
diff --git a/mcu/interface/sap/md/haplus_msgid.h b/mcu/interface/sap/md/haplus_msgid.h
new file mode 100644
index 0000000..81abf8a
--- /dev/null
+++ b/mcu/interface/sap/md/haplus_msgid.h
@@ -0,0 +1,207 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ * haplus_sap.h
+ *
+ * Project:
+ * --------
+ *   katla
+ *
+ * Description:
+ * ------------
+ *   air controller 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!
+ *============================================================================
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _HALPLUS_MSGID_H
+#define _HALPLUS_MSGID_H
+
+/* Request for air controller */
+#if defined (__UE_SIMULATOR__)
+MODULE_MSG_BEGIN(MSG_ID_HAPLUS_MSG_CODE_BEGIN)
+MSG_ID_HA_U_MSG_CODE_REQ_BEGIN = MSG_ID_HAPLUS_MSG_CODE_BEGIN,
+MSG_ID_HA_U_FIND_PSCH_REQ,
+MSG_ID_HA_U_FIND_SSCH_REQ,
+MSG_ID_HA_U_FIND_CPICH_REQ,
+MSG_ID_HA_U_FIND_PCCPCH_REQ,
+MSG_ID_HA_U_FIND_PICH_REQ,
+MSG_ID_HA_U_ENUM_DL_PATHS_REQ,
+MSG_ID_HA_U_ENUM_DL_PATHS_BY_PSC_REQ,
+MSG_ID_HA_U_CARRIER_RSSI_REQ,
+MSG_ID_HA_U_FIND_SCCPCH_REQ,
+MSG_ID_HA_U_FIND_DLDPCH_REQ,
+MSG_ID_HA_U_SEND_ULDPCH_REQ,
+MSG_ID_HA_U_FIND_AICH_REQ,
+MSG_ID_HA_U_SEND_PRACH_REQ, 
+MSG_ID_HA_U_FIND_HSSCCH_REQ,
+MSG_ID_HA_U_FIND_HSPDSCH_REQ,
+MSG_ID_HA_U_SEND_HSDPCCH_REQ,
+MSG_ID_HA_U_SEND_EDCH_REQ,
+MSG_ID_HA_U_FIND_EHICH_REQ,
+MSG_ID_HA_U_FIND_ERGCH_REQ,
+MSG_ID_HA_U_FIND_EAGCH_REQ,
+MSG_ID_HA_U_FIND_FDPCH_REQ,
+MSG_ID_HA_U_TIME_CONSUME_INFO_REQ,
+
+MSG_ID_HA_U_FIND_PSCH_CNF = MSG_ID_HAPLUS_MSG_CODE_BEGIN + 101,
+MSG_ID_HA_U_FIND_SSCH_CNF,
+MSG_ID_HA_U_FIND_CPICH_CNF,
+MSG_ID_HA_U_FIND_PCCPCH_CNF,
+MSG_ID_HA_U_FIND_PICH_CNF,
+MSG_ID_HA_U_ENUM_DL_PATHS_CNF,
+MSG_ID_HA_U_ENUM_DL_PATHS_BY_PSC_CNF,
+MSG_ID_HA_U_CARRIER_RSSI_CNF,
+MSG_ID_HA_U_FIND_SCCPCH_CNF,
+MSG_ID_HA_U_FIND_DLDPCH_CNF,
+MSG_ID_HA_U_SEND_ULDPCH_CNF,
+MSG_ID_HA_U_FIND_AICH_CNF,
+MSG_ID_HA_U_SEND_PRACH_CNF,
+MSG_ID_HA_U_FIND_HSSCCH_CNF,
+MSG_ID_HA_U_FIND_HSPDSCH_CNF,
+MSG_ID_HA_U_SEND_HSDPCCH_CNF,
+MSG_ID_HA_U_SEND_EDCH_CNF,
+MSG_ID_HA_U_FIND_EHICH_CNF,
+MSG_ID_HA_U_FIND_ERGCH_CNF,
+MSG_ID_HA_U_FIND_EAGCH_CNF,
+MSG_ID_HA_U_FIND_FDPCH_CNF,
+MSG_ID_HA_U_TIME_CONSUME_INFO_CNF,
+
+MODULE_MSG_END(MSG_ID_HAPLUS_MSG_CODE_TAIL)
+#endif
+
+#endif  //_HALPLUS_MSGID_H
+
diff --git a/mcu/interface/sap/md/hlp_msgid.h b/mcu/interface/sap/md/hlp_msgid.h
new file mode 100644
index 0000000..d2a2c7d
--- /dev/null
+++ b/mcu/interface/sap/md/hlp_msgid.h
@@ -0,0 +1,276 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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:
+ * ---------
+ *   hlp_msgid.h
+ *
+ * Description:
+ * ------------
+ *   This file defines the ILM messgae IDs for HLP task.
+ *
+ *
+ ****************************************************************************/
+
+#ifndef _HLP_MSG_ID_H
+#define _HLP_MSG_ID_H
+
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_CHLP_CODE_BEGIN )
+
+   MSG_ID_HLP_STARTUP_SIGNAL = MSG_ID_CHLP_CODE_BEGIN,
+   MSG_ID_HLP_FWD_DATA_IND_SIGNAL,
+   MSG_ID_HLP_REV_DATA_IND_SIGNAL,
+   MSG_ID_HLP_PPP_HA_DEC0_COMPLETE,
+   MSG_ID_HLP_PPP_HA_ENC0_COMPLETE,
+   MSG_ID_HLP_PPP_HA_DEC1_COMPLETE,
+   MSG_ID_HLP_PPP_HA_ENC1_COMPLETE,
+   MSG_ID_HLP_REV_DATA_DORM_SIGNAL,
+   MSG_ID_HLP_FWD_PKT_DATA_IND_SIGNAL,      /* for EHRPD */
+
+   MSG_ID_HLP_RLP_IDLE_IND_MSG,             /* alias: is7074RlpInactivityInd        */
+   MSG_ID_HLP_RLP_REV_DATA_RSP_MSG,         /* alias: is7074RlpTxComplete           */
+   MSG_ID_HLP_RLP_OPEN_FAILED_MSG,          /* 1x RLP fail to open.                 */
+   MSG_ID_HLP_PPP_CONNECT_REQ_MSG,          /* start PPP connection(s).             */
+   MSG_ID_HLP_PPP_RELEASE_REQ_MSG,          /* release PPP connection               */
+   MSG_ID_HLP_PPP_STATUS_MSG,               /* indicates change of PPP status       */
+   MSG_ID_HLP_ANSWER_REQ_MSG,               /* To answer a circuit switched data call. */
+   MSG_ID_HLP_TIMER_EXPIRED_MSG,            /* alias: is7074TimerExpired            */
+   MSG_ID_HLP_SYTEM_QUERY_RSP_MSG,          /* System query response                */
+   MSG_ID_HLP_CONNECTION_IND_MSG,           /* TCH connection response              */
+   MSG_ID_HLP_CONNECTION_RELEASED_IND_MSG,  /* TCH connection released.             */
+   MSG_ID_HLP_CONNECTION_FAILED_IND_MSG,    /* TCH connection failed.               */
+   MSG_ID_HLP_OOSA_IND_MSG,                 /* In/Out of service indicator          */
+   MSG_ID_HLP_DORMANT_RECONNECT_REQ_MSG,    /* to connect TCH.                      */
+   MSG_ID_HLP_POWER_REQ_MSG,                /* for powering down HLP                */
+   MSG_ID_HLP_UM_APP_INSTANCE_MSG,
+   MSG_ID_HLP_VOICE_CALL_RELEASE_MSG,       /* possible backoff timer activiation upon end of voice call. */
+
+   MSG_ID_HLP_SOCKET_CREATE_MSG,            /* create a TCP/UDP SAP for client.     */
+   MSG_ID_HLP_SOCKET_BIND_MSG,              /* bind address/port to a SAP that's created by a socket  */
+   MSG_ID_HLP_SOCKET_CONNECT_MSG,           /* connect a created socket             */
+   MSG_ID_HLP_SOCKET_CLOSE_MSG,             /* close a connected socket             */
+   MSG_ID_HLP_DORMANT_REQ_MSG,              /* alias: is7074BrowserDormantReq       */
+   MSG_ID_HLP_SOCKET_SEND_REQ_MSG,          /* raw data to be sent through TCP/UDP sockets at reverse link. */
+   MSG_ID_HLP_UPB_SEND_DATA_MSG,            /* alias: is7074BrowserSendDatagram     */
+   MSG_ID_HLP_UPB_RECV_DATA_RSP_MSG,
+   MSG_ID_HLP_TCPB_DATA_RECV_RSP_MSG,
+
+   MSG_ID_HLP_IPV6_SOCKET_CONNECT_MSG,
+
+   MSG_ID_HLP_OTAPA_UPDATE_IND_MSG,         /* Notification from PE when OTAPA completed  */
+   MSG_ID_HLP_SID_NID_CHANGE_IND_MSG,       /* 1X SID/NID change notification             */
+   MSG_ID_HLP_PKT_ZONE_ID_CHANGE_IND_MSG,   /* 1X Packet ZONE ID change notification      */
+   MSG_ID_HLP_SUBNET_ID_CHANGE_IND_MSG,     /* DO Subnet ID change notification           */
+   MSG_ID_HLP_COLOR_CODE_CHANGE_IND_MSG,    /* DO ColorCode change notification           */
+   MSG_ID_HLP_1X_MT_CONN_IN_NULL_IND_MSG,   /* 1X MT Connected in NULL state notification */
+
+   MSG_ID_HLP_ICMP_PING_REQ_MSG,
+
+   MSG_ID_HLP_MIP_RRP_MSG,                  /* alias to MIP is7074 calls            */
+   MSG_ID_HLP_MIP_AGENT_ADV_MSG,            /* alias to MIP is7074 calls            */
+   MSG_ID_HLP_MIP_UM_PPP_STATUS_MSG,        /* indicate major milestone for MIP PPP progress. */
+
+   MSG_ID_HLP_ALMP_CONN_OPENED_MSG,
+   MSG_ID_HLP_ALMP_CONN_FAILED_MSG,
+   MSG_ID_HLP_ALMP_CONN_RELEASED_MSG,
+   MSG_ID_HLP_ALMP_CONN_CLOSED_MSG,
+   MSG_ID_HLP_XOFF_RESP_RCVD_MSG,
+   MSG_ID_HLP_ACSTRM_XON_RESP_RCVD_MSG,
+
+   MSG_ID_HLP_SERVICE_STATUS_MSG,           /* Service status from PSW (1X) or ALMP (DO) */
+
+   /* test messages use only. */
+   MSG_ID_HLP_TEST_BROWSER_CONNECT_MSG,
+
+   MSG_ID_HLP_PURE_ACK_TAG_RATE_GET_ETS,
+   MSG_ID_HLP_PURE_ACK_TAG_RATE_SET_ETS,
+
+   MSG_ID_HLP_THROTTLING_TMR_STATUS_GET_ETS,
+
+   MSG_ID_HLP_VAL_DMUV_SET_MSG,
+   MSG_ID_HLP_PSWS_DMU_KEYGEN_RSP_MSG,
+   MSG_ID_HLP_PSWS_DMU_KEYENC_RSP_MSG,
+
+   MSG_ID_HLP_SOCKET_LISTEN_MSG,
+   MSG_ID_HLP_SOCKET_OPTION_MSG,
+   MSG_ID_HLP_SOCKET_SHUTDOWN_MSG,
+   MSG_ID_HLP_SOCKET_LINGER_MSG,
+
+   MSG_ID_HLP_VAL_CTA_UPDATE_REQ_MSG,
+
+   MSG_ID_HLP_DO_INACTIVITY_EXPR_MSG, //null message
+
+   /*PRI*/
+   MSG_ID_HLP_PARM_SET_MSG,
+   MSG_ID_HLP_PARM_GET_MSG,
+   MSG_ID_HLP_DBM_GET_ESN_MEID_RSP_MSG,
+
+   MSG_ID_HLP_DMU_SECURE_DATA_CHANGED_MSG,
+   MSG_ID_HLP_VAL_POWER_CYCLE_MSG,
+   MSG_ID_HLP_VAL_FLIGHT_MODE_MSG,
+
+   MSG_ID_HLP_PSW_MDN_UPDATED_MSG,
+   MSG_ID_HLP_UIM_SIP_CHAP_RSP_MSG,
+   MSG_ID_HLP_UIM_MIP_MNHA_AUTH_RSP_MSG,
+   MSG_ID_HLP_UIM_MIP_RRQ_HASH_RSP_MSG,
+   MSG_ID_HLP_UIM_MIP_MNAAA_AUTH_RSP_MSG,
+   MSG_ID_HLP_UIM_AKA_AUTH_RSP_MSG,
+   MSG_ID_HLP_UIM_ACCESS_CHAP_RESP_MSG,
+   MSG_ID_HLP_UIM_GET_3GPD_OPC_RSP_MSG,                   /* Get EFME3GPDOPC    */
+   MSG_ID_HLP_UIM_UPDATE_3GPD_OPC_RSP_MSG,                /* Update EFME3GPDOPC */
+   MSG_ID_HLP_UIM_GET_3GPD_OPM_RSP_MSG,                   /* Get EF3GPDOPM      */
+   MSG_ID_HLP_UIM_UPDATE_3GPD_OPM_RSP_MSG,                /* Update EF3GPDOPM   */
+   MSG_ID_HLP_UIM_GET_3GPD_SIPCAP_RSP_MSG,                /* Get EFSIPCAP       */
+   MSG_ID_HLP_UIM_GET_3GPD_MIPCAP_RSP_MSG,                /* Get EFMIPCAP       */
+   MSG_ID_HLP_UIM_GET_3GPD_SIPUPP_RSP_MSG,                /* Get EFSIPUPP       */
+   MSG_ID_HLP_UIM_GET_3GPD_MIPUPP_RSP_MSG,                /* Get EFMIPUPP       */
+   MSG_ID_HLP_UIM_GET_3GPD_SIPSP_RSP_MSG,                 /* Get EFSIPSP        */
+   MSG_ID_HLP_UIM_UPDATE_3GPD_SIPSP_RSP_MSG,              /* Update EFSIPSP     */
+   MSG_ID_HLP_UIM_GET_3GPD_MIPSP_RSP_MSG,                 /* Get EFMIPSP        */
+   MSG_ID_HLP_UIM_UPDATE_3GPD_MIPSP_RSP_MSG,              /* Update EFMIPSP     */
+   MSG_ID_HLP_UIM_GET_3GPD_SIPPAPSS_RSP_MSG,              /* Get SIPPAPSS       */
+   MSG_ID_HLP_UIM_UPDATE_3GPD_SIPPAPSS_RSP_MSG,           /* Update SIPPAPSS    */
+   MSG_ID_HLP_DORMANCY_TIMERS_SET_MSG,
+   MSG_ID_HLP_DORETRY_TIMERS_SET_MSG,
+
+   MSG_ID_HLP_UM_PPP_RENEGOTIATION_MSG,
+   MSG_ID_HLP_SET_NETWORK_OR_RELAY_MODE_MSG,
+
+   MSG_ID_HLP_UIM_NOTIFY_REGISTER_MSG,
+   MSG_ID_HLP_UIM_FILE_CHANGED_MSG,
+   MSG_ID_HLP_UIM_GET_HRPDCAP_RSP_MSG,
+   MSG_ID_HLP_UIM_GET_3GPDUPPEXT_RSP_MSG,
+   MSG_ID_HLP_UIM_GET_TCPCFG_RSP_MSG,
+   MSG_ID_HLP_UIM_GET_DGC_RSP_MSG,
+   MSG_ID_HLP_UIM_GET_MIPFLAGS_RSP_MSG,
+   MSG_ID_HLP_UIM_GET_IPV6CAP_RSP_MSG,
+   MSG_ID_HLP_UIM_GET_USIM_FILE_LENGTH_RSP_MSG,
+   MSG_ID_HLP_UIM_GET_USIM_UST_DATA_RSP_MSG,
+   MSG_ID_HLP_UIM_GET_USIM_EST_DATA_RSP_MSG,
+   MSG_ID_HLP_UIM_GET_USIM_ACL_DATA_RSP_MSG,
+
+
+   MSG_ID_IMS_APP_NETWK_CONN_REQ,
+   MSG_ID_IMS_APP_NETWK_REL_REQ, /* null msg */
+   MSG_ID_IMS_APP_SETUP_REQ,
+   MSG_ID_IMS_APP_REL_REQ,
+
+   MSG_ID_IMS_PPP_PDN_CONN_SET_UP_RSP,
+   MSG_ID_IMS_PPP_PDN_CONN_REL_RSP,
+   MSG_ID_IMS_PPP_PDN_REL_IND,
+   MSG_ID_IMS_IPV6_ADDR_CONFIG_RSP,
+   MSG_ID_IMS_CAM_PPP_UM_STATUS_IND,
+   MSG_ID_IMS_CAM_PPP_RM_STATUS_IND,
+   MSG_ID_IMS_QOM_FLOW_REQ_RSP,
+   MSG_ID_IMS_QOM_FLOW_REL_RSP,
+   MSG_ID_IMS_QOM_FLOW_REL_IND,
+   MSG_ID_IMS_QOM_FLOW_NTWK_INIT,
+
+   MSG_ID_IMS_RLP_EHRPD_ATTRIBUTE_MSG,
+   MSG_ID_IMS_APP_BEARER_REQ_MSG,
+
+   /*Message Ids for EAKA*/
+   MSG_ID_HLP_SEC_AKAAUTH_RSP_MSG,
+   MSG_ID_HLP_SEC_DERIVEMK_RSP_MSG,
+   MSG_ID_HLP_SEC_DERIVEREAUTHXKEY_RSP_MSG,
+   MSG_ID_HLP_SEC_DERIVEMSK_RSP_MSG,
+   MSG_ID_HLP_SEC_DERIVEMAC_RSP_MSG,
+   MSG_ID_HLP_SEC_AESCRYPT_RSP_MSG,
+   MSG_ID_HLP_GET_USIM_IMSI_RSP_MSG,
+   MSG_ID_HLP_GET_USIM_AD_RSP_MSG,
+
+   MSG_ID_HLP_RCP_RLPFLOW_PROTOCOL_INFO_MSG,
+   MSG_ID_HLP_FCP_RLPROUTE_CHANGED_MSG,
+
+   /*message between CSS and HLP*/
+   MSG_ID_HLP_DEFAULT_BEARER_CONN_REQ,
+   MSG_ID_HLP_CSS_NETWORK_REL_REQ,
+   MSG_ID_HLP_EPS_BEARER_SETUP_REQ,
+   MSG_ID_HLP_EPS_BEARER_DISCONN_REQ,
+   MSG_ID_HLP_DATA_CONNECTION_CMD,
+   MSG_ID_HLP_IRAT_SET_IPV6ADDR_CMD,
+   MSG_ID_HLP_VAL_UPDATE_PDN_INACTIVITY_TIMER_MSG,
+   MSG_ID_HLP_VAL_PCMT_PARA_MSG,
+   MSG_ID_HLP_SEND_PING_MSG,
+   MSG_ID_HLP_PPP_ROUTE_SET_MSG,
+   MSG_ID_HLP_AN_AUTH_ALGO_SET_MSG,
+
+   /* CHLP -> RATDM */
+   MSG_ID_RATDM_CHLP_UL_DATA_REQ,
+   MSG_ID_RATDM_CHLP_UL_BUFFER_STATUS_NTF,
+
+   /* SMP new message below */
+   MSG_ID_HLP_AMP_SUBNET_CHANGE_IND_MSG,
+   MSG_ID_HLP_CSS_DO_AUTH_FAIL_SLEEP_TIME_EXPIRY_IND,
+   MSG_ID_HLP_IDP_UPDATE_HO_EHRPD_ENABLE_IND,
+
+   /*VAL PSDM -> HLP*/
+   MSG_ID_VAL_HLP_PPP_CONNECT_REQ,
+   MSG_ID_VAL_HLP_PPP_DISCONNECT_REQ,
+   MSG_ID_VAL_HLP_PPP_UPDATE_REQ,
+
+   MSG_ID_VAL_HLP_EHRPD_BEARER_CONNECT_REQ,
+   MSG_ID_VAL_HLP_EHRPD_BEARER_DISCONNECT_REQ,
+
+   MSG_ID_VAL_HLP_CONNECTION_FALLBACK_CMD,   /* command HLP to fall back from eHRPD to 1x/HRPD */
+   MSG_ID_VAL_HLP_CONNECTION_SUSPEND_CMD,   /* HLP_DATA_CONNECTION_CMD */
+   MSG_ID_VAL_HLP_CONNECTION_RESUME_CMD,
+   MSG_ID_VAL_HLP_CONNECTION_DISABLE_CMD,
+   MSG_ID_VAL_HLP_CONNECTION_RESET_CMD,
+
+   MSG_ID_VAL_HLP_EAPNSYNC_DEFINE_REQ, /*EAPN info for sprint case*/
+
+   MSG_ID_VAL_HLP_NETWORK_REL_REQ, /* Release all data connections by one msg */
+
+   /* UT message below */
+   MSG_ID_HLP_PPP_DATA_REQ_MSG,
+   MSG_ID_HLP_PPP_DATA_IND_MSG,
+   MSG_ID_HLP_INIT_NVRAM_READ_MSG,
+   MSG_ID_HLP_UT_CONFIG_PARAM_MSG,
+
+   MSG_ID_HLP_IP_DATA_SEND_REQ_MSG,
+   MSG_ID_HLP_PSW_RSVAS_ABORT_REQ_MSG,
+   MSG_ID_HLP_PSW_CPC_CONNECT_IND_MSG,
+MODULE_MSG_END( MSG_ID_CHLP_CODE_TAIL )
+
+
+#endif /* _HLP_MSG_ID_H */
diff --git a/mcu/interface/sap/md/hsc_msgid.h b/mcu/interface/sap/md/hsc_msgid.h
new file mode 100644
index 0000000..0ee1baa
--- /dev/null
+++ b/mcu/interface/sap/md/hsc_msgid.h
@@ -0,0 +1,161 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+
+  FILE NAME:  hsc_msgid.h
+
+  DESCRIPTION:
+
+    This file contains the defenitions of all the HSC msg id's.
+    
+  HISTORY     :    
+    1.File Create by atlas.xu, 2016,2,4
+
+*****************************************************************************/
+
+#ifndef _HSC_MSG_ID_H
+#define _HSC_MSG_ID_H
+
+
+/*----------------------------------------------------------------------------
+     Command Message IDs, for FCP task, for HSC_CMD_MAILBOX, EXE_MAILBOX_1_ID
+     The message IDs for components shall also be put in here.
+     Satya: Add all the PKT_SIM related messages into the area that is defined
+     between #ifdef/#endif..Contact me, if you need any clarifications!.
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+
+
+MODULE_MSG_BEGIN( MSG_ID_HSC_CODE_BEGIN )
+    MSG_ID_HSC_MPA_MSGID_START =  MSG_ID_HSC_CODE_BEGIN,  
+    MSG_ID_MPA_RF_ANTENNA_REQUEST_MSG,
+    MSG_ID_MPA_RF_RELEASE_IND_MSG,
+    MSG_ID_MPA_RF_SHUTOFF_RSP_MSG,
+    MSG_ID_MPA_RF_ANTENNA_RELEASE_REQ_MSG,
+    MSG_ID_MPA_RF_ANTENNA_ASSIGN_MSG,
+    MSG_ID_MPA_RF_ANTENNA_REQUEST_CANCEL_MSG,
+    MSG_ID_HSC_MPA_MSGID_LAST,    
+
+    MSG_ID_HSC_SPDO_MSGID_START,
+    MSG_ID_HSC_IDP_HANDOFF_CMD_MSG,
+    MSG_ID_HSC_IDP_WAKE_CMD_MSG,
+    MSG_ID_HSC_IDP_SLEEP_CMD_MSG,
+    MSG_ID_HSC_IDP_SRCH_DONE_MSG,
+    MSG_ID_HSC_SLEEP_ACK_MSG,
+    MSG_ID_HSC_RMC_MINIACQ_RESULT_MSG,
+    MSG_ID_HSC_IDP_DISABLE_DO_SLOTTED_MSG,
+    MSG_ID_HSC_IDP_ENABLE_DO_SLOTTED_MSG,
+    MSG_ID_HSC_CLK_CAL_START_MSG,
+    MSG_ID_HSC_IDP_THAW_REQ_MSG,
+    MSG_ID_HSC_TIME_PROFILE_MSG,
+
+    MSG_ID_HSC_SPDO_INIT_WARM_MSG,
+    MSG_ID_HSC_RESYNC_IND_MSG,
+    MSG_ID_HSC_DO_RESYNC_DENIED_MSG,
+    MSG_ID_HSC_WAKE_IND_MSG,
+    MSG_ID_HSC_FREEZE_MSG,
+    MSG_ID_HSC_THAW_MSG,
+    MSG_ID_HSC_FM_RESULT_UPDATE_MSG,
+    MSG_ID_HSC_SP_RESYNC_RECORD_MSG,
+    MSG_ID_HSC_SPDO_MSGID_LAST,
+ 
+    MSG_ID_HSC_SP1X_MSGID_START,
+    MSG_ID_L1D_SLEEP_RDY_MSG,
+    MSG_ID_HSC_1X_PRIORITY_BOOST_MSG,
+    MSG_ID_HSC_DO_PRIORITY_BOOST_MSG,
+    MSG_ID_HSC_SP1X_MSGID_LAST,
+ 
+    MSG_ID_HSC_CMD_MSGID_START,
+    MSG_ID_L1D_OOSA_REQ_MSG,
+    MSG_ID_L1D_OOSA_CONT_MSG,
+    MSG_ID_L1D_OOSA_WAKEUP_MSG,
+    MSG_ID_HSC_CLC_OOSA_SLEEP_CMD_MSG,
+    MSG_ID_HSC_CLC_OOSA_CONT_CMD_MSG,
+    MSG_ID_HSC_CLC_OOSA_WAKE_CMD_MSG,
+    MSG_ID_HSC_RMC_OOSA_RDY_MSG,
+    MSG_ID_HSC_L1D_OOSA_RDY_MSG,
+    MSG_ID_HSC_ALTERNATE_AFC_MSG,
+    MSG_ID_HSC_SET_SHDR_SVDO_OP_MODE_MSG,
+    MSG_ID_HSC_SLEEPOVER_INT_COMP_MSG, 
+
+    /* IRAT */
+    MSG_ID_HSC_INSP_SUSPEND_SLEEP_CMD_MSG,
+    MSG_ID_LL1A_RMC_RAT_STATUS_IND_MSG,
+    MSG_ID_LL1A_RMC_MODE_STATUS_IND_MSG,
+    MSG_ID_LL1A_RMC_ACTIVE_MEASURE_INFO_IND_MSG,
+    MSG_ID_LL1A_EVSTANDBY_MEASURE_REQ_MSG,
+    MSG_ID_LL1A_EVSTANDBY_MEAS_DONE_IND_MSG,
+    MSG_ID_LL1A_EVSTANDBY_GAP_STOP_CNF_MSG,
+    MSG_ID_LL1A_EVSTANDBY_AUTO_GAP_END_REQ_MSG,
+    MSG_ID_LL1A_EVSTANDBY_AUTO_GAP_STOP_RES_MSG,
+    MSG_ID_LL1A_EVSTANDBY_AUTO_GAP_REQ_MSG,
+    MSG_ID_LL1A_EVSTANDBY_AUTO_GAP_REQ_CANCEL_MSG,
+    MSG_ID_LL1A_RMC_SET_RAT_REQ_MSG,
+    MSG_ID_HSC_LL1A_MSGID_LAST,
+    MSG_ID_HSC_CSS_SUSPEND_RESUME_CMD_MSG,
+    MSG_ID_HSC_C2K_SIM_INDEX_INFO_MSG,
+    MSG_ID_HSC_C2K_MMO_GAP_INFO_MSG,
+    MSG_ID_HSC_C2K_RTBA_CHANNEL_STATUS_INFO_MSG,
+    MSG_ID_HSC_C2K_HSC_MPA_STATUS_INFO_MSG,
+    MSG_ID_LL1A_EVSTANDBY_SPECIFIC_GAP_REQ_MSG,
+
+    MSG_ID_HSC_CLC_SIB8_INFO_CFG_MSG,
+    MSG_ID_HSC_SIB8_TIMING_SYNC_REQ,
+    MSG_ID_HSC_SIB8_TIMING_SYNC_CNF,
+    MSG_ID_HSC_SIB8_TIMING_STATE_TIMER_EXPIRY,
+    MSG_ID_HSC_RECOVER_TIMING_CNF,
+    MSG_ID_LL1A_L1D_MODE_STATUS_IND,
+    MSG_ID_LL1A_CLC_LTE_SCAN_C2K_ACTIVE_PARAMS_IND,
+    MSG_ID_LL1A_IDP_SIGNAL_PROTECT_STATUS_IND,
+    MSG_ID_LL1A_PSW_SIGNAL_PROTECT_STATUS_IND,
+    MSG_ID_HSC_INFINITE_SLEEP_REQ_MSG,    
+    MSG_ID_C2K_SLEEP_CTRL_MSG,
+    MSG_ID_HSC_FRC_SYNC_INFO_REPT_MSG,
+    MSG_ID_HSC_CSS_PSEUDO_SET_RAT_IND,
+	MSG_ID_HSC_CSS_SET_RAT_GAP_STOP_REQ,
+    MSG_ID_HSC_CMD_MSGID_LAST,
+
+    MSG_ID_IRQ_TO_HISR_SYSTIME,
+
+#if defined(__DYNAMIC_CACHE_LOCK_CENTRAL_CONTROL_SUPPORT__)
+    MSG_ID_XL1_DCLC_LOCK_UNLOCK_IND,
+    MSG_ID_EVL1_DCLC_LOCK_UNLOCK_IND,
+#endif
+MODULE_MSG_END( MSG_ID_HSC_CODE_TAIL )
+
+#endif
+
diff --git a/mcu/interface/sap/md/http_tls_msgid.h b/mcu/interface/sap/md/http_tls_msgid.h
new file mode 100644
index 0000000..067d554
--- /dev/null
+++ b/mcu/interface/sap/md/http_tls_msgid.h
@@ -0,0 +1,114 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   http_tls_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *
+ * Author:
+ * -------
+ *   
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 09 18 2020 jing.cui
+ * [MOLY00565295] Telus requirement  TELUS-v11.0_VoLTE-137 and TELUS-v11.0_VoLTE-138 DNS Failover
+ * specify_ip:interface part.
+ *
+ * 09 14 2020 jing.cui
+ * [MOLY00565295] Telus requirement  TELUS-v11.0_VoLTE-137 and TELUS-v11.0_VoLTE-138 DNS Failover
+ * specify IP:interface part.
+ *
+ * 09 01 2020 jing.cui
+ * [MOLY00565295] Telus requirement  TELUS-v11.0_VoLTE-137 and TELUS-v11.0_VoLTE-138 DNS Failover
+ * 	
+ * 	specify ip:interface part.
+ * 	EWSP0000149880
+ *
+ * 05 20 2019 vikas.srivastava
+ * [MOLY00407478] TLS checkin to SUBMARINE.DEV
+ * 	
+ * 	[MOLY00407478]	TLS Support
+ *
+ *
+ ****************************************************************************/
+
+#ifndef _HTTP_TLS_MSGID_H_
+#define _HTTP_TLS_MSGID_H_
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_HTTP_TLS_CODE_BEGIN )
+
+        /* APP -> HTTP */
+        MSG_ID_APP_HTTP_SET_CHANNEL_REQ=MSG_ID_HTTP_TLS_CODE_BEGIN,
+        MSG_ID_APP_HTTP_REMOVE_CHANNEL_REQ,
+        MSG_ID_APP_HTTP_REQUEST_REQ,
+        MSG_ID_APP_HTTP_CANCEL_REQUEST_REQ,
+        MSG_ID_APP_HTTP_POST_CONTENT_RSP,
+        MSG_ID_APP_HTTP_READ_CONTENT_IND,
+        MSG_ID_APP_HTTP_USERNAME_PASSWD_QUERY_RSP,
+        MSG_ID_APP_HTTP_CLEAR_REQ,
+        MSG_ID_APP_HTTP_CONFIG_REQ,
+        MSG_ID_APP_SOC_NOTIFY_IND, 
+        MSG_ID_APP_HTTP_FORCE_CLOSE_CONNECTION_IND,
+
+        /* HTTP -> APP */
+        MSG_ID_APP_HTTP_SET_CHANNEL_CNF,
+        MSG_ID_APP_HTTP_REMOVE_CHANNEL_CNF,
+        MSG_ID_APP_HTTP_REQUEST_CNF,
+        MSG_ID_APP_HTTP_CANCEL_REQUEST_CNF,
+        MSG_ID_APP_HTTP_POST_CONTENT_IND,
+        MSG_ID_APP_HTTP_READ_CONTENT_RSP,
+        MSG_ID_APP_HTTP_USERNAME_PASSWD_QUERY_IND,
+        MSG_ID_APP_HTTP_CLEAR_CNF,
+        MSG_ID_APP_HTTP_CONFIG_CNF,
+        MSG_ID_APP_HTTP_NOTIFY_IND,
+
+        /* < TLS SAP Starts > */
+        MSG_ID_APP_TLS_NOTIFY_IND,
+        MSG_ID_APP_TLS_ALERT_IND,
+
+MODULE_MSG_END( MSG_ID_HTTP_TLS_CODE_TAIL )
+#endif /* _HTTP_TLS_MSGID_H_ */
diff --git a/mcu/interface/sap/md/idc_md_msgid.h b/mcu/interface/sap/md/idc_md_msgid.h
new file mode 100644
index 0000000..a56c28a
--- /dev/null
+++ b/mcu/interface/sap/md/idc_md_msgid.h
@@ -0,0 +1,69 @@
+#include "module_msg_range.h"
+
+#ifndef _IDC_MD_MSGID_H
+#define _IDC_MD_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_IDC_MD_CODE_BEGIN )
+
+
+/* MSG FROM RX */
+MSG_ID_EL1_CH_IDC_FREQ_NTF,
+MSG_ID_NL1_CTRL_IDC_FREQ_NTF,
+MSG_ID_EL1_CH_IDC_FRAME_CFG_NTF,
+MSG_ID_NL1_CTRL_IDC_FRAME_CFG_NTF,
+MSG_ID_EL1_CH_IDC_SCH_NTF,
+MSG_ID_NL1_CTRL_IDC_SCH_NTF,
+MSG_ID_EL1_CH_IDC_DRX_CONFIG_NTF,
+MSG_ID_NL1_CTRL_IDC_DRX_CONFIG_NTF,
+MSG_ID_EL1_CH_IDC_HO_NTF,
+MSG_ID_NL1_CTRL_IDC_HO_NTF,
+MSG_ID_EL1_CH_IDC_RSVAS_SUSPEND_NTF,
+MSG_ID_NL1_CTRL_IDC_RSVAS_SUSPEND_NTF,
+MSG_ID_EL1_PHS_IDC_PSIM_SWAP_REQ,
+MSG_ID_NL1_SCHED_IDC_PSIM_SWAP_REQ,
+MSG_ID_EL1_PHS_IDC_PSIM_SWAP_PTN_UPDT_NTF,
+MSG_ID_NL1_SCHED_IDC_PSIM_SWAP_PTN_UPDT_NTF,
+MSG_ID_EL1_PHS_IDC_RX_GAP_SUSP_CNF,
+MSG_ID_NL1_SCHED_IDC_RX_GAP_SUSP_CNF,
+MSG_ID_EL1_IRT_IDC_ACTV_NTF,
+MSG_ID_NL1_CTRL_IDC_ACTV_NTF,
+MSG_ID_NL1_CTRL_IDC_BWP_NTF,
+MSG_ID_NL1_SCHED_IDC_SCELL_ACTV_NTF,
+
+/* MSG FROM TX */
+MSG_ID_EL1TX_IDC_SCELL_ACTV_NTF,
+MSG_ID_NL1TX_IDC_PROTECT_NTF,
+
+/* MSG FROM MEAS */
+MSG_ID_EL1_MPC_IDC_MEAS_OBJECT_NTF,
+MSG_ID_NL1_MPC_IDC_MEAS_OBJECT_NTF,
+
+/* MSG FROM EMAC */
+MSG_ID_EMAC_IDC_IDC_PROTECT_NTF,
+
+/* MSG FROM ERRC */
+MSG_ID_ERRC_IDC_IDC_CFG_NTF,
+MSG_ID_ERRC_IDC_IDC_LTE_PROTECT_NTF,
+MSG_ID_NCCCI_IDC_WIFI_CHANNEL_WRITE_RETRY_IND,
+MSG_ID_NCCCI_IDC_WIFI_CHANNEL_READY_TO_READ_IND,
+MSG_ID_NCCCI_IDC_BT_CHANNEL_WRITE_RETRY_IND,
+MSG_ID_NCCCI_IDC_BT_CHANNEL_READY_TO_READ_IND,
+
+MSG_ID_IDC_TDM_MD_SCHED_CMD,
+MSG_ID_IDC_LTE_INTF_DETECT_CMD,
+MSG_ID_IDC_NR_INTF_DETECT_CMD,
+
+#if (defined(CHIP10992))
+/* MSG FROM L5 */
+MSG_ID_IDC_NRTC_STATIC_CFG_REQ,
+#endif
+
+#if ((defined(__IDC_ENABLED__)) && (defined (__IDC_NRTC_ENABLE__)))
+MSG_ID_IDC_NRTC_DYNAMIC_CFG_REQ,
+MSG_ID_EL1_IDC_NRTC_TX_POWER_BREACH_THRESHOLD_IND,
+MSG_ID_NL1_IDC_NRTC_TX_POWER_BREACH_THRESHOLD_IND,
+#endif
+
+MODULE_MSG_END( MSG_ID_IDC_MD_CODE_TAIL )
+
+#endif
diff --git a/mcu/interface/sap/md/idc_msgid.h b/mcu/interface/sap/md/idc_msgid.h
new file mode 100644
index 0000000..447a44a
--- /dev/null
+++ b/mcu/interface/sap/md/idc_msgid.h
@@ -0,0 +1,123 @@
+#include "module_msg_range.h"
+
+#ifndef _IDC_MSGID_H
+#define _IDC_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_IDC_CODE_BEGIN )
+
+#if !defined (__IDC_L1SIM__)
+
+
+/***** SW MSG from MD to CONSYS *****/
+
+MSG_ID_IDC_LTE_DEFAULT_PARAM_IND,
+MSG_ID_IDC_NR_DEFAULT_PARAM_IND,
+MSG_ID_IDC_LTE_OPER_FREQ_IND,
+MSG_ID_IDC_NR_OPER_FREQ_IND,
+MSG_ID_IDC_LTE_WIFI_UNSAFE_FREQ_BMP_IND,
+MSG_ID_IDC_LTE_WIFI_DBDC_B0_UNSAFE_FREQ_BMP_IND,
+MSG_ID_IDC_LTE_WIFI_DBDC_B1_UNSAFE_FREQ_BMP_IND,
+MSG_ID_IDC_LTE_BT_UNSAFE_FREQ_BMP_IND,
+MSG_ID_IDC_NR_WIFI_UNSAFE_FREQ_BMP_IND,
+MSG_ID_IDC_NR_WIFI_DBDC_B0_UNSAFE_FREQ_BMP_IND,
+MSG_ID_IDC_NR_WIFI_DBDC_B1_UNSAFE_FREQ_BMP_IND,
+MSG_ID_IDC_NR_BT_UNSAFE_FREQ_BMP_IND,
+MSG_ID_IDC_LTE_DRX_PATTERN_IND,
+MSG_ID_IDC_NR_DRX_PATTERN_IND,
+MSG_ID_IDC_MD_IDC_R11_PARAM_IND,
+MSG_ID_IDC_MD_SW_MSG_ACK_IND,
+MSG_ID_IDC_LTE_TRX_GROUP_IND,
+MSG_ID_IDC_MD_IDC_INFO_IND,    // The first SW MSG for handshaking, the ID must be 17
+MSG_ID_IDC_NR_TRX_GROUP_IND,
+MSG_ID_IDC_MD_PATTERN_CFG_IND,
+
+/***** SW MSG from CONSYS to MD *****/
+
+MSG_ID_IDC_WIFI_DEFAULT_PARAM_NTF,
+MSG_ID_IDC_BT_DEFAULT_PARAM_NTF,
+MSG_ID_IDC_WIFI_OPER_FREQ_NTF,
+MSG_ID_IDC_BT_OPER_FREQ_NTF,
+MSG_ID_IDC_CONSYS_SEND_SW_MSG_CNF,
+#if !defined(CHIP10992)
+MSG_ID_IDC_WIFI_LAA_RELEASE_NTF,
+#else
+/****HW SIGNAL-> SW MSG transmit by ccci path: from modem to consys****/
+MSG_ID_IDC_LTE_STATE_IND,    //internal msg id:25
+MSG_ID_IDC_NR_STATE_IND,
+MSG_ID_IDC_LTE_SCELL_ACTV_IND,
+MSG_ID_IDC_NR_SCELL_ACTV_IND,
+MSG_ID_IDC_MD_TX_BWP_FW_IND,
+MSG_ID_IDC_MD_RX_BWP_FW_IND,
+MSG_ID_IDC_MD_TX_SUSP_IND,    //internal msg id:31
+
+/****HW SIGNAL-> SW MSG transmit by ccci path: from consys to modem****/
+MSG_ID_IDC_WIFI_MAX_POWER_BACKOFF_NTF,    //internal msg id:32
+MSG_ID_IDC_WIFI_ACTV_BSS_NTF,
+MSG_ID_IDC_WIFI_LAA_RELEASE_NTF,
+MSG_ID_IDC_BT_MAX_POWER_BACKOFF_NTF,
+MSG_ID_IDC_CONSYS_RESEND_NTF,
+MSG_ID_IDC_CONSYS_TDM_NTF,
+
+MSG_ID_IDC_LTE_INT_DETECT_IND,
+MSG_ID_IDC_NR_INT_DETECT_IND,
+#endif
+
+#else
+
+MSG_ID_IDC_LTE_DEFAULT_PARAM_IND_ILM,
+MSG_ID_IDC_NR_DEFAULT_PARAM_IND_ILM,
+MSG_ID_IDC_LTE_OPER_FREQ_IND_ILM,
+MSG_ID_IDC_NR_OPER_FREQ_IND_ILM,
+MSG_ID_IDC_LTE_WIFI_UNSAFE_FREQ_BMP_IND_ILM,
+MSG_ID_IDC_LTE_WIFI_DBDC_B0_UNSAFE_FREQ_BMP_IND_ILM,
+MSG_ID_IDC_LTE_WIFI_DBDC_B1_UNSAFE_FREQ_BMP_IND_ILM,
+MSG_ID_IDC_LTE_BT_UNSAFE_FREQ_BMP_IND_ILM,
+MSG_ID_IDC_NR_WIFI_UNSAFE_FREQ_BMP_IND_ILM,
+MSG_ID_IDC_NR_WIFI_DBDC_B0_UNSAFE_FREQ_BMP_IND_ILM,
+MSG_ID_IDC_NR_WIFI_DBDC_B1_UNSAFE_FREQ_BMP_IND_ILM,
+MSG_ID_IDC_NR_BT_UNSAFE_FREQ_BMP_IND_ILM,
+MSG_ID_IDC_LTE_DRX_PATTERN_IND_ILM,
+MSG_ID_IDC_NR_DRX_PATTERN_IND_ILM,
+MSG_ID_IDC_MD_IDC_R11_PARAM_IND_ILM,
+MSG_ID_IDC_MD_SW_MSG_ACK_IND_ILM,
+MSG_ID_IDC_LTE_TRX_GROUP_IND_ILM,
+MSG_ID_IDC_MD_IDC_INFO_IND_ILM,    // The first SW MSG for handshaking, the ID must be 17
+MSG_ID_IDC_NR_TRX_GROUP_IND_ILM,
+MSG_ID_IDC_MD_PATTERN_CFG_IND_ILM,
+
+/***** SW MSG from CONSYS to MD *****/
+
+MSG_ID_IDC_WIFI_DEFAULT_PARAM_NTF_ILM,
+MSG_ID_IDC_BT_DEFAULT_PARAM_NTF_ILM,
+MSG_ID_IDC_WIFI_OPER_FREQ_NTF_ILM,
+MSG_ID_IDC_BT_OPER_FREQ_NTF_ILM,
+MSG_ID_IDC_CONSYS_SEND_SW_MSG_CNF_ILM,
+#if !defined(CHIP10992)
+MSG_ID_IDC_WIFI_LAA_RELEASE_NTF_ILM,
+#else
+/****HW SIGNAL-> SW MSG transmit by ccci path: from modem to consys****/
+MSG_ID_IDC_LTE_STATE_IND_ILM,    //internal msg id:25
+MSG_ID_IDC_NR_STATE_IND_ILM,
+MSG_ID_IDC_LTE_SCELL_ACTV_IND_ILM,
+MSG_ID_IDC_NR_SCELL_ACTV_IND_ILM,
+MSG_ID_IDC_MD_TX_BWP_FW_IND_ILM,
+MSG_ID_IDC_MD_RX_BWP_FW_IND_ILM,
+MSG_ID_IDC_MD_TX_SUSP_IND_ILM,    //internal msg id:31
+
+/****HW SIGNAL-> SW MSG transmit by ccci path: from consys to modem****/
+MSG_ID_IDC_WIFI_MAX_POWER_BACKOFF_NTF_ILM,    //internal msg id:32
+MSG_ID_IDC_WIFI_ACTV_BSS_NTF_ILM,
+MSG_ID_IDC_WIFI_LAA_RELEASE_NTF_ILM,
+MSG_ID_IDC_BT_MAX_POWER_BACKOFF_NTF_ILM,
+MSG_ID_IDC_CONSYS_RESEND_NTF_ILM,
+MSG_ID_IDC_CONSYS_TDM_NTF_ILM,
+
+MSG_ID_IDC_LTE_INT_DETECT_IND_ILM,
+MSG_ID_IDC_NR_INT_DETECT_IND_ILM,
+#endif
+
+#endif
+
+MODULE_MSG_END( MSG_ID_IDC_CODE_TAIL )
+
+#endif
diff --git a/mcu/interface/sap/md/imc_msgid.h b/mcu/interface/sap/md/imc_msgid.h
new file mode 100644
index 0000000..c4ccce8
--- /dev/null
+++ b/mcu/interface/sap/md/imc_msgid.h
@@ -0,0 +1,392 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   imc_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ ****************************************************************************/
+
+#ifndef _IMC_MSGID_H_
+#define _IMC_MSGID_H_
+
+#include "module_msg_range.h"
+
+#define IMC_IN_RANGE (800)
+
+	/*------------------- IMC_MSG_CODE_BEGIN---------------------*/
+MODULE_MSG_BEGIN( MSG_ID_IMC_CODE_BEGIN )
+
+  /* { */
+  MSG_ID_IMC_BEGIN,
+
+  /* -----------------------------------------------------*/
+  /* this is for vm external messages */
+  /* -----------------------------------------------------*/
+  MSG_ID_IMC_EX_BEGIN,
+
+    /* with ims proxy */
+    MSG_ID_ATP_IMC_BEGIN,
+      /* inject */ 
+      MSG_ID_ATP_IMC_LOOP_TEST_RSP,
+
+      MSG_ID_ATP_IMC_UE_MODE_UPDATE_REQ,
+      MSG_ID_ATP_IMC_IMSVOPS_NOTIFICATION_REQ,
+      MSG_ID_ATP_IMC_CELL_INFO_UPDATE_REQ,
+      MSG_ID_ATP_IMC_EIMSINFO_REQ,
+      MSG_ID_ATP_IMC_POWER_OFF_REQ,
+      MSG_ID_ATP_IMC_OOS_START_REQ,
+      MSG_ID_ATP_IMC_OOS_END_REQ,
+      MSG_ID_ATP_IMC_EMB_S1_SUPP_REQ,
+      MSG_ID_ATP_IMC_INTER_RAT_STATUS_IND,
+      MSG_ID_ATP_IMC_AUTO_FAST_RETURN_IND,
+      MSG_ID_ATP_IMC_CS_CALL_STATUS_IND,
+      MSG_ID_ATP_IMC_MT_CS_PAGING_IND,
+      MSG_ID_ATP_IMC_RLM_EVENT_IND,
+      MSG_ID_ATP_IMC_IMS_DEREG_REQ,
+      MSG_ID_ATP_IMC_EMB_SUPPORT_REQ,
+
+      /* USSI */
+      MSG_ID_ATP_IMC_SEND_USSD_REQ,
+
+      /* ss */
+      MSG_ID_ATP_IMC_SS_BEGIN,
+        MSG_ID_ATP_IMC_SS_CONFERENCE_CONTROL_REQ,        
+        MSG_ID_ATP_IMC_SS_ECT_REQ,
+        /* +EAPPROVE */
+        MSG_ID_ATP_IMC_SS_FDN_CHECK_CNF,
+      MSG_ID_ATP_IMC_SS_END,
+
+      /* cc */
+      MSG_ID_ATP_IMC_CC_BEGIN,
+        /* +ECCTRL */
+        MSG_ID_ATP_IMC_CALL_CONTROL_V2_REQ,
+        /* +EAPPROVE */
+        MSG_ID_ATP_IMC_FDN_ECC_CHECK_CNF,
+      MSG_ID_ATP_IMC_CC_END,
+
+      /* configure */
+      MSG_ID_ATP_IMC_ECFG_SET_REQ, // ATP --> IMC      
+      MSG_ID_ATP_IMC_ECFG_GET_REQ, // ATP --> IMC
+      MSG_ID_ATP_IMC_ECFG_RESET_REQ, // ATP --> IMC      
+      MSG_ID_ATP_IMC_EPVS_SET_REQ, // ATP --> IMC
+      MSG_ID_ATP_IMC_EPVS_GET_REQ, // ATP --> IMC
+      MSG_ID_ATP_IMC_EMOCFG_REQ,   // ATP-->IMC
+      
+      /* AT+CDU=0 */
+      MSG_ID_ATP_IMC_QUERY_URI_TYPE_REQ,
+
+      /* +ESRFAIL:<cause> */
+      MSG_ID_ATP_IMC_SERVICE_REQUEST_FAIL_REQ,
+
+      /* timer testing */
+      MSG_ID_ATP_IMC_TIMER_TEST_REQ,
+      MSG_ID_ATP_IMC_TIMER_TEST_CNF,
+
+      /* emergency access id, requirement for AT&T */
+      MSG_ID_ATP_IMC_SET_EMERGENCY_AID_REQ,
+
+      /* AT+CISRVCC */
+      MSG_ID_ATP_IMC_CISRVCC_REQ,
+      MSG_ID_ATP_IMC_CISRVCC_CNF,
+      
+      /* AT+EWFCP */
+      MSG_ID_ATP_IMC_WFC_PROFILE_REQ,
+
+      /* AT+EIMSRCS */
+      MSG_ID_ATP_IMC_RCS_FEATURE_REQ,
+      MSG_ID_ATP_IMC_SWITCH_PREFER_RAT_REQ,
+
+      /* AT+ECMPCID */
+      MSG_ID_ATP_IMC_CAMPED_CELL_ID_UPDATE_REQ,
+
+      /* AT+ESIPHEADER */
+      MSG_ID_ATP_IMC_SIP_HEADER_REQ,
+
+      /* RTT */
+      MSG_ID_ATP_IMC_RTT_CAPABILITY_REQ,
+      MSG_ID_ATP_IMC_CC_RTT_OP_REQ,
+      
+      /* +CIEV */
+      MSG_ID_ATP_IMC_C2K_ECBM_STATE_IND, //ATP to IMC
+      
+      /* +EC2KCI */
+      MSG_ID_ATP_IMC_C2K_1X_CALL_STATUS_IND,  //ATP to IMC
+
+      /* +ETAUFAIL */
+      MSG_ID_ATP_IMC_TAU_FAIL_IND,
+      /* +CEPSFBS */
+      MSG_ID_ATP_IMC_EPSFB_IND,
+
+      /* AT CMD relay */
+      MSG_ID_ATP_IMC_ATCMD_RELAY_REQ,
+
+      /* AT+EIMSEVS */
+      MSG_ID_ATP_IMC_SET_EVS_SUPPORT_REQ,
+
+      /* AT+EVVS */
+      MSG_ID_ATP_IMC_VOICE_DOMAIN_STATUS_IND,
+
+      /* AT+EMULTIIMS? */
+      MSG_ID_ATP_IMC_MIMS_CAPABILITY_REQ,
+
+      /* AT+ECNCFG */
+      MSG_ID_ATP_IMC_ECNCFG_REQ,
+
+      /* +ENW */
+      MSG_ID_ATP_IMC_NW_SEARCH_STATUS_IND,
+
+      /* AT+ECFGDRP */
+      MSG_ID_ATP_IMC_DUMP_RUNTIME_PARA_REQ,
+      /* AT+EIMSGEO */
+      MSG_ID_ATP_IMC_EIMSGEO_REQ,
+	  
+	  /*AT+CSCM*/
+      MSG_ID_IMC_ATP_IMS_NORMAL_REG_CSCM_CNF,
+      
+      /* AT+EVOLTESI */
+      MSG_ID_ATP_IMC_EVOLTESI_CONFIG_IND,
+
+      /* +EGMR */
+      MSG_ID_ATP_IMC_QUERY_IMEI_SVN_CNF,	  
+    MSG_ID_ATP_IMC_END,
+
+    /* with vdm */
+    MSG_ID_VDM_IMC_BEGIN,
+
+      MSG_ID_VDM_IMC_CC_BEGIN,
+        MSG_ID_VDM_IMC_SRVCC_STATUS_UPDATE_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_MO_CALL_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_MO_CALL_DOMAIN_CONFLICT_IND,
+        MSG_ID_VDM_IMC_IMS_CC_MO_CONF_CALL_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_MT_CALL_PRESENT_RSP,
+        MSG_ID_VDM_IMC_IMS_CC_MT_CALL_ACCEPT_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_MT_VT_SPECIAL_ACCEPT_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_FORCE_HANGUP_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_SEND_DIGIT_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_START_SEND_DIGIT_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_STOP_SEND_DIGIT_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_SET_HVOLTE_CALL_DOMAIN_REQ,
+        MSG_ID_VDM_IMC_ECBM_START_IND,
+        MSG_ID_VDM_IMC_ECBM_END_IND,
+        MSG_ID_VDM_IMC_IS_CS_ALLOWED_CNF,
+        MSG_ID_VDM_IMC_IMS_CC_STK_CALL_REQ,
+#if defined(__NG_ECALL_SUPPORT__)
+        MSG_ID_VDM_IMC_UPDATE_MSD_RSP,
+        MSG_ID_VDM_IMC_IN_BAND_MSD_TRANSFER_RSP,
+#endif
+      MSG_ID_VDM_IMC_CC_END,
+      
+      MSG_ID_VDM_IMC_SS_BEGIN,
+        MSG_ID_VDM_IMC_IMS_CC_CALL_RELATED_SS_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_EXT_ERROR_REPORT_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_HANGUP_ALL_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_LIST_CURRENT_CALLS_REQ,
+        MSG_ID_VDM_IMC_IMS_CC_ALLOC_CONF_CALL_RSP,
+      MSG_ID_VDM_IMC_SS_END,
+
+      MSG_ID_VDM_IMC_NORMAL_SERVICE_SCAN_RSP,
+      MSG_ID_VDM_IMC_C2K_1X_CALL_STATUS_IND,
+    MSG_ID_VDM_IMC_END,
+
+    /* with lte csr */
+    MSG_ID_IMC_LTECSR_BEGIN,
+      MSG_ID_IMC_LTECSR_LOOP_TEST_REQ,
+      MSG_ID_IMC_LTECSR_LOOP_TEST_CNF,
+      MSG_ID_LTECSR_MEDIA_NO_DLPKT,
+      MSG_ID_LTECSR_MEDIA_NO_ULPKT,
+      MSG_ID_LTECSR_MEDIA_INCOMING_DLPKT,
+      MSG_ID_LTECSR_MEDIA_ANBR_NOTIFY_IND,/*ANBR notify UA for SIP negotiation*/
+      MSG_ID_LTECSR_MEDIA_ANBR_NOTIFY_RSP,/*UA tells SIP negotiation based on ANBR fails*/
+    MSG_ID_IMC_LTECSR_END,
+
+    MSG_ID_IMCSMS_IMC_BEGIN,
+      MSG_ID_IMCSMS_IMC_SEND_SMS_REQ,
+      MSG_ID_IMCSMS_IMC_RECV_SMS_RSP,
+      MSG_ID_IMCSMS_IMC_SEND_C2K_SMS_REQ,
+      MSG_ID_IMCSMS_IMC_RECV_C2K_SMS_RSP,
+      MSG_ID_IMCSMS_IMC_REL_SMS_REQ,
+      MSG_ID_IMCSMS_IMC_ABORT_SEND_SMS_REQ,
+      MSG_ID_IMCSMS_IMC_ABORT_RECV_SMS_REQ,
+      MSG_ID_IMCSMS_IMC_SMS_EMERGENCY_REG_REQ,
+    MSG_ID_IMCSMS_IMC_END,
+
+    /* with LBS */
+    MSG_ID_IMC_LBS_BEGIN,
+      MSG_ID_IMC_LBS_POS_IND,
+    MSG_ID_IMC_LBS_END,
+
+    /* with IWLAN */
+    MSG_ID_IMC_IWLAN_BEGIN,
+      MSG_ID_IMC_IWLAN_IMS_CFG_IND,
+      MSG_ID_IMC_IWLAN_IMS_DEREG_IND,
+      MSG_ID_IMC_IWLAN_IMS_AVAILRAT_IND,
+      MSG_ID_IMC_IWLAN_IMS_ECC_HO_RSP,
+    MSG_ID_IMC_IWLAN_END,
+
+    /* with D2 */
+    MSG_ID_D2_IMC_BEGIN,
+      MSG_ID_D2_IMC_IMS_DEREG_REQ,
+    MSG_ID_D2_IMC_END,
+
+    /* DSBP internal */
+    MSG_ID_L4_IMC_BEGIN,    
+      MSG_ID_IMC_DSBP_RECONFIGURE_REQ,
+      MSG_ID_L4C_IMC_RAT_OPERATION_IND,
+      MSG_ID_L4C_IMC_CS_SERVICE_NOTIFICATION_IND,
+      MSG_ID_L4C_IMC_EPSFB_IND,
+    MSG_ID_L4_IMC_END,
+
+    /* with UPCM */
+    MSG_ID_IMC_UPCM_BEGIN,
+      MSG_ID_IMC_UPCM_SERVICE_REQUEST_FAIL_IND,
+    MSG_ID_IMC_UPCM_END,
+
+    /* with SDM */
+    MSG_ID_IMC_SDM_BEGIN,
+      MSG_ID_SDM_IMC_SCBM_START_IND,
+      MSG_ID_SDM_IMC_SCBM_STOP_IND,
+    MSG_ID_IMC_SDM_END,
+
+    /* with DHL */
+    MSG_ID_DHL_IMC_BEGIN,
+        MSG_ID_DHL_IMC_DBG_LOG_IND,
+        MSG_ID_DHL_IMC_EM_DUMP_NVRAM_IND,
+    MSG_ID_DHL_IMC_END,
+
+    MSG_ID_IMC_DUMP_IMS_PROFILE_NTF,
+
+    /* with XCAP */
+    MSG_ID_XCAP_IMC_BEGIN,
+      MSG_ID_XCAP_IMC_IMS_DEREG_REQ,
+    MSG_ID_XCAP_IMC_END,
+
+    /* with SSDS */
+    MSG_ID_IMC_SSDS_BEGIN,
+      MSG_ID_SSDS_IMC_USSD_ATCMD_REQ,
+    MSG_ID_IMC_SSDS_END,
+
+    /* with IMSUA */
+    MSG_ID_IMC_IMSUA_BEGIN,
+      MSG_ID_IMC_IMSUA_EVOLTESI_CALL_STATUS_IND,
+    MSG_ID_IMC_IMSUA_END,
+
+    /* with IMS_STACK */
+    MSG_ID_IMC_IMS_STACK_BEGIN,
+      MSG_ID_REGUA_IMC_REMAIN_TIME_IND,
+    MSG_ID_IMC_IMS_STACK_END,
+
+
+  MSG_ID_IMC_EX_END,
+  /* } */
+
+  MSG_ID_IMC_IN_BEGIN,
+
+    MSG_ID_IMC_IMC_BEGIN,
+      MSG_ID_IMC_IMC_INJECT_EM_CFG_IND,
+      MSG_ID_IMC_IMC_EXTQ_WAKE_REQ,
+
+      MSG_ID_IMC_IMC_LOOP_TEST_IND,
+      MSG_ID_IMC_IMC_LOOP_TEST_RSP,
+
+      MSG_ID_IMC_IMC_STARTUP_REQ,
+
+      /* IMS IMC-manager */
+      MSG_ID_IMC_IMC_MNGR_BEGIN,
+        MSG_ID_IMC_IMC_MNGR_DUMP_CONTEXT_IND,
+      MSG_ID_IMC_IMC_MNGR_END,
+
+      /* IMS IMC-Registration */
+      MSG_ID_IMC_IMC_MNGR_REG_BEGIN,
+        MSG_ID_IMC_IMC_MNGR_REG_EVENT_REQ,
+        MSG_ID_IMC_IMC_MNGR_REG_STARTUP_REQ,
+
+        MSG_ID_IMC_IMC_MNGR_REG_DEREG_REQ,
+        MSG_ID_IMC_IMC_MNGR_REG_DEREG_CNF,
+        MSG_ID_IMC_IMC_MNGR_REG_EMERGENCY_REG_REQ,
+        MSG_ID_IMC_IMC_MNGR_REG_EMERGENCY_REG_CNF,
+        MSG_ID_IMC_IMC_MNGR_SMS_REG_EMERGENCY_REG_CNF,
+        MSG_ID_IMC_IMC_MNGR_REG_EMERGENCY_DEREG_REQ,
+        MSG_ID_IMC_IMC_MNGR_REG_EMERGENCY_DEREG_CNF,
+        MSG_ID_IMC_IMC_MNGR_REG_EMERGENCY_CALL_REJ_IND,
+
+        MSG_ID_IMC_IMC_MNGR_REG_LOOP_TEST_REQ,
+        MSG_ID_IMC_IMC_MNGR_REG_LOOP_TEST_CNF,
+      MSG_ID_IMC_IMC_MNGR_REG_END,
+
+      /* IMS IMC-CC */
+      MSG_ID_IMC_IMC_MNGR_CC_BEGIN,
+        MSG_ID_IMC_IMC_MNGR_CC_EVENT_REQ,
+        MSG_ID_IMC_IMC_MNGR_CC_STARTUP_REQ,
+        MSG_ID_IMC_IMC_MNGR_CC_ALLOC_CONF_CTXT_REQ,     // related to MSG_ID_IMC_IMC_MNGR_SS_ALLOC_CONF_CTXT_CNF
+        MSG_ID_IMC_IMC_MNGR_CC_FREE_CONF_CTXT_REQ,      // related to MSG_ID_IMCB_IMC_SS_CREATE_CONFERENCE_CALL_RSP, NO CNF of this MSG
+        MSG_ID_IMC_IMC_MNGR_CC_MO_HANGUP_REQ,          // related to AT+CHLD = 1x
+
+        MSG_ID_IMC_IMC_MNGR_CC_LOOP_TEST_REQ,
+        MSG_ID_IMC_IMC_MNGR_CC_LOOP_TEST_CNF,
+      MSG_ID_IMC_IMC_MNGR_CC_END,
+
+      MSG_ID_IMC_IMC_MNGR_SMSIP_BEGIN,
+        MSG_ID_IMC_IMC_MNGR_SMSIP_LOOP_TEST_REQ,
+        MSG_ID_IMC_IMC_MNGR_SMSIP_LOOP_TEST_CNF,
+      MSG_ID_IMC_IMC_MNGR_SMSIP_END,
+
+      MSG_ID_IMC_IMC_MNGR_SS_BEGIN,
+        MSG_ID_IMC_IMC_MNGR_SS_ALLOC_CONF_CTXT_CNF,
+      MSG_ID_IMC_IMC_MNGR_SS_END,
+    MSG_ID_IMC_IMC_END,
+
+  MSG_ID_IMC_IN_END = MSG_ID_IMC_IN_BEGIN + IMC_IN_RANGE,
+
+  MSG_ID_IMC_END,
+
+MODULE_MSG_END( MSG_ID_IMC_CODE_TAIL )
+    /*------------------- IMC_MSG_CODE_END-----------------------*/
+
+
+#endif /* _IMC_MSGID_H_ */
diff --git a/mcu/interface/sap/md/imcb_msgid.h b/mcu/interface/sap/md/imcb_msgid.h
new file mode 100644
index 0000000..3ab884c
--- /dev/null
+++ b/mcu/interface/sap/md/imcb_msgid.h
@@ -0,0 +1,466 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   imcb_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 03 22 2022 yung-liang.tsou
+ * [MOLY00784440] [FeatureDevelopment][ALPSAR06354999][Gen97/98][AT&T][v21.3][CDR-LTE-1447][CDR-IMS-1210] IMS voice not available when PDN reject casue 28, 33
+ * .imcb msg id
+ *
+ * 12 16 2021 xin.ni
+ * [MOLY00774161] [mt2735][CS eCall][NG eCall][patch back] ecall patch back from NR15.R3.MD700.MP.ECAll.DEV
+ * 	
+ * 	.
+ *
+ * 12 06 2021 xin.ni
+ * [MOLY00774161] [mt2735][CS eCall][NG eCall][patch back] ecall patch back from NR15.R3.MD700.MP.ECAll.DEV
+ * 	SWRD interface Part.
+ * 	.
+ *
+ * 05 18 2021 ot_hui.tu
+ * [MOLY00389007] eCall over IMS IMC interface part
+ * 	
+ * 	.
+ *
+ * 08 26 2019 jani.manninen
+ * [MOLY00433041] [Gen97][EPSFB] IT related issues
+ * 	
+ * 	VMOLY.APOLLO.SQC - IMS 5G Voice Support Changes
+ *
+ * 08 14 2019 jani.manninen
+ * [MOLY00431826] [VONR] IMC Changes for 5G Voice Support - SAP
+ * 	
+ * 	VMOLY.V.5GVOICE.DEV - SAP - SWRD
+ *
+ * 01 08 2019 mika.leinonen
+ * [MOLY00367126] [Gen97][IMS] VoLTE porting
+ * Adding IMS interfaces to trace database.
+ *
+ * 12 31 2018 huifeng.jing
+ * [MOLY00375660] [IMS][Gen97 submarine] VTS interface developments
+ * remove build error.
+ *
+ * 12 29 2018 huifeng.jing
+ * [MOLY00375660] [IMS][Gen97 submarine] VTS interface developments
+ * ims_hif over tty.
+ *
+ * 12 21 2018 szu-chieh.chiu
+ * [MOLY00366884] [IMS][Gen97] IMCB related developments
+ * [Gen97] Tracing.
+ * 	1. DHL logging event: dump sim_context
+ *
+ * 12 18 2018 johnson.liu
+ * [MOLY00373083] [Gen97][Submarine][IMC]Pcscf address discovery via sim by imc
+ * patch back to dev.
+ *
+ * 12 11 2018 joni.huttula
+ * [MOLY00372130] [Gen97][IMS] MSG_ID change and some bug fix to run UT.
+ *
+ * 12 11 2018 joni.huttula
+ * [MOLY00372130] [Gen97][IMS] MSG_ID change and some bug fix to run UT.
+ *
+ ****************************************************************************/
+
+#ifndef _IMCB_MSGID_H_
+#define _IMCB_MSGID_H_
+
+#include "module_msg_range.h"
+
+/*------------------- IMCB_MSG_CODE_BEGIN---------------------*/
+MODULE_MSG_BEGIN( MSG_ID_IMCB_CODE_BEGIN )
+
+    MSG_ID_IMCB_BEGIN,
+
+    MSG_ID_IMCB_EX_BEGIN,
+
+    /* with IMSM */
+    MSG_ID_IMSM_IMCB_BEGIN,
+
+        MSG_ID_IMSM_IMCB_PDN_ACT_PROGRESSING_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_PDN_ACT_ACK_RSP,
+        MSG_ID_IMSM_IMCB_PDN_ACT_REJ_RSP,
+
+        MSG_ID_IMSM_IMCB_DEDICATED_BEARER_ACT_IND,
+        MSG_ID_IMSM_IMCB_DEDICATED_BEARER_ACT_ACK_RSP,
+        MSG_ID_IMSM_IMCB_DEDICATED_BEARER_ACT_REJ_RSP,
+        MSG_ID_IMSM_IMCB_DEDICATED_BEARER_ACT_NOTIFY_REQ,
+
+        MSG_ID_IMSM_IMCB_DEACT_ACK_RSP,
+        MSG_ID_IMSM_IMCB_DEACT_REJ_RSP,
+        MSG_ID_IMSM_IMCB_DEACT_NOTIFY_REQ,
+
+        MSG_ID_IMSM_IMCB_MODIFY_ACK_RSP,
+        MSG_ID_IMSM_IMCB_MODIFY_REJ_RSP,
+        MSG_ID_IMSM_IMCB_MODIFY_NOTIFY_REQ,
+
+        MSG_ID_IMSM_IMCB_PDN_BEARER_UPDATE_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_HANDOVER_START_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_HANDOVER_STOP_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_HANDOVER_IP_READY_NOTIFY_REQ,
+
+        MSG_ID_IMSM_IMCB_UPDATE_IPV4_GLOBAL_ADDR_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_UPDATE_IPV6_GLOBAL_ADDR_NOTIFY_REQ,
+        MSG_ID_IMSM_IMCB_IRAT_WITHOUT_IP_CHANGE_REQ,
+
+        MSG_ID_IMSM_IMCB_PCO_UPDATE_REQ,
+
+        MSG_ID_IMSM_IMCB_RESET_SUGGESTION_TIMER_REQ,
+        MSG_ID_IMSM_IMCB_DEACT_IND,
+        MSG_ID_IMCB_IMSM_INPUT_MSG_PARA_CHECKING_FAIL_IND,
+        MSG_ID_IMSM_IMCB_MODIFY_IND,
+        MSG_ID_IMCB_IMSM_PDN_ACT_IND,
+        MSG_ID_IMSM_IMCB_PDN_ACT_IND,
+        MSG_ID_IMCB_IMSM_DEACT_IND,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_VIA_SIM_REJ_RSP,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_VIA_SIM_ACK_RSP,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_VIA_PCO_REJ_RSP,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_VIA_PCO_ACK_RSP,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_REJ_RSP,
+        MSG_ID_IMSM_IMCB_PCSCF_DISCOVERY_ACK_RSP,
+        MSG_ID_IMSM_IMCB_IND_TIMER_CANCEL,
+        MSG_ID_IMSM_IMCB_IND_TIMER_START,
+        
+    MSG_ID_IMSM_IMCB_END,
+
+    /* with IMSVT */
+    MSG_ID_IMSVT_IMCB_BEGIN,
+        /* Type4: IMSVT-IMCB TV { */
+        MSG_ID_IMSVT_IMCB_LOOP_TEST_IND,
+        MSG_ID_IMSVT_IMCB_LOOP_TEST_RSP,
+        MSG_ID_IMSVT_IMCB_COMM_ERROR,
+
+        MSG_ID_IMSVT_IMCB_GET_CAP_IND,
+        MSG_ID_IMSVT_IMCB_GET_CAP_RSP,
+
+        MSG_ID_IMSVT_IMCB_CONFIG_INIT_IND,
+        MSG_ID_IMSVT_IMCB_CONFIG_UPDATE_IND,
+        MSG_ID_IMSVT_IMCB_CONFIG_DEINIT_IND,
+
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_REQ,
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_CNF,
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_IND,
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_RSP,
+
+        MSG_ID_IMSVT_IMCB_CONFIG_INIT,
+        MSG_ID_IMSVT_IMCB_CONFIG_UPDATE,
+        MSG_ID_IMSVT_IMCB_GET_CAP_REQ,
+
+        MSG_ID_IMSVT_IMCB_MOD_BW_REQ,
+
+        MSG_ID_IMSVT_IMCB_HANDOVER_START_IND,
+        MSG_ID_IMSVT_IMCB_HANDOVER_STOP_IND,
+
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_CANCEL_REQ,
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_CANCEL_CNF,
+        MSG_ID_IMSVT_IMCB_MODIFY_SESSION_CANCEL_IND,
+        MSG_ID_IMSVT_IMCB_EVENT_LOCAL_BW_READY_IND,
+
+        MSG_ID_IMSVT_IMCB_CALL_PROGRESS_IND,
+
+        MSG_ID_IMSVT_IMCB_PDN_HANDOVER_BEGIN_IND,
+        MSG_ID_IMSVT_IMCB_PDN_HANDOVER_END_IND,
+
+        /* } Type4: IMSVT-IMCB TV */
+    MSG_ID_IMSVT_IMCB_END,
+
+    /* with IMC */
+    MSG_ID_IMCB_IMC_BEGIN,
+
+        MSG_ID_IMCB_IMC_IPC_IND,
+        MSG_ID_IMCB_IMC_IPC_REQ,
+
+        MSG_ID_IMCB_IMC_LOOP_TEST_IND,
+        MSG_ID_IMCB_IMC_LOOP_TEST_RSP,
+
+        MSG_ID_IMCB_IMC_SET_TEST_MODE_REQ,
+        MSG_ID_IMCB_IMC_SET_TEST_MODE_CELL_INFO_REQ,
+
+        /* IMS SIM */
+        MSG_ID_IMCB_IMC_PCSCF_DISCOVERY_VIA_SIM_REQ,
+        MSG_ID_IMCB_IMC_PCSCF_DISCOVERY_VIA_SIM_CNF,
+        MSG_ID_IMCB_IMC_PCSCF_DISCOVERY_VIA_SIM_REJ,
+
+        /* WFC */
+        MSG_ID_IMCB_IMC_HANDOVER_START_REQ,
+        MSG_ID_IMCB_IMC_HANDOVER_STOP_REQ,
+
+        /* IMS Registration */
+        MSG_ID_IMCB_IMC_REQ_UPDATE_RT_SETTING,
+        MSG_ID_IMCB_IMC_IMS_REG_IND,
+        MSG_ID_IMCB_IMC_IMS_REG_REJ_RSP,
+        MSG_ID_IMCB_IMC_IMS_DEREG_IND,
+        MSG_ID_IMCB_IMC_IMS_REG_STATE_REQ,
+        MSG_ID_IMCB_IMC_IND_REG_AUTH_REQ,
+        MSG_ID_IMCB_IMC_REG_EMS_MODE_REQ,
+        MSG_ID_IMCB_IMC_CNF_REG_AUTH_REQ,
+        MSG_ID_IMCB_IMC_OOS_START_IND,
+        MSG_ID_IMCB_IMC_OOS_END_IND,
+        MSG_ID_IMCB_IMC_QUERY_STATE_REQ,
+        MSG_ID_IMCB_IMC_QUERY_STATE_CNF,
+        MSG_ID_IMCB_IMC_RAT_CHANGE_IND,
+        MSG_ID_IMCB_IMC_IMSVOPS_NOTIFICATION_IND,
+        MSG_ID_IMCB_IMC_RLM_EVENT_IND,
+
+        /* VILTE */
+        MSG_ID_IMCB_IMC_VT_CONNECT_REQ,
+        MSG_ID_IMCB_IMC_VT_CAP_QUERY_IND,
+        MSG_ID_IMCB_IMC_VT_CAP_QUERY_RSP,
+
+        /* SMS relay */
+        MSG_ID_IMCB_IMC_SMS_BEGIN,
+            MSG_ID_IMCB_IMC_SEND_SMS_IND,
+            MSG_ID_IMCB_IMC_SEND_SMS_RSP,
+            MSG_ID_IMCB_IMC_RECV_SMS_REQ,
+            MSG_ID_IMCB_IMC_RECV_SMS_CNF,
+            MSG_ID_IMCB_IMC_REL_SMS_IND,
+            MSG_ID_IMCB_IMC_RECV_SMS_ERROR_REQ,
+            MSG_ID_IMCB_IMC_ABORT_SEND_SMS_IND,
+            MSG_ID_IMCB_IMC_ABORT_RECV_SMS_IND,
+        MSG_ID_IMCB_IMC_SMS_END,
+
+        /* CC relay */
+        MSG_ID_IMCB_IMC_CC_BEGIN,
+            MSG_ID_IMCB_IMC_CC_CALL_PROGRESS_REQ,
+            MSG_ID_IMCB_IMC_CC_SIP_CALL_PROGRESS_IND,
+            MSG_ID_IMCB_IMC_CC_MEDIA_REQ,
+            MSG_ID_IMCB_IMC_CC_MO_CALL_IND,
+            MSG_ID_IMCB_IMC_CC_MO_CALL_RSP,
+            MSG_ID_IMCB_IMC_CC_MT_CALL_ABORT_REQ,
+            MSG_ID_IMCB_IMC_CC_MT_CALL_PRESENT_REQ,
+            MSG_ID_IMCB_IMC_CC_MT_CALL_PRESENT_CNF,
+            MSG_ID_IMCB_IMC_CC_MT_CALL_RING_REQ,
+            MSG_ID_IMCB_IMC_CC_MO_FORCE_HANGUP_IND,
+            MSG_ID_IMCB_IMC_CC_MT_ACCEPT_IND,
+            MSG_ID_IMCB_IMC_CC_MT_ACCEPT_RSP,
+            MSG_ID_IMCB_IMC_CC_MO_HANGUP_IND,
+            MSG_ID_IMCB_IMC_CC_MO_HANGUP_RSP,
+            MSG_ID_IMCB_IMC_SRVCC_STATUS_UPDATE_IND,
+            MSG_ID_IMCB_IMC_SRVCC_CONTEXT_TRANSFER_REQ,
+            MSG_ID_IMCB_IMC_CALL_CONTROL_IND,
+            MSG_ID_IMCB_IMC_CALL_CONTROL_RSP,
+            MSG_ID_IMCB_IMC_CC_MO_CONF_CALL_IND,
+            MSG_ID_IMCB_IMC_CC_MO_CONF_CALL_RSP,
+
+            /* VILTE */
+            MSG_ID_IMCB_IMC_CC_VT_ACTIVE_IND,
+            MSG_ID_IMCB_IMC_CC_MEDIA_MOD_REQ,
+            MSG_ID_IMCB_IMC_CC_VIDEO_CAP_REQ,
+
+            /* SDP info */
+            MSG_ID_IMCB_IMC_MEDIA_NEW,
+            MSG_ID_IMCB_IMC_MEDIA_UPDATE,
+            MSG_ID_IMCB_IMC_MEDIA_DEL,
+
+            /* VILTE */
+            MSG_ID_IMCB_IMC_CC_MT_VT_SPECIAL_ACCEPT_IND,
+            MSG_ID_IMCB_IMC_CC_MT_VT_SPECIAL_ACCEPT_RSP,
+			
+			/*ECALL*/
+			MSG_ID_IMCB_IMC_CC_ECALL_IN_BAND_MSD_TRANFER_RSP,
+			MSG_ID_IMCB_IMC_CC_ECALL_UPDATE_MSD_RSP,
+        MSG_ID_IMCB_IMC_CC_END,
+
+        /* SS relay */
+        MSG_ID_IMCB_IMC_SS_BEGIN,
+            MSG_ID_IMCB_IMC_SS_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE_IND,
+            MSG_ID_IMCB_IMC_SS_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE_RSP,
+            MSG_ID_IMCB_IMC_SS_RELEASE_WAITING_OR_ALL_BG_CALLS_IND,
+            MSG_ID_IMCB_IMC_SS_RELEASE_WAITING_OR_ALL_BG_CALLS_RSP,
+            MSG_ID_IMCB_IMC_SS_RELEASE_ALL_FG_AND_RESUME_BG_CALL_IND,
+            MSG_ID_IMCB_IMC_SS_RELEASE_ALL_FG_AND_RESUME_BG_CALL_RSP,
+            MSG_ID_IMCB_IMC_SS_RELEASE_ALL_FG_AND_BG_CALLS_IND,
+            MSG_ID_IMCB_IMC_SS_RELEASE_ALL_FG_AND_BG_CALLS_RSP,
+            MSG_ID_IMCB_IMC_SS_EXPLICIT_CALL_TRANSFER_IND,
+            MSG_ID_IMCB_IMC_SS_EXPLICIT_CALL_TRANSFER_RSP,
+            MSG_ID_IMCB_IMC_SS_CREATE_CONFERENCE_CALL_IND,
+            MSG_ID_IMCB_IMC_SS_CREATE_CONFERENCE_CALL_RSP,
+            MSG_ID_IMCB_IMC_SS_ATH_REL_ALL_CALLS_IND,
+            MSG_ID_IMCB_IMC_SS_ATH_REL_ALL_CALLS_RSP,
+            MSG_ID_IMCB_IMC_SS_LIST_CURRENT_CALLS_IND,
+            MSG_ID_IMCB_IMC_SS_LIST_CURRENT_CALLS_RSP,
+            MSG_ID_IMCB_IMC_SS_PROGRESS_NOTIFY_REQ,
+            MSG_ID_IMCB_IMC_CC_NO_RTPPKT_IND,
+            MSG_ID_IMCB_IMC_CC_NO_RTPPKT_RSP,
+            MSG_ID_IMCB_IMC_SS_CONFERENCE_CONTROL_REQ,
+            MSG_ID_IMCB_IMC_SS_SUBSCRIBE_CONTROL_REQ,
+            MSG_ID_IMCB_IMC_SS_CONFERENCE_CONTROL_IND,
+            MSG_ID_IMCB_IMC_SS_CONFERENCE_CONTROL_RSP,
+            MSG_ID_IMCB_IMC_CC_INCOMING_RTPPKT_IND,
+        MSG_ID_IMCB_IMC_SS_END,
+
+        /* USSD */
+        MSG_ID_IMCB_IMC_SEND_USSD_IND,  //Send USSD Request to UA
+        MSG_ID_IMCB_IMC_SEND_USSD_RSP,  //Send USSD's Response from UA
+        MSG_ID_IMCB_IMC_RECV_USSD_REQ,  //URC from UA
+        MSG_ID_IMCB_IMC_USSD_URC_STATUS_IND, //Send URC Status to UA
+
+        /* CMCC Auto Test Tool */
+        MSG_ID_IMCB_IMC_START_EBI_FILTER_REQ,
+        MSG_ID_IMCB_IMC_STOP_EBI_FILTER_REQ,
+        MSG_ID_IMCB_IMC_START_BEARER_FILTER_REQ,
+        MSG_ID_IMCB_IMC_STOP_BEARER_FILTER_REQ,
+        MSG_ID_IMCB_IMC_REG_IPSEC_FLUSH_REQ,
+        MSG_ID_IMCB_IMC_REG_IPSEC_ADD_REQ,
+        MSG_ID_IMCB_IMC_REG_IPSEC_DELETE_REQ,
+
+        /* MD Lower Layer Error (Service request failed, AC Barred...etc) */
+        MSG_ID_IMCB_IMC_MD_LOWER_LAYER_ERR_IND,
+
+        MSG_ID_IMCB_IMC_TLV_PARA_SETTING_IND,
+
+        /* IMS Debug Information IMCB->IMC*/
+        MSG_ID_IMCB_IMC_IMS_DEBUG_INFO_REQ,
+
+        /* IMS Debug Information IMC->IMCB */
+        MSG_ID_IMCB_IMC_IMS_DEBUG_INFO_IND,
+
+        /* for ISIM read data segmentation */
+        MSG_ID_IMCB_IMC_READ_ISIM_NTF_REQ,
+
+        /* Handover event to LTECSR */
+        MSG_ID_IMCB_IMC_HANDOVER_BEGIN_REQ,
+        MSG_ID_IMCB_IMC_HANDOVER_END_REQ,
+
+        /* TTY   IMC -> IMCB */
+        MSG_ID_IMCB_IMC_CC_TTY_ENABLE_IND,
+
+        /* TTY   IMCB -> IMC */
+        MSG_ID_IMCB_IMC_CC_TTY_ENABLE_RSP,
+        MSG_ID_IMCB_IMC_CC_TTY_CAPABILITY_REQ,
+
+        /* For LTECSR, NOTIFY IMS the data plan event. */
+        MSG_ID_IMCB_IMC_CC_IMS_NOTIFY_IND,
+
+        /* IMC trigger IMCB release PDN */
+        MSG_ID_IMCB_IMC_RELEASE_PDN_IND,
+        MSG_ID_IMCB_IMC_RELEASE_PDN_RSP,
+
+        /* ECT IMC -> IMCB */
+        MSG_ID_IMCB_IMC_SS_ECT_IND,  // Send ECT request to UA
+
+        /* ECT IMCB -> IMC */
+        MSG_ID_IMCB_IMC_SS_ECT_RSP,  // Send ECT response from UA
+        MSG_ID_IMCB_IMC_SS_ECT_REQ,  // Send final ECT URC confirmation from UA
+
+        /* TLV from IMCB to IMC */
+        MSG_ID_IMCB_IMC_TLV_PARA_SETTING_REQ,
+
+        /*MO Call Domain Conflict flow*/
+        MSG_ID_IMCB_IMC_CC_MO_CALL_DOMAIN_CONFLICT_IND,
+        MSG_ID_IMCB_IMC_CC_MO_CALL_DOMAIN_CONFLICT_RSP,
+
+        /* ATCMD relay */
+        MSG_ID_IMCB_IMC_ATCMD_RELAY_REQ,
+        MSG_ID_IMCB_IMC_ATCMD_RELAY_IND,
+
+        /* RTT   IMC -> IMCB */
+        MSG_ID_IMCB_IMC_CC_RTT_OP_IND,
+
+        /* RTT   IMCB -> IMC */
+        MSG_ID_IMCB_IMC_CC_RTT_OP_RSP,
+
+        /* CDMA-less IMCB->IMC */
+        MSG_ID_IMCB_IMC_IMS_TIMER_STATUS_IND,
+
+        /* RF control message */
+        MSG_ID_IMCB_IMC_SRU_INFO_REQ,
+
+        /* PS_DATA_OFF IMC->IMCB */
+        MSG_ID_IMCB_IMC_PS_DATA_OFF_IND,
+
+        /* eVOLTE flow */
+        MSG_ID_IMCB_IMC_CC_MEDIA_ANBR_NOTIFY_IND, /* IMC -> IMCB */
+        MSG_ID_IMCB_IMC_CC_MEDIA_ANBR_NOTIFY_RSP, /* IMCB -> IMC */
+
+        /* UA query CS status from IMC */
+        MSG_ID_IMCB_IMC_CC_CS_AVAILABILITY_REQ,  /* IMCB -> IMC */
+        MSG_ID_IMCB_IMC_CC_CS_AVAILABILITY_CNF,  /* IMC -> IMCB */
+        MSG_ID_IMCB_IMC_SMS_CS_AVAILABILITY_REQ,  /* IMCB -> IMC */
+        MSG_ID_IMCB_IMC_SMS_CS_AVAILABILITY_CNF,  /* IMC -> IMCB */
+
+        MSG_ID_IMCB_IMC_IMS_RESET_SUGGESTION_TIMER_REQ, /* IMCB -> IMC */
+
+    MSG_ID_IMCB_IMC_END,
+
+    /* with NCCCI */
+    MSG_ID_WRAP_IMCB_IMCB_NCCCI_BEGIN,
+
+        MSG_ID_WRAP_IMCB_IMCB_READY_TO_WRITE_IND,
+        MSG_ID_WRAP_IMCB_IMCB_READ_DONE_IND,
+        MSG_ID_WRAP_IMCB_IMCB_COMM_ERROR,
+
+    MSG_ID_WRAP_IMCB_IMCB_NCCCI_END,
+
+    /* with ATP */
+    MSG_ID_ATP_IMCB_BEGIN,
+
+        MSG_ID_ATP_IMCB_INTER_RAT_STATUS_IND,
+
+    MSG_ID_ATP_IMCB_END,
+
+    MSG_ID_IMCB_EX_END,
+
+    MSG_ID_IMCB_IN_BEGIN,
+
+        /* IMCB Ctrl */
+        MSG_ID_IMCB_IMCB_BEGIN,
+            MSG_ID_IMCB_IMCB_DUMP_CONTEXT_IND,
+        MSG_ID_IMCB_IMCB_END,
+
+    MSG_ID_IMCB_IN_END,
+
+    MSG_ID_IMCB_END,
+
+MODULE_MSG_END( MSG_ID_IMCB_CODE_TAIL )
+
+
+#endif /* _IMCB_MSGID_H_ */
diff --git a/mcu/interface/sap/md/imcsms_msgid.h b/mcu/interface/sap/md/imcsms_msgid.h
new file mode 100644
index 0000000..2cbda3e
--- /dev/null
+++ b/mcu/interface/sap/md/imcsms_msgid.h
@@ -0,0 +1,240 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   imcsms_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   imcsms 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!
+ * removed!
+ * removed!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _IMCSMS_MSGID_H
+#define _IMCSMS_MSGID_H
+
+    /*--------------- MSG_ID_IMCSMS_CODE_BEGIN------------------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_IMCSMS_CODE_BEGIN )
+
+    /* ATP and IMCSMS */
+    MSG_ID_ATP_IMCSMS_SUBMIT_CHECK_RSP = MSG_ID_IMCSMS_CODE_BEGIN,
+    MSG_ID_ATP_IMCSMS_COMMAND_CHECK_RSP,
+    MSG_ID_ATP_IMCSMS_SMMA_CHECK_RSP,
+    MSG_ID_ATP_IMCSMS_STK_SUBMIT_CHECK_RSP,
+    MSG_ID_ATP_IMCSMS_IMS_REG_STATUS_IND,
+    MSG_ID_ATP_IMCSMS_CDMA_LESS_C2K_DELIVER_REPORT_IND,
+	MSG_ID_SDM_IMCSMS_CMSS_SUBMIT,         // even though this message is received from SDM , it will be treated like a ATP message
+    
+
+    /* SDM and IMCSMS */
+    MSG_ID_SDM_IMCSMS_SUBMIT,
+    MSG_ID_SDM_IMCSMS_C2K_SUBMIT,
+    MSG_ID_SDM_IMCSMS_C2K_ACKNOWLEDGE,
+    MSG_ID_SDM_IMCSMS_UTK_SUBMIT,
+    MSG_ID_SDM_IMCSMS_STK_SUBMIT,
+    MSG_ID_SDM_IMCSMS_DELIVER_REPORT_ACK,
+    MSG_ID_SDM_IMCSMS_DELIVER_REPORT_NACK,
+    MSG_ID_SDM_IMCSMS_COMMAND,
+    MSG_ID_SDM_IMCSMS_MEM_AVL_NOTIF,
+	MSG_ID_SDM_IMCSMS_IS_CS_ALLOWED_CNF,
+
+    /* IMCSMS and  IMC */
+    MSG_ID_IMCSMS_IMC_SEND_SMS_CNF,
+    MSG_ID_IMCSMS_IMC_RECV_SMS_IND,
+    MSG_ID_IMCSMS_IMC_SEND_C2K_SMS_CNF,
+    MSG_ID_IMCSMS_IMC_RECV_C2K_SMS_IND,
+    MSG_ID_IMCSMS_IMC_RECV_SMS_ERROR_IND,
+    MSG_ID_IMCSMS_IMC_SMS_EMERGENCY_REG_CNF,
+
+	/* __TC01_IMS_SUPPORT__ */
+    MSG_ID_ATP_IMCSMS_RECV_MSG_REQ,
+
+    /* IMCSMS and  IMSUA */
+    MSG_ID_IMCSMS_IMSUA_SEND_SMS_CNF,
+    MSG_ID_IMCSMS_IMSUA_RECV_SMS_IND,
+    MSG_ID_IMCSMS_IMSUA_RECV_SMS_ERROR_IND,
+    MSG_ID_IMCSMS_IMSUA_CS_AVAILABILITY_IND,
+    MSG_ID_IMCSMS_IMSUA_SEND_SMS_REQ,
+    MSG_ID_IMCSMS_IMSUA_RECV_SMS_RSP,
+    MSG_ID_IMCSMS_IMSUA_REL_SMS_REQ,
+    MSG_ID_IMCSMS_IMSUA_CS_AVAILABILITY_CNF,
+
+MODULE_MSG_END( MSG_ID_IMCSMS_CODE_TAIL )
+
+    /*---------------MSG_ID_IMCSMS_CODE_END---------------------*/
+
+#endif  /* _IMCSMS_MSGID_H */
diff --git a/mcu/interface/sap/md/ims_stack_msgid.h b/mcu/interface/sap/md/ims_stack_msgid.h
new file mode 100644
index 0000000..702f799
--- /dev/null
+++ b/mcu/interface/sap/md/ims_stack_msgid.h
@@ -0,0 +1,464 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   ims_stack_msgid.h
+ *
+ * Project:
+ * --------
+ *   VMOLY
+ *
+ * Description:
+ * ------------
+ *
+ * Author:
+ * -------
+ *   
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 06 21 2022 kai-cheng.chiu
+ * [MOLY00765081] [FeatureDevelopment][ALPSAR06336232] TMOUS 22Q1 Requirement Gap Development - UE MO Timer F1
+ * 	
+ * 	.
+ *
+ * 01 28 2022 xin.ni
+ * [MOLY00603484] [GEN95][New Feature]si transaction should keep 330s after sending 18x
+ * 	
+ * 	.
+ *
+ * 01 25 2022 xin.ni
+ * [MOLY00603484] [GEN95][New Feature]si transaction should keep 330s after sending 18x
+ * 	
+ * 	.
+ *
+ * 07 19 2021 ot_hui.tu
+ * [MOLY00603484] [GEN95][New Feature]si transaction should keep 330s after sending 18x
+ * 	
+ * 	.
+ *
+ * 11 16 2020 sami.jutila
+ * [MOLY00586172] [MT6893][Petrus-P][SQC][R0][R3][MP6][5G][SA][CTC][FT][Hangzhou][Huawei][TC-MF_IOTFT-06001][5G空闲ï¿??终端始呼]MT failed
+ * .
+ *
+ * 11 06 2020 york.li
+ * [MOLY00588036] ï¿??20131?‘�?DVT?œºæµ‹ã?‘�???„å?‰ã?‘�?ï¿??�ç?‘ã?‘CT+CMCC(2G+IMS),主ï¿??�电ä¿?2G?•¿ï¿??过ç?‹ä¸­?жï¿??ï¿???‰¯ï¿??�移?ЍVoLTE消失(1/10)
+ * 	
+ * 	.
+ *
+ * 11 06 2020 york.li
+ * [MOLY00588036] ï¿??20131?‘�?DVT?œºæµ‹ã?‘�???„å?‰ã?‘�?ï¿??�ç?‘ã?‘CT+CMCC(2G+IMS),主ï¿??�电ä¿?2G?•¿ï¿??过ç?‹ä¸­?жï¿??ï¿???‰¯ï¿??�移?ЍVoLTE消失(1/10)
+ * 	
+ * 	.
+ *
+ * 09 18 2020 uri.chang
+ * [MOLY00569695] [US_DEV][VZW][MP7] P-CSCF handling for handover
+ * P-CSCF handling for IP/PCO change - interface part (SWRD) - delete unused msg
+ * 	merge IP_CHANGE_NOTIFY, PCSCF_RESTORE, and REQ_REREG to CONDITION_CHANGE_NOTIFY.
+ *
+ * 09 18 2020 uri.chang
+ * [MOLY00569695] [US_DEV][VZW][MP7] P-CSCF handling for handover
+ * 	
+ * 	P-CSCF handling for IP/PCO change - interface part (SWRD) - add msg
+ * 	merge IP_CHANGE_NOTIFY, PCSCF_RESTORE, and REQ_REREG to CONDITION_CHANGE_NOTIFY.
+ *
+ * 08 28 2020 york.li
+ * [MOLY00562709] [5GHP][feature][Data&Call]game space mode
+ * 	
+ * 	.
+ *
+ * 07 04 2020 frank-th.chen
+ * [MOLY00538261] [Blocking][CCP2-P0][MT6885][Petrus][TMO-US][MP5][SQC][20Q2][q0][HQ][Keysight][Protocol_Wi-Fi Calling][60474][L-ePDG -97602-7]The msg doesn't contain header field P-Location-Object - Error
+ * 	
+ * 	.
+ *
+ * 06 30 2020 xw.wang
+ * [MOLY00536704] [KDDI][new feature][RMSC00540517]ACB skip for SUBSCRIBE
+ * 	
+ * 	.
+ *
+ * 06 30 2020 frank-th.chen
+ * [MOLY00526066] ALPS05120134 [TCL][Tokyo Lite TMO]WFC] The "P-LANI TIMESTAMP here" in invite is not correct, it is display the invite timestamp. The time reported is not in UTC or local time for LTE/ 3G/ 2G
+ * 	
+ * 	.
+ *
+ * 06 15 2020 frank-th.chen
+ * [MOLY00526066] ALPS05120134 [TCL][Tokyo Lite TMO]WFC] The "P-LANI TIMESTAMP here" in invite is not correct, it is display the invite timestamp. The time reported is not in UTC or local time for LTE/ 3G/ 2G
+ * 	
+ * 	.
+ *
+ * 03 24 2020 manik.mahajan
+ * [MOLY00464854] [Sony][SM33][IMS][JIMODM18-2846][RAT][Huaihe1.0][PCCW] UE not to perform IMS re-registration after Vowifi HO to LTE
+ * 	
+ * 	.
+ *
+ * 03 24 2020 manik.mahajan
+ * [MOLY00464854] [Sony][SM33][IMS][JIMODM18-2846][RAT][Huaihe1.0][PCCW] UE not to perform IMS re-registration after Vowifi HO to LTE
+ * 	
+ * 	.
+ *
+ * 03 24 2020 xw.wang
+ * [MOLY00507077] [MT6739][Zion][Q0][WW FT][Turkey][Istanbul][4GMM][IMS][Regression][SQC Excluded][TurkTelekom][VoWiFi] To check the PCNI requirements, Cell Time is showing 0
+ * 	
+ * 	.
+ *
+ * 03 23 2020 manik.mahajan
+ * [MOLY00464854] [Sony][SM33][IMS][JIMODM18-2846][RAT][Huaihe1.0][PCCW] UE not to perform IMS re-registration after Vowifi HO to LTE
+ * 	
+ * 	.
+ *
+ * 03 22 2020 manik.mahajan
+ * [MOLY00464854] [Sony][SM33][IMS][JIMODM18-2846][RAT][Huaihe1.0][PCCW] UE not to perform IMS re-registration after Vowifi HO to LTE
+ * 	
+ * 	.
+ *
+ * 02 24 2020 manik.mahajan
+ * [MOLY00464854] [Sony][SM33][IMS][JIMODM18-2846][RAT][Huaihe1.0][PCCW] UE not to perform IMS re-registration after Vowifi HO to LTE
+ * 	
+ * 	.
+ *
+ * 12 06 2019 chengwen.liu
+ * [MOLY00464287] [VMOLY][Gen97] UA ASSERT Removal & IMCB/UA state unsync handling
+ * .
+ *
+ * 12 05 2019 xw.wang
+ * [MOLY00458932] [GEN97][IMS PATCH BACK][volte_stack] patch back to VMOLY
+ * 	
+ * 	.
+ * 	patch back from CL 9789410
+ * 	interface part
+ *
+ * 12 04 2019 frank-th.chen
+ * [MOLY00463248] [TMOUS] [IMS] 2020Q2 Requirement
+ * 	
+ * 	.
+ *
+ * 12 02 2019 xw.wang
+ * [MOLY00462202] [MT6771][Sylvia][O1][MP1.5][IOT][Japan][KDDI][PH3-VoLTE] TC3-10-6-3 UE supported "ACB Skip(3GPP Rel.12)" or not
+ * 	
+ * 	.
+ *
+ * 07 23 2019 frank-th.chen
+ * [MOLY00424474] [VMOLY] The DUT hangs up automatically in VOWIFI calling
+ * 	
+ * 	.
+ *
+ * 07 23 2019 frank-th.chen
+ * [MOLY00424474] [VMOLY] The DUT hangs up automatically in VOWIFI calling
+ * 	
+ * 	.
+ *
+ * 04 12 2019 york.li
+ * [MOLY00398906] [Submarine][M1][RDIT][CT][FT][TC-MF_VOLTEFT-03002][China][SH][ASSERT] file:mcu/protocol/imc/sub_imc/imc_cc/src/imc_cc_msghdlr.c line:1004 when keep long Vilte call
+ * 	
+ * 	.
+ *
+ * 03 13 2019 chengwen.liu
+ * [MOLY00384501] [Cervino P0][VzW][EAB][3.30]Fail due to REGISTER request received
+ * .
+ *
+ * 01 29 2019 szu-chieh.chiu
+ * [MOLY00381194] [Submarine][M1][1stCall] decode fail on the ILM messages between IMSUA/IMCB/IMS_STACK
+ * ua naming refine.
+ *
+ * 01 23 2019 mika.leinonen
+ * [MOLY00380857] [Submarine][M1][1stCall][CMCC]IMS register fail
+ * Update IMS Stack interface - flag field usage
+ *
+ * 01 08 2019 mika.leinonen
+ * [MOLY00367126] [Gen97][IMS] VoLTE porting
+ * Adding IMS interfaces to trace database.
+ *
+ * 01 07 2019 kari.suvivaara
+ * [MOLY00373280] [Gen97][IMS][VoLTE Porting] Coding/UT Phase 1
+ * 	
+ * 	IMS UA and Stack ramp up on MD side.
+ *
+>>>> ORIGINAL //UMOLYE/DEV/UMOLYE.GEN97.SUBMARINE.DEV/mcu/interface/sap/md/ims_stack_msgid.h#3
+ * 12 28 2018 huifeng.jing
+==== THEIRS //UMOLYE/DEV/UMOLYE.GEN97.SUBMARINE.DEV/mcu/interface/sap/md/ims_stack_msgid.h#4
+ * 01 07 2019 kari.suvivaara
+ * [MOLY00373280] [Gen97][IMS][VoLTE Porting] Coding/UT Phase 1
+ * 	
+ * 	IMS UA and Stack ramp up on MD side.
+ *
+ * 12 28 2018 huifeng.jing
+==== YOURS //ws_kari.suvivaara_modem/UMOLYE/DEV/UMOLYE.SUBMARINE.M1IT.DEV/mcu/interface/sap/md/ims_stack_msgid.h
+ * 12 29 2018 huifeng.jing
+<<<<
+ * [MOLY00375660] [IMS][Gen97 submarine] VTS interface developments
+ * ims_hif over tty.
+ *
+ * 12 14 2018 mika.leinonen
+ * [MOLY00367126] [Gen97][IMS] VoLTE porting
+ * Timers - framework for UA and Stack
+ *
+ ****************************************************************************/
+
+#ifndef _IMS_STACK_MSGID_H_
+#define _IMS_STACK_MSGID_H_
+
+#include "module_msg_range.h"
+
+/*------------------- IMS_STACK_MSG_CODE_BEGIN---------------------*/
+MODULE_MSG_BEGIN( MSG_ID_IMS_STACK_CODE_BEGIN )
+
+    MSG_ID_IMS_STACK_BEGIN,
+
+    MSG_ID_IMS_STACK_EX_BEGIN,
+
+        /* ------------------------------------------------ */
+        /*  Client --> VoLTE Stack                          */
+        /* ------------------------------------------------ */
+        /* TO SIPTX */
+        MSG_ID_VOLTE_SIPTX_CREATE_REQ,                  /* VoLTE_Stack_Channel_Info_t */
+        MSG_ID_VOLTE_SIPTX_DESTROY_REQ,                 /* N/A */
+        MSG_ID_VOLTE_SIPTX_CONNECT_REQ,                 /* VoLTE_Stack_Connection_Info_t */
+        MSG_ID_VOLTE_SIPTX_DISCONNECT_REQ,              /* N/A */
+        MSG_ID_VOLTE_SIPTX_SEND_SIPMSG_REQ,             /* VoLTE_Stack_Sip_Info_t */
+        MSG_ID_VOLTE_SIPTX_MEM_DEBUG_REQ,               /* VoLTE_Debug_Info_t */
+        MSG_ID_VOLTE_SIPTX_SETTING_REQ,                 /* VoLTE_Event_Setting_t */
+        MSG_ID_VOLTE_SIPTX_AUTO_TESTING_ID_UPDATE_REQ,  /* VoLTE_AutoTesting_Info_t */
+        MSG_ID_VOLTE_SIPTX_ABORT_SIPMSG_REQ,            /* VoLTE_Stack_Sip_Info_t */
+        MSG_ID_VOLTE_SIPTX_RESET_TCP_REQ,               /* VoLTE_Stack_Channel_Info_t */
+        MSG_ID_VOLTE_SIPTX_START_KEEP_ALIVE_REQ,        /* VoLTE_Stack_Channel_Info_t */
+        MSG_ID_VOLTE_SIPTX_STOP_KEEP_ALIVE_REQ,         /* VoLTE_Stack_Channel_Info_t */
+        MSG_ID_VOLTE_SIPTX_CALL_SESSION_TERMINATED_IND, /* VoLTE_Stack_Sip_Info_t */
+        MSG_ID_VOLTE_SIPTX_UA_STATE_IND,                /* VoLTE_Event_UA_State_t */
+        MSG_ID_VOLTE_SIPTX_CALL_SESSION_STARTED_IND,    /* VoLTE_Stack_Sip_Info_t */
+        MSG_ID_VOLTE_SIPTX_UPDATE_RCS_STATUS_REQ,       /* int */
+        MSG_ID_VOLTE_SIPTX_SEND_DUMMY_DATA_REQ,         /* VoLTE_Stack_Channel_Info_t */
+
+        /* TO SIPTX_REG */
+        MSG_ID_VOLTE_SIPTX_REG_REG_REQ,                 /* VoLTE_Event_Reg_Item_t */
+        MSG_ID_VOLTE_SIPTX_REG_REREG_REQ,               /* VoLTE_Event_Reg_Item_t */
+        MSG_ID_VOLTE_SIPTX_REG_DEREG_REQ,               /* VoLTE_Event_Reg_Item_t */
+        MSG_ID_VOLTE_SIPTX_REG_NETWORK_CHANGE_REQ,      /* VoLTE_Event_Network_Change_t */
+        MSG_ID_VOLTE_SIPTX_REG_UPDATE_SETTING_REQ,      /* VoLTE_Event_Setting_t */
+        MSG_ID_VOLTE_SIPTX_REG_ADD_BIND_REQ,            /* VoLTE_Event_Reg_Item_t */
+        MSG_ID_VOLTE_SIPTX_REG_DEL_BIND_REQ,            /* VoLTE_Event_Reg_Item_t */
+        MSG_ID_VOLTE_SIPTX_REG_CLEAR_BIND_REQ,          /* N/A */
+        MSG_ID_VOLTE_SIPTX_REG_ADD_CAPABILITY_REQ,      /* VoLTE_Event_Reg_Capability_t */
+        MSG_ID_VOLTE_SIPTX_REG_DEL_CAPABILITY_REQ,      /* VoLTE_Event_Reg_Capability_t */
+        MSG_ID_VOLTE_SIPTX_REG_GET_STATE_REQ,           /* VoLTE_Event_Reg_Item_t */
+        MSG_ID_VOLTE_SIPTX_REG_RESET_REQ,               /* VoLTE_Event_Reg_Item_t */
+        MSG_ID_VOLTE_SIPTX_REG_RAT_CHANGE_REQ,          /* VoLTE_Event_Rat_Change_t */
+        MSG_ID_VOLTE_SIPTX_REG_RESTORE_REQ,             /* VoLTE_Event_Reg_Item_t */
+        MSG_ID_VOLTE_SIPTX_REG_3GPP_RAT_CHANGE_REQ,     /* VoLTE_Event_3gpp_Rat_Change_t */
+        MSG_ID_VOLTE_SIPTX_REG_QUERY_CALL_STATE_CNF,    /* VoLTE_Event_List_Current_Call_To_Stack_t */
+        MSG_ID_VOLTE_SIPTX_REG_MD_LOWER_LAYER_ERR_REQ,  /* VoLTE_Event_MD_Lower_Layer_Err_t */
+        MSG_ID_VOLTE_SIPTX_REG_SEND_SUBSRIBE_REQ,       /* VoLTE_Event_Reg_Item_t */
+        MSG_ID_VOLTE_SIPTX_REG_QUERY_IF_EM_TS_EXIST_REQ,/* N/A */
+        MSG_ID_VOLTE_SIPTX_GEOLOCATION_REQ_CNF,         /* VoLTE_Event_Geolocation_Info_t */
+        MSG_ID_VOLTE_SIPTX_REG_NOTIFY_IMSVOPS_REQ,      /* VoLTE_Event_Notify_t */
+        MSG_ID_VOLTE_SIPTX_REG_NOTIFY_SIP_BLOCK_REQ,    /* VoLTE_Event_Notify_t */
+        MSG_ID_VOLTE_SIPTX_PRESENCE_UNPUBLISH_CNF,      /* VoLTE_Event_Presence_Unpublish_t */
+        MSG_ID_VOLTE_SIPTX_REG_IRAT_WITHOUT_IP_CHANGE_REQ, /* VoLTE_Event_iRat_without_IP_Change_t */
+        MSG_ID_VOLTE_SIPTX_REG_HANDOVER_IP_READY_NOTIFY,
+        MSG_ID_VOLTE_SIPTX_IF_REG_READY_REQ,            /* N/A */
+        MSG_ID_VOLTE_SIPTX_REG_NOTIFY_CONF_SUBSC_REQ,   /* VoLTE_Event_Notify_t  */
+        MSG_ID_VOLTE_SIPTX_REG_FF00H_UPDATE_REQ,        /* VoLTE_Event_FF00H_Update_t */
+        MSG_ID_VOLTE_SIPTX_REG_E911_E2_TIMEOUT_REQ,     /* VoLTE_Event_Reg_Item_t */
+        MSG_ID_VOLTE_SIPTX_REG_DIGITLINE_REQ,           /* VoLTE_Event_ATCmd_Relay_t */
+        MSG_ID_VOLTE_SIPTX_LOGGING_EVENT_NOTIFY_REQ,    /* VoLTE_Event_Logging_Event_Notify_t */
+        MSG_ID_VOLTE_SIPTX_REG_3GPP_OOS_IND_REQ,        /* VoLTE_Event_3gpp_OOS_Ind_t */
+        MSG_ID_VOLTE_SIPTX_REG_PS_DATA_OFF_REQ,         /* VoLTE_Event_PS_DATA_OFF_Req_t */
+        MSG_ID_VOLTE_SIPTX_REG_CALL_STATUS_IND,         /* VoLTE_Event_List_Current_Call_To_Stack_t */
+        MSG_ID_VOLTE_SIPTX_REG_EXTERNAL_UA_STATE,       /* VoLTE_Event_External_UA_State_t */
+        MSG_ID_VOLTE_SIPTX_REG_TRIGER_REREG_INIT_DEREG_IND,   /* VoLTE_Event_Reg_Triger_Rereg_Init_Dereg_t */
+        MSG_ID_VOLTE_SIPTX_ACB_SKIP_START_CNF,          /* VoLTE_Event_ACB_Skip_Info_t */
+        MSG_ID_VOLTE_SIPTX_ACB_SKIP_END_CNF,            /* VoLTE_Event_ACB_Skip_Info_t */
+        MSG_ID_VOLTE_SIPTX_REG_AP_LOCATION_REQ,         /* VoLTE_Event_AP_Location_status_t */
+        MSG_ID_VOLTE_SIPTX_REG_CONDITION_CHANGE_NOTIFY_REQ,    /* VoLTE_Event_Condition_Change_Notify_t */
+        /* Teardon Flow for IMCB/REG state un-sync */
+        MSG_ID_IMSUA_IMS_STACK_UNEXPECTED_STATE_REQ,    /* imsua_ims_stack_unexpected_state_req_struct */
+
+        /* TO SIPTX_IPSEC */
+        MSG_ID_VOLTE_SIPTX_IPSEC_SETUP_REQ,             /* VoLTE_Stack_IPSec_Info_t */
+        MSG_ID_VOLTE_SIPTX_IPSEC_CONNECT_REQ,           /* VoLTE_Stack_IPSec_Info_t */
+        MSG_ID_VOLTE_SIPTX_IPSEC_DELETE_REQ,            /* VoLTE_Stack_IPSec_Info_t */
+        MSG_ID_VOLTE_SIPTX_IPSEC_CLEAR_REQ,             /* VoLTE_Stack_IPSec_Info_t */
+        MSG_ID_VOLTE_SIPTX_IPSEC_CHANGE_TO_REGULAR_REQ, /* siptx_req_struct */
+        MSG_ID_VOLTE_SIPTX_IPSEC_REFRESH_REQ,           /* VoLTE_Stack_IPSec_Info_t */
+
+
+        /* ------------------------------------------------ */
+        /*  Client <-- VoLTE Stack                          */
+        /* ------------------------------------------------ */
+        /* FROM SIPTX */
+        MSG_ID_VOLTE_SIPTX_CREATE_RSP,                  /* VoLTE_Stack_Result_t */
+        MSG_ID_VOLTE_SIPTX_DESTROY_RSP,                 /* VoLTE_Stack_Result_t */
+        MSG_ID_VOLTE_SIPTX_CONNECT_RSP,                 /* VoLTE_Stack_Result_t */
+        MSG_ID_VOLTE_SIPTX_DISCONNECT_RSP,              /* VoLTE_Stack_Result_t */
+        MSG_ID_VOLTE_SIPTX_SEND_SIPMSG_RSP,             /* VoLTE_Stack_Result_t */
+        MSG_ID_VOLTE_SIPTX_IND_SIPMSG_RSP,              /* VoLTE_Stack_Sip_Info_t */
+        MSG_ID_VOLTE_SIPTX_ABORT_SIPMSG_RSP,            /* VoLTE_Stack_Result_t */
+        MSG_ID_VOLTE_SIPTX_RESET_TCP_RSP,               /* VoLTE_Stack_Sip_Info_t */
+        MSG_ID_VOLTE_SIPTX_START_KEEP_ALIVE_RSP,        /* VoLTE_Stack_Channel_Info_t */
+        MSG_ID_VOLTE_SIPTX_STOP_KEEP_ALIVE_RSP,         /* VoLTE_Stack_Channel_Info_t */
+
+        MSG_ID_VOLTE_SIPTX_DISCONNECT_IND,              /* VoLTE_Stack_Result_t */
+        MSG_ID_VOLTE_SIPTX_REG_QUERY_IF_EM_TS_EXIST_RSP,/* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_VOLTE_SIPTX_SEND_DUMMY_DATA_RSP,         /* VoLTE_Stack_Channel_Info_t */
+        MSG_ID_SIP_SENT_VIA_HDR_IND,                    /* character string */
+
+        /* FROM SIPTX_REG */
+        MSG_ID_VOLTE_SIPTX_REG_STATE_IND,               /* VoLTE_Event_Reg_State_t */
+        MSG_ID_VOLTE_SIPTX_REG_QUERY_STATE_IND,         /* VoLTE_Event_Query_State_t */
+        MSG_ID_VOLTE_SIPTX_EMS_MODE_IND,                /* VoLTE_Event_Reg_Ems_Mode_t */
+        MSG_ID_VOLTE_SIPTX_REG_NOTIFY_DONE_IND,         /* VoLTE_Event_Reg_Notify_Done_t */
+        MSG_ID_VOLTE_SIPTX_REG_CANCEL_SIP_BLOCK_IND,    /* VoLTE_Event_Notify_t */
+        MSG_ID_VOLTE_SIPTX_REG_DEREG_START_IND,         /* VoLTE_Event_Reg_Dereg_Start_t */
+        MSG_ID_VOLTE_SIPTX_IF_REG_READY_RSP,            /* N/A */
+        MSG_ID_VOLTE_SIPTX_REG_NOTIFY_CONF_SUBSC_IND,   /* VoLTE_Event_Notify_t */
+        MSG_ID_VOLTE_SIPTX_SRU_INFO_IND,                /* VoLTE_Event_SRU_Info_t */
+        MSG_ID_VOLTE_SIPTX_ATCMD_RELAY_IND,             /* VoLTE_Event_ATCmd_Relay_t */
+        MSG_ID_VOLTE_SIPTX_REG_REL_ALL_CALL_IND,        /* VoLTE_Event_Call_Rel_t*/
+        MSG_ID_VOLTE_SIPTX_ACB_SKIP_START_IND,          /* VoLTE_Event_ACB_Skip_Info_t */
+        MSG_ID_VOLTE_SIPTX_ACB_SKIP_END_IND,            /* VoLTE_Event_ACB_Skip_Info_t */
+        MSG_ID_VOLTE_SIPTX_REG_UPDATE_PLANI_TIME_IND,   /* VoLTE_Event_Update_PLANI_Time_t */
+
+        /* FROM SIPTX_IPSEC */
+        MSG_ID_VOLTE_SIPTX_IPSEC_SETUP_RSP,             /* VoLTE_Stack_Result_t */
+        MSG_ID_VOLTE_SIPTX_IPSEC_CONNECT_RSP,           /* VoLTE_Stack_Result_t */
+        MSG_ID_VOLTE_SIPTX_IPSEC_DELETE_RSP,            /* VoLTE_Stack_Result_t */
+        MSG_ID_VOLTE_SIPTX_IPSEC_CLEAR_RSP,             /* VoLTE_Stack_Result_t */
+        MSG_ID_VOLTE_SIPTX_IPSEC_CHANGE_TO_REGULAR_RSP, /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_VOLTE_SIPTX_IPSEC_REFRESH_RSP,           /* VoLTE_Stack_Result_t */
+
+        /* IPSEC POLICY */
+        MSG_ID_VOLTE_IPSEC_POLICY_FLUSH_IND,            /* VoLTE_Event_IPSec_Policy_Flush_Ind_t */
+        MSG_ID_VOLTE_IPSEC_POLICY_ADD_IND,              /* VoLTE_Event_IPSec_Policy_Add_Ind_t */
+        MSG_ID_VOLTE_IPSEC_POLICY_DELETE_IND,           /* VoLTE_Event_IPSec_Policy_Delete_Ind_t */
+
+        /*For UA in AP side*/
+        MSG_ID_VOLTE_SEND_TO_IMS_HIF,                   /* VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_VOLTE_RECV_FROM_IMS_HIF,                 /* VoLTE_Event_IMS_HIF_Data */
+
+        /* IMS DBG info indication */
+        MSG_ID_IMS_DBG_EM_REG_INFO_IND,                 /* ims_dbg_em_reg_info_ind_struct */
+        MSG_ID_IMS_DBG_SIP_INFO_IND,                    /* VoLTE_Event_Reg_Dbg_Sip_Info_t */
+        MSG_ID_IMS_DBG_EM_REG_ABNORMAL_IND,             /* ims_dbg_em_reg_abnormal_ind_struct */
+
+
+    MSG_ID_IMS_STACK_EX_END,
+
+    MSG_ID_IMS_STACK_IN_BEGIN,
+
+        /* MSG FROM APP */
+        MSG_ID_SIP_CREATE_CONN_REQ,                     /* siptx_req_create_conn_struct */
+        MSG_ID_SIP_DELETE_CONN_REQ,                     /* siptx_req_struct */
+        MSG_ID_SIP_SEND_MSG_REQ,                        /* sip_msg_req_struct */
+        MSG_ID_SIP_MODIFY_TOS_REQ,                      /* no use */                      
+        MSG_ID_SIP_ABORT_MSG_REQ,                       /* siptx_req_struct */
+        MSG_ID_SIP_DNQ_QUERY_REQ,                       /* no use */
+        MSG_ID_SIP_SETUP_IPSEC_REQ,                     /* siptx_req_struct */
+        MSG_ID_SIP_DELETE_IPSEC_REQ,                    /* siptx_req_struct */
+        MSG_ID_SIP_CONNECT_IPSEC_REQ,                   /* siptx_req_struct */
+        MSG_ID_SIP_REFRESH_IPSEC_REQ,                   /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_T1_REQ,                       /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_T2_REQ,                       /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_T4_REQ,                       /* siptx_req_struct */
+        MSG_ID_SIP_CLEAR_IPSEC_REQ,                     /* siptx_req_struct */
+        MSG_ID_SIP_CONNECT_TCP_CLIENT_REQ,              /* siptx_req_connect_tcp_client_struct */
+        MSG_ID_SIP_RECORD_TIMESTAMP_REQ,                /* siptx_req_struct */
+        MSG_ID_SIP_DELETE_CONN_SOC_FD_REQ,              /* siptx_req_struct */
+        MSG_ID_SIP_DELETE_CONN_OBJ_REQ,                 /* siptx_req_struct */
+        MSG_ID_SIP_RESET_TCP_CLIENT_REQ,                /* siptx_req_reset_tcp_struct */
+        MSG_ID_SIP_SETUP_IPSEC_CHANGE_TO_REGULAR,       /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_F_TIMER_REQ,                  /* siptx_req_struct */
+        MSG_ID_SIP_START_KEEP_ALIVE_REQ,                /* siptx_req_struct */
+        MSG_ID_SIP_STOP_KEEP_ALIVE_REQ,                 /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_A_TIMER_REQ,                  /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_B_TIMER_REQ,                  /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_C_TIMER_REQ,                  /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_D_TIMER_REQ,                  /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_E_TIMER_REQ,                  /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_G_TIMER_REQ,                  /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_H_TIMER_REQ,                  /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_I_TIMER_REQ,                  /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_J_TIMER_REQ,                  /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_K_TIMER_REQ,                  /* siptx_req_struct */
+        MSG_ID_SIP_DBG_SETTING_REQ,                     /* siptx_req_struct */
+        MSG_ID_SIP_QUERY_IF_EM_TS_EXIST,                /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_B_TIMER_STOP_REQ,             /* siptx_req_struct */
+        MSG_ID_SIP_CHECK_REG_CONTACT_REQ,               /* siptx_req_struct */
+        MSG_ID_SIP_NORMAL_CALL_BUFFER,                  /* siptx_req_struct */
+        MSG_ID_SIP_CONNECT_TCP_CLIENT_NON_PROTECT_REQ,  /* no need */
+        MSG_ID_SIP_CONNECT_TCP_CLIENT_PROTECT_REQ,      /* no need */
+        MSG_ID_SIP_RESET_TCP_CLIENT_NON_PROTECT_REQ,    /* no need */
+        MSG_ID_SIP_RESET_TCP_CLIENT_PROTECT_REQ,        /* no need */
+        MSG_ID_SIP_RECORD_CELL_INFO_AGE_TIMESTAMP_REQ,  /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_EMC_CITS_PROTECT_TIMER_REQ,   /* siptx_req_struct */
+        MSG_ID_SIP_EMC_CITS_SKIP_ERR_IN_PROCEEDING,     /* siptx_req_struct */
+
+        MSG_ID_SIP_MODIFY_SITS_TCP_2XX_RETRANSMIT_REQ,  /* siptx_req_struct */
+        MSG_ID_SIP_MODIFY_NORM_CITS_PROTECT_TIMER_REQ,  /* siptx_req_struct */
+        MSG_ID_SIP_SEND_DUMMY_DATA_REQ,                 /* siptx_req_struct */
+        MSG_ID_SIP_RECORD_REGISTERED_TIMESTAMP_REQ,     /* siptx_req_struct */
+        MSG_ID_SIP_RECORD_CELL_CAMPED_TIMESTAMP_REQ,    /* siptx_req_struct */
+        MSG_ID_SIP_NORM_SITS_TRANS_TIMER_IN_PROCEEDING,
+        MSG_ID_SIP_MODIFY_F1_TIMER_REQ,                 /* siptx_req_struct */
+
+        /* MSG TO APP */
+        MSG_ID_SIP_CREATE_CONN_RSP,                     /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_SIP_DELETE_CONN_RSP,                     /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_SIP_RECV_MSG_IND,		                /* VoLTE_Stack_Sip_Info_t */
+        MSG_ID_SIP_DELETE_CONN_IND,                     /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_SIP_SETUP_IPSEC_RSP,                     /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_SIP_DELETE_IPSEC_RSP,                    /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_SIP_CONNECT_IPSEC_RSP,                   /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_SIP_CLEAR_IPSEC_RSP,                     /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_SIP_ABORT_MSG_RSP,                       /* no use */
+        MSG_ID_SIP_REFRESH_IPSEC_RSP,                   /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_SIP_DELETE_CONN_SOC_FD_REQ_RSP,          /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_SIP_DELETE_CONN_OBJ_REQ_RSP,             /* siptx_resp_struct */
+        MSG_ID_SIP_RESET_TCP_CLIENT_REQ_RSP,            /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_SIP_IPSEC_CHANGE_TO_REGULAR_REQ_RSP,     /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+        MSG_ID_SIP_DBG_SIP_INFO_IND,                    /* no use */
+        MSG_ID_SIP_QUERY_IF_EM_TS_EXIST_RSP,            /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
+
+
+    MSG_ID_IMS_STACK_IN_END,
+
+    MSG_ID_IMS_STACK_END,
+
+MODULE_MSG_END( MSG_ID_IMS_STACK_CODE_TAIL )
+
+
+#endif /* _IMS_STACK_MSGID_H_ */
diff --git a/mcu/interface/sap/md/imsm_msgid.h b/mcu/interface/sap/md/imsm_msgid.h
new file mode 100644
index 0000000..aac86a5
--- /dev/null
+++ b/mcu/interface/sap/md/imsm_msgid.h
@@ -0,0 +1,92 @@
+/*******************************************************************************
+* Filename:
+* ---------
+*   imsm_msgid.h
+*
+* Project:
+* --------
+*
+*
+* Description:
+* ------------
+*
+*
+* Author:
+* -------
+*
+*
+*
+* ==========================================================================
+* $Log$
+*
+* 06 10 2019 sameer.sethi
+* [MOLY00406523] IMSM checkin in VMOLY
+* 	
+* 	[MOLY00412266] IMSM patchback to VMOLY with D2
+* 	
+* 	.
+*
+* 05 20 2019 sameer.sethi
+* [MOLY00406523] IMSM checkin in VMOLY
+* .
+*
+* 05 08 2019 mika.leinonen
+* [MOLY00402881] [Gen97][Submarine] Submarine M1 VMOLY patch back - IMS
+* ims interface files
+*
+* 05 07 2019 savvas.chou
+* [MOLY00403400] [Submarine] M1 to VMOLY
+* .
+*
+* 11 27 2017 yts.chen
+* [MOLY00291619] [R3][VzW feature] EIMSROAM flow redesign.
+* 	
+* 	.
+*
+* 06 24 2017 mingchun.cheng
+* [MOLY00259445] [Bianco] sync code form LR12A.MP1
+* sync from MP1.
+*
+* 06 14 2017 ben.chiu
+* [MOLY00256374] [Bianco][N1]  Volte icon should not appear and go when change APN
+* UMOLYA - IMC/IMSM new interface for IMS dereg and IMS call status
+*
+*
+****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _IMSM_MSGID_H
+#define _IMSM_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_IMSM_CODE_BEGIN )
+    //From users to IMSM
+    MSG_ID_IMSM_FROM_USER_BEGIN = MSG_ID_IMSM_CODE_BEGIN,
+        MSG_ID_IMSM_SET_ROUTE_DNS_REQ,
+        MSG_ID_IMSM_IMC_IMS_DEREG_CNF,
+        MSG_ID_IMSM_IMC_IMS_CALL_STATUS_IND,
+        MSG_ID_IMSM_IMSM_GET_VERSION_REQ,
+        MSG_ID_IMSM_IMC_IMS_ROAMING_IND,
+
+        MSG_ID_IMCB_IMSM_BEGIN,
+            MSG_ID_IMCB_IMSM_PDN_ACT_REQ,
+            MSG_ID_IMCB_IMSM_PDN_DEACT_REQ,
+            MSG_ID_IMCB_IMSM_BEARER_ACT_REQ,
+            MSG_ID_IMCB_IMSM_BEARER_MOD_REQ,
+            MSG_ID_IMCB_IMSM_BEARER_DEACT_REQ,
+            MSG_ID_IMCB_IMSM_PARA_FAIL_REQ,
+        MSG_ID_IMCB_IMSM_END,
+
+        MSG_ID_IMSM_IMSM_INTERNAL_DEBUG_REQ,
+
+    MSG_ID_IMSM_FROM_USER_END,
+
+    //IMSM to Users
+    MSG_ID_IMSM_TO_USER_BEGIN,
+        MSG_ID_IMSM_SET_ROUTE_DNS_CNF,
+        MSG_ID_IMSM_WFC_IND,
+        MSG_ID_IMSM_IMSM_GET_VERSION_CNF,
+    MSG_ID_IMSM_TO_USER_END,
+
+MODULE_MSG_END( MSG_ID_IMSM_CODE_TAIL )
+
+#endif /* _IMSM_MSGID_H */
diff --git a/mcu/interface/sap/md/imsua_msgid.h b/mcu/interface/sap/md/imsua_msgid.h
new file mode 100644
index 0000000..a6afc44
--- /dev/null
+++ b/mcu/interface/sap/md/imsua_msgid.h
@@ -0,0 +1,499 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   imsua_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 12 16 2021 xin.ni
+ * [MOLY00774161] [mt2735][CS eCall][NG eCall][patch back] ecall patch back from NR15.R3.MD700.MP.ECAll.DEV
+ * 	
+ * 	.
+ *
+ * 05 17 2021 uri.chang
+ * [MOLY00624439] [TMO][Echolocate] TMOUS 21Q2 Echolocate feature
+ * [patch back][97R3 to 97MD700.MP][TMOUS][SWRD] Echolocate - SWRD part 3 (devided CL for category).
+ *
+ * 11 13 2020 peng.pan
+ * [MOLY00589298] [MT6853][Mouton][VzW][CCP2][LC][HQ][RnS][E911][2.41][UE Without UICC, SIB1 PS 911 Supported and SIB2 Emergency Call Not Barred, UE Recently Acquired List has LTE, PS 911 Call Unsuccessful, 911 call Completes on available System ]911 call on the UMTS fail
+ * Remove IMS unused msg id.
+ *
+ * 11 13 2020 peng.pan
+ * [MOLY00589298] [MT6853][Mouton][VzW][CCP2][LC][HQ][RnS][E911][2.41][UE Without UICC, SIB1 PS 911 Supported and SIB2 Emergency Call Not Barred, UE Recently Acquired List has LTE, PS 911 Call Unsuccessful, 911 call Completes on available System ]911 call on the UMTS fail
+ * Remove IMS unused msg id.
+ *
+ * 09 18 2020 uri.chang
+ * [MOLY00569695] [US_DEV][VZW][MP7] P-CSCF handling for handover
+ * P-CSCF handling for IP/PCO change - interface part (SWRD) - delete unused msg
+ * 	merge IP_CHANGE_NOTIFY, PCSCF_RESTORE, and REQ_REREG to CONDITION_CHANGE_NOTIFY.
+ *
+ * 09 18 2020 uri.chang
+ * [MOLY00569695] [US_DEV][VZW][MP7] P-CSCF handling for handover
+ * 	
+ * 	P-CSCF handling for IP/PCO change - interface part (SWRD) - add msg
+ * 	merge IP_CHANGE_NOTIFY, PCSCF_RESTORE, and REQ_REREG to CONDITION_CHANGE_NOTIFY.
+ *
+ * 08 28 2020 jin.liang
+ * [MOLY00562709] [5GHP][feature][Data&Call]game space mode
+ * Interface.
+ *
+ * 06 30 2020 xw.wang
+ * [MOLY00536704] [KDDI][new feature][RMSC00540517]ACB skip for SUBSCRIBE
+ * 	
+ * 	.
+ *
+ * 06 30 2020 tsung-kun.shih
+ * [MOLY00508983] [Call UA][TCL][Tokyo Lite TMO][RCS][Android Q]Apply RCS enriched calling feature patch for platform part.
+ * .
+ *
+ * 05 06 2020 theresa.yang
+ * [MOLY00520782] [CHR][EM] Add EM_IMC_CALL_380_DROP_IND - interface part
+ * Patch back interface for EM
+ * 	1. net_type
+ * 	2. CALL_380_DROP_IND.
+ *
+ * 01 14 2020 jin.liang
+ * [MOLY00474534] Modem??????????????????
+ * 	
+ * 	.
+ *
+ * 12 02 2019 xw.wang
+ * [MOLY00462202] [MT6771][Sylvia][O1][MP1.5][IOT][Japan][KDDI][PH3-VoLTE] TC3-10-6-3 UE supported "ACB Skip(3GPP Rel.12)" or not
+ * 	
+ * 	.
+ *
+ * 12 02 2019 szu-chieh.chiu
+ * [MOLY00462969] [VMOLY][Gen97] IMCB ASSERT Removal
+ * 	
+ * 	.
+ *
+ * 11 06 2019 ari.simonen
+ * [MOLY00457408] [MT6885][Petrus][MP1][SQC][MDST][SWIFT][TW][CHT+CHT][4G MM][ASSERT] file:mcu/protocol/ims/core/src/os/api_mem.c line:122
+ * 	
+ * 	Cleaned up old MEM_DEBUG message IDs
+ *
+ * 07 17 2019 sami.jutila
+ * [MOLY00422938] [Submarine]IMS_DBG_EM messages not working
+ * .
+ *
+ * 07 17 2019 tsung-kun.shih
+ * [MOLY00422851] [IMS][Gen97] [Submarine] Submarine VMOLY Patch Back
+ * .
+ *
+ * 06 12 2019 sami.jutila
+ * [MOLY00412794] Multiple PAU handled wrongly .. telenor Hungary
+ * IMS_DBG messages
+ *
+ *
+ * 07 11 2019 theresa.yang
+ * [MOLY00357356] [US_DEV][VzW][2018_JUN] CALL/SMS UA dev
+ * 	
+ * 	Patch back from SUBMARINE for Vzw 2018Jun.
+ * 	interface part in 
+ * 	MOLY00394858
+ * 	MOLY00391176
+ * 	MOLY00357356
+ * 	MOLY00375517
+ * 05 10 2019 shu-lin.yang
+ * [MOLY00357356] [US_DEV][VzW][2018_JUN] CALL/SMS UA dev
+ * 
+ * [MOLY00357356] 97 Submarine scope patches sync to Submarine DEVs
+ * [MOLY00357356][US_DEV][VzW][2018_JUN] CALL/SMS UA dev
+ * [MOLY00382398][VZW][ZTE][6761] Client API patch back
+ * [MOLY00386977][US_DEV][VzW][2018_OCT] CALLUA dev
+ * [MOLY00394340][US_DEV][MDMI] CALL UA part
+ * [MOLY00395789][US_DEV][VZW][PST tool] phone context uri
+ * 
+ * 07 04 2019 mika.leinonen
+ * [MOLY00367126] [Gen97][IMS] VoLTE porting
+ * IMS UT enhancements - SWRD
+ *
+ *
+ * 02 04 2019 mika.leinonen
+ * [MOLY00383118] [Submarine][M1] no SIP view  in ELT log
+ * Passing SIP messages to ELT view
+ *
+ * 01 25 2019 szu-chieh.chiu
+ * [MOLY00381194] [Submarine][M1][1stCall] decode fail on the ILM messages between IMSUA/IMCB/IMS_STACK
+ * call ua naming refine.
+ *
+ * 01 23 2019 mika.leinonen
+ * [MOLY00380857] [Submarine][M1][1stCall][CMCC]IMS register fail
+ * Update IMS Stack interface - flag field usage
+ *
+ * 01 08 2019 mika.leinonen
+ * [MOLY00367126] [Gen97][IMS] VoLTE porting
+ * Adding IMS interfaces to trace database.
+ *
+ *
+ * 01 03 2019 lydia.liang
+ * [MOLY00375706] [Gen97][IMS]VoLTE SMS porting
+ * 	
+ * 	-remove gen97 sms msgid, get from IMCSMS.
+ *
+ * 12 29 2018 lydia.liang
+ * [MOLY00375706] [Gen97][IMS]VoLTE SMS porting
+ *
+ * 	.
+ *
+ * 12 14 2018 mika.leinonen
+ * [MOLY00367126] [Gen97][IMS] VoLTE porting
+ * Timers - framework for UA and Stack
+ *
+ * 12 04 2018 peng.pan
+ * [MOLY00369461] [Gen97][Submarine][IMCSMS]VoLTE SMS Procedure Optimization
+ * rollback due to build error.
+ *
+ ****************************************************************************/
+
+#ifndef _IMSUA_MSGID_H_
+#define _IMSUA_MSGID_H_
+
+#include "module_msg_range.h"
+
+/*------------------- IMSUA_MSG_CODE_BEGIN---------------------*/
+MODULE_MSG_BEGIN( MSG_ID_IMSUA_CODE_BEGIN )
+
+    MSG_ID_IMSUA_BEGIN,
+
+    MSG_ID_IMSUA_EX_BEGIN,
+
+        /* To Service */
+
+        /* System */
+        MSG_ID_VOLTE_REQ_INIT,                              // VoLTE_Event_Init_t(checked!)
+        MSG_ID_VOLTE_REQ_SHUTDOWN_SERVICE,                  // no parameter
+        MSG_ID_VOLTE_REQ_AUTO_TESTING_ID_UPDATE,            // VoLTE_AutoTesting_Info_t
+        MSG_ID_VOLTE_REQ_FEATURE_SYNC,                      // VoLTE_Feature_Sync_t (checked!)
+        MSG_ID_VOLTE_REQ_LOGGING_EVENT_NOTIFY,              // VoLTE_Event_Logging_Event_Notify_t (checked!)
+        MSG_ID_IMS_DBG_SETTING_REQ,                         // ims_dbg_setting_req_struct (Theresa, EM is using)
+
+        /* System - Network */
+        MSG_ID_VOLTE_REQ_NETWORK_CHANGE,                    // VoLTE_Event_Network_Change_t (checked!)
+        MSG_ID_VOLTE_REQ_RAT_CHANGE,                        // VoLTE_Event_RAT_Change_t (checked!)
+        MSG_ID_VOLTE_REQ_3GPP_RAT_CHANGE,                   // VoLTE_Event_3gpp_Rat_Change_t (checked!)
+        MSG_ID_VOLTE_REQ_RADIO_LINK_MONITOR,                // VoLTE_Event_Radio_Link_Monitor_t (checked!)
+        MSG_ID_VOLTE_REQ_IRAT_WITHOUT_IP_CHANGE,            // VoLTE_Event_iRat_without_IP_Change_t (checked!)
+        MSG_ID_VOLTE_REQ_FF00H_UPDATE,                      // VoLTE_Event_FF00H_Update_t (checked!)
+        MSG_ID_VOLTE_REQ_RESET_IMS_REG_THROTTLING_PARA,     // VoLTE_Event_Reset_IMS_Reg_Throttling_Para_t (checked!)
+        MSG_ID_VOLTE_REQ_HANDOVER_START_NOTIFY,             // VoLTE_Event_Handover_Start_Notify_t (checked!)
+        MSG_ID_VOLTE_REQ_HANDOVER_STOP_NOTIFY,              // VoLTE_Event_Handover_Stop_Notify_t (checked!)
+        MSG_ID_VOLTE_REQ_HANDOVER_IP_READY_NOTIFY,          // VoLTE_Event_Handover_IP_Ready_Notify_t (checked!)
+        MSG_ID_VOLTE_REQ_CONDITION_CHANGE_NOTIFY,           // VoLTE_Event_Condition_Change_Notify_t
+        /* System - Setting */
+        MSG_ID_VOLTE_REQ_UPDATE_RT_SETTING,                 // VoLTE_Event_Setting_t (checked!)
+        MSG_ID_VOLTE_REQ_UPDATE_ST_SETTING,                 // VoLTE_Event_Setting_t
+        /* ViLTE */
+        MSG_ID_VOLTE_REQ_VT_CAP_SETTING,                    // VoLTE_Event_VT_Cap_Setting_t  (checked!)
+        MSG_ID_VOLTE_REQ_ATCMD_RELAY,                       // VoLTE_Event_ATCmd_Relay_t (checked!)
+
+        /* System - Low Layer */
+        MSG_ID_VOLTE_REQ_MD_LOWER_LAYER_ERR,                // VoLTE_Event_MD_Lower_Layer_Err_t (checked!)
+        MSG_ID_VOLTE_REQ_3GPP_OOS_IND,                      // VoLTE_Event_3gpp_OOS_Ind_t (checked!)
+
+        /* Teardon Flow for IMCB/REG state un-sync */
+        MSG_ID_IMSUA_IMCB_UNEXPECTED_STATE_IND,             // imsua_imcb_unexpected_state_ind_t
+
+        /* From Service */
+        MSG_ID_VOLTE_IND_BOOTUP,                            // no parameter
+        MSG_ID_VOLTE_IND_READY,                             // no parameter (Theresa, notify IMCB that volte service is ready)
+        MSG_ID_VOLTE_IND_QUERY_STATE,                       // VoLTE_Event_Query_State_t (checked!)
+        MSG_ID_VOLTE_IND_REG_NOTIFY_DONE,                   // VoLTE_Event_Reg_Notify_Done_t
+        MSG_ID_VOLTE_IND_ATCMD_RELAY,                       // VoLTE_Event_ATCmd_Relay_t (checked!)
+        MSG_ID_VOLTE_IND_REG_NOTIFY_CONF_SUBSC,             // VoLTE_Event_Notify_t (Theresa, REG feature - send SUBSCRIBE to UA)
+        MSG_ID_VOLTE_IND_TLV_PARA,                          // VoLTE_Event_Tlv_Para_Setting_t (checked!)
+        MSG_ID_VOLTE_IND_REG_REL_ALL_CALL,                  // VoLTE_Event_Call_Rel_t
+
+        /* To REG UA */
+        MSG_ID_VOLTE_REQ_REG,                               // VoLTE_Event_Reg_Item_t (checked!)
+        MSG_ID_VOLTE_REQ_REREG,                             // VoLTE_Event_Reg_Item_t (checked!)
+        MSG_ID_VOLTE_REQ_DEREG,                             // VoLTE_Event_Reg_Item_t (checked!)
+        MSG_ID_VOLTE_REQ_REG_STATE,                         // VoLTE_Event_Reg_Item_t
+        MSG_ID_VOLTE_REQ_REG_ADD_BIND,                      // VoLTE_Event_Reg_Item_t
+        MSG_ID_VOLTE_REQ_REG_DEL_BIND,                      // VoLTE_Event_Reg_Item_t
+        MSG_ID_VOLTE_REQ_REG_ADD_CAPABILITY,                // VoLTE_Event_Reg_Capability_t (checked!)
+        MSG_ID_VOLTE_REQ_REG_DEL_CAPABILITY,                // VoLTE_Event_Reg_Capability_t (checked!)
+        MSG_ID_VOLTE_REQ_REG_RESET,                         // VoLTE_Event_Reg_Item_t
+        MSG_ID_VOLTE_REQ_REG_RESTORE,                       // VoLTE_Event_Reg_Item_t
+        MSG_ID_VOLTE_CNF_REG_QUERY_CALL_STATE,              // VoLTE_Event_Reg_Item_t
+        MSG_ID_VOLTE_IND_REG_CALL_SESSION_TERMINATED,       // VoLTE_Event_Reg_Item_t
+        MSG_ID_VOLTE_REQ_REG_SEND_SUBSCRIBE,                // VoLTE_Event_Reg_Item_t
+        MSG_ID_VOLTE_CNF_GEOLOCATION_REQ,                   // VoLTE_Event_Geolocation_Info_t
+        MSG_ID_VOLTE_IND_FROM_FWK_RELAY_REQ,                // relay from framework
+        MSG_ID_VOLTE_IND_UA_STATE,                          // VoLTE_Event_UA_State_t
+        MSG_ID_VOLTE_REQ_REG_E911_E2_TIMEOUT,               // VoLTE_Event_Reg_Item_t
+        MSG_ID_VOLTE_IND_REG_CALL_SESSION_STARTED,          // VoLTE_Event_Reg_Item_t
+        MSG_ID_VOLTE_REQ_PS_DATA_OFF,                       // VoLTE_Event_PS_DATA_OFF_Req_t (checked!)
+        MSG_ID_VOLTE_IND_REG_CALL_STATUS,                   // VoLTE_Event_List_Current_Call_To_Stack_t
+        MSG_ID_VOLTE_CNF_REG_ACB_SKIP_START,                // VoLTE_Event_ACB_Skip_Info_t
+        MSG_ID_VOLTE_CNF_REG_ACB_SKIP_END,                  // VoLTE_Event_ACB_Skip_Info_t
+
+
+        /* From REG UA */
+        MSG_ID_VOLTE_IND_REG_STATE,                         // VoLTE_Event_Reg_State_t (checked!)
+        MSG_ID_VOLTE_RSP_REG_STATE,                         // VoLTE_Event_Reg_State_t
+        MSG_ID_VOLTE_IND_REG_IPSEC_FLUSH,                   // VoLTE_Event_IPSec_Policy_Flush_Ind_t (checked!)
+        MSG_ID_VOLTE_IND_REG_IPSEC_ADD,                     // VoLTE_Event_IPSec_Policy_Add_Ind_t (checked!)
+        MSG_ID_VOLTE_IND_REG_IPSEC_DELETE,                  // VoLTE_Event_IPSec_Policy_Delete_Ind_t (checked!)
+        MSG_ID_VOLTE_IND_REG_EMS_MODE,                      // VoLTE_Event_Reg_Ems_Mode_t (checked!)
+        MSG_ID_VOLTE_IND_SRU_INFO,                          // VoLTE_Event_SRU_Info_t (checked!)
+        MSG_ID_VOLTE_IND_REG_ACB_SKIP_START,                // VoLTE_Event_ACB_Skip_Info_t
+        MSG_ID_VOLTE_IND_REG_ACB_SKIP_END,                  // VoLTE_Event_ACB_Skip_Info_t
+        MSG_ID_VOLTE_IND_REG_UPDATE_PLANI_TIME,             // VoLTE_Event_Update_PLANI_Time
+
+
+        /* To Call UA */
+
+        /* Call - starting */
+        MSG_ID_VOLTE_MO_CALL_REQ,                           // VoLTE_Event_Call_Start_t (checked!)
+        MSG_ID_VOLTE_MT_CALL_PRESENT_RSP,                   // VoLTE_Event_MT_Call_Rsp_t (checked!)
+
+        /* Call - progress */
+        MSG_ID_VOLTE_BW_CNF,                                // VoLTE_Event_BW_Act_t (checked!)
+        MSG_ID_VOLTE_BW_NEGO,                               // VoLTE_Event_BW_Act_t (checked!)
+        MSG_ID_VOLTE_MT_ACCEPT_REQ,                         // VoLTE_Event_Req_t (checked!)
+        MSG_ID_VOLTE_MO_HANGUP_REQ,                         // VoLTE_Event_Req_t, map to AT+CHLD=1x. must have call id. (checked!)
+        MSG_ID_VOLTE_REFRESH_REQ,                           // VoLTE_Event_Call_Refresh_t. internal message for NETWORK_CHANGE with refresh state (Theresa, session refresh)
+        MSG_ID_VOLTE_LIST_CALL_REQ,                         // (Theresa, obsoleted!)
+        MSG_ID_VOLTE_MO_FORCE_HANGUP_REQ,                   // VoLTE_Event_Req_t (checked!)
+        MSG_ID_VOLTE_SRVCC_START,                           // VoLTE_Event_SRVCC_Info_t (checked!)
+        MSG_ID_VOLTE_SRVCC_END,                             // VoLTE_Event_SRVCC_Info_t (checked!)
+        MSG_ID_VOLTE_NO_RTPPKT_REQ,                         // VoLTE_Event_Req_t (checked!)
+        MSG_ID_VOLTE_MO_CONF_CALL_REQ,                      // VoLTE_Event_Conf_Call_Start_t (checked!)
+        MSG_ID_VOLTE_NOTIFY_IMSVOPS_REQ,                    // VoLTE_Event_Notify_t (checked!)
+        MSG_ID_VOLTE_INCOMING_RTPPKT_REQ,                   // VoLTE_Event_Req_t (checked!)
+        MSG_ID_VOLTE_IMS_NOTIFY_REQ,                        // VoLTE_Event_Ims_Notify_Req_t (checked!)
+
+        /*R13 ALTC*/
+        MSG_ID_VOLTE_ALTC_ADDRESS_STATUS_REQ,               // VoLTE_Event_Altc_Address_Req_t (checked!)
+
+        /* Call - Internal */
+        MSG_ID_VOLTE_OOS_HANGUP_REQ,                        // VoLTE_Event_Call_Refresh_t. internal message for NETWORK_CHANGE with refresh state (Theresa, internal use)
+        MSG_ID_VOLTE_OOS_STOP_REQ,                          // VoLTE_Event_Call_Refresh_t. internal message for NETWORK_CHANGE with refresh state
+        MSG_ID_VOLTE_REL_SESSION_REQ,                       // VoLTE_Event_Call_Rel_t. internal message for NETWORK_CHANGE with refresh state (Theresa, internal use)
+        MSG_ID_VOLTE_HOLD_REQ,
+        MSG_ID_VOLTE_UNHOLD_REQ,
+        MSG_ID_VOLTE_QUEUE_SIP_MSG_REQ,                     // VoLTE_Event_Queue_SIP_t. internal message for put the SIP message to message queue. (Theresa, internal use)
+        MSG_ID_VOLTE_TRANSFER_ABORT_REQ,                    // VoLTE_Event_MT_Call_Abort_t (Theresa, internal use. ECT)
+        MSG_ID_VOLTE_TRANSFER_FINALIZE_REQ,                 // VoLTE_Event_Media_Mod_Ind_t (Theresa, internal use. ECT)
+        MSG_ID_VOLTE_MOD_SESSION_INTERNAL_CANCEL_REQ,
+        MSG_ID_VOLTE_CC_CS_AVAILABILITY_CNF,                // VoLTE_Event_CC_CS_Availability_cnf_t (checked!)
+        MSG_ID_VOLTE_CS_SERVICE_NOTIFICATION_REQ,           // VOLTE_CS_SERVICE_NOTIFICATION_REQ (Patrick, TMOUS_2019Q2_GID-MTRREQ-245903)
+
+        /* ViLTE */
+        MSG_ID_VOLTE_MOD_SESSION_REQ,                       // VoLTE_Event_Mod_Session_Req_t (checked!)
+        MSG_ID_VOLTE_MOD_SESSION_RSP,                       // VoLTE_Event_Mod_Session_Rsp_t (checked!)
+        MSG_ID_VOLTE_MT_VT_SPECIAL_ACCEPT_REQ,              // VoLTE_Event_MT_VT_Special_Accept_Req_t (checked!)
+        MSG_ID_VOLTE_MOD_BW_REQ,                            // VoLTE_Event_Mod_BW_Req_t
+        MSG_ID_VOLTE_MOD_SESSION_CANCEL_REQ,                // VoLTE_Event_Mod_Session_Cancel_Req_t (checked!)
+
+        /*GTT*/
+        MSG_ID_VOLTE_TEXT_REQ,                              // VoLTE_Event_Text_Req_t, AT+CTMCALL (checked!)
+
+        /*eCall*/
+        MSG_ID_VOLTE_ECALL_IN_BAND_MSD_TRANSFER_RSP,        // VoLTE_Event_ecall_In_Band_MSD_Transfer_Rsp_t
+        MSG_ID_VOLTE_ECALL_UPDATE_MSD_RSP,                  // VoLTE_Event_ecall_Update_MSD_Rsp_t
+
+        /*SMS*/
+        MSG_ID_VOLTE_SMS_CS_AVAILABILITY_CNF,               // VoLTE_Event_SMS_CS_Availability_cnf_t (checked!)
+
+        /* Multi Calls Domain Conflict */
+        MSG_ID_VOLTE_MO_CALL_DOMAIN_CONFLICT_REQ,           // VoLTE_Event_Req_t (checked!)
+        MSG_ID_VOLTE_MEDIA_ANBR_IND,                        // VoLTE_Event_Media_Anbr_Ind_t(AS value noitfy to UA ANBR) (checked!)
+        MSG_ID_VOLTE_MEDIA_ANBR_RSP,                        // VoLTE_Event_Media_Anbr_Rsp_t(SIP negotiation response) (checked!)
+
+        /*RTT*/
+        MSG_ID_VOLTE_RTT_REQ,                               // VoLTE_Event_RTT_Req_t, AT+RTTCALL (checked!)
+        MSG_ID_VOLTE_AUTO_RTT_REQ,                          // VoLTE_Event_RTT_Req_t, Internal event (Theresa, absoleted!)
+        MSG_ID_VOLTE_RTT_RSP,                               // VoLTE_Event_RTT_Rsp_t, Internal event (Theresa, RTT)
+
+        /*Client API*/
+        MSG_ID_VOLTE_GET_HEADER_REQ,                        // VoLTE_Event_Header_Req_t, AT+EIMSHEADER
+        MSG_ID_VOLTE_IMS_CALL_MODE_REQ,                     // VoLTE_Event_Call_Mode_Req_t, AT+EIMSCALLMODE
+
+        /*Enrich Calling*/
+        MSG_ID_VOLTE_EC_CALL_EXTRA_HEADER_REQ,              // VoLTE_Event_EC_Call_Extra_header_Req_t, AT+EIMSCAI, mode 3, type 1
+        MSG_ID_VOLTE_EC_CALL_LOC_INFO,                      // VoLTE_Event_EC_Call_Location_Info_t, AT+EIMSCAI, mode 3, type 2
+
+
+        /* From Call UA */
+
+        /* Call - starting */
+        MSG_ID_VOLTE_BW_IND,                                // VoLTE_Event_BW_Require_t (checked!)
+        MSG_ID_VOLTE_BW_MOD,                                // VoLTE_Event_BW_Update_t (checked!)
+        MSG_ID_VOLTE_BW_REL,                                // VoLTE_Event_BW_Act_t (checked!)
+        MSG_ID_VOLTE_MT_CALL_PRESENT_IND,                   // VoLTE_Event_MT_Call_Ind_t (checked!)
+        MSG_ID_VOLTE_MT_CALL_ABORT_IND,                     // VoLTE_Event_MT_Call_Abort_t (checked!)
+        MSG_ID_VOLTE_MT_ACCEPT_CNF,                         // VoLTE_Event_Call_Stop_t (checked!)
+        MSG_ID_VOLTE_MO_CALL_CNF,                           // VoLTE_Event_MO_Call_Cnf_t (checked!)
+        MSG_ID_VOLTE_MO_HANGUP_CNF,                         // VoLTE_Event_Call_Stop_t (checked!)
+        MSG_ID_VOLTE_MO_CONF_CALL_CNF,                      // VoLTE_Event_MO_Conf_Call_Cnf_t (checked!)
+        /* Call - progress */
+        /* Call - connect */
+        /* Call - disconnect */
+        MSG_ID_VOLTE_CALL_PROGRESS_IND,                     // VoLTE_Event_Call_Prog_t (checked!)
+        /* Call - Media */
+        MSG_ID_VOLTE_MEDIA_IND,                             // VoLTE_Event_MediaInfo_t (checked!)
+        MSG_ID_VOLTE_MT_CALL_RING_IND,                      // VoLTE_Event_Call_Refresh_t (checked!)
+        MSG_ID_VOLTE_LIST_CALL_CNF,                         // VoLTE_Event_List_Current_Call_t (checked!)
+        MSG_ID_VOLTE_SRVCC_CALL_CTXT_TRANSFER,              // VoLTE_Event_List_SRVCC_Call_Ctxt_t (checked!)
+        MSG_ID_VOLTE_SIP_CALL_PROGRESS_IND,                 // VoLTE_Event_SIP_Call_Prog_Ind_t (checked!)
+
+        /* ViLTE */
+        MSG_ID_VOLTE_MEDIA_MOD_IND,                         // VoLTE_Event_Media_Mod_Ind_t (checked!)
+        MSG_ID_VOLTE_VIDEO_CAP_IND,                         // VoLTE_Event_Video_Cap_Ind_t (checked!)
+
+        /* VOLTE_MOD_SESSION_CNF, VOLTE_MOD_SESSION_IND move to VoLTE_Event_fromCall_Internal_e */
+        MSG_ID_VOLTE_MOD_SESSION_CNF,                       // VoLTE_Event_Mod_Session_Cnf_t (checked!)
+        MSG_ID_VOLTE_MOD_SESSION_IND,                       // VoLTE_Event_Mod_Session_Ind_t (checked!)
+        MSG_ID_VOLTE_MT_VT_SPECIAL_ACCEPT_CNF,              // VoLTE_Event_MT_VT_Special_Accept_Cnf_t (checked!)
+        MSG_ID_VOLTE_MOD_SESSION_CANCEL_CNF,                // VoLTE_Event_Mod_Session_Cancel_Cnf_t (checked!)
+        MSG_ID_VOLTE_MOD_SESSION_CANCEL_IND,                // VoLTE_Event_Mod_Session_Cancel_Ind_t (checked!)
+        MSG_ID_VOLTE_LOCAL_BW_READY_IND,                    // VoLTE_Event_Local_BW_Ready_Ind_t (checked!)
+        MSG_ID_VOLTE_CC_CS_AVAILABILITY_REQ,                // VoLTE_Event_CC_CS_Availability_req_t (checked!)
+        MSG_ID_VOLTE_SMS_CS_AVAILABILITY_REQ,               // VoLTE_Event_SMS_CS_Availability_req_t (checked!)
+
+        /*GTT*/
+        MSG_ID_VOLTE_TEXT_CNF,                              // VoLTE_Event_Text_Cnf_t (checked!)
+        MSG_ID_VOLTE_TEXT_CAP_IND,                          // VoLTE_Event_Text_Cap_Ind_t (checked!)
+
+        /* CDMA-less */
+        MSG_ID_VOLTE_IMS_TIMER_STATUS_IND,                  // VoLTE_Event_IMS_Timer_Status_Ind_t (checked!)
+
+        /* Multi Calls Domain Conflict */
+        MSG_ID_VOLTE_MO_CALL_DOMAIN_CONFLICT_CNF,           // VoLTE_Event_Call_Stop_t (checked!)
+
+        /*RTT*/
+        MSG_ID_VOLTE_RTT_CNF,                               // VoLTE_Event_RTT_Cnf_t (checked!)
+
+
+        /* To SS UA */
+
+        MSG_ID_VOLTE_SS_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE_REQ,   // VoLTE_Event_SS_Req_t, AT+CHLD=2 (checked!)
+        MSG_ID_VOLTE_SS_REL_WAITING_OR_HOLDING_CALL_REQ,            // VoLTE_Event_SS_Req_t, AT+CHLD=0 (checked!)
+        MSG_ID_VOLTE_SS_REL_ALL_ACTIVE_CALLS_AND_RESUME_CALL_REQ,   // VoLTE_Event_SS_Req_t, map to AT+CHLD=1 (checked!)
+        MSG_ID_VOLTE_SS_REL_ALL_CALLS_REQ,                          // VoLTE_Event_SS_Req_t, AT+CHLD=6 (checked!)
+        MSG_ID_VOLTE_SS_ATH_REL_ALL_CALLS_REQ,                      // VoLTE_Event_SS_Req_t, ATH (checked!)
+        MSG_ID_VOLTE_SS_CREATE_CONFERENCE_CALL_REQ,                 // VoLTE_Event_SS_Conf_Req_t, AT+CHLD=3 (checked!)
+        MSG_ID_VOLTE_SS_EXPLICIT_CALL_TRANSFER_REQ,                 // VoLTE_Event_SS_Req_t, AT+CHLD=4 (checked!)
+        MSG_ID_VOLTE_SS_CONFERENCE_CONTROL_REQ,                     // AP side require to add someone to the conference. VoLTE_Event_SS_Conf_Control_Req_t. AT+ECONF (checked!)
+        MSG_ID_VOLTE_SS_CALL_CONTROL_REQ,                           // VoLTE_Event_SS_Call_Ctrl_t, AT+ECCTRL (checked!)
+        MSG_ID_VOLTE_SS_ECT_REQ,                                    // receive SS ECT blind/assured request from AP side. VoLTE_Event_SS_ect_Req_t (checked!)
+
+
+        /* From SS UA */
+
+        MSG_ID_VOLTE_SS_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE_CNF,   // VoLTE_Event_SS_Resp_t (checked!)
+        MSG_ID_VOLTE_SS_REL_WAITING_OR_HOLDING_CALL_CNF,            // VoLTE_Event_SS_Resp_t (checked!)
+        MSG_ID_VOLTE_SS_REL_ALL_ACTIVE_CALLS_AND_RESUME_CALL_CNF,   // VoLTE_Event_SS_Resp_t (checked!)
+        MSG_ID_VOLTE_SS_REL_ALL_CALLS_CNF,                          // VoLTE_Event_SS_Resp_t (checked!)
+        MSG_ID_VOLTE_SS_ATH_REL_ALL_CALLS_CNF,                      // VoLTE_Event_SS_Resp_t (checked!)
+        MSG_ID_VOLTE_SS_CREATE_CONFERENCE_CALL_CNF,                 // VoLTE_Event_SS_Resp_t (checked!)
+        MSG_ID_VOLTE_SS_EXPLICIT_CALL_TRANSFER_CNF,                 // VoLTE_Event_SS_Resp_t (checked!)
+        MSG_ID_VOLTE_SS_SUBSCRIBE_CONTROL_IND,                      // send SUBSCRIBE before, when we receive 200 OK, send indication to AP side, VoLTE_Event_SS_Sub_ind_t (checked!)
+        MSG_ID_VOLTE_SS_CONFERENCE_CONTROL_IND,                     // send REFER for conference before, when we receive NOTIFY related to the REFER, send indication to AP side, VoLTE_Event_SS_Conf_ind_t (checked!)
+        MSG_ID_VOLTE_SS_PROGRESS_NOTIFY_IND,                        // send SS notification to AP side. VoLTE_Event_SS_Notify_t (checked!)
+        MSG_ID_VOLTE_SS_CONFERENCE_CONTROL_CNF,                     // After add someone to the conference, send indication to AP side, VoLTE_Event_SS_Resp_t (checked!)
+        MSG_ID_VOLTE_SS_CALL_CONTROL_CNF,                           // After action is done, send indication to AP side, VoLTE_Event_SS_Resp_t (checked!)
+        MSG_ID_VOLTE_SS_ECT_NOTIFY_IND,                             // send SS notification to AP side. VoLTE_Event_SS_ect_notify_t (checked!)
+        MSG_ID_VOLTE_SS_ECT_CNF,                                    // send SS ECT blind/assured response to AP side. VoLTE_Event_SS_ect_Resp_t (checked!)
+
+
+        /* To SMS UA */
+
+        MSG_ID_VOLTE_REQ_SMS_SEND,                          // VoLTE_Event_SMS_Send_Message_t (checked!)
+        MSG_ID_VOLTE_REQ_SMS_RELEASE,                       // VoLTE_Event_SMS_Release_t (checked!)
+        MSG_ID_VOLTE_CNF_SMS_RECEIVED,                      // VoLTE_Event_SMS_Confirm_t (checked!)
+
+
+        /* From SMS UA */
+
+        MSG_ID_VOLTE_RSP_SMS_SENT,                          // VoLTE_Event_SMS_Result_t (checked!)
+        MSG_ID_VOLTE_IND_SMS_RECEIVED,                      // VoLTE_Event_SMS_Recv_Message_t (checked!)
+        MSG_ID_VOLTE_IND_SMS_ERROR,                         // VoLTE_Event_SMS_Result_t (checked!)
+
+        /* To USSD UA */
+
+        MSG_ID_VOLTE_USSD_CMD_REQ,                          // VoLTE_Event_New_Ussd_CMD_t (checked!)
+        MSG_ID_VOLTE_USSD_URC_STATUS_REQ,                   // VoLTE_Event_Ussd_Urc_Status_REQ_t (checked!)
+
+
+        /* From USSD UA */
+
+        MSG_ID_VOLTE_USSD_IND,                              // VoLTE_Event_Ussd_IND_t (checked!)
+        MSG_ID_VOLTE_USSD_RSP,                              // VoLTE_Event_Ussd_RSP_t (checked!)
+
+        MSG_ID_IMS_DBG_EM_SMS_INFO_IND,
+        MSG_ID_IMS_DBG_EM_CALL_INFO_IND,
+        MSG_ID_IMS_DBG_EM_SRVCC_INFO_IND,
+        MSG_ID_IMS_DBG_EM_CONF_INFO_IND,
+        MSG_ID_IMS_DBG_EM_BEARER_INFO_IND,
+        MSG_ID_IMS_DBG_EM_PCSCF_INFO_IND,
+        MSG_ID_IMS_DBG_EM_MEDIA_INFO_IND,
+        MSG_ID_IMS_DBG_EM_CALL_DROP_IND,
+        MSG_ID_IMS_DBG_EM_IMS_EVENT_INFO_IND,
+        MSG_ID_IMS_DBG_EM_CALL_380_DROP_IND,
+        MSG_ID_IMS_DBG_EM_TIMER_INFO_IND,
+
+
+        /* From IMC */
+        MSG_ID_IMSUA_IMC_EVOLTESI_CONFIG_IND,
+
+    MSG_ID_IMSUA_EX_END,
+
+    MSG_ID_IMSUA_IN_BEGIN,
+    MSG_ID_IMSUA_IN_END,
+
+    MSG_ID_IMSUA_END,
+
+MODULE_MSG_END( MSG_ID_IMSUA_CODE_TAIL )
+
+
+#endif /* _IMSUA_MSGID_H_ */
diff --git a/mcu/interface/sap/md/iwlan_ipc_msgid_source.h b/mcu/interface/sap/md/iwlan_ipc_msgid_source.h
new file mode 100644
index 0000000..20e6e54
--- /dev/null
+++ b/mcu/interface/sap/md/iwlan_ipc_msgid_source.h
@@ -0,0 +1,66 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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:
+ * ---------
+ *   iwlan_ipc_msgid_source.h
+ *
+ * Project:
+ * --------
+ *   UMOLYA
+ *
+ * Description:
+ * ------------
+ *   IWLAN related IPC message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ *
+ ****************************************************************************/
+
+MSG_ID_LWXN_WIPC_WLAN_LWA_CONNECT_IND,
+MSG_ID_LWXN_WIPC_WLAN_LWA_CONNECT_RSP,
+MSG_ID_LWXN_WIPC_WLAN_LWA_DISCONNECT_IND,
+MSG_ID_LWXN_WIPC_WLAN_LWA_DISCONNECT_RSP,
+MSG_ID_LWXN_WIPC_WLAN_LWA_LOST_REQ,
+MSG_ID_LWXN_WIPC_WLAN_MEASUREMENT_IND,
+MSG_ID_LWXN_WIPC_WLAN_MEASUREMENT_REQ,
+MSG_ID_LWXN_WIPC_WLAN_MEASUREMENT_STOP_IND,
diff --git a/mcu/interface/sap/md/iwlan_msgid.h b/mcu/interface/sap/md/iwlan_msgid.h
new file mode 100644
index 0000000..0c0b713
--- /dev/null
+++ b/mcu/interface/sap/md/iwlan_msgid.h
@@ -0,0 +1,435 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   iwlan_msgid.h
+ *
+ * Project:
+ * --------
+ *	 UMOLYA 
+ *
+ * Description:
+ * ------------
+ * This module defines the messgae IDs for IWLAN.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ ****************************************************************************/
+#ifndef _IWLAN_MSG_ID_H
+#define _IWLAN_MSG_ID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_IWLAN_CODE_BEGIN )
+
+/****************************************************************************
+*                 <1> Desitnation: IWLAN 
+****************************************************************************/
+// <1.1> From ERRC
+    // LWI
+    MSG_ID_IWLAN_ERRC_LWI_STEER_STATUS_IND = MSG_ID_IWLAN_CODE_BEGIN,
+    MSG_ID_IWLAN_ERRC_WLAN_PARAMETER_IND,
+
+    // LWA
+    MSG_ID_IWLAN_ERRC_WLAN_LWA_CONNECT_IND,
+    MSG_ID_IWLAN_ERRC_WLAN_LWA_DISCONNECT_IND,
+    MSG_ID_IWLAN_ERRC_WLAN_MEASUREMENT_IND,
+    MSG_ID_IWLAN_ERRC_WLAN_MEASUREMENT_STOP_IND,
+
+// <1.2> From WIPC
+    // LWI
+    MSG_ID_CS_IWLAN_ASSOCIATE_REQ,
+    MSG_ID_IWLAN_WLFW_LWI_CONF_CNF,
+    MSG_ID_IWLAN_WLFW_LWI_START_STOP_CNF,
+    MSG_ID_IWLAN_WLFW_LWI_MEAS_IND,
+    MSG_ID_IWLAN_WLFW_MEAS_CAPA_FAIL_IND,
+    // LWA
+    MSG_ID_WIPC_IWLAN_WLAN_MEASUREMENT_REQ,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_CONNECT_RSP,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_DISCONNECT_RSP,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_LOST_REQ,
+
+// <1.3> To WIPC
+    // LWA
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_CONNECT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_DISCONNECT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_MEASUREMENT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_MEASUREMENT_STOP_IND,
+
+// <1.3> From ATP
+    MSG_ID_ATP_IWLAN_WLAN_CAPABILITY_REQ,
+    MSG_ID_ATP_IWLAN_IMSCFG_REQ,
+    MSG_ID_ATP_IWLAN_L4_IMSCFG_RSP,
+    MSG_ID_ATP_IWLAN_L4_EXT_CELLTECH_URCRPT_REQ,
+    MSG_ID_ATP_IWLAN_L4_VOPS_URCRPT_REQ,
+    MSG_ID_ATP_IWLAN_L4_ECEVDP_URCRPT_REQ,
+    MSG_ID_ATP_IWLAN_ESRVSTATE_REQ,
+    MSG_ID_ATP_IWLAN_ECNCFG_REQ,
+    MSG_ID_ATP_IWLAN_EWIFIEN_REQ,
+    MSG_ID_ATP_IWLAN_EWFCPREF_REQ,
+    MSG_ID_ATP_IWLAN_ELOCAEN_REQ,    
+    MSG_ID_ATP_IWLAN_EIWLCFGSET_REQ,
+    MSG_ID_ATP_IWLAN_EIWLCFGGET_REQ,       
+    MSG_ID_ATP_IWLAN_EIMSGEO_REQ,
+    MSG_ID_ATP_IWLAN_EIWLPING_REQ,
+    MSG_ID_ATP_IWLAN_EPVSSET_REQ,
+    MSG_ID_ATP_IWLAN_EPVSGET_REQ,
+    MSG_ID_ATP_IWLAN_EIRAT_STATUS_REQ,
+    MSG_ID_ATP_IWLAN_EIMSRCSCONN_REQ,
+    MSG_ID_ATP_IWLAN_EIWLPLEN_REQ,
+    MSG_ID_ATP_IWLAN_CEUS_IND,
+    MSG_ID_ATP_IWLAN_EFUN_REQ,
+    MSG_ID_ATP_IWLAN_EAPMODE_REQ,
+    MSG_ID_ATP_IWLAN_SIP_CALL_PROGRESS_REQ,    
+    MSG_ID_ATP_IWLAN_DUMP_RUNTIME_PARA_REQ, // AT+ECFGDRP 
+// <1.4> From D2RM
+
+// <1.5> From IMC
+    MSG_ID_IMC_IWLAN_IMS_CALL_STATUS_REQ,
+    MSG_ID_IMC_IWLAN_CALL_MEDIA_INFO_REQ,
+    MSG_ID_IMC_IWLAN_MO_CONFIG_IND,
+    MSG_ID_IMC_IWLAN_WIFI_SERVICE_FAIL_REQ,
+    MSG_ID_IMC_IWLAN_REG_RAN_PRIO_UPDATE_REQ,
+    MSG_ID_IMC_IWLAN_IMS_ECC_HO_REQ,
+
+// <1.6> From SDM
+	MSG_ID_IWLAN_SDM_ECSCM_INFO_REQ,
+
+/****************************************************************************
+*                 <2> Desitnation: WMOB
+****************************************************************************/
+    MSG_ID_WMOB_WMOB_LWI_STAT_REQ,
+    MSG_ID_EVHD_WMOB_LWX_LWI_STEER_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWI_PARA_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWI_STEER_STATUS_REQ,
+    MSG_ID_EVHD_WMOB_LWX_WLAN_CAPABILITY_REQ,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_LWA_CONNECT_IND,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_LWA_CONNECT_RSP,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_LWA_DISCONNECT_IND,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_LWA_DISCONNECT_RSP,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_MEASUREMENT_IND,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_MEASUREMENT_STOP_IND,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_MEASUREMENT_REQ,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_LWA_LOST_REQ,
+
+    MSG_ID_EVHD_WMOB_LWX_CS_ASSOCIATE_REQ,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_LWI_CONF_REQ,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_LWI_CONF_CNF,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_LWI_START_STOP_REQ,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_LWI_START_STOP_CNF,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_LWI_MEAS_IND,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_MEAS_CAPA_FAIL_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_MEASUREMENT_REQ,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_LWA_CONNECT_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_LWA_CONNECT_RSP,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_LWA_DISCONNECT_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_LWA_DISCONNECT_RSP,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_LWA_LOST_REQ,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_MEASUREMENT_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_MEASUREMENT_STOP_IND,
+
+    MSG_ID_EVHD_WMOB_LWX_CS_WLAN_CAPABILITY_REQ,
+
+    MSG_ID_WMOB_LWX_LWX_STAT_REQ,
+    MSG_ID_WMOB_LWX_LWI_STEER_REQ,
+    MSG_ID_EVHD_WMOB_TMR_TO_IND,
+    MSG_ID_EVHD_WMOB_SIM_READY_IND,
+    MSG_ID_EVHD_WMOB_SIM_ERROR_IND,
+
+    /*Desitnation: WMOB WANS*/
+    MSG_ID_EVHD_WMOB_WANS_TMR_TO_IND,
+    MSG_ID_EVHD_WMOB_WANS_DATASRVSTATE_INFO_REQ, //FWK
+    MSG_ID_EVHD_WMOB_WANS_SIGLEVEL_INFO_REQ, //+ECSQ
+    MSG_ID_EVHD_WMOB_WANS_VOPSRPT_INFO_REQ, //+CIREPI
+    MSG_ID_EVHD_WMOB_WANS_PCSCFPING_INFO_REQ, //LTECSR
+    MSG_ID_EVHD_WMOB_WANS_WIFISRVSTATE_INFO_REQ, //WfcD
+    MSG_ID_EVHD_WMOB_WANS_WIFISIGLVL_INFO_REQ, //WfcD
+    MSG_ID_EVHD_WMOB_WANS_IMSCFG_REQ, //ATP
+    MSG_ID_EVHD_WMOB_WANS_L4_IMSCFG_RSP, // ATP
+    MSG_ID_EVHD_WMOB_WANS_WFCPREF_CFG_REQ, //ATP: for wfc_pref & wfc_wpref_en
+    MSG_ID_EVHD_WMOB_WANS_WIFIUI_CFG_REQ,
+    MSG_ID_EVHD_WMOB_WANS_ECSCM_INFO_REQ, //+ECSCM
+    MSG_ID_EVHD_WMOB_WANS_L4_VOPS_URCRPT_REQ,
+    MSG_ID_EVHD_WMOB_WANS_L4BNW_ATTACHED_RAT_IND,
+    MSG_ID_EVHD_WMOB_WANS_ESRVSTATE_REQ,
+    MSG_ID_EVHD_WMOB_WANS_ECNCFG_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EWIFIEN_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EWFCPREF_REQ,
+    MSG_ID_EVHD_WMOB_WANS_ELOCAEN_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EIWLCFGSET_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EIWLCFGGET_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EPVSSET_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EPVSGET_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EIRAT_STATUS_REQ,
+
+    MSG_ID_EVHD_WMOB_WANS_WIFIMON_CFG_IND, // To WLC
+    MSG_ID_IPOL_WLC_UPDATE_PRIORITY_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EIWLPLEN_REQ,    // AT+EIWLPLEN
+    MSG_ID_EVHD_WMOB_WANS_EIWLPL_IND,      // URC+EIWLPL
+
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_CFG_REQ,
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_CFG_CNF,
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_RPT_IND,
+
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_QUERY_REQ,
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_QUERY_CNF,
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_QUERY_IND,
+
+    // From WO
+    MSG_ID_EVHD_WMOB_WANS_WO_STATUS_IND,
+    MSG_ID_EVHD_WMOB_WANS_WO_DPD_CNF,
+    MSG_ID_EVHD_WMOB_WANS_WO_MOBIKE_IND,
+
+    MSG_ID_EVHD_WMOB_WANS_EIMSGEO_IND, // +EIMSGEO
+    MSG_ID_EVHD_WMOB_WANS_EIMSGEO_REQ, // AT+EIMSGEO
+
+    MSG_ID_EVHD_WMOB_WANS_EWFCRVOUT_IND, // +EWFCRVOUT
+    MSG_ID_EVHD_WMOB_WANS_EIWLPING_IND, //+EIWLPING
+    MSG_ID_EVHD_WMOB_WANS_EIWLPING_REQ, //AT+EIWLPING
+    MSG_ID_EVHD_WMOB_WANS_EIMSRCSCONN_REQ, //AT+EIMSRCSCONN
+    
+
+    MSG_ID_EVHD_WMOB_WANS_IMS_ECC_HO_REQ,
+    MSG_ID_EVHD_WMOB_WANS_IMS_CALL_STATUS_REQ,
+    MSG_ID_EVHD_WMOB_WANS_WIFI_SERVICE_FAIL_REQ,
+    MSG_ID_EVHD_WMOB_WANS_REG_RAN_PRIO_UPDATE_REQ,
+
+
+    MSG_ID_EVHD_WMOB_ME_DSBP_RECONFIGURE_REQ,
+    MSG_ID_EVHD_WMOB_WANS_L4C_SET_PWL_THRHD_CNF,
+    MSG_ID_EVHD_WMOB_WANS_L4C_IWLAN_PWR_LEVEL_IND,    
+    MSG_ID_EVHD_WMOB_WANS_L4C_IMS_SYS_INFO_IND,
+    MSG_ID_EVHD_WMOB_WANS_L4C_CSFB_FAIL_IND,
+
+    MSG_ID_EVHD_WMOB_WANS_SIP_CALL_PROGRESS_REQ,
+    MSG_ID_EVHD_WMOB_WANS_CALL_MEDIA_INFO_REQ,
+    MSG_ID_EVHD_WMOB_WANS_DUMP_RUNTIME_PARA_REQ, // AT+ECFGDRP 
+    
+    MSG_ID_EVHD_WMOB_WANS_PHONE_STATE_REQ,       // from L4BPWR
+    MSG_ID_EVHD_WMOB_WANS_MO_CONFIG_IND,         // from IMC: MO(Managed Object) config
+    MSG_ID_EVHD_WMOB_WANS_L4BNW_FORCE_BAR_IND,
+/****************************************************************************
+*                 <4> Desitnation: EVHD
+****************************************************************************/
+    /* from WMOB */
+    MSG_ID_EVHD_WMOB_WANS_CELL_SIGLEVEL_THRCGF_IND,
+    MSG_ID_EVHD_WMOB_WANS_WIFI_SIGLEVEL_THRCGF_IND,
+    MSG_ID_EVHD_WMOB_WANS_CALLQUALITY_THRCGF_IND,
+    MSG_ID_EVHD_WMOB_WANS_CELLREG_INFO_QUERY_IND,
+    MSG_ID_EVHD_WMOB_WANS_EOPS_INFO_QUERY_IND,
+    MSG_ID_EVHD_WMOB_WANS_SIGLEVEL_INFO_QUERY_IND,
+    MSG_ID_EVHD_WMOB_WANS_CALLQUALITY_INFO_QUERY_IND,
+    MSG_ID_EVHD_WMOB_WANS_ATP_IMSCFG_IND,             // To ATP
+    
+    MSG_ID_EVHD_WSEM_EWIFIPDNACT_IND,
+    MSG_ID_EVHD_WMOB_WANS_EWIFIEN_SYNCPS_IND,
+    MSG_ID_EVHD_WMOB_WANS_EWIFIASC_SYNCPS_IND,
+    MSG_ID_EVHD_WMOB_WANS_EWIFISIGLVL_SYNCPS_IND,
+    MSG_ID_EVHD_WMOB_WANS_EIWLCFGSET_IND, // for AT RSP
+    MSG_ID_EVHD_WMOB_WANS_EIWLCFGGET_IND, // for AT RSP
+    MSG_ID_EVHD_WMOB_WANS_EPVSSET_IND, // for AT RSP
+    MSG_ID_EVHD_WMOB_WANS_EPVSGET_IND, // for AT RSP
+
+    MSG_ID_EVHD_WMOB_ME_DSBP_RECONFIGURE_CNF,
+    MSG_ID_EVHD_WMOB_WANS_L4C_SET_PWL_THRHD_REQ,     // To L4C
+
+    MSG_ID_EVHD_WMOB_WANS_WO_DPD_REQ,                // To WO
+
+    MSG_ID_EVHD_WMOB_WANS_PHONE_STATE_CNF,           // To L4BPWR
+
+    MSG_ID_EVHD_WMOB_WANS_EAPMODE_REQ,
+
+    MSG_ID_EVHD_WMOB_WANS_IMS_ECC_HO_RSP,           // To IMC
+
+/****************************************************************************
+*                 <5> UT
+****************************************************************************/
+#ifdef __IWLAN_UT__
+    MSG_ID_IWLAN_WLFW_LWI_CONF_REQ,
+    MSG_ID_IWLAN_WLFW_LWI_START_STOP_REQ,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_CONNECT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_DISCONNECT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_MEASUREMENT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_MEASUREMENT_STOP_IND,
+    MSG_ID_IWLAN_ERRC_WLAN_MEASUREMENT_REQ,
+    MSG_ID_IWLAN_ERRC_WLAN_LWA_CONNECT_RSP,
+    MSG_ID_IWLAN_ERRC_WLAN_LWA_DISCONNECT_RSP,
+    MSG_ID_IWLAN_ERRC_WLAN_LWA_LOST_REQ,
+#endif
+    MSG_ID_IWLAN_IWLAN_CONFIG_LWX_REQ,
+    MSG_ID_IWLAN_IWLAN_QUERY_LWX_REQ,
+    MSG_ID_IWLAN_IWLAN_QUERY_LWX_CNF,
+    MSG_ID_IWLAN_WMOB_ILM_IT_EXT2INT_REQ,
+    MSG_ID_IWLAN_WMOB_ILM_IT_INT2EXT_REQ,
+    MSG_ID_IWLAN_WMOB_ILM_IT_EXT_REQ,    
+    MSG_ID_IWLAN_IWLAN_UT_DSBP_CALLBACK_REQ,
+    MSG_ID_EVHD_WMOB_UT_DSBP_CALLBACK_REQ,
+    MSG_ID_EVHD_WMOB_UT_CONFIG_IND,
+    MSG_ID_IWLAN_IWLAN_UT_MO_PARA_CFG_REQ,
+    MSG_ID_EVHD_WMOB_WANS_UT_MO_PARA_CFG_REQ,
+
+/******************************************************************************
+ *                      IWLAN TIMER EVENT                                     *
+ ******************************************************************************/
+    MSG_ID_IWLAN_TIMER_EVENT_NONE,
+
+    MSG_ID_MASF_TIMER_EVENT_TRTL_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_RAT_UNSTABLE_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_MEAS_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_EIWLPING_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_CALL_QOS_BKOFF_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_PCSCF_BKOFF_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_CALL_RECV_HO_HYS_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_RVOUT_ALERT_TIMEOUT,
+    
+/******************************************************************************
+ *                                 MASF                                       *
+ ******************************************************************************/
+
+
+// MTTsai TODO: define msgid for MASF, re-use wans MSG now
+// TODO: Only temp solution for functional UT
+    MSG_ID_IPOL_ICAP_UT_REQ,
+    MSG_ID_IPOL_ICAP_UT_RSP,
+
+/******************************************************************************
+ *                             GEN97 NEW MSG                                  *
+ ******************************************************************************/
+    MSG_ID_D2RM_IWLAN_PDN_INFO_NTF,
+    MSG_ID_MASF_SA_MODE_NTF,
+    MSG_ID_MASF_PDN_INFO_NTF,
+    MSG_ID_MASF_ECEVDP_URCRPT_REQ,
+    MSG_ID_MASF_DATA_INFO_UPDATE_NTF,
+
+    MSG_ID_D2RM_IWLAN_PDN_ACCSEL_REQ,
+    MSG_ID_D2RM_IWLAN_PDN_ACCSEL_IND,
+    MSG_ID_D2RM_IWLAN_PDN_ACCSEL_RSP,
+    MSG_ID_D2RM_IWLAN_PDN_ACCSEL_EVENT_IND,
+    MSG_ID_D2RM_IWLAN_WUIOFF_IND,
+
+    MSG_ID_EVHD_MASF_PDN_ACCSEL_REQ,
+    MSG_ID_EVHD_MASF_PDN_ACCSEL_IND,
+    MSG_ID_EVHD_MASF_PDN_ACCSEL_RSP,
+    MSG_ID_EVHD_MASF_PDN_ACCSEL_EVENT_IND,
+
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_SUBSCRIBE_REQ,
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_SUBSCRIBE_CNF,
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_UNSUBSCRIBE_REQ,
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_UNSUBSCRIBE_CNF,
+
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_ACQUIRE_NTF,
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_PROCESS_IND,
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_PROCESS_RSP,
+
+    MSG_ID_EVHD_MASF_N3_PRIORITY_ACQUIRE_NTF,
+    MSG_ID_EVHD_MASF_N3_PRIORITY_PROCESS_IND,
+    MSG_ID_EVHD_MASF_N3_PRIORITY_PROCESS_RSP,
+
+    MSG_ID_IMC_IWLAN_IMS_CAP_INFO_IND,
+    MSG_ID_EVHD_MASF_IMS_CAP_INFO_IND,
+
+    MSG_ID_IMC_IWLAN_SRVCC_STATUS_UPDATE_REQ,
+    MSG_ID_MASF_SRVCC_STATUS_REQ,
+
+    MSG_ID_IMC_IWLAN_IMS_CC_SET_HVOLTE_CALL_DOMAIN_REQ,
+    MSG_ID_MASF_IMS_CC_SET_HVOLTE_CALL_DOMAIN_REQ,
+
+    MSG_ID_ATP_IWLAN_EVODATA_REQ,
+    MSG_ID_MASF_EVODATA_REQ,
+
+    /* Porting from ATP_IMC */
+    MSG_ID_ATP_IWLAN_EIMSINFO_REQ,
+    MSG_ID_MASF_EIMSINFO_REQ,
+
+    MSG_ID_ATP_IWLAN_EC2KREG_REQ,
+    MSG_ID_MASF_EC2KREG_REQ,
+
+    MSG_ID_ATP_IWLAN_EC2KCELL_REQ,
+    MSG_ID_MASF_EC2KCELL_REQ,
+
+    MSG_ID_ATP_IWLAN_EAFR_IND,
+    MSG_ID_MASF_EAFR_IND,
+
+    MSG_ID_ATP_IWLAN_ECMPCID_REQ,
+    MSG_ID_MASF_ECMPCID_REQ,
+
+    MSG_ID_ATP_IWLAN_MT_CS_PAGING_IND,
+    MSG_ID_MASF_MT_CS_PAGING_IND,
+
+    MSG_ID_ATP_IWLAN_CS_CALL_STATUS_IND,
+    MSG_ID_MASF_CS_CALL_STATUS_IND,
+
+    MSG_ID_ATP_IWLAN_SIM_INVALID_REQ,
+    MSG_ID_MASF_SIM_INVALID_REQ,
+
+    MSG_ID_ATP_IWLAN_OOS_START_REQ,
+    MSG_ID_MASF_OOS_START_REQ,
+
+    MSG_ID_ATP_IWLAN_OOS_END_REQ,
+    MSG_ID_MASF_OOS_END_REQ,
+
+    MSG_ID_IWLAN_DSBP_RECONFIGURE_IND,
+    MSG_ID_MASF_DSBP_RECONFIGURE_IND,
+
+    /* From IntCtrl */
+    MSG_ID_MASF_DATA_INFO_UPDATE_IND,
+
+    /* From WLC */
+    MSG_ID_MASF_WIFI_INFO_UPDATE_IND,
+    MSG_ID_MASF_EWIFIRSSITHR_REQ,
+    
+    /* To IMC */
+    MSG_ID_IMC_IWLAN_IMS_ROAMING_STATUS_IND,
+    MSG_ID_MASF_IMS_ROAMING_STATUS_IND,
+    
+    /* To L4 / from L4 */
+    MSG_ID_MASF_QUERY_CENTRIC_TYPE_REQ,    // AT+CEUS?
+    MSG_ID_MASF_CENTRIC_TYPE_IND,          // +CEUS:
+	
+	/* From ATP */
+    MSG_ID_ATP_IWLAN_CSFB_FAIL_IND,
+    MSG_ID_EVHD_WMOB_WANS_CSFB_FAIL_IND,
+
+/******************************************************************************
+ *                                MSG END                                     *
+ ******************************************************************************/
+MODULE_MSG_END( MSG_ID_IWLAN_CODE_TAIL )
+
+#endif  //_IWLAN_MSG_ID_H
diff --git a/mcu/interface/sap/md/l1_ext_msgid.h b/mcu/interface/sap/md/l1_ext_msgid.h
new file mode 100644
index 0000000..15ca3d9
--- /dev/null
+++ b/mcu/interface/sap/md/l1_ext_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) 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:
+ * ---------
+ * l1_ext_sap.h
+ *
+ * Project:
+ * --------
+ *   GSM_Software
+ *
+ * Description:
+ * ------------
+ *   2G Layer 1 and Protocol Stack(Exclude RR) related message identity definition
+ *
+ * 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!!
+ *============================================================================
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _L1_EXT_SAP_H
+#define _L1_EXT_SAP_H
+
+MODULE_MSG_BEGIN( MSG_ID_L1_EXT_CODE_BEGIN )
+/*For checking calibration data downlink status*/
+MSG_ID_L4CL1_QUERY_CAL_DATA_DL_STATUS_REQ = MSG_ID_L1_EXT_CODE_BEGIN,
+MSG_ID_L4CL1_QUERY_CAL_DATA_DL_STATUS_CNF,
+//#if IS_2G_TAS_SUPPORT
+//MSG_ID_EM_GSM_TAS_INFO_IND,
+//#endif
+MODULE_MSG_END( MSG_ID_L1_EXT_CODE_TAIL )
+
+#endif
+
diff --git a/mcu/interface/sap/md/l1_msgid.h b/mcu/interface/sap/md/l1_msgid.h
new file mode 100644
index 0000000..be99ac4
--- /dev/null
+++ b/mcu/interface/sap/md/l1_msgid.h
@@ -0,0 +1,721 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ * l1_sap.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   Layer 1 and Protocol Stack 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!
+ *
+ * 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!
+ * 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!
+ * 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 L1_MSGID_H
+#define L1_MSGID_H
+
+/* Note that GPRS REQ should before GSM CNF/IND, GSM should before 
+   GPRS for MPAL's requirement!!! That is, all REQ first and GSM 
+   before GPRS, and then all CNF/IND together with GSM before GPRS */ 
+
+/* Request for GSM */
+
+MODULE_MSG_BEGIN( L1_MSG_CODE_BEGIN )
+MSG_ID_MPHC_POWER_SCAN_REQ = L1_MSG_CODE_BEGIN,
+MSG_ID_MPHC_MANUSEL_PWRSCAN_REQ,
+MSG_ID_MPHC_MANUSEL_PWRSCAN_STOP_REQ,
+MSG_ID_MPHC_BSIC_SYNC_REQ,
+MSG_ID_MPHC_SPECIFIC_SYNC_REQ,
+MSG_ID_MPHC_SERV_BCCH_MONITOR_REQ,
+MSG_ID_MPHC_IDLE_CCCH_START_REQ,
+MSG_ID_MPHC_CCCH_UPDATE_REQ,
+MSG_ID_MPHC_PAGE_MODE_CHANGE_REQ,
+MSG_ID_MPHC_SMART_PAGE_START_REQ,
+MSG_ID_MPHC_RANDOM_ACCESS_REQ,
+MSG_ID_MPHC_RACH_ABORT_REQ,
+MSG_ID_MPHC_IMMED_ASSIGN_REQ,
+MSG_ID_MPHC_CHANNEL_ASSIGN_REQ,
+MSG_ID_MPHC_CHANNEL_RELEASE_REQ,
+MSG_ID_MPHC_HANDOVER_REQ,
+MSG_ID_MPHC_HANDOVER_ACCESS_STOP_REQ,
+MSG_ID_MPHC_CHANNEL_RECONNECT_REQ,
+MSG_ID_MPHC_FREQUENCY_REDEFINITION_REQ,
+MSG_ID_MPHC_CHANNEL_MODE_MODIFY_REQ,
+MSG_ID_MPHC_CIPHERING_MODE_COMMAND_REQ,
+MSG_ID_MPHC_CLOSE_TCH_LOOP_REQ,
+MSG_ID_MPHC_OPEN_TCH_LOOP_REQ,
+MSG_ID_MPHC_DAI_TEST_REQ,
+MSG_ID_MPHC_POWER_CLASS_REQ,
+MSG_ID_MPHC_CELL_OPTION_UPDATE_REQ,
+MSG_ID_MPHC_EXTENDED_MEAS_REQ,
+MSG_ID_MPHC_NEIGHBOR_MEAS_REQ,
+MSG_ID_MPHC_NEIGHBOR_BSIC_START_REQ,
+MSG_ID_MPHC_NEIGHBOR_BSIC_STOP_REQ,
+MSG_ID_MPHC_NEIGHBOR_SYS_INFO_READ_REQ,
+MSG_ID_MPHC_NEIGHBOR_SYS_INFO_STOP_REQ,
+MSG_ID_MPHC_CELL_BSIC_START_REQ,
+MSG_ID_MPHC_CELL_BSIC_STOP_REQ,
+MSG_ID_MPHC_CELL_SYS_INFO_READ_REQ,
+MSG_ID_MPHC_CELL_SYS_INFO_STOP_REQ,
+#ifdef __GEMINI__
+MSG_ID_MPHC_CELL_SYS_INFO_PRI_ADJUST_REQ,
+#endif /* end of __GEMINI__ */
+MSG_ID_MPHC_CBCH_CONFIG_REQ,
+MSG_ID_MPHC_CBCH_START_REQ,
+MSG_ID_MPHC_CBCH_STOP_REQ,
+MSG_ID_MPHC_CBCH_SKIP_REQ,
+MSG_ID_MPHC_BLIND_HANDOVER_BSIC_REQ,
+MSG_ID_MPHC_DEACTIVATE_REQ,
+MSG_ID_MPHC_SIM_READY_NOTIFY_REQ,
+MSG_ID_MPHC_CELL_SELECTION_INIT_REQ,
+
+
+#ifdef __PS_SERVICE__
+/* Request for GPRS */
+MSG_ID_MPHP_DOWNLINK_SINGLE_BLOCK_REQ,
+MSG_ID_MPHP_INTERFERENCE_MEAS_REQ,
+MSG_ID_MPHP_PACKET_IDLE_CCCH_START_REQ,
+#ifdef __RMP_PRESENT__
+MSG_ID_MPHP_NEIGHBOR_PBCCH_START_REQ,
+MSG_ID_MPHP_NEIGHBOR_PBCCH_STOP_REQ,
+MSG_ID_MPHP_PACKET_CCCH_CONFIG_REQ,
+MSG_ID_MPHP_PACKET_IDLE_PCCCH_START_REQ,
+MSG_ID_MPHP_PACKET_PAGE_MODE_UPDATE_REQ,
+MSG_ID_MPHP_PACKET_RANDOM_ACCESS_REQ,
+MSG_ID_MPHP_PRACH_ABORT_REQ,
+MSG_ID_MPHP_PBCCH_START_REQ,
+MSG_ID_MPHP_PBCCH_STOP_REQ,
+MSG_ID_MPHP_PCCCH_CONFIG_REQ,
+#endif /* end of __RMP_PRESENT__*/
+MSG_ID_MPHP_PACKET_DOWNLINK_ASSIGNMENT_REQ,
+#ifdef __PKT_EXT_MEAS__
+MSG_ID_MPHP_PACKET_EXTENDED_MEAS_REQ, 
+#endif /*__PKT_EXT_MEAS__*/
+MSG_ID_MPHP_PACKET_NC_MEAS_START_REQ,
+MSG_ID_MPHP_PACKET_NC_MEAS_STOP_REQ,
+MSG_ID_MPHP_PACKET_PDCH_RELEASE_REQ,
+MSG_ID_MPHP_PACKET_UNASSIGNMENT_REQ,
+MSG_ID_MPHP_PACKET_UPLINK_ASSIGNMENT_REQ,
+MSG_ID_MPHP_PACKET_TIMESLOT_RECONFIGURE_REQ,
+MSG_ID_MPHP_PDCH_FAIL_RECONNECT_REQ,
+MSG_ID_MPHP_POLL_RESPONSE_REQ,
+MSG_ID_MPHP_POWER_CONTROL_UPDATE_REQ,
+MSG_ID_MPHP_REPEAT_ALLOCATION_REQ,
+MSG_ID_MPHP_TIMING_ADVANCE_UPDATE_REQ,
+MSG_ID_MPHP_UPLINK_SINGLE_BLOCK_REQ,
+#ifdef __MONITOR_PAGE_DURING_TRANSFER__
+MSG_ID_MPHP_MONITOR_PAGE_IN_PTM_START_REQ,
+MSG_ID_MPHP_MONITOR_PAGE_IN_PTM_STOP_REQ,
+#endif /* end of __MONITOR_PAGE_DURING_TRANSFER__ */
+#ifdef __PS_HO__
+MSG_ID_MPHP_PS_HANDOVER_REQ,
+MSG_ID_MPHP_PS_HANDOVER_RECONNECT_REQ,
+MSG_ID_MPHP_BLIND_PS_HANDOVER_BSIC_REQ,
+#endif /* end of __PS_HO__ */
+MSG_ID_MPHP_PS_SESSION_STATUS_UPDATE_REQ,
+#endif  /* __PS_SERVICE__ */ 
+
+MSG_ID_MPHC_ACTIVE_REQ,
+
+#if defined(__UMTS_RAT__) || defined(__LTE_RAT__)
+MSG_ID_MPHM_STANDBY_REQ,
+MSG_ID_MPHM_STANDBY_GSM_MEAS_START_REQ,
+MSG_ID_MPHM_STANDBY_GSM_MEAS_STOP_REQ,
+#if defined(__23G_PRI_RESEL_SUPPORT__) || defined(__LTE_RAT__)
+MSG_ID_MPHM_STANDBY_GSM_PRIO_MEAS_START_REQ,
+MSG_ID_MPHM_STANDBY_GSM_PRIO_MEAS_STOP_REQ,
+#endif /* defined(__23G_PRI_RESEL_SUPPORT__) || defined(__LTE_RAT__) */
+MSG_ID_MPHM_STANDBY_GSM_BSIC_READ_REQ,
+MSG_ID_MPHM_STANDBY_GSM_BSIC_STOP_REQ,
+MSG_ID_MPHM_STANDBY_CELL_BSIC_RES_REQ,
+MSG_ID_MPHM_INTER_RAT_HANDOVER_REQ,
+#if 0
+/* under construction !*/
+#endif /* 0 */
+#ifdef __LTE_RAT__
+MSG_ID_MPHM_STANDBY_GSM_REPORT_CGI_PWRSCAN_REQ,
+MSG_ID_MPHM_STANDBY_GSM_REPORT_CGI_PWRSCAN_STOP_REQ,
+MSG_ID_MPHM_STANDBY_GSM_REPORT_CGI_BSIC_START_REQ,
+MSG_ID_MPHM_STANDBY_GSM_REPORT_CGI_BSIC_STOP_REQ,
+MSG_ID_MPHM_STANDBY_GSM_REPORT_CGI_SYS_INFO_START_REQ,
+MSG_ID_MPHM_STANDBY_GSM_REPORT_CGI_SYS_INFO_STOP_REQ,
+MSG_ID_MPHM_STANDBY_GSM_REPORT_SRVCC_BSIC_START_REQ,
+MSG_ID_MPHM_STANDBY_GSM_REPORT_SRVCC_BSIC_STOP_REQ,
+
+#endif /* __LTE_RAT__ */
+
+#ifdef __CSG_SUPPORT_NW_CTRL__
+MSG_ID_MPHM_AUTO_GAP_START_REQ,
+MSG_ID_MPHM_AUTO_GAP_STOP_REQ,
+#endif /* __CSG_SUPPORT_NW_CTRL__ */
+#endif /* defined(__UMTS_RAT__) || defined(__LTE_RAT__) */
+
+MSG_ID_MPHM_DUPLEX_MODE_CHANGE_REQ,
+#ifdef __EGPRS_MODE__
+MSG_ID_MPHP_EGPRS_LOOP_REQ,
+MSG_ID_MPHP_UPDATE_IR_RESET_REQ,
+#endif
+
+#if defined(__GEMINI__) || defined(__SGLTE__)
+MSG_ID_MPHC_SIM_STATUS_UPDATE_REQ,
+#endif /*end of __GEMINI__ || __SGLTE__ */
+
+#ifdef __GEMINI__
+
+/* Shihyao, gemini 2.0 development */
+MSG_ID_MPHC_POWER_SCAN_STOP_REQ,
+MSG_ID_MPHC_VIRTUAL_SUSPEND_REQ,
+MSG_ID_MPHC_RESUME_REQ, /* it is sent from MPAL to L1 */
+MSG_ID_MPHC_CHANNEL_PROTECT_START_REQ,
+MSG_ID_MPHC_CHANNEL_PROTECT_STOP_REQ,
+
+#endif /*end of __GEMINI__*/
+
+/* add for U3G */
+MSG_ID_MPHC_PAGING_PARAM_ASSIGN_REQ,
+
+/* Confirmation & Indication for GSM */
+
+MSG_ID_MPHC_POWER_SCAN_CNF,
+MSG_ID_L1_CNF_CODE_BEGIN = MSG_ID_MPHC_POWER_SCAN_CNF,
+MSG_ID_MPHC_MANUSEL_PWRSCAN_CNF,
+MSG_ID_MPHC_BSIC_SYNC_CNF,
+MSG_ID_MPHC_UNITDATA_IND,
+MSG_ID_MPHC_RANDOM_ACCESS_CNF,
+MSG_ID_MPHC_IMMED_ASSIGN_CNF,
+MSG_ID_MPHC_CHANNEL_ASSIGN_CNF,
+MSG_ID_MPHC_CHANNEL_RELEASE_CNF,
+MSG_ID_MPHC_HANDOVER_CNF,
+MSG_ID_MPHC_HANDOVER_ACCESS_START_IND,
+MSG_ID_MPHC_HANDOVER_CONNECTED_IND,
+MSG_ID_MPHC_HANDOVER_ACCESS_STOP_CNF,
+MSG_ID_MPHC_CHANNEL_RECONNECT_CNF,
+MSG_ID_MPHC_FREQUENCY_REDEFINITION_CNF,
+MSG_ID_MPHC_CHANNEL_MODE_MODIFY_CNF,
+MSG_ID_MPHC_CIPHERING_MODE_COMMAND_CNF,
+MSG_ID_MPHC_CLOSE_TCH_LOOP_CNF,
+MSG_ID_MPHC_OPEN_TCH_LOOP_CNF,
+MSG_ID_MPHC_EXTENDED_MEAS_IND,
+MSG_ID_MPHC_BLOCK_QUALITY_IND,
+MSG_ID_MPHC_SERV_IDLE_MEAS_IND,
+MSG_ID_MPHC_SERV_DEDI_MEAS_IND,
+MSG_ID_MPHC_NEIGHBOR_MEAS_IND,
+MSG_ID_MPHC_NEIGHBOR_BSIC_IND,
+MSG_ID_MPHC_CELL_BSIC_IND,
+MSG_ID_MPHC_BLIND_HANDOVER_BSIC_IND,
+MSG_ID_MPHC_CELL_SELECTION_INIT_CNF,
+MSG_ID_MPHC_ACTIVE_CNF,
+MSG_ID_MPHC_DEACTIVATE_CNF,
+MSG_ID_GISE_MPAL_ENTER_IDLE_IND,
+
+
+#ifdef __PS_SERVICE__
+/* Confirmation & Indication for GPRS */
+MSG_ID_MPHP_DOWNLINK_SINGLE_BLOCK_CNF,
+MSG_ID_MPHP_INTERFERENCE_MEAS_IND,
+MSG_ID_MPHP_PACKET_BLOCK_QUALITY_IND,
+MSG_ID_MPHP_PACKET_DATA_IND,
+MSG_ID_MPHP_PACKET_DOWNLINK_ASSIGNMENT_CNF,
+#ifdef __PKT_EXT_MEAS__
+MSG_ID_MPHP_PACKET_EXTENDED_MEAS_IND,
+#endif /*__PKT_EXT_MEAS__*/
+MSG_ID_MPHP_PACKET_NC_MEAS_IND,
+#ifdef __RMP_PRESENT__
+MSG_ID_MPHP_PACKET_RANDOM_ACCESS_CNF,
+#endif /* end of __RMP_PRESENT__*/
+MSG_ID_MPHP_PACKET_SERV_MEAS_IND,
+MSG_ID_MPHP_PACKET_UNASSIGNMENT_CNF,
+MSG_ID_MPHP_PACKET_UPLINK_ASSIGNMENT_CNF,
+MSG_ID_MPHP_PACKET_TIMESLOT_RECONFIGURE_CNF,
+#ifndef __MTK_TARGET__
+MSG_ID_MPHP_PKT_U1_IND,
+MSG_ID_MPHP_PKT_U2_IND,
+MSG_ID_MPHP_PACKET_DOWNLINK_IND,
+#endif
+MSG_ID_MPHP_PDCH_FAIL_RECONNECT_CNF,
+MSG_ID_MPHP_POLL_RESPONSE_CNF,
+MSG_ID_MPHP_REPEAT_ALLOCATION_IND,
+#ifdef __PS_HO__
+MSG_ID_MPHP_PS_HANDOVER_CNF,
+MSG_ID_MPHP_PS_HANDOVER_RECONNECT_CNF,
+MSG_ID_MPHP_BLIND_PS_HANDOVER_BSIC_IND,
+#endif /* end of __PS_HO__ */
+MSG_ID_MPHP_UPLINK_SINGLE_BLOCK_CNF,
+#endif  /* __PS_SERVICE__ */   
+#ifdef __EGPRS_MODE__
+MSG_ID_MPHP_EGPRS_LOOP_CNF,
+#endif
+
+#ifdef __GEMINI__
+
+/* Shihyao, gemini 2.0 development. */
+MSG_ID_MPHC_VIRTUAL_SUSPEND_CNF,
+
+#endif /*end of __GEMINI__*/
+MSG_ID_MPHC_SPECIFIC_SYNC_CNF,
+
+MSG_ID_L1_CNF_CODE_END, /* Must not include 3G msg since 3G msg use another function table */
+
+#if defined(__UMTS_RAT__) || defined(__LTE_RAT__) 
+MSG_ID_MPHM_STANDBY_CNF,
+MSG_ID_MPHM_L1_CNF_CODE_BEGIN = MSG_ID_MPHM_STANDBY_CNF,
+MSG_ID_MPHM_STANDBY_GSM_MEAS_IND,
+#if defined(__23G_PRI_RESEL_SUPPORT__) || defined (__LTE_RAT__)
+MSG_ID_MPHM_STANDBY_GSM_PRIO_MEAS_IND,
+#endif /*defined(__23G_PRI_RESEL_SUPPORT__) || defined (__LTE_RAT__) */
+
+MSG_ID_MPHM_STANDBY_GSM_BSIC_IND,
+MSG_ID_MPHM_INTER_RAT_HANDOVER_CNF,
+
+#ifdef __LTE_RAT__
+MSG_ID_MPHM_STANDBY_GSM_REPORT_CGI_PWRSCAN_CNF,
+MSG_ID_MPHM_STANDBY_GSM_REPORT_CGI_BSIC_IND,
+#endif /* __LTE_RAT__ */
+
+#ifdef __CSG_SUPPORT_NW_CTRL__
+MSG_ID_MPHM_AUTO_GAP_START_CNF,
+MSG_ID_MPHM_AUTO_GAP_STOP_CNF,
+#endif /* __CSG_SUPPORT_NW_CTRL__ */
+
+MSG_ID_MPHM_DUPLEX_MODE_CHANGE_CNF,
+MSG_ID_MPHM_L1_CNF_CODE_END,
+
+#ifdef __LTE_RAT__
+	MSG_ID_MPHM_STANDBY_GSM_REPORT_SRVCC_BSIC_IND,
+#endif /* __LTE_RAT__ */
+
+#ifdef __GEMINI__
+MSG_ID_MPHC_ALT_L1_GSM_GAP_SERVICE_UPDATE_REQ,
+MSG_ID_MPHC_ALT_L1_GSM_GAP_RESUME_REQ,
+#endif /* __GEMINI__ */
+#endif /* defined(__UMTS_RAT__) || defined(__LTE_RAT__) */
+
+/* Add for comm. between GL1 and GL1_PCORE */
+MSG_ID_MPHC_MPAL_SDCCH_DOWNLINK,
+MSG_ID_MPHC_MPAL_SACCH_DOWNLINK,
+MSG_ID_MPHC_MPAL_FACCH_DOWNLINK,
+#ifdef __PS_SERVICE__   
+MSG_ID_MPHP_MPAL_PACKET_DOWNLINK,
+#endif
+MSG_ID_MPHC_RATCM_RA_UPLINKTICK,
+MSG_ID_MPHC_RATCM_RA_DOWNLINKTICK,
+MSG_ID_MPHC_RATCM_RA_ACTIVATE_REQ,
+MSG_ID_MPHC_RATCM_RA_ACTIVATE_CNF,
+MSG_ID_MPHC_RATCM_RA_DEACTIVATE_REQ,
+MSG_ID_MPHC_RATCM_RA_DEACTIVATE_CNF,
+MSG_ID_MPHC_RATCM_RA_PUTUPLINKDATA,
+MSG_ID_MPHC_RATCM_RA_GETDOWNLINKDATA,
+#ifdef L1A_SIM
+MSG_ID_L1C_L1A_REPORT,
+#ifndef __GEMINI__ /* To run WG_0, GW_0 scripts in Dual_Mode environment*/
+MSG_ID_MPHC_SIM2_RSVAS_L1_SUSPEND_REQ,
+MSG_ID_MPHC_SIM2_VIRTUAL_SUSPEND_REQ,
+MSG_ID_MPHC_SIM2_DEACTIVATE_REQ,
+MSG_ID_RSVAS_L1_SUSPEND_CNF,
+#if defined(__TC10__) && defined(__TC10_IPC_CDMA_SUPPORT__)
+   MSG_ID_L1D_EM_TX_RFPD_INFO_MSG,
+#endif
+MSG_ID_MPHC_VIRTUAL_SUSPEND_CNF,
+#endif /* end of __GEMINI__*/   
+#endif
+
+/* To bypass SGLTE build error, these messages will be never sent in SGLTE without DSDS */
+#if !defined(__GEMINI__) && defined(__SGLTE__)
+MSG_ID_RSVAS_L1_SUSPEND_REQ,
+MSG_ID_RSVAS_L1_SUSPEND_CNF,
+MSG_ID_RSVAS_L1_RESUME_REQ,
+MSG_ID_MPHC_ALT_L1_GSM_GAP_SERVICE_UPDATE_REQ,
+MSG_ID_MPHC_ALT_L1_GSM_GAP_RESUME_REQ,
+MSG_ID_MPHC_CELL_SYS_INFO_PRI_ADJUST_REQ,
+MSG_ID_MPHC_POWER_SCAN_STOP_REQ,
+MSG_ID_MPHC_VIRTUAL_SUSPEND_REQ,
+MSG_ID_MPHC_RESUME_REQ,
+MSG_ID_MPHC_CHANNEL_PROTECT_START_REQ,
+MSG_ID_MPHC_CHANNEL_PROTECT_STOP_REQ,
+MSG_ID_MPHC_VIRTUAL_SUSPEND_CNF,
+#endif
+MODULE_MSG_END( MSG_ID_L1_CODE_TAIL )
+
+#endif //L1_MSGID_H
diff --git a/mcu/interface/sap/md/l1d_msgid.h b/mcu/interface/sap/md/l1d_msgid.h
new file mode 100644
index 0000000..706fa3c
--- /dev/null
+++ b/mcu/interface/sap/md/l1d_msgid.h
@@ -0,0 +1,288 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+
+  FILE NAME:  l1d_msgid.h
+
+  DESCRIPTION:
+
+    This file contains the defenitions of all the RMC msg id's.
+
+*****************************************************************************/
+
+#ifndef _L1D_MSGID_H_
+#define _L1D_MSGID_H_
+
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN(MSG_ID_L1D_MDM_CODE_BEGIN)
+
+        MSG_ID_L1D_MSGID_START        =  MSG_ID_L1D_MDM_CODE_BEGIN,  
+/* 0*/  MSG_ID_L1D_ACCESS_ABORT_MSG   =  MSG_ID_L1D_MSGID_START,
+        MSG_ID_L1D_ACCESS_SIG_MSG,
+        MSG_ID_L1D_BCCH_START_MSG,
+        MSG_ID_L1D_BCCH_STOP_MSG,
+        MSG_ID_L1D_CAND_FREQ_MSG,
+        MSG_ID_L1D_CAND_FREQ_START_MSG,
+        MSG_ID_L1D_CSCH_STOP_MSG,
+        MSG_ID_L1D_CFS_SEND_REQUEST_MSG,
+/* A*/  MSG_ID_L1D_FCCCH_START_MSG,
+        MSG_ID_L1D_FDSCH_ACQ_IND_MSG,
+        MSG_ID_L1D_FSCH_MSG,
+        MSG_ID_L1D_CFS_TUNE_PLLS_MSG,
+        MSG_ID_L1D_IDLE_SETS_LIST_UPDATE_MSG,
+        MSG_ID_L1D_LONG_CODE_CHANGE_MSG,
+        MSG_ID_L1D_PAGING_CHAN_START_MSG,
+        MSG_ID_L1D_PAGING_CHAN_STOP_MSG,
+        MSG_ID_L1D_PILOT_ACQ_START_MSG,
+/*14*/  MSG_ID_L1D_PREAMBLE_OFF_MSG,
+        MSG_ID_L1D_PREAMBLE_ON_MSG,
+        MSG_ID_L1D_RESET_MSG,
+        MSG_ID_L1D_RESOURCE_ALLOC_MSG,
+        MSG_ID_L1D_RESOURCE_DEALLOC_MSG,
+        MSG_ID_L1D_RESOURCE_REQ_MSG,
+        MSG_ID_L1D_CFS_RESTORE_PLLS_MSG,
+        MSG_ID_L1D_REVERSE_POWER_SET_MSG,
+        MSG_ID_L1D_RX_POWER_MSG,
+/*1E*/  MSG_ID_L1D_SEARCH_PARMS_UPDATE_MSG,
+        MSG_ID_L1D_SEARCH_RSLT_MSG,
+        MSG_ID_L1D_SERVICE_CONFIG_MSG,
+        MSG_ID_L1D_SERVICE_CONFIG_NN_MSG,
+        MSG_ID_L1D_SETS_LIST_UPDATE_MSG,
+        MSG_ID_L1D_SLOTTED_MODE_DISABLE_MSG,  /* L1D_SLOTTED_MODE_DISABLE_MSG, */
+        MSG_ID_L1D_SLOTTED_MODE_PARAMS_MSG,  /* L1D_SLOTTED_MODE_PARAMS_MSG, */
+        MSG_ID_L1D_SLEEP_MSG,  /* L1D_SLEEP_MSG, */
+        MSG_ID_L1D_WAKEUP_MSG,  /* L1D_WAKEUP_MSG, */
+/*28*/  MSG_ID_L1D_SLOTTED_MSG,
+        MSG_ID_L1D_SYNC_ACQ_START_MSG,
+        MSG_ID_L1D_TIMING_CHANGE_MSG,
+        MSG_ID_L1D_TRAFFIC_CHAN_HARD_HANDOFF_MSG,
+        MSG_ID_L1D_TRAFFIC_CHAN_PWR_STEP_MSG, /* obsolete, kept here for compatibility with 4.0 because of "ETS Lite" issues */
+        MSG_ID_L1D_TRAFFIC_CHAN_SOFT_HANDOFF_MSG,
+        MSG_ID_L1D_TRAFFIC_CHAN_START_MSG,
+        MSG_ID_L1D_TRAFFIC_CHAN_STOP_MSG,
+        MSG_ID_L1D_TRANSMITTER_CONTROL_MSG,
+/*32*/  MSG_ID_L1D_FOR_POWER_CONTROL_PARAMS_MSG,
+        MSG_ID_L1D_OUTERLOOP_REQ_MSG,
+        MSG_ID_L1D_FPC_REP_MSG,
+        MSG_ID_L1D_TST_DIAG_MONITOR_MSG,
+        MSG_ID_L1D_TST_GET_PHONE_STATE_MSG,
+        MSG_ID_L1D_IDLE_DIFF_FREQ_SEARCH_MSG,
+        MSG_ID_L1D_ACCESS_PROBE_COMPLETE_MSG,
+        MSG_ID_L1D_GET_PS_INFO_RSP_MSG,
+        MSG_ID_L1D_TST_TX_CDMA_MSG,
+        MSG_ID_L1D_TST_TX_AGC_CTRL_MSG,
+/*3C*/  MSG_ID_L1D_RSCH_MSG,
+        MSG_ID_L1D_FPC_CAL_FACTOR_MSG,
+        MSG_ID_L1D_GET_VAL_INFO_RSP_MSG,
+        MSG_ID_L1D_GET_DSPV_INFO_RSP_MSG,
+        MSG_ID_L1D_AFLT_SEARCH_RSLT_MSG,
+        MSG_ID_L1D_AFLT_DSP_SEARCH_TIMEOUT_MSG,
+        MSG_ID_L1D_POS_AFLT_SEARCH_MSG,
+        MSG_ID_L1D_POS_AFLT_ABORT_MSG,
+        MSG_ID_L1D_DSM_MDM_RST_ACK_MSG,
+/*46*/  MSG_ID_L1D_RX_POWER_REQ_MSG,
+        MSG_ID_L1D_SYNC_CHAN_MSG_RECD_MSG,
+        MSG_ID_L1D_INIT_MSG,
+        
+        MSG_ID_L1D_DEACTIVE_REQ_MSG,
+
+        MSG_ID_L1D_TST_DEBUG_FILTER_MSG,
+        MSG_ID_L1D_IDLE_PRIORITY_SET_UPDATE_MSG,
+        MSG_ID_L1D_PUF_PROBE_ABORT_MSG,
+/*51*/  MSG_ID_L1D_PUF_PROBE_SEND_MSG,
+        MSG_ID_L1D_MPA_RELEASE_IND_MSG,
+        MSG_ID_L1D_GPS_INIT_GPS_MSG,
+        MSG_ID_L1D_GPS_CONT_CDMA_REQ_MSG,
+        MSG_ID_L1D_GPS_N1_GOOD_FRAMES_FOUND_MSG,
+        MSG_ID_L1D_GPS_PSMM_SENT_MSG,
+        MSG_ID_L1D_GPS_SWITCHING_HANDOFF_COMPLETE_MSG,
+/*5B*/  MSG_ID_L1D_GPS_GOOD_FRAMES_TMR_EXP_MSG,
+        MSG_ID_L1D_GPS_XMIT_TMR_EXP_MSG,
+        MSG_ID_L1D_GPS_HANDOFF_IND_TMR_EXP_MSG,
+        MSG_ID_L1D_GPS_END_GPS_REQ_MSG,        
+        MSG_ID_L1D_AFLT_TIMING_RSP_MSG,        
+        MSG_ID_L1D_TST_IDLE_DIFF_FREQ_SRCH_MODE_MSG,
+        MSG_ID_L1D_TST_IGNORE_RESET_MSG,
+        MSG_ID_L1D_FSCH_CONFIG_UPDATE_MSG,
+        MSG_ID_L1D_RSCH_CONFIG_UPDATE_MSG,
+        MSG_ID_L1D_SRCH_RESULT_COMPLETE_MSG,  /* L1D_SRCH_RESULT_COMPLETE_MSG, */
+        MSG_ID_L1D_MPA_RELEASE_INIT_CNF_MSG,
+        MSG_ID_L1D_MAX_TX_POWER_LIMIT_MSG,
+        MSG_ID_L1D_VAL_1X_DAT_CFG_REQ_MSG,
+        MSG_ID_L1D_ACCESS_IN_PROGRESS_MSG,
+        MSG_ID_L1D_GET_DEBUG_SCRN_INFO_MSG,
+        MSG_ID_L1D_RSCH_POWER_SET_MSG,
+
+        /*
+         * All msg ids that are the same as those on 4.0 are listed above.
+         * New msg ids for 6.x should be listed below.
+         */
+        MSG_ID_L1D_TEST_1X_AFLT_CMD_MSG,
+        MSG_ID_L1D_PDCH_PARAMS_MSG,
+        MSG_ID_L1D_ACKCQICH_RATE_CHANGE_MSG,
+        MSG_ID_L1D_POWER_SAVINGS_DELAY_MSG,
+        MSG_ID_L1D_ALT_PILOT_ACQ_MSG,
+        MSG_ID_L1D_MPA_RF_PREEMPT_REQ_MSG,
+        MSG_ID_L1D_DSM_RF_RELEASE_RSP_MSG,
+        MSG_ID_L1D_PSW_RF_RELEASE_REQ_MSG,
+        MSG_ID_L1D_BAND_SUPPORT_QUERY_MSG,
+        MSG_ID_L1D_IRAT_TX_PWR_REQ,
+        MSG_ID_L1D_RX_TX_POWER_INFO_RESP_MSG,
+        MSG_ID_L1D_TST_TRANSMIT_NST_MSG,
+        MSG_ID_L1D_TST_NST_TRAFFIC_ON_MSG,
+        MSG_ID_L1D_SWITCH_PA_FOR_ACCESS,
+        MSG_ID_L1D_RADIO_CONFIG_MSG,
+        MSG_ID_L1D_DIVERSITY_ENABLE_MSG,
+        MSG_ID_L1D_TST_NST_END_MSG,
+        MSG_ID_L1D_DFS_ECIO_THRESH_MSG,
+        MSG_ID_L1D_TX_ACK_NAK_MSG,
+#ifdef  MTK_DEV_ENGINEER_MODE
+        MSG_ID_L1D_RF_TST_POWER_CONTROL_MSG,
+#endif
+        MSG_ID_L1D_PREBURST_CALIB_END_MSG,
+
+#if defined (MTK_DEV_C2K_IRAT) && defined (MTK_DEV_C2K_SRLTE_L1)
+        MSG_ID_L1D_PROTECT_ANTENNA_START_MSG,
+        MSG_ID_L1D_PROTECT_ANTENNA_STOP_MSG,
+        MSG_ID_L1D_SET_RAT_STATUS_MSG,
+        MSG_ID_L1D_RTBA_RF_RESERVE_END_IND_MSG,
+        MSG_ID_L1D_SEARCH_STATUS_MSG,
+        MSG_ID_L1D_TST_NST_START_MSG,
+        MSG_ID_L1D_TEST_1X_CFS_CMD_MSG,
+        MSG_ID_L1D_TEST_1X_DFS_CMD_MSG,
+ #ifdef MTK_CBP_SYNC_OPTIMIZE 
+        MSG_ID_L1D_TEST_1X_ICS_OPTIMIZE_MSG,
+ #endif
+        MSG_ID_L1D_SCH_EBNT_MSG,
+#endif
+
+        MSG_ID_L1D_TEST_ADAPTIVE_RX_CMD_MSG,
+        
+        MSG_ID_L1D_TST_RX_PWR_REQ_MSG,
+
+#ifdef MTK_GPS_SYNC_DEV
+        MSG_ID_L1D_GPS_PERIOD_SYNC_CMD,
+        MSG_ID_L1D_GPS_PERIOD_SYNC_STOP_CMD,
+#endif     
+        MSG_ID_L1D_TAS_FORCE_ANT_MSG,
+        MSG_ID_L1D_MDM_STARTUP_SIGNAL,
+        MSG_ID_L1D_TIME_CHG_SIGNAL,
+        MSG_ID_L1D_FRAME_SET_SIGNAL,
+        MSG_ID_L1D_ACCESS_PREAMBLE_SIGNAL,
+        MSG_ID_L1D_ENABLE_REV_TX_SIGNAL,
+        MSG_ID_L1D_SVC_CFG_SIG_TX_ON_SIGNAL,
+        MSG_ID_L1D_RSCH_LMD_STOP_SIGNAL,
+        MSG_ID_L1D_RF_TUNE_COMPLETE_SIGNAL,
+        MSG_ID_L1D_SERVICE_CONFIG_SIGNAL,
+        MSG_ID_L1D_SERVICE_CONFIG_NN_SIGNAL,
+        MSG_ID_L1D_HARD_HANDOFF_SIGNAL,
+        MSG_ID_L1D_SOFT_HANDOFF_SIGNAL,
+        MSG_ID_L1D_RSCH_SIGNAL,
+        MSG_ID_L1D_RSCH_DISABLE_SIGNAL,
+        MSG_ID_L1D_HO_PREAMBLE_OFF_SIGNAL,
+        MSG_ID_L1D_POWER_CONTROL_PARAMS_SIGNAL,
+        MSG_ID_L1D_FSCH_SIGNAL,
+        MSG_ID_L1D_FSCH_DISABLE_SIGNAL,
+        MSG_ID_L1D_LONG_CODE_CHANGE_SIGNAL,
+        MSG_ID_L1D_RADIO_CONFIG_SIGNAL,
+        MSG_ID_L1D_FSCH_BURST_END_SIGNAL,
+        MSG_ID_L1D_SPAGE_SEARCHER_TIMEOUT_SIGNAL,
+        MSG_ID_L1D_SUBCHAN_GAIN_SIGNAL,
+        MSG_ID_L1D_LMD_RLP_STOP_REQ_SIGNAL,
+        MSG_ID_L1D_TXCRP_CRC_RPT_MSG,
+        MSG_ID_L1D_LC_SCRAM_READ_MSG,
+        MSG_ID_L1D_MPA_ASSIGN_IND_MSG,  /*from frame tick*/
+        MSG_ID_LMD_L1D_REV_DATA_REQ_MSG,
+        MSG_ID_L1D_TX_BRP_DONE_MSG,
+        MSG_ID_L1D_ESR_PROTECT_MSG,
+        MSG_ID_L1D_AFLT_GRANT_IND_MSG,
+        MSG_ID_L1D_CFS_GRANT_IND_MSG,      
+        MSG_ID_L1D_ICS_RF_ENOUGH_IND_MSG,
+        MSG_ID_L1D_SYNC_CHNL_ACTION_TIME_MSG,
+        MSG_ID_L1D_SYNC_CHNL_GRANT_IND_MSG,
+        MSG_ID_L1D_RTB_CHNL_IND_MSG,
+        MSG_ID_L1D_MMAFC_NBIF_RX_ON_MSG,
+        MSG_ID_L1D_MMAFC_NBIF_RX_OFF_MSG,
+        MSG_ID_L1D_MMAFC_NBIF_FOE_UPDATE_MSG,
+        MSG_ID_L1D_SCH_OBF_RDY_IND_MSG,
+        MSG_ID_L1D_SCH_DONE_RDY_IND_MSG,
+        MSG_ID_L1D_TST_VOICE_GATE_MSG,
+        MSG_ID_L1D_FL_BRP_QUALITY_MSG,
+        MSG_ID_L1D_TMG_TRK_DONE_MSG,
+        MSG_ID_L1D_RESYNC_DENIED_MSG,
+        MSG_ID_L1D_RESYNC_ACCEPT_MSG,
+        MSG_ID_L1D_SPAGE_INIT_MSG,
+        MSG_ID_L1D_CLK_CAL_DONE_MSG,
+        MSG_ID_L1D_RAKE_DDL_REQ_MSG,
+        MSG_ID_L1D_SLT_TXCRP_CRC_PASS_MSG,
+        MSG_ID_L1D_RF_OFF_CNF_MSG,
+        MSG_ID_CSS_L1D_RSSI_SCAN_REQ_MSG,      
+        MSG_ID_CSS_L1D_RSSI_SCAN_ABORT_REQ_MSG,
+        MSG_ID_L1D_ICS_RSSI_SCAN_REPORT_MSG,
+        MSG_ID_L1D_TST_FSCH_CFG_MSG,
+        MSG_ID_L1D_TRANSMIT_STATUS_ON_MSG,
+        MSG_ID_L1D_TRANSMIT_STATUS_OFF_MSG,
+        MSG_ID_L1D_EM_STATUS_INFO_MSG,
+        MSG_ID_L1D_EM_MEAS_INFO_MSG,
+        MSG_ID_L1D_EM_MAIN_RXAGC_INFO_MSG,
+        MSG_ID_L1D_EM_DIV_RXAGC_INFO_MSG,
+        MSG_ID_L1D_EM_TX_PATH_INFO_MSG,
+        MSG_ID_L1D_EM_TX_AGC_INFO_MSG,
+        MSG_ID_L1D_EM_AFC_INFO_MSG,
+        MSG_ID_L1D_EM_RAKE_INFO_MSG,
+        MSG_ID_L1D_EM_CRC_INFO_MSG,
+        MSG_ID_L1D_EM_MMAFC_INFO_MSG,
+        MSG_ID_L1D_EM_TMG_LOOP_INFO_MSG,
+        MSG_ID_L1D_GPS_FRAME_SYNC_INFO_MSG,
+        MSG_ID_ELT_L1D_TEST_1X_AFC_CFG_MSG,
+        MSG_ID_ELT_L1D_RPC_CNT_CMD_MSG,
+        MSG_ID_L1D_RPC_REPORT_MSG,
+#ifdef __EM_MAX_TX_POWER_SUPPORT__
+        MSG_ID_L1D_VAL_MAX_TX_PWR_SET_MSG,
+#endif
+        MSG_ID_L1D_SLT_PAGING_OPT_MSG,
+        MSG_ID_L1D_TMG_CHG_INFO_MSG,
+        MSG_ID_L1D_NUM_CMD_MSG_SIG,
+MODULE_MSG_END(MSG_ID_L1D_MDM_CODE_TAIL)
+
+/*****************************************************************************
+* End of File
+*****************************************************************************/
+#endif
diff --git a/mcu/interface/sap/md/l1edps_msgid.h b/mcu/interface/sap/md/l1edps_msgid.h
new file mode 100644
index 0000000..82c9c4c
--- /dev/null
+++ b/mcu/interface/sap/md/l1edps_msgid.h
@@ -0,0 +1,292 @@
+/*******************************************************************************
+*  Modification Notice:
+*  --------------------------
+*  This software is modified by MediaTek Inc. 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:
+ * ---------
+ *   l1edps_sap.h
+ *
+ * Project:
+ * --------
+ *   TATAKA
+ *
+ * Description:
+ * ------------
+ *   LTE Dummy Protocol Stack, SAP definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ ****************************************************************************/
+#include "module_msg_range.h"
+#ifndef _L1EDPS_SAP_H
+#define _L1EDPS_SAP_H
+
+MODULE_MSG_BEGIN( MSG_ID_L1EDPS_CODE_BEGIN )
+
+MSG_ID_L1EDPS_NOCH_CSR_01 = MSG_ID_L1EDPS_CODE_BEGIN ,
+MSG_ID_L1EDPS_NOCH_CSR_02,
+MSG_ID_L1EDPS_NOCH_CSR_03,
+MSG_ID_L1EDPS_NOCH_CSR_04,
+MSG_ID_L1EDPS_NOCH_CSR_05,
+MSG_ID_L1EDPS_NOCH_CSR_06,
+MSG_ID_L1EDPS_NOCH_CSR_07,
+MSG_ID_L1EDPS_NOCH_CSR_08,
+MSG_ID_L1EDPS_NOCH_CSR_09,
+MSG_ID_L1EDPS_NOCH_CSR_10,
+MSG_ID_L1EDPS_NOCH_CSR_11,
+MSG_ID_L1EDPS_NOCH_SCS_01,
+MSG_ID_L1EDPS_NOCH_RESET_01,
+MSG_ID_L1EDPS_IDLE_CSR_01,
+MSG_ID_L1EDPS_IDLE_CSR_02,
+MSG_ID_L1EDPS_IDLE_BCCH_01,
+MSG_ID_L1EDPS_IDLE_BCCH_01_5,
+MSG_ID_L1EDPS_IDLE_BCCH_01_10,
+MSG_ID_L1EDPS_IDLE_BCCH_02,
+MSG_ID_L1EDPS_IDLE_BCCH_03,
+MSG_ID_L1EDPS_IDLE_BCCH_04,
+MSG_ID_L1EDPS_IDLE_PCH_01,
+MSG_ID_L1EDPS_IDLE_PCH_02,
+MSG_ID_L1EDPS_IDLE_PCH_03,
+MSG_ID_L1EDPS_IDLE_PCH_TDD_01,
+MSG_ID_L1EDPS_IDLE_PCH_TDD_02,
+MSG_ID_L1EDPS_IDLE_PWS_01,
+MSG_ID_L1EDPS_IDLE_CELL_RESEL_01,
+MSG_ID_L1EDPS_IDLE_CELL_RESEL_02,
+MSG_ID_L1EDPS_IDLE_CELL_RESEL_03,
+MSG_ID_L1EDPS_IDLE_CELL_RESEL_04,
+MSG_ID_L1EDPS_IDLE_PLMN_LIST_01,
+MSG_ID_L1EDPS_IDLE_PLMN_LIST_02,
+MSG_ID_L1EDPS_IDLE_OOS_01,
+MSG_ID_L1EDPS_IDLE_OOS_02,
+MSG_ID_L1EDPS_IDLE_OOS_03,
+MSG_ID_L1EDPS_IDLE_OOS_04,
+MSG_ID_L1EDPS_IDLE_SCH_RA_01,
+MSG_ID_L1EDPS_IDLE_SCH_RA_02,
+MSG_ID_L1EDPS_IDLE_SCH_RA_02_5,
+MSG_ID_L1EDPS_IDLE_SCH_RA_02_10,
+MSG_ID_L1EDPS_IDLE_SCH_RA_03,
+MSG_ID_L1EDPS_IDLE_SCH_RA_04,
+MSG_ID_L1EDPS_IDLE_SCH_RA_05,
+MSG_ID_L1EDPS_IDLE_SCH_RA_06,
+MSG_ID_L1EDPS_IDLE_SCH_RA_07,
+MSG_ID_L1EDPS_IDLE_SCH_RA_08,
+MSG_ID_L1EDPS_IDLE_SCH_CONN_EST_01,
+MSG_ID_L1EDPS_SCH_TPC_01,
+MSG_ID_L1EDPS_SCH_TPC_02,
+MSG_ID_L1EDPS_SCH_TPC_03,
+MSG_ID_L1EDPS_SCH_TPC_04,
+MSG_ID_L1EDPS_SCH_TPC_05,
+MSG_ID_L1EDPS_SCH_TPC_06,
+MSG_ID_L1EDPS_SCH_TX_01,
+MSG_ID_L1EDPS_SCH_TX_02,
+MSG_ID_L1EDPS_SCH_TX_03,
+MSG_ID_L1EDPS_SCH_TX_04,
+MSG_ID_L1EDPS_SCH_TX_05,
+MSG_ID_L1EDPS_SCH_TX_06,
+MSG_ID_L1EDPS_SCH_TRX_01,
+MSG_ID_L1EDPS_SCH_TRX_02,
+MSG_ID_L1EDPS_SCH_TRX_GAP,
+MSG_ID_L1EDPS_SCH_PC_01,
+MSG_ID_L1EDPS_SCH_PCQI_01,
+MSG_ID_L1EDPS_SCH_ACQI_01,
+MSG_ID_L1EDPS_SCH_HANDOVER_01,
+MSG_ID_L1EDPS_SCH_HANDOVER_02,
+MSG_ID_L1EDPS_SCH_HANDOVER_03,
+MSG_ID_L1EDPS_SCH_HANDOVER_04,
+MSG_ID_L1EDPS_SCH_HANDOVER_05,
+MSG_ID_L1EDPS_SCH_HANDOVER_06,
+MSG_ID_L1EDPS_SCH_SYNC_HANDOVER_01,
+MSG_ID_L1EDPS_SCH_INTRAHO_01,
+MSG_ID_L1EDPS_SCH_REDIRECTION_01,
+MSG_ID_L1EDPS_SCH_REDIRECTION_02,
+MSG_ID_L1EDPS_SCH_REDIRECTION_03,
+MSG_ID_L1EDPS_SCH_REDIRECTION_04,
+MSG_ID_L1EDPS_SCH_CSG_01,
+MSG_ID_L1EDPS_SCH_CSG_02,
+MSG_ID_L1EDPS_SCH_SI_MODIFY_01,
+MSG_ID_L1EDPS_SCH_PWS_01,
+MSG_ID_L1EDPS_SCH_PAG_GAP_01,
+MSG_ID_L1EDPS_SCH_CONN_REEST_01,
+MSG_ID_L1EDPS_SCH_CONN_REEST_02,
+MSG_ID_L1EDPS_SCH_CONN_REEST_03,
+MSG_ID_L1EDPS_SCH_CONN_REEST_04,
+MSG_ID_L1EDPS_SCH_RLM_01,
+MSG_ID_L1EDPS_SCH_RLM_02,
+MSG_ID_L1EDPS_SCH_RLM_03,
+MSG_ID_L1EDPS_SCH_RLM_04,
+MSG_ID_L1EDPS_SCH_RLM_05,
+MSG_ID_L1EDPS_SCH_RLM_06,
+MSG_ID_L1EDPS_SCH_RLM_07,
+MSG_ID_L1EDPS_SCH_RLM_08,
+MSG_ID_L1EDPS_SCH_RLM_DRX_01,
+MSG_ID_L1EDPS_SCH_RLM_DRX_02,
+MSG_ID_L1EDPS_SCH_RLM_DRX_03,
+MSG_ID_L1EDPS_SCH_RLM_DRX_04,
+MSG_ID_L1EDPS_SCH_DRX_TRANS_01,
+MSG_ID_L1EDPS_BCCH_MEASUREMENT_01,
+MSG_ID_L1EDPS_BCCH_MEASUREMENT_02,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_01,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_02,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_03,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_04,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_05,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_06,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_07,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_08,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_09,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_10,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_11,
+MSG_ID_L1EDPS_IDLE_MEASUREMENT_12,
+MSG_ID_L1EDPS_IDLE_SCH_MEASUREMENT_01,
+MSG_ID_L1EDPS_IDLE_SCH_MEASUREMENT_02,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_01,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_02,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_03,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_04,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_05,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_06,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_07,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_08,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_09,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_10,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_11,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_12,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_01,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_02,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_03,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_04,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_05,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_06,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_07,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_08,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_09,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_10,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_11,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_12,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_13,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_14,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_15,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_16,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_17,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_18,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_19,
+MSG_ID_L1EDPS_SCH_MEASUREMENT_CA_20,
+MSG_ID_L1EDPS_SCH_MEAS_EICIC_01,
+MSG_ID_L1EDPS_SCH_MEAS_EICIC_02,
+MSG_ID_L1EDPS_SCH_RLM_EICIC_01,
+MSG_ID_L1EDPS_SCH_RLM_EICIC_02,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_01,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_02,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_03,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_04,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_05,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_06,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_07,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_08,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_09,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_10,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_11,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_12,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_13,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_14,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_15,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_16,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_17,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_18,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_19,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_20,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_21,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_22,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_23,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_24,
+MSG_ID_L1EDPS_SCH_HANDOVER_CA_25,
+MSG_ID_L1EDPS_SCH_TRX_CA_01,
+MSG_ID_L1EDPS_SCH_TRX_CA_02,
+MSG_ID_L1EDPS_SCH_TRX_CA_03,
+MSG_ID_L1EDPS_SCH_TRX_CA_04,
+MSG_ID_L1EDPS_SCH_TRX_CA_05,
+MSG_ID_L1EDPS_SCH_TRX_CA_06,
+MSG_ID_L1EDPS_SCH_TRX_CA_07,
+MSG_ID_L1EDPS_SCH_TRX_03,
+MSG_ID_L1EDPS_SCH_TRX_04,
+MSG_ID_L1EDPS_IDLE_PWS_02,
+MSG_ID_L1EDPS_IDLE_PWS_03,
+MSG_ID_L1EDPS_SCH_PWS_02,
+MSG_ID_L1EDPS_SCH_PWS_03,
+MSG_ID_L1EDPS_SCH_TX_SIMULT_01,
+MSG_ID_L1EDPS_SCH_TX_SIMULT_02,
+MSG_ID_L1EDPS_SCH_TX_RATYPE1_01,
+MSG_ID_L1EDPS_SCH_TX_RATYPE1_02,
+MSG_ID_L1EDPS_IDLE_MBMS_MCCH_01,
+MSG_ID_L1EDPS_IDLE_MBMS_MCCH_02,
+MSG_ID_L1EDPS_SCH_MBMS_MCCH_01,
+MSG_ID_L1EDPS_SCH_MBMS_MCCH_02,
+MSG_ID_L1EDPS_3DL1UL_BASIC_01,
+MSG_ID_L1EDPS_3DL1UL_FDD_BASIC,
+MSG_ID_L1EDPS_3DL1UL_TDD_BASIC,
+MSG_ID_L1EDPS_2DL1UL_BASIC_01,
+MSG_ID_L1EDPS_2DL1UL_BASIC_02,
+MSG_ID_L1EDPS_4DL1UL_FDD_BASIC_23,
+MSG_ID_L1EDPS_4DL1UL_FDD_BASIC_24,
+MSG_ID_L1EDPS_2DL2UL_FDD_BASIC_05,
+MSG_ID_L1EDPS_2DL2UL_FDD_BASIC_06,
+MSG_ID_L1EDPS_2DL2UL_FDD_BASIC_07,
+MSG_ID_L1EDPS_2DL2UL_FDD_BASIC_08,
+MSG_ID_L1EDPS_2DL2UL_FDD_BASIC_09,
+MSG_ID_L1EDPS_2DL2UL_FDD_BASIC_10,
+MSG_ID_L1EDPS_2DL2UL_FDD_BASIC_11,
+MSG_ID_L1EDPS_2DL2UL_FDD_BASIC_12,
+MSG_ID_L1EDPS_2DL2UL_FDD_BASIC_13,
+MSG_ID_L1EDPS_2DL2UL_TDD_BASIC_05,
+MSG_ID_L1EDPS_2DL2UL_TDD_BASIC_06,
+MSG_ID_L1EDPS_2DL2UL_TDD_BASIC_08,
+MSG_ID_L1EDPS_2DL2UL_TDD_BASIC_09,
+MSG_ID_L1EDPS_2DL2UL_TDD_BASIC_10,
+MSG_ID_L1EDPS_2DL2UL_TDD_BASIC_11,
+MSG_ID_L1EDPS_3DL2UL_FDD_BASIC_14,
+MSG_ID_L1EDPS_3DL2UL_FDD_BASIC_15,
+MSG_ID_L1EDPS_3DL2UL_TDD_FDD_BASIC_14,
+MSG_ID_L1EDPS_3DL2UL_TDD_FDD_BASIC_15,
+
+//add MSG ID Before this line
+MSG_ID_L1EDPS_COMMON_PARAMS_SETUP,
+MSG_ID_L1EDPS_START_RUN_L1S_CASE,
+
+MODULE_MSG_END(MSG_ID_L1EDPS_CODE_TAIL)
+#endif /* _L1EDPS_SAP_H */
+
diff --git a/mcu/interface/sap/md/l1hisr_msgid.h b/mcu/interface/sap/md/l1hisr_msgid.h
new file mode 100644
index 0000000..8d1881d
--- /dev/null
+++ b/mcu/interface/sap/md/l1hisr_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) 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:
+ * ---------
+ * l1hisr_sap.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   Layer 1 HISR and Protocol Stack 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef L1HISR_MSGID_H
+#define L1HISR_MSGID_H
+
+MODULE_MSG_BEGIN(MSG_ID_L1HISR_CODE_BEGIN)
+MSG_ID_L1TASK_WAKEUP,
+MSG_ID_CRYSTAL_THERMAL_CHANGE_NOTIFY,
+MODULE_MSG_END(MSG_ID_L1HISR_CODE_TAIL)
+
+#endif  //L1HISR_MSGID_H
diff --git a/mcu/interface/sap/md/l1misc_msgid.h b/mcu/interface/sap/md/l1misc_msgid.h
new file mode 100644
index 0000000..5e96504
--- /dev/null
+++ b/mcu/interface/sap/md/l1misc_msgid.h
@@ -0,0 +1,66 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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 _L1MISC_MSGID_H
+#define _L1MSIC_MSGID_H
+
+
+MODULE_MSG_BEGIN( MSG_ID_L1MISC_CODE_BEGIN )
+
+    //L5IO <- TASAR
+    MSG_ID_L5_TA_RANGE_BEGIN, 
+        MSG_ID_L5IO_TASAR_CONTROL_REQ = MSG_ID_L5_TA_RANGE_BEGIN,
+        MSG_ID_L5IO_TASAR_CONTROL_CNF,
+        MSG_ID_L5IO_TASAR_ALGO_STATUS_QUERY_REQ,
+        MSG_ID_L5IO_TASAR_ALGO_STATUS_QUERY_CNF,
+        MSG_ID_L5IO_TASAR_INFO_QUERY_REQ,
+        MSG_ID_L5IO_TASAR_INFO_QUERY_CNF,
+    MSG_ID_L5_TA_RANGE_END,
+
+    //TASAR <--> MMRF
+    MSG_ID_TASAR_MMRF_RANGE_BEGIN, 
+    	MSG_ID_L1MMRF_TA_SAR_INFO_QUERY_REQ,
+    	MSG_ID_L5MMRF_TA_SAR_INFO_QUERY_CNF,
+    	MSG_ID_L1MMRF_TA_SAR_AVG_POWER_REPORT_REQ,
+    	MSG_ID_L5MMRF_TA_SAR_DPR_STATUS_CONTROL,
+        //MSG_ID_TASAR_MMRF
+    MSG_ID_TASAR_MMRF_RANGE_END,
+
+MODULE_MSG_END( MSG_ID_L1MISC_CODE_TAIL )
+
+#endif
+
diff --git a/mcu/interface/sap/md/l1tst_msgid.h b/mcu/interface/sap/md/l1tst_msgid.h
new file mode 100644
index 0000000..ecc1fda
--- /dev/null
+++ b/mcu/interface/sap/md/l1tst_msgid.h
@@ -0,0 +1,76 @@
+/*******************************************************************************
+*  Modification Notice:
+*  --------------------------
+*  This software is modified by MediaTek Inc. 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:
+ * ---------
+ *   l1tst_msgid.h
+ *
+ * Project:
+ * --------
+ *   MT6291
+ *
+ * Description:
+ * ------------
+ *   GL1TST task related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *============================================================================
+ *             HISTORY
+ * Below this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *------------------------------------------------------------------------------
+ * removed!
+ * removed!
+ * removed!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef L1TST_MSGID_H
+#define L1TST_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_GL1TST_CODE_BEGIN )
+MSG_ID_GL1TST_TO_FT = MSG_ID_GL1TST_CODE_BEGIN,
+MODULE_MSG_END( MSG_ID_GL1TST_CODE_TAIL )
+
+#endif //L1TST_MSGID_H
diff --git a/mcu/interface/sap/md/l4_ipc_msgid_source.h b/mcu/interface/sap/md/l4_ipc_msgid_source.h
new file mode 100644
index 0000000..a73cb21
--- /dev/null
+++ b/mcu/interface/sap/md/l4_ipc_msgid_source.h
@@ -0,0 +1,49 @@
+//below are AGPS messages for IPC
+MSG_ID_MMI_AGPS_BEGIN_NULL,
+MSG_ID_MMI_SS_MTLR_BEGIN_IND_NULL = MSG_ID_MMI_AGPS_BEGIN_NULL,
+MSG_ID_MMI_SS_MTLR_BEGIN_RES_REQ_NULL,
+MSG_ID_MMI_SS_MTLR_BEGIN_RES_RSP_NULL,
+MSG_ID_MMI_SS_AERQ_BEGIN_IND_NULL,
+MSG_ID_MMI_SS_AERQ_BEGIN_RES_REQ_NULL,
+MSG_ID_MMI_SS_AERQ_BEGIN_RES_RSP_NULL,
+MSG_ID_MMI_SS_AERP_BEGIN_REQ_NULL,
+MSG_ID_MMI_SS_AERP_BEGIN_RSP_NULL,
+MSG_ID_MMI_SS_AERP_END_REQ_NULL,
+MSG_ID_MMI_SS_AERP_END_RSP_NULL,
+MSG_ID_MMI_SS_AECL_BEGIN_IND_NULL,
+MSG_ID_MMI_SS_AECL_BEGIN_RES_REQ_NULL,
+MSG_ID_MMI_SS_AECL_BEGIN_RES_RSP_NULL,
+MSG_ID_MMI_SS_MOLR_BEGIN_REQ_NULL,
+MSG_ID_MMI_SS_MOLR_BEGIN_RSP_NULL,
+MSG_ID_MMI_SS_MOLR_END_REQ_NULL,
+MSG_ID_MMI_SS_MOLR_END_RSP_NULL,
+MSG_ID_MMI_AGPS_ENABLE_DISABLE_REQ_NULL,
+MSG_ID_MMI_AGPS_ENABLE_DISABLE_RSP_NULL,
+MSG_ID_MMI_AGPS_KEY_UPDATE_REQ_NULL,
+MSG_ID_MMI_AGPS_KEY_UPDATE_RSP_NULL,
+MSG_ID_MMI_AGPS_NEW_KEY_NEEDED_IND_NULL,
+MSG_ID_MMI_AGPS_RESET_POSITIONING_IND_NULL,
+MSG_ID_MMI_AGPS_CP_START_IND_NULL,
+MSG_ID_MMI_AGPS_CP_END_IND_NULL,
+MSG_ID_MMI_AGPS_CP_ABORT_REQ_NULL,
+MSG_ID_MMI_AGPS_CP_ABORT_RSP_NULL,
+MSG_ID_MMI_AGPS_END_NULL = MSG_ID_MMI_AGPS_CP_ABORT_RSP_NULL,
+MSG_ID_MMI_NBR_BEGIN_NULL,
+MSG_ID_L4C_NBR_CELL_INFO_REG_REQ_NULL = MSG_ID_MMI_NBR_BEGIN_NULL,
+MSG_ID_L4C_NBR_CELL_INFO_REG_CNF_NULL,
+MSG_ID_L4C_NBR_CELL_INFO_DEREG_REQ_NULL,
+MSG_ID_L4C_NBR_CELL_INFO_DEREG_CNF_NULL,
+MSG_ID_L4C_NBR_CELL_INFO_IND_NULL,
+MSG_ID_MMI_NBR_END_NULL = MSG_ID_L4C_NBR_CELL_INFO_IND_NULL,
+//below are for AGPS auto test
+MSG_ID_AGPS_AUTO_TEST_IND_NULL,
+MSG_ID_AGPS_CP_UP_STATUS_IND_NULL,
+MSG_ID_AGPS_MOLR_START_IND_NULL,
+MSG_ID_AGPS_MOLR_STOP_IND_NULL,
+MSG_ID_AGPS_MTLR_RESPONSE_IND_NULL,
+MSG_ID_DHCP_MBCI_IP_CONFIG_REQ,
+MSG_ID_DHCP_MBCI_IP_CONFIG_RSP,
+MSG_ID_DHCP_MBCI_IP_CONFIG_IND,
+/*below is for GPS desense*/
+MSG_ID_L4C_RF_INFO_IND,
+MSG_ID_L4C_RF_INFO_REQ,
diff --git a/mcu/interface/sap/md/l4_msgid.h b/mcu/interface/sap/md/l4_msgid.h
new file mode 100644
index 0000000..b49a3c3
--- /dev/null
+++ b/mcu/interface/sap/md/l4_msgid.h
@@ -0,0 +1,1773 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   l4.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   l4 related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ ****************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _L4_MSGID_H
+#define _L4_MSGID_H
+
+
+/*---------------L4_MSG_CODE_BEGIN---------------------------*/
+    /*--------------- L4C_INTERNAL_CODE_BEGIN------------------------*/
+    /* for msg from L4 task to L4C */
+MODULE_MSG_BEGIN( MSG_ID_L4C_INTERNAL_CODE_BEGIN )
+    MSG_TAG_L4C_FIRST_CNF_MSG = MSG_ID_L4C_INTERNAL_CODE_BEGIN,
+    #define L4C_REQ(MSG, HDLR)
+    #define L4C_CNF(MSG, HDLR)  MSG,
+    #define L4C_IND(MSG, HDLR)
+        #include "l4c_msg_hdlr_defs.h"
+    #undef L4C_REQ
+    #undef L4C_CNF
+    #undef L4C_IND
+    MSG_TAG_L4C_LAST_CNF_MSG,
+
+    MSG_TAG_L4C_FIRST_IND_MSG,
+    #define L4C_REQ(MSG, HDLR)
+    #define L4C_CNF(MSG, HDLR)
+    #define L4C_IND(MSG, HDLR)  MSG,
+        #include "l4c_msg_hdlr_defs.h"
+    #undef L4C_REQ
+    #undef L4C_CNF
+    #undef L4C_IND
+    MSG_TAG_L4C_LAST_IND_MSG,
+
+    MSG_TAG_L4C_FIRST_REQ_MSG,
+    #define L4C_REQ(MSG, HDLR)  MSG,
+    #define L4C_CNF(MSG, HDLR)
+    #define L4C_IND(MSG, HDLR)
+        #include "l4c_msg_hdlr_defs.h"
+    #undef L4C_REQ
+    #undef L4C_CNF
+    #undef L4C_IND
+    MSG_TAG_L4C_LAST_REQ_MSG,
+
+    MSG_ID_L4C_CODE_END = MSG_TAG_L4C_LAST_REQ_MSG,
+MODULE_MSG_END( MSG_ID_L4C_INTERNAL_CODE_TAIL )
+    /*--------------- L4C_INTERNAL_CODE_END--------------------------*/
+
+    /*--------------- L4C_EXTERNAL_CODE_BEGIN------------------------*/
+    /* for msg from non-L4 task to L4C */
+MODULE_MSG_BEGIN( MSG_ID_L4C_EXTERNAL_CODE_BEGIN )
+
+    // IMC -> L4C
+    MSG_ID_L4C_IMC_MSG_BEGIN = MSG_ID_L4C_EXTERNAL_CODE_BEGIN,
+        MSG_ID_L4C_IMC_CS_SERVICE_NOTIFICATION_RSP,
+    MSG_ID_L4C_IMC_MSG_END = MSG_ID_L4C_IMC_MSG_BEGIN + 50,
+
+    // VDM -> L4C
+    MSG_ID_VDM_L4C_FDN_ECC_CHECK_REQ,
+    MSG_ID_VDM_L4C_MSG_BEGIN = MSG_ID_VDM_L4C_FDN_ECC_CHECK_REQ,
+    MSG_ID_VDM_L4C_CS_CC_MO_CALL_REQ,
+    MSG_ID_VDM_L4C_CS_CC_EMERG_CALL_REQ,
+    MSG_ID_VDM_L4C_CS_CC_STK_CALL_REQ,
+    MSG_ID_VDM_L4C_CS_CC_MT_CALL_PRESENT_RSP,
+    MSG_ID_VDM_L4C_CS_CC_MT_CALL_ACCEPT_REQ, //+5
+    MSG_ID_VDM_L4C_CS_CC_HANGUP_ALL_REQ,
+    MSG_ID_VDM_L4C_CS_CC_FORCE_HANGUP_REQ,
+    MSG_ID_VDM_L4C_CS_CC_CALL_RELATED_SS_REQ,
+    MSG_ID_VDM_L4C_CS_CC_EXT_ERROR_REPORT_REQ,
+    MSG_ID_VDM_L4C_CS_CC_SEND_DIGIT_REQ, //+10
+    MSG_ID_VDM_L4C_CS_CC_START_SEND_DIGIT_REQ,
+    MSG_ID_VDM_L4C_CS_CC_STOP_SEND_DIGIT_REQ,
+    MSG_ID_VDM_L4C_CS_CC_LIST_CURRENT_CALLS_REQ,
+    MSG_ID_VDM_L4C_CS_CC_EMERG_SERV_CAT_REQ,
+    MSG_ID_VDM_L4C_CS_CC_LIST_CURRENT_CALLS_EXT_REQ, //+15
+    MSG_ID_VDM_L4C_GET_SSAC_PARAM_REQ,
+    MSG_ID_VDM_L4C_SRVCC_CONTEXT_TRANSFER_REQ,
+    MSG_ID_VDM_L4C_IMS_CALL_SCM_REQ,
+    MSG_ID_VDM_L4C_IMS_CALL_PROGRESS_REQ,
+    MSG_ID_VDM_L4C_GMSS_SET_HVOLTE_MODE_REQ, //+20
+    MSG_ID_VDM_L4C_EMCS_REQ,
+    MSG_ID_VDM_L4C_UAC_PARAM_CHECK_REQ,
+    MSG_ID_VDM_L4C_UAC_PARAM_CHECK_ABORT_REQ,
+    MSG_ID_VDM_L4C_NR_IMS_CALL_STATUS_REQ,
+    MSG_ID_VDM_L4C_ERRC_CELL_REJ_IND,
+    MSG_ID_VDM_L4C_EMERGENCY_SERVICE_REQ,
+    MSG_ID_VDM_L4C_EMERGENCY_SERVICE_FALLBACK_REQ, //+25
+    MSG_ID_VDM_L4C_IMS_CC_CALL_PROGRESS_IND, //relay IMS call +ECPI progress to L4C
+    MSG_ID_VDM_L4C_ECALL_TEST_CALL_ATTACH_REQ,
+    MSG_ID_VDM_L4C_ECALL_ABORT_TEST_CALL_ATTACH_REQ,
+#if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)
+    MSG_ID_VDM_L4C_CS_CC_CECALL_REQ,
+#endif
+    MSG_ID_VDM_L4C_MSG_END = MSG_ID_VDM_L4C_MSG_BEGIN + 50,
+
+    // ATP -> L4C
+    MSG_ID_ATP_L4C_CSFB_PAGE_REQ,
+    MSG_ID_ATP_L4C_CALL_HANDOVER_IND,
+
+    // SDM -> L4C
+    MSG_ID_SDM_L4C_IMS_NORMAL_SMS_UAC_REQ,
+    MSG_ID_SDM_L4C_MSG_BEGIN = MSG_ID_SDM_L4C_IMS_NORMAL_SMS_UAC_REQ,
+    MSG_ID_SDM_L4C_IMS_STK_SMS_UAC_REQ,
+    MSG_ID_SDM_L4C_IMS_CMSS_SMS_UAC_REQ,
+    MSG_ID_SDM_L4C_IMS_C2K_SMS_UAC_REQ,
+    MSG_ID_SDM_L4C_IMS_UTK_SMS_UAC_REQ,
+    MSG_ID_SDM_L4C_NR_IMS_SMS_STATUS_REQ, //+5
+    MSG_ID_SDM_L4C_EMERGENCY_SERVICE_REQ,
+    MSG_ID_SDM_L4C_EMERGENCY_SERVICE_FALLBACK_REQ,
+    MSG_ID_SDM_L4C_EMTS_REQ,
+    MSG_ID_SDM_L4C_MSG_END = MSG_ID_SDM_L4C_MSG_BEGIN + 50,
+
+    // SSDS -> L4C
+    MSG_ID_SSDS_L4C_FDN_CHECK_REQ,
+    MSG_ID_SSDS_L4C_MSG_BEGIN = MSG_ID_SSDS_L4C_FDN_CHECK_REQ,
+    MSG_ID_SSDS_L4C_STK_IMS_USSD_CONFIG_REQ,
+    MSG_ID_SSDS_L4C_STK_IMS_USSD_RES,
+    MSG_ID_SSDS_L4C_STK_CS_USSD_REQ,
+    MSG_ID_SSDS_L4C_STKSS_CONFIG_REQ,
+    MSG_ID_SSDS_L4C_STKSS_RES,
+    MSG_ID_SSDS_L4C_STKSS_CS_REQ,
+    MSG_ID_SSDS_L4C_MSG_END = MSG_ID_SSDS_L4C_MSG_BEGIN + 30,
+
+    // DDM -> L4C
+    MSG_ID_DDM_L4C_MSG_BEGIN,
+    MSG_ID_DDM_L4C_UE_USAGE_SETTING_REQ = MSG_ID_DDM_L4C_MSG_BEGIN,
+    MSG_ID_DDM_L4C_UE_USAGE_SETTING_CNF,
+    MSG_ID_DDM_L4C_MSG_END,
+
+#ifdef __L5_SUPPORT__
+    //L5 -> L4C
+    MSG_ID_L5_L4C_CELL_LIST_REQ,
+    MSG_ID_L5_L4C_MSG_BEGIN = MSG_ID_L5_L4C_CELL_LIST_REQ,
+    MSG_ID_L5_L4C_CELL_LIST_CNF,
+    MSG_ID_L5_L4C_SET_NW_BLACK_LIST_REQ,
+    MSG_ID_L5_L4C_SET_NW_BLACK_LIST_CNF,
+    MSG_ID_L5_L4C_GET_NW_BLACK_LIST_REQ,
+    MSG_ID_L5_L4C_GET_NW_BLACK_LIST_CNF,
+    MSG_ID_L5_L4C_NW_BLACK_LIST_STATE_IND,
+    MSG_ID_L5_L4C_L5URF_RADIO_ON_IND,
+    MSG_ID_L5_L4C_CELL_PWR_SRXLEV_IND,
+    MSG_ID_L5_L4C_SET_ALLOWED_MCC_LIST_REQ,
+    MSG_ID_L5_L4C_SET_ALLOWED_MCC_LIST_CNF,
+    MSG_ID_L5_L4C_GET_RF_STATUS_REQ,
+    MSG_ID_L5_L4C_GET_RF_STATUS_CNF,
+    MSG_ID_L5_L4C_GET_NSSAI_REQ,
+    MSG_ID_L5_L4C_GET_NSSAI_CNF,
+    MSG_ID_L5_L4C_SET_NSSAI_REQ,
+    MSG_ID_L5_L4C_SET_NSSAI_CNF,
+    MSG_ID_L5_L4C_SET_PREF_NSSAI_REQ,
+    MSG_ID_L5_L4C_SET_PREF_NSSAI_CNF,
+    MSG_ID_L5_L4C_VGMM_NW_PARAMS_IND,
+    MSG_ID_L5_L4C_MSG_END,
+#endif
+    // DMF -> L4C
+    MSG_ID_MT_DMF_L4C_CUSTOM_CONFIG_REQ,
+
+MODULE_MSG_END( MSG_ID_L4C_EXTERNAL_CODE_TAIL )
+    /*--------------- L4C_EXTERNAL_CODE_END--------------------------*/
+
+    /*-----------------L4APS_CODE_BEGIN-----------------------*/
+MODULE_MSG_BEGIN( MSG_ID_L4APS_CODE_BEGIN )
+
+    MSG_ID_DDM_L4APS_MSG_BEGIN,
+        /* DDM -> L4APS */
+        MSG_ID_DDM_L4APS_MSG_FROM_DDM_BEGIN,
+            MSG_ID_DDM_L4APS_CGDCONT_REQ,
+            MSG_ID_DDM_L4APS_CGDSCONT_REQ,
+            MSG_ID_DDM_L4APS_CGTFT_REQ,
+            MSG_ID_DDM_L4APS_CGQREQ_REQ,
+            MSG_ID_DDM_L4APS_CGQMIN_REQ,
+            MSG_ID_DDM_L4APS_CGEQREQ_REQ,
+            MSG_ID_DDM_L4APS_CGEQMIN_REQ,
+            MSG_ID_DDM_L4APS_CGEQNEG_REQ,
+            MSG_ID_DDM_L4APS_CGACT_REQ,
+            MSG_ID_DDM_L4APS_CGCMOD_REQ,
+            MSG_ID_DDM_L4APS_CGPADDR_REQ,
+            MSG_ID_DDM_L4APS_CGAUTO_REQ,
+            MSG_ID_DDM_L4APS_CGANS_REQ,
+            MSG_ID_DDM_L4APS_CGEREP_REQ,
+            MSG_ID_DDM_L4APS_CGCONTRDP_REQ,
+            MSG_ID_DDM_L4APS_CGSCONTRDP_REQ,
+            MSG_ID_DDM_L4APS_CGTFTRDP_REQ,
+            MSG_ID_DDM_L4APS_CGEQOS_REQ,
+            MSG_ID_DDM_L4APS_CGEQOSRDP_REQ,
+            MSG_ID_DDM_L4APS_CGDEL_REQ,
+            MSG_ID_DDM_L4APS_CGAUTH_REQ,
+            MSG_ID_DDM_L4APS_ECNCFG_REQ,
+            MSG_ID_DDM_L4APS_EGDCONT_REQ,
+            MSG_ID_DDM_L4APS_VZWAPNETMR_REQ,
+            MSG_ID_DDM_L4APS_VZWAPNE_REQ,
+            MSG_ID_DDM_L4APS_EGPAU_REQ,
+            MSG_ID_DDM_L4APS_EGACT_REQ,
+            MSG_ID_DDM_L4APS_CGSDATA_REQ,
+            MSG_ID_DDM_L4APS_ACTTEST_REQ,
+            MSG_ID_DDM_L4APS_PSBEARER_REQ,
+            MSG_ID_DDM_L4APS_EGFB_REQ,
+            MSG_ID_DDM_L4APS_EGDELPF_REQ,
+            MSG_ID_DDM_L4APS_EGLNKPF_REQ,
+            MSG_ID_DDM_L4APS_EGPCORDP_REQ,
+            MSG_ID_DDM_L4APS_EGPCO_REQ,
+            MSG_ID_DDM_L4APS_CGDATA_REQ,
+            MSG_ID_DDM_L4APS_EGLD_REQ,
+            MSG_ID_DDM_L4APS_EDALLOW_REQ,
+            MSG_ID_DDM_L4APS_LTE_ATTACH_PDN_DEFINE_NEEDED_RSP,
+            MSG_ID_DDM_L4APS_SET_EIMSROAM_CONFIG_VALUE_REQ,
+            MSG_ID_DDM_L4APS_CMD_NOT_YET_SUPPORT_REQ, /* Only for UT */
+            MSG_ID_DDM_L4APS_EAPNSYNC_REQ,
+            MSG_ID_DDM_L4APS_EVZWAPFCIA_REQ,
+            MSG_ID_DDM_L4APS_EGGRNTRSPT_REQ,
+            MSG_ID_DDM_L4APS_EGPCAP_REQ,
+            MSG_ID_DDM_L4APS_C5GQOS_REQ,
+            MSG_ID_DDM_L4APS_C5GQOSRDP_REQ,
+            MSG_ID_DDM_L4APS_IA_APN_CHANGE_REQ,
+            MSG_ID_DDM_L4APS_SET_DEFAULT_SIM_IND,
+            MSG_ID_DDM_L4APS_CLADN_REQ,
+            MSG_ID_DDM_L4APS_NOTIFY_PDN_TYPE_REQ,
+            MSG_ID_DDM_L4APS_UPDATE_CID_MAPPING_REQ,
+            MSG_ID_DDM_L4APS_ESCONTIND_REQ,
+            MSG_ID_DDM_L4APS_NW_APPLIED_CACHE_DATA_NOTIFY,
+        MSG_ID_DDM_L4APS_MSG_FROM_DDM_END,
+
+        /* DDM <- L4APS */
+        MSG_ID_DDM_L4APS_MSG_FROM_L4APS_BEGIN,
+            MSG_ID_DDM_L4APS_CMD_CNF,
+            MSG_ID_DDM_L4APS_CGEV_IND,
+            MSG_ID_DDM_L4APS_CGDCONT_IND,
+            MSG_ID_DDM_L4APS_CGDSCONT_IND,
+            MSG_ID_DDM_L4APS_CGTFT_IND,
+            MSG_ID_DDM_L4APS_CGQREQ_IND,
+            MSG_ID_DDM_L4APS_CGQMIN_IND,
+            MSG_ID_DDM_L4APS_CGEQREQ_IND,
+            MSG_ID_DDM_L4APS_CGEQMIN_IND,
+            MSG_ID_DDM_L4APS_CGEQNEG_IND,
+            MSG_ID_DDM_L4APS_CGACT_IND,
+            MSG_ID_DDM_L4APS_CGPADDR_IND,
+            MSG_ID_DDM_L4APS_CGAUTO_IND,
+            MSG_ID_DDM_L4APS_CGEREP_IND,
+            MSG_ID_DDM_L4APS_CGCONTRDP_IND,
+            MSG_ID_DDM_L4APS_CGSCONTRDP_IND,
+            MSG_ID_DDM_L4APS_CGTFTRDP_IND,
+            MSG_ID_DDM_L4APS_CGEQOS_IND,
+            MSG_ID_DDM_L4APS_CGEQOSRDP_IND,
+            MSG_ID_DDM_L4APS_CGDEL_IND,
+            MSG_ID_DDM_L4APS_CGAUTH_IND,
+            MSG_ID_DDM_L4APS_PSBEARER_IND,
+            MSG_ID_DDM_L4APS_EGFB_IND,
+            MSG_ID_DDM_L4APS_EGDELPF_IND,
+            MSG_ID_DDM_L4APS_EGLNKPF_IND,
+            MSG_ID_DDM_L4APS_EGPCORDP_IND,
+            MSG_ID_DDM_L4APS_EGPCO_IND,
+            MSG_ID_DDM_L4APS_CGDATA_CNF,
+            MSG_ID_DDM_L4APS_EGLD_CNF,
+            MSG_ID_DDM_L4APS_EGEV_IND,
+            MSG_ID_DDM_L4APS_LTE_ATTACH_NEEDED_IND,
+            MSG_ID_DDM_L4APS_LTE_ATTACH_PDN_DEFINE_NEEDED_IND,
+            MSG_ID_DDM_L4APS_LTE_ATTACH_PDN_ACTIVATE_SUCCESS_IND,
+            MSG_ID_DDM_L4APS_LTE_ATTACH_PDN_ACTIVATE_FAILURE_IND,
+            MSG_ID_DDM_L4APS_VZWAPNE_IND,
+            MSG_ID_DDM_L4APS_VZWAPNETMR_IND,
+            MSG_ID_DDM_L4APS_PDN_MODIFY_IND,
+            MSG_ID_DDM_L4APS_EAPNSYNC_IND,
+            MSG_ID_DDM_L4APS_EVZWAPFCIA_IND,
+            MSG_ID_DDM_L4APS_EGGRNTRSPT_IND,
+            MSG_ID_DDM_L4APS_EGPCAP_TEST_MODE_IND,
+            MSG_ID_DDM_L4APS_BACKOFF_TIMER_STATUS_IND,
+            MSG_ID_DDM_L4APS_C5GQOS_IND,
+            MSG_ID_DDM_L4APS_C5GQOSRDP_IND,
+            MSG_ID_DDM_L4APS_CLADN_IND,
+            MSG_ID_DDM_L4APS_CLADNU_IND,
+            MSG_ID_DDM_L4APS_NOTIFY_PDN_TYPE_CNF,
+            MSG_ID_DDM_L4APS_UPDATE_CID_MAPPING_CNF,
+            MSG_ID_DDM_L4APS_ESCONTIND_IND,
+        MSG_ID_DDM_L4APS_MSG_FROM_L4APS_END,
+
+        /* L4APS <- TCM */
+        MSG_ID_L4APS_TCM_MSG_FROM_TCM_BEGIN,
+            MSG_ID_L4APS_TCM_UPDATE_CID_MAPPING_CNF,
+        MSG_ID_L4APS_TCM_MSG_FROM_TCM_END,
+    MSG_ID_DDM_L4APS_MSG_END,
+
+    /*-----------------L4APS_CODE_TAIL-------------------------*/
+MODULE_MSG_END( MSG_ID_L4APS_CODE_TAIL )
+
+    /*-----------------L4BPDN_CODE_BEGIN-----------------------*/
+MODULE_MSG_BEGIN( MSG_ID_L4BPDN_CODE_BEGIN )
+
+    MSG_ID_L4APS_L4BPDN_MSG_BEGIN,
+        /* L4APS -> L4BPDN */
+        MSG_ID_L4APS_L4BPDN_MSG_FROM_L4APS_BEGIN,
+            MSG_ID_L4APS_L4BPDN_CGDCONT_REQ,
+            MSG_ID_L4APS_L4BPDN_CGDSCONT_REQ,
+            MSG_ID_L4APS_L4BPDN_CGTFT_REQ,
+            MSG_ID_L4APS_L4BPDN_CGQREQ_REQ,
+            MSG_ID_L4APS_L4BPDN_CGQMIN_REQ,
+            MSG_ID_L4APS_L4BPDN_CGEQREQ_REQ,
+            MSG_ID_L4APS_L4BPDN_CGEQMIN_REQ,
+            MSG_ID_L4APS_L4BPDN_CGEQNEG_REQ,
+            MSG_ID_L4APS_L4BPDN_CGACT_REQ,
+            MSG_ID_L4APS_L4BPDN_CGCMOD_REQ,
+            MSG_ID_L4APS_L4BPDN_CGPADDR_REQ,
+            MSG_ID_L4APS_L4BPDN_CGAUTO_REQ,
+            MSG_ID_L4APS_L4BPDN_CGANS_REQ,
+            MSG_ID_L4APS_L4BPDN_CGEREP_REQ,
+            MSG_ID_L4APS_L4BPDN_CGCONTRDP_REQ,
+            MSG_ID_L4APS_L4BPDN_CGSCONTRDP_REQ,
+            MSG_ID_L4APS_L4BPDN_CGTFTRDP_REQ,
+            MSG_ID_L4APS_L4BPDN_CGEQOS_REQ,
+            MSG_ID_L4APS_L4BPDN_CGEQOSRDP_REQ,
+            MSG_ID_L4APS_L4BPDN_CGDEL_REQ,
+            MSG_ID_L4APS_L4BPDN_CGAUTH_REQ,
+            MSG_ID_L4APS_L4BPDN_ECNCFG_REQ,
+            MSG_ID_L4APS_L4BPDN_EGDCONT_REQ,
+            MSG_ID_L4APS_L4BPDN_VZWAPNETMR_REQ,
+            MSG_ID_L4APS_L4BPDN_VZWAPNE_REQ,
+            MSG_ID_L4APS_L4BPDN_EGPAU_REQ,
+            MSG_ID_L4APS_L4BPDN_EGACT_REQ,
+            MSG_ID_L4APS_L4BPDN_CGSDATA_REQ,
+            MSG_ID_L4APS_L4BPDN_ACTTEST_REQ,
+            MSG_ID_L4APS_L4BPDN_PSBEARER_REQ,
+            MSG_ID_L4APS_L4BPDN_EGFB_REQ,
+            MSG_ID_L4APS_L4BPDN_EGDELPF_REQ,
+            MSG_ID_L4APS_L4BPDN_EGLNKPF_REQ,
+            MSG_ID_L4APS_L4BPDN_EGPCORDP_REQ,
+            MSG_ID_L4APS_L4BPDN_EGPCO_REQ,
+            MSG_ID_L4APS_L4BPDN_CGDATA_REQ,
+            MSG_ID_L4APS_L4BPDN_EGLD_REQ,
+            MSG_ID_L4APS_L4BPDN_EDALLOW_REQ,
+            MSG_ID_L4APS_L4BPDN_LTE_ATTACH_PDN_DEFINE_NEEDED_RSP,
+            MSG_ID_L4APS_L4BPDN_SET_EIMSROAM_CONFIG_VALUE_REQ,
+            MSG_ID_L4APS_L4BPDN_CMD_NOT_YET_SUPPORT_REQ, /* Only for UT */
+            MSG_ID_L4APS_L4BPDN_EAPNSYNC_REQ,
+            MSG_ID_L4APS_L4BPDN_EVZWAPFCIA_REQ,
+            MSG_ID_L4APS_L4BPDN_EGGRNTRSPT_REQ,
+            MSG_ID_L4APS_L4BPDN_EGPCAP_REQ,
+            MSG_ID_L4APS_L4BPDN_C5GQOS_REQ,
+            MSG_ID_L4APS_L4BPDN_C5GQOSRDP_REQ,
+            MSG_ID_L4APS_L4BPDN_SET_DEFAULT_SIM_IND,
+            MSG_ID_L4APS_L4BPDN_CLADN_REQ,
+            MSG_ID_L4APS_L4BPDN_NOTIFY_PDN_TYPE_REQ,
+            MSG_ID_L4APS_L4BPDN_ESCONTIND_REQ,
+            MSG_ID_L4APS_L4BPDN_NW_APPLIED_CACHE_DATA_NOTIFY,
+        MSG_ID_L4APS_L4BPDN_MSG_FROM_L4APS_END,
+
+        /* L4BPDN -> L4APS */
+        MSG_ID_L4APS_L4BPDN_MSG_FROM_L4BPDN_BEGIN,
+            MSG_ID_L4APS_L4BPDN_CMD_CNF,
+            MSG_ID_L4APS_L4BPDN_CGEV_IND,
+            MSG_ID_L4APS_L4BPDN_CGDCONT_IND,
+            MSG_ID_L4APS_L4BPDN_CGDSCONT_IND,
+            MSG_ID_L4APS_L4BPDN_CGTFT_IND,
+            MSG_ID_L4APS_L4BPDN_CGQREQ_IND,
+            MSG_ID_L4APS_L4BPDN_CGQMIN_IND,
+            MSG_ID_L4APS_L4BPDN_CGEQREQ_IND,
+            MSG_ID_L4APS_L4BPDN_CGEQMIN_IND,
+            MSG_ID_L4APS_L4BPDN_CGEQNEG_IND,
+            MSG_ID_L4APS_L4BPDN_CGACT_IND,
+            MSG_ID_L4APS_L4BPDN_CGPADDR_IND,
+            MSG_ID_L4APS_L4BPDN_CGAUTO_IND,
+            MSG_ID_L4APS_L4BPDN_CGEREP_IND,
+            MSG_ID_L4APS_L4BPDN_CGCONTRDP_IND,
+            MSG_ID_L4APS_L4BPDN_CGSCONTRDP_IND,
+            MSG_ID_L4APS_L4BPDN_CGTFTRDP_IND,
+            MSG_ID_L4APS_L4BPDN_CGEQOS_IND,
+            MSG_ID_L4APS_L4BPDN_CGEQOSRDP_IND,
+            MSG_ID_L4APS_L4BPDN_CGDEL_IND,
+            MSG_ID_L4APS_L4BPDN_CGAUTH_IND,
+            MSG_ID_L4APS_L4BPDN_PSBEARER_IND,
+            MSG_ID_L4APS_L4BPDN_EGFB_IND,
+            MSG_ID_L4APS_L4BPDN_EGDELPF_IND,
+            MSG_ID_L4APS_L4BPDN_EGLNKPF_IND,
+            MSG_ID_L4APS_L4BPDN_EGPCORDP_IND,
+            MSG_ID_L4APS_L4BPDN_EGPCO_IND,
+            MSG_ID_L4APS_L4BPDN_CGDATA_CNF,
+            MSG_ID_L4APS_L4BPDN_EGLD_CNF,
+            MSG_ID_L4APS_L4BPDN_EGEV_IND,
+            MSG_ID_L4APS_L4BPDN_LTE_ATTACH_NEEDED_IND,
+            MSG_ID_L4APS_L4BPDN_LTE_ATTACH_PDN_DEFINE_NEEDED_IND,
+            MSG_ID_L4APS_L4BPDN_LTE_ATTACH_PDN_ACTIVATE_SUCCESS_IND,
+            MSG_ID_L4APS_L4BPDN_LTE_ATTACH_PDN_ACTIVATE_FAILURE_IND,
+            MSG_ID_L4APS_L4BPDN_VZWAPNE_IND,
+            MSG_ID_L4APS_L4BPDN_VZWAPNETMR_IND,
+            MSG_ID_L4APS_L4BPDN_PDN_MODIFY_IND,
+            MSG_ID_L4APS_L4BPDN_EAPNSYNC_IND,
+            MSG_ID_L4APS_L4BPDN_EVZWAPFCIA_IND,
+            MSG_ID_L4APS_L4BPDN_EGGRNTRSPT_IND,
+            MSG_ID_L4APS_L4BPDN_EGPCAP_TEST_MODE_IND,
+            MSG_ID_L4APS_L4BPDN_BACKOFF_TIMER_STATUS_IND,
+            MSG_ID_L4APS_L4BPDN_C5GQOS_IND,
+            MSG_ID_L4APS_L4BPDN_C5GQOSRDP_IND,
+            MSG_ID_L4APS_L4BPDN_CLADN_IND,
+            MSG_ID_L4APS_L4BPDN_CLADNU_IND,
+            MSG_ID_L4APS_L4BPDN_NOTIFY_PDN_TYPE_CNF,
+            MSG_ID_L4APS_L4BPDN_ESCONTIND_IND,
+        MSG_ID_L4APS_L4BPDN_MSG_FROM_L4BPDN_END,
+    MSG_ID_L4APS_L4BPDN_MSG_END,
+
+    MSG_ID_DDM_L4BNW_MSG_BEGIN,
+        MSG_ID_DDM_L4BNW_ATTACHED_RAT_IND,
+        MSG_ID_DDM_L4BNW_RESTART_CLEAR_CODE_33_PROC_IND,
+        MSG_ID_DDM_L4BNW_PS_TYPE_CONFIG_REQ,
+        MSG_ID_DDM_L4BNW_PS_TYPE_CONFIG_CNF,
+        MSG_ID_DDM_L4BNW_PS_REATTACH_CONFIG_REQ,
+        MSG_ID_DDM_L4BNW_IMS_PDN_REJ_IND,
+        MSG_ID_DDM_L4BNW_PS_EVENT_REPORT_IND,
+        MSG_ID_DDM_L4BNW_T3402_STOP_IND,
+    MSG_ID_DDM_L4BNW_MSG_END,
+
+    MSG_ID_N3ANS_L4BNW_MSG_BEGIN,
+        MSG_ID_N3ANS_L4BNW_ATTACHED_RAT_IND,
+    MSG_ID_N3ANS_L4BNW_MSG_END,
+
+    MSG_ID_WO_L4BNW_MSG_BEGIN,
+        MSG_ID_WO_L4BNW_ATTACHED_RAT_IND,
+    MSG_ID_WO_L4BNW_MSG_END,
+
+    MSG_ID_IMSM_L4BNW_MSG_BEGIN,
+        MSG_ID_IMSM_L4BNW_ATTACHED_RAT_IND,
+    MSG_ID_IMSM_L4BNW_MSG_END,
+
+    MSG_ID_IWLAN_L4BNW_MSG_BEGIN,
+        MSG_ID_IWLAN_L4BNW_ATTACHED_RAT_IND,
+        MSG_ID_IWLAN_L4BNW_FORCE_BAR_IND,
+    MSG_ID_IWLAN_L4BNW_MSG_END,
+
+    MSG_ID_L4BPDN_L4B_MSG_BEGIN,
+        MSG_ID_L4BPDN_L4BNW_ATTACHED_RAT_IND,
+    MSG_ID_L4BPDN_L4B_MSG_END,
+
+    MSG_ID_VDM_L4B_MSG_BEGIN,
+        MSG_ID_VDM_L4BNW_ATTACHED_RAT_IND,
+    MSG_ID_VDM_L4B_MSG_END,
+
+    MSG_ID_SSDS_L4B_MSG_BEGIN,
+        MSG_ID_SSDS_L4BNW_ATTACHED_RAT_IND,
+    MSG_ID_SSDS_L4B_MSG_END,
+
+    MSG_ID_L4BNW_L4C_MSG_BEGIN,
+        MSG_ID_L4BNW_L4C_ACTIVE_RAT_IND,
+        MSG_ID_L4BNW_L4C_SUSPEND_EGREG_UPDATE_IND,
+        MSG_ID_L4BNW_L4C_SUSPEND_EGREG_UPDATE_CNF,
+        MSG_ID_L4BNW_L4C_RESTART_CLEAR_CODE_33_PROC_IND,
+        MSG_ID_L4BNW_L4C_SIM_LOCK_REQ,
+        MSG_ID_L4BNW_L4C_SIM_LOCK_CNF,
+        MSG_ID_L4BNW_L4C_PS_TYPE_CONFIG_CNF,
+        MSG_ID_L4BNW_L4C_ILLEGAL_ME_IND,
+        MSG_ID_L4BNW_L4C_REG_STATE_IND,
+        MSG_ID_L4BNW_L4C_IMS_PDN_REJ_IND,
+        MSG_ID_L4BNW_L4C_PS_EVENT_REPORT_IND,
+        MSG_ID_L4BNW_L4C_T3402_STOP_IND,
+    MSG_ID_L4BNW_L4C_MSG_END,
+
+    MSG_ID_L4BPWR_L4C_MSG_BEGIN,
+        MSG_ID_L4BPWR_L4C_OP01_LOCK_CNF,
+        MSG_ID_L4BPWR_L4C_SERVICE_MODE_CNF,
+        MSG_ID_L4BPWR_L4C_SERVICE_MODE_IND,
+        MSG_ID_L4BPWR_L4C_RAT_CHANGE_IND,
+        MSG_ID_L4BPWR_L4C_AUTO_STARTUP_IND,
+        MSG_ID_L4BPWR_L4C_5GOPT_SET_CNF,
+    MSG_ID_L4BPWR_L4C_MSG_END,
+
+    MSG_ID_L4BSBP_L4C_MSG_BEGIN,
+        MSG_ID_L4BSBP_L4C_DUPLEX_MODE_CHANGE_FINISH_IND,
+    MSG_ID_L4BSBP_L4C_MSG_END,
+
+    MSG_ID_L4C_PS_UT_MSG_BEGIN,
+        MSG_ID_L4C_PS_UT_RESULT_OK,
+    MSG_ID_L4C_PS_UT_MSG_END,
+
+    MSG_ID_L4BPDN_L4C_MSG_FROM_L4BPDN_BEGIN,
+    /* L4BPDN to L4C AT command Primitive */
+    #define L4C_PS_REQ(MSG, HDLR1, HDLR2, HDLR3, HDLR4)  MSG,
+        #include "l4c_ps_msg_hdlr_defs.h"
+    #undef  L4C_PS_REQ
+
+    /* L4BPDN to L4C Non-AT command Primitive */
+    MSG_ID_L4BPDN_L4C_PDN_REVIVE_REQ,
+    MSG_ID_L4BPDN_L4C_LTE_ATTACH_PDN_DEFINE_NEEDED_RSP,
+    MSG_ID_L4BPDN_L4C_SET_EIMSROAM_CONFIG_VALUE_REQ,
+    MSG_ID_L4BPDN_L4C_SET_DEFAULT_SIM_IND,
+    MSG_ID_L4BPDN_L4C_NW_APPLIED_CACHE_DATA_NOTIFY,
+
+    MSG_ID_L4BPDN_L4C_MSG_FROM_L4BPDN_END,
+
+    MSG_ID_L4BPDN_L4C_MSG_FROM_L4C_BEGIN,
+        MSG_ID_L4BPDN_L4C_CMD_CNF,
+        MSG_ID_L4BPDN_L4C_CGEV_IND,
+        MSG_ID_L4BPDN_L4C_CGDCONT_IND,
+        MSG_ID_L4BPDN_L4C_CGDSCONT_IND,
+        MSG_ID_L4BPDN_L4C_CGTFT_IND,
+        MSG_ID_L4BPDN_L4C_CGQREQ_IND,
+        MSG_ID_L4BPDN_L4C_CGQMIN_IND,
+        MSG_ID_L4BPDN_L4C_CGEQREQ_IND,
+        MSG_ID_L4BPDN_L4C_CGEQMIN_IND,
+        MSG_ID_L4BPDN_L4C_CGEQNEG_IND,
+        MSG_ID_L4BPDN_L4C_CGACT_IND,
+        MSG_ID_L4BPDN_L4C_CGPADDR_IND,
+        MSG_ID_L4BPDN_L4C_CGAUTO_IND,
+        MSG_ID_L4BPDN_L4C_CGEREP_IND,
+        MSG_ID_L4BPDN_L4C_CGCONTRDP_IND,
+        MSG_ID_L4BPDN_L4C_CGSCONTRDP_IND,
+        MSG_ID_L4BPDN_L4C_CGTFTRDP_IND,
+        MSG_ID_L4BPDN_L4C_CGEQOS_IND,
+        MSG_ID_L4BPDN_L4C_CGEQOSRDP_IND,
+        MSG_ID_L4BPDN_L4C_CGDEL_IND,
+        MSG_ID_L4BPDN_L4C_CGAUTH_IND,
+        MSG_ID_L4BPDN_L4C_PSBEARER_IND,
+        MSG_ID_L4BPDN_L4C_EGFB_IND,
+        MSG_ID_L4BPDN_L4C_EGDELPF_IND,
+        MSG_ID_L4BPDN_L4C_EGLNKPF_IND,
+        MSG_ID_L4BPDN_L4C_EGPCORDP_IND,
+        MSG_ID_L4BPDN_L4C_EGPCO_IND,
+        MSG_ID_L4BPDN_L4C_RAT_SELECT_IND,
+        MSG_ID_L4BPDN_L4C_GMSS_STOP_SEARCH_IND,
+        MSG_ID_L4BPDN_L4C_PDN_REVIVE_CNF,
+        MSG_ID_L4BPDN_L4C_PDN_REVIVE_ABORT_CNF,
+        MSG_ID_L4BPDN_L4C_LTE_ATTACH_NEEDED_IND,
+        MSG_ID_L4BPDN_L4C_LTE_ATTACH_PDN_DEFINE_NEEDED_IND,
+        MSG_ID_L4BPDN_L4C_VZWAPNE_IND,
+        MSG_ID_L4BPDN_L4C_VZWAPNETMR_IND,
+        MSG_ID_L4BPDN_L4C_LTE_ATTACH_PDN_ACTIVATE_SUCCESS_IND,
+        MSG_ID_L4BPDN_L4C_LTE_ATTACH_PDN_ACTIVATE_FAILURE_IND,
+        MSG_ID_L4BPDN_L4C_EAPNSYNC_IND,
+        MSG_ID_L4BPDN_L4C_EVZWAPFCIA_IND,
+        MSG_ID_L4BPDN_L4C_EGGRNTRSPT_IND,
+        MSG_ID_L4BPDN_L4C_CMD_NOT_YET_SUPPORT_IND, /* Only for UT */
+        MSG_ID_L4BPDN_L4C_C5GQOS_IND,
+        MSG_ID_L4BPDN_L4C_C5GQOSRDP_IND,
+        MSG_ID_L4BPDN_L4C_CLADN_IND,
+        MSG_ID_L4BPDN_L4C_CLADNU_IND,
+        MSG_ID_L4BPDN_L4C_ESCONTIND_IND,
+    MSG_ID_L4BPDN_L4C_MSG_FROM_L4C_END,
+
+    MSG_ID_L4BPDN_TCM_MSG_BEGIN,
+        MSG_ID_L4BPDN_TCM_BEARER_ACT_IND,
+        MSG_ID_L4BPDN_TCM_BEARER_DEACT_IND,
+        MSG_ID_L4BPDN_TCM_PF_UPDATE_IND,
+        MSG_ID_L4BPDN_TCM_PCO_RDP_UPDATE_IND,
+        MSG_ID_L4BPDN_TCM_45G_IRAT_BEARER_UPDATE_IND,
+    MSG_ID_L4BPDN_TCM_MSG_END,
+
+    /* Note: MSG_ID with MD3 are listed in md3_msgid.h */
+
+    /* For logging */
+    MSG_ID_L4BPDN_LOG_CID,
+    MSG_ID_L4BPDN_LOG_CID_RDP,
+    MSG_ID_L4BPDN_LOG_LEISIM,
+
+    MSG_ID_L4BPDN_MSG_DUMMY,
+    MSG_ID_L4BPDN_CODE_END = MSG_ID_L4BPDN_MSG_DUMMY,
+
+    /* Temporarily located at the tail of L4BPDN*/
+    MSG_ID_DDM_L4BNW_EDALLOW_REQ,
+    MSG_ID_DDM_L4BNW_EDALLOW_CNF,
+
+    MSG_ID_TMC_L4BPWR_BATTERY_STATUS_IND,
+
+    MSG_ID_SASE_L4C_VG_OPTION_CHECK_IND,
+    MSG_ID_SASE_L4C_VG_OPTION_UPDATE_CNF,
+    MSG_ID_SASE_L4C_IMS_REG_STATUS_UPDATE_IND,
+    MSG_ID_SASE_L4C_IMS_CONFIG_IND,
+
+    /*-----------------L4BPDN_CODE_TAIL-------------------------*/
+MODULE_MSG_END( MSG_ID_L4BPDN_CODE_TAIL )
+
+    /*-----------------RAT_TCM_CODE_BEGIN-----------------------*/
+MODULE_MSG_BEGIN( MSG_ID_RAT_TCM_CODE_BEGIN )
+       MSG_ID_L4CTCM_RAT_CHANGE_START_REQ = MSG_ID_RAT_TCM_CODE_BEGIN,
+       MSG_ID_L4CTCM_RAT_CHANGE_FINISH_REQ,
+       MSG_ID_TCM_RAT_CHANGE_COMPLETE_IND,
+
+       MSG_ID_TCM_RAT_TCM_INIT_DEACTIVATE_CONTEXT_IND,
+       MSG_ID_TCM_RAT_TCM_INIT_MODIFY_CONTEXT_IND,
+       MSG_ID_TCM_RAT_TCM_CONTEXT_TRANSFER_COMPLETE_IND,
+       MSG_ID_RAT_TCM_PRINT_EMBEDDED_SEC_ACTIVATE_IND_MSG,
+       MSG_ID_RAT_TCM_PRINT_EMBEDDED_DEACTIVATE_IND_MSG,
+       MSG_ID_RAT_TCM_PRINT_EMBEDDED_MODIFY_IND_MSG,
+       MSG_ID_RAT_TCM_PRINT_CONTEXT_GV,
+
+       MSG_ID_RAT_TCM_CODE_END,
+    /*-----------------RAT_TCM_CODE_TAIL-------------------------*/
+MODULE_MSG_END( MSG_ID_RAT_TCM_CODE_TAIL )
+
+    /*--------------- TCM_MSG_CODE_BEGIN------------------------*/
+MODULE_MSG_BEGIN( MSG_ID_TCM_CODE_BEGIN )
+
+    /* Processed by tcm_at_handler.c. */
+    MSG_ID_TCM_AT_MSG_BEGIN,
+        /* Bootup. */
+        MSG_ID_L4CTCM_START_REQ,
+        MSG_ID_TCM_PAM_START_CNF,
+        /* Set items for PDP and QOS. */
+        MSG_ID_L4CTCM_UNDEFINE_PDP_INFO_REQ,
+        MSG_ID_L4CTCM_SET_PRI_PDP_INFO_REQ,
+        MSG_ID_L4CTCM_SET_SEC_PDP_INFO_REQ,
+        MSG_ID_L4CTCM_SET_QOS_INFO_REQ,
+        MSG_ID_L4CTCM_SET_EQOS_INFO_REQ,
+        MSG_ID_L4CTCM_SET_EPS_QOS_INFO_REQ, /* __LTE_RAT__ */
+        MSG_ID_L4CTCM_SET_VGQOS_INFO_REQ,
+
+        /* Set items for others. */
+        MSG_ID_L4CTCM_SET_TFT_INFO_REQ,
+        MSG_ID_L4CTCM_SET_PPP_AUTH_INFO_REQ,
+        MSG_ID_L4CTCM_SET_CGAUTH_INFO_REQ,
+        MSG_ID_L4CTCM_ENTER_DATA_MODE_REQ,
+        MSG_ID_L4CTCM_LEAVE_DATA_MODE_REQ,
+        MSG_ID_L4CTCM_SET_MULTIPLE_PDN_INFO_REQ,
+        MSG_ID_L4CTCM_SET_SPECIFIC_CONTEXT_REQ,
+        MSG_ID_L4CTCM_SET_EXTENDED_PDP_INFO_REQ,
+        MSG_ID_L4CTCM_SYNC_APN_INFO_REQ,
+        MSG_ID_L4CTCM_CELLULAR_NETWORK_CONFIG_REQ,
+        MSG_ID_L4CTCM_SET_THIS_IS_AN_INVALID_APN_NOTIFY_REQ, // deprecated
+        MSG_ID_L4CTCM_SET_EGPCO_REQ,
+
+        /* __MEDIATEK_SMART_QOS__ */
+        MSG_ID_L4CTCM_SET_MSQ_MODE_REQ,
+        MSG_ID_L4CTCM_SET_MSQ_ENTRY_REQ,
+        MSG_ID_L4CTCM_DATA_ALLOW_REQ,
+        MSG_ID_L4CTCM_SET_EIMSROAM_CONFIG_VALUE_REQ,
+        MSG_ID_TCM_PAM_LADN_INFO_UPDATE_IND,
+    MSG_ID_TCM_AT_MSG_END,
+
+    /* Processed by BOTH UGTCM and ETCM */
+    MSG_ID_TCM_COMMON_FSM_MSG_BEGIN,
+        /* From L4C. */
+        MSG_ID_TCM_PDP_ACTIVATE_REQ,
+        MSG_ID_TCM_PDP_DEACTIVATE_REQ,
+        MSG_ID_TCM_PDP_MODIFY_REQ,
+        /* From PPP. */
+        MSG_ID_TAF_EXT_PDP_ACTIVATE_IND,
+        MSG_ID_TAF_EXT_PDP_DEACTIVATE_IND,
+        MSG_ID_TAF_LINK_FREE_IND,
+    MSG_ID_TCM_COMMON_FSM_MSG_END,
+
+    /* For PAM message handled by COMMON TCM */
+    MSG_ID_TCM_FROM_PAM_MSG_BEGIN,
+        /* PAM -> TCM */
+        MSG_ID_TCM_USM_CONTEXT_UPDATE_IND,
+        MSG_ID_PAM_BACKOFF_TIMER_REPORT_IND,
+    MSG_ID_TCM_FROM_PAM_MSG_END,
+
+    /* Processed by UGTCM. */
+    MSG_ID_TCM_UGTCM_MSG_BEGIN,
+        /* ACT. */
+        MSG_ID_SMREG_PDP_ACTIVATE_CNF,
+        MSG_ID_SMREG_PDP_ACTIVATE_REJ,
+        MSG_ID_SMREG_PDP_ACTIVATE_SEC_CNF,
+        MSG_ID_SMREG_PDP_ACTIVATE_SEC_REJ,
+        /* MT ACT. */
+        MSG_ID_SMREG_PDP_ACTIVATE_IND,
+        MSG_ID_SMREG_PDP_ACTIVATE_SEC_IND,
+        MSG_ID_TCM_PDP_ACTIVATE_REJ_RSP,
+        MSG_ID_TCM_TIMER_EXPIRY,
+        /* DEACT. */
+        MSG_ID_SMREG_PDP_DEACTIVATE_IND,
+        MSG_ID_SMREG_PDP_DEACTIVATE_CNF,
+        /* MODIFY. */
+        MSG_ID_SMREG_PDP_MODIFY_IND,
+        MSG_ID_SMREG_PDP_MODIFY_CNF,
+        MSG_ID_SMREG_PDP_MODIFY_REJ,
+        /* __LTE_RAT__ */
+        MSG_ID_SMREG_RAT_CHANGE_COMPLETE_IND,
+        MSG_ID_SMREG_PS_CHANGE_COMPLETE_IND,
+        /* __HSDPA_SUPPORT__ */
+        MSG_ID_TCM_RATDM_PS_BEARER_CAPABILITY_IND,
+        /* 3G PDP preservation. */
+        MSG_ID_SMREG_PDP_PRESERVE_IND,
+        MSG_ID_SMREG_PDP_REESTABLISH_IND,
+        /* 2G CS suspend PS (-> MOD_PPP) */
+        MSG_ID_SMREG_PS_SUSPEND_IND,
+        MSG_ID_SMREG_PS_RESUME_IND,
+    MSG_ID_TCM_UGTCM_MSG_END,
+
+    /* Processed by ETCM */
+    MSG_ID_TCM_ETCM_MSG_BEGIN,
+        /* From L4C */
+        MSG_ID_L4C_TCM_EPS_ATTACH_REQ,
+        /****************************************************************************
+         *                          Destination: ESM to ETCM
+         ****************************************************************************/
+        MSG_ID_ESMREG_PDN_CONN_EST_REJ,
+        MSG_ID_EVAL_ESM_PDN_CONN_EST_REJ = MSG_ID_ESMREG_PDN_CONN_EST_REJ,
+        MSG_ID_ESMREG_BEARER_RSC_ALLOC_REJ,
+        MSG_ID_EVAL_ESM_BEARER_RSC_ALLOC_REJ = MSG_ID_ESMREG_BEARER_RSC_ALLOC_REJ,
+        MSG_ID_ESMREG_BEARER_RSC_MOD_REJ,
+        MSG_ID_EVAL_ESM_BEARER_RSC_MOD_REJ = MSG_ID_ESMREG_BEARER_RSC_MOD_REJ,
+        MSG_ID_ESMREG_EPSB_DEACT_REJ,
+        MSG_ID_EVAL_ESM_EPSB_DEACT_REJ = MSG_ID_ESMREG_EPSB_DEACT_REJ,
+        MSG_ID_ESMREG_PDN_CONN_EST_IND,
+        MSG_ID_EVAL_ESM_PDN_CONN_EST_IND = MSG_ID_ESMREG_PDN_CONN_EST_IND,
+        MSG_ID_ESMREG_PDN_CONN_UPDATE_IND,
+        MSG_ID_EVAL_ESM_PDN_CONN_UPDATE_IND = MSG_ID_ESMREG_PDN_CONN_UPDATE_IND,
+        MSG_ID_ESMREG_EPSB_DEACT_IND,
+        MSG_ID_EVAL_ESM_EPSB_DEACT_IND = MSG_ID_ESMREG_EPSB_DEACT_IND,
+        MSG_ID_ESMREG_RAT_CHANGE_COMPLETE_IND,
+        MSG_ID_EVAL_ESM_RAT_CHANGE_COMPLETE_IND = MSG_ID_ESMREG_RAT_CHANGE_COMPLETE_IND,
+
+        MSG_ID_TAF_EXT_ENTER_DATA_MODE_REQ, /* PPP Dial-up */
+        MSG_ID_ETCM_EM_DUMP_PDP_CONTEXT_IND, /* ETCM EM msg */
+
+        MSG_ID_ESMREG_PS_INIT_BEARER_DEACT_IND,
+        MSG_ID_EVAL_ESM_PS_INIT_BEARER_DEACT_IND = MSG_ID_ESMREG_PS_INIT_BEARER_DEACT_IND,
+        MSG_ID_ESMREG_5G4_CONTEXT_TRANSFER_IND,
+
+    MSG_ID_TCM_ETCM_MSG_END,
+
+    /* Processed by VGTCM. */
+    MSG_ID_TCM_VGTCM_MSG_BEGIN,
+        /* EST */
+        MSG_ID_TCM_PAM_PDU_SESSION_EST_CNF,
+        MSG_ID_TCM_PAM_PDU_SESSION_EST_REJ,
+        /* MODIFY */
+        MSG_ID_TCM_PAM_PDU_SESSION_MOD_CNF,
+        MSG_ID_TCM_PAM_PDU_SESSION_MOD_IND,
+        MSG_ID_TCM_PAM_PDU_SESSION_MOD_REJ,
+        /* RELEASE */
+        MSG_ID_TCM_PAM_PDU_SESSION_REL_CNF,
+        MSG_ID_TCM_PAM_PDU_SESSION_REL_REJ,
+        MSG_ID_TCM_PAM_PDU_SESSION_REL_IND,
+        /* Interworking */
+        MSG_ID_TCM_PAM_4G5_CONTEXT_TRANSFERRED_IND,
+    MSG_ID_TCM_VGTCM_MSG_END,
+
+    /* L4APS -> TCM */
+    MSG_ID_L4APS_TCM_MSG_BEGIN,
+        MSG_ID_L4APS_TCM_IA_APN_CHANGE_REQ,
+        MSG_ID_L4APS_TCM_UPDATE_CID_MAPPING_REQ,
+    MSG_ID_L4APS_TCM_MSG_END,
+
+    /* __ACL_SUPPORT__ */
+    MSG_ID_TCM_ACL_MSG_BEGIN,
+        MSG_ID_L4CTCM_SET_ACL_MODE_REQ,
+        MSG_ID_L4CTCM_GET_ACL_ENTRIES_REQ,
+        MSG_ID_L4CTCM_SET_ACL_ENTRY_REQ,
+        MSG_ID_L4CTCM_ADD_ACL_ENTRY_REQ,
+        MSG_ID_L4CTCM_DEL_ACL_ENTRY_REQ,
+        MSG_ID_L4CTCM_LEAVE_ACL_MENU_REQ,
+    MSG_ID_TCM_ACL_MSG_END,
+
+    /* __TCM_UT__ */
+    MSG_ID_TCM_UT_MSG_BEGIN,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_GET_PRI_PDP_INFO,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_QUERY_NEG_QOS_INFO,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_GET_SEC_PDP_INFO,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_TCM_WRITE_TFT,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_SET_TFT_INFO,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_GET_TFT_INFO,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_GET_QOS_INFO,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_GET_CONFIG_OPTION_INFO,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_GET_EQOS_INFO,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_ENCODE_SDU_SIZE,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_DECODE_SDU_SIZE,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_ENCODE_BIT_RATE,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_DECODE_BIT_RATE,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_ENCODE_TRANSFER_DELAY,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_DECODE_TRANSFER_DELAY,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_GET_PDP_ADDR,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_GET_CONTEXT_STATE,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_GET_EMPTY_GPRS_PROF,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_GET_PPP_AUTH,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_CMUX_PORT_TO_CID,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_L4CTCM_GET_BEARER_CAPABILITY,
+        MSG_ID_TCM_UT_CHECK_CALLBACK_CHECK_PDP_CONTEXT_EXIST_OR_DURING_ACTIVATING_FUNC,
+        MSG_ID_TCM_UT_RESULT_OK,
+        MSG_ID_TCM_UT_L4CTCM_GET_PRI_PDP_RDP_INFO,
+        MSG_ID_TCM_UT_L4CTCM_GET_SEC_PDP_RDP_INFO,
+        MSG_ID_TCM_UT_L4CTCM_GET_PRI_PDP_INFO,
+        MSG_ID_TCM_UT_L4CTCM_GET_SEC_PDP_INFO,
+        MSG_ID_TCM_UT_L4CTCM_GET_NW_APPLIED_PDP_INFO,
+        MSG_ID_TCM_UT_L4CTCM_GET_SIB_INFO,
+        MSG_ID_TCM_UT_ETCM_CID_GET_PCO_RESULT,
+        MSG_ID_TCM_UT_PIC_CONTEXT_DUMP,
+    MSG_ID_TCM_UT_MSG_END,
+
+    /* __DSBP_MSG __ */
+    MSG_ID_TCM_DSBP_MSG_BEGIN,
+        MSG_ID_TCM_DSBP_RECONFIGURE_IND,
+    MSG_ID_TCM_DSBP_MSG_END,
+
+MODULE_MSG_END( MSG_ID_TCM_CODE_TAIL )
+    /*--------------- TCM_MSG_CODE_END--------------------------*/
+
+    /*-----------------CSM_MSG_CODE_BEGIN-----------------------*/
+    MODULE_MSG_BEGIN(MSG_ID_CSM_CODE_BEGIN)
+    MSG_ID_MNCC_SETUP_IND = MSG_ID_CSM_CODE_BEGIN,
+    MSG_ID_MNCC_SETUP_CNF,
+    MSG_ID_MNCC_SETUP_COMPL_IND,
+    MSG_ID_MNCC_REJ_IND,
+    MSG_ID_MNCC_CALL_PROC_IND,
+    MSG_ID_MNCC_PROGRESS_IND,
+    MSG_ID_MNCC_ALERT_IND,
+    MSG_ID_MNCC_NOTIFY_IND,
+    MSG_ID_MNCC_DISC_IND,
+    MSG_ID_MNCC_REL_IND,
+    MSG_ID_MNCC_REL_CNF,
+    MSG_ID_MNCC_FACILITY_IND,
+    MSG_ID_MNCC_START_DTMF_CNF,
+    MSG_ID_MNCC_STOP_DTMF_CNF,
+    MSG_ID_MNCC_MODIFY_IND,
+    MSG_ID_MNCC_MODIFY_CNF,
+    MSG_ID_MNCC_SYNC_IND,
+    MSG_ID_MNCC_RAT_IND,
+    MSG_ID_MNCC_HOLD_CNF,
+    MSG_ID_MNCC_RETRIEVE_CNF,
+    MSG_ID_MNCC_USER_INFO_IND,
+    MSG_ID_MNCC_CONGESTION_CTRL_IND,
+    MSG_ID_MNCC_CCBS_EST_IND,
+    MSG_ID_MNCC_CCBS_RECALL_IND,
+    MSG_ID_MNCC_AOC_IND,
+    MSG_ID_MNCC_SIG_CON_REEST_IND,
+    MSG_ID_MNCC_SIG_CON_REEST_CNF,
+    MSG_ID_MNCC_SRVCC_TRANSFER_CNF,
+    MSG_ID_MNCC_PLMN_INFO_IND,
+
+    MSG_ID_L4CCSM_CC_STARTUP_REQ,
+    MSG_ID_L4CCSM_CC_ACM_RESET_REQ,
+    MSG_ID_L4CCSM_CC_ACMMAX_SET_REQ,
+    MSG_ID_L4CCSM_CC_LAST_CCM_RESET_REQ,
+    MSG_ID_L4CCSM_CC_CALL_DEFLECTION_REQ,
+    MSG_ID_L4CCSM_CC_CRSS_REQ,
+    MSG_ID_L4CCSM_CC_CALL_ACCEPT_REQ,
+    MSG_ID_L4CCSM_CC_CALL_DISC_REQ,
+    MSG_ID_L4CCSM_CC_CALL_MODIFY_REQ,
+    MSG_ID_L4CCSM_CC_CALL_SETUP_REQ,
+    MSG_ID_L4CCSM_CC_AUTO_DTMF_START_REQ,
+    MSG_ID_L4CCSM_CC_EMERGENCY_CALL_SETUP_REQ,
+    MSG_ID_L4CCSM_CC_START_DTMF_REQ,
+    MSG_ID_L4CCSM_CC_STOP_DTMF_REQ,
+    MSG_ID_L4CCSM_CC_SAT_SETUP_REQ,
+    MSG_ID_L4CCSM_CC_SAT_SEND_DTMF_REQ,
+    MSG_ID_L4CCSM_CC_SAT_ABORT_DTMF_REQ,
+    MSG_ID_L4CCSM_CC_SET_CSD_PROF_REQ,
+    MSG_ID_L4CCSM_CC_UPDATE_ALS_REQ,
+    MSG_ID_L4CCSM_CC_UART_TRANSFER_REQ,
+    MSG_ID_L4CCSM_CC_CALL_PRESENT_RSP, /* __AUTO_CALL_REJECTION__ */
+    MSG_ID_L4CCSM_CC_ABORT_CALL_REQ,
+    MSG_ID_L4CCSM_CC_REL_COMP_REQ,
+    MSG_ID_L4CCSM_CC_SRVCC_TRANSFER_REQ,
+
+    MSG_ID_SAT_CALL_CTRL_BY_SIM_CNF,
+
+    MSG_ID_CSM_TDT_ACTIVATE_CNF,
+    MSG_ID_CSM_TDT_DEACTIVATE_CNF,
+    MSG_ID_CSM_TDT_ESC_ON_IND,
+    MSG_ID_CSM_TDT_DISC_IND,
+    MSG_ID_CSM_L2R_ACTIVATE_CNF,
+    MSG_ID_CSM_L2R_DEACTIVATE_CNF,
+    MSG_ID_CSM_L2R_XID_IND,
+    MSG_ID_CSM_L2R_DISC_IND,
+    MSG_ID_CSM_L2R_ESC_ON_IND,
+
+    MSG_ID_CSM_T30_ACTIVATE_CNF,
+    MSG_ID_CSM_T30_DEACTIVATE_CNF,
+    MSG_ID_CSM_T30_FAX_RATE_CNF,
+    MSG_ID_CSM_T30_DISC_IND,
+
+    MSG_ID_L4CCSM_CISS_STARTUP_REQ,
+    MSG_ID_L4CCSM_CISS_SS_PARSE_REQ,
+    MSG_ID_L4CCSM_CISS_CF_BEGIN_REQ,
+    MSG_ID_L4CCSM_CISS_CW_BEGIN_REQ,
+    MSG_ID_L4CCSM_CISS_CB_BEGIN_REQ,
+    MSG_ID_L4CCSM_CISS_EMLPP_BEGIN_REQ,
+    MSG_ID_L4CCSM_CISS_CLI_BEGIN_REQ,
+    MSG_ID_L4CCSM_CISS_CCBS_BEGIN_REQ,
+    MSG_ID_L4CCSM_CISS_PUSSR_BEGIN_REQ,
+    MSG_ID_L4CCSM_CISS_CB_FAC_RES,
+    MSG_ID_L4CCSM_CISS_USSR_FAC_RES,
+    MSG_ID_L4CCSM_CISS_USSN_FAC_RES,
+    MSG_ID_L4CCSM_CISS_END_RES,
+    MSG_ID_MNSS_BEGIN_IND,
+    MSG_ID_MNSS_FAC_IND,
+    MSG_ID_MNSS_END_IND,
+    MSG_ID_SAT_SS_CTRL_BY_SIM_CNF,
+    //SSAGPS
+    MSG_ID_L4CCSM_CISS_MTLR_END_RSP,
+    MSG_ID_L4CCSM_CISS_AERQ_END_RSP,
+    MSG_ID_L4CCSM_CISS_AERP_REQ,
+    MSG_ID_L4CCSM_CISS_AERP_FAC_RES,
+    MSG_ID_L4CCSM_CISS_AERP_END_REQ,
+    MSG_ID_L4CCSM_CISS_AECL_END_RSP,
+    MSG_ID_L4CCSM_CISS_MOLR_REQ,
+    MSG_ID_L4CCSM_CISS_MOLR_FAC_RES,
+    MSG_ID_L4CCSM_CISS_MOLR_END_REQ,
+
+
+    MSG_ID_L4CCSM_IMS_CALL_PROGRESS_REQ,
+    MSG_ID_L4CCSM_IMS_CALL_STATUS_IND,
+
+    MSG_ID_CSM_TIMER_EXPIRY,
+    MSG_ID_CSM_CODE_END,
+    /*-----------------CSM_MSG_CODE_END-------------------------*/
+    MODULE_MSG_END(MSG_ID_CSM_CODE_TAIL)
+
+    /*--------------- SMSAL_MSG_CODE_BEGIN----------------------*/
+    MODULE_MSG_BEGIN( MSG_ID_SMSAL_CODE_BEGIN )
+    MSG_ID_L4CSMSAL_INIT_REQ = MSG_ID_SMSAL_CODE_BEGIN,
+    MSG_ID_L4CSMSAL_DE_INIT_REQ,
+    MSG_ID_L4CSMSAL_DELETE_REQ,
+    MSG_ID_L4CSMSAL_DE_PERSONALIZATION_ACK,
+    MSG_ID_L4CSMSAL_READ_REQ,
+    MSG_ID_L4CSMSAL_WRITE_REQ,
+    MSG_ID_L4CSMSAL_SEND_REQ,
+    MSG_ID_L4CSMSAL_SEND_SMMA_REQ,    // triger by MMI
+    MSG_ID_L4CSMSAL_SEND_FROM_STORAGE_REQ,
+    MSG_ID_L4CSMSAL_SEND_DELIVER_REPORT_REQ,
+    MSG_ID_L4CSMSAL_SEND_ABORT,
+    MSG_ID_L4CSMSAL_SET_PARAMETER_REQ,
+    MSG_ID_L4CSMSAL_SET_COMMON_PARA_REQ,
+    MSG_ID_L4CSMSAL_SET_PROFILE_PARA_REQ,
+    MSG_ID_L4CSMSAL_SAT_SEND_REQ, /* SAT MO SMS */
+    MSG_ID_L4CSMSAL_STARTUP_READ_NEXT_REQ,
+    MSG_ID_L4CSMSAL_FDN_CHECK_RSP,
+    MSG_ID_L4CSMSAL_SMS_DEPERSONALIZATION_RSP,
+    MSG_ID_L4CSMSAL_COPY_MSG_REQ,
+    MSG_ID_L4CSMSAL_SET_STATUS_REQ,
+    MSG_ID_L4CSMSAL_GET_MAILBOX_NUM_REQ,
+    MSG_ID_L4CSMSAL_INIT_ME_SMS_REQ,
+    MSG_ID_L4CSMSAL_SET_MSG_WAITING_REQ,
+    MSG_ID_L4CSMSAL_SYNC_MSG_STORAGE_REQ,
+    MSG_ID_L4CSMSAL_READ_RAW_DATA_REQ,
+    MSG_ID_L4CSMSAL_WRITE_RAW_DATA_REQ,
+
+    /* __IMS_SUPPORT__ */
+    MSG_ID_L4CSMSAL_IMS_SEND_REQ,
+    MSG_ID_L4CSMSAL_IMS_SEND_SMMA_REQ,
+    MSG_ID_L4CSMSAL_IMS_SEND_SMMA_RESULT_REQ,
+    MSG_ID_L4CSMSAL_IMS_SMS_DELIVER_REQ,
+    MSG_ID_L4CSMSAL_IMS_SMS_STATUS_REQ,
+    MSG_ID_L4CSMSAL_IMS_SEND_FROM_STORAGE_REQ,
+    MSG_ID_L4CSMSAL_IMS_UPDATE_MSGBOX_REQ,
+
+    /* MSGS FROM SMS */
+    MSG_ID_SMS_DELIVER,
+    MSG_ID_SMS_SUBMIT_REPORT_ACK,
+    MSG_ID_SMS_SUBMIT_REPORT_NACK,
+    MSG_ID_SMS_STATUS_REPORT,
+    MSG_ID_SMS_SUBMIT_ABORT_CNF,
+    MSG_ID_SMS_MEM_AVL_NOTIF_CNF,
+    MSG_ID_SMS_MORE_MSG_SEND_IND,
+    MSG_ID_SMS_MT_FINAL_ACK_IND,
+    MSG_ID_SMSAL_TST_DELIVER,
+    MSG_ID_SMSAL_TST_IMS_DELIVER,
+
+    /* MSGS FROM SIM -- for SAT */
+    MSG_ID_SAT_SMS_DL_CNF,
+    MSG_ID_SAT_CB_DL_CNF,
+    MSG_ID_SAT_SEND_SMS_CTRL_BY_SIM_CNF,
+
+    MSG_ID_L4CSMSAL_CBCH_REQ,
+    MSG_ID_L4CSMSAL_CB_UPDATE_REQ,
+    MSG_ID_L4CSMSAL_HZ_CB_ACT_REQ,
+    MSG_ID_L4CSMSAL_CB_SERVICE_BY_PLMN_REQ,
+
+    MSG_ID_SMSAL_AS_CB_PAGE_IND,
+    MSG_ID_SMSAL_AS_CB_GS_CHANGE_IND,
+
+    MSG_ID_SMSAL_RATCM_CB_DATA_IND,
+    MSG_ID_SMSAL_RATCM_CB_RECONFIG_IND,
+    MSG_ID_SMSAL_RATCM_CB_GS_CHANGE_IND,
+    MSG_ID_SMSAL_RATCM_CB_DUP_DET_TIMER_STOP_IND,
+
+    /* MSGS FROM L4C -- for interRAT*/
+    MSG_ID_L4CSMSAL_RAT_CHANGE_START_REQ,
+    MSG_ID_L4CSMSAL_RAT_CHANGE_FINISH_REQ,
+
+    /* MSGS FROM EVAL -- for SMSAL */
+    MSG_ID_SMSAL_EVAL_CB_DATA_IND,
+    MSG_ID_SMSAL_EVAL_CB_RECONFIG_IND,
+    MSG_ID_SMSAL_EVAL_CB_GS_CHANGE_IND,
+
+    /* MSGs from NRRC */
+    MSG_ID_SMSAL_NRRC_CB_DATA_IND,
+    MSG_ID_SMSAL_NRRC_CB_RECONFIG_IND,
+
+    /* MSGS FROM PHB */
+    MSG_ID_PHBSMSAL_GET_EXT1_NUM_REQ,
+    MSG_ID_PHBSMSAL_GET_EXT1_NUM_CNF,
+
+    /* MSGS FROM SOC */
+    MSG_ID_SMSAL_SOC_REG_PORT_REQ,
+
+    MSG_ID_SMSAL_TR2_EXPIRE_IND,
+
+    MSG_ID_L4CSMSAL_CB_MSG_REMOVAL_REQ,
+    MSG_ID_L4CSMSAL_UPDATE_SMS_OVER_SGS_CFG_REQ,
+    MSG_ID_L4CSMSAL_CONFIG_CB_FOR_DUPLEX_MODE_REQ,
+
+    /* MSGs from ATP */
+    MSG_ID_ATP_SMSAL_C5GSMS_REQ,
+
+
+    MSG_ID_SMSAL_IMCSMS_IMS_MT_SMS_END_IND,
+    MSG_ID_L4CSMSAL_SMS_END_IND,
+
+    MSG_ID_L4CSMSAL_EMTSMS_REQ,
+
+    MSG_ID_SMSAL_CODE_END,
+    /*------------------ SMSAL_MSG_CODE_END --------------------*/
+MODULE_MSG_END( MSG_ID_SMSAL_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_SMU_CODE_BEGIN )
+    /*------------------------SMU_MSG_CODE_BEGIN ---------------*/
+    MSG_ID_L4CSMU_START_REQ = MSG_ID_SMU_CODE_BEGIN,
+    MSG_ID_L4CSMU_APP_START_REQ,
+    MSG_ID_L4CSMU_SECURITY_REQ,
+    MSG_ID_L4CSMU_APP_SECURITY_REQ,
+    MSG_ID_L4CSMU_SET_PERSONALIZATION_REQ, /* SML */
+    MSG_ID_L4CSMU_GET_SHARED_KEY_REQ,
+    MSG_ID_L4CSMU_UPDATE_SLB_REQ,
+    MSG_ID_L4CSMU_RESET_SLB_REQ,
+    MSG_ID_L4CSMU_GET_SLB_VERSION_REQ,
+    MSG_ID_L4CSMU_GET_SIM_LOCK_STATUS_REQ,
+    MSG_ID_L4CSMU_UPDATE_NW_TIME_REQ,
+    MSG_ID_L4CSMU_SML_STATUS_REQ, /* SML */
+    MSG_ID_L4CSMU_PLMN_SEL_WRITE_REQ,
+    MSG_ID_L4CSMU_SIM_ACCESS_REQ,
+    MSG_ID_L4CSMU_PUCT_WRITE_REQ,
+    MSG_ID_L4CSMU_PUCT_READ_REQ,
+    MSG_ID_L4CSMU_CSP_READ_REQ,
+    MSG_ID_L4CSMU_SMS_DEPERSONALIZATION_REQ,
+    MSG_ID_L4CSMU_DIAL_MODE_REQ,
+    MSG_ID_UIM_SIM_PIN_SYNC_IND,
+    MSG_ID_SMU_DUMP_SML_CONTEXT_IND,
+    MSG_ID_L4CSMU_UT_SET_NONCE_REQ,
+    MSG_ID_L4CSMU_UT_SIG_VERIFY_REQ,
+    MSG_ID_L4CSMU_SL_UPDATE_BLOB_REQ,
+    MSG_ID_L4CSMU_SL_UPDATE_BLOB_CNF,
+    MSG_ID_L4CSMU_SL_GET_SIM_LOCK_STATUS_REQ,
+    MSG_ID_L4CSMU_SL_GET_SIM_LOCK_STATUS_CNF,
+    MSG_ID_L4CSMU_UPDATE_GBLOB_LOCK_RULE_REQ,
+    MSG_ID_L4CSMU_UPDATE_GBLOB_LOCK_RULE_CNF,
+    MSG_ID_L4CSMU_UPDATE_GBLOB_DATA_REQ,
+    MSG_ID_L4CSMU_UPDATE_GBLOB_DATA_CNF,
+    MSG_ID_L4CSMU_GBLOB_DEV_LOCK_VERIFY_REQ,
+    MSG_ID_L4CSMU_GBLOB_DEV_LOCK_VERIFY_CNF,
+    MSG_ID_L4CSMU_UPDATE_GBLOB_DEV_LOCK_ALGO_REQ,
+    MSG_ID_L4CSMU_UPDATE_GBLOB_DEV_LOCK_ALGO_CNF,
+    MSG_ID_L4CSMU_UPDATE_GBLOB_IMEI_REQ,
+    MSG_ID_L4CSMU_UPDATE_GBLOB_IMEI_CNF,
+    MSG_ID_L4CSMU_GET_GBLOB_DEV_LOCK_STATUS_REQ,
+    MSG_ID_L4CSMU_GET_GBLOB_DEV_LOCK_STATUS_CNF,
+#ifdef __CUST_SML_RULE__
+    MSG_ID_L4CSMU_UPDATE_GBLOB_CUST_RULE_REQ,
+    MSG_ID_L4CSMU_UPDATE_GBLOB_CUST_RULE_CNF,
+#endif
+    MSG_ID_L4CSMU_SML_GET_LOCK_CODES_REQ,
+    MSG_ID_L4CSMU_SML_GET_LOCK_CODES_CNF,
+    MSG_ID_L4CSMU_SET_CUSTOM_PERSONALIZATION_REQ,
+    MSG_ID_L4CSMU_SET_CUSTOM_PERSONALIZATION_CNF,
+    MSG_ID_SMU_UT_DYNAMIC_SIMMELOCK_REQ,
+    MSG_ID_SMU_UT_DYNAMIC_SIMMELOCK_CNF,
+#ifdef __CARRIER_RESTRICTION__
+    MSG_ID_L4CSMU_SET_CARRIER_RESTRICTION_REQ,
+    MSG_ID_L4CSMU_CARRIER_RESTRICTION_STATUS_REQ,
+    MSG_ID_L4CSMU_SET_CRRST_SECURE_DATA_REQ,
+#endif /* __CARRIER_RESTRICTION__ */
+    MSG_ID_L4CSMU_VZW_RSU_INITIATE_REQ,
+    MSG_ID_L4CSMU_VZW_RSU_RESPONSE_REQ,
+    MSG_ID_L4CSMU_VZW_RSU_DELAY_TIMER_REQ,
+    MSG_ID_L4CSMU_VZW_RSU_DATA_RESET_REQ,
+    MSG_ID_L4CSMU_OP129_UPDATE_SIMLOCK_SETTING_REQ,
+    MSG_ID_L4CSMU_OP129_GET_SIMLOCK_DATA_REQ,
+    MSG_ID_L4CSMU_GET_MODEM_CONFIG_REQ,
+    MSG_ID_L4CSMU_GET_API_VERSION_REQ,
+    MSG_ID_L4CSMU_TMO_RSU_CREATE_UNLOCK_MSG_REQ,
+    MSG_ID_L4CSMU_TMO_RSU_PROCESS_MSG_REQ,
+    MSG_ID_L4CSMU_TMO_RSU_GET_SML_STATUS_REQ,
+    MSG_ID_L4CSMU_TMO_RSU_GET_REG_MSG_REQ,
+    MSG_ID_L4CSMU_TMO_RSU_GET_ADAPTER_CONFIG_REQ,
+    MSG_ID_L4CSMU_TMO_RSU_UPDATE_BLOB_REQ,
+    MSG_ID_L4CSMU_GENERATE_HCK_REQ,
+    MSG_ID_L4CSMU_GENERATE_HCK_CNF,
+
+#ifdef __MBIM_MS_NETWORK_BLACKLIST__
+    MSG_ID_L4CSMU_SET_NW_BLACK_LIST_REQ,
+#endif
+
+    MSG_ID_SMU_CODE_END,
+    /*------------------------SMU_MSG_CODE_END -----------------*/
+MODULE_MSG_END( MSG_ID_SMU_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_UEM_CODE_BEGIN )
+    /*------------------------UEM_MSG_CODE_BEGIN ---------------*/
+    MSG_ID_DRVUEM_AUDIO_PLAY_FINISH_IND = MSG_ID_UEM_CODE_BEGIN,
+    MSG_ID_DRVUEM_KEYPAD_IND,
+    MSG_ID_DRVUEM_POWER_ON_IND,
+    MSG_ID_DRVUEM_PMIC_IND,
+    MSG_ID_DRVUEM_GPIO_DETECT_IND,
+    MSG_ID_DRVUEM_RTC_PERIOD_IND,
+    MSG_ID_DRVUEM_USBDETECT_IND,
+    MSG_ID_DRVUEM_CCCI_EM_REQ_IND,
+    MSG_ID_L4CUEM_AUDIO_PLAY_BY_NAME_REQ,
+    MSG_ID_L4CUEM_AUDIO_STOP_BY_NAME_REQ,
+    MSG_ID_L4CUEM_AUDIO_PLAY_BY_STRING_REQ,
+    MSG_ID_L4CUEM_AUDIO_STOP_BY_STRING_REQ,
+    MSG_ID_L4CUEM_STARTUP_REQ,
+    MSG_ID_L4CUEM_SET_AUDIO_PROFILE_REQ,
+    MSG_ID_L4CUEM_SET_AUDIO_PARAM_REQ,
+    MSG_ID_L4CUEM_SET_HW_LEVEL_REQ,
+    MSG_ID_UEM_CODE_END = MSG_ID_L4CUEM_SET_HW_LEVEL_REQ,
+
+
+MODULE_MSG_END( MSG_ID_UEM_CODE_TAIL )
+    /*------------------------UEM_MSG_CODE_END -----------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_RAC_CODE_BEGIN )
+    /*------------------------RAC_MSG_CODE_BEGIN----------------*/
+   MSG_ID_L4CRAC_ACT_REQ = MSG_ID_RAC_CODE_BEGIN,
+   MSG_ID_L4CRAC_REG_REQ,
+   MSG_ID_L4CRAC_PS_REG_REQ,
+   MSG_ID_L4CRAC_DEREG_REQ,
+   MSG_ID_L4CRAC_PLMN_LIST_REQ,
+   MSG_ID_L4CRAC_CLASS_CHANGE_REQ,
+   MSG_ID_L4CRAC_ABORT_LIST_REQ,
+   MSG_ID_L4CRAC_RFOFF_REQ, /* Ripple */
+   MSG_ID_L4CRAC_SIM_STATUS_UPDATE_REQ, //__GEMINI__
+   MSG_ID_L4CRAC_SET_ROAMING_MODE_REQ,
+   MSG_ID_L4CRAC_PLMN_SEARCH_REQ ,
+   MSG_ID_L4CRAC_SET_RAT_MODE_REQ,
+   MSG_ID_L4CRAC_PLMN_LIST_STOP_REQ,
+   MSG_ID_L4CRAC_SET_PREFER_RAT_REQ,
+   MSG_ID_L4CRAC_GET_PREFER_RAT_REQ,
+   MSG_ID_L4CRAC_END_PS_DATA_SESSION_REQ , //mtk02475: for Fast Dormancy
+   MSG_ID_L4CRAC_CSG_LIST_REQ, //mtk02475: for Rel8 CSG feature
+   MSG_ID_L4CRAC_CSG_LIST_STOP_REQ, //mtk02475: for Rel8 CSG feature
+   MSG_ID_L4CRAC_SUSP_RESU_UPDATE_REQ, //mtk03643: for CT network selection requirement
+   MSG_ID_L4CRAC_ABORT_EMERGENCY_PLMN_SEARCH_REQ,
+   MSG_ID_L4CRAC_CUSTOM_PLMN_LIST_UPDATE_REQ,
+   MSG_ID_L4CRAC_GET_CUSTOM_PLMN_LIST_REQ,
+   //Add for LTE multimode
+   MSG_ID_L4CRAC_CSFB_PAGE_CONFIG_REQ,
+   MSG_ID_GMMREG_CSFB_PAGE_IND,
+   MSG_ID_L4CRAC_CSFB_PAGE_RSP,
+   //End of LTE multimode
+
+   /* LTE multimode for UE mode */
+   MSG_ID_L4CRAC_SET_SMS_PREFERENCE_REQ,
+   MSG_ID_L4CRAC_SET_VOICE_DOMAIN_PREFERENCE_REQ,
+   MSG_ID_L4CRAC_SET_UE_USAGE_SETTING_REQ,
+   MSG_ID_L4CRAC_SET_UE_MODE_REQ,
+   MSG_ID_L4CRAC_SET_IMS_VOICE_AVAILABILITY_REQ,
+   MSG_ID_L4CRAC_SET_IMS_SMS_AVAILABILITY_REQ,
+   MSG_ID_L4CRAC_IMS_REG_STATUS_UPDATE_REQ,
+   MSG_ID_L4CRAC_IMS_CONFIG_REQ,
+   MSG_ID_L4CRAC_IMS_REG_START_REQ,
+   MSG_ID_L4CRAC_SIM_READY_IND,
+   MSG_ID_L4CRAC_SIM_ERROR_IND,
+   MSG_ID_L4CRAC_SET_MM_IMS_VOICE_TERMINATION_REQ,
+   MSG_ID_L4CRAC_SET_SMS_OVER_SGS_REQ,
+   /* end of LTE multimode for UE mode */
+
+   MSG_ID_L4CRAC_SET_RECOVERY_SEARCH_TIMER_REQ,
+   MSG_ID_L4CRAC_GET_RECOVERY_SEARCH_TIMER_REQ,
+   MSG_ID_L4CRAC_DUPLEX_MODE_REQUIRED_REQ,
+
+   MSG_ID_RAC_GMSS_SET_RECOVERY_SEARCH_TIMER_CNF,
+   MSG_ID_RAC_GMSS_GET_RECOVERY_SEARCH_TIMER_CNF,
+   MSG_ID_RAC_GMSS_DUPLEX_MODE_REQUIRED_CNF,
+
+   MSG_ID_L4CRAC_EPS_ATTACH_NEEDED_REJ_RSP,
+   /* add for 6291 MTC */
+   MSG_ID_L4CRAC_IMS_CALL_INFO_REQ,
+   /* add for 6291 MTC */
+
+   MSG_ID_L4CRAC_IMS_SCM_REQ,
+   MSG_ID_L4CRAC_GET_LAST_RAT_SELECT_IND_REQ,
+   MSG_ID_L4CRAC_SET_PGCHECK_REQ,
+   MSG_ID_L4CRAC_SET_PGCHECKEXT_REQ,
+   MSG_ID_L4CRAC_VOLTE_STATUS_UPDATE_REQ,
+
+   MSG_ID_L4CRAC_MMDC_RECOVERY_SEARCH_REQ,
+
+   MSG_ID_L4CRAC_ACTIVE_SIM_REQ,
+   MSG_ID_L4CRAC_SET_CT_MODE_REQ,
+   MSG_ID_L4CRAC_CLEAR_MRU_REQ,
+   MSG_ID_L4CRAC_SET_MRU_REQ,
+   MSG_ID_L4CRAC_SET_AUX_PLMN_REQ,
+
+   // for SONY requirement, not re-enable E-UTRAN after CGATT=0
+   MSG_ID_L4CRAC_DISABLE_EUTRAN_REQ,
+   MSG_ID_L4CRAC_SET_ROAMING_DATA_CONFIG_REQ,
+   MSG_ID_L4CRAC_SET_HVOLTE_MODE_REQ,
+   MSG_ID_L4CRAC_EMC_SESSION_START_REQ,
+   MSG_ID_L4CRAC_EMC_SESSION_STOP_REQ,
+   MSG_ID_L4CRAC_OMADM_UPDATE_REQ,
+   MSG_ID_L4CRAC_PTMSI_CLEAR_REQ,
+   MSG_ID_L4CRAC_LOCI_CLEAR_REQ,
+   MSG_ID_L4CRAC_5GSLOCI_CLEAR_REQ,
+   MSG_ID_L4CRAC_DATA_ALLOW_REQ,
+   MSG_ID_L4CRAC_VZW_ADMIN_APN_SETTING_NOTIFY_REQ,
+ #ifdef __GEMINI__
+   MSG_ID_L4CRAC_RSIM_AUTH_ABORT_REQ,
+ #endif
+
+   /* add for NSSAI network slicing */
+   MSG_ID_L4CRAC_GET_NSSAI_REQ,
+   MSG_ID_L4CRAC_SET_NSSAI_REQ,
+   MSG_ID_L4CRAC_SET_PREF_NSSAI_REQ,
+   /* end of NSSAI network slicing */
+#if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)
+   MSG_ID_L4CRAC_SET_TIMER_REQ,
+   MSG_ID_L4CRAC_ECALL_REGISTRATION_STATE_IND,
+   MSG_ID_L4CRAC_SET_ECALL_REGISTRATION_REQ,
+   MSG_ID_L4CRAC_SET_ECALL_REGISTRATION_CNF,
+#endif
+   MSG_ID_L4CRAC_SUSPEND_EGREG_UPDATE_REQ,
+   MSG_ID_L4CRAC_EMERGENCY_SERVICE_REQ,
+   MSG_ID_L4CRAC_EMERGENCY_SERVICE_FALLBACK_REQ,
+   MSG_ID_L4CRAC_IMS_PDN_ACTIVATION_REQ,
+   MSG_ID_GMMREG_PLMN_LIST_IND, //not used
+   MSG_ID_GMMREG_NW_INFO_IND,
+   MSG_ID_GMMREG_STATUS_IND,
+   MSG_ID_GMMREG_CELL_INFO_UPDATE_IND,
+   MSG_ID_GMMREG_PS_SERVICE_INFO_IND, /* For GPRS MMI information. */
+   MSG_ID_GMMREG_CIPHER_IND,
+ #ifdef __GEMINI__
+   MSG_ID_GMMREG_RSIM_AUTH_ABORT_CNF,
+   MSG_ID_GMMREG_AUTH_FINISH_IND,
+   MSG_ID_GMMREG_VIRTUAL_MODE_IND,
+ #endif
+   MSG_ID_GMMREG_DEDICATED_MODE_IND, /* CH_Liang 2005/05/31 Homezone feature */
+   MSG_ID_GMMREG_SEARCH_NORMAL_FINISH_IND, //__GEMINI__ not used
+#if defined(__GEMINI__)   /* for RAC2 GEMINI */
+   MSG_ID_GMMREG_POWERON_SEARCH_FINISH_IND, //__GEMINI__ (MONZA)
+#endif
+   MSG_ID_GMMREG_RR_SERVICE_STATUS_IND,  //__GEMINI__ ,20080217
+   MSG_ID_GMMREG_SUSPEND_STATUS_IND,  //__GEMINI__ ,20080217
+   /* 3G */
+   MSG_ID_GMMREG_SET_ROAMING_MODE_CNF,
+   MSG_ID_GMMREG_SUSP_RESU_UPDATE_CNF,
+   MSG_ID_GMMREG_SET_PREFER_RAT_CNF,
+   MSG_ID_GMMREG_PLMN_LIST_CNF, /* for MONZA */
+   MSG_ID_GMMREG_PLMN_LIST_STOP_CNF, /* for MONZA */
+   MSG_ID_GMMREG_CSG_LIST_CNF,
+   MSG_ID_GMMREG_CSG_LIST_STOP_CNF,
+   MSG_ID_GMMREG_BAND_SEL_CNF,
+   MSG_ID_GMMREG_END_PS_DATA_SESSION_CNF, //mtk02475: for Fast Dormancy
+   MSG_ID_GMMREG_NW_ECC_IND,  /* __REL5__ */
+   MSG_ID_GMMREG_NW_REJECT_IND,
+   MSG_ID_GMMREG_NW_FEATURE_IND,
+   MSG_ID_GMMREG_NON_3GPP_NW_POLICIES_IND,
+
+   MSG_ID_MMIAS_CELL_POWER_LEVEL_IND,
+   MSG_ID_MMIAS_PKT_TRANSFER_MODE_IND, /*Byron: 2005/06/07/: send the pkt transfer mode indication to RAC*/
+   MSG_ID_GMMREG_END_PS_DATA_SESSION_IND, //mtk80370: for FOP request Fast Dormancy
+#ifdef __LTE_RAT__
+    MSG_ID_EMMREG_DISABLE_NW_LOSS_OPTIMIZE_IND,
+    MSG_ID_EMMREG_CELL_INFO_UPDATE_IND,
+    MSG_ID_EMMREG_NW_INFO_IND,
+    MSG_ID_EMMREG_EPS_ATTACH_NEEDED_IND,
+    MSG_ID_EMMREG_NW_ECC_IND,
+    MSG_ID_EMMREG_NON_3GPP_NW_POLICIES_IND,
+    MSG_ID_EMMREG_PEER_REJECT_IND,
+    MSG_ID_EMMREG_EMC_ATTACH_IND,
+    MSG_ID_EMMREG_EMC_ATTACH_CNF,
+    MSG_ID_EMMREG_EMC_DETACH_IND,
+    MSG_ID_EMMREG_NW_FEATURE_IND,
+    MSG_ID_EMMREG_NW_REJECT_IND,
+    MSG_ID_EMMREG_CS_DOMAIN_NOT_AVAILABLE_IND,
+    MSG_ID_EMMREG_IMS_SCM_INFO_CNF,
+#ifdef __GEMINI__
+    MSG_ID_EMMREG_RSIM_AUTH_FINISH_IND,
+    MSG_ID_EMMREG_RSIM_AUTH_ABORT_CNF,
+#endif /* __GEMINI__ */
+#endif /* __LTE_RAT__ */
+
+   MSG_ID_RAC_GMSS_SET_ROAMING_MODE_CNF, /* 3G */
+   MSG_ID_RAC_GMSS_SET_PREFER_RAT_CNF,
+   MSG_ID_RAC_GMSS_PLMN_SEARCH_CNF,
+   MSG_ID_RAC_GMSS_PLMN_LIST_CNF,
+   MSG_ID_RAC_GMSS_PLMN_LIST_STOP_CNF,
+   MSG_ID_RAC_GMSS_CSG_LIST_CNF,
+   MSG_ID_RAC_GMSS_CSG_LIST_STOP_CNF,
+   MSG_ID_RAC_GMSS_PLMN_STATUS_IND,
+   MSG_ID_RAC_GMSS_SUSPEND_STATUS_IND,
+   MSG_ID_RAC_GMSS_PLMN_LIST_IND,
+   MSG_ID_RAC_GMSS_SUSP_RESU_UPDATE_CNF,
+   MSG_ID_RAC_GMSS_GET_CUSTOM_PLMN_LIST_CNF,
+
+   MSG_ID_RAC_GMSS_IMS_SERVICE_IND,
+   MSG_ID_RAC_GMSS_RESTART_CLEAR_CODE_33_PROC_IND,
+   MSG_ID_RAC_GMSS_CS_DOMAIN_AVAILABILITY_IND,
+   MSG_ID_RAC_GMSS_REPORTED_RAT_CHANGE_IND,
+   MSG_ID_L4CRAC_MD_SIM_CONFIG_REQ,
+   MSG_ID_RAC_GMSS_RAT_SELECT_IND,
+   MSG_ID_RAC_GMSS_ATTACH_RESULT_IND,
+   MSG_ID_RAC_GMSS_DUPLEX_MODE_CHANGE_IND,
+   MSG_ID_L4CRAC_DUPLEX_MODE_CHANGE_REQ,
+   MSG_ID_RAC_GMSS_DUPLEX_MODE_CHANGE_CNF,
+   MSG_ID_EMMREG_DUPLEX_MODE_CHANGE_CNF,
+   MSG_ID_GMMREG_DUPLEX_MODE_CHANGE_CNF,
+
+   MSG_ID_RAC_GMSS_RPLMN_IND,    /* Get RPLMN */
+
+   MSG_ID_RAC_GMSS_SET_CT_MODE_CNF,
+   MSG_ID_RAC_GMSS_ACTIVE_SIM_INFO_CNF,
+   MSG_ID_RAC_GMSS_C2K_DETACH_IND,
+   MSG_ID_RAC_GMSS_SET_WM_POLICY_CNF,
+   MSG_ID_L4CRAC_SET_WM_POLICY_REQ,
+   MSG_ID_RAC_GMSS_SET_AUX_PLMN_CNF,
+   MSG_ID_RAC_GMSS_SET_MRU_CNF,
+   MSG_ID_RAC_GMSS_CLEAR_MRU_CNF,
+   MSG_ID_RAC_GMSS_EMC_SERVICE_IND,
+   MSG_ID_RAC_GMSS_STOP_SEARCH_IND,
+   MSG_ID_RAC_GMSS_C2K_SERVICE_IND,
+   MSG_ID_RAC_GMSS_1X_CONN_STATUS_IND,
+   MSG_ID_RAC_GMSS_SET_HVOLTE_MODE_CNF,
+   MSG_ID_L4CRAC_VZWMRU_UPDATE_REQ,
+   MSG_ID_RAC_GMSS_VZWMRU_UPDATE_CNF,
+   MSG_ID_RAC_GMSS_1XRTT_CELL_LIST_CNF,
+   MSG_ID_RAC_GMSS_GET_PREFER_RAT_CNF,
+
+   MSG_ID_L4CRAC_GMSS_SET_TW_MODE_REQ,
+   MSG_ID_RAC_GMSS_C2K_SILENT_REDIAL_IND,
+   MSG_ID_RAC_GMSS_TRY_SWITCH_RAT_RESULT_IND,
+
+//#ifdef __LTE_R11__
+   MSG_ID_EVAL_RAC_CA_INFO_IND,
+   MSG_ID_EVAL_RAC_MT_PAGE_IND,
+   MSG_ID_EVAL_RAC_SEND_ESR_IND,
+//#endif
+   MSG_ID_L4CRAC_CALL_STATUS_REQ,
+   MSG_ID_L4CRAC_CSG_AUTO_SEARCH_MODE_REQ,
+   MSG_ID_L4CRAC_SET_FIRST_CAMP_ON_PREFER_RAT_REQ,
+   MSG_ID_L4CRAC_DUPLEX_MODE_CHANGE_FINISH_REQ,
+   MSG_ID_L4CRAC_NW_REG_STATUS_IND,
+   MSG_ID_RAC_GMSS_REG_STATUS_IND,
+   MSG_ID_RAC_GMSS_OMADM_UPDATE_CNF,
+   MSG_ID_RAC_GMSS_C2K_CELL_INFO_IND,
+   MSG_ID_L4CRAC_ARAL_UPDATE_REQ,
+   MSG_ID_L4CRAC_SCREEN_ON_REQ,
+   MSG_ID_GMMREG_PACKET_PAGING_IND,
+   MSG_ID_L4CRAC_PACKET_PAGING_IND,
+//#if defined(__FAST_ROAMING_SEARCH__)
+   MSG_ID_RAC_GMSS_PLMN_FOUND_IND,
+//#endif
+   MSG_ID_L4CRAC_CS_VOICE_CALL_PROTECTION_REQ,
+   MSG_ID_L4CRAC_CAMPED_CELL_INFO_IND,
+   MSG_ID_L4CRAC_RRC_CONN_REL_IND,
+   MSG_ID_GMMREG_RRC_CONN_REL_CAUSE_IND,
+
+   MSG_ID_L4CRAC_IMS_DEREG_START_REQ,
+   MSG_ID_RAC_GMSS_C2K_CSFB_START_IND,
+   MSG_ID_RAC_GMSS_HVOLTE_MODE_CHANGE_IND,
+   MSG_ID_L4CRAC_DATA_SERVICE_STATUS_UPDATE_REQ,
+   MSG_ID_RAC_GMSS_INVALID_SIM_RECOVER_IND,
+
+   /* add for CT3G global mode attach */
+   MSG_ID_L4CRAC_CT3G_INSERTED_IND,
+   MSG_ID_L4CRAC_CA_INFO_IND,
+   MSG_ID_L4CRAC_RESET_OTA_CTXT_REQ,
+   MSG_ID_RAC_GMSS_SUSPEND_EGREG_UPDATE_IND,
+   MSG_ID_RAC_GMSS_SUSPEND_EGREG_UPDATE_CNF,
+   MSG_ID_RAC_GMSS_MANUAL_SEARCH_NOT_ALLOW_IND,
+   /*mtk13782: [MOLY00267639] porting from LR11 to UMOLYA*/
+   MSG_ID_RAC_GMSS_WAIT_FOR_IMS_REG_STATUS_IND,
+   MSG_ID_RAC_GMSS_GET_LAST_RAT_SELECT_IND_CNF,
+   //CDMA less porting
+   MSG_ID_L4CRAC_IMS_TIMER_STATUS_UPDATE_REQ,
+   MSG_ID_RAC_GMSS_IMS_CALL_END_STATUS_IND,
+   MSG_ID_L4CRAC_ABORT_ENWSEL_SEARCH_REQ,
+   MSG_ID_L4CRAC_IMS_EVENT_UPDATE_REQ,
+   MSG_ID_L4CRAC_SET_IMS_ROAMING_CONFIG_REQ,
+   MSG_ID_L4CRAC_GMSS_SET_PLMN_BARRING_TIMER_REQ,
+   MSG_ID_L4CRAC_GMSS_GET_PLMN_BARRING_TIMER_REQ,
+   MSG_ID_RAC_GMSS_SET_PLMN_BARRING_TIMER_CNF,
+   MSG_ID_RAC_GMSS_GET_PLMN_BARRING_TIMER_CNF,
+#ifdef __GEMINI__
+   MSG_ID_L4CRAC_RSIM_SET_PS_ONLY_REQ,
+   MSG_ID_L4CRAC_RSIM_AKA_STATUS_REQ,
+   MSG_ID_L4CRAC_RSIM_AKA_RSIM_ACCESS_FOR_AUTH_DOWNLOAD_REQ,
+   MSG_ID_L4C_RATDM_RSIM_AKA_RSIM_ACCESS_FOR_AUTH_DOWNLOAD_REQ,
+   MSG_ID_L4C_RATDM_RSIM_AUTH_ABORT_REQ,
+#endif
+   /*TMO disable 2G*/
+   MSG_ID_L4CRAC_RAT_DISABLE_CONFIG_REQ,
+   MSG_ID_L4CRAC_SET_MS_SV_REQ,
+
+   MSG_ID_L4CRAC_FPLMN_ACTION_REQ,
+   // Reporting NW abnormal reject causes
+   MSG_ID_RAC_GMSS_NW_REG_REJ_IND,
+   MSG_ID_L4CRAC_CELLULAR_NETWORK_CONFIG_REQ,
+   MSG_ID_GMMREG_CSFB_RESULT_IND,
+   MSG_ID_L4CRAC_VG_OPTION_UPDATE_REQ,
+   MSG_ID_L4CRAC_UAC_PARAM_CHECK_REQ,
+   MSG_ID_L4CRAC_NR_IMS_SERVICE_STATUS_REQ,
+   MSG_ID_L4CRAC_UAC_ABORT_REQ,
+   MSG_ID_RAC_GMSS_ILLEGAL_ME_IND,
+
+   /* RAC -> VDM */
+   MSG_ID_VDM_RAC_NW_FEATURE_IND,
+
+   MSG_ID_L4CRAC_INACTIVE_MODE_CONFIGURATION_REQ,
+   MSG_ID_L4CRAC_SCREEN_OFF_REQ,
+
+   /* RAC <--> VGMM */
+   MSG_ID_RAC_VGMM_INIT_CNF, // according to Gen97 coding convention, MsgID/Struct defined at Service provider
+   MSG_ID_RAC_VGMM_NW_INFO_IND,
+   MSG_ID_RAC_VGMM_NW_FEATURE_SUPPORT_IND,
+   MSG_ID_RAC_VGMM_NW_ECC_IND,
+   MSG_ID_RAC_VGMM_NW_REJECT_IND,
+   MSG_ID_RAC_VGMM_IMS_UAC_CNF,
+   MSG_ID_RAC_VGMM_IMS_UAC_ALLEVIATION_IND,
+   MSG_ID_RAC_VGMM_IMS_CONFIG_IND,
+   MSG_ID_RAC_VGMM_EMERGENCY_SERVICE_CNF,
+   MSG_ID_RAC_VGMM_EMERGENCY_SERVICE_IND,
+   MSG_ID_RAC_VGMM_EMERGENCY_SERVICE_FALLBACK_CNF,
+   MSG_ID_RAC_VGMM_CELL_INFO_UPDATE_IND,
+   MSG_ID_RAC_VGMM_GET_NSSAI_CNF,
+   MSG_ID_RAC_VGMM_SET_NSSAI_CNF,
+   MSG_ID_RAC_VGMM_SET_PREF_NSSAI_CNF,
+   MSG_ID_RAC_VGMM_PROC_FAILURE_IND,
+   MSG_ID_RAC_VGMM_NW_PARAMS_IND,
+
+   MSG_ID_L4CRAC_USER_SELECTED_MAIN_PS_REQ,
+#ifdef __NG_ECALL_SUPPORT__
+   MSG_ID_EMM_SET_TIMER_REQ,
+#endif
+
+   MSG_ID_L4CRAC_VGMM_NW_PARAMS_IND,
+
+   MSG_ID_L4CRAC_CAUSE_INFO_IND,
+   MSG_ID_GMMREG_CAUSE_INFO_IND,
+   MSG_ID_EMMREG_CAUSE_INFO_IND,
+
+   MSG_ID_L4CRAC_HIGH_PRIO_SEARCH_TIMER_CONFIG_REQ,
+   MSG_ID_L4CRAC_SET_SAVE_RAC_PREFERENCE_REQ,
+   MSG_ID_L4CRAC_SET_SAVE_RAC_PREFERENCE_CNF,
+   MSG_ID_L4CRAC_PLMN_LIST_ABORT_REQ,
+   MSG_ID_RAC_GMSS_PLMN_SCAN_IND,
+   MSG_ID_L4CRAC_PLMN_SCAN_IND,
+
+   MSG_ID_GMMREG_GPRS_TRAFFIC_CHANNEL_STATUS_IND,
+
+   MSG_ID_L4CRAC_AS_PLMN_SEARCH_REPORT_IND,
+#ifdef __MBIM_MS_NETWORK_BLACKLIST__
+   MSG_ID_RAC_GMSS_FPLMN_ACTION_CNF,
+   MSG_ID_RAC_GMSS_NW_BLACK_LIST_STATE_IND,
+#endif
+
+#if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)
+   MSG_ID_GMMREG_SET_ECALL_REGISTRATION_CNF,
+   MSG_ID_GMMREG_ECALL_REGISTRATION_STATE_IND,
+#endif
+   MSG_ID_L4CRAC_SET_ALLOWED_MCC_LIST_REQ,
+   MSG_ID_L4CRAC_SET_ALLOWED_MCC_LIST_CNF,
+   MSG_ID_RAC_GMSS_SET_ALLOWED_MCC_LIST_CNF,
+
+   MSG_ID_RAC_CODE_MAX,//not used, only for MSG_ID_RAC_CODE_END reference
+   MSG_ID_RAC_CODE_END = MSG_ID_RAC_CODE_MAX-1,
+MODULE_MSG_END( MSG_ID_RAC_CODE_TAIL )
+
+    /*------------------------RAC_MSG_CODE_END -----------------*/
+    /*------------------------USAT_MSG_CODE_BEGIN --------------*/
+    /*------------------------USAT_MSG_CODE_END ----------------*/
+    /*------------------------PHB_MSG_CODE_BEGIN ---------------*/
+MODULE_MSG_BEGIN( MSG_ID_PHB_CODE_BEGIN )
+    MSG_ID_L4CPHB_STARTUP_REQ = MSG_ID_PHB_CODE_BEGIN,
+    MSG_ID_L4CPHB_READ_REQ,
+    MSG_ID_L4CPHB_ADD_REQ,
+    MSG_ID_L4CPHB_UPDATE_REQ,
+    MSG_ID_L4CPHB_DELETE_REQ,
+    MSG_ID_L4CPHB_SEARCH_REQ,
+    MSG_ID_L4CPHB_APPROVE_REQ,
+    MSG_ID_L4CPHB_WRITE_REQ,
+    MSG_ID_L4CPHB_UPDATE_NW_ECC_REQ, //mtk01616_070905: for R5 ECC category
+    MSG_ID_L4CPHB_WRITE_USIM_REQ,
+    MSG_ID_L4CPHB_READ_USIM_REQ,
+    MSG_ID_L4CPHB_DELETE_USIM_REQ,
+    MSG_ID_L4CPHB_CHECK_WRITE_USIM_ENTRY_REQ,
+
+    MSG_ID_PHB_CODE_END,
+    /*------------------------PHB_MSG_CODE_END -----------------*/
+MODULE_MSG_END( MSG_ID_PHB_CODE_TAIL )
+    /*------------------------ATCI_MSG_CODE_BEGIN ---------------*/
+    //RMMI_UT ---
+MODULE_MSG_BEGIN( MSG_ID_ATCI_CODE_BEGIN )
+    MSG_ID_ATCI_UT_RMMI_INPUT_STRING = MSG_ID_ATCI_CODE_BEGIN,
+    MSG_ID_ATCI_UT_RMMI_OUTPUT_STRING,
+    MSG_ID_ATCI_UT_RMMI_INPUT_EXPANDED_AT_STRING,
+    MSG_ID_ATCI_UT_CHECK_L4C_CONTEXT_INFO,
+    //--- RMMI_UT
+    MSG_ID_ATCI_THERMAL_EVENT_REPORT_IND, //for thermal_protection
+    MSG_ID_ATCI_UT_UART_INPUT_IND,
+    MSG_ID_ATCI_MD3_PWROFF_DONE_IND,
+    MSG_ID_L4B_ATCI_TARGET_RESET_IND,
+    MSG_ID_L4B_ATCI_AT_CMD_REQ,
+    MSG_ID_L4BPWR_ATCI_EPOF_REQ,
+
+    MSG_ID_ATCI_CODE_END,
+MODULE_MSG_END( MSG_ID_ATCI_CODE_TAIL )
+    /*------------------------ATCI_MSG_CODE_END -----------------*/
+    /*------------------------ENG_MSG_CODE_BEGIN ---------------*/
+    /*------------------------ENG_MSG_CODE_END -----------------*/
+
+MODULE_MSG_BEGIN(MSG_ID_MBCI_CODE_BEGIN)
+    /*------------------------MBCI_MSG_CODE_BEGIN ---------------*/
+    MSG_ID_UPS_MBCI_COMMAND_REQ = MSG_ID_MBCI_CODE_BEGIN,
+    MSG_ID_UPS_MBCI_COMMAND_RSP,
+    MSG_ID_UPS_MBCI_STATUS_IND,
+    MSG_ID_UPS_MBCI_LOOPBACK_START_IND,
+    MSG_ID_UPS_MBCI_LOOPBACK_STOP_IND,
+    MSG_ID_MBCI_CODE_END,
+    /*------------------------MBCI_MSG_CODE_END ---------------*/
+MODULE_MSG_END( MSG_ID_MBCI_CODE_TAIL )
+
+
+MODULE_MSG_BEGIN( MSG_ID_PS_CODE_BEGIN )
+   /*----------AS_MSG_CODE_BEGIN ---------------*/
+   MSG_ID_L4CPS_NBR_CELL_INFO_START_REQ = MSG_ID_PS_CODE_BEGIN,
+   MSG_ID_L4CPS_NBR_CELL_INFO_STOP_REQ,
+
+   #if defined(__AT_RRC_TRACE_SUPPORT__)
+   MSG_ID_L4CAS_SET_RRC_PEER_TRACE_REQ,
+   MSG_ID_L4CAS_RRC_PEER_TRACE_IND,
+   #endif
+
+   #if defined(__ETWS_SUPPORT__)
+   MSG_ID_L4CAS_ETWS_SETTING_REQ,
+   MSG_ID_L4CAS_ETWS_INFORMATION_IND,
+   #endif
+
+   MSG_ID_L4C_EVAL_ETWS_INFORMATION_IND,
+   MSG_ID_L4C_NRRC_ETWS_INFORMATION_IND,
+
+   MSG_ID_L4C_EVAL_ADJUST_MEAS_REQ,
+   MSG_ID_L4C_EVAL_ADJUST_MEAS_CNF,
+
+   MSG_ID_L4C_EVAL_EDDA_CNF,
+
+   // re-usage 4G LPP CP message to reset LCS pos info during SUPL testing
+   MSG_ID_L4C_EVAL_NW_RESET_UE_STORED_POS_INFO_IND,
+
+   // To notify the ERRC state
+   MSG_ID_L4C_EVAL_ERRC_STATE_IND,
+
+   // C2K 1XCSFB
+   MSG_ID_L4C_EVAL_C2K_CSFB_REQ,
+   MSG_ID_L4C_EVAL_C2K_CSFB_CNF,
+   MSG_ID_L4C_EVAL_C2K_CSFB_STOP_REQ,
+   MSG_ID_L4C_EVAL_C2K_CSFB_STOP_CNF,
+
+   MSG_ID_L4CAS_SET_PLMN_LIST_PREFERENCE_REQ,
+
+   MSG_ID_L4CAS_SET_HSPA_PREFERENCE_REQ, //mtk02285, hspa_mmi
+
+   MSG_ID_L4CAS_SET_PREFER_RAT_REQ,
+    MSG_ID_L4CAS_CSG_AUTO_SEARCH_REQ,
+
+   MSG_ID_L4CAS_BAR_CELL_CONTROL_REQ,
+
+   MSG_ID_L4CAS_BAR_CELL_CONTROL_CNF,
+
+   MSG_ID_L4CAS_IMS_CONFIG_IND,
+   MSG_ID_L4CAS_IMS_CALL_INFO_IND,
+
+   //agps_up_cp_conflict
+   MSG_ID_L4C_LCSP_AGPS_CP_START_IND,
+   MSG_ID_L4C_LCSP_AGPS_CP_END_IND,
+   MSG_ID_L4C_LCSP_AGPS_CP_ABORT_REQ,
+
+   MSG_ID_L4C_RATCM_AGPS_RESET_POSITIONING_IND,
+   MSG_ID_L4CPS_MEAS_INFO_REQ,
+   MSG_ID_L4CPS_MEAS_INFO_CNF,
+   MSG_ID_L4CPS_RF_INFO_IND,
+   MSG_ID_L4C_RRCE_RRC_STATE_IND,
+   MSG_ID_L4C_RRCE_PCH_TXRX_IND,
+   MSG_ID_L4C_ME_RECONFIGURE_REQ,
+   MSG_ID_L4C_ME_RECONFIGURE_CNF,
+   MSG_ID_L4C_RRM_RRMS_STATE_IND,
+   MSG_ID_L4C_EVAL_DRX_UPDATE_CNF,
+   MSG_ID_L4C_EVAL_DRX_UPDATE_IND,
+   MSG_ID_L4C_EVAL_SR_FAILURE_IND,
+   MSG_ID_L4C_EVAL_TAU_FAILURE_IND,
+   MSG_ID_L4C_EVAL_SR_REJECT_IND,
+   MSG_ID_L4C_EVAL_RACH_REJECT_IND,
+   MSG_ID_L4C_CELL_POWER_THRESHOLD_CONFIG_CNF,
+   MSG_ID_L4C_ME_VOLTE_RECONFIGURE_REQ,
+   MSG_ID_L4C_ME_VOLTE_RECONFIGURE_CNF,
+   MSG_ID_L4CAS_CC_ERROR_IND,
+   MSG_ID_L4C_ERRC_WLAN_LWA_CONNECT_REQ,
+   MSG_ID_L4C_ERRC_WLAN_LWA_DISCONNECT_REQ,
+   MSG_ID_L4C_ERRC_WLAN_MEASUREMENT_REQ,
+   MSG_ID_L4C_ERRC_WLAN_MEASUREMENT_STOP_REQ,
+   MSG_ID_L4C_NRRC_CELL_POWER_THRESHOLD_CONFIG_CNF,
+   MSG_ID_L4C_NRRC_CUSTOM_BAR_LIST_CNF,
+   MSG_ID_L4C_NRRC_CUSTOM_BAR_LIST_CLEAR_NTF,
+   MSG_ID_L4C_EVAL_PCELL_INFO_IND,
+   MSG_ID_L4C_ERRC_CUSTOM_BAR_LIST_CNF,
+   MSG_ID_L4C_ERRC_CUSTOM_BAR_LIST_CLEAR_NTF,
+
+   // To notify the RRC Connection Establishment failure cause
+   MSG_ID_L4C_EVAL_ESTABLISHMENT_IND,
+
+   MSG_ID_L4C_ME_IMS_RECONFIGURE_REQ,
+   MSG_ID_L4C_ME_IMS_RECONFIGURE_CNF,
+   MSG_ID_L4CPS_NW_BAND_INFO_START_REQ,
+   MSG_ID_L4CPS_NW_BAND_INFO_STOP_REQ,
+   MSG_ID_L4CPS_NW_BAND_INFO_IND,
+   MSG_ID_L4CAS_SIB19_INFO_IND,
+   MSG_ID_L4CAS_RR_APC_CTRL_INFO_REQ,
+   MSG_ID_L4CAS_RR_APC_CTRL_INFO_CNF,
+   MSG_ID_L4CPS_GSM_BAR_CONTROL_REQ,
+   MSG_ID_L4CUAS_SET_RACH_TEST_MODE_REQ,
+   MSG_ID_L4C_RRM_PSEUDO_BS_DETECT_IND,
+   MSG_ID_L4CAS_RR_PSEUDO_BS_QUERY_REQ,
+   MSG_ID_L4CAS_RR_PSEUDO_BS_QUERY_CNF,
+   MSG_ID_L4C_ME_DSBP_RECONFIGURE_REQ,
+   MSG_ID_L4C_ME_DSBP_RECONFIGURE_CNF,
+   MSG_ID_L4C_SBP_DSBP_RECONFIGURE_REQ,
+   MSG_ID_L4C_SBP_DSBP_RECONFIGURE_CNF,
+   MSG_ID_L4C_CC_DSBP_RECONFIGURE_IND,
+
+   // Notify IPCore PLMN LIST current action in order to suspend/resume Tx traffic in data plane
+   MSG_ID_L4C_IPCORE_UL_THROTTLE_REQ,
+
+   MSG_ID_L4C_PHB_UT_REQ,
+
+   MSG_ID_L4CAS_CELL_POWER_THRESHOLD_CONFIG_REQ,
+
+#ifdef __TC7__CS__SUPPORT__
+   MSG_ID_L4CUAS_CS_STATUS_REQ,
+#endif
+
+#ifdef __GEMINI__
+   MSG_ID_L4C_AKA_RESOURCE_RELEASE_REQ,
+#endif
+    MSG_ID_DDM_EVAL_CABTSRI_IND,
+    MSG_ID_DDM_EVAL_PAGING_PROTECTED_TIMER_MAX_IND,
+    MSG_ID_L4C_SMS_DSBP_RECONFIGURE_IND,
+    MSG_ID_L4C_IMCSMS_DSBP_RECONFIGURE_IND,
+    MSG_ID_L4C_SMSAL_DSBP_RECONFIGURE_IND,
+    MSG_ID_L4C_EVAL_ERRC_SSAC_RESEL_RESULT_IND,
+    MSG_ID_L4C_ENPDCP_DATA_USAGE_NTF,
+    MSG_ID_L4C_EVAL_CS_SERVICE_NOTIFICATION_IND,
+    MSG_ID_L4C_EVAL_CSFB_FAIL_IND,
+#ifdef __NG_ECALL_SUPPORT__
+    MSG_ID_L4C_EVAL_ECALL_REGISTRATION_STATE_IND,
+#endif
+
+    // To update RLC latency
+    MSG_ID_L4C_NRLCUL_LATENCY_UPDATE_IND,
+    MSG_ID_L4C_ERLCUL_LATENCY_UPDATE_IND,
+    MSG_ID_L4C_RRM_CHANNEL_PARAM_IND,
+    MSG_ID_L4C_RRC_CUR_FREQ_IND,
+    MSG_ID_L4CAS_SET_POWER_THRESHOLD_CONFIG_COMMON_REQ,
+    MSG_ID_L4C_HVOLTE_MODE_SWITCH_IND,
+    MSG_ID_L4C_EVAL_MODIFY_B7_B38_IN_USA_REQ,
+    MSG_ID_L4C_EVAL_MODIFY_B7_B38_IN_USA_CNF,
+    MSG_ID_L4CAS_SET_WCDMA_SECURITY_MODE_PARAM_REQ,
+    MSG_ID_L4CAS_SET_WCDMA_SECURITY_MODE_PARAM_CNF,
+    MSG_ID_L4CAS_GET_WCDMA_SECURITY_MODE_PARAM_REQ,
+    MSG_ID_L4CAS_GET_WCDMA_SECURITY_MODE_PARAM_CNF,
+    MSG_ID_L4C_ATCI_DSBP_RECONFIGURE_IND,
+
+    MSG_ID_L4CPS_SET_SIGNAL_REPORTING_CRITERIA_REQ,
+
+    MSG_ID_L4CPS_GAS_REPORT_SIGNAL_LEVEL_IND,
+    MSG_ID_L4CPS_UAS_REPORT_SIGNAL_LEVEL_IND,
+    MSG_ID_L4C_EVAL_REPORT_SIGNAL_LEVEL_IND,
+    MSG_ID_L4C_NRRC_REPORT_SIGNAL_LEVEL_IND,
+	MSG_ID_L4C_DSBP_SETTING_INFO_IND,
+    MSG_ID_L4CRAC_NW_ECC_EENL_IND,
+  MSG_ID_PS_CODE_END,
+
+  /*----------AS_MSG_CODE_END -----------------*/
+MODULE_MSG_END( MSG_ID_PS_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_VMMI_CODE_BEGIN )
+   /*----------VMMI_MSG_CODE_BEGIN -----------------*/
+   MSG_ID_L4VMMI_AT_RESPONSE_IND = MSG_ID_VMMI_CODE_BEGIN,
+   MSG_ID_L4VMMI_ETS_RESPONSE_IND,
+   MSG_ID_VMMI_CODE_END,
+   /*----------VMMI_MSG_CODE_END -----------------*/
+MODULE_MSG_END( MSG_ID_VMMI_CODE_TAIL )
+
+#if 0 //move to ATP
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif
+
+MODULE_MSG_BEGIN( MSG_ID_MBMSAL_CODE_BEGIN )
+  MSG_ID_MBMSAL_ERRC_MBMS_SERVICE_STATUS_IND = MSG_ID_MBMSAL_CODE_BEGIN,
+  MSG_ID_MBMSAL_ERRC_MBMS_SIB15_IND,
+  MSG_ID_MBMSAL_ERRC_MBMS_SIB16_IND,
+  MSG_ID_MBMSAL_ERRC_MBMS_CONFIG_INFO_IND,
+  MSG_ID_MBMSAL_ERRC_MBMS_SERVSESS_STATUS_IND,
+  MSG_ID_MBMSAL_INTERNAL_IND,
+  MSG_ID_MBMSAL_ERRC_MBMS_INFO_IND,
+MODULE_MSG_END( MSG_ID_MBMSAL_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_L4C2K_CODE_BEGIN )
+    MSG_ID_C2K_L4C_MDSTATUS_UPDATE_IND = MSG_ID_L4C2K_CODE_BEGIN,
+    MSG_ID_L4C_C2K_PWROFF_START_IND,
+MODULE_MSG_END( MSG_ID_L4C2K_CODE_TAIL )
+
+   /*---------------L4_MSG_CODE_END---------------------*/
+
+#endif  //_L4_MSGIDID.H
diff --git a/mcu/interface/sap/md/l4b_msgid.h b/mcu/interface/sap/md/l4b_msgid.h
new file mode 100644
index 0000000..5546359
--- /dev/null
+++ b/mcu/interface/sap/md/l4b_msgid.h
@@ -0,0 +1,352 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *  l4b_msgid.h
+ *
+ *
+ * Description:
+ * ------------
+ *  l4b 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!
+ *
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _L4B_MSGID_H
+#define _L4B_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_L4B_CODE_BEGIN )
+    /* ATP --> L4B */
+    MSG_ID_ATP_L4B_RANGE_BEGIN = MSG_ID_L4B_CODE_BEGIN,
+    MSG_ID_ATP_L4B_AT_CMD_REQ,
+    MSG_ID_ATP_L4B_RANGE_END,
+
+    /* ATCI --> L4B */
+    /* below pattern will cause MD codegen can't recognize the local parameter structure for 
+       MSG_ID_L4B_ATCI_AT_CMD_CNF, which is l4b_atci_at_cmd_cnf_struct 
+       MSG_ID_TAG,
+       MSG_ID = MSG_ID_TAG, 
+    */
+       
+    //MSG_ID_L4B_ATCI_RANGE_BEGIN,
+    //MSG_ID_L4B_ATCI_AT_CMD_CNF = MSG_ID_L4B_ATCI_RANGE_BEGIN,
+    
+    /*  so I use below pattern: 
+    MSG_ID, 
+    MSG_ID_TAG = MSG_ID 
+    */
+    MSG_ID_L4B_ATCI_AT_CMD_CNF, MSG_ID_L4B_ATCI_RANGE_BEGIN = MSG_ID_L4B_ATCI_AT_CMD_CNF,
+    MSG_ID_L4B_ATCI_AT_URC_IND,
+    MSG_ID_L4B_ATCI_RANGE_END = MSG_ID_L4B_ATCI_AT_URC_IND,
+
+    /* CVAL --> L4B */
+    /* defined in md1_msgid.h */
+
+    /* L4BXXX --> L4B */
+    MSG_ID_L4B_FORWARD_AT_URC_IND,
+
+    //AT Request for LWTG or C2K protocol stack
+    MSG_ID_L4B_L4BGROUP_IND_BEGIN,
+    #define L4B_ATCI_AT(ENUM_ID,IND_MSG,AT_ENCODE_FUNC_PTR,RSP_MSG,RSP_MSG_FUNC_PTR) IND_MSG,
+    #define L4B_CVAL_AT(ENUM_ID,IND_MSG,AT_ENCODE_FUNC_PTR,RSP_MSG,RSP_MSG_FUNC_PTR) IND_MSG,
+        #include "l4b_at_request.def"
+    #undef L4B_ATCI_AT
+    #undef L4B_CVAL_AT
+    MSG_ID_L4B_L4BGROUP_IND_END,
+
+    //AT confirm from L4BXXX
+    MSG_ID_L4B_L4BGROUP_CNF_BEGIN,
+    #define L4B_AT_CMD(ENUM_ID,AT_PREFIX,CMD_MODE,DEST,FORWARD_MSG,FORWARD_MSG_FUNC_PTR,CNFRM_MSG,AT_RSP_FUNC_PTR) CNFRM_MSG,
+    #define L4B_FORWARD_TO_ATCI_CMD(ENUM_ID,AT_PREFIX,CMD_MODE)
+    #define L4B_FORWARD_TO_CVAL_CMD(ENUM_ID,AT_PREFIX,CMD_MODE)
+        #include "l4b_at_cmd.def"
+    #undef L4B_AT_CMD
+    #undef L4B_FORWARD_TO_ATCI_CMD
+    #undef L4B_FORWARD_TO_CVAL_CMD
+    MSG_ID_L4B_L4BGROUP_CNF_END,
+
+    /* L4B --> L4BXXX */
+    // AT URC forward to L4BXXX
+    MSG_ID_L4B_L4BGROUP_URC_REQ_BEGIN,
+    #define L4B_URC(ENUM_ID,URC_PREFIX,URC_SRC,WHETHER_SEND_TO_AP,DEST,FORWARD_MSG,FORWARD_MSG_FUNC_PTR) FORWARD_MSG,
+        #include "l4b_at_urc.def"
+    #undef L4B_URC
+    MSG_ID_L4B_L4BGROUP_URC_REQ_END,
+    
+    // AT CMD forward to L4BXXX
+    MSG_ID_L4B_L4BGROUP_REQ_BEGIN,
+    #define L4B_AT_CMD(ENUM_ID,AT_PREFIX,CMD_MODE,DEST,FORWARD_MSG,FORWARD_MSG_FUNC_PTR,CNFRM_MSG,AT_RSP_FUNC_PTR) FORWARD_MSG,
+    #define L4B_FORWARD_TO_ATCI_CMD(ENUM_ID,AT_PREFIX,CMD_MODE)
+    #define L4B_FORWARD_TO_CVAL_CMD(ENUM_ID,AT_PREFIX,CMD_MODE)
+        #include "l4b_at_cmd.def"
+    #undef L4B_AT_CMD
+    #undef L4B_FORWARD_TO_ATCI_CMD
+    #undef L4B_FORWARD_TO_CVAL_CMD
+    MSG_ID_L4B_L4BGROUP_REQ_END,
+
+    //AT Response from LWTG or C2K protocol stack
+    MSG_ID_L4B_L4BGROUP_RSP_BEGIN,
+    #define L4B_ATCI_AT(ENUM_ID,IND_MSG,AT_ENCODE_FUNC_PTR,RSP_MSG,RSP_MSG_FUNC_PTR) RSP_MSG,
+    #define L4B_CVAL_AT(ENUM_ID,IND_MSG,AT_ENCODE_FUNC_PTR,RSP_MSG,RSP_MSG_FUNC_PTR) RSP_MSG,
+        #include "l4b_at_request.def"
+    #undef L4B_ATCI_AT
+    #undef L4B_CVAL_AT
+    MSG_ID_L4B_L4BGROUP_RSP_END,
+
+
+    // VDM/L4BCC interface
+    MSG_ID_VDM_L4B_REQ_BEGIN,
+    MSG_ID_VDM_L4B_CS_CC_EMERG_CALL_REQ,
+    MSG_ID_VDM_L4B_CS_CC_STK_CALL_REQ,
+    MSG_ID_VDM_L4B_CS_CC_MT_CALL_PRESENT_RSP,
+    MSG_ID_VDM_L4B_CS_CC_MT_CALL_ACCEPT_REQ,
+    MSG_ID_VDM_L4B_CS_CC_HANGUP_ALL_REQ,
+    MSG_ID_VDM_L4B_CS_CC_FORCE_HANGUP_REQ,
+    MSG_ID_VDM_L4B_CS_CC_CALL_RELATED_SS_REQ,
+    MSG_ID_VDM_L4B_CS_CC_EXT_ERROR_REPORT_REQ,
+    MSG_ID_VDM_L4B_CS_CC_SEND_DIGIT_REQ,
+    MSG_ID_VDM_L4B_CS_CC_START_SEND_DIGIT_REQ,
+    MSG_ID_VDM_L4B_CS_CC_STOP_SEND_DIGIT_REQ,
+    MSG_ID_VDM_L4B_CS_CC_LIST_CURRENT_CALLS_REQ,
+    MSG_ID_VDM_L4B_CS_CC_EMERG_SERV_CAT_REQ,
+    MSG_ID_VDM_L4B_CS_CC_LIST_CURRENT_CALLS_EXT_REQ,
+#if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)  
+    MSG_ID_VDM_L4B_CS_CC_ECALL_REQ,
+#endif
+
+    /*C2K MSG begin*/
+    /* CVAL --> L4B */
+    MSG_ID_L4B_CVAL_AT_CMD_CNF, MSG_ID_L4B_CVAL_RANGE_BEGIN = MSG_ID_L4B_CVAL_AT_CMD_CNF,
+    MSG_ID_L4B_CVAL_AT_URC_IND,
+    MSG_ID_L4B_CVAL_RANGE_END = MSG_ID_L4B_CVAL_AT_URC_IND,
+
+    MSG_ID_VDM_L4B_C2K_CC_MO_CALL_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_EMERG_CALL_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_STK_CALL_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_MT_CALL_PRESENT_RSP,
+    MSG_ID_VDM_L4B_C2K_CC_MT_CALL_ACCEPT_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_HANGUP_ALL_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_FORCE_HANGUP_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_CALL_RELATED_SS_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_EXT_ERROR_REPORT_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_SEND_DIGIT_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_START_SEND_DIGIT_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_STOP_SEND_DIGIT_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_LIST_CURRENT_CALLS_REQ,
+    MSG_ID_VDM_L4B_C2K_CC_EMERG_SERV_CAT_REQ,
+    /*C2K MSG end*/
+
+    /*L4B SAT MSG begin*/
+    MSG_ID_VDM_L4B_SND_STK_CALL_TR_REQ,
+    /*L4B SAT MSG end*/
+    
+    MSG_ID_VDM_L4B_REQ_END,
+
+
+    /*L4B <-> L4BSAT*/
+    MSG_ID_L4B_L4BSAT_BEGIN,
+      MSG_ID_L4B_L4BSAT_VDM_STKCALL_TR_REQ,
+      MSG_ID_L4B_L4BSAT_VDM_STKCALL_TR_CNF,
+    MSG_ID_L4B_L4BSAT_END,
+
+
+    /*ATP->L4BNW*/
+    MSG_ID_ATP_L4BNW_BEGIN,
+    MSG_ID_ATP_L4BNW_SIM_LOCK_REQ,
+    MSG_ID_ATP_L4BNW_END,
+
+    /*ATP->L4BSBP*/
+    MSG_ID_ATP_L4BSBP_BEGIN,
+    MSG_ID_ATP_L4BSBP_AT_CH_LOCK_CNF,
+    MSG_ID_ATP_L4BSBP_AT_CH_UNLOCK_CNF,
+    MSG_ID_ATP_L4BSBP_EMC_SESSION_START_REQ,
+    MSG_ID_ATP_L4BSBP_EMC_SESSION_STOP_REQ,
+    MSG_ID_ATP_L4BSBP_ESBP_CONFLICT_IND,
+    MSG_ID_ATP_L4BSBP_END,
+
+
+    /*L4BPWR<->L4BSBP*/
+    MSG_ID_L4BPWR_L4BSBP_BEGIN,
+    MSG_ID_L4BPWR_L4BSBP_RF_REQ,
+    MSG_ID_L4BPWR_L4BSBP_RF_CNF,
+    MSG_ID_L4BPWR_L4BSBP_PHONE_STATE_CHANGE_END_IND ,
+    MSG_ID_L4BPWR_L4BSBP_END,
+
+ 
+    /*ATP->L4BPWR*/
+    MSG_ID_ATP_L4BPWR_EFUN_REQ,
+    MSG_ID_ATP_L4BPWR_CFUN_REQ,
+    MSG_ID_ATP_L4BPWR_EPOF_REQ,
+
+    MSG_ID_ATP_L4BPWR_GET_NR_PS_REQ,
+    MSG_ID_ATP_L4BPWR_SET_NR_PS_REQ,
+
+    MSG_ID_L4BPWR_L4BNW_RAT_TYPE_SWITCH_REQ,
+    MSG_ID_L4BPWR_L4BNW_RAT_TYPE_SWITCH_CNF,
+
+    /*ATCI -> L4bPWR*/
+    MSG_ID_L4BPWR_ATCI_EPOF_CNF,
+
+    /*L4BSBP Interfaces*/
+    MSG_ID_L4BSBP_ME_RECONFIGURE_NOT_OCCUR_REQ,
+	
+	/*L5IO->L4BSBP*/
+    MSG_ID_L5IO_L4BSBP_AT_CH_LOCK_CNF,
+    MSG_ID_L5IO_L4BSBP_AT_CH_UNLOCK_CNF,
+
+
+MODULE_MSG_END( MSG_ID_L4B_CODE_TAIL )
+
+#endif  /* _L4B_MSGID_H */
diff --git a/mcu/interface/sap/md/l5_msgid.h b/mcu/interface/sap/md/l5_msgid.h
new file mode 100644
index 0000000..1fb3e8c
--- /dev/null
+++ b/mcu/interface/sap/md/l5_msgid.h
@@ -0,0 +1,800 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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 _L5_MSGID_H
+#define _L5_MSGID_H
+
+
+MODULE_MSG_BEGIN( MSG_ID_L5_CODE_BEGIN )
+    /* L5U --> L5IO */
+    MSG_ID_L5IO_AT_CMD_CNF, //ATP responds
+    MSG_ID_L5IO_AT_URC_IND, //urc report
+    MSG_ID_L5IO_TARGET_RESET_IND,     // ATP requests L5IO to reset modem
+    MSG_ID_L5IO_FLUSH_UART_QUEUE_IND,
+    MSG_ID_L5U_TX_STATUS_IND,
+    MSG_ID_L5U_CELL_UPDATE_IND,
+    MSG_ID_L5U_EURCALLOW_CNF,
+    MSG_ID_L5U_EL2_IP_UL_IND,
+    MSG_ID_L5U_EL2_IP_DL_IND,
+    MSG_ID_L5U_EL2_MAC_UL_IND,
+    MSG_ID_L5U_EL2_MAC_DL_IND,
+    MSG_ID_L5U_EL2_PDCP_UL_IND,
+    MSG_ID_L5U_EL2_PDCP_DL_IND,
+    MSG_ID_L5U_NL2_MAC_UL_IND,
+    MSG_ID_L5U_NL2_MAC_DL_IND,
+    MSG_ID_L5U_NL2_PDCP_UL_IND,
+    MSG_ID_L5U_NL2_PDCP_DL_IND,
+
+    //From L5IO
+    MSG_ID_L5IO_SET_FILTER_REQ,
+    MSG_ID_L5IO_RESET_FILTER_REQ,
+    //To L5IO
+    MSG_ID_L5IO_SET_FILTER_CNF,
+    MSG_ID_L5IO_RESET_FILTER_CNF,
+
+    //For UT
+    MSG_ID_L5IO_UT_MIPC_TEST_IND,
+    MSG_ID_L5IO_UT_MIPC_TEST_CMD,
+    MSG_ID_L5IO_UT_UART_RTR_IND,
+    MSG_ID_L5IO_UT_UART_RTW_IND,
+    MSG_ID_L5IO_UT_AT_CMD_REQ,
+    MSG_ID_L5IO_UT_AT_CMD_CNF,
+    MSG_ID_L5IO_UT_IO_CONTEXT_REQ,
+    MSG_ID_L5IO_TST_AT_RESPONSE_IND, //to replace MSG_ID_L4CTST_AT_RESPONSE_IND
+    MSG_ID_L5IO_UT_URC_REPORT_MODE_IND,
+
+    /*L5user-- define-CNF--> L5IO*/
+    MSG_ID_L5IO_USER_DEFINE_CNF_RANGE_BEGIN,
+
+        /*L5USWITCH*/
+    MSG_ID_L5IO_USWITCH_CNF_RANGE_BEGIN,
+        MSG_ID_L5IO_SIM_SWITCH_CNF,
+        MSG_ID_L5IO_WP_SWITCH_CNF,
+        MSG_ID_L5IO_SWITCH_SIM_MAPPING_GET_CNF,
+        MSG_ID_L5IO_SWITCH_SIM_MAPPING_SET_CNF,
+        MSG_ID_L5IO_SWITCH_MULTI_SIM_CONFIG_CNF,
+        MSG_ID_L5IO_SWITCH_LOCK_CNF,
+        MSG_ID_L5IO_SWITCH_UNLOCK_CNF,
+        MSG_ID_L5IO_SWITCH_RESTRICT_CARD_TYPE_SET_CNF,
+        MSG_ID_L5IO_SWITCH_RESTRICT_CARD_TYPE_GET_CNF,  		
+    MSG_ID_L5IO_USWITCH_CNF_RANGE_END,
+
+        /*L5USS*/
+    MSG_ID_L5USS_L5IO_MSG_FROM_L5USS_BEGIN,
+        MSG_ID_L5IO_AT_SS_ECUSD_CNF,
+        MSG_ID_L5IO_AT_SS_CNF,
+        MSG_ID_L5USS_SET_CLIR_CNF,
+        MSG_ID_L5USS_ATP_SET_CLIR_CNF,
+        MSG_ID_L5USS_ECUSD_CNF,
+        MSG_ID_L5USS_ATP_ECUSD_CNF,
+        MSG_ID_L5IO_AT_SS_CLIR_CNF,
+        MSG_ID_L5IO_AT_SS_ECUSD_IND,
+        MSG_ID_L5USS_SET_CLIP_CNF,
+        MSG_ID_L5USS_ATP_SET_CLIP_CNF,
+        MSG_ID_L5USS_QUERY_CLIP_CNF,
+        MSG_ID_L5USS_ATP_QUERY_CLIP_CNF,
+        MSG_ID_L5USS_SET_SUPP_SVC_NOTIFICATION_CNF,
+        MSG_ID_L5USS_ATP_SET_SUPP_SVC_NOTIFICATION_CNF,
+        MSG_ID_L5USS_CHANGE_BARRING_PASSWORD_CNF,
+        MSG_ID_L5USS_ATP_CHANGE_BARRING_PASSWORD_CNF,
+        MSG_ID_L5USS_GET_COLP_CNF,
+        MSG_ID_L5USS_ATP_GET_COLP_CNF,
+        MSG_ID_L5USS_SET_COLP_CNF,
+        MSG_ID_L5USS_ATP_SET_COLP_CNF,
+        MSG_ID_L5USS_GET_COLR_CNF,
+        MSG_ID_L5USS_ATP_GET_COLR_CNF,
+    MSG_ID_L5USS_L5IO_MSG_FROM_L5USS_END,
+
+       /*L5URF*/
+    MSG_ID_L5IO_RF_CNF_RANGE_BEGIN,
+        MSG_ID_L5IO_RF_CNF,
+    MSG_ID_L5IO_RF_CNF_RANGE_END,
+
+        /*L5USIM*/
+    MSG_ID_L5IO_SIM_CNF_RANGE_BEGIN,
+        MSG_ID_L5IO_SIM_PIN_PROTECT_CNF,
+        MSG_ID_L5IO_SIM_VERIFY_PIN_CNF,
+        MSG_ID_L5IO_SIM_CHANGE_PIN_CNF,
+        MSG_ID_L5IO_SIM_UNBLOCK_PIN_CNF,
+        MSG_ID_L5IO_SIM_PIN_INFO_GET_CNF,
+        MSG_ID_L5IO_SIM_PIN_LIST_GET_CNF,
+        MSG_ID_L5IO_SIM_ICCID_CNF,
+        MSG_ID_L5IO_SIM_IMSI_CNF,
+        MSG_ID_L5IO_SIM_MSISDN_CNF,
+        MSG_ID_L5IO_SIM_STATE_CNF,
+        MSG_ID_L5IO_SIM_STATUS_CNF,
+        MSG_ID_L5IO_SIM_ATR_CNF,
+        MSG_ID_L5IO_SIM_OPEN_CHANNEL_CNF,
+        MSG_ID_L5IO_SIM_CLOSE_CHANNEL_CNF,
+        MSG_ID_L5IO_SIM_RESTRICTED_APDU_ACCESS_CNF,
+        MSG_ID_L5IO_SIM_GENERAL_APDU_ACCESS_CNF,
+        MSG_ID_L5IO_SIM_LONG_APDU_READ_CNF,
+        MSG_ID_L5IO_SIM_LONG_APDU_WRITE_CNF,
+        MSG_ID_L5IO_SIM_TERMINAL_CAPABILITY_SET_CNF,
+        MSG_ID_L5IO_SIM_TERMINAL_CAPABILITY_GET_CNF,
+        MSG_ID_L5IO_SIM_RESET_SET_CNF,
+        MSG_ID_L5IO_SIM_RESET_GET_CNF,
+        MSG_ID_L5IO_SIM_APP_LIST_CNF,
+        MSG_ID_L5IO_SIM_FILE_STATUS_GET_CNF,
+        MSG_ID_L5IO_SIM_PIN_EXTENTION_GET_CNF,
+        MSG_ID_L5IO_SIM_PIN_EXTENTION_SET_CNF,
+        MSG_ID_L5IO_SIM_GSM_AUTHENTICATE_CNF,
+        MSG_ID_L5IO_SIM_EXT_AUTHENTICATE_CNF,
+        MSG_ID_L5IO_SIM_BTSAP_CONNECT_CNF,
+        MSG_ID_L5IO_SIM_BTSAP_DISCONNECT_CNF,
+        MSG_ID_L5IO_SIM_BTSAP_POWER_ON_CNF,
+        MSG_ID_L5IO_SIM_BTSAP_POWER_OFF_CNF,
+        MSG_ID_L5IO_SIM_BTSAP_RESET_CNF,
+        MSG_ID_L5IO_SIM_BTSAP_APDU_CNF,
+        MSG_ID_L5IO_SIM_PHYSICAL_SLOTS_MAPPING_SET_CNF,
+        MSG_ID_L5IO_SIM_PHYSICAL_SLOTS_MAPPING_GET_CNF,
+        MSG_ID_L5IO_SIM_POWER_SET_CNF,
+        MSG_ID_L5IO_SIM_EXTENDED_GENERIC_APDU_ACCESS_CNF,
+        MSG_ID_L5IO_SIM_UICC_FILE_ACCESS_RECORD_CNF,
+        MSG_ID_L5IO_SIM_UICC_FILE_ACCESS_BINARY_CNF,
+        MSG_ID_L5IO_SIM_EUICC_SLOTS_STATUS_GET_CNF,
+        MSG_ID_L5IO_SIM_FACILITY_GET_CNF,
+        MSG_ID_L5IO_SIM_FACILITY_SET_CNF,
+        MSG_ID_L5IO_SIM_PIN_COUNT_QUERY_CNF,
+    MSG_ID_L5IO_SIM_CNF_RANGE_END,
+
+         /*L5USYS*/
+    MSG_ID_L5IO_SYS_CNF_RANGE_BEGIN,
+        MSG_ID_L5IO_SYS_INFO_GET_CNF,
+        MSG_ID_L5IO_SYS_SAR_GET_CNF,
+        MSG_ID_L5IO_SYS_SAR_SET_CNF,
+        MSG_ID_L5USYS_CONNECTIVITY_STATISTICS_CNF,
+        MSG_ID_L5IO_SYS_QUERY_SBP_CNF,
+    MSG_ID_L5IO_SYS_CNF_RANGE_END,
+
+        /*L5UXXX,please add cnf to L5IO here*/
+
+    MSG_ID_L5IO_USER_DEFINE_CNF_RANGE_END,
+
+    //L5UIO to L5USS
+    MSG_ID_L5IO_L5USS_MSG_FROM_L5IO_BEGIN,
+        MSG_ID_L5USS_ECUSD_REQ,
+        MSG_ID_L5IO_AT_SS_REQ,
+        MSG_ID_L5USS_SET_CLIR_REQ,
+        MSG_ID_L5USS_SET_CLIP_REQ,
+        MSG_ID_L5USS_QUERY_CLIP_REQ,
+        MSG_ID_L5USS_SET_SUPP_SVC_NOTIFICATION_REQ,
+        MSG_ID_L5USS_CHANGE_BARRING_PASSWORD_REQ,
+        MSG_ID_L5USS_GET_COLP_REQ,
+        MSG_ID_L5USS_SET_COLP_REQ,
+        MSG_ID_L5USS_GET_COLR_REQ,
+    MSG_ID_L5IO_L5USS_MSG_FROM_L5IO_END,
+
+    MSG_ID_L5IO_L5UCAT_MSG_FROM_L5IO_BEGIN,
+        MSG_ID_L5IO_AT_CAT_STK_NOTIFY_REQ,
+        MSG_ID_L5UCAT_SET_PAC_INFO_REQ,
+        MSG_ID_L5UCAT_GET_PAC_INFO_REQ,
+        MSG_ID_L5UCAT_SEND_TR_REQ,
+        MSG_ID_L5UCAT_SEND_ENVELOP_REQ,
+        MSG_ID_L5UCAT_GET_ENVELOP_INFO_REQ,
+        MSG_ID_L5UCAT_SEND_BIPCONF_REQ,
+    MSG_ID_L5IO_L5UCAT_MSG_FROM_L5IO_END,
+
+    MSG_ID_L5U_L5UCAT_MSG_FROM_LOWLAYER_BEGIN,
+        MSG_ID_L5U_L5UCAT_URC_STK_NOTIFY_REQ,
+        MSG_ID_L5UCAT_SIM_REFRESH_RESULT_NTF,
+    MSG_ID_L5U_L5UCAT_MSG_FROM_LOWLAYER_END,
+
+
+    MSG_ID_L5UCAT_L5IO_MSG_FROM_L5UCAT_BEGIN,
+        MSG_ID_L5UCAT_SET_PAC_INFO_CNF,
+        MSG_ID_L5UCAT_GET_PAC_INFO_CNF,
+        MSG_ID_L5UCAT_SEND_TR_CNF,
+        MSG_ID_L5UCAT_SEND_ENVELOP_CNF,
+        MSG_ID_L5UCAT_GET_ENVELOP_INFO_CNF,
+        MSG_ID_L5UCAT_PAC_IND,
+        MSG_ID_L5UCAT_SIM_REFRESH_RESULT_IND,
+        MSG_ID_L5UCAT_SEND_BIPCONF_CNF,
+    MSG_ID_L5UCAT_L5IO_MSG_FROM_L5UCAT_END,
+
+        /*L5IO->L5USWITH*/
+    MSG_ID_L5IO_USWITCH_MSG_BEGIN,
+        MSG_ID_L5IO_SIM_SWITCH_REQ,
+        MSG_ID_L5IO_WP_SWITCH_REQ,
+        MSG_ID_L5IO_SWITCH_SIM_MAPPING_GET_REQ,
+        MSG_ID_L5IO_SWITCH_SIM_MAPPING_SET_REQ,
+        MSG_ID_L5IO_SWITCH_MULTI_SIM_CONFIG_REQ,
+        MSG_ID_L5IO_SWITCH_LOCK_REQ,
+        MSG_ID_L5IO_SWITCH_UNLOCK_REQ,
+        MSG_ID_L5IO_SWITCH_RESTRICT_CARD_TYPE_SET_REQ,
+        MSG_ID_L5IO_SWITCH_RESTRICT_CARD_TYPE_GET_REQ,   		
+    MSG_ID_L5IO_USWITCH_MSG_END,
+
+        /*L5IO->L5URF */
+    MSG_ID_L5IO_L5URF_MSG_BEGIN,
+    MSG_ID_L5IO_RF_REQ,
+    MSG_ID_L5IO_L5URF_MSG_END,
+
+    MSG_ID_L5UNW_MSG_BEGIN,
+        /* L5IO -> L5UNW */
+        MSG_ID_L5IO_AT_EREG_REQ,
+        MSG_ID_L5IO_AT_EGREG_REQ,
+        MSG_ID_L5IO_L5UNW_SET_PS_REQ,
+        MSG_ID_L5IO_L5UNW_SET_PS_CNF,
+        MSG_ID_L5IO_L5UNW_GET_PS_REQ,
+        MSG_ID_L5IO_L5UNW_GET_PS_CNF,
+        MSG_ID_L5IO_L5UNW_PS_STATE_IND,
+        MSG_ID_L5IO_L5UNW_REGISTER_SET_REQ,
+        MSG_ID_L5IO_L5UNW_REGISTER_GET_REQ,
+        MSG_ID_L5IO_L5UNW_REGISTER_SET_CNF,
+        MSG_ID_L5IO_L5UNW_REGISTER_GET_CNF,
+        MSG_ID_L5IO_L5UNW_PLMN_LIST_GET_REQ,
+        MSG_ID_L5IO_L5UNW_PLMN_LIST_GET_CNF,
+        MSG_ID_L5IO_L5UNW_SIGNAL_SET_REQ,
+        MSG_ID_L5IO_L5UNW_SIGNAL_SET_CNF,
+        MSG_ID_L5IO_L5UNW_SIGNAL_GET_REQ,
+        MSG_ID_L5IO_L5UNW_SIGNAL_GET_CNF,
+        MSG_ID_L5IO_L5UNW_HOME_PROVIDER_GET_REQ,
+        MSG_ID_L5IO_L5UNW_HOME_PROVIDER_GET_CNF,
+        MSG_ID_L5IO_L5UNW_HOME_PROVIDER_SET_REQ,
+        MSG_ID_L5IO_L5UNW_HOME_PROVIDER_SET_CNF,
+        MSG_ID_L5IO_L5UNW_PREFERRED_PROVIDER_SET_REQ,
+        MSG_ID_L5IO_L5UNW_PREFERRED_PROVIDER_SET_CNF,
+        MSG_ID_L5IO_L5UNW_PREFERRED_PROVIDER_GET_REQ,
+        MSG_ID_L5IO_L5UNW_PREFERRED_PROVIDER_GET_CNF,
+        MSG_ID_L5IO_L5UNW_REGISTER_IND,
+        MSG_ID_L5IO_L5UNW_SIGNAL_IND,
+        MSG_ID_L5IO_L5UNW_RADIO_STATE_IND,
+        MSG_ID_L5IO_L5UNW_IA_STATUS_GET_REQ,
+        MSG_ID_L5IO_L5UNW_IA_STATUS_GET_CNF,
+        MSG_ID_L5IO_L5UNW_IA_STATUS_IND,
+        MSG_ID_L5IO_L5UNW_NITZ_GET_REQ,
+        MSG_ID_L5IO_L5UNW_NITZ_GET_CNF,
+        MSG_ID_L5IO_L5UNW_NITZ_IND,
+        MSG_ID_L5IO_L5UNW_IDLE_HINT_SET_REQ,
+        MSG_ID_L5IO_L5UNW_IDLE_HINT_SET_CNF,
+        MSG_ID_L5IO_L5UNW_IDLE_HINT_GET_REQ,
+        MSG_ID_L5IO_L5UNW_IDLE_HINT_GET_CNF,
+        MSG_ID_L5IO_L5UNW_BASE_STATIONS_GET_REQ,
+        MSG_ID_L5IO_L5UNW_BASE_STATIONS_GET_CNF,
+        MSG_ID_L5IO_L5UNW_LOCATION_INFO_GET_REQ,
+        MSG_ID_L5IO_L5UNW_LOCATION_INFO_GET_CNF,
+        MSG_ID_L5IO_L5UNW_LOCATION_INFO_IND,
+        MSG_ID_L5IO_L5UNW_RAT_SET_REQ,
+        MSG_ID_L5IO_L5UNW_RAT_SET_CNF,
+        MSG_ID_L5IO_L5UNW_CS_STATE_IND,
+        MSG_ID_L5IO_L5UNW_CS_GET_REQ,
+        MSG_ID_L5IO_L5UNW_CS_GET_CNF,
+        MSG_ID_L5IO_L5UNW_NR_OPTION_SET_REQ,
+        MSG_ID_L5IO_L5UNW_NR_OPTION_SET_CNF,
+        MSG_ID_L5IO_L5UNW_RAT_GET_REQ,
+        MSG_ID_L5IO_L5UNW_RAT_GET_CNF,
+        MSG_ID_L5IO_L5UNW_BAND_SET_REQ,
+        MSG_ID_L5IO_L5UNW_BAND_SET_CNF,
+        MSG_ID_L5IO_L5UNW_BAND_GET_REQ,
+        MSG_ID_L5IO_L5UNW_BAND_GET_CNF,
+        MSG_ID_L5IO_L5UNW_CHANNEL_LOCK_SET_REQ,
+        MSG_ID_L5IO_L5UNW_CHANNEL_LOCK_SET_CNF,
+        MSG_ID_L5IO_L5UNW_CHANNEL_LOCK_GET_REQ,
+        MSG_ID_L5IO_L5UNW_CHANNEL_LOCK_GET_CNF,
+        MSG_ID_L5IO_L5UNW_CSCON_IND,
+        MSG_ID_L5IO_L5UNW_ABORT_PLMN_SEARCH_REQ,
+        MSG_ID_L5IO_L5UNW_ABORT_PLMN_SEARCH_CNF,
+        MSG_ID_L5UNW_RAT_SWITCH_REQ,
+        MSG_ID_L5UNW_RAT_SWITCH_CNF,
+        MSG_ID_L5IO_L5UNW_POL_CAPABILITY_GET_REQ,
+        MSG_ID_L5IO_L5UNW_POL_CAPABILITY_GET_CNF,
+        MSG_ID_L5IO_L5UNW_PREFER_RAT_SET_REQ,
+        MSG_ID_L5IO_L5UNW_PREFER_RAT_SET_CNF,
+        MSG_ID_L5IO_L5UNW_PREFERRED_PROVIDER_IND,
+        MSG_ID_L5IO_L5UNW_XREG_IND,
+        MSG_ID_L5IO_L5UNW_XREG_GET_REQ,
+        MSG_ID_L5IO_L5UNW_XREG_GET_CNF,
+        MSG_ID_L5IO_L5UNW_LTE_CARRIER_AGGREGATION_SWITCH_SET_REQ,
+        MSG_ID_L5IO_L5UNW_LTE_CARRIER_AGGREGATION_SWITCH_SET_CNF,
+        MSG_ID_L5IO_L5UNW_PS_CS_REGISTRATION_STATE_ROAMING_TYPE_SET_REQ,
+        MSG_ID_L5IO_L5UNW_PS_CS_REGISTRATION_STATE_ROAMING_TYPE_SET_CNF,
+        MSG_ID_L5IO_L5UNW_LTE_CARRIER_AGGREGATION_SWITCH_GET_REQ,
+        MSG_ID_L5IO_L5UNW_LTE_CARRIER_AGGREGATION_SWITCH_GET_CNF,
+        MSG_ID_L5IO_L5UNW_BLACK_LIST_SET_REQ,
+        MSG_ID_L5IO_L5UNW_BLACK_LIST_SET_CNF,
+        MSG_ID_L5IO_L5UNW_BLACK_LIST_GET_REQ,
+        MSG_ID_L5IO_L5UNW_BLACK_LIST_GET_CNF,
+        MSG_ID_L5IO_L5UNW_BLACK_LIST_STATE_IND,
+        MSG_ID_L5IO_L5UNW_CELL_MEASUREMENT_REQ,
+        MSG_ID_L5IO_L5UNW_CELL_MEASUREMENT_CNF,
+        MSG_ID_L5IO_L5UNW_CELL_BAND_WHITE_LIST_LOCK_REQ,
+        MSG_ID_L5IO_L5UNW_CELL_BAND_WHITE_LIST_LOCK_CNF,
+        MSG_ID_L5IO_L5UNW_GET_CELL_BAND_BANDWIDTH_REQ,
+        MSG_ID_L5IO_L5UNW_GET_CELL_BAND_BANDWIDTH_CNF,
+        MSG_ID_L5IO_L5UNW_PROVIDER_NAME_GET_REQ,
+        MSG_ID_L5IO_L5UNW_PROVIDER_NAME_GET_CNF,
+        MSG_ID_L5IO_L5UNW_NR_OPTION_GET_REQ,
+        MSG_ID_L5IO_L5UNW_NR_OPTION_GET_CNF,
+        MSG_ID_L5IO_L5UNW_SRXLEV_GET_REQ,
+        MSG_ID_L5IO_L5UNW_SRXLEV_GET_CNF,
+        MSG_ID_L5IO_L5UNW_LTE_NR_CAINFO_IND,	
+        MSG_ID_L5IO_L5UNW_URC_ENABLE_SET_REQ,
+        MSG_ID_L5IO_L5UNW_URC_ENABLE_SET_CNF,
+        MSG_ID_L5IO_L5UNW_ROAMING_MODE_SET_REQ,
+        MSG_ID_L5IO_L5UNW_ROAMING_MODE_SET_CNF,
+        MSG_ID_L5IO_L5UNW_ROAMING_MODE_GET_REQ,
+        MSG_ID_L5IO_L5UNW_ROAMING_MODE_GET_CNF,
+        MSG_ID_L5IO_L5UNW_ECELL_IND,
+        MSG_ID_L5IO_L5UNW_CIEV_IND,
+        MSG_ID_L5IO_L5UNW_PSBEARER_IND,
+        MSG_ID_L5IO_L5UNW_EGMSS_IND,
+        MSG_ID_L5IO_L5UNW_EONS_IND,		
+        MSG_ID_L5U_L5UNW_MODE_SWITCH_REQ,
+        MSG_ID_L5U_L5UNW_MODE_SWITCH_CNF,
+        MSG_ID_L5IO_L5UNW_RF_STATUS_GET_REQ,
+        MSG_ID_L5IO_L5UNW_RF_STATUS_GET_CNF,
+        MSG_ID_L5IO_L5UNW_CSCON_GET_REQ,
+        MSG_ID_L5IO_L5UNW_CSCON_GET_CNF,
+        MSG_ID_L5IO_L5UNW_SET_TUW_TIMER_LENGTH_REQ,
+        MSG_ID_L5IO_L5UNW_SET_TUW_TIMER_LENGTH_CNF,
+        MSG_ID_L5IO_L5UNW_GET_TUW_TIMER_LENGTH_REQ,
+        MSG_ID_L5IO_L5UNW_GET_TUW_TIMER_LENGTH_CNF,
+        MSG_ID_L5IO_L5UNW_GET_5GUW_INFO_REQ,
+        MSG_ID_L5IO_L5UNW_GET_5GUW_INFO_CNF,
+        MSG_ID_L5IO_L5UNW_NRUW_INFO_IND,
+        MSG_ID_L5IO_L5UNW_SET_ALLOWED_MCC_LIST_REQ,
+        MSG_ID_L5IO_L5UNW_SET_ALLOWED_MCC_LIST_CNF,
+        MSG_ID_L5IO_L5UNW_ETXPWR_IND,
+        MSG_ID_L5IO_L5UNW_ETXPWRSTUS_IND,
+        MSG_ID_L5IO_L5UNW_NW_PARAMS_UPDATE_IND,
+        MSG_ID_L5IO_L5UNW_GET_NW_PARAMS_REQ,
+        MSG_ID_L5IO_L5UNW_GET_NW_PARAMS_CNF,
+        MSG_ID_L5IO_L5UNW_SET_PREF_NSSAI_REQ,
+        MSG_ID_L5IO_L5UNW_SET_PREF_NSSAI_CNF,
+        MSG_ID_L5IO_L5UNW_SET_NSSAI_REQ,
+        MSG_ID_L5IO_L5UNW_SET_NSSAI_CNF,
+        MSG_ID_L5IO_L5UNW_GET_NSSAI_REQ,
+        MSG_ID_L5IO_L5UNW_GET_NSSAI_CNF,
+        MSG_ID_L5UNW_PS_STATE_IND,
+        MSG_ID_L5IO_L5UNW_CACHE_ENDC_CONNECT_MODE_SET_REQ,
+        MSG_ID_L5IO_L5UNW_CACHE_ENDC_CONNECT_MODE_SET_CNF,
+        MSG_ID_L5IO_L5UNW_GET_LATEST_CA_MEASUREMENT_REQ,
+        MSG_ID_L5IO_L5UNW_GET_LATEST_CA_MEASUREMENT_CNF,
+        MSG_ID_L5IO_L5UNW_GET_CURRENT_CELL_INFO_REQ,
+        MSG_ID_L5IO_L5UNW_GET_CURRENT_CELL_INFO_CNF,
+    MSG_ID_L5UNW_MSG_END,
+
+        /*MSG_ID_L5IO->L5USIM*/
+    MSG_ID_L5IO_USIM_MSG_BEGIN,
+        MSG_ID_L5IO_SIM_PIN_PROTECT_REQ,
+        MSG_ID_L5IO_SIM_VERIFY_PIN_REQ,
+        MSG_ID_L5IO_SIM_CHANGE_PIN_REQ,
+        MSG_ID_L5IO_SIM_UNBLOCK_PIN_REQ,
+        MSG_ID_L5IO_SIM_PIN_INFO_GET_REQ,
+        MSG_ID_L5IO_SIM_PIN_LIST_GET_REQ,
+        MSG_ID_L5IO_SIM_ICCID_REQ,
+        MSG_ID_L5IO_SIM_IMSI_REQ,
+        MSG_ID_L5IO_SIM_MSISDN_REQ,
+        MSG_ID_L5IO_SIM_STATE_REQ,
+        MSG_ID_L5IO_SIM_STATUS_REQ,
+        MSG_ID_L5IO_SIM_ATR_REQ,
+        MSG_ID_L5IO_SIM_OPEN_CHANNEL_REQ,
+        MSG_ID_L5IO_SIM_CLOSE_CHANNEL_REQ,
+        MSG_ID_L5IO_SIM_RESTRICTED_APDU_ACCESS_REQ,
+        MSG_ID_L5IO_SIM_GENERAL_APDU_ACCESS_REQ,
+        MSG_ID_L5IO_SIM_LONG_APDU_READ_REQ,
+        MSG_ID_L5IO_SIM_LONG_APDU_WRITE_REQ,
+        MSG_ID_L5IO_SIM_TERMINAL_CAPABILITY_SET_REQ,
+        MSG_ID_L5IO_SIM_TERMINAL_CAPABILITY_GET_REQ,
+        MSG_ID_L5IO_SIM_RESET_SET_REQ,
+        MSG_ID_L5IO_SIM_RESET_GET_REQ,
+        MSG_ID_L5IO_SIM_APP_LIST_REQ,
+        MSG_ID_L5IO_SIM_FILE_STATUS_GET_REQ,
+        MSG_ID_L5IO_SIM_PIN_EXTENTION_GET_REQ,
+        MSG_ID_L5IO_SIM_PIN_EXTENTION_SET_REQ,
+        MSG_ID_L5IO_SIM_GSM_AUTHENTICATE_REQ,
+        MSG_ID_L5IO_SIM_EXT_AUTHENTICATE_REQ,
+        MSG_ID_L5IO_SIM_BTSAP_CONNECT_REQ,
+        MSG_ID_L5IO_SIM_BTSAP_DISCONNECT_REQ,
+        MSG_ID_L5IO_SIM_BTSAP_POWER_ON_REQ,
+        MSG_ID_L5IO_SIM_BTSAP_POWER_OFF_REQ,
+        MSG_ID_L5IO_SIM_BTSAP_RESET_REQ,
+        MSG_ID_L5IO_SIM_BTSAP_APDU_REQ,
+        MSG_ID_L5IO_SIM_PHYSICAL_SLOTS_MAPPING_SET_REQ,
+        MSG_ID_L5IO_SIM_PHYSICAL_SLOTS_MAPPING_GET_REQ,
+        MSG_ID_L5IO_SIM_POWER_SET_REQ,
+        MSG_ID_L5IO_SIM_EXTENDED_GENERIC_APDU_ACCESS_REQ,
+        MSG_ID_L5IO_SIM_UICC_FILE_ACCESS_RECORD_REQ,
+        MSG_ID_L5IO_SIM_UICC_FILE_ACCESS_BINARY_REQ,
+        MSG_ID_L5IO_SIM_EUICC_SLOTS_STATUS_GET_REQ,
+        MSG_ID_L5IO_SIM_FACILITY_GET_REQ,
+        MSG_ID_L5IO_SIM_FACILITY_SET_REQ,
+        MSG_ID_L5IO_SIM_PIN_COUNT_QUERY_REQ,        
+        MSG_ID_L5IO_USIM_MSG_END,
+
+        /*MSG_ID_L5IO->L5USYS*/
+    MSG_ID_L5IO_USYS_MSG_BEGIN,
+        MSG_ID_L5IO_SYS_INFO_GET_REQ,
+        MSG_ID_L5USYS_EIND_IND,
+        MSG_ID_L5USYS_ESBPID_IND,
+        MSG_ID_L5USYS_CIEV_IND,
+        MSG_ID_L5USYS_EIMSGEO_IND,
+        MSG_ID_L5IO_SYS_SAR_GET_REQ,
+        MSG_ID_L5IO_SYS_SAR_SET_REQ,
+        MSG_ID_L5USYS_CONNECTIVITY_STATISTICS_REQ,
+        MSG_ID_L5IO_SYS_QUERY_SBP_REQ,
+    MSG_ID_L5IO_USYS_MSG_END,
+
+    MSG_ID_L5USMS_MSG_BEGIN,
+        /* L5IO -> L5USMS */
+        MSG_ID_L5USMS_CONFIG_REQ,
+        MSG_ID_L5USMS_CONFIG_CNF,
+        MSG_ID_L5USMS_CONFIG_IND,
+        MSG_ID_L5USMS_SEND_REQ,
+        MSG_ID_L5USMS_SEND_CNF,
+        MSG_ID_L5USMS_READ_REQ,
+        MSG_ID_L5USMS_READ_CNF,
+        MSG_ID_L5USMS_NEW_SMS_IND,
+        MSG_ID_L5USMS_NEW_SMS_CMD,
+        MSG_ID_L5USMS_NEW_SMS_RSP,
+        MSG_ID_L5USMS_NEW_STATUS_REPORT_IND,
+        MSG_ID_L5USMS_NEW_STATUS_REPORT_CMD,
+        MSG_ID_L5USMS_NEW_STATUS_REPORT_RSP,
+        MSG_ID_L5USMS_NEW_CBM_IND,
+        MSG_ID_L5USMS_DELETE_REQ,
+        MSG_ID_L5USMS_DELETE_CNF,
+        MSG_ID_L5USMS_WRITE_REQ,
+        MSG_ID_L5USMS_WRITE_CNF,
+        MSG_ID_L5USMS_STORE_STATUS_REQ,
+        MSG_ID_L5USMS_STORE_STATUS_CNF,
+        MSG_ID_L5USMS_STORE_STATUS_IND,
+        MSG_ID_L5USMS_C5GUSMS_IND,
+        MSG_ID_L5USMS_SCBM_REQ,
+        MSG_ID_L5USMS_SCBM_CNF,
+        MSG_ID_L5USMS_SCBM_IND,
+        /* L5USMS -> L5USMS */
+        MSG_ID_L5USMS_HANDLE_NEXT_NTF,
+        MSG_ID_L5USMS_EIND_URC,
+        MSG_ID_L5USMS_CIEV_URC,
+        MSG_ID_L5USMS_CMT_URC,
+        MSG_ID_L5USMS_CMTI_URC,
+        MSG_ID_L5USMS_ETWS_URC,
+        MSG_ID_L5USMS_CBM_URC,
+        MSG_ID_L5USMS_CDS_URC,
+        MSG_ID_L5USMS_C5GUSMS_URC,
+        MSG_ID_L5USMS_EC2KCMT_URC,
+    MSG_ID_L5USMS_MSG_END,
+
+    MSG_ID_L5U_MSG_BEGIN,
+        /* L5IO -> L5U */
+        MSG_ID_L5IO_AT_CMD_REQ,
+        MSG_ID_L5U_EURCALLOW_REQ,
+
+        /* ATP -> L5U */
+        MSG_ID_L5U_ATP_AT_CMD_CNF,
+        MSG_ID_L5U_ATP_AT_URC_IND,
+        /* L4C L5U*/
+        MSG_ID_L5U_CONFIG_DSBP_RECONFIG_IND,
+        MSG_ID_L5U_DUMP_CHANNEL_IND,
+    MSG_ID_L5U_MSG_END,
+
+    MSG_ID_ATP_MSG_BEGIN,
+        /* L5U -> ATP */
+        MSG_ID_L5U_ATP_AT_CMD_REQ,
+    MSG_ID_ATP_MSG_END,
+
+    MSG_ID_L5U_L5USS_MSG_FROM_L5IO_BEGIN,
+        MSG_ID_L5USS_AT_CMD_CNF,
+        MSG_ID_L5USS_USSD_CMD_IND,
+        MSG_ID_L5USS_ECMCCSS_IND,
+    MSG_ID_L5U_L5USS_MSG_FROM_L5IO_END,
+
+    MSG_ID_L5IO_L5UPDN_MSG_FROM_L5IO_BEGIN,
+        MSG_ID_L5UPDN_ACT_DATA_CALL_REQ,
+        MSG_ID_L5UPDN_DEACT_DATA_CALL_REQ,
+        MSG_ID_L5UPDN_GET_DATA_CALL_REQ,
+        MSG_ID_L5UPDN_SET_IA_REQ,
+        MSG_ID_L5UPDN_GET_IA_REQ,
+        MSG_ID_L5UPDN_SET_APN_REQ,
+        MSG_ID_L5UPDN_GET_APN_REQ,
+        MSG_ID_L5UPDN_DEL_APN_REQ,
+        MSG_ID_L5UPDN_GET_PCO_REQ,
+        MSG_ID_L5UPDN_SET_PCO_REQ,
+        MSG_ID_L5UPDN_SET_PACKET_FILTER_REQ,
+        MSG_ID_L5UPDN_GET_PACKET_FILTER_REQ,
+		MSG_ID_L5UPDN_GET_DATA_CALL_LIST_REQ,
+		MSG_ID_L5UPDN_GET_MD_APN_REQ,
+		MSG_ID_L5UPDN_SET_PROFILE_STATUS_REQ,
+		MSG_ID_L5UPDN_SET_DATA_ALLOW_REQ,
+		MSG_ID_L5UPDN_ABORT_DATA_CALL_REQ,
+		MSG_ID_L5UPDN_GET_CALL_INFO_REQ,
+		MSG_ID_L5UPDN_GET_DISABLED_APN_REQ,
+		MSG_ID_L5UPDN_GET_URSP_ROUTE_PROFILE_REQ,
+		MSG_ID_L5UPDN_SET_URSP_PRECONF_UE_POLICY_REQ,
+		MSG_ID_L5UPDN_GET_URSP_UE_POLICY_REQ,
+        MSG_ID_L5UPDN_GET_QOS_REQ,
+        MSG_ID_L5UPDN_GET_5GQOS_REQ,
+		MSG_ID_L5UPDN_GET_NSSAI_REQ,
+        MSG_ID_L5UPDN_DATA_RETRY_TIMER_REQ,
+    MSG_ID_L5IO_L5UPDN_MSG_FROM_L5IO_END,
+
+    MSG_ID_L5IO_L5UPDN_MSG_FROM_LOWLAYER_BEGIN,
+        MSG_ID_L5UPDN_ACT_DATA_CALL_CNF,
+        MSG_ID_L5UPDN_ACT_DATA_CALL_IND,
+        MSG_ID_L5UPDN_MD_ACT_DATA_CALL_IND,
+        MSG_ID_L5UPDN_DEACT_DATA_CALL_CNF,
+        MSG_ID_L5UPDN_DEACT_DATA_CALL_IND,
+        MSG_ID_L5UPDN_MD_DEACT_DATA_CALL_IND,
+        MSG_ID_L5UPDN_MOD_DATA_CALL_IND,
+        MSG_ID_L5UPDN_GET_DATA_CALL_IND,
+		MSG_ID_L5UPDN_APN_CHG_IND,
+		MSG_ID_L5UPDN_VZW_APN_CHG_IND,
+		MSG_ID_L5UPDN_EIWLPL_IND,
+        MSG_ID_L5UPDN_EKALIVE_IND,
+        MSG_ID_L5UPDN_EDRETRY_IND,
+        MSG_ID_L5UPDN_GET_DATA_CALL_CNF,
+        MSG_ID_L5UPDN_SET_IA_CNF,
+        MSG_ID_L5UPDN_GET_IA_CNF,
+        MSG_ID_L5UPDN_SET_APN_CNF,
+        MSG_ID_L5UPDN_GET_APN_CNF,
+        MSG_ID_L5UPDN_DEL_APN_CNF,
+        MSG_ID_L5UPDN_GET_PCO_CNF,
+        MSG_ID_L5UPDN_SET_PCO_CNF,
+        MSG_ID_L5UPDN_MOD_PCO_IND,
+        MSG_ID_L5UPDN_SET_PACKET_FILTER_CNF,
+        MSG_ID_L5UPDN_GET_PACKET_FILTER_CNF,
+		MSG_ID_L5UPDN_GET_DATA_CALL_LIST_CNF,
+		MSG_ID_L5UPDN_GET_MD_APN_CNF,
+	    MSG_ID_L5UPDN_SET_PROFILE_STATUS_CNF,
+		MSG_ID_L5UPDN_SET_DATA_ALLOW_CNF,
+		MSG_ID_L5UPDN_ABORT_DATA_CALL_CNF,
+		MSG_ID_L5UPDN_GET_CALL_INFO_CNF,
+        MSG_ID_L5UPDN_DUP_ACT_DATA_CALL_IND,
+        MSG_ID_L5UPDN_DUP_DEACT_DATA_CALL_IND,
+		MSG_ID_L5UPDN_GET_DISABLED_APN_CNF,
+		MSG_ID_L5UPDN_GET_URSP_ROUTE_PROFILE_CNF,
+		MSG_ID_L5UPDN_SET_URSP_PRECONF_UE_POLICY_CNF,
+		MSG_ID_L5UPDN_GET_URSP_UE_POLICY_CNF,
+		MSG_ID_L5UPDN_URSP_REEVAL_IND,
+		MSG_ID_L5UPDN_URSP_UE_POLICY_CHG_IND,
+        MSG_ID_L5UPDN_GET_QOS_CNF,
+        MSG_ID_L5UPDN_GET_5GQOS_CNF,
+		MSG_ID_L5UPDN_PACKET_WAKE_UP_IND,
+		MSG_ID_L5UPDN_GET_NSSAI_CNF,
+        MSG_ID_L5UPDN_DATA_RETRY_TIMER_CNF,
+    MSG_ID_L5IO_L5UPDN_MSG_FROM_LOWLAYER_END,
+
+    MSG_ID_L5IO_L5UCC_REQ_MSG_BEGIN,
+        /* IO->CC */
+        MSG_ID_L5IO_CC_DIAL_REQ,
+        MSG_ID_L5IO_CC_HANGUP_REQ,
+        MSG_ID_L5IO_CC_ANSWER_REQ,
+        MSG_ID_L5IO_CC_GET_CALL_STATUS_REQ,
+        MSG_ID_L5IO_CC_SS_REQ,
+        MSG_ID_L5IO_CC_CONFERENCE_DIAL_REQ,
+        MSG_ID_L5IO_CC_CONFERENCE_REQ,
+        MSG_ID_L5IO_CC_GET_CONFERENCE_INFO_REQ,
+        MSG_ID_L5IO_CC_DTMF_REQ,
+        MSG_ID_L5IO_CC_GET_FINISH_REASON_REQ,
+        MSG_ID_L5IO_CC_EXIT_ECBM_REQ,
+        MSG_ID_L5IO_CC_FLIGHT_MODE_ECC_SESSION_REQ,
+        MSG_ID_L5IO_CC_ECC_LIST_SET_REQ,
+        MSG_ID_L5IO_CC_ECC_LIST_GET_REQ,
+        MSG_ID_L5IO_CC_IVS_ONEKEY_ECALL_REQ,
+    MSG_ID_L5IO_L5UCC_REQ_MSG_END,
+
+    MSG_ID_L5IO_L5UCC_CNF_MSG_BEGIN,
+        /* CC->IO */
+        MSG_ID_L5IO_CC_DIAL_CNF,
+        MSG_ID_L5IO_CC_HANGUP_CNF,
+        MSG_ID_L5IO_CC_ANSWER_CNF,
+        MSG_ID_L5IO_CC_GET_CALL_STATUS_CNF,
+        MSG_ID_L5IO_CC_SS_CNF,
+        MSG_ID_L5IO_CC_CONFERENCE_DIAL_CNF,
+        MSG_ID_L5IO_CC_CONFERENCE_CNF,
+        MSG_ID_L5IO_CC_GET_CONFERENCE_INFO_CNF,
+        MSG_ID_L5IO_CC_DTMF_CNF,
+        MSG_ID_L5IO_CC_GET_FINISH_REASON_CNF,
+        MSG_ID_L5IO_CC_EXIT_ECBM_CNF,
+        MSG_ID_L5IO_CC_FLIGHT_MODE_ECC_SESSION_CNF,
+        MSG_ID_L5IO_CC_ECC_LIST_SET_CNF,
+        MSG_ID_L5IO_CC_ECC_LIST_GET_CNF,
+        MSG_ID_L5IO_CC_IVS_ONEKEY_ECALL_CNF,
+    MSG_ID_L5IO_L5UCC_CNF_MSG_END,
+
+    MSG_ID_L5IO_L5UCC_CMD_MSG_BEGIN,
+        /* CC->IO */
+        MSG_ID_L5IO_CC_APPROVE_INCOMING_CMD,
+    MSG_ID_L5IO_L5UCC_CMD_MSG_END,
+
+    MSG_ID_L5IO_L5UCC_RSP_MSG_BEGIN,
+        /* IO->CC */
+        MSG_ID_L5IO_CC_APPROVE_INCOMING_RSP,
+    MSG_ID_L5IO_L5UCC_RSP_MSG_END,
+
+    MSG_ID_L5IO_L5UCC_IND_MSG_BEGIN,
+        /* CC->IO */
+        MSG_ID_L5IO_CC_CALL_STATUS_IND,
+        MSG_ID_L5IO_CC_CALL_EVENT_IND,
+        MSG_ID_L5IO_CC_CALL_MODE_IND,
+        MSG_ID_L5IO_CC_CALL_SIP_IND,
+        MSG_ID_L5IO_CC_CALL_CONFERENCE_IND,
+        MSG_ID_L5IO_CC_CALL_IMS_EVENT_PACKAGE_IND,
+        MSG_ID_L5IO_CC_CALL_SS_IND,
+        MSG_ID_L5IO_CC_ECC_LIST_CHANGE_IND,
+        MSG_ID_L5IO_CC_ECBM_MODE_CHANGE_IND,
+        MSG_ID_L5IO_CC_CRSS_IND,
+    MSG_ID_L5IO_L5UCC_IND_MSG_END,
+
+    MSG_ID_L5_THERMAL_STATE_INFO_IND,
+
+    MSG_ID_L5_GENERAL_MODEM_CONFIGURE_SET_REQ,
+    MSG_ID_L5_GENERAL_MODEM_CONFIGURE_SET_CNF,
+    MSG_ID_L5_GENERAL_MODEM_CONFIGURE_GET_REQ,
+    MSG_ID_L5_GENERAL_MODEM_CONFIGURE_GET_CNF,
+    MSG_ID_L5IO_L4BSBP_AT_CH_LOCK_REQ,
+    MSG_ID_L5IO_L4BSBP_AT_CH_UNLOCK_REQ,
+	MSG_ID_L5IO_L4BSBP_SBP_ID_CHANGE_IND,
+
+    MSG_ID_L5U_L5UIMS_IND_BEGIN,
+        MSG_ID_L5U_L5UIMS_CIREGU_IND,
+        MSG_ID_L5U_L5UIMS_EWFC_IND,
+        MSG_ID_L5U_L5UIMS_EIMSREGURI_IND,
+        MSG_ID_L5U_L5UIMS_EIMSREGRESP_IND,
+    MSG_ID_L5U_L5UIMS_IND_END,
+
+    MSG_ID_L5UIMS_IND_BEGIN,
+        MSG_ID_L5UIMS_CIREGU_IND,
+        MSG_ID_L5UIMS_EWFC_IND,
+        MSG_ID_L5UIMS_EIMSREGURI_IND,
+        MSG_ID_L5UIMS_EIMSREGRESP_IND,
+    MSG_ID_L5UIMS_IND_END,
+
+    MSG_ID_L5IO_L5UIMS_REQ_MSG_BEGIN,
+        /* IO->IMS */
+        MSG_ID_L5UIMS_GET_STATE_REQ,
+	    MSG_ID_L5UIMS_SET_EIMSCFG_REQ,
+    MSG_ID_L5IO_L5UIMS_REQ_MSG_END,
+
+    MSG_ID_L5IO_L5UIMS_CNF_MSG_BEGIN,
+        /* IMS->IO */
+        MSG_ID_L5UIMS_GET_STATE_CNF,
+		MSG_ID_L5UIMS_SET_EIMSCFG_CNF,
+    MSG_ID_L5IO_L5UIMS_CNF_MSG_END,
+
+    /* L5USIM IND */
+    MSG_ID_L5IO_L5USIM_IND_MSG_BEGIN,
+        MSG_ID_L5IO_SIM_STATE_IND,
+        MSG_ID_L5IO_SIM_STATUS_IND,
+        MSG_ID_L5IO_SIM_STATUS_CHANGE_IND,
+        MSG_ID_L5IO_SIM_ICCID_IND,
+        MSG_ID_L5IO_SIM_EUICC_SLOTS_STATUS_IND,
+        MSG_ID_L5IO_SIM_PHYSICAL_SLOTS_MAPPING_DONE_IND,
+        MSG_ID_L5IO_SIM_CSIM_IMSI_CHANGE_IND,
+    MSG_ID_L5IO_L5USIM_IND_MSG_END,
+    
+    /* L5USWITCH IND */
+    MSG_ID_L5USWITCH_IND_MSG_BEGIN,
+        MSG_ID_L5USWITCH_SIM_SWITCH_STATE_IND,
+    MSG_ID_L5USWITCH_IND_MSG_END,
+
+    MSG_ID_L5IO_L5IO_MIPC_SEND_DUMP,
+    MSG_ID_L5IO_L5IO_MIPC_RECV_DUMP,
+    MSG_ID_L5IO_L5IO_MBCI_SEND_DUMP,
+    MSG_ID_L5IO_L5IO_MBCI_RECV_DUMP,
+    MSG_ID_L5IO_L5IO_HANDLE_NEXT_AT_NTF,
+    MSG_ID_L5IO_L5IO_HANDLE_NEXT_MBCI_NTF,
+    MSG_ID_L5IO_L5IO_HANDLE_NEXT_MIPC_NTF,
+
+#if defined(CHIP10992)
+    /* IDC->L5 */
+    MSG_ID_IDC_NRTC_STATIC_CFG_CNF,
+    MSG_ID_IDC_NRTC_STATIC_CFG_IND,
+#endif
+
+#if ((defined(__IDC_ENABLED__)) && (defined (__IDC_NRTC_ENABLE__)))
+    /* IDC->L5 */
+    MSG_ID_L5_IDC_NRTC_DYNAMIC_INFO_SET_CNF,
+    MSG_ID_L5_IDC_NRTC_DYNAMIC_CFG_QUERY_CNF,
+    MSG_ID_L5_IDC_NRTC_DYNAMIC_CFG_IND,
+    MSG_ID_L5_IDC_NRTC_DYNAMIC_INFO_SET_REQ,
+    MSG_ID_L5_IDC_NRTC_DYNAMIC_CFG_QUERY_REQ,
+#endif
+        /* L5ATH -> L5UPDN*/
+    MSG_ID_L5ATH_L5UPDN_MSG_FROM_L5IO_BEGIN,
+        MSG_ID_L5UPDN_EIAAPN_REQ,
+        MSG_ID_L5UPDN_SET_EGDATA_REQ,
+		MSG_ID_L5UPDN_VZWAPNE_REQ,
+		MSG_ID_L5UPDN_VZWAPNETMR_REQ,
+    MSG_ID_L5ATH_L5UPDN_MSG_FROM_L5IO_END,
+
+        /* L5UPDN -> L5ATH*/
+    MSG_ID_L5ATH_L5UPDN_MSG_FROM_L5UPDN_BEGIN,
+        MSG_ID_L5UPDN_EIAAPN_CNF,
+        MSG_ID_L5UPDN_SET_EGDATA_CNF,
+		MSG_ID_L5UPDN_VZWAPNE_CNF,
+		MSG_ID_L5UPDN_VZWAPNETMR_CNF,
+    MSG_ID_L5ATH_L5UPDN_MSG_FROM_L5UPDN_END,
+
+MSG_ID_L5UECALL_REQ_MSG_BEGIN,
+    /* L5IO -> L5UECALL */
+    MSG_ID_L5UECALL_IVS_UPDATE_MSD_REQ,
+    MSG_ID_L5UECALL_IVS_RESET_REQ,
+    MSG_ID_L5UECALL_IVS_SET_TEST_ADDR_REQ,
+    MSG_ID_L5UECALL_IVS_SET_RECONF_ADDR_REQ,
+    MSG_ID_L5UECALL_IVS_SET_ADDR_PRI_REQ,
+    MSG_ID_L5UECALL_IVS_GET_SIM_INFO_REQ,
+MSG_ID_L5UECALL_REQ_MSG_END,
+
+MSG_ID_L5UECALL_NTF_MSG_BEGIN,
+    /* L5IO -> L5UECALL */
+    MSG_ID_L5UECALL_MSD_INTERNAL_NTF,
+    MSG_ID_L5UECALL_ECALL_FAIL_NTF,
+    /* L5UECALL -> L5UECALL */
+    MSG_ID_L5UECALL_FUNC_INIT_DONE_NTF,
+MSG_ID_L5UECALL_NTF_MSG_END,
+
+MSG_ID_L5UECALL_CNF_MSG_BEGIN,
+    /* L5UECALL -> L5IO */
+    MSG_ID_L5UECALL_IVS_UPDATE_MSD_CNF,
+    MSG_ID_L5UECALL_IVS_RESET_CNF,
+    MSG_ID_L5UECALL_IVS_SET_TEST_ADDR_CNF,
+    MSG_ID_L5UECALL_IVS_SET_RECONF_ADDR_CNF,
+    MSG_ID_L5UECALL_IVS_SET_ADDR_PRI_CNF,
+    MSG_ID_L5UECALL_IVS_GET_SIM_INFO_CNF,
+MSG_ID_L5UECALL_CNF_MSG_END,
+
+MSG_ID_L5UECALL_IND_MSG_BEGIN,
+    /* L5UECALL -> L5IO */
+    MSG_ID_L5UECALL_STATUS_IND,
+    MSG_ID_L5UECALL_CALL_STATUS_IND,
+    /* L1SP -> L5UECALL */
+    MSG_ID_L5UECALL_L1SP_ECALL_STATUS_IND,
+    /* L5U -> L5UECALL */
+    MSG_ID_L5UECALL_CECN_URC,
+    MSG_ID_L5UECALL_EECREGS_URC,
+MSG_ID_L5UECALL_IND_MSG_END,
+
+		/* USB MBIM -> L5IO*/
+    MSG_ID_MBIM_L5IO_MBCI_MSG_FROM_MBIM_BEGIN,
+        MSG_ID_MBIM_L5IO_MBCI_COMMAND_REQ,
+        MSG_ID_MBIM_L5IO_MBCI_RESET_FUNCTION_IND,
+        MSG_ID_USB_L5IO_DISCONNECT_IND,
+        MSG_ID_USB_L5IO_REMOTE_WAKEUP_IND,
+    MSG_ID_MBIM_L5IO_MBCI_MSG_FROM_MBIM_END,
+
+        /* L5IO -> USB MBIM*/
+    MSG_ID_MBIM_L5IO_MBCI_MSG_FROM_L5IO_BEGIN,
+        MSG_ID_MBIM_L5IO_MBCI_COMMAND_CNF,
+        MSG_ID_MBIM_L5IO_MBCI_STATUS_IND,
+    MSG_ID_MBIM_L5IO_MBCI_MSG_FROM_L5IO_END,
+
+MODULE_MSG_END( MSG_ID_L5_CODE_TAIL )
+
+#endif
+
diff --git a/mcu/interface/sap/md/las_msgid.h b/mcu/interface/sap/md/las_msgid.h
new file mode 100644
index 0000000..ce92770
--- /dev/null
+++ b/mcu/interface/sap/md/las_msgid.h
@@ -0,0 +1,211 @@
+/*****************************************************************************
+*  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) 2014
+*
+*  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:
+ * ---------
+ *   las_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   P-core and L1-core Protocol Stack related message identity definition
+ *
+ * Author:
+ * -------
+ *
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 06 06 2018 nalin.chovatia
+ * [MOLY00327941] UMOLYE: Gemini: Change handling of MSG_ID_RSVAS_GAS_SUSPEND_SERVICE_REQ/CNF
+ * 	
+ * 	.suspend r0
+ *
+ * 06 06 2018 nalin.chovatia
+ * [MOLY00327941] UMOLYE: Gemini: Change handling of MSG_ID_RSVAS_GAS_SUSPEND_SERVICE_REQ/CNF
+ * .suspend r0
+ *
+ * 08 09 2016 maruco.tu
+ * [MOLY00196065] [MT6293][folder structure] Move EL1/EL2 files from LTE domain to SWRD domain
+ * [LCEL re-arch](CONFIG files) (OA domain)
+ * 	1.modify SAP file 
+ * 	2.Add new message for dhl/mcddll
+ * 	3.disable LCEL in las_create.c
+ * 	4.check in el1/errc/las_msgid.h
+ * 	5.Remove las/lcel path and add errc/lcel path in lte_def.mak
+ *
+ * 07 27 2016 jui-chih.chin
+ * [MOLY00193618] [6293][LMOB Removel] Code Merge from CBr to UMOLYA TRUNK and UMOLYA PS DEV
+ * 	
+ * 	LMOB removal (OA)
+ *
+ * 06 27 2016 jui-chih.chin
+ * [MOLY00183642] new task EL1_MPC definition for 6293
+ * 	
+ * 	.
+ *
+ * 03 11 2016 yi-han.chung
+ * [MOLY00162461] ¦bAndroid???Modem??Logªº»Ý¨D
+ *
+ * 08 06 2015 claud.li
+ * [MOLY00125612] [PS1][91plus] core change modification
+ * [PS1][91+]no need to set module id for LAS during mode switch
+ *
+ * 07 23 2015 henry.lai
+ * [MOLY00092508] [MT6291][LTE-C2K] AS Inter RAT feature
+ * .
+ *
+ * 07 17 2015 doug.shih
+ * [MOLY00126936] [TK6291E1][4G FDD][ATE][8820][1][L1CORE] Assert fail: lcel_paging.c 871 - LAS_PCO
+ * [LCEL] add UT message id for L1_LISR preempt simulation.
+ *
+ * 06 16 2015 henry.lai
+ * [MOLY00113082] [MT6291] ERRC CEL development
+ * .
+ *
+ * 06 01 2015 henry.lai
+ * [MOLY00092508] [MT6291][LTE-C2K] AS Inter RAT feature
+ * .
+ *
+ * 04 29 2015 cen.chen
+ * [MOLY00109047] [UMOLY][new feature] Pich false alarm Optimization.
+ * LRRCE & RRCE code change for Paging OPT.
+ *
+ * 04 28 2015 george.chang
+ * [MOLY00109714] [6291] MOB MDT check in to UMOLY TRUNK
+ * 	.
+ *
+ * 04 16 2015 george.chang
+ * [MOLY00107870] [6291] LAS UBIN phase 2 check in to UMOLY TRUNK
+ * .
+ *
+ * 03 11 2015 yenchih.yang
+ * [MOLY00098473] [LMEME/LMOB/L4C] Power Consumption Enhancement for Signal Bar Reporting
+ * .
+ *
+ * 01 27 2015 dongqing.qi
+ * [MOLY00087491] [UMOLY][TDD][UAS][SLCE/RRCE/MEME]sync U-Bin CBr to UMOLY TRUNCK.
+ * .Rename MSG_ID to MSG_ID_TDD.
+ *
+ * 01 26 2015 yenchih.yang
+ * [MOLY00084256] [MEME] sync MT6291 to UMOLY
+ * Rename MSG_ID to MSG_ID_FDD.
+ *
+ * 01 16 2015 david.niu
+ * [MOLY00087934] [MT6291][LPP OTDOA Development] Inter-freq RSTD measurement indication
+ * .
+ *
+ * 10 16 2014 david.niu
+ * [MOLY00080211] [MT6291_DEV][MT6291_UESIM_DEV] Check in low power to MT6291_DEV, MT6291_UESIM_DEV
+ * .
+ *
+ * 09 25 2014 henry.lai
+ * [MOLY00079071][MT6291][U4G] Low Power Modification for CEL Paging.
+ *
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _LAS_MSGID_H
+#define _LAS_MSGID_H
+
+
+MODULE_MSG_BEGIN( MSG_ID_LAS_CODE_BEGIN )
+
+MSG_ID_LAS_MESSAGE_BEGIN = MSG_ID_LAS_CODE_BEGIN,
+/* MOB to LMOB */
+MSG_ID_MOB_LMOB_CONFIG_REQ,
+MSG_ID_MOB_LMOB_RADIO_MEASURE_REQ,
+MSG_ID_MOB_LMOB_CELL_REJ_INFO_IND,
+MSG_ID_MOB_LMOB_PRIORITY_INFO_IND,
+MSG_ID_MOB_LMOB_OOS_SCSI_INFO_CNF,
+MSG_ID_MOB_LMOB_CONFIG_UCELL_MEAS_CNF,
+MSG_ID_MOB_LMOB_CONFIG_UCELL_PRIO_MEAS_CNF,
+MSG_ID_MOB_LMOB_UAS_LTE_MEASUREMENT_REQ,
+MSG_ID_MOB_LMOB_CONFIG_GCELL_MEAS_CNF,
+MSG_ID_MOB_LMOB_CONFIG_GCELL_PRIO_MEAS_CNF,
+MSG_ID_MOB_LMOB_GAS_LTE_MEASUREMENT_REQ,
+MSG_ID_MOB_LMOB_CONFIG_CCELL_MEAS_CNF,
+MSG_ID_MOB_LMOB_CONFIG_CCELL_PRIO_MEAS_CNF,
+MSG_ID_MOB_LMOB_CAS_LTE_MEASUREMENT_REQ,
+MSG_ID_MOB_LMOB_CAS_LTE_HPS_QUALIFY_CELL_IND,
+MSG_ID_MOB_LMOB_IR_MEAS_CTRL_REQ,
+MSG_ID_MOB_LMOB_ADJUST_MEAS_REQ,
+MSG_ID_MOB_LMOB_SYNCH_STATUS_REQ,
+MSG_ID_MOB_LMOB_TST_INJECT_SYNCH_REQ,
+MSG_ID_MOB_LMOB_NBR_CELL_INFO_START_REQ,
+MSG_ID_MOB_LMOB_NBR_CELL_INFO_STOP_REQ,
+MSG_ID_MOB_LMOB_EM_UPDATE_REQ,
+MSG_ID_MOB_LMOB_MEAS_LOGGING_REQ,
+MSG_ID_MOB_LMOB_ESTFAIL_REPORT_REQ,
+/* EL1 to LAS */
+#ifdef __LAS_MOB__
+MSG_ID_ERRC_EL1MPC_PRS_GAP_IND,
+#endif /* __LAS_MOB__ */
+/* ERRC to LAS */
+/* MPAL to GISE*/
+MSG_ID_MPAL_GISE_STANDBY_GSM_MEAS_REQ,
+MSG_ID_MPAL_GISE_STANDBY_GSM_PRIO_MEAS_REQ,
+/* RRM to GISE*/
+MSG_ID_RRM_GISE_SET_CONTEXT_REQ,
+MSG_ID_RRM_GISE_GET_GCELL_MEAS_REQ,
+
+
+MSG_ID_TDD_LURR_DUMP_CONTEXT,
+MSG_ID_TDD_LMEME_DUMP_CONTEXT,
+MSG_ID_TDD_LMEME_UT_SET_CONTEXT,
+MSG_ID_TDD_LMEME_UT_SET_SHM,
+MSG_ID_TDD_LRRCE_LURLC_TM_DATA_IND,/*LURLC to LRRCE*/
+
+MSG_ID_FDD_LURR_DUMP_CONTEXT,
+MSG_ID_FDD_LMEME_DUMP_CONTEXT,
+MSG_ID_FDD_LMEME_UT_SET_CONTEXT,
+MSG_ID_FDD_LMEME_UT_SET_SHM,
+
+MSG_ID_L4C_LAS_CELL_POWER_MEAS_ONOFF_REQ,
+MSG_ID_L4C_LAS_CELL_POWER_MEAS_ONOFF_CNF,
+
+/* MPAL to GISE*/
+MSG_ID_MPAL_GISE_SUSPEND_REQ,
+
+MSG_ID_LAS_NON_USED_MESSAGE_END,
+MSG_ID_LAS_CODE_END = MSG_ID_LAS_NON_USED_MESSAGE_END,
+MODULE_MSG_END( MSG_ID_LAS_CODE_TAIL )
+
+#endif /* _LAS_MSGID_H */
diff --git a/mcu/interface/sap/md/lec_msgid.h b/mcu/interface/sap/md/lec_msgid.h
new file mode 100644
index 0000000..6caa40a
--- /dev/null
+++ b/mcu/interface/sap/md/lec_msgid.h
@@ -0,0 +1,243 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+
+  FILE NAME:  lec_msgid.h
+
+  DESCRIPTION:
+
+    This file contains the defenitions of all the LEC msg id's.
+
+*****************************************************************************/
+/*----------------------------------------------------------------------------
+Include Files
+----------------------------------------------------------------------------*/
+#ifndef _LEC_MSGID_H_
+#define _LEC_MSGID_H_
+
+#include "module_msg_range.h"
+
+
+#undef MSGID_SET
+#undef MSGID_NEXT
+
+MODULE_MSG_BEGIN( MSG_ID_LEC_CODE_BEGIN )
+    /* from PSW */
+    MSG_ID_LEC_GPS_DEVICE_POWER_ON_REQ_MSG = MSG_ID_LEC_CODE_BEGIN+0,  /* Turn on the GPS Device */
+    MSG_ID_LEC_PSEUDORANGE_MSMT_REQ_MSG,
+    MSG_ID_LEC_SESSION_END_REQ_MSG,
+    MSG_ID_LEC_36BIT_NWK_CDMA_TIME_MSG,  /* LEC requested System time and PSW response */
+    MSG_ID_LEC_SENSITIVITY_ASSIST_MSG,  /* Not used with GNS7560 */
+    MSG_ID_LEC_PSW_GPS_EPH_MSG,  /*MS-Based MSG*/
+    MSG_ID_LEC_PSW_GPS_ALM_MSG,
+    MSG_ID_LEC_PSW_LOC_RESP_MSG,
+
+    /*MS-Based    from ETS*/
+    MSG_ID_LEC_GPS_MS_BASED_MSG,
+    MSG_ID_LEC_GPS_MS_BASED_GETASSIST_MSG,
+
+    /* from L1D */
+    MSG_ID_LEC_GPS_INIT_GPS_ACK_MSG,
+    MSG_ID_LEC_GPS_END_GPS_ACK_MSG,
+    MSG_ID_LEC_GPS_CONT_GPS_MSG, /* Not used */
+    MSG_ID_LEC_GPS_HW_ENABLE_MSG, /* Not used */
+    MSG_ID_LEC_GPS_REF_FREQ_ADJ_MSG, /* To Set or adjust Clock Frequecny */
+
+    /* from IOP */
+    MSG_ID_LEC_GPS_RX_DATA_MSG,
+
+    /* from DBM */
+    MSG_ID_LEC_DBM_READ_BLK_RSP_MSG,
+    MSG_ID_LEC_DBM_WRITE_BLK_RSP_MSG,
+
+    /* from VAL */
+    MSG_ID_LEC_GPS_RESET_ASSIST_MSG, /* PLTS /Field Test Purpose */
+#if 0
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif
+    MSG_ID_LEC_CALL_BACK_MSG,
+    MSG_ID_LEC_APMODE_MSG,
+    MSG_ID_LEC_TESTMODE_MSG,
+    MSG_ID_LEC_USERMODE_MSG,
+    MSG_ID_LEC_NMEA_CFG_SET_ETS,
+    MSG_ID_LEC_NMEA_CFG_GET_ETS,
+    MSG_ID_LEC_PSW_RESTART_MSG,
+    MSG_ID_LEC_GET_RF_BAND_MSG,
+    MSG_ID_LEC_PSW_CDMA_SYSTEM_RSP_MSG,
+    MSG_ID_LEC_VAL_FACTORY_GET_RF_CNO_MSG,
+    MSG_ID_LEC_VAL_FACTORY_STOP_RF_CNO_MSG,
+    MSG_ID_LEC_LTE_TRN_MSG,
+#if 0    
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif        
+    MSG_ID_LEC_SLEEP_TIME_MSG,
+
+    MSG_ID_LEC_GPS_PGPS_ON_OFF_MSG,
+#if 0    
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif    
+    MSG_ID_LEC_PSW_CELL_INFOMATION_MSG,
+#if 0    
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif    
+    MSG_ID_LEC_AP_GPS_LOC_RESP_MSG,
+    MSG_ID_LEC_FIX_TIME_MSG,
+    MSG_ID_LEC_AP_GPS_AA_ASSIST_REQ_MSG,
+    MSG_ID_LEC_AP_GPS_QOS_REQ_MSG,
+
+    MSG_ID_LEC_VAL_AP_GPS_START_ACK,
+    MSG_ID_LEC_APF_READY_MSG,
+
+    MSG_ID_LEC_AP_GPS_PRECISE_TIME_AIDING_REQ_MSG,
+    MSG_ID_LEC_AP_GPS_FREQUENCY_AIDING_REQ_MSG,
+    MSG_ID_LEC_AP_GPS_PSEUDORANGE_MSMT_RSP_MSG,
+    MSG_ID_LEC_AP_GPS_REFERENCE_LOCATION_AIDING_REQ_MSG,
+    MSG_ID_LEC_VAL_CP_GPS_STOP_ACK,
+#if 0    
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif    
+    MSG_ID_LEC_GPS_READY_MSG,
+#if 0    
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif    
+    MSG_ID_LEC_PSW_READY_MSG,
+#if 0    
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif    
+    MSG_ID_LEC_AP_GPS_ASSIST_FINISH_MSG,
+    MSG_ID_LEC_AP_GPS_STOP_ACK_MSG,
+    MSG_ID_LEC_CUSTOMER_SETTING_MSG,
+#if 0    
+/* under construction !*/
+#endif    
+#ifdef MTK_GPS_SYNC_DEV
+    MSG_ID_LEC_AP_GPS_PERIOD_SYNC_REQ,
+    MSG_ID_LEC_AP_GPS_PERIOD_SYNC_STOP_REQ,
+    MSG_ID_LEC_L1D_GPS_TIME_IND,
+    MSG_ID_LEC_AP_DELETE_ASSIT_DATA_CNF,
+#endif
+    MSG_ID_LEC_STARTUP_SIGNAL,
+   // MSG_ID_LEC_RUN_GPS_LIBRARY_SIGNAL,
+    //MSG_ID_LEC_RUN_PATCH_SIGNAL,
+    MSG_ID_LEC_AP_GPS_SV_VALID_REQ,
+    MSG_ID_LEC_NUM_MSGS_ID,
+
+MODULE_MSG_END(MSG_ID_LEC_CODE_TAIL)
+
+/*****************************************************************************
+ * End of File
+*****************************************************************************/
+#endif
diff --git a/mcu/interface/sap/md/ll1_msgid.h b/mcu/interface/sap/md/ll1_msgid.h
new file mode 100644
index 0000000..7ebee1c
--- /dev/null
+++ b/mcu/interface/sap/md/ll1_msgid.h
@@ -0,0 +1,245 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ * ll1_sap.h
+ *
+ * Project:
+ * --------
+ *   WCDMA_Software
+ *
+ * Description:
+ * ------------
+ *   Layer 1 and Protocol Stack 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!
+ * removed!
+ * removed!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+/* Request for LL1 */
+#include "module_msg_range.h"
+
+#ifndef LL1_MSGID_H
+#define LL1_MSGID_H
+
+#ifdef _Test_Hdr_On_PC
+enum {
+#endif
+
+MODULE_MSG_BEGIN( MSG_ID_LL1_MSG_CODE_BEGIN )
+/* BEGIN:jake: 20051226, for LL1 implement, send/receive MSG to/form GSM L1 */
+MSG_ID_MPHD_GSM_GAP_SERVICE_REQ = MSG_ID_LL1_MSG_CODE_BEGIN,
+MSG_ID_MPHD_GSM_TICK_IND,
+MSG_ID_MPHD_GSM_GAP_PATTERN_IND,
+MSG_ID_MPHD_GSM_GAP_STOP_REQ,
+MSG_ID_MPHD_GSM_GAP_STOP_CNF,
+MSG_ID_MPHD_GSM_SC_MODE_IND, /*MTK L1 only, to inform 3G L1 currently 2G SC mode*/
+MSG_ID_MPHD_UMTS_GAP_SERVICE_REQ,
+MSG_ID_MPHD_UMTS_PARAM_NOTIFY_IND,
+#if 0 /*Pop20090310 for low pwr improvement in 2G standby mode*/
+/* under construction !*/
+#endif
+MSG_ID_MPHD_UMTS_GAP_STOP_REQ,
+MSG_ID_MPHD_UMTS_GAP_STOP_CNF,
+#ifdef __UMTS_TDD128_MODE__
+MSG_ID_MPHD_UMTS_FACH_LOCK_REQ, 
+MSG_ID_MPHD_UMTS_FACH_UNLOCK_REQ, 
+MSG_ID_MPHD_UMTS_FACH_LOCK_CNF,
+#endif /*__UMTS_TDD128_MODE__*/
+#ifdef __UMTS_FDD_MODE__
+MSG_ID_MPHD_UMTS_FMO_LOCK_REQ, /*MTK L1 only, to inform 2G L1 hold FMO for RACH*/
+MSG_ID_MPHD_UMTS_FMO_UNLOCK_REQ, /*MTK L1 only, to inform 2G L1 resume FMO*/
+MSG_ID_MPHD_UMTS_FMO_LOCK_CNF,
+#endif /*__UMTS_FDD_MODE__*/
+MSG_ID_MPHD_GSM_PM_DONE_IND,/*Popcafa 20090207 low pwr improvement in 2G standby mode*/
+MSG_ID_MPHD_IRAT_SYNC_READY_IND,
+MSG_ID_MPHD_IRAT_SYNC_COMPLETE_IND,
+MSG_ID_MPHD_IRAT_SYNC_CNF,
+MSG_ID_MPHD_IRAT_UMTS_TIMING_CHANGE_IND,
+MSG_ID_MPHD_IRAT_SYNC_REQ,
+MSG_ID_MPHD_IRAT_SYNC_IND,  /* SYY, 3G wake up to notify 2G do timing sync. when 2G in connection mode */
+MSG_ID_MPHD_GSM_GAP_UNAVAILABLE_IND,
+MSG_ID_MPHD_GSM_GAP_AVAILABLE_IND,
+MSG_ID_MPHD_UMTS_GAP_UNAVAILABLE_IND,
+MSG_ID_MPHD_UMTS_GAP_AVAILABLE_IND,
+MSG_ID_MPHD_DUAL_MODE_PRIMITIVE_END,
+/*
+#ifdef __UMTS_FDD_MODE__
+#ifdef __MTK_UL1_FDD__
+MSG_ID_MPHD_UMTS_GAP_PATTERN_PCH_IND,
+MSG_ID_MPHD_UMTS_GAP_PATTERN_FACH_IND,
+MSG_ID_MPHD_UMTS_GAP_PATTERN_DCH_IND,
+#else
+MSG_ID_MPHD_UMTS_GAP_PATTERN_IND,
+#endif
+#endif
+*/ 
+
+//#ifdef __UMTS_TDD128_MODE__
+MSG_ID_MPHD_UMTS_GAP_PATTERN_PCH_IND,
+MSG_ID_MPHD_UMTS_GAP_PATTERN_FACH_IND,
+MSG_ID_MPHD_UMTS_GAP_PATTERN_DCH_IND,
+MSG_ID_MPHD_UMTS_GAP_PATTERN_HSPA_IND,
+//#endif /*__UMTS_TDD128_MODE__*/
+MSG_ID_MPHD_UMTS_MODE_IND, /* MTK L1 only, to inform 2G L1 the current 3G mode */
+MSG_ID_MPHD_UMTS_CELL_MEAS_DONE_IND, /* Maruco20090120, add new interface(UL1A->LL1->L1A->L1C) for DM low power optimize */
+MODULE_MSG_END( MSG_ID_LL1_MSG_CODE_TAIL )
+
+/* END */
+#ifdef _Test_Hdr_On_PC
+};
+#endif
+
+#endif //LL1_MSGID_H
diff --git a/mcu/interface/sap/md/llc_msgid.h b/mcu/interface/sap/md/llc_msgid.h
new file mode 100644
index 0000000..ac9f5d7
--- /dev/null
+++ b/mcu/interface/sap/md/llc_msgid.h
@@ -0,0 +1,175 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   llc.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   LLC 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef LLC_MSGID_H
+#define LLC_MSGID_H
+
+	/*-------------------------LLC messages---------------------*/
+MODULE_MSG_BEGIN( MSG_ID_LLC_CODE_BEGIN )
+	MSG_ID_LLSMS_UNITDATA_REQ = MSG_ID_LLC_CODE_BEGIN,
+	MSG_ID_LLTOM_UNITDATA_REQ,
+	MSG_ID_LLGMM_UNITDATA_REQ,
+	MSG_ID_LLGMM_ASSIGN_REQ,
+	MSG_ID_LLGMM_TRIGGER_REQ,
+	MSG_ID_LLGMM_SUSPEND_REQ,
+	MSG_ID_LLGMM_RESUME_REQ,
+	MSG_ID_LLSND_UNITDATA_REQ,
+	MSG_ID_LLSND_DATA_REQ,
+	MSG_ID_LLSND_XID_REQ,
+	MSG_ID_LLSND_XID_RES,
+	MSG_ID_LLSND_ESTABLISH_REQ,
+	MSG_ID_LLSND_ESTABLISH_RES,
+	MSG_ID_LLSND_RELEASE_REQ,
+	MSG_ID_LLSND_CREATE_REG_REQ,
+	MSG_ID_LLSND_SAPI_MEM_XID,
+	MSG_ID_LLSND_RNR_STOP,
+	MSG_ID_GRR_DATA_IND,
+	MSG_ID_GRR_UNITDATA_IND,
+	MSG_ID_GRR_STATUS_IND,
+	MSG_ID_GRR_FLUSH_CNF,
+
+	/* 3G specific messages */
+	MSG_ID_RATCM_LLC_ASSIGN_REQ,
+	MSG_ID_RATCM_LLC_RESUME_REQ,
+	MSG_ID_RATCM_LLC_SUSPEND_REQ,
+	MSG_ID_RATCM_LLC_TRIGGER_REQ,
+	MSG_ID_RATCM_LLC_UNITDATA_REQ,
+	/* End of 3G specific messages */
+
+
+#ifdef __GCU_DVT__
+    MSG_ID_GCU_DVT_START_IND,
+    MSG_ID_GCU_DVT_END_RSP,
+#endif
+
+	MSG_ID_SAPI_MEM_FLOW_ON_REQ,
+	MSG_ID_RLC_LLC_FLOW_CONTROL_OFF,
+	MSG_ID_LL_TIMER_EXPIRY,
+	MSG_ID_LL_CIPHER_RSP,
+	MSG_ID_LL_DECIPHER_RSP,
+	MSG_ID_RLC_LLC_RNR_TRIGGER,
+	MSG_ID_LLSND_SAPI_ACT_REQ,
+	MSG_ID_GRR_CIBUFF_AVAIL_IND,
+	MSG_ID_AS_NAS_DATA_CNF,
+	MSG_ID_LLSND_FLUSH_REQ,
+	MSG_ID_LLSND_SAPI_DEACT_REQ,
+	MSG_ID_LLC_CODE_END = MSG_ID_LLSND_SAPI_DEACT_REQ,
+MODULE_MSG_END( MSG_ID_LLC_CODE_TAIL )
+	/*----------------------- LLC_MSG_CODE_END -----------------*/
+#endif //LLC_MSGID_H
diff --git a/mcu/interface/sap/md/lmd_msgid.h b/mcu/interface/sap/md/lmd_msgid.h
new file mode 100644
index 0000000..af035a4
--- /dev/null
+++ b/mcu/interface/sap/md/lmd_msgid.h
@@ -0,0 +1,204 @@
+/*****************************************************************************
+*  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) 2015
+*
+*  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 _LMD_MSG_ID_H
+#define _LMD_MSG_ID_H
+
+/*****************************************************************************
+* 
+* FILE NAME   :lmd_msgid.h 
+*
+* DESCRIPTION :
+*
+*     
+*
+* HISTORY     :
+*     See Log at end of file
+*
+*****************************************************************************/
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+
+MODULE_MSG_BEGIN( MSG_ID_LMD_CODE_BEGIN )
+
+    /* PSW's commands for call processing*/
+    MSG_ID_LMD_ACCESS_PROBE_ABORT_MSG = MSG_ID_LMD_CODE_BEGIN,
+    MSG_ID_LMD_TRAFFIC_CHAN_START_MSG,
+    MSG_ID_LMD_TRAFFIC_CHAN_STOP_MSG,
+    MSG_ID_LMD_RESET_MSG,
+
+    /* Service Configuration */
+    MSG_ID_LMD_SERVICE_CONFIGURATION_MSG,
+    MSG_ID_LMD_SERVICE_CONFIG_NN_MSG,
+    MSG_ID_LMD_SERVICE_OPTION_CONTROL_MSG,
+    MSG_ID_LMD_CONVERSATION_SUBSTATE_CONN_MSG,
+    MSG_ID_LMD_CONVERSATION_SUBSTATE_DISC_MSG,
+    MSG_ID_LMD_LOOPBACK_SERVICE_OPTION_MSG,
+    MSG_ID_LMD_AUDIO_SSO_CONNECT_RSP_MSG,
+    MSG_ID_LMD_AUDIO_SSO_DISCONN_RSP_MSG,
+
+    /* Markov/TDSO support */
+    MSG_ID_LMD_CLEAR_MARKOV_STATS_MSG,   
+    MSG_ID_LMD_MARKOV_SERVICE_OPTION_MSG,     
+
+    /* Power control message */
+    MSG_ID_LMD_PWR_CTL_PARMS_MSG,
+ 
+   /* Audio AGC and Handsfree messages */
+    MSG_ID_LMD_SPCH_DATA_ENC_AGC_MSG,
+    MSG_ID_LMD_SPCH_DATA_ENC_HFREE_MSG,
+    MSG_ID_LMD_SPCH_DATA_DEC_HFREE_MSG,
+
+    /* Voice Activity */
+    /* Debug */
+#ifdef MTK_CBP_ENCRYPT_VOICE
+    MSG_ID_LMD_VOICE_ENCRYPT_DISABLE_SPCH_DATA_MSG,
+    MSG_ID_LMD_VOICE_ENCRYPT_ENABLE_SPCH_DATA_MSG,
+#endif
+
+
+    /* For Data services. */
+    MSG_ID_LMD_RLP_REV_FUNDICATED_DATA_REQ_MSG,
+    MSG_ID_LMD_RLP_REV_SCH_DATA_REQ_MSG,
+    /* Data services:  Fwd SCH and SCCH Ack Response Msg */
+    MSG_ID_LMD_SCCH_FWD_DATA_RSP_MSG,
+
+   /* The TDSO TX data msg */ 
+    MSG_ID_LMD_FCH_REV_TDSO_DATA_MSG,
+    MSG_ID_LMD_SCH_REV_TDSO_DATA_MSG,  
+                   
+    /* SCH setup messages */
+    MSG_ID_LMD_FSCH_MSG,
+    MSG_ID_LMD_RSCH_MSG,
+    MSG_ID_LMD_FSCH_BURST_END_MSG,
+    MSG_ID_LMD_RSCH_STOP_MSG,
+    MSG_ID_LMD_FSCH_PDU_ORDER_CTRL_MSG,
+
+    /* Forward channel messages*/
+    MSG_ID_LMD_L1D_FWD_DATA_IND_MSG,
+
+    /* Reverse channel messages */
+    MSG_ID_LMD_REVERSE_ACCESS_SIG_MSG,
+    MSG_ID_LMD_EACH_SIG_MSG,
+    MSG_ID_LMD_REVERSE_TRAFFIC_SIG_MSG,
+    MSG_ID_LMD_TRANSMITTER_STATUS_MSG,
+    MSG_ID_LMD_COUNTER_SUSPEND_MSG,
+
+    /* For Diagnostic Monitor support */
+    /* Voice quality muting */
+
+
+    /* Resource Control: FCH and DCCH only */
+    MSG_ID_LMD_RESOURCE_UPDATE_MSG,
+    
+    /* Sim Message */
+    MSG_ID_LMD_SIM_MSG,
+
+    /* Statistics counter retrieve and set message */
+    MSG_ID_LMD_GET_STAT_CNT_MSG,
+    MSG_ID_LMD_SET_STAT_CNT_MSG,
+    MSG_ID_LMD_RESET_STAT_CNT_MSG,
+    MSG_ID_LMD_SET_FER_STATS_NUM_FRAMES_MSG,
+
+    /* Debug Screen Info message */
+    MSG_ID_LMD_GET_DEBUG_SCRN_INFO_MSG,
+
+    /* Speech Routing Disable Message */
+    MSG_ID_LMD_SPEECH_DISABLE_MSG,
+    /* Instruct LMD to stop requesting data from RLP but continue
+     * submitting R-Sch Tx data to DSPm.
+     */
+    MSG_ID_LMD_RLP_STOP_REQ_MSG,
+    
+    MSG_ID_LMD_CLEAR_FWD_SCH_DTX_STATS_MSG,
+    MSG_ID_LMD_SPEECH_LOOPBACK_MODE_MSG,
+    
+    MSG_ID_LMD_TX_SPCH_MSG,
+    MSG_ID_LMD_TX_LOOPBACK_MSG,
+    MSG_ID_LMD_TX_MARKOV_MSG,
+    MSG_ID_LMD_TX_TDSO_MSG,
+
+
+    /* signal ID from ... to ... */
+    MSG_ID_LMD_FORWARD_CHAN_SIG,
+    MSG_ID_LMD_REVERSE_CHAN_SIG,
+    MSG_ID_LMD_STARTUP_SIGNAL,
+    MSG_ID_LMD_20MS_STROBE_SIG,
+    MSG_ID_LMD_FWD_CHAN_SIGNAL_SUP,
+    MSG_ID_LMD_START_SERVICE_CONFIG_SIG,
+    MSG_ID_LMD_START_NN_SERVICE_CONFIG_SIG,
+    MSG_ID_LMD_SERVICE_OPTION_CONTROL_SIG,
+    MSG_ID_LMD_REVERSE_SIGNALING_TXED_SIG,
+    MSG_ID_LMD_UNUSED_SIG,
+    MSG_ID_LMD_REVERSE_SCH0_STOP_SIG,
+    MSG_ID_LMD_REVERSE_SCH1_ON_SIG,
+    MSG_ID_LMD_REVERSE_SCH1_STOP_SIG,
+    MSG_ID_LMD_FORWARD_SCH0_ON_SIG,
+    MSG_ID_LMD_FORWARD_SCH1_STOP_SIG,
+    MSG_ID_LMD_FORWARD_SCH1_ON_SIG,
+    MSG_ID_LMD_ACCESS_PROBE_COMPLETE_SIG,
+    MSG_ID_LMD_RESOURCE_UPDATE_SIG,
+    MSG_ID_LMD_FWD_HIGHSPEED_DATA_SIG,
+    MSG_ID_LMD_MUXPDU_TIMEOUT_SIG,
+    MSG_ID_LMD_REV_DTX_DURATION_EXPIRE,
+    MSG_ID_IPC_DSV_SEND_AUDIO_CHAN_QLTY_MSG,/*TODO for 93*/
+    MSG_ID_IPC_DSV_SEND_AUDIO_SPCH_ROUTING_MSG,
+    MSG_ID_IPC_DSV_SEND_AUDIO_SSO_CONNECT_MSG,
+    MSG_ID_IPC_DSV_SEND_AUDIO_SSO_CTRL_PARAMS_MSG,
+    MSG_ID_IPC_DSV_SEND_AUDIO_SSO_DISCONNECT_MSG,
+    MSG_ID_IPC_DSV_SET_MIC_VOICE_ENC_MAX_RATE_MSG,
+    MSG_ID_IPC_DSV_SEND_SPKR_VOICE_FWD_CH_PCKT_DATA_MSG,
+    MSG_ID_SDRV_SSO_CONN_DONE_MSG,
+    MSG_ID_SDRV_SSO_DISCONN_DONE_MSG,
+    MSG_ID_CAAL_SSO_CONN_RSP_MSG,
+    MSG_ID_CAAL_SSO_DISCONN_RSP_MSG,
+    MSG_ID_CAAL_SPH_DATA_UL_MSG,
+    
+    /* Added messages for MTK_PLT_ON_PC_UT */
+    MSG_ID_UT_LMD_FWD_DATA_IND_MSG,
+    MSG_ID_UT_LMD_REV_DATA_REQ_MSG,
+    MSG_ID_UT_LMD_EFUSE_CHECK_MSG,
+
+
+    MSG_ID_LMD_NUM_CMD_MSG_IDS,
+    
+MODULE_MSG_END( MSG_ID_LMD_CODE_TAIL )
+
+
+#endif
+
diff --git a/mcu/interface/sap/md/lmds_msgid.h b/mcu/interface/sap/md/lmds_msgid.h
new file mode 100644
index 0000000..74a1f3a
--- /dev/null
+++ b/mcu/interface/sap/md/lmds_msgid.h
@@ -0,0 +1,97 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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:
+* ---------
+* lmds_msgid.h 
+*
+* Project:
+* --------
+* C2K
+*
+* Description: 
+* ------------
+* This module defines the RLP ILM messgae IDs for the 1xRTT Protocol Stack
+*
+* 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 _LMDS_MSG_ID_H
+#define _LMDS_MSG_ID_H
+
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+/*----------------------------------------------------------------------------
+ Global Defines and Macros
+----------------------------------------------------------------------------*/
+
+
+MODULE_MSG_BEGIN( MSG_ID_LMDS_CODE_BEGIN )
+
+    MSG_ID_LMD_S_TDSO_CONNECT_MSG = MSG_ID_LMDS_CODE_BEGIN,
+    MSG_ID_LMD_S_TDSO_CONTROL_MSG,
+    MSG_ID_LMD_S_TDSO_DATA_MSG,
+    MSG_ID_LMD_S_TDSO_DISCONNECT_MSG,
+    MSG_ID_LMD_S_TDSO_CLEAR_STATS_MSG,
+    MSG_ID_LMD_S_TDSO_RANDOM_NUMBER_CALC_MSG,
+
+
+    /* signal ID from ... to ... */
+    MSG_ID_LMD_S_STARTUP_SIGNAL,
+    MSG_ID_LMD_S_20MS_STROBE_SIG,
+    MSG_ID_LMD_S_VMEM_STROBE_SIG,
+    
+MODULE_MSG_END( MSG_ID_LMDS_CODE_TAIL )
+
+
+#endif
+
diff --git a/mcu/interface/sap/md/lpp_msgid.h b/mcu/interface/sap/md/lpp_msgid.h
new file mode 100644
index 0000000..2d35f08
--- /dev/null
+++ b/mcu/interface/sap/md/lpp_msgid.h
@@ -0,0 +1,335 @@
+/******************************************************************************
+*  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:
+ * --------------------------------------------------------
+ *   lpp_msgid.h
+ *
+ * Project:
+ * --------------------------------------------------------
+ *   LTE project
+ *
+ * Description:
+ * --------------------------------------------------------
+ *    LTE Positioning Protocol related message identity definition
+ *
+ * Author:
+ * --------------------------------------------------------
+ * -------
+ *
+ * --------------------------------------------------------
+ * $Log$
+ *
+ * 11 10 2020 jie-yu.wang
+ * [MOLY00589182] [Gen97][MP7][Memory reduction] Stage V - LTE POS preempt LTE/NR HARQ buffer
+ * 	
+ * 	[Interface][LPP].
+ *
+ * 11 29 2019 jie-yu.wang
+ * [MOLY00461947] [LPP] Patch back from 1001.DEV to VMOLY
+ * [SWRD] LPP patch back
+ *
+ * 07 24 2019 allen.keh
+ * [MOLY00423216] [MT6297][VGMM] message id ownership re-grouping
+ * .move some message id to vgmm_msgid.h
+ *
+ * 06 20 2019 jie-yu.wang
+ * [MOLY00415205] [AGPS] [LBS] NR Neighbor cell information for SUPL
+ * [OA][LBS] SUPL Nbr Cell Interface.
+ *
+ * 06 12 2019 jie-yu.wang
+ * [MOLY00413168] [LPP] Inter RAT OTDOA modification for adding NRRC IND
+ * [OA][LPP] InterRAT OTDOA interface change for NRRC.
+ *
+ * 03 28 2019 jie-yu.wang
+ * [MOLY00394881] [LPP] Inter RAT OTDOA modification
+ * [LPP] InterRAT OTDOA interface.
+ *
+ * 11 29 2018 roland.li
+ * [MOLY00363204] [Gen97] NR positioning interface check-in
+ * [LPP] 5G positioning interface.
+ *
+ * 09 20 2017 jie-yu.wang
+ * [MOLY00278366] LPP OTDOA new procedure architecture development
+ * [UMOLYA] Gen93 OTDOA refectoring.
+ *
+ * 07 07 2017 jie-yu.wang
+ * [MOLY00261827] [UMOYLA] LPPe development
+ * [LPP] LPPe code change check-in.
+ *
+ * 06 27 2016 jie-yu.wang
+ * [MOLY00183642] new task EL1_MPC definition for 6293
+ * (LPP) UMOLYA MessageID change.
+ *
+ * 01 13 2015 roland.li
+ * [MOLY00092193] [UMOLY][LPP]LPP R10R11 feature checkin
+ * 	.
+ *
+ * 08 22 2014 doug.shih
+ * [MOLY00075997] [LPP] OTDOA RESET_UE_STORED_POS_INFO flow enhancement over CP and UP
+ * .
+ *
+ * 08 04 2014 doug.shih
+ * [MOLY00073990] [LPP CP] LPP code check-in for OTDOA feature
+ * .
+ *
+ *
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _LPP_MSGID_H
+#define _LPP_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_LPP_CODE_BEGIN )
+
+/****************************************************************************
+ *                          LPP <-> LBS
+ ****************************************************************************/
+/* LPP -> LBS */
+MSG_ID_LPP_LBS_SESSION_START_IND = MSG_ID_LPP_CODE_BEGIN,
+MSG_ID_LPP_LBS_SESSION_END_IND,
+MSG_ID_LPP_LBS_POS_METHOD_IND,
+//For LPPe, move to gps_msgid.h
+
+/* LBS -> LPP */
+MSG_ID_LPP_LBS_SESSION_END_REQ,
+MSG_ID_LPP_LBS_CAPABILITY_UPDATE_REQ,
+MSG_ID_LPP_LBS_RESET_UE_STORED_POS_INFO_REQ,
+
+MSG_ID_LPP_LBS_EXT_WLAN_CAPABILITY_IND,
+MSG_ID_LPP_LBS_EXT_BT_CAPABILITY_IND,
+MSG_ID_LPP_LBS_EXT_SENSOR_CAPABILITY_IND,
+MSG_ID_LPP_LBS_EXT_NETWORK_CAPABILITY_IND,
+MSG_ID_LPP_LBS_EXT_IPADDRESS_CAPABILITY_IND,
+
+MSG_ID_LPP_LBS_EXT_WLAN_POS_ASSIST_DATA_REQUEST_IND,
+MSG_ID_LPP_LBS_EXT_BT_POS_ASSIST_DATA_REQUEST_IND,
+MSG_ID_LPP_LBS_EXT_SENSOR_POS_ASSIST_DATA_REQUEST_IND,
+
+MSG_ID_LPP_LBS_EXT_WLAN_MEAS_QUERY_CNF,
+MSG_ID_LPP_LBS_EXT_BT_MEAS_QUERY_CNF,
+MSG_ID_LPP_LBS_EXT_SENSOR_MEAS_QUERY_CNF,
+MSG_ID_LPP_LBS_EXT_NETWORK_MEAS_QUERY_CNF,
+MSG_ID_LPP_LBS_EXT_IPADDRESS_MEAS_QUERY_CNF,
+
+/****************************************************************************
+ *                          LPP <-> ERRC (EL1)
+ ****************************************************************************/
+/* LPP -> ERRC */
+//move to errc_msgid.h
+
+/* LPP -> EL1 */
+//move to el1_msgid.h
+
+/* ERRC -> LPP */
+MSG_ID_LPP_ERRC_ECID_MEAS_CNF,
+MSG_ID_LPP_ERRC_IRAT_ECID_MEAS_CNF,
+MSG_ID_LPP_ERRC_SRB_STATUS_IND,
+MSG_ID_LPP_ERRC_OTDOA_MEAS_CNF,
+
+/* EL1 -> LPP */
+MSG_ID_LPP_EL1MPC_OTDOA_MEAS_CNF,
+MSG_ID_LPP_EL1MPC_OTDOA_ASSIST_DATA_CNF,
+MSG_ID_LPP_EL1MPC_OTDOA_ADDITIONAL_ASSIST_DATA_IND,
+
+
+/****************************************************************************
+ *                          LPP <-> GNSS Task
+ ****************************************************************************/
+/* defined in gps_msgid.h */
+
+/****************************************************************************
+ *                          LPP <-> EMM via EVAL
+ ****************************************************************************/
+/* LPP -> EMM (EVAL) */
+MSG_ID_LPP_EVAL_DATA_REQ,
+
+/* EMM (EVAL) -> LPP */
+MSG_ID_LPP_EVAL_DATA_IND,
+MSG_ID_LPP_EVAL_DATA_CNF,
+
+/****************************************************************************
+ *                          ETC -> LPP via EVAL
+ ****************************************************************************/
+/* ETC (EVAL) -> LPP */
+MSG_ID_EVAL_LPP_NW_RESET_UE_STORED_POS_INFO_IND,
+
+/****************************************************************************
+ *                          ETC -> LPP
+ ****************************************************************************/
+/* ETC -> LPP */
+MSG_ID_ETC_LPP_NW_RESET_UE_STORED_POS_INFO_IND,
+
+/****************************************************************************
+ *                          LPP (SWIP)  <-> SUPL
+ ****************************************************************************/
+/* LPP (SWIP) -> SUPL */
+MSG_ID_LPP_SUPL_PDU_DATA_REQ,
+
+/* SUPL -> LPP (SWIP) */
+MSG_ID_LPP_SUPL_PDU_DATA_IND,
+MSG_ID_LPP_SUPL_PDU_DATA_CNF,
+
+/****************************************************************************
+ *                          LPP <-> LPP (SWIP) via LBS
+ ****************************************************************************/
+/* LPP (SWIP) -> LPP */
+MSG_ID_LPP_PEER_OTDOA_MEAS_REQ,
+MSG_ID_LPP_PEER_OTDOA_ASSIST_DATA_REQ,
+MSG_ID_LPP_PEER_OTDOA_MEAS_ABORT_REQ,
+MSG_ID_LPP_PEER_ECID_MEAS_REQ,
+MSG_ID_LPP_PEER_ECID_MEAS_ABORT_REQ,
+MSG_ID_LPP_PEER_EUTRAN_BAND_UPDATE_REQ,
+MSG_ID_LPP_PEER_OTDOA_RESET_UE_STORED_POS_REQ,
+
+/* LPP -> LPP (SWIP) */
+MSG_ID_LPP_PEER_OTDOA_MEAS_CNF,
+MSG_ID_LPP_PEER_OTDOA_ASSIST_DATA_CNF,
+MSG_ID_LPP_PEER_OTDOA_ADDITIONAL_ASSIST_DATA_REQ,
+MSG_ID_LPP_PEER_ECID_MEAS_CNF,
+MSG_ID_LPP_PEER_EUTRAN_BAND_UPDATE_CNF,
+
+/****************************************************************************
+ *                          LPP <-> LPP_EXT
+ ****************************************************************************/
+/* LPP -> LPP_EXT */
+MSG_ID_LPP_LPPE_EPDU_DATA_IND,
+MSG_ID_LPP_LPPE_EPDU_DATA_CNF,
+MSG_ID_LPP_LPPE_EPDU_DATA_NTF,
+MSG_ID_LPP_LPPE_STATUS_SYNC_IND,
+
+MSG_ID_LPP_LPPE_WLAN_CAPABILITY_IND,
+MSG_ID_LPP_LPPE_BT_CAPABILITY_IND,
+MSG_ID_LPP_LPPE_SENSOR_CAPABILITY_IND,
+MSG_ID_LPP_LPPE_NETWORK_CAPABILITY_IND,
+MSG_ID_LPP_LPPE_IPADDRESS_CAPABILITY_IND,
+
+MSG_ID_LPP_LPPE_WLAN_POS_ASSIST_DATA_REQUEST_IND,
+MSG_ID_LPP_LPPE_BT_POS_ASSIST_DATA_REQUEST_IND,
+MSG_ID_LPP_LPPE_SENSOR_POS_ASSIST_DATA_REQUEST_IND,
+MSG_ID_LPP_LPPE_HA_AGNSS_POS_ASSIST_DATA_REQUEST_IND,
+MSG_ID_LPP_LPPE_PMTK_DONE_IND,
+
+MSG_ID_LPP_LPPE_WLAN_MEAS_QUERY_CNF,
+MSG_ID_LPP_LPPE_BT_MEAS_QUERY_CNF,
+MSG_ID_LPP_LPPE_SENSOR_MEAS_QUERY_CNF,
+MSG_ID_LPP_LPPE_NETWORK_MEAS_QUERY_CNF,
+MSG_ID_LPP_LPPE_IPADDRESS_MEAS_QUERY_CNF,
+
+MSG_ID_LPP_LPPE_GNSS_POS_IND,
+MSG_ID_LPP_LPPE_GNSS_MEAS_IND,
+MSG_ID_LPP_LPPE_ABORT_IND,
+MSG_ID_LPP_LPPE_ERROR_IND,
+
+
+/* LPP_EXT -> LPP */
+MSG_ID_LPP_LPPE_EPDU_DATA_REQ,
+MSG_ID_LPP_LPPE_EPDU_DATA_RSP,
+
+MSG_ID_LPP_LPPE_WLAN_POS_ASSIST_DATA_PROVIDE_IND,
+MSG_ID_LPP_LPPE_BT_POS_ASSIST_DATA_PROVIDE_IND,
+MSG_ID_LPP_LPPE_SENSOR_POS_ASSIST_DATA_PROVIDE_IND,
+MSG_ID_LPP_LPPE_HA_AGNSS_POS_ASSIST_DATA_PROVIDE_IND,
+
+MSG_ID_LPP_LPPE_WLAN_MEAS_QUERY_REQ,
+MSG_ID_LPP_LPPE_BT_MEAS_QUERY_REQ,
+MSG_ID_LPP_LPPE_SENSOR_MEAS_QUERY_REQ,
+MSG_ID_LPP_LPPE_NETWORK_MEAS_QUERY_REQ,
+MSG_ID_LPP_LPPE_IPADDRESS_MEAS_QUERY_REQ,
+
+MSG_ID_LPP_LPPE_WLAN_START_IND,
+MSG_ID_LPP_LPPE_BT_START_IND,
+MSG_ID_LPP_LPPE_SENSOR_START_IND,
+MSG_ID_LPP_LPPE_NETWORK_START_IND,
+
+MSG_ID_LPP_LPPE_WLAN_STOP_IND,
+MSG_ID_LPP_LPPE_BT_STOP_IND,
+MSG_ID_LPP_LPPE_SENSOR_STOP_IND,
+MSG_ID_LPP_LPPE_NETWORK_STOP_IND,
+
+MSG_ID_LPP_LPPE_ABORT_RSP,
+MSG_ID_LPP_LPPE_ERROR_RSP,
+
+/****************************************************************************
+ *                          LBS <-> LPP_EXT
+ ****************************************************************************/
+/* LBS -> LPP_EXT */
+MSG_ID_LCSP_GNSS_HA_ASSIST_CNF,
+MSG_ID_LCSP_GNSS_HA_ASSIST_DATA_REQUEST_IND,
+MSG_ID_LPPE_LBS_GNSS_ASSIST_DATA_RSP,
+
+/****************************************************************************
+ *                          LPP <-> LPP_ADAPTER
+ ****************************************************************************/
+/* LPP->LPP_AS_Adapter */
+MSG_ID_LPP_AS_ADAPTER_OTDOA_ASSIST_DATA_REQ,
+MSG_ID_LPP_AS_ADAPTER_OTDOA_ASSIST_DATA_CLEAR_NTF,
+MSG_ID_LPP_AS_ADAPTER_OTDOA_MEAS_REQ,
+MSG_ID_LPP_AS_ADAPTER_OTDOA_MEAS_ABORT_REQ,
+/* LPP_AS_Adapter->LPP */
+MSG_ID_LPP_AS_ADAPTER_OTDOA_ASSIST_DATA_CNF,
+MSG_ID_LPP_AS_ADAPTER_OTDOA_ADDITIONAL_ASSIST_DATA_REQ,
+MSG_ID_LPP_AS_ADAPTER_OTDOA_MEAS_CNF,
+
+/****************************************************************************
+ *                          LPP <-> VGMM 
+ ****************************************************************************/
+/* LPP -> VGMM  */
+//move to vgmm_msgid.h
+
+/* EMM (EVAL) -> LPP */
+MSG_ID_LPP_VGMM_DATA_IND,
+MSG_ID_LPP_VGMM_DATA_CNF, 
+
+/****************************************************************************
+ *                          LPP <- NRRC
+ ****************************************************************************/
+/* NRRC  -> LPP   */
+MSG_ID_LPP_NRRC_OTDOA_MEAS_IND,
+MSG_ID_LPP_NRRC_OTDOA_MEAS_CNF,
+ 
+/****************************************************************************
+ *                          LPP <- SASE
+ ****************************************************************************/
+/* NRRC  -> LPP   */
+MSG_ID_LPP_SASE_START_OTDOA_MEAS_CNF,
+
+
+MSG_ID_LPP_CODE_END,
+
+MODULE_MSG_END( MSG_ID_LPP_CODE_TAIL )
+
+#endif /* _LPP_MSGID_H */
diff --git a/mcu/interface/sap/md/mll1_msgid.h b/mcu/interface/sap/md/mll1_msgid.h
new file mode 100644
index 0000000..7cdb3db
--- /dev/null
+++ b/mcu/interface/sap/md/mll1_msgid.h
@@ -0,0 +1,258 @@
+#include "module_msg_range.h"
+
+#ifndef _MLL1_MSG_H
+#define _MLL1_MSG_H
+
+#ifdef _Test_Hdr_On_PC
+enum {
+#endif
+
+MODULE_MSG_BEGIN( MSG_ID_MLL1_MSG_CODE_BEGIN )
+
+MSG_ID_LL1_GL1_SYNC_REQ = MSG_ID_MLL1_MSG_CODE_BEGIN,
+MSG_ID_GL1_LL1_SYNC_CNF,
+MSG_ID_GL1_LL1_RAT_STATUS_IND,
+MSG_ID_GL1_LL1_MODE_STATUS_IND,
+MSG_ID_LL1_GL1_MODE_STATUS_UPDATE_IND,
+MSG_ID_GL1_LL1_ACTIVE_MEASURE_STATUS_IND,
+MSG_ID_GL1_LL1_MEASURE_REQ,
+MSG_ID_GL1_LL1_STANDBY_MEASURE_DONE_IND,
+MSG_ID_LL1_GL1_GAP_SERVICE_REQ,
+MSG_ID_GL1_LL1_GAP_STOP_REQ,
+MSG_ID_LL1_GL1_GAP_STOP_CNF,
+MSG_ID_LL1_GL1_GAP_STOP_REQ,
+MSG_ID_GL1_LL1_GAP_STOP_CNF,
+MSG_ID_GL1_LL1_GAP_SUSPEND_REQ,
+MSG_ID_LL1_GL1_GAP_SUSPEND_CNF,
+MSG_ID_LL1_GL1_GAP_SUSPEND_REQ,
+MSG_ID_GL1_LL1_GAP_SUSPEND_CNF,
+MSG_ID_GL1_LL1_GAP_RESUME_IND,
+MSG_ID_LL1_GL1_GAP_RESUME_IND,
+MSG_ID_GL1_LL1_AUTO_GAP_REQ,
+MSG_ID_LL1_GL1_AUTO_GAP_CNF,
+MSG_ID_LL1_GL1_AUTO_GAP_IND,
+MSG_ID_GL1_LL1_AUTO_GAP_RES,
+MSG_ID_GL1_LL1_AUTO_GAP_STOP_REQ,
+MSG_ID_LL1_GL1_AUTO_GAP_STOP_IND,
+MSG_ID_GL1_LL1_AUTO_GAP_STOP_RES,
+MSG_ID_LL1_GL1_AUTO_GAP_STOP_CNF,
+MSG_ID_GL1_LL1_AUTO_GAP_END_IND,
+MSG_ID_LL1_GL1_AUTO_GAP_END_IND,
+MSG_ID_GL1_LL1_AUTO_GAP_AVAILABLE_IND,
+MSG_ID_LL1_GL1_AUTO_GAP_AVAILABLE_IND,
+MSG_ID_GL1_LL1_AUTO_GAP_UNAVAILABLE_IND,
+MSG_ID_LL1_GL1_AUTO_GAP_UNAVAILABLE_IND,
+MSG_ID_LL1_GL1_GAP_NOTIFY_IND,
+MSG_ID_GL1_LL1_GAP_PATTERN_IND,
+
+MSG_ID_LL1_UL1_SYNC_REQ,
+MSG_ID_UL1_LL1_SYNC_CNF,
+MSG_ID_UL1_LL1_RAT_STATUS_IND,
+MSG_ID_UL1_LL1_MODE_STATUS_IND,
+MSG_ID_LL1_UL1_MODE_STATUS_UPDATE_IND,
+MSG_ID_UL1_LL1_ACTIVE_MEASURE_STATUS_IND,
+MSG_ID_UL1_LL1_MEASURE_REQ,
+MSG_ID_UL1_LL1_STANDBY_MEASURE_DONE_IND,
+MSG_ID_LL1_UL1_GAP_SERVICE_REQ,
+MSG_ID_UL1_LL1_GAP_STOP_REQ,
+MSG_ID_LL1_UL1_GAP_STOP_CNF,
+MSG_ID_LL1_UL1_GAP_STOP_REQ,
+MSG_ID_UL1_LL1_GAP_STOP_CNF,
+MSG_ID_UL1_LL1_GAP_SUSPEND_REQ,
+MSG_ID_LL1_UL1_GAP_SUSPEND_CNF,
+MSG_ID_LL1_UL1_GAP_SUSPEND_REQ,
+MSG_ID_UL1_LL1_GAP_SUSPEND_CNF,
+MSG_ID_UL1_LL1_GAP_RESUME_IND,
+MSG_ID_LL1_UL1_GAP_RESUME_IND,
+MSG_ID_UL1_LL1_AUTO_GAP_REQ,
+MSG_ID_LL1_UL1_AUTO_GAP_CNF,
+MSG_ID_LL1_UL1_AUTO_GAP_IND,
+MSG_ID_UL1_LL1_AUTO_GAP_RES,
+MSG_ID_UL1_LL1_AUTO_GAP_STOP_REQ,
+MSG_ID_LL1_UL1_AUTO_GAP_STOP_IND,
+MSG_ID_UL1_LL1_AUTO_GAP_STOP_RES,
+MSG_ID_LL1_UL1_AUTO_GAP_STOP_CNF,
+MSG_ID_UL1_LL1_AUTO_GAP_END_IND,
+MSG_ID_LL1_UL1_AUTO_GAP_END_IND,
+MSG_ID_UL1_LL1_AUTO_GAP_AVAILABLE_IND,
+MSG_ID_LL1_UL1_AUTO_GAP_AVAILABLE_IND,
+MSG_ID_UL1_LL1_AUTO_GAP_UNAVAILABLE_IND,
+MSG_ID_LL1_UL1_AUTO_GAP_UNAVAILABLE_IND,
+MSG_ID_LL1_UL1_GAP_NOTIFY_IND,
+MSG_ID_UL1_LL1_GAP_PATTERN_IND,
+MSG_ID_LL1_UL1_SPECIFIC_GAP_IND,
+MSG_ID_LL1_UL1_GAP_STATUS_IND,
+
+MSG_ID_LL1_TL1_SYNC_REQ,
+MSG_ID_TL1_LL1_SYNC_CNF,
+MSG_ID_TL1_LL1_RAT_STATUS_IND,
+MSG_ID_TL1_LL1_MODE_STATUS_IND,
+MSG_ID_LL1_TL1_MODE_STATUS_UPDATE_IND,
+MSG_ID_TL1_LL1_ACTIVE_MEASURE_STATUS_IND,
+MSG_ID_TL1_LL1_MEASURE_REQ,
+MSG_ID_TL1_LL1_STANDBY_MEASURE_DONE_IND,
+MSG_ID_LL1_TL1_GAP_SERVICE_REQ,
+MSG_ID_TL1_LL1_GAP_STOP_REQ,
+MSG_ID_LL1_TL1_GAP_STOP_CNF,
+MSG_ID_LL1_TL1_GAP_STOP_REQ,
+MSG_ID_TL1_LL1_GAP_STOP_CNF,
+MSG_ID_TL1_LL1_GAP_SUSPEND_REQ,
+MSG_ID_LL1_TL1_GAP_SUSPEND_CNF,
+MSG_ID_LL1_TL1_GAP_SUSPEND_REQ,
+MSG_ID_TL1_LL1_GAP_SUSPEND_CNF,
+MSG_ID_TL1_LL1_GAP_RESUME_IND,
+MSG_ID_LL1_TL1_GAP_RESUME_IND,
+MSG_ID_TL1_LL1_AUTO_GAP_REQ,
+MSG_ID_LL1_TL1_AUTO_GAP_CNF,
+MSG_ID_LL1_TL1_AUTO_GAP_IND,
+MSG_ID_TL1_LL1_AUTO_GAP_RES,
+MSG_ID_TL1_LL1_AUTO_GAP_STOP_REQ,
+MSG_ID_LL1_TL1_AUTO_GAP_STOP_IND,
+MSG_ID_TL1_LL1_AUTO_GAP_STOP_RES,
+MSG_ID_LL1_TL1_AUTO_GAP_STOP_CNF,
+MSG_ID_TL1_LL1_AUTO_GAP_END_IND,
+MSG_ID_LL1_TL1_AUTO_GAP_END_IND,
+MSG_ID_TL1_LL1_AUTO_GAP_AVAILABLE_IND,
+MSG_ID_LL1_TL1_AUTO_GAP_AVAILABLE_IND,
+MSG_ID_TL1_LL1_AUTO_GAP_UNAVAILABLE_IND,
+MSG_ID_LL1_TL1_AUTO_GAP_UNAVAILABLE_IND,
+MSG_ID_LL1_TL1_GAP_NOTIFY_IND,
+MSG_ID_TL1_LL1_GAP_PATTERN_IND,
+
+MSG_ID_LL1_EL1_SYNC_REQ,
+MSG_ID_EL1_LL1_SYNC_CNF,
+MSG_ID_EL1_LL1_RAT_STATUS_IND,
+MSG_ID_EL1_LL1_MODE_STATUS_IND,
+MSG_ID_LL1_EL1_MODE_STATUS_UPDATE_IND,
+MSG_ID_EL1_LL1_ACTIVE_MEASURE_STATUS_IND,
+MSG_ID_EL1_LL1_MEASURE_REQ,
+MSG_ID_EL1_LL1_STANDBY_MEASURE_DONE_IND,
+MSG_ID_LL1_EL1_GAP_SERVICE_REQ,
+MSG_ID_EL1_LL1_GAP_STOP_REQ,
+MSG_ID_LL1_EL1_GAP_STOP_CNF,
+MSG_ID_LL1_EL1_GAP_STOP_REQ,
+MSG_ID_EL1_LL1_GAP_STOP_CNF,
+MSG_ID_EL1_LL1_GAP_SUSPEND_REQ,
+MSG_ID_LL1_EL1_GAP_SUSPEND_CNF,
+MSG_ID_LL1_EL1_GAP_SUSPEND_REQ,
+MSG_ID_EL1_LL1_GAP_SUSPEND_CNF,
+MSG_ID_EL1_LL1_GAP_RESUME_IND,
+MSG_ID_LL1_EL1_GAP_RESUME_IND,
+MSG_ID_EL1_LL1_AUTO_GAP_REQ,
+MSG_ID_LL1_EL1_AUTO_GAP_CNF,
+MSG_ID_LL1_EL1_AUTO_GAP_IND,
+MSG_ID_EL1_LL1_AUTO_GAP_RES,
+MSG_ID_EL1_LL1_AUTO_GAP_STOP_REQ,
+MSG_ID_LL1_EL1_AUTO_GAP_STOP_IND,
+MSG_ID_EL1_LL1_AUTO_GAP_STOP_RES,
+MSG_ID_LL1_EL1_AUTO_GAP_STOP_CNF,
+MSG_ID_EL1_LL1_AUTO_GAP_END_IND,
+MSG_ID_LL1_EL1_AUTO_GAP_END_IND,
+MSG_ID_EL1_LL1_AUTO_GAP_AVAILABLE_IND,
+MSG_ID_LL1_EL1_AUTO_GAP_AVAILABLE_IND,
+MSG_ID_EL1_LL1_AUTO_GAP_UNAVAILABLE_IND,
+MSG_ID_LL1_EL1_AUTO_GAP_UNAVAILABLE_IND,
+MSG_ID_LL1_EL1_GAP_NOTIFY_IND,
+MSG_ID_EL1_LL1_TIMING_UPDATE_IND,
+#if (CUR_GEN >= MD_GEN95)
+MSG_ID_LL1_EL1_RPG_GAP_NOTIFY_IND,
+#endif
+MSG_ID_EL1_LL1_GAP_PATTERN_IND,
+MSG_ID_LL1_EL1_C2K_TIME_INFO_REQ,
+MSG_ID_EL1_LL1_C2K_TIME_INFO_CNF,
+MSG_ID_LL1_EL1_GAP_STATUS_IND,
+
+#ifdef __EL1_IT__
+MSG_ID_MLL1_IRT_SYNC_TMR,
+MSG_ID_MLL1_EXPAND_PERIOD_TMR,
+#endif /*__EL1_IT__*/
+
+MSG_ID_CL1_LL1_RAT_STATUS_IND,
+MSG_ID_CL1_LL1_MODE_STATUS_IND,
+MSG_ID_LL1_CL1_MODE_STATUS_UPDATE_IND,
+MSG_ID_CL1_LL1_ACTIVE_MEASURE_STATUS_IND,
+MSG_ID_CL1_LL1_MEASURE_REQ,
+MSG_ID_CL1_LL1_STANDBY_MEASURE_DONE_IND,
+MSG_ID_LL1_CL1_GAP_SERVICE_REQ,
+MSG_ID_CL1_LL1_GAP_STOP_REQ,
+MSG_ID_LL1_CL1_GAP_STOP_CNF,
+MSG_ID_LL1_CL1_GAP_STOP_REQ,
+MSG_ID_CL1_LL1_GAP_STOP_CNF,
+MSG_ID_LL1_CL1_GAP_SUSPEND_REQ,
+MSG_ID_CL1_LL1_GAP_SUSPEND_CNF,
+MSG_ID_LL1_CL1_GAP_RESUME_IND,
+MSG_ID_CL1_LL1_AUTO_GAP_REQ,
+MSG_ID_LL1_CL1_AUTO_GAP_CNF,
+MSG_ID_LL1_CL1_AUTO_GAP_IND,
+MSG_ID_CL1_LL1_AUTO_GAP_RES,
+MSG_ID_LL1_CL1_AUTO_GAP_STOP_IND,
+MSG_ID_CL1_LL1_AUTO_GAP_STOP_RES,
+MSG_ID_CL1_LL1_AUTO_GAP_END_IND,
+MSG_ID_LL1_CL1_AUTO_GAP_END_IND,
+MSG_ID_LL1_CL1_AUTO_GAP_AVAILABLE_IND,
+MSG_ID_LL1_CL1_AUTO_GAP_UNAVAILABLE_IND,
+MSG_ID_LL1_CL1_GAP_NOTIFY_IND,
+MSG_ID_CL1_LL1_GAP_PATTERN_IND,
+MSG_ID_CL1_LL1_SIB8_TIMING_SYNC_REQ,
+MSG_ID_LL1_CL1_SIB8_TIMING_SYNC_CNF,
+MSG_ID_CL1_LL1_SPECIFIC_GAP_IND,
+
+MSG_ID_LL1_NL1_SYNC_REQ,
+MSG_ID_NL1_LL1_SYNC_CNF,
+MSG_ID_NL1_LL1_RAT_STATUS_IND,
+MSG_ID_NL1_LL1_MODE_STATUS_IND,
+MSG_ID_LL1_NL1_MODE_STATUS_UPDATE_IND,
+MSG_ID_NL1_LL1_ACTIVE_MEASURE_STATUS_IND,
+MSG_ID_NL1_LL1_MEASURE_REQ,
+MSG_ID_NL1_LL1_STANDBY_MEASURE_DONE_IND,
+MSG_ID_LL1_NL1_GAP_SERVICE_REQ,
+MSG_ID_NL1_LL1_GAP_STOP_REQ,
+MSG_ID_LL1_NL1_GAP_STOP_CNF,
+MSG_ID_LL1_NL1_GAP_STOP_REQ,
+MSG_ID_NL1_LL1_GAP_STOP_CNF,
+MSG_ID_NL1_LL1_GAP_SUSPEND_REQ,
+MSG_ID_LL1_NL1_GAP_SUSPEND_CNF,
+MSG_ID_LL1_NL1_GAP_SUSPEND_REQ,
+MSG_ID_NL1_LL1_GAP_SUSPEND_CNF,
+MSG_ID_NL1_LL1_GAP_RESUME_IND,
+MSG_ID_LL1_NL1_GAP_RESUME_IND,
+MSG_ID_LL1_NL1_GAP_NOTIFY_IND,
+MSG_ID_NL1_LL1_GAP_PATTERN_IND,
+MSG_ID_NL1_LL1_AUTO_GAP_REQ,
+MSG_ID_LL1_NL1_AUTO_GAP_CNF,
+MSG_ID_LL1_NL1_AUTO_GAP_IND,
+MSG_ID_NL1_LL1_AUTO_GAP_RES,
+MSG_ID_NL1_LL1_AUTO_GAP_STOP_REQ,
+MSG_ID_LL1_NL1_AUTO_GAP_STOP_IND,
+MSG_ID_NL1_LL1_AUTO_GAP_STOP_RES,
+MSG_ID_LL1_NL1_AUTO_GAP_STOP_CNF,
+MSG_ID_NL1_LL1_AUTO_GAP_END_IND,
+MSG_ID_LL1_NL1_AUTO_GAP_END_IND,
+MSG_ID_NL1_LL1_AUTO_GAP_AVAILABLE_IND,
+MSG_ID_LL1_NL1_AUTO_GAP_AVAILABLE_IND,
+MSG_ID_NL1_LL1_AUTO_GAP_UNAVAILABLE_IND,
+MSG_ID_LL1_NL1_AUTO_GAP_UNAVAILABLE_IND,
+MSG_ID_NL1_LL1_GET_LTE_TIMING_INFO_REQ,
+MSG_ID_LL1_NL1_GET_LTE_TIMING_INFO_CNF,
+
+
+/* [ENDC] */
+MSG_ID_NL1_LL1_ENDC_STATUS_IND, // inform MLL1 EN-DC ON/OFF and current NR cell time/FRC.
+MSG_ID_LL1_NL1_ENDC_GAP_CONFIG_IND, // LL1 inform NL1 the LTE gap start time, NR time, FRC, gap period
+MSG_ID_EL1_LL1_ENDC_GAP_CONFIG_IND, // EL1 inform LL1 the LTE gap start time, NR time, FRC, gap period
+MSG_ID_LL1_NL1_ENDC_AUTO_GAP_REQ,
+MSG_ID_LL1_NL1_ENDC_AUTO_GAP_END_IND,
+MSG_ID_NL1_LL1_ENDC_AUTO_GAP_CNF,
+MSG_ID_EL1_LL1_ENDC_AUTO_GAP_REQ,
+MSG_ID_EL1_LL1_ENDC_AUTO_GAP_END_IND,
+
+/* inter-RAT RSTD */
+MSG_ID_NL1_LL1_GAP_CONFIG_IND, // NL1 inform LL1 the gap config
+MSG_ID_LL1_EL1_GAP_CONFIG_IND, // LL1 inform EL1 the NR gap start time, gap config
+
+MODULE_MSG_END( MSG_ID_MLL1_MSG_CODE_TAIL )
+
+#ifdef _Test_Hdr_On_PC
+	};
+#endif
+#endif /*_MLL1_MSG_H*/
diff --git a/mcu/interface/sap/md/mm_msgid.h b/mcu/interface/sap/md/mm_msgid.h
new file mode 100644
index 0000000..6cf9fd1
--- /dev/null
+++ b/mcu/interface/sap/md/mm_msgid.h
@@ -0,0 +1,747 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   mm.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   MM 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!
+ *
+ * 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!
+ *
+ * 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!
+ * 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!
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN()
+ * removed!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _MM_MSG_H
+#define _MM_MSG_H
+
+/*----------------------- MM_MSG_CODE_BEGIN------------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_MM_CODE_BEGIN )
+/* mesage received from TIMER at MMTIMER SAP */
+/*TBD*/
+
+/* messages received from CC at MMCC sap */
+    MSG_ID_MMCC_PROMPT_REJ = MSG_ID_MM_CODE_BEGIN,
+    MSG_ID_MMCC_PROMPT_RSP,
+    MSG_ID_MMCC_REL_REQ,
+    MSG_ID_MMCC_EST_REQ,
+    MSG_ID_MMCC_REEST_REQ,
+    MSG_ID_MMCC_DATA_REQ,
+    MSG_ID_MMCC_START_CALL_REQ,
+    MSG_ID_MMCC_ABORT_CALL_REQ,
+    MSG_ID_MMCC_SRVCC_EST_REQ,
+    MSG_ID_MMCC_SRVCC_ABORT_REQ,
+    MSG_ID_MMCC_SETUP_CNF,
+    MSG_ID_MMCC_SETUP_COMPL_IND,
+
+/* messages received from SS at MMSS sap */
+    MSG_ID_MMSS_EST_REQ,
+    MSG_ID_MMSS_DATA_REQ,
+    MSG_ID_MMSS_REL_REQ,
+#ifdef __LTE_RAT__    
+    MSG_ID_MMSS_EAFR_REQ,
+#endif    
+/* messages received from SMS at MMSMS sap*/
+    MSG_ID_MMSMS_REL_REQ,
+    MSG_ID_MMSMS_DATA_REQ,
+    MSG_ID_MMSMS_EST_REQ,
+    MSG_ID_GMMREG_CS_VOICE_CALL_PROTECTION_REQ,
+/* messages received from RAC at GMMREG  sap */
+    //MSG_ID_GMMREG_PLMN_SEARCH_REQ,
+    MSG_ID_GMMREG_INIT_REQ,
+    //MSG_ID_GMMREG_SEL_MODE_REQ,
+    MSG_ID_GMMREG_RFOFF_REQ,
+    MSG_ID_GMMREG_SET_ROAMING_MODE_REQ,
+    //MSG_ID_GMMREG_SET_PREFER_RAT_REQ,
+    //MSG_ID_GMMREG_PLMN_LIST_REQ,
+    //MSG_ID_GMMREG_PLMN_LIST_STOP_REQ,
+    //MSG_ID_GMMREG_CSG_LIST_REQ,
+    //MSG_ID_GMMREG_CSG_LIST_STOP_REQ,
+    MSG_ID_GMMREG_SET_GPRS_TRANSFER_PREFERENCE_REQ,
+    MSG_ID_GMMREG_SET_PREFERRED_BAND_REQ,   /* mtk02475: for set band without reboot*/
+    MSG_ID_GMMREG_END_PS_DATA_SESSION_REQ, //mtk02475: for Fast Dormancy
+    MSG_ID_GMMREG_ACTIVE_SIM_INFO_REQ,  //for DSDS ,ps on which sim
+    MSG_ID_GMMREG_SET_IMS_VOICE_TERMINATION_REQ,
+    MSG_ID_GMMREG_SET_IMS_VOICE_AVAILABILITY_REQ,
+#if defined (__GEMINI__)
+    MSG_ID_GMMREG_SIM_STATUS_UPDATE_REQ,
+#endif
+#ifdef __LTE_RAT__
+    MSG_ID_GMMREG_CSFB_PAGE_RSP,
+#endif
+    MSG_ID_GMMREG_SET_PGCHECK_REQ,
+    MSG_ID_GMMREG_DUPLEX_MODE_CHANGE_REQ,
+    MSG_ID_GMMREG_ARAL_UPDATE_REQ,
+    MSG_ID_GMMREG_DATA_ALLOW_REQ,
+#ifdef __GEMINI__
+    MSG_ID_GMMREG_RSIM_AUTH_ABORT_REQ,
+    MSG_ID_MM_RATCM_RSIM_DATA_ABORT_CNF,
+    MSG_ID_GMMREG_RSIM_AKA_STATUS_REQ,
+    MSG_ID_GMMREG_RSIM_AKA_RSIM_ACCESS_FOR_AUTH_DOWNLOAD_REQ,
+#endif /* __GEMINI__ */
+    MSG_ID_GMMREG_PTMSI_CLEAR_REQ,
+    MSG_ID_GMMREG_LOCI_CLEAR_REQ,
+    MSG_ID_GMMREG_ELEVATOR_MODE_REQ,
+
+/* messages received from EMM at MM_EMM sap */
+    MSG_ID_MM_EMM_INIT_NAS_CTXT_IND,
+    MSG_ID_MM_EMM_EMM_UPDATE_REGISTRATION_IND,
+    MSG_ID_MM_EMM_EMM_UPDATE_DEREGISTRATION_IND,
+    MSG_ID_MM_EMM_CSFB_CNF,
+    MSG_ID_MM_EMM_CSFB_PAGE_IND,
+    MSG_ID_MM_EMM_ISR_UPDATE_IND,
+#if 0
+/* under construction !*/
+#endif
+    MSG_ID_EMM_MM_NAS_CTXT_TRANSFER_REQ,
+#if defined (__SGLTE__)
+    MSG_ID_MM_EMM_PEER_LR_HANDLE_PREPARATION_CNF,
+    MSG_ID_MM_EMM_PEER_LR_RESULT_IND,
+    /*from 2G MM to 3G MM, or from 3G MM to 2G MM*/
+    MSG_ID_MM_MM_PEER_LR_HANDLE_PREPARATION_REQ,
+    MSG_ID_MM_MM_PEER_LR_HANDLE_PREPARATION_CNF,
+    MSG_ID_MM_MM_PEER_LR_RESULT_IND,
+#endif
+/* messages received from NWSEL at NWSEL_MM sap */
+    MSG_ID_NWSEL_MM_PLMN_LIST_REQ,
+    MSG_ID_NWSEL_MM_PLMN_LIST_STOP_REQ,
+    MSG_ID_NWSEL_MM_CSG_LIST_REQ,
+    MSG_ID_NWSEL_MM_CSG_LIST_STOP_REQ,
+    MSG_ID_NWSEL_MM_RESUME_REQ,
+    MSG_ID_NWSEL_MM_CELL_GLOBAL_IDENTITY_INFO_UPDATE_REQ,
+    MSG_ID_NWSEL_MM_SYS_INFO_UPDATE_REQ,
+    MSG_ID_NWSEL_MM_REGN_STATUS_UPDATE_REQ,
+    MSG_ID_NWSEL_MM_HPLMN_INFO_UPDATE_REQ,
+    /* 24.008 CR# 2109 Start */
+    MSG_ID_NWSEL_MM_MANUAL_MODE_UPDATE_REQ,
+    /* 24.008 CR# 2109 End */
+    /* #ifdef __LTE_RAT__ */
+    MSG_ID_NWSEL_MM_SEARCH_STATUS_UPDATE_REQ,
+    MSG_ID_NWSEL_MM_EUTRAN_CAP_UPDATE_REQ,
+    MSG_ID_NWSEL_MM_EUTRAN_CAP_ABORT_REQ,
+    MSG_ID_NWSEL_MM_VOICE_PREFER_UE_USAGE_UPDATE_REQ,
+    /* #endif */
+    MSG_ID_NWSEL_MM_INVALID_SIM_RECOVER_REQ,
+    MSG_ID_NWSEL_MM_CLEAR_FPLMNGPRS_INFO_REQ,
+    MSG_ID_NWSEL_MM_SET_MRU_REQ,
+    MSG_ID_NWSEL_MM_CLEAR_MRU_REQ,
+    MSG_ID_NWSEL_MM_ARAL_UPDATE_REQ,
+    MSG_ID_NWSEL_MM_CSG_AUTO_SEARCH_MODE_REQ,
+    MSG_ID_NWSEL_MM_GLOBAL_MODE_CHANGE_START_REQ,
+    MSG_ID_NWSEL_MM_C2K_FORCE_TO_LOCAL_DETACH_REQ,
+    MSG_ID_NWSEL_MM_C2K_NORMAL_SERVICE_REQ,
+    MSG_ID_NWSEL_MM_EMC_FORBIDDEN_NW_LIST_UPDATE_REQ,
+    MSG_ID_NWSEL_MM_PLMN_LIST_STATUS_UPDATE_REQ,
+    MSG_ID_NWSEL_MM_NEED_DUPLEX_MODE_CHG_UPDATE_REQ,
+    MSG_ID_NWSEL_MM_CLEAR_FORBIDDEN_LAI_LIST_REQ,
+    MSG_ID_NWSEL_MM_RAT_DISABLE_CONFIG_REQ,
+
+/* message received from SIM GMM_SIM_SAP */
+/*TBD*/
+
+/* message received from SMS GMM_SMS_SAP*/
+    MSG_ID_GMMSMS_EST_REQ,
+    MSG_ID_GMMSMS_UNITDATA_REQ,
+
+/* message received from SM GMM_SM_SAP */
+    MSG_ID_GMMSM_UNITDATA_REQ,
+    MSG_ID_GMMSM_NSAPI_STATUS_REQ,
+    MSG_ID_GMMSM_DUAL_PRIORITY_CONFIG_REQ,
+    MSG_ID_GMMSM_ATTACH_REQ,
+    MSG_ID_GMMSM_EST_REQ,
+    MSG_ID_GMMSM_ISR_DEACTIVATE_REQ,  // __LTE_RAT__    ISR Deactivate
+#ifdef __GEMINI__
+    MSG_ID_GMMSM_SESSION_BEGIN_REQ,
+    MSG_ID_GMMSM_SESSION_END_REQ,
+#endif
+    MSG_ID_GMMSM_EVENT_REPORT_REQ,
+/* message received from RABM at GMM_RABM_SAP*/
+/*TBD*/
+
+/* message received from SIM at MM_SIM_SAP*/
+/*TBD*/
+
+/* Temporarily Added the TC MSG_IDs here */
+/*TBD*/
+
+/* messages received from RATDM at MM_RATDM_SAP */
+    MSG_ID_MM_RATDM_SEQUENCE_CNF,
+    MSG_ID_MM_RATDM_REESTABLISH_RAB_IND,
+    MSG_ID_MM_RATDM_SEND_USER_DATA_IND,
+    MSG_ID_MM_RATDM_RAB_RELEASE_IND,
+
+/* messages received from RATCM at MM_RATCM_SAP */
+    MSG_ID_MM_RATCM_INIT_CNF,
+    MSG_ID_MM_RATCM_RFOFF_CNF,
+    MSG_ID_MM_RATCM_PLMN_SEARCH_CNF,
+    MSG_ID_MM_RATCM_SET_IMEI_REQ,
+    MSG_ID_MM_RATCM_CELL_GLOBAL_IDENTITY_INFO_IND,
+    MSG_ID_MM_RATCM_PLMN_LOSS_IND,
+    MSG_ID_MM_RATCM_OUT_OF_SERVICE_IND,
+    MSG_ID_MM_RATCM_PLMN_LIST_CNF,
+    MSG_ID_MM_RATCM_PLMN_LIST_STOP_CNF,
+    MSG_ID_MM_RATCM_CSG_LIST_CNF,
+    MSG_ID_MM_RATCM_CSG_LIST_STOP_CNF,
+    MSG_ID_MM_RATCM_CELL_CHANGE_START_IND,
+    MSG_ID_MM_RATCM_CELL_CHANGE_FINISH_IND,
+    MSG_ID_MM_RATCM_PAGE_IND,
+    MSG_ID_MM_RATCM_SYNC_IND,
+    MSG_ID_MM_RATCM_SECURITY_MODE_COMPLETE_IND,
+    MSG_ID_MM_RATCM_SECURITY_MODE_CHANGE_IND,
+    MSG_ID_MM_RATCM_CONN_EST_CNF,
+    MSG_ID_MM_RATCM_CONN_EST_IND,
+    MSG_ID_MM_RATCM_CONN_REL_CNF,
+    MSG_ID_MM_RATCM_CONN_REL_IND,
+    MSG_ID_MM_RATCM_CONN_LOSS_IND,
+    MSG_ID_MM_RATCM_CONN_ABORT_IND,
+    MSG_ID_MM_RATCM_READY_TIMER_UPDATE_IND,
+    MSG_ID_MM_RATCM_CS_DATA_IND,
+    MSG_ID_MM_RATCM_PS_DATA_CNF,
+    MSG_ID_MM_RATCM_PS_DATA_IND,
+    MSG_ID_MM_RATCM_RESET_KEYS_IND,
+    MSG_ID_MM_RATCM_T3122_TIMEOUT_IND,
+    MSG_ID_MM_RATCM_CCO_ACTIVATION_TIME_TIMEOUT_IND,
+    MSG_ID_MM_RATCM_END_PS_DATA_SESSION_CNF,  /* MAUI_02852442, __NO_PSDATA_SEND_SCRI__ */
+    MSG_ID_MM_RATCM_SERVICE_ACCEPT_NOTIFY_REQ,
+#ifdef __GEMINI__
+    MSG_ID_MM_RATCM_SUSPEND_IND,
+    MSG_ID_MM_RATCM_RESUME_IND,
+    MSG_ID_MM_RATCM_VIRTUAL_MODE_IND,    
+#endif
+    MSG_ID_MM_RATCM_CS_STATUS_UPDATE_REQ,
+    MSG_ID_MM_RATCM_LCS_PROC_START_IND,
+    MSG_ID_MM_RATCM_LCS_PROC_END_IND,
+    MSG_ID_MM_RATCM_LLC_PSHO_IND,
+    MSG_ID_MM_RATCM_PS_HO_SUCCESS_IND,
+    MSG_ID_MM_RATCM_SIGNAL_APPEAR_IND,
+    MSG_ID_MM_RATCM_LOCAL_RELEASE_IND, /* solve local release status asynchronization between UE and NW */
+    //Add for LTE multimode
+    MSG_ID_MM_RATCM_DEACTIVATE_CNF,
+    MSG_ID_MM_RATCM_EUTRAN_CAP_UPDATE_CNF,
+    //End of LTE multimode
+    MSG_ID_MM_RATCM_RRC_STATE_IND,
+    MSG_ID_MM_RATCM_IDLE_OUT_OF_SERVICE_IND,
+    MSG_ID_MM_RATCM_START_TEST_MODE_IND,
+    MSG_ID_MM_RATCM_STOP_TEST_MODE_IND,
+    MSG_ID_MM_RATCM_DUPLEX_MODE_CHANGE_CNF,
+    MSG_ID_MM_RATCM_SET_MRU_CNF,
+    MSG_ID_MM_RATCM_PLMN_FOUND_IND,
+    MSG_ID_MM_RATCM_CALL_STATUS_IND,
+    MSG_ID_MM_RATCM_CS_DATA_CNF,
+    MSG_ID_GMMREG_SET_MS_SV_REQ, 
+    MSG_ID_MM_RATCM_RRCE_RELEASE_PROCESSED_IND,
+    MSG_ID_GMMREG_CELLULAR_NETWORK_CONFIG_REQ,	
+    MSG_ID_NWSEL_MM_MANUAL_SEARCH_STOP_REQ,
+	MSG_ID_GMMREG_CSFB_PAGE_CONFIG_REQ,
+	MSG_ID_MM_EMM_CSFB_RESULT_IND,
+    MSG_ID_GMMSM_PS_CONNECTION_RELEASE_REQ,
+    MSG_ID_MM_RATCM_FORCE_CONN_RELEASE_REQ,
+    MSG_ID_NWSEL_MM_SERVICE_RECOVERY_ROUND_UPDATE_REQ,
+    MSG_ID_NWSEL_MM_INACTIVE_MODE_CONFIGURATION_REQ,
+    MSG_ID_NWSEL_MM_SCREEN_ON_REQ,
+    MSG_ID_NWSEL_MM_SCREEN_OFF_REQ,
+    MSG_ID_GMMREG_LTE_NORMAL_SERVICE_LOSS_UPDATE_REQ,
+	MSG_ID_MM_RATCM_END_PS_DATA_SESSION_IND,
+	MSG_ID_MM_RATCM_PLMN_SCAN_IND,
+#if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)
+    MSG_ID_GMMREG_SET_TIMER_REQ,
+    MSG_ID_GMMREG_SET_ECALL_REGISTRATION_REQ,
+#endif
+	MSG_ID_NWSEL_MM_PLMN_INFO_UPDATE_REQ,
+    MSG_ID_MM_CODE_END =  MSG_ID_NWSEL_MM_PLMN_INFO_UPDATE_REQ,
+MODULE_MSG_END( MSG_ID_MM_CODE_TAIL )
+
+/*----------------------- MM_MSG_CODE_END--------------------*/
+
+#endif  //_MM_MSG_H
diff --git a/mcu/interface/sap/md/mmrf_msgid.h b/mcu/interface/sap/md/mmrf_msgid.h
new file mode 100644
index 0000000..ee30204
--- /dev/null
+++ b/mcu/interface/sap/md/mmrf_msgid.h
@@ -0,0 +1,161 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   mmrf_msgid.h
+ *
+ * Project:
+ * --------
+ *   TK6291
+ *
+ * Description:
+ * ------------
+ *   MML1 RF 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!!
+ *============================================================================
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef MMRF_MSGID_H
+#define MMRF_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_MMRF_CODE_BEGIN )
+MSG_ID_MMRF_POC_2G_REQ = MSG_ID_MMRF_CODE_BEGIN,
+MSG_ID_MMRF_POC_3GFDD_REQ,
+MSG_ID_MMRF_POC_3GTDD_REQ,
+MSG_ID_MMRF_POC_LTE_REQ,
+MSG_ID_MMRF_POC_C2K_REQ,
+MSG_ID_MMRF_NVRAM_READ_REQ,
+MSG_ID_MMRF_NVRAM_WRITE_REQ,
+MSG_ID_MMRF_UPDATE_RUNTIME_REQ,
+MSG_ID_MMRF_UPDATE_RUNTIME_CNF,
+MSG_ID_MMRFTST_REQ,
+MSG_ID_MMRFTST_CNF,
+MSG_ID_MMRF_TEMPERATURE_REQ,
+MSG_ID_MMRF_REGULAR_TRACE_REQ,
+MSG_ID_MMRF_BOOTUP_RFC_REQ,
+MSG_ID_MMRF_BOOTUP_RFC_CNF,
+MSG_ID_MMRF_RFD_INIT_DONE_CNF,
+MSG_ID_L4C_MMRF_BOOTUP_RFC_INFO_REQ,
+MSG_ID_L4C_MMRF_BOOTUP_RFC_INFO_CNF,
+MSG_ID_MMTST_INFORM_CAL_DATA_DL_STATUS,
+MSG_ID_MMRFTST_WAKEUP,
+//Script test messages
+MSG_ID_MMRF_SCRIPT_TEST_INIT_IND,
+MSG_ID_MMRF_SCRIPT_TEST_START_IND,
+MSG_ID_MMRF_SCRIPT_TEST_EXEC_IND,
+MSG_ID_MMRF_SCRIPT_TEST_FINISH_IND,
+MSG_ID_MMRF_SCRIPT_TEST_END_IND,
+MSG_ID_L4C_MMRF_GET_RF_STATUS_REQ,
+MSG_ID_L4C_MMRF_GET_RF_STATUS_CNF,
+MODULE_MSG_END( MSG_ID_MMRF_CODE_TAIL )
+
+#endif
+
diff --git a/mcu/interface/sap/md/mmrf_pcore_msgid.h b/mcu/interface/sap/md/mmrf_pcore_msgid.h
new file mode 100644
index 0000000..f4e3368
--- /dev/null
+++ b/mcu/interface/sap/md/mmrf_pcore_msgid.h
@@ -0,0 +1,77 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   mmrf_pcore_msgid.h
+ *
+ * Project:
+ * --------
+ *   TK6291
+ *
+ * Description:
+ * ------------
+ *   MML1 RF related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *============================================================================
+ *             HISTORY
+ * Below this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *----------------------------------------------------------------------------
+ * removed!
+ * removed!
+ * removed!
+ *
+ *----------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef MMRF_PCORE_MSGID_H
+#define MMRF_PCORE_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_MMRF_PCORE_CODE_BEGIN )
+MSG_ID_MMRF_PCORE_MMTST_REQ = MSG_ID_MMRF_PCORE_CODE_BEGIN, //Temp add, can modify it if needed
+MODULE_MSG_END( MSG_ID_MMRF_PCORE_CODE_TAIL )
+
+#endif
+
diff --git a/mcu/interface/sap/md/mrs_msgid.h b/mcu/interface/sap/md/mrs_msgid.h
new file mode 100644
index 0000000..1958a1e
--- /dev/null
+++ b/mcu/interface/sap/md/mrs_msgid.h
@@ -0,0 +1,216 @@
+/*****************************************************************************
+*  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) 2007
+*
+*  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:
+ * ---------
+ *   mrs_msgid.h
+ *
+ * Project:
+ * --------
+ *   Multimode
+ *
+ * Description:
+ * ------------
+ *   This file is intends for MRS SAP definition.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *===========================================================================
+ * 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!
+ *
+ *===========================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _MRS_MSG_H
+#define _MRS_MSG_H
+
+#ifdef __SOURCE_INSIGHT_PARSE__
+typedef enum {
+#endif
+
+MODULE_MSG_BEGIN( MSG_ID_MRS_CODE_BEGIN )
+
+MSG_ID_MRS_AS_CSG_WHITE_LIST_UPDATE_IND = MSG_ID_MRS_CODE_BEGIN,
+MSG_ID_MRS_LOWER_LAYER_AVAILABILITY_UPDATE_IND, 
+MSG_ID_MRS_GAS_LOWER_LAYER_AVAILABILITY_UPDATE_REQ,
+MSG_ID_MRS_UAS_LOWER_LAYER_AVAILABILITY_UPDATE_REQ,
+MSG_ID_MRS_EAS_LOWER_LAYER_AVAILABILITY_UPDATE_REQ,
+MSG_ID_MRS_GAS_BAND_SETTING_UPDATE_IND,
+MSG_ID_MRS_UAS_BAND_SETTING_UPDATE_IND,
+MSG_ID_MRS_EAS_BAND_SETTING_UPDATE_IND,
+
+MSG_ID_MRS_UAS_ADD_BLACK_CELL_IND,
+MSG_ID_MRS_GAS_ADD_BLACK_CELL_IND,
+MSG_ID_MRS_UAS_CLEAR_BLACK_CELL_IND,
+MSG_ID_MRS_GAS_CLEAR_BLACK_CELL_IND,
+
+MSG_ID_MRS_EAS_BAND_CTRL_IND,
+MSG_ID_MRS_CAS_OCCUPY_LLA_REQ,
+MSG_ID_MRS_CAS_RELEASE_LLA_REQ,
+MSG_ID_MRS_CAS_GET_LLA_OCCUPY_RAT_REQ,
+MSG_ID_RAC_MRS_INIT_REQ,
+MSG_ID_RAC_MRS_INIT_CNF,
+MSG_ID_RAC_MRS_MD_SIM_CONFIG_REQ,
+MSG_ID_MRS_EAS_SBP_RECONFIG_REQ,
+MSG_ID_MRS_EAS_SBP_RECONFIG_CNF,
+MSG_ID_MRS_UAS_UMTS_HO_INFO_RSP,
+#ifdef __GEMINI_LTE__
+MSG_ID_MRS_EAS_SIM_SWITCH_REQ,
+MSG_ID_MRS_EAS_SIM_SWITCH_CNF,
+#endif/*__GEMINI_LTE__*/
+MSG_ID_MRS_NRRC_SBP_RECONFIG_REQ,
+MSG_ID_MRS_NRRC_SBP_RECONFIG_CNF,
+
+MSG_ID_MRS_DUMP_BAND_QUERY_IND,
+MSG_ID_MRS_EAS_SRCH_INFO_BAND_IND,
+MSG_ID_MRS_EAS_SRCH_INFO_FREQ_IND,
+MSG_ID_MRS_EAS_SRCH_INFO_CELL_IND,
+MSG_ID_MRS_ARFCN_PREDICT_UTIL_UT_RESULT_IND,
+MSG_ID_MRS_ARFCN_PREDICT_UTIL_CONFIG,
+MSG_ID_MRS_MCC_AI_RESULT_IND,
+MSG_ID_MRS_UAS_TRIGGER_SYNC_UP_REQ,
+MSG_ID_MRS_UAS_TRIGGER_UNLOCK_REQ,
+MSG_ID_MRS_L4C_CAPABILITY_UPDATE_IND,
+MSG_ID_MRS_DUMP_VG_ROAMING_CONFIG_IND,
+MSG_ID_MRS_DUMP_RAT_CAPABILITY_CONFIG_IND,
+
+MSG_ID_MRS_CODE_END = MSG_ID_MRS_DUMP_RAT_CAPABILITY_CONFIG_IND,
+
+
+MODULE_MSG_END( MSG_ID_MRS_CODE_TAIL )
+
+#ifdef __SOURCE_INSIGHT_PARSE__
+};
+#endif
+
+#endif   //_MRS_MSG_H
diff --git a/mcu/interface/sap/md/mspm_msgid.h b/mcu/interface/sap/md/mspm_msgid.h
new file mode 100644
index 0000000..a5cf8d3
--- /dev/null
+++ b/mcu/interface/sap/md/mspm_msgid.h
@@ -0,0 +1,68 @@
+/******************************************************************************
+*  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).
+*
+*******************************************************************************/
+ 
+#ifndef MSPM_MSGID_H
+#define MSPM_MSGID_H
+ 
+#include "module_msg_range.h"
+ 
+/********************************************
+ *                  MACROS                  *
+ ********************************************/
+ 
+ 
+/********************************************
+ *         TYPE DEFINITIONS & ENUMS         *
+ ********************************************/
+MODULE_MSG_BEGIN(MSG_ID_MSPM_CODE_BEGIN)
+
+    MSG_ID_MSPM_SESSION_START_NTF = MSG_ID_MSPM_CODE_BEGIN,
+    MSG_ID_MSPM_SESSION_END_NTF,
+    MSG_ID_MSPM_AS_SESSION_START_REQ,
+    MSG_ID_MSPM_AS_SESSION_START_CNF,
+    MSG_ID_MSPM_AS_SESSION_END_NTF,
+    MSG_ID_MSPM_RF_OWNER_PRIORITY_CHANGE_NTF,
+    MSG_ID_MSPM_RF_OWNER_CHANGE_NTF,
+    MSG_ID_MSPM_CONTEXT_DUMP,
+    MSG_ID_MSPM_AS_LEAVE_VC_SUSPEND_REQ,
+    MSG_ID_MSPM_SESSION_START_REQ,
+    MSG_ID_MSPM_SESSION_START_CNF,
+    MSG_ID_MSPM_PRE_GEMINI_ABORT_IND,
+    MSG_ID_MSPM_XL1_DR_STATUS_IND,
+    MSG_ID_MSPM_CODE_END = MSG_ID_MSPM_XL1_DR_STATUS_IND,
+
+MODULE_MSG_END(MSG_ID_MSPM_CODE_TAIL) 
+ 
+#endif /* MSPM_MSGID_H */
diff --git a/mcu/interface/sap/md/mtf_msgid.h b/mcu/interface/sap/md/mtf_msgid.h
new file mode 100644
index 0000000..e5ede56
--- /dev/null
+++ b/mcu/interface/sap/md/mtf_msgid.h
@@ -0,0 +1,114 @@
+/*****************************************************************************
+*  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:
+ * ------------
+ *   mtf_msgid.h
+ *
+ * Project:
+ * ------------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   This file defines the identities of the messages received by MTF.
+ * 
+ *
+ * Author:
+ * -----------
+ * -------
+ *
+ *===========================================================
+ * $Log$
+ *
+ * 06 17 2022 bingking.li
+ * [MOLY00778775] NR->NRºÍNR->LTEÇл»ÓÅ»¯Âñµãµ¼ÈëM80
+ *
+ * 10 18 2021 ot_muhammed.rafy
+ * [MOLY00572177] Bar cell????
+ * 	
+ * 	.
+ *
+ * 12 09 2019 ian-yw.chen
+ * [MOLY00463337] ¡i5G-LH¡j Hvolte feature ?Õu®I?»Ý¨D (Following ALPS04766900)
+ *  .
+ *
+ * 08 09 2019 danny.kuo
+ * [MOLY00430467] [Gen97] DMF patch back to Gen97
+ * 	
+ * 	.
+ *
+ * 07 13 2018 edwin.liu
+ * [MOLY00333398] [Gen93] Diagnostic Manager Framework development
+ * 	
+ * 	.
+ *
+ * .
+ *****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef MTF_MSGID_H
+#define MTF_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_MTF_CODE_BEGIN )
+
+
+MSG_ID_MT_CIQ_METRIC_IND,
+
+MSG_ID_MT_CIQ_LT01_IND,
+MSG_ID_FOR_FRAMEWORK_TEST_1,
+MSG_ID_EM_EUTRA_RRC_MESSAGE_S_IND,
+MSG_ID_EM_EUTRA_RRC_MESSAGE_M_IND,
+MSG_ID_EM_EUTRA_RRC_MESSAGE_L_IND,
+
+MSG_ID_DHL_MT_PEER_TRACE_IND,
+MSG_ID_DHL_MT_ICD_IND,
+
+MSG_ID_ATP_MT_DMF_CMD_REQ,
+MSG_ID_ATP_MT_DMF_WIFIASC_REQ,
+MSG_ID_ERRC_MT_DMF_CUSTOM_BAR_IND,
+MSG_ID_ATP_MT_DMF_ECPI_IND,
+
+MSG_ID_L4C_MT_SCREEN_STATE_IND,
+MSG_ID_MT_DMF_L4C_CUSTOM_CONFIG_CNF,
+
+
+MSG_ID_NL1MOB_MT_DMF_CUSTOM_ENH_IND,
+MODULE_MSG_END( MSG_ID_MTF_CODE_TAIL )
+
+
+#endif // SDM_MSGID_H
+
diff --git a/mcu/interface/sap/md/n3ans_msgid.h b/mcu/interface/sap/md/n3ans_msgid.h
new file mode 100644
index 0000000..788acb2
--- /dev/null
+++ b/mcu/interface/sap/md/n3ans_msgid.h
@@ -0,0 +1,57 @@
+/*****************************************************************************
+*  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).
+*
+*****************************************************************************/
+
+#ifndef N3ANS_MSGID_H
+#define N3ANS_MSGID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_N3ANS_CODE_BEGIN )
+
+    MSG_ID_N3EPC_N3ANS_SEARCH_START_NTF = MSG_ID_N3ANS_CODE_BEGIN,
+    MSG_ID_N3EPC_N3ANS_SEARCH_STOP_NTF,
+    
+    MSG_ID_N3EPC_N3ANS_NODE_QUERY_REQ,
+    MSG_ID_N3EPC_N3ANS_NODE_QUERY_CNF,
+
+    MSG_ID_N3EPC_N3ANS_NODE_INFO_UPDATE_NTF,
+    MSG_ID_N3EPC_N3ANS_PLMN_INFO_UPDATE_NTF,
+
+    MSG_ID_ATP_N3ANS_EIMSGEO_REQ,
+
+MODULE_MSG_END( MSG_ID_N3ANS_CODE_TAIL )
+
+#endif  // N3ANS_MSGID_H
+
diff --git a/mcu/interface/sap/md/n3cf_msgid.h b/mcu/interface/sap/md/n3cf_msgid.h
new file mode 100644
index 0000000..e095e68
--- /dev/null
+++ b/mcu/interface/sap/md/n3cf_msgid.h
@@ -0,0 +1,42 @@
+#ifndef _N3CF_MSG_ID_H
+#define _N3CF_MSG_ID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_N3CF_CODE_BEGIN )
+
+/****************************************************************************
+ *                 <1> Desitnation: N3CF                                    *
+ ****************************************************************************/
+// From UT
+    MSG_ID_N3CF_UT_PRINT_ALL_REQ = MSG_ID_N3CF_CODE_BEGIN,
+    MSG_ID_N3CF_UT_PRINT_IKE_REQ,
+    MSG_ID_N3CF_UT_DSBP_CALLBACK_REQ,
+    MSG_ID_N3CF_UT_SET_IKE_REKEY_REQ,
+
+// From ATP
+    MSG_ID_ATP_N3CF_EN3CFGSET_REQ,
+    MSG_ID_ATP_N3CF_EN3CFGGET_REQ,
+    MSG_ID_ATP_N3CF_DUMP_RUNTIME_PARA_REQ,
+    MSG_ID_ATP_N3CF_EPVS_SET_REQ,
+
+// From SBP / DSBP
+    MSG_ID_N3CF_DSBP_RECONFIGURE_IND,
+
+// From SIM
+    MSG_ID_SIM_N3CF_READY_IND,    // (phase out)
+    MSG_ID_SIM_N3CF_ERROR_IND,    // (phase out)
+
+// From N3CF self
+    MSG_ID_N3CF_DHL_EVENT_NTF,
+    
+/****************************************************************************
+ *                 <2> Desitnation: Other modules                           *
+ ****************************************************************************/
+// To ATP defined in ./interface/sap/md/atp_msgid.h
+   /*
+   MSG_ID_ATP_N3CF_EN3CFGSET_IND,
+   */
+
+MODULE_MSG_END( MSG_ID_N3CF_CODE_TAIL )
+#endif  //_N3CF_MSG_ID_H
diff --git a/mcu/interface/sap/md/n3epc_msgid.h b/mcu/interface/sap/md/n3epc_msgid.h
new file mode 100644
index 0000000..8ad9178
--- /dev/null
+++ b/mcu/interface/sap/md/n3epc_msgid.h
@@ -0,0 +1,154 @@
+/*****************************************************************************
+*  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).
+*
+*****************************************************************************/
+
+#ifndef N3EPC_MSGID_H
+#define N3EPC_MSGID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_N3EPC_CODE_BEGIN )
+
+    // From DSBP
+    MSG_ID_N3EPC_DSBP_RECONFIGURE_IND = MSG_ID_N3EPC_CODE_BEGIN,
+
+    // From ATP
+    MSG_ID_ATP_N3EPC_EWIFIASC_REQ,
+    MSG_ID_ATP_N3EPC_EWIFIADDR_REQ,
+    MSG_ID_ATP_N3EPC_EWIFINATT_REQ,
+    MSG_ID_ATP_N3EPC_EWIFIEN_REQ,
+    MSG_ID_ATP_N3EPC_EIMSGEO_REQ,
+    MSG_ID_ATP_N3EPC_EPVSSET_REQ,
+    MSG_ID_ATP_N3EPC_EN3EPCCFGSET_REQ,
+    MSG_ID_ATP_N3EPC_EN3EPCCFGGET_REQ,
+    MSG_ID_ATP_N3EPC_EEPDG_REQ,
+    MSG_ID_ATP_N3EPC_ECFGDRP_REQ,
+    MSG_ID_ATP_N3EPC_EIFCONFIG_REQ,
+    MSG_ID_ATP_N3EPC_EPOF_REQ,
+    MSG_ID_ATP_N3EPC_EN3EPCTEST_REQ,
+    MSG_ID_ATP_N3EPC_EIMSCFG_REQ,
+    MSG_ID_ATP_N3EPC_ENAPTRCONFIG_REQ,
+    MSG_ID_ATP_N3EPC_ENAPTR_REQ,
+    MSG_ID_ATP_N3EPC_ESCREENSTATE_REQ,
+
+    // D2RM
+    MSG_ID_D2RM_N3EPDG_START,
+
+    MSG_ID_D2RM_N3EPC_ACT_DATA_CALL_REQ, 
+    MSG_ID_D2RM_N3EPC_ACT_DATA_CALL_CNF,
+
+    MSG_ID_D2RM_N3EPC_DEACT_DATA_CALL_REQ,
+    MSG_ID_D2RM_N3EPC_DEACT_DATA_CALL_CNF,
+
+    MSG_ID_D2RM_N3EPC_ABORT_DATA_CALL_REQ, 
+    MSG_ID_D2RM_N3EPC_ABORT_DATA_CALL_CNF, 
+    
+    MSG_ID_D2RM_N3EPC_GET_DATA_CALL_LIST_REQ,
+    MSG_ID_D2RM_N3EPC_GET_DATA_CALL_LIST_CNF,
+    
+    MSG_ID_D2RM_N3EPC_GET_DYNAMIC_PARAM_REQ,
+    MSG_ID_D2RM_N3EPC_GET_DYNAMIC_PARAM_CNF,
+    
+    MSG_ID_D2RM_N3EPC_GET_PDP_ADDRESS_REQ,
+    MSG_ID_D2RM_N3EPC_GET_PDP_ADDRESS_CNF,
+    
+    MSG_ID_D2RM_N3EPC_PDN_HO_NOTIFY_REQ,
+    
+    MSG_ID_D2RM_N3EPC_GET_SECONDARY_DYNAMIC_PARAM_REQ,
+    MSG_ID_D2RM_N3EPC_GET_SECONDARY_DYNAMIC_PARAM_CNF,
+
+    MSG_ID_D2RM_N3EPC_GET_QOS_REQ,
+    MSG_ID_D2RM_N3EPC_GET_QOS_CNF,
+
+    MSG_ID_D2RM_N3EPC_GET_TFT_REQ,
+    MSG_ID_D2RM_N3EPC_GET_TFT_CNF,
+    
+    MSG_ID_D2RM_N3EPC_GET_PACKET_FILTER_REQ,
+    MSG_ID_D2RM_N3EPC_GET_PACKET_FILTER_CNF,
+    
+    MSG_ID_D2RM_N3EPC_SET_PACKET_FILTER_REQ,
+    MSG_ID_D2RM_N3EPC_SET_PACKET_FILTER_CNF,
+    
+    MSG_ID_D2RM_N3EPC_MODIFY_DATA_CALL_REQ,
+    MSG_ID_D2RM_N3EPC_MODIFY_DATA_CALL_CNF,
+    
+    MSG_ID_D2RM_N3EPC_GET_RETRYTMR_REQ,
+    MSG_ID_D2RM_N3EPC_GET_RETRYTMR_CNF,
+
+    MSG_ID_D2RM_N3EPC_SET_RETRYTMR_REQ,
+    MSG_ID_D2RM_N3EPC_SET_RETRYTMR_CNF,
+   
+
+    MSG_ID_N3EPC_D2RM_GET_EPDG_INFO_CNF,
+    MSG_ID_N3EPC_D2RM_GET_EPDG_INFO_IND,
+
+    MSG_ID_D2RM_N3EPC_PDN_BIND_REQ,
+    MSG_ID_D2RM_N3EPC_PDN_UNBIND_REQ,
+
+    MSG_ID_D2RM_N3EPC_PDN_DISCONN_IND,
+
+    MSG_ID_D2RM_N3EPC_GET_DATA_CALL_LIST_IND,
+    MSG_ID_D2RM_N3EPC_GET_DYNAMIC_PARAM_IND,
+    MSG_ID_D2RM_N3EPC_GET_PDP_ADDRESS_IND,
+    MSG_ID_D2RM_N3EPC_GET_SECONDARY_DYNAMIC_PARAM_IND,
+    MSG_ID_D2RM_N3EPC_GET_QOS_IND,
+    MSG_ID_D2RM_N3EPC_GET_TFT_IND,
+    MSG_ID_D2RM_N3EPC_GET_PACKET_FILTER_IND,
+    MSG_ID_D2RM_N3EPC_PING_STATUS_IND,
+    MSG_ID_D2RM_N3EPC_MODIFY_DATA_CALL_IND,
+    MSG_ID_D2RM_N3EPC_RST_RETRYTMR_IND,
+
+    MSG_ID_N3EPC_D2RM_GET_EPDG_INFO_REQ,
+
+    MSG_ID_D2RM_N3EPC_PDN_BIND_CNF,
+    MSG_ID_D2RM_N3EPC_PDN_UNBIND_CNF,
+
+    // From IWLAN
+    MSG_ID_IWLAN_N3EPC_DPD_REQ,
+
+    // To IWLAN
+    MSG_ID_IWLAN_N3EPC_DPD_CNF,
+    MSG_ID_IWLAN_N3EPC_STATUS_IND,
+    MSG_ID_IWLAN_N3EPC_MOBIKE_IND,
+
+    // To internal module
+    MSG_ID_N3EPC_ADPT_PENDING_N3EPCMSG_REQ,
+    MSG_ID_N3EPC_ADPT_IKE_DECRYPT_INFO_IND,
+    MSG_ID_N3EPC_ADPT_ESP_DECRYPT_INFO_IND,
+    MSG_ID_N3EPC_ADPT_CFG_INFO_IND,
+
+MODULE_MSG_END( MSG_ID_N3EPC_CODE_TAIL )
+
+#endif  // N3EPC_MSGID_H
+
diff --git a/mcu/interface/sap/md/n3sam_msgid.h b/mcu/interface/sap/md/n3sam_msgid.h
new file mode 100644
index 0000000..e9b49e8
--- /dev/null
+++ b/mcu/interface/sap/md/n3sam_msgid.h
@@ -0,0 +1,218 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   n3sam_msgid.h
+ *
+ * Project:
+ * --------
+ *   VMOLY
+ *
+ * Description:
+ * ------------
+ *   This module defines the messgae IDs for N3SAM.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ ****************************************************************************/
+#ifndef _N3SAM_MSG_ID_H
+#define _N3SAM_MSG_ID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_N3SAM_CODE_BEGIN )
+
+/****************************************************************************
+*                 EXT INBOUND MSG
+****************************************************************************/
+    /***********************************/
+
+    MSG_ID_EXT_SAMNG_BEGIN = MSG_ID_N3SAM_CODE_BEGIN,
+    MSG_ID_N3EPC_N3SAM_IKE_SA_EST_REQ,
+    MSG_ID_N3EPC_N3SAM_IKE_SA_DEL_REQ,
+    MSG_ID_N3EPC_N3SAM_ABORT_REQ,
+    MSG_ID_N3EPC_N3SAM_FORCE_DPD_REQ,
+    MSG_ID_N3EPC_N3SAM_IKE_SA_UPDATE_NW_DEV_REQ,
+
+    MSG_ID_N3SAM_EAP_EAP_DECODE_CNF,
+    MSG_ID_N3SAM_EAP_MSK_GET_CNF,
+    MSG_ID_EXT_SAMNG_END,
+    /***********************************/
+
+    MSG_ID_EXT_CERT_ADAPT_BEGIN,
+    MSG_ID_EXT_CERT_ADAPT_END,
+
+    /***********************************/
+
+    MSG_ID_EXT_CIPHER_WRAP_BEGIN,
+    MSG_ID_EXT_CIPHER_WRAP_END,
+
+
+    /***********************************/
+
+    MSG_ID_EXT_IKE_ENCAP_BEGIN,
+    MSG_ID_EXT_IKE_ENCAP_END,
+    /***********************************/
+
+    MSG_ID_EXT_NW_ADAPT_BEGIN,
+    MSG_ID_EXT_NW_ADAPT_END,
+    /***********************************/
+
+    MSG_ID_EXT_EAP_PROXY_BEGIN,
+    MSG_ID_EXT_EAP_PROXY_END,
+    /***********************************/
+    MSG_ID_EXT_DP_CTRL_BEGIN,
+    MSG_ID_EXT_DP_CTRL_END,
+
+
+
+/****************************************************************************
+*                 EXT OUTBOUND MSG
+****************************************************************************/
+    MSG_ID_N3EPC_N3SAM_IKE_SA_EST_CNF,
+    MSG_ID_N3EPC_N3SAM_IKE_SA_EST_REJ,
+    MSG_ID_N3EPC_N3SAM_IKE_SA_DEL_CNF,
+    MSG_ID_N3EPC_N3SAM_IKE_SA_DEL_IND,
+    MSG_ID_N3EPC_N3SAM_PCSCF_UPDATE_IND,
+    MSG_ID_N3EPC_N3SAM_DNS_UPDATE_IND,
+    MSG_ID_N3EPC_N3SAM_ABORT_CNF,
+    MSG_ID_N3EPC_N3SAM_FORCE_DPD_CNF,
+    MSG_ID_N3EPC_N3SAM_N3GPP_OOS_IND,
+    MSG_ID_N3EPC_N3SAM_MOBIKE_ENABLE_IND,
+    MSG_ID_N3EPC_N3SAM_IKE_SA_UPDATE_NW_DEV_CNF,
+
+    MSG_ID_N3SAM_EAP_EAP_DECODE_REQ,
+    MSG_ID_N3SAM_EAP_MSK_GET_REQ,
+
+
+
+/****************************************************************************
+*                 INT MSG, SORT BY DST MOD
+****************************************************************************/
+    MSG_ID_INT_SAMNG_BEGIN,
+    MSG_ID_SAMGR_ENCAP_MESSAGE_ENCODE_CNF,
+    MSG_ID_SAMGR_ENCAP_MESSAGE_DECODE_CNF,
+    MSG_ID_SAMGR_ENCAP_PARAM_SET_CNF,
+    MSG_ID_SAMGR_ENCAP_PARAM_UNSET_CNF,
+    MSG_ID_SAMNG_CIPHER_WRAP_IKE_GEN_PUBLIC_KEY_NTF, //key mat
+    MSG_ID_SAMNG_CIPHER_WRAP_IKE_GEN_SHARE_SECRET_NTF,
+    MSG_ID_SAMNG_CIPHER_WRAP_IKE_KEY_DERIVE_NTF,
+    MSG_ID_SAMNG_CIPHER_WRAP_CHILD_GEN_PUBLIC_KEY_NTF,
+    MSG_ID_SAMNG_CIPHER_WRAP_CHILD_GEN_SHARE_SECRET_NTF,
+    MSG_ID_SAMNG_CIPHER_WRAP_CHILD_KEY_DERIVE_NTF,
+    MSG_ID_SAMNG_CERT_ADAPT_CERT_HASH_IND,
+    MSG_ID_SAMNG_CERT_ADAPT_CERT_GET_CNF,
+    MSG_ID_SAMNG_CERT_ADAPT_CERT_VERIFY_CNF,
+    MSG_ID_SAMNG_CERT_ADAPT_CERT_URL_VERIFY_CNF,
+    MSG_ID_SAMNG_EAP_PROXY_START_CONVERSATION_CNF,
+    MSG_ID_SAMNG_EAP_PROXY_STOP_CONVERSATION_CNF,
+    MSG_ID_SAMNG_EAP_PROXY_HANDLE_DATA_CNF,
+    MSG_ID_SAMNG_NW_ADAPT_SETUP_IKE_PATH_NTF,
+    MSG_ID_SAMNG_NW_ADAPT_SETUP_ESP_PATH_NTF,
+    MSG_ID_SAMNG_NW_ADAPT_CONN_STATUS_CHANGE_NTF,
+    MSG_ID_SAMNG_DP_CTRL_INSTALL_IND,
+    MSG_ID_SAMNG_DP_CTRL_ACTIVATE_IND,
+    MSG_ID_SAMNG_DP_CTRL_UNINSTALL_IND,
+    MSG_ID_SAMNG_DP_CTRL_DEACTIVATE_IND,
+    MSG_ID_SAMNG_DP_CTRL_EXPIRED_IND,
+    MSG_ID_SAMNG_DP_CTRL_SPI_READY_IND,
+    MSG_ID_INT_SAMNG_END,
+    /***********************************/
+
+
+    MSG_ID_INT_CERT_ADAPT_BEGIN,
+    MSG_ID_SAMNG_CERT_ADAPT_CERT_GET_REQ,
+    MSG_ID_SAMNG_CERT_ADAPT_CERT_VERIFY_REQ,
+    MSG_ID_SAMNG_CERT_ADAPT_CERT_URL_VERIFY_REQ,
+    MSG_ID_INT_CERT_ADAPT_END,
+
+    /***********************************/
+
+    MSG_ID_INT_CIPHER_WRAP_BEGIN,
+
+    MSG_ID_INT_CIPHER_WRAP_END,
+
+    /***********************************/
+
+    MSG_ID_INT_IKE_ENCAP_BEGIN,
+    MSG_ID_SAMGR_ENCAP_MESSAGE_ENCODE_REQ,
+    MSG_ID_SAMGR_ENCAP_MESSAGE_DECODE_REQ,
+    MSG_ID_SAMGR_ENCAP_PARAM_SET_REQ,
+    MSG_ID_SAMGR_ENCAP_PARAM_UNSET_REQ,
+    MSG_ID_INT_IKE_ENCAP_END,
+    /***********************************/
+
+    MSG_ID_INT_NW_ADAPT_BEGIN,
+    MSG_ID_INT_NW_ADAPT_END,
+
+    /***********************************/
+
+    MSG_ID_INT_EAP_PROXY_BEGIN,
+    MSG_ID_SAMNG_EAP_PROXY_START_CONVERSATION_REQ,
+    MSG_ID_SAMNG_EAP_PROXY_STOP_CONVERSATION_REQ,
+    MSG_ID_SAMNG_EAP_PROXY_HANDLE_DATA_REQ,
+    MSG_ID_INT_EAP_PROXY_END,
+    /***********************************/
+
+    MSG_ID_INT_DP_CTRL_BEGIN,
+    MSG_ID_INT_DP_CTRL_END,
+
+    MSG_ID_INT_PRIMITIVE_LOG_BEGIN,
+    MSG_ID_IKEV2_IKE_SA_ADD_NTF,
+    MSG_ID_INT_PRIMITIVE_LOG_END,
+
+
+/****************************************************************************
+*                 UT
+****************************************************************************/
+
+    MSG_ID_N3SAM_UT_TIMER,
+    MSG_ID_N3SAM_UT_MEMORY,
+
+    MSG_ID_N3SAM_UT_IKE_UL_MSG,
+    MSG_ID_N3SAM_UT_IKE_DL_MSG,
+
+
+/******************************************************************************
+ *                                MSG END                                     *
+ ******************************************************************************/
+MODULE_MSG_END( MSG_ID_N3SAM_CODE_TAIL )
+
+#endif  //_N3SAM_MSG_ID_H
diff --git a/mcu/interface/sap/md/nas_sv_msgid.h b/mcu/interface/sap/md/nas_sv_msgid.h
new file mode 100644
index 0000000..565a89f
--- /dev/null
+++ b/mcu/interface/sap/md/nas_sv_msgid.h
@@ -0,0 +1,434 @@
+/*****************************************************************************
+*  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).
+*
+*****************************************************************************/
+
+/********************************************************************************/
+#include "module_msg_range.h"
+#ifndef _NAS_SV_MSG_H
+#define _NAS_SV_MSG_H
+
+/*-----------------------NAS_SV_MSG_CODE_BEGIN------------------*/
+MODULE_MSG_BEGIN( MSG_ID_NAS_SV_CODE_BEGIN )
+    MSG_ID_THE_NAS_SV_DUMP_COMMON_CONTEXT_IND= MSG_ID_NAS_SV_CODE_BEGIN,
+    /* RAC<>SV */
+    /* RAC guarantee send out all NAS init then inform NAS_SV */
+    MSG_ID_RAC_NAS_SV_INIT_REQ,
+    MSG_ID_RAC_NAS_SV_ATTACH_REQ,
+    MSG_ID_RAC_NAS_SV_DETACH_REQ,
+    MSG_ID_RAC_NAS_SV_SET_RAT_MODE_REQ,
+    MSG_ID_RAC_NAS_SV_SET_RAT_MODE_CNF,
+    MSG_ID_RAC_NAS_SV_DUPLEX_MODE_CHANGE_REQ,
+    MSG_ID_RAC_NAS_SV_DUPLEX_MODE_CHANGE_CNF,
+    MSG_ID_RAC_NAS_SV_ATTACH_CNF,
+    MSG_ID_RAC_NAS_SV_DETACH_IND,
+    MSG_ID_RAC_NAS_SV_ATTACH_DETACH_RESULT_IND,
+    MSG_ID_RAC_NAS_SV_RFOFF_REQ,
+    MSG_ID_RAC_NAS_SV_RFOFF_CNF,
+    MSG_ID_RAC_NAS_SV_RAT_CHANGE_START_IND,
+    MSG_ID_RAC_NAS_SV_RAT_CHANGE_FINISH_IND,
+    MSG_ID_RAC_NAS_SV_UPDATE_ACTIVE_RAT_IND,
+    MSG_ID_RAC_NAS_SV_EVENT_UPDATE_IND,
+    MSG_ID_RAC_NAS_SV_EPS_ATTACH_NEEDED_REJ_RSP,
+    MSG_ID_RAC_NAS_SV_EPS_ATTACH_NEEDED_IND,
+    MSG_ID_RAC_NAS_SV_EMC_ATTACH_IND,
+    MSG_ID_RAC_NAS_SV_EMC_ATTACH_REQ,
+    MSG_ID_RAC_NAS_SV_EMM_NW_FEATURE_SUPPORT_IND,
+    MSG_ID_RAC_NAS_SV_VG_OPTION_UPDATE_REQ,
+    MSG_ID_RAC_NAS_SV_UEMODE_PARAM_UPDATE_REQ,
+    MSG_ID_RAC_NAS_SV_NRRC_STATE_IND,
+    MSG_ID_RAC_NAS_SV_IMS_REG_STATUS_UPDATE_REQ,
+    MSG_ID_RAC_NAS_SV_CALL_STATUS_REQ,
+    MSG_ID_RAC_NAS_SV_CAP_UPDATE_IND,
+    MSG_ID_RAC_NAS_SV_IMS_PDN_ACTIVATION_REQ,
+    MSG_ID_RAC_NAS_SV_NR_NORMAL_SERVICE_LOSS_UPDATE_REQ,
+    MSG_ID_RAC_NAS_SV_T3402_STOP_IND,
+	MSG_ID_RAC_NAS_SV_AS_PLMN_SEARCH_REPORT_IND,
+
+
+    /* RAT_TCM <> SV */
+    MSG_ID_RAT_TCM_NAS_SV_BEGIN = MSG_ID_NAS_SV_CODE_BEGIN + 100,
+
+    MSG_ID_RAT_TCM_NAS_SV_ACTIVE_NAS_UPDATE_IND, /* to be removed */
+    MSG_ID_RAT_TCM_NAS_SV_EVENT_UPDATE_IND,
+
+    /* SMIC <> SV */
+    MSG_ID_NAS_SV_SMIC_BOOT_UP_INIT_NAS_UPDATE_IND, /* new */
+
+    /* SV<>ANY*/
+    MSG_ID_NAS_SV_ANY_BEGIN = MSG_ID_RAT_TCM_NAS_SV_BEGIN + 50,
+    MSG_ID_NAS_SV_ANY_ATTACH_REQ,
+    MSG_ID_NAS_SV_ANY_DETACH_REQ,
+    MSG_ID_NAS_SV_ANY_EVENT_UPDATE_REQ,
+    MSG_ID_NAS_SV_ANY_EVENT_UPDATE_IND,
+    MSG_ID_NAS_SV_ANY_RFOFF_REQ,
+    MSG_ID_NAS_SV_ANY_RFOFF_CNF,
+    MSG_ID_NAS_SV_ANY_DUPLEX_MODE_CHANGE_REQ,
+    MSG_ID_NAS_SV_ANY_DUPLEX_MODE_CHANGE_CNF,
+    MSG_ID_NAS_SV_ANY_RAT_CHANGE_START_IND, /* xSM change to SMIC */
+    MSG_ID_NAS_SV_ANY_RAT_CHANGE_FINISH_IND, /* xSM change to SMIC */
+    MSG_ID_NAS_SV_ANY_SRVCC_STATUS_UPDATE_IND,
+    MSG_ID_NAS_SV_ANY_PLMN_FOUND_IND,
+    MSG_ID_NAS_SV_ANY_REGN_RESULT_IND,
+    MSG_ID_NAS_SV_ANY_EPLMN_UPDATE_IND,
+    MSG_ID_NAS_SV_ANY_SEARCH_STATUS_UPDATE_REQ,
+    MSG_ID_NAS_SV_ANY_BROADCAST_REGN_RESULT_IND,
+    MSG_ID_NAS_SV_ANY_BROADCAST_TIMER_STATUS_IND,
+    MSG_ID_NAS_SV_ANY_OPERATION_ALLOW_REQ,
+    MSG_ID_NAS_SV_ANY_OPERATION_ALLOW_CNF,
+    MSG_ID_NAS_SV_ANY_MANIPULATE_CONNECTION_REQ,
+    MSG_ID_NAS_SV_ANY_OPERATION_ALLOW_NO_ACTION_IND,
+    MSG_ID_NAS_SV_ANY_MM_CAP_UPDATE_REQ,
+    MSG_ID_NAS_SV_ANY_VG_OPTION_UPDATE_REQ,
+    MSG_ID_NAS_SV_ANY_BROADCAST_DETACH_REQUIRED_IND,
+    MSG_ID_NAS_SV_ANY_DISABLE_INFO_UPDATE_NTF,
+    MSG_ID_NAS_SV_ANY_GENERAL_MODEM_CONFIGURE_SET_REQ,
+    MSG_ID_NAS_SV_ANY_GENERAL_MODEM_CONFIGURE_SET_CNF,
+
+    /* SV<>GMSS */
+    MSG_ID_NAS_SV_GMSS_BEGIN = MSG_ID_NAS_SV_ANY_BEGIN + 200,
+    MSG_ID_NAS_SV_GMSS_SET_RAT_MODE_REQ,
+    MSG_ID_NAS_SV_GMSS_SET_RAT_MODE_CNF,
+    MSG_ID_NAS_SV_GMSS_C2K_DEACTIVATE_IND,
+    MSG_ID_NAS_SV_GMSS_UEMODE_PARAM_UPDATE_REQ,
+
+    /* SV<>NWSEL */
+    MSG_ID_NWSEL_NAS_SV_BEGIN = MSG_ID_NAS_SV_GMSS_BEGIN + 50,
+    MSG_ID_NWSEL_NAS_SV_SYS_INFO_UPDATE_IND,
+    MSG_ID_NWSEL_NAS_SV_PLMN_SEARCH_REQ,
+    MSG_ID_NWSEL_NAS_SV_PLMN_SEARCH_IND,
+    MSG_ID_NWSEL_NAS_SV_PLMN_SEARCH_CNF,
+    MSG_ID_NWSEL_NAS_SV_CSS_CS_REG_REQ,
+    MSG_ID_NWSEL_NAS_SV_CSS_CS_REG_CNF,
+    MSG_ID_NWSEL_NAS_SV_CSS_PS_REG_REQ,
+    MSG_ID_NWSEL_NAS_SV_CSS_PS_REG_CNF,
+    MSG_ID_NWSEL_NAS_SV_CSS_MCC_SEARCH_REQ,
+    MSG_ID_NWSEL_NAS_SV_CSS_MCC_SEARCH_CNF,
+    MSG_ID_NWSEL_NAS_SV_NO_ACTION_IND,
+    MSG_ID_NWSEL_NAS_SV_CAPABILITY_QUERY_REQ,
+    MSG_ID_NWSEL_NAS_SV_CAPABILITY_QUERY_CNF,
+    MSG_ID_NWSEL_NAS_SV_ENDC_IND,
+    MSG_ID_NWSEL_NAS_SV_PLMN_LIST_REQ,
+    MSG_ID_NWSEL_NAS_SV_PLMN_LIST_CNF,
+    MSG_ID_NWSEL_NAS_SV_PLMN_LIST_STOP_REQ,
+    MSG_ID_NWSEL_NAS_SV_PLMN_LIST_STOP_CNF,
+    MSG_ID_NWSEL_NAS_SV_PLMN_SCAN_IND,
+    MSG_ID_NWSEL_NAS_SV_CAPABILITY_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_POWER_SCAN_REQ,
+    MSG_ID_NWSEL_NAS_SV_POWER_SCAN_IND,
+    MSG_ID_NWSEL_NAS_SV_POWER_SCAN_CNF,
+    MSG_ID_NWSEL_NAS_SV_PLMN_BAND_IND,
+    MSG_ID_NWSEL_NAS_SV_CSS_PS_DEREG_REQ,
+    MSG_ID_NWSEL_NAS_SV_CSS_PS_DEREG_CNF,
+    MSG_ID_NWSEL_NAS_SV_DISPLAY_SEARCH_STATUS_IND,
+    MSG_ID_NWSEL_NAS_SV_PLMN_FOUND_IND,
+    MSG_ID_NWSEL_NAS_SV_NR_PLMN_LOSS_IND,
+    MSG_ID_NWSEL_NAS_SV_CHECK_ACTIVE_RAT_REQ,
+    MSG_ID_NWSEL_NAS_SV_SNIFFER_START_REQ,
+    MSG_ID_NWSEL_NAS_SV_SNIFFER_STOP_REQ,
+    MSG_ID_NWSEL_NAS_SV_SIGNAL_APPEAR_IND,
+    MSG_ID_NWSEL_NAS_SV_REGN_RESULT_IND,
+    MSG_ID_NWSEL_NAS_SV_EPLMN_UPDATE_IND,
+    MSG_ID_NWSEL_NAS_SV_NRRC_EQ_PLMN_LIST_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_EMM_UPDATE_PARAM_IND,
+    MSG_ID_NWSEL_NAS_SV_UEMODE_PARAM_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_VGMM_T3502_CHANGE_IND,
+    MSG_ID_NWSEL_NAS_SV_VGMM_SYS_INFO_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_CSG_LIST_REQ,
+    MSG_ID_NWSEL_NAS_SV_CSG_LIST_CNF,
+    MSG_ID_NWSEL_NAS_SV_CSG_LIST_STOP_REQ,
+    MSG_ID_NWSEL_NAS_SV_CSG_LIST_STOP_CNF,
+    MSG_ID_NWSEL_NAS_SV_SEARCH_STATUS_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_NRRC_REGN_STATUS_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_VGMM_REGN_STATUS_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_VGMM_INVALID_SIM_RECOVER_REQ,
+    MSG_ID_NWSEL_NAS_SV_SOR_OPLMN_LIST_UPDATE_IND,
+    MSG_ID_NWSEL_NAS_SV_SOR_OPLMN_LIST_UPDATE_RSP,
+    MSG_ID_NWSEL_NAS_SV_SOR_SECURE_PACKET_IND,
+    MSG_ID_NWSEL_NAS_SV_SOR_SECURE_PACKET_RSP,
+    MSG_ID_NWSEL_NAS_SV_GEMINI_RESUME_REQ,
+    MSG_ID_NWSEL_NAS_SV_START_PREDICT_SEARCH_IND,
+    MSG_ID_NWSEL_NAS_SV_START_SEARCH_IND,
+    MSG_ID_NWSEL_NAS_SV_BACKGROUND_BAND_LEARNING_REQ,
+    MSG_ID_NWSEL_NAS_SV_BACKGROUND_BAND_LEARNING_CNF,
+    MSG_ID_NWSEL_NAS_SV_BACKGROUND_BAND_LEARNING_STOP_REQ,
+    MSG_ID_NWSEL_NAS_SV_BACKGROUND_BAND_LEARNING_STOP_CNF,
+    MSG_ID_NWSEL_NAS_SV_SUSPEND_IND,
+    MSG_ID_NWSEL_NAS_SV_RESUME_IND,
+    MSG_ID_NWSEL_NAS_SV_VIRTUAL_RESUME_IND,
+    MSG_ID_NWSEL_NAS_SV_LIMITED_VIRTUAL_RESUME_IND,
+    MSG_ID_NWSEL_NAS_SV_LIMITED_VIRTUAL_RESUME_RSP,
+    MSG_ID_NWSEL_NAS_SV_SLT_ENDC_SUCCESS_IND,
+    MSG_ID_NWSEL_NAS_SV_VIRTUAL_SUSPEND_IND,
+    MSG_ID_NWSEL_NAS_SV_MANUAL_MODE_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_HPLMN_INFO_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_CANCEL_PLMN_SEARCH_REQ,
+    MSG_ID_NWSEL_NAS_SV_MM_PLMN_LIST_ABORT_REQ,
+    MSG_ID_NWSEL_NAS_SV_ERRC_PLMN_LIST_ABORT_REQ,
+    MSG_ID_NWSEL_NAS_SV_NRRC_PLMN_LIST_ABORT_REQ,
+    MSG_ID_NWSEL_NAS_SV_NRRC_INACTIVE_MODE_CONFIGURATION_REQ,
+    MSG_ID_NWSEL_NAS_SV_NRRC_SERVICE_RECOVERY_ROUND_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_NRRC_SCREEN_ON_REQ,
+    MSG_ID_NWSEL_NAS_SV_NRRC_SCREEN_OFF_REQ,
+    MSG_ID_NWSEL_NAS_SV_VGSM_PERSISTENT_PDU_SESSION_IND,
+    MSG_ID_NWSEL_NAS_SV_VGSM_MAX_PDU_EST_TIMEOUT_REACHED_IND,
+    MSG_ID_NWSEL_NAS_SV_VGMM_C2K_FORCE_TO_LOCAL_DETACH_REQ,
+    MSG_ID_NWSEL_NAS_SV_VGMM_GLOBAL_MODE_CHANGE_START_REQ,
+    MSG_ID_NWSEL_NAS_SV_VGMM_PLMN_RESTRICTION_CHANGE_IND,
+    MSG_ID_NWSEL_NAS_SV_NRRC_PLMN_SEARCH_PREFERENCE_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_VGMM_CELL_BAND_INFO_UPDATE_IND,
+    MSG_ID_NWSEL_NAS_SV_VGMM_EMERGENCY_STATUS_UPDATE_IND,
+    MSG_ID_NWSEL_NAS_SV_DISABLE_INFO_UPDATE_NTF,
+    MSG_ID_NWSEL_NAS_SV_VGMM_PERMANENT_INVALID_CAUSE_RECOVER_IND,    
+    MSG_ID_NWSEL_NAS_SV_CONTINUOUS_IRAT_FAILURE_IND,
+    MSG_ID_NWSEL_NAS_SV_PLMN_LIST_STATUS_UPDATE_REQ,
+    MSG_ID_NWSEL_NAS_SV_VGMM_N1_REENABLE_CLEAR_FORBIDDEN_TA_LIST_REQ,
+	MSG_ID_NWSEL_NAS_SV_AS_PLMN_SEARCH_REPORT_IND,
+
+    /* SV<>EVAL */
+    /* SV<>EMM */
+    MSG_ID_NAS_SV_EMM_BEGIN = MSG_ID_NWSEL_NAS_SV_BEGIN + 250,
+    MSG_ID_NAS_SV_EMM_SET_RAT_MODE_REQ,
+    MSG_ID_NAS_SV_EMM_SET_RAT_MODE_CNF,
+    MSG_ID_NAS_SV_EMM_SIM_RESET_COMPLETE_IND,
+    MSG_ID_NAS_SV_EMM_BROADCAST_DETACH_REQUIRED_IND,
+    MSG_ID_NAS_SV_EMM_PLMN_SEARCH_REQ,
+    MSG_ID_NAS_SV_EMM_PLMN_SEARCH_IND,
+    MSG_ID_NAS_SV_EMM_PLMN_SEARCH_CNF,
+    MSG_ID_NAS_SV_EMM_SYS_INFO_UPDATE_IND,
+    MSG_ID_NAS_SV_EMM_DEACTIVATE_REQ,
+    MSG_ID_NAS_SV_EMM_DEACTIVATE_CNF,
+    MSG_ID_NAS_SV_EMM_NO_ACTION_IND,
+    MSG_ID_NAS_SV_EMM_DETACH_IND,
+    MSG_ID_NAS_SV_EMM_ATTACH_CNF,
+    MSG_ID_NAS_SV_EMM_NAS_CTXT_TRANSFER_REQ,
+    MSG_ID_NAS_SV_EMM_NAS_CTXT_TRANSFER_CNF,
+    MSG_ID_NAS_SV_EMM_AS_PARAM_UPDATE_REQ,
+    MSG_ID_NAS_SV_EMM_EMC_ATTACH_REQ,
+    MSG_ID_NAS_SV_EMM_PLMN_LIST_REQ,
+    MSG_ID_NAS_SV_EMM_PLMN_LIST_CNF,
+    MSG_ID_NAS_SV_EMM_PLMN_LIST_STOP_REQ,
+    MSG_ID_NAS_SV_EMM_PLMN_LIST_STOP_CNF,
+    MSG_ID_NAS_SV_EMM_NW_FEATURE_SUPPORT_IND,
+    MSG_ID_NAS_SV_EMM_REL_REQ,
+    MSG_ID_NAS_SV_EMM_UPDATE_PARAM_IND,
+    MSG_ID_NAS_SV_EMM_CSG_LIST_REQ,
+    MSG_ID_NAS_SV_EMM_CSG_LIST_CNF,
+    MSG_ID_NAS_SV_EMM_CSG_LIST_STOP_REQ,
+    MSG_ID_NAS_SV_EMM_CSG_LIST_STOP_CNF,
+    MSG_ID_NAS_SV_EMM_BROADCAST_REGN_RESULT_IND,
+    MSG_ID_NAS_SV_EMM_BROADCAST_TIMER_STATUS_IND,    
+    MSG_ID_NAS_SV_EMM_SET_ACTIVE_RAT_CNF,
+    MSG_ID_NAS_SV_EMM_AS_PARAM_NOTIFY_IND,
+    MSG_ID_NAS_SV_EMM_T3402_STOP_IND,
+
+    /* SV<>ERRC */
+    MSG_ID_NAS_SV_ERRC_BEGIN = MSG_ID_NAS_SV_EMM_BEGIN + 200,
+    MSG_ID_NAS_SV_ERRC_RAT_CHANGE_IND,
+    MSG_ID_NAS_SV_ERRC_RAT_CHANGE_CNF,
+    MSG_ID_NAS_SV_ERRC_CAP_UPDATE_CNF,
+    MSG_ID_NAS_SV_ERRC_PLMN_BAND_IND,
+    MSG_ID_NAS_SV_ERRC_CHECK_ACTIVE_RAT_CNF,
+    MSG_ID_NAS_SV_ERRC_POWER_SCAN_CNF,
+    MSG_ID_NAS_SV_ERRC_SET_ACTIVE_RAT_CNF,
+    MSG_ID_NAS_SV_ERRC_SIGNAL_APPEAR_IND,
+    MSG_ID_NAS_SV_ERRC_SRVCC_STATUS_UPDATE_IND,
+    MSG_ID_NAS_SV_ERRC_START_PREDICT_SEARCH_IND,
+    MSG_ID_NAS_SV_ERRC_BACKGROUND_BAND_LEARNING_CNF,
+    MSG_ID_NAS_SV_ERRC_BACKGROUND_BAND_LEARNING_STOP_CNF,
+    
+
+    /* SV<>ESM */
+    MSG_ID_NAS_SV_ESM_BEGIN = MSG_ID_NAS_SV_ERRC_BEGIN + 50,
+    MSG_ID_NAS_SV_ESM_AS_PARAM_UPDATE_REQ,
+    MSG_ID_NAS_SV_ESM_EPS_ATTACH_NEEDED_REJ_RSP,
+    MSG_ID_NAS_SV_ESM_EPS_ATTACH_NEEDED_IND,
+    MSG_ID_NAS_SV_ESM_EMC_ATTACH_IND,
+
+
+    /* SV<>MM */
+    MSG_ID_NAS_SV_MM_BEGIN = MSG_ID_NAS_SV_ESM_BEGIN + 50,
+    MSG_ID_NAS_SV_MM_SET_RAT_MODE_REQ,
+    MSG_ID_NAS_SV_MM_SET_RAT_MODE_CNF,
+    MSG_ID_NAS_SV_MM_SIM_INFO_RESET_IND,
+    MSG_ID_NAS_SV_MM_PLMN_SEARCH_REQ,
+    MSG_ID_NAS_SV_MM_PLMN_SEARCH_IND,
+    MSG_ID_NAS_SV_MM_PLMN_SEARCH_CNF,
+    MSG_ID_NAS_SV_MM_DEACTIVATE_REQ,
+    MSG_ID_NAS_SV_MM_DEACTIVATE_CNF,
+    MSG_ID_NAS_SV_MM_NO_ACTION_IND,
+    MSG_ID_NAS_SV_MM_DETACH_IND,
+    MSG_ID_NAS_SV_MM_ATTACH_CNF,
+
+
+    MSG_ID_NAS_SV_MM_NAS_CTXT_TRANSFER_REQ,
+    MSG_ID_NAS_SV_MM_NAS_CTXT_TRANSFER_CNF,
+    MSG_ID_NAS_SV_MM_AS_PARAM_UPDATE_REQ,
+    MSG_ID_NAS_SV_MM_PLMN_LIST_REQ,
+    MSG_ID_NAS_SV_MM_PLMN_LIST_CNF,
+    MSG_ID_NAS_SV_MM_PLMN_LIST_STOP_REQ,
+    MSG_ID_NAS_SV_MM_PLMN_LIST_STOP_CNF,
+    MSG_ID_NAS_SV_MM_CSG_LIST_REQ,
+    MSG_ID_NAS_SV_MM_CSG_LIST_CNF,
+    MSG_ID_NAS_SV_MM_CSG_LIST_STOP_REQ,
+    MSG_ID_NAS_SV_MM_CSG_LIST_STOP_CNF,
+    MSG_ID_NAS_SV_MM_BROADCAST_REGN_RESULT_IND,
+    MSG_ID_NAS_SV_MM_BROADCAST_TIMER_STATUS_IND,
+    MSG_ID_NAS_SV_MM_PLMN_LIST_ABORT_REQ,
+    /* SV<>SM */
+
+    /* SV<>RATCM */
+    MSG_ID_NAS_SV_RATCM_BEGIN = MSG_ID_NAS_SV_MM_BEGIN + 100,
+    MSG_ID_NAS_SV_RATCM_SET_RAT_MODE_REQ,
+    MSG_ID_NAS_SV_RATCM_SET_RAT_MODE_CNF,
+    MSG_ID_NAS_SV_RATCM_RAT_CHANGE_IND,
+    MSG_ID_NAS_SV_RATCM_RAT_CHANGE_REQ,
+    MSG_ID_NAS_SV_RATCM_RAT_CHANGE_RSP,
+    MSG_ID_NAS_SV_RATCM_RAT_CHANGE_CNF,
+    MSG_ID_NAS_SV_RATCM_SYS_INFO_UPDATE_IND,
+    MSG_ID_NAS_SV_RATCM_PLMN_BAND_IND,
+    MSG_ID_NAS_SV_RATCM_CELL_CHANGE_FINISH_IND,
+    MSG_ID_NAS_SV_RATCM_CAP_UPDATE_REQ,
+    MSG_ID_NAS_SV_RATCM_CAP_UPDATE_CNF,
+    MSG_ID_NAS_SV_RATCM_SNIFFER_START_REQ,
+    MSG_ID_NAS_SV_RATCM_SNIFFER_STOP_REQ,
+    MSG_ID_NAS_SV_RATCM_CHECK_ACTIVE_RAT_REQ,
+    MSG_ID_NAS_SV_RATCM_CHECK_ACTIVE_RAT_CNF,
+    MSG_ID_NAS_SV_RATCM_SET_ACTIVE_RAT_REQ,
+    MSG_ID_NAS_SV_RATCM_SET_ACTIVE_RAT_CNF,
+    MSG_ID_NAS_SV_RATCM_SIGNAL_APPEAR_IND,
+    MSG_ID_NAS_SV_RATCM_NR_NORMAL_SERVICE_LOSS_UPDATE_REQ,
+
+    /* SV<>PAM */
+
+    /* SV<>C2K */
+    MSG_ID_NAS_SV_CSS_BEGIN = MSG_ID_NAS_SV_RATCM_BEGIN + 100,
+    MSG_ID_NAS_SV_CSS_DEACTIVATE_REQ,
+    MSG_ID_NAS_SV_CSS_DEACTIVATE_CNF,
+    MSG_ID_NAS_SV_CSS_PS_REG_REQ,
+    MSG_ID_NAS_SV_CSS_PS_REG_CNF,
+    MSG_ID_NAS_SV_CSS_CS_REG_REQ,
+    MSG_ID_NAS_SV_CSS_CS_REG_CNF,
+    MSG_ID_NAS_SV_CSS_MCC_SEARCH_REQ,
+    MSG_ID_NAS_SV_CSS_MCC_SEARCH_CNF,
+    MSG_ID_NAS_SV_CSS_PS_DEREG_CNF,
+    MSG_ID_NAS_SV_CSS_CHECK_ACTIVE_RAT_REQ,
+    MSG_ID_NAS_SV_CSS_CHECK_ACTIVE_RAT_CNF,
+    MSG_ID_NAS_SV_CSS_SET_ACTIVE_RAT_REQ,
+    MSG_ID_NAS_SV_CSS_SET_ACTIVE_RAT_CNF,
+
+    /* SV<>RATDM */
+    MSG_ID_NAS_SV_RATDM_BEGIN = MSG_ID_NAS_SV_CSS_BEGIN + 100,
+    MSG_ID_NAS_SV_RATDM_RAT_CHANGE_REQ,
+    MSG_ID_NAS_SV_RATDM_DUPLEX_MODE_CHANGE_REQ,
+    MSG_ID_NAS_SV_RATDM_DUPLEX_MODE_CHANGE_CNF,
+
+    /* SV<>NRRC */
+    MSG_ID_NAS_SV_NRRC_BEGIN = MSG_ID_NAS_SV_RATDM_BEGIN + 100,
+    MSG_ID_NAS_SV_NRRC_INIT_CNF,
+    MSG_ID_NAS_SV_NRRC_SET_RAT_MODE_CNF,
+    MSG_ID_NAS_SV_NRRC_RFOFF_CNF,
+
+    MSG_ID_NAS_SV_NRRC_DEACTIVATE_CNF,
+    MSG_ID_NAS_SV_NRRC_PLMN_SEARCH_CNF,
+    MSG_ID_NAS_SV_NRRC_PLMN_LIST_CNF,
+    MSG_ID_NAS_SV_NRRC_PLMN_LIST_STOP_CNF,
+    MSG_ID_NAS_SV_NRRC_SYS_INFO_UPDATE_IND,
+    MSG_ID_NAS_SV_NRRC_PLMN_LOSS_IND,
+    MSG_ID_NAS_SV_NRRC_RAT_CHANGE_IND,
+    MSG_ID_NAS_SV_NRRC_RAT_CHANGE_CNF,
+    MSG_ID_NAS_SV_NRRC_CAP_UPDATE_CNF,
+    MSG_ID_NAS_SV_NRRC_POWER_SCAN_IND,
+    MSG_ID_NAS_SV_NRRC_POWER_SCAN_CNF,
+    MSG_ID_NAS_SV_NRRC_CHECK_ACTIVE_RAT_CNF,
+    MSG_ID_NAS_SV_NRRC_SET_ACTIVE_RAT_CNF,
+    MSG_ID_NAS_SV_NRRC_SIGNAL_APPEAR_IND,
+    MSG_ID_NAS_SV_NRRC_CSG_LIST_CNF,
+    MSG_ID_NAS_SV_NRRC_CSG_LIST_STOP_CNF,
+    MSG_ID_NAS_SV_NRRC_PLMN_BAND_IND,
+    MSG_ID_NAS_SV_NRRC_SLT_ENDC_SUCCESS_IND,
+    MSG_ID_NAS_SV_NRRC_START_PREDICT_SEARCH_IND,
+    MSG_ID_NAS_SV_NRRC_NRRC_STATE_IND,
+    MSG_ID_NAS_SV_NRRC_BACKGROUND_BAND_LEARNING_CNF,
+    MSG_ID_NAS_SV_NRRC_BACKGROUND_BAND_LEARNING_STOP_CNF,
+    MSG_ID_NAS_SV_NRRC_OUT_OF_SERVICE_IND,
+    MSG_ID_NAS_SV_NRRC_PLMN_SCAN_IND,
+    MSG_ID_NAS_SV_NRRC_CONTINUOUS_IRAT_FAILURE_IND,
+
+    /* SV<>VGMM */
+    // SV->VGMM message ids are defined in vgmm_msgid.h
+    MSG_ID_NAS_SV_VGMM_BEGIN = MSG_ID_NAS_SV_NRRC_BEGIN + 100,
+    MSG_ID_NAS_SV_VGMM_PLMN_SEARCH_ALLOWED_CNF,
+    MSG_ID_NAS_SV_VGMM_PLMN_LOSS_IND,    
+    MSG_ID_NAS_SV_VGMM_SET_RAT_MODE_CNF,
+    MSG_ID_NAS_SV_VGMM_NAS_CTXT_TRANSFER_CNF,
+    MSG_ID_NAS_SV_VGMM_DETACH_IND,
+    MSG_ID_NAS_SV_VGMM_ATTACH_CNF,
+    MSG_ID_NAS_SV_VGMM_SIM_INFO_RESET_IND,
+    MSG_ID_NAS_SV_VGMM_T3502_CHANGE_IND,
+    MSG_ID_NAS_SV_VGMM_REGN_RESULT_IND,
+    MSG_ID_NAS_SV_VGMM_PLMN_RESTRICTION_CHANGE_IND,
+    MSG_ID_NAS_SV_VGMM_EVENT_UPDATE_IND,
+    MSG_ID_NAS_SV_VGMM_EPLMN_IND,
+    MSG_ID_NAS_SV_VGMM_SOR_OPLMN_LIST_UPDATE_IND,
+    MSG_ID_NAS_SV_VGMM_BROADCAST_REGN_RESULT_IND,
+    MSG_ID_NAS_SV_VGMM_BROADCAST_TIMER_STATUS_IND,
+    MSG_ID_NAS_SV_VGMM_CELL_BAND_INFO_UPDATE_IND,
+    MSG_ID_NAS_SV_VGMM_EMERGENCY_STATUS_UPDATE_IND,
+    MSG_ID_NAS_SV_VGMM_PERMANENT_INVALID_CAUSE_RECOVER_IND,        
+
+    /* SV<>VGSM */
+    MSG_ID_NAS_SV_VGSM_PERSISTENT_PDU_SESSION_IND,
+    MSG_ID_NAS_SV_VGSM_MAX_PDU_EST_TIMEOUT_REACHED_IND,
+
+    /* SV<>RSVAS */
+    MSG_ID_RSVAS_NAS_SV_BEGIN = MSG_ID_NAS_SV_VGMM_BEGIN + 100,
+    MSG_ID_RSVAS_NAS_SV_SUSPEND_IND,
+    MSG_ID_RSVAS_NAS_SV_RESUME_IND,
+    MSG_ID_RSVAS_NAS_SV_VIRTUAL_RESUME_IND,
+    MSG_ID_RSVAS_NAS_SV_LIMITED_VIRTUAL_RESUME_IND,
+    MSG_ID_RSVAS_NAS_SV_LIMITED_VIRTUAL_RESUME_RSP,
+    MSG_ID_RSVAS_NAS_SV_VIRTUAL_SUSPEND_IND,
+
+    /* SV<>SV */
+    MSG_ID_NAS_SV_REG_STATUS_MEETING_END_IND,
+    MSG_ID_NAS_SV_GOTO_NEXT_ACTION_IND,
+    MSG_ID_NAS_SV_CHECK_CAP_UPDATE_IND,
+    MSG_ID_NAS_SV_CHECK_LOCAL_RELEASE_IND,
+    MSG_ID_NAS_SV_CHECK_TRICK_RELEASE_IND,
+
+    MSG_ID_NAS_SV_CODE_END,
+
+MODULE_MSG_END( MSG_ID_NAS_SV_CODE_TAIL )
+#endif
+/*----------------------- NAS_SV_MSG_CODE_END--------------------*/
diff --git a/mcu/interface/sap/md/nl1_msgid.h b/mcu/interface/sap/md/nl1_msgid.h
new file mode 100644
index 0000000..c343539
--- /dev/null
+++ b/mcu/interface/sap/md/nl1_msgid.h
@@ -0,0 +1,602 @@
+/******************************************************************************
+*  Modification Notice:
+*  --------------------------
+*  This software is modified by MediaTek Inc. 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).
+*
+*******************************************************************************/
+
+/* Doxygene header *********************************************************//**
+ *
+ * @file       nl1_msgid.h
+ * @brief      NL1 pubic header file.
+ * @details    The public interfaces provided by NL1 MODULE.                                       \n
+ *             Don't put any module internal information here!                                     \n
+ *             Non-NL1 modules can only access NL1 MODULE through those interfaces declared here.  \n
+ *             Please make sure users can build pass w/o including other header files.             \n
+ *             This file shall be included by "nl1_public.h".
+ * @addtogroup NL1
+ * @{
+ *//***************************************************************************/
+
+#ifndef __NL1_MSGID_H__
+#define __NL1_MSGID_H__
+
+
+/*******************************************************************************
+*  #include
+*******************************************************************************/
+#include "module_msg_range.h"
+////////// End #include //////////
+
+
+/*******************************************************************************
+*  #define
+*  - All chars are "capital".
+*  - Use "NL1_" or module name (e.g., "RX_") as prefix.
+*  - Enclosed by "( )" to avoid ambiguity.
+*******************************************************************************/
+MODULE_MSG_BEGIN( MSG_ID_NL1_MSG_CODE_BEGIN )
+
+/****************************************************************************
+ *                          NRRC - NL1
+****************************************************************************/
+MSG_ID_NRRC_NL1_MSG_START            = MSG_ID_NL1_MSG_CODE_BEGIN,
+MSG_ID_NRRC_NL1_CONNECTED_CONFIG_REQ,/* Needs fixed message ID value for ELT decoding to work, so please keep as first NL1 message ID */
+MSG_ID_NRRC_NL1_SET_RAT_REQ,
+MSG_ID_NRRC_NL1_POWER_SCAN_REQ,
+MSG_ID_NRRC_NL1_CONTINUOUS_CARRIER_SEARCH_REQ,
+MSG_ID_NRRC_NL1_BCCH_REQ,
+MSG_ID_NRRC_NL1_BACKGROUND_POWER_SCAN_REQ,
+MSG_ID_NRRC_NL1_BACKGROUND_CONTINUOUS_CARRIER_SEARCH_REQ,
+MSG_ID_NRRC_NL1_CELL_DETECT_WITH_AUTO_GAP_NEEDED_RSP,
+MSG_ID_NRRC_NL1_BACKGROUND_BCCH_REQ,
+MSG_ID_NRRC_NL1_IDLE_CONFIG_REQ,
+MSG_ID_NRRC_NL1_CONNECTED_CONFIG_PARTIAL_REQ,
+MSG_ID_NRRC_NL1_CONNECTED_CONFIG_INDIRECT_DATA_REQ,
+MSG_ID_NRRC_NL1_DEACTIVATE_REQ,
+MSG_ID_NRRC_NL1_RANDOM_ACCESS_REQ,
+MSG_ID_NRRC_NL1_SCG_FAIL_MEAS_REPORT_REQ,
+MSG_ID_NRRC_NL1_REDIRECT_MEAS_REQ,
+MSG_ID_NRRC_NL1_REESTABLISH_MEAS_REQ,
+MSG_ID_NRRC_NL1_CHANNEL_PROCTECT_START_REQ,
+MSG_ID_NRRC_NL1_CHANNEL_PROCTECT_STOP_REQ,
+MSG_ID_NRRC_NL1_CHANNEL_PROTECT_START_REQ,
+MSG_ID_NRRC_NL1_CHANNEL_PROTECT_STOP_REQ,
+MSG_ID_NRRC_NL1_VIRTUAL_MODE_REQ,
+MSG_ID_NRRC_NL1_LEAVE_VC_SUCCESS_IND,
+MSG_ID_NRRC_NL1_SWITCH_VIRTUAL_CONNECTED_REQ,
+MSG_ID_NRRC_NL1_GET_SERV_MEAS_RESULT_REQ,
+MSG_ID_NRRC_NL1_AUTO_GAP_ON_REQ,
+MSG_ID_NRRC_NL1_AUTO_GAP_OFF_REQ,
+MSG_ID_NRRC_NL1_SPECIFIC_MEAS_RESULT_REQ,
+MSG_ID_NRRC_NL1_CELL_INFO_START_REQ,
+MSG_ID_NRRC_NL1_CELL_INFO_STOP_REQ,
+MSG_ID_NRRC_NL1_ENHANCEMENT_NTF,
+MSG_ID_NRRC_NL1_SYNC_CONNECTION_STATUS_REQ,
+MSG_ID_NRRC_NL1_HANDOVER_EVENT_REQ,
+MSG_ID_NRRC_NL1_ENHANCEMENT_QUERY_REQ,
+MSG_ID_NRRC_NL1_SIB9_FRAME_SYNC_REQ,
+MSG_ID_NRRC_NL1_VONR_STATUS_REQ,
+MSG_ID_NRRC_NL1_REPORT_CGI_REQ,
+MSG_ID_NRRC_NL1_DSP_SNIFFER_REQ,
+MSG_ID_NRRC_NL1_GEMINI_MODE_UPDATE_REQ,
+MSG_ID_NRRC_NL1_CELL_POWER_THRESHOLD_CONFIG_NTF,
+MSG_ID_NRRC_NL1_CONN_BAR_LIST_CTRL_REQ,
+MSG_ID_NRRC_NL1_PLMN_STATUS_UPDATE_NTF,
+MSG_ID_NRRC_NL1_SA_SILENCE_CTRL_REQ,
+MSG_ID_NRRC_NL1_GEMINI_SHARE_REQ,
+MSG_ID_NRRC_NL1_MOB_NVRAM_PARA_UPDATE_REQ,
+MSG_ID_NL1_NRRC_DVFS_CONTROL_MSG,
+MSG_ID_NRRC_NL1_HST_ENHANCE_CONFIG_REQ,
+
+/****************************************************************************
+ *                          NMAC - NL1
+****************************************************************************/
+MSG_ID_NMAC_NL1_SR_REQ,
+MSG_ID_NMAC_NL1_MAC_RESET_REQ,
+MSG_ID_NMAC_NL1_DL_HARQ_RESET_REQ,
+MSG_ID_NMAC_NL1_HOST_DATA_REQ,
+MSG_ID_NMAC_NL1_THERMAL_CTRL_NTF,
+MSG_ID_NMAC_NL1_MAC_SWITCH_VIRTUAL_CONNECTED_REQ,
+MSG_ID_NMAC_NL1_BUCKET_EXIST_DATA_RSP,
+MSG_ID_NMAC_NL1_BUCKET_STATUS_UPDATE_RSP,
+
+/****************************************************************************
+ *                          ERRC - NL1
+****************************************************************************/
+MSG_ID_ERRC_NL1_RADIO_MEAS_REQ,
+MSG_ID_ERRC_NL1_SFTD_REQ,
+MSG_ID_ERRC_NL1_SFTD_RSP,
+MSG_ID_ERRC_NL1_HPS_QUALIFY_CELL_NTF,
+MSG_ID_ERRC_NL1_HSR_CELL_FOUND_REQ,
+MSG_ID_NL1_ERRC_LTE_MEASUREMENT_CNF,
+MSG_ID_NL1_ERRC_LTE_MEASUREMENT_IND,
+MSG_ID_ERRC_NL1_LTE_INFO_NTF,
+
+/****************************************************************************
+ *                          EL1 - NL1
+****************************************************************************/
+MSG_ID_EL1_NL1_ENDC_GAP_CTRL_CNF,
+MSG_ID_EL1_NL1_MML1_ENDC_PRE_DB_READY_IND,
+MSG_ID_EL1_NL1_SFTD_TIMING_CNF,
+MSG_ID_EL1_NL1_FORCE_GAP_RSP,
+MSG_ID_EL1_NL1_SPECIFIC_DL_CHNG_NTF,
+MSG_ID_EL1_NL1_SPECIFIC_DL_CHNG_ABORT_NTF,
+MSG_ID_EL1_NL1_UDC_CONFIG_UPDATE_NTF,
+MSG_ID_EL1_NL1_UNLOCK_LTE_RFDB_NTF,
+MSG_ID_EL1_NL1_UNLOCK_SM_NTF, //to be removed
+MSG_ID_EL1_NL1_SA_RFDB_CREATE_NTF,
+
+/****************************************************************************
+ *                          EL1MPC - NL1
+****************************************************************************/
+MSG_ID_EL1MPC_NL1_LTE_POS_NTF,   /*__EL1_LPP_INTER_RAT_RSTD_SUPPORT__*/
+
+
+/****************************************************************************
+ *                          NL1CSM - NL1
+****************************************************************************/
+MSG_ID_NL1CSM_NL1_CSR_CTRL_NTF,
+MSG_ID_NL1CSM_NL1_CSR_RELEASE_DONE_NTF,
+MSG_ID_NL1CSM_NL1_RRM_HANDLING_START_NTF,
+MSG_ID_NL1CSM_NL1_RRM_MEASURE_DONE_NTF,
+MSG_ID_NL1CSM_NL1_SFTD_TIMING_CAL_NTF,
+MSG_ID_NL1CSM_NL1_SPECIFIC_CELL_SEARCH_NTF,
+MSG_ID_NL1CSM_NL1_REDIRECT_DONE_NTF,
+MSG_ID_NL1CSM_NL1_REESTABLISH_DONE_NTF,
+MSG_ID_NL1CSM_NL1_SPECIFIC_MEAS_RESULT_CNF,
+MSG_ID_NL1CSM_NL1_CSR_AUTO_GAP_END_NTF,
+MSG_ID_NL1CSM_NL1_BACKGROUND_CELL_DETECT_NTF,
+
+/****************************************************************************
+ *                          TEST MODE - NL1
+****************************************************************************/
+MSG_ID_NL1_NL1_NORMAL_MODE_RELEASE_REQ, // temp use. Finally solution: L4 run RSVAS SUSPEND flow.
+MSG_ID_NL1_NL1_NORMAL_MODE_RELEASE_CNF, // temp use. Finally solution: L4 run RSVAS SUSPEND flow.
+
+/****************************************************************************
+ *                          LISR - NL1
+****************************************************************************/
+MSG_ID_NL1SCHED_NL1_TG_MAPPING_CNF,
+MSG_ID_NL1SCHED_NL1_TG_ACT_CNF,
+MSG_ID_NL1SCHED_NL1_TG_DEACT_CNF,
+MSG_ID_NL1SCHED_NL1_CTRL_CNF,
+MSG_ID_NL1SCHED_NL1_BM_CNF,
+MSG_ID_NL1SCHED_NL1_BM_IND_CNF,
+MSG_ID_NL1SCHED_NL1_DL_CHNG_CNF,
+MSG_ID_NL1SCHED_NL1_FAST_DL_CHNG_CNF,
+MSG_ID_NL1SCHED_NL1_RRC_CONFIG_CNF,
+MSG_ID_NL1SCHED_NL1_SET_RAT_CNF,
+MSG_ID_NL1SCHED_NL1_MIB_RPT,
+MSG_ID_NL1SCHED_NL1_ABORT_RPT,
+MSG_ID_NL1SCHED_NL1_PDSCH_RPT,
+MSG_ID_NL1SCHED_NL1_PAGING_SHORT_MESSAGE_IND,
+MSG_ID_NL1SCHED_NL1_FIRST_PAGING_OCCASION_IND,
+MSG_ID_NL1SCHED_NL1_IRAT_DL_CHNG_DONE_IND,
+MSG_ID_NL1SCHED_NL1_VIRTUAL_MODE_CNF,
+MSG_ID_STLISR_NL1_RX_MEAS_RPT,
+MSG_ID_STLISR_NL1_CTRL_BM_CSI_BEAM_RSRP_RPT,
+MSG_ID_STLISR_NL1CTRL_DCI_TCI_STATE_IND,
+MSG_ID_NL1SCHED_NL1_BWP_CHNG_IND,
+MSG_ID_NMAC_STLISR_NL1_TCI_STATE_IND,
+MSG_ID_NL1LISR_NL1_BUFFER_ORGANIZE_IND,
+MSG_ID_STLISR_NL1_BWP_ABORT_CNF,
+MSG_ID_STLISR_NL1CTRL_SCHED_TICK_NTF,
+MSG_ID_STLISR_NL1CTRL_SLEEP_NTF,
+MSG_ID_STLISR_NL1CTRL_WAKE_UP_NTF,
+MSG_ID_STLISR_NL1CTRL_DRX_SWITCH_NTF,
+MSG_ID_STLISR_NL1CTRL_LIF_CHNG_IND,
+MSG_ID_STLISR_NL1CTRL_SCELL_STATUS_NTF,
+MSG_ID_STLISR_NL1_MEAS_GAP_PATTERN_DONE_NTF,
+MSG_ID_STLISR_NL1_META_PROC_DONE_IND,   // for TSTM use
+MSG_ID_STLISR_NL1_META_TASK_WAKE_IND,   // for TSTM use
+MSG_ID_STLISR_NL1_META_CRNTI_PDSCH_RPT, //for TSTM use
+MSG_ID_STLISR_NL1_META_RSRP_RSSI_RPT,   //for TSTM use
+MSG_ID_STLISR_NL1_META_SCH_OFF_IND,
+MSG_ID_STLISR_NL1_META_SCELL_PROC_IND,   // for TSTM use
+MSG_ID_NL1_NL1_EM_INIT_IND,
+MSG_ID_NL1_NL1_EM_DEINIT_IND,
+MSG_ID_NL1_NL1_EM_UNSYNC_NRT_UPDT_IND,
+MSG_ID_STLISR_NL1_EM_RSSI_NTF,
+MSG_ID_STLISR_NL1_TSTM_RSSI_NTF,
+MSG_ID_NL1RXGNSS_NL1_SYNC_CNF,
+MSG_ID_NL1SCHED_NL1_RX_CAPTURE_START,
+MSG_ID_NL1SCHED_NL1_RX_CAPTURE_STOP,
+MSG_ID_STLISR_NL1_BWP_MAC_RESET_CNF,
+
+/****************************************************************************
+ *                          NL1TX - NL1
+****************************************************************************/
+MSG_ID_NL1TX_NL1_SR_CNF,
+MSG_ID_NL1TX_NL1_SR_VC_REQ,
+MSG_ID_NL1TX_NL1_SR_INVALID_GRANT_IND,
+MSG_ID_NL1TX_NL1_RA_CNF,
+MSG_ID_NL1TX_NL1_RA_BEAM_NTF,
+MSG_ID_NL1TX_NL1_RA_OD_REQ,
+MSG_ID_NL1TX_NL1_TX_STOP_CNF,
+MSG_ID_NL1TX_NL1_TX_STOP_BY_VC_CNF,
+MSG_ID_NL1TX_NL1_UL_SYNC_IND,
+MSG_ID_NL1TX_NL1_FORCE_DRX_ON_REQ,
+MSG_ID_NL1TX_NL1_BFD_TIMEOUT_NTF,
+MSG_ID_NL1TX_NL1_BFR_REQ,
+MSG_ID_NL1TX_NL1_BFR_CFG_CHNG_NTF,
+MSG_ID_NL1_NL1_CTRL_BM_BFD_TIMEOUT,
+MSG_ID_NL1_NL1_CTRL_BM_BFR_NTF,
+MSG_ID_NL1TX_NL1_AUTO_GAP_SET_CNF,
+MSG_ID_NL1TX_SCHED_RX_RF_SELECT_NTF,
+MSG_ID_NL1TX_NL1TAS_CMD_IND,
+MSG_ID_NL1TX_NL1TAS_RRC_IND,
+MSG_ID_NL1TX_NL1TAS_TICK_IND,
+MSG_ID_NL1TX_NL1TAS_SCELL_IND,
+MSG_ID_NL1TX_NL1GNSS_TA_UPDATE_IND,
+
+/****************************************************************************
+ *                          LISR - NL1CSM
+****************************************************************************/
+MSG_ID_STLISR_NL1CSM_PS_RESULT_NTF,
+MSG_ID_STLISR_NL1CSM_EM_RSSI_NTF,
+MSG_ID_STLISR_NL1CSM_CS_RESULT_NTF,
+MSG_ID_STLISR_NL1CSM_CM_RESULT_NTF,
+MSG_ID_STLISR_NL1CSM_CM_PBC_RESULT_NTF,
+MSG_ID_STLISR_NL1CSM_MPC_PBCH_RESULT_NTF,
+MSG_ID_STLISR_NL1CSM_SCHED_TICK_NTF,
+MSG_ID_STLISR_NL1CSM_RRM_MSG_START                    = MSG_ID_STLISR_NL1CSM_SCHED_TICK_NTF,
+MSG_ID_STLISR_NL1CSM_CMD_CONFLICT_IND,
+MSG_ID_STLISR_NL1CSM_SSB_SMTC_ABORT_IND,
+MSG_ID_STLISR_NL1CSM_CMD_PER_CC_CONFLICT_NTF,
+MSG_ID_STLISR_NL1CSM_SCELL_DETECTION_NTF,
+MSG_ID_STLISR_NL1CSM_SCELL_STATUS_NTF,
+MSG_ID_STLISR_NL1CSM_CSR_ABORT_NTF,
+MSG_ID_STLISR_NL1CSM_PBCH_RF_CLOSE_NTF,
+
+/****************************************************************************
+ *                          NRRC - NL1CSM
+****************************************************************************/
+MSG_ID_NL1MPC_MPC_MSG_START,
+MSG_ID_NL1_CSM_CTRL_COMMAND_DEQEUE_REQ,
+MSG_ID_NL1_CSM_CTRL_COMMAND_DEQEUE_CNF,
+MSG_ID_NL1_CTRL_CSM_COMMAND_PREPARE_REQ,
+MSG_ID_NL1_CTRL_CSM_COMMAND_PREPARE_CNF,
+
+/****************************************************************************
+ *                          NL1 - NL1CSM
+****************************************************************************/
+MSG_ID_NL1_NL1CSM_CSR_START_CNF,
+MSG_ID_NL1_NL1CSM_CSR_STOP_CNF,
+MSG_ID_NL1_NL1CSM_CSR_STOP_CHK_REQ,
+MSG_ID_NL1_NL1CSM_CSR_STOP_CHK_CNF,
+MSG_ID_NL1_NL1CSM_CSR_CONFIG_UPDATE_NTF,
+MSG_ID_NL1_NL1CSM_RRM_CONFIG_NTF,
+MSG_ID_NL1_NL1CSM_RRM_MSG_START                    = MSG_ID_NL1_NL1CSM_RRM_CONFIG_NTF,
+MSG_ID_NL1_NL1CSM_RX_PBCH_RESULT_NTF,
+MSG_ID_NL1_NL1CSM_RRM_GAP_NOTIFY_NTF,
+MSG_ID_NL1_NL1CSM_RRM_ENDC_GAP_CONFIG_NTF,
+MSG_ID_NL1_NL1CSM_RRM_IRAT_MODE_STATUS_NTF,
+MSG_ID_NL1_NL1CSM_SCELL_STATUS_NTF,
+MSG_ID_NL1_NL1CSM_RSVAS_SUSPEND_IND,
+MSG_ID_NL1_NL1CSM_RSVAS_RESUME_IND,
+MSG_ID_NL1_NL1CSM_SPECIFIC_MEAS_RESULT_REQ,
+MSG_ID_NL1_NL1CSM_DEACTIVATE_NTF,
+MSG_ID_NL1_NL1CSM_RRM_DCI_BAD_QUALITY_NTF,
+MSG_ID_NL1_NL1CSM_GEMINI_SHARE_NTF,
+MSG_ID_NL1_NL1CSM_SET_RAT_REQ_NTF,
+
+
+/****************************************************************************
+ *                          NL1MOB - NL1CSM
+****************************************************************************/
+MSG_ID_NL1MOB_NL1CSM_SSB_RRM_POLICY_NTF,
+
+/****************************************************************************
+ *                          NL1MOB - NL1
+****************************************************************************/
+MSG_ID_NL1MOB_NL1_IDLE_RRM_MEAS_CNF,
+MSG_ID_NL1MOB_NL1_CONNECT_RRM_MEAS_CNF,
+MSG_ID_NL1MOB_NL1_DEACTIVATE_CNF,
+MSG_ID_NL1MOB_NL1_MEAS_EVENT_NBR_A3A5_NTF,
+MSG_ID_NL1MOB_NL1_GEMINI_GAP_STATUS_CHG_CNF,
+MSG_ID_NL1MOB_NL1_SYNC_CONNECTION_STATUS_CNF,
+MSG_ID_NL1MOB_NL1_CELL_INFO_IND,
+MSG_ID_NL1MOB_NL1_VONR_STATUS_CNF,
+
+
+/****************************************************************************
+ *                          NL1 - NL1MOB
+****************************************************************************/
+MSG_ID_NL1_NL1MOB_IDLE_RRM_MEAS_REQ,
+MSG_ID_NL1_NL1MOB_CONNECT_RRM_MEAS_REQ,
+MSG_ID_NL1_NL1MOB_DEACTIVATE_REQ,
+MSG_ID_NL1_NL1MOB_ENTER_SEARCHING_STATE_NTF,
+MSG_ID_NL1_NL1MOB_RSVAS_SUSPEND_NTF,
+MSG_ID_NL1_NL1MOB_VIRTUAL_MODE_NTF,
+MSG_ID_NL1_NL1MOB_SWITCH_VIRTUAL_CONNECTED_NTF,
+MSG_ID_NL1_NL1MOB_GEMINI_GAP_STATUS_CHG_REQ,
+MSG_ID_NL1_NL1MOB_SYNC_CONNECTION_STATUS_REQ,
+MSG_ID_NL1_NL1MOB_CELL_INFO_START_REQ,
+MSG_ID_NL1_NL1MOB_CELL_INFO_STOP_REQ,
+MSG_ID_NL1_NL1MOB_VONR_STATUS_REQ,
+MSG_ID_NL1_NL1MOB_LTE_HST_INFO_NTF,
+MSG_ID_NL1_NL1MOB_SA_SILENCE_CTRL_NTF,
+MSG_ID_NL1_NL1MOB_HANDOVER_EVENT_NTF,
+MSG_ID_NL1_NL1MOB_GEMINI_SHARE_NTF,
+
+/****************************************************************************
+ *                          NL1CSM - NL1MOB
+****************************************************************************/
+MSG_ID_NL1CSM_NL1MOB_SSB_INTRA_MEAS_RESULT_NTF,
+MSG_ID_NL1CSM_NL1MOB_SSB_INTER_MEAS_RESULT_NTF,
+MSG_ID_NL1CSM_NL1MOB_SBI_UPDATE_NTF,
+
+/****************************************************************************
+*                          TMC <-> NL1
+****************************************************************************/
+MSG_ID_TMC_NL1_SESSION_BEGIN_NTF,
+MSG_ID_TMC_NL1_SESSION_END_NTF,
+
+
+//TEMP for build pass
+// TODO: move to destination module file.
+/****************************************************************************
+ *                          NL1 - others
+****************************************************************************/
+MSG_ID_NRRC_NL1_BCCH_CNF,
+MSG_ID_NRRC_NL1_BCCH_IND,
+MSG_ID_NRRC_NL1_BACKGROUND_BCCH_IND,
+MSG_ID_NRRC_NL1_BACKGROUND_BCCH_CNF,
+
+MSG_ID_NRRC_NL1_CONTINUOUS_CARRIER_SEARCH_IND,
+MSG_ID_NRRC_NL1_CONTINUOUS_CARRIER_SEARCH_CNF,
+MSG_ID_NRRC_NL1_BACKGROUND_CONTINUOUS_CARRIER_SEARCH_IND,
+MSG_ID_NRRC_NL1_BACKGROUND_CONTINUOUS_CARRIER_SEARCH_CNF,
+MSG_ID_NRRC_NL1_POWER_SCAN_IND,
+MSG_ID_NRRC_NL1_POWER_SCAN_CNF,
+MSG_ID_NRRC_NL1_BACKGROUND_POWER_SCAN_IND,
+MSG_ID_NRRC_NL1_BACKGROUND_POWER_SCAN_CNF,
+MSG_ID_NRRC_NL1_VIRTUAL_MODE_CNF,
+
+/****************************************************************************
+* NL1 <-> MM
+****************************************************************************/
+MSG_ID_MM_NL1_HTP_MODE_IND,
+
+/****************************************************************************
+ *                          NL1 - others
+****************************************************************************/
+MSG_ID_NL1_NL1_SCHED_MAC_RESET_REQ,
+MSG_ID_NL1_NL1_SCHED_CTRL_REQ,
+MSG_ID_NL1_NL1_SCHED_CTRL_BM_REQ,
+MSG_ID_NL1_NL1_SCHED_CTRL_BM_BEAM_IND_REQ,
+MSG_ID_NL1_NL1_SCHED_CTRL_IND,
+MSG_ID_NL1_NL1_FAST_DL_CHNG_REQ,
+MSG_ID_NL1_NL1_DL_CHNG_REQ,
+MSG_ID_NL1_NL1_RRC_CONFIG_REQ,
+MSG_ID_NL1_NL1_SET_RAT_REQ,
+MSG_ID_NL1_NL1_SET_RNTI_VALUE,
+MSG_ID_NL1_NL1_SET_SLM_SSB_PARAM,
+MSG_ID_NL1_NL1_CRNTI_OFF_NTF,
+MSG_ID_NL1_NL1_CRNTI_ON_NTF,
+MSG_ID_NL1_NL1_SCHED_RLM_IND,
+MSG_ID_NL1_NL1_TST_META_IND,
+MSG_ID_NL1_NL1_META_SCELL_UNSYNC_NRT_UPDT_IND, // for TSTM use
+MSG_ID_NL1_NL1_META_SCELL_SYNC_DLCHNG_IND, // for TSTM use
+MSG_ID_NL1_NL1_META_SCELL_SYNC_NRT_UPDT_IND, // for TSTM use
+MSG_ID_NL1_NL1_META_SCELL_CSR_IND, // for TSTM use
+MSG_ID_NL1_NL1_META_UNSYNC_NRT_UPDT_IND, // for TSTM use
+MSG_ID_NL1_NL1_META_SYNC_DLCHNG_IND, // for TSTM use
+MSG_ID_NL1_NL1_META_SYNC_NRT_UPDT_IND, // for TSTM use
+MSG_ID_NL1_NL1_META_FORCE_NRT_UPDT_IND, // for TSTM use
+MSG_ID_NL1_NL1_META_SCH_OFF_IND, // for TSTM use
+MSG_ID_NL1_NL1_META_PCELL_RELEASE_IND, // for TSTM use
+MSG_ID_NL1_NL1_META_NROMAL_INIT_IND, // for TSTM use
+MSG_ID_NL1_NL1_EM_LTE_ENDC_RF_SCAN_START_REQ,
+MSG_ID_NL1_NL1_EM_LTE_ENDC_RF_SCAN_START_CNF,
+MSG_ID_NL1_NL1_EM_SIM1_LTE_ENDC_RF_SCAN_START_REQ,
+MSG_ID_NL1_NL1_EM_SIM1_LTE_ENDC_RF_SCAN_START_CNF,
+MSG_ID_NL1_NL1_EM_SIM2_LTE_ENDC_RF_SCAN_START_REQ,
+MSG_ID_NL1_NL1_EM_SIM2_LTE_ENDC_RF_SCAN_START_CNF,
+MSG_ID_NL1_NL1_EM_LTE_ENDC_RF_SCAN_STOP_REQ,
+MSG_ID_NL1_NL1_EM_LTE_ENDC_RF_SCAN_STOP_CNF,
+MSG_ID_NL1_NL1_EM_LTE_ENDC_RF_SCAN_TRIGGER_START_REQ,
+MSG_ID_NL1_NL1_EM_LTE_ENDC_RF_SCAN_TRIGGER_START_CNF,
+MSG_ID_NL1_NL1_EM_LTE_ENDC_RF_SCAN_TRIGGER_STOP_REQ,
+MSG_ID_NL1_NL1_EM_LTE_ENDC_RF_SCAN_TRIGGER_STOP_CNF,
+MSG_ID_NL1_NL1_EM_SIM1_LTE_ENDC_RF_SCAN_TRIGGER_START_REQ,
+MSG_ID_NL1_NL1_EM_SIM1_LTE_ENDC_RF_SCAN_TRIGGER_START_CNF,
+MSG_ID_NL1_NL1_EM_SIM2_LTE_ENDC_RF_SCAN_TRIGGER_START_REQ,
+MSG_ID_NL1_NL1_EM_SIM2_LTE_ENDC_RF_SCAN_TRIGGER_START_CNF,
+MSG_ID_NL1_NL1_EM_ENDC_UNSYNC_NRT_UPDATE,
+MSG_ID_NL1_NL1_META_RESET_TSTM_IND, // for TSTM use
+MSG_ID_NL1_NL1_IRT_GAP_NOTIFY_IND,
+MSG_ID_NL1_NL1_CSM_MODE_IND,
+MSG_ID_NL1_NL1_PHYTEST_IND,
+MSG_ID_NL1_NL1_CTRL_RX_MEAS_RSLT_IND,
+MSG_ID_NL1_NL1_CTRL_BM_BFI_NTF, // for NL1 internal use
+MSG_ID_NL1_NL1_CTRL_BM_BFR_MONITOR_START_NTF, // for NL1 internal use
+MSG_ID_NL1_NL1_RANDOM_ACCESS_ABORT_REQ,
+MSG_ID_NL1_NL1_SCHED_VIRTUAL_MODE_REQ,
+MSG_ID_NL1_NL1_RFDB_LOCK_AVAILABLE_IND,
+MSG_ID_NL1_NL1_CTRL_RLM_FORCE_MODE_NTF,
+MSG_ID_NL1_NL1_UTAS_DAT_INACTIVE_REQ,
+MSG_ID_NL1_NL1_PEER_SIM_PAGING_SHARING_NTF,
+MSG_ID_NL1_NL1_PEER_SIM_CAMPING_LOST_IND,
+
+/****************************************************************************
+ *                          NI TestStand Tool <-> NL1-MAIN
+ ****************************************************************************/
+MSG_ID_ML1S_NL1_ML1S_TEST_MODE_REQ,
+MSG_ID_ML1S_NL1_MSG_START                     = MSG_ID_ML1S_NL1_ML1S_TEST_MODE_REQ,
+MSG_ID_ML1S_NL1_ML1S_TEST_MODE_CNF,
+MSG_ID_ML1S_NL1_SIMULATE_RA_PROCEDURE_REQ,
+MSG_ID_ML1S_NL1_TBS_MISMATCH_FORCE_NEWTX_REQ,
+MSG_ID_ML1S_NL1_FIXED_SFN_NTF,
+MSG_ID_ML1S_NL1_CSIF_N_L1_ONLY_MODE_UL_GRANT_CMD,
+MSG_ID_ML1S_NL1_MSG_END,
+MSG_ID_ML1S_NL1_PHYTEST_CFG_REQ,
+
+/****************************************************************************
+ *                          NL1 <-> FT
+****************************************************************************/
+MSG_ID_NL1_TO_FT,
+MSG_ID_NL1TASK_WAKEUP,
+
+/****************************************************************************
+ *                          NL1 <-> NL1ICD
+****************************************************************************/
+MSG_ID_NL1_NL1ICD_RRC_RPT,
+MSG_ID_NL1_NL1ICD_RRC_SCELL_RPT,
+MSG_ID_NL1_NL1ICD_PWR_CTRL_RPT,
+MSG_ID_NL1_NL1ICD_PWR_HEADROOM_RPT,
+MSG_ID_NL1_NL1ICD_AGC_RSSI_RPT,
+MSG_ID_NL1_NL1ICD_DMRS_SNR_RPT,
+MSG_ID_NL1_NL1ICD_UTAS_COMMON_RPT,
+MSG_ID_NL1_NL1ICD_UTAS_CC_RPT,
+MSG_ID_NL1_NL1ICD_BWP_CHG_RPT,
+MSG_ID_NL1_NL1ICD_BWP_CHG_SCELL_RPT,
+MSG_ID_NL1_NL1ICD_SIM_CHG_RPT,
+
+/****************************************************************************
+*                          NL1 <-> DCLC(Dynamic Cache Lock Control)
+ ****************************************************************************/
+#if defined(__DYNAMIC_CACHE_LOCK_CENTRAL_CONTROL_SUPPORT__)
+MSG_ID_NL1_DCLC_LOCK_UNLOCK_IND,
+#endif
+
+/****************************************************************************
+*                          OTHER <-> NL1ICD
+****************************************************************************/
+MSG_ID_CSIF_NL1ICD_EMI_READ_REQ,
+MSG_ID_STLISR_NL1ICD_TICK_IND,
+MSG_ID_L4C_NL1ICD_RFPD_SET_IND,
+
+/****************************************************************************
+ *                          NL1 <-> MODEM IDC
+****************************************************************************/
+#if defined(__IDC_ENABLED__)
+MSG_ID_IDC_NL1TX_MAX_PWR_IND,
+#endif
+
+/****************************************************************************
+ *                          NRLC - NL1
+****************************************************************************/
+MSG_ID_NRLCUL_NL1_LCPR_PARAM_RSP,
+MSG_ID_NRLCUL_NL1_GAMING_CELL_INFO_NTF,
+
+/****************************************************************************
+*                          GNSS_TC -> NL1
+****************************************************************************/
+MSG_ID_GNSS_TC_NL1_SYNC_REQ,
+MSG_ID_GNSS_TC_NL1_TIME_INFO_RSP,
+
+/****************************************************************************
+*                          SASE -> NL1
+****************************************************************************/
+MSG_ID_SASE_NL1_LTE_POS_START_REQ, // stop SCH to make BRP not access HARQ buffer anymore
+
+/****************************************************************************
+* xL1SIM
+****************************************************************************/
+#ifdef __XL1SIM__
+MSG_ID_NRRC_NL1_ADDITIONAL_DL_BWP,
+MSG_ID_NRRC_NL1_ADDITIONAL_UL_BWP,
+MSG_ID_NRRC_NL1_MEAS_OBJECT,
+MSG_ID_NRRC_NL1_NZP_CSI_RS_RESOURCE,
+MSG_ID_NRRC_NL1_NZP_CSI_RS_RESOURCE_SET,
+MSG_ID_NRRC_NL1_CSI_SSB_RESOURCE_SET,
+MSG_ID_NRRC_NL1_CSI_RESOURCE_CONFIG,
+MSG_ID_NRRC_NL1_CSI_REPORT_CONFIG,
+MSG_ID_NRRC_NL1_CSI_APERIODIC_TRIGGER_STATE,
+#endif
+
+/****************************************************************************
+* Logging
+****************************************************************************/
+MSG_ID_NL1_PDSCH_BUFFER,
+
+MODULE_MSG_END( MSG_ID_NL1_MSG_CODE_TAIL )
+
+////////// End #define //////////
+
+
+/*******************************************************************************
+*  typedef
+*  - enum
+*     - Use module name (e.g., "RX_") as prefix.
+*     - Add postfix with "_E"
+*     - Element Naming
+*        - All chars are "capital".
+*        - Words are separated by underline "_".
+*        - Use enum name as prefix (remove "_E").
+*  - struct
+*     - Use module name (e.g., "RX_") as prefix.
+*     - Add postfix with "_T".
+*     - Element Naming
+*        - All chars are "lowercase".
+*        - Words are separated by underline "_".
+*******************************************************************************/
+
+////////// End typedef //////////
+
+
+/*******************************************************************************
+*  Extern Global Data (only const is allowed)
+*******************************************************************************/
+
+////////// End Extern Global Data //////////
+
+
+/*******************************************************************************
+*  Module Public Interface Functions "inside" NL1
+*******************************************************************************/
+/***************************************************************************//**
+ * @brief         N/A
+ * @details       N/A
+ * @param[in]     N/A
+ * @param[out]    N/A
+ * @param[in,out] N/A
+ * @return        N/A
+*******************************************************************************/
+
+/***************************************************************************//**
+ * @brief         N/A
+ * @details       N/A
+ * @param[in]     N/A
+ * @param[out]    N/A
+ * @param[in,out] N/A
+ * @return        N/A
+*******************************************************************************/
+
+////////// End Module Public Interface Functions "inside" NL1 //////////
+
+
+#endif /* #define __NL1_MSGID_H__ */
+
+/* Doxygene end of defgroup header!!! **********************************//**@}*/
+
diff --git a/mcu/interface/sap/md/nl1b_msgid.h b/mcu/interface/sap/md/nl1b_msgid.h
new file mode 100644
index 0000000..870817f
--- /dev/null
+++ b/mcu/interface/sap/md/nl1b_msgid.h
@@ -0,0 +1,71 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *  nl1b_msgid.h
+ *
+ * Project:
+ * --------
+ *  N5G adaptor
+ *
+ * Description:
+ * ------------
+ *  NL1B message id definitions
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ *
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef NL1B_MSGID_H
+#define NL1B_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_NL1B_CODE_BEGIN )
+/****************************************************************************/
+
+MSG_ID_N5G_TICK_IND                = MSG_ID_NL1B_CODE_BEGIN,
+
+/****************************************************************************/
+MODULE_MSG_END( MSG_ID_NL1B_CODE_TAIL )
+
+#endif /* NL1B_MSGID_H */
diff --git a/mcu/interface/sap/md/nl2_msgid.h b/mcu/interface/sap/md/nl2_msgid.h
new file mode 100644
index 0000000..a4e1078
--- /dev/null
+++ b/mcu/interface/sap/md/nl2_msgid.h
@@ -0,0 +1,206 @@
+/*****************************************************************************
+*  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).
+*
+*****************************************************************************/
+#ifndef _NL2_MSGID_H
+#define _NL2_MSGID_H
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_NL2_CODE_BEGIN )
+MSG_ID_NL2_MSG_ID_START = MSG_ID_NL2_CODE_BEGIN,
+    /* MSGs from NRRC (upper layer) */
+    MSG_ID_NRRC_NRLCDL_CONFIG_REQ,
+    MSG_ID_NRRC_NRLCUL_CONFIG_REQ,
+    MSG_ID_NRRC_NRLCUL_SRB1_ACK_REQ,
+    MSG_ID_NRRC_NMAC_CONFIG_REQ,
+    MSG_ID_NRRC_NMAC_RESET_REQ,
+    MSG_ID_NRRC_NMAC_CCCH_DATA_REQ,
+    MSG_ID_NRRC_NRLCUL_SWITCH_VIRTUAL_CONNECTED_REQ,
+    MSG_ID_NRRC_NRLCDL_SWITCH_VIRTUAL_CONNECTED_REQ,
+    MSG_ID_NRRC_NMAC_SWITCH_VIRTUAL_CONNECTED_REQ,
+    MSG_ID_NRRC_NRLCDL_RECONFIG_WITH_SYNC_COMPLETE_REQ,
+    MSG_ID_NRRC_NMAC_DSP_SNIFFER_REQ,
+    MSG_ID_NRRC_NRLCDL_SRB1_RLC_CTRL_PDU_REQ,
+
+    /* MSGs from NL1 (lower layer) */
+    MSG_ID_NMAC_NL1_MAC_RESET_CNF,
+    MSG_ID_NMAC_NL1_HARQ_CLOSE_IND,
+    MSG_ID_NMAC_NL1_DL_HARQ_CLOSE_IND,
+    MSG_ID_NMAC_NL1_SPS_START_IND,
+    MSG_ID_NMAC_NL1_SPS_END_IND,
+    MSG_ID_NMAC_NL1_UL_TOTAL_TB_SIZE_IND,
+    MSG_ID_NL2POW_NL1_L2COPRO_POWER_ON_IND,
+    MSG_ID_NL2POW_NL1_L2COPRO_POWER_OFF_IND,
+    MSG_ID_NMAC_NL1_RA_START_IND,
+    MSG_ID_NMAC_NL1_RA_FINISH_IND,
+    MSG_ID_NMAC_NL1_RA_ICD_INFO_IND,
+    MSG_ID_NMAC_NL1_TIMER_STATUS_IND,
+    MSG_ID_NMAC_NL1_DRX_ICD_INFO_IND,
+    MSG_ID_NMAC_NL1_TIMING_ADVANCE_IND,
+    MSG_ID_NMAC_NL1_CA_IND,
+    MSG_ID_NMAC_NL1_SR_TRIGGERED_IND,
+    MSG_ID_NMAC_NL1_P_SI_TB_IND,
+    MSG_ID_NMAC_NL1_SERVING_CELL_INFO_IND,
+    MSG_ID_NMAC_NL1_LEAVE_GEMINI_GAP_IND,
+    MSG_ID_NMAC_NL1_MAC_SWITCH_VIRTUAL_CONNECTED_CNF,
+    MSG_ID_NMAC_NL1_PHY_CONFIG_INFO_IND,
+    MSG_ID_NMAC_NL1_DEFENSE_GAP_ACTION_IND,    
+    MSG_ID_NMAC_NL1_RA_COMPLETE_IND,
+    MSG_ID_NMAC_NL1_SR_MAX_IND,
+    MSG_ID_NMAC_NL1_SR_TX_IND,
+    MSG_ID_NMAC_NL1_LEAVE_IDC_GAP_IND,
+    MSG_ID_NMAC_NL1_PAGING_GAP_IND,
+    MSG_ID_NRLCDL_NL1_IDC_GAP_IND,
+
+    /* NOTE: MSGs from NMAC to NL1 are in nl1_msgid.h */
+
+    /* MSGs from NMAC to NMAC. */
+    MSG_ID_NMAC_NORMAL_PRIO_DL_DATA_IND,
+    MSG_ID_NMAC_HIGH_PRIO_DL_DATA_IND,
+    MSG_ID_NMACDL_HARQ_LIFETIME_MONITOR_EXPIRE_NTF,
+    MSG_ID_NMAC_STOP_DATA_INACT_TIMER_REQ,
+    MSG_ID_NMAC_FORCE_CLOSE_HARQ_NTF,
+    MSG_ID_NMAC_RETX_BSR_TIMER_EXPIRE_NTF,
+    MSG_ID_NMAC_ICD_ERR_LCID_NTF,
+    MSG_ID_NMAC_DYN_FEAT_SR_REQ,
+
+    /* MSGs from NMAC to ENPDCP. */
+    MSG_ID_ENPDCP_NMAC_DUP_ACT_DEACT_IND,
+
+    /* MSGs from NMAC to NRLC-UL. */
+    MSG_ID_NRLCUL_NMAC_MAC_RESET_IND,
+    MSG_ID_NRLCUL_NMAC_HARQ_CLOSE_IND,
+
+    /* MSGs from NMAC to NRLC-DL. */
+    MSG_ID_NRLCDL_NMAC_GEMINI_GAP_INFO_IND,
+	
+    /* MSGs from NRLC-UL to NMAC. */
+    MSG_ID_NRLCUL_NMAC_MAC_RESET_RSP,
+    MSG_ID_NRLCUL_NMAC_RETX_BSR_TRIGGER_REQ,
+
+    /* MSGs from NL2TXRLC to NRLCUL task */
+    MSG_ID_NRLCUL_NL2TXRLC_POST_PROCESS_IND,
+
+    /* MSGs from NL2TXMAC to NMACDL task */
+    MSG_ID_NRMACMUX_NMACDL_START_DATA_INACT_TIMER_IND,
+    
+    /* MSGs from copro lisr to NRLCUL task */
+    MSG_ID_NRLCUL_NRLCUL_RETX_CIPHER_DONE_IND,
+
+    /* MSGs from NRLCUL to NRLCDL */
+    MSG_ID_NRLCUL_NRLCDL_FREE_STATUS_PDU_REQ,
+    MSG_ID_NRLCUL_NRLCDL_SRB1_ACK_REQ,
+    MSG_ID_NRLCUL_NRLCDL_SEND_STATUS_IND,
+
+    /* MSGs from NRLCDL to NRLCDL */
+    MSG_ID_NRLCDL_NRLCDL_POST_OFF_DELIVER_IND,
+    MSG_ID_NRLCDL_NRLCDL_POST_DROP_IND,
+
+    /* MSGs from NRLCDL to NRLCUL */
+    MSG_ID_NRLCDL_NRLCUL_RCV_STATUS_IND,
+    MSG_ID_NRLCDL_NRLCUL_SRB1_ACK_CNF,
+
+    /* MSGs from NRLC to NMAC */
+    MSG_ID_NRLC_NMAC_BSR_TRIGGER_REQ,
+    
+    /* MSGs from EMAC to NMAC */
+    MSG_ID_EMAC_NMAC_PREDICT_SR_REQ,    
+
+    /* MSGs from ENPDCP to NMAC */
+    MSG_ID_ENPDCP_NMAC_BSR_TRIGGER_REQ,
+
+
+    /* MSGs to ENPDCP */
+    MSG_ID_NPDCP_DPCOPRO_DECIPHER_DONE_IND,
+    MSG_ID_NPDCP_NRLC_DL_DATA_IND,
+    MSG_ID_NR_L2_RLC_DL_DATA_IND = MSG_ID_NPDCP_NRLC_DL_DATA_IND,
+    MSG_ID_ENPDCP_NRLCDL_VRB_VA_NO_RELEASE_IND,
+    MSG_ID_ENPDCP_NRLCDL_IDC_GAP_BEGIN_IND,
+
+    /* MSGs from ENL2ICD */
+    MSG_ID_ENL2ICD_NMAC_CTRL_NTF,
+    MSG_ID_ENL2ICD_NMAC_TIMER_EXPIRY_NTF,
+    MSG_ID_ENL2ICD_NRLCDL_CTRL_NTF,
+    MSG_ID_ENL2ICD_NRLCDL_TIMER_EXPIRY_NTF,
+    MSG_ID_ENL2ICD_NRLCUL_CTRL_NTF,
+    MSG_ID_ENL2ICD_NRLCUL_TIMER_EXPIRY_NTF,
+    MSG_ID_ICD_NMAC_REQUEST_LOG_NTF,
+    
+    /* MSGs to NRLCUL */
+    MSG_ID_NRLCUL_SIMULATE_TIMER_EXPIRY,
+    MSG_ID_NRLCUL_SIMULATE_ENL2ICD_TIMER_EXPIRY,
+
+    /* MSGs from ML1S */
+    MSG_ID_ML1S_NMAC_ML1S_TEST_MODE_REQ,
+    MSG_ID_ML1S_NMAC_CCCH_DATA_REQ,
+    MSG_ID_ML1S_NMAC_DL_DATA_DISCARD_REQ,
+    MSG_ID_ML1S_NMAC_MAC_PDU_FOR_RAR_REQ,
+    MSG_ID_ML1S_NMAC_MAC_CE_TRIGGER_REQ,
+
+    /* MSGs from NL2 User to NL2POW. */
+    MSG_ID_NL2POW_USER_L2COPRO_POWER_ON_REQ,
+    MSG_ID_NL2POW_USER_L2COPRO_POWER_OFF_REQ,
+
+    /* MSGs from TMC to NMAC */
+    MSG_ID_TMC_NMAC_THERMAL_CONTROL_REQ,
+    MSG_ID_TMC_NMAC_SESSION_BEGIN_NTF,
+    MSG_ID_TMC_NMAC_SESSION_END_NTF,
+
+    /* MSGs from IPCore to ENPDCP */
+	MSG_ID_IPCORE_ENPDCP_UL_SUSPEND_NTF,
+	MSG_ID_IPCORE_ENPDCP_UL_ACTIVE_NTF,
+
+    /* MSGs from UPCM to NMAC */    
+    MSG_ID_UPCM_NMAC_RBRQ_REQ,
+    MSG_ID_UPCM_NMAC_TAG_DATA_ARRIVAL_REQ,
+    MSG_ID_UPCM_NMAC_INTERNET_DISCONNECT_REQ,
+    
+   /* MSGs from ENL2 SEC */
+    MSG_ID_ENL2_NRLCDL_VRB_VA_SHORTAGE_NTF,
+    MSG_ID_ENL2_NRLCUL_VRB_VA_SHORTAGE_NTF,
+    MSG_ID_ENL2_NMACDL_VRB_VA_SHORTAGE_NTF,
+    MSG_ID_ENL2_NRLCDL_VRB_VA_NO_RELEASE_NTF,
+    MSG_ID_ENL2_NRLCUL_VRB_VA_NO_RELEASE_NTF,
+    MSG_ID_ENL2_NL2POW_VRB_VA_NO_RELEASE_NTF,
+
+    /* MSGs from speech driver to NMAC */
+    MSG_ID_MED_NMAC_VONR_TIMING_INFO_REQ,
+
+    /* MSGs from RSVAS to NMAC */
+    MSG_ID_RSVAS_NMAC_SUSPEND_SERVICE_REQ,
+    MSG_ID_RSVAS_NMAC_RESUME_SERVICE_REQ,
+
+    MSG_ID_NL2_MSG_ID_END,
+MODULE_MSG_END( MSG_ID_NL2_CODE_TAIL )
+
+#endif /* NL2_MSGID_H */
diff --git a/mcu/interface/sap/md/nrrc_msgid.h b/mcu/interface/sap/md/nrrc_msgid.h
new file mode 100644
index 0000000..5f558a3
--- /dev/null
+++ b/mcu/interface/sap/md/nrrc_msgid.h
@@ -0,0 +1,736 @@
+/*****************************************************************************
+*  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).
+*
+*****************************************************************************/
+#ifndef NRRC_MSGID_H
+#define NRRC_MSGID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_NRRC_CODE_BEGIN )
+MSG_ID_NRRC_MSG_ID_START = MSG_ID_NRRC_CODE_BEGIN,
+
+    /* MSGs from 2G RR */
+    MSG_ID_RR_NRRC_EVALUATE_NRCELL_REQ,
+    MSG_ID_RR_NRRC_EVALUATE_NRCELL_STOP_REQ,
+    MSG_ID_RR_NRRC_ACTIVATE_NRCELL_REQ,
+    MSG_ID_RR_NRRC_BACKGROUND_SEARCH_START_REQ,
+    MSG_ID_RR_NRRC_BACKGROUND_SEARCH_STOP_REQ,
+
+    /* MSGs from 3G RRC */
+    MSG_ID_RRC_NRRC_EVALUATE_NRCELL_REQ,
+    MSG_ID_RRC_NRRC_EVALUATE_NRCELL_STOP_REQ,
+    MSG_ID_RRC_NRRC_ACTIVATE_NRCELL_REQ,
+    MSG_ID_RRC_NRRC_BACKGROUND_SEARCH_START_REQ,
+    MSG_ID_RRC_NRRC_BACKGROUND_SEARCH_STOP_REQ,
+
+    /* MSGs from ERRC  */
+    MSG_ID_ERRC_NRRC_IE_CHECK_REQ,
+    MSG_ID_ERRC_NRRC_CONFIG_REQ,
+    MSG_ID_ERRC_NRRC_CONFIG_CONTINUE_REQ,
+    MSG_ID_ERRC_NRRC_SUSPEND_REQ,
+    MSG_ID_ERRC_NRRC_RELEASE_REQ,
+    MSG_ID_NRRC_ERRC_PDCP_CONFIG_CNF,
+    MSG_ID_NRRC_ERRC_PDCP_SWITCH_VIRTUAL_CONNECTED_CNF,
+    MSG_ID_ERRC_NRRC_RB_REVERT_FORGET_REQ,
+    MSG_ID_ERRC_NRRC_QOS_UPDATE_REQ,
+    MSG_ID_ERRC_NRRC_SRB1_SEC_ACTIVATE_REQ,
+    MSG_ID_NRRC_ERRC_COMBINED_IE_CHECK_FAILURE_IND,
+    MSG_ID_ERRC_NRRC_VIRTUAL_CONNECTED_SUSPEND_REQ,
+    MSG_ID_ERRC_NRRC_VIRTUAL_CONNECTED_RESUME_REQ,
+    MSG_ID_ERRC_NRRC_BACKGROUND_SEARCH_START_REQ,
+    MSG_ID_ERRC_NRRC_BACKGROUND_SEARCH_STOP_REQ,
+    MSG_ID_ERRC_NRRC_EVALUATE_NRCELL_REQ,
+    MSG_ID_ERRC_NRRC_EVALUATE_NRCELL_STOP_REQ,
+    MSG_ID_NRRC_ERRC_EVALUATE_ECELL_CNF,
+    MSG_ID_NRRC_ERRC_EVALUATE_ECELL_STOP_CNF,
+    MSG_ID_NRRC_ERRC_ACTIVATE_ECELL_CNF,
+    MSG_ID_ERRC_NRRC_INTER_RAT_FREQ_UPDATE_IND,
+    MSG_ID_NRRC_ERRC_REPORT_CGI_CNF,
+    MSG_ID_ERRC_NRRC_REPORT_CGI_REQ,
+    MSG_ID_NRRC_ERRC_CGI_CONFLICT_JUDGE_CNF,
+    MSG_ID_NRRC_ERRC_AUTO_GAP_ON_CNF,
+    MSG_ID_NRRC_ERRC_AUTO_GAP_OFF_CNF,
+    MSG_ID_NRRC_ERRC_AUTO_GAP_OFF_IND,
+    MSG_ID_ERRC_NRRC_HANDOVER_NRCELL_REQ,
+    MSG_ID_ERRC_NRRC_ABORT_HANDOVER_NRCELL_REQ,
+    MSG_ID_NRRC_ERRC_HANDOVER_ECELL_CNF,
+    MSG_ID_NRRC_ERRC_OTDOA_MEAS_IND,
+    MSG_ID_NRRC_ERRC_OTDOA_MEAS_CNF,
+    MSG_ID_NRRC_ERRC_OTDOA_AUTO_GAP_OFF_IND,
+    MSG_ID_NRRC_ERRC_PRS_GAP_IND,
+    MSG_ID_ERRC_NRRC_DSP_SNIFFER_REQ,
+    MSG_ID_ERRC_NRRC_DSP_SNIFFER_CNF,
+
+    /* MSGs from NL1  */
+    MSG_ID_NRRC_NL1_CONNECTED_CONFIG_CNF,
+    MSG_ID_NRRC_NL1_IDLE_CONFIG_CNF,
+    MSG_ID_NRRC_NL1_PUCCH_SRS_RELEASE_IND,
+    MSG_ID_NRRC_NL1_MEAS_REPORT_IND,
+    MSG_ID_NRRC_NL1_SCG_FAIL_MEAS_REPORT_CNF,
+    MSG_ID_NRRC_NL1_RLF_IND,
+    MSG_ID_NRRC_NL1_RANDOM_ACCESS_CNF,
+    MSG_ID_NRRC_NL1_RANDOM_ACCESS_IND,
+    MSG_ID_NRRC_NL1_DEACTIVATE_CNF,
+    MSG_ID_NRRC_NL1_SET_RAT_CNF,
+    MSG_ID_NRRC_NL1_RESELECTION_NEEDED_IND,
+    MSG_ID_NRRC_NL1_CAMPING_LOST_IND,
+    MSG_ID_NRRC_NL1_EARLY_CAMPING_LOST_IND,
+    MSG_ID_NRRC_NL1_BACKGROUND_PBCH_MEAS_RESULT_IND,
+    MSG_ID_NRRC_NL1_PBCH_MEAS_RESULT_IND,
+    MSG_ID_NRRC_NL1_PAGING_IND,
+    MSG_ID_NRRC_NL1_BCCH_MOD_IND,
+    MSG_ID_NRRC_NL1_PWS_IND,
+    MSG_ID_NRRC_NL1_REDIRECT_MEAS_IND,
+    MSG_ID_NRRC_NL1_REDIRECT_MEAS_CNF,
+    MSG_ID_NRRC_NL1_REESTABLISH_MEAS_IND,
+    MSG_ID_NRRC_NL1_REESTABLISH_MEAS_CNF,
+    MSG_ID_NRRC_NL1_CELL_POWER_LEVEL_IND,
+    MSG_ID_NRRC_NL1_GET_SERV_MEAS_RESULT_CNF,
+    MSG_ID_NRRC_NL1_AUTO_GAP_ON_CNF,
+    MSG_ID_NRRC_NL1_AUTO_GAP_OFF_CNF,
+    MSG_ID_NRRC_NL1_SPECIFIC_MEAS_RESULT_CNF,
+    MSG_ID_NRRC_NL1_CELL_INFO_IND,
+    MSG_ID_NRRC_NL1_SYNC_CONNECTION_STATUS_CNF,
+    MSG_ID_NRRC_NL1_HANDOVER_EVENT_CNF,
+    MSG_ID_NRRC_NL1_SIB9_FRAME_SYNC_CNF,
+    MSG_ID_NRRC_NL1_SWITCH_VIRTUAL_CONNECTED_CNF,
+    MSG_ID_NRRC_NL1_ENHANCEMENT_QUERY_CNF,
+    MSG_ID_NRRC_NL1_VONR_STATUS_CNF,
+    MSG_ID_NRRC_NL1_CELL_DETECT_WITH_AUTO_GAP_NEEDED_IND,
+    MSG_ID_NRRC_NL1_SA_SILENCE_CTRL_CNF,
+    MSG_ID_NRRC_NL1_DSP_SNIFFER_CNF,
+    MSG_ID_NRRC_NL1_GEMINI_MODE_UPDATE_CNF,
+    MSG_ID_NRRC_NL1_GEMINI_SHARE_CNF,
+    MSG_ID_NRRC_NL1_CONN_BAR_LIST_CTRL_CNF,
+	MSG_ID_NRRC_NL1_CUSTOM_BAR_LIST_CLEAR_NTF,
+
+    /* MSGs from NMAC  */
+    MSG_ID_NRRC_NMAC_CONFIG_CNF,
+    MSG_ID_NRRC_NMAC_RESET_CNF,
+    MSG_ID_NRRC_NMAC_CCCH_DATA_IND,
+    MSG_ID_NRRC_NMAC_DATA_INACTIVITY_TIMER_EXPIRED_IND,
+    MSG_ID_NRRC_NMAC_SWITCH_VIRTUAL_CONNECTED_CNF,
+    MSG_ID_NRRC_NMAC_DSP_SNIFFER_CNF,
+
+    /* MSGs from NRLCDL (lower layer) */
+    MSG_ID_NRRC_NRLCDL_CONFIG_CNF,
+    MSG_ID_NRRC_NRLCDL_SWITCH_VIRTUAL_CONNECTED_CNF,
+
+    /* MSGs from NRLCUL (lower layer) */
+    MSG_ID_NRRC_NRLCUL_CONFIG_CNF,
+    MSG_ID_NRRC_NRLCUL_PROBLEM_IND,
+    MSG_ID_NRRC_NRLCUL_SWITCH_VIRTUAL_CONNECTED_CNF,
+    MSG_ID_NRRC_NRLCUL_SRB1_ACK_CNF,
+
+    /* MSGs from ENPDCP  */
+    MSG_ID_NRRC_ENPDCP_CONFIG_CNF,
+    MSG_ID_NRRC_ENPDCP_DCCH_DATA_CNF,
+    MSG_ID_NRRC_ENPDCP_DCCH_DATA_IND,
+    MSG_ID_NRRC_ENPDCP_CNTINFO_CNF,
+    MSG_ID_NRRC_ENPDCP_TEST_CNF,
+    MSG_ID_NRRC_ENPDCP_SWITCH_VIRTUAL_CONNECTED_CNF,
+    MSG_ID_NRRC_ENPDCP_CUT_CELL_IND,
+    MSG_ID_NRRC_ENPDCP_DETECTION_TIMER_3_TIMEOUT_IND,
+    MSG_ID_NRRC_ENPDCP_DETECTION_TIMER_4_TIMEOUT_IND,
+
+    /* MSGs from NAS_SV  */
+    MSG_ID_NAS_SV_NRRC_INIT_REQ,
+    MSG_ID_NAS_SV_NRRC_SET_RAT_MODE_REQ,
+    MSG_ID_NAS_SV_NRRC_RFOFF_REQ,
+    MSG_ID_NAS_SV_NRRC_DEACTIVATE_REQ,
+    MSG_ID_NAS_SV_NRRC_PLMN_SEARCH_REQ,
+    MSG_ID_NAS_SV_NRRC_PLMN_LIST_REQ,
+    MSG_ID_NAS_SV_NRRC_PLMN_LIST_STOP_REQ,
+    MSG_ID_NAS_SV_NRRC_PLMN_LIST_ABORT_REQ,
+    MSG_ID_NAS_SV_NRRC_RAT_CHANGE_REQ,
+    MSG_ID_NAS_SV_NRRC_RAT_CHANGE_RSP,
+    MSG_ID_NAS_SV_NRRC_CHECK_ACTIVE_RAT_REQ,
+    MSG_ID_NAS_SV_NRRC_SET_ACTIVE_RAT_REQ,
+    MSG_ID_NAS_SV_NRRC_SNIFFER_START_REQ,
+    MSG_ID_NAS_SV_NRRC_SNIFFER_STOP_REQ,
+    MSG_ID_NAS_SV_NRRC_NAS_REGN_STATUS_UPDATE_REQ,
+    MSG_ID_NAS_SV_NRRC_EQ_PLMN_LIST_UPDATE_REQ,
+    MSG_ID_NAS_SV_NRRC_CSG_LIST_REQ,
+    MSG_ID_NAS_SV_NRRC_CAP_UPDATE_REQ,
+    MSG_ID_NAS_SV_NRRC_CSG_LIST_STOP_REQ,
+    MSG_ID_NAS_SV_NRRC_POWER_SCAN_REQ,
+    MSG_ID_NAS_SV_NRRC_EMC_FORBIDDEN_NW_LIST_UPDATE_REQ,
+    MSG_ID_NAS_SV_NRRC_HPLMN_INFO_UPDATE_REQ,
+    MSG_ID_NAS_SV_NRRC_CELL_CAMPED_HANDLE_REQ,
+    MSG_ID_NAS_SV_NRRC_BACKGROUND_BAND_LEARNING_REQ,
+    MSG_ID_NAS_SV_NRRC_BACKGROUND_BAND_LEARNING_STOP_REQ,
+    MSG_ID_NAS_SV_NRRC_INACTIVE_MODE_CONFIGURATION_REQ,
+    MSG_ID_NAS_SV_NRRC_SERVICE_RECOVERY_ROUND_UPDATE_REQ,
+    MSG_ID_NAS_SV_NRRC_SCREEN_ON_REQ,
+    MSG_ID_NAS_SV_NRRC_SCREEN_OFF_REQ,
+    MSG_ID_NAS_SV_NRRC_SEARCH_PREFERENCE_UPDATE_REQ,
+    MSG_ID_NAS_SV_NRRC_CALL_STATUS_REQ,
+
+    /* MSGs from VGMM */
+    MSG_ID_VGMM_NRRC_INIT_REQ,
+    MSG_ID_VGMM_NRRC_IDENTITY_UPDATE_REQ, // TODO: Remove
+    MSG_ID_VGMM_NRRC_NAS_PARAM_REQ,
+    MSG_ID_VGMM_NRRC_KEY_UPDATE_REQ,
+    MSG_ID_VGMM_NRRC_FTAI_UPDATE_REQ,
+    MSG_ID_VGMM_NRRC_UAC_CHECK_REQ,
+    MSG_ID_VGMM_NRRC_ESTABLISH_REQ,
+    MSG_ID_VGMM_NRRC_RELEASE_REQ,
+    MSG_ID_VGMM_NRRC_RESUME_REQ,
+    MSG_ID_VGMM_NRRC_FALLBACK_RSP,
+    MSG_ID_VGMM_NRRC_NW_ACCESS_STATUS_REQ,
+    MSG_ID_VGMM_NRRC_DATA_REQ,
+    MSG_ID_VGMM_NRRC_EMERGENCY_STATUS_NEEDED_RSP,
+    MSG_ID_VGMM_NRRC_SYNC_CONNECTION_STATUS_REQ,
+    MSG_ID_VGMM_NRRC_DATA_ABORT_REQ,  // to clear NRRC enqueued data_req during virtual connected period
+    MSG_ID_VGMM_NRRC_PROC_RESULT_UPDATE_REQ,
+    MSG_ID_VGMM_NRRC_MRU_OUT_OF_SYNC_REQ,
+    MSG_ID_VGMM_NRRC_CAPABILITY_CHANGE_RSP,
+
+    /* MSGs from ML1S */
+    MSG_ID_ML1S_NRRC_ML1S_TEST_MODE_REQ,
+
+    /* MSGs from SMSAL */
+    MSG_ID_SMSAL_NRRC_CBCH_REQ,             /* PWS: update is_cbs_required = true/false */
+    MSG_ID_SMSAL_NRRC_CB_UPDATE_REQ,        /* PWS: update cbmi/cbmid/cbmir/dcs/is_all_language_on */
+    MSG_ID_SMSAL_NRRC_CB_MSG_REMOVAL_REQ,   /* PWS: msgid, serial_num */
+
+    /* MSGs from L4C */
+    MSG_ID_L4C_NRRC_ETWS_SETTING_REQ,       /* PWS: update is_etws_needed, is_etws_testing_on */
+    MSG_ID_L4C_NRRC_SCG_EVENT_CONFIG_REQ,   /* Detect the scenario for SCG failure or SCG release from NW */
+    MSG_ID_L4C_NRRC_IMS_CONFIG_REQ,         /* Inform VoNR capability */
+    MSG_ID_L4C_NRRC_IMS_CALL_STATUS_REQ,    /* Inform VoNR call status */
+    MSG_ID_L4C_NRRC_SET_PLMN_STORED_FREQ_REQ, /* Set stored freq info for SEARCH */
+    MSG_ID_L4C_NRRC_CA_BAND_COMB_LIST_REQ,
+    MSG_ID_L4C_NRRC_CELL_POWER_THRESHOLD_CONFIG_REQ,
+    MSG_ID_L4C_NRRC_CUSTOM_BAR_LIST_REQ,
+
+    /* MSGs from SASE */
+    MSG_ID_SASE_NRRC_ENDC_ACTIVATE_REQ,                    /* enable ENDC */
+    MSG_ID_SASE_NRRC_ENDC_DEACTIVATE_REQ,                  /* disable ENDC */
+    MSG_ID_SASE_NRRC_SA_SILENCE_CTRL_REQ,                  /* configure SA_Silence mode, and/or enhancement bitmap */
+
+    /* MSGs from ETC */
+    MSG_ID_ETC_NRRC_TESTLOOP_REQ,
+
+    /* MSGs from LPP */
+    MSG_ID_LPP_NRRC_OTDOA_MEAS_REQ,
+    MSG_ID_LPP_NRRC_OTDOA_MEAS_ABORT_REQ,
+
+    /* MSGs from TMC */
+    MSG_ID_TMC_NRRC_ASSISTANCE_INFO_SEND_REQ,
+    MSG_ID_NRRC_TMC_NO_OVERHEATING_IND,
+
+    /* MSGs from GNSS_TC (in task LBS) */
+    MSG_ID_GNSS_TC_NRRC_READ_TIME_SIB_REQ,
+    
+    /* MSGs in NRRC  */
+    MSG_ID_NRRC_MAIN_SCG_IE_CHECK_REQ,
+    MSG_ID_NRRC_MAIN_SCG_IE_CHECK_CNF,
+    MSG_ID_NRRC_MAIN_SCG_CONFIG_REQ,
+    MSG_ID_NRRC_MAIN_SCG_CONFIG_CNF,
+    MSG_ID_NRRC_MAIN_SCG_SUSPEND_REQ,
+    MSG_ID_NRRC_MAIN_SCG_SUSPEND_CNF,
+    MSG_ID_NRRC_MAIN_SCG_RELEASE_REQ,
+    MSG_ID_NRRC_MAIN_SCG_RELEASE_CNF,
+    MSG_ID_NRRC_MAIN_SCG_QOS_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_SCG_QOS_UPDATE_CNF,
+    MSG_ID_NRRC_MAIN_SCG_INTEGRITY_FAIL_HANDLE_REQ,
+    MSG_ID_NRRC_MAIN_SCG_VC_SUSPEND_REQ,
+    MSG_ID_NRRC_MAIN_SCG_VC_SUSPEND_CNF,
+    MSG_ID_NRRC_MAIN_SCG_VC_RESUME_REQ,
+    MSG_ID_NRRC_MAIN_SCG_VC_RESUME_CNF,
+    MSG_ID_NRRC_MAIN_SCG_DSP_SNIFFER_REQ,
+    MSG_ID_NRRC_MAIN_SCG_DSP_SNIFFER_CNF,
+
+    /* MAIN-IDLE */
+    MSG_ID_NRRC_MAIN_IDLE_DEACTIVATE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_DEACTIVATE_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_PLMN_SEARCH_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_PLMN_SEARCH_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_POWER_SCAN_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_POWER_SCAN_IND,
+    MSG_ID_NRRC_MAIN_IDLE_POWER_SCAN_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_CAMPING_LOST_IND,
+    MSG_ID_NRRC_MAIN_IDLE_OOS_SEARCH_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_OOS_SEARCH_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_NAS_REGN_STATUS_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_RESELECTION_NEEDED_IND,
+    MSG_ID_NRRC_MAIN_IDLE_RESELECTION_NEEDED_RSP,
+    MSG_ID_NRRC_MAIN_IDLE_RESELECTION_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_RESELECTION_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_RAT_CHANGE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_RAT_CHANGE_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_IR_SUCCESS_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_IR_FAILED_SEARCH_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_IR_FAILED_SEARCH_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_CONN_RELEASE_SEARCH_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_CONN_RELEASE_SEARCH_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_CONN_RELEASE_SEARCH_START_L1_SEARCH_IND,
+    MSG_ID_NRRC_MAIN_IDLE_LLA_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_UE_ID_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_UE_ID_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_EQ_PLMN_LIST_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_FTAI_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_STORE_SI_EXPIRED_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_SYS_INFO_UPDATE_IND,
+    MSG_ID_NRRC_MAIN_IDLE_RA_FORBIDDEN_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_RA_FORBIDDEN_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_RA_ALLOWED_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_RA_ALLOWED_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_CONN_EST_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_CONN_EST_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_SUSPEND_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_SUSPEND_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_RESUME_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_RESUME_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_RESUME_COMPLETE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_VIRTUAL_SUSPEND_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_VIRTUAL_SUSPEND_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_VIRTUAL_SUSPEND_COMPLETE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_VIRTUAL_RESUME_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_USE_TEMP_QOFFSET_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_USE_TEMP_QOFFSET_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_EMC_FORBIDDEN_NW_LIST_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_PRIORITY_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_RRC_INACTIVE_CONFIG_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_RRC_INACTIVE_CONFIG_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_PAGING_IND,
+    MSG_ID_NRRC_MAIN_IDLE_S1_MODE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_VIRTUAL_MODE_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_VIRTUAL_MODE_UPDATE_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_CONN_EST_RA_FAIL_HANDLE_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_ABORT_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_GEMINI_ABORT_CNF,
+    MSG_ID_NRRC_MAIN_IDLE_CUSTOM_BAR_LIST_REQ,
+    MSG_ID_NRRC_MAIN_IDLE_CUSTOM_BAR_LIST_CNF,
+
+    /* IDLE-CONFIG */
+    MSG_ID_NRRC_IDLE_CONFIG_CONFIG_REQ,
+    MSG_ID_NRRC_IDLE_CONFIG_CONFIG_CNF,
+    MSG_ID_NRRC_IDLE_CONFIG_MAC_RESET_REQ,
+    MSG_ID_NRRC_IDLE_CONFIG_MAC_RESET_CNF,
+    MSG_ID_NRRC_IDLE_CONFIG_DEACTIVATE_REQ,
+    MSG_ID_NRRC_IDLE_CONFIG_DEACTIVATE_CNF,
+    MSG_ID_NRRC_IDLE_CONFIG_GEMINI_SUSPEND_REQ,
+    MSG_ID_NRRC_IDLE_CONFIG_GEMINI_SUSPEND_CNF,
+
+    /* IDLE-IDLE */
+    MSG_ID_NRRC_IDLE_IDLE_SIB_MOD_PWS_REQ,
+    MSG_ID_NRRC_IDLE_IDLE_PWS_NON_ESSENTIAL_SIB_REQ,
+    MSG_ID_NRRC_IDLE_IDLE_PWS_REQ,
+    MSG_ID_NRRC_IDLE_IDLE_SIB_MOD_REQ,
+    MSG_ID_NRRC_IDLE_IDLE_NON_ESSENTIAL_SIB_REQ,
+    MSG_ID_NRRC_IDLE_IDLE_EXCLUDE_LIST_UPDATE_REQ,
+    MSG_ID_NRRC_IDLE_IDLE_SIB_EVENT_REQ,
+    MSG_ID_NRRC_IDLE_IDLE_UPDATE_CONFIG_REQ,
+	
+    /* IDLE-MEAS */
+    MSG_ID_NRRC_IDLE_MEAS_PLMN_STATUS_UPDATE_IND,
+			
+    //SCG UT usage
+    MSG_ID_NRRC_SCG_UT_SET_CONTEXT,
+    MSG_ID_NRRC_SCG_UT_INJECT_CONFIG_REQ,
+    MSG_ID_NRRC_SCG_UT_INJECT_IE_CHECK_REQ,
+
+    /* SCG-CONFIG */
+    MSG_ID_NRRC_SCG_CONFIG_CONFIG_REQ,
+    MSG_ID_NRRC_SCG_CONFIG_CONFIG_CNF,
+    MSG_ID_NRRC_SCG_CONFIG_CONTINUE_REQ,
+    MSG_ID_NRRC_SCG_CONFIG_CONTINUE_CNF,
+    MSG_ID_NRRC_SCG_CONFIG_SUSPEND_REQ,
+    MSG_ID_NRRC_SCG_CONFIG_SUSPEND_CNF,
+    MSG_ID_NRRC_SCG_CONFIG_RELEASE_REQ,
+    MSG_ID_NRRC_SCG_CONFIG_RELEASE_CNF,
+    MSG_ID_NRRC_SCG_CONFIG_PUCCH_SRS_REL_REQ,
+    MSG_ID_NRRC_SCG_CONFIG_PUCCH_SRS_REL_CNF,
+    MSG_ID_NRRC_SCG_CONFIG_QOS_UPDATE_REQ,
+    MSG_ID_NRRC_SCG_CONFIG_QOS_UPDATE_CNF,
+    MSG_ID_NRRC_SCG_CONFIG_SRB1_SEC_ACTIVATE_REQ,
+    MSG_ID_NRRC_SCG_CONFIG_SRB1_SEC_ACTIVATE_CNF,
+    MSG_ID_NRRC_SCG_CONFIG_VC_SUSPEND_REQ,
+    MSG_ID_NRRC_SCG_CONFIG_VC_SUSPEND_CNF,
+    MSG_ID_NRRC_SCG_CONFIG_VC_RESUME_REQ,
+    MSG_ID_NRRC_SCG_CONFIG_VC_RESUME_CNF,
+    MSG_ID_NRRC_SCG_CONFIG_DSP_SNIFFER_REQ,
+    MSG_ID_NRRC_SCG_CONFIG_DSP_SNIFFER_CNF,
+
+    /* SCG-MEAS */
+    MSG_ID_NRRC_SCG_MEAS_CONFIG_REQ,
+    MSG_ID_NRRC_SCG_MEAS_CONFIG_CNF,
+    MSG_ID_NRRC_SCG_MEAS_RELEASE_REQ,
+    MSG_ID_NRRC_SCG_MEAS_RELEASE_CNF,
+    MSG_ID_NRRC_SCG_MEAS_GET_SCG_FAIL_MEAS_REPORT_REQ,
+    MSG_ID_NRRC_SCG_MEAS_GET_SCG_FAIL_MEAS_REPORT_CNF,
+    MSG_ID_NRRC_SCG_MEAS_REPORT_IND,
+    MSG_ID_NRRC_SCG_MEAS_ENDC_ACTIVATE_REQ,
+    MSG_ID_NRRC_SCG_MEAS_ENDC_DEACTIVATE_REQ,
+    MSG_ID_NRRC_SCG_MEAS_VC_SUSPEND_REQ,
+    MSG_ID_NRRC_SCG_MEAS_VC_SUSPEND_CNF,
+    MSG_ID_NRRC_SCG_MEAS_VC_RESUME_REQ,
+    MSG_ID_NRRC_SCG_MEAS_VC_RESUME_CNF,
+
+    MSG_ID_NRRC_CONFIG_MEAS_MODIFY_IND,
+    MSG_ID_NRRC_CONFIG_MEAS_MODIFY_RSP,
+
+    MSG_ID_NRRC_MEAS_CONFIG_DONE_IND,
+
+    /* MAIN-BACKGROUND */
+    MSG_ID_NRRC_MAIN_BACKGROUND_PAUSE_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_PAUSE_CNF,
+    MSG_ID_NRRC_MAIN_BACKGROUND_PROCEED_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_PLMN_LIST_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_PLMN_LIST_CNF,
+    MSG_ID_NRRC_MAIN_BACKGROUND_PLMN_LIST_STOP_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_PLMN_LIST_STOP_CNF,
+    MSG_ID_NRRC_MAIN_BACKGROUND_PLMN_LIST_ABORT_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_RSSI_SNIFFER_START_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_RSSI_SNIFFER_STOP_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_RSSI_SNIFFER_STOP_CNF,
+    MSG_ID_NRRC_MAIN_BACKGROUND_LLA_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_BACKGROUND_SEARCH_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_BACKGROUND_SEARCH_CNF,
+    MSG_ID_NRRC_MAIN_BACKGROUND_GEMINI_SUSPEND_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_GEMINI_SUSPEND_CNF,
+    MSG_ID_NRRC_MAIN_BACKGROUND_GEMINI_RESUME_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_GEMINI_RESUME_CNF,
+    MSG_ID_NRRC_MAIN_BACKGROUND_GEMINI_RESUME_COMPLETE_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_GEMINI_VIRTUAL_SUSPEND_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_GEMINI_VIRTUAL_SUSPEND_CNF,
+    MSG_ID_NRRC_MAIN_BACKGROUND_GEMINI_VIRTUAL_SUSPEND_COMPLETE_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_GEMINI_VIRTUAL_RESUME_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_GEMINI_VIRTUAL_MODE_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_GEMINI_VIRTUAL_MODE_UPDATE_CNF,
+    MSG_ID_NRRC_MAIN_BACKGROUND_BACKGROUND_BAND_LEARNING_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_BACKGROUND_BAND_LEARNING_CNF,    
+    MSG_ID_NRRC_MAIN_BACKGROUND_BACKGROUND_BAND_LEARNING_STOP_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_BACKGROUND_BAND_LEARNING_STOP_CNF,
+    MSG_ID_NRRC_MAIN_BACKGROUND_NR_AVAIL_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_INACTIVE_MODE_CONFIGURATION_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_SERVICE_RECOVERY_ROUND_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_SCREEN_ON_REQ,
+    MSG_ID_NRRC_MAIN_BACKGROUND_SCREEN_OFF_REQ,
+
+    /* IDLE-SEARCH */
+    MSG_ID_NRRC_IDLE_SEARCH_CELL_SEARCH_REQ,
+    MSG_ID_NRRC_IDLE_SEARCH_CELL_SEARCH_IND,
+    MSG_ID_NRRC_IDLE_SEARCH_CELL_SEARCH_CNF,
+    MSG_ID_NRRC_IDLE_SEARCH_RESET_SEARCH_RESULT_REQ,
+    MSG_ID_NRRC_IDLE_SEARCH_POWER_SCAN_REQ,
+    MSG_ID_NRRC_IDLE_SEARCH_POWER_SCAN_IND,
+    MSG_ID_NRRC_IDLE_SEARCH_POWER_SCAN_CNF,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_SUSPEND_REQ,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_SUSPEND_CNF,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_RESUME_REQ,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_RESUME_CNF,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_RESUME_COMPLETE_REQ,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_VIRTUAL_SUSPEND_REQ,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_VIRTUAL_SUSPEND_CNF,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_VIRTUAL_RESUME_REQ,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_VIRTUAL_SUSPEND_COMPLETE_REQ,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_VIRTUAL_MODE_UPDATE_REQ,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_VIRTUAL_MODE_UPDATE_CNF,
+    MSG_ID_NRRC_IDLE_SEARCH_GEMINI_ABORT_REQ,
+    MSG_ID_NRRC_IDLE_SEARCH_CONN_RELEASE_SEARCH_START_L1_SEARCH_IND,
+    
+    /* BACKGROUND-SEARCH */
+    MSG_ID_NRRC_BACKGROUND_SEARCH_CELL_SEARCH_REQ,
+    MSG_ID_NRRC_BACKGROUND_SEARCH_CELL_SEARCH_IND,
+    MSG_ID_NRRC_BACKGROUND_SEARCH_CELL_SEARCH_CNF,
+    MSG_ID_NRRC_BACKGROUND_SEARCH_SNIFFER_REQ,
+    MSG_ID_NRRC_BACKGROUND_SEARCH_SNIFFER_IND,
+    MSG_ID_NRRC_BACKGROUND_SEARCH_SNIFFER_CNF,
+
+    /* NCONN-SEARCH */
+    MSG_ID_NRRC_NCONN_SEARCH_CELL_SEARCH_REQ,
+    MSG_ID_NRRC_NCONN_SEARCH_CELL_SEARCH_IND,
+    MSG_ID_NRRC_NCONN_SEARCH_CELL_SEARCH_CNF,
+
+    /* NCONN-MEAS */
+    MSG_ID_NRRC_NCONN_MEAS_CONFIG_REQ,
+    MSG_ID_NRRC_NCONN_MEAS_CONFIG_CNF,
+    MSG_ID_NRRC_NCONN_MEAS_RELEASE_REQ,
+    MSG_ID_NRRC_NCONN_MEAS_RELEASE_CNF,
+    MSG_ID_NRRC_NCONN_MEAS_REPORT_IND,
+    MSG_ID_NRRC_NCONN_MEAS_LOCATION_MEASUREMENT_IND,
+    MSG_ID_NRRC_NCONN_MEAS_VC_SUSPEND_REQ,
+    MSG_ID_NRRC_NCONN_MEAS_VC_SUSPEND_CNF,
+    MSG_ID_NRRC_NCONN_MEAS_VC_RESUME_REQ,
+    MSG_ID_NRRC_NCONN_MEAS_VC_RESUME_CNF,
+    MSG_ID_NRRC_NCONN_MEAS_SUSPEND_REQ,
+    MSG_ID_NRRC_NCONN_MEAS_SUSPEND_CNF,
+    MSG_ID_NRRC_NCONN_MEAS_RESUME_REQ,
+    MSG_ID_NRRC_NCONN_MEAS_RESUME_CNF,
+    MSG_ID_NRRC_NCONN_MEAS_SYNC_CONNECTION_STATUS_REQ,
+    MSG_ID_NRRC_NCONN_MEAS_SYNC_CONNECTION_STATUS_CNF,
+    MSG_ID_NRRC_NCONN_MEAS_CUSTOM_BAR_LIST_REQ,
+    MSG_ID_NRRC_NCONN_MEAS_CUSTOM_BAR_LIST_CNF,
+    MSG_ID_NRRC_NCONN_MEAS_CUSTOM_BAR_LIST_CLEAR_NTF,
+
+    /* MEAS-NCONN */
+    MSG_ID_NRRC_MEAS_NCONN_NR_REPORT_CGI_REQ,
+    MSG_ID_NRRC_MEAS_NCONN_NR_REPORT_CGI_CNF,
+    MSG_ID_NRRC_MEAS_NCONN_EUTRA_REPORT_CGI_REQ,
+    MSG_ID_NRRC_MEAS_NCONN_EUTRA_REPORT_CGI_CNF,
+
+    /* MSGs in NRRC:SI*/
+    MSG_ID_NRRC_IDLE_SI_COLLECT_SI_REQ,
+    MSG_ID_NRRC_IDLE_SI_COLLECT_SI_IND,
+    MSG_ID_NRRC_IDLE_SI_COLLECT_SI_CNF,
+    MSG_ID_NRRC_IDLE_SI_STORE_SI_REQ,
+    MSG_ID_NRRC_IDLE_SI_STORE_SI_CNF,
+    MSG_ID_NRRC_IDLE_SI_BCCH_TYPE_CHANGE_REQ,
+    MSG_ID_NRRC_IDLE_SI_BCCH_TYPE_CHANGE_CNF,
+    MSG_ID_NRRC_IDLE_SI_PWS_REQ,
+    MSG_ID_NRRC_IDLE_SI_PWS_CNF,
+    MSG_ID_NRRC_IDLE_SI_REFRESH_REQ,
+    MSG_ID_NRRC_IDLE_SI_SUSPEND_REQ,
+    MSG_ID_NRRC_IDLE_SI_SUSPEND_CNF,
+    MSG_ID_NRRC_IDLE_SI_RESUME_REQ,
+    MSG_ID_NRRC_IDLE_SI_RESUME_CNF,
+    MSG_ID_NRRC_IDLE_SI_DEL_PWS_DUPLICATE_REQ, /* by gs_scope */
+    MSG_ID_NRRC_IDLE_SI_GEMINI_SUSPEND_REQ,
+    MSG_ID_NRRC_IDLE_SI_GEMINI_SUSPEND_CNF,
+    MSG_ID_NRRC_IDLE_SI_GEMINI_RESUME_REQ,
+    MSG_ID_NRRC_IDLE_SI_GEMINI_RESUME_CNF,
+    MSG_ID_NRRC_IDLE_SI_GEMINI_RESUME_COMPLETE_REQ,
+    MSG_ID_NRRC_IDLE_SI_GEMINI_VIRTUAL_SUSPEND_REQ,
+    MSG_ID_NRRC_IDLE_SI_GEMINI_VIRTUAL_SUSPEND_CNF,
+    MSG_ID_NRRC_IDLE_SI_GEMINI_VIRTUAL_SUSPEND_COMPLETE_REQ,
+    MSG_ID_NRRC_IDLE_SI_GEMINI_VIRTUAL_RESUME_REQ,
+    MSG_ID_NRRC_IDLE_SI_GEMINI_VIRTUAL_MODE_UPDATE_REQ,
+    MSG_ID_NRRC_IDLE_SI_GEMINI_VIRTUAL_MODE_UPDATE_CNF,
+
+    MSG_ID_NRRC_NCONN_SI_COLLECT_SI_REQ,
+    MSG_ID_NRRC_NCONN_SI_COLLECT_SI_IND,
+    MSG_ID_NRRC_NCONN_SI_COLLECT_SI_CNF,
+    MSG_ID_NRRC_NCONN_SI_STORE_SI_REQ,
+    MSG_ID_NRRC_NCONN_SI_STORE_SI_CNF,
+    MSG_ID_NRRC_NCONN_SI_BCCH_TYPE_CHANGE_REQ,
+    MSG_ID_NRRC_NCONN_SI_BCCH_TYPE_CHANGE_CNF,
+    MSG_ID_NRRC_NCONN_SI_PWS_REQ,
+    MSG_ID_NRRC_NCONN_SI_PWS_CNF,
+    MSG_ID_NRRC_NCONN_SI_REFRESH_REQ,
+    MSG_ID_NRRC_NCONN_SI_SUSPEND_REQ,
+    MSG_ID_NRRC_NCONN_SI_SUSPEND_CNF,
+    MSG_ID_NRRC_NCONN_SI_RESUME_REQ,
+    MSG_ID_NRRC_NCONN_SI_RESUME_CNF,
+    MSG_ID_NRRC_NCONN_SI_DEL_PWS_DUPLICATE_REQ, /* by gs_scope */
+    MSG_ID_NRRC_NCONN_SI_DEDICATED_SI_HANDLE_REQ,
+    MSG_ID_NRRC_NCONN_SI_DEDICATED_SI_HANDLE_CNF,
+    MSG_ID_NRRC_NCONN_SI_RESET_SI_REQ,
+    MSG_ID_NRRC_NCONN_SI_RESET_SI_CNF,
+    MSG_ID_NRRC_NCONN_SI_GEMINI_VIRTUAL_MODE_UPDATE_REQ,
+    MSG_ID_NRRC_NCONN_SI_GEMINI_VIRTUAL_MODE_UPDATE_CNF,
+   
+    /* SI-SI */
+    MSG_ID_NRRC_SI_SI_SHARED_BCCH_IND, /* GEMINI SI reuse */
+
+    /* MAIN-SI */
+    MSG_ID_NRRC_MAIN_SI_STORE_SI_EXPIRE_IND,
+
+    /* MAIN-NCONN */
+    MSG_ID_NRRC_MAIN_NCONN_STORE_SI_EXPIRED_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_SYS_INFO_UPDATE_IND,
+    MSG_ID_NRRC_MAIN_NCONN_ESTABLISH_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_ESTABLISH_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_SUCCESS_IND,
+    MSG_ID_NRRC_MAIN_NCONN_SUCCESS_RSP,
+    MSG_ID_NRRC_MAIN_NCONN_ESTABLISH_ABORT_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_ESTABLISH_ABORT_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_PDU_HANDLE_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_PDU_HANDLE_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_RELEASE_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_RELEASE_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_RELEASE_START_IND,
+    MSG_ID_NRRC_MAIN_NCONN_RELEASE_IND,
+    MSG_ID_NRRC_MAIN_NCONN_INTEGRITY_FAIL_HANDLE_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_SERVING_CELL_IND,
+    MSG_ID_NRRC_MAIN_NCONN_HO_FROM_NR_IND,
+    MSG_ID_NRRC_MAIN_NCONN_HO_FROM_NR_RSP,
+    MSG_ID_NRRC_MAIN_NCONN_HO_TO_NR_IE_CHECK_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_HO_TO_NR_IE_CHECK_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_HO_TO_NR_IE_CHECK_CLEAN_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_HO_TO_NR_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_HO_TO_NR_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_RESUME_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_RESUME_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_RESUME_ABORT_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_RESUME_ABORT_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_HO_SUCCESS_IND,
+    MSG_ID_NRRC_MAIN_NCONN_CELL_SEARCH_NEEDED_IND,
+    MSG_ID_NRRC_MAIN_NCONN_CELL_SEARCH_NEEDED_RSP,
+    MSG_ID_NRRC_MAIN_NCONN_CELL_SEARCH_READY_IND,
+    MSG_ID_NRRC_MAIN_NCONN_RE_EST_SEARCH_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_RE_EST_SEARCH_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_VC_SUSPEND_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_VC_SUSPEND_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_VC_RESUME_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_VC_RESUME_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_FAKE_A2_SENT_IND,
+    MSG_ID_NRRC_MAIN_NCONN_SMART_IDLE_CONFIG_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_DSP_SNIFFER_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_DSP_SNIFFER_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_CUSTOM_BAR_LIST_REQ,
+    MSG_ID_NRRC_MAIN_NCONN_CUSTOM_BAR_LIST_CNF,
+    MSG_ID_NRRC_MAIN_NCONN_CUSTOM_BAR_LIST_CLEAR_NTF,
+
+    /* NCONN-CONFIG */
+    MSG_ID_NRRC_NCONN_CONFIG_CONFIG_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_CONFIG_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_EST_ABORT_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_EST_ABORT_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_RELEASE_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_RELEASE_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_SECURITY_CONFIG_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_SECURITY_CONFIG_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_HO_REVERT_FORGET_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_HO_REVERT_FORGET_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_HO_REVERT_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_HO_REVERT_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_RE_EST_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_RE_EST_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_PUCCH_SRS_RELEASE_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_PUCCH_SRS_RELEASE_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_SUSPEND_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_SUSPEND_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_RESUME_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_RESUME_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_RESUME_ABORT_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_RESUME_ABORT_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_LEAVE_RRC_INACTIVE_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_LEAVE_RRC_INACTIVE_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_USER_PLANE_RESOURCES_IND,
+    MSG_ID_NRRC_NCONN_CONFIG_VC_SUSPEND_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_VC_SUSPEND_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_VC_RESUME_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_VC_RESUME_CNF,
+    MSG_ID_NRRC_NCONN_CONFIG_DSP_SNIFFER_REQ,
+    MSG_ID_NRRC_NCONN_CONFIG_DSP_SNIFFER_CNF,
+
+    /* MAIN-CONFIG */
+    MSG_ID_NRRC_MAIN_CONFIG_ICD_INFO_IND,
+    MSG_ID_NRRC_MAIN_CONFIG_GEMINI_MODE_UPDATE_REQ,
+    MSG_ID_NRRC_MAIN_CONFIG_GEMINI_MODE_UPDATE_CNF,
+
+    /* MAIN-MAIN */
+    MSG_ID_NRRC_MAIN_MAIN_PDU_RRC_RECONFIGURATION_REQ,
+    MSG_ID_NRRC_MAIN_MAIN_CONN_REL_SEARCH_REQ,
+    MSG_ID_NRRC_MAIN_MAIN_GEMINI_SUSPEND_COMPLETE_REQ,
+    MSG_ID_NRRC_MAIN_MAIN_DSP_SNIFFER_REQ,
+    MSG_ID_NRRC_MAIN_MAIN_VONR_EARLY_CONN_REL_REQ,
+    MSG_ID_NRRC_MAIN_MAIN_NGRAN_CAP_CHANGE_IND,
+
+    /* Timer expiry indications */
+    MSG_ID_NRRC_T300_EXPIRY_IND,
+    MSG_ID_NRRC_T301_EXPIRY_IND,
+    MSG_ID_NRRC_T302_EXPIRY_IND,
+    MSG_ID_NRRC_T304_EXPIRY_IND,
+    MSG_ID_NRRC_T310_EXPIRY_IND,
+    MSG_ID_NRRC_T311_EXPIRY_IND,
+    MSG_ID_NRRC_T320_EXPIRY_IND,
+    MSG_ID_NRRC_T325_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_STORED_SI_EXPIRED_IND,      /* SI: for stored SI validity */
+    MSG_ID_NRRC_TIMER_BCCH_PROTECTION_EXPIRY_IND, /* SI: for NL1 BCCH recv procedure */
+    MSG_ID_NRRC_TIMER_PWS_WARNING_MSG_SEG_EXPIRY_IND, /* SI: for PWS msg. seg. watchdog */
+    MSG_ID_NRRC_TIMER_PWS_RCVD_IND_WATCHDOG_EXPIRY_IND, /* SI: for PWS recv procedure */
+    MSG_ID_NRRC_TIMER_PWS_PRIO_WATCHDOG_EXPIRY_IND, /* SI: for first PWS prioritization */
+    MSG_ID_NRRC_TIMER_SEARCH_PROCEDURE_EXPIRY_IND, /* SEARCH: Protect timer for Search procedure */
+    MSG_ID_NRRC_TIMER_SEARCH_AUTO_GAP_SEARCH_EXPIRY_IND, /* SEARCH: Protect timer for Auto Gap Search procedure */
+    MSG_ID_NRRC_TIMER_BG_BCCH_PROTECTION_EXPIRY_IND, /* BG: for NL1 BCCH recv procedure */
+    MSG_ID_NRRC_TIMER_BG_BGSRCH_SLEEP_EXPIRY_IND, /* BG: for guarding full search interval of BGSRCH procedure*/
+    MSG_ID_NRRC_TIMER_SNIFFER_EXCLUDE_FREQ_EXPIRY_IND, /* BG: Sniffer timer to remove exclude freq */
+    MSG_ID_NRRC_TIMER_SNIFFER_INTERVAL_EXPIRY_IND, /* BG: Sniffer timer to command SEARCH/NL1 sniffer after this interval */
+    MSG_ID_NRRC_TIMER_IDLE_EXCLUDE_NR_FREQ_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_IDLE_EXCLUDE_NR_CELL_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_IDLE_EXCLUDE_LTE_FREQ_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_IDLE_EXCLUDE_LTE_CELL_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_IDLE_IR_REDIRECT_TIMER_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_IDLE_SEARCH_PERIOD_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_IDLE_SI_MOD_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_IDLE_TEMP_QOFFSET_CELL_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_IDLE_TEMP_QOFFSET_ERM_CELL_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_IDLE_ODSI_RA_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_IDLE_READ_TIME_SIB9_EXPIRED_IND,
+    MSG_ID_NRRC_TIMER_CONN_REL_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_CONN_SI_MOD_EXPIRY_IND,
+    MSG_ID_NRRC_T304_VC_EXPIRY_IND,
+    MSG_ID_NRRC_T390_EXPIRY_IND,
+    MSG_ID_NRRC_MEAS_RCGI_T321_EXPIRY_IND,
+    MSG_ID_NRRC_MEAS_RCGI_WAIT_CHANGE_MODE_EXPIRY_IND,
+    MSG_ID_NRRC_TIMER_RCGI_PROTECTION_EXPIRY_IND,
+    MSG_ID_NRRC_T319_EXPIRY_IND,
+    MSG_ID_NRRC_T380_EXPIRY_IND,
+    MSG_ID_NRRC_NRCC_FEATURE_EXPIRY_IND,
+    MSG_ID_NRRC_L_LNOPT_FEATURE_EXPIRY_IND,
+    MSG_ID_NRRC_N_NOPT_FEATURE_EXPIRY_IND,
+    MSG_ID_NRRC_GEMINI_FEATURE_EXPIRY_IND,
+    MSG_ID_NRRC_T342_EXPIRY_IND,
+    MSG_ID_NRRC_T345_EXPIRY_IND,
+    MSG_ID_NRRC_SCG_FAILURE_BAR_ENDC_EXPIRY_IND,
+    MSG_ID_NRRC_SCG_RELEASE_BAR_ENDC_EXPIRY_IND,
+    MSG_ID_NRRC_VC_VALID_EXPIRY_IND,
+    MSG_ID_NRRC_VONR_EARLY_CONN_REL_EXPIRY_IND,
+
+    /* RSVAN and NRRC message*/
+    MSG_ID_RSVAN_NRRC_FREQUENCY_SCAN_ACCEPT_IND,
+    MSG_ID_RSVAN_NRRC_FREQUENCY_SCAN_PREEMPT_IND,
+
+    /* RSVAS message */
+    MSG_ID_RSVAS_NRRC_SUSPEND_SERVICE_REQ,
+    MSG_ID_RSVAS_NRRC_RESUME_SERVICE_REQ,
+    MSG_ID_RSVAS_NRRC_ABORT_SERVICE_REQ,
+    MSG_ID_RSVAS_NRRC_ABORT_SERVICE_COMPLETE_IND,
+    MSG_ID_RSVAS_NRRC_VIRTUAL_SUSPEND_SERVICE_REQ,
+    MSG_ID_RSVAS_NRRC_VIRTUAL_SUSPEND_SERVICE_COMPLETE_IND,
+    MSG_ID_RSVAS_NRRC_VIRTUAL_RESUME_SERVICE_REQ,
+    MSG_ID_RSVAS_NRRC_VIRTUAL_CONNECTED_SUSPEND_REQ,
+    MSG_ID_RSVAS_NRRC_VIRTUAL_CONNECTED_RESUME_REQ,
+    MSG_ID_RSVAS_NRRC_VIRTUAL_MODE_UPDATE_REQ,
+    MSG_ID_RSVAS_NRRC_GEMINI_MODE_UPDATE_REQ,
+
+    /* LTECSR message */
+    MSG_ID_NRRC_LTECSR_DELAY_BUDGET_REPORT_IND,
+
+    /* NRRC MAIN Internal Use message */
+    MSG_ID_NRRC_MAIN_UE_CAP_BC_LIST_IND,
+    
+    /* NRRC SEARCH Internal Use message */
+    MSG_ID_NRRC_SEARCH_DUMP_CONTEXT_IND,
+    MSG_ID_NRRC_SEARCH_DUMP_CARRIER_CONTROL_INFO_IND,
+
+MSG_ID_NRRC_MSG_ID_END,
+MODULE_MSG_END( MSG_ID_NRRC_CODE_TAIL )
+
+#endif /* NRRC_MSGID_H */
+
diff --git a/mcu/interface/sap/md/nwsel_msgid.h b/mcu/interface/sap/md/nwsel_msgid.h
new file mode 100644
index 0000000..9a02e4e
--- /dev/null
+++ b/mcu/interface/sap/md/nwsel_msgid.h
@@ -0,0 +1,276 @@
+/*****************************************************************************
+*  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).
+*
+*****************************************************************************/
+ /*******************************************************************************
+ *  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:
+ * ---------
+ *   nwsel.sap
+ *
+ * Project:
+ * --------
+ *   VMOLY
+ *
+ * Description:
+ * ------------
+ *   NWSEL related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *******************************************************************************/
+#include "module_msg_range.h"
+/*----------------------- MM_MSG_CODE_BEGIN------------------*/
+MODULE_MSG_BEGIN( MSG_ID_NWSEL_CODE_BEGIN )
+/* messages received from GMSS at GMSS_NWSEL_SAP */
+    MSG_ID_GMSS_NWSEL_ATTACH_REQ = MSG_ID_NWSEL_CODE_BEGIN,
+    MSG_ID_GMSS_NWSEL_DETACH_REQ,
+    MSG_ID_GMSS_NWSEL_RAC_PLMN_SEARCH_REQ,
+    MSG_ID_GMSS_NWSEL_RAC_PLMN_SEARCH_STOP_REQ,
+    MSG_ID_GMSS_NWSEL_INIT_REQ,
+    MSG_ID_GMSS_NWSEL_RFOFF_REQ,
+    MSG_ID_GMSS_NWSEL_SEL_MODE_REQ,
+    MSG_ID_GMSS_NWSEL_SET_ROAMING_MODE_REQ,
+    MSG_ID_GMSS_NWSEL_SET_PREFER_RAT_REQ,
+    MSG_ID_GMSS_NWSEL_GET_PREFER_RAT_REQ,
+    MSG_ID_GMSS_NWSEL_ELEVATOR_MODE_REQ,
+    MSG_ID_GMSS_NWSEL_RAC_PLMN_LIST_REQ,
+    MSG_ID_GMSS_NWSEL_RAC_PLMN_LIST_STOP_REQ,
+    MSG_ID_GMSS_NWSEL_RAC_PLMN_LIST_ABORT_REQ,
+    MSG_ID_GMSS_NWSEL_RAC_CSG_LIST_REQ,
+    MSG_ID_GMSS_NWSEL_RAC_CSG_LIST_STOP_REQ,
+    MSG_ID_GMSS_NWSEL_SET_RAT_MODE_REQ,
+    MSG_ID_GMSS_NWSEL_UPDATE_UEMODE_REQ, /* should be replaced by the following MSG_ID_GMSS_NWSEL_UEMODE_PARAM_UPDATE_REQ */
+    MSG_ID_GMSS_NWSEL_UEMODE_PARAM_UPDATE_REQ,
+    MSG_ID_GMSS_NWSEL_SUSP_RESU_UPDATE_REQ,
+    MSG_ID_GMSS_NWSEL_ABORT_EMERGENCY_PLMN_SEARCH_REQ,
+    MSG_ID_GMSS_NWSEL_ABORT_ENWSEL_SEARCH_REQ,
+    /* add for 6291 MTC */
+    MSG_ID_GMSS_NWSEL_IMS_CALL_INFO_REQ,
+    /* add for 6291 MTC */
+    MSG_ID_GMSS_NWSEL_MMDC_RECOVERY_SEARCH_REQ,
+    MSG_ID_GMSS_NWSEL_SET_RECOVERY_SEARCH_TIMER_REQ,
+    MSG_ID_GMSS_NWSEL_GET_RECOVERY_SEARCH_TIMER_REQ,
+    MSG_ID_GMSS_NWSEL_CUSTOM_PLMN_LIST_UPDATE_REQ,
+    MSG_ID_GMSS_NWSEL_GET_CUSTOM_PLMN_LIST_REQ,
+    MSG_ID_GMSS_NWSEL_SET_UTRAN_VOICE_DOMAIN_PREFERENCE_REQ,
+    MSG_ID_GMSS_NWSEL_DATA_SERVICE_STATUS_UPDATE_REQ,
+    MSG_ID_GMSS_NWSEL_PLMN_SEARCH_REQ,
+    MSG_ID_GMSS_NWSEL_MCC_SEARCH_REQ,
+    MSG_ID_GMSS_NWSEL_PLMN_LIST_REQ,
+    MSG_ID_GMSS_NWSEL_PLMN_LIST_STOP_REQ,
+    MSG_ID_GMSS_NWSEL_RESET_SEARCH_RESULT_REQ,
+    MSG_ID_GMSS_NWSEL_GMSS_STATUS_UPDATE_REQ,
+    MSG_ID_GMSS_NWSEL_SIM_READY_REQ,
+    MSG_ID_GMSS_NWSEL_SIM_ERROR_REQ,
+    MSG_ID_GMSS_NWSEL_ARAL_UPDATE_REQ,
+    MSG_ID_GMSS_NWSEL_NO_SERVICE_REQ,
+    MSG_ID_GMSS_NWSEL_C2K_IRAT_COMPLETE_REQ,
+    MSG_ID_GMSS_NWSEL_NVRAM_WRITE_REQ,
+    MSG_ID_GMSS_NWSEL_C2K_NORMAL_SERVICE_REQ,
+    MSG_ID_GMSS_NWSEL_PRIO_CLASS_UPDATE_REQ,
+    MSG_ID_GMSS_NWSEL_ACTIVE_SIM_INFO_REQ,
+    MSG_ID_GMSS_NWSEL_DISABLE_EUTRAN_REQ,
+    MSG_ID_GMSS_NWSEL_ROAMING_DATA_CONFIG_REQ,
+    MSG_ID_GMSS_NWSEL_DUPLEX_MODE_CHANGE_REQ,
+    MSG_ID_GMSS_NWSEL_SET_AUX_PLMN_REQ,
+    MSG_ID_GMSS_NWSEL_SET_MRU_REQ,
+    MSG_ID_GMSS_NWSEL_CLEAR_MRU_REQ,
+    MSG_ID_GMSS_NWSEL_CSG_AUTO_SEARCH_MODE_REQ,
+    MSG_ID_GMSS_NWSEL_RAT_CHANGE_SUCCESS_NOTIFY_REQ,
+    MSG_ID_GMSS_NWSEL_GLOBAL_MODE_CHANGE_START_REQ,
+    MSG_ID_GMSS_NWSEL_PLMN_INFO_RSP,
+    MSG_ID_GMSS_NWSEL_SET_FIRST_CAMP_ON_PREFER_RAT_REQ,
+    MSG_ID_GMSS_NWSEL_HVOLTE_MODE_CHANGE_REQ,
+    MSG_ID_GMSS_NWSEL_EMC_BAR_NETWORK_REQ,
+    MSG_ID_GMSS_NWSEL_RAC_INVALID_SIM_RECOVER_RSP,
+    MSG_ID_GMSS_NWSEL_PRIMARY_SIM_DUPLEX_MODE_CHANGE_IND,
+    MSG_ID_GMSS_NWSEL_DEACTIVATE_LIMIT_SERV_REQ,
+    MSG_ID_GMSS_NWSEL_LIMIT_SERV_SRCH_REQ,
+    MSG_ID_GMSS_NWSEL_CALL_STATUS_IND,
+    MSG_ID_GMSS_NWSEL_RAT_DISABLE_CONFIG_REQ,
+    MSG_ID_GMSS_NWSEL_SNIFFER_START_REQ,
+    MSG_ID_GMSS_NWSEL_SNIFFER_STOP_REQ,
+    MSG_ID_GMSS_NWSEL_DATA_ALLOW_REQ,
+    MSG_ID_GMSS_NWSEL_INACTIVE_MODE_CONFIGURATION_REQ,
+    MSG_ID_GMSS_NWSEL_SERVICE_RECOVERY_ROUND_UPDATE_REQ,
+
+/* messages for relaying to NAS SV*/
+    MSG_ID_GMSS_NWSEL_CSS_MCC_SEARCH_REQ,
+    MSG_ID_GMSS_NWSEL_CSS_CS_REG_REQ,
+    MSG_ID_GMSS_NWSEL_CSS_PS_REG_REQ,
+    MSG_ID_GMSS_NWSEL_CSS_PS_DEREG_REQ,
+
+/* messages for VZW ECC call */
+    MSG_ID_GMSS_NWSEL_EMC_SESSION_START_REQ,
+    MSG_ID_GMSS_NWSEL_EMC_SESSION_STOP_REQ,
+    MSG_ID_GMSS_NWSEL_ECBM_START_REQ,
+    MSG_ID_GMSS_NWSEL_ECBM_STOP_REQ,
+    MSG_ID_GMSS_NWSEL_C2K_EMC_LOCAL_DETACH_REQ,
+
+    MSG_ID_GMSS_NWSEL_PLMN_LIST_STATUS_UPDATE_REQ,
+    MSG_ID_GMSS_NWSEL_MODE_SWITCH_MT_CSFB_SUCCESS_IND,
+
+    MSG_ID_GMSS_NWSEL_SCREEN_ON_REQ,
+    MSG_ID_GMSS_NWSEL_SCREEN_OFF_REQ,
+    MSG_ID_GMSS_NWSEL_VOLTE_STATUS_UPDATE_REQ,
+    MSG_ID_GMSS_NWSEL_GMSS_IRAT_START_IND,
+    MSG_ID_GMSS_NWSEL_GMSS_IRAT_FINISH_IND,
+    MSG_ID_GMSS_NWSEL_POWER_ON_PROTECTION_REQ,
+
+    MSG_ID_GMSS_NWSEL_SET_PLMN_BARRING_TIMER_REQ,
+    MSG_ID_GMSS_NWSEL_GET_PLMN_BARRING_TIMER_REQ,
+    MSG_ID_GMSS_NWSEL_IMS_TIMER_STATUS_UPDATE_REQ,
+    MSG_ID_GMSS_NWSEL_SET_IMS_ROAMING_CONFIG_REQ,
+    MSG_ID_GMSS_NWSEL_IMS_REG_STATUS_UPDATE_REQ,
+
+    MSG_ID_GMSS_NWSEL_FPLMN_ACTION_REQ,
+    MSG_ID_GMSS_NWSEL_REGN_STATUS_UPDATE_REQ,
+    MSG_ID_GMSS_NWSEL_MSPL_SEARCH_EXHAUSTED,
+
+/* messages for allowed MCC list */
+    MSG_ID_GMSS_NWSEL_SET_ALLOWED_MCC_LIST_REQ,
+
+/* messages for voice selection */
+    MSG_ID_GMSS_NWSEL_SERVICE_SCAN_REQ,
+
+/* messages for +ECAMPUI */
+    MSG_ID_GMSS_NWSEL_CAMP_UI_IND,
+
+/* messages received from MM at NWSEL_MM_SAP */
+    MSG_ID_NWSEL_MM_PLMN_LOSS_IND,
+    MSG_ID_NWSEL_MM_OUT_OF_SERVICE_IND,
+    MSG_ID_NWSEL_MM_CSG_LIST_CNF,
+    MSG_ID_NWSEL_MM_CSG_LIST_STOP_CNF,
+    MSG_ID_NWSEL_MM_RESUME_IND,
+    MSG_ID_NWSEL_MM_SUSPEND_IND,
+    MSG_ID_NWSEL_MM_VIRTUAL_MODE_IND,
+    MSG_ID_NWSEL_MM_REGN_RESULT_IND,
+    MSG_ID_NWSEL_MM_EVENT_IND,
+    /* #ifdef __LTE_RAT__ */
+    MSG_ID_NWSEL_MM_EUTRAN_CAP_UPDATE_CNF,
+    /* #endif */
+    MSG_ID_NWSEL_MM_CELL_GLOBAL_IDENTITY_INFO_IND,
+    MSG_ID_NWSEL_MM_PLMN_FOUND_IND,
+    MSG_ID_NWSEL_MM_PLMN_SCAN_IND,
+    MSG_ID_NWSEL_MM_CELL_BAND_INFO_UPDATE_IND,
+    MSG_ID_NWSEL_MM_SET_MRU_CNF,
+    MSG_ID_NWSEL_MM_MODE_SWITCH_MT_CSFB_SUCCESS_IND,
+    MSG_ID_NWSEL_MM_CALL_STATUS_IND,
+
+/* messages received from MM at NWSEL_EVAL_SAP */
+    MSG_ID_NWSEL_EVAL_PLMN_LOSS_IND,
+    MSG_ID_NWSEL_EVAL_OUT_OF_SERVICE_IND,
+    MSG_ID_NWSEL_EVAL_PLMN_LIST_CNF,
+    MSG_ID_NWSEL_EVAL_PLMN_LIST_STOP_CNF,
+    MSG_ID_NWSEL_EVAL_CSG_LIST_CNF,
+    MSG_ID_NWSEL_EVAL_CSG_LIST_STOP_CNF,
+    MSG_ID_NWSEL_EVAL_REGN_RESULT_IND,
+    MSG_ID_NWSEL_EVAL_SIGNAL_APPEAR_IND,
+    MSG_ID_NWSEL_EVAL_T3402_CHANGE_IND,  // __REL10__: t3402
+    MSG_ID_NWSEL_EVAL_PERSISTENT_EPSB_REL_IND,  // __REL10__: persistent EPSB
+    MSG_ID_NWSEL_EVAL_PLMN_RESTRICTION_CHANGE_IND,
+    MSG_ID_NWSEL_EVAL_EMERGENCY_STATUS_UPDATE_IND, // for IMS
+    MSG_ID_NWSEL_EVAL_OOS_SEARCH_IND, // for GMSS C2K
+    MSG_ID_NWSEL_EVAL_PLMN_FOUND_IND,
+    MSG_ID_NWSEL_EVAL_PLMN_SCAN_IND,
+    MSG_ID_NWSEL_EVAL_CELL_BAND_INFO_UPDATE_IND,
+    MSG_ID_NWSEL_EVAL_SET_MRU_CNF,
+    MSG_ID_NWSEL_EVAL_IRAT_C2L_SUCCESS_NOTIFY_IND,
+    MSG_ID_NWSEL_EVAL_SEARCH_INTERRUPT_EVENT_IND,
+    MSG_ID_NWSEL_EVAL_EVDO_PS_CONNECTION_STATUS_IND,
+    MSG_ID_NWSEL_EVAL_1XRTT_PS_CONNECTION_STATUS_IND,
+    MSG_ID_NWSEL_EVAL_C2K_CSFB_START_IND,
+    MSG_ID_NWSEL_EVAL_C2K_CSFB_EST_IND,
+    MSG_ID_NWSEL_EVAL_C2K_CSFB_STOP_IND,
+    MSG_ID_NWSEL_EVAL_NEED_DUPLEX_MODE_CHG_IND,
+    MSG_ID_NWSEL_EVAL_CLEAR_FORBIDDEN_TA_NEED_SEARCH_IND,
+    MSG_ID_NWSEL_EVAL_OTHER_RAT_START_SEARCH_IND,
+    MSG_ID_NWSEL_EVAL_UPDATE_EMC_PDN_STATUS_IND,
+    MSG_ID_NWSEL_EVAL_IA_APN_CHANGE_IND,
+    MSG_ID_NWSEL_EVAL_IMS_HANDOVER_NEED_SEARCH_IND,
+    MSG_ID_NWSEL_EVAL_IA_APN_NOT_READY_IND,
+/* message received from SIM at MM_SIM_SAP*/
+
+/* messages received from NWSEL at NWSEL_NWSEL_SAP */
+    MSG_ID_NWSEL_NWSEL_CONTEXT_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_SEARCH_LIST_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_SBP_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_SIM_DATA_TRACE_IND,
+    MSG_ID_NWSEL_NWSEL_IRAT_RSSI_SEARCH_MANAGER_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_BG_BAND_LEARNING_MANAGER_DUMP_IND,
+    //#ifdef __SENSITIVE_DATA_MOSAIC__
+    MSG_ID_NWSEL_NWSEL_NAS_SV_SYS_INFO_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_INIT_REQ_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_SIM_READY_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_GMSS_PLMN_SEARCH_REQ_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_EVAL_SYS_INFO_UPDATE_REQ_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_MM_SYS_INFO_UPDATE_REQ_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_NAS_SV_VGMM_SYS_INFO_UPDATE_REQ_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_MM_CELL_GLOBAL_IDENTITY_INFO_UPDATE_REQ_DUMP_IND,
+    MSG_ID_NWSEL_NWSEL_GMSS_RAC_PLMN_SEARCH_CNF_DUMP_IND,
+    //#endif
+    MSG_ID_NWSEL_NWSEL_PLMN_LIST_UPDATE_IND,
+
+/*TBD*/
+/* messages received from RATCM at NWSEL_RATCM_SAP */
+    MSG_ID_NWSEL_RATCM_CELL_CHANGE_START_IND,
+    MSG_ID_NWSEL_RATCM_CELL_CHANGE_FINISH_IND,
+    MSG_ID_NWSEL_RATCM_SIGNAL_APPEAR_IND,
+
+    MSG_ID_NWSEL_NWSEL_INJECT_SEARCH_LIST_IND,
+/* messages received from PAM at NWSEL_PAM_SAP */
+    MSG_ID_NWSEL_PAM_THROTTLING_APN_UPDATE_IND,
+    MSG_ID_NWSEL_PAM_PDN_AVAILABILITY_UPDATE_REQ,
+/* messages received from DDM at DDM_NWSEL_SAP */
+    MSG_ID_NWSEL_UT_INJECT_IND,
+    MSG_ID_NWSEL_UT_RESULT_IND,
+    MSG_ID_NWSEL_NWSEL_LEAVE_REJ13_EUTRAN_DISABLE_AREA_IND,
+    MSG_ID_NWSEL_NWSEL_LEAVE_REJ15_EUTRAN_DISABLE_AREA_IND,
+    MSG_ID_NWSEL_NWSEL_GPS_DATA_VALID_IND,
+    MSG_ID_NWSEL_NWSEL_FAR_DISTANCE_IND,
+    MSG_ID_DDM_NWSEL_EUTRAN_DISABLE_CHECK_RSP,
+    MSG_ID_NWSEL_CODE_END = MSG_ID_DDM_NWSEL_EUTRAN_DISABLE_CHECK_RSP,
+
+MODULE_MSG_END( MSG_ID_NWSEL_CODE_TAIL )
+/*----------------------- MM_MSG_CODE_END--------------------*/
diff --git a/mcu/interface/sap/md/p2p_msgid.h b/mcu/interface/sap/md/p2p_msgid.h
new file mode 100644
index 0000000..dea05c2
--- /dev/null
+++ b/mcu/interface/sap/md/p2p_msgid.h
@@ -0,0 +1,92 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   p2p.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   P2P related message identity definition
+ *
+ * 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!! 
+ *==============================================================================
+ *******************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _P2P_MSG_H
+#define _P2P_MSG_H
+
+    /*------------------------- P2P messages---------------------*/
+MODULE_MSG_BEGIN( MSG_ID_P2P_CODE_BEGIN )
+    MSG_ID_P2P_VL1_TICK_IND = MSG_ID_P2P_CODE_BEGIN,
+    MSG_ID_P2P_SEND_UL_DATA_IND,
+    MSG_ID_P2P_CODE_END = MSG_ID_P2P_SEND_UL_DATA_IND,
+MODULE_MSG_END( MSG_ID_P2P_CODE_TAIL )
+    /*----------------------- P2P_MSG_CODE_END -----------------*/
+
+#endif  //_P2P_MSG_H
\ No newline at end of file
diff --git a/mcu/interface/sap/md/pam_msgid.h b/mcu/interface/sap/md/pam_msgid.h
new file mode 100644
index 0000000..2a50a9e
--- /dev/null
+++ b/mcu/interface/sap/md/pam_msgid.h
@@ -0,0 +1,264 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   
+ *
+ * Project:
+ * --------
+ *   
+ *
+ * Description:
+ * ------------
+ *   PAM 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!
+ * 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 _PAM_MSG_H
+#define _PAM_MSG_H
+
+/*------------------- PAM_MSG_CODE_BEGIN---------------------*/
+MODULE_MSG_BEGIN( MSG_ID_PAM_CODE_BEGIN )
+MSG_ID_PAM_MSG_ID_START = MSG_ID_PAM_CODE_BEGIN,
+
+    MSG_ID_PAM_PROCESS_BY_CONTEXT_MAIN_START,
+        MSG_ID_NWSEL_PAM_EQ_PLMN_LIST_UPDATE_IND,
+        MSG_ID_TCM_PAM_START_REQ,
+        MSG_ID_TCM_PAM_ATTACH_CONTEXT_DEFINED_NOTIFY_REQ,
+        MSG_ID_TCM_PAM_CELLULAR_NETWORK_CONFIG_REQ,
+        MSG_ID_TCM_PAM_IA_APN_CHANGE_REQ, 
+        MSG_ID_TCM_PAM_SET_VZW_APN_TABLE_REQ,
+        MSG_ID_TCM_PAM_GET_VZW_APN_TABLE_REQ,
+        MSG_ID_TCM_PAM_SET_VZW_PARAMS_REQ,
+        MSG_ID_TCM_PAM_GET_VZW_PARAMS_REQ,
+        MSG_ID_TCM_PAM_GET_APN_BLOCKING_TIMER_LENGTH_REQ,
+
+        /* MSGs from SM/ESM */
+        MSG_ID_PAM_STOP_ALL_T3396_IND,
+        MSG_ID_PAM_PDP_SYNCED_IND,
+        
+        /* MSGs from ESM */
+        MSG_ID_PAM_ESM_T3402_STOP_IND,
+        MSG_ID_PAM_ESM_STOP_ALL_PDN_THROTT_TIMER_IND,
+        MSG_ID_PAM_ESM_CONN_EST_IND,
+        MSG_ID_PAM_ESM_T3402_CHANGE_IND, // __ATnT__
+
+        /* MSGs for logging */
+        MSG_ID_PAM_LOG_PIB, 
+        MSG_ID_PAM_LOG_SMIB,
+        MSG_ID_PAM_LOG_SMIB_VZW,
+        MSG_ID_PAM_LOG_SMIB_VZW_5G,
+        MSG_ID_PAM_LOG_API_IS_HIGH_PRIORITY_ACCESS,
+
+        /* MSGs for USM context checking */
+        MSG_ID_USM_CHECK_GV,
+
+        MSG_ID_TCM_PAM_EVENT_NOTIFY_REQ,
+
+        /* MSGs from VGSM */
+        MSG_ID_PAM_VGSM_STOP_CONGESTION_TIMERS_IND,
+
+        /* MSGs from NAS-SV */
+        MSG_ID_NAS_SV_PAM_RFOFF_NTF,
+        
+    MSG_ID_PAM_PROCESS_BY_CONTEXT_MAIN_END,
+
+
+    /* MSGs for VGSM */
+    MSG_ID_PAM_PROCESS_BY_SM_PROCESS_MAIN_START = MSG_ID_PAM_PROCESS_BY_CONTEXT_MAIN_END+1,
+        MSG_ID_TCM_PAM_PDU_SESSION_EST_REQ,
+        MSG_ID_TCM_PAM_PDU_SESSION_MOD_REQ,
+        MSG_ID_TCM_PAM_PDU_SESSION_REL_REQ,
+        MSG_ID_PAM_VGSM_PDU_SESSION_EST_CNF, //TEMP
+        MSG_ID_PAM_VGSM_PDU_SESSION_EST_REJ, //TEMP
+        MSG_ID_PAM_VGSM_PDU_SESSION_MOD_CNF, //TEMP
+        MSG_ID_PAM_VGSM_PDU_SESSION_MOD_IND, //TEMP
+        MSG_ID_PAM_VGSM_PDU_SESSION_MOD_REJ, //TEMP
+        MSG_ID_PAM_VGSM_PDU_SESSION_REL_CNF, //TEMP
+        MSG_ID_PAM_VGSM_PDU_SESSION_REL_REJ, //TEMP
+        MSG_ID_PAM_VGSM_PDU_SESSION_REL_IND, //TEMP
+        MSG_ID_PAM_VGSM_LADN_INFO_UPDATE_IND,
+        MSG_ID_PAM_VGSM_4G5_CONTEXT_TRANSFERRED_IND,
+        MSG_ID_PAM_VGSM_LADN_INOUT_CHANGE_IND,
+    MSG_ID_PAM_PROCESS_BY_SM_PROCESS_MAIN_END,
+
+MSG_ID_PAM_MSG_ID_END,
+MODULE_MSG_END( MSG_ID_PAM_CODE_TAIL )
+/*------------------- PAM_MSG_CODE_END-----------------------*/
+
+#endif  /* _PAM_MSG_H */
diff --git a/mcu/interface/sap/md/perf_msgid.h b/mcu/interface/sap/md/perf_msgid.h
new file mode 100644
index 0000000..1c3e628
--- /dev/null
+++ b/mcu/interface/sap/md/perf_msgid.h
@@ -0,0 +1,64 @@
+/*****************************************************************************
+*  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 _PERF_MSGID_H_
+#define _PERF_MSGID_H_
+
+MODULE_MSG_BEGIN( MSG_ID_PERF_CODE_BEGIN )
+
+    MSG_ID_PROTOCOL_EXCEPTION_RECOVERY,
+    MSG_ID_PERF_L4BPWR_FLIGHT_MODE_RECOVERY_REQ,
+    MSG_ID_PERF_L4BPWR_FLIGHT_MODE_RECOVERY_CNF,
+    MSG_ID_PERF_EMM_LTE_LOCAL_RELEASE_RECOVERY_REQ,
+    MSG_ID_PERF_EMM_LTE_LOCAL_RELEASE_RECOVERY_CNF,
+    //MSG_ID_PERF_ERRC_REESTABLISHMENT_RECOVERY_REQ,
+    MSG_ID_PERF_ERRC_REESTABLISHMENT_RECOVERY_CNF,
+    //Start NR MSG
+    MSG_ID_ERM_ERROR_IND,
+    MSG_ID_ERM_NRRC_CELL_INFO_IND, 
+    MSG_ID_ERM_NRRC_ERROR_RECOVERY_IND,
+    MSG_ID_ERM_NRRC_ERROR_RECOVERY_REQ,
+    MSG_ID_ERM_NRRC_ERROR_RECOVERY_CNF, 
+    MSG_ID_ERM_VGMM_ERROR_RECOVERY_REQ,
+    MSG_ID_ERM_VGMM_ERROR_RECOVERY_CNF, 
+    MSG_ID_ERM_NRRC_PENALTY_REQ, 
+    MSG_ID_ERM_NRRC_PENALTY_CNF,
+    MSG_ID_ERM_NRRC_BARRING_INFO_UPDATE_REQ,
+    //End NR MSG    
+
+MODULE_MSG_END( MSG_ID_PERF_CODE_TAIL )
+
+#endif // ~ #ifndef _PERF_MSGID_H_
\ No newline at end of file
diff --git a/mcu/interface/sap/md/ppp_msgid.h b/mcu/interface/sap/md/ppp_msgid.h
new file mode 100644
index 0000000..be98352
--- /dev/null
+++ b/mcu/interface/sap/md/ppp_msgid.h
@@ -0,0 +1,206 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   ppp.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   PPP 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _PPP_MSG_H
+#define _PPP_MSG_H
+
+	/*-------------- PPP_MSG_CODE_BEGIN ------------------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_PPP_CODE_BEGIN )
+	/*-------------- PPP for GPRS messages ---------------------*/
+	/* msg from L4C */
+
+	MSG_TAG_PPP_FIRST_GPRS_MSG = MSG_ID_PPP_CODE_BEGIN,
+	MSG_ID_L4CPPP_ACTIVATE_REQ = MSG_TAG_PPP_FIRST_GPRS_MSG,
+	MSG_ID_L4CPPP_DEACTIVATE_REQ,
+	MSG_ID_L4CPPP_RESUME_REQ,
+	MSG_ID_L4CPPP_PPPTYPEPDP_UART_TRANSFER_IND, // PPP Type PDP Dialup Feature
+	MSG_ID_L4CPPP_IPV4V6_FALLBACK_RSP,          //__IPV4V6__
+
+    /* msg from TCM */
+	MSG_ID_TAF_EXT_PDP_ACTIVATE_ACK_RSP,
+  	MSG_ID_TAF_EXT_PDP_ACTIVATE_REJ_RSP,
+  	MSG_ID_TAF_EXT_PDP_DEACTIVATE_ACK_RSP,
+  	MSG_ID_TAF_EXT_PDP_DEACTIVATE_REQ,
+  	MSG_ID_TAF_DATA_REQ,
+  	MSG_ID_TAF_EXT_UPDATE_PDP_ADDR_REQ,
+  	MSG_ID_TAF_EXT_PDP_SET_IP_AND_DNS_INFO_CNF,
+	//mtk04121
+	/* PPP Dial-up */
+	MSG_ID_TAF_EXT_ENTER_DATA_MODE_CNF,
+
+	/* msg to self(PPP) */
+	MSG_ID_PPP_FLC_DATA_RESUME_IND,
+	MSG_ID_PPP_STATUS_REPORT_IND,
+	MSG_ID_PPP_PROCESS_PKT_IND,
+
+       MSG_ID_TAF_PS_SUSPEND_IND,
+       MSG_ID_TAF_PS_RESUME_IND,
+	MSG_TAG_PPP_LAST_GPRS_MSG = MSG_ID_TAF_PS_RESUME_IND,
+
+	
+	/*-------------- PPP for CSD messages ---------------------*/
+	/* msg from L4C */
+	MSG_TAG_PPP_FIRST_CSD_MSG,
+	MSG_ID_L4CPPP_CSD_ACTIVATE_REQ = MSG_TAG_PPP_FIRST_CSD_MSG,
+	MSG_ID_L4CPPP_CSD_DEACTIVATE_REQ,
+	
+	/* msg from TCPIP */
+	MSG_ID_TCPIP_PPP_DATA_REQ,
+	MSG_ID_SOC_PPP_DL_SRPDU_RESUME,
+	
+	/* msg from CSD */
+	MSG_ID_FLC_PPP_UL_APPDU_RESUME,
+	MSG_ID_PPP_TDT_DATA_IND,
+
+#ifdef __PPP_UT__ 
+        MSG_ID_PPP_TST_DATA_REQ,
+#endif /* ~ __PPP_UT__ */
+	MSG_ID_PPP_L2R_DATA_IND,		
+		
+	MSG_TAG_PPP_LAST_CSD_MSG = MSG_ID_PPP_L2R_DATA_IND,
+
+       /*------------- EXT MODEM related messages ----------------*/
+       MSG_TAG_PPP_FIRST_EXT_MODEM_MSG,  
+       /* EXT_MODEM <--> PPP */
+       MSG_ID_PPP_EXT_MODEM_DATA_REQ = MSG_TAG_PPP_FIRST_EXT_MODEM_MSG,
+       MSG_ID_PPP_EXT_MODEM_DATA_IND,
+       MSG_ID_EXT_MODEM_PPP_ACTIVATE_REQ,
+       MSG_ID_EXT_MODEM_PPP_ACTIVATE_CNF,
+       MSG_ID_EXT_MODEM_PPP_DEACTIVATE_REQ,
+       MSG_ID_EXT_MODEM_PPP_DEACTIVATE_CNF,
+       MSG_ID_EXT_MODEM_PPP_DEACTIVATE_IND,
+
+       MSG_TAG_PPP_LAST_EXT_MODEM_MSG = MSG_ID_EXT_MODEM_PPP_DEACTIVATE_IND,
+
+       MSG_ID_PPP_CODE_END = MSG_TAG_PPP_LAST_EXT_MODEM_MSG,
+MODULE_MSG_END( MSG_ID_PPP_CODE_TAIL )
+	
+	/*--------------- PPP_MSG_CODE_END--------------------*/
+
+#endif //_PPP_MSG_H
diff --git a/mcu/interface/sap/md/ps_public_l4_msgid.h b/mcu/interface/sap/md/ps_public_l4_msgid.h
new file mode 100644
index 0000000..2830389
--- /dev/null
+++ b/mcu/interface/sap/md/ps_public_l4_msgid.h
@@ -0,0 +1,146 @@
+/*****************************************************************************
+*  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) 2006
+*
+*  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:
+ * ---------
+ *   ps_public_l4_sap.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file is the common public SAP for protocol stack.
+ *
+ * Author: Danny Kuo
+ * -------
+ *   
+ *
+ *==============================================================================
+ *******************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _PS_PUB_L4_MSG_H
+#define _PS_PUB_L4_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_L4_PUBLIC_CODE_BEGIN )
+    MSG_ID_GATI_DATA_IND = MSG_ID_L4_PUBLIC_CODE_BEGIN,  
+    MSG_ID_GATI_DATA_RSP,
+    MSG_ID_GATI_DATA_REQ,
+    MSG_ID_GATI_DATA_CNF,
+    MSG_ID_GATI_RTW_IND,
+    MSG_ID_GATI_CTRL_REQ,
+    MSG_ID_GATI_CTRL_CNF,
+    MSG_ID_GATI_SWITCH_MODE_REQ,
+    MSG_ID_GATI_SWITCH_MODE_CNF,
+    MSG_ID_ATCIDT_FORCE_TRANSFER_REQ,
+    MSG_ID_ATCIDT_FORCE_TRANSFER_CNF,
+    MSG_ID_MMI_ATCI_MASTER_SIM_CHANGE_REQ,      
+    MSG_ID_MMI_ATCI_MASTER_SIM_CHANGE_CNF,    
+    MSG_ID_RMMI_REGISTER_CHANNEL_REQ,
+    MSG_ID_RMMI_REGISTER_CHANNEL_CNF,
+    MSG_ID_RMMI_EXE_AT_REQ,
+    MSG_ID_RMMI_EXE_AT_CNF,
+    MSG_ID_RMMI_RESPONSE_AT_IND,
+    MSG_ID_RMMI_URC_AT_IND,
+    MSG_ID_L4C_END_PS_DATA_SENSSION_REQ,
+    MSG_ID_RMMI_LOCK_AT_CMD_REQ,
+    MSG_ID_RMMI_LOCK_AT_CMD_CNF,
+    MSG_ID_L4C_NBR_CELL_INFO_REG_REQ,       
+    MSG_ID_L4C_NBR_CELL_INFO_REG_CNF,
+    MSG_ID_L4C_NBR_CELL_INFO_DEREG_REQ,    
+    MSG_ID_L4C_NBR_CELL_INFO_DEREG_CNF,
+    MSG_ID_L4C_NBR_CELL_INFO_IND,
+    MSG_ID_GAS_DATA_IND,
+    MSG_ID_GAS_DATA_REQ,
+    MSG_ID_L4C_MAX_TX_PWR_RED_REQ,
+    MSG_ID_L4C_REGIONAL_PHONE_MODE_REQ,
+    MSG_ID_L4C_MEAS_INFO_REQ, //for Thermal
+    MSG_ID_L4C_ASSERT_BYPASS_TRACE_IND,
+    //MSG_ID_L4CTST_AT_RESPONSE_IND,
+    MSG_ID_L4C_USB_SUSPEND_REQ,
+    MSG_ID_L4C_USB_RESUME_REQ,
+    /*not use
+    MSG_ID_AGPS_ENABLE_DISABLE_RSP,
+    MSG_ID_AGPS_KEY_UPDATE_RSP,
+    MSG_ID_AGPS_NEW_KEY_NEEDED_IND,*/
+    /*below are for AGPS auto test
+    MSG_ID_AGPS_AUTO_TEST_IND,
+    MSG_ID_AGPS_CP_UP_STATUS_IND,
+    MSG_ID_AGPS_MOLR_START_IND,
+    MSG_ID_AGPS_MOLR_STOP_IND,
+    MSG_ID_AGPS_MTLR_RESPONSE_IND,*/
+    MSG_ID_LBSAP_DATA_RECV_IND,
+    MSG_ID_LBSAP_DATA_SEND_REQ,
+    MSG_ID_L4C_INJECT_SBP_CHANGE_IND,
+    MSG_ID_FT_ENTER_FACTORY_MODE_REQ,
+    MSG_ID_FT_ENTER_FACTORY_MODE_CNF,
+    MSG_ID_FT_ENTER_NORMAL_MODE_REQ,
+    MSG_ID_FT_ENTER_NORMAL_MODE_CNF,
+    MSG_ID_L4C_ENTER_FACTORY_MODE_REQ,
+    MSG_ID_L4C_ENTER_FACTORY_MODE_CNF,
+    MSG_ID_L4C_ENTER_NORMAL_MODE_REQ,
+    MSG_ID_L4C_ENTER_NORMAL_MODE_CNF,
+    MSG_ID_RAC_DUMP_CONTEXT_IND,
+    MSG_ID_RAC_UT_UPDATE_CONTEXT_REQ,
+    MSG_ID_L4C_DUMP_CONTEXT_IND,
+    MSG_ID_IWLAN_L4C_SET_PWL_THRHD_REQ,
+    MSG_ID_IWLAN_L4C_SET_PWL_THRHD_CNF,
+    MSG_ID_L4C_IWLAN_PWR_LEVEL_IND,
+    MSG_ID_IWLAN_L4C_IMS_SYS_INFO_IND,
+    MSG_ID_IWLAN_L4C_IMS_CAP_IND,
+    MSG_ID_IWLAN_L4C_CSFB_FAIL_IND,
+    MSG_ID_L4C_GENERAL_MODEM_CONFIGURE_SET_REQ,
+    MSG_ID_L4C_GENERAL_MODEM_CONFIGURE_SET_CNF,
+    MSG_ID_L4C_GENERAL_MODEM_CONFIGURE_QUERY_REQ,
+    MSG_ID_L4C_GENERAL_MODEM_CONFIGURE_QUERY_CNF,
+    MSG_ID_L4BNW_ATTACHED_RAT_IND,
+    MSG_ID_L4BPWR_PHONE_STATE_REQ,
+    MSG_ID_L4BPWR_PHONE_STATE_CNF,
+    MSG_ID_L4BPWR_MT_PHONE_STATE_IND,
+    MSG_ID_L4BPWR_PHONE_STATE_FINISHED_IND,
+    MSG_ID_L4C_UT_SET_RAC_RAT_MODE_CONTEXT_IND,
+    MSG_ID_OSTD_AP_CORE_STATUS_REQ,
+    MSG_ID_L4BPWR_AP_CORE_STATUS_REQ,
+    MSG_ID_L4C_EONS_SIM_DATA_REQ,
+    MSG_ID_L4C_EONS_SIM_DATA_CNF,
+	MSG_ID_L4C_PUBLIC_SIGNAL_INFO_IND,
+    MSG_ID_L4_PUBLIC_CODE_END,
+MODULE_MSG_END( MSG_ID_L4_PUBLIC_CODE_TAIL )
+
+#endif //_PS_PUB_L4_MSG_H
diff --git a/mcu/interface/sap/md/ps_public_supl_msgid.h b/mcu/interface/sap/md/ps_public_supl_msgid.h
new file mode 100644
index 0000000..bab963c
--- /dev/null
+++ b/mcu/interface/sap/md/ps_public_supl_msgid.h
@@ -0,0 +1,124 @@
+/*****************************************************************************
+*  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) 2006
+*
+*  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:
+ * ---------
+ *   supl_sap.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file is the common public SAP for protocol stack.
+ *
+ * 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _PS_PUB_SUPL_MSG_H
+#define _PS_PUB_SUPL_MSG_H
+
+#ifdef __BUILD_DOM__
+/**************************************
+ * <GROUP Messages >
+ *
+ * SUPL_LCSP SAP primitives
+ *************************************/
+ typedef enum{
+ #endif
+MODULE_MSG_BEGIN( MSG_ID_PS_PUBLIC_SUPL_MSG_CODE_BEGIN )
+    MSG_ID_SUPL_MMI_PUSH_REQ = MSG_ID_PS_PUBLIC_SUPL_MSG_CODE_BEGIN, /* MMI uses this message to notify SUPL a incoming push (SUPL INIT). If the push contains correct SUPL INIT, SUPL will use this message to notify the start of a SUPL session. Direction: MMI-> SUPL\n Local parameter: supl_mmi_push_req_struct. Peer buffer: None. */
+    MSG_ID_SUPL_MMI_STATUS_IND, /* SUPL uses this message to notify MMI the new status. */
+    MSG_ID_SUPL_MMI_STATUS_RSP, /* MMI uses this message to notify SUPL the result of STATUS_IND. */
+    MSG_ID_SUPL_MMI_NOTIFY_IND, /* SUPL uses this message to notify an notification or verification coming. */
+    MSG_ID_SUPL_MMI_NOTIFY_RSP, /* MMI uses this message to notify the response of an notification or verification. */ 
+    MSG_ID_SUPL_MMI_START_REQ,  /* MMI uses this message to request starting a SUPL SET initiated session. */
+    MSG_ID_SUPL_MMI_ABORT_REQ,  /* MMI uses this message to request aborting a SUPL SET initiated session. */
+    MSG_ID_SUPL_MMI_ABORT_CNF,  /* SUPL uses this message to notify the result of aborting. */
+MODULE_MSG_END( MSG_ID_PS_PUBLIC_SUPL_MSG_CODE_TAIL )
+
+#ifdef __BUILD_DOM__
+} sap_supl_mmi_enum;
+#endif
+
+#endif //_PS_PUB_SUPL_MSG_H
diff --git a/mcu/interface/sap/md/ps_public_vt_msgid.h b/mcu/interface/sap/md/ps_public_vt_msgid.h
new file mode 100644
index 0000000..540468b
--- /dev/null
+++ b/mcu/interface/sap/md/ps_public_vt_msgid.h
@@ -0,0 +1,154 @@
+/*******************************************************************************
+*  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:
+ * ---------
+ *   ps_public_vt_sap.h
+ *
+ * Project:
+ * --------
+ *   MONZA
+ *
+ * Description:
+ * ------------
+ *  VT related message identity definition (public)
+ *
+ * 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!
+*
+*******************************************************************************/
+#include "module_msg_range.h"
+
+// ----------------------------------------
+// Public
+// ----------------------------------------
+
+// MMI
+
+MODULE_MSG_BEGIN( MSG_ID_PS_PUBLIC_VT_MSG_CODE_BEGIN )
+MSG_ID_MMI_VT_START_COUNTER_IND = MSG_ID_PS_PUBLIC_VT_MSG_CODE_BEGIN,
+MSG_ID_MMI_VT_UII,
+
+// MED
+MSG_ID_MEDIA_VCALL_CHANNEL_STATUS_IND,
+MSG_ID_MEDIA_VCALL_VIDEO_REPLENISH_DATA_READY_IND,
+MSG_ID_MEDIA_VT_ADJUST_VIDEO_QUALITY_IND,
+MSG_ID_MEDIA_VT_SWITCH_VIDEO_SIZE,
+MSG_ID_MED_VT_VIDEO_MISC_CMD,
+MSG_ID_MED_VT_FAST_UPDATE_REQ,
+MODULE_MSG_END( MSG_ID_PS_PUBLIC_VT_MSG_CODE_TAIL )
diff --git a/mcu/interface/sap/md/psdm_msgid.h b/mcu/interface/sap/md/psdm_msgid.h
new file mode 100644
index 0000000..ff5265c
--- /dev/null
+++ b/mcu/interface/sap/md/psdm_msgid.h
@@ -0,0 +1,122 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   psdm_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   PSDM 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!
+ *
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _PSDM_MSGID_H
+#define _PSDM_MSGID_H
+
+
+MODULE_MSG_BEGIN(MSG_ID_PSDM_CODE_BEGIN)
+
+
+MODULE_MSG_END( MSG_ID_PSDM_CODE_TAIL )	
+
+#endif  //_PSDM_MSGIDID.H
+
diff --git a/mcu/interface/sap/md/psw_msgid.h b/mcu/interface/sap/md/psw_msgid.h
new file mode 100644
index 0000000..db00df1
--- /dev/null
+++ b/mcu/interface/sap/md/psw_msgid.h
@@ -0,0 +1,540 @@
+/*****************************************************************************
+*  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) 2015
+*
+*  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 _PSW_MSG_ID_H
+#define _PSW_MSG_ID_H
+
+/*****************************************************************************
+*
+* FILE NAME   :psw_msgid.h
+*
+* DESCRIPTION :
+*
+*
+*
+* HISTORY     :
+*     See Log at end of file
+*
+*****************************************************************************/
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+
+MODULE_MSG_BEGIN( MSG_ID_CPSW_CODE_BEGIN )
+       /* from multiple sources */
+       MSG_ID_PSW_CMD_STATUS_MSG = MSG_ID_CPSW_CODE_BEGIN + 0,
+
+       /* from L1D */
+       MSG_ID_PSW_PMRM_REQ_MSG,
+       MSG_ID_PSW_CAND_FREQ_TIMES_MSG,
+       MSG_ID_PSW_CAND_FREQ_MEASUREMENTS_MSG,
+       MSG_ID_PSW_SCAN_MEASUREMENTS_MSG,
+       MSG_ID_PSW_IDLE_HANDOFF_MSG,
+       MSG_ID_PSW_START_CF_MEASURE_MSG,
+       MSG_ID_PSW_END_CF_MEASURE_MSG,
+       MSG_ID_PSW_INITIAL_ACQ_REPORT_MSG,
+
+       MSG_ID_PSW_SET_IDLE_HO_PARAMETERS_MSG,
+
+       MSG_ID_PSW_OUTER_LOOP_REPORT_REQ_MSG,
+       MSG_ID_PSW_GET_PS_INFO_MSG,
+       MSG_ID_PSW_L1D_ACCESS_PREAMBLE_COMPLETE_MSG,
+       MSG_ID_PSW_L1D_ACCESS_COMPLETE_MSG,
+       MSG_ID_PSW_L1D_ACCESS_PROBE_COMPLETE_MSG,
+       MSG_ID_PSW_OOSA_WAKEUP_IND_MSG,
+       MSG_ID_PSW_L1D_RSSI_RPT_MSG,
+       MSG_ID_PSW_STATUS_REQUEST_RSSI_RSP_MSG,
+       MSG_ID_PSW_L1D_DEACTIVE_CNF_MSG,
+       MSG_ID_PSW_L1D_OOSA_CNF_MSG,
+       MSG_ID_PSW_L1D_RAKE_DDL_CNF_MSG,
+	   MSG_ID_PSW_L1D_ACCESS_PREAMBLE_DELAY_MSG,
+
+       /* from LMD */
+       MSG_ID_PSW_FORWARD_SYNC_CHAN_FRAME_MSG,
+       MSG_ID_PSW_FORWARD_PAGE_CHAN_FRAME_MSG,
+       MSG_ID_PSW_FORWARD_BCCH_FRAME_MSG,
+       MSG_ID_PSW_FORWARD_FCCCH_FRAME_MSG,
+       MSG_ID_PSW_DSCH_CHAN_FRAME_MSG,
+       MSG_ID_PSW_REVERSE_STATISTICS_PARMS_MSG,
+       MSG_ID_PSW_SERVICE_OPTION_CONTROL_RESP_MSG,
+       MSG_ID_PSW_RSCH_REL_IND_MSG,
+       MSG_ID_PSW_STAT_CNT_MSG,
+       MSG_ID_PSW_FORWARD_PAGE_CHAN_MSG,
+       MSG_ID_PSW_FORWARD_FCCCH_MSG,
+       MSG_ID_PSW_FORWARD_BCCH_MSG,
+       MSG_ID_PSW_FORWARD_SYNC_CHAN_MSG,
+       MSG_ID_PSW_DSCH_CHAN_MSG,
+
+       /* from MMI */
+       MSG_ID_PSW_POWER_MSG,
+       MSG_ID_PSW_CALL_INITIATE_MSG,
+       MSG_ID_PSW_CALL_INITIATE_WITH_INFO_REC_MSG,
+       MSG_ID_PSW_GET_PRL_INFO_MSG,
+       MSG_ID_PSW_E911_MODE_MSG,
+       MSG_ID_PSW_CALL_ANSWER_MSG,
+       MSG_ID_PSW_CALL_HANGUP_MSG,
+       MSG_ID_PSW_SEND_CONT_DTMF_ON_MSG,
+       MSG_ID_PSW_SEND_CONT_DTMF_OFF_MSG,
+       MSG_ID_PSW_SEND_BURST_DTMF_MSG,
+       MSG_ID_PSW_HOOKFLASH_MSG,
+       MSG_ID_PSW_SET_PRIVACY_MODE_MSG,
+
+       MSG_ID_PSW_SET_RETRIEVABLE_PARAMETER,
+       MSG_ID_PSW_GET_RETRIEVABLE_PARAMETER,
+       MSG_ID_PSW_INJECT_HANDOFF_MSG,
+
+       MSG_ID_PSW_GET_FULL_SYS_TIME_MSG,
+       MSG_ID_PSW_SET_SILENT_RETRY_MSG,
+       MSG_ID_PSW_GET_SILENT_RETRY_STATUS_MSG,
+       MSG_ID_PSW_SET_MOB_PREV_MSG,
+       MSG_ID_PSW_SET_CUSTOM_FEATURE_MSG,
+       MSG_ID_PSW_SET_PRL_ENABLE_MSG,
+
+       /* from VAL - SMS related */
+       MSG_ID_PSW_SMS_UNKNOWN_CONNECT_MSG,
+       MSG_ID_PSW_SMS_UNKNOWN_DISCONNECT_MSG,
+       MSG_ID_PSW_SMS_UNKNOWN_PARMS_MSG,
+       MSG_ID_PSW_SMS_PREF_SRV_OPT_MSG,
+       MSG_ID_PSW_SMS_CONNECT_MSG,
+       MSG_ID_PSW_SMS_DISCONNECT_MSG,
+       MSG_ID_PSW_SMS_BCAST_CONNECT_MSG,
+       MSG_ID_PSW_SMS_BCAST_DISCONNECT_MSG,
+       MSG_ID_PSW_SMS_BCAST_PARMS_MSG,
+       MSG_ID_PSW_SMS_SUBMIT_PARMS_MSG,
+       MSG_ID_PSW_SMS_SUBMIT_DATA_MSG,
+       MSG_ID_PSW_SMS_CANCEL_MSG,
+       MSG_ID_PSW_SMS_ACK_PARMS_MSG,
+       MSG_ID_PSW_SMS_ACK_DATA_MSG,
+       MSG_ID_PSW_SMS_TERMINAL_STATUS_MSG,
+       MSG_ID_PSW_SMS_TIMER_EXPIRED_MSG,
+       MSG_ID_PSW_SMS_CAUSE_CODE_STATUS_MSG,
+       MSG_ID_PSW_SMS_RETX_AMOUNT_MSG,
+       MSG_ID_PSW_SMS_CAUSE_CODE_SET_MSG,
+       MSG_ID_PSW_SMS_REPLY_TL_ACK_MSG,
+       MSG_ID_PSW_TIMER_EXPIRED_MSG,
+       MSG_ID_PSW_SMS_PREF_REQ_MSG,
+       MSG_ID_PSW_SMS_REL_REQ_MSG,
+       MSG_ID_PSW_SMS_TX_REQ_MSG,
+       MSG_ID_PSW_SMS_RESEND_TIMER_EXPIRED_MSG,
+       MSG_ID_PSW_SMS_MMS_TIMER_EXPIRED_MSG,
+       MSG_ID_PSW_SMS_MOREL_TIMER_EXPIRED_MSG,
+       MSG_ID_PSW_SMS_TLACK_REQ_MSG,
+       MSG_ID_PSW_SMS_RETRY_PERIOD_TIMER_EXPIRED_MSG,
+
+       MSG_ID_PSW_IMS_SMS_READY_MSG,
+       MSG_ID_PSW_IMS_SMS_RSP_MSG,
+       MSG_ID_PSW_IMS_SMS_NOTIFY_MSG,
+       MSG_ID_PSW_SET_MULTI_SMS_MODE_MSG,
+       MSG_ID_PSW_SMS_BROADCAST_EXPECTED_MSG,
+       MSG_ID_PSW_SMS_MT_DATA_BURST_MSG,
+       MSG_ID_PSW_VAL_PREF_VOICE_SERVICEOPTION_SET_MSG,
+       MSG_ID_PSW_VAL_REG_RESUME,
+       MSG_ID_PSW_SMS_CBS_INFO_CFG,
+       MSG_ID_PSW_VAL_SET_SO_SUPPORT_MSG,
+
+#ifdef MTK_CBP_ENCRYPT_VOICE
+       MSG_ID_PSW_VAL_ENCRYPT_VOICE_REQ_MSG,
+       MSG_ID_PSW_VAL_SET_KS_KEY_REQ_MSG,
+       MSG_ID_PSW_VAL_CLEAR_TEMP_KEY_REQ_MSG,
+       MSG_ID_PSW_VAL_CANCEL_CIPHER_SMS_SEND_REQ_MSG,
+#endif
+
+       /* from DBM */
+       MSG_ID_PSW_DBM_DATA_NAM_MSG,
+       MSG_ID_PSW_DBM_DATA_NAM_WRITE_ACK_MSG,
+       MSG_ID_PSW_DBM_DATA_MSG,
+       MSG_ID_PSW_DBM_DATA_WRITE_ACK_MSG,
+       MSG_ID_PSW_DBM_FLUSH_ACK_MSG,
+       MSG_ID_PSW_DBM_DATA_PRL_MSG,
+       MSG_ID_PSW_DBM_DATA_PRL_WRITE_MSG,
+       MSG_ID_PSW_DBM_DATA_MS_CAP_DB_MSG,
+       MSG_ID_PSW_DBM_DATA_MS_CAP_DB_WRITE_ACK_MSG,
+       MSG_ID_PSW_DBM_DATA_MISC_MSG,
+       MSG_ID_PSW_NVM_CHANGED_BY_ETS_MSG,
+       MSG_ID_PSW_NAM_UNLOCK_ACK_MSG,
+       MSG_ID_PSW_DBM_DATA_MISC_WRITE_ACK_MSG,
+       MSG_ID_PSW_DBM_SECURE_DATA_WRITE_ACK_MSG,
+       MSG_ID_PSW_DBM_SECURE_DATA_MSG,
+       MSG_ID_PSW_GET_NAM_MSG,
+       MSG_ID_PSW_NAM_CHANGED_MSG,
+       MSG_ID_PSW_DBM_INIT_MSG,
+
+       /* from R-UIM */
+       MSG_ID_PSW_UIM_GET_NAM_DATA_MSG,
+       MSG_ID_PSW_UIM_GET_UIM_MEID_FEATURE_MSG,
+       MSG_ID_PSW_UIM_UPDATE_NAM_DATA_MSG,
+       MSG_ID_PSW_UIM_STORE_ESN_MSG,
+       MSG_ID_PSW_UIM_DATA_PRL_MSG,
+       MSG_ID_PSW_UIM_BS_CHALLENGE_ACK_MSG,
+       MSG_ID_PSW_UIM_CONFIRM_SSD_ACK_MSG,
+       MSG_ID_PSW_UIM_RUN_CAVE_ACK_MSG,
+       MSG_ID_PSW_UIM_GENERATE_KEY_VPM_ACK_MSG,
+       MSG_ID_PSW_UIM_STATUS_NOTIFY_MSG,
+       MSG_ID_PSW_UIM_DATA_OTAFEATURE_MSG,
+       MSG_ID_PSW_UIM_MS_KEY_REQUEST_ACK_MSG,
+       MSG_ID_PSW_UIM_KEY_GENERATION_REQUEST_ACK_MSG,
+       MSG_ID_PSW_UIM_COMMIT_ACK_MSG,
+       MSG_ID_PSW_UIM_VALIDATE_ACK_MSG,
+       MSG_ID_PSW_UIM_CONFIGURATION_REQUEST_ACK_MSG,
+       MSG_ID_PSW_UIM_DOWNLOAD_REQUEST_ACK_MSG,
+       MSG_ID_PSW_UIM_SSPR_CONFIGURATION_REQUEST_ACK_MSG,
+       MSG_ID_PSW_UIM_SSPR_DOWNLOAD_REQUEST_ACK_MSG,
+       MSG_ID_PSW_UIM_OTAPA_REQUEST_ACK_MSG,
+       MSG_ID_PSW_UIM_UPDATE_BINARY_ACK_MSG,
+       MSG_ID_PSW_UIM_OTA_RUN_CAVE_ACK_MSG,
+       MSG_ID_PSW_UIM_STORE_MECONFIG_MSG,
+       MSG_ID_PSW_UIM_SMS_CAP_MSG,
+       /* from RLP */
+       MSG_ID_PSW_DATA_BUFFER_STATUS_MSG,
+
+       /* from ets or generic PS interfaces */
+       MSG_ID_PSW_ACCESS_SIGNAL_ETS_MSG,
+       MSG_ID_PSW_TEST_MODE_TIMERS_USED_MSG,
+       MSG_ID_PSW_UNIT_TEST_REVERSE_SIG_MSG,
+       MSG_ID_PSW_SET_IRAT_PARAM_MSG,
+
+       MSG_ID_PSW_ENGINE_TEST_MODE_MSG,
+#if defined (__TC10__) && defined (__TC10_IPC_CDMA_SUPPORT__)
+       MSG_ID_PSW_ENGINE_TEST_MODE_GET_REQ_MSG,
+       MSG_ID_PSW_GET_SERVICE_CONFIG_REQ_MSG,
+       MSG_ID_PSW_SET_SERVICE_CONFIG_REQ_MSG,
+#endif
+       MSG_ID_PSW_STATUS_REQUEST_MSG,
+       MSG_ID_PSW_PHONE_STATE_MSG,
+       MSG_ID_PSW_INIT_NAM_NOT_PROVISIONED_MSG,
+       MSG_ID_PSW_INIT_NAM_ALREADY_PROVISIONED_MSG,
+
+       MSG_ID_PSW_INIT_MS_CAP_DB_MSG,
+       MSG_ID_PSW_HSPD_ACTIVE_CONTROL_HOLD_MSG,
+       MSG_ID_PSW_RSCH_REQUEST_MSG,
+       MSG_ID_PSW_GET_P_REV_IN_USE_MSG,
+       MSG_ID_PSW_CLEAR_MRU_MSG,
+       MSG_ID_PSW_GET_ACTIVE_NAM_MSG,
+       MSG_ID_PSW_SELECT_ACTIVE_NAM_MSG,
+       MSG_ID_PSW_FORCE_ANALOG_MODE_MSG,
+       MSG_ID_PSW_ENTER_AKEY_MSG,
+       MSG_ID_PSW_SET_ACCESS_HO_PARAMETERS_MSG,
+       MSG_ID_PSW_DEBUG_SCREEN_INFO_REQUEST,
+       MSG_ID_PSW_DEBUG_PILOT_STRENGTH_INFO_REQUEST,
+       MSG_ID_PSW_DEBUG_SCRN_LMD_RSP_MSG,
+       MSG_ID_PSW_DEBUG_SCRN_L1D_RSP_MSG,
+       MSG_ID_PSW_GET_GPS_DEBUG_INFO_MSG,
+       MSG_ID_PSW_SET_MOBILE_ID_MSG,
+       MSG_ID_PSW_GET_MOBILE_ID_MSG,
+       MSG_ID_PSW_CL1TST_SET_MOBILE_ID_MSG,
+       MSG_ID_PSW_CL1TST_GET_MOBILE_ID_MSG,
+
+       MSG_ID_PSW_OTTS_TIMER_SIMULATION,
+       MSG_ID_PSW_HLW_MIP_KEYS_UPDATE_MSG,
+       MSG_ID_PSW_READ_RAW_IMSI_MSG,
+       MSG_ID_PSW_WRITE_RAW_IMSI_MSG,
+       MSG_ID_PSW_SLOTTED_VETO_MSG,
+       MSG_ID_PSW_SET_MIP_PASSWORD_MSG,
+       MSG_ID_PSW_GET_MIP_KEYS_MSG,
+       MSG_ID_PSW_SET_SIP_PASSWORD_MSG,
+       MSG_ID_PSW_GET_SIP_PASSWORD_MSG,
+       MSG_ID_PSW_SET_SPC_MSG,
+       MSG_ID_PSW_GET_SPC_MSG,
+       MSG_ID_PSW_GET_SSD_MSG,
+       MSG_ID_PSW_INIT_SECURE_DB_MSG,
+       MSG_ID_PSW_GET_CP_BC_TO_CDMA_BC_MSG,
+       MSG_ID_PSW_BAND_SUPPORTED_QUERY_RSP_MSG,
+       MSG_ID_PSW_SET_FLY_MODE_ENABLE_MSG,
+       MSG_ID_PSW_ENABLE_PRL_MSG,
+       MSG_ID_PSW_SET_PARM_MSG,
+       MSG_ID_PSW_GET_PARM_MSG,
+       MSG_ID_PSW_WRITE_RAW_MDN_MSG,
+       MSG_ID_PSW_TA_TIMER_EXPIRED_MSG,
+       MSG_ID_PSW_DATA_CALL_ANSWER_MSG,
+       MSG_ID_PSW_UICC_FACTORY_MODE_MSG,
+       MSG_ID_PSW_VAL_PILOT_PWR_ACK_MSG,
+
+       MSG_ID_PSW_DS_CALL_REL_MSG,
+       MSG_ID_PSW_PS_CALL_REL_MSG,
+       MSG_ID_PSW_LS_CALL_REL_MSG,
+       MSG_ID_PSW_DS_ENABLE_MSG,
+       MSG_ID_PSW_PS_DORMANT_REQ_MSG,
+       MSG_ID_PSW_DATA_PREF_REQ_MSG,
+       MSG_ID_PSW_VS_PREF_REQ_MSG,
+       MSG_ID_PSW_LS_PREF_REQ_MSG,
+       MSG_ID_PSW_VS_SWITCH_SO_MSG,
+       MSG_ID_PSW_VS_DS_PREARANG_MSG,
+       MSG_ID_PSW_SET_SERVICE_CONFIG_MSG,
+       MSG_ID_PSW_SET_PKZID_HYSTER_TMR_MSG,
+       MSG_ID_PSW_INIT_PSW_MISC_DB_MSG,
+       MSG_ID_PSW_CUSTOM_LOCK_FEATURE_REG,
+       MSG_ID_PSW_CUSTOM_LOCK_TRIGGER,
+       MSG_ID_PSW_PS_SUSPEND_REQ_MSG,
+       MSG_ID_PSW_PS_RESUME_REQ_MSG,
+
+       /* System Selection Messages */
+       MSG_ID_PSW_CSS_SELECT_RSP_MSG,
+       MSG_ID_PSW_CSS_VALIDATE_RSP_MSG,
+       MSG_ID_PSW_CSS_SYS_ACQ_REQ_MSG,
+       MSG_ID_PSW_CSS_ACQ_ABORT_REQ_MSG,
+       MSG_ID_PSW_CSS_OOSA_SLEEP_REQ_MSG,
+       MSG_ID_PSW_CSS_OOSA_CONT_SLEEP_REQ_MSG,/*used for continuous sleep cmd after OOSA timer expired*/
+       MSG_ID_PSW_CSS_OOSA_WAKEUP_REQ_MSG,
+       MSG_ID_PSW_CSS_CONN_START_CNF_MSG,
+       MSG_ID_PSW_CSS_OTASP_SCAN_FINISHED_MSG,
+       MSG_ID_PSW_CSS_INDICATE_IN_SERVICE_MSG,
+       MSG_ID_PSW_NOTIFY_SRV_STATUS_TO_UPPER_LAYER_MSG,
+       MSG_ID_PSW_CSS_END_E911_CALL_REQ_MSG,
+
+       MSG_ID_PSW_CSS_VAL_SYNC_RSP_MSG,
+       MSG_ID_PSW_SET_LOST_SCAN_PING_FREQUENCY_MSG,
+       MSG_ID_PSW_IRAT_MCC_REQ,
+       MSG_ID_PSW_IRAT_CUR_SYS_MEAS_REQ,
+       MSG_ID_PSW_IRAT_RAT_SIG_MON_REQ,
+       MSG_ID_PSW_IRAT_1X_REG_REQ,
+
+       /* OTASP IS683 */
+       MSG_ID_PSW_OTASP_RCVD_MSG,
+       MSG_ID_PSW_OTASP_REL_MSG,
+       MSG_ID_PSW_OTASP_TX_REQ_MSG,
+       MSG_ID_PSW_OTASP_SO_PREF_MSG,
+       MSG_ID_PSW_EXP_MOD_MS_RESULT_MSG,
+       MSG_ID_PSW_EXP_MOD_BS_RESULT_MSG,
+       MSG_ID_PSW_FILL_SSPR_RSP_MSG,
+       MSG_ID_PSW_IOTA_IS683_MSG,
+       MSG_ID_PSW_IOTA_PRL_MSG,
+       MSG_ID_PSW_OTA_SPL_UNLOCK_FAIL_MSG,
+       MSG_ID_PSW_OTA_SET_POWER_UP_MODE_MSG,
+       MSG_ID_PSW_VERIFY_SPC_MSG,
+
+       /* IS801 Location Services */
+       MSG_ID_PSW_POS_AFLT_PPM_REQ_MSG,
+       MSG_ID_PSW_POS_AFLT_MEASUREMENTS_MSG,
+       MSG_ID_PSW_POS_AFLT_ACK_ABORT_MSG,
+       MSG_ID_PSW_POS_AFLT_ABORT_REQ_MSG,
+       MSG_ID_PSW_IS801_TCPB_REV_DATA_RESP_INFO_MSG,
+       MSG_ID_PSW_IS801_TCPB_FWD_DATA_RESP_INFO_MSG,
+       MSG_ID_PSW_IS801_SESSION_START_MSG ,
+       MSG_ID_PSW_IS801_TCP_CONN_STATUS_MSG,
+       MSG_ID_PSW_IS801_RESET_ASSIST_MSG,
+       MSG_ID_PSW_LOC_START_MODE_SET_MSG,
+       MSG_ID_PSW_LOC_FIX_MODE_GET_MSG,
+
+       MSG_ID_PSW_IS801_MS_CANCEL_REQ_MSG,
+       MSG_ID_PSW_POS_REJECT_MSG,
+       MSG_ID_PSW_IS801_EPH_ALM_TIME_MSG,
+       MSG_ID_PSW_IS801_MSS_DONE_MSG,
+       MSG_ID_PSW_IS801_AFLT_INFO_GET_MSG,
+       MSG_ID_PSW_LOC_PREF_REQ_MSG,
+       MSG_ID_PSW_PDE_SESSION_ABORT_REQ_MSG,
+       MSG_ID_PSW_PDE_PSEUDORANGE_MSMT_RSP_MSG,
+       MSG_ID_PSW_PDE_SESSION_END_RSP_MSG,
+       MSG_ID_PSW_PDE_GPS_INOP_MSG,
+       MSG_ID_PSW_GPS_ENABLE_REPORTS_MSG,
+       MSG_ID_PSW_TEST_LOC_PDDM_MSG,
+       MSG_ID_PSW_TEST_POWER_CONTROL_MSG,
+       MSG_ID_PSW_L1D_ALTERNATE_PILOTS_MSG,
+       MSG_ID_PSW_LOCATION_SVC_CFG_MSG,
+       MSG_ID_PSW_IS801_RESTART_FIX_MSG,
+       /*MS-Based*/
+       MSG_ID_PSW_ASSIST_REQ_MSG,
+       MSG_ID_PSW_GPS_NMEA_STREAM_MSG,
+       MSG_ID_PSW_IS801_NMEA_SETTING_MSG,
+       MSG_ID_PSW_IS801_MPC_CONN_MSG,
+       MSG_ID_PSW_IS801_GET_SECTOR_INFO_MSG,
+       MSG_ID_PSW_LOC_STATE_CHANGE_ETS_TEST_CMD,
+       MSG_ID_PSW_IS801_PPM_TIMER_EXP_MSG,
+       MSG_ID_PSW_IS801_SESS_TIMER_EXP_MSG,
+       MSG_ID_PSW_IS801_PRM_TIMER_EXP_MSG,
+       MSG_ID_PSW_IS801_PREF_RESP_QUAL_TIMER_EXP_MSG,
+       MSG_ID_PSW_IS801_OUT_REQ_TIMER_EXP_MSG,
+       /****MS-Based*********/
+       /*From LEC*/
+       MSG_ID_PSW_LEC_LOC_RSP_MSG,
+       MSG_ID_PSW_GPS_READY_REQ_MSG,
+       MSG_ID_PSW_GPS_READY_MSG,
+       MSG_ID_PSW_GPS_SIXTY_TIMER_MSG,
+       MSG_ID_PSW_GET_TRANSMIT_INFO_MSG,
+       MSG_ID_PSW_SET_TRANSMIT_INFO_MSG,
+       MSG_ID_PSW_SYSTEM_READY_REQ_MSG,
+       MSG_ID_PSW_IS801_CUSTOMER_SETTING_MSG,
+       MSG_ID_PSW_LEC_SESSION_END_RSP_MSG,
+
+       /* AMPS related message ID's */
+       MSG_ID_PSW_AMPS_BB_IND_TX_STAT_MSG,
+       MSG_ID_PSW_AMPS_BB_IND_CHAN_FORMAT_MSG,
+       MSG_ID_PSW_AMPS_BB_IND_SAT_CC_MSG,
+       MSG_ID_PSW_AMPS_BB_IND_FOCC_DATA_MSG,
+       MSG_ID_PSW_AMPS_BB_IND_FVC_DATA_MSG,
+       MSG_ID_PSW_AMPS_RELAY_RADIO_TUNE_STAT_MSG,
+       MSG_ID_PSW_AMPS_RELAY_RADIO_FSU_LOCK_MSG,
+       MSG_ID_PSW_AMPS_RELAY_RADIO_RSSI_VAL_MSG,
+       MSG_ID_PSW_AMPS_RELAY_RADIO_CARRIER_STAT_MSG,
+       MSG_ID_PSW_AMPS_RELAY_RADIO_POWER_LVL_MSG,
+       MSG_ID_PSW_AMPS_RELAY_RADIO_AFC_COMPLETE_MSG,
+       MSG_ID_PSW_AMPS_CP_RQ_ENABLE_MSG,
+       MSG_ID_PSW_AMPS_CP_RQ_POWER_DOWN_MSG,
+       MSG_ID_PSW_AMPS_CP_RQ_CALL_INITIATE_MSG,
+       MSG_ID_PSW_AMPS_CP_RQ_CALL_ANSWER_MSG,
+       MSG_ID_PSW_AMPS_CP_RQ_CALL_HANGUP_MSG,
+       MSG_ID_PSW_AMPS_AUDIO_VOICE_MSG,
+       MSG_ID_PSW_AMPS_READ_DATA_ACK_MSG,
+       MSG_ID_PSW_AMPS_POWER_MSG,
+       MSG_ID_PSW_AMPS_WBIOS_INIT_COMPLETE_MSG,
+       MSG_ID_PSW_AMPS_SET_RSSI_TH_MSG,
+       MSG_ID_PSW_AMPS_WORD_SYNC_RSP_MSG,
+
+       MSG_ID_PSW_GPS_FRAME_SYNC_DONE_MSG,
+       MSG_ID_PSE_LEC_CDMA_SYSTEM_REQ_MSG,
+       MSG_ID_PSW_USERMODE_MSG,
+       MSG_ID_PSW_TESTMODE_MSG,
+       MSG_ID_PSW_LTE_MSG,
+       MSG_ID_PSW_NST_POWERUP_MSG,
+       MSG_ID_PSW_NST_TCH_FER_CFG_MSG,
+       MSG_ID_PSW_NST_TX_PWR_MEAS_CFG_MSG,
+       MSG_ID_PSW_NST_RX_PWR_MEAS_CFG_MSG,
+       MSG_ID_PSW_NST_TRANSMIT_TCH_MSG,
+       MSG_ID_PSW_NST_EXIT_TEST_MODE_MSG,
+       MSG_ID_PSW_NST_LIST_SET_MSG,
+
+       MSG_ID_PSW_NST_RX_PWR_REQ_MSG,
+       MSG_ID_L1D_NST_RX_PWR_CNF_MSG,
+       MSG_ID_PSW_NST_TX_PWR_LEVEL_SET_MSG,
+
+       MSG_ID_PSW_SET_EMERGENCY_CARD_INIT_MSG,
+       MSG_ID_PSW_MANUAL_AVOID_NETWORK_MSG,
+       MSG_ID_PSW_CSFB_CDMA2000PARM_MSG,
+       MSG_ID_PSW_CSFB_SIB8_PARM_MSG,
+       MSG_ID_PSW_CSFB_GCSNA_DL_MSG,
+       MSG_ID_PSW_CSFB_MEAS_REQ_MSG,
+       MSG_ID_PSW_CSFB_REDIRECT_MSG,
+       MSG_ID_PSW_CSFB_HO_EUTRA_PREP_MSG,
+       MSG_ID_PSW_CSFB_MOBFROM_EUTRA_MSG,
+       MSG_ID_PSW_CSFB_SERVICE_REJECT_MSG,
+       MSG_ID_PSW_ANTENNA_CFG_MSG,
+       MSG_ID_PSW_CSFB_GET_STATUS_MSG,
+
+       MSG_ID_PSW_HLP_DORMANT_CNF_MSG,
+       MSG_ID_PSW_HLP_DRS_UPDATE_IND_MSG,
+
+       MSG_ID_PSW_CSS_RSVAS_SUSPEND_CNF_MSG,
+       MSG_ID_PSW_CSS_RSVAS_DO_VRTL_SUSP_CNF_MSG,
+       MSG_ID_PSW_RSVAS_VIRTUAL_SUSPEND_REQ_MSG,
+       MSG_ID_PSW_RSVAS_RESUME_REQ_MSG,
+       MSG_ID_PSW_RSVAS_OCCUPY_IND_MSG,
+
+       MSG_ID_RSVAS_CAS_SUSPEND_SERVICE_REQ,
+       MSG_ID_RSVAS_CAS_RESUME_SERVICE_REQ,
+       MSG_ID_RSVAS_CAS_ABORT_SERVICE_REQ,
+       MSG_ID_RSVAS_CAS_ABORT_SERVICE_COMPLETE_IND,
+       MSG_ID_RSVAS_CAS_VIRTUAL_SUSPEND_SERVICE_REQ,
+       MSG_ID_RSVAS_CAS_VIRTUAL_SUSPEND_SERVICE_COMPLETE_IND,
+       MSG_ID_RSVAS_CAS_VIRTUAL_RESUME_SERVICE_REQ,
+       MSG_ID_C2K_LTE_CSFB_CNF,
+       MSG_ID_C2K_LTE_CSFB_STOP_CNF,
+
+       MSG_ID_PSW_IDP_RSVAS_SERVICE_OCCUPY_REQ_MSG,
+       MSG_ID_PSW_IDP_RSVAS_SERVICE_RELEASE_REQ_MSG,
+       MSG_ID_PSW_C2K_RSVAS_OCCUPY_IND_MSG,
+       MSG_ID_PSW_C2K_SIM_INDEX_MSG,
+
+       MSG_ID_PSW_SEND_SMS_CONFIRM_MSG,
+       MSG_ID_PSW_SEND_SBP_CONFIG_MSG,
+       MSG_ID_PSW_SMS_WAIT_L3ACK_TIMER_EXPIRED_MSG,
+       MSG_ID_PSW_SMS_WAIT_RSP_TIMER_EXPIRED_MSG,
+       MSG_ID_PSW_STARTUP_SIGNAL,
+       MSG_ID_PSW_STARTUP_SIGNAL2,
+       MSG_ID_PSW_UIM_RSP_TIMEOUT_MSG,
+       MSG_ID_PSW_UIM_OTA_RSP_TIMEOUT_MSG,
+       /* PSW UT */
+       MSG_ID_RSVAS_CAS_OCCUPY_SERVICE_REQ,
+       MSG_ID_RSVAS_CAS_RELEASE_SERVICE_REQ,
+       MSG_ID_RSVAS_CAS_TRANSFER_SERVICE_REQ,
+
+       /* SLT msg */
+       MSG_ID_PSW_L1D_SLT_TX_VERIFY_IND_MSG,
+       MSG_ID_PSW_1X_SLT_VERIFY_RESULT_MSG,
+       MSG_ID_PSW_DO_SLT_VERIFY_RESULT_MSG,
+
+#if !defined(__GEMINI__)
+       /* Fix build error when GMINI disabled, as in L1S load */
+       MSG_ID_RSVAS_CAS_ABORT_SERVICE_CNF,
+       MSG_ID_RSVAS_CAS_SUSPEND_SERVICE_CNF,
+       MSG_ID_RSVAS_CAS_VIRTUAL_SUSPEND_SERVICE_CNF,
+       MSG_ID_RSVAS_CAS_RESUME_SERVICE_CNF,
+       MSG_ID_RSVAS_CAS_VIRTUAL_RESUME_SERVICE_CNF,
+       MSG_ID_RSVAS_CAS_PROTECT_CS_SERVICE_REQ,
+       MSG_ID_CSS_RSVAC_FREQUENCY_SCAN_START_REQ,
+       MSG_ID_CSS_RSVAC_FREQUENCY_SCAN_MODIFY_REQ,
+       MSG_ID_CSS_RSVAC_FREQUENCY_SCAN_STOP_REQ,
+#endif
+
+	   /* OTA UT */
+	   MSG_ID_PSW_OTASPPA_CONN_IND_MSG,
+	   MSG_ID_PSW_OTASPPA_ORIG_IND_MSG,
+	   MSG_ID_PSW_OTASPPA_DISCONN_IND_MSG,
+	   MSG_ID_PSW_OTASPPA_MSG_CONFIRM_IND_MSG,
+	   MSG_ID_PSW_OTASPPA_RECV_MSG_IND_MSG,
+	   MSG_ID_PSW_OTASPPA_SEND_MSG_REQ_MSG,
+
+       /* new message id in 93*/
+       MSG_ID_PSW_L1D_INIT_CNF_MSG,
+       MSG_ID_PSW_STOP_PSC_DORMANT_TIMER_MSG,
+       MSG_ID_PSW_FORCE_TO_ENTER_DORMANT_MSG,
+       MSG_ID_PSW_HLP_RSVAS_ABORT_CNF_MSG,
+       MSG_ID_PSW_VAL_SET_DDTM_MSG,
+
+#ifdef MTK_PLT_ON_PC_UT
+	   MSG_ID_PSW_SCC_IND_MSG,
+	   MSG_ID_PSW_SCC_REQ_MSG,
+	   MSG_ID_SCC_UT_DUMMY_REQ,
+	   MSG_ID_SCC_UT_DUMMY_CNF,
+#endif
+       MSG_ID_PSW_VAL_FLIGHT_MODE_MSG,
+       MSG_ID_PSW_CSS_FORCE_POWER_DOWN_MSG,
+       MSG_ID_PSW_CSS_DEAC_IND,
+       MSG_ID_PSW_TST_INJECT_STRING,
+	   MSG_ID_PSW_SET_GPS_FLOW_MSG,
+       MSG_ID_PSW_PKZ_HYSTS_ACTIVE_IND,
+       MSG_ID_PSW_RESET_HHO_START_MSG,
+       MSG_ID_PSW_VAL_REPORT_MODE_LWG_MSG,
+       MSG_ID_PSW_LOCAL_RELEASE_MSG,
+#ifdef MTK_PLT_ON_PC
+       MSG_ID_PSW_EFUSE_MODE_FEATURE_MSG,
+#endif
+       MSG_ID_CSS_CPSW_ROAMING_IND,
+       MSG_ID_PSW_NUM_MSG_IDS,
+
+MODULE_MSG_END( MSG_ID_CPSW_CODE_TAIL )
+
+
+#endif
diff --git a/mcu/interface/sap/md/psws_msgid.h b/mcu/interface/sap/md/psws_msgid.h
new file mode 100644
index 0000000..4d00b72
--- /dev/null
+++ b/mcu/interface/sap/md/psws_msgid.h
@@ -0,0 +1,93 @@
+/*************************************************************
+******************************************************************************
+*  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) 2016
+*
+*  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:
+* ---------
+* psws_msgid.h 
+*
+* Project:
+* --------
+* C2K
+*
+* Description: 
+* ------------
+* This module defines the PSW_S ILM messgae IDs for the 1xRTT Protocol Stack
+*
+* 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 _PSWS_MSG_ID_H
+#define _PSWS_MSG_ID_H
+
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+/*----------------------------------------------------------------------------
+ Global Defines and Macros
+----------------------------------------------------------------------------*/
+
+
+MODULE_MSG_BEGIN( MSG_ID_CPSWS_CODE_BEGIN )
+
+    MSG_ID_PSW_S_MOD_EXP_MSREQ_MSG = MSG_ID_CPSWS_CODE_BEGIN,
+    MSG_ID_PSW_S_MOD_EXP_KREQ_MSG,
+    MSG_ID_DO_DHKEP_CAL_REQ_MSG,
+    MSG_ID_PSW_S_HLP_DMU_KEYGEN_REQ_MSG,
+    MSG_ID_PSW_S_HLP_DMU_KEYENC_REQ_MSG,
+    MSG_ID_PSW_S_DBM_DATA_NAM_MSG,
+    MSG_ID_PSW_S_NUM_MSG_IDS,
+    
+MODULE_MSG_END( MSG_ID_CPSWS_CODE_TAIL )
+
+
+#endif
+
diff --git a/mcu/interface/sap/md/ratcm_msgid.h b/mcu/interface/sap/md/ratcm_msgid.h
new file mode 100644
index 0000000..f8f1a3b
--- /dev/null
+++ b/mcu/interface/sap/md/ratcm_msgid.h
@@ -0,0 +1,327 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   ratcm_sap.h
+ *
+ * Project:
+ * --------
+ *   MONZA
+ *
+ * Description:
+ * ------------
+ *
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ ******************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _RATCM_MSG_H
+#define _RATCM_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_RATCM_CODE_BEGIN )
+//UDC
+MSG_ID_RATCM_RRCE_CONN_EST_CNF = MSG_ID_RATCM_CODE_BEGIN,
+MSG_ID_RATCM_RRCE_CONN_REL_CNF,
+MSG_ID_RATCM_RRCE_CONN_REL_IND,
+MSG_ID_RATCM_RRCE_RELEASE_PROCESSED_IND, /* For the case where no CN DOmain existing and RRC Connection still existing*/
+MSG_ID_RATCM_RRCE_DATA_TRANSFER_IND,
+MSG_ID_RATCM_RRCE_DATA_TRANSFER_CNF,
+MSG_ID_RATCM_RRCE_SECURITY_MODE_COMPLETE_IND,
+MSG_ID_RATCM_RRCE_SECURITY_MODE_CHANGE_IND,
+MSG_ID_RATCM_RRCE_CONN_LOSS_IND,
+MSG_ID_RATCM_RRCE_RESET_KEYS_IND,
+MSG_ID_RATCM_RRCE_RB_RE_ESTABLISHMENT_IND,
+MSG_ID_RATCM_RRCE_END_PS_DATA_SESSION_CNF,  /* MAUI_02852442, __NO_PSDATA_SEND_SCRI__ */
+//UNT
+MSG_ID_RATCM_RRCE_PAGE_IND,
+MSG_ID_RATCM_RRCE_LOCAL_RELEASE_IND, /* solve local release status asynchronization between UE and NW */
+MSG_ID_RATCM_RRCE_RRC_STATE_IND,
+//UGC
+MSG_ID_RATCM_UAS_SYS_INFO_IND,
+MSG_ID_RATCM_UAS_CELL_GLOBAL_IDENTITY_INFO_IND,
+MSG_ID_RATCM_UAS_UPDATE_CAPABILITY_IND,
+MSG_ID_RATCM_UAS_PLMN_BAND_IND,
+MSG_ID_RATCM_CSCE_INIT_CNF,
+MSG_ID_RATCM_CSCE_PLMN_SEARCH_CNF,
+MSG_ID_RATCM_CSCE_PLMN_LOSS_IND,
+MSG_ID_RATCM_CSE_PLMN_LIST_CNF,
+MSG_ID_RATCM_CSE_PLMN_LIST_UPDATE_IND,
+MSG_ID_RATCM_CSE_PLMN_LIST_STOP_CNF, 
+MSG_ID_RATCM_CSE_CSG_LIST_CNF,
+MSG_ID_RATCM_CSE_CSG_LIST_STOP_CNF,
+MSG_ID_RATCM_CSCE_RRC_DEACTIVATE_CNF,
+MSG_ID_RAC_UAS_CELL_POWER_LEVEL_IND,
+MSG_ID_RATCM_RRCE_CELL_CHANGE_START_IND,
+MSG_ID_RATCM_RRCE_CELL_CHANGE_FINISH_IND,
+MSG_ID_RATCM_CSCE_START_TIMER_OUT_OF_SERVICE_IND,
+MSG_ID_RATCM_CSCE_RFON_CNF,
+MSG_ID_RATCM_CSCE_RFOFF_CNF,
+#if 0
+/* under construction !*/
+#endif
+MSG_ID_RATCM_CSCE_SET_RAT_MODE_CNF,
+MSG_ID_RATCM_CSCE_IDLE_OUT_OF_SERVICE_IND, /* __OOS_EARLY_IND__ */
+MSG_ID_RATCM_CSE_PLMN_FOUND_IND,
+MSG_ID_RATCM_UAS_PLMN_SEARCH_BY_STORED_INFO_NOT_FOUND_IND,
+MSG_ID_RATCM_CSCE_SET_MRU_CNF,
+
+//SLCE
+MSG_ID_RATCM_SLCE_MONITORING_CLOSE_LOOP_CNF,
+MSG_ID_RATCM_SLCE_MONITORING_CLOSE_LOOP_IND,
+MSG_ID_RATCM_SLCE_RAB_ESTABLISHMENT_IND,
+MSG_ID_RATCM_SLCE_RAB_MODIFY_IND,
+MSG_ID_RATCM_SLCE_RAB_RELEASE_IND,
+MSG_ID_RATCM_SLCE_DUPLEX_MODE_CHANGE_CNF,
+
+/* RATCM - LLC */
+MSG_ID_RATCM_LLC_STATUS_IND,
+MSG_ID_RATCM_LLC_UNITDATA_IND,
+MSG_ID_RATCM_LLC_AS_NAS_DATA_CNF,
+
+/* RATCM - URLC */
+MSG_ID_RATCM_URLC_UTEST_OPEN_LOOP_CNF,
+MSG_ID_RATCM_URLC_UTEST_CLOSE_LOOP_M1_CNF,
+MSG_ID_RATCM_URLC_UTEST_CLOSE_LOOP_M2_CNF,
+MSG_ID_RATCM_URLC_UTEST_CLOSE_LOOP_M4_CNF,
+
+/* RATCM - BMC */
+MSG_ID_RATCM_BMC_DATA_IND,
+MSG_ID_RATCM_BMC_CB_GS_CHANGE_IND, //MAUI_01995874
+
+MSG_ID_RATCM_UAS_SIGNAL_APPEAR_IND,
+MSG_ID_RATCM_UAS_CHECK_ACTIVE_RAT_CNF,
+MSG_ID_RATCM_UAS_SET_ACTIVE_RAT_CNF,
+
+/* RATCM - GAS */
+MSG_ID_RATCM_GAS_CELL_CHANGE_START_IND,
+MSG_ID_RATCM_GAS_CELL_CHANGE_FINISH_IND,
+MSG_ID_RATCM_GAS_CONN_ABORT_IND,
+MSG_ID_RATCM_GAS_CONN_LOSS_IND,
+MSG_ID_RATCM_GAS_CONN_EST_CNF,
+MSG_ID_RATCM_GAS_CONN_EST_IND,
+MSG_ID_RATCM_GAS_CONN_REL_CNF,
+MSG_ID_RATCM_GAS_CONN_REL_IND,
+MSG_ID_RATCM_GAS_DATA_CNF,
+MSG_ID_RATCM_GAS_DATA_IND,
+MSG_ID_RATCM_GAS_DEACTIVATE_CNF,
+MSG_ID_RATCM_GAS_INIT_CNF,
+MSG_ID_RATCM_GAS_PLMN_LIST_CNF,
+MSG_ID_RATCM_GAS_PLMN_LIST_STOP_CNF,
+MSG_ID_RATCM_GAS_PLMN_LOSS_IND,
+MSG_ID_RATCM_GAS_PAGE_IND,
+MSG_ID_RATCM_GAS_PLMN_SEARCH_CNF,
+MSG_ID_RATCM_GAS_READY_TIMER_UPDATE_IND,
+MSG_ID_RATCM_GAS_RFOFF_CNF,
+MSG_ID_RATCM_GAS_RFON_CNF,
+MSG_ID_RATCM_GAS_SET_RAT_MODE_CNF,
+MSG_ID_RATCM_GAS_STOP_TEST_MODE_IND,
+MSG_ID_RATCM_GAS_SYNC_IND,
+MSG_ID_RATCM_GAS_SYS_INFO_IND,
+MSG_ID_RATCM_GAS_CELL_GLOBAL_IDENTITY_INFO_IND,
+MSG_ID_RATCM_GAS_PS_HO_SUCCESS_IND,
+MSG_ID_RATCM_GAS_CB_PAGE_IND,
+MSG_ID_RATCM_GAS_T3122_TIMEOUT_IND,
+/*Byron: 2007/05/08: Add for notify MM CCO activation time timer timeout that can do access now*/
+MSG_ID_RATCM_GAS_CCO_ACTIVATION_TIME_TIMEOUT_IND,
+MSG_ID_RATCM_GAS_CB_GS_CHANGE_IND,
+#if 0
+/* under construction !*/
+#endif 
+MSG_ID_RATCM_GAS_IDLE_OUT_OF_SERVICE_IND, /* __OOS_EARLY_IND__ */
+MSG_ID_RATCM_GAS_PLMN_SEARCH_BY_STORED_INFO_NOT_FOUND_IND,
+//MSG_ID_RATCM_GAS_DUPLEX_MODE_CHANGE_CNF,
+#ifdef __GEMINI__
+MSG_ID_RATCM_GAS_RSIM_DATA_ABORT_CNF,
+MSG_ID_RATCM_GAS_SUSPEND_IND,
+MSG_ID_RATCM_GAS_RESUME_IND, //MAUI_02877191
+MSG_ID_RATCM_GAS_VIRTUAL_MODE_IND,  /* MAUI_02865693 */
+MSG_ID_MM_RATCM_SIM_STATUS_UPDATE_REQ, 
+MSG_ID_MM_RATCM_RSIM_DATA_ABORT_REQ,
+MSG_ID_MM_RATCM_NO_IR_SIG_PROC_REQ,
+MSG_ID_MM_RATCM_UAS_VIRTUAL_MODE_IND,
+#endif /* __GEMINI__ */
+MSG_ID_RATCM_GAS_PLMN_FOUND_IND,
+MSG_ID_RATCM_GAS_PLMN_BAND_IND,
+
+/*Sniffer related messages*/
+MSG_ID_RATCM_GAS_SIGNAL_APPEAR_IND,
+MSG_ID_RATCM_GAS_CHECK_ACTIVE_RAT_CNF,
+MSG_ID_RATCM_GAS_SET_ACTIVE_RAT_CNF,
+
+/* RATCM - RRLP */
+/* __AGPS_CONTROL_PLANE__ */
+MSG_ID_RATCM_RRLP_LCS_PROC_START_IND,
+MSG_ID_RATCM_RRLP_LCS_PROC_END_IND,
+MSG_ID_RATCM_GAS_AGPS_RESET_POSITIONING_IND,
+/* __AGPS_CONTROL_PLANE__ */
+
+/* RATCM - UAGPS_CP */
+MSG_ID_RATCM_UAGPS_CP_LCS_PROC_START_IND, //__UAGPS_CP_SUPPORT__
+MSG_ID_RATCM_UAGPS_CP_LCS_PROC_END_IND,
+
+/* SMSAL -> RATCM */
+MSG_ID_SMSAL_RATCM_CBCH_REQ,
+MSG_ID_SMSAL_RATCM_CB_UPDATE_REQ,
+
+/* RATDM -> RATCM */
+MSG_ID_RATCM_RATDM_RAT_CHANGE_CNF,
+
+/* NWSEL -> RATCM */
+MSG_ID_NWSEL_RATCM_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_NWSEL_RATCM_RPLMN_EQ_PLMN_LIST_UPDATE_REQ,
+
+/* MM -> RATCM */
+MSG_ID_MM_RATCM_SET_RAT_MODE_REQ,
+MSG_ID_MM_RATCM_INIT_REQ,
+MSG_ID_MM_RATCM_SIM_INFO_RESET_REQ,
+MSG_ID_MM_RATCM_RFOFF_REQ,
+MSG_ID_MM_RATCM_PLMN_SEARCH_REQ,
+MSG_ID_MM_RATCM_HPLMN_INFO_UPDATE_REQ,
+MSG_ID_MM_RATCM_ADD_FORBIDDEN_LA_REQ,
+MSG_ID_MM_RATCM_DEL_FORBIDDEN_LA_REQ,
+MSG_ID_MM_RATCM_PLMN_LIST_REQ,
+MSG_ID_MM_RATCM_PLMN_LIST_STOP_REQ,
+MSG_ID_MM_RATCM_UPDATE_ALLOWED_CSG_LIST_REQ,
+MSG_ID_MM_RATCM_CSG_LIST_REQ,
+MSG_ID_MM_RATCM_CSG_LIST_STOP_REQ,
+MSG_ID_MM_RATCM_TLLI_ASSIGN_REQ,
+MSG_ID_MM_RATCM_PAGING_PARAM_ASSIGN_REQ,
+MSG_ID_MM_RATCM_SECURITY_MODE_REQ,
+MSG_ID_MM_RATCM_CONN_EST_REQ,
+MSG_ID_MM_RATCM_CONN_ABORT_REQ, 
+MSG_ID_MM_RATCM_CONN_REL_REQ,
+MSG_ID_MM_RATCM_REGN_STATUS_UPDATE_REQ,
+#ifdef __UMTS_RAT__
+MSG_ID_MM_RATCM_STOP_TEST_MODE_REQ,
+#endif
+MSG_ID_MM_RATCM_CELL_UPDATED_REQ,
+MSG_ID_MM_RATCM_CB_LOC_UPDATE_REQ, /* MAUI_03101878, [Silver Clam][CV][SilverClam-94]Pre-CV-CMAS: GPRS failed due to timeout */
+MSG_ID_MM_RATCM_READY_TIMER_UPDATE_REQ,
+MSG_ID_MM_RATCM_SERVICE_CHANGE_REQ,
+MSG_ID_MM_RATCM_CS_DATA_REQ,
+MSG_ID_MM_RATCM_PS_DATA_REQ,
+MSG_ID_MM_RATCM_LLC_ASSIGN_REQ,
+MSG_ID_MM_RATCM_LLC_RESUME_REQ,
+MSG_ID_MM_RATCM_LLC_SUSPEND_REQ,
+MSG_ID_MM_RATCM_LLC_TRIGGER_REQ,
+
+
+MSG_ID_MM_RATCM_SET_GPRS_TRANSFER_PREFERENCE_REQ, //__MONITOR_PAGE_DURING_TRANSFER__ 
+MSG_ID_MM_RATCM_SET_PREFERRED_BAND_REQ,   /* MAUI_01972920, __DYNAMIC_BAND_SEL__ */
+MSG_ID_MM_RATCM_END_PS_DATA_SESSION_REQ,  /* MAUI_02852442, __NO_PSDATA_SEND_SCRI__ */
+MSG_ID_MM_RATCM_RESET_CS_DATA_QUEUE_REQ,
+
+//Add for LTE multimode: __LTE_RAT__
+MSG_ID_MM_RATCM_DEACTIVATE_REQ,
+MSG_ID_MM_RATCM_EUTRAN_CAP_UPDATE_REQ,
+MSG_ID_MM_RATCM_RAT_CHANGE_REQ,
+MSG_ID_MM_RATCM_RAT_CHANGE_RSP,
+MSG_ID_MM_RATCM_PAGE_REQ,
+
+#if defined(__LTE_RAT__) && (defined(__GSM_RAT__) || defined(__UMTS_RAT__))  /* dual or multi mode including LTE */
+//#if (defined(__OP01__)) && (!defined(__SGLTE__))
+MSG_ID_MM_RATCM_PLMN_SEARCH_ABORT_REQ,
+//#endif
+#endif
+
+MSG_ID_MM_RATCM_SET_PGCHECK_REQ,
+MSG_ID_MM_RATCM_DUPLEX_MODE_CHANGE_REQ,
+MSG_ID_MM_RATCM_SET_MRU_REQ,
+MSG_ID_MM_RATCM_CLEAR_MRU_REQ,
+MSG_ID_MM_RATCM_EMC_FORBIDDEN_NW_LIST_UPDATE_REQ,
+MSG_ID_MM_RATCM_CSG_AUTO_SEARCH_MODE_REQ,
+MSG_ID_MM_RATCM_PLMN_LIST_STATUS_UPDATE_REQ,
+MSG_ID_MM_RATCM_CACHED_SYS_INFO_REQ,
+MSG_ID_MM_RATCM_ELEVATOR_MODE_REQ,
+
+#if defined(__LTE_RAT__)
+MSG_ID_MM_RATCM_CSFB_PAGE_CONFIG_REQ,
+#endif
+
+
+/* RATCM - GAS */
+MSG_ID_RATCM_GAS_RAT_CHANGE_IND,
+MSG_ID_RATCM_GAS_RAT_CHANGE_CNF,
+MSG_ID_RATCM_GAS_CAP_UPDATE_CNF,
+MSG_ID_RATCM_GAS_SET_MRU_CNF,
+
+/* RATCM - UAS */
+MSG_ID_RATCM_UAS_RAT_CHANGE_IND,
+MSG_ID_RATCM_UAS_RAT_CHANGE_CNF,
+MSG_ID_RATCM_CSCE_CAP_UPDATE_CNF,
+//End of LTE multimode: __LTE_RAT__
+
+/* RATCM - UL2 */
+MSG_ID_RATCM_UL2_DUPLEX_MODE_CHANGE_CNF,
+
+/* RATCM - UL2D */
+MSG_ID_RATCM_UL2D_DUPLEX_MODE_CHANGE_CNF,
+
+MSG_ID_MM_RATCM_START_TEST_MODE_REQ,
+//#ifdef __UMTS_TDD128_MODE__
+MSG_ID_MM_RATCM_FORCE_REL_REQ,   /*For TDD call clearing optimization*/
+MSG_ID_NWSEL_RATCM_PLMN_LOSS_INFO_UPDATE_REQ,
+//#endif
+MSG_ID_MM_RATCM_ARAL_UPDATE_REQ,
+MSG_ID_SMSAL_RATCM_CB_MSG_REMOVAL_REQ,
+MSG_ID_MM_RATCM_RAT_DISABLE_CONFIG_REQ,
+MSG_ID_MM_RATCM_SET_IMEI_SV_REQ,
+MSG_ID_MM_RATCM_RSIM_AUTH_DOWNLOAD_REQ,
+MSG_ID_MM_RATCM_SERVICE_RECOVERY_ROUND_UPDATE_REQ,
+MSG_ID_MM_RATCM_INACTIVE_MODE_CONFIGURATION_REQ,
+MSG_ID_MM_RATCM_SCREEN_ON_REQ,
+MSG_ID_MM_RATCM_SCREEN_OFF_REQ,
+MSG_ID_MM_RATCM_LTE_NORMAL_SERVICE_LOSS_UPDATE_REQ,
+MSG_ID_RATCM_CSCE_END_PS_DATA_SESSION_IND,
+MSG_ID_MM_RATCM_NO_CC_DATA_DETECT_IND,
+MSG_ID_MM_RATCM_DATA_ALLOW_REQ,
+MSG_ID_MM_RATCM_PLMN_LIST_ABORT_REQ,
+MSG_ID_RATCM_GAS_PLMN_SCAN_IND,
+MSG_ID_RATCM_CSE_PLMN_SCAN_IND,
+MSG_ID_MM_RATCM_PLMN_INFO_UPDATE_REQ,
+MSG_ID_RATCM_GAS_CB_DUP_DET_TIMER_STOP_IND,
+MSG_ID_RATCM_BMC_CB_DUP_DET_TIMER_STOP_IND,
+MSG_ID_RATCM_CODE_END = MSG_ID_RATCM_BMC_CB_DUP_DET_TIMER_STOP_IND,
+
+//MSG_ID_RATCM_CODE_END,
+MODULE_MSG_END( MSG_ID_RATCM_CODE_TAIL )
+
+#endif  //_RATCM_MSG_H
diff --git a/mcu/interface/sap/md/ratdm_msgid.h b/mcu/interface/sap/md/ratdm_msgid.h
new file mode 100644
index 0000000..6be7f0e
--- /dev/null
+++ b/mcu/interface/sap/md/ratdm_msgid.h
@@ -0,0 +1,490 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   ratdm_sap.h
+ *
+ * Project:
+ * --------
+ *   MONZA
+ *
+ * Description:
+ * ------------
+ *
+ *
+ * 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!
+ * 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!!
+ *============================================================================
+ ****************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _RATDM_MSG_H
+#define _RATDM_MSG_H
+
+MODULE_MSG_BEGIN(MSG_ID_RATDM_CODE_BEGIN)
+
+/* TCM -> RATDM */
+MSG_ID_TCM_RATDM_DATA_REQ = MSG_ID_RATDM_CODE_BEGIN,
+MSG_ID_TCM_RATDM_CONFIG_REQ,
+MSG_ID_TCM_RATDM_DECONFIG_REQ,
+MSG_ID_TCM_RATDM_ENTER_DATA_MODE_REQ,
+MSG_ID_TCM_RATDM_QUERY_PS_STATISTICS_REQ,
+MSG_ID_TCM_RATDM_RESET_PS_STATISTICS_REQ,
+MSG_ID_TCM_RATDM_DATA_ALLOW_REQ,
+
+/* CMUX -> RATDM */
+MSG_ID_CMUX_RATDM_DATA_ACTIVATE_RSP,
+MSG_ID_CMUX_RATDM_DATA_DEACTIVATE_RSP,
+
+/* PS - RATDM */
+MSG_ID_PS_DATA_REQ,
+MSG_ID_PS_DATA_IND,
+MSG_ID_PS_DSCR_DATA_IND,
+
+/* RATDM SHAQ UT Usage */
+MSG_ID_RATDM_SHAQ_PRINT_CS_Q_ELEMENT,
+MSG_ID_RATDM_SHAQ_PRINT_PS_Q_ELEMENT,
+
+/* RATDM TST Log UL data usage*/
+MSG_ID_RATDM_LOG_SHAQ_UL_ELEMENT,
+
+/* ESM -> RATDM */
+MSG_ID_ESM_RATDM_EPSB_INIT_REQ,
+MSG_ID_ESM_LTM_EPSB_INIT_REQ = MSG_ID_ESM_RATDM_EPSB_INIT_REQ,
+MSG_ID_ESM_RATDM_EPSB_ACT_REQ,
+MSG_ID_ESM_LTM_EPSB_ACT_REQ = MSG_ID_ESM_RATDM_EPSB_ACT_REQ,
+MSG_ID_ESM_RATDM_EPSB_DEACT_REQ,
+MSG_ID_ESM_LTM_EPSB_DEACT_REQ = MSG_ID_ESM_RATDM_EPSB_DEACT_REQ,
+MSG_ID_ESM_RATDM_EPSB_MODIFY_REQ,
+MSG_ID_ESM_LTM_EPSB_MODIFY_REQ = MSG_ID_ESM_RATDM_EPSB_MODIFY_REQ,
+MSG_ID_ESM_RATDM_IDLE_ENTER_REQ,
+MSG_ID_ESM_LTM_IDLE_ENTER_REQ = MSG_ID_ESM_RATDM_IDLE_ENTER_REQ,
+MSG_ID_ESM_RATDM_IDLE_LEAVE_REQ,
+MSG_ID_ESM_LTM_IDLE_LEAVE_REQ = MSG_ID_ESM_RATDM_IDLE_LEAVE_REQ,
+MSG_ID_ESM_RATDM_IDLE_LEAVE_REJ,
+MSG_ID_ESM_LTM_IDLE_LEAVE_REJ = MSG_ID_ESM_RATDM_IDLE_LEAVE_REJ,
+MSG_ID_ESM_RATDM_UL_SUSPEND_REQ,
+MSG_ID_ESM_LTM_UL_SUSPEND_REQ = MSG_ID_ESM_RATDM_UL_SUSPEND_REQ,
+MSG_ID_ESM_RATDM_UL_RESUME_REQ,
+MSG_ID_ESM_LTM_UL_RESUME_REQ = MSG_ID_ESM_RATDM_UL_RESUME_REQ,
+MSG_ID_ESM_RATDM_GEMINI_SUSPEND_REQ,
+MSG_ID_ESM_LTM_GEMINI_SUSPEND_REQ = MSG_ID_ESM_RATDM_GEMINI_SUSPEND_REQ,
+MSG_ID_ESM_RATDM_GEMINI_RESUME_REQ,
+MSG_ID_ESM_LTM_GEMINI_RESUME_REQ = MSG_ID_ESM_RATDM_GEMINI_RESUME_REQ,
+MSG_ID_ESM_RATDM_QUERY_UL_DATA_STATUS_REQ,
+MSG_ID_ESM_LTM_QUERY_UL_DATA_STATUS_REQ = MSG_ID_ESM_RATDM_QUERY_UL_DATA_STATUS_REQ,
+MSG_ID_ESM_RATDM_AC_BAR_ALLEVIATE_REQ,
+MSG_ID_ESM_LTM_AC_BAR_ALLEVIATE_REQ = MSG_ID_ESM_RATDM_AC_BAR_ALLEVIATE_REQ,
+MSG_ID_ESM_RATDM_5G4_CONTEXT_TRANSFER_REQ,
+
+/* SM -> RATDM */
+MSG_ID_SM_RATDM_RAB_ACTIVATE_RSP,
+MSG_ID_SM_RATDM_ACTIVATE_REQ,
+MSG_ID_SM_RATDM_DEACTIVATE_REQ,
+MSG_ID_SM_RATDM_MODIFY_REQ,
+MSG_ID_SM_RATDM_ALLOW_DL_PACKET_IND, // LTE multimode
+//MSG_ID_SM_RATDM_UPDATE_MAX_TRAFFIC_CLASS_REQ, // LTE multimode 4G23 IR_TYPE_SEARCH interRAT
+
+/* VGSM -> RATDM */
+MSG_ID_VGSM_RATDM_PDUS_INIT_REQ,
+MSG_ID_VGSM_RATDM_PDUS_FLOW_EST_REQ,
+MSG_ID_VGSM_RATDM_PDUS_FLOW_MOD_REQ,
+MSG_ID_VGSM_RATDM_PDUS_FLOW_REL_REQ,
+MSG_ID_VGSM_RATDM_4G5_CONTEXT_TRANSFER_REQ,
+
+/* SMIC -> RATDM */
+MSG_ID_SMIC_RATDM_N26_CAPABILITY_UPDATE_REQ,
+
+/* MM -> RATDM */
+MSG_ID_MM_RATDM_REESTABLISH_RAB_RSP,
+MSG_ID_MM_RATDM_SEQUENCE_REQ,
+MSG_ID_MM_RATDM_SEND_USER_DATA_RSP,
+MSG_ID_MM_RATDM_REESTABLISH_RAB_READY_IND,
+MSG_ID_MM_RATDM_SERVICE_PROC_IND,
+
+/* VGMM -> RATDM */
+MSG_ID_VGMM_RATDM_REESTABLISH_CONN_RSP,
+MSG_ID_VGMM_RATDM_QUERY_UL_DATA_STATUS_REQ,
+MSG_ID_VGMM_RATDM_UL_SUSPEND_REQ,
+MSG_ID_VGMM_RATDM_UL_RESUME_REQ,
+MSG_ID_VGMM_RATDM_GEMINI_SUSPEND_REQ,
+MSG_ID_VGMM_RATDM_GEMINI_RESUME_REQ,
+
+/* VGMM <- RATDM */
+//move to vgmm_msgid.h
+
+
+/* NWSEL-> RATDM */
+MSG_ID_NWSEL_RATDM_RAT_CHANGE_REQ,
+MSG_ID_NWSEL_RATDM_DUPLEX_MODE_CHANGE_REQ,
+
+/* RATCM -> RATDM */
+MSG_ID_RATCM_RATDM_REGAIN_COVERAGE_REQ,
+
+/* RABM -> RATDM */
+MSG_ID_RATDM_RABM_ACTIVATE_CNF,
+MSG_ID_RATDM_RABM_ACTIVATE_IND,
+MSG_ID_RATDM_RABM_DEACTIVATE_CNF,
+MSG_ID_RATDM_RABM_DEACTIVATE_IND,
+MSG_ID_RATDM_RABM_MODIFY_CNF,
+MSG_ID_RATDM_RABM_REESTABLISH_IND,
+MSG_ID_RATDM_RABM_DATA_CNF,
+MSG_ID_RATDM_RABM_DATA_IND,
+MSG_ID_RATDM_RABM_SUSPEND_DATA_PLANE_IND,
+MSG_ID_RATDM_RABM_RESUME_DATA_PLANE_IND,
+MSG_ID_RATDM_RABM_PDCP_RELOC_IND,
+MSG_ID_RATDM_RABM_RETRANSMIT_IND,
+MSG_ID_RATDM_RABM_RB_CONFIG_IND,
+MSG_ID_RATDM_RABM_RAB_RELEASE_IND,
+MSG_ID_RATDM_RABM_RAB_CAPABILITY_IND,
+//MSG_ID_RATDM_RABM_CONFIG_CNF,
+//MSG_ID_RATDM_RABM_QUERY_STATISTICS_RSP,
+//MSG_ID_RATDM_RABM_RESET_STATISTICS_RSP,
+//MSG_ID_RATDM_RABM_STATISTICS_IND,
+//MSG_ID_RATDM_RABM_SET_STATISTICS_CNF,
+MSG_ID_RATDM_PDCP_RESET_STATISTICS_RSP,
+MSG_ID_RATDM_RABM_RAT_READY_IND,
+
+/* URLC -> RATDM */
+MSG_ID_RATDM_URLC_DEACTIVATE_PS_RAB_CNF,
+
+/* SNDCP - RATDM */
+MSG_ID_RATDM_SNDCP_DATA_IND,
+MSG_ID_RATDM_SNDCP_DATA_CNF,
+MSG_ID_RATDM_SNDCP_ACTIVATE_CNF,
+MSG_ID_RATDM_SNDCP_MODIFY_CNF,
+MSG_ID_RATDM_SNDCP_DEACTIVATE_CNF,
+MSG_ID_RATDM_SNDCP_STATUS_IND,
+MSG_ID_RATDM_SNDCP_SUSPEND_DATA_PLANE_IND,
+MSG_ID_RATDM_SNDCP_RESUME_DATA_PLANE_IND,
+MSG_ID_RATDM_SNDCP_FLUSH_IND,
+MSG_ID_RATDM_SNDCP_TRANSMIT_IND,
+MSG_ID_RATDM_SNDCP_SEQUENCE_CNF,
+MSG_ID_RATDM_SNDCP_RESET_NPDU_SEQ_IND,
+MSG_ID_RATDM_SNDCP_RAT_READY_IND,
+
+/* EPDCP -> RATDM */
+MSG_ID_RATDM_EPDCP_UL_DATA_REDIR_IND,
+MSG_ID_RATDM_EPDCP_DATA_IND,
+MSG_ID_RATDM_EPDCP_TESTLOOP_IND,
+
+/* RATDM -> EPDCP */
+MSG_ID_RATDM_EPDCP_DATA_REQ,
+MSG_ID_RATDM_EPDCP_DL_PATH_SWITCH_REQ,
+MSG_ID_RATDM_EPDCP_BIND_NTF,
+MSG_ID_RATDM_EPDCP_UNBIND_NTF,
+MSG_ID_RATDM_EPDCP_TESTLOOP_RSP,
+MSG_ID_RATDM_EPDCP_BEARER_ACT_NTF,
+MSG_ID_RATDM_EPDCP_BEARER_DEACT_NTF,
+
+/* ENPDCP -> RATDM */
+MSG_ID_RATDM_ENPDCP_UL_DATA_REDIR_IND,
+MSG_ID_RATDM_ENPDCP_DATA_IND,
+MSG_ID_RATDM_ENPDCP_TESTLOOP_IND,
+MSG_ID_RATDM_ENPDCP_PDU_SESSION_RB_STATUS_IND,
+MSG_ID_RATDM_ENPDCP_AGGREGATED_LOG_IND,
+MSG_ID_RATDM_ENPDCP_VCONN_LEAVE_TO_CONN_IND,
+MSG_ID_RATDM_ENPDCP_IDLE_LEAVE_IND,
+MSG_ID_RATDM_ENPDCP_DATA_IND_RESUME_REQ,
+
+/* RATDM -> ENPDCP */
+MSG_ID_RATDM_SDAP_DATA_REQ,
+MSG_ID_RATDM_ENPDCP_DATA_REQ = MSG_ID_RATDM_SDAP_DATA_REQ,
+MSG_ID_RATDM_ENPDCP_DL_PATH_SWITCH_REQ,
+MSG_ID_RATDM_ENPDCP_TESTLOOP_RSP,
+MSG_ID_RATDM_ENPDCP_5QI_UPDATE_REQ,
+MSG_ID_RATDM_ENPDCP_VCONN_LEAVE_TO_CONN_RSP,
+MSG_ID_RATDM_ENPDCP_SIT_FULL_REQ,
+MSG_ID_RATDM_ENPDCP_DATA_DISC_REQ,
+
+/* RATDM -> RATDM */
+MSG_ID_RATDM_RATDM_VA_SHORTAGE_IND,
+MSG_ID_RATDM_AS_BEARER_DEACT_IND,
+
+/* LTE */
+MSG_ID_RATDM_UT_MULTIMODE_UG_DATA_IND_CB,
+MSG_ID_RATDM_UT_MULTIMODE_LTE_DATA_IND_CB,
+MSG_ID_RATDM_UT_MULTIMODE_LTE_MTCH_DATA_IND_CB,
+MSG_ID_RATDM_UT_MULTIMODE_HOOK_UL_DEST_CB,
+MSG_ID_RATDM_UT_MULTIMODE_UG_READY_IND_CB,
+MSG_ID_RATDM_UT_MULTIMODE_FORWARD_FROM_UG_DATA_CB,
+MSG_ID_RATDM_UT_MULTIMODE_FORWARD_FROM_LTE_DATA_CB,
+
+/* RATDM -> RATDM */
+MSG_ID_RATDM_PS_DSCR_DATA_93_IND,
+/* FLC(RATDM) -> RATDM */
+MSG_ID_RATDM_FLC_NPDU_DL_CB,
+
+/* L4C -> RATDM */
+MSG_ID_L4C_RATDM_IMS_CALL_STATUS,
+
+/* CVAL -> RATDM */
+MSG_ID_CVAL_RATDM_ACTIVATE_REQ,
+MSG_ID_CVAL_RATDM_DEACTIVATE_REQ,
+MSG_ID_CVAL_RATDM_SET_RAT_MODE_REQ,
+
+/* CHLP -> RATDM */
+MSG_ID_RATDM_CHLP_DL_DATA_IND,
+MSG_ID_RATDM_CHLP_DATA_STATUS_IND,
+
+/* UT, UPCM -> RATDM */
+MSG_ID_RATDM_UT_UPCM_UL_DATA_REQ,
+MSG_ID_RATDM_UT_C2K_FLC2_REV_BUF_STATUS_IND,
+
+/* RATDM -> RATDM */
+MSG_ID_RATDM_PROCESS_TX_QUEUE_IND,
+
+/* RATCM -> RATDM */
+MSG_ID_RATCM_RATDM_VIRTUAL_MODE_IND,
+MSG_ID_RATDM_CODE_END = MSG_ID_RATCM_RATDM_VIRTUAL_MODE_IND,
+MODULE_MSG_END(MSG_ID_RATDM_CODE_TAIL)
+
+#endif //_RATDM_MSG_H
diff --git a/mcu/interface/sap/md/rlp_msgid.h b/mcu/interface/sap/md/rlp_msgid.h
new file mode 100644
index 0000000..60c338b
--- /dev/null
+++ b/mcu/interface/sap/md/rlp_msgid.h
@@ -0,0 +1,117 @@
+/*****************************************************************************
+*  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) 2015
+*
+*  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:
+* ---------
+* rlp_msgid.h 
+*
+* Project:
+* --------
+* C2K
+*
+* Description: 
+* ------------
+* This module defines the RLP ILM messgae IDs for the 1xRTT Protocol Stack
+*
+* 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 _RLP_MSG_ID_H
+#define _RLP_MSG_ID_H
+
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+
+MODULE_MSG_BEGIN( MSG_ID_CXRLP_CODE_BEGIN )
+
+    MSG_ID_RLP_PSW_INIT_CFG_MSG = MSG_ID_CXRLP_CODE_BEGIN,
+    MSG_ID_RLP_PSW_BLOB_CFG_MSG,
+    MSG_ID_RLP_OPEN_MSG,
+    MSG_ID_RLP_CLOSE_MSG,
+    MSG_ID_RLP_LMD_FWD_FUNDICATED_DATA_IND_MSG,
+    MSG_ID_RLP_LMD_FWD_SCH_DATA_IND_MSG,
+    MSG_ID_RLP_LMD_FWD_PDCH_DATA_IND_MSG,
+    MSG_ID_RLP_LMD_REV_DATA_AVAIL_IND_MSG,
+    MSG_ID_RLP_REV_DATA_REQ_MSG,
+    MSG_ID_RLP_HLW_FWD_DATA_ACK_MSG,
+    MSG_ID_RLP_REINSTATE_RATE_MSG,
+    MSG_ID_RLP_RATE_CONTROL_MSG, /* from PS */
+    MSG_ID_RLP_DCCH_REV_DATA_REQ_MSG,   
+    MSG_ID_RLP_INACT_TMO_REQ_MSG,     
+
+    MSG_ID_RLP_ETS_RESET_STAT_CFG_MSG,
+    MSG_ID_RLP_ETS_PEEK_RXQ_STAT_CFG_MSG,
+    MSG_ID_RLP_ETS_PEEK_FRAME_STAT_CFG_MSG,
+    MSG_ID_RLP_ETS_NUM_FRAME_PER_UPPER_LAYER_IND_CFG_MSG,
+
+    MSG_ID_RLP_RESET_STAT_MSG,
+    MSG_ID_RLP_RESET_FRAME_COUNT_MSG,
+    MSG_ID_RLP_PEEK_FRAME_STAT_MSG,
+    
+    MSG_ID_RLP_DISABLE_MSG,
+    MSG_ID_RLP_QUERY_STAT_MSG,
+  
+    /* ID from ... to ... */
+    MSG_ID_RLP_STARTUP_SIGNAL,
+    MSG_ID_RLP_REV_DATA_REQ_SIGNAL,
+    MSG_ID_RLP_REV_DATA_REQ2_SIGNAL,
+
+    /* Added messages for MTK_PLT_ON_PC_UT */
+    MSG_ID_UT_RLP_LMD_FWD_FUNDICATED_DATA_IND_MSG, 
+    MSG_ID_UT_RLP_LMD_FWD_SCH_DATA_IND_MSG,
+    MSG_ID_UT_RLP_SET_MAX_ELEMENT_MSG,
+    
+MODULE_MSG_END( MSG_ID_CXRLP_CODE_TAIL )
+
+
+#endif
+
diff --git a/mcu/interface/sap/md/rr_msgid.h b/mcu/interface/sap/md/rr_msgid.h
new file mode 100644
index 0000000..b57e026
--- /dev/null
+++ b/mcu/interface/sap/md/rr_msgid.h
@@ -0,0 +1,1239 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   rr.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *  RR 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!
+ * 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!
+ * 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!
+ * 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!
+ *
+ * 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!
+ * 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!!
+ *==============================================================================
+ *******************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _RR_MSG_H
+#define _RR_MSG_H
+
+
+
+    /*-------------------------- RLC_MSG_CODE_BEGIN --------------------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_RLC_CODE_BEGIN )
+    MSG_ID_GRR_DATA_REQ = MSG_ID_RLC_CODE_BEGIN,
+    MSG_ID_GRR_UNITDATA_REQ,
+    MSG_ID_GRR_FLUSH_REQ,
+    MSG_ID_MAC_RLC_UL_CON_IND,
+#ifndef __MTK_TARGET__
+    MSG_ID_MAC_RLC_DATA_REQ,
+    MSG_ID_MAC_TIMER_EVENT_IND,
+    MSG_ID_MAC_NEXT_OUTGOING_RRBP_IND,
+#endif
+    MSG_ID_MAC_RLC_ACK_IND,
+    MSG_ID_MAC_RLC_SWITCH_TO_DL,
+    MSG_ID_MAC_RLC_READY_IND,
+    MSG_ID_MAC_RLC_PDCH_REL_IND,
+
+    MSG_ID_RATCM_GAS_READY_TIMER_UPDATE_REQ,
+  
+    MSG_ID_MAC_RLC_REL_CNF,
+    MSG_ID_RATCM_GAS_CELL_UPDATED_REQ,
+    MSG_ID_MAC_RLC_ACCESS_REJECT_IND,
+    MSG_ID_MAC_RLC_PS_CONF_TIMER_UPDATE_REQ,
+
+    MSG_ID_MAC_RLC_SWITCH_TO_UL,
+    MSG_ID_RLC_DL_CODE_BEGIN = MSG_ID_MAC_RLC_SWITCH_TO_UL,
+    MSG_ID_MAC_RLC_DL_CON_IND,
+
+#ifndef __MTK_TARGET__
+    MSG_ID_MAC_RLC_DL_DATA_IND,
+    MSG_ID_MAC_RLC_ACK_REQ,
+#endif
+
+    MSG_ID_REASM_RLC_REASM_DONE_IND,
+
+    MSG_ID_RATCM_GAS_START_TEST_MODE_REQ,    
+
+    MSG_ID_MAC_RLC_TBF_REL_IND,
+    MSG_ID_RLC_COMMON_CODE_BEGIN = MSG_ID_MAC_RLC_TBF_REL_IND,
+    MSG_ID_RLC_CODE_END = MSG_ID_MAC_RLC_TBF_REL_IND,
+MODULE_MSG_END( MSG_ID_RLC_CODE_TAIL )
+    
+MODULE_MSG_BEGIN( MSG_ID_RRM_COMMON_CODE_BEGIN )
+    /*-------------------------- RRM_MSG_CODE_BEGIN --------------------------*/
+
+    MSG_ID_SIM_RR_READY_IND = MSG_ID_RRM_COMMON_CODE_BEGIN,
+    //MSG_ID_RATCM_GAS_DUPLEX_MODE_CHANGE_REQ,
+    MSG_ID_RATCM_GAS_SET_MRU_REQ,
+    MSG_ID_RATCM_GAS_CLEAR_MRU_REQ,
+    MSG_ID_RATCM_GAS_ADD_FORBIDDEN_LA_REQ,
+    MSG_ID_RATCM_GAS_DEACTIVATE_REQ,
+    MSG_ID_RATCM_GAS_DEL_FORBIDDEN_LA_REQ,
+    MSG_ID_RATCM_GAS_EQ_PLMN_LIST_UPDATE_REQ,
+    MSG_ID_RATCM_GAS_INIT_REQ,
+    MSG_ID_RATCM_GAS_PAGING_PARAM_ASSIGN_REQ,
+    MSG_ID_RATCM_GAS_REGN_STATUS_UPDATE_REQ,
+    MSG_ID_RATCM_GAS_RPLMN_EQ_PLMN_LIST_UPDATE_REQ,
+    MSG_ID_RATCM_GAS_RFOFF_REQ,
+    MSG_ID_RATCM_GAS_RFON_REQ,
+    MSG_ID_RATCM_GAS_SET_RAT_MODE_REQ,
+    MSG_ID_RATCM_GAS_SET_IMEI_REQ,
+    MSG_ID_RATCM_GAS_SIM_INFO_RESET_REQ,
+    MSG_ID_RATCM_GAS_TLLI_ASSIGN_REQ,
+    MSG_ID_RATCM_GAS_HPLMN_INFO_UPDATE_REQ, //mtk02475: MAUI_02456964
+    MSG_ID_RATCM_GAS_SET_PREFERRED_BAND_REQ,
+#ifdef __MONITOR_PAGE_DURING_TRANSFER__
+    MSG_ID_RATCM_GAS_SET_GPRS_TRANSFER_PREFERENCE_REQ,
+#endif /* __MONITOR_PAGE_DURING_TRANSFER__ */
+
+#ifdef __GEMINI__
+    MSG_ID_RATCM_GAS_SIM_STATUS_UPDATE_REQ,
+
+#if defined(__UMTS_RAT__) || defined(__LTE_RAT__)
+    MSG_ID_RATCM_GAS_NO_IR_SIG_PROC_REQ,
+#endif/* defined(__UMTS_RAT__) || defined(__LTE_RAT__) */
+
+#ifdef __LTE_RAT__
+    MSG_ID_RATCM_GAS_CS_STATUS_UPDATE_REQ,
+    MSG_ID_RATCM_GAS_CCO_SUCCESS_FORCED_BY_NAS_REQ,
+#endif/* __LTE_RAT__ */
+#endif
+
+    MSG_ID_MPAL_RR_ENTER_IDLE_IND,
+
+#if defined(__LTE_RAT__) || defined(__NR_RAT__)
+	MSG_ID_RATCM_GAS_RAT_CHANGE_RSP,
+#endif /* defined(__LTE_RAT__) || defined(__NR_RAT__) */
+
+#ifdef __LTE_RAT__
+    MSG_ID_RATCM_GAS_RAT_CHANGE_REQ,
+    MSG_ID_RATCM_GAS_PAGE_REQ,
+#endif /* __LTE_RAT__ */
+    MSG_ID_RATCM_GAS_CAP_UPDATE_REQ, 
+
+    MSG_ID_RATCM_GAS_CALL_STATUS_IND,
+    MSG_ID_RATCM_GAS_EMC_FORBIDDEN_NW_LIST_UPDATE_REQ,
+    
+    MSG_ID_RATCM_GAS_ARAL_UPDATE_REQ,
+    
+    //MSG_ID_MPAL_RR_DUPLEX_MODE_CHANGE_CNF,
+    MSG_ID_MPAL_RR_SET_RAT_SERVICE_CNF,
+    MSG_ID_MPAL_RR_BSIC_SYNC_CNF,
+    MSG_ID_MPAL_RR_NEIGHBOR_BSIC_IND,
+    MSG_ID_MPAL_RR_CELL_BSIC_IND,
+    MSG_ID_MPAL_RR_DATA_IND,
+    MSG_ID_MPAL_RR_CELL_SELECTION_INIT_CNF,
+    
+#ifdef __GEMINI__
+    MSG_ID_RSVAS_GAS_SUSPEND_SERVICE_REQ,
+    MSG_ID_RSVAS_GAS_RESUME_SERVICE_REQ,
+
+    /* Add for __GEMINI__ */
+    MSG_ID_RSVAS_GAS_ABORT_SERVICE_REQ,
+    MSG_ID_RSVAS_GAS_ABORT_SERVICE_COMPLETE_IND,
+
+    /* for  Gemini 2.0 */
+    MSG_ID_RSVAS_GAS_VIRTUAL_SUSPEND_SERVICE_REQ,
+    MSG_ID_RSVAS_GAS_VIRTUAL_SUSPEND_SERVICE_COMPLETE_IND,
+    MSG_ID_RSVAS_GAS_VIRTUAL_RESUME_SERVICE_REQ,
+    MSG_ID_MPAL_RR_VIRTUAL_SUSPEND_CNF,
+
+#ifdef __ADAPTIVE_PAGING_PERIOD_IN_UNACK_MODE__
+    MSG_ID_RR_PRR_ADJUST_PAGING_PERIOD_IND,
+#endif /* __ADAPTIVE_PAGING_PERIOD_IN_UNACK_MODE__ */
+
+    /* for share power scan */
+    MSG_ID_RR_PRR_RF_RESULT_NOTIFY_REQ,
+#endif
+
+    /* This primitive is used to verify large structures or variables in context for UT check.
+       Since verify GV utility in MSC is suitable for a few items, and we do not wrap option 
+       UNIT_TEST for convenience. */
+    MSG_ID_RRM_VERIFY_GV_FOR_UT,
+
+    /* Add for GISE to RRM */
+    MSG_ID_GISE_RRM_GET_GCELL_MEAS_CNF,
+    MSG_ID_GISE_RRM_SYNC_CONTEXT_IND,
+
+    MSG_ID_RSVAS_GAS_VIRTUAL_CONNECTED_SUSPEND_REQ,
+    MSG_ID_RSVAS_GAS_VIRTUAL_CONNECTED_RESUME_REQ,
+    MSG_ID_RATCM_GAS_RSIM_DATA_ABORT_REQ,
+
+    MSG_ID_GISE_RRM_SUSPEND_CNF,
+    MSG_ID_MPAL_RR_SPECIFIC_SYNC_CNF,
+
+    MSG_ID_RATCM_GAS_CHECK_ACTIVE_RAT_REQ,
+    MSG_ID_RATCM_GAS_SET_ACTIVE_RAT_REQ,
+    MSG_ID_RATCM_GAS_SNIFFER_START_REQ,
+    MSG_ID_RATCM_GAS_SNIFFER_STOP_REQ,
+	MSG_ID_RATCM_GAS_ELEVATOR_MODE_REQ,
+
+    /*These msgs are to save power during SNIFFER - OPPO requirement*/
+    MSG_ID_RATCM_GAS_INACTIVE_MODE_CONFIGURATION_REQ,
+    MSG_ID_RATCM_GAS_SCREEN_ON_REQ,
+    MSG_ID_RATCM_GAS_SCREEN_OFF_REQ,
+    MSG_ID_RATCM_GAS_SERVICE_RECOVERY_ROUND_UPDATE_REQ,  
+    MSG_ID_CC_GAS_CALL_FAILURE_IND,
+    MSG_ID_RATCM_GAS_DATA_ALLOW_REQ,
+    MSG_ID_RATCM_GAS_CSFB_PAGE_CONFIG_REQ,
+    MSG_ID_RATCM_GAS_LTE_NORMAL_SERVICE_LOSS_UPDATE_REQ,
+    MSG_ID_CC_GAS_CALL_STATUS_IND,
+    MSG_ID_RATCM_GAS_NR_NORMAL_SERVICE_LOSS_UPDATE_REQ,
+    MSG_ID_RATCM_GAS_PLMN_INFO_UPDATE_REQ,
+    /* Please add any new message ID above this only */
+    MSG_ID_RRM_COMMON_NON_USED_MESSAGE,
+    MSG_ID_RRM_COMMON_CODE_END = MSG_ID_RRM_COMMON_NON_USED_MESSAGE,
+
+MODULE_MSG_END( MSG_ID_RRM_COMMON_CODE_TAIL )
+
+    /*-------------------------- RCS_MSG_CODE_BEGIN --------------------------*/
+MODULE_MSG_BEGIN( MSG_ID_RCS_CODE_BEGIN )
+    MSG_ID_RATCM_GAS_PLMN_LIST_REQ = MSG_ID_RCS_CODE_BEGIN,
+    MSG_ID_RATCM_GAS_PLMN_LIST_STOP_REQ,
+    MSG_ID_RATCM_GAS_PLMN_SEARCH_REQ,
+    MSG_ID_RATCM_GAS_PLMN_LOSS_INFO_UPDATE_REQ,
+
+    MSG_ID_MPAL_RR_SEARCH_RF_CNF,
+    
+#if (defined(__UMTS_RAT__) || defined(__LTE_RAT__)) && defined(__GEMINI__)
+    MSG_ID_RSVAG_GAS_FREQUENCY_SCAN_START_CNF,
+    MSG_ID_RSVAG_GAS_FREQUENCY_SCAN_STOP_CNF,
+    MSG_ID_RSVAG_GAS_FREQUENCY_SCAN_PREEMPT_IND,
+    MSG_ID_RSVAG_GAS_FREQUENCY_SCAN_ACCEPT_IND,
+#endif /* (defined(__UMTS_RAT__) || defined(__LTE_RAT__))&&defined(__GEMINI__) */
+	MSG_ID_RATCM_GAS_PLMN_LIST_ABORT_REQ,
+    
+    /* Please add any new message ID above this only */
+    MSG_ID_RCS_COMMON_NON_USED_MESSAGE,
+    MSG_ID_RCS_CODE_END = MSG_ID_RCS_COMMON_NON_USED_MESSAGE,
+    
+MODULE_MSG_END( MSG_ID_RCS_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_RMPC_CODE_BEGIN )
+
+    /*------------------------- RMPC_MSG_CODE_BEGIN --------------------------*/
+
+    MSG_ID_RATCM_GAS_CONN_EST_REQ = MSG_ID_RMPC_CODE_BEGIN,
+    MSG_ID_RATCM_GAS_CONN_REL_REQ,
+    MSG_ID_RATCM_GAS_CONN_ABORT_REQ, /*ZY: add for user mo abort request*/
+    MSG_ID_RATCM_GAS_DATA_REQ,
+    MSG_ID_RATCM_GAS_SECURITY_MODE_REQ,
+    MSG_ID_RATCM_GAS_SERVICE_CHANGE_REQ,
+    MSG_ID_RATCM_GAS_CBCH_REQ,           
+    MSG_ID_RATCM_GAS_CB_UPDATE_REQ, 
+    MSG_ID_RATCM_GAS_CB_MSG_REMOVAL_REQ,
+
+#ifdef __AGPS_CONTROL_PLANE__
+    MSG_ID_RRLP_GAS_DATA_REQ,
+#else
+    /* NULL */
+#endif
+
+    MSG_ID_MAC_RMPC_CTRL_MSG_IND,
+    MSG_ID_MAC_RMPC_PKT_ACCESS_REQ,
+    MSG_ID_MAC_RMPC_ACCESS_RESULT_IND,
+    MSG_ID_MAC_RMPC_ENTER_IDLE_REQ,
+    
+    MSG_ID_MAC_RMPC_DL_ASSIGN_RESULT_IND,
+    MSG_ID_MAC_RMPC_TBF_STATUS_IND,
+    MSG_ID_MAC_RMPC_CTRL_MSG_CNF,
+    MSG_ID_MAC_RMPC_PS_HANDOVER_MSG_IND,
+    MSG_ID_MAC_RMPC_PS_HANDOVER_CONNECT_IND,
+    MSG_ID_MAC_RMPC_PS_HANDOVER_RESULT_IND,
+    MSG_ID_MAC_RMPC_PS_HANDOVER_RECONNECT_IND,
+    MSG_ID_MAC_RMPC_PS_HANDOVER_RSP_IND,
+    MSG_ID_MAC_RMPC_PACKET_APPLICATION_INFO_MSG_IND,
+    MSG_ID_RLC_RMPC_RESEL_REQ,
+    MSG_ID_RLC_RMPC_MS_STATE_CHANGE_IND,
+#ifdef __ADAPTIVE_PAGING_PERIOD_IN_UNACK_MODE__
+    MSG_ID_RLC_RMPC_ADJUST_PAGING_PERIOD_IND,
+#endif
+    MSG_ID_MPAL_RR_NEIGHBOR_MEAS_IND,
+    MSG_ID_MPAL_RR_NC_MEASUREMENT_IND,
+    MSG_ID_MPAL_RR_EXTENDED_MEAS_IND,
+    MSG_ID_MPAL_RR_SERV_IDLE_MEAS_IND,
+    MSG_ID_MPAL_RR_SERV_DEDI_MEAS_IND,
+    
+#ifdef __PKT_EXT_MEAS__
+    MSG_ID_MPAL_RR_PKT_EXT_MEASUREMENT_IND,
+#endif /*__PKT_EXT_MEAS__*/
+
+#ifdef __GEMINI__
+    MSG_ID_MPAL_RR_SUSPEND_PROC_FINISH_IND,
+#endif /*__GEMINI__ */
+
+#ifndef __PS_L1_DC_ARCH__
+    /* Although it is a message for UT only, but mcddll build flow do not recognize __MTK_TARGET__, so this 
+       message should be built into both target/MoDIS, otherwise it would cause MSG_ID shift problem. */
+    MSG_ID_MPAL_RR_DETECT_PAGING_BLOCK_CALLBACK_REQ,
+#endif /* !__PS_L1_DC_ARCH__ */
+
+    MSG_ID_MPAL_RR_RACH_CNF,
+    MSG_ID_MPAL_RR_HANDOVER_FAIL_IND,
+    MSG_ID_MPAL_RR_HANDOVER_SUCCESS_IND,
+    MSG_ID_MPAL_RR_HANDOVER_CONNECT_IND,
+    MSG_ID_MPAL_RR_DEDICATED_CHANNEL_CONNECT_CNF,
+    MSG_ID_MPAL_RR_DEDICATED_CHANNEL_DISCONNECT_CNF,
+    MSG_ID_MPAL_RR_DEDICATED_CHANNEL_RECONNECT_CNF,
+    MSG_ID_MPAL_RR_FREQUENCY_REDEFINITION_CNF,
+    MSG_ID_MPAL_RR_CHANNEL_MODE_MODIFY_CNF,
+    MSG_ID_MPAL_RR_CIPHERING_MODE_COMMAND_CNF,
+    MSG_ID_MPAL_RR_CLOSE_TCH_LOOP_CNF,
+    MSG_ID_MPAL_RR_OPEN_TCH_LOOP_CNF,
+    MSG_ID_RMP_MSG_CODE_END = MSG_ID_MPAL_RR_OPEN_TCH_LOOP_CNF,
+  
+    MSG_ID_LAPDM_RR_ESTB_CONF,
+    MSG_ID_LAPDM_RR_ESTB_IND,
+    MSG_ID_LAPDM_RR_REL_IND,
+    MSG_ID_LAPDM_RR_REL_CONF,
+    MSG_ID_LAPDM_RR_SUS_CONF,
+    MSG_ID_LAPDM_RR_RESUME_CONF,
+    MSG_ID_LAPDM_RR_RECON_CONF,
+    MSG_ID_LAPDM_RR_DATA_IND,
+    MSG_ID_LAPDM_RR_UNITDATA_IND,
+    MSG_ID_LAPDM_RR_ERROR_IND,
+    
+#if defined(__UMTS_RAT__) || defined(__LTE_RAT__)
+    MSG_ID_LAPDM_RR_INTER_RAT_EST_CNF,
+#endif /* defined(__UMTS_RAT__) || defined(__LTE_RAT__) */
+
+    MSG_ID_LAPDM_RR_DATA_CONF,
+    MSG_ID_RMPC_CODE_END = MSG_ID_LAPDM_RR_DATA_CONF,
+MODULE_MSG_END( MSG_ID_RMPC_CODE_TAIL )
+  
+MODULE_MSG_BEGIN( MSG_ID_RRM_MPAL_MM_CODE_BEGIN )
+    /*------------------- MSG_ID_RRM_MPAL_MM_CODE_BEGIN ----------------------*/
+    
+#if defined(__UMTS_RAT__) || defined(__LTE_RAT__)
+    MSG_ID_MPAL_RR_STANDBY_GSM_MEAS_IND = MSG_ID_RRM_MPAL_MM_CODE_BEGIN,
+#if defined(__23G_PRI_RESEL_SUPPORT__) || defined(__LTE_RAT__)
+    MSG_ID_MPAL_RR_STANDBY_GSM_PRIO_MEAS_IND, /* R8 PBCR */
+#endif /* defined(__23G_PRI_RESEL_SUPPORT__) || defined(__LTE_RAT__) */
+    MSG_ID_MPAL_RR_STANDBY_GSM_BSIC_IND,
+#ifdef __LTE_RAT__    
+    MSG_ID_MPAL_RR_STANDBY_GSM_REPORT_CGI_SEARCH_RF_CNF,
+    MSG_ID_MPAL_RR_STANDBY_GSM_REPORT_CGI_BSIC_IND,
+#endif /* __LTE_RAT__ */    
+    MSG_ID_MPAL_RR_INTER_RAT_HANDOVER_CNF,  
+    MSG_ID_RRM_MPAL_MM_CODE_END = MSG_ID_MPAL_RR_INTER_RAT_HANDOVER_CNF,
+#endif /* defined(__UMTS_RAT__) || defined(__LTE_RAT__) */
+
+MODULE_MSG_END( MSG_ID_RRM_MPAL_MM_CODE_TAIL)
+
+MODULE_MSG_BEGIN( MSG_ID_MAC_CODE_BEGIN )
+    /*-------------------------- MAC_MSG_CODE_BEGIN --------------------------*/
+    MSG_ID_RLC_MAC_RES_REQ = MSG_ID_MAC_CODE_BEGIN,
+    MSG_ID_RLC_MAC_TBF_REL_REQ,
+    MSG_ID_RLC_MAC_UL_DATA_IND,
+    MSG_ID_RLC_MAC_ACK_RES,
+/* Evelyn 20090415: Merge R6 */
+    MSG_ID_RMPC_MAC_CTRL_MSG_REQ,
+    MSG_ID_RMPC_MAC_CTRL_MSG_DELETE_REQ,
+    MSG_ID_RMPC_MAC_UL_ASSIGN_IND,
+    MSG_ID_RMPC_MAC_DL_ASSIGN_IND,
+    MSG_ID_RMPC_MAC_SUSPEND_TBF_REQ,
+    MSG_ID_RMPC_MAC_RESUME_TBF_REQ,
+    MSG_ID_RMPC_MAC_SI_INFO_READY_IND,
+//  Evelyn Add for PS HANDOVER
+    MSG_ID_RMPC_MAC_PS_HANDOVER_REQ,
+    MSG_ID_RMPC_MAC_PS_HANDOVER_ERROR_RSP,
+    MSG_ID_MPAL_RR_PS_HANDOVER_CNF,
+    MSG_ID_MPAL_RR_PS_HANDOVER_RECONNECT_CNF,
+    
+
+    MSG_ID_MPAL_RR_TRANSFER_DATA_IND,
+    MSG_ID_MPAL_RR_EGPRS_TRANSFER_DATA_IND,
+    MSG_ID_MPAL_RR_READY_TO_SEND_IND,
+    MSG_ID_MPAL_RR_PDTCH_DISCONN_CNF,
+    MSG_ID_MPAL_RR_CCCH_RRBP_CNF,
+  
+#if  defined(__MTK_TARGET__) && (!defined(__MAC_SHOW_TRANS_DATA__))
+    /* NULL */
+#else
+    MSG_ID_RMPC_MAC_CELL_STATUS_IND, 
+#endif
+
+#if (!defined(__MTK_TARGET__)) && (defined (__GERAN_RTTI__) || defined(__GERAN_FANR__))
+    MSG_ID_MPAL_RR_TRANSFER_DATA_NOTICE_IND,
+#endif
+
+    MSG_ID_MAC_MAC_TRANS_DATA_IND,
+#if defined(__PS_L1_DC_ARCH__) && (!defined(__MTK_TARGET__))
+    MSG_ID_MAC_MAC_RRBP_FN_IND,
+#endif
+
+    MSG_ID_MPAL_RR_EGPRS_LOOP_CNF,
+    MSG_ID_MPAL_RR_PDTCH_CONNECT_IND,
+    
+    MSG_ID_MAC_RMPC_COMMON_CODE_BEGIN = MSG_ID_MPAL_RR_PDTCH_CONNECT_IND,
+    MSG_ID_MPAL_RR_INT_MEASUREMENT_IND,
+    MSG_ID_MAC_RMPC_COMMON_CODE_END = MSG_ID_MPAL_RR_INT_MEASUREMENT_IND,
+    
+    MSG_ID_MAC_CODE_END = MSG_ID_MAC_RMPC_COMMON_CODE_END,
+MODULE_MSG_END( MSG_ID_MAC_CODE_TAIL )
+  
+MODULE_MSG_BEGIN( MSG_ID_LAPDM_CODE_BEGIN )
+    /*------------------------- LAPDM_MSG_CODE_BEGIN -------------------------*/
+    MSG_ID_RR_LAPDM_DATA_REQ = MSG_ID_LAPDM_CODE_BEGIN,
+    MSG_ID_RR_LAPDM_UNITDATA_REQ,
+#ifdef __AGPS_CONTROL_PLANE__
+    MSG_ID_RR_LAPDM_APP_DATA_REQ,
+    MSG_ID_RR_LAPDM_CLEAR_APP_QUEUE_REQ,
+#else
+    /* NULL */
+#endif    
+    MSG_ID_RR_LAPDM_ESTB_REQ,
+    MSG_ID_RR_LAPDM_SUS_REQ,
+    MSG_ID_RR_LAPDM_RESUME_REQ,
+    MSG_ID_RR_LAPDM_RECON_REQ,
+    MSG_ID_RR_LAPDM_REL_REQ,
+    MSG_ID_RR_LAPDM_MDL_REL_REQ,
+    MSG_ID_RR_LAPDM_CELL_OPTION_UPDATE_REQ,
+    MSG_ID_LAPDM_UL_DATA_REQ,
+    MSG_ID_LAPDM_DL_AND_UL_IND,
+
+    MSG_ID_RR_LAPDM_INTER_RAT_EST_REQ,
+    MSG_ID_LAPDM_CODE_END = MSG_ID_RR_LAPDM_INTER_RAT_EST_REQ,
+
+    MSG_ID_RR_MPAL_DEDICATED_DATA_REQ,
+    MSG_ID_MPAL_RR_DEDICATED_DATA_IND,
+    MSG_ID_MPAL_RR_DEDICATED_READY_TO_SEND_IND,
+    MSG_ID_MPAL_RR_DEDICATED_DATA_CALLBACK_IND,
+    MSG_ID_MPAL_RR_DEDICATED_READY_TO_SEND_CALLBACK_IND,
+MODULE_MSG_END( MSG_ID_LAPDM_CODE_TAIL )    
+  
+MODULE_MSG_BEGIN( MSG_ID_REASM_CODE_BEGIN )
+    /*------------------------- REASM_MSG_CODE_BEGIN -------------------------*/
+    MSG_ID_RLC_REASM_BEGIN_REASM_IND = MSG_ID_REASM_CODE_BEGIN,
+    MSG_ID_RLC_REASM_TBF_REL_IND,
+    MSG_ID_FLC_REASM_RESUME_REQ,
+    MSG_ID_REASM_CODE_END = MSG_ID_FLC_REASM_RESUME_REQ,
+MODULE_MSG_END( MSG_ID_REASM_CODE_TAIL )
+  
+MODULE_MSG_BEGIN( MSG_ID_MPAL_CODE_BEGIN )
+    /*-------------------------- MPAL_MSG_CODE_BEGIN -------------------------*/
+    MSG_ID_RR_MPAL_SEARCH_RF_REQ = MSG_ID_MPAL_CODE_BEGIN,
+    MSG_ID_RR_MPAL_REQ_CODE_BEGIN = MSG_ID_RR_MPAL_SEARCH_RF_REQ, /*Maruco20080904, add for count MPAL_NUM_UL_MSGS*/
+    MSG_ID_RR_MPAL_SEARCH_RF_STOP_REQ,
+    MSG_ID_RR_MPAL_BSIC_SYNC_REQ,
+    MSG_ID_RR_MPAL_SPECIFIC_SYNC_REQ,
+    MSG_ID_RR_MPAL_SERV_BCCH_MONITOR_REQ,
+    MSG_ID_RR_MPAL_CCCH_MONITOR_REQ,
+    MSG_ID_RR_MPAL_PAGE_MODE_CHANGE_REQ,
+    MSG_ID_RR_MPAL_RACH_REQ,
+    MSG_ID_RR_MPAL_STOP_RACH_REQ,
+    MSG_ID_RR_MPAL_DEDICATED_CHANNEL_CONNECT_REQ,
+    MSG_ID_RR_MPAL_DEDICATED_CHANNEL_DISCONNECT_REQ,
+    MSG_ID_RR_MPAL_HANDOVER_REQ,
+    MSG_ID_RR_MPAL_HANDOVER_STOP_REQ,
+    MSG_ID_RR_MPAL_DEDICATED_CHANNEL_RECONNECT_REQ,
+    MSG_ID_RR_MPAL_FREQUENCY_REDEFINITION_REQ,
+    MSG_ID_RR_MPAL_CHANNEL_MODE_MODIFY_REQ,
+    MSG_ID_RR_MPAL_CIPHERING_MODE_COMMAND_REQ,
+    MSG_ID_RR_MPAL_CLOSE_TCH_LOOP_REQ,
+    MSG_ID_RR_MPAL_OPEN_TCH_LOOP_REQ,
+    MSG_ID_RR_MPAL_DAI_TEST_REQ,
+    MSG_ID_RR_MPAL_POWER_CLASS_REQ,
+    MSG_ID_RR_MPAL_CELL_OPTION_UPDATE_REQ,
+    MSG_ID_RR_MPAL_EXTENDED_MEAS_REQ,
+    MSG_ID_RR_MPAL_NEIGHBOR_MEAS_REQ,
+    MSG_ID_RR_MPAL_NEIGHBOR_BSIC_START_REQ,
+    MSG_ID_RR_MPAL_NEIGHBOR_BSIC_STOP_REQ,
+    MSG_ID_RR_MPAL_NEIGHBOR_SYS_INFO_READ_REQ,
+    MSG_ID_RR_MPAL_NEIGHBOR_SYS_INFO_STOP_REQ,
+    MSG_ID_RR_MPAL_CELL_BSIC_START_REQ,
+    MSG_ID_RR_MPAL_CELL_BSIC_STOP_REQ,
+    MSG_ID_RR_MPAL_CELL_SYS_INFO_READ_REQ,
+    MSG_ID_RR_MPAL_CELL_SYS_INFO_STOP_REQ,
+    MSG_ID_RR_MPAL_SET_GISE_CONTEXT_REQ,
+    MSG_ID_GISE_MPAL_SYNC_CONTEXT_TO_RRM_IND,
+#ifndef __MTK_TARGET__
+    MSG_ID_RR_MPAL_FLUSH_REQ, /*for MTBF UT*/
+#ifdef __PS_L1_DC_ARCH__
+    MSG_ID_MPAL_DC_DEBUG_IND, /* for DC debug U1 U2 */
+    MSG_ID_MPAL_DC_DEBUG_MIN_RRBP_IND, /* for DC debug update min rrbp */
+#endif
+#endif
+
+    /*------------------------ CBCH msgcodes --------------*/
+    MSG_ID_RR_MPAL_CBCH_CONFIG_REQ,
+    MSG_ID_RR_MPAL_CBCH_START_REQ,
+    MSG_ID_RR_MPAL_CBCH_STOP_REQ,
+    MSG_ID_RR_MPAL_CBCH_SKIP_REQ,
+    
+#if defined(__GEMINI__)
+    MSG_ID_RR_MPAL_SIM_STATUS_UPDATE_REQ,
+#endif
+      
+#ifdef __GEMINI__ 
+    MSG_ID_RR_MPAL_SUSPEND_PROC_START_REQ,
+    MSG_ID_RR_MPAL_SUSPEND_REQ,
+    MSG_ID_RR_MPAL_RESUME_REQ,
+    /* Primitive to adjust prority */
+    MSG_ID_RR_MPAL_CELL_SYS_INFO_PRI_ADJUST_REQ,
+    /* add for Gemini 2.0 */
+    MSG_ID_RR_MPAL_VIRTUAL_SUSPEND_REQ,
+    MSG_ID_RR_MPAL_VIRTUAL_RESUME_REQ,
+    MSG_ID_RR_MPAL_CHANNEL_PROTECT_START_REQ,
+    MSG_ID_RR_MPAL_CHANNEL_PROTECT_STOP_REQ,
+#endif /* end of __GEMINI__ */
+
+    MSG_ID_RR_MPAL_SIM_READY_NOTIFY_REQ,
+    MSG_ID_RR_MPAL_SET_RAT_SERVICE_REQ,
+   // MSG_ID_RR_MPAL_DUPLEX_MODE_CHANGE_REQ,
+    MSG_ID_RR_MPAL_CELL_SELECTION_INIT_REQ, 
+    MSG_ID_T3124_EXPIRY,
+
+    MSG_ID_RR_MPAL_SMART_PAGE_START_REQ,
+
+#ifdef __PS_SERVICE__
+#ifdef __MONITOR_PAGE_DURING_TRANSFER__
+   MSG_ID_RR_MPAL_MONITOR_PAGE_IN_PTM_START_REQ,
+   MSG_ID_RR_MPAL_MONITOR_PAGE_IN_PTM_STOP_REQ,
+#endif /* end of __MONITOR_PAGE_DURING_TRANSFER__*/
+    MSG_ID_RR_MPAL_NC_MEASUREMENT_REQ,
+    MSG_ID_RR_MPAL_STOP_NC_MEASUREMENT_REQ,
+#ifdef __PKT_EXT_MEAS__
+    MSG_ID_RR_MPAL_PKT_EXT_MEASUREMENT_REQ,
+#endif /*__PKT_EXT_MEAS__*/    
+    MSG_ID_RR_MPAL_PDTCH_CONNECT_REQ,
+    MSG_ID_RR_MPAL_RRBP_REQ,
+    MSG_ID_RR_MPAL_CTRL_REQ,
+    MSG_ID_RR_MPAL_DATA_REQ,
+    MSG_ID_RR_MPAL_PKT_TIMING_ADV_PWR_CTRL_REQ,
+    MSG_ID_RR_MPAL_PDCH_RELEASE_REQ,
+    MSG_ID_RR_MPAL_PDTCH_DISCONN_REQ,
+    MSG_ID_RR_MPAL_PDCH_ASSIGNMENT_REQ,
+#endif /* end of __PS_SERVICE__ */
+
+#ifdef __EGPRS_MODE__
+    MSG_ID_RR_MPAL_UPDATE_IR_RESET_REQ,
+    MSG_ID_RR_MPAL_EGPRS_LOOP_REQ,
+#endif /* __EGPRS_MODE__ */    
+
+
+/*Maruco20080904, add for count MPAL_NUM_UL_MSGS*/
+/*Must not include 3G msg since 3G msg use another function table */
+    MSG_ID_RR_MPAL_REQ_CODE_END, 
+
+#if defined(__UMTS_RAT__) || defined(__LTE_RAT__)
+    /*----------------------- RR-MPAL interface for Multi-mode -----------------------*/
+    MSG_ID_RR_MPAL_STANDBY_GSM_MEAS_REQ,
+    MSG_ID_RR_MPAL_INTER_RAT_REQ_CODE_BEGIN = MSG_ID_RR_MPAL_STANDBY_GSM_MEAS_REQ,
+#if defined(__23G_PRI_RESEL_SUPPORT__) || defined(__LTE_RAT__)
+    MSG_ID_RR_MPAL_STANDBY_GSM_PRIO_MEAS_REQ,
+#endif /* defined(__23G_PRI_RESEL_SUPPORT__) || defined(__LTE_RAT__) */
+    MSG_ID_RR_MPAL_STANDBY_GSM_BSIC_READ_REQ,
+    MSG_ID_RR_MPAL_STANDBY_GSM_BSIC_STOP_REQ,
+    MSG_ID_RR_MPAL_INTER_RAT_HANDOVER_REQ,
+#ifdef __LTE_RAT__    
+    MSG_ID_RR_MPAL_STANDBY_GSM_REPORT_CGI_SEARCH_RF_REQ,
+    MSG_ID_RR_MPAL_STANDBY_GSM_REPORT_CGI_SEARCH_RF_STOP_REQ,
+    MSG_ID_RR_MPAL_STANDBY_GSM_REPORT_CGI_BSIC_START_REQ,
+    MSG_ID_RR_MPAL_STANDBY_GSM_REPORT_CGI_BSIC_STOP_REQ,
+    MSG_ID_RR_MPAL_STANDBY_GSM_REPORT_CGI_SYS_INFO_READ_REQ,
+    MSG_ID_RR_MPAL_STANDBY_GSM_REPORT_CGI_SYS_INFO_STOP_REQ,
+#endif /* __LTE_RAT__ */    
+    MSG_ID_RR_MPAL_STANDBY_CELL_BSIC_RES_REQ,
+    MSG_ID_RR_MPAL_INTER_RAT_REQ_CODE_END,
+#endif /* defined(__UMTS_RAT__) || defined(__LTE_RAT__) */
+
+    /*--------------------------- MPAL UT (MPAL-L1)- -------------------------*/
+#ifndef __MTK_TARGET__
+    MSG_ID_MPHC_PHY_INFO_CHECK_REQ,
+    MSG_ID_MPHC_UT_UL_DATA_REQ,
+    MSG_ID_MPHC_UT_DL_DATA_IND,
+    MSG_ID_MPAL_RR_UT_UL_DATA_REQ,
+    MSG_ID_MPAL_RR_UT_DL_DATA_IND,
+//#ifndef __PS_L1_DC_ARCH__
+    MSG_ID_RR_MPAL_DETECT_PAGING_BLOCK_RESULT_CNF,
+//#endif /* !__PS_L1_DC_ARCH__ */
+#endif /* __MTK_TARGET__ */
+
+    MSG_ID_MPAL_CODE_END,   
+
+    /*-------------------------- APGS_MSG_CODE_BEGIN -------------------------*/
+#ifdef __AGPS_CONTROL_PLANE__
+    MSG_ID_GAS_RRLP_DATA_IND,
+    MSG_ID_RRLP_GAS_DATA_CNF,
+    MSG_ID_GAS_RRLP_ABORT_IND,
+    MSG_ID_GAS_RRLP_FIRST_SEGMENT_IND,
+    MSG_ID_GAS_RRLP_SEGMENT_DISCARD_IND,
+#endif /* __AGPS_CONTROL_PLANE__ */
+
+MODULE_MSG_END( MSG_ID_MPAL_CODE_TAIL ) 
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_GAS_CODE_BEGIN )
+    MSG_ID_RATCM_GAS_PLMN_LIST_STATUS_UPDATE_REQ = MSG_ID_FDD_GAS_CODE_BEGIN,
+    /* new AT command (AT%PGCHECK) */
+    MSG_ID_RATCM_GAS_SET_PGCHECK_REQ,
+    MSG_ID_RATCM_GAS_RSIM_AUTH_DOWNLOAD_REQ,
+    MSG_ID_FDD_GAS_CODE_END = MSG_ID_RATCM_GAS_RSIM_AUTH_DOWNLOAD_REQ,
+MODULE_MSG_END( MSG_ID_FDD_GAS_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_TDD_GAS_CODE_BEGIN )
+   MSG_ID_FIRST_TDD_GAS_MSG_TO_BE_REPLACED = MSG_ID_TDD_GAS_CODE_BEGIN,
+   MSG_ID_TDD_GAS_CODE_END = MSG_ID_FIRST_TDD_GAS_MSG_TO_BE_REPLACED,
+MODULE_MSG_END( MSG_ID_TDD_GAS_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_RR_SMP_BEGIN )
+    MSG_ID_RR_SMP_GL1_CALLBACK_START = MSG_ID_RR_SMP_BEGIN,
+    MSG_ID_RR_SMP_CODE_END = MSG_ID_RR_SMP_GL1_CALLBACK_START,
+MODULE_MSG_END( MSG_ID_RR_SMP_TAIL )
+
+#endif //_RR_MSG_H
diff --git a/mcu/interface/sap/md/rsva_msgid.h b/mcu/interface/sap/md/rsva_msgid.h
new file mode 100644
index 0000000..9ff8c9b
--- /dev/null
+++ b/mcu/interface/sap/md/rsva_msgid.h
@@ -0,0 +1,536 @@
+/*****************************************************************************
+*  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) 2007
+*
+*  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).
+*
+*****************************************************************************/
+
+/****************************************************************************
+ * PARTS OF THIS FILE ARE AUTOGENERATED
+ * DO NOT EDIT EXCEPT BETWEEN LINES MARKED !BEGIN MANUAL CODE and !END MANUAL CODE
+ *               Assignment :
+ *               CONFIDENTIAL
+ *               Copyright (c) 2000-2005, UbiNetics Ltd. All rights reserved.
+ *               Cambridge Technology Centre
+ *               Melbourn Royston
+ *               Herts SG8 6DP UK
+ *               Tel: +44 1763 262222
+ *
+ ****************************************************************************
+ * !BEGIN MANUAL CODE! (HEADERS)
+ *
+ * COMPONENT:    (Insert Component Name)
+ * MODULE:       $RCSfile: rsva_sap.h,v $
+ * VERSION:      $Revision: 1.0 $
+ * DATED:        $Date: 2009/06/12 14:22:29 $
+ * AUTHOR:
+ * DESCRIPTION:  Check Header for full description
+ *
+ ****************************************************************************/
+/* !END MANUAL CODE! (HEADERS) */
+/*****************************************************************************
+ * 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!
+ * 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!
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _RSVA_MSG_H
+#define _RSVA_MSG_H
+
+#if defined(__GEMINI__) 
+
+MODULE_MSG_BEGIN( MSG_ID_RSVAS_CODE_BEGIN )
+// RSVAS
+MSG_ID_MSPM_RSVAS_GEMINI_STATE_ASSIGN_REQ = MSG_ID_RSVAS_CODE_BEGIN,
+MSG_ID_MSPM_RSVAS_GEMINI_STATE_ASSIGN_CNF,
+
+MSG_ID_RSVAS_L1_SUSPEND_REQ,
+MSG_ID_RSVAS_L1_SUSPEND_CNF,
+#if 0 /* move to ul1_sap.h */
+/* under construction !*/
+/* under construction !*/
+#endif
+MSG_ID_RSVAS_EL1_SUSPEND_REQ,
+MSG_ID_RSVAS_EL1_SUSPEND_CNF,
+MSG_ID_RSVAS_NL1_SUSPEND_REQ,
+MSG_ID_RSVAS_NL1_SUSPEND_CNF,
+MSG_ID_RSVAS_NMAC_SUSPEND_SERVICE_CNF,
+
+MSG_ID_RSVAS_LL1_SUSPEND_IND,
+
+/* CL1_RSVAS_SAP */
+MSG_ID_RSVAS_CL1_LL1_SUSPEND_IND,
+
+MSG_ID_RSVAS_L1_RESUME_REQ,
+#if 0 /* move to ul1_sap.h */
+/* under construction !*/
+#endif
+MSG_ID_RSVAS_EL1_RESUME_REQ,
+MSG_ID_RSVAS_NL1_RESUME_REQ,
+
+MSG_ID_RSVAS_LL1_RESUME_IND,
+
+MSG_ID_RSVAS_L1_RESUME_CNF,
+#if 0 /* move to ul1_sap.h */
+/* under construction !*/
+#endif
+MSG_ID_RSVAS_EL1_RESUME_CNF,
+MSG_ID_RSVAS_NL1_RESUME_CNF,
+
+MSG_ID_RSVAS_NMAC_RESUME_SERVICE_CNF,
+
+/* CL1_RSVAS_SAP */
+MSG_ID_RSVAS_CL1_LL1_RESUME_IND,
+MSG_ID_RSVAS_CL1_LL1_VIRTUAL_RESUME_IND,
+
+#if 0 /* move to rr_sap.h */
+/* under construction !*/
+#endif /* 0 */
+MSG_ID_RSVAS_UAS_SUSPEND_SERVICE_REQ,
+MSG_ID_RSVAS_UL2_SUSPEND_SERVICE_REQ,
+MSG_ID_RSVAS_UL2D_SUSPEND_SERVICE_REQ,
+#if 0 /* move to errc_msgid.h */
+/* under construction !*/
+#endif
+MSG_ID_RSVAS_LAS_SUSPEND_SERVICE_REQ,
+
+MSG_ID_RSVAS_L4C_SUSPEND_SERVICE_IND,
+
+MSG_ID_RSVAS_GAS_SUSPEND_SERVICE_CNF,
+MSG_ID_RSVAS_UAS_SUSPEND_SERVICE_CNF,
+MSG_ID_RSVAS_EAS_SUSPEND_SERVICE_CNF,
+MSG_ID_RSVAS_NRRC_SUSPEND_SERVICE_CNF,
+MSG_ID_RSVAS_LAS_SUSPEND_SERVICE_CNF,
+MSG_ID_RSVAS_CAS_SUSPEND_SERVICE_CNF,
+
+MSG_ID_RSVAS_MRS_SUSPEND_SERVICE_COMPLETE_IND,
+
+#if 0 /* move to rr_sap.h */
+/* under construction !*/
+#endif /* 0 */
+MSG_ID_RSVAS_UAS_RESUME_SERVICE_REQ,
+#if 0 /* move to errc_msgid.h */
+/* under construction !*/
+#endif 
+
+MSG_ID_RSVAS_UL2_RESUME_SERVICE_REQ,
+MSG_ID_RSVAS_UL2D_RESUME_SERVICE_REQ,
+
+MSG_ID_RSVAS_LAS_RESUME_SERVICE_REQ,
+
+MSG_ID_RSVAS_L4C_RESUME_SERVICE_IND,
+
+MSG_ID_RSVAS_GAS_RESUME_SERVICE_CNF,
+MSG_ID_RSVAS_UAS_RESUME_SERVICE_CNF,
+MSG_ID_RSVAS_EAS_RESUME_SERVICE_CNF,
+MSG_ID_RSVAS_LAS_RESUME_SERVICE_CNF,
+MSG_ID_RSVAS_NRRC_RESUME_SERVICE_CNF,
+MSG_ID_RSVAS_CAS_RESUME_SERVICE_CNF,
+
+
+#if 0 /* move to rr_sap.h */
+/* under construction !*/
+#endif /* 0 */
+MSG_ID_RSVAS_GAS_ABORT_SERVICE_CNF,
+MSG_ID_RSVAS_UAS_ABORT_SERVICE_REQ,
+MSG_ID_RSVAS_UAS_ABORT_SERVICE_CNF,
+#if 0 /* move to errc_msgid.h */
+/* under construction !*/
+#endif
+MSG_ID_RSVAS_EAS_ABORT_SERVICE_CNF,
+MSG_ID_RSVAS_NRRC_ABORT_SERVICE_CNF,
+MSG_ID_RSVAS_CAS_ABORT_SERVICE_CNF,
+
+MSG_ID_RSVAS_L4C_ABORT_SERVICE_IND,
+
+#if 0 /* move to rr_sap.h */
+/* under construction !*/
+#endif /* 0 */
+MSG_ID_RSVAS_UAS_ABORT_SERVICE_COMPLETE_IND,
+#if 0 /* move to errc_msgid.h */
+/* under construction !*/
+#endif
+
+MSG_ID_RSVAS_L4C_ABORT_SERVICE_COMPLETE_IND,
+
+
+
+#if 0 /* move to rr_sap.h */
+/* under construction !*/
+#endif /* 0 */
+MSG_ID_RSVAS_UAS_VIRTUAL_SUSPEND_SERVICE_REQ,
+#if 0 /* move to errc_msgid.h */
+/* under construction !*/
+#endif
+MSG_ID_RSVAS_LAS_VIRTUAL_SUSPEND_SERVICE_REQ,
+MSG_ID_RSVAS_GAS_VIRTUAL_SUSPEND_SERVICE_CNF,
+MSG_ID_RSVAS_UAS_VIRTUAL_SUSPEND_SERVICE_CNF,
+MSG_ID_RSVAS_EAS_VIRTUAL_SUSPEND_SERVICE_CNF,
+MSG_ID_RSVAS_NRRC_VIRTUAL_SUSPEND_SERVICE_CNF,
+MSG_ID_RSVAS_LAS_VIRTUAL_SUSPEND_SERVICE_CNF,
+MSG_ID_RSVAS_CAS_VIRTUAL_SUSPEND_SERVICE_CNF,
+
+#if 0 /* move to rr_sap.h */
+/* under construction !*/
+#endif /* 0 */
+MSG_ID_RSVAS_UAS_VIRTUAL_SUSPEND_SERVICE_COMPLETE_IND,
+#if 0 /* move to errc_msgid.h */
+/* under construction !*/
+#endif
+#if 0 /* move to rr_sap.h */
+/* under construction !*/
+#endif /* 0 */
+MSG_ID_RSVAS_UAS_VIRTUAL_RESUME_SERVICE_REQ,
+#if 0 /* move to errc_msgid.h */
+/* under construction !*/
+#endif
+
+MSG_ID_RSVAS_LAS_VIRTUAL_RESUME_SERVICE_REQ,
+
+MSG_ID_RSVAS_L1_VIRTUAL_RESUME_REQ,
+#if 0 /* move to ul1_sap.h */
+/* under construction !*/
+#endif
+MSG_ID_RSVAS_EL1_VIRTUAL_RESUME_REQ,
+MSG_ID_RSVAS_NL1_VIRTUAL_RESUME_REQ,
+
+MSG_ID_RSVAS_LL1_VIRTUAL_RESUME_IND,
+
+MSG_ID_RSVAS_GAS_VIRTUAL_RESUME_SERVICE_CNF,
+MSG_ID_RSVAS_UAS_VIRTUAL_RESUME_SERVICE_CNF,
+MSG_ID_RSVAS_EAS_VIRTUAL_RESUME_SERVICE_CNF,
+MSG_ID_RSVAS_LAS_VIRTUAL_RESUME_SERVICE_CNF,
+MSG_ID_RSVAS_NRRC_VIRTUAL_RESUME_SERVICE_CNF,
+MSG_ID_RSVAS_CAS_VIRTUAL_RESUME_SERVICE_CNF,
+MSG_ID_RSVAS_L1_VIRTUAL_RESUME_CNF,
+#if 0 /* move to ul1_sap.h */
+/* under construction !*/
+#endif
+MSG_ID_RSVAS_EL1_VIRTUAL_RESUME_CNF,
+MSG_ID_RSVAS_NL1_VIRTUAL_RESUME_CNF,
+
+
+MSG_ID_RSVAS_MONITOR_PEER_PCH_SWITCH_REQ,
+
+
+
+MSG_ID_RSVAS_AS_PREFERENCE_MODE_REQ,
+
+
+/* ifdef __SINGLE_AP_DUAL_MODEM__ */
+MSG_ID_RSVAS_SIM_STATUS_CONFIG_REQ,
+/* endif __SINGLE_AP_DUAL_MODEM__ */
+
+/* #if defined(__ETWS_SUPPORT__) || defined(__LTE_RAT__) */
+MSG_ID_RSVAS_AS_UPDATE_ETWS_PRIORITY_REQ,
+/* endif __ETWS_SUPPORT__ || __LTE_RAT__ */
+
+MSG_ID_RSVAS_FAST_MODE_SWITCH_REQ,
+MSG_ID_RSVAS_FAST_MODE_SWITCH_CNF,
+
+/* ifdef UNIT_TEST */
+MSG_ID_RSVAS_AS_UPDATE_ETWS_PRIORITY_CNF, /* only for UT */
+/* endif UNIT_TEST */
+
+MSG_ID_RSVAS_MODE_SWITCH_START_REQ,
+MSG_ID_RSVAS_MODE_SWITCH_START_CNF,
+MSG_ID_RSVAS_MODE_SWITCH_FINISH_REQ,
+MSG_ID_RSVAS_MODE_SWITCH_FINISH_CNF,
+
+/* ifdef UNIT_TEST */
+MSG_ID_RSVAS_UT_RESULT_IND, /* only for UT */
+/* endif UNIT_TEST */
+
+
+MSG_ID_RAC_RSVAS_SET_RAT_MODE_REQ,
+
+MSG_ID_RSVAS_UAS_VIRTUAL_CONNECTED_SUSPEND_REQ,
+MSG_ID_RSVAS_UAS_VIRTUAL_CONNECTED_RESUME_REQ,
+MSG_ID_RSVAS_EAS_VIRTUAL_CONNECTED_SUSPEND_CNF,
+MSG_ID_RSVAS_EAS_VIRTUAL_CONNECTED_RESUME_CNF,
+MSG_ID_RSVAS_UAS_VIRTUAL_CONNECTED_SUSPEND_CNF,
+MSG_ID_RSVAS_UAS_VIRTUAL_CONNECTED_RESUME_CNF,
+MSG_ID_RSVAS_GAS_VIRTUAL_CONNECTED_SUSPEND_CNF,
+MSG_ID_RSVAS_GAS_VIRTUAL_CONNECTED_RESUME_CNF,
+MSG_ID_RSVAS_NRRC_VIRTUAL_CONNECTED_SUSPEND_CNF,
+MSG_ID_RSVAS_NRRC_VIRTUAL_CONNECTED_RESUME_CNF,
+
+
+MSG_ID_RSVAS_EAS_VIRTUAL_MODE_UPDATE_CNF,
+MSG_ID_RSVAS_NRRC_VIRTUAL_MODE_UPDATE_CNF,
+MSG_ID_RSVAS_NRRC_GEMINI_MODE_UPDATE_CNF,
+
+
+MSG_ID_RSVAS_NON_USED_MESSAGE,
+MSG_ID_RSVAS_CODE_END = MSG_ID_RSVAS_NON_USED_MESSAGE,
+
+MODULE_MSG_END( MSG_ID_RSVAS_CODE_TAIL )
+
+#if defined(__UMTS_RAT__)
+
+MODULE_MSG_BEGIN( MSG_ID_RSVAK_CODE_BEGIN )
+// RSVAK
+MSG_ID_RSVA_RES_RESERVE_REQ = MSG_ID_RSVAK_CODE_BEGIN,
+MSG_ID_RSVA_RES_MODIFY_REQ,
+MSG_ID_RSVA_RES_RELEASE_REQ,
+MSG_ID_RSVA_RES_RESERVE_CNF,
+MSG_ID_RSVA_RES_MODIFY_CNF,
+MSG_ID_RSVA_RES_RESERVE_ACCEPT_IND,
+MSG_ID_RSVA_RES_RESERVE_PREEMPT_IND,
+MSG_ID_MSPM_RSVAK_STOP_ALL_FREQ_SCAN_REQ,
+MSG_ID_MSPM_RSVAK_STOP_ALL_FREQ_SCAN_CNF,
+MSG_ID_MSPM_RSVAK_RESUME_ALL_FREQ_SCAN_REQ,
+MSG_ID_MSPM_RSVAK_RESUME_ALL_FREQ_SCAN_CNF,
+MSG_ID_RSVAK_CODE_END = MSG_ID_MSPM_RSVAK_RESUME_ALL_FREQ_SCAN_CNF,
+MODULE_MSG_END( MSG_ID_RSVAK_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_RSVAU_CODE_BEGIN )
+// RSVAU
+MSG_ID_RSVAS_RSVAU_SUSPEND_SERVICE_REQ = MSG_ID_RSVAU_CODE_BEGIN,
+MSG_ID_RSVAS_RSVAU_RESUME_SERVICE_REQ,
+MSG_ID_RSVAU_CODE_END = MSG_ID_RSVAS_RSVAU_RESUME_SERVICE_REQ,
+MODULE_MSG_END( MSG_ID_RSVAU_CODE_TAIL )
+
+// RSVAG
+#ifdef  __GSM_RAT__
+MODULE_MSG_BEGIN( MSG_ID_RSVAG_CODE_BEGIN )
+MSG_ID_GAS_RSVAG_FREQUENCY_SCAN_START_REQ  = MSG_ID_RSVAG_CODE_BEGIN,
+MSG_ID_GAS_RSVAG_FREQUENCY_SCAN_STOP_REQ,
+MSG_ID_RSVAG_CODE_END = MSG_ID_GAS_RSVAG_FREQUENCY_SCAN_STOP_REQ,
+MODULE_MSG_END( MSG_ID_RSVAG_CODE_TAIL )
+#endif /* __GSM_RAT__ */
+
+// RSVAE
+#ifdef __LTE_RAT__
+MODULE_MSG_BEGIN( MSG_ID_RSVAE_CODE_BEGIN )
+MSG_ID_EAS_RSVAE_FREQUENCY_SCAN_START_REQ  = MSG_ID_RSVAE_CODE_BEGIN,
+MSG_ID_EAS_RSVAE_FREQUENCY_SCAN_STOP_REQ,
+MSG_ID_EAS_RSVAE_FREQUENCY_SCAN_MODIFY_REQ,
+MSG_ID_RSVAE_CODE_END = MSG_ID_EAS_RSVAE_FREQUENCY_SCAN_MODIFY_REQ,
+
+MODULE_MSG_END( MSG_ID_RSVAE_CODE_TAIL )
+#endif /* __LTE_RAT__ */
+
+// RSVAN
+#ifdef __NR_RAT__
+MODULE_MSG_BEGIN( MSG_ID_RSVAN_CODE_BEGIN )
+MSG_ID_NRRC_RSVAN_FREQUENCY_SCAN_START_REQ  = MSG_ID_RSVAN_CODE_BEGIN,
+MSG_ID_NRRC_RSVAN_FREQUENCY_SCAN_STOP_REQ,
+MSG_ID_NRRC_RSVAN_FREQUENCY_SCAN_MODIFY_REQ,
+MSG_ID_RSVAN_CODE_END = MSG_ID_NRRC_RSVAN_FREQUENCY_SCAN_MODIFY_REQ,
+
+MODULE_MSG_END( MSG_ID_RSVAN_CODE_TAIL )
+#endif /* __NR_RAT__ */
+
+
+#if defined(__CDMA2000_RAT__) || defined(__C2K_RAT__)
+MODULE_MSG_BEGIN( MSG_ID_RSVAC_CODE_BEGIN )
+MSG_ID_CSS_RSVAC_FREQUENCY_SCAN_START_REQ  = MSG_ID_RSVAC_CODE_BEGIN,
+MSG_ID_CSS_RSVAC_FREQUENCY_SCAN_MODIFY_REQ,
+MSG_ID_CSS_RSVAC_FREQUENCY_SCAN_STOP_REQ,
+MSG_ID_RSVAC_CODE_END = MSG_ID_CSS_RSVAC_FREQUENCY_SCAN_STOP_REQ,
+MODULE_MSG_END( MSG_ID_RSVAC_CODE_TAIL )
+#endif /* __CDMA2000_RAT__ || __C2K_RAT__ */
+
+#endif /* __UMTS_RAT__ */
+
+#endif /* __GEMINI__ */
+#endif  //_RSVA_MSG_H
diff --git a/mcu/interface/sap/md/sase_msgid.h b/mcu/interface/sap/md/sase_msgid.h
new file mode 100644
index 0000000..b02f5e0
--- /dev/null
+++ b/mcu/interface/sap/md/sase_msgid.h
@@ -0,0 +1,147 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   sase_msgid.h
+ *
+ * Description:
+ * ------------
+ *   SASE 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+
+
+#include "module_msg_range.h"
+
+#ifndef _SASE_MSGID_H
+#define _SASE_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_SASE_CODE_BEGIN ) 
+// NRRC -> SASE
+MSG_ID_SASE_NRRC_SCG_EVENT_IND,
+MSG_ID_SASE_NRRC_CONNECTION_RELEASE_IND,
+MSG_ID_SASE_NRRC_SCG_INFO_IND,
+MSG_ID_SASE_NRRC_ENDC_DEACTIVATE_CNF,
+// TMC -> SASE
+MSG_ID_SASE_TMC_UE_STATUS_IND,
+// Query Information
+MSG_ID_SASE_GET_INFO_REQ,
+MSG_ID_SASE_GET_INFO_CNF,
+// IMC -> SASE
+MSG_ID_ATP_SASE_IMS_REG_STATUS_IND,
+// IMC -> SASE, IMS call status
+MSG_ID_SASE_IMC_IMS_CALL_STATUS_IND,
+// SASE -> iWLAN
+MSG_ID_SASE_IWLAN_SA_MODE_NTF,
+// general vg option control API
+MSG_ID_SASE_VG_OPTION_CONTROL_REQ,
+MSG_ID_SASE_VG_OPTION_CONTROL_CNF,
+//LPP -> SASE
+MSG_ID_LPP_SASE_START_OTDOA_MEAS_REQ,
+MSG_ID_LPP_SASE_STOP_OTDOA_MEAS_REQ,
+//NL1 -> SASE
+MSG_ID_SASE_NL1_LTE_POS_START_CNF,
+
+MODULE_MSG_END( MSG_ID_SASE_CODE_TAIL )
+#endif  /* _SASE_MSGID_H */
diff --git a/mcu/interface/sap/md/sdm_msgid.h b/mcu/interface/sap/md/sdm_msgid.h
new file mode 100644
index 0000000..bbfa9ce
--- /dev/null
+++ b/mcu/interface/sap/md/sdm_msgid.h
@@ -0,0 +1,317 @@
+/*****************************************************************************
+*  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:
+ * ------------
+ *   sdm_msgid.h
+ *
+ * Project:
+ * ------------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   This file defines the identities of the messages received by SDM.
+ * 
+ *
+ * Author:
+ * -----------
+ * -------
+ *
+ *===========================================================
+ * $Log$
+ *
+ * 09 18 2020 chen-wei.lan
+ * [MOLY00568087] [Gen97] Support 5g t911
+ * 	
+ * 	.
+ *
+ * 09 11 2020 chen-wei.lan
+ * [MOLY00568087] [Gen97] Support 5g t911
+ * [SWRD]t911
+ *
+ * 07 27 2020 yulong.chang
+ * [MOLY00549478] [Gen97][HE3.0]N3GPP offload over data feature
+ * VoData SDM part RD domain
+ *
+ * 05 20 2020 chen-wei.lan
+ * [MOLY00523592] Support for MT SMS in 3GPP2 format over IMS domain in CDMA less project.
+ * 3gpp2 sms in cdma less project
+ *
+ * 03 25 2020 chen-wei.lan
+ * [MOLY00499773] [FTAA][CNY][MDST][SWIFT][MT6873][Margaux][Q0][MP2][SQC][NSA][China][Shanghai][Static][SIM1:CU][SIM2:Verizon]Externel (EE),0,0,99,/data/vendor/core/,1,modem,[Fatal error(buf)] err_code1:0x00000823 err_code2:0x00000100 err_code3:0xCCCCCCCC MD Offender:NAS
+ * IMS MT SMS END
+ *
+ * 02 07 2020 chen-wei.lan
+ * [MOLY00498827] [Need Patch] [Sanity Fail] Failed SMS sending on  LTE / UMTS / GSM mode.
+ * nas register status
+ *
+ * 08 26 2019 chen-wei.lan
+ * [MOLY00433041] [Gen97][EPSFB] IT related issues
+ * 	
+ * 	uac
+ *
+ * 08 08 2019 chen-wei.lan
+ * [MOLY00427679] [Gen97] SMS to 911 and SCBM feature
+ * [scbm][OA]interface
+ *
+ * 04 24 2019 ian-yw.chen
+ * [MOLY00401131] [Gen97] porting from 95
+ * 	
+ * 	[porting from UMOLYE][to_20181230]
+ * 	SDM part
+ * 	(SWRD)
+ *
+ * 04 24 2019 ian-yw.chen
+ * [MOLY00401131] [Gen97] porting from 95
+ * 	
+ * 	[porting from UMOLYE][to_20181230]
+ * 	SDM part
+ * 	(SWRD)
+ *
+ * 03 12 2019 ian-yw.chen
+ * [MOLY00390240] [Gen97] SMS features and revise
+ *  .
+ *
+ * 04 05 2017 hsuanchang.chen
+ * [MOLY00237411] [6293][PreIT] UTK/STK SMS Flow Merge
+ * 	
+ * 	. interface
+ *
+ * 04 05 2017 hsuanchang.chen
+ * [MOLY00232032] [SDM] [MT SMS AT Merge] merge +CMT/+EIMSCMT and +CDS/+EIMSCDS
+ * 	
+ * 	. ATP and interface
+ *
+ * 04 05 2017 hsuanchang.chen
+ * [MOLY00229182] [MT6293] EIMSCFG for SDM (SDM replace WFC enable to vowifi enable)
+ * .
+ *
+ * 03 24 2017 hsuanchang.chen
+ * [MOLY00228407] [SDM] Internal Re-arch
+ * . add +ECFGSET/+ECFGGET for SDM Profile
+ *
+ * 03 20 2017 hsuanchang.chen
+ * [MOLY00228407] [SDM] Internal Re-arch
+ * . [SDM Re-arch#8] add SCM for CMSS SMS
+ *
+ * 01 11 2017 hsuanchang.chen
+ * [MOLY00220510] [93 PREIT_DEV][UMOLYA] Rename IMSP interface/context/API to ATP and reorg folder layout
+ * 	
+ * 	. SDM part
+ *
+ * 10 31 2016 hsuanchang.chen
+ * [MOLY00208821] [SDM] UMOLY to UMOLYA sync
+ * 	
+ * 	.[UMOLY to UMOLYA] [MOLY00204308] [??][Jade][CT][VoLTE]SDM will not select CS domain for SMS when CS is unregistered in LTE
+ *
+ * 10 31 2016 hsuanchang.chen
+ * [MOLY00208821] [SDM] UMOLY to UMOLYA sync
+ * . Rollback [MOLY00204308][??][Jade][CT][VoLTE]SDM will not select CS domain for SMS when CS is unregistered in LTE
+ *
+ * 09 26 2016 hsuanchang.chen
+ * [MOLY00205107] [SDM] Cross core integration merge back to UMOLYA
+ * 	
+ * 	.
+ *
+ * 09 26 2016 hsuanchang.chen
+ * [MOLY00203894] [SDM] UMOLYA.PS.DEV merge back UMOLYA
+ * 	
+ * 	.
+ *
+ * 03 15 2016 ian-yw.chen
+ * [MOLY00169015] [COPY CR][VzW][MT6735][Pre-LC][AT command][2.51]  case fail at AT+CMSS=1, shows error
+ * SDM part
+ *
+ * 03 02 2016 ian-yw.chen
+ * [MOLY00163894] [SMS][TC01] 3GPP2 SMS over IMS
+ * [MT/PP download/STK] interface
+ *
+ * 03 02 2016 ian-yw.chen
+ * [MOLY00163894] [SMS][TC01] 3GPP2 SMS over IMS
+ *  [MO] interfaces
+ *
+ * 03 01 2016 ian-yw.chen
+ * [MOLY00147454] VZW 3GPP2 SMS over IMS
+ *  SDM and interfaces
+ *
+ * 09 18 2015 mika.leinonen
+ * [MOLY00141364] [WWFT][MT6755][Jade][EU][Telefonica][VoLTE][Germany][FT] SMS must be sent over SGs in Telefonica Germany networks
+ * 	Integration change for UMOLY TRUNK.
+ * 	Dynamic framework implemented to configure MO SMS domain preferences in 4G per operator country variant.
+ * 	Review SDM: http://mtksap20:8080/go?page=ReviewDisplay&reviewid=213739
+ * 	Review IMSP: http://mtksap20:8080/go?page=ReviewDisplay&reviewid=213748
+ *
+ * 07 30 2015 chinte.chen
+ * [MOLY00132834] [COPY_CR][TMO][EM] Enable/Disable SMS over SGs through EM for TMO requirement 58071
+ * .
+ *
+ * 07 09 2015 nick.wang
+ * [MOLY00127009] WFC Patch back to UMOLY- interface part
+ * .moly wfc interface patch
+ *
+ * 07 09 2015 nick.wang
+ * [MOLY00127009] WFC Patch back to UMOLY- interface part
+ * 	.jade interface sync
+ *
+ * 05 08 2015 chinte.chen
+ * [MOLY00110919] [SAT] Support STK SMS over IP
+ * .
+ *
+ * 11 22 2013 chinte.chen
+ * [MOLY00047460] [MT6582LTE][IMS][VoLTE][Basic IT][IT3-045] Memory status reporting re-enable of SMSoIP
+ * .
+ *
+ * 09 30 2013 chinte.chen
+ * [MOLY00038966] [6290E1][VoLTE][IT][BringUp] Unable to complete RAT mode config
+ * .
+ *****************************************************************************/
+
+#ifndef SDM_MSGID_H
+#define SDM_MSGID_H
+
+#include "module_msg_range.h"
+
+
+MODULE_MSG_BEGIN( MSG_ID_SDM_CODE_BEGIN )
+
+/****************************************************************************
+ *                          ATP -> SDM
+ ****************************************************************************/
+MSG_ID_SDM_ATP_CMD_SEND_SMS_IND                    = MSG_ID_SDM_CODE_BEGIN,
+MSG_ID_SDM_ATP_CMD_SEND_DELIVER_REPORT_IND,
+MSG_ID_SDM_ATP_CMD_SEND_MEM_AVL_NOTIF_IND,
+MSG_ID_SDM_ATP_CMD_WFC_PROFILE_IND,
+MSG_ID_SDM_ATP_CMD_WFC_SWITCH_IND,
+MSG_ID_SDM_ATP_CS_SMS_SUBMIT_REPORT_ACK,
+MSG_ID_SDM_ATP_CS_SMS_SUBMIT_REPORT_NACK,
+MSG_ID_SDM_ATP_CMD_STK_SMS_IND,
+MSG_ID_SDM_ATP_STK_SMS_QUERY_CNF,
+MSG_ID_SDM_ATP_CS_STK_SMS_CNF,
+MSG_ID_SDM_ATP_IMSI_GET_CNF,
+
+MSG_ID_SDM_ATP_CMD_SEND_COMMAND_IND,
+MSG_ID_SDM_ATP_SMS_OVER_IP_CONFIG_IND,
+MSG_ID_SDM_ATP_IMS_REG_STATUS_IND,
+MSG_ID_SDM_ATP_SMS_OVER_SGS_CONFIG_IND,
+MSG_ID_SDM_ATP_CMD_SEND_C2K_SMS_IND,
+MSG_ID_SDM_ATP_CMD_SEND_C2K_ACKNOWLEDGE_IND,
+MSG_ID_SDM_ATP_CMD_SEND_CMSS_IND,
+MSG_ID_SDM_ATP_CMSS_IMS_CNF,
+MSG_ID_SDM_ATP_CMSS_CS_CNF,
+MSG_ID_SDM_ATP_UPDATE_MSG_BOX_CNF,
+MSG_ID_SDM_ATP_CMD_SEND_SMS_DELIVER_IND,
+MSG_ID_SDM_ATP_CMD_SEND_C2K_SMS_DELIVER_IND,
+MSG_ID_SDM_ATP_CMD_SEND_STATUS_REPORT_IND,
+MSG_ID_SDM_ATP_CMD_EIMSCFG_IND,
+MSG_ID_SDM_ATP_CMD_EVODATA_IND,
+MSG_ID_SDM_ATP_IMS_NORMAL_SMS_SMART_CONGESTION_START_CNF,
+MSG_ID_SDM_ATP_IMS_STK_SMS_SMART_CONGESTION_START_CNF,
+MSG_ID_SDM_ATP_IMS_CMSS_SMS_SMART_CONGESTION_START_CNF,
+MSG_ID_SDM_ATP_IMS_C2K_SMS_SMART_CONGESTION_START_CNF,
+MSG_ID_SDM_ATP_IMS_UTK_SMS_SMART_CONGESTION_START_CNF,
+MSG_ID_SDM_ATP_IMS_SMS_SMART_CONGESTION_STOP_CNF,
+MSG_ID_SDM_ATP_ECFG_SET_REQ,
+MSG_ID_SDM_ATP_ECFG_GET_REQ,
+MSG_ID_SDM_ATP_CMD_EXIT_SCBM_IND,
+MSG_ID_SDM_ATP_FDN_ECC_CHECK_CNF,
+MSG_ID_SDM_ATP_CELL_INFO_UPDATE_IND,
+
+/****************************************************************************
+ *                          IMCSMS -> SDM
+ ****************************************************************************/
+MSG_ID_SDM_IMCSMS_SUBMIT_REPORT_ACK,
+MSG_ID_SDM_IMCSMS_SUBMIT_REPORT_NACK,
+MSG_ID_SDM_IMCSMS_STK_SUBMIT_REPORT_ACK,
+MSG_ID_SDM_IMCSMS_STK_SUBMIT_REPORT_NACK,
+MSG_ID_SDM_IMCSMS_DELIVER,
+MSG_ID_SDM_IMCSMS_C2K_SUBMIT_REPORT_ACK,
+MSG_ID_SDM_IMCSMS_C2K_SUBMIT_REPORT_NACK,
+MSG_ID_SDM_IMCSMS_UTK_SUBMIT_REPORT_ACK,
+MSG_ID_SDM_IMCSMS_UTK_SUBMIT_REPORT_NACK,
+MSG_ID_SDM_IMCSMS_C2K_DELIVER,
+MSG_ID_SDM_IMCSMS_CDMA_LESS_C2K_DELIVER,
+MSG_ID_SDM_IMCSMS_STATUS_REPORT,
+MSG_ID_SDM_IMCSMS_CMSS_SUBMIT_REPORT_ACK,
+MSG_ID_SDM_IMCSMS_CMSS_SUBMIT_REPORT_NACK,
+MSG_ID_SDM_IMCSMS_MEM_AVL_NOTIF_CNF,
+MSG_ID_SDM_IMCSMS_RCV_MSG_IND,
+MSG_ID_SDM_IMCSMS_IS_CS_ALLOWED_REQ,
+MSG_ID_SDM_IMCSMS_IMS_MT_SMS_END_IND,
+
+/****************************************************************************
+ *                          CVAL -> SDM
+ ****************************************************************************/
+MSG_ID_SDM_CVAL_C2K_SMS_SEND_CNF,
+MSG_ID_SDM_CVAL_C2K_SMS_IND,
+
+/****************************************************************************
+ *                          VDM  -> SDM
+ ****************************************************************************/
+MSG_ID_SDM_VDM_EXIT_SCBM_IND,
+MSG_ID_SDM_UT_CONFIG,
+
+/****************************************************************************
+*                          Debug purpose 
+****************************************************************************/
+MSG_ID_SDM_DUMP_NVRAM_RAW_DATA_IND,
+
+/****************************************************************************
+ *                          SMS -> SDM
+ ****************************************************************************/
+MSG_ID_SDM_SMS_STATUS_IND,
+
+/****************************************************************************
+ *                          L4C -> SDM
+ ****************************************************************************/
+MSG_ID_SDM_L4C_IMS_NORMAL_SMS_UAC_CNF,
+MSG_ID_SDM_L4C_IMS_STK_SMS_UAC_CNF,
+MSG_ID_SDM_L4C_IMS_CMSS_SMS_UAC_CNF,
+MSG_ID_SDM_L4C_IMS_C2K_SMS_UAC_CNF,
+MSG_ID_SDM_L4C_IMS_UTK_SMS_UAC_CNF,
+MSG_ID_SDM_L4C_IMS_UAC_ALLEVIATION_IND,
+MSG_ID_SDM_L4C_PS_ATTACHED_RAT_IND,
+MSG_ID_SDM_L4C_CS_ATTACHED_RAT_IND,
+MSG_ID_SDM_L4C_EMERGENCY_SERVICE_CNF,
+MSG_ID_SDM_L4C_EMERGENCY_SERVICE_IND,
+MSG_ID_SDM_L4C_EMERGENCY_SERVICE_FALLBACK_CNF,
+MSG_ID_SDM_L4C_NW_FEATURE_IND,
+
+MODULE_MSG_END( MSG_ID_SDM_CODE_TAIL )
+
+
+#endif // SDM_MSGID_H
+
diff --git a/mcu/interface/sap/md/sim_ps_msgid.h b/mcu/interface/sap/md/sim_ps_msgid.h
new file mode 100644
index 0000000..cd0f69a
--- /dev/null
+++ b/mcu/interface/sap/md/sim_ps_msgid.h
@@ -0,0 +1,369 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   sim_ps_sap.h
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   SAP provided by SIM task and outside-PS task uses also
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *******************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _SIM_PS_MSG_H
+#define _SIM_PS_MSG_H
+
+   /*------------------------MSG_ID_SIM_PS_CODE_BEGIN ---------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_SIM_PS_CODE_BEGIN )
+   MSG_ID_GMMSIM_GSM_ALGO_REQ = MSG_ID_SIM_PS_CODE_BEGIN,
+   MSG_ID_SIM_START_REQ,
+   MSG_ID_SIM_START_CNF,
+   MSG_ID_SIM_ERROR_IND,
+   /*[MAUI_02356453] 20110123 mtk01612: sim_smu_error_ind is removed due to no need after MAUI_01815935*/
+   MSG_ID_SIM_MMI_READY_IND,
+   MSG_ID_SIM_MMI_SECURITY_IND, /* 20030609,CPHS */
+   MSG_ID_SIM_MMRR_READY_IND, /* 20030823,BOOTUP */
+   MSG_ID_SIM_MM_READY_IND,
+   MSG_ID_SIM_PAM_READY_IND,  /*__MTC_SUPPORT__ */
+   MSG_ID_SIM_READ_REQ,
+   MSG_ID_SIM_READ_CNF,
+   MSG_ID_SIM_WRITE_REQ,
+   MSG_ID_SIM_WRITE_CNF,
+   MSG_ID_SIM_INCREASE_REQ,
+   MSG_ID_SIM_INCREASE_CNF,
+   MSG_ID_SIM_SECURITY_REQ,
+   MSG_ID_SIM_SECURITY_CNF,
+   MSG_ID_SIM_FILE_INFO_REQ,
+   MSG_ID_SIM_FILE_INFO_CNF,
+   MSG_ID_SIM_DIAL_MODE_REQ,
+   MSG_ID_SIM_DIAL_MODE_CNF,
+   MSG_ID_SIM_STATUS_REQ,
+   MSG_ID_SIM_STATUS_CNF,
+   MSG_ID_SIM_POWEROFF_REQ,
+   MSG_ID_SIM_POWEROFF_CNF,
+   MSG_ID_SIM_ERROR_TEST_REQ,
+   MSG_ID_SIM_READ_PLMN_REQ,
+   MSG_ID_SIM_READ_PLMN_CNF,
+   MSG_ID_SIM_WRITE_PLMN_REQ,
+   MSG_ID_SIM_WRITE_PLMN_CNF,
+   MSG_ID_SIM_ACL_MODE_REQ,
+   MSG_ID_SIM_ACL_MODE_CNF,
+   MSG_ID_SAT_READY_REQ,
+   MSG_ID_SIM_STATUS_UPDATE_IND,        // mtk01488
+   /*mtk80420: remove L4C_VERIFY_PIN_RESULT_IND*/
+   MSG_ID_L4C_SIM_GET_GSMCDMA_DUALSIM_INFO_REQ,
+   MSG_ID_L4C_SIM_GET_GSMCDMA_DUALSIM_INFO_CNF,
+   MSG_ID_L4C_SIM_SET_GSMCDMA_DUALSIM_MODE_REQ,
+   MSG_ID_L4C_SIM_SET_GSMCDMA_DUALSIM_MODE_CNF,
+   MSG_ID_L4C_SIM_SET_VSIM_MODE_REQ,
+   MSG_ID_L4C_SIM_SET_VSIM_MODE_CNF,
+   MSG_ID_USIM_URR_READY_IND,
+   MSG_ID_USIM_UPDATE_NETPAR_REQ, /*mtk01612: [MAUI_02575860]*/
+   MSG_ID_USIM_UPDATE_NETPAR_CNF, /*mtk01612: [MAUI_02575860]*/
+   /* [MAUI_03058282] mtk80420: move authenticate_req/cnf to public sap */
+   MSG_ID_SAT_PROACTIVE_CMD_IND,
+   MSG_ID_SAT_MORE_TIME_RES,         /* PH 20050414 cut off infinite loop */
+   MSG_ID_SAT_CALL_CTRL_BY_SIM_REQ,
+   MSG_ID_SAT_SS_CTRL_BY_SIM_REQ,
+   MSG_ID_SAT_SEND_SMS_CTRL_BY_SIM_REQ,
+   MSG_ID_SAT_SMS_DL_REQ,
+   MSG_ID_SAT_CB_DL_REQ,
+   MSG_ID_SAT_EVDL_MT_CALL_REQ,
+   MSG_ID_SAT_EVDL_CALL_CONNECT_REQ,
+   MSG_ID_SAT_EVDL_CALL_DISCONNECT_REQ,
+   MSG_ID_SAT_EVDL_USER_ACTIVITY_REQ,
+   MSG_ID_SAT_EVDL_HCI_CONNECTIVITY_REQ, //__SATCM__
+   MSG_ID_SAT_EVDL_CARD_READER_STATUS_REQ,
+   MSG_ID_SAT_EVDL_ACCESS_TECHNOLOGY_CHANGE_REQ,      /* mtk01488 */
+   MSG_ID_SAT_SEND_SMS_RES,
+   MSG_ID_SAT_SEND_SS_RES,
+   MSG_ID_SAT_SEND_USSD_RES,
+   MSG_ID_SAT_SETUP_CALL_RES,
+   MSG_ID_SAT_RUN_AT_COMMAND_RES,
+   MSG_ID_SAT_SEND_DTMF_RES,
+   MSG_ID_SAT_ACTIVATE_RES, // __SATCL__
+   MSG_ID_SAT_FILE_CHANGE_IND,
+   MSG_ID_SAT_FILE_CHANGE_RES,
+   MSG_ID_SAT_IMEI_INFO_REQ,
+   MSG_ID_SAT_IMEI_INFO_CNF,
+   MSG_ID_SAT_LOCATION_INFO_IND,
+   MSG_ID_SAT_PROVIDE_LOCATION_INFO_IND,
+   MSG_ID_SAT_TIME_ZONE_CNF,
+   MSG_ID_SAT_TIME_ZONE_IND,
+   MSG_ID_SAT_CURRENT_TIME_REQ,
+   MSG_ID_SAT_CURRENT_TIME_CNF,
+   MSG_ID_SAT_ME_STATUS_REQ,
+   MSG_ID_SAT_ME_STATUS_CNF,
+   MSG_ID_SAT_NMR_REQ,
+   MSG_ID_SAT_NMR_CNF,
+   MSG_ID_SAT_LANGUAGE_REQ,
+   MSG_ID_SAT_LANGUAGE_CNF,
+   MSG_ID_SAT_TIMING_ADVANCE_IND,
+   MSG_ID_SAT_ACCESS_TECHNOLOGY_CHANGE_IND,     /* mtk01488 */
+   MSG_ID_SAT_CALL_STATUS_IND,
+   MSG_ID_SAT_PROFILE_DOWNLOAD_REQ,
+   MSG_ID_SAT_PROFILE_DOWNLOAD_CNF,
+   MSG_ID_SAT_TERMINAL_RSP,
+   MSG_ID_SAT_MORETIME_IND,
+   MSG_ID_SAT_POLL_INTERVAL_IND,
+   MSG_ID_SAT_ENVELOPE_REQ,
+   MSG_ID_SAT_ENVELOPE_CNF,
+   MSG_ID_SAT_REFRESH_IND,
+   MSG_ID_SAT_POLLING_OFF_IND,
+   MSG_ID_SAT_PROVIDE_LOCAL_INFO_IND,
+   MSG_ID_SAT_SETUP_EVENT_LIST_IND,
+   MSG_ID_SAT_ACTIVATE_IND, //__SATCL__
+   MSG_ID_SAT_CONTACTLESS_STATE_CHANGED_IND, //__SATCR__
+   MSG_ID_SAT_CONTACTLESS_STATE_CHANGED_RES, //__SATCR__
+   MSG_ID_SAT_TIMER_MANAGEMENT_IND,
+   MSG_ID_SAT_OPEN_CHANNEL_IND,
+   MSG_ID_SAT_CLOSE_CHANNEL_IND,
+   MSG_ID_SAT_SEND_DATA_IND,
+   MSG_ID_SAT_RECV_DATA_IND,
+   MSG_ID_SAT_CH_STATUS_IND,
+   MSG_ID_SAT_NW_SEARCH_MODE_IND,  /*mtk02374 20090513 add for provide local info with nw search mode*/
+   MSG_ID_SAT_PROVIDE_NW_SEARCH_MODE_IND,
+   MSG_ID_SIM_IMEI_LOCK_VERIFIED_IND, /*mtk02374 20090914 used to indicate SMU whether imei lock verified*/
+   MSG_ID_SIM_O2_PREPAID_SIM_IND, /*mtk01612: [MAUI_02014578] wise detect O2 prepay SIM*/
+   //MSG_ID_SIM_CSIM_REQ, /*mtk01612: MAUI_00479434 __CSIM__*/
+   //MSG_ID_SIM_CSIM_CNF,
+   /* MAUI_03082391 */
+   MSG_ID_SIM_APDU_ACCESS_REQ,
+   MSG_ID_SIM_APDU_ACCESS_CNF,
+   MSG_ID_SIM_MANAGE_CHANNEL_REQ,
+   MSG_ID_SIM_MANAGE_CHANNEL_CNF,
+   MSG_ID_SIM_CALL_DISCONNECT_IND, /*mtk01612: [MAUI_02574001]*/
+   MSG_ID_SIM_PLUG_OUT_IND,    /* mtk80420: SIM hot swap */
+   MSG_ID_SIM_PLUG_IN_IND,
+   MSG_ID_SIM_SEARCH_RECORD_REQ, /* MAUI_02953154 */
+   MSG_ID_SIM_SEARCH_RECORD_CNF,
+   MSG_ID_SIM_SYNC_POLL_TIMER_IND, /*mtk01612: [MAUI_03020152] sync polling timer*/
+   MSG_ID_SIM_RECOVERY_ENHANCEMENT_SWITCH_REQ,
+   MSG_ID_SIM_RECOVERY_ENHANCEMENT_SWITCH_CNF,
+   MSG_ID_SIM_NWSEL_READY_IND,
+   MSG_ID_SIM_GMSS_READY_IND,
+   MSG_ID_SIM_EMM_READY_IND,
+   MSG_ID_SIM_NAS_SV_READY_IND,
+   MSG_ID_SIM_TERMINAL_CAPABILITY_SETTING_REQ,
+   MSG_ID_SIM_TERMINAL_CAPABILITY_SETTING_CNF,
+   MSG_ID_SIM_APP_START_REQ,
+   MSG_ID_SIM_APP_START_CNF,
+   MSG_ID_SIM_APP_ERROR_IND,
+   MSG_ID_SIM_APP_READY_IND,
+   MSG_ID_SIM_APP_READ_REQ,
+   MSG_ID_SIM_APP_READ_CNF,
+   MSG_ID_SIM_APP_WRITE_REQ,
+   MSG_ID_SIM_APP_WRITE_CNF,
+   MSG_ID_SIM_APP_SECURITY_REQ,
+   MSG_ID_SIM_APP_SECURITY_CNF,
+   MSG_ID_SIM_APP_FILE_INFO_REQ,
+   MSG_ID_SIM_APP_FILE_INFO_CNF,
+   MSG_ID_SIM_READ_IMSI_ICCID_REQ,
+   MSG_ID_SIM_READ_IMSI_ICCID_CNF,
+   MSG_ID_SIM_INTSIM_ACCESS_REQ,
+   MSG_ID_SIM_INTSIM_ACCESS_CNF,
+   MSG_ID_SIM_INTSIM_NOTIFY_IND,
+   MSG_ID_SIM_INTSIM_SECURITY_IND,
+   MSG_ID_SIM_INTSIM_DIAL_MODE_CHANGE_IND,
+   MSG_ID_SIM_MDSTATUS_UPDATE_REQ,
+   MSG_ID_SAT_NW_REJECT_IND,
+   MSG_ID_SAT_PDP_STATUS_IND,
+   MSG_ID_SAT_MEME_NMR_REQ,
+   MSG_ID_SAT_MEME_NMR_CNF,
+   MSG_ID_SAT_EAS_NMR_CNF,
+   MSG_ID_SAT_PROFILE_ACTIVATE_REQ,
+   MSG_ID_SAT_PROFILE_WRITE_REQ,
+   MSG_ID_SIM_SEND_STATUS_TO_UIM_REQ,
+   MSG_ID_SAT_SET_CT_MODE_REQ,
+   MSG_ID_SAT_PLMN_INFO_IND,
+   MSG_ID_SAT_SMS_REFRESH_PERMISSION_CNF,
+   MSG_ID_SIM_SET_APVSIM_MODE_REQ,
+   MSG_ID_SIM_SET_APVSIM_MODE_CNF,
+   MSG_ID_SIM_RSA_RESET_IND,
+   MSG_ID_SIM_RSA_ATR_REQ,
+   MSG_ID_SIM_RSA_ATR_CNF,
+   MSG_ID_SIM_RSA_APDU_IND,
+   MSG_ID_SIM_RSA_APDU_RSP_REQ,
+   MSG_ID_SIM_RSA_APDU_RSP_CNF,
+   MSG_ID_SIM_RSA_HOT_PLUG_OUT_REQ,
+   MSG_ID_SIM_RSA_HOT_PLUG_OUT_CNF,
+   MSG_ID_SIM_RSA_HOT_PLUG_IN_REQ,
+   MSG_ID_SIM_RSA_HOT_PLUG_IN_CNF,
+   MSG_ID_SIM_RSA_POWER_DOWN_IND,
+   MSG_ID_SAT_EVAL_CONNECTION_INFO_IND,
+   MSG_ID_SAT_MM_CONNECTION_INFO_IND,
+   MSG_ID_GMSS_SIM_CSS_READY_IND,
+   MSG_ID_L4C_SIM_SET_VSIM_PROFILE_REQ,
+   MSG_ID_L4C_SIM_SET_VSIM_PROFILE_CNF,
+   MSG_ID_L4C_SIM_SET_VSIM_FILE_REQ,
+   MSG_ID_L4C_SIM_SET_VSIM_FILE_CNF,
+   MSG_ID_L4C_SIM_GET_VSIM_RSA_PUBKEY_REQ,
+   MSG_ID_L4C_SIM_GET_VSIM_RSA_PUBKEY_CNF,
+   MSG_ID_L4C_SIM_VSIM_KI_MODE_REQ,
+   MSG_ID_L4C_SIM_VSIM_KI_MODE_CNF,
+   MSG_ID_L4C_SIM_SET_VSIM_KI_REQ,
+   MSG_ID_L4C_SIM_SET_VSIM_KI_CNF,
+   MSG_ID_KEYGEN_SIM_READY_IND,
+   MSG_ID_VSIM_ERROR_IND,
+   MSG_ID_SAT_RAT_MODE_IND,
+   MSG_ID_SIM_READ_DIR_REQ,
+   MSG_ID_SIM_READ_DIR_CNF,
+   MSG_ID_NWSEL_SAT_SUSPEND_STATUS_IND,
+   MSG_ID_NWSEL_SAT_SUSP_RESU_UPDATE_REQ,
+   MSG_ID_NWSEL_SAT_SUSP_RESU_UPDATE_CNF,
+   MSG_ID_SAT_RAT_SELECT_IND,
+   MSG_ID_SAT_MSISDN_INFO_IND,
+   MSG_ID_UIM_SIM_APDU_ACCESS_REQ,
+   MSG_ID_UIM_SIM_RESET_IND,
+   MSG_ID_UIM_SIM_SECURITY_CHANGE_IND,
+   MSG_ID_UIM_SIM_AUTHENTICATE_REQ,
+   MSG_ID_UIM_SAT_TERMINAL_RSP_REQ,
+   MSG_ID_UIM_SAT_ENVELOPE_REQ,
+   MSG_ID_UIM_SAT_FILE_CHANGE_RES,
+   MSG_ID_UIM_SIM_READ_REQ,
+   MSG_ID_BT_UIM_SIM_RESET_REQ,
+   MSG_ID_BT_UIM_SIM_POWER_OFF_REQ,
+   MSG_ID_BT_UIM_SIM_POWER_ON_REQ,
+   MSG_ID_UIM_PRL_READ_FINISH_IND,
+   MSG_ID_UIM_SIM_C2K_BATCH_FILE_READ_REQ,
+   MSG_ID_SIM_SET_REGISTRATION_MODE_REQ,
+   MSG_ID_SAT_SET_RAT_MODE_REQ,
+   MSG_ID_SAT_SET_RAT_MODE_CNF,
+   MSG_ID_NAS_SV_SIM_CS_STK_DOMAIN_IND,
+   MSG_ID_SAT_L4BSAT_SET_SAT_RULE_IND,
+   MSG_ID_SIM_L4BSBP_READY_IND,
+   MSG_ID_SIM_IWLAN_READY_IND,
+   MSG_ID_SIM_DUMP_CONTEXT_IND,
+   MSG_ID_SIM_CT3G_INSERTED_IND,
+   MSG_ID_SIM_MM_CONFIGURE_AS_FOR_DUPLEX_MODE_CHANGE_IND,
+   MSG_ID_SIM_DUPLEX_MODE_REQ,
+   MSG_ID_SIM_OP20_AP_SIMLOCK_REQ,
+   MSG_ID_SIM_AP_SIMPOWER_REQ,
+   MSG_ID_SAT_L4BSIM_SET_RAT_MODE_IND,
+   MSG_ID_SIM_RSA_SIM_PLUG_IN_IND,
+   MSG_ID_SIM_RSA_SIM_PLUG_OUT_IND,
+   MSG_ID_SIM_SWITCH_START_REQ,
+   MSG_ID_SIM_SWITCH_START_CNF,
+   MSG_ID_SIM_CACHE_UPDATE_IND,
+   MSG_ID_SIM_DUMP_RESET_CONTEXT_IND,
+   MSG_ID_SIM_DUPLEX_MODE_CNF,
+   MSG_ID_SIM_EVENT_IND,
+   MSG_ID_SIM_GMSS_CONFIGURE_AS_FOR_DUPLEX_MODE_CHANGE_IND,
+   MSG_ID_SIM_AUTH_FINISH_IND,
+   MSG_ID_SIM_AUTH_FINISH_RSP,
+   MSG_ID_GMSS_SIM_ROAMING_STATE_IND,
+   MSG_ID_SAT_EVDL_IMS_REG_IND,
+   MSG_ID_SIM_MSG_REDIRECT_IND,
+   MSG_ID_SIM_HOT_SWAP_POLL_TIMER_ROLLBACK_IND,
+   MSG_ID_SAT_FORCE_UICC_RESET_IND,
+   MSG_ID_SAT_DM_SESSION_STATUS_IND,
+   MSG_ID_SIM_UT_CAPDU_IND,
+   MSG_ID_SIM_UT_RAPDU_RSP,
+   MSG_ID_SIM_UT_SET_CONFIG_BIN_REQ,
+   MSG_ID_SIM_UT_CONFIG_IND,
+   MSG_ID_SIM_UT_ABORT_REQ,
+   MSG_ID_SIM_DUMP_UT_CONTEXT_IND,
+   MSG_ID_SIM_AP_SIMPOWER_CNF,
+   MSG_ID_SIM_DDM_READY_IND,
+   MSG_ID_SIM_L5USIM_READY_IND,
+   MSG_ID_SIM_VGMM_READY_IND,
+   MSG_ID_SIM_GET_IDENTITY_REQ,
+   MSG_ID_SIM_GET_IDENTITY_CNF,
+   MSG_ID_SAT_INJECT_PROACTIVE_CMD_IND,
+   MSG_ID_SAT_NAS_SV_SOR_SECURE_PACKET_IND,
+   MSG_ID_SAT_NAS_SV_SOR_SECURE_PACKET_RSP,
+   MSG_ID_SAT_VGMM_SECURE_PACKET_IND,
+   MSG_ID_SAT_VGMM_SECURE_PACKET_RSP,
+#ifndef __SIM_ACCESS_INTEGRATION__
+   MSG_ID_SIM_EXTENDED_APDU_ACCESS_REQ,
+   MSG_ID_SIM_EXTENDED_APDU_ACCESS_CNF,
+#endif
+   MSG_ID_SIM_FAKE_ID_REQ,
+   MSG_ID_SIM_APDU_RES_BLOCK_IND,
+   MSG_ID_SIM_ICCID_READY_IND,
+   MSG_ID_L4C_SIM_VSIM_UPDATE_PARAM_REQ,
+   MSG_ID_L4C_SIM_VSIM_UPDATE_PARAM_CNF,
+   MSG_ID_SAT_EBIP_IND,
+   MSG_ID_SIM_SIMME_LOCKED_IND,
+   MSG_ID_SIMDRV_DEBUG_BUFFER_IND,
+   MSG_ID_L4C_SIM_ECC_SESSION_IND,
+   MSG_ID_SIM_TRAY_PLUG_OUT_IND,
+   MSG_ID_SAT_TERMINAL_RSP_RES,    // __TC10__ && __IPC_ADAPTER__
+   MSG_ID_SAT_REFRESH_VOTING_RES,  // __TC10__ && __IPC_ADAPTER__
+   MSG_ID_SIM_INTERNAL_CRITICAL_RECOVERY_IND,
+   MSG_ID_SIM_HOT_SWAP_POLL_START_IND,
+   MSG_ID_SIM_PEER_PLUG_OUT_IND,
+   MSG_ID_SIM_VGSM_READY_IND,
+   MSG_ID_SIM_INACTIVE_SIM_POWER_ON_IND,
+   MSG_ID_SIM_INACTIVE_SIM_PLUG_IN_IND,
+   MSG_ID_L4BSIM_ESLOTSINFO_DATA_IND,
+#ifdef __SIM_PASS_THROUGH__
+   MSG_ID_SIM_PASS_THROUGH_IND,
+#endif
+   MSG_ID_SIM_BERTLV_RETRIEVE_DATA_REQ,
+   MSG_ID_SIM_BERTLV_RETRIEVE_DATA_CNF,
+   MSG_ID_SIM_BERTLV_SET_DATA_REQ,   
+   MSG_ID_SIM_BERTLV_SET_DATA_CNF,
+   MSG_ID_SAT_EVDL_DATA_CONNECT_IND,
+
+   /* Add above this line */
+   MSG_ID_SIM_PS_CODE_MAX,  //not used, only for MSG_ID_SIM_PS_CODE_END reference
+   MSG_ID_SIM_PS_CODE_END = MSG_ID_SIM_PS_CODE_MAX-1,
+MODULE_MSG_END( MSG_ID_SIM_PS_CODE_TAIL )
+
+   /*------------------------SIM_MSG_CODE_END -----------------*/
+
+#endif  //_SIM_PS_MSG_H
diff --git a/mcu/interface/sap/md/sim_public_msgid.h b/mcu/interface/sap/md/sim_public_msgid.h
new file mode 100644
index 0000000..a195401
--- /dev/null
+++ b/mcu/interface/sap/md/sim_public_msgid.h
@@ -0,0 +1,104 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   sim_public_msgid.h
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   SAP provided by SIM task and outside-PS task uses also
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *==============================================================================
+ *******************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _SIM_PUB_MSG_H
+#define _SIM_PUB_MSG_H
+
+   /*------------------------MSG_ID_SIM_PUBLIC_CODE_BEGIN ---------------*/
+MODULE_MSG_BEGIN( MSG_ID_SIM_PUBLIC_CODE_BEGIN )
+   MSG_ID_SIM_READY_IND = MSG_ID_SIM_PUBLIC_CODE_BEGIN,   
+   MSG_ID_SIM_RESET_REQ,  
+   MSG_ID_SIM_RESET_CNF,  
+   MSG_ID_BT_SIM_CONNECT_REQ, /*mtk01612:  [MAUI_02023545] BT_SIM_Profile for MAUI and DUMA*/
+   MSG_ID_BT_SIM_CONNECT_CNF,
+   MSG_ID_BT_SIM_RESET_REQ,
+   MSG_ID_BT_SIM_RESET_CNF,
+   MSG_ID_BT_SIM_APDU_REQ,
+   MSG_ID_BT_SIM_APDU_CNF,
+   MSG_ID_BT_SIM_DISCONNECT_REQ,
+   MSG_ID_BT_SIM_DISCONNECT_CNF,
+   MSG_ID_BT_SIM_POWER_OFF_REQ,
+   MSG_ID_BT_SIM_POWER_OFF_CNF,
+   MSG_ID_BT_SIM_POWER_ON_REQ,
+   MSG_ID_BT_SIM_POWER_ON_CNF,
+   MSG_ID_SIM_AUTHENTICATE_REQ,
+   MSG_ID_SIM_AUTHENTICATE_CNF,
+   MSG_ID_SIM_QUERY_INFO_REQ,
+   MSG_ID_SIM_QUERY_INFO_CNF,   
+   MSG_ID_SIM_ACCESS_EXTMD_IND,
+   MSG_ID_SIM_ACCESS_EXTMD_RES,
+   MSG_ID_SIM_EXTMD_NOTIFY_REQ,
+   MSG_ID_SIM_EXTMD_NOTIFY_CNF,
+   MSG_ID_SIM_APP_AUTHENTICATE_REQ,
+   MSG_ID_SIM_APP_AUTHENTICATE_CNF,
+   MSG_ID_SIM_DSBP_RECONFIGURE_IND,
+   MSG_ID_SIM_RESTRICT_CARD_TYPE_REQ,
+   MSG_ID_SIM_RESTRICT_CARD_TYPE_CNF,
+   MSG_ID_SIM_PUBLIC_CODE_END = MSG_ID_SIM_DSBP_RECONFIGURE_IND,
+MODULE_MSG_END( MSG_ID_SIM_PUBLIC_CODE_TAIL )
+
+   /*------------------------MSG_ID_SIM_PUBLIC_CODE_END -----------------*/
+
+#endif  //_SIM_PUB_MSG_H
diff --git a/mcu/interface/sap/md/simmngr_msgid.h b/mcu/interface/sap/md/simmngr_msgid.h
new file mode 100644
index 0000000..c328bfc
--- /dev/null
+++ b/mcu/interface/sap/md/simmngr_msgid.h
@@ -0,0 +1,71 @@
+/*******************************************************************************
+* Filename:
+* ---------
+*   simmngr_msgid.h
+*
+* Project:
+* --------
+*
+*
+* Description:
+* ------------
+*
+*
+* Author:
+* -------
+ * -------
+*
+*
+* ==========================================================================
+* $Log$
+*
+* 06 15 2017 rong.wang
+* [MOLY00251469] [UMOLY] [Add Module] ssds.
+*
+*
+****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _SIMMNGR_MSGID_H
+#define _SIMMNGR_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_SIMMNGR_CODE_BEGIN )
+    //From users to SIMMNGR
+    MSG_ID_SIMMNGR_FROM_USER_BEGIN = MSG_ID_SIMMNGR_CODE_BEGIN,
+        MSG_ID_SIMMNGR_QUERY_SIM_INFO_REQ,
+        MSG_ID_SIMMNGR_WRITE_SIM_EF_REQ,
+        MSG_ID_SIMMNGR_SIM_AKA_REQ  ,
+        MSG_ID_SIMMNGR_SIM_GBA_AUTH_REQ ,
+        MSG_ID_SIMMNGR_SIM_STATE_CHECK_REQ ,
+        MSG_ID_SIMMNGR_SIM_INSERT_CHECK_REQ ,
+        MSG_ID_SIMMNGR_SIM_TYPE_CHECK_REQ ,
+    MSG_ID_SIMMNGR_FROM_USER_END,
+
+    //SIMMNGR to Users
+    MSG_ID_SIMMNGR_TO_USER_BEGIN,
+        //Response
+        MSG_ID_SIMMNGR_QUERY_SIM_INFO_CNF,
+        MSG_ID_SIMMNGR_WRITE_SIM_EF_CNF,
+        MSG_ID_SIMMNGR_SIM_AKA_CNF  ,
+        MSG_ID_SIMMNGR_SIM_GBA_AUTH_CNF ,
+        MSG_ID_SIMMNGR_SIM_STATE_CHECK_CNF ,
+        MSG_ID_SIMMNGR_SIM_INSERT_CHECK_CNF ,
+        MSG_ID_SIMMNGR_SIM_TYPE_CHECK_CNF ,
+        //Notification
+        MSG_ID_SIMMNGR_SIM_STATE_IND ,
+        MSG_ID_SIMMNGR_SIM_INSERT_IND ,
+        MSG_ID_SIMMNGR_USIM_DETECTED_IND ,
+        MSG_ID_SIMMNGR_ISIM_CH_IND ,
+    MSG_ID_SIMMNGR_TO_USER_END,
+
+    //ATP to SIMMNGR
+    MSG_ID_SIMMNGR_ATP_FROM_ATP_BEGIN,
+        MSG_ID_ATP_SIMMNGR_CMEE_SET_CNF,
+        MSG_ID_ATP_SIMMNGR_CPIN_QUERY_CNF,
+        MSG_ID_ATP_SIMMNGR_ESIMS_QUERY_CNF,
+        MSG_ID_ATP_SIMMNGR_IMEI_QUERY_CNF,
+        MSG_ID_ATP_SIMMNGR_ESIMAPP_QUERY_CNF,
+    MSG_ID_SIMMNGR_ATP_FROM_ATP_END,
+MODULE_MSG_END( MSG_ID_SIMMNGR_CODE_TAIL )
+
+#endif /* _SIMMNGR_MSGID_H */
diff --git a/mcu/interface/sap/md/sm_msgid.h b/mcu/interface/sap/md/sm_msgid.h
new file mode 100644
index 0000000..70b3743
--- /dev/null
+++ b/mcu/interface/sap/md/sm_msgid.h
@@ -0,0 +1,294 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   sm.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   SM 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!
+ * removed!
+ * removed!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _SM_MSG_H
+#define _SM_MSG_H
+
+	/*------------------- SM_MSG_CODE_BEGIN---------------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_SM_CODE_BEGIN )
+	MSG_ID_SMREG_PDP_ACTIVATE_REQ = MSG_ID_SM_CODE_BEGIN,
+	MSG_ID_SMREG_PDP_DEACTIVATE_REQ,
+	MSG_ID_SMREG_PDP_MODIFY_REQ,
+	MSG_ID_SMREG_PDP_ACTIVATE_SEC_REQ,
+	MSG_ID_SM_RATDM_ACTIVATE_CNF,
+	MSG_ID_SM_RATDM_MODIFY_CNF,
+	MSG_ID_SM_RATDM_DEACTIVATE_CNF,
+	MSG_ID_SM_RATDM_STATUS_IND,
+	MSG_ID_SM_NSAPI_MSG_CODE_END = MSG_ID_SM_RATDM_STATUS_IND,
+
+	/* Carlson Lin 2012-04-17 LTE MultiMode */
+
+        MSG_ID_ESM_SM_IRAT_INFO_TRANSFER_REQ, /* ESM->SM : 4G23 context transfer req */
+        MSG_ID_SM_ESM_IRAT_INFO_TRANSFER_CNF, /* ESM->SM : 23G4 context transfer cnf */
+
+	MSG_ID_GMMSM_RAT_CHANGE_IND, // (23G4 start)
+	MSG_ID_L4CSM_RAT_CHANGE_RSP, // (23G4 finish)
+	MSG_ID_GMMSM_RAT_CHANGE_CNF, // (4G23 finish) note: need two stage CNF if IRCCO
+	MSG_ID_L4CSM_RAT_CHANGE_REQ, // (4G23 start)
+	MSG_ID_SM_ESM_EPSB_CONTEXT_TRANSFER_IND, // 4G23 success context transfer: ESM --> SM
+	MSG_ID_ESM_SM_IRAT_INFO_TRANSFER_REQ_FOR_SM_UT, // to verify function: sm_irat_local_activate_lte_transferred_context()
+	//MSG_ID_SM_ESM_EPSB_CONTEXT_TRANSFER_RSP, // 4G23 success context transfer: SM --> ESM
+	MSG_ID_SM_ESM_STANDBY_ON_OLD_RAT_IND, // 4G23 success context transfer : ESM --> SM
+	//MSG_ID_SM_ESM_PDP_CONTEXT_TRANSFER_REQ, // 23G4 success context transfer: SM --> ESM
+	MSG_ID_SM_ESM_PDP_CONTEXT_TRANSFER_CNF, // 23G4 success context transfer : ESM --> SM
+	//MSG_ID_SM_ESM_STANDBY_ON_OLD_RAT_REQ, // 23G4 success context transfer: SM --> ESM
+
+	MSG_ID_SM_TRACE_SMREG_PDP_ACTIVATE_REQ, // print structure to trace
+	MSG_ID_SM_TRACE_SMREG_PDP_ACTIVATE_SEC_REQ, // print structure to trace
+	MSG_ID_SMREG_ALLOW_DL_PACKET_IND,
+	
+        /*Huifeng: PS Swtich msg*/
+        MSG_ID_GMMSM_PS_SWITCH_CONTEXT_TRANSFER_IND,
+        MSG_ID_L4C_SM_PS_SWITCH_CONTEXT_TRANSFER_RSP,
+        MSG_ID_GMMSM_PS_SWITCH_CONTEXT_TRANSFER_CNF,
+        MSG_ID_L4C_SM_PS_SWITCH_CONTEXT_TRANSFER_REQ,
+        MSG_ID_SM_PS_SWITCH_PDP_CONTEXT_TRANSFER_REQ,
+        MSG_ID_SM_PS_SWITCH_PDP_CONTEXT_TRANSFER_CNF,
+        MSG_ID_SM_PS_SWITCH_STANDBY_ON_OLD_RAT_REQ,
+
+      /* Jeff Wu 2007-03-03: RATDM -> SM */
+      MSG_ID_SM_RATDM_RAB_ACTIVATE_CNF,
+      MSG_ID_SM_RATDM_RAB_ACTIVATE_IND,
+      MSG_ID_SM_RATDM_RAB_DEACTIVATE_IND,
+
+    /* SM Core <-> SM Conn */
+    MSG_ID_SM_CONN_SEND_REQ,
+    MSG_ID_SM_CONN_SEND_CNF,
+    MSG_ID_SM_CONN_ABORT_REQ,
+    MSG_ID_SM_CONN_ABORT_CNF,
+    MSG_ID_SM_CONN_ABORT_FAIL,
+    MSG_ID_SM_CONN_SEND_FAIL,
+    MSG_ID_SM_CONN_ERR_IND,
+    MSG_ID_SM_CONN_DETACH_IND,
+    MSG_ID_SM_CONN_CANCEL_NOTIFY,
+    MSG_ID_SM_CONN_IRAT_SYNC_STATE_NOTIFY,
+    MSG_ID_SM_CONN_STOP_ALL_CONN_TIMER_NOTIFY,
+
+    /* SM UT usage */
+    MSG_ID_SM_CORE_UT_TIMER_EXPIRY_IMMEDICATELY,
+    MSG_ID_SM_CONN_UT_TIMER_EXPIRY_IMMEDICATELY,
+    MSG_ID_SM_CONN_UT_CHECK_GV,
+    MSG_ID_SM_CORE_UT_CHECK_GV,
+    MSG_ID_SM_UT_FRIENDLY_UNITDATA_IND,
+    
+	/* 3G, MM -> SM */	
+	MSG_ID_GMMSM_ATTACH_CNF,
+	MSG_ID_GMMSM_ATTACH_REJ,
+	MSG_ID_GMMSM_DETACH_IND,
+	MSG_ID_GMMSM_EST_CNF,
+	MSG_ID_GMMSM_EST_REJ,
+	MSG_ID_GMMSM_ERR_IND,
+	MSG_ID_GMMSM_UNITDATA_CNF,
+
+	MSG_ID_GMMSM_UNITDATA_IND,
+	MSG_ID_GMMSM_SUSPEND_REQ,
+	MSG_ID_GMMSM_RESUME_REQ,
+	MSG_ID_GMMSM_NSAPI_STATUS_IND, //__REL4__
+	MSG_ID_GMMSM_RAT_IND, // When 4G23 irat_type==IR_TYPE_SEARCH, SM need to queue ESM transferred context until receiving GMMSM_RAT_IND. SM only need to process this message when __LTE_RAT__ is on because this message is only used when 4G23 IR_TYPE_SEARCH interRAT
+	MSG_ID_SMREG_PDP_ACTIVATE_REJ_RSP,
+	MSG_ID_SMREG_PDP_ACTIVATE_SEC_REJ_RSP,
+    MSG_ID_SMREG_DUAL_PRIORITY_CONFIG_REQ,
+	
+	MSG_ID_SM_TEST_SM_CALCULATE_HOW_MANY_PDP_ARE_USED, // UT used
+	MSG_ID_GMMSM_CELL_INFO_UPDATE_IND, /* erica 20051229: for egprs */
+    MSG_ID_SM_DSBP_RECONFIGURE_IND,
+#ifdef __GEMINI__
+	MSG_ID_GMMSM_RSIM_AKA_RSIM_ACCESS_FOR_AUTH_DOWNLOAD_REQ,
+	MSG_ID_GMMSM_VIRTUAL_MODE_IND,
+	MSG_ID_SM_CODE_END = MSG_ID_GMMSM_VIRTUAL_MODE_IND,
+#else
+	MSG_ID_SM_CODE_END = MSG_ID_SM_DSBP_RECONFIGURE_IND,
+#endif /*__GEMINI__*/
+
+MODULE_MSG_END( MSG_ID_SM_CODE_TAIL )
+	/*------------------- SM_MSG_CODE_END-----------------------*/
+
+#endif  //_SM_MSG_H
diff --git a/mcu/interface/sap/md/smic_msgid.h b/mcu/interface/sap/md/smic_msgid.h
new file mode 100644
index 0000000..12acdb2
--- /dev/null
+++ b/mcu/interface/sap/md/smic_msgid.h
@@ -0,0 +1,73 @@
+/*****************************************************************************
+*  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).
+*
+*****************************************************************************/
+ 
+/********************************************************************************/
+#include "module_msg_range.h"
+#ifndef _SMIC_MSG_H
+#define _SMIC_MSG_H
+
+/*-----------------------SMIC_MSG_CODE_BEGIN------------------*/
+MODULE_MSG_BEGIN( MSG_ID_SMIC_CODE_BEGIN )
+    MSG_ID_SMIC_MSG_ID_START = MSG_ID_SMIC_CODE_BEGIN,  
+
+    /* NAS_SV */
+    
+    
+    /* TCM */
+    MSG_ID_TCM_SMIC_5G_UE_INFO_DEFINE_REQ,
+    
+    /* SM/ESM */
+    MSG_ID_SMIC_ACTIVE_SM_CHANGE_START_IND,
+    MSG_ID_SMIC_ACTIVE_SM_CHANGE_FINISH_IND,
+    
+    /* ESM */
+    MSG_ID_SMIC_ESM_ACTIVE_RAT_IND,
+    MSG_ID_SMIC_ESM_AS_PARA_UPDATE_NTF_REQ,
+
+    /* VGSM / RAT_TCM / RATDM */
+    MSG_ID_SMIC_ACTIVE_SM_CHANGE_IND,
+    
+    /* DEBUG */
+    MSG_ID_SMIC_DEBUG_ASSERT_HAPPENED,
+    MSG_ID_SMIC_DEBUG_DUMP_COMMON_INFO,
+    MSG_ID_SMIC_DEBUG_DUMP_4G_INFO,
+    MSG_ID_SMIC_DEBUG_DUMP_5G_INFO,
+    MSG_ID_SMIC_DEBUG_FUNCTION_CALL,
+    
+    MSG_ID_SMIC_CODE_END,
+
+MODULE_MSG_END( MSG_ID_SMIC_CODE_TAIL )
+#endif
+/*----------------------- SMIC_MSG_CODE_END--------------------*/
diff --git a/mcu/interface/sap/md/sms_msgid.h b/mcu/interface/sap/md/sms_msgid.h
new file mode 100644
index 0000000..acbe2a9
--- /dev/null
+++ b/mcu/interface/sap/md/sms_msgid.h
@@ -0,0 +1,264 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   sms.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   SMS 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!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _SMS_MSG_H
+#define _SMS_MSG_H
+
+	/*------------------- SMS_MSG_CODE_BEGIN--------------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_SMS_CODE_BEGIN )
+	MSG_ID_GMMSMS_REG_STATE_IND = MSG_ID_SMS_CODE_BEGIN,
+	MSG_ID_LLSMS_UNITDATA_IND,
+	MSG_ID_MMSMS_EST_IND,
+	MSG_ID_MMSMS_EST_CNF,
+	MSG_ID_MMSMS_DATA_IND,
+	MSG_ID_MMSMS_REL_IND,
+	MSG_ID_MMSMS_ERR_IND,
+	MSG_ID_MMSMS_EST_REJ,
+	MSG_ID_SMS_TIMER_EXPIRY,
+	MSG_ID_MMSMS_EST_INTR,
+	MSG_ID_GMMSMS_RAU_STATE_IND,
+    MSG_ID_GMMSMS_CN_DOMAIN_STATE_IND,//Added for SKT Operator KOR REQ ID : 299,328
+	/* 3G */
+	MSG_ID_GMMSMS_EST_CNF,
+	MSG_ID_GMMSMS_EST_REJ,
+	MSG_ID_GMMSMS_ERR_IND,
+	MSG_ID_GMMSMS_UNITDATA_IND,
+
+	/* LTE */
+	MSG_ID_SMS_EVAL_EST_CNF,
+	MSG_ID_SMS_EVAL_EST_REJ,
+	MSG_ID_SMS_EVAL_UNITDATA_IND,
+	MSG_ID_SMS_EVAL_ERR_IND,
+	MSG_ID_SMS_EMM_REG_STATUS_IND,
+
+    /* 5G */
+    MSG_ID_SMS_VGMM_EST_CNF,
+	MSG_ID_SMS_VGMM_EST_REJ,
+	MSG_ID_SMS_VGMM_DATA_IND,
+	MSG_ID_SMS_VGMM_ERR_IND,
+	MSG_ID_SMS_VGMM_REG_STATUS_IND,
+	MSG_ID_SMS_VGMM_STATUS_IND,
+
+	/*MSGS_FROM_SMSAL*/
+	MSG_ID_SMS_SUBMIT,
+	MSG_ID_SMS_SUBMIT_ABORT,
+	MSG_ID_SMS_COMMAND,
+	MSG_ID_SMS_COMMAND_ABORT,
+	MSG_ID_SMS_DELIVER_REPORT_ACK,
+	MSG_ID_SMS_DELIVER_REPORT_NACK,
+	MSG_ID_SMS_SERVICE_REQ,
+	MSG_ID_SMS_MORE_MSG_SEND_REQ,
+	MSG_ID_SMS_TRY_NEXT_BEARER_REQ,
+	MSG_ID_SMS_MEM_AVL_NOTIF,
+	MSG_ID_MMSMS_SYNC_IND,//Add to Enhance performance during handover 
+	MSG_ID_MMSMS_RAT_IND,
+	MSG_ID_SAT_SMS_REFRESH_PERMISSION_REQ,
+	MSG_ID_SMS_ENABLE_SMS_OVER_SGS_IND,
+    MSG_ID_SMS_EVAL_REL_IND,
+    MSG_ID_SMS_EVAL_UNITDATA_CNF,
+	MSG_ID_SMS_SET_STUB_IND,//MTK08505 added for KT operator in korea
+	MSG_ID_L4CSMS_CS_CALL_STATUS_REQ,
+	MSG_ID_SMS_RESET_IND,
+	MSG_ID_L4CSMS_CALL_DOMAIN_IND,
+
+	// from ATP
+    MSG_ID_ATP_SMS_STATUS_REQ,
+    /*MSGS WITH IMCSMS*/
+    MSG_ID_SMS_IMCSMS_MT_LONG_SMS_INFO_IND,//IMCSMS to SMS
+    MSG_ID_IMCSMS_SMS_MT_LONG_SMS_INFO_IND,//SMS to IMCSMS
+	MSG_ID_SMS_DUMP_CONTEXT_IND,
+	MSG_ID_SMS_CODE_END = MSG_ID_SMS_DUMP_CONTEXT_IND,
+
+MODULE_MSG_END( MSG_ID_SMS_CODE_TAIL )
+	/*------------------- SMS_MSG_CODE_END----------------------*/
+
+#endif  //_SMS_MSG_H
diff --git a/mcu/interface/sap/md/sndcp_msgid.h b/mcu/interface/sap/md/sndcp_msgid.h
new file mode 100644
index 0000000..2021f31
--- /dev/null
+++ b/mcu/interface/sap/md/sndcp_msgid.h
@@ -0,0 +1,195 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   sndcp.sap
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   SNDCP 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+
+/********************************************************************************
+*  Copyright Statement:
+*  --------------------
+*
+*  This product has been developed using a protocol stack
+*  developed by Sasken Communication Technologies Limited.
+*
+********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _SNDCP_MSG_H
+#define _SNDCP_MSG_H
+
+    /*------------------------SND_MSG_CODE_BEGIN ---------------*/
+    /*Not verify yet.*/
+
+MODULE_MSG_BEGIN( MSG_ID_SND_CODE_BEGIN )
+    MSG_ID_SN_DATA_REQ = MSG_ID_SND_CODE_BEGIN,
+    MSG_ID_SN_UNITDATA_REQ,
+    MSG_ID_SN_XID_REQ,
+
+    /* Robert comment start  */
+    /* Don't modify following message sequence. */
+    /* SNDCP checks sapi in snd_main() function. */
+    MSG_ID_LLSND_UNITDATA_IND,
+    MSG_ID_LLSND_XID_IND,
+    MSG_ID_LLSND_XID_CNF,
+    MSG_ID_LLSND_DATA_IND,
+    MSG_ID_LLSND_DATA_CNF,
+    MSG_ID_LLSND_ESTABLISH_IND,
+    MSG_ID_LLSND_ESTABLISH_CNF,
+    MSG_ID_LLSND_RELEASE_IND,
+    MSG_ID_LLSND_RELEASE_CNF,
+    MSG_ID_LLSND_STATUS_IND,
+    /* Robert comment end  */
+
+    MSG_ID_LLSND_RESET_IND,
+    MSG_ID_LLSND_T100_RESET_IND, /* Eric Hsieh: for PSHO */
+    MSG_ID_SNDCP_LLC_RAT_LEAVE_REQ, /* Eric Hsieh: for MSG_ID_RATDM_SNDCP_RAT_LEAVE_REQ handling, RATDM-refactor */
+    MSG_ID_LLSND_FLUSH_CNF,
+
+    MSG_ID_SNSM_ACTIVATE_IND,
+    MSG_ID_SNSM_DEACTIVATE_IND,
+    MSG_ID_SNSM_MODIFY_IND,
+    MSG_ID_SNSM_SEQUENCE_IND,
+    MSG_ID_SNSM_CELL_INFO_UPDATE_IND, /* erica 20051229: for egprs */
+
+    MSG_ID_SND_FLC_SUSPEND_RESUME,
+    MSG_ID_SND_ACTIVATE_IND,
+    MSG_ID_SND_ACTIVATE_RSP,
+    MSG_ID_SND_DEACTIVATE_IND,
+    MSG_ID_SND_DEACTIVATE_RSP,
+    MSG_ID_SND_MODIFY_EST,
+    MSG_ID_SND_MODIFY_EST_RSP,
+    MSG_ID_SND_MODIFY_REL,
+    MSG_ID_SND_MODIFY_REL_RSP,
+    MSG_ID_SND_UNITDATA_IND,
+    MSG_ID_SND_UNITDATA_TX_REQ,
+    MSG_ID_SND_DATA_IND,
+    MSG_ID_SND_DATA_TX_REQ,
+    MSG_ID_SND_RESET_IND,
+    MSG_ID_SND_DATA_ERROR,
+    MSG_ID_SND_COMPRESS_RSP,
+    MSG_ID_SND_DECOMPRESS_RSP,
+    MSG_ID_SND_FLC_DATA_RESUME_PPP,
+
+    /* Jeff Wu 2007-03-03: RATDM -> SNDCP */
+    MSG_ID_RATDM_SNDCP_ACTIVATE_REQ,
+    MSG_ID_RATDM_SNDCP_DATA_REQ,
+    MSG_ID_RATDM_SNDCP_MODIFY_REQ,
+    MSG_ID_RATDM_SNDCP_DEACTIVATE_REQ,
+    MSG_ID_RATDM_SNDCP_SEQUENCE_REQ,
+    MSG_ID_RATDM_SNDCP_RAT_ENTER_REQ,
+    MSG_ID_RATDM_SNDCP_RAT_LEAVE_REQ,
+
+    MSG_ID_SOC_SND_DL_SRPDU_RESUME,
+    MSG_ID_SND_NPDU_INQUEUE_IND, //erica 20060320
+    MSG_ID_SND_CODE_END = MSG_ID_SND_NPDU_INQUEUE_IND,
+
+MODULE_MSG_END( MSG_ID_SND_CODE_TAIL )
+/*------------------------SND_MSG_CODE_END -----------------*/
+
+#endif  //_SNDCP_MSG_H
diff --git a/mcu/interface/sap/md/ssds_msgid.h b/mcu/interface/sap/md/ssds_msgid.h
new file mode 100644
index 0000000..db70539
--- /dev/null
+++ b/mcu/interface/sap/md/ssds_msgid.h
@@ -0,0 +1,158 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   ssds_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *
+ * Author:
+ * -------
+ *   
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 04 21 2022 panu.peisa
+ * [MOLY00781592] 【STR4】2698405: 【212A1】【DE】【OM】【FT】【Vodafone】【SA USSD】【运营商送测】DUT run USSD fail under SA 5G
+ * 	
+ * ERAT Configuration and Message ID's.
+ *
+ * 01 06 2020 xiaoting.wang
+ * [MOLY00469135] [Gen97][SAT] STKSS over XCAP.
+ *
+ * 12 02 2019 xiaoting.wang
+ * [MOLY00438070] [Gen97][IMS] STKCALL and STKUSSD over IMS[SSDS common file].
+ *
+ * 10 25 2019 xiaoting.wang
+ * [MOLY00454524] [Rose][Petrus]BSP+][Q0]The DUT will have not pup up FDN toast "Your phone app's fixed dialing number setting is turned on.As a result,some call-related features aren't working"(5/5).
+ *
+ * 09 25 2019 tingwen.chen
+ * [MOLY00438070] [Gen97][IMS] STKCALL and STKUSSD over IMS (SWRD)
+ *     - STKUSSD over IMS, SIM/L4 part
+ *     - Show MMI info to user in default
+ *
+ * 04 26 2019 ya.li
+ * [MOLY00398566] [MT6297][SSDS]patch back UMOLYE's modifications to VMOLY branch
+ * 	
+ * 	.
+ *
+ * 06 14 2018 cs.huang
+ * [MOLY00333058] [XCAP] XCAP check-in
+ * interface
+ *
+ * 03 30 2018 ya.li
+ * [MOLY00313100] [Rose][Cervino][O1][BSP+]The device will popup "Network or SIM card error".(5/5)-SAP part
+ * 	
+ * 	.
+ *
+ * 11 29 2017 xiaoting.wang
+ * [MOLY00292245] [SSDS]patch back R2 modifcation to R3 branch.
+ *
+ * 11 29 2017 xiaoting.wang
+ * [MOLY00292245] [SSDS]patch back R2 modifcation to R3 branch.
+ *
+ * 11 29 2017 xiaoting.wang
+ * [MOLY00292245] [SSDS]patch back R2 modifcation to R3 branch.
+ *
+ * 11 29 2017 xiaoting.wang
+ * [MOLY00292245] [SSDS]patch back R2 modifcation to R3 branch
+ * .
+ *
+ ****************************************************************************/
+
+#ifndef _SSDS_MSGID_H_
+#define _SSDS_MSGID_H_
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_SSDS_CODE_BEGIN )
+
+        /*ATP -> SSDS*/
+        MSG_ID_ATP_SSDS_SS_ATCMD_REQ=MSG_ID_SSDS_CODE_BEGIN,       /*SS atcmd request*/    
+        MSG_ID_ATP_SSDS_EGBA_ATCMD_REQ,                            /*Trigger GBA*/
+        MSG_ID_ATP_SSDS_ECNCFG_ATCMD_REQ,                          /*For mobile data/roaming data setting*/        
+        MSG_ID_ATP_SSDS_ESRVSTATE_ATCMD_REQ,                       /*For data roaming type*/        
+        MSG_ID_ATP_SSDS_ECFGSET_ATCMD_REQ,                         /*For CT volte setting*/          
+
+        MSG_ID_ATP_SSDS_SS_URC_REQ,                                /*URC request*/   
+        MSG_ID_ATP_SSDS_CIREGU_URC_REQ,                            /*URC: IMS registered state*/        
+        MSG_ID_ATP_SSDS_XUI_INFO_REQ,                              /*XUI information request*/
+        MSG_ID_ATP_SSDS_IMS_REG_STATUS_REQ,                        /*IMS registration status*/
+        MSG_ID_ATP_SSDS_PS_REG_STATUS_REQ,
+
+        MSG_ID_ATP_SSDS_SS_ATCMD_REDIRECT_CNF,  
+        MSG_ID_SSDS_DSBP_RECONFIGURE_IND,
+        
+        /*ATP -> SSDS (USSD)*/
+        MSG_ID_ATP_SSDS_USSD_ATCMD_REQ,                           /*USSD atcmd request*/          
+        MSG_ID_ATP_SSDS_USSD_ATCMD_REDIRECT_CNF, 
+        MSG_ID_ATP_SSDS_USSD_ATCMD_REDIRECT_IND,
+        MSG_ID_ATP_SSDS_STKUSSD_ATCMD_REQ,
+        
+        MSG_ID_ATP_SSDS_STKSS_ATCMD_REQ,
+
+        MSG_ID_SSDS_NOTIFY_OTHER_SIM_REL_PDN_CONN_IND,
+        MSG_ID_SSDS_NOTIFY_OTHER_SIM_REL_PDN_CONN_RSP,
+        MSG_ID_ATP_SSDS_ERAT_QUERY_CNF,                           /*SSDS receive +ERAT, OK*/
+        MSG_ID_ATP_SSDS_ERAT_SET_CNF,                             /*SSDS receive OK*/
+    
+        /*XCAP -> SSDS */
+        MSG_ID_SSDS_XCAP_SS_INIT_IND,
+        MSG_ID_SSDS_XCAP_SS_ATCMD_CNF,
+        MSG_ID_SSDS_XCAP_SS_CSFB_START_CNF,
+        MSG_ID_SSDS_XCAP_STKSS_CNF,
+
+        /*IMC -> SSDS */
+        MSG_ID_SSDS_IMC_USSD_ATCMD_CNF,
+        MSG_ID_SSDS_IMC_USSD_ATCMD_IND,
+
+        /*L4C -> SSDS */
+        MSG_ID_SSDS_L4C_FDN_CHECK_CNF,
+        MSG_ID_SSDS_L4C_NW_FEATURE_IND,
+        MSG_ID_SSDS_L4C_STK_IMS_USSD_CONFIG_CNF,
+        MSG_ID_SSDS_L4C_STK_CS_USSD_END_IND,
+        MSG_ID_SSDS_L4C_STKSS_CONFIG_CNF,
+        MSG_ID_SSDS_L4C_STKSS_CS_END_IND,
+
+MODULE_MSG_END( MSG_ID_SSDS_CODE_TAIL )
+#endif /* _SSDS_MSGID_H_ */
diff --git a/mcu/interface/sap/md/stub_msgid.h b/mcu/interface/sap/md/stub_msgid.h
new file mode 100644
index 0000000..caf94a2
--- /dev/null
+++ b/mcu/interface/sap/md/stub_msgid.h
@@ -0,0 +1,138 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+
+  FILE NAME:  stub_msgid.h
+
+  DESCRIPTION:
+
+    This file contains the defenitions of all the STUB msg id's.
+
+*****************************************************************************/
+
+#ifndef _STUB_MSGID_H_
+#define _STUB_MSGID_H_
+
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#include "module_msg_range.h"
+
+#undef MSGID_SET
+#undef MSGID_NEXT
+
+#define MSGID_SET(name, val) MSG_ID_##name = val
+#define MSGID_NEXT(name) MSG_ID_##name
+
+
+
+/* Messages handled by STUB task
+
+*/
+MODULE_MSG_BEGIN(MSG_ID_STUB_CODE_BEGIN)
+
+
+    /* STUB segment */
+    MSGID_SET(CBS_RAT_MODE_STATUS_IND , MSG_ID_STUB_CODE_BEGIN),
+    MSGID_NEXT(CBS_CHANNEL_CONFIG_IND),
+    MSGID_NEXT(EL1_RAT_MODE_STATUS_IND),
+    MSGID_NEXT(EL1_ACTIVE_MEASURE_INFO_IND),
+    MSGID_NEXT(EL1_STANDBY_MEASURE_REQ),
+    MSGID_NEXT(EL1_AUTO_GAP_AVAILABLE_IND),
+    MSGID_NEXT(EL1_AUTO_GAP_FAIL),  
+    MSGID_NEXT(EL1_STOP_GAP_IND),
+    MSGID_NEXT(EL1_SUSPEND_GAP_IND),
+    MSGID_NEXT(EL1_RESUME_GAP_IND),
+    MSGID_NEXT(EL1_MMO_GAP_LENGTH_IND),
+    MSGID_NEXT(STUB_LL1A_RMC_RAT_STATUS_IND_MSG),
+    MSGID_NEXT(STUB_LL1A_IDP_SIGNAL_PROTECT_STATUS_IND),
+    MSGID_NEXT(STUB_LL1A_PSW_SIGNAL_PROTECT_STATUS_IND),
+    MSGID_NEXT(EVDO_ACTIVE_MODE_STATUS_IND),
+    MSGID_NEXT(EL1_STANDBY_SRCIPT_MEAS_REPORT),
+    MSGID_NEXT(LL1STUB_CBS_CHANNEL_NOTIFY_IND),
+    MSGID_NEXT(EVDO_ACTIVE_GAP_OFFER),
+    MSGID_NEXT(EVDO_ACTIVE_GAP_STOP_REQ),
+    MSGID_NEXT(EVDO_SLEEP_IND),
+    MSGID_NEXT(EVDO_WAKEUP_IND),
+    MSGID_NEXT(RTT_SLEEP_IND),
+    MSGID_NEXT(RTT_WAKEUP_IND),
+    MSGID_NEXT(LTE_ACTIVE_GAP_STOP_IND_CHECK),
+    MSGID_NEXT(EVDO_ACTIVE_SLT_PCH_DENIED),
+    MSGID_NEXT(EVDO_RTB_DENY_IND),
+    MSGID_NEXT(EVDO_RTB_PREMPT_IND),
+    MSGID_NEXT(EVDO_RTB_RESUME_IND),
+    MSGID_NEXT(EVDO_HSC_PREMPT_IND),
+    MSGID_NEXT(EVDO_HSC_RESUME_IND),
+    MSGID_NEXT(EVDO_CELL_SWITH_IND),
+    MSGID_NEXT(EVDO_ICS_INITACQ_REGCHANEL_WITH_AFC_IND),
+    MSGID_NEXT(EVDO_ICS_INITACQ_REGCHANEL_WITHOUT_AFC_IND),
+    MSGID_NEXT(EVDO_CGI_ACQ_START_IND),
+    MSGID_NEXT(EVDO_MPSR_START_IND),
+    MSGID_NEXT(EVDO_MPSR_END_IND),
+    MSGID_NEXT(STUB_HSC_SIB8_TIMING_CONFIG_REQ),
+    MSGID_NEXT(STUB_HSC_SIB8_TIMING_SYNC_REQ),
+    MSGID_NEXT(STUB_HSC_SIB8_TIMING_SYNC_CNF),
+
+    MSGID_NEXT(MSG_CL1_FR_UT_TRIG),
+    MSGID_NEXT(FR_UT_CASE_PASS_REPORT),
+    MSGID_NEXT(CL1_NWSIM_UT_TEST_TRIG),
+    MSGID_NEXT(CL1_NWSIM_UT_TEST_REPORT),
+
+    MSGID_NEXT(EVSTANDBY_SCRIPT_CELL_MEAS_REQ),
+    MSGID_NEXT(EVSTANDBY_SCRIPT_ACQ_CGI_REQ),
+    MSGID_NEXT(XL1_SCRIPT_L1D_TEST_CASE_MSG),
+
+    MSGID_NEXT(CL1_UT_TRIG),
+    MSGID_NEXT(CL1_UT_RLT_RPT),
+    MSGID_NEXT(L1_IT_STEP_PASS),    
+    MSGID_NEXT(L1_IT_1XSYNC_PASS),
+    MSGID_NEXT(L1_IT_ACCESS_MEAS_PASS),
+    MSGID_NEXT(L1_IT_PCH_REC_PASS),
+    MSGID_NEXT(L1_IT_IDLE_MEAS_PASS),
+    MSGID_NEXT(L1_IT_TRAFFIC_MEAS_PASS),
+    MSGID_NEXT(L1_IT_IDLE_DFS_PASS),
+    MSGID_NEXT(L1_IT_MINI_ACQ_PASS),
+    MSGID_NEXT(L1_IT_DFS_MEAS_DONE),    
+    MSGID_NEXT(LL1A_SCRIPT_LTE_SCAN_C2K_ACTIVE_PARAMS_IND),
+    MSGID_NEXT(LL1A_SCRIPT_PS_MMO_SIGNAL_PROTECT_IND),
+    MSGID_NEXT(LL1STUB_SCRIPT_RSVAS_SUSPEND_RESUME_IND),
+MODULE_MSG_END(MSG_ID_STUB_CODE_TAIL)
+
+
+/*****************************************************************************
+* End of File
+*****************************************************************************/
+#endif
diff --git a/mcu/interface/sap/md/supl_msgid.h b/mcu/interface/sap/md/supl_msgid.h
new file mode 100644
index 0000000..c812f5c
--- /dev/null
+++ b/mcu/interface/sap/md/supl_msgid.h
@@ -0,0 +1,158 @@
+/*****************************************************************************
+*  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) 2006
+*
+*  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:
+ * ---------
+ *   supl_sap.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file is defines SAP for SUPL related service.
+ *
+ * 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!
+ *
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *==============================================================================
+ *******************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _SUPL_MSG_H
+#define _SUPL_MSG_H
+
+#if 0 /* for HAL */
+/* under construction !*/
+#ifdef __BUILD_DOM__
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+ #endif
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#ifdef __BUILD_DOM__
+/* under construction !*/
+#endif
+/* under construction !*/
+#endif /* if 0 for HAL */
+
+#ifdef __BUILD_DOM__
+/**************************************
+ * <GROUP Messages >
+ *
+ * SUPL_LCSP SAP primitives
+ *************************************/
+ typedef enum{
+#endif
+MODULE_MSG_BEGIN( MSG_ID_SUPL_MSG_CODE_BEGIN )
+    MSG_ID_SUPL_LCSP_DATA_IND = MSG_ID_SUPL_MSG_CODE_BEGIN, /* SUPL uses this message to notify LCSP modules incoming data. */
+    MSG_ID_SUPL_LCSP_DATA_RSP, /* LCSP modules use this message to notify SUPL the result after processing the incoming data */
+    MSG_ID_SUPL_LCSP_DATA_REQ, /* LCSP modules use this message to ask SUPL to send the request to server. */
+    MSG_ID_SUPL_LCSP_DATA_CNF, /* SUPL uses this message to notify LCSP modules the result of sending request. */
+    MSG_ID_LCSP_START_REQ,
+    MSG_ID_LCSP_END_REQ,
+    MSG_ID_SUPL_LCSP_ABORT_REQ,
+#ifdef __BUILD_DOM__
+} sap_supl_lcsp_enum;
+#endif
+
+    /* Internal Messages */
+    MSG_ID_SUPL_CONN_SEND_REQ,
+    MSG_ID_SUPL_CONN_SEND_CNF,
+    MSG_ID_SUPL_CONN_RECV_IND,
+    MSG_ID_SUPL_CONN_FAIL_IND,
+MODULE_MSG_END( MSG_ID_SUPL_MSG_CODE_TAIL )
+
+#endif  //_SUPL_MSG_H
diff --git a/mcu/interface/sap/md/tftlib_msgid.h b/mcu/interface/sap/md/tftlib_msgid.h
new file mode 100644
index 0000000..29f8dda
--- /dev/null
+++ b/mcu/interface/sap/md/tftlib_msgid.h
@@ -0,0 +1,353 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   tftlib_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   TFT library related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 08 12 2020 terence.kuo
+ * [MOLY00557318] [MT6875][Margaux][Q0][R3][MP6][SQC][Internal][WW FT][China][Quzhou][5GMM][MDST][SWIFT][S][CMCC+Invalid][Error times:1]System API Dump,1165,29,99,/data/vendor/core/,1,,mtkrild:AT command pending too long. assert!!! AT cmd: EAPNACT.timer: 900000ms
+ * . Add message for the new api which constructs context for default bearer wo tft.
+ *
+ * 04 15 2020 terence.kuo
+ * [MOLY00508241] Memory reduction - l4 ps cid reduction and reduce maximum number of support flow
+ * . Add primitive traces for pdu session/ bearer info statistics.
+ *
+ * 04 06 2020 terence.kuo
+ * [MOLY00508241] Memory reduction - l4 ps cid reduction and reduce maximum number of support flow
+ * . Add primitive traces to record current applied qr/ tft status for analysis.
+ *
+ * 09 19 2019 terence.kuo
+ * [MOLY00441107] [Gen97] USIR and related changes
+ * . USIR support in tftlib.
+ *
+ * 09 04 2019 terence.kuo
+ * [MOLY00434754] Upgrade CGTFT to support 5GC
+ * 	
+ * . Update tftlib_msgid.h
+ *
+ * 03 26 2019 jeffery.chen
+ * [MOLY00393456] [Gen97][VMOLY] 45G InterRAT & interSystem feature
+ * 	
+ * 	(SWRD) SAP part.
+ *
+ * 12 14 2018 jeffery.chen
+ * [MOLY00372635] [VMOLY] L4/TCM/TFTLIB/VGSM phase2 check-in
+ * 	
+ * 	[TFTLIB] phase2 check-in.
+ *
+ * 10 19 2016 renhuang.liu
+ * [MOLY00203260] [TFTLIB] Logging mechanism refinement
+ * 93 TFTLIB re-arch 4
+ *
+ * 10 16 2016 renhuang.liu
+ * [MOLY00205035][TFTLIB] Memory management in TFT internal
+ *
+ * 09 26 2016 vera.yeh
+ * [MOLY00205116] [6293][ESM][TFTLIB] new feature/re-arch item porting to UMOLYA trunk
+ * [TFTLIB][OA] PS.DEV porting to UMOLYA.Trunk.
+ * 	1. TFTLIB UT enhancement
+ * 	2. UL_PF_CHECK
+ *
+ * 11 18 2013 joe.chang
+ * [MOLY00045033] [MOLY][SM][ESM][TCM][TFT][Custom] NRSPCA(NISPCA) Network Requested/Initiated Secondary PDP Context Activation
+ * Check-in TFTLIB part
+ *
+ * 10 31 2013 joe.chang
+ * [MOLY00044423] [MT6290] New TFT AT command development merge back to MOLY
+ * check in TFTLIB related change
+ *
+ * 06 10 2013 joe.chang
+ * [MOLY00025286] [MT7208][NW-UE SIM] [TC 10.8.1] AT+CGCMOD Error due to TFT compose issue
+ * TFTLIB modification for AT+CGTFT interpretation (support both difference set & full set)
+ *
+ * 05 27 2013 joe.chang
+ * [MOLY00023789] [MT6290][TFTLIB] New architecture & EM support
+ * TFTLIB part check-in
+ *
+ * 11 07 2012 joe.chang
+ * [MOLY00005322] TATAKA merge to MOLY
+ * [Joe] TFTLIB part is check in done.
+ ****************************************************************************/
+
+#ifndef TFTLIB_MSGID_H_
+#define TFTLIB_MSGID_H_
+
+#include "module_msg_range.h"
+
+/*---------------TFTLIB_MSG_CODE_BEGIN---------------*/
+
+MODULE_MSG_BEGIN( MSG_ID_TFTLIB_CODE_BEGIN )
+
+MSG_ID_TFTLIB_MSG_BEGIN = MSG_ID_TFTLIB_CODE_BEGIN,
+
+//#ifdef __TFTLIB_UT__
+
+MSG_ID_TFTLIB_TFT_DECODE,
+MSG_ID_TFTLIB_TFT_ENCODE,
+MSG_ID_TFTLIB_TFT_VALIDATE,
+MSG_ID_TFTLIB_TFT_DIR_EXTRACT,
+
+MSG_ID_TFTLIB_SET_APPLIED_TFT,
+MSG_ID_TFTLIB_COMPOSE_TFT_TO_NW,
+MSG_ID_TFTLIB_DEL_TFT,
+MSG_ID_TFTLIB_DEL_ALL_TFT,
+
+MSG_ID_TFTLIB_GET_USER_DEFINED_TFT,
+MSG_ID_TFTLIB_GET_APPLIED_TFT,
+MSG_ID_TFTLIB_GET_APPLIED_QR,
+MSG_ID_TFTLIB_SET_USER_DEFINED_TFT,
+
+MSG_ID_TFTLIB_SET_USR_DELPF,
+MSG_ID_TFTLIB_GET_USR_DELPF,
+MSG_ID_TFTLIB_CLEAR_USR_DELPF,
+
+MSG_ID_TFTLIB_SET_USR_LNKPF,
+MSG_ID_TFTLIB_GET_USR_LNKPF,
+MSG_ID_TFTLIB_CLEAR_USR_LNKPF,
+
+MSG_ID_TFTLIB_DEFINE_EPSB_CONTEXT,
+MSG_ID_TFTLIB_ACT_EPSB_CONTEXT,
+
+MSG_ID_TFTLIB_COMPOSE_AND_ENCODE_QRS_TO_NW,
+MSG_ID_TFTLIB_COMPOSE_AND_ENCODE_DEACT_QR_LIST_TO_NW,
+MSG_ID_TFTLIB_SET_CID_FOR_APPLIED_QR,
+MSG_ID_TFTLIB_SET_CID_FOR_APPLIED_TFT,
+MSG_ID_TFTLIB_QRS_PRECHECK,
+MSG_ID_TFTLIB_QR_DECODE,
+MSG_ID_TFTLIB_SET_APPLIED_QR,
+MSG_ID_TFTLIB_RQOS_SET_APPLIED_QR,
+MSG_ID_TFTLIB_QR_GET_PF_ACT_LIST,
+MSG_ID_TFTLIB_TFT_GET_PF_ACT_LIST,
+MSG_ID_TFTLIB_QF_HAS_ANY_RULE,
+MSG_ID_TFTLIB_DEL_APPLIED_TFT_OR_QR,
+MSG_ID_TFTLIB_SET_APPLIED_TFT_BY_EBI,
+MSG_ID_TFTLIB_UPDATE_DEACT_QR_LIST_TO_DEL_QF,
+MSG_ID_TFTLIB_GENERIC_API_REQ,
+MSG_ID_TFTLIB_RQOS_SET_TIMER,
+MSG_ID_TFTLIB_IPFC_RQOS_ENABLE,
+MSG_ID_TFTLIB_USIR_HANDLE,
+MSG_ID_TFTLIB_RQOS_GET_RULE,
+MSG_ID_TFTLIB_CONSTRUCT_CONTEXT_FOR_DEFAULT_BEARER_WO_TFT,
+
+//#endif // __TFTLIB_UT__
+
+
+// --> EXEC_RESULT MSG
+MSG_ID_TFTLIB_TFT_DECODE_EXEC_RESULT,
+MSG_ID_TFTLIB_TFT_ENCODE_EXEC_RESULT,
+MSG_ID_TFTLIB_QRS_ENCODE_EXEC_RESULT,
+
+MSG_ID_TFTLIB_SET_APPLIED_TFT_EXEC_RESULT,
+MSG_ID_TFTLIB_SET_APPLIED_QR_EXEC_RESULT,
+MSG_ID_TFTLIB_RQOS_SET_APPLIED_QR_EXEC_RESULT,
+MSG_ID_TFTLIB_COMPOSE_TFT_TO_NW_EXEC_RESULT,
+
+MSG_ID_TFTLIB_CURRENT_TFT_CONTEXT_STATUS,
+MSG_ID_TFTLIB_PDU_SESSION_INFO,
+MSG_ID_TFTLIB_BEARER_INFO,
+
+MSG_ID_TFTLIB_SET_USER_DEFINED_TFT_EXEC_RESULT,
+
+MSG_ID_TFTLIB_PF_AND_MEM_ALLOC_UPDATE_STATUS,
+
+MSG_ID_TFTLIB_GENERIC_EXEC_RESULT,
+MSG_ID_TFTLIB_QF_HAS_ANY_RULE_EXEC_RESULT,
+MSG_ID_TFTLIB_UPDATE_DEACT_QR_LIST_TO_DEL_QF_EXEC_RESULT,
+MSG_ID_TFTLIB_GET_APPLIED_TFT_QR_EXEC_RESULT,
+MSG_ID_TFTLIB_GET_DEFINED_TFT_QR_EXEC_RESULT,
+MSG_ID_TFTLIB_SET_CID_FOR_APPLIED_QR_EXEC_RESULT,
+MSG_ID_TFTLIB_SET_CID_FOR_APPLIED_TFT_EXEC_RESULT,
+MSG_ID_TFTLIB_RQOS_SET_TIMER_EXEC_RESULT,
+MSG_ID_TFTLIB_RQOS_ADD_RULE_EXEC_RESULT,
+MSG_ID_TFTLIB_CONSTRUCT_CONTEXT_FOR_DEFAULT_BEARER_WO_TFT_EXEC_RESULT,
+// <-- EXEC_RESULT MSG
+
+
+MSG_ID_TFTLIB_RQOS_ADD_RULE_IND,
+MSG_ID_TFTLIB_RQOS_DEL_RULES_IND,
+
+MSG_ID_TFTLIB_DEBUG_TIMER_STARTED,
+MSG_ID_TFTLIB_DEBUG_TIMER_STOPPED,
+MSG_ID_TFTLIB_DEBUG_TIMER_EXPIRED,
+
+/* Set TFTLIB context message id */
+
+MSG_ID_TFTLIB_SET_MTK_AP_STATUS_REQ,
+
+MSG_ID_TFTLIB_ENABLE_PRIM_LOG_REQ,
+
+/* EM message id */
+
+MSG_ID_TFTLIB_ENABLE_EM_INFO_REQ,
+
+MSG_ID_EM_TFTLIB_APPLIED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI5_APPLIED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI6_APPLIED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI7_APPLIED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI8_APPLIED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI9_APPLIED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI10_APPLIED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI11_APPLIED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI12_APPLIED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI13_APPLIED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI14_APPLIED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI15_APPLIED_TFT_UPDATE_IND,
+
+
+MSG_ID_EM_TFTLIB_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID0_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID1_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID2_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID3_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID4_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID5_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID6_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID7_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID8_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID9_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID10_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID11_USER_DEFINED_TFT_UPDATE_IND,
+
+
+MSG_ID_EM_TFTLIB_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI5_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI6_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI7_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI8_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI9_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI10_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI11_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI12_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI13_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI14_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_EBI15_NW_ASSIGNED_TAD_UPDATE_IND,
+
+
+MSG_ID_EM_TFTLIB_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID0_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID1_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID2_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID3_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID4_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID5_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID6_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID7_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID8_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID9_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID10_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_EM_TFTLIB_CID11_UE_COMPOSED_TAD_UPDATE_IND,
+
+
+MSG_ID_TFTLIB_APPLIED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_EBI5_APPLIED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_EBI6_APPLIED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_EBI7_APPLIED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_EBI8_APPLIED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_EBI9_APPLIED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_EBI10_APPLIED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_EBI11_APPLIED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_EBI12_APPLIED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_EBI13_APPLIED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_EBI14_APPLIED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_EBI15_APPLIED_TFT_UPDATE_IND,
+
+
+MSG_ID_TFTLIB_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID0_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID1_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID2_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID3_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID4_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID5_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID6_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID7_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID8_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID9_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID10_USER_DEFINED_TFT_UPDATE_IND,
+MSG_ID_TFTLIB_CID11_USER_DEFINED_TFT_UPDATE_IND,
+
+
+MSG_ID_TFTLIB_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_EBI5_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_EBI6_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_EBI7_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_EBI8_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_EBI9_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_EBI10_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_EBI11_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_EBI12_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_EBI13_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_EBI14_NW_ASSIGNED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_EBI15_NW_ASSIGNED_TAD_UPDATE_IND,
+
+
+MSG_ID_TFTLIB_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID0_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID1_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID2_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID3_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID4_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID5_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID6_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID7_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID8_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID9_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID10_UE_COMPOSED_TAD_UPDATE_IND,
+MSG_ID_TFTLIB_CID11_UE_COMPOSED_TAD_UPDATE_IND,
+
+
+MSG_ID_TFTLIB_MSG_END,
+
+MODULE_MSG_END( MSG_ID_TFTLIB_CODE_TAIL )
+
+
+#endif /* TFTLIB_MSGID_H_ */
diff --git a/mcu/interface/sap/md/tl1_msgid.h b/mcu/interface/sap/md/tl1_msgid.h
new file mode 100644
index 0000000..6570af0
--- /dev/null
+++ b/mcu/interface/sap/md/tl1_msgid.h
@@ -0,0 +1,484 @@
+/*****************************************************************************
+*  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) 2009
+*
+*  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:
+ * --------------------------------------------------------
+ *   tl1_sap.h
+ *
+ * Project:
+ * --------------------------------------------------------
+ *   
+ *
+ * Description:
+ * --------------------------------------------------------
+ *   
+ *
+ * Author:
+ * --------------------------------------------------------
+ * -------
+ *
+ * --------------------------------------------------------
+ * $Log$
+ *
+ * 10 31 2018 yuhhwang.yu
+ * [MOLY00361478] [Gen97] Gemini Compile Option Clean Up
+ * .
+ *
+ * 08 14 2018 yuhhwang.yu
+ * [MOLY00345860] [RSVAS] GEN97.DEV merge to VMOLY
+ * .
+ *
+ * 06 20 2018 cruze.yu
+ * [MOLY00285698] [93/95 re-arch][TL1] Modify tl1 code and folder for 93/95 co-codebase
+ * 	
+ * 	.
+ *
+ * 11 17 2017 cruze.yu
+ * [MOLY00288671] [MT6295][MML1 DCLC] Dynamic cache lock central control development
+ * 	
+ * 	.
+ *
+ * 10 22 2015 yunlong.li
+ * [MOLY00139750] [MT6755][TDD]
+ * .add tl1_l1adt_enter_tdd_mode_ind
+ *
+ * 08 04 2015 yunlong.li
+ * [MOLY00135310] [TK6291][E1EVB] [ADT]add adt feature
+ * 	.add adt feature
+ *
+ * 04 29 2015 rong.yang
+ * [MOLY00109047] [UMOLY][new feature] Pich false alarm Optimization
+ * .
+ *
+ * 04 16 2015 chuansheng.zhang
+ * [MOLY00097620] [TK6291][UBin] TL1 Platform Patch
+ * TL1: Ubin Phase2 code merge.
+ *
+ * 01 07 2015 marco.zhang
+ * [MOLY00086950] UMOLY TL1 MAINTAIN
+ * .
+ *
+ * 01 05 2015 marco.zhang
+ * [MOLY00086950] UMOLY TL1 MAINTAIN
+ * 	.
+ *
+ * 01 05 2015 marco.zhang
+ * [MOLY00086950] UMOLY TL1 MAINTAIN
+ * 	.
+ *
+ * 12 29 2014 marco.zhang
+ * [MOLY00086950] UMOLY TL1 MAINTAIN
+ * 	msg id frefix.
+ *
+ * 01 21 2014 wcpuser_integrator
+ * [MOLY00054475] SGLTE option rename
+ * .
+ *
+ * 11 13 2013 shouzhu.zhang
+ * [MOLY00045069] [TL1C][Volunteer Patch] Standby Measurement FSCS opt
+ * Check in MMDC Band3 Band39 co-exist feature.
+ *
+ * 04 09 2013 ast00029
+ * [MOLY00013377] [TDD128][ESL][MOLY]check-in ESL code.
+ * for ESL
+ *
+ * 04 01 2013 shouzhu.zhang
+ * [MOLY00013249] MM TL1 Code check in
+ * [TL1] Merge lastes WR8 + R9 + MM code to MOLY..
+ *
+ * 03 01 2013 shun.liu
+ * [MOLY00011182] MT6572/6582: RF TX test feature check in MOLY main
+ * EM tx test tl1 part.
+ * 
+ * 09 24 2012 xiaoyun.mao
+ * [MOLY00004069] [MOLY]TDD_R9_DEV Patch back to MOLY
+ * TDD_R9_DEV patch back to MOLY
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 03 2012 wcpuser_integrator
+ * removed!
+ * .
+ *
+ * 03 21 2012 shuyang.yin
+ * removed!
+ * .
+ *
+ * 03 02 2012 shuyang.yin
+ * removed!
+ * .
+ * (TL1 SAP)
+ *
+ * 12 06 2011 shuyang.yin
+ * removed!
+ * .
+ *
+ * 11 21 2011 shuyang.yin
+ * 
+ * removed!
+ *
+ * 11 14 2011 shi.dong
+ * removed!
+ * TL1 code interface fta merge in MAUI.
+ *
+ * 09 07 2011 shuyang.yin
+ * 
+ * removed!
+ * <saved by Perforce>
+ *
+ * 04 19 2011 xinqiu.wang
+ * removed!
+ * merge code from daily LOAD to MAUI 10A.
+ *
+ * 12 01 2010 popcafa.shih
+ * removed!
+ * .
+ *
+ * 11 04 2010 xinqiu.wang
+ * removed!
+ * 1. Add ul_mac_event to cphy_dch_setup/modify/release_req
+ * 2. Add two ticks and structs for mac-tl1 interface.
+ * 3. Add two simulation structs according to MAC's requeset.
+ *
+ * 11 03 2010 xinqiu.wang
+ * removed!
+ * 1.SLCE-TL1 SAP Modify for R7
+ * 2. MAC-TL1 SAP Modify for UPA
+ *
+ * 08 24 2010 popcafa.shih
+ * removed!
+ * .
+ *
+ * removed!
+ * removed!
+ * 1.Add MSG_ID_PHY_END_EDCH_TX_IND
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * 1.Add MSG_ID_CPHY_EDCH_SETUP/MODIFY/RELEASE_REQ
+ *
+ * removed!
+ * removed!
+ * 1.Delete pre-declare check of __UMTS_TDD128_MODE__
+ *
+ * removed!
+ * removed!
+ * 1.Add pre-declare check of __UMTS_TDD128_MODE__
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * Rename the msg code begin from UL1 to TL1
+ *
+ * removed!
+ * removed!
+ * Rename __UMTS_TDD128_RAT__ to __UMTS_TDD128_MODE__
+ *
+ * removed!
+ * removed!
+ * add log section for tl1interface header files
+ *
+*******************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _TL1_MSG_H
+#define _TL1_MSG_H
+
+#if defined(__UMTS_RAT__) && defined(__UMTS_TDD128_MODE__)
+/* Request for CPHY */
+#ifdef _Test_Hdr_On_PC
+enum {
+#endif
+
+#include "em_msgid.h"
+
+MODULE_MSG_BEGIN( MSG_ID_TL1_MSG_CODE_BEGIN )
+/* RELEASE REQ should be put before SETUP/MODIFY REQ */
+/* MSG_ID_TDD_CPHY_BCH_RELEASE_REQ to MSG_ID_TDD_CPHY_DCH_MODIFY_REQ must be continuous */
+MSG_ID_TDD_TL1_MSG_CODE_REQ_BEGIN = MSG_ID_TL1_MSG_CODE_BEGIN,
+MSG_ID_TDD_CPHY_BCH_RELEASE_REQ,
+MSG_ID_TDD_CPHY_BCH_MODIFY_REQ,
+MSG_ID_TDD_CPHY_BCH_SETUP_REQ,
+MSG_ID_TDD_CPHY_PCH_RELEASE_REQ,
+MSG_ID_TDD_CPHY_PCH_SETUP_REQ,
+MSG_ID_TDD_CPHY_PCH_MODIFY_REQ,
+MSG_ID_TDD_CPHY_FACH_RELEASE_REQ,
+MSG_ID_TDD_CPHY_FACH_SETUP_REQ,
+/*MSG_ID_CPHY_FACH_MODIFY_REQ,*/    /*MSG_ID_CPHY_FACH_MODIFY_REQ is not used in TDD128 */
+MSG_ID_TDD_CPHY_RACH_RELEASE_REQ,
+MSG_ID_TDD_CPHY_RACH_SETUP_REQ,
+MSG_ID_TDD_CPHY_DCH_RELEASE_REQ,
+MSG_ID_TDD_CPHY_DCH_SETUP_REQ,
+MSG_ID_TDD_CPHY_DCH_MODIFY_REQ,
+MSG_ID_TDD_CPHY_FREQUENCY_SCAN_REQ,
+MSG_ID_TDD_CPHY_FREQUENCY_SCAN_CONTINUE_REQ,
+MSG_ID_TDD_CPHY_FREQUENCY_SCAN_SUSPEND_REQ,
+/*MSG_ID_CPHY_FREQUENCY_SCAN_STOP_REQ,*/  /*MSG_ID_CPHY_FREQUENCY_SCAN_STOP_REQ is not used in TDD128 */
+MSG_ID_TDD_CPHY_RSSI_SNIFFER_START_REQ,          /*keep their space for future use */
+MSG_ID_TDD_CPHY_RSSI_SNIFFER_STOP_REQ,          /*keep their space for future use */
+MSG_ID_TDD_CPHY_MEASUREMENT_CONFIG_CELL_REQ,
+
+MSG_ID_TDD_CPHY_MEASUREMENT_INTERNAL_CONFIG_REQ,
+MSG_ID_TDD_CPHY_MEASUREMENT_INTERNAL_STOP_REQ,
+MSG_ID_TDD_CPHY_MEASUREMENT_INTERNAL_RESULT_REQ,
+MSG_ID_TDD_CPHY_SPECIFIC_CELL_SEARCH_REQ,
+MSG_ID_TDD_CPHY_SPECIFIC_CELL_SEARCH_STOP_REQ,
+MSG_ID_TDD_CPHY_RESET_REQ,
+MSG_ID_TDD_CPHY_DUPLEX_MODE_CHANGE_REQ,
+MSG_ID_TDD_CPHY_RF_ON_REQ,
+MSG_ID_TDD_CPHY_RF_OFF_REQ,
+MSG_ID_TDD_CPHY_SET_ACTIVE_RAT_REQ,
+
+MSG_ID_TDD_CPHY_HSDSCH_SETUP_REQ,
+MSG_ID_TDD_CPHY_HSDSCH_MODIFY_REQ,
+MSG_ID_TDD_CPHY_HSDSCH_RELEASE_REQ,
+
+#ifdef __HSUPA_SUPPORT__
+MSG_ID_TDD_CPHY_EDCH_SETUP_REQ,
+MSG_ID_TDD_CPHY_EDCH_MODIFY_REQ,
+MSG_ID_TDD_CPHY_EDCH_RELEASE_REQ,
+#ifdef __SIMULATION_PS_TL1_BOTH__
+MSG_ID_TDD_CPHY_SIMULATE_DPA_ONLY_SUB_FRAME_ENTRY_REQ, /*By sub-frame. tl1data_ast_msgid.h has the same def for dsp resp logging.*/
+MSG_ID_TDD_CPHY_SIMULATE_UPA_ONLY_SUB_FRAME_ENTRY_REQ, /*By sub-frame*/
+#endif /*__SIMULATION_PS_TL1_BOTH__*/
+#endif
+
+//#if defined( __UMTS_R9__ ) && defined ( __AST3002__ )
+MSG_ID_TDD_CPHY_MEASUREMENT_CONFIG_DMO_REQ,
+//#endif
+MSG_ID_TDD_CPHY_MEASUREMENT_CONFIG_IDLE_INTERVAL_REQ,	/*Interface for idle interval*/
+
+MSG_ID_TDD_CPHY_MSG_CONTAINER_REQ,
+MSG_ID_TDD_CPHY_ABORT_REQ,
+MSG_ID_TDD_CPHY_ABORT_BCH_SETUP_REQ,
+
+
+/* Request from PHY */
+MSG_ID_TDD_PHY_RACH_DATA_REQ,
+
+MSG_ID_TDD_RSVAS_TL1_SUSPEND_REQ,
+MSG_ID_TDD_RSVAS_TL1_RESUME_REQ,
+
+MSG_ID_TDD_PHY_ACCESS_REQ,
+MSG_ID_L4CTL1_EM_TST_CONTROL_REQ,
+
+MSG_ID_TDD_TL1_MSG_CODE_REQ_END,
+
+/*MSG_ID_UL1C_UL1A_UREPORT,
+MSG_ID_UL1D_UL1C_UREPORT,*/
+
+/* Confirm & Indication for CPHY */
+MSG_ID_TDD_CPHY_BCH_SETUP_CNF,
+MSG_ID_TDD_CPHY_BCH_SETUP_IND,
+MSG_ID_TDD_CPHY_BCH_MODIFY_CNF,
+MSG_ID_TDD_CPHY_BCH_MODIFY_IND,
+MSG_ID_TDD_CPHY_BCH_RELEASE_CNF,
+MSG_ID_TDD_CPHY_BCH_RELEASE_IND,
+MSG_ID_TDD_CPHY_SFN_IND,
+
+
+MSG_ID_TDD_CPHY_T312_EXPIRY_IND,
+MSG_ID_TDD_CPHY_DL_INIT_SYNC_IND,
+MSG_ID_TDD_CPHY_RL_FAILURE_IND,
+
+MSG_ID_TDD_CPHY_FREQUENCY_SCAN_CNF,
+MSG_ID_TDD_CPHY_FREQUENCY_SCAN_IND,
+MSG_ID_TDD_CPHY_FREQUENCY_SCAN_CONTINUE_CNF,
+MSG_ID_TDD_CPHY_FREQUENCY_SCAN_SUSPEND_CNF,
+MSG_ID_TDD_CPHY_FREQUENCY_SCAN_SUSPEND_IND,
+
+MSG_ID_TDD_CPHY_RSSI_SNIFFER_START_CNF, 
+MSG_ID_TDD_CPHY_RSSI_SNIFFER_STOP_CNF,  
+MSG_ID_TDD_CPHY_RSSI_SNIFFER_SIGNAL_APPEAR_IND,  
+MSG_ID_TDD_CPHY_MEASUREMENT_CONFIG_CELL_CNF,
+MSG_ID_TDD_CPHY_MEASUREMENT_CELL_IND,
+
+MSG_ID_TDD_CPHY_MEASUREMENT_INTERNAL_CONFIG_CNF,
+MSG_ID_TDD_CPHY_MEASUREMENT_INTERNAL_EVENT_IND,
+MSG_ID_TDD_CPHY_MEASUREMENT_INTERNAL_PERIODIC_IND,
+MSG_ID_TDD_CPHY_MEASUREMENT_INTERNAL_RESULT_IND,
+MSG_ID_TDD_CPHY_MEASUREMENT_INTERNAL_STOP_CNF,
+
+MSG_ID_TDD_CPHY_SPECIFIC_CELL_SEARCH_IND,
+MSG_ID_TDD_CPHY_SPECIFIC_CELL_SEARCH_STOP_IND,
+MSG_ID_TDD_CPHY_RESET_CNF,
+MSG_ID_TDD_CPHY_DUPLEX_MODE_CHANGE_CNF,
+MSG_ID_TDD_CPHY_RF_ON_CNF,
+MSG_ID_TDD_CPHY_RF_OFF_CNF,
+MSG_ID_TDD_CPHY_SET_ACTIVE_RAT_CNF,
+
+MSG_ID_TDD_CPHY_MSG_CONTAINER_CNF,
+MSG_ID_TDD_CPHY_MSG_CONTAINER_IND,
+MSG_ID_TDD_CPHY_ABORT_CNF,
+MSG_ID_TDD_CPHY_TX_STATUS_IND,
+#ifdef __TDD_DM_GAP_OPTIMIZATION__
+MSG_ID_TDD_CPHY_GSM_GAP_STATUS_IND,
+#endif
+/* Confirm & Indication for PHY */
+MSG_ID_TDD_PHY_PCH_SETUP_IND,
+/*MSG_ID_PHY_PCH_MODIFY_IND,*/  /* MSG_ID_PHY_PCH_MODIFY_IND is not used in TDD128 */
+MSG_ID_TDD_PHY_PCH_RELEASE_IND,
+MSG_ID_TDD_PHY_FACH_SETUP_IND,
+/*MSG_ID_PHY_FACH_MODIFY_IND,*/ /* MSG_ID_PHY_FACH_MODIFY_IND is not used in TDD128 */
+MSG_ID_TDD_PHY_FACH_RELEASE_IND,
+MSG_ID_TDD_PHY_RACH_SETUP_IND,
+MSG_ID_TDD_PHY_RACH_RELEASE_IND,
+MSG_ID_TDD_PHY_DCH_SETUP_IND,
+MSG_ID_TDD_PHY_DCH_MODIFY_IND,
+MSG_ID_TDD_PHY_DCH_RELEASE_IND,
+MSG_ID_TDD_PHY_CONFIG_ABORT_IND,
+MSG_ID_TDD_PHY_DL_INIT_SYNC_IND,
+MSG_ID_TDD_PHY_BCH_DATA_IND,
+/*specially for pch data from PHY to LUMAC*/
+MSG_ID_TDD_PHY_PCH_DATA_IND, 
+MSG_ID_TDD_PHY_DATA_IND,
+MSG_ID_TDD_PHY_ACCESS_IND,
+MSG_ID_TDD_PHY_POST_TX_IND,
+MSG_ID_TDD_PHY_END_DCH_TX_IND,
+MSG_ID_TDD_PHY_HSDSCH_DATA_IND,
+
+#ifdef __HSUPA_SUPPORT__
+MSG_ID_TDD_PHY_END_EDCH_TX_IND,
+#endif
+
+MSG_ID_TDD_CPHY_MEASUREMENT_CONFIG_IDLE_INTERVAL_CNF,	/*Interface for idle interval*/
+
+/*New-Added message for HSPA+ */
+
+/*MSG_ID_CPHY_ULSYNC_ORDER_IND,*/
+MSG_ID_TDD_PHY_ERUCCH_ACCESS_IND,
+MSG_ID_TDD_PHY_CEDCH_SETUP_IND,
+MSG_ID_TDD_PHY_CEDCH_RELEASE_IND,
+MSG_ID_TDD_PHY_CEDCH_MODIFY_IND,
+MSG_ID_TDD_PHY_CEDCH_TERMINATION_IND,
+MSG_ID_TDD_PHY_CEDCH_TERMINATION_REQ,
+
+/*New-Added message for HSPA+ */
+
+/*========== UMAC UT SIMULATE MESSAGE   ==========*/
+//#ifdef  __MNT_UT_UMAC_ALONE_WITHOUT_L1__  /* UMAC UT */
+MSG_ID_TDD_PHY_SIMULATE_DCH_UL_CCTRCH_TASK, 
+MSG_ID_TDD_PHY_SIMULATE_DCH_UL_CCTRCH_HISR,
+MSG_ID_TDD_PHY_SIMULATE_DCH_UL_CCTRCH_HISR_RSP,
+
+MSG_ID_TDD_PHY_SIMULATE_DCH_UL_CCTRCH_LISR,
+MSG_ID_TDD_PHY_SIMULATE_DCH_UL_CCTRCH_LISR_RSP,
+
+MSG_ID_TDD_PHY_SIMULATE_DCH_UL_CALLBACK_CCTRCH, 
+MSG_ID_TDD_PHY_SIMULATE_DCH_UL_CALLBACK_CCTRCH_RSP,
+MSG_ID_TDD_PHY_SIMULATE_DCH_UL_CALLBACK_POWER,
+MSG_ID_TDD_PHY_SIMULATE_END_DCH_TX_IND, 
+
+MSG_ID_TDD_PHY_SIMULATE_UMAC_UL_DCH_TICK,
+MSG_ID_TDD_PHY_SIMULATE_UMAC_UL_DCH_TICK_END,
+#ifdef __HSUPA_SUPPORT__
+MSG_ID_TDD_PHY_SIMULATE_UMAC_E_DCH_TICK_1,
+MSG_ID_TDD_PHY_SIMULATE_UMAC_E_DCH_TICK_1_RSP,
+MSG_ID_TDD_PHY_SIMULATE_UMAC_E_DCH_TICK_2,
+MSG_ID_TDD_PHY_SIMULATE_UMAC_E_DCH_TICK_2_RSP,
+MSG_ID_TDD_PHY_SIMULATE_UMAC_E_DCH_TICK_3,
+MSG_ID_TDD_PHY_SIMULATE_UMAC_E_DCH_TICK_4,
+MSG_ID_TDD_PHY_SIMULATE_INVOKE_UL_INFORM_EDCH_MAC,
+//MSG_ID_PHY_SIMULATE_END_EDCH_TX_IND,
+#endif
+//#endif  /* __MNT_UT_UMAC_ALONE_WITHOUT_L1__ */
+/*========== END UMAC UT SIMULATE MESSAGE   ==========*/
+
+MSG_ID_TDD_CPHY_MSG_CONTAINER_REQ_UNPACK,
+MSG_ID_TDD_CPHY_CHANNEL_QUALITY_STATUS_IND,
+
+MSG_ID_TDD_RSVAS_TL1_SUSPEND_CNF,
+MSG_ID_TDD_RSVAS_TL1_RESUME_CNF,
+
+
+MSG_ID_TDD_CPHY_CHANNEL_PRIORITY_ADJUSTMENT_REQ,
+MSG_ID_TDD_URR_TL1_SWITCH_GEMINI_MODE_REQ,
+MSG_ID_TDD_RSVAS_TL1_VIRTUAL_RESUME_REQ,
+MSG_ID_TDD_RSVAS_TL1_VIRTUAL_RESUME_CNF,
+MSG_ID_TDD_PHY_CHANNEL_PRIORITY_ADJUSTMENT_REQ,
+
+
+//move this meassage to L4
+//#if 1//__TDD_TX_PWR_REDUCE__
+//MSG_ID_TDD_TL1_UMTS_MAX_TX_PWR_RED_REQ,
+//#endif
+
+/*ADT Test start*/
+#if defined (__MML1_ADT_ENABLE__)
+MSG_ID_TDD_TL1_L1ADT_ENTER_CONNECTED_REQ,
+MSG_ID_TDD_TL1_L1ADT_ENTER_CONNECTED_CNF,
+
+MSG_ID_TDD_TL1_L1ADT_LEAVE_CONNECTED_REQ,
+MSG_ID_TDD_TL1_L1ADT_LEAVE_CONNECTED_CNF,
+
+MSG_ID_TDD_TL1_L1ADT_ENTER_TDD_MODE_REQ,
+MSG_ID_TDD_TL1_L1ADT_ENTER_TDD_MODE_CNF,
+MSG_ID_TDD_TL1_L1ADT_ENTER_TDD_MODE_IND,
+#endif
+/*ADT Test end*/
+#if defined(__DYNAMIC_CACHE_LOCK_CENTRAL_CONTROL_SUPPORT__)
+MSG_ID_TL1_DCLC_LOCK_UNLOCK_IND,
+#endif
+
+MODULE_MSG_END( MSG_ID_TL1_MSG_CODE_TAIL )
+
+#ifdef _Test_Hdr_On_PC
+};
+#endif
+#endif
+
+#endif  //_TL1_MSG_H
diff --git a/mcu/interface/sap/md/tl1data_ast_msgid.h b/mcu/interface/sap/md/tl1data_ast_msgid.h
new file mode 100644
index 0000000..8915840
--- /dev/null
+++ b/mcu/interface/sap/md/tl1data_ast_msgid.h
@@ -0,0 +1,450 @@
+/*****************************************************************************
+*  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) 2009
+*
+*  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:
+ * --------------------------------------------------------
+ *   tl1data_sap.h
+ *
+ * Project:
+ * --------------------------------------------------------
+ *   
+ *
+ * Description:
+ * --------------------------------------------------------
+ *   
+ *
+ * Author:
+ * --------------------------------------------------------
+ * -------
+ *
+ * --------------------------------------------------------
+ * $Log$
+ *
+ * 11 20 2019 xiaochi.zhang
+ * [MOLY00456996] TAS ÐèÒªÔö¼ÓSNÊýÁ¿
+ * 	
+ * 	.
+ *
+ * 10 31 2018 xiaochi.zhang
+ * [MOLY00361478] [Gen97] Gemini Compile Option Clean Up
+ * 	
+ * 	.
+ *
+ * 01 21 2016 qianli.li
+ * [MOLY00143367] ÇëÆÀ¹ÀÊÖ»ú¶Ëͨ¹ýÄÚÖù¤³Ìģʽ²é¿´¡°Ë«ÌìÏßÇл»×´Ì¬¡±µÄÐèÇó¿ÉÐÐÐÔ
+ * 	
+ * 	.
+ *
+ * 01 14 2016 yanhai.xuan
+ * [MOLY00159734] TX power detector support on Jade
+ * .
+ *
+ * 10 18 2015 chuansheng.zhang
+ * [MOLY00145677] [91+][TL1] Platform patch check in
+ * (1) LR11 until patch CL1745309 merge to UMOLY;
+ * (2) 91+ for MIPS: l1core->__SMP_ARCH__ modify, and build error clr;
+ * (3) TL1 IRQ code part modify
+ *
+ * 07 28 2015 chuansheng.zhang
+ * [MOLY00132771] [MT6755][TDD3G][SLT] Dev
+ * Jade: TDSCDMA SLT code check in.
+ *
+ * 07 13 2015 qianli.li
+ * [MOLY00114091] [MT6755][BRINGUP_FIRSTCALL][TAS feature] Add TDD_TAS feature
+ * 	.
+ *
+ * 04 17 2015 marco.zhang
+ * [MOLY00096053] [TDD] Rx report for test (need turn on __TDS_RX_TEST_SUPPORT__)
+ * 	.
+ *
+ * 01 05 2015 marco.zhang
+ * [MOLY00086950] UMOLY TL1 MAINTAIN
+ * 	.
+ *
+ * 12 29 2014 marco.zhang
+ * [MOLY00086950] UMOLY TL1 MAINTAIN
+ * 	msg id frefix.
+ *
+ * 12 17 2013 shouzhu.zhang
+ * [MOLY00050653] [TL1][Check in]Remove TL1 MCU needless compile option
+ * .
+ *
+ * 09 17 2013 shouzhu.zhang
+ * [MOLY00038199] [Check in][Remove Compile Option]Remove __UMTS_TDD128_SNIFFER__
+ * remove Sniffer Compile option.
+ *
+ * 07 16 2013 xiaoyun.mao
+ * [MOLY00028746] [MT6290E1][MM LL1][GTL] RF conflict when 4G gives gap pattern to do TDS MEAS
+ * .
+ *
+ * 05 30 2013 ast00033
+ * [MOLY00024285] [MT6572][CMCC Case  FT][LCA_GEMINI][Beijing][Regression-7th time][C6.3 ¿¨²Û1Ë«PDPºÍ¿¨²Û2ÓïÒô²¢·¢ ]8th_11:38:34_ÔÝʱÎÞ·¨½Óͨ_ÈýÔªÎ÷ÇÅ
+ * .
+ *
+ * 05 15 2013 xiaoyun.mao
+ * [MOLY00007737] [WR8][UMAC]3G speech UL delay improve phase 2
+ * .remove __PREPARE_TX_AHEAD__
+ *
+ * 04 26 2013 xiaoyun.mao
+ * [MOLY00020915] Check in Autonomous gap code
+ * .
+ *
+ * 04 09 2013 ast00029
+ * [MOLY00013377] [TDD128][ESL][MOLY]check-in ESL code.
+ * for ESL
+ *
+ * 04 01 2013 shouzhu.zhang
+ * [MOLY00013249] MM TL1 Code check in
+ * [TL1] Merge lastes WR8 + R9 + MM code to MOLY..
+ *
+ * 03 01 2013 shun.liu
+ * [MOLY00011182] MT6572/6582: RF TX test feature check in MOLY main
+ * EM tx test tl1 part.
+ * 
+ * 09 24 2012 xiaoyun.mao
+ * [MOLY00004069] [MOLY]TDD_R9_DEV Patch back to MOLY
+ * TDD_R9_DEV patch back to MOLY
+ * 
+ * 09 11 2012 xiaoyun.mao
+ * [MOLY00002766] warning removal
+ * .
+ * remove __UMAC_DCH_LISR__
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 03 2012 wcpuser_integrator
+ * removed!
+ * .
+ *
+ * 03 09 2012 shouzhu.zhang
+ * removed!
+ * .
+ *
+ * 02 24 2012 shouzhu.zhang
+ * removed!
+ * Check in TL1 Sniffer code to MAUI.
+ *
+ * 12 26 2011 shuyang.yin
+ * removed!
+ * .
+ *
+ * 11 14 2011 shi.dong
+ * removed!
+ * TL1 code interface fta merge in MAUI.
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * Rename the msg code begin from UL1 to TL1
+ *
+ * removed!
+ * removed!
+ * Rename __UMTS_TDD128_RAT__ to __UMTS_TDD128_MODE__
+ *
+ * removed!
+ * removed!
+ * add log section for tl1interface header files
+ *
+*******************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _TL1DATA_MSG_H
+#define _TL1DATA_MSG_H
+
+/* LISR -> TASK */
+
+#ifdef __BUILD_DOM__
+enum{
+#endif
+
+MODULE_MSG_BEGIN( MSG_ID_TL1DATA_AST_MSG_CODE_BEGIN )
+MSG_ID_TL1DATA_AST_RESET_CNF = MSG_ID_TL1DATA_AST_MSG_CODE_BEGIN,
+
+//RF Calibration begin
+MSG_ID_TL1DATA_AST_RFCAL_RESET_CNF,
+MSG_ID_TL1DATA_AST_RFCAL_CS_IND,
+MSG_ID_TL1DATA_AST_RFCAL_ABBREG_IND,
+MSG_ID_TL1DATA_AST_FHC_FINISH_IND,
+MSG_ID_TL1DATA_AST_OTCAL_IND,
+//RF Calibration end
+MSG_ID_TL1DATA_AST_SET_ACTIVE_RAT_CNF,
+//Suspend mode related msg begin
+MSG_ID_TL1DATA_AST_SUSPEND_DONE_IND,
+MSG_ID_TL1DATA_AST_RESUME_DONE_IND,
+MSG_ID_TL1DATA_AST_GAP_SYNC_SUSPEND_IND,
+MSG_ID_TL1DATA_AST_RF_SUSPEND_IND,
+MSG_ID_TL1DATA_AST_RAT_SUSPEND_IND,
+MSG_ID_TL1DATA_AST_CONTAINER_SUSPEND_IND,
+MSG_ID_TL1DATA_AST_FS_SUSPEND_IND,
+MSG_ID_TL1DATA_AST_SNIFFER_SUSPEND_IND,
+MSG_ID_TL1DATA_AST_BCH_SUSPEND_IND,
+MSG_ID_TL1DATA_AST_PCH_SUSPEND_IND,
+MSG_ID_TL1DATA_AST_MEAS_SUSPEND_IND,
+MSG_ID_TL1DATA_AST_BCH_CS_SUSPEND_IND,
+//Suspend mode related msg end
+MSG_ID_TL1DATA_AST_FREQUENCY_SCAN_IND,
+MSG_ID_TL1DATA_AST_FREQUENCY_SCAN_SUSPEND_IND,
+MSG_ID_TL1DATA_AST_CELL_SEARCH_IND,
+
+// Sniffer begin
+MSG_ID_TL1DATA_AST_SNIFFER_TIMEOUT_IND,
+MSG_ID_TL1DATA_AST_SNIFFER_SETUP_IND,
+MSG_ID_TL1DATA_AST_SNIFFER_NO_SIGNAL_IND,
+MSG_ID_TL1DATA_AST_SNIFFER_SIGNAL_IND,
+MSG_ID_TL1DATA_AST_SNIFFER_RELEASE_IND,
+// Sniffer end
+
+MSG_ID_TL1DATA_AST_SPECIFIC_CELL_SEARCH_IND,
+MSG_ID_TL1DATA_AST_SPECIFIC_CELL_SEARCH_STOP_IND,
+
+MSG_ID_TL1DATA_AST_MSG_CONTAINER_IND,
+MSG_ID_TL1DATA_AST_ABORT_CNF,
+
+MSG_ID_TL1DATA_AST_BCH_SETUP_IND,
+MSG_ID_TL1DATA_AST_BCH_RELEASE_IND,
+MSG_ID_TL1DATA_AST_SFN_IND,
+MSG_ID_TL1DATA_AST_BCH_CS_IND,
+MSG_ID_TL1DATA_AST_BCH_CS_SETUP_IND,
+
+MSG_ID_TL1DATA_AST_PCH_SETUP_IND,                  
+MSG_ID_TL1DATA_AST_PCH_RELEASE_IND,    
+
+MSG_ID_TL1DATA_AST_FACH_SETUP_IND,                  
+MSG_ID_TL1DATA_AST_FACH_RELEASE_IND,
+
+MSG_ID_TL1DATA_AST_RACH_SETUP_IND,                  
+MSG_ID_TL1DATA_AST_RACH_RELEASE_IND,   
+
+
+MSG_ID_TL1DATA_AST_POST_TX_IND,
+MSG_ID_TL1DATA_AST_ACCESS_IND,
+
+
+MSG_ID_TL1DATA_AST_UL_DCH_SETUP_IND,
+MSG_ID_TL1DATA_AST_UL_DCH_RELEASE_IND,
+
+MSG_ID_TL1DATA_AST_DL_DCH_SETUP_IND,
+MSG_ID_TL1DATA_AST_DL_DCH_RELEASE_IND,
+
+
+MSG_ID_TL1DATA_AST_TX_STATUS_IND,
+MSG_ID_TL1DATA_AST_T312_EXPIRY_IND,
+MSG_ID_TL1DATA_AST_DL_INIT_SYNC_IND,
+MSG_ID_TL1DATA_AST_RL_FAILURE_IND,
+
+
+MSG_ID_TL1DATA_AST_HSDSCH_SETUP_IND,
+MSG_ID_TL1DATA_AST_HSDSCH_RELEASE_IND,
+
+#ifdef __HSUPA_SUPPORT__
+MSG_ID_TL1DATA_AST_EDCH_SETUP_IND,
+MSG_ID_TL1DATA_AST_EDCH_RELEASE_IND,
+#endif
+MSG_ID_TL1DATA_AST_MEAS_SETUP_IND,
+MSG_ID_TL1DATA_AST_MEAS_RELEASE_IND,
+
+MSG_ID_TL1DATA_AST_MEAS_RSCP_INTRA_IND,
+MSG_ID_TL1DATA_AST_MEAS_RSCP_INTER_IND,
+MSG_ID_TL1DATA_AST_MEAS_ISCP_IND,
+
+MSG_ID_TL1DATA_AST_MEAS_INTERNAL_SETUP_IND,
+MSG_ID_TL1DATA_AST_MEAS_INTERNAL_RELEASE_IND,
+
+MSG_ID_TL1DATA_AST_MEAS_INTERNAL_EVENT_IND,
+MSG_ID_TL1DATA_AST_MEAS_INTERNAL_PERIODIC_IND,
+MSG_ID_TL1DATA_AST_MEAS_INTERNAL_RESULT_IND,
+
+//@CMW
+MSG_ID_TL1DATA_AST_BCH_DATA_IND,
+MSG_ID_TL1DATA_AST_DATA_IND,
+MSG_ID_TL1DATA_AST_HSDSCH_DATA_IND,
+MSG_ID_TL1DATA_AST_PREPARE_DATA_REQ,
+MSG_ID_TL1DATA_AST_GET_DATA_REQ,
+
+MSG_ID_TL1DATA_AST_HSDSCH_SETUP_DATA_IND,
+MSG_ID_TL1DATA_AST_HSDSCH_RELEASE_DATA_IND,
+MSG_ID_TL1DATA_AST_HSDSCH_MODIFY_DATA_IND,
+
+//#ifdef __UMAC_DCH_LISR__
+MSG_ID_TL1DATA_AST_INFORM_DCH_MAC_IND,
+//#endif
+
+MSG_ID_TL1DATA_AST_INFORM_MAC_CSR_IND,
+
+#ifdef __HSUPA_SUPPORT__
+MSG_ID_TL1DATA_AST_INFORM_EDCH_MAC_IND,
+#endif
+
+MSG_ID_TL1DATA_AST_MEAS_DMO_SETUP_IND,
+
+
+MSG_ID_TL1DATA_AST_UE_STATE_IND,
+
+
+MSG_ID_TL1DATA_AST_GAP_SERVICE_IND,
+
+
+MSG_ID_TL1DATA_AST_GAP_SYNC_RAT_IND,
+MSG_ID_TL1DATA_AST_GAP_SYNC_TIMEOUT_IND,
+MSG_ID_TL1DATA_AST_GAP_SYNC_CELL_CHANGE_IND,
+MSG_ID_TL1DATA_AST_GAP_SYNC_IND,
+MSG_ID_TL1DATA_AST_GAP_SYNC_TL1_CNF,
+
+MSG_ID_TL1DATA_AST_GAP_CALC_PROVIDE_IND,
+MSG_ID_TL1DATA_AST_GAP_CALC_CANCEL_IND,
+
+MSG_ID_TL1DATA_AST_GAP_RELEASE_IND,
+
+MSG_ID_TL1DATA_AST_FACH_GAP_LOCK_IND,
+
+/* @dms */
+MSG_ID_TL1DATA_AST_DMS_MEAS_DONE_IND,
+MSG_ID_TL1DATA_AST_TL1C_GAP_PATTERN_STOP,
+MSG_ID_TL1DATA_AST_TL1C_GAP_PATTERN_FINISH,
+#ifdef TL1_TESTCASE
+MSG_ID_TL1DATA_AST_L1CASE_TEST_CMD_IND,
+#endif
+MSG_ID_TL1DATA_AST_TIMING_SYNC_TL1_CNF,
+MSG_ID_TL1DATA_AST_AUTO_GAP_SUSPEND_DONE_IND,
+MSG_ID_TL1DATA_AST_AUTO_GAP_START_CNF,
+MSG_ID_TL1DATA_AST_TRACE_IND,
+
+#ifdef __TL1_TST_LOG_DSP_RESP__
+MSG_ID_CPHY_SIMULATE_DPA_ONLY_SUB_FRAME_ENTRY_REQ, /*By sub-frame*/
+MSG_ID_CPHY_SIMULATE_UPA_ONLY_SUB_FRAME_ENTRY_REQ, /*By sub-frame*/	
+#endif
+
+MSG_ID_TL1DATA_AST_CHANNEL_QUALITY_STATUS_IND,
+MSG_ID_TL1DATA_AST_RX_POWER_TEST_IND,
+MSG_ID_TL1DATA_AST_TX_POWER_TEST_IND,
+#ifdef __RF_SCAN_FOR_DESENSE_TEST__
+MSG_ID_TL1DATA_AST_RF_SCAN_TEST_IND,
+#endif
+MSG_ID_TL1DATA_AST_FORCE_TX_ANT_CNF,
+/* For List Mode*/
+MSG_ID_LIST_MODE_GETRES_IND,
+MSG_ID_TL1DATA_AST_EM_TDD_L1_TAS_INFO_IND,
+MSG_ID_TL1DATA_AST_NUM,
+
+/* LL1 -> TASK */
+
+
+MSG_ID_TL1DATA_AST_GAP_SERVICE_START_UMTS_PM_ONLY,
+MSG_ID_TL1DATA_AST_GAP_SERVICE_START_UMTS_ALL,
+MSG_ID_TL1DATA_AST_GAP_SERVICE_STOP_UMTS,
+
+
+MSG_ID_TL1DATA_AST_GAP_SYNC_GL1_CNF_SUCCESS,
+MSG_ID_TL1DATA_AST_GAP_SYNC_GL1_CNF_FAILURE,
+
+MSG_ID_TL1DATA_AST_GAP_CTRL_GSM_PM_DONE_IND,
+
+MSG_ID_TL1DATA_AST_GAP_CTRL_STOP_GAP_CONFIRM,
+
+MSG_ID_TL1DATA_AST_FACH_GAP_LOCK_CNF,
+
+MSG_ID_TL1DATA_AST_GSM_SYNC_START,
+
+MSG_ID_TL1DATA_AST_DMS_TIM_ADJ_CLEAR_CNF,
+/* @dms */
+
+MSG_ID_TL1DATA_AST_GSM_GAP_AVAIABLE_IND,
+MSG_ID_TL1DATA_AST_GSM_GAP_UNAVAIABLE_IND,
+MSG_ID_TL1DATA_AST_TL1A_GAP_PATTERN_SET,
+
+
+/* TASK -> TASK */
+
+/* @dms */
+
+MSG_ID_TL1DATA_AST_GAP_SERVICE_FS_REQ,
+MSG_ID_TL1DATA_AST_GAP_SERVICE_FS_STOP,
+MSG_ID_TL1DATA_AST_GAP_SERVICE_BCH_REQ,
+MSG_ID_TL1DATA_AST_GAP_SERVICE_BCH_STOP,
+MSG_ID_TL1DATA_AST_GAP_SERVICE_MEAS_REQ,
+MSG_ID_TL1DATA_AST_GAP_SERVICE_MEAS_STOP,
+
+#if defined( __GEMINI__ ) && defined ( __UMTS_RAT__ )
+MSG_ID_TL1DATA_AST_PEER_2G_OPEN_REQ,
+MSG_ID_TL1DATA_AST_PEER_2G_CLOSE_REQ,
+MSG_ID_TL1DATA_AST_PEER_2G_OPEN_CNF,
+#endif
+#ifdef __GEMINI__
+MSG_ID_TL1DATA_AST_CHANNEL_PRIORITY_ADJUSTMENT_CNF,
+#endif
+/* TL1C -> TL4C */
+MSG_ID_TL1DATA_AST_TIMING_SYNC_IND,
+MSG_ID_TL1DATA_AST_TIMING_SYNC_SUSPEND_IND,
+MSG_ID_TL1DATA_AST_TL1A_GAP_STOP_REQ,
+MSG_ID_TL1DATA_AST_MMS_TIM_ADJ_CLEAR_CNF,
+MSG_ID_TL1DATA_AST_GAP_MMS_SUSPEND_DONE_IND,
+MSG_ID_TL1DATA_AST_AUTO_GAP_START,
+MSG_ID_TL1DATA_AST_AUTO_GAP_RELEASE,
+MSG_ID_TL1DATA_AST_AUTO_GAP_STOP_CNF,
+MSG_ID_TL1DATA_AST_AUTO_GAP_FINISH,
+MSG_ID_TL1DATA_AST_TL1C_AUTO_GAP_PATTERN_STOP,
+MSG_ID_TL1DATA_AST_MMS_AUTO_GAP_TIM_ADJ_CLEAR_CNF,
+MSG_ID_L4CTL1_EM_TST_CONTROL_CNF,
+MSG_ID_TDDSLT_RESET_REQ,
+MSG_ID_TDDSLT_RESET_CNF,
+MODULE_MSG_END( MSG_ID_TL1DATA_AST_MSG_CODE_TAIL )
+
+#ifdef __BUILD_DOM__
+};
+#endif
+
+#endif  //_TL1DATA_MSG_H
diff --git a/mcu/interface/sap/md/tl1fta_ast_msgid.h b/mcu/interface/sap/md/tl1fta_ast_msgid.h
new file mode 100644
index 0000000..b869077
--- /dev/null
+++ b/mcu/interface/sap/md/tl1fta_ast_msgid.h
@@ -0,0 +1,117 @@
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ * tl1ft_ast_sap.h
+ *
+ * Project:
+ * --------
+ *   Astroanut
+ *
+ * Description:
+ * ------------
+ *   TL1_FT SAP
+ *
+ * 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _TL1FTA_MSG_H
+#define _TL1FTA_MSG_H
+
+#ifdef __BUILD_DOM__
+enum{
+#endif
+
+MODULE_MSG_BEGIN( MSG_ID_TL1FTA_AST_MSG_CODE_BEGIN )
+/* FTA -> L1 TASK */
+MSG_ID_RFCAL_RESET_REQ = MSG_ID_TL1FTA_AST_MSG_CODE_BEGIN,
+
+MSG_ID_RFCAL_CS_REQ,
+
+MSG_ID_RFCAL_DCH_REQ,
+
+MSG_ID_RFCAL_DCH_REL_REQ,
+
+MSG_ID_RFCAL_GETINFO_REQ,
+
+MSG_ID_RFCAL_MODEM_SWITCH_REQ,
+
+MSG_ID_RFCAL_ABBREG_REQ,
+
+MSG_ID_NSFT_SET_PARA_REQ,
+
+MSG_ID_RFTEST_RXTX_REQ,
+
+MSG_ID_FHC_START_REQ,
+
+MSG_ID_FHC_START_EX_REQ,
+
+/* L1 TASK -> FTA */
+MSG_ID_RFCAL_RESET_CNF,
+
+MSG_ID_RFCAL_CS_IND,
+
+MSG_ID_RFCAL_DCH_CNF,
+
+MSG_ID_RFCAL_DCH_REL_CNF,
+
+MSG_ID_RFCAL_GETINFO_CNF,
+
+MSG_ID_RFCAL_MODEM_SWITCH_CNF,
+
+MSG_ID_RFCAL_ABBREG_IND,
+
+MSG_ID_NSFT_SET_PARA_CNF,
+
+MSG_ID_RFTEST_RXTX_CNF,
+
+MSG_ID_FHC_START_CNF,
+
+MSG_ID_FHC_FINISH_IND,
+
+MSG_ID_FHC_FINISH_EX_IND,
+
+MSG_ID_SLT_TEST_REQ,
+
+MSG_ID_LIST_MODE_REQ,
+
+MSG_ID_LIST_MODE_CNF,
+
+MSG_ID_CPHY_LIST_GET_RES,
+
+MSG_ID_TL1TEST_INIT_REQ,
+MSG_ID_TL1TEST_UL_PARAM_REQ,
+MSG_ID_TL1TEST_UL_INFO_IND,
+MSG_ID_CPHY_RFCAL_GETRSSI_CFG_REQ,
+MSG_ID_CPHY_RFCAL_GETRSSI_CFG_CNF,
+
+#ifdef __BUILD_DOM__
+};
+#endif
+MODULE_MSG_END( MSG_ID_TL1FTA_AST_MSG_CODE_TAIL )
+
+#endif   //_TL1FTA_MSG_H
diff --git a/mcu/interface/sap/md/uas_gas_gemini_msgid.h b/mcu/interface/sap/md/uas_gas_gemini_msgid.h
new file mode 100644
index 0000000..af860b0
--- /dev/null
+++ b/mcu/interface/sap/md/uas_gas_gemini_msgid.h
@@ -0,0 +1,132 @@
+/*****************************************************************************
+*  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) 2007
+*
+*  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:
+ * ---------
+ *   uas_gas_gemini_sap.h
+ *
+ * Project:
+ * --------
+ *   GEMINI
+ *
+ * Description:
+ * ------------
+ *
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *===========================================================================
+ * $Log:$
+ *
+ * 06 08 2012 qinghua.yu
+ * removed!
+ * 1) confirm all _msgid.h is same as old (exclude fold ../delete/);
+ * 2) fix range error in module_msg_range.h.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 01 13 2012 ij.liao
+ * removed!
+ * .
+ *
+ * 12 07 2010 maruco.tu
+ * removed!
+ * .
+ *
+ * removed!
+ * removed!
+ * add to source control recursely
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * add to source control recursely
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ *===========================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _UAS_GAS_GEMINI_MSG_H
+#define _UAS_GAS_GEMINI_MSG_H
+
+#ifdef __SOURCE_INSIGHT_PARSE__
+typedef enum {
+#endif
+
+MODULE_MSG_BEGIN( MSG_ID_GEMINI_UAS_CODE_BEGIN )
+//MSG_ID_GEMINI_UAS_CODE_BEGIN,
+MSG_ID_GAS_UAS_SUSPEND_SERVICE_REQ = MSG_ID_GEMINI_UAS_CODE_BEGIN,
+MSG_ID_GAS_UAS_RESUME_SERVICE_REQ,
+MSG_ID_GEMINI_UAS_CODE_END = MSG_ID_GAS_UAS_RESUME_SERVICE_REQ, 
+//MSG_ID_GEMINI_UAS_CODE_END,
+MODULE_MSG_END( MSG_ID_GEMINI_UAS_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_GEMINI_GAS_CODE_BEGIN )
+//MSG_ID_GEMINI_GAS_CODE_BEGIN,
+MSG_ID_UAS_GAS_SUSPEND_SERVICE_REQ = MSG_ID_GEMINI_GAS_CODE_BEGIN,
+MSG_ID_UAS_GAS_RESUME_SERVICE_REQ,
+MSG_ID_GEMINI_GAS_CODE_END = MSG_ID_UAS_GAS_RESUME_SERVICE_REQ,
+//MSG_ID_GEMINI_GAS_CODE_END,
+MODULE_MSG_END( MSG_ID_GEMINI_GAS_CODE_TAIL )
+
+#ifdef __SOURCE_INSIGHT_PARSE__
+};
+#endif
+
+#endif  //_UAS_GAS_GEMINI_MSG_H
diff --git a/mcu/interface/sap/md/uas_gas_msgid.h b/mcu/interface/sap/md/uas_gas_msgid.h
new file mode 100644
index 0000000..e95d013
--- /dev/null
+++ b/mcu/interface/sap/md/uas_gas_msgid.h
@@ -0,0 +1,449 @@
+/*****************************************************************************
+*  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) 2007
+*
+*  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:
+ * ---------
+ *   uas_gas_sap.h
+ *
+ * Project:
+ * --------
+ *   MONZA
+ *
+ * Description:
+ * ------------
+ *
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *===========================================================================
+ * 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!
+ * 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!
+ *===========================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _UAS_GAS_MSG_H
+#define _UAS_GAS_MSG_H
+
+#if defined(__UMTS_RAT__)&& !defined (__L1_STANDALONE__)
+#ifdef __SOURCE_INSIGHT_PARSE__
+typedef enum {
+#endif
+
+MODULE_MSG_BEGIN( MSG_ID_DM_CSCE_CODE_BEGIN )
+// MSG_ID_DM_CSCE_CODE_BEGIN
+MSG_ID_GAS_UAS_EVALUATE_UCELL_REQ = MSG_ID_DM_CSCE_CODE_BEGIN,
+MSG_ID_GAS_UAS_ACTIVATE_UCELL_REQ, 
+#ifdef __CMCC_23G_PINGPONG_RESTRAIN__
+MSG_ID_GAS_UAS_RESEL_RESTRAIN_STATUS_IND,
+#endif
+MSG_ID_GAS_UAS_LOWER_LAYER_AVAILABILITY_REQ, 
+#if defined(__3G_CSG_SUPPORT__) /*|| defined(__LTE_RAT__)*/
+MSG_ID_GAS_UAS_SEARCH_CSG_UCELL_REQ,
+MSG_ID_GAS_UAS_EVALUATE_CSG_UCELL_REQ,
+#endif
+MSG_ID_UAS_GAS_BUILD_FINGERPRINT_CNF, /* CSG fingerprint */
+
+
+/* EAS to UAS relevant messages */
+#ifdef __LTE_RAT__
+#ifdef __3G_CSG_SUPPORT__
+MSG_ID_EAS_UAS_SEARCH_CSG_UCELL_REQ,  /* 4G3 Auto-CSG-Search */
+MSG_ID_EAS_UAS_EVALUATE_CSG_UCELL_REQ,
+#endif
+MSG_ID_EAS_UAS_REPORT_CGI_REQ,        /* 4G3 CGI-Collection */
+MSG_ID_EAS_UAS_EVALUATE_UCELL_REQ,    /* 4G3 Cell Evaluation */
+MSG_ID_EAS_UAS_EVALUATE_UCELL_STOP_REQ,
+MSG_ID_UAS_EAS_SEARCH_CSG_ECELL_CNF,  /* 3G4 Auto-CSG-Search */
+MSG_ID_UAS_EAS_EVALUATE_CSG_ECELL_CNF,
+MSG_ID_EAS_UAS_BACKGROUND_SEARCH_FOUND_IND,  /* 3G4 Background Search */
+MSG_ID_UAS_EAS_BUILD_FINGERPRINT_CNF,/*3G4 FINGERPRINT*/
+MSG_ID_EAS_UAS_BUILD_FINGERPRINT_REQ,/*4G3 FINGERPRINT*/
+MSG_ID_EAS_UAS_ABORT_FINGERPRINT_IND,/*4G3 FINGERPRINT*/
+MSG_ID_EAS_UAS_HSR_CELL_FOUND_IND, /*HSR Sniffer*/
+#endif /* __LTE_RAT__ */
+
+MSG_ID_GAS_UAS_EVALUATE_UCELL_STOP_REQ,
+MSG_ID_UAS_EAS_BACKGROUND_SEARCH_START_CNF, /* 3G4 Background Search start confirm*/
+MSG_ID_DM_CSCE_CODE_END = MSG_ID_UAS_EAS_BACKGROUND_SEARCH_START_CNF, 
+// MSG_ID_DM_CSCE_CODE_END,
+MODULE_MSG_END( MSG_ID_DM_CSCE_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_UAS_GAS_CODE_BEGIN )
+//MSG_ID_UAS_GAS_CODE_BEGIN,
+MSG_ID_UAS_GAS_CONFIG_GCELL_MEAS_REQ = MSG_ID_UAS_GAS_CODE_BEGIN,
+#if defined(__LTE_RAT__) || defined(__23G_PRI_RESEL_SUPPORT__)
+MSG_ID_UAS_GAS_CONFIG_GCELL_PRIO_MEAS_REQ,
+MSG_ID_FDD_GAS_UAS_CONFIG_UCELL_PRIO_MEAS_CNF,
+MSG_ID_TDD_GAS_UAS_CONFIG_UCELL_PRIO_MEAS_CNF,
+#endif /* defined(__LTE_RAT__) || defined(__23G_PRI_RESEL_SUPPORT__) */
+MSG_ID_UAS_GAS_EVALUATE_GCELL_REQ,
+MSG_ID_UAS_GAS_ACTIVATE_GCELL_REQ,
+MSG_ID_UAS_GAS_EVALUATE_GCELL_STOP_REQ,
+MSG_ID_UAS_GAS_HANDOVER_GCELL_REQ,  
+MSG_ID_UAS_GAS_HO_ACTIVATE_GCELL_REQ,
+MSG_ID_UAS_GAS_ABORT_HO_GCELL_REQ,
+MSG_ID_FDD_GAS_UAS_CONFIG_UCELL_MEAS_CNF,
+MSG_ID_FDD_GAS_UAS_UCELL_MEAS_IND,
+MSG_ID_TDD_GAS_UAS_CONFIG_UCELL_MEAS_CNF,
+MSG_ID_TDD_GAS_UAS_UCELL_MEAS_IND,
+MSG_ID_GAS_UAS_EVALUATE_UCELL_CNF,
+MSG_ID_GAS_UAS_ACTIVATE_UCELL_CNF,
+MSG_ID_GAS_UAS_EVALUATE_UCELL_STOP_CNF,
+MSG_ID_GAS_UAS_UCELL_CHANGE_COMPLETE_IND,
+MSG_ID_GAS_UAS_HANDOVER_UCELL_CNF,
+MSG_ID_GAS_UAS_HO_ACTIVATE_UCELL_CNF,
+#ifdef __CMCC_23G_PINGPONG_RESTRAIN__
+MSG_ID_GAS_UAS_VIRTUAL_CELL_RESEL_IND,
+#endif
+#ifdef __CMCC_STD_FR__
+MSG_ID_GAS_UAS_STD_FR_INFO_IND,
+#endif
+MSG_ID_GAS_UAS_SEARCH_CSG_UCELL_CNF,
+MSG_ID_GAS_UAS_EVALUATE_CSG_UCELL_CNF,
+
+#ifdef __UMTS_FDD_MODE__
+#if defined(__LTE_RAT__) || defined(__3G_CSG_SUPPORT__)
+MSG_ID_UAS_GAS_BUILD_FINGERPRINT_REQ, /* CSG fingerprint */
+MSG_ID_UAS_GAS_ABORT_FINGERPRINT_IND, /* CSG fingerprint */
+#endif /* defined(__LTE_RAT__) || defined(__3G_CSG_SUPPORT__) */
+#endif /* __UMTS_FDD_MODE__ */
+
+MSG_ID_GAS_UAS_CELL_RESELECTION_PARAMS_IND,
+MSG_ID_UAS_GAS_CODE_END = MSG_ID_GAS_UAS_CELL_RESELECTION_PARAMS_IND,
+//MSG_ID_UAS_GAS_CODE_END,
+MODULE_MSG_END( MSG_ID_UAS_GAS_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_EAS_GAS_CODE_BEGIN )
+/* EAS to GAS relevant messages */
+MSG_ID_EAS_GAS_CONFIG_GCELL_MEAS_REQ =  MSG_ID_EAS_GAS_CODE_BEGIN,  /* 4G2 IR Measurement */
+MSG_ID_EAS_GAS_CONFIG_GCELL_PRIO_MEAS_REQ,
+MSG_ID_GAS_EAS_LTE_MEASUREMENT_IND,                                 /* 2G4 IR Measurement */
+MSG_ID_GAS_EAS_LTE_MEASUREMENT_CNF,
+MSG_ID_EAS_GAS_REPORT_CGI_REQ,                                      /* 4G2 CGI Collection */
+MSG_ID_EAS_GAS_EVALUATE_GCELL_REQ,
+MSG_ID_EAS_GAS_EVALUATE_GCELL_STOP_REQ,
+MSG_ID_EAS_GAS_ACTIVATE_GCELL_REQ,
+MSG_ID_EAS_GAS_HANDOVER_GCELL_REQ,
+MSG_ID_EAS_GAS_HO_ACTIVATE_GCELL_REQ,
+MSG_ID_EAS_GAS_ABORT_HO_GCELL_REQ,
+MSG_ID_GAS_EAS_EVALUATE_ECELL_CNF,
+MSG_ID_GAS_EAS_EVALUATE_ECELL_STOP_CNF,
+MSG_ID_GAS_EAS_ACTIVATE_ECELL_CNF,
+MSG_ID_GAS_EAS_SEARCH_CSG_ECELL_CNF,
+/* __4G_BACKGROUND_SEARCH__ begin*/
+MSG_ID_EAS_GAS_BACKGROUND_SEARCH_FOUND_IND,  /* 2G4 Background Search */
+/* __4G_BACKGROUND_SEARCH__ end*/
+MSG_ID_GAS_EAS_EVALUATE_CSG_ECELL_CNF,
+#if defined(__LTE_RAT__) || defined(__3G_CSG_SUPPORT__)
+MSG_ID_EAS_GAS_BUILD_FINGERPRINT_REQ, /* 4G2 FINGERPRINT */
+MSG_ID_EAS_GAS_ABORT_FINGERPRINT_IND, /* 4G2 FINGERPRINT */
+#endif /* defined(__LTE_RAT__) || defined(__3G_CSG_SUPPORT__) */
+MSG_ID_EAS_GAS_HSR_CELL_FOUND_IND,  /* HSR sniffer search */
+MSG_ID_GAS_EAS_BACKGROUND_SEARCH_START_CNF, /* 2G4 Background Search start confirm*/
+MSG_ID_EAS_GAS_CODE_END = MSG_ID_GAS_EAS_BACKGROUND_SEARCH_START_CNF,
+MODULE_MSG_END( MSG_ID_EAS_GAS_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_DM_MEME_CODE_BEGIN )
+//MSG_ID_DM_MEME_CODE_BEGIN,
+MSG_ID_UAS_GAS_CONFIG_GCELL_MEAS_CNF = MSG_ID_DM_MEME_CODE_BEGIN,
+#if defined(__LTE_RAT__) || defined(__23G_PRI_RESEL_SUPPORT__)
+MSG_ID_UAS_GAS_CONFIG_GCELL_PRIO_MEAS_CNF,
+MSG_ID_FDD_GAS_UAS_CONFIG_UCELL_PRIO_MEAS_REQ,
+MSG_ID_TDD_GAS_UAS_CONFIG_UCELL_PRIO_MEAS_REQ,
+#endif /* defined(__LTE_RAT__) || defined(__23G_PRI_RESEL_SUPPORT__) */
+MSG_ID_UAS_GAS_GCELL_MEAS_IND,
+MSG_ID_UAS_GAS_GCELL_BSIC_IND,
+MSG_ID_FDD_GAS_UAS_CONFIG_UCELL_MEAS_REQ,
+MSG_ID_TDD_GAS_UAS_CONFIG_UCELL_MEAS_REQ,
+
+/* EAS to MEME */
+MSG_ID_UAS_EAS_LTE_MEASUREMENT_CNF,
+MSG_ID_UAS_EAS_LTE_MEASUREMENT_IND,
+MSG_ID_EAS_FDD_UAS_CONFIG_UCELL_PRIO_MEAS_REQ,
+MSG_ID_EAS_FDD_UAS_CONFIG_UCELL_MEAS_REQ,
+MSG_ID_EAS_TDD_UAS_CONFIG_UCELL_PRIO_MEAS_REQ,
+MSG_ID_EAS_TDD_UAS_CONFIG_UCELL_MEAS_REQ,
+MSG_ID_DM_MEME_CODE_END = MSG_ID_EAS_TDD_UAS_CONFIG_UCELL_MEAS_REQ,
+MODULE_MSG_END( MSG_ID_DM_MEME_CODE_TAIL )
+
+//MSG_ID_DM_RRCE_CODE_BEGIN,
+MODULE_MSG_BEGIN( MSG_ID_DM_RRCE_CODE_BEGIN )
+MSG_ID_UAS_GAS_HO_ACTIVATE_GCELL_CNF = MSG_ID_DM_RRCE_CODE_BEGIN,
+MSG_ID_UAS_GAS_HANDOVER_GCELL_CNF,
+MSG_ID_GAS_UAS_HANDOVER_UCELL_REQ,  
+MSG_ID_GAS_UAS_HO_ACTIVATE_UCELL_REQ,
+MSG_ID_GAS_UAS_ABORT_HO_UCELL_REQ,
+MSG_ID_UAS_GAS_EVALUATE_GCELL_CNF,
+MSG_ID_UAS_GAS_ACTIVATE_GCELL_CNF,
+MSG_ID_UAS_GAS_EVALUATE_GCELL_STOP_CNF,
+MSG_ID_UAS_GAS_GCELL_CHANGE_COMPLETE_IND,
+#ifdef __LTE_RAT__
+/* EAS -> UAS IRHO part */
+MSG_ID_EAS_UAS_HANDOVER_UCELL_REQ,
+MSG_ID_UAS_EAS_HANDOVER_ECELL_CNF,
+MSG_ID_UAS_EAS_HO_ACTIVATE_ECELL_CNF,
+MSG_ID_EAS_UAS_ABORT_HO_UCELL_REQ,
+/* EAS -> UAS IRCR, Redirection part */
+MSG_ID_UAS_EAS_EVALUATE_ECELL_CNF,
+MSG_ID_UAS_EAS_EVALUATE_ECELL_STOP_CNF,
+MSG_ID_UAS_EAS_ACTIVATE_ECELL_CNF,
+MSG_ID_DM_RRCE_CODE_END = MSG_ID_UAS_EAS_ACTIVATE_ECELL_CNF,
+#else
+MSG_ID_DM_RRCE_CODE_END = MSG_ID_UAS_GAS_GCELL_CHANGE_COMPLETE_IND,
+#endif
+MODULE_MSG_END( MSG_ID_DM_RRCE_CODE_TAIL )
+//MSG_ID_DM_RRCE_CODE_END,
+
+MODULE_MSG_BEGIN( MSG_ID_AS_LOG_CODE_BEGIN )
+//MSG_ID_AS_LOG_CODE_BEGIN
+#ifdef __LTE_RAT__
+MSG_ID_UAS_EAS_ACTIVATE_ECELL_REQ = MSG_ID_AS_LOG_CODE_BEGIN,
+MSG_ID_GAS_EAS_ACTIVATE_ECELL_REQ,
+MSG_ID_EAS_GAS_GCELL_CHANGE_COMPLETE_IND,
+MSG_ID_GAS_EAS_ECELL_CHANGE_COMPLETE_IND,
+MSG_ID_EAS_UAS_ACTIVATE_UCELL_REQ,
+MSG_ID_AS_LOG_CODE_END = MSG_ID_EAS_UAS_ACTIVATE_UCELL_REQ,
+#endif
+// MSG_ID_AS_LOG_CODE_END,
+MODULE_MSG_END( MSG_ID_AS_LOG_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_RR_NRRC_CODE_BEGIN )
+MSG_ID_RR_NRRC_BACKGROUND_SEARCH_START_CNF = MSG_ID_RR_NRRC_CODE_BEGIN,
+MSG_ID_RR_NRRC_BACKGROUND_SEARCH_FOUND_IND,  
+MSG_ID_RR_NRRC_EVALUATE_NRCELL_CNF, 
+MSG_ID_RR_NRRC_EVALUATE_NRCELL_STOP_CNF,
+MSG_ID_RR_NRRC_ACTIVATE_NRCELL_CNF,
+
+/* Please add any new message ID above this only */
+MSG_ID_RR_NRRC_NOT_USED_MSG,
+MSG_ID_RR_NRRC_CODE_END = MSG_ID_RR_NRRC_NOT_USED_MSG,
+
+MODULE_MSG_END( MSG_ID_RR_NRRC_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_RRC_NRRC_CODE_BEGIN )
+MSG_ID_RRC_NRRC_BACKGROUND_SEARCH_START_CNF = MSG_ID_RRC_NRRC_CODE_BEGIN,
+MSG_ID_RRC_NRRC_BACKGROUND_SEARCH_FOUND_IND,  
+MSG_ID_RRC_NRRC_EVALUATE_NRCELL_CNF, 
+MSG_ID_RRC_NRRC_EVALUATE_NRCELL_STOP_CNF,
+MSG_ID_RRC_NRRC_ACTIVATE_NRCELL_CNF,
+
+/* Please add any new message ID above this only */
+MSG_ID_RRC_NRRC_NOT_USED_MSG,
+MSG_ID_RRC_NRRC_CODE_END = MSG_ID_RRC_NRRC_NOT_USED_MSG,
+
+MODULE_MSG_END( MSG_ID_RRC_NRRC_CODE_TAIL )
+
+
+#include "errc_msgid.h"
+#ifdef __SOURCE_INSIGHT_PARSE__
+};
+#endif
+
+#endif
+#endif   //_UAS_GAS_MSG_H
diff --git a/mcu/interface/sap/md/udps_msgid.h b/mcu/interface/sap/md/udps_msgid.h
new file mode 100644
index 0000000..d910624
--- /dev/null
+++ b/mcu/interface/sap/md/udps_msgid.h
@@ -0,0 +1,581 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   dps_sap.h
+ *
+ * Project:
+ * --------
+ *   WCDMA
+ *
+ * Description:
+ * ------------
+ *   Dummy Protocol Stack, SAP 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _UDPS_MSG_H
+#define _UDPS_MSG_H
+
+MODULE_MSG_BEGIN(MSG_ID_UDPS_CODE_BEGIN)
+MSG_ID_UDPS_UMTS_TEST_STOP_REQ = MSG_ID_UDPS_CODE_BEGIN,
+MSG_ID_UDPS_UMTS_TEST_STOP2_REQ,
+MSG_ID_UDPS_INITIAL_CELL_SEARCH,
+MSG_ID_UDPS_SFN_READ_SIB_LISTEN,
+MSG_ID_UDPS_PAGING_RESPONSE,
+MSG_ID_UDPS_TARGET_CELL_SEARCH,
+MSG_ID_UDPS_PCH_READING_ON_STTD_CELL, /* I5 = MPS2(CSD) and BSC1(CSD) */
+MSG_ID_UDPS_PCH_RECEIVE,  /* I6 (Requested by CSD) */
+MSG_ID_UDPS_RECURSIVE_TCS_IN_PCH, /* I8 = CS6(CSD) and CS7(CSD) */
+MSG_ID_UDPS_RECURSIVE_ICS_IN_NULL, /* I9 = CS1(CSD) */
+MSG_ID_UDPS_UL1D_CS_TEST, /* I10 = MTK UL1 internal CS testing (UL1D request) */
+MSG_ID_UDPS_RECURSIVE_IPS_IN_NULL, /* I11 = IPS(CSD) */
+MSG_ID_UDPS_PCH_MEASUREMENT_8960, /* I12 (3G Sleep Mode Testing) */
+MSG_ID_UDPS_CONTINUAL_ICS, /* I13: continual ICS */
+
+MSG_ID_UDPS_UL_OPEN_LOOP_PWR_CTRL,
+MSG_ID_UDPS_TX_ON_OFF_TIME_MASK,
+MSG_ID_UDPS_RX_ACK_ON_AICH,
+MSG_ID_UDPS_RX_NO_ACK_ON_AICH,
+MSG_ID_UDPS_RX_NACK_ON_AICH,
+MSG_ID_UDPS_BEST_EFFORT_FOR_PRACH, /* A6 = ACH1(CSD) */
+MSG_ID_UDPS_RECURSIVE_TCS_IN_FACH, /* A7 = CS5(CSD) */
+MSG_ID_UDPS_FACH_PERFORMANCE, /* A8 */
+
+MSG_ID_UDPS_UL_INNER_LOOP_PWR_CTRL,
+MSG_ID_UDPS_OUT_OF_SYNC_HANDLING,
+MSG_ID_UDPS_CHANGE_OF_TFC,
+MSG_ID_UDPS_UL_COMPRESSED_MODE,
+MSG_ID_UDPS_PEF_IN_STATIC_CH,
+MSG_ID_UDPS_PEF_IN_FADING_CH,
+MSG_ID_UDPS_PEF_IN_MOVING_CH,
+MSG_ID_UDPS_PEF_IN_BIRTH_DEATH_CH,
+MSG_ID_UDPS_PEF_IN_TX_DIV_MODE,
+MSG_ID_UDPS_DL_PWR_CTRL_CONST_BLER,
+MSG_ID_UDPS_PEF_IN_DL_COMPRESSED_MODE,
+MSG_ID_UDPS_PEF_OF_BTFD,
+MSG_ID_UDPS_PEF_IN_SHO,
+MSG_ID_UDPS_PEF_OF_TPC_COMBINING,
+MSG_ID_UDPS_PEF_IN_SSDT_PWR_CTRL,
+MSG_ID_UDPS_ACTIVE_SET_UPDATE_DELAY,
+MSG_ID_UDPS_TX_TIMING_IN_SHO,
+MSG_ID_UDPS_INTRA_FREQ_TRHHO_DELAY,
+MSG_ID_UDPS_INTER_FREQ_TRHHO_DELAY,
+MSG_ID_UDPS_RRC_REESTAB_DELAY,
+MSG_ID_UDPS_INTER_FREQ_TMHHO, /* CD21 */
+MSG_ID_UDPS_INTER_FREQ_TRHHO_REVERT, /* CD22 */
+MSG_ID_UDPS_INTER_FREQ_TMHHO_REVERT, /* CD23 */
+MSG_ID_UDPS_ABORT_ENTER_DCH, /* CD24 */
+MSG_ID_UDPS_RECURSIVE_TCS_IN_DCH, /* CD25 = CS2(CSD),CS3(CSD),CS4(CSD) */
+MSG_ID_UDPS_UNKNOWN_SFN_DECODING_IN_DCH, /* CD26 = BCH1(CSD) */
+
+MSG_ID_UDPS_TPC_COMBINING_RELIABLE_TEST, /* CD28 = UPC1(CSD), UPC2(CSD), UPC3(CSD), UPC4(CSD) and DDC3(CSD) */
+MSG_ID_UDPS_SIR_MEAS_IN_DCH_WITH_TXTD_CM, /* CD31 = DPC7(CSD) and DPC8(CSD) */
+MSG_ID_UDPS_DLPC_TEST_WIND_UP_DOWN, /* CD32 = DPC44(CSD) and DPC45(CSD) */
+MSG_ID_UDPS_PEF_OF_TRCH_RECONFIG, /* CD33 = DPC46(CSD) */
+MSG_ID_UDPS_DLPC_FOR_DIFF_TF, /* CD34 = DPC47(CSD) */
+MSG_ID_UDPS_DLPC_FOR_BTFD_DUAL_TF, /* CD35 = DPC68(CSD) */
+MSG_ID_UDPS_DLPC_FOR_TFCI_DUAL_TF, /* CD36 = DPC69(CSD) */
+MSG_ID_UDPS_DLPC_TEST_INITIAL_CONVERGENCE, /* CD37 = DDC4(CSD) */
+MSG_ID_UDPS_ULPC_FOR_TX_AGC_TEST, /* CD38 = UPC7~18(CSD) */
+MSG_ID_UDPS_BER_TEST_IN_DCH_MODE, /* CD39 (SA/CS request) */
+MSG_ID_UDPS_SADCH_TTI_EIGHTY, /* CD40 (R99) Stand-Alone DCH TTI=80ms */
+MSG_ID_UDPS_SADCH_TTI_EIGHTY_WITH_CM, /* CD41 (R99) Stand-Alone DCH TTI=80ms with CM */
+
+MSG_ID_UDPS_AUTO_RECONFIG,/* CD50, By Albert for auto re-config */
+MSG_ID_UDPS_DCH_FACH_TRANSIT, /* CD51, By Amida */
+MSG_ID_UDPS_DPAS_SL1,
+MSG_ID_UDPS_DPAS_SL2,
+MSG_ID_UDPS_DPAS_SL3,
+MSG_ID_UDPS_DPAS_SL4,
+MSG_ID_UDPS_DPAS_SL5,
+MSG_ID_UDPS_DPAS_SL6,
+MSG_ID_UDPS_DPAS_SL7,
+MSG_ID_UDPS_DPAS_SL8,
+MSG_ID_UDPS_DPAS_SL9,
+MSG_ID_UDPS_DPAS_SL10,
+MSG_ID_UDPS_DPAS_SL11,
+MSG_ID_UDPS_DPAS_SL12,
+MSG_ID_UDPS_DPAS_SL13,
+MSG_ID_UDPS_DPAS_FDD_TEST_SL1,
+MSG_ID_UDPS_DPAS_FDD_TEST_SL2,
+MSG_ID_UDPS_DPAS_CC1,
+MSG_ID_UDPS_DPAS_CC2,
+MSG_ID_UDPS_DPAS_CC3,
+MSG_ID_UDPS_DPAS_CC4,
+MSG_ID_UDPS_DPAS_CC5,
+MSG_ID_UDPS_DPAS_CC6,
+MSG_ID_UDPS_DPAS_TGPS1,
+MSG_ID_UDPS_DPAS_TGPS2,
+MSG_ID_UDPS_DPAS_MEAS1,
+MSG_ID_UDPS_DPAS_MEAS2,
+MSG_ID_UDPS_DPAS_MEAS3,
+MSG_ID_UDPS_DPAS_OCIC1,
+MSG_ID_UDPS_DPAS_OCIC2,
+MSG_ID_UDPS_DPAS02_OCIC,
+MSG_ID_UDPS_DPAS08_1,
+MSG_ID_UDPS_DPAF01,
+MSG_ID_UDPS_DPAF02,
+MSG_ID_UDPS_DPAF03,
+MSG_ID_UDPS_DPAF04,
+MSG_ID_UDPS_DPAF07,
+MSG_ID_UDPS_DPAF08,
+MSG_ID_UDPS_DPAF09,
+MSG_ID_UDPS_DPAF10,
+MSG_ID_UDPS_DPAF11,
+MSG_ID_UDPS_DPAF11_1,
+MSG_ID_UDPS_DPAF12, 
+MSG_ID_UDPS_DPAF13, 
+MSG_ID_UDPS_DPAF14, 
+MSG_ID_UDPS_DPAF15, 
+MSG_ID_UDPS_R6_CN01_1,
+MSG_ID_UDPS_R6_CN01_2,
+MSG_ID_UDPS_R6_CN02_1,
+MSG_ID_UDPS_R6_CN02_2,
+MSG_ID_UDPS_R6_CN03_1,
+MSG_ID_UDPS_R6_CN03_2,
+MSG_ID_UDPS_R6_CN04_1,
+MSG_ID_UDPS_R6_CN04_2,
+MSG_ID_UDPS_R6_CN05_1,
+MSG_ID_UDPS_R6_CN05_2,
+MSG_ID_UDPS_R6_CN06_1,
+MSG_ID_UDPS_R6_CN06_2,
+MSG_ID_UDPS_R6_CN07_1,
+MSG_ID_UDPS_R6_CN07_2,
+MSG_ID_UDPS_R6_CN08_1,
+MSG_ID_UDPS_R6_CN08_2,
+MSG_ID_UDPS_R6_CN09_1,
+MSG_ID_UDPS_R6_CN09_2,
+MSG_ID_UDPS_R6_CN10_1,
+MSG_ID_UDPS_R6_CN10_2,
+MSG_ID_UDPS_R6_CN11_1,
+MSG_ID_UDPS_R6_CN11_2,
+MSG_ID_UDPS_R6_CN12_1,
+MSG_ID_UDPS_R6_CN12_2,
+MSG_ID_UDPS_R6_CN13_1,
+MSG_ID_UDPS_R6_CN13_2,
+MSG_ID_UDPS_R6_CN14_1,
+MSG_ID_UDPS_R6_CN14_2,
+MSG_ID_UDPS_R6_CN15_1,
+MSG_ID_UDPS_R6_CN15_2,
+MSG_ID_UDPS_R6_CN16,
+MSG_ID_UDPS_R6_CN17_1,
+MSG_ID_UDPS_R6_CN17_2,
+MSG_ID_UDPS_R6_CN18_1,
+MSG_ID_UDPS_R6_CN18_2,
+MSG_ID_UDPS_R6_CN19_1,
+MSG_ID_UDPS_R6_CN19_2,
+MSG_ID_UDPS_R6_CN20,
+MSG_ID_UDPS_R6_CN21,
+MSG_ID_UDPS_R6_CN22,
+MSG_ID_UDPS_R6_CN90_1,
+MSG_ID_UDPS_R6_CN90_2,
+MSG_ID_UDPS_R6_CN91_1,
+MSG_ID_UDPS_R6_CN91_2,
+MSG_ID_UDPS_R6_PW01_1,
+MSG_ID_UDPS_R6_PW01_2,
+MSG_ID_UDPS_R6_PW02,
+MSG_ID_UDPS_R6_PW03,
+MSG_ID_UDPS_R6_PW04,
+MSG_ID_UDPS_R6_PW05,
+MSG_ID_UDPS_R6_PW06_1,
+MSG_ID_UDPS_R6_PW06_2,
+MSG_ID_UDPS_R6_PW06_3,
+MSG_ID_UDPS_R6_PW07_1,
+MSG_ID_UDPS_R6_PW07_2,
+MSG_ID_UDPS_R6_PW07_3,
+MSG_ID_UDPS_R6_PW08_1,
+MSG_ID_UDPS_R6_PW08_2,
+MSG_ID_UDPS_R6_PW08_3,
+MSG_ID_UDPS_R6_CM01_1,
+MSG_ID_UDPS_R6_CM01_2,
+MSG_ID_UDPS_R6_CM02_1,
+MSG_ID_UDPS_R6_CM02_2,
+MSG_ID_UDPS_R6_CM03_1,
+MSG_ID_UDPS_R6_CM03_2,
+MSG_ID_UDPS_R6_CM04,
+MSG_ID_UDPS_R6_CM05_1,
+MSG_ID_UDPS_R6_CM05_2,
+MSG_ID_UDPS_R6_HI01_1,
+MSG_ID_UDPS_R6_HI01_2,
+MSG_ID_UDPS_R6_HI02_1,
+MSG_ID_UDPS_R6_HI02_2,
+MSG_ID_UDPS_R6_HI03_1,
+MSG_ID_UDPS_R6_HI03_2,
+MSG_ID_UDPS_R6_HI04_1,
+MSG_ID_UDPS_R6_HI04_2,
+MSG_ID_UDPS_R6_RG01_1,
+MSG_ID_UDPS_R6_RG01_2,
+MSG_ID_UDPS_R6_RG02,
+MSG_ID_UDPS_R6_RG03_1,
+MSG_ID_UDPS_R6_RG03_2,
+MSG_ID_UDPS_R6_RG04_1,
+MSG_ID_UDPS_R6_RG04_2,
+MSG_ID_UDPS_R6_AG01_1,
+MSG_ID_UDPS_R6_AG01_2,
+MSG_ID_UDPS_R6_AG02_1,
+MSG_ID_UDPS_R6_AG02_2,
+MSG_ID_UDPS_R6_AG03_1,
+MSG_ID_UDPS_R6_AG03_2,
+MSG_ID_UDPS_R6_TF01_1,
+MSG_ID_UDPS_R6_TF01_2,
+MSG_ID_UDPS_R6_TF02_1,
+MSG_ID_UDPS_R6_TF02_2,
+MSG_ID_UDPS_R6_CD01_1,
+MSG_ID_UDPS_R6_CSD_HI01_1,
+MSG_ID_UDPS_R6_CSD_HI01_2,
+MSG_ID_UDPS_R6_CSD_HI02_1,
+MSG_ID_UDPS_R6_CSD_HI02_2,
+MSG_ID_UDPS_R6_CSD_HI03_1,
+MSG_ID_UDPS_R6_CSD_HI03_2,
+MSG_ID_UDPS_R6_CSD_HI04_1,
+MSG_ID_UDPS_R6_CSD_HI04_2,
+MSG_ID_UDPS_R6_CSD_RG01_1,
+MSG_ID_UDPS_R6_CSD_RG01_2,
+MSG_ID_UDPS_R6_CSD_RG02,
+MSG_ID_UDPS_R6_CSD_RG03_1,
+MSG_ID_UDPS_R6_CSD_RG03_2,
+MSG_ID_UDPS_R6_CSD_RG04_1,
+MSG_ID_UDPS_R6_CSD_RG04_2,
+MSG_ID_UDPS_R6_CSD_AG01_1,
+MSG_ID_UDPS_R6_CSD_AG01_2,
+MSG_ID_UDPS_R6_CSD_AG02_1,
+MSG_ID_UDPS_R6_CSD_AG02_2,
+MSG_ID_UDPS_R6_CSD_PW02,
+MSG_ID_UDPS_R6_CSD_PW03,
+MSG_ID_UDPS_R6_AGL01_1,
+MSG_ID_UDPS_R6_AGL01_2,
+MSG_ID_UDPS_R6_AGL02_1,
+MSG_ID_UDPS_R6_AGL02_2,
+MSG_ID_UDPS_R6_AGL_HI01_1_ACK,
+MSG_ID_UDPS_R6_AGL_HI01_1_FALSE_ACK,
+MSG_ID_UDPS_R6_AGL_HI01_2_ACK,
+MSG_ID_UDPS_R6_AGL_HI01_2_FALSE_ACK,
+MSG_ID_UDPS_R6_AGL_AG01_1,
+MSG_ID_UDPS_R6_AGL_AG01_2,
+MSG_ID_UDPS_R6_ME01_1,
+MSG_ID_UDPS_R6_ME01_2,
+MSG_ID_UDPS_R6_ME02_1,
+MSG_ID_UDPS_R6_ME02_2,
+MSG_ID_UDPS_R6_ME02_3,
+MSG_ID_UDPS_R6_ME03_1,
+MSG_ID_UDPS_R6_ME03_2,
+MSG_ID_UDPS_R6_ME03_3,
+// __UMTS_R7__
+MSG_ID_UDPS_R7_HSDPA_01,
+MSG_ID_UDPS_R7_HSDPA_02,
+MSG_ID_UDPS_R7_HSDPA_03,
+MSG_ID_UDPS_R7_HSDPA_04,
+MSG_ID_UDPS_R7_HSDPA_05,
+MSG_ID_UDPS_R7_HSDPA_06,
+MSG_ID_UDPS_R7_HSDPA_07,
+MSG_ID_UDPS_R7_HSDPA_08,
+MSG_ID_UDPS_R7_CPC_01,
+MSG_ID_UDPS_R7_CPC_02,
+MSG_ID_UDPS_R7_CPC_03,
+MSG_ID_UDPS_R7_CPC_04,
+MSG_ID_UDPS_R7_CPC_05,
+MSG_ID_UDPS_R7_CPC_06,
+MSG_ID_UDPS_R7_CPC_07,
+MSG_ID_UDPS_R7_CPC_08,
+MSG_ID_UDPS_R7_CPC_09,
+MSG_ID_UDPS_R7_CPC_10,
+MSG_ID_UDPS_R7_CPC_11,
+MSG_ID_UDPS_R7_CPC_12,
+MSG_ID_UDPS_R7_CPC_13,
+MSG_ID_UDPS_R7_CPC_14,
+MSG_ID_UDPS_R7_CPC_15,
+MSG_ID_UDPS_R7_CPC_16,
+MSG_ID_UDPS_R7_FDPCH_01,
+MSG_ID_UDPS_R7_FDPCH_02,
+MSG_ID_UDPS_R7_FDPCH_03,
+MSG_ID_UDPS_R7_FDPCH_04,
+MSG_ID_UDPS_R7_FDPCH_05,
+MSG_ID_UDPS_R7_EFACH_01,
+MSG_ID_UDPS_R7_EFACH_02,
+MSG_ID_UDPS_R7_EFACH_03,
+MSG_ID_UDPS_R7_EFACH_04,
+MSG_ID_UDPS_R7_EFACH_05,
+MSG_ID_UDPS_R7_EFACH_06,
+MSG_ID_UDPS_R7_EFACH_07,
+MSG_ID_UDPS_R7_TF01_1,
+MSG_ID_UDPS_R7_TF01_2,
+MSG_ID_UDPS_R7_F01,
+MSG_ID_UDPS_R7_F02,
+MSG_ID_UDPS_R7_F03,
+MSG_ID_UDPS_R7_F04,
+MSG_ID_UDPS_R7_F05,
+MSG_ID_UDPS_R7_F06,
+MSG_ID_UDPS_R7_F07,
+MSG_ID_UDPS_R7_F08,
+MSG_ID_UDPS_R7_F09,
+MSG_ID_UDPS_R8_F01,
+MSG_ID_UDPS_R8_F02,
+MSG_ID_UDPS_R8_F03,
+MSG_ID_UDPS_R8_F04,
+MSG_ID_UDPS_R8_F05,
+MSG_ID_UDPS_R8_F06,
+
+// __UMTS_R7__
+//__UMTS_R8__
+
+MSG_ID_UDPS_R8_DCHSDPA_01,
+MSG_ID_UDPS_R8_DCHSDPA_02,
+MSG_ID_UDPS_R8_DCHSDPA_03,
+MSG_ID_UDPS_R8_DCHSDPA_04,
+MSG_ID_UDPS_R8_DCHSDPA_05,
+MSG_ID_UDPS_R8_DCHSDPA_06,
+MSG_ID_UDPS_R8_DCHSDPA_07,
+MSG_ID_UDPS_R8_DCHSDPA_08,
+MSG_ID_UDPS_R8_DCHSDPA_09,
+MSG_ID_UDPS_R8_DCHSDPA_10,
+MSG_ID_UDPS_R8_DCHSDPA_11,
+MSG_ID_UDPS_R8_DCHSDPA_12,
+MSG_ID_UDPS_R8_DCHSDPA_13,
+MSG_ID_UDPS_R8_DCHSDPA_14,
+MSG_ID_UDPS_R8_DCHSDPA_15,
+MSG_ID_UDPS_R8_LESSMODE_01,
+MSG_ID_UDPS_R8_LESSMODE_02,
+MSG_ID_UDPS_R8_LESSMODE_03,
+MSG_ID_UDPS_R8_LESSMODE_04,
+MSG_ID_UDPS_R8_LESSMODE_05,
+MSG_ID_UDPS_R8_CEDCH_01,
+MSG_ID_UDPS_R8_CEDCH_02,
+MSG_ID_UDPS_R8_CEDCH_03,
+MSG_ID_UDPS_R8_CEDCH_04,
+MSG_ID_UDPS_R8_CEDCH_05,
+MSG_ID_UDPS_R8_CEDCH_06,
+MSG_ID_UDPS_R8_CEDCH_07,
+MSG_ID_UDPS_R8_FACHDRX_01,
+MSG_ID_UDPS_R8_FACHDRX_02,
+MSG_ID_UDPS_R8_FACHDRX_03,
+MSG_ID_UDPS_R8_M01,
+MSG_ID_UDPS_R8_M02,
+MSG_ID_UDPS_R8_M03,
+MSG_ID_UDPS_R8_M04,
+MSG_ID_UDPS_R8_M05,
+MSG_ID_UDPS_R8_M06,
+MSG_ID_UDPS_R8_M07,
+MSG_ID_UDPS_R8_M08,
+MSG_ID_UDPS_R8_M09,
+MSG_ID_UDPS_R8_M10,
+MSG_ID_UDPS_R8_MCPC1_01,
+MSG_ID_UDPS_R8_MCPC1_02,
+MSG_ID_UDPS_R8_MCPC2_01,
+MSG_ID_UDPS_R8_MCPC2_02,
+MSG_ID_UDPS_R8_CRS1,
+MSG_ID_UDPS_R8_CRS2,
+
+//__UMTS_R8__
+/* __UMTS_R9__ */
+MSG_ID_UDPS_R9_DB_DCHSDPA_01,
+MSG_ID_UDPS_R9_TF_01,
+MSG_ID_UDPS_R9_DCHSUPA_01,
+MSG_ID_UDPS_R9_DCHSUPA_02,
+MSG_ID_UDPS_R9_DCHSUPA_03,
+MSG_ID_UDPS_R9_DCHSUPA_04,
+MSG_ID_UDPS_R9_DCHSUPA_05,
+MSG_ID_UDPS_R9_DCHSUPA_06,
+MSG_ID_UDPS_R9_DCHSUPA_07,
+MSG_ID_UDPS_R9_DCHSUPA_08,
+MSG_ID_UDPS_R9_DCHSUPA_09,
+MSG_ID_UDPS_R9_PW01,
+MSG_ID_UDPS_R9_PW02,
+MSG_ID_UDPS_R9_PW03,
+MSG_ID_UDPS_R9_PW04,
+MSG_ID_UDPS_R9_PW05,
+MSG_ID_UDPS_R9_TGPS_01,
+MSG_ID_UDPS_R9_HI01,
+MSG_ID_UDPS_R9_RG01,
+MSG_ID_UDPS_R9_AG01,
+MSG_ID_UDPS_R9_AG02,
+MSG_ID_UDPS_R9_CPC_01,
+MSG_ID_UDPS_R9_CPC_02,
+MSG_ID_UDPS_R9_CPC_03,
+MSG_ID_UDPS_R9_CPC_04,
+MSG_ID_UDPS_R9_CPC_05,
+MSG_ID_UDPS_R9_CPC_06,
+MSG_ID_UDPS_R9_CPC_07,
+MSG_ID_UDPS_R9_CPC_08,
+MSG_ID_UDPS_R9_CPC_09,
+MSG_ID_UDPS_R9_CPC_10,
+MSG_ID_UDPS_R9_CPC_11,
+MSG_ID_UDPS_R10_3CHSDPA_01,
+MSG_ID_UDPS_R10_3CHSDPA_02,
+MSG_ID_UDPS_R10_3CHSDPA_03,
+MSG_ID_UDPS_R10_3CHSDPA_04,
+MSG_ID_UDPS_R10_3CHSDPA_05,
+MSG_ID_UDPS_R10_3CHSDPA_06,
+MSG_ID_UDPS_R10_3CHSDPA_07,
+MSG_ID_UDPS_R10_3CHSDPA_08,
+MSG_ID_UDPS_R10_LESSMODE_01,
+MSG_ID_UDPS_R10_LESSMODE_02,
+MSG_ID_UDPS_R10_LESSMODE_03,
+MSG_ID_UDPS_R10_M01,
+MSG_ID_UDPS_R10_M02,
+MSG_ID_UDPS_R10_M03,
+MSG_ID_UDPS_R10_M04,
+/* __UMTS_R9__ */
+
+MSG_ID_UDPS_INTER_FREQ_CRS_IN_IDLE,
+MSG_ID_UDPS_INTRA_FREQ_CRS_IN_FACH,
+MSG_ID_UDPS_INTER_FREQ_CRS_IN_FACH,
+
+MSG_ID_UDPS_INTRA_FREQ_REPORTING_DELAY,
+MSG_ID_UDPS_INTRA_FREQ_REPORTING_DELAY_IN_FADING,
+MSG_ID_UDPS_INTER_FREQ_REPORTING_DELAY,
+MSG_ID_UDPS_ABS_INTRA_FREQ_CPICH_RSCP,
+MSG_ID_UDPS_REL_INTRA_FREQ_CPICH_RSCP,
+MSG_ID_UDPS_REL_INTER_FREQ_CPICH_RSCP,
+MSG_ID_UDPS_ABS_INTRA_FREQ_CPICH_ECIO,
+MSG_ID_UDPS_REL_INTRA_FREQ_CPICH_ECIO,
+MSG_ID_UDPS_REL_INTER_FREQ_CPICH_ECIO,
+MSG_ID_UDPS_ABS_UTRA_CARRIER_RSSI,
+MSG_ID_UDPS_REL_UTRA_CARRIER_RSSI,
+MSG_ID_UDPS_INTRA_FREQ_SFN_CFN_DIFF,
+MSG_ID_UDPS_INTER_FREQ_SFN_CFN_DIFF,
+MSG_ID_UDPS_SFN_SFN_DIFF_TYPE1,
+MSG_ID_UDPS_UE_TX_POWER,
+MSG_ID_UDPS_ALL_MEAS_STATISTIC,/* CSD request */
+
+/* 2.5G Measurement */
+/* 2G Standby 3G Active: start from UDPS */
+MSG_ID_UDPS_GSM_MEAS_IN_NULL, /* GM1 */
+MSG_ID_UDPS_GSM_MEAS_IN_IDLE, /* GM2 */
+MSG_ID_UDPS_GSM_MEAS_IN_FACH, /* GM3 */
+MSG_ID_UDPS_GSM_REPORTING_DELAY,
+MSG_ID_UDPS_GSM_REPORTING_DELAY_NO_BSIC, /* GM5 */
+MSG_ID_UDPS_ABS_GSM_CARRIER_RSSI,
+
+/* 2G Active 3G Standby: still start from UDPS */
+MSG_ID_UDPS_WCDMA_MEAS_IN_SCAN, /* UM1 */
+MSG_ID_UDPS_WCDMA_MEAS_IN_IDLE, /* UM2 */
+MSG_ID_UDPS_WCDMA_MEAS_IN_DEDI, /* UM3 */
+MSG_ID_UDPS_WCDMA_MEAS_IN_PIDLE, /* UM4 */
+MSG_ID_UDPS_WCDMA_MEAS_IN_PTX, /* UM5 */
+MSG_ID_UDPS_RECURSIVE_TCS_IN_2G_IDLE, /* UM6 = CS12(CSD) and CS13(CSD) */
+MSG_ID_UDPS_RECURSIVE_TCS_IN_2G_DEDI, /* UM7 = CS8(CSD) and CS9(CSD) */
+
+MSG_ID_UDPS_GSM_CRS_TO_UMTS, /*IRT1*/
+MSG_ID_UDPS_UMTS_CRS_TO_GSM, /*IRT2*/
+MSG_ID_UDPS_GSM_HHO_TO_UMTS, /*IRT3*/
+MSG_ID_UDPS_UMTS_HHO_TO_GSM, /*IRT4*/
+
+/* LoRx */
+MSG_ID_UDPS_AMR_LORX01,
+
+/* UDPS_UNIT_TEST */
+MSG_ID_CPHY_UL_DPCH_CB,
+
+/* For Phase 3 Emulation */
+MSG_ID_UL1D_LOOPBACK_REQ,
+MSG_ID_UL1D_LOOPBACK_RESULT_IND,
+MSG_ID_MODEM_LOOPBACK_REQ,
+MSG_ID_MODEM_LOOPBACK_RESULT_IND,
+
+/* For TPC CER(Command Error Rate)  Evaluation */
+MSG_ID_UL1D_DL_TPC_RESULT_IND,
+
+MSG_ID_UDPS_EVENT_3B_TRIGGERED,
+MSG_ID_UDPS_EVENT_3C_TRIGGERED,
+MSG_ID_UDPS_ABORT_SUCCESS,
+
+MSG_ID_UDPS_START_RUN_L1S_CASE,
+MODULE_MSG_END(MSG_ID_UDPS_CODE_TAIL)
+
+#endif  //_UDPS_MSG_H
diff --git a/mcu/interface/sap/md/uim_msgid.h b/mcu/interface/sap/md/uim_msgid.h
new file mode 100644
index 0000000..885aa23
--- /dev/null
+++ b/mcu/interface/sap/md/uim_msgid.h
@@ -0,0 +1,317 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+*
+* FILE NAME   :uim_msgid.h
+*
+* DESCRIPTION :
+*
+*
+*
+* HISTORY     :
+*     See Log at end of file
+*
+*****************************************************************************/
+#ifndef _UIM_MSG_ID_H
+#define _UIM_MSG_ID_H
+
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_CUIM_CODE_BEGIN )
+
+   MSG_ID_UIM_RAW_CMD_MSG = MSG_ID_CUIM_CODE_BEGIN + 0x0000, /* 0x8858 base */
+   MSG_ID_UIM_SELECT_MSG,
+   MSG_ID_UIM_STATUS_MSG,
+   MSG_ID_UIM_READ_BINARY_MSG,
+   MSG_ID_UIM_UPDATE_BINARY_MSG,
+   MSG_ID_UIM_READ_RECORD_MSG,
+   MSG_ID_UIM_UPDATE_RECORD_MSG,
+   MSG_ID_UIM_SEARCH_RECORD_MSG,
+   MSG_ID_UIM_VERIFY_CHV_MSG,
+   MSG_ID_UIM_CHANGE_CHV_MSG,
+   MSG_ID_UIM_ENABLE_CHV_MSG,
+   MSG_ID_UIM_DISABLE_CHV_MSG,
+   MSG_ID_UIM_UNBLOCK_CHV_MSG,
+   MSG_ID_UIM_BS_CHALLENGE_MSG,
+   MSG_ID_UIM_CONFIRM_SSD_MSG,
+   MSG_ID_UIM_RUN_CAVE_MSG,
+   MSG_ID_UIM_GENERATE_KEY_VPM_MSG,
+   MSG_ID_UIM_STORE_ESN_ME_MSG,
+   MSG_ID_UIM_HLP_ACCESS_CHAP_REQ_MSG,
+
+   MSG_ID_UIM_3GPD_OPC_GET_MSG,   /* obsolete! */ /*Get EFME3GPDOPC*/
+   MSG_ID_UIM_3GPD_OPC_UPDATE_MSG,  /*Update EFME3GPDOPC*/
+   MSG_ID_UIM_3GPD_OPM_GET_MSG,   /* obsolete! */ /*Get EF3GPDOPM*/
+   MSG_ID_UIM_3GPD_OPM_UPDATE_MSG,  /*Update EF3GPDOPM*/
+   MSG_ID_UIM_3GPD_SIPCAP_GET_MSG,   /*Get EFSIPCAP*/
+   MSG_ID_UIM_3GPD_MIPCAP_GET_MSG,  /* Get EFMIPCAP */
+   MSG_ID_UIM_3GPD_SIPUPP_GET_MSG,  /* Get EFSIPUPP */
+   MSG_ID_UIM_3GPD_MIPUPP_GET_MSG,  /*Get EFMIPUPP */
+   MSG_ID_UIM_3GPD_SIPSP_GET_MSG,    /* Get EFSIPSP */
+   MSG_ID_UIM_3GPD_SIPSP_UPDATE_MSG,  /* Update EFSIPSP */
+   MSG_ID_UIM_3GPD_MIPSP_GET_MSG,        /*Get EFMIPSP*/
+   MSG_ID_UIM_3GPD_MIPSP_UPDATE_MSG,  /* Update EFMIPSP */
+   MSG_ID_UIM_3GPD_SIPPAPSS_GET_MSG,   /* Get SIPPAPSS */
+   MSG_ID_UIM_3GPD_SIPPAPSS_UPDATE_MSG, /* Update SIPPAPSS*/
+
+   MSG_ID_UIM_3GPD_IPV6_CAP_GET_MSG,            /* obsolete! */ /* Get EFIPV6CAP 7F25/6F77 in UIM or 7FFF/6F87 in CSIM */
+   MSG_ID_UIM_3GPD_MIP_FLAGS_GET_MSG,           /* obsolete! */ /* Get EFMIPFlags  7F25/6F78 in UIM or 7FFF/6F84 in CSIM */
+   MSG_ID_UIM_3GPD_TCP_CONFIG_GET_MSG,          /* obsolete! */ /* Get EFTCPCONFIG 7F25/6F79 in UIM or 7FFF/6F88 in CSIM */
+   MSG_ID_UIM_3GPD_DATA_GENERIC_CONFIG_GET_MSG, /* obsolete! */ /* Get EFDCG       7F25/6F7A in UIM or 7FFF/6F89 in CSIM */
+   MSG_ID_UIM_3GPD_UPPEXT_GET_MSG,              /* Get EFSIPUPPEXT 7F25/6F7D in UIM or 7FFF/6F85 in CSIM, referred to as 3GPDUpp in latest Spec */
+
+   MSG_ID_UIM_MS_KEY_REQUEST_MSG,
+   MSG_ID_UIM_KEY_GENERATION_REQUEST_MSG,
+   MSG_ID_UIM_COMMIT_MSG,
+   MSG_ID_UIM_VALIDATE_MSG,
+   MSG_ID_UIM_CONFIGURATION_REQUEST_MSG,
+   MSG_ID_UIM_DOWNLOAD_REQUEST_MSG,
+   MSG_ID_UIM_SSPR_CONFIGURATION_REQUEST_MSG,
+   MSG_ID_UIM_SSPR_DOWNLOAD_REQUEST_MSG,
+
+   MSG_ID_UIM_PUZL_CONFIGURATION_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_PUZL_DOWNLOAD_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_3GPD_CONFIGURATION_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_3GPD_DOWNLOAD_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_MMD_CONFIGURATION_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_MMD_DOWNLOAD_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_MMS_CONFIGURATION_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_MMS_DOWNLOAD_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_SYSTEM_TAG_CONFIGURATION_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_SYSTEM_TAG_DOWNLOAD_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_MMSS_CONFIGURATION_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_MMSS_DOWNLOAD_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_SECURE_MODE_MSG, /* obsolete! */
+   MSG_ID_UIM_FRESH_MSG, /* obsolete! */
+   MSG_ID_UIM_SERVICE_KEY_GENERATION_REQUEST_MSG, /* obsolete! */
+   MSG_ID_UIM_BCMCS_MSG, /* obsolete! */
+   MSG_ID_UIM_APPLICATION_AUTHENTION_MSG, /* obsolete! */
+   MSG_ID_UIM_UMAC_GENERATION_MSG, /* obsolete! */
+   MSG_ID_UIM_CONFIRM_KEYS_MSG,  /* obsolete! */
+
+   MSG_ID_UIM_OTAPA_REQUEST_MSG,
+   MSG_ID_UIM_OTA_RUN_CAVE_MSG,
+
+   MSG_ID_UIM_HRPD_MD5_AUTH_MSG,
+   MSG_ID_UIM_CARD_TYPE_GET_MSG,
+   MSG_ID_UIM_3G_SIP_CHAP_REQ_MSG,
+   MSG_ID_UIM_3G_MIP_MNHA_AUTH_REQ_MSG,
+   MSG_ID_UIM_3G_MIP_RRQ_HASH_REQ_MSG,
+   MSG_ID_UIM_3G_MIP_MNAAA_AUTH_REQ_MSG,
+   MSG_ID_UIM_GET_ISIM_IMPU_MSG, /* obsolete! */
+   MSG_ID_UIM_APP_INIT_TERM_MSG, /* UIM application initialization or termination */
+   
+   MSG_ID_UIM_EXT_INFO_GET_MSG,
+   MSG_ID_UICC_LOGI_CHAN_OPEN_MSG,
+   MSG_ID_UICC_LOGI_CHAN_CLOSE_MSG,
+   MSG_ID_UIM_RESET_MSG,
+
+   MSG_ID_UIM_GET_PRL_MSG,
+   MSG_ID_UIM_GET_EXT_PRL_MSG,
+   MSG_ID_UIM_GET_EFPL_MSG, /* obsolete! */
+
+   MSG_ID_UIM_TERMINAL_PROFILE_MSG = MSG_ID_CUIM_CODE_BEGIN + 0x0A0,
+   MSG_ID_UIM_TERMINAL_RESPONSE_MSG,
+   MSG_ID_UIM_ENVELOPE_MSG,
+   MSG_ID_UIM_UTK_REFRESH_MSG,
+   MSG_ID_UIM_FILE_CHANGE_RSP_MSG,
+   MSG_ID_UIM_PROACTIVE_REGISTER_MSG,  /* obsolete! */
+   MSG_ID_UIM_PROACTIVE_POLLING_MSG,
+   MSG_ID_C2K_UIM_SAT_FILE_CHANGE_RES,
+
+
+   MSG_ID_UIM_3G_AKA_AUTH_REQ_MSG = MSG_ID_CUIM_CODE_BEGIN + 0x0C0,
+   MSG_ID_UIM_3G_AKA_READ_EFKEYSPS_MSG, /* obsolete! */
+   MSG_ID_UIM_3G_AKA_UPDATE_EFKEYSPS_MSG, /* obsolete! */
+   MSG_ID_UIM_GET_USIM_AD_MSG, /*Administrative Data*/
+   MSG_ID_UIM_GET_USIM_IMSI_MSG,
+   MSG_ID_UIM_USIM_UST_DATA_GET_MSG,   /* Get ust */
+   MSG_ID_UIM_USIM_EST_DATA_GET_MSG,   /* Get est */
+   MSG_ID_UIM_USIM_ACL_DATA_GET_MSG,   /* Get acl */
+
+   MSG_ID_UIM_EXTENDED_RAW_CMD_MSG,
+   
+#if defined (__TC10__) && defined (__TC10_IPC_CDMA_SUPPORT__) 
+   MSG_ID_UIM_REFRESH_CONF_IND_MSG,
+#endif
+
+   MSG_ID_UIM_GET_NAM_DATA_MSG = MSG_ID_CUIM_CODE_BEGIN + 0x0100,
+   MSG_ID_UIM_UPDATE_NAM_DATA_MSG,
+   MSG_ID_UIM_GET_CST_MSG,
+   MSG_ID_UIM_GET_UIMID_EUIMID_MSG,
+   MSG_ID_UIM_GET_IMSI_MSG,
+
+   MSG_ID_UIM_OTA_UPDATE_NAM_MSG,/* NAM data updated by OTAPA/OTASP */
+
+
+   MSG_ID_UIM_GET_PHB_REC_PARAMS_MSG= MSG_ID_CUIM_CODE_BEGIN + 0x0200,
+   MSG_ID_UIM_GET_PHB_REC_MSG,
+   MSG_ID_UIM_UPDATE_PHB_REC_MSG,
+   MSG_ID_UIM_ERASE_PHB_REC_MSG,
+   MSG_ID_UIM_GET_SMS_REC_PARAMS_MSG,
+   MSG_ID_UIM_GET_SMS_REC_MSG,
+   MSG_ID_UIM_UPDATE_SMS_REC_MSG,
+   MSG_ID_UIM_ERASE_SMS_REC_MSG,
+
+   MSG_ID_UIM_GET_STATUS_MSG,
+   MSG_ID_UIM_CARD_DETECT_MSG,
+
+   /* CHV APP */
+   MSG_ID_UIM_APP_VERIFY_CHV_MSG,
+   MSG_ID_UIM_APP_CHANGE_CHV_MSG,
+   MSG_ID_UIM_APP_ENABLE_CHV_MSG,
+   MSG_ID_UIM_APP_DISABLE_CHV_MSG,
+   MSG_ID_UIM_APP_UNBLOCK_CHV_MSG,
+
+   MSG_ID_UIM_GET_EF_PROPERTY_MSG,
+   MSG_ID_UIM_SET_CARDTYPE_MSG,
+
+   MSG_ID_UIM_FULL_RECOVERY_MSG,
+   MSG_ID_UIM_FAST_RECOVERY_MSG,
+   MSG_ID_UIM_UTK_REFRESH_TIMEOUT_MSG,
+   MSG_ID_UIM_BTSAP_CONNECT_MSG,
+   MSG_ID_UIM_BTSAP_DISCONNECT_MSG,
+   MSG_ID_UIM_BTSAP_POWER_ON_MSG,
+   MSG_ID_UIM_BTSAP_POWER_OFF_MSG,
+   MSG_ID_UIM_BTSAP_RESET_MSG,
+   MSG_ID_UIM_BTSAP_TRANSFER_APDU_MSG,
+
+
+   MSG_ID_UIM_GET_FDN_REC_MSG,
+   MSG_ID_UIM_UPDATE_FDN_REC_MSG,
+   MSG_ID_UIM_ERASE_FDN_REC_MSG,
+   MSG_ID_UIM_SET_FDN_STATUS_MSG,
+   MSG_ID_UIM_GET_FDN_STATUS_MSG,
+   MSG_ID_UIM_GET_SMS_CAP_MSG,
+   MSG_ID_UIM_OTA_COMPLETE_IND_MSG,
+   
+   MSG_ID_UIM_CALL_STATUS_MSG,
+   MSG_ID_UIM_IMS_REGISTER_STATUS_MSG,
+
+
+   MSG_ID_UIM_NOTIFY_REGISTER_MSG = MSG_ID_CUIM_CODE_BEGIN + 0x0300,
+   MSG_ID_UIM_SET_PARM_MSG,
+   MSG_ID_UIM_GET_PARM_MSG,
+   MSG_ID_UIM_ACCESS_OPTION_MSG,
+   
+   MSG_ID_C2K_UIM_SIM_APDU_ACCESS_CNF = MSG_ID_CUIM_CODE_BEGIN + 0x0320 ,
+   MSG_ID_C2K_UIM_SIM_ERROR_IND,
+   MSG_ID_C2K_UIM_CARD_STATUS_INFO_IND,
+   MSG_ID_C2K_UIM_INDEX_REGISTER_CNF,
+   MSG_ID_C2K_UIM_IMS_DEREG_TIMER_MSG,    
+
+   MSG_ID_C2K_UIM_SIM_APDU_ACCESS_REQ,   
+   MSG_ID_C2K_UIM_GET_MDN_REQ,
+   MSG_ID_C2K_UIM_GET_HOME_SID_NID_REQ,
+   MSG_ID_C2K_UIM_GET_IMSI_REQ,
+   MSG_ID_C2K_UIM_GET_ICCID_REQ,
+   MSG_ID_C2K_UIM_GET_CARD_APP_INFO_REQ, 
+   MSG_ID_C2K_UIM_SET_POWER_ON_MODE_REQ,
+   MSG_ID_C2K_UIM_SAT_TERMINAL_RSP_REQ,
+   MSG_ID_C2K_UIM_SAT_TERMINAL_RSP_CNF,
+   MSG_ID_C2K_UIM_SAT_ENVELOPE_REQ,
+   MSG_ID_C2K_UIM_SAT_ENVELOPE_CNF,
+   MSG_ID_C2K_UIM_SAT_PROACTIVE_CMD_IND,
+   MSG_ID_C2K_UIM_FILE_CHANGED_IND_MSG,
+   
+   MSG_ID_C2K_UIM_VSIM_STATUS_IND,
+   MSG_ID_C2K_UIM_GET_UIMID_REQ,
+   MSG_ID_C2K_SIM_READ_REQ,
+   MSG_ID_C2K_SIM_READ_CNF,
+#if defined (__TC10__)   
+   MSG_ID_C2K_UIM_CARD_ERROR_IND,
+#endif
+
+   MSG_ID_UIM_SIM_C2K_BATCH_FILE_READ_CNF,
+   MSG_ID_UIM_SIM_APDU_ACCESS_CNF,
+   MSG_ID_UIM_SIM_READ_CNF,  
+   MSG_ID_UIM_SIM_ERROR_IND,
+   MSG_ID_UIM_SIM_STATUS_IND,
+   MSG_ID_UIM_SAT_TERMINAL_RSP_CNF,
+   MSG_ID_UIM_SAT_ENVELOPE_CNF,
+   MSG_ID_UIM_SAT_PROACTIVE_CMD_IND,
+   MSG_ID_UIM_SIM_AUTHENTICATE_CNF,
+   MSG_ID_BT_UIM_SIM_RESET_CNF,
+   MSG_ID_BT_UIM_SIM_POWER_ON_CNF,
+   MSG_ID_BT_UIM_SIM_POWER_OFF_CNF,
+   MSG_ID_UIM_SIM_MDSTATUS_UPDATE_IND,
+   MSG_ID_SIM_UIM_PIN_SYNC_IND,
+   
+
+   MSG_ID_UIM_SET_FACTORY_MODE_MSG,
+   MSG_ID_UIM_GET_FACTORY_MODE_MSG,  
+#if defined (__TC10__) && defined (__TC10_IPC_CDMA_SUPPORT__)   
+   MSG_ID_UIM_VAL_SET_FACTORY_MODE_MSG,
+   MSG_ID_UIM_VAL_GET_FACTORY_MODE_MSG,
+   MSG_ID_UIM_SMS_STORE_ESN_ME_MSG,
+#endif   
+   MSG_ID_UIM_SIM_STARTUP_READ_FINISH_IND,
+   MSG_ID_UIM_SIM_APP_READY_IND,
+   MSG_ID_UIM_SIM_APP_ERROR_IND,
+
+   MSG_ID_UIM_FILE_INFO_REQ,
+   MSG_ID_UIM_FILE_INFO_CNF,
+   MSG_ID_UIM_READ_REQ,
+   MSG_ID_UIM_READ_CNF,
+   MSG_ID_UIM_WRITE_REQ,
+   MSG_ID_UIM_WRITE_CNF,
+   MSG_ID_UIM_SEARCH_RECORD_REQ,
+   MSG_ID_UIM_SEARCH_RECORD_CNF,
+   MSG_ID_UIM_UTK_FILE_CHANGE_IND,
+   MSG_ID_UIM_UTK_FILE_CHANGE_RES,
+   MSG_ID_UIM_PHB_STARTUP_REQ,
+   MSG_ID_UIM_PHB_STARTUP_CNF,
+
+   MSG_ID_UIM_SIM_CARD_TYPE_CHANGE_IND,
+
+   MSG_ID_UIM_UT_DUMMY_REQ,
+   MSG_ID_UIM_UT_DUMMY_CNF,
+   MSG_ID_UIM_SIM_CALL_STATUS_IND,
+
+   MSG_ID_UIM_L4BSBP_READY_IND,
+   MSG_ID_UIM_SIM_DSBP_RECONFIGURE_IND,
+   MSG_ID_UIM_SIM_RECOVERY_REQ,
+
+   MSG_ID_UIM_SIM_EXTENDED_APDU_ACCESS_REQ,
+   MSG_ID_UIM_SIM_EXTENDED_APDU_ACCESS_CNF,
+
+   MSG_ID_UIM_PHB_CSIM_FDN_STATE_IND,
+
+MODULE_MSG_END(MSG_ID_CUIM_CODE_TAIL)
+
+#endif
+
diff --git a/mcu/interface/sap/md/ul1_msgid.h b/mcu/interface/sap/md/ul1_msgid.h
new file mode 100644
index 0000000..1d32513
--- /dev/null
+++ b/mcu/interface/sap/md/ul1_msgid.h
@@ -0,0 +1,801 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ * ul1_cnst.h
+ *
+ * Project:
+ * --------
+ *   WCDMA_Software
+ *
+ * Description:
+ * ------------
+ *   Layer 1 and Protocol Stack 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!
+ *
+ * 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!
+ *
+ * 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!
+ * 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!!
+ *============================================================================
+ ****************************************************************************/
+/* Request for CPHY */
+#include "module_msg_range.h"
+
+#ifndef _UL1_MSG_H
+#define _UL1_MSG_H
+
+#if defined(__UMTS_RAT__) && defined(__UMTS_FDD_MODE__)
+
+#ifdef _Test_Hdr_On_PC
+enum {
+#endif
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_UL1_MSG_CODE_BEGIN )
+/* RELEASE REQ should be put before SETUP/MODIFY REQ */
+/* MSG_ID_FDD_CPHY_BCH_RELEASE_REQ to MSG_ID_FDD_CPHY_DCH_MODIFY_REQ must be continuous */
+MSG_ID_FDD_UL1_MSG_CODE_REQ_BEGIN = MSG_ID_FDD_UL1_MSG_CODE_BEGIN,
+MSG_ID_FDD_CPHY_BCH_RELEASE_REQ,
+MSG_ID_FDD_CPHY_BCH_MODIFY_REQ,
+MSG_ID_FDD_CPHY_BCH_SETUP_REQ,
+MSG_ID_FDD_CPHY_PCH_RELEASE_REQ,
+MSG_ID_FDD_CPHY_PCH_SETUP_REQ,
+MSG_ID_FDD_CPHY_PCH_MODIFY_REQ,
+MSG_ID_FDD_CPHY_FACH_RELEASE_REQ,
+MSG_ID_FDD_CPHY_FACH_SETUP_REQ,
+MSG_ID_FDD_CPHY_FACH_MODIFY_REQ,
+MSG_ID_FDD_CPHY_RACH_RELEASE_REQ,
+MSG_ID_FDD_CPHY_RACH_SETUP_REQ,
+MSG_ID_FDD_CPHY_DCH_RELEASE_REQ,
+MSG_ID_FDD_CPHY_DCH_SETUP_REQ,
+MSG_ID_FDD_CPHY_DCH_MODIFY_REQ,
+/* __HSDPA_SUPPORT__ */
+MSG_ID_FDD_CPHY_HSDSCH_RELEASE_REQ,
+MSG_ID_FDD_CPHY_HSDSCH_SETUP_REQ,
+MSG_ID_FDD_CPHY_HSDSCH_MODIFY_REQ,
+/* __HSUPA_SUPPORT__ */
+MSG_ID_FDD_CPHY_EDCH_RELEASE_REQ,
+MSG_ID_FDD_CPHY_EDCH_SETUP_REQ,
+MSG_ID_FDD_CPHY_EDCH_MODIFY_REQ,
+/* __UMTS_R7__ */
+MSG_ID_FDD_CPHY_CPC_CONFIG_REQ,
+MSG_ID_FDD_PHY_MAC_EHS_RESET_REQ,
+
+MSG_ID_FDD_CPHY_TGPS_DELETE_REQ,
+MSG_ID_FDD_CPHY_TGPS_OVERLAP_RESUME_REPORTING_REQ,
+MSG_ID_FDD_CPHY_FREQUENCY_SCAN_REQ,
+MSG_ID_FDD_CPHY_FREQUENCY_SCAN_CONTINUE_REQ,
+MSG_ID_FDD_CPHY_FREQUENCY_SCAN_SUSPEND_REQ,
+MSG_ID_FDD_CPHY_FREQUENCY_SCAN_STOP_REQ,
+MSG_ID_FDD_CPHY_RSSI_SNIFFER_START_REQ, //Add by Janet
+MSG_ID_FDD_CPHY_RSSI_SNIFFER_STOP_REQ,  //Add by Janet
+MSG_ID_FDD_CPHY_MEASUREMENT_CONFIG_TGPS_REQ,
+MSG_ID_FDD_CPHY_MEASUREMENT_CONFIG_FMO_REQ,
+MSG_ID_FDD_CPHY_MEASUREMENT_CONFIG_CELL_REQ,
+MSG_ID_FDD_CPHY_MEASUREMENT_CONFIG_RSSI_EVENT_REQ,
+MSG_ID_FDD_CPHY_TRESELECTION_START_REQ,
+MSG_ID_FDD_CPHY_MEASUREMENT_CONFIG_TX_POWER_REQ,
+MSG_ID_FDD_CPHY_MEASUREMENT_CONFIG_TX_POWER_STOP_REQ,
+MSG_ID_FDD_CPHY_TX_POWER_RESULT_REQ,
+MSG_ID_FDD_CPHY_SPECIFIC_CELL_SEARCH_REQ,
+MSG_ID_FDD_CPHY_SPECIFIC_CELL_SEARCH_STOP_REQ,
+MSG_ID_FDD_CPHY_RESET_REQ,
+MSG_ID_FDD_CPHY_RF_ON_REQ,
+MSG_ID_FDD_CPHY_RF_OFF_REQ,
+MSG_ID_FDD_CPHY_SET_ACTIVE_RAT_REQ,
+MSG_ID_FDD_CPHY_MSG_CONTAINER_REQ,
+MSG_ID_FDD_CPHY_ABORT_REQ,
+MSG_ID_FDD_WAKEUP_3G_REQ,            /*For F8F9, called at ADR*/
+MSG_ID_FDD_WAKEUP_3G_LOCK_REQ,       /*For L2 CoPro*/
+MSG_ID_FDD_WAKEUP_3G_UNLOCK_REQ,     /*For L2 CoPro*/
+/* __UMTS_R8__ */
+MSG_ID_FDD_CPHY_START_MONITOR_ORDER_REQ,
+MSG_ID_FDD_CPHY_STOP_MONITOR_ORDER_REQ,
+
+MSG_ID_FDD_USER_WAKEUP_3G_HANDLE_REQ,
+MSG_ID_FDD_USER_WAKEUP_3G_LOCK_REQ,
+MSG_ID_FDD_USER_WAKEUP_3G_UNLOCK_REQ,
+/* Request from PHY */
+MSG_ID_FDD_PHY_RACH_DATA_REQ,
+MSG_ID_FDD_PHY_ACCESS_REQ,
+MSG_ID_FDD_PHY_DATA_BUFFER_FREE_IND,
+/* __UMTS_R8__ */
+MSG_ID_FDD_PHY_CEDCH_TERMINATION_REQ,
+
+
+MSG_ID_FDD_RSVAS_UL1_SUSPEND_REQ,
+MSG_ID_FDD_RSVAS_UL1_RESUME_REQ,
+
+MSG_ID_FDD_RSVAS_UL1_VIRTUAL_RESUME_REQ,
+MSG_ID_FDD_URR_UL1_SWITCH_GEMINI_MODE_REQ,
+MSG_ID_FDD_CPHY_PEER_GEMINI_MODE_NOTIFY_REQ,
+MSG_ID_FDD_CPHY_CHANNEL_PRIORITY_ADJUSTMENT_REQ,
+/* __L1_GPS_AUTO_TIMING_SYNC_SUPPORT__ || __L1_GPS_REF_TIME_SUPPORT__*/
+/* The corresponding SAP is defined in mcu\interface\hal\L1\hal_ul1_sap.h. */
+MSG_ID_UL1_GPS_TIME_SYNC_REQ,    /* Request from GPS Task */
+MSG_ID_FDD_CPHY_OUT_OF_SERVICE_REQ,
+/* __HSDPA_SUPPORT__ */
+MSG_ID_FDD_CPHY_RLC_INFO_REQ,
+/* __MULTI_MODE_SUPPORT__ */
+MSG_ID_FDD_CPHY_AUTO_GAP_ON_REQ,
+MSG_ID_FDD_CPHY_AUTO_GAP_ON_CNF,
+MSG_ID_FDD_CPHY_AUTO_GAP_OFF_REQ,
+MSG_ID_FDD_CPHY_AUTO_GAP_OFF_CNF,
+
+MSG_ID_FDD_CPHY_DUPLEX_MODE_CHANGE_REQ,
+/* __MML1_ADT_ENABLE__ */
+MSG_ID_FDD_UL1_L1ADT_ENTER_CONNECTED_CNF,
+MSG_ID_FDD_UL1_L1ADT_LEAVE_CONNECTED_CNF,
+MSG_ID_FDD_UL1_L1ADT_ENTER_FDD_MODE_CNF,
+MSG_ID_FDD_CPHY_RSSI_SNIFFER_PERIOD_CHANGE_REQ,
+MSG_ID_FDD_CPHY_RB_LPBK_REQ,
+
+MSG_ID_FDD_CPHY_SMART_PAGING_RECONFIG_REQ,
+MSG_ID_FDD_CPHY_TAS_NOTIFY_IND,
+#if defined(__UE_SIMULATOR__) || defined(L1_SIM)
+/* Only for xl1sim UT */
+MSG_ID_FDD_UL1_UNIT_TEST_REQ,
+#endif  // defined(__UE_SIMULATOR__) || defined(L1_SIM)
+
+MSG_ID_FDD_UL1_MSG_CODE_REQ_END,
+
+MSG_ID_FDD_UL1C_UL1A_UREPORT,
+MSG_ID_FDD_UL1D_UL1C_UREPORT,
+
+/* Confirm & Indication for CPHY */
+MSG_ID_FDD_CPHY_BCH_SETUP_CNF,
+MSG_ID_FDD_CPHY_BCH_SETUP_IND,
+MSG_ID_FDD_CPHY_BCH_MODIFY_CNF,
+MSG_ID_FDD_CPHY_BCH_MODIFY_IND,
+MSG_ID_FDD_CPHY_BCH_RELEASE_CNF,
+MSG_ID_FDD_CPHY_BCH_RELEASE_IND,
+MSG_ID_FDD_CPHY_SFN_IND,
+MSG_ID_FDD_CPHY_TGPS_OVERLAP_IND,
+MSG_ID_FDD_CPHY_GAP_COMPLETE_IND,
+MSG_ID_FDD_CPHY_T312_EXPIRY_IND,
+MSG_ID_FDD_CPHY_DL_INIT_SYNC_IND,
+MSG_ID_FDD_CPHY_RL_FAILURE_IND,
+MSG_ID_FDD_CPHY_TGPS_DELETE_IND,
+MSG_ID_FDD_CPHY_TGPS_INFO_IND,
+/*Joy 012207 remove DELETE_TGPS interface*/
+//MSG_ID_FDD_CPHY_TGPS_DELETE_CNF,
+//MSG_ID_FDD_CPHY_TGPS_DELETE_IND,
+MSG_ID_FDD_CPHY_FREQUENCY_SCAN_CNF,
+MSG_ID_FDD_CPHY_FREQUENCY_SCAN_IND,
+MSG_ID_FDD_CPHY_FREQUENCY_SCAN_CONTINUE_CNF,
+MSG_ID_FDD_CPHY_FREQUENCY_SCAN_SUSPEND_CNF,
+MSG_ID_FDD_CPHY_FREQUENCY_SCAN_SUSPEND_IND,
+MSG_ID_FDD_CPHY_FREQUENCY_SCAN_STOP_CNF,
+MSG_ID_FDD_CPHY_FREQUENCY_SCAN_STOP_IND,
+MSG_ID_FDD_CPHY_RSSI_SNIFFER_START_CNF, //Add by Janet
+MSG_ID_FDD_CPHY_RSSI_SNIFFER_STOP_CNF,  //Add by Janet
+MSG_ID_FDD_CPHY_RSSI_SNIFFER_STOP_IND,
+MSG_ID_FDD_CPHY_RSSI_SNIFFER_SIGNAL_APPEAR_IND,  //Add by Janet
+MSG_ID_FDD_CPHY_RSSI_SNIFFER_EXECUTED_IND,
+MSG_ID_FDD_CPHY_MEASUREMENT_CONFIG_TGPS_CNF,
+MSG_ID_FDD_CPHY_MEASUREMENT_CONFIG_TGPS_IND,
+MSG_ID_FDD_CPHY_MEASUREMENT_CONFIG_FMO_CNF,
+MSG_ID_FDD_CPHY_MEASUREMENT_CONFIG_CELL_CNF,
+MSG_ID_FDD_CPHY_MEASUREMENT_CELL_IND,
+MSG_ID_FDD_CPHY_MEASUREMENT_CELL_SFN_IND,
+MSG_ID_FDD_CPHY_RSSI_EXCEED_RANGE_IND,
+MSG_ID_FDD_CPHY_MEASUREMENT_RL_IND,
+MSG_ID_FDD_CPHY_MEASUREMENT_CONFIG_TX_POWER_CNF,
+MSG_ID_FDD_CPHY_MEASUREMENT_TX_POWER_PERIODIC_IND,
+MSG_ID_FDD_CPHY_MEASUREMENT_TX_POWER_EVENT_IND,
+MSG_ID_FDD_CPHY_TX_POWER_RESULT_IND,
+MSG_ID_FDD_CPHY_SPECIFIC_CELL_SEARCH_IND,
+MSG_ID_FDD_CPHY_SPECIFIC_CELL_SEARCH_STOP_IND,
+MSG_ID_FDD_CPHY_RESET_CNF,
+MSG_ID_FDD_CPHY_RF_ON_CNF,
+MSG_ID_FDD_CPHY_RF_OFF_CNF,
+MSG_ID_FDD_CPHY_SET_ACTIVE_RAT_CNF,
+MSG_ID_FDD_CPHY_ASU_SUCCESS_IND,
+
+MSG_ID_FDD_CPHY_MSG_CONTAINER_CNF,
+MSG_ID_FDD_CPHY_MSG_CONTAINER_IND,
+MSG_ID_FDD_CPHY_ABORT_CNF,
+MSG_ID_FDD_CPHY_TX_STATUS_IND,
+/* __UMTS_R7__ */
+//MSG_ID_FDD_CPHY_D_HRNTI_DETECTED_IND,
+/* __UMTS_R8__ */
+MSG_ID_FDD_CPHY_MONITOR_ORDER_RECEIVED_IND,
+MSG_ID_FDD_CPHY_START_MONITOR_ORDER_CNF,
+MSG_ID_FDD_CPHY_STOP_MONITOR_ORDER_CNF,
+
+MSG_ID_FDD_CPHY_DUPLEX_MODE_CHANGE_CNF,
+/* __TEST_ANTENNA_IDX_ON_REAL_SIM__ */
+MSG_ID_FDD_CPHY_RB_LPBK_CNF,
+
+/* Confirm & Indication for PHY */
+MSG_ID_FDD_PHY_PCH_SETUP_IND,
+MSG_ID_FDD_PHY_PCH_MODIFY_IND,
+MSG_ID_FDD_PHY_PCH_RELEASE_IND,
+MSG_ID_FDD_PHY_FACH_SETUP_IND,
+MSG_ID_FDD_PHY_FACH_MODIFY_IND,
+MSG_ID_FDD_PHY_FACH_RELEASE_IND,
+MSG_ID_FDD_PHY_RACH_SETUP_IND,
+MSG_ID_FDD_PHY_RACH_RELEASE_IND,
+MSG_ID_FDD_PHY_DCH_SETUP_IND,
+MSG_ID_FDD_PHY_DCH_MODIFY_IND,
+MSG_ID_FDD_PHY_DCH_RELEASE_IND,
+MSG_ID_FDD_PHY_CONFIG_ABORT_IND,
+MSG_ID_FDD_PHY_CONFIG_FAIL_IND,
+
+MSG_ID_FDD_PHY_DL_INIT_SYNC_IND,
+MSG_ID_PHY_UL_NOT_ACTIVATED_IND,
+MSG_ID_FDD_PHY_BCH_DATA_IND,
+MSG_ID_FDD_PHY_DATA_IND,
+MSG_ID_FDD_PHY_ACCESS_IND,
+MSG_ID_FDD_PHY_POST_TX_IND,
+MSG_ID_FDD_PHY_END_DCH_TX_IND,
+/* __HSDPA_SUPPORT__ */
+MSG_ID_FDD_PHY_HSDSCH_DATA_IND,
+/* __HSUPA_SUPPORT__ */
+MSG_ID_FDD_PHY_END_EDCH_TX_IND,
+/* __UMTS_R8__ */
+MSG_ID_FDD_PHY_CEDCH_SETUP_IND,
+MSG_ID_FDD_PHY_CEDCH_MODIFY_IND,
+MSG_ID_FDD_PHY_CEDCH_RELEASE_IND,
+MSG_ID_FDD_PHY_CEDCH_TERMINATION_IND,
+/* EM Msg */
+MSG_ID_L4CUL1_EM_TST_CONTROL_REQ,
+MSG_ID_L4CUL1_EM_TST_CONTROL_CNF,
+/*  LCE report for Android M  */
+MSG_ID_L4CUL1_HSPA_LCE_REPORT_REQ,
+MSG_ID_L4CUL1_HSPA_LCE_REPORT_STOP_REQ,
+MSG_ID_L4CUL1_HSPA_LCE_REPORT_PULLDATA_REQ,
+MSG_ID_L4CUL1_HSPA_LCE_REPORT_CNF,
+MSG_ID_L4CUL1_HSPA_LCE_REPORT_IND,
+/* SLT Msg */
+MSG_ID_FDD_UL1_SLT_TASK_INIT_IND,
+/*========== UMAC UT SIMULATE MESSAGE   ==========*/
+//#ifdef  __MNT_UT_UMAC_ALONE_WITHOUT_L1__  /* UMAC UT */
+MSG_ID_FDD_PHY_SIMULATE_DCH_UL_CCTRCH_TASK, 
+MSG_ID_FDD_PHY_SIMULATE_DCH_UL_CCTRCH_HISR,
+MSG_ID_FDD_PHY_SIMULATE_DCH_UL_CCTRCH_HISR_RSP,
+MSG_ID_FDD_PHY_SIMULATE_DCH_UL_CCTRCH_LISR,
+MSG_ID_FDD_PHY_SIMULATE_DCH_UL_CCTRCH_LISR_RSP,
+
+MSG_ID_FDD_PHY_SIMULATE_DCH_UL_CALLBACK_CCTRCH, 
+MSG_ID_FDD_PHY_SIMULATE_DCH_UL_CALLBACK_CCTRCH_RSP,
+MSG_ID_FDD_PHY_SIMULATE_DCH_UL_CALLBACK_POWER,
+MSG_ID_FDD_PHY_SIMULATE_END_DCH_TX_IND, 
+
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TICK_1,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TICK_1_RSP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TICK_2_PARAM_SETUP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TICK_2,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TICK_2_RSP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TICK_3,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TICK_3_RSP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TICK_4,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TICK_4_RSP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TICK_5,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TICK_5_RSP,
+/* For TK6291 U3G */
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_EVAL_TX_PROC,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_EVAL_TX_PROC_RSP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_IS_TX_PERMIT,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_IS_TX_PERMIT_RSP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_PREPARE_DATA,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_PREPARE_DATA_RSP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_GET_HAPPY_BIT,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_GET_HAPPY_BIT_RSP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_POST_TX_PROC,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_POST_TX_PROC_RSP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_PREDICT_TX,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_PREDICT_TX_RSP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_UPDATE_REF_ETPR,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_UPDATE_REF_ETPR_RSP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_E_DCH_TX_PARAM_SETUP,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_SETUP_PCH_EM_INFO,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_FORCED_TO_SEND_DCH_EM_INFO,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_FORCED_TO_SEND_EDCH_EM_INFO,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_FORCED_TO_SEND_HSDSCH_EM_INFO,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_FORCED_TO_SEND_MDMI_MAC_EM_INFO,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_FORCED_TO_SEND_MDMI_UPA_EM_INFO,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_FORCED_TO_SEND_MDMI_MEA_EM_INFO,
+
+MSG_ID_FDD_PHY_SIMULATE_INVOKE_UL_INFORM_EDCH_MAC,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_GET_HS_BUFFER,
+MSG_ID_FDD_PHY_SIMULATE_UMAC_FREE_HS_BUFFER,
+MSG_ID_FDD_PHY_SIMULATE_TRY_TO_TRIGGER_CSR_STATUS_IND,
+//MSG_ID_FDD_PHY_SIMULATE_END_EDCH_TX_IND,
+//#endif  /* __MNT_UT_UMAC_ALONE_WITHOUT_L1__ */
+/*========== END UMAC UT SIMULATE MESSAGE   ==========*/
+
+MSG_ID_FDD_RSVAS_UL1_SUSPEND_CNF,
+MSG_ID_FDD_RSVAS_UL1_RESUME_CNF,
+MSG_ID_FDD_RSVAS_UL1_VIRTUAL_RESUME_CNF,
+
+/* __L1_GPS_AUTO_TIMING_SYNC_SUPPORT__ || __L1_GPS_REF_TIME_SUPPORT__*/
+/* The corresponding SAP is defined in mcu\interface\hal\L1\hal_ul1_sap.h. */
+MSG_ID_UL1_GPS_TIME_SYNC_IND, /* Indication to GPS Task */
+MSG_ID_FDD_USER_WAKEUP_3G_HANDLE_IND,
+/* Audio */
+MSG_ID_FDD_UL1_L1SP_UPDATE_DCH_INFO_IND,
+/*========== UL1 INTERNAL MESSAGE  ==========*/
+MSG_ID_FDD_UL1_SPECIFIC_CELL_SEARCH_REQ,
+MSG_ID_FDD_UL1_SPECIFIC_CELL_SEARCH_IND,
+MSG_ID_FDD_UL1_SPECIFIC_CELL_SEARCH_STOP_REQ,
+MSG_ID_FDD_UL1_SPECIFIC_CELL_SEARCH_STOP_IND,
+MSG_ID_FDD_UL1_SFN_DECODE_REQ,
+MSG_ID_FDD_UL1_SFN_DECODE_CNF,
+MSG_ID_FDD_UL1_SFN_STOP_REQ,
+MSG_ID_FDD_UL1_SFN_STOP_IND,
+MSG_ID_FDD_UL1_SFN_DECODE_SFN_IND,
+MSG_ID_FDD_UL1_MSG_CONTAINER_REQ,
+MSG_ID_FDD_UL1_T312_EXPIRY_IND,
+MSG_ID_FDD_UL1_MM_TGPS_CHANNELACT_REQ,
+MSG_ID_FDD_UL1_MM_TGPS_CHANNELACT_CNF,
+MSG_ID_FDD_UL1_PHY_CONFIG_FAIL_IND,
+
+MSG_ID_FDD_UL1_MEASUREMENT_CONFIG_CELL_REQ,
+MSG_ID_FDD_UL1_BCH_SETUP_REQ,
+MSG_ID_FDD_UL1_BCH_RELEASE_REQ,
+MSG_ID_FDD_UL1_AUTO_GAP_ON_REQ,
+MSG_ID_FDD_UL1_AUTO_GAP_OFF_REQ,
+MSG_ID_FDD_UL1_FREQUENCY_SCAN_REQ,
+MSG_ID_FDD_UL1_FREQUENCY_SCAN_SUSPEND_REQ,
+MSG_ID_FDD_UL1_FREQUENCY_SCAN_CONTINUE_REQ,
+MSG_ID_FDD_UL1_MEASUREMENT_CELL_IND,
+
+/*========== END UL1 INTERNAL MESSAGE    ==========*/
+
+/* __MML1_ADT_ENABLE__ */
+MSG_ID_FDD_UL1_L1ADT_ENTER_CONNECTED_REQ,
+MSG_ID_FDD_UL1_L1ADT_LEAVE_CONNECTED_REQ,
+MSG_ID_FDD_UL1_L1ADT_ENTER_FDD_MODE_REQ,
+MSG_ID_FDD_UL1_L1ADT_ENTER_FDD_MODE_IND,
+
+#if defined(__DYNAMIC_CACHE_LOCK_CENTRAL_CONTROL_SUPPORT__)
+MSG_ID_FDD_UL1_DCLC_LOCK_UNLOCK_IND,
+#endif
+
+MODULE_MSG_END( MSG_ID_FDD_UL1_MSG_CODE_TAIL )
+
+MODULE_MSG_BEGIN ( MSG_ID_GNSS_TC_UL1_MSG_CODE_BEGIN )
+MSG_ID_GNSS_TC_UL1_SYNC_REQ,
+MSG_ID_GNSS_TC_UL1_TIME_INFO_RSP,
+MODULE_MSG_END( MSG_ID_GNSS_TC_UL1_MSG_CODE_TAIL )
+#ifdef _Test_Hdr_On_PC
+};
+#endif
+#endif
+
+#endif  //_UL1_MSG_H
diff --git a/mcu/interface/sap/md/ul1b_msgid.h b/mcu/interface/sap/md/ul1b_msgid.h
new file mode 100644
index 0000000..a345ff6
--- /dev/null
+++ b/mcu/interface/sap/md/ul1b_msgid.h
@@ -0,0 +1,79 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *  ul1b_msgid.h
+ *
+ * Project:
+ * --------
+ *  U4G adaptor
+ *
+ * Description:
+ * ------------
+ *  UL1B message id definitions
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 03 03 2014 flemming.pihl
+ * NULL
+ * Add ul1b
+ *
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef UL1B_MSGID_H
+#define UL1B_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_UL1B_CODE_BEGIN )
+/****************************************************************************/
+
+MSG_ID_U3G_TICK_IND                = MSG_ID_UL1B_CODE_BEGIN,
+
+#ifndef __UE_SIMULATOR__
+MSG_ID_UHLHWSIM_DL_DATA_IND,    /* Used only in UL1B unit test.*/
+MSG_ID_UHLHWSIM_UL_DATA_REQ,
+#endif
+
+/****************************************************************************/
+MODULE_MSG_END( MSG_ID_UL1B_CODE_TAIL )
+
+#endif /* UL1B_MSGID_H */
diff --git a/mcu/interface/sap/md/ul1c_msgid.h b/mcu/interface/sap/md/ul1c_msgid.h
new file mode 100644
index 0000000..beadd7e
--- /dev/null
+++ b/mcu/interface/sap/md/ul1c_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) 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:
+ * ---------
+ * ul1c_sap.h
+ *
+ * Project:
+ * --------
+ *   MT6268
+ *
+ * Description:
+ * ------------
+ *   UMTS Layer 1 HISR and Protocol Stack 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _UL1C_MSG_H
+#define _UL1C_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_UL1C_MSG_CODE_BEGIN )
+MSG_ID_UL1C_SEND_REPORT = MSG_ID_UL1C_MSG_CODE_BEGIN,
+MSG_ID_UL1C_WAKEUP_UL1TASK,
+MSG_ID_UL1C_USER_DEF_FUNC,
+MODULE_MSG_END( MSG_ID_UL1C_MSG_CODE_TAIL )
+
+#endif  //_UL1C_MSG_H
diff --git a/mcu/interface/sap/md/ul1data_msgid.h b/mcu/interface/sap/md/ul1data_msgid.h
new file mode 100644
index 0000000..814fea3
--- /dev/null
+++ b/mcu/interface/sap/md/ul1data_msgid.h
@@ -0,0 +1,104 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ * ul1data_sap.h
+ *
+ * Project:
+ * --------
+ *   WCDMA_Software
+ *
+ * Description:
+ * ------------
+ *   UL1 frame HISR and UL1 DATA 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+/* Request for CPHY */
+#include "module_msg_range.h"
+
+#ifndef _UL1DATA_MSG_H
+#define _UL1DATA_MSG_H
+
+#ifdef _Test_Hdr_On_PC
+enum {
+#endif
+
+MODULE_MSG_BEGIN(MSG_ID_UL1DATA_MSG_CODE_BEGIN)
+//Ralf add for ul2 ul data task
+MSG_ID_UL1DATA_UL_DPCH_POWER,
+MSG_ID_UL1DATA_UL_DPCH_CCTRCH_TASK,
+MODULE_MSG_END(MSG_ID_UL1DATA_MSG_CODE_TAIL)
+
+#ifdef _Test_Hdr_On_PC
+};
+#endif
+
+#endif  //_UL1DATA_MSG_H
diff --git a/mcu/interface/sap/md/ul1hisr_msgid.h b/mcu/interface/sap/md/ul1hisr_msgid.h
new file mode 100644
index 0000000..f8b22b7
--- /dev/null
+++ b/mcu/interface/sap/md/ul1hisr_msgid.h
@@ -0,0 +1,103 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ * ul1hisr_sap.h
+ *
+ * Project:
+ * --------
+ *   MT6268
+ *
+ * Description:
+ * ------------
+ *   UMTS Layer 1 HISR and Protocol Stack 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _UL1HISR_MSG_H
+#define _UL1HISR_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_UL1HISR_MSG_CODE_BEGIN )
+MSG_ID_UL1TASK_WAKEUP = MSG_ID_UL1HISR_MSG_CODE_BEGIN,
+MODULE_MSG_END( MSG_ID_UL1HISR_MSG_CODE_TAIL )
+
+#endif  //_UL1HISR_MSG_H
diff --git a/mcu/interface/sap/md/ul1tst_msgid.h b/mcu/interface/sap/md/ul1tst_msgid.h
new file mode 100644
index 0000000..137e80e
--- /dev/null
+++ b/mcu/interface/sap/md/ul1tst_msgid.h
@@ -0,0 +1,104 @@
+/*******************************************************************************
+*  Modification Notice:
+*  --------------------------
+*  This software is modified by MediaTek Inc. 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:
+ * ---------
+ * ul1tst_sap.h
+ *
+ * Project:
+ * --------
+ *   MT6268 Project
+ *
+ * Description:
+ * ------------
+ *   ul1tst_sap.h
+ *
+ * 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+ 
+#ifndef _UL1TST_MSG_H
+#define _UL1TST_MSG_H
+ 
+MODULE_MSG_BEGIN( MSG_ID_UL1TST_MSG_CODE_BEGIN )
+MSG_ID_UL1TST_TO_FT = MSG_ID_UL1TST_MSG_CODE_BEGIN,
+MODULE_MSG_END( MSG_ID_UL1TST_MSG_CODE_TAIL )
+
+#endif  //_UL1TST_MSG_H
diff --git a/mcu/interface/sap/md/ul2_msgid.h b/mcu/interface/sap/md/ul2_msgid.h
new file mode 100644
index 0000000..546d607
--- /dev/null
+++ b/mcu/interface/sap/md/ul2_msgid.h
@@ -0,0 +1,828 @@
+/*****************************************************************************
+*  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) 2007
+*
+*  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:
+ * ---------
+ *   ul2_sap.h
+ *
+ * Project:
+ * --------
+ *   MONZA
+ *
+ * Description:
+ * ------------
+ *
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *===========================================================================
+ * 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!
+ * 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!
+ * 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!
+ *===========================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _UL2_MSG_H
+#define _UL2_MSG_H
+
+#ifdef __SOURCE_INSIGHT_PARSE__
+typedef enum {
+#endif
+
+/* mtk80197, merge TDD128 back to MAUI */
+#if defined(__UMTS_FDD_MODE__)
+MODULE_MSG_BEGIN( MSG_ID_FDD_UMAC_CODE_BEGIN )
+//MSG_ID_UMAC_CODE_BEGIN,
+/* SLCE-UMAC */
+MSG_ID_FDD_CMAC_CONFIG_TX_CCTRCH_REQ = MSG_ID_FDD_UMAC_CODE_BEGIN,
+MSG_ID_FDD_CMAC_CONFIG_EDCH_CCTRCH_REQ,
+MSG_ID_FDD_CMAC_CONFIG_RX_CCTRCH_REQ,
+MSG_ID_FDD_CMAC_CONFIG_HSDSCH_CCTRCH_REQ,
+MSG_ID_FDD_CMAC_REMOVE_TX_CCTRCH_REQ,
+MSG_ID_FDD_CMAC_REMOVE_EDCH_CCTRCH_REQ,
+MSG_ID_FDD_CMAC_REMOVE_RX_CCTRCH_REQ,
+MSG_ID_FDD_CMAC_REMOVE_HSDSCH_CCTRCH_REQ,
+MSG_ID_FDD_CMAC_TRAFFIC_VOLUME_MEASUREMENT_REQ,
+MSG_ID_FDD_CMAC_CONFIG_CIPHERING_REQ,
+MSG_ID_FDD_CMAC_CONFIG_UE_REQ,
+MSG_ID_FDD_CMAC_CONFIG_RACH_REQ,
+MSG_ID_FDD_CMAC_COUNT_C_REQ,
+MSG_ID_FDD_CMAC_CONFIG_TX_RLC_REESTABLISH_REQ,
+MSG_ID_FDD_CMAC_CONFIG_RX_RLC_REESTABLISH_REQ,
+MSG_ID_FDD_CMAC_DELETE_CIPHERING_REQ,
+//MSG_ID_FDD_CMAC_HS_RESET_REQ,
+MSG_ID_FDD_CMAC_ES_RESET_REQ,
+MSG_ID_FDD_CMAC_CONFIG_TFC_SUBSET_REQ,
+MSG_ID_FDD_CMAC_QUALITY_MEASUREMENT_REQ,
+MSG_ID_FDD_CMAC_ADDITIONAL_TVM_REQ,
+MSG_ID_FDD_CMAC_CONFIG_CPCH_REQ,
+MSG_ID_FDD_CMAC_CONFIG_ABORT_REQ,
+/* CSR-UMAC */
+MSG_ID_FDD_CSR_UMAC_DEACTIVATE_REPORT_REQ,
+MSG_ID_FDD_CSR_UMAC_STATUS_REQ,
+/* URLC-UMAC*/
+MSG_ID_FDD_URLC_UMAC_TX_DATA_REQ,    /* for URLC UT or UL2 IT */
+MSG_ID_FDD_URLC_UMAC_GEMINI_RESET,   /* for UMAC UT */
+
+/* MEME-UMAC */
+MSG_ID_FDD_MEME_UMAC_SIMULATE_GET_COUNTC,   /* for UMAC UT */
+/* RRCE-UMAC */
+MSG_ID_FDD_RRCE_UMAC_SIMULATE_GET_COUNTC_ACTIVATION_TIME,   /* for UMAC UT */
+
+/* UMAC-UMAC */  
+MSG_ID_FDD_UMAC_UMAC_DCH_UL_DPCH_CCTRCH_RSP,
+MSG_ID_FDD_UMAC_UMAC_DCH_UL_DPCH_CCTRCH_RESULT,
+MSG_ID_FDD_UMAC_UMAC_DCH_UL_DPCH_POWER_IND, 
+MSG_ID_FDD_UMAC_UMAC_CHECK_DATA_REF_COUNT_IND,
+MSG_ID_FDD_UMAC_UMAC_T1_TIMER_ACTION_IND,
+MSG_ID_FDD_UMAC_UMAC_EDCH_TICK1_IND,
+MSG_ID_FDD_UMAC_UMAC_EDCH_TICK2_IND,
+MSG_ID_FDD_UMAC_UMAC_EDCH_TICK3_IND,
+MSG_ID_FDD_UMAC_UMAC_ABORT_IND,
+MSG_ID_FDD_UMAC_UMAC_COUNTC_VERDICT_IND,    /* for UMAC UT */
+MSG_ID_FDD_UMAC_UMAC_IS_MACTICK_VERDICT_IND,    /* for UMAC UT */
+MSG_ID_FDD_UMAC_UMAC_USE_MAX_PRIO_LOGCH_PO_IND, /* for UMAC UT, EDCH */
+MSG_ID_FDD_UMAC_UMAC_EDCH_DSC_RELEASE_IND,
+
+/* 93 */
+MSG_ID_FDD_UMAC_UMAC_INVALID_HS_PDU_IND,
+MSG_ID_FDD_UMAC_UMAC_DELIVER_R99_PDU_IND,
+MSG_ID_FDD_UMAC_UMAC_DELIVER_VRB_PDU_IND,
+MSG_ID_FDD_UMAC_UMAC_QP_3G_DL_MAC_COPY_IND,
+MSG_ID_FDD_UMAC_UMAC_QP_3G_DL_MAC_COPY_NON_BLOCKING_IND,
+MSG_ID_FDD_UMAC_UMAC_QP_3G_DL_MAC_QUERY_NON_BLOCKING_IND,
+MSG_ID_FDD_UMAC_UMAC_COPRO_VRB_TO_EMI_MEMCPY_IND,
+MSG_ID_FDD_UMAC_UMAC_COPRO_VRB_RELEASE_IND,
+MSG_ID_FDD_UMAC_UMAC_UPA_PDU_LEN_IND,
+MSG_ID_FDD_UMAC_UMAC_SIMULATE_UMAC_QIDNCT_TO_RLCENTITYID_RSP,
+MSG_ID_FDD_UMAC_UMAC_L2_3G_DL_ALL_SRB_POWER_IND,
+MSG_ID_FDD_UMAC_UMAC_ELT_UPA_EM_INFO_IND,
+MSG_ID_FDD_UMAC_UMAC_ELT_DPA_EM_INFO_IND,
+MSG_ID_FDD_UMAC_UMAC_ELT_R99_EM_INFO_IND,
+/* 93 MDMI EM */
+MSG_ID_FDD_UMAC_MDMI_EM_WCDMA_1_INFO_IND,    /* wcdmaMacKpis 1 */
+MSG_ID_FDD_UMAC_MDMI_EM_WCDMA_2_INFO_IND,    /* wcdmaMacKpis 2 */
+MSG_ID_FDD_UMAC_MDMI_EM_WCDMA_3_INFO_IND,    /* wcdmaMacKpis 3 */
+MSG_ID_FDD_UMAC_MDMI_EM_WCDMA_4_INFO_IND,    /* wcdmaMacKpis 4 */
+
+MSG_ID_FDD_UMAC_MDMI_EM_HSUPA_1_INFO_IND,    /* hsupaMacKpis 1 */
+MSG_ID_FDD_UMAC_MDMI_EM_HSUPA_2_INFO_IND,    /* hsupaMacKpis 2 */
+MSG_ID_FDD_UMAC_MDMI_EM_HSUPA_3_INFO_IND,    /* hsupaMacKpis 3 */
+MSG_ID_FDD_UMAC_MDMI_EM_HSUPA_4_INFO_IND,    /* hsupaMacKpis 4 */
+
+MSG_ID_FDD_UMAC_MDMI_EM_WCDMA_PM_6_INFO_IND,    /* wcdmaPhyMeasurements 6 */
+
+/* For c-model */
+MSG_ID_FDD_UMAC_CMODEL_GENERATE_SPECIFIC_MAC_EHS_PDU,
+MSG_ID_FDD_UMAC_CMODEL_GENERATE_SPECIFIC_MAC_HS_PDU,
+MSG_ID_FDD_UMAC_CMODEL_CHECK_DL_MAC_VRB_EMPTY,
+MSG_ID_FDD_URLC_UMAC_TRIGGER_UMAC_UT_SPECIAL_EVENT,
+
+MSG_ID_FDD_UMAC_UMAC_POST_TX_VERDICT_IND,
+/* DRLC-UMAC */
+MSG_ID_FDD_DRLC_UMAC_SIMULATE_IS_MACTICK_AVAILABLE, /* for UMAC UT */
+MSG_ID_FDD_DRLC_UMAC_DATA_PENDING_REQ,
+
+MSG_ID_FDD_UMAC_CODE_END = MSG_ID_FDD_DRLC_UMAC_DATA_PENDING_REQ,
+//MSG_ID_UMAC_CODE_END,
+MODULE_MSG_END( MSG_ID_FDD_UMAC_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_URLC_CODE_BEGIN )
+/***** URLC - start *****/
+/* URLC - RATCM, RATDM */
+MSG_ID_RATCM_URLC_UTEST_ACTIVATE_LOOP_REQ = MSG_ID_FDD_URLC_CODE_BEGIN,
+MSG_ID_RATCM_URLC_UTEST_DEACTIVATE_LOOP_REQ,
+MSG_ID_RATCM_URLC_UTEST_OPEN_LOOP_REQ,
+MSG_ID_RATCM_URLC_UTEST_CLOSE_LOOP_M1_REQ,
+MSG_ID_RATCM_URLC_UTEST_CLOSE_LOOP_M2_REQ,
+MSG_ID_RATCM_URLC_UTEST_CLOSE_LOOP_M4_REQ,
+MSG_ID_RATDM_URLC_DEACTIVATE_PS_RAB_REQ,
+MSG_ID_RATDM_URLC_DEACTIVATE_PS_RAB_ABORT_REQ,
+MSG_ID_RATDM_URLC_DRLC_NPDU_DL_CB_REQ,
+MSG_ID_RATDM_URLC_VRB_VA_SHORTAGE_NTF,
+
+/* UL2 - RATCM */
+MSG_ID_RATCM_UL2_DUPLEX_MODE_CHANGE_REQ,
+
+/* URLC - DRLC */
+MSG_ID_FDD_DRLC_URLC_START_DISCARD_TIMER_REQ,
+
+/* URLC - SLCE */
+MSG_ID_FDD_CRLC_CONFIG_RAB_REQ,
+MSG_ID_FDD_CRLC_CONFIG_TM_ESTABLISH_REQ,
+MSG_ID_FDD_CRLC_CONFIG_UM_ESTABLISH_REQ,
+MSG_ID_FDD_CRLC_CONFIG_AM_ESTABLISH_REQ,
+MSG_ID_FDD_CRLC_CONFIG_RELEASE_REQ,
+MSG_ID_FDD_CRLC_SUSPEND_REQ,
+MSG_ID_FDD_CRLC_RESUME_REQ,
+MSG_ID_FDD_CRLC_CONFIG_TX_CIPHERING_REQ,
+MSG_ID_FDD_CRLC_CONFIG_RX_CIPHERING_REQ,
+MSG_ID_FDD_CRLC_COUNT_C_REQ,
+MSG_ID_FDD_CRLC_RB_CONTROL_REQ,
+MSG_ID_FDD_CRLC_REESTABLISH_REQ,
+MSG_ID_FDD_CRLC_PS_RATE_INFO_REQ, //20101206 Send PS RATE INFO to RLC for adaptive padding
+MSG_ID_FDD_CRLC_ABORT_REQ,    /* [20110413/ALPS00039979/MengSung] CRLC needs to know L1 abort happened, otherwise pending re-establish configuration won't be clear */
+/* URLC - UMAC */
+MSG_ID_FDD_L2L_MAC_DATA_IND,
+MSG_ID_FDD_URLC_UMAC_POST_TX_IND,
+MSG_ID_FDD_URLC_UMAC_STATUS_REPORT_REQUIRED_IND, 
+MSG_ID_FDD_URLC_UMAC_TX_DCH_MODIFY_IND,
+MSG_ID_FDD_URLC_UMAC_TX_EDCH_MODIFY_IND,
+MSG_ID_FDD_URLC_UMAC_TX_STATUS_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_FDD_URLC_UMAC_GET_AM_BO_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_FDD_URLC_UMAC_GET_AM_CONTROL_BO_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_FDD_URLC_UMAC_GET_TM_BO_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_FDD_URLC_UMAC_GET_UM_BO_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_FDD_URLC_UMAC_TRANSMIT_AM_PDU_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_FDD_URLC_UMAC_TRANSMIT_TM_PDU_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_FDD_URLC_UMAC_TRANSMIT_UM_PDU_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_FDD_URLC_UMAC_TRANSMIT_SEGMENTED_PDU_IND,
+MSG_ID_FDD_URLC_UMAC_NOTIFY_EDCH_HARQ_FINISH_IND,
+MSG_ID_FDD_URLC_UMAC_DELIVER_VRB_PDU_IND,                           /* 6293 URLC UT or UL2 IT */
+MSG_ID_FDD_URLC_SIMULATE_UMAC_HS_QID_CT_TO_ENTITYID_MAPPING_REQ,    /* 6293 URLC UT or UL2 IT */
+MSG_ID_FDD_URLC_SIMULATE_UMAC_BUFFER_OCCUPANCY_REQ, /* for UMAC UT */
+MSG_ID_FDD_URLC_SIMULATE_UMAC_RB_TO_LOGICAL_CHANNEL_MAPPING_REQ, /* for UMAC UT */
+MSG_ID_FDD_URLC_SIMULATE_UMAC_RLC_REESTABLISH_ACTIVATION_IND, /* for UMAC UT */
+MSG_ID_FDD_URLC_SIMULATE_UMAC_END_RX_REESTABLISH_AM_USER_RB_LOG_CH_IND, /* for URLC UT */
+MSG_ID_FDD_URLC_SIMULATE_UMAC_QIDNCT_TO_RLCENTITYID, /* for UMAC UT */
+MSG_ID_FDD_URLC_UMAC_INJECT_SADR_REQ, //DEREK
+MSG_ID_FDD_URLC_UMAC_INJECT_HSUPA_CMD_REQ,  //DEREK
+MSG_ID_FDD_URLC_UMAC_TX_STOP_REQ,
+MSG_ID_FDD_URLC_UMAC_TX_STOP_CNF,
+/* DRLC - URLC */
+MSG_ID_FDD_DRLC_URLC_RELEASE_REQ,
+MSG_ID_FDD_DRLC_URLC_REASSEMBLE_CNF,
+MSG_ID_FDD_DRLC_URLC_DEINIT_CNF,
+MSG_ID_FDD_DRLC_URLC_TX_PRESEG_REQ,
+MSG_ID_FDD_DRLC_URLC_ENTER_PCH_CNF,
+MSG_ID_FDD_DRLC_URLC_SLEEP_ATTEMPT_CNF,
+MSG_ID_FDD_DRLC_URLC_LBM_OPEN_CNF,
+/* DRLC - L2HWREASM */
+MSG_ID_FDD_DRLC_L2HWREASMSIM_CMD_IND, 
+MSG_ID_FDD_L2HWREASMSIM_SEQ_INTR_IND,
+MSG_ID_FDD_UL2D_BYTECOPY_SIM_CMD_IND,
+MSG_ID_FDD_BYTECOPY_SIM_UL2D_INTR_IND,
+
+/* URLC - URLC */
+MSG_ID_FDD_L2L_DEBUG_INFO_IND,
+MSG_ID_FDD_L2L_BO_DEBUG_INFO_IND,
+MSG_ID_FDD_L2L_RELEASE_REQ,
+MSG_ID_FDD_L2L_USE_OLD_KEY_REQ,
+MSG_ID_FDD_L2L_TRIGGER_RESET_REQ,
+MSG_ID_FDD_L2L_RESET_ACK_RECEIVED,
+MSG_ID_FDD_L2L_RESET_DETECTED,
+MSG_ID_FDD_L2L_SUSPEND_REQ,
+MSG_ID_FDD_L2L_RESUME_REQ,
+MSG_ID_FDD_L2L_RLC_ACC_RX_CONFIG_REQ,
+MSG_ID_FDD_L2L_RLC_ACC_RX_EVENT_IND,
+MSG_ID_FDD_L2L_RLC_ACC_HW_RESET_IND,
+MSG_ID_URLC_URLC_VRB_VA_SHORTAGE_NTF,
+
+//#ifdef __UL2_HSPA_PLUS_TX_COPRO__
+/* no writeback */
+/* for not enclose MSG_ID_URLC_CODE_END into compile option, we decide not to use compile option here */
+/* if we add more msg in the future, we can add back these compile options */
+//#else
+MSG_ID_FDD_L2L_TX_CONTAINER_ALLOC_IND,
+MSG_ID_FDD_L2L_TX_CONTAINER_DEALLOC_IND,
+MSG_ID_FDD_L2L_RELEASE_UM_SDU_IND,
+//#endif
+
+/* URLC - RRCE */
+//#ifdef __TC7__CS__SUPPORT__
+MSG_ID_FDD_RRCE_URLC_USR_DATA_AVAILABLE_REQ,
+MSG_ID_FDD_RRCE_URLC_VIRTUAL_CONNECTED_RESUME_IND,
+//#endif /* __TC7__CS__SUPPORT__ */
+
+#ifdef __UL2_ACC_TEST_FPGA__ //DEREK_L2S_REFINE#20: add a message
+MSG_ID_FDD_L2L_URLC_COSIM_DONE_IND,
+#endif /* __UL2_ACC_TEST_FPGA__ */
+
+MSG_ID_FDD_L2L_RLC_EM_UPDATE_IND,
+
+MSG_ID_FDD_L2L_RLC_UPLANE_DECIPHER_DONE_IND,
+
+/* URLC - SEQ */
+MSG_ID_FDD_URLC_SEQ_RRC_STATE_CHANGE_IND, /* To notify RRC state change */
+MSG_ID_FDD_URLC_SEQ_RESTORE_RB_REQ, /* for URLC UT or driver UT */
+MSG_ID_FDD_URLC_SEQ_ENTER_PCH_REQ,
+MSG_ID_FDD_URLC_SEQ_SLEEP_ATTEMPT_REQ,
+MSG_ID_FDD_URLC_CODE_END = MSG_ID_FDD_URLC_SEQ_SLEEP_ATTEMPT_REQ,
+
+MODULE_MSG_END( MSG_ID_FDD_URLC_CODE_TAIL )
+/***** URLC -end *****/
+
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_SEQ_CODE_BEGIN )
+/* SEQ - URLC */
+MSG_ID_FDD_URLC_SEQ_ENQUEUE_CMD_REQ = MSG_ID_FDD_SEQ_CODE_BEGIN,
+MSG_ID_FDD_URLC_SEQ_URB_ESTABLISH_REQ,
+MSG_ID_FDD_URLC_SEQ_URB_RELEASE_REQ,
+MSG_ID_FDD_URLC_SEQ_ENTER_PCH_CNF,
+MSG_ID_FDD_SEQ_SEQ_ENQUEUE_CMD_REQ,
+MSG_ID_FDD_SEQ_SEQ_CMD_VERDICT_IND,
+/* add by Jackal for UL2 DNT verdict, 2010/4/16 */
+MSG_ID_FDD_SEQ_SEQ_DNT_HW_REG_VERDICT_IND,
+MSG_ID_FDD_SEQ_URLC_CMD_REGISTER_IND,
+MSG_ID_FDD_UMAC_SEQ_ENQUEUE_CMD_REQ,
+MSG_ID_FDD_UMAC_SEQ_TICK_REQ,
+MSG_ID_FDD_URLC_SEQ_SLEEP_ATTEMPT_CNF,
+
+/* SEQ - SLCE */
+MSG_ID_FDD_CSEQ_CONFIG_UL2ACC_CLK_ON_INFO_REQ,
+MSG_ID_FDD_CSEQ_CONFIG_UL2ACC_CLK_OFF_INFO_REQ,
+MSG_ID_FDD_SEQ_CODE_END = MSG_ID_FDD_CSEQ_CONFIG_UL2ACC_CLK_OFF_INFO_REQ,
+
+/* CSR */
+MSG_ID_CSR_SET_ROUTING_REQ,
+MSG_ID_CSR_CODEC_DATA_REQ,
+
+/* UL2 - L2ACCSIM */
+MSG_ID_SEQ_HWACCSIM_CMD_IND,   
+MSG_ID_HWACCSIM_SEQ_INTR_IND, 
+
+/*URLC -- BMC*/
+MSG_ID_FDD_URLC_BMC_PRIO_IND,
+
+#ifndef __MTK_TARGET__
+MSG_ID_CSR_TM_DATA_REQ,
+
+    /* L1Aud interface */
+MSG_ID_CSR_SP3G_ACTIVATE_REQ,
+MSG_ID_CSR_SP3G_SET_FRAME_REQ,
+MSG_ID_CSR_SP3G_GET_FRAME_IND,
+MSG_ID_CSR_SP3G_PUT_FRAME_REQ,
+MSG_ID_CSR_SP3G_CALLBACK_REQ,
+
+    /* CSD interface */
+MSG_ID_CSR_RATCM_ACTIVATE_REQ,
+MSG_ID_CSR_RATCM_DEACTIVATE_REQ,
+MSG_ID_CSR_RATCM_DATA_IND,
+MSG_ID_CSR_RATCM_DATA_REQ,
+
+    /* VT interface */
+MSG_ID_CSR_VT_ACTIVATE_REQ,
+MSG_ID_CSR_VT_DEACTIVATE_REQ,
+MSG_ID_CSR_VT_DATA_IND,
+MSG_ID_CSR_VT_DATA_REQ,
+
+MSG_ID_CSR_SP3GHSPA_SET_CSDELAY_IND,
+MSG_ID_CSR_SP3GHSPA_GET_FRAME_IND,
+MSG_ID_CSR_SP3GHSPA_PUT_FRAME_REQ,
+
+MSG_ID_CSR_SHAQ_DATA_REQ,
+MSG_ID_FDD_RLC_CSR_DATA_IND,
+
+
+#endif
+/**** CSR end *****/
+MODULE_MSG_END( MSG_ID_FDD_SEQ_CODE_TAIL )
+#endif /* __UMTS_FDD_MODE__ */
+
+/* mtk80197, merge TDD128 back to MAUI */
+#if defined(__UMTS_TDD128_MODE__)
+MODULE_MSG_BEGIN( MSG_ID_TDD_UMAC_CODE_BEGIN )
+//MSG_ID_UMAC_CODE_BEGIN,
+/* SLCE-UMAC */
+MSG_ID_TDD_CMAC_CONFIG_TX_CCTRCH_REQ = MSG_ID_TDD_UMAC_CODE_BEGIN,
+#ifdef __HSUPA_SUPPORT__
+MSG_ID_TDD_CMAC_CONFIG_EDCH_CCTRCH_REQ, /* mtk80197, 2010-06-22 */
+#endif
+MSG_ID_TDD_CMAC_CONFIG_RX_CCTRCH_REQ,
+MSG_ID_TDD_CMAC_CONFIG_HSDSCH_CCTRCH_REQ,
+MSG_ID_TDD_CMAC_REMOVE_TX_CCTRCH_REQ,
+#ifdef __HSUPA_SUPPORT__
+MSG_ID_TDD_CMAC_REMOVE_EDCH_CCTRCH_REQ, /* mtk80197, 2010-06-22 */
+#endif
+MSG_ID_TDD_CMAC_REMOVE_RX_CCTRCH_REQ,
+MSG_ID_TDD_CMAC_REMOVE_HSDSCH_CCTRCH_REQ,
+MSG_ID_TDD_CMAC_TRAFFIC_VOLUME_MEASUREMENT_REQ,
+MSG_ID_TDD_CMAC_CONFIG_CIPHERING_REQ,
+MSG_ID_TDD_CMAC_CONFIG_UE_REQ,
+MSG_ID_TDD_CMAC_CONFIG_RACH_REQ,
+MSG_ID_TDD_CMAC_COUNT_C_REQ,
+MSG_ID_TDD_CMAC_CONFIG_TX_RLC_MODIFY_REQ,
+MSG_ID_TDD_CMAC_CONFIG_RX_RLC_MODIFY_REQ,
+MSG_ID_TDD_CMAC_DELETE_CIPHERING_REQ,
+MSG_ID_TDD_CMAC_HS_RESET_REQ,
+MSG_ID_TDD_CMAC_CONFIG_TFC_SUBSET_REQ,
+MSG_ID_TDD_CMAC_QUALITY_MEASUREMENT_REQ,
+MSG_ID_TDD_CMAC_ADDITIONAL_TVM_REQ,
+MSG_ID_TDD_CMAC_CONFIG_CPCH_REQ,
+MSG_ID_TDD_CMAC_CONFIG_ABORT_REQ,
+MSG_ID_TDD_CMAC_ABORT_IGNORE_INIT_SYNC_REQ,
+MSG_ID_TDD_CMAC_WORKFREQ_CHANGE_REQ, /* mtk80760, HSDPA Local Reset */
+
+/* CSR-UMAC */
+MSG_ID_TDD_CSR_UMAC_DEACTIVATE_REPORT_REQ,
+MSG_ID_TDD_CSR_UMAC_STATUS_REQ,
+/* URLC-UMAC*/
+MSG_ID_TDD_URLC_UMAC_TX_DATA_REQ,    /* for URLC UT or UL2 IT */
+MSG_ID_TDD_URLC_UMAC_GEMINI_RESET,   /* for UMAC UT */
+
+/* UMAC-UMAC */  
+MSG_ID_TDD_UMAC_UMAC_DCH_UL_DPCH_CCTRCH_RSP,
+MSG_ID_TDD_UMAC_UMAC_DCH_UL_DPCH_CCTRCH_RESULT,
+MSG_ID_TDD_UMAC_UMAC_DCH_UL_DPCH_POWER_IND, 
+#ifdef __HSUPA_SUPPORT__
+MSG_ID_TDD_UMAC_UMAC_EDCH_TICK1_IND,    /* for E-DCH callback simulation, mtk80197, 2010-06-22 */
+MSG_ID_TDD_UMAC_UMAC_EDCH_TICK2_IND,    /* for E-DCH callback simulation, mtk80197, 2010-06-22 */
+#endif
+MSG_ID_TDD_UMAC_UMAC_T1_TIMER_ACTION_IND,
+MSG_ID_TDD_UMAC_UMAC_ABORT_IND,
+
+/* DRLC-UMAC */
+MSG_ID_TDD_DRLC_UMAC_DATA_PENDING_REQ,
+
+MSG_ID_TDD_UMAC_CODE_END = MSG_ID_TDD_DRLC_UMAC_DATA_PENDING_REQ,
+MODULE_MSG_END( MSG_ID_TDD_UMAC_CODE_TAIL )
+//MSG_ID_UMAC_CODE_END,
+
+/***** URLC - start *****/
+/* URLC - RATCM, RATDM */
+MODULE_MSG_BEGIN( MSG_ID_TDD_URLC_CODE_BEGIN )
+/* Universal Bin: merge TDD and FDD RATCM_URLC duplicated MSG ID */
+#if !defined(__UMTS_FDD_MODE__)
+MSG_ID_RATCM_URLC_UTEST_ACTIVATE_LOOP_REQ = MSG_ID_TDD_URLC_CODE_BEGIN,
+MSG_ID_RATCM_URLC_UTEST_DEACTIVATE_LOOP_REQ,
+MSG_ID_RATCM_URLC_UTEST_OPEN_LOOP_REQ,
+MSG_ID_RATCM_URLC_UTEST_CLOSE_LOOP_M1_REQ,
+MSG_ID_RATCM_URLC_UTEST_CLOSE_LOOP_M2_REQ,
+MSG_ID_RATCM_URLC_UTEST_CLOSE_LOOP_M4_REQ,
+MSG_ID_RATDM_URLC_DEACTIVATE_PS_RAB_REQ,
+MSG_ID_RATDM_URLC_DEACTIVATE_PS_RAB_ABORT_REQ,
+
+/* UL2 - RATCM */
+MSG_ID_RATCM_UL2_DUPLEX_MODE_CHANGE_REQ,
+
+/* URLC - DRLC */
+MSG_ID_TDD_DRLC_URLC_START_DISCARD_TIMER_REQ,
+#else
+/* URLC - DRLC */
+MSG_ID_TDD_DRLC_URLC_START_DISCARD_TIMER_REQ = MSG_ID_TDD_URLC_CODE_BEGIN,
+#endif /* !defined(__UMTS_FDD_MODE__) */
+
+/* URLC - SLCE */
+MSG_ID_TDD_CRLC_CONFIG_RAB_REQ,
+MSG_ID_TDD_CRLC_CONFIG_TM_ESTABLISH_REQ,
+MSG_ID_TDD_CRLC_CONFIG_UM_ESTABLISH_REQ,
+MSG_ID_TDD_CRLC_CONFIG_AM_ESTABLISH_REQ,
+MSG_ID_TDD_CRLC_CONFIG_RELEASE_REQ,
+MSG_ID_TDD_CRLC_SUSPEND_REQ,
+MSG_ID_TDD_CRLC_RESUME_REQ,
+MSG_ID_TDD_CRLC_CONFIG_TX_CIPHERING_REQ,
+MSG_ID_TDD_CRLC_CONFIG_RX_CIPHERING_REQ,
+MSG_ID_TDD_CRLC_COUNT_C_REQ,
+MSG_ID_TDD_CRLC_RB_CONTROL_REQ,
+MSG_ID_TDD_CRLC_REESTABLISH_REQ,
+MSG_ID_TDD_CRLC_PS_RATE_INFO_REQ,
+MSG_ID_TDD_CRLC_ABORT_REQ,
+
+/* URLC - UMAC */
+MSG_ID_TDD_L2L_MAC_DATA_IND,
+MSG_ID_TDD_URLC_UMAC_POST_TX_IND,
+MSG_ID_TDD_URLC_UMAC_STATUS_REPORT_REQUIRED_IND, 
+MSG_ID_TDD_URLC_UMAC_TX_DCH_MODIFY_IND,
+MSG_ID_TDD_URLC_UMAC_RLC_MODIFY_IND,
+#ifdef __HSUPA_SUPPORT__
+MSG_ID_TDD_URLC_UMAC_TX_EDCH_MODIFY_IND,
+#endif
+MSG_ID_TDD_URLC_UMAC_TX_STATUS_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_TDD_URLC_UMAC_GET_AM_BO_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_TDD_URLC_UMAC_GET_AM_CONTROL_BO_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_TDD_URLC_UMAC_GET_TM_BO_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_TDD_URLC_UMAC_GET_UM_BO_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_TDD_URLC_UMAC_TRANSMIT_AM_PDU_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_TDD_URLC_UMAC_TRANSMIT_TM_PDU_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_TDD_URLC_UMAC_TRANSMIT_UM_PDU_IND,    /* for URLC UT or UL2 IT */
+MSG_ID_TDD_URLC_UMAC_INJECT_SADR_REQ, //DEREK
+MSG_ID_TDD_URLC_UMAC_INJECT_HSUPA_CMD_REQ,  //DEREK
+
+/* DRLC - URLC */
+MSG_ID_TDD_DRLC_URLC_RELEASE_REQ,
+MSG_ID_TDD_DRLC_URLC_REASSEMBLE_CNF,
+MSG_ID_TDD_DRLC_URLC_TX_PRESEG_REQ,      /* mtk80437, 2010-08-04 */
+
+/* URLC - URLC */
+MSG_ID_TDD_L2L_DEBUG_INFO_IND,
+MSG_ID_TDD_L2L_BO_DEBUG_INFO_IND,
+MSG_ID_TDD_L2L_RELEASE_REQ,
+MSG_ID_TDD_L2L_TRIGGER_RESET_REQ,
+MSG_ID_TDD_L2L_RESET_ACK_RECEIVED,
+MSG_ID_TDD_L2L_RESET_DETECTED,
+MSG_ID_TDD_L2L_SUSPEND_REQ,
+MSG_ID_TDD_L2L_RESUME_REQ,
+MSG_ID_TDD_URLC_CODE_END = MSG_ID_TDD_L2L_RESUME_REQ,
+/***** URLC -end *****/
+/* CSR */
+#if !defined(__UMTS_FDD_MODE__)
+MSG_ID_CSR_SET_ROUTING_REQ,
+MSG_ID_CSR_CODEC_DATA_REQ,
+
+#ifndef __MTK_TARGET__
+MSG_ID_CSR_TM_DATA_REQ,
+
+    /* L1Aud interface */
+MSG_ID_CSR_SP3G_ACTIVATE_REQ,
+MSG_ID_CSR_SP3G_SET_FRAME_REQ,
+MSG_ID_CSR_SP3G_GET_FRAME_IND,
+MSG_ID_CSR_SP3G_PUT_FRAME_REQ,
+MSG_ID_CSR_SP3G_CALLBACK_REQ,
+
+    /* CSD interface */
+MSG_ID_CSR_RATCM_ACTIVATE_REQ,
+MSG_ID_CSR_RATCM_DEACTIVATE_REQ,
+MSG_ID_CSR_RATCM_DATA_IND,
+MSG_ID_CSR_RATCM_DATA_REQ,
+
+    /* VT interface */
+MSG_ID_CSR_VT_ACTIVATE_REQ,
+MSG_ID_CSR_VT_DEACTIVATE_REQ,
+MSG_ID_CSR_VT_DATA_IND,
+MSG_ID_CSR_VT_DATA_REQ,
+
+MSG_ID_CSR_SHAQ_DATA_REQ,
+
+#endif
+#endif
+/**** CSR end *****/
+
+MODULE_MSG_END( MSG_ID_TDD_URLC_CODE_TAIL )
+
+#endif /* __UMTS_TDD128_MODE__ */
+
+#ifdef __SOURCE_INSIGHT_PARSE__
+};
+#endif
+
+#endif  //UL2_MSG_H
diff --git a/mcu/interface/sap/md/ul2d_msgid.h b/mcu/interface/sap/md/ul2d_msgid.h
new file mode 100644
index 0000000..f5f8ae5
--- /dev/null
+++ b/mcu/interface/sap/md/ul2d_msgid.h
@@ -0,0 +1,593 @@
+/*****************************************************************************
+*  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) 2007
+*
+*  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:
+ * ---------
+ *   ul2d_sap.h
+ *
+ * Project:
+ * --------
+ *   MONZA
+ *
+ * Description:
+ * ------------
+ *
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *===========================================================================
+ * $Log:$
+ *
+ * 06 06 2017 jen-de.lai
+ * [MOLY00253470] SE2 Internal CR] [8960 ATT test] [6293][I6-PERF] [TC50000][1][core1,vpe0,tc0(vpe2)] Assert fail: l2_testloop_one.c 950 - UL2D
+ *
+ * 06 06 2017 frank.song
+ * [MOLY00254022] [BIANCO][MT6763][RDIT][VTF_RF][FDD 3G][GQA3] Assert for WCDMA R6 test with 0531 official load
+ * after deinit_req and deinit_cnf, RLC still received the BC done, but TX and RX entity has been removed.so DRLC need to wait for al_bc_done_ind. Then drlc can send deinit_cnf.
+ *
+ * 01 25 2017 sh.yang
+ * [MOLY00179747] [UMOLYA] Development phase check-in
+ * Power control check-in, code sync to 3416183.
+ *
+ * 01 05 2017 jen-de.lai
+ * [MOLY00195317] [URLC][TX] - Gen93 URLC TX code modification for new HW and MCU Archi - LBM on VRB
+ *
+ * 12 26 2016 ravitej.ballakur
+ * [MOLY00195360] [3G][RATDM][PDCP] - Gen93 3G RATDM and PDCP code modification for new HW and MCU Archi
+ * Fixing bug in RATDM free SDU for Target and UESIM as well as fixes for PDCP HC..
+ *
+ * 09 26 2016 ravitej.ballakur
+ * [MOLY00195360] [3G][RATDM][PDCP] - Gen93 3G RATDM and PDCP code modification for new HW and MCU Archi
+ * 	Merging 2G and WCDMA RATDM and PDCP changes from merge_CBr.
+ *
+ * 08 03 2016 ravitej.ballakur
+ * [MOLY00195360] [3G][RATDM][PDCP] - Gen93 3G RATDM and PDCP code modification for new HW and MCU Archi
+ * 3G RATDM and PDCP changes.
+ *
+ * 04 16 2015 charlescm.wu
+ * [MOLY00098458] [UMOLY][Universal Bin][Phase 2][FDD][UL2] Mode change
+ * .
+ *
+ * 02 13 2015 head.hsu
+ * [MOLY00091822] RATDM reorganization
+ * 	FDD/TDD RABM/PDCP checkin
+ *
+ * 01 06 2015 wei.tang
+ * [MOLY00087685] [UMAC][CSR]universal bin check in
+ * sync UBIN CBr
+ *
+ * 12 29 2014 charlescm.wu
+ * [MOLY00087679] [UMOLY][FDD][UAS COMMON][UL2 COMMON/URLC/BMC/SEQ]U-Bin CBr to UMOLY TRUNCK.
+ *
+ * 12 16 2014 johnson.liu
+ * [MOLY00087759] [One modem bin]Sync TDD RABM code to UMOLY trunk
+ * .
+ *
+ * 12 15 2014 charlescm.wu
+ * [MOLY00087679] [UMOLY][FDD][UAS COMMON][UL2 COMMON/URLC/BMC/SEQ]U-Bin CBr to UMOLY TRUNCK.
+ *
+ * 12 15 2014 jinpeng.hu
+ * [MOLY00087590] [Ubin check-in UMOLY][TDD][URLC]-add prefix
+ *
+ * 12 12 2014 tc.chang
+ * [MOLY00087434] [Universal Bin] Check in.
+ * FDD RABM
+ *
+ * 03 25 2014 stanley.ko
+ * [MOLY00060012] AT+ECBMR to remove modem CB records
+ *
+ * 03 13 2014 yanfei.ding
+ * [MOLY00059440] [3G TDD][UAS][SYNC FDD CR] Add SRB Flow Control to avoid URR Queue Full
+ * 	Interface update .
+ *
+ * 11 15 2012 johnson.liu
+ * [MOLY00006202] [TDD][R6]Remove RABM T3319 expiry handler
+ * .
+ * 
+ * 09 18 2012 yanfei.ding
+ * [MOLY00003744] [3G TDD][__RATDM_UL_SHAQ__] Check in SHAQ Code and Enable SHAQ
+ * .
+ * 
+ * 08 22 2012 andrew.wu
+ * [MOLY00002319] [MSBB] Remove Invalid Inter-Category Including.
+ * modem related option move to modem internal
+ *
+ * 06 27 2012 johnson.liu
+ * [MOLY00000029] [3G TDD]modify msg id range in MOLY branch
+ * Diff PDCP&RABM MSG ID for TDD.
+ *
+ * 06 25 2012 babylon.tien
+ * [MOLY00000029] [3G TDD]modify msg id range in MOLY branch
+ * <saved by Perforce>
+ *
+ * 06 25 2012 huifeng.jing
+ * [MOLY00000029] [3G TDD]modify msg id range in MOLY branch
+ * Differ CSR Messages between TDD & FDD.
+ *
+ * 06 25 2012 yanfei.ding
+ * [MOLY00000029] [3G TDD]modify msg id range in MOLY branch
+ * Differ URLC, DRLC Messages between TDD & FDD.
+ *
+ * 06 08 2012 qinghua.yu
+ * removed!
+ * 1) confirm all _msgid.h is same as old (exclude fold ../delete/);
+ * 2) fix range error in module_msg_range.h.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 08 2012 babylon.tien
+ * removed!
+ * <saved by Perforce>
+ *
+ * 02 07 2012 andrew.wu
+ * removed!
+ * Integration change.
+ *
+ * 01 20 2012 ij.liao
+ * removed!
+ * .
+ *
+ * 01 16 2012 andrew.wu
+ * removed!
+ * Integration change.
+ *
+ * 01 13 2012 ij.liao
+ * removed!
+ * .
+ *
+ * 01 11 2012 carlson.lin
+ * removed!
+ * <saved by Perforce>
+ *
+ * 12 11 2011 haizhou.liu
+ * removed!
+ * .
+ *
+ * 11 19 2011 ashleyroy.yang
+ * removed!
+ * .
+ *
+ * 11 13 2011 haizhou.liu
+ * removed!
+ * 11 08 2011 weimin.zeng
+ * removed!
+ * merge MSBB.
+ *
+ * 08 12 2011 andrew.wu
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN()
+ * removed!
+ * Remove CCSR_RB_RELEASE_IND
+ *
+ * 07 07 2011 mengsung.wu
+ * removed!
+ * .
+ *
+ * 04 15 2011 yiting.cheng
+ * removed!
+ * MAUI
+ *
+ * 03 31 2011 tc.chang
+ * removed!
+ * .
+ *
+ * 01 21 2011 max.yin
+ * removed!
+ * .
+ *
+ * 12 07 2010 alfred.lee
+ * removed!
+ * PS HAL UL2 SAP Header files move 
+ *
+ * 12 01 2010 quanping.wang
+ * removed!
+ * Merge TDD128 backto MAUI, based on 10AW1032MP_ASTRO w10.48 Tue. P1
+ *
+ * 09 17 2010 jessica.chang
+ * removed!
+ * .
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * add to source control recursely
+ *===========================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _UL2D_MSG_H
+#define _UL2D_MSG_H
+
+#ifdef __SOURCE_INSIGHT_PARSE__
+typedef enum {
+#endif
+
+
+/* mtk80197, merge TDD128 back to MAUI */
+#if defined(__UMTS_FDD_MODE__)
+MODULE_MSG_BEGIN( MSG_ID_BMC_CODE_BEGIN )
+/***** BMC - start *****/
+/* BMC - RATCM */
+MSG_ID_RATCM_BMC_CBCH_REQ = MSG_ID_BMC_CODE_BEGIN,
+MSG_ID_RATCM_BMC_UPDATE_REQ,
+MSG_ID_RATCM_BMC_CB_LOC_UPDATE_REQ,
+MSG_ID_RATCM_BMC_CB_MSG_REMOVAL_REQ,
+
+/* UL2D - RATCM */
+MSG_ID_RATCM_UL2D_DUPLEX_MODE_CHANGE_REQ,
+
+/* Universal Bin: merge TDD and FDD BMC inside the AS */
+#if defined(__UMTS_TDD128_MODE__)
+/* BMC - SLCE */
+MSG_ID_TDD_CBMC_CONFIG_REQ,
+/* BMC - DRLC */
+MSG_ID_TDD_RLC_BMC_DATA_IND,
+#endif /* __UMTS_TDD128_MODE__ */
+/* BMC - SLCE */
+MSG_ID_FDD_CBMC_CONFIG_REQ,
+/* BMC - DRLC */
+MSG_ID_FDD_RLC_BMC_DATA_IND,
+MSG_ID_BMC_CODE_END = MSG_ID_FDD_RLC_BMC_DATA_IND,
+/***** BMC - end *****/
+MODULE_MSG_END( MSG_ID_BMC_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_CSR_CODE_BEGIN )
+//MSG_ID_FDD_CSR_CODE_BEGIN,
+//UMAC
+MSG_ID_FDD_CSR_UMAC_STATUS_IND = MSG_ID_FDD_CSR_CODE_BEGIN,
+MSG_ID_FDD_CSR_UMAC_TFC_IND,
+MSG_ID_FDD_CCSR_RAB_ESTABLISH_IND,
+MSG_ID_FDD_CCSR_RAB_RELEASE_IND,
+MSG_ID_FDD_CCSR_RAB_MODIFY_IND,
+MSG_ID_FDD_CCSR_RB_RELEASE_IND,
+MSG_ID_FDD_CSR_CODE_END = MSG_ID_FDD_CCSR_RB_RELEASE_IND,
+//MSG_ID_FDD_CSR_CODE_END,
+MODULE_MSG_END( MSG_ID_FDD_CSR_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_DRLC_CODE_BEGIN )
+/***** DRLC - start *****/
+/* DRLC - URLC */
+MSG_ID_FDD_DRLC_URLC_REASSEMBLE_REQ = MSG_ID_FDD_DRLC_CODE_BEGIN,
+MSG_ID_FDD_DRLC_URLC_INIT_REQ,
+MSG_ID_FDD_DRLC_URLC_DEINIT_REQ,
+MSG_ID_FDD_DRLC_URLC_ENTER_PCH_REQ,
+MSG_ID_FDD_DRLC_URLC_SLEEP_ATTEMPT_REQ,
+MSG_ID_FDD_DRLC_URLC_LBM_OPEN_REQ,
+
+/* DRLC - DRLC */
+MSG_ID_FDD_DRLC_DRLC_BC_DONE_IND,
+MSG_ID_FDD_DRLC_UPLANE_ALL_BC_CB_DONE_IND,
+MSG_ID_FDD_DRLC_UPLANE_ALL_BC_CB_DONE_BEFORE_DEINIT_IND,
+/* DRLC - RRCE */
+MSG_ID_FDD_RRCE_DRLC_FLUSH_DATA_REQ,
+/* DRLC - URR */
+MSG_ID_FDD_URR_DRLC_SRB_SDU_CONTINUE_REQ,
+/* DRLC - ADR */
+MSG_ID_FDD_RLC_TM_DATA_REQ,
+MSG_ID_FDD_RLC_UM_DATA_REQ,
+MSG_ID_FDD_RLC_AM_DATA_REQ,
+MSG_ID_FDD_DRLC_CODE_END = MSG_ID_FDD_RLC_AM_DATA_REQ,
+/***** DRLC - end *****/
+MODULE_MSG_END( MSG_ID_FDD_DRLC_CODE_TAIL )
+
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_PDCP_CODE_BEGIN )
+//MSG_ID_FDD_PDCP_CODE_BEGIN,
+MSG_ID_FDD_CPDCP_CONFIG_REQ = MSG_ID_FDD_PDCP_CODE_BEGIN,
+MSG_ID_FDD_CPDCP_RELOC_REQ,
+MSG_ID_FDD_CPDCP_RELEASE_REQ,
+MSG_ID_FDD_PDCP_URLC_RESET_IND,
+MSG_ID_FDD_PDCP_URLC_REESTABLISH_IND,
+#ifdef UNIT_TEST
+MSG_ID_FDD_PDCP_CSR_DATA_IND,
+MSG_ID_FDD_PDCP_CSR_BUILDAMR_REQ,
+MSG_ID_FDD_PDCP_CSR_BUILDAMR_RSP,
+#endif
+MSG_ID_RATDM_PDCP_RESET_STATISTICS_REQ,
+MSG_ID_PDCP_DATA_DELIVER_IND,
+
+MSG_ID_FDD_PDCP_CODE_END = MSG_ID_PDCP_DATA_DELIVER_IND,
+//MSG_ID_FDD_PDCP_CODE_END,
+MODULE_MSG_END( MSG_ID_FDD_PDCP_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_RABM_CODE_BEGIN )
+//MSG_ID_FDD_RABM_CODE_BEGIN,
+/* RATDM - RABM */
+MSG_ID_RATDM_RABM_ACTIVATE_REQ = MSG_ID_FDD_RABM_CODE_BEGIN,
+MSG_ID_RATDM_RABM_ACTIVATE_RSP,
+MSG_ID_RATDM_RABM_DEACTIVATE_REQ,
+MSG_ID_RATDM_RABM_MODIFY_REQ,
+MSG_ID_RATDM_RABM_REESTABLISH_RSP,
+MSG_ID_RATDM_RABM_RESUME_REQ,
+MSG_ID_RATDM_RABM_DATA_REQ,
+MSG_ID_RATDM_RABM_RAT_ENTER_REQ,
+MSG_ID_RATDM_RABM_RAT_LEAVE_REQ,
+
+MSG_ID_RATDM_RABM_REESTABLISH_RAB_READY_IND,
+
+/* UL data path optimization: Share Uplink Queue */
+
+MSG_ID_RATDM_SHAQ_KICK_UL2,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_0,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_1,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_2,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_3,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_4,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_5,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_6,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_7,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_8,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_9,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_10,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_11,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_12,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_13,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_14,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_15,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_16,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_17,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_18,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_19,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_20,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_21,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_22,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_23,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_24,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_25,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_26,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_27,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_28,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_29,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_30,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_31,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_32,
+/* __NEW_DATA_PLANE__ */
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_0,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_1,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_2,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_3,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_4,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_5,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_6,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_7,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_8,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_9,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_10,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_11,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_12,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_13,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_14,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_15,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_16,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_17,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_18,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_19,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_20,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_21,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_22,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_23,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_24,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_25,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_26,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_27,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_28,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_29,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_30,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_31,
+MSG_ID_REALTIME_SIT_KICK_URLC_PS_RBID_32,
+
+
+/* SLCE - RABM */
+MSG_ID_FDD_CRABM_RAB_ESTABLISH_IND,
+MSG_ID_FDD_CRABM_RAB_RELEASE_IND,
+
+/* RRCE - RABM */
+MSG_ID_FDD_CRABM_PS_RAB_CAPABILITY_IND,
+
+MSG_ID_FDD_RABM_CODE_END = MSG_ID_FDD_CRABM_PS_RAB_CAPABILITY_IND,
+//MSG_ID_RABM_CODE_END,
+MODULE_MSG_END( MSG_ID_FDD_RABM_CODE_TAIL )
+
+#endif /* __UMTS_FDD_MODE__ */
+
+/* mtk80197, merge TDD128 back to MAUI */
+#if defined(__UMTS_TDD128_MODE__)
+
+#if !defined(__UMTS_FDD_MODE__) /* UB: temp add this compile option for LTG build test */
+MODULE_MSG_BEGIN( MSG_ID_BMC_TDD_CODE_BEGIN )
+/***** BMC - start *****/
+/* BMC - RATCM */
+MSG_ID_RATCM_BMC_CBCH_REQ = MSG_ID_BMC_TDD_CODE_BEGIN,
+MSG_ID_RATCM_BMC_UPDATE_REQ,
+MSG_ID_RATCM_BMC_CB_LOC_UPDATE_REQ,
+MSG_ID_RATCM_BMC_CB_MSG_REMOVAL_REQ,
+
+/* UL2D - RATCM */
+MSG_ID_RATCM_UL2D_DUPLEX_MODE_CHANGE_REQ,
+
+/* BMC - SLCE */
+MSG_ID_CBMC_CONFIG_REQ,
+/* BMC - DRLC */
+MSG_ID_RLC_BMC_DATA_IND,
+MSG_ID_BMC_CODE_END = MSG_ID_RLC_BMC_DATA_IND,
+/***** BMC - end *****/
+MODULE_MSG_END( MSG_ID_BMC_TDD_CODE_TAIL )
+#endif /* !defined(__UMTS_FDD_MODE__) */
+
+
+MODULE_MSG_BEGIN( MSG_ID_CSR_TDD_CODE_BEGIN )
+//MSG_ID_CSR_CODE_BEGIN,
+//UMAC
+MSG_ID_TDD_CSR_UMAC_STATUS_IND = MSG_ID_CSR_TDD_CODE_BEGIN,
+MSG_ID_TDD_CSR_UMAC_TFC_IND,
+MSG_ID_TDD_CCSR_RAB_ESTABLISH_IND,
+MSG_ID_TDD_CCSR_RAB_RELEASE_IND,
+MSG_ID_TDD_CCSR_RAB_MODIFY_IND,
+MSG_ID_TDD_CCSR_RB_RELEASE_IND,
+MSG_ID_TDD_CSR_CODE_END = MSG_ID_TDD_CCSR_RB_RELEASE_IND,
+//MSG_ID_CSR_CODE_END,
+MODULE_MSG_END( MSG_ID_CSR_TDD_CODE_TAIL )
+
+
+MODULE_MSG_BEGIN( MSG_ID_TDD_DRLC_CODE_BEGIN )
+/***** DRLC - start *****/
+/* DRLC - URLC */
+MSG_ID_TDD_DRLC_URLC_REASSEMBLE_REQ = MSG_ID_TDD_DRLC_CODE_BEGIN,
+/* DRLC - RRCE */
+MSG_ID_TDD_RRCE_DRLC_FLUSH_DATA_REQ,
+/* DRLC - URR */
+MSG_ID_TDD_URR_DRLC_SRB_SDU_CONTINUE_REQ,
+/* DRLC - ADR */
+MSG_ID_TDD_RLC_TM_DATA_REQ,
+MSG_ID_TDD_RLC_UM_DATA_REQ,
+MSG_ID_TDD_RLC_AM_DATA_REQ,
+MSG_ID_TDD_DRLC_CODE_END = MSG_ID_TDD_RLC_AM_DATA_REQ,
+MODULE_MSG_END( MSG_ID_TDD_DRLC_CODE_TAIL )
+/***** DRLC - end *****/
+
+MODULE_MSG_BEGIN( MSG_ID_TDD_PDCP_CODE_BEGIN )
+//MSG_ID_PDCP_CODE_BEGIN,
+MSG_ID_TDD_CPDCP_CONFIG_REQ = MSG_ID_TDD_PDCP_CODE_BEGIN,
+MSG_ID_TDD_CPDCP_RELOC_REQ,
+MSG_ID_TDD_CPDCP_RELEASE_REQ,
+MSG_ID_TDD_PDCP_URLC_RESET_IND,
+MSG_ID_TDD_PDCP_URLC_REESTABLISH_IND,
+MSG_ID_TDD_PDCP_FLC_RESUME_UL_TRANSFER,
+MSG_ID_TDD_PDCP_FLC_RESUME_DL_TRANSFER,
+MSG_ID_TDD_PDCP_CODE_END = MSG_ID_TDD_PDCP_FLC_RESUME_DL_TRANSFER,
+MODULE_MSG_END( MSG_ID_TDD_PDCP_CODE_TAIL )
+//MSG_ID_PDCP_CODE_END,
+
+//MSG_ID_RABM_CODE_BEGIN,
+/* RATDM - RABM */
+MODULE_MSG_BEGIN( MSG_ID_RABM_TDD_CODE_BEGIN )
+/* use FDD defination for one modem bin.
+MSG_ID_RATDM_RABM_ACTIVATE_REQ = MSG_ID_RABM_TDD_CODE_BEGIN,
+MSG_ID_RATDM_RABM_ACTIVATE_RSP,
+MSG_ID_RATDM_RABM_DEACTIVATE_REQ,
+MSG_ID_RATDM_RABM_MODIFY_REQ,
+MSG_ID_RATDM_RABM_REESTABLISH_RSP,
+MSG_ID_RATDM_RABM_RESUME_REQ,
+MSG_ID_RATDM_RABM_DATA_REQ,
+*/
+//RATDM - PDCP
+//MSG_ID_RATDM_PDCP_RESET_STATISTICS_REQ,
+
+/* UL data path optimization: Share Uplink Queue */
+/*  use FDD defination for one modem bin.
+MSG_ID_RATDM_SHAQ_KICK_UL2,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_0,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_1,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_2,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_3,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_4,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_5,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_6,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_7,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_8,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_9,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_10,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_11,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_12,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_13,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_14,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_15,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_16,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_17,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_18,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_19,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_20,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_21,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_22,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_23,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_24,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_25,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_26,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_27,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_28,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_29,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_30,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_31,
+MSG_ID_REALTIME_SHAQ_KICK_URLC_PS_RBID_32,
+*/
+
+/* SLCE - RABM */
+MSG_ID_TDD_CRABM_RAB_ESTABLISH_IND = MSG_ID_RABM_TDD_CODE_BEGIN,
+MSG_ID_TDD_CRABM_RAB_RELEASE_IND,
+
+/* RRCE - RABM */
+MSG_ID_TDD_CRABM_PS_RAB_CAPABILITY_IND,
+    
+/*    
+#ifdef __REL7__
+    MSG_ID_RATDM_RABM_REESTABLISH_RAB_READY_IND,
+#endif
+*/
+
+MSG_ID_TDD_RABM_CODE_END,
+MODULE_MSG_END( MSG_ID_RABM_TDD_CODE_TAIL )
+
+#endif /* __UMTS_TDD128_MODE__ */
+
+#ifdef __SOURCE_INSIGHT_PARSE__
+};
+#endif
+
+#endif   //_UL2D_MSG_H
diff --git a/mcu/interface/sap/md/ulcs_msgid.h b/mcu/interface/sap/md/ulcs_msgid.h
new file mode 100644
index 0000000..3b8453f
--- /dev/null
+++ b/mcu/interface/sap/md/ulcs_msgid.h
@@ -0,0 +1,137 @@
+/*****************************************************************************
+*  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) 2007
+*
+*  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:
+ * ---------
+ *   ulcs_sap.h
+ *
+ * Project:
+ * --------
+ *   AGPS
+ *
+ * Description:
+ * ------------
+ *
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *===========================================================================
+ * $Log:$
+ *
+ * 12 17 2014 farming.tseng
+ * [MOLY00087857] [UAS FDD] UBIN intra-category interface
+ * [UBIN] FDD CISE interface with AGPS.
+ *
+ * 12 16 2014 claud.li
+ * [MOLY00087795] [MEME] universal bin check in
+ * [Universal bin] [FDD][MEME/RRCE/CSCE/CSE/AGPS] interface and message id
+ *
+ * 06 08 2012 qinghua.yu
+ * removed!
+ * 1) confirm all _msgid.h is same as old (exclude fold ../delete/);
+ * 2) fix range error in module_msg_range.h.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 05 24 2012 wcpuser_integrator
+ * removed!
+ * Qinghua Yu check in global enum (MSG & SAP) at modem_dev.
+ *
+ * 02 25 2011 c-hua.yang
+ * removed!
+ * .
+ *
+ * 12 07 2010 gordonjc.kuo
+ * removed!
+ * <saved by Perforce>
+ *
+ * 08 16 2010 david.niu
+ * removed!
+ * 2G parameter initialization and UP/CP conflict handling modification
+ *
+ * removed!
+ * removed!
+ * 
+ *
+ * removed!
+ * removed!
+ * add to source control recursely
+ *
+ *===========================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _ULCS_MSG_H
+#define _ULCS_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_UAGPS_CP_CODE_BEGIN )
+//MSG_ID_UAGPS_CP_CODE_BEGIN,
+// L4
+MSG_ID_L4C_UAGPS_CP_AGPS_ENABLE_DISABLE_REQ = MSG_ID_UAGPS_CP_CODE_BEGIN,
+MSG_ID_L4C_UAGPS_CP_AGPS_KEY_UPDATE_REQ,
+MSG_ID_L4C_UAGPS_CP_AGPS_NEW_KEY_NEEDED_IND,
+
+// CSCE
+MSG_ID_FDD_UAGPS_CP_CSCE_START_SIB15_COLLECTION_REQ,
+MSG_ID_FDD_UAGPS_CP_CSCE_START_SIB15_COLLECTION_CNF,
+MSG_ID_FDD_UAGPS_CP_CSCE_STOP_SIB15_COLLECTION_REQ,
+MSG_ID_FDD_UAGPS_CP_CSCE_STOP_SIB15_COLLECTION_CNF,
+MSG_ID_FDD_UAGPS_CP_CSCE_CELL_CHANGE_IND,
+
+// SIBE
+MSG_ID_FDD_UAGPS_CP_SIBE_SIB15_CHANGE_IND,
+
+// MEME
+MSG_ID_FDD_UAGPS_CP_MEME_MOVE_TO_STATE_IND,
+MSG_ID_FDD_UAGPS_CP_MEME_POSITIONING_DATA_IND,
+MSG_ID_FDD_UAGPS_CP_MEME_RELEASE_MEASUREMENT_IND,
+MSG_ID_FDD_UAGPS_CP_MEME_POSITIONING_DATA_REQ,
+MSG_ID_FDD_UAGPS_CP_MEME_RELEASE_MEASUREMENT_REQ,
+MSG_ID_FDD_UAGPS_CP_MEME_MEASUREMENT_REPORT_CNF,
+
+MSG_ID_UAGPS_CP_CODE_END = MSG_ID_FDD_UAGPS_CP_MEME_MEASUREMENT_REPORT_CNF,
+//MSG_ID_UAGPS_CP_CODE_END,
+MODULE_MSG_END( MSG_ID_UAGPS_CP_CODE_TAIL )
+
+#endif  //_ULCS_MSG_H
diff --git a/mcu/interface/sap/md/upcm_msgid.h b/mcu/interface/sap/md/upcm_msgid.h
new file mode 100644
index 0000000..ba7250b
--- /dev/null
+++ b/mcu/interface/sap/md/upcm_msgid.h
@@ -0,0 +1,276 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   upcm_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   UPCM and Protocol Stack related message identity definition
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 08 13 2020 ken.li
+ * [MOLY00543497] [MT6873][Margaux][R0][MP5][in-house FTA][LTE][7.1.1.2]enable volte fail
+ * 	
+ * 	UPCM TESTMODE drops non-loopback data for obtaining IP address case (SWRD)
+ *
+ * 05 07 2020 andy-wc.chang
+ * [MOLY00506312] [Titan][IPC][IMS] IPC_IMS_INVITE_FLUSH (0x1C) - EL2 dev
+ * [VMOLY][TITAN] ipc flush command porting - setting3
+ *
+ * 02 26 2020 willy-wj.chen
+ * [MOLY00501981] [Gen97][UPCM] TMO-US F4L data performance patch sync from Gen93
+ * [UPCM] put small UDP packet into pri-SIT upon channel lock.
+ *
+ * 02 07 2020 tc.chang
+ * [MOLY00486860] 2752924¡G¡i19165¡j¡i?¥~³¡?¥Î¡j¡i??¥ý?¡j¡i²Ä¤T¤è¡j¡i²y²y¤j§@?¡j²y²y¤j§@?´å??µ{¤¤¡A¥X?­«·s?±µ.
+ *
+ * 02 04 2020 allen.keh
+ * [MOLY00476273] [MT6297][gemini][VGMM] gemini phase 2 development
+ * 	
+ * 	.add interface & custom file
+ *
+ * 12 05 2019 tc.chang
+ * [MOLY00446861] [Gen97][Code Sync] [B190414-819]?ģ??{d?AI??450 (?`X?A?h`?) According to data type to release HPS for paging.
+ *
+ * 12 04 2019 yu-hsin.lin
+ * [MOLY00463231] [GEN97][GWSD+] patchback from 1001dev
+ * [OA][GWSD] msgid for GWSD
+ *
+ * 09 23 2019 tc.chang
+ * [MOLY00442630] [MT6885][Petrus][SA][RTD][Blocking] IMS Register is not sent by UE because of no matched TFT.
+ *
+ * 07 12 2019 tc.chang
+ * [MOLY00421061] [Gen97] ANBR (RBR,RBRQ) over NR.
+ *
+ * 07 04 2019 tc.chang
+ * [MOLY00418272] [Gen97] Sync Gen95 UMOLYE patch.
+ *
+ * 07 03 2019 mark.ng
+ * [MOLY00415229] NMAC RBR feature development
+ * 	
+ * 	RBR interface (SWRD domain)
+ *
+ * 05 09 2019 tc.chang
+ * [MOLY00404770] [Gen97] Sync Gen95 UMOLYE patch.
+ * RBRQ, USIR, fake A2
+ *
+ * 04 19 2019 tc.chang
+ * [MOLY00399993] [Gen97][VMOLY] interworking withN26 features.
+ *
+ * 06 14 2018 timothy.yao
+ * [MOLY00333176] [ICD] stage1+stage2 ICD UMOLYE CBr patch back to LR13.R0
+ * [ICD][UPCM]
+ *
+ * 06 11 2018 jia-shi.lin
+ * [MOLY00319373] [MT6295] recommended bit rate feature
+ * recommended bit rate feature: upcm-emac interface
+ *
+ * 08 10 2017 steve.kao
+ * [MOLY00269909] [MT6293] IP Tag development
+ * [TRUNK][UPCM] IP packet tagging.
+ *
+ * 02 24 2017 poying.chuang
+ * [MOLY00209737] [MT6293] LWTG and C2K L4 integration check in
+ * 	
+ * 	- [M2] Support AT+CGSDATA command - interface of l4bpdn/upcm .
+ *
+ * 12 28 2016 cammie.yang
+ * [MOLY00221324] [6293][EL2][UPCM] C2K feature integrations
+ * [TRUNK][UPCM] modifications for C2K feature integrations
+ *
+ * 12 27 2016 cammie.yang
+ * [MOLY00221324] [6293][EL2][UPCM] C2K feature integrations
+ * [UMOLYA][UPCM] Interface change for C2K integration
+ *
+ * 09 26 2016 cammie.yang
+ * [MOLY00195563] [6293][EL2][UPCM][RATDM][EPDCP] Initial feature integrations
+ * [TRUNK] UPCM/RATDM/EPDCP feature integrations from PS.DEV
+ *
+ * 06 11 2015 ariel.lin
+ * [MOLY00120396] [UMOLY] VoLTE patch back from MP7
+ * Merge from CL1353395.
+ *
+ * 06 05 2015 ariel.lin
+ * MP7 to UMOLY.
+ *
+ * 04 27 2015 ben.chiu
+ * [MOLY00109234] [VoLTE][Volunteer Patch] MP7.CMCCVOLTE.FPB merge back to MP7/MP7.CMCC
+ * MP7.CMCCVOLTE.FPB merge back to MP7
+ *
+ * 04 27 2015 ben.chiu
+ * [MOLY00109234] [VoLTE][Volunteer Patch] MP7.CMCCVOLTE.FPB merge back to MP7/MP7.CMCC
+ * MP7.CMCCVOLTE.FPB merge back to MP7
+ *
+ * 02 05 2015 stan.chen
+ * [MOLY00094939] MASE UMOLY check in
+ * MASE/4GESL code checkin.
+ *
+ * 01 07 2015 stan.chen
+ * [MOLY00081925] [TK6291_DEV] EMBMS Support
+ * Restore UPCM MBMSAL msg ids.
+ *
+ * 11 07 2014 kun-lin.wu
+ * [MOLY00082366] Loop back mode 4 support
+ *
+ * 08 29 2014 stan.chen
+ * [MOLY00077591] [TK6291] MBMSAL for eMBMS
+ * Summit MBMSAL ERRC interfaces.
+ *
+ * 07 25 2013 jeffery.chen
+ * [MOLY00031206] [MOLY][L4C PS] Add AT+EGLD to leave data mode
+ * .
+ *
+ * 07 05 2013 danny.kuo
+ * [MOLY00028800] [MMDC] PS Domain Switch Manager (PSDM) development
+ * Interface Check-in
+ *
+ * 06 04 2013 moja.hsu
+ * [MOLY00024881] Network Interface Bind Confirm
+ * add PDN Bind related structure and enum.
+ *
+ * 01 22 2013 carlson.lin
+ * [MOLY00009161] LTE Multimode Merge to MOLY
+ * interface - sap part
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _UPCM_MSGID_H
+#define _UPCM_MSGID_H
+
+
+MODULE_MSG_BEGIN( MSG_ID_UPCM_CODE_BEGIN )
+
+MSG_ID_RAT_TCM_UPCM_SUSPEND_REQ = MSG_ID_UPCM_CODE_BEGIN,
+MSG_ID_RAT_TCM_UPCM_RESUME_REQ,
+
+MSG_ID_IPCORE_UPCM_PDN_BIND_IND,
+MSG_ID_IPCORE_UPCM_PDN_BIND_RSP,
+MSG_ID_IPCORE_UPCM_PDN_DEACT_IND, // TODO: delete after IPCORE's code change!!!
+MSG_ID_IPCORE_UPCM_PDN_UNBIND_IND,
+MSG_ID_IPCORE_UPCM_PDN_REBIND_IND,
+MSG_ID_IPCORE_UPCM_PDN_REBIND_RSP,
+MSG_ID_IPCORE_UPCM_ESL_PDN_BIND_REQ,
+MSG_ID_IPCORE_UPCM_TESTLOOP_IND,
+MSG_ID_IPCORE_UPCM_TESTLOOP_RSP,
+MSG_ID_IPCORE_UPCM_PDN_INFO_IND,
+
+MSG_ID_UPCM_RATCM_TEST_MODE_IND,
+
+MSG_ID_MNY_UPCM_SUSPEND_REQ,
+MSG_ID_MNY_UPCM_RESUME_REQ,
+
+MSG_ID_IMC_UPCM_START_EBI_FILTER_REQ, // NR TODO: Obsoleted
+MSG_ID_IMC_UPCM_STOP_EBI_FILTER_REQ,  // NR TODO: Obsoleted
+MSG_ID_IMC_UPCM_START_BEARER_FILTER_REQ,
+MSG_ID_IMC_UPCM_STOP_BEARER_FILTER_REQ,
+MSG_ID_MBMSAL_UPCM_PDN_BIND_REQ,
+MSG_ID_MBMSAL_UPCM_PDN_BIND_CNF,
+MSG_ID_MBMSAL_UPCM_PDN_UNBIND_REQ,
+MSG_ID_MBMSAL_UPCM_PDN_UNBIND_CNF,
+
+/* UPCM <--> L4BPDN */
+MSG_ID_L4BPDN_UPCM_BEARER_ACT_REQ,
+MSG_ID_L4BPDN_UPCM_BEARER_DEACT_REQ,
+MSG_ID_L4BPDN_UPCM_PF_UPDATE_REQ,
+
+MSG_ID_L4BPDN_UPCM_PDN_BIND_REQ,
+MSG_ID_L4BPDN_UPCM_PDN_REBIND_REQ, // TODO: no need!
+MSG_ID_L4BPDN_UPCM_PDN_UNBIND_REQ,
+MSG_ID_L4BPDN_UPCM_PDN_BIND_CNF,
+MSG_ID_L4BPDN_UPCM_PDN_REBIND_CNF, // TODO: no need!
+MSG_ID_L4BPDN_UPCM_PDN_UNBIND_CNF,
+
+MSG_ID_L4BPDN_UPCM_PDN_SEND_DATA_REQ,
+MSG_ID_L4BPDN_UPCM_PDN_SEND_DATA_CNF,
+MSG_ID_L4BPDN_UPCM_NOTIFY_PDN_TYPE_REQ,
+MSG_ID_L4BPDN_UPCM_NOTIFY_PDN_TYPE_CNF,
+
+MSG_ID_L4BPDN_UPCM_45G_IRAT_BEARER_UPDATE_REQ,
+
+MSG_ID_LHIFCORE_UPCM_HW_LOG_NTF,
+
+/* UPCM */
+MSG_ID_UPCM_UPCM_ICD_NTF,
+MSG_ID_UPCM_DEBUG_PF_ACTION_IND,
+MSG_ID_D2CM_UPCM_GET_IP_ADDR_IND,
+
+/* ENPDCP --> UPCM */
+MSG_ID_UPCM_ENPDCP_ROHC_ENABLE_IND,
+
+/* EMAC --> UPCM */
+MSG_ID_UPCM_EMAC_RBRQ_SUPPORT_REL_IND,
+
+/* EMACDL --> UPCM */
+MSG_ID_UPCM_EMACDL_RBR_IND,
+
+/* NMAC --> UPCM */
+MSG_ID_UPCM_NMAC_RBRQ_SUPPORT_REL_IND,
+
+/* NMACDL --> UPCM */
+MSG_ID_UPCM_NMACDL_RBR_IND,
+
+MSG_ID_L4C_UPCM_ANBRQ_CONFIG_IND,
+MSG_ID_L4C_UPCM_ANBR_IND,
+MSG_ID_L4C_UPCM_ANBRQ_REQ,
+
+MSG_ID_EVAL_UPCM_DRB_SESSION_STATUS_NTF,
+
+/* VGMM --> UPCM */
+MSG_ID_VGMM_UPCM_PAGING_SESSION_STATUS_NTF,
+
+/* MRS --> UPCM */
+MSG_ID_MRS_UPCM_CH_LOCK_NTF,
+
+#ifdef __IPC_ADAPTER__
+/* IPCA_IMS --> UPCM */
+MSG_ID_IPCA_IMS_UPCM_INVITE_FLUSH_REQ,
+#endif // __IPC_ADAPTER__
+
+MODULE_MSG_END( MSG_ID_UPCM_CODE_TAIL )
+
+#endif /* _UPCM_MSGID_H */
diff --git a/mcu/interface/sap/md/upds_msgid.h b/mcu/interface/sap/md/upds_msgid.h
new file mode 100644
index 0000000..f50efeb
--- /dev/null
+++ b/mcu/interface/sap/md/upds_msgid.h
@@ -0,0 +1,63 @@
+/*****************************************************************************
+*  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).
+*
+*****************************************************************************/
+
+/********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _UPDS_MSGID_H
+#define _UPDS_MSGID_H
+
+/*-----------------------UPDS_MSG_CODE_BEGIN------------------*/
+MODULE_MSG_BEGIN( MSG_ID_UPDS_CODE_BEGIN )
+    MSG_ID_UPDS_START = MSG_ID_UPDS_CODE_BEGIN,
+
+    /* MSGs from VGMM  */
+    MSG_ID_UPDS_VGMM_DATA_IND,
+    MSG_ID_UPDS_VGMM_DATA_CNF,
+    MSG_ID_UPDS_VGMM_GET_UE_STATE_INDICATION_IND,
+
+    /* MSGs from URSP */
+    MSG_ID_URSP_UPDS_UE_POLICY_RSP,
+    MSG_ID_URSP_UPDS_GET_UE_POLICY_INFO_RSP,
+
+    /* MSGs to URSP (Need to move to other file) */
+    MSG_ID_URSP_UPDS_UE_POLICY_IND,
+    MSG_ID_URSP_UPDS_GET_UE_POLICY_INFO_IND,
+
+    MSG_ID_UPDS_END,
+
+MODULE_MSG_END( MSG_ID_UPDS_CODE_TAIL )
+#endif
+/*----------------------- UPDS_MSG_CODE_END--------------------*/
diff --git a/mcu/interface/sap/md/urr_msgid.h b/mcu/interface/sap/md/urr_msgid.h
new file mode 100644
index 0000000..fd8db1d
--- /dev/null
+++ b/mcu/interface/sap/md/urr_msgid.h
@@ -0,0 +1,1873 @@
+/*****************************************************************************
+*  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) 2007
+*
+*  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:
+ * ---------
+ *   urr_sap.h
+ *
+ * Project:
+ * --------
+ *   MONZA
+ *
+ * Description:
+ * ------------
+ *
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *===========================================================================
+ * 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!
+ *
+ * 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!
+ *
+ * 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!
+ * 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!
+ * 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!
+ * 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!
+ *
+ * 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!
+ *===========================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _URR_MSG_H
+#define _URR_MSG_H
+
+#ifdef __SOURCE_INSIGHT_PARSE__
+typedef enum {
+#endif
+
+/* mtk80197, merge TDD128 back to MAUI */
+#if defined(__UMTS_FDD_MODE__)
+MODULE_MSG_BEGIN( MSG_ID_FDD_ADR_CODE_BEGIN )
+//MSG_ID_FDD_ADR_CODE_BEGIN,
+MSG_ID_FDD_RLC_TM_DATA_IND = MSG_ID_FDD_ADR_CODE_BEGIN,
+MSG_ID_FDD_RLC_UM_DATA_IND,
+MSG_ID_FDD_RLC_AM_DATA_IND,
+
+#ifdef UNIT_TEST
+MSG_ID_FDD_ADR_UNPACK_UT_EVENT_PHY_DATA_IND,
+MSG_ID_FDD_ADR_UNPACK_UT_EVENT_RLC_DATA_IND,
+MSG_ID_FDD_ADR_UNPACK_UT_EVENT_VERDICT_DATA_IND,
+MSG_ID_FDD_ADR_PACK_UT_MOVE_TO_IDLE_REQ,
+MSG_ID_FDD_ADR_PACK_UT_SEND_CCCH_REQ,
+MSG_ID_FDD_ADR_PACK_UT_SEND_DCCH_REQ,
+#endif
+
+MSG_ID_FDD_ADR_ADR_ACKNOWLEDGEMENT_IND,
+MSG_ID_FDD_RLC_AM_DATA_CNF,
+MSG_ID_FDD_ADR_CODE_END = MSG_ID_FDD_RLC_AM_DATA_CNF,
+//MSG_ID_FDD_ADR_CODE_END,
+MODULE_MSG_END( MSG_ID_FDD_ADR_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_CSCE_CODE_BEGIN )
+//MSG_ID_CSCE_CODE_BEGIN,
+//SLCE
+MSG_ID_FDD_URR_SLCE_SET_ACTIVE_RAT_CNF = MSG_ID_FDD_CSCE_CODE_BEGIN,  /*Alfie: this msg_id is also used by RRCE*/
+MSG_ID_FDD_CSCE_SLCE_INITIALISE_CNF,
+MSG_ID_FDD_CSCE_SLCE_RF_ON_CNF,
+MSG_ID_FDD_CSCE_SLCE_RF_OFF_CNF,
+MSG_ID_FDD_CSCE_SLCE_RSSI_SNIFFER_STOP_CNF,
+
+//RRCE
+MSG_ID_FDD_CSCE_RRCE_MOVE_TO_IDLE_IND,
+MSG_ID_FDD_CSCE_RRCE_MOVE_TO_CELL_DCH_IND,
+MSG_ID_FDD_CSCE_RRCE_MOVE_TO_CONNECTED_IND,
+MSG_ID_FDD_CSCE_RRCE_MOVE_TO_INACTIVE_IND,
+MSG_ID_FDD_CSCE_RRCE_BCCH_MODIFICATION_INFO_IND,
+MSG_ID_FDD_CSCE_RRCE_RRC_CONNECTION_ESTABLISHMENT_IND,
+MSG_ID_FDD_CSCE_RRCE_RELEASE_CHANNELS_CNF,
+MSG_ID_FDD_CSCE_RRCE_OUT_OF_SERVICE_AREA_CNF,
+MSG_ID_FDD_RRCE_CSCE_SIB_COLLECTION_RSP,
+MSG_ID_FDD_CSCE_RRCE_STEADY_INACTIVE_IND,
+
+MSG_ID_FDD_RRCE_CSCE_DCH_SIB_COLLECTION_START_REQ,
+MSG_ID_FDD_RRCE_CSCE_DCH_SIB_COLLECTION_STOP_REQ,
+
+#ifdef __GEMINI__
+MSG_ID_FDD_CSCE_RRCE_ABORT_SERVICE_REQ,
+MSG_ID_FDD_CSCE_RRCE_ABORT_SERVICE_COMPLETE_IND,
+#endif
+
+#ifdef __SMART_PAGING_3G_FDD__
+MSG_ID_FDD_CSCE_RRCE_SMART_PAGING_STATUS_IND,
+#endif
+
+#if defined(__23G_PRI_RESEL_SUPPORT__) || defined(__LTE_RAT__)
+MSG_ID_FDD_RRCE_CSCE_DEDI_PRIO_INFO_IND,
+#endif
+
+//CSE
+MSG_ID_FDD_CSCE_CSE_CELL_SELECTION_STOP_CNF, 
+MSG_ID_FDD_CSCE_CSE_CELL_SELECTION_CNF, 
+MSG_ID_FDD_CSCE_CSE_PLMN_LIST_CNF, 
+MSG_ID_FDD_CSCE_CSE_FREQ_SCAN_SUSPEND_IND, 
+#if defined(__3G_CSG_SUPPORT__) || defined(__LTE_RAT__)
+MSG_ID_FDD_CSCE_CSE_FINGERPRINT_COLLECTION_CNF,
+MSG_ID_FDD_CSCE_CSE_FINGERPRINT_COLLECTION_STOP_CNF,
+#endif
+#if defined(__GEMINI_WCDMA__) && defined(__UAS_GEMINI_PROC_SHARING__)
+MSG_ID_FDD_CSCE_CSE_VIRTUAL_CELL_SELECTION_CNF,
+MSG_ID_FDD_CSCE_CSE_VIRTUAL_PLMN_LIST_CNF, 
+#endif
+
+
+#if defined(__3G_CSG_SUPPORT__) || defined(__LTE_RAT__)
+MSG_ID_FDD_CSCE_CSE_CSG_LIST_CNF,
+MSG_ID_FDD_CSCE_CSE_CSG_AUTONOMOUS_SEARCH_SUSPEND_CNF,
+MSG_ID_FDD_CSCE_CSE_CSG_AUTONOMOUS_SEARCH_CNF,
+MSG_ID_FDD_MEME_CSE_CSG_AUTONOMOUS_SEARCH_INTRA_FREQ_CELL_IND,
+MSG_ID_FDD_CSCE_CSE_EVALUATE_CSG_CELL_CNF,
+MSG_ID_FDD_CSCE_CSE_EVALUATE_CSG_CELL_SUSPEND_CNF,
+#endif
+
+#ifdef __LTE_RAT__
+MSG_ID_FDD_CSCE_CSE_CGI_COLLECTION_CNF,
+MSG_ID_FDD_CSCE_CSE_CGI_COLLECTION_STOP_CNF,
+#endif /* __LTE_RAT__ */
+
+//SIBE
+MSG_ID_FDD_SIBE_SIB_COLLECTION_CNF, 
+MSG_ID_FDD_SIBE_SIB_MONITORING_CNF, 
+MSG_ID_FDD_SIBE_SIB_MONITORING_ERROR_IND, 
+//MEME
+MSG_ID_FDD_CSCE_MEME_CELL_MEASUREMENT_RESULT_IND,
+MSG_ID_FDD_CSCE_MEME_LTE_MEASUREMENT_IND,
+MSG_ID_FDD_CSCE_MEME_CELL_REF_TIME_ANCHOR_IND,
+MSG_ID_FDD_MEME_CSCE_MODIFY_CELL_LIST_IND,
+MSG_ID_FDD_CSCE_MEME_REF_CELL_CHANGE_IND,
+MSG_ID_FDD_CSCE_MEME_EUTRA_FACH_MC_NOTIFICATION,
+
+//USIME
+MSG_ID_FDD_CSCE_USIME_USIM_REMOVED_IND,
+MSG_ID_FDD_CSCE_USIME_READ_NVRAM_CNF,
+MSG_ID_FDD_USIME_SIM_FILE_CHANGE_IND,
+
+//RATCM
+MSG_ID_RATCM_CSCE_INIT_REQ,
+MSG_ID_RATCM_CSCE_PLMN_SEARCH_REQ,
+MSG_ID_RATCM_CSCE_PLMN_LIST_REQ,
+MSG_ID_RATCM_CSCE_PLMN_LIST_STOP_REQ,
+MSG_ID_RATCM_CSCE_PLMN_LIST_ABORT_REQ,
+MSG_ID_RATCM_CSCE_ADD_FORBIDDEN_LA_REQ,
+MSG_ID_RATCM_CSCE_DEL_FORBIDDEN_LA_REQ,
+MSG_ID_RATCM_CSCE_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_RATCM_CSCE_HPLMN_INFO_UPDATE_REQ,
+MSG_ID_RATCM_CSCE_RRC_DEACTIVATE_REQ,
+MSG_ID_RATCM_CSCE_SET_RAT_MODE_REQ,
+MSG_ID_RATCM_CSCE_RFON_REQ,
+MSG_ID_RATCM_CSCE_RFOFF_REQ,
+MSG_ID_RATCM_CSCE_SET_IMEI_REQ,
+MSG_ID_RATCM_CSCE_ELEVATOR_MODE_REQ,
+MSG_ID_RATCM_CSCE_CLEAR_MRU_REQ,
+MSG_ID_RATCM_CSCE_SET_MRU_REQ,
+MSG_ID_RATCM_CSCE_CSG_AUTO_SEARCH_MODE_REQ,
+MSG_ID_RATCM_CSCE_EMC_SESSION_START_REQ,
+MSG_ID_RATCM_CSCE_EMC_SESSION_STOP_REQ,
+MSG_ID_RATCM_CSCE_CALL_STATUS_IND,
+MSG_ID_RATCM_CSCE_EMC_FORBIDDEN_NW_LIST_UPDATE_REQ,
+MSG_ID_RATCM_CSCE_LTE_NORMAL_SERVICE_LOSS_UPDATE_REQ,
+
+/*Sniffer related*/
+MSG_ID_RATCM_UAS_SNIFFER_START_REQ,
+MSG_ID_RATCM_UAS_SNIFFER_STOP_REQ,
+MSG_ID_RATCM_UAS_CHECK_ACTIVE_RAT_REQ,
+MSG_ID_RATCM_UAS_SET_ACTIVE_RAT_REQ,
+
+//CM
+MSG_ID_CMCSCE_EMERGENCY_CALL_STATUS_IND,
+MSG_ID_CC_CSCE_TAS_NOTIFY_IND,
+
+#ifdef __GEMINI__
+MSG_ID_RATCM_CSCE_SIM_STATUS_UPDATE_REQ,
+#endif
+
+#if defined(__3G_CSG_SUPPORT__) || defined(__LTE_RAT__)
+MSG_ID_RATCM_CSCE_CSG_LIST_REQ,
+MSG_ID_RATCM_CSCE_CSG_LIST_STOP_REQ,
+MSG_ID_RATCM_CSCE_UPDATE_WHITE_LIST_REQ,
+#endif
+
+#ifdef __LTE_RAT__
+MSG_ID_RATCM_UAS_RAT_CHANGE_REQ,  //also used by RRCE
+#endif
+MSG_ID_RATCM_CSCE_CAP_UPDATE_REQ,
+
+MSG_ID_RATCM_CSCE_REGN_STATUS_UPDATE_REQ,
+MSG_ID_RATCM_CSCE_PLMN_INFO_UPDATE_REQ,
+
+MSG_ID_RATCM_CSCE_PLMN_LIST_STATUS_UPDATE_REQ,
+MSG_ID_RATCM_CSCE_DISABLE_RAT_CONFIG_REQ,
+MSG_ID_RATCM_CSCE_INACTIVE_MODE_CONFIGURATION_REQ,
+MSG_ID_RATCM_CSCE_SCREEN_ON_REQ,
+MSG_ID_RATCM_CSCE_SCREEN_OFF_REQ,
+MSG_ID_RATCM_CSCE_SERVICE_RECOVERY_ROUND_UPDATE_REQ,
+MSG_ID_RATCM_CSCE_NR_NORMAL_SERVICE_LOSS_UPDATE_REQ,
+MSG_ID_FDD_CSCE_CODE_END = MSG_ID_RATCM_CSCE_NR_NORMAL_SERVICE_LOSS_UPDATE_REQ, 
+//MSG_ID_CSCE_CODE_END,
+MODULE_MSG_END( MSG_ID_FDD_CSCE_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_CSE_CODE_BEGIN )
+//MSG_ID_CSE_CODE_BEGIN,
+//SLCE
+MSG_ID_FDD_CSE_SLCE_FREQ_SCAN_SUSPEND_IND = MSG_ID_FDD_CSE_CODE_BEGIN,
+// MEME
+MSG_ID_FDD_CSE_MEME_CELL_MEASUREMENT_RESULT_IND,
+// CSCE
+MSG_ID_FDD_CSCE_CSE_CELL_SELECTION_START_REQ, 
+MSG_ID_FDD_CSCE_CSE_CELL_SELECTION_STOP_REQ, 
+MSG_ID_FDD_CSCE_CSE_PLMN_LIST_START_REQ, 
+MSG_ID_FDD_CSCE_CSE_PLMN_LIST_SUSPEND_REQ, 
+MSG_ID_FDD_CSCE_CSE_RF_OFF_REQ,                             // For auto band
+MSG_ID_FDD_CSCE_CSE_PLMN_LOSS_WITH_LIST_IND,                // For PLMN List optimization
+#if defined(__3G_CSG_SUPPORT__) || defined(__LTE_RAT__)
+MSG_ID_FDD_CSCE_CSE_FINGERPRINT_COLLECTION_REQ,
+MSG_ID_FDD_CSCE_CSE_FINGERPRINT_COLLECTION_STOP_REQ,
+#endif
+MSG_ID_FDD_CSE_SLCE_FREQ_SCAN_CNF,
+
+
+#if (defined(__3G_CSG_SUPPORT__) || defined(__LTE_RAT__))
+MSG_ID_FDD_CSCE_CSE_CSG_LIST_START_REQ,
+MSG_ID_FDD_CSCE_CSE_CSG_LIST_SUSPEND_REQ,
+MSG_ID_FDD_CSCE_CSE_CSG_AUTONOMOUS_SEARCH_START_REQ,
+MSG_ID_FDD_CSCE_CSE_CSG_AUTONOMOUS_SEARCH_SUSPEND_REQ,
+MSG_ID_FDD_CSCE_CSE_EVALUATE_CSG_CELL_REQ,
+MSG_ID_FDD_CSCE_CSE_EVALUATE_CSG_CELL_SUSPEND_REQ,
+#endif
+
+#ifdef __LTE_RAT__
+MSG_ID_FDD_CSCE_CSE_CGI_COLLECTION_REQ,
+MSG_ID_FDD_CSCE_CSE_CGI_COLLECTION_STOP_REQ,
+#endif
+MSG_ID_FDD_CSCE_CSE_PLMN_LIST_STATUS_UPDATE_REQ,
+
+MSG_ID_FDD_CSE_CACHE_INFO_IND,                              // For showing cache content to Catcher...>#I
+MSG_ID_FDD_CSE_CODE_END = MSG_ID_FDD_CSE_CACHE_INFO_IND, 
+MODULE_MSG_END( MSG_ID_FDD_CSE_CODE_TAIL )
+//MSG_ID_CSE_CODE_END,
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_MEME_CODE_BEGIN )
+//MSG_ID_FDD_MEME_CODE_BEGIN,
+//SLCE
+//UMAC
+MSG_ID_FDD_MEME_UMAC_TRAFFIC_VOLUME_MEASUREMENT_IND = MSG_ID_FDD_MEME_CODE_BEGIN,
+MSG_ID_FDD_MEME_UMAC_QUALITY_MEASUREMENT_IND,
+MSG_ID_FDD_MEME_UMAC_ADDITIONAL_TVM_IND,
+MSG_ID_FDD_MEME_UMAC_MEASUREMENT_ERROR_IND,
+#ifdef __UMTS_R6__
+MSG_ID_FDD_MEME_UMAC_TVM_EXCEED_THRESHOLD_IND,
+#endif
+MSG_ID_FDD_MEME_UMAC_COUNTC_STATUS_IND,
+//RRCE
+MSG_ID_FDD_RRCE_MEME_MOVE_TO_STATE_REQ,
+MSG_ID_FDD_MEME_RRCE_COMPRESSED_MODE_RECONFIGURE_FAILURE_IND,
+MSG_ID_FDD_MEME_RRCE_COMPRESSED_MODE_RECONFIGURE_SUCCESS_IND,
+MSG_ID_FDD_RRCE_MEME_ASU_IND,
+MSG_ID_FDD_RRCE_MEME_ELEVATOR_MODE_MEAS_START_REQ,
+MSG_ID_FDD_RRCE_MEME_ELEVATOR_MODE_MEAS_STOP_REQ,
+
+
+//SLCE
+MSG_ID_FDD_MEME_SLCE_SUSPEND_REPORT_IND,
+MSG_ID_FDD_MEME_SLCE_RESUME_REPORT_IND,
+MSG_ID_FDD_MEME_SLCE_MEASUREMENT_CONFIG_CELL_CNF,
+MSG_ID_FDD_MEME_SLCE_MEASUREMENT_CONFIG_TGPS_CNF,
+
+
+//CSCE
+MSG_ID_FDD_CSCE_MEME_INITIALISE_REQ,
+MSG_ID_FDD_MEME_CSCE_CELL_SELECTED_IND,
+MSG_ID_FDD_CSCE_MEME_MEAS_MANIPULATION_REQ,
+MSG_ID_FDD_CSCE_MEME_LTE_HPS_QUALIFY_CELL_IND,
+MSG_ID_FDD_CSCE_MEME_RF_ON_REQ,
+MSG_ID_FDD_CSCE_MEME_RF_OFF_REQ,
+MSG_ID_FDD_CSCE_MEME_SET_MODE_REQ,
+MSG_ID_FDD_CSCE_MEME_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_FDD_CSCE_MEME_CLEAN_DB_CELL_REQ,
+MSG_ID_FDD_CSCE_MEME_SIB19_CHANGE_IND,
+//SIBE
+MSG_ID_FDD_MEME_SIBE_SIB3_CHANGE_IND,
+MSG_ID_FDD_MEME_SIBE_SIB4_CHANGE_IND,
+MSG_ID_FDD_MEME_SIBE_SIB11_CHANGE_IND, 
+MSG_ID_FDD_MEME_SIBE_SIB12_CHANGE_IND, 
+MSG_ID_FDD_MEME_SIBE_SIB18_CHANGE_IND, 
+//MEME self
+MSG_ID_FDD_MEME_MEME_QUEUED_GAS_UAS_CONFIG_UCELL_MEAS_REQ,
+MSG_ID_FDD_MEME_MEME_QUEUED_GAS_UAS_CONFIG_UCELL_PRIO_MEAS_REQ,
+MSG_ID_FDD_MEME_MEME_QUEUED_EAS_UAS_CONFIG_UCELL_MEAS_REQ,
+MSG_ID_FDD_MEME_MEME_QUEUED_EAS_UAS_CONFIG_UCELL_PRIO_MEAS_REQ,
+MSG_ID_FDD_MEME_MEME_SAVED_MEAS_CTRL_IND,
+MSG_ID_FDD_MEME_NBR_CELL_INFO_IND,
+MSG_ID_FDD_MEME_CELL_POWER_LEVEL_IND,
+MSG_ID_FDD_MEME_DUMP_CONTEXT,
+MSG_ID_FDD_MEME_UT_SET_CONTEXT,
+MSG_ID_FDD_MEME_UT_SET_SHM,
+MSG_ID_FDD_MEME_UAS_REPORT_SIGNAL_LEVEL_IND,
+
+
+MSG_ID_FDD_MEME_CODE_END = MSG_ID_FDD_MEME_UAS_REPORT_SIGNAL_LEVEL_IND,
+MODULE_MSG_END( MSG_ID_FDD_MEME_CODE_TAIL )
+//MSG_ID_FDD_MEME_CODE_END,
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_RRCE_CODE_BEGIN )
+//MSG_ID_FDD_RRCE_CODE_BEGIN,
+//UDC
+MSG_ID_RATCM_RRCE_CONN_EST_REQ = MSG_ID_FDD_RRCE_CODE_BEGIN,
+MSG_ID_RATCM_RRCE_CONN_REL_REQ,
+MSG_ID_RATCM_RRCE_CONN_ABORT_REQ,
+MSG_ID_RATCM_RRCE_DATA_TRANSFER_REQ,
+MSG_ID_RATCM_RRCE_SECURITY_MODE_REQ,
+MSG_ID_RATCM_RRCE_RB_RE_ESTABLISHMENT_RSP,
+//UNT
+MSG_ID_RATCM_RRCE_PAGING_PARAM_ASSIGN_REQ,
+//NEW
+MSG_ID_RATCM_RRCE_REGN_STATUS_UPDATE_REQ,
+MSG_ID_RATCM_RRCE_SET_PGCHECK_REQ,
+#ifdef __GEMINI__
+MSG_ID_RATCM_RRCE_NO_IR_SIG_PROC_REQ,
+#endif
+#ifdef __NO_PSDATA_SEND_SCRI__
+MSG_ID_RATCM_RRCE_END_PS_DATA_SESSION_REQ,
+#endif
+#ifdef __FAST_DORMANCY__
+MSG_ID_RATCM_RRCE_END_PS_DATA_SESSION_REQ,
+#endif
+#ifdef __LTE_RAT__
+MSG_ID_RATCM_UAS_RAT_CHANGE_RES,
+//LTE interRAT
+MSG_ID_RATCM_RRCE_RAT_CHANGE_REQ,
+MSG_ID_RATCM_RRCE_RAT_CHANGE_RSP,
+MSG_ID_RATCM_CSCE_RAT_CHANGE_REQ,
+MSG_ID_RATCM_UAS_RAT_CHANGE_RSP,
+MSG_ID_RATCM_RRCE_CS_STATUS_UPDATE_REQ,
+#endif
+
+/* BMC */
+MSG_ID_FDD_RRCE_BMC_RX_IND,
+MSG_ID_FDD_RRCE_BMC_PRIO_IND,
+MSG_ID_FDD_RRCE_BMC_ETWS_IND,
+/* URLC */
+MSG_ID_FDD_RRCE_URLC_STATUS_IND,
+/* PDCP */
+MSG_ID_FDD_RRCE_PDCP_STATUS_IND,
+
+//SLCE
+MSG_ID_FDD_RRCE_SLCE_RECONFIG_COMPLETE_IND,
+MSG_ID_FDD_RRCE_SLCE_RECONFIG_ERROR_IND,
+MSG_ID_FDD_RRCE_SLCE_PDCP_RELOC_IND,
+MSG_ID_FDD_RRCE_SLCE_GET_COUNT_C_CNF,
+MSG_ID_FDD_RRCE_SLCE_ABORT_CNF,
+#if 0
+/* under construction !*/
+/* under construction !*/
+#endif
+MSG_ID_FDD_RRCE_SLCE_L1_CONTAINER_RECEIVED_IND,
+MSG_ID_FDD_RRCE_SLCE_MONITOR_ORDER_REQ,  
+//SIBE
+MSG_ID_FDD_RRCE_SIBE_CELL_RST_CNF, 
+MSG_ID_FDD_RRCE_SIBE_CELL_RST_STOP_CNF,
+//CSCE
+MSG_ID_FDD_CSCE_RRCE_SUITABLE_CELL_SELECTED_REQ,
+MSG_ID_FDD_CSCE_RRCE_ACCEPTABLE_CELL_SELECTED_REQ,
+MSG_ID_FDD_CSCE_RRCE_OUT_OF_SERVICE_AREA_REQ,
+MSG_ID_FDD_CSCE_RRCE_DEACTIVATE_REQ,
+MSG_ID_FDD_CSCE_RRCE_SET_MODE_REQ,
+MSG_ID_FDD_RRCE_CSCE_SIB_COLLECTION_IND,
+MSG_ID_FDD_CSCE_RRCE_PCH_TO_FACH_READY_RSP,
+MSG_ID_FDD_CSCE_RRCE_RELEASE_CHANNELS_REQ,
+//MEME
+MSG_ID_FDD_MEME_RRCE_COMPRESSED_MODE_RECONFIGURE_REQ,
+MSG_ID_FDD_MEME_RRCE_MONITOR_ORDER_IND,
+MSG_ID_FDD_MEME_RRCE_ELEVATOR_MODE_MEAS_RELEASE_IND,
+MSG_ID_FDD_MEME_RRCE_ELEVATOR_MODE_TGPS_START_REQ,
+//UMAC
+MSG_ID_FDD_RRCE_UMAC_STATUS_DATA_PENDING_IND,
+MSG_ID_FDD_RRCE_UMAC_STATUS_RACH_IND,
+#ifdef __UMTS_R7__
+MSG_ID_FDD_RRCE_UMAC_D_HRNTI_DETECTED_IND,
+#endif
+#ifdef __MTK_INTERNAL__
+// RRCE itself
+MSG_ID_FDD_RRCE_RRCE_DEBUG_INFO_IND,
+#endif
+/* ACK */
+MSG_ID_FDD_RRCE_RRCE_SECURITY_ACK_IND,//Jingo: R10CR 4427
+MSG_ID_FDD_RRCL_RRC_ACKNOWLEDGEMENT_IND,
+MSG_ID_FDD_RRCE_VERDICT_TIMERID_IND, //Jack: Event Scheduler
+MSG_ID_FDD_RRCE_FORCE_TIMER_EXPIRY_IND, //Jack: Event Scheduler
+#ifdef __TC7__CS__SUPPORT__
+MSG_ID_FDD_RRCE_URLC_USR_DATA_AVAILABLE_CNF,
+#endif
+#ifdef __GEMINI__
+MSG_ID_RATCM_UAS_VIRTUAL_MODE_IND,
+#endif
+MSG_ID_RATCM_UAS_DATA_ALLOW_REQ,
+MSG_ID_RATCM_RRCE_FORCE_CONN_RELEASE_REQ,
+MSG_ID_RATCM_RRCE_NO_CC_DATA_DETECT_IND,
+MSG_ID_FDD_RRCE_CODE_END = MSG_ID_RATCM_RRCE_NO_CC_DATA_DETECT_IND,
+MODULE_MSG_END( MSG_ID_FDD_RRCE_CODE_TAIL )
+//MSG_ID_RRCE_CODE_END,
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_SIBE_CODE_BEGIN )
+
+//MSG_ID_SIBE_CODE_BEGIN,
+//SLCE
+MSG_ID_FDD_SIBE_SLCE_CONFIGURE_BCH_FAILED_IND = MSG_ID_FDD_SIBE_CODE_BEGIN,
+#ifdef __GEMINI__
+MSG_ID_FDD_SIBE_SLCE_RECONFIGURE_BCH_CNF,
+#endif
+// SIBE self
+MSG_ID_FDD_SIBE_SIB_COLLECTION_REQ, 
+MSG_ID_FDD_SIBE_SIB_COLLECTION_CANCEL_REQ, 
+MSG_ID_FDD_SIBE_START_SIB_MONITORING_REQ, 
+MSG_ID_FDD_SIBE_STOP_SIB_MONITORING_REQ, 
+MSG_ID_FDD_RRCE_SIBE_CELL_RST_REQ, 
+MSG_ID_FDD_RRCE_SIBE_CELL_RST_STOP_REQ,
+#ifdef __UMTS_R8__
+MSG_ID_FDD_RRCE_SIBE_SIB7_EXPIRY_TIMER_IND,
+#endif
+MSG_ID_FDD_CSCE_SIBE_MOVE_TO_IDLE_REQ, 
+MSG_ID_FDD_SIBE_DUMP_BCH_SIB_IND,
+MSG_ID_FDD_SIBE_SIB_CHANGE_IND,
+MSG_ID_FDD_SIBE_CODE_END = MSG_ID_FDD_SIBE_SIB_CHANGE_IND,
+MODULE_MSG_END( MSG_ID_FDD_SIBE_CODE_TAIL )
+//MSG_ID_SIBE_CODE_END,
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_SLCE_CODE_BEGIN )
+
+//MSG_ID_FDD_SLCE_CODE_BEGIN,
+//RATCM
+MSG_ID_RATCM_SLCE_MONITORING_CLOSE_LOOP_REQ = MSG_ID_FDD_SLCE_CODE_BEGIN,
+MSG_ID_RATCM_SLCE_DUPLEX_MODE_CHANGE_REQ,
+
+/* RABM */
+MSG_ID_FDD_CRABM_RAB_ESTABLISH_RSP,
+MSG_ID_FDD_CRABM_RAB_RELEASE_RSP,
+/* PDCP */
+MSG_ID_FDD_CPDCP_CONFIG_CNF,
+MSG_ID_FDD_CPDCP_RELOC_CNF,
+MSG_ID_FDD_CPDCP_RELEASE_CNF,
+/* URLC */
+MSG_ID_FDD_CRLC_CONFIG_RAB_CNF,
+MSG_ID_FDD_CRLC_CONFIG_TM_ESTABLISH_CNF,
+MSG_ID_FDD_CRLC_CONFIG_UM_ESTABLISH_CNF,
+MSG_ID_FDD_CRLC_CONFIG_AM_ESTABLISH_CNF,
+MSG_ID_FDD_CRLC_CONFIG_RELEASE_CNF,
+MSG_ID_FDD_CRLC_SUSPEND_CNF,
+MSG_ID_FDD_CRLC_RESUME_CNF,
+MSG_ID_FDD_CRLC_CONFIG_TX_CIPHERING_CNF,
+MSG_ID_FDD_CRLC_CONFIG_RX_CIPHERING_CNF,
+MSG_ID_FDD_CRLC_COUNT_C_CNF,
+MSG_ID_FDD_CRLC_REESTABLISH_CNF,
+/* SEQ */
+MSG_ID_FDD_CSEQ_CONFIG_UL2ACC_CLK_ON_INFO_CNF,
+MSG_ID_FDD_CSEQ_CONFIG_UL2ACC_CLK_OFF_INFO_CNF,
+//CSCE
+MSG_ID_FDD_CSCE_SLCE_INITIALISE_REQ,
+MSG_ID_FDD_CSCE_SLCE_RF_OFF_REQ,
+MSG_ID_FDD_CSCE_SLCE_RF_ON_REQ,
+MSG_ID_FDD_CSCE_SLCE_RSSI_SNIFFER_START_REQ,
+MSG_ID_FDD_CSCE_SLCE_RSSI_SNIFFER_STOP_REQ,
+MSG_ID_FDD_CSCE_SLCE_RSSI_SNIFFER_STOP_IND,
+#ifdef __GEMINI__
+MSG_ID_FDD_CSCE_SLCE_RESUME_REQ,
+#endif
+
+//URR
+MSG_ID_FDD_URR_SLCE_SET_ACTIVE_RAT_REQ,
+//RRCE
+MSG_ID_FDD_RRCE_SLCE_ABORT_REQ,
+MSG_ID_FDD_RRCE_SLCE_GET_COUNT_C_REQ,
+MSG_ID_FDD_RRCE_SLCE_RECONFIG_REQ,
+//SIBE
+MSG_ID_FDD_SIBE_SLCE_RECONFIGURE_BCH_REQ,
+MSG_ID_FDD_SIBE_SLCE_SIB7_CHANGE_IND,
+//CSE
+MSG_ID_FDD_CSE_SLCE_FREQ_SCAN_CONTINUE_REQ,
+MSG_ID_FDD_CSE_SLCE_FREQ_SCAN_REQ,
+MSG_ID_FDD_CSE_SLCE_FREQ_SCAN_SUSPEND_REQ,
+MSG_ID_FDD_CSE_SLCE_SPECIFIC_CELL_SEARCH_REQ,
+MSG_ID_FDD_CSE_SLCE_SPECIFIC_CELL_SEARCH_STOP_REQ,
+//MEME
+MSG_ID_FDD_MEME_SLCE_MEASUREMENT_CONFIG_CELL_REQ,
+MSG_ID_FDD_MEME_SLCE_MEASUREMENT_CONFIG_FMO_REQ,
+MSG_ID_FDD_MEME_SLCE_MEASUREMENT_CONFIG_TGPS_REQ,
+MSG_ID_FDD_MEME_SLCE_MEASUREMENT_CONFIG_RSSI_EVENT_REQ,
+MSG_ID_FDD_MEME_SLCE_MEASUREMENT_CONFIG_TX_POWER_REQ,
+MSG_ID_FDD_MEME_SLCE_MEASUREMENT_CONFIG_TX_POWER_STOP_REQ,
+MSG_ID_FDD_MEME_SLCE_TX_POWER_RESULT_REQ,
+MSG_ID_FDD_MEME_SLCE_RLC_CONTINUE_REQ,
+MSG_ID_FDD_MEME_SLCE_RLC_STOP_REQ,                 
+
+//SEQ
+MSG_ID_FDD_SEQ_SEQUENCE_REQ,
+MSG_ID_FDD_SEQ_SEQUENCE_CONFIRMED_IND,
+MSG_ID_FDD_SEQ_SEQUENCE_INDICATED_IND,
+MSG_ID_FDD_SEQ_SEQUENCE_ERROR_IND,
+
+//UMAC
+MSG_ID_FDD_CMAC_CONFIG_UE_CNF,
+MSG_ID_FDD_CMAC_CONFIG_UE_IND,
+MSG_ID_FDD_CMAC_CONFIG_TX_CCTRCH_CNF,
+MSG_ID_FDD_CMAC_CONFIG_EDCH_CCTRCH_CNF,
+MSG_ID_FDD_CMAC_CONFIG_TX_CCTRCH_IND,
+MSG_ID_FDD_CMAC_CONFIG_EDCH_CCTRCH_IND,
+MSG_ID_FDD_CMAC_REMOVE_TX_CCTRCH_CNF,
+MSG_ID_FDD_CMAC_REMOVE_EDCH_CCTRCH_CNF,
+MSG_ID_FDD_CMAC_REMOVE_TX_CCTRCH_IND,
+MSG_ID_FDD_CMAC_REMOVE_EDCH_CCTRCH_IND,
+MSG_ID_FDD_CMAC_CONFIG_RX_CCTRCH_CNF,
+MSG_ID_FDD_CMAC_CONFIG_HSDSCH_CCTRCH_CNF,
+MSG_ID_FDD_CMAC_CONFIG_RX_CCTRCH_IND,
+MSG_ID_FDD_CMAC_CONFIG_HSDSCH_CCTRCH_IND,
+MSG_ID_FDD_CMAC_REMOVE_RX_CCTRCH_CNF,
+MSG_ID_FDD_CMAC_REMOVE_HSDSCH_CCTRCH_CNF,
+MSG_ID_FDD_CMAC_REMOVE_RX_CCTRCH_IND,
+MSG_ID_FDD_CMAC_REMOVE_HSDSCH_CCTRCH_IND,
+MSG_ID_FDD_CMAC_CONFIG_RACH_CNF,
+MSG_ID_FDD_CMAC_CONFIG_RACH_IND,
+MSG_ID_FDD_CMAC_CONFIG_CPCH_CNF,
+MSG_ID_FDD_CMAC_CONFIG_CIPHERING_CNF,
+MSG_ID_FDD_CMAC_COUNT_C_CNF,
+MSG_ID_FDD_CMAC_DELETE_CIPHERING_CNF,
+
+MSG_ID_FDD_CMAC_CONFIG_TX_RLC_REESTABLISH_CNF,
+MSG_ID_FDD_CMAC_CONFIG_TX_RLC_REESTABLISH_IND,
+MSG_ID_FDD_CMAC_CONFIG_RX_RLC_REESTABLISH_CNF,
+MSG_ID_FDD_CMAC_CONFIG_RX_RLC_REESTABLISH_IND,
+
+MSG_ID_FDD_CMAC_CONFIG_ABORT_CNF,
+MSG_ID_FDD_CMAC_CONFIG_TFC_SUBSET_CNF,
+MSG_ID_FDD_CMAC_CONFIG_TFC_SUBSET_IND,
+MSG_ID_FDD_CMAC_ABORT_IND,
+
+MSG_ID_FDD_SLCE_CODE_END = MSG_ID_FDD_CMAC_ABORT_IND,
+MODULE_MSG_END( MSG_ID_FDD_SLCE_CODE_TAIL )
+//MSG_ID_SLCE_CODE_END,
+
+MODULE_MSG_BEGIN( MSG_ID_FDD_DBME_CODE_BEGIN )
+//MSG_ID_DBME_CODE_BEGIN,
+MSG_ID_FDD_DBME_DUMP_IND = MSG_ID_FDD_DBME_CODE_BEGIN,
+MSG_ID_FDD_DBME_DUMP_EXT_QUEUE_IND,
+MSG_ID_FDD_DBME_CODE_END = MSG_ID_FDD_DBME_DUMP_EXT_QUEUE_IND,
+MODULE_MSG_END( MSG_ID_FDD_DBME_CODE_TAIL )
+//MSG_ID_DBME_CODE_END,
+
+//MSG_ID_USIME_CODE_BEGIN,
+MODULE_MSG_BEGIN( MSG_ID_FDD_USIME_CODE_BEGIN )
+MSG_ID_FDD_RRCE_USIME_SAVE_REQ = MSG_ID_FDD_USIME_CODE_BEGIN,
+MSG_ID_FDD_CSCE_USIME_READ_NVRAM_REQ,
+MSG_ID_FDD_CSCE_USIME_SAVE_REQ,
+MSG_ID_FDD_CSCE_USIME_SET_MODE_REQ,
+MSG_ID_FDD_CSCE_USIME_BAND_SETTING_UPDATE_REQ,
+MSG_ID_FDD_CSCE_USIME_EUTRAN_CAP_UPDATE_REQ,
+MSG_ID_RATCM_UAS_USIM_INFO_RESET_REQ,
+MSG_ID_FDD_USIM_REGISTER_CNF,
+MSG_ID_FDD_USIME_DUMP_UE_CAPABILITY,
+MSG_ID_FDD_NWSEL_USIME_EUTRAN_BAND_UPDATE_REQ,
+MSG_ID_FDD_USIME_CODE_END = MSG_ID_FDD_USIM_REGISTER_CNF,
+MODULE_MSG_END( MSG_ID_FDD_USIME_CODE_TAIL )
+//MSG_ID_USIME_CODE_END,
+
+//MSG_ID_FDD_URR_CODE_BEGIN,
+MODULE_MSG_BEGIN( MSG_ID_FDD_URR_CODE_BEGIN )
+MSG_ID_URR_NON_USED_MESSAGE_BEGIN = MSG_ID_FDD_URR_CODE_BEGIN,
+
+#ifdef __GEMINI__
+MSG_ID_FDD_URR_CSCE_SWITCH_GEMINI_MODE_REQ,
+
+/* ifdef __GEMINI__ */
+MSG_ID_FDD_URR_RRCE_SWITCH_GEMINI_MODE_REQ,
+MSG_ID_FDD_URR_CSE_SWITCH_GEMINI_MODE_REQ,
+MSG_ID_FDD_URR_MEME_SWITCH_GEMINI_MODE_REQ,
+MSG_ID_FDD_URR_SIBE_SWITCH_GEMINI_MODE_REQ,
+MSG_ID_FDD_URR_CSCE_VIRTUAL_SUSPEND_SERVICE_COMPLETE_IND,
+#if 0 /* move to ul1_sap.h */
+/* under construction !*/
+#endif
+/* endif __GEMINI__ */
+#endif /* __GEMINI__ */
+
+/* DRLC */
+MSG_ID_FDD_URR_DRLC_SRB_SDU_STOP_IND,
+
+/* LCSCE */
+MSG_ID_FDD_LCSCE_CSCE_RESEL_IND,
+MSG_ID_FDD_LCSCE_CSCE_BAR_CELL_IND,
+MSG_ID_FDD_LCSCE_CSCE_TRIGGER_4G_CSG_SEARCH_IND,
+MSG_ID_FDD_LCSCE_CSCE_TRIGGER_4G_CSG_EVALUATION_IND,
+MSG_ID_FDD_LCSCE_CSCE_TRIGGER_3G_CSG_SEARCH_IND,
+
+#ifdef UNIT_TEST
+MSG_ID_FDD_LCSCE_CSCE_UT_SIMULATE_CONTEXT_TRANSFER,
+#endif /* UNIT_TEST */
+
+/* LURR */
+MSG_ID_FDD_URR_LURR_SYNC_UP_REQ,
+MSG_ID_FDD_URR_LURR_SYNC_UP_CNF,
+MSG_ID_FDD_URR_LURR_SYNC_DOWN_REQ,
+MSG_ID_FDD_URR_LURR_DUMP_SYNC_DATA,
+MSG_ID_FDD_URR_DUMP_CONTEXT,
+#ifdef __GEMINI__
+MSG_ID_FDD_URR_RRCE_VIRTUAL_CONNECTED_SUSPEND_REQ,
+MSG_ID_FDD_URR_CSCE_VIRTUAL_CONNECTED_SUSPEND_REQ,
+MSG_ID_FDD_URR_MEME_VIRTUAL_CONNECTED_SUSPEND_REQ,
+MSG_ID_FDD_URR_SIBE_VIRTUAL_CONNECTED_SUSPEND_REQ,
+
+MSG_ID_FDD_URR_RRCE_VIRTUAL_CONNECTED_RESUME_REQ,
+MSG_ID_FDD_URR_CSCE_VIRTUAL_CONNECTED_RESUME_REQ,
+MSG_ID_FDD_URR_MEME_VIRTUAL_CONNECTED_RESUME_REQ,
+MSG_ID_FDD_URR_SIBE_VIRTUAL_CONNECTED_RESUME_REQ,
+#endif
+
+MSG_ID_FDD_URR_NON_USED_MESSAGE_END,
+MSG_ID_FDD_URR_CODE_END = MSG_ID_FDD_URR_NON_USED_MESSAGE_END,
+MODULE_MSG_END( MSG_ID_FDD_URR_CODE_TAIL )
+//MSG_ID_FDD_URR_CODE_END,
+
+#endif /* __UMTS_FDD_MODE__ */
+
+/* mtk80197, merge TDD128 back to MAUI */
+#if defined(__UMTS_TDD128_MODE__)
+MODULE_MSG_BEGIN( MSG_ID_TDD_ADR_CODE_BEGIN )
+
+//MSG_ID_TDD_ADR_CODE_BEGIN,
+MSG_ID_TDD_RLC_TM_DATA_IND = MSG_ID_TDD_ADR_CODE_BEGIN,
+MSG_ID_TDD_RLC_UM_DATA_IND,
+MSG_ID_TDD_RLC_AM_DATA_IND,
+
+#ifdef UNIT_TEST
+MSG_ID_TDD_ADR_UNPACK_UT_EVENT_PHY_DATA_IND,
+MSG_ID_TDD_ADR_UNPACK_UT_EVENT_RLC_DATA_IND,
+MSG_ID_TDD_ADR_UNPACK_UT_EVENT_VERDICT_DATA_IND,
+MSG_ID_TDD_ADR_PACK_UT_MOVE_TO_IDLE_REQ,
+MSG_ID_TDD_ADR_PACK_UT_SEND_CCCH_REQ,
+MSG_ID_TDD_ADR_PACK_UT_SEND_DCCH_REQ,
+#endif
+
+MSG_ID_TDD_ADR_ADR_ACKNOWLEDGEMENT_IND,
+MSG_ID_TDD_RLC_AM_DATA_CNF,
+MSG_ID_TDD_ADR_CODE_END = MSG_ID_TDD_RLC_AM_DATA_CNF,
+MODULE_MSG_END( MSG_ID_TDD_ADR_CODE_TAIL )
+//MSG_ID_TDD_ADR_CODE_END,
+
+//MSG_ID_TDD_CSCE_CODE_BEGIN,
+//SLCE
+MODULE_MSG_BEGIN( MSG_ID_TDD_CSCE_CODE_BEGIN )
+MSG_ID_TDD_URR_SLCE_SET_ACTIVE_RAT_CNF = MSG_ID_TDD_CSCE_CODE_BEGIN,  /*Alfie: this msg_id is also used by RRCE*/
+MSG_ID_TDD_CSCE_SLCE_INITIALISE_CNF,
+MSG_ID_TDD_CSCE_SLCE_RF_ON_CNF,
+MSG_ID_TDD_CSCE_SLCE_RF_OFF_CNF,
+MSG_ID_TDD_CSCE_SLCE_RSSI_SNIFFER_STOP_CNF,
+
+//RRCE
+MSG_ID_TDD_CSCE_RRCE_MOVE_TO_IDLE_IND,
+MSG_ID_TDD_CSCE_RRCE_MOVE_TO_CELL_DCH_IND,
+MSG_ID_TDD_CSCE_RRCE_MOVE_TO_CONNECTED_IND,
+MSG_ID_TDD_CSCE_RRCE_MOVE_TO_INACTIVE_IND,
+MSG_ID_TDD_CSCE_RRCE_BCCH_MODIFICATION_INFO_IND,
+MSG_ID_TDD_CSCE_RRCE_RRC_CONNECTION_ESTABLISHMENT_IND,
+MSG_ID_TDD_CSCE_RRCE_RELEASE_CHANNELS_CNF,
+MSG_ID_TDD_CSCE_RRCE_OUT_OF_SERVICE_AREA_CNF,
+MSG_ID_TDD_RRCE_CSCE_SIB_COLLECTION_RSP,
+MSG_ID_TDD_CSCE_RRCE_STEADY_INACTIVE_IND,
+
+#if defined(__23G_PRI_RESEL_SUPPORT__) || defined(__LTE_RAT__)
+MSG_ID_TDD_CSCE_RRCE_DEDI_PRIO_INFO_IND,
+#endif
+
+#ifdef __GEMINI__
+MSG_ID_TDD_CSCE_RRCE_ABORT_SERVICE_REQ,
+MSG_ID_TDD_CSCE_RRCE_ABORT_SERVICE_COMPLETE_IND,
+MSG_ID_TDD_CSCE_RRCE_REVERT_RAT_IN_SUSPEND_IND,
+#endif
+MSG_ID_TDD_CSCE_RRCE_CHANNEL_CONFIG_FAILURE_IND,
+#ifdef __SMART_PAGING_3G_FDD__
+MSG_ID_TDD_CSCE_RRCE_SMART_PAGING_STATUS_IND,
+#endif
+
+//CSE
+MSG_ID_TDD_CSCE_CSE_CELL_SELECTION_STOP_CNF,
+MSG_ID_TDD_CSCE_CSE_CELL_SELECTION_CNF,
+MSG_ID_TDD_CSCE_CSE_PLMN_LIST_CNF,
+MSG_ID_TDD_CSCE_CSE_FREQ_SCAN_SUSPEND_IND,
+
+#if 0
+#endif
+#if (defined(__3G_CSG_SUPPORT__) || defined(__LTE_RAT__))
+MSG_ID_TDD_CSCE_CSE_CSG_LIST_CNF,
+MSG_ID_TDD_CSCE_CSE_CSG_AUTONOMOUS_SEARCH_SUSPEND_CNF,
+MSG_ID_TDD_CSCE_CSE_CSG_AUTONOMOUS_SEARCH_CNF,
+MSG_ID_TDD_MEME_CSE_CSG_AUTONOMOUS_SEARCH_INTRA_FREQ_CELL_IND,
+MSG_ID_TDD_CSCE_CSE_EVALUATE_CSG_CELL_CNF,
+MSG_ID_TDD_CSCE_CSE_EVALUATE_CSG_CELL_SUSPEND_CNF,
+#endif
+
+#ifdef __LTE_RAT__
+MSG_ID_TDD_CSCE_CSE_CGI_COLLECTION_CNF,
+MSG_ID_TDD_CSCE_CSE_CGI_COLLECTION_STOP_CNF,
+#endif /* __LTE_RAT__ */
+
+//SIBE
+MSG_ID_TDD_SIBE_SIB_COLLECTION_CNF,
+MSG_ID_TDD_SIBE_SIB_MONITORING_CNF,
+MSG_ID_TDD_SIBE_SIB_MONITORING_ERROR_IND,
+MSG_ID_TDD_CSCE_SIBE_MIB_CHANGE_IND,
+//MEME
+MSG_ID_TDD_CSCE_MEME_CELL_MEASUREMENT_RESULT_IND,
+MSG_ID_TDD_CSCE_MEME_LTE_MEASUREMENT_IND,
+MSG_ID_TDD_CSCE_MEME_CELL_REF_TIME_ANCHOR_IND,
+MSG_ID_TDD_MEME_CSCE_MODIFY_CELL_LIST_IND,
+MSG_ID_TDD_CSCE_MEME_REF_CELL_CHANGE_IND,
+//USIME
+MSG_ID_TDD_CSCE_USIME_USIM_REMOVED_IND,
+MSG_ID_TDD_CSCE_USIME_READ_NVRAM_CNF,
+MSG_ID_TDD_USIME_SIM_FILE_CHANGE_IND,
+
+
+//RATCM
+MSG_ID_TDD_RATCM_CSCE_INIT_REQ,
+MSG_ID_RATCM_CSCE_PLMN_SEARCH_ABORT_REQ,
+MSG_ID_RATCM_CSCE_ARAL_UPDATE_REQ,
+#if !defined(__UMTS_FDD_MODE__)
+MSG_ID_RATCM_CSCE_PLMN_SEARCH_REQ,
+MSG_ID_RATCM_CSCE_DISABLE_RAT_CONFIG_REQ,
+MSG_ID_RATCM_CSCE_PLMN_LIST_REQ,
+MSG_ID_RATCM_CSCE_PLMN_LIST_STOP_REQ,
+MSG_ID_RATCM_CSCE_ADD_FORBIDDEN_LA_REQ,
+MSG_ID_RATCM_CSCE_DEL_FORBIDDEN_LA_REQ,
+MSG_ID_RATCM_CSCE_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_RATCM_CSCE_HPLMN_INFO_UPDATE_REQ,
+MSG_ID_RATCM_CSCE_RRC_DEACTIVATE_REQ,
+MSG_ID_RATCM_CSCE_SET_RAT_MODE_REQ,
+MSG_ID_RATCM_CSCE_RFON_REQ,
+MSG_ID_RATCM_CSCE_RFOFF_REQ,
+MSG_ID_RATCM_CSCE_SET_IMEI_REQ,
+MSG_ID_RATCM_CSCE_ELEVATOR_MODE_REQ,
+MSG_ID_RATCM_CSCE_CALL_STATUS_IND,
+
+/*Sniffer related*/
+MSG_ID_RATCM_UAS_SNIFFER_START_REQ,
+MSG_ID_RATCM_UAS_SNIFFER_STOP_REQ,
+MSG_ID_RATCM_UAS_CHECK_ACTIVE_RAT_REQ,
+MSG_ID_RATCM_UAS_SET_ACTIVE_RAT_REQ,
+
+//CM
+MSG_ID_CMCSCE_EMERGENCY_CALL_STATUS_IND,
+#ifdef __GEMINI__
+MSG_ID_RATCM_CSCE_SIM_STATUS_UPDATE_REQ,
+#endif
+
+#if defined(__3G_CSG_SUPPORT__) || defined(__LTE_RAT__)
+MSG_ID_RATCM_CSCE_CSG_LIST_REQ,
+MSG_ID_RATCM_CSCE_CSG_LIST_STOP_REQ,
+MSG_ID_RATCM_CSCE_UPDATE_WHITE_LIST_REQ,
+#endif
+MSG_ID_RATCM_CSCE_PLMN_LIST_STATUS_UPDATE_REQ,
+
+
+#ifdef __LTE_RAT__
+MSG_ID_RATCM_UAS_RAT_CHANGE_REQ,  //also used by RRCE
+MSG_ID_RATCM_CSCE_EUTRAN_CAP_UPDATE_REQ,
+MSG_ID_RATCM_CSCE_CAP_UPDATE_REQ,
+#endif
+
+MSG_ID_RATCM_CSCE_REGN_STATUS_UPDATE_REQ,
+
+MSG_ID_TDD_CSCE_CODE_END = MSG_ID_RATCM_CSCE_REGN_STATUS_UPDATE_REQ,
+#else
+MSG_ID_TDD_CSCE_CODE_END = MSG_ID_TDD_RATCM_CSCE_INIT_REQ,
+#endif
+MODULE_MSG_END( MSG_ID_TDD_CSCE_CODE_TAIL )
+//MSG_ID_TDD_CSCE_CODE_END,
+
+MODULE_MSG_BEGIN( MSG_ID_TDD_CSE_CODE_BEGIN )
+//MSG_ID_TDD_CSE_CODE_BEGIN,
+//SLCE
+MSG_ID_TDD_CSE_SLCE_FREQ_SCAN_SUSPEND_IND = MSG_ID_TDD_CSE_CODE_BEGIN,
+// MEME
+MSG_ID_TDD_CSE_MEME_CELL_MEASUREMENT_RESULT_IND,
+// CSCE
+MSG_ID_TDD_CSCE_CSE_CELL_SELECTION_START_REQ,
+MSG_ID_TDD_CSCE_CSE_CELL_SELECTION_STOP_REQ,
+MSG_ID_TDD_CSCE_CSE_PLMN_LIST_START_REQ,
+MSG_ID_TDD_CSCE_CSE_PLMN_LIST_SUSPEND_REQ,
+MSG_ID_TDD_CSCE_CSE_RF_OFF_REQ,                             // For auto band
+MSG_ID_TDD_CSCE_CSE_PLMN_LOSS_WITH_LIST_IND,                // For PLMN List optimization
+MSG_ID_TDD_CSE_SLCE_FREQ_SCAN_CNF,
+
+#if 0
+#endif
+#if (defined(__3G_CSG_SUPPORT__) || defined(__LTE_RAT__))
+MSG_ID_TDD_CSCE_CSE_CSG_LIST_START_REQ,
+MSG_ID_TDD_CSCE_CSE_CSG_LIST_SUSPEND_REQ,
+MSG_ID_TDD_CSCE_CSE_CSG_AUTONOMOUS_SEARCH_START_REQ,
+MSG_ID_TDD_CSCE_CSE_CSG_AUTONOMOUS_SEARCH_SUSPEND_REQ,
+MSG_ID_TDD_CSCE_CSE_EVALUATE_CSG_CELL_REQ,
+MSG_ID_TDD_CSCE_CSE_EVALUATE_CSG_CELL_SUSPEND_REQ,
+#endif
+
+#ifdef __LTE_RAT__
+MSG_ID_TDD_CSCE_CSE_CGI_COLLECTION_REQ,
+MSG_ID_TDD_CSCE_CSE_CGI_COLLECTION_STOP_REQ,
+#endif
+
+MSG_ID_TDD_CSE_CACHE_INFO_IND,                              // For showing cache content to Catcher...>#I
+MSG_ID_TDD_CSE_CODE_END = MSG_ID_TDD_CSE_CACHE_INFO_IND,
+MODULE_MSG_END( MSG_ID_TDD_CSE_CODE_TAIL )
+//MSG_ID_TDD_CSE_CODE_END,
+
+MODULE_MSG_BEGIN( MSG_ID_TDD_MEME_CODE_BEGIN )
+//MSG_ID_TDD_MEME_CODE_BEGIN,
+//SLCE
+//UMAC
+MSG_ID_TDD_MEME_UMAC_TRAFFIC_VOLUME_MEASUREMENT_IND = MSG_ID_TDD_MEME_CODE_BEGIN,
+MSG_ID_TDD_MEME_UMAC_QUALITY_MEASUREMENT_IND,
+MSG_ID_TDD_MEME_UMAC_ADDITIONAL_TVM_IND,
+MSG_ID_TDD_MEME_UMAC_MEASUREMENT_ERROR_IND,
+#ifdef __UMTS_R6__
+MSG_ID_TDD_MEME_UMAC_TVM_EXCEED_THRESHOLD_IND,
+#endif
+MSG_ID_TDD_MEME_UMAC_CS_CIPHER_STATUS_IND,
+//RRCE
+MSG_ID_TDD_RRCE_MEME_MOVE_TO_STATE_REQ,
+MSG_ID_TDD_MEME_RRCE_COMPRESSED_MODE_RECONFIGURE_FAILURE_IND,
+MSG_ID_TDD_MEME_RRCE_COMPRESSED_MODE_RECONFIGURE_SUCCESS_IND,
+
+
+//SLCE
+MSG_ID_TDD_MEME_SLCE_SUSPEND_REPORT_IND,
+MSG_ID_TDD_MEME_SLCE_RESUME_REPORT_IND,
+
+//CSCE
+MSG_ID_TDD_CSCE_MEME_INITIALISE_REQ,
+//MSG_ID_MEME_CSCE_CELL_RESELECTION_IND,	
+MSG_ID_TDD_MEME_CSCE_CELL_SELECTED_IND,
+MSG_ID_TDD_CSCE_MEME_MEAS_MANIPULATION_REQ,
+MSG_ID_TDD_CSCE_MEME_LTE_HPS_QUALIFY_CELL_IND,
+MSG_ID_TDD_CSCE_MEME_RF_ON_REQ,
+MSG_ID_TDD_CSCE_MEME_RF_OFF_REQ,
+MSG_ID_TDD_CSCE_MEME_SET_MODE_REQ,
+MSG_ID_TDD_CSCE_MEME_EQ_PLMN_LIST_UPDATE_REQ,
+MSG_ID_TDD_CSCE_MEME_CLEAN_DB_CELL_REQ,
+//SIBE
+MSG_ID_TDD_MEME_SIBE_SIB3_CHANGE_IND,
+MSG_ID_TDD_MEME_SIBE_SIB4_CHANGE_IND,
+MSG_ID_TDD_MEME_SIBE_SIB11_CHANGE_IND, 
+MSG_ID_TDD_MEME_SIBE_SIB12_CHANGE_IND, 
+MSG_ID_TDD_MEME_SIBE_SIB18_CHANGE_IND, 
+//MEME self
+MSG_ID_TDD_MEME_DUMP_CONTEXT,
+MSG_ID_TDD_MEME_UT_SET_CONTEXT,
+MSG_ID_TDD_MEME_UT_SET_SHM,
+MSG_ID_TDD_MEME_CELL_POWER_LEVEL_IND,
+MSG_ID_TDD_MEME_MEME_SAVED_MEAS_CTRL_IND,
+
+MSG_ID_TDD_MEME_CODE_END = MSG_ID_TDD_MEME_MEME_SAVED_MEAS_CTRL_IND,
+//MSG_ID_TDD_MEME_CODE_END,
+MODULE_MSG_END( MSG_ID_TDD_MEME_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_TDD_RRCE_CODE_BEGIN )
+//MSG_ID_TDD_RRCE_CODE_BEGIN,
+//UDC
+MSG_ID_RATCM_RRCE_FORCE_REL_REQ = MSG_ID_TDD_RRCE_CODE_BEGIN,
+//NEW
+#if defined (__NO_PSDATA_SEND_SCRI__) || defined (__FAST_DORMANCY__)
+MSG_ID_RATCM_RRCE_SERVICE_ACCEPT_NOTIFY_REQ,
+#endif /* __NO_PSDATA_SEND_SCRI__ || __FAST_DORMANCY__ */
+
+/* BMC */
+MSG_ID_TDD_RRCE_BMC_RX_IND,
+MSG_ID_TDD_RRCE_BMC_ETWS_IND,
+/* URLC */
+MSG_ID_TDD_RRCE_URLC_STATUS_IND,
+
+//SLCE
+MSG_ID_TDD_RRCE_SLCE_RECONFIG_COMPLETE_IND,
+MSG_ID_TDD_RRCE_SLCE_RECONFIG_ERROR_IND,
+MSG_ID_TDD_RRCE_SLCE_PDCP_RELOC_IND,
+MSG_ID_TDD_RRCE_SLCE_GET_COUNT_C_CNF,
+MSG_ID_TDD_RRCE_SLCE_ABORT_CNF,
+MSG_ID_TDD_RRCE_SLCE_ACTIVATION_TIME_IND,
+
+//SIBE
+MSG_ID_TDD_RRCE_SIBE_CELL_RST_CNF,
+MSG_ID_TDD_RRCE_SIBE_CELL_RST_STOP_CNF,
+//CSCE
+MSG_ID_TDD_CSCE_RRCE_SUITABLE_CELL_SELECTED_REQ,
+MSG_ID_TDD_CSCE_RRCE_ACCEPTABLE_CELL_SELECTED_REQ,
+MSG_ID_TDD_CSCE_RRCE_OUT_OF_SERVICE_AREA_REQ,
+MSG_ID_TDD_CSCE_RRCE_DEACTIVATE_REQ,
+MSG_ID_TDD_CSCE_RRCE_SET_MODE_REQ,
+MSG_ID_TDD_RRCE_CSCE_SIB_COLLECTION_IND,
+MSG_ID_TDD_CSCE_RRCE_PCH_TO_FACH_READY_RSP,
+MSG_ID_TDD_CSCE_RRCE_RELEASE_CHANNELS_REQ,
+//MEME
+//MSG_ID_MEME_RRCE_COMPRESSED_MODE_RECONFIGURE_REQ,  //FDD only
+//UMAC
+MSG_ID_TDD_RRCE_UMAC_STATUS_DATA_PENDING_IND,
+MSG_ID_TDD_RRCE_UMAC_STATUS_RACH_IND,
+#ifdef __HSUPA_SUPPORT__
+MSG_ID_TDD_RRCE_UMAC_RL_FAILURE_IND,
+#endif
+#ifdef __MTK_INTERNAL__
+// RRCE itself
+MSG_ID_TDD_RRCE_RRCE_DEBUG_INFO_IND,
+#endif
+/* ACK */
+MSG_ID_TDD_RRCL_RRC_ACKNOWLEDGEMENT_IND,
+MSG_ID_TDD_RRCE_TIMERID_IND, // Event Scheduler, UT: Oneshot Timer id verification */
+MSG_ID_TDD_RRCE_CODE_END = MSG_ID_TDD_RRCE_TIMERID_IND,
+MODULE_MSG_END( MSG_ID_TDD_RRCE_CODE_TAIL )
+//MSG_ID_TDD_RRCE_CODE_END,
+
+MODULE_MSG_BEGIN( MSG_ID_TDD_SIBE_CODE_BEGIN )
+//MSG_ID_TDD_SIBE_CODE_BEGIN,
+//SLCE
+MSG_ID_TDD_SIBE_SLCE_CONFIGURE_BCH_FAILED_IND = MSG_ID_TDD_SIBE_CODE_BEGIN,
+MSG_ID_TDD_SIBE_SLCE_RECONFIGURE_BCH_CNF,
+// SIBE self
+MSG_ID_TDD_SIBE_SIB_COLLECTION_REQ,
+MSG_ID_TDD_SIBE_SIB_COLLECTION_CANCEL_REQ,
+MSG_ID_TDD_SIBE_START_SIB_MONITORING_REQ,
+MSG_ID_TDD_SIBE_STOP_SIB_MONITORING_REQ,
+MSG_ID_TDD_RRCE_SIBE_CELL_RST_REQ,
+MSG_ID_TDD_RRCE_SIBE_CELL_RST_STOP_REQ,
+#ifdef __UMTS_R9__
+MSG_ID_TDD_RRCE_SIBE_SIB7_EXPIRY_TIMER_IND,
+#endif
+MSG_ID_TDD_CSCE_SIBE_MOVE_TO_IDLE_REQ,
+MSG_ID_TDD_SIBE_DUMP_BCH_SIB_IND,
+MSG_ID_TDD_SIBE_SIB_CHANGE_IND,// remember to Sync FDD,and Put it to SIBE's location(before MSG_ID_SIBE_CODE_END)
+MSG_ID_TDD_SIBE_CODE_END = MSG_ID_TDD_SIBE_DUMP_BCH_SIB_IND,
+//MSG_ID_TDD_SIBE_CODE_END,
+MODULE_MSG_END( MSG_ID_TDD_SIBE_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_TDD_SLCE_CODE_BEGIN )
+//MSG_ID_TDD_SLCE_CODE_BEGIN,
+//RATCM
+
+/* RABM */
+MSG_ID_TDD_CRABM_RAB_ESTABLISH_RSP = MSG_ID_TDD_SLCE_CODE_BEGIN,
+MSG_ID_TDD_CRABM_RAB_RELEASE_RSP,
+/* PDCP */
+MSG_ID_TDD_CPDCP_CONFIG_CNF,
+MSG_ID_TDD_CPDCP_RELOC_CNF,
+MSG_ID_TDD_CPDCP_RELEASE_CNF,
+/* URLC */
+MSG_ID_TDD_CRLC_CONFIG_RAB_CNF,
+MSG_ID_TDD_CRLC_CONFIG_TM_ESTABLISH_CNF,
+MSG_ID_TDD_CRLC_CONFIG_UM_ESTABLISH_CNF,
+MSG_ID_TDD_CRLC_CONFIG_AM_ESTABLISH_CNF,
+MSG_ID_TDD_CRLC_CONFIG_RELEASE_CNF,
+MSG_ID_TDD_CRLC_SUSPEND_CNF,
+MSG_ID_TDD_CRLC_RESUME_CNF,
+MSG_ID_TDD_CRLC_CONFIG_TX_CIPHERING_CNF,
+MSG_ID_TDD_CRLC_CONFIG_RX_CIPHERING_CNF,
+MSG_ID_TDD_CRLC_COUNT_C_CNF,
+
+//CSCE
+MSG_ID_TDD_CSCE_SLCE_INITIALISE_REQ,
+MSG_ID_TDD_CSCE_SLCE_RF_OFF_REQ,
+MSG_ID_TDD_CSCE_SLCE_RF_ON_REQ,
+MSG_ID_TDD_CSCE_SLCE_RSSI_SNIFFER_START_REQ,
+MSG_ID_TDD_CSCE_SLCE_RSSI_SNIFFER_STOP_REQ,
+MSG_ID_TDD_CSCE_SLCE_RSSI_SNIFFER_STOP_IND,
+
+#ifdef __GEMINI__
+MSG_ID_TDD_CSCE_SLCE_RESUME_REQ,
+#endif
+
+//URR
+MSG_ID_TDD_URR_SLCE_SET_ACTIVE_RAT_REQ,
+//RRCE
+MSG_ID_TDD_RRCE_SLCE_ABORT_REQ,
+MSG_ID_TDD_RRCE_SLCE_GET_COUNT_C_REQ,
+MSG_ID_TDD_RRCE_SLCE_RECONFIG_REQ,
+//SIBE
+MSG_ID_TDD_SIBE_SLCE_RECONFIGURE_BCH_REQ,
+MSG_ID_TDD_SIBE_SLCE_SIB7_CHANGE_IND,
+//FDD_CSE
+MSG_ID_TDD_CSE_SLCE_FREQ_SCAN_CONTINUE_REQ,
+MSG_ID_TDD_CSE_SLCE_FREQ_SCAN_REQ,
+MSG_ID_TDD_CSE_SLCE_FREQ_SCAN_SUSPEND_REQ,
+MSG_ID_TDD_CSE_SLCE_SPECIFIC_CELL_SEARCH_REQ,
+MSG_ID_TDD_CSE_SLCE_SPECIFIC_CELL_SEARCH_STOP_REQ,
+//MEME
+MSG_ID_TDD_MEME_SLCE_ADDITIONAL_TVM_REQ,
+MSG_ID_TDD_MEME_SLCE_MEASUREMENT_CONFIG_CELL_REQ,
+MSG_ID_TDD_MEME_SLCE_MEASUREMENT_CONFIG_FMO_REQ,
+MSG_ID_TDD_MEME_SLCE_MEASUREMENT_CONFIG_TGPS_REQ,
+MSG_ID_TDD_MEME_SLCE_MEASUREMENT_CONFIG_GSMGAP_REQ,
+MSG_ID_TDD_MEME_SLCE_RLC_CONTINUE_REQ,
+MSG_ID_TDD_MEME_SLCE_RLC_STOP_REQ,
+MSG_ID_TDD_MEME_SLCE_QUALITY_MEASUREMENT_REQ,
+MSG_ID_TDD_MEME_SLCE_TVM_MEASUREMENT_REQ,
+MSG_ID_TDD_MEME_SLCE_MEASUREMENT_CONFIG_DMO_REQ,
+//SEQ
+MSG_ID_TDD_SEQ_SEQUENCE_REQ,
+MSG_ID_TDD_SEQ_SEQUENCE_CONFIRMED_IND,
+MSG_ID_TDD_SEQ_SEQUENCE_INDICATED_IND,
+MSG_ID_TDD_SEQ_SEQUENCE_ERROR_IND,
+
+//UMAC
+MSG_ID_TDD_CMAC_CONFIG_UE_CNF,
+MSG_ID_TDD_CMAC_CONFIG_UE_IND,
+MSG_ID_TDD_CMAC_CONFIG_TX_CCTRCH_CNF,
+MSG_ID_TDD_CMAC_CONFIG_TX_CCTRCH_IND,
+MSG_ID_TDD_CMAC_REMOVE_TX_CCTRCH_CNF,
+MSG_ID_TDD_CMAC_REMOVE_TX_CCTRCH_IND,
+MSG_ID_TDD_CMAC_CONFIG_RX_CCTRCH_CNF,
+MSG_ID_TDD_CMAC_CONFIG_RX_CCTRCH_IND,
+MSG_ID_TDD_CMAC_REMOVE_RX_CCTRCH_CNF,
+MSG_ID_TDD_CMAC_REMOVE_RX_CCTRCH_IND,
+MSG_ID_TDD_CMAC_CONFIG_HSDSCH_CCTRCH_CNF,
+MSG_ID_TDD_CMAC_CONFIG_HSDSCH_CCTRCH_IND,
+MSG_ID_TDD_CMAC_REMOVE_HSDSCH_CCTRCH_CNF,
+MSG_ID_TDD_CMAC_REMOVE_HSDSCH_CCTRCH_IND,
+#ifdef __HSUPA_SUPPORT__
+MSG_ID_TDD_CMAC_CONFIG_EDCH_CCTRCH_CNF,
+MSG_ID_TDD_CMAC_CONFIG_EDCH_CCTRCH_IND,
+MSG_ID_TDD_CMAC_REMOVE_EDCH_CCTRCH_CNF,
+MSG_ID_TDD_CMAC_REMOVE_EDCH_CCTRCH_IND,
+#endif
+MSG_ID_TDD_CMAC_CONFIG_RACH_CNF,
+MSG_ID_TDD_CMAC_CONFIG_RACH_IND,
+MSG_ID_TDD_CMAC_CONFIG_CPCH_CNF,
+MSG_ID_TDD_CMAC_CONFIG_CIPHERING_CNF,
+MSG_ID_TDD_CMAC_COUNT_C_CNF,
+MSG_ID_TDD_CMAC_DELETE_CIPHERING_CNF,
+MSG_ID_TDD_CMAC_CONFIG_TX_RLC_MODIFY_CNF,
+MSG_ID_TDD_CMAC_CONFIG_TX_RLC_MODIFY_IND,
+MSG_ID_TDD_CMAC_CONFIG_RX_RLC_MODIFY_CNF,
+MSG_ID_TDD_CMAC_CONFIG_RX_RLC_MODIFY_IND,
+MSG_ID_TDD_CMAC_CONFIG_ABORT_CNF,
+MSG_ID_TDD_CMAC_CONFIG_TFC_SUBSET_CNF,
+MSG_ID_TDD_CMAC_CONFIG_TFC_SUBSET_IND,
+
+MSG_ID_TDD_SLCE_CODE_END = MSG_ID_TDD_CMAC_CONFIG_TFC_SUBSET_IND,
+MODULE_MSG_END( MSG_ID_TDD_SLCE_CODE_TAIL )
+//MSG_ID_TDD_SLCE_CODE_END,
+
+MODULE_MSG_BEGIN( MSG_ID_TDD_DBME_CODE_BEGIN )
+//MSG_ID_TDD_DBME_CODE_BEGIN,
+MSG_ID_TDD_DBME_DUMP_IND = MSG_ID_TDD_DBME_CODE_BEGIN,
+MSG_ID_TDD_DBME_DUMP_EXT_QUEUE_IND,
+MSG_ID_TDD_DBME_CODE_END = MSG_ID_TDD_DBME_DUMP_EXT_QUEUE_IND,
+MODULE_MSG_END( MSG_ID_TDD_DBME_CODE_TAIL )
+//MSG_ID_TDD_DBME_CODE_END,
+
+//MSG_ID_TDD_USIME_CODE_BEGIN,
+MODULE_MSG_BEGIN( MSG_ID_TDD_USIME_CODE_BEGIN )
+MSG_ID_TDD_RRCE_USIME_SAVE_REQ = MSG_ID_TDD_USIME_CODE_BEGIN,
+MSG_ID_TDD_CSCE_USIME_READ_NVRAM_REQ,
+MSG_ID_TDD_CSCE_USIME_SET_MODE_REQ,
+MSG_ID_TDD_CSCE_USIME_BAND_SETTING_UPDATE_REQ,
+MSG_ID_TDD_CSCE_USIME_EUTRAN_CAP_UPDATE_REQ,
+MSG_ID_TDD_USIME_DUMP_UE_CAPABILITY,
+MSG_ID_TDD_USIM_REGISTER_CNF,
+MSG_ID_TDD_USIME_CODE_END = MSG_ID_TDD_USIM_REGISTER_CNF,
+MODULE_MSG_END( MSG_ID_TDD_USIME_CODE_TAIL )
+//MSG_ID_TDD_USIME_CODE_END,
+
+//MSG_ID_TDD_URR_CODE_BEGIN,
+MODULE_MSG_BEGIN( MSG_ID_TDD_URR_CODE_BEGIN )
+MSG_ID_TDD_URR_NON_USED_MESSAGE_BEGIN = MSG_ID_TDD_URR_CODE_BEGIN,
+
+#ifdef __GEMINI__
+MSG_ID_TDD_URR_RRCE_SERVICE_RES_OCCUPY_IND,
+MSG_ID_TDD_URR_CSCE_SWITCH_GEMINI_MODE_REQ,
+
+/* ifdef __GEMINI__ */
+MSG_ID_TDD_URR_RRCE_SWITCH_GEMINI_MODE_REQ,
+MSG_ID_TDD_URR_CSE_SWITCH_GEMINI_MODE_REQ,
+MSG_ID_TDD_URR_MEME_SWITCH_GEMINI_MODE_REQ,
+MSG_ID_TDD_URR_SIBE_SWITCH_GEMINI_MODE_REQ,
+MSG_ID_TDD_URR_CSCE_VIRTUAL_SUSPEND_SERVICE_COMPLETE_IND,
+#if 0 /* move to ul1_sap.h */
+/* under construction !*/
+#endif
+/* endif __GEMINI__ */
+#endif /* __GEMINI__ */
+
+/* DRLC */
+MSG_ID_TDD_URR_DRLC_SRB_SDU_STOP_IND,
+
+/*LURR*/
+MSG_ID_TDD_URR_LURR_SYNC_UP_REQ,
+MSG_ID_TDD_URR_LURR_SYNC_UP_CNF,
+MSG_ID_TDD_URR_LURR_SYNC_DOWN_REQ,
+MSG_ID_TDD_URR_LURR_DUMP_SYNC_DATA,
+
+/* LCSCE */
+MSG_ID_TDD_LCSCE_CSCE_RESEL_IND,
+MSG_ID_TDD_LCSCE_CSCE_BAR_CELL_IND,
+MSG_ID_TDD_LCSCE_CSCE_TRIGGER_4G_CSG_SEARCH_IND,
+MSG_ID_TDD_LCSCE_CSCE_TRIGGER_4G_CSG_EVALUATION_IND,
+MSG_ID_TDD_LCSCE_CSCE_TRIGGER_3G_CSG_SEARCH_IND,
+#ifdef __CMCC_23G_PINGPONG_RESTRAIN__
+MSG_ID_TDD_LCSCE_CSCE_GAS_UAS_VIRTUAL_CELL_RESEL_IND,
+#endif /* __CMCC_23G_PINGPONG_RESTRAIN__ */
+#ifdef UNIT_TEST
+MSG_ID_TDD_LCSCE_CSCE_UT_SIMULATE_CONTEXT_TRANSFER,
+#endif /* UNIT_TEST */
+MSG_ID_TDD_URR_DUMP_CONTEXT,
+
+/*LRRCE*/
+MSG_ID_TDD_RRCE_LRRCE_PAGING_TYPE1_IND,
+
+
+MSG_ID_TDD_URR_NON_USED_MESSAGE_END,
+MSG_ID_TDD_URR_CODE_END = MSG_ID_TDD_URR_NON_USED_MESSAGE_END,
+MODULE_MSG_END( MSG_ID_TDD_URR_CODE_TAIL )
+//MSG_ID_TDD_URR_CODE_END,
+
+#endif /* __UMTS_TDD128_MODE__ */
+
+
+#ifdef __SOURCE_INSIGHT_PARSE__
+};
+#endif
+
+#endif  //_URR_MSG_H
diff --git a/mcu/interface/sap/md/utt_msgid.h b/mcu/interface/sap/md/utt_msgid.h
new file mode 100644
index 0000000..616c00e
--- /dev/null
+++ b/mcu/interface/sap/md/utt_msgid.h
@@ -0,0 +1,160 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   utt_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   GTEST Testing Task signal IDs
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 03 04 2015 mingtsung.sun
+ * [MOLY00097603] [MT6291][UMOLY] Universal Testing Task Framework
+ * UTT RD Change 1
+ *
+ * 11 11 2014 yiting.cheng
+ * [MOLY00084042] [UMOLY] merge UMOLY_DEV to UMOLY trunk
+ * .
+ *
+ * 10 27 2014 sh.yang
+ * [MOLY00082211] [MT6291_DEV] EMBMS check-in
+ * .
+ *
+ * 08 25 2014 mingtsung.sun
+ * [MOLY00075987] [TK6291][DEV] L2CE C-Model and LTT/EPDCP UT
+ * add LTT_EPDCP_SW_POLLING_IND
+ *
+ * 08 22 2014 jy.ou
+ * [MOLY00076104] [TK6291] EMAC & ERLC UT framework and ERLC UT cases
+ * .
+ *
+ * 07 25 2014 christopher.pim
+ * [MOLY00072902] [TK6291][DEV] LTT unit test framework
+ * Integrate LTT files on 6291 DEV branch
+ *
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _UTT_MSGID_H
+#define _UTT_MSGID_H
+
+
+MODULE_MSG_BEGIN( MSG_ID_UTT_CODE_BEGIN )	
+	
+	/*------------------- MSG_ID_LTT_CODE_BEGIN---------------------*/
+
+	//////////////////////////////////////////////
+	// Destination: LTT (from MOD_NILL)         //
+	//////////////////////////////////////////////
+
+	// NIL --> UTT
+	MSG_ID_UTT_DUMMY_IND = MSG_ID_UTT_CODE_BEGIN,
+
+	//////////////////////////////////////////////
+	// Configuring module data                  //
+	//////////////////////////////////////////////
+      MSG_ID_UTT_MODULE_CONFIG_REQ,
+      MSG_ID_UTT_MODULE_CONFIG_CNF,
+      
+#if 0      
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+/* under construction !*/
+#endif
+
+      MSG_ID_UTT_GTEST_CTRL_REQ,
+      MSG_ID_UTT_GTEST_CTRL_CNF,
+
+
+
+	/*------------------- LTT_MSG_CODE_END-----------------------*/
+
+MODULE_MSG_END( MSG_ID_UTT_CODE_TAIL )
+
+#endif /* _UTT_MSGID_H */
diff --git a/mcu/interface/sap/md/val_msgid.h b/mcu/interface/sap/md/val_msgid.h
new file mode 100644
index 0000000..75a4149
--- /dev/null
+++ b/mcu/interface/sap/md/val_msgid.h
@@ -0,0 +1,1222 @@
+/*****************************************************************************
+*  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) 2016
+*
+*  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).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+*
+* FILE NAME   :val_msgid.h
+*
+* DESCRIPTION :
+*
+*
+*
+* HISTORY     :
+*     See Log at end of file
+*
+*****************************************************************************/
+/*----------------------------------------------------------------------------
+ Include Files
+----------------------------------------------------------------------------*/
+#ifndef _VAL_MSG_ID_H
+#define _VAL_MSG_ID_H
+
+
+#include "module_msg_range.h"
+
+
+MODULE_MSG_BEGIN( MSG_ID_CVAL_CODE_BEGIN )
+
+    /*-----------------------------------------------------------------
+    * AIWHandler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_FLUSH_FINAL_MSG = MSG_ID_CVAL_CODE_BEGIN + 0, /* base 0x8248  */
+    MSG_ID_VAL_NWK_RPT_DATA_SVC_STATUS_WORD_MSG,
+
+    /*-----------------------------------------------------------------
+    * HLWHandler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_TCPB_DATA_RECV_MSG,
+    MSG_ID_VAL_TCPB_DATA_SEND_RSP_MSG,
+
+    MSG_ID_VAL_UPB_RECV_DATA_MSG,
+    MSG_ID_VAL_UPB_SENT_DATA_RSP_MSG,
+
+    MSG_ID_VAL_HLP_PPP_CONN_STATUS_MSG,
+    MSG_ID_VAL_HLP_SOCKET_CREATE_STATUS_MSG,
+    MSG_ID_VAL_HLP_SOCKET_BIND_STATUS_MSG,
+    MSG_ID_VAL_HLP_SOCKET_CONN_STATUS_MSG,
+    MSG_ID_VAL_HLP_SOCKET_CLOSE_STATUS_MSG,
+    MSG_ID_VAL_HLP_SOCKET_LISTEN_STATUS_MSG,
+    MSG_ID_VAL_HLP_SOCKET_OPT_STATUS_MSG,
+    MSG_ID_VAL_HLP_SOCKET_SHUT_STATUS_MSG,
+    MSG_ID_VAL_HLP_SOCKET_LINGER_STATUS_MSG,
+
+    MSG_ID_VAL_IP_DATA_SEND_CNF_MSG,
+    MSG_ID_VAL_IP_DATA_RECV_IND_MSG,
+    MSG_ID_VAL_NET_PING_EXPIRY_MSG,
+    MSG_ID_VAL_HLP_PCMT_PARA_RSP_MSG,
+    MSG_ID_VAL_HLP_MTU_URC_MSG,
+
+    MSG_ID_VAL_HLP_IP_DNS_ADDR_GET_MSG,
+    MSG_ID_VAL_RPT_DATA_PREARRANGE_MSG,
+
+    /*HLP -> VAL PSDM */
+	MSG_ID_VAL_HLP_PPP_CONNECT_CNF,
+	MSG_ID_VAL_HLP_PPP_DISCONNECT_CNF,
+	MSG_ID_VAL_HLP_PPP_DISCONNECT_IND,
+	MSG_ID_VAL_HLP_PPP_MODIFY_IND,
+
+	MSG_ID_VAL_HLP_EHRPD_BEARER_CONNECT_CNF,
+	MSG_ID_VAL_HLP_EHRPD_BEARER_DISCONNECT_CNF,
+	MSG_ID_VAL_HLP_EHRPD_BEARER_DISCONNECT_IND,
+	MSG_ID_VAL_HLP_EHRPD_BEARER_MODIFY_IND,
+
+	MSG_ID_VAL_HLP_NETWORK_REL_RSP,
+
+    /*-----------------------------------------------------------------
+    * OTASPHandler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_IOTA_683_RSP_MSG,
+    MSG_ID_VAL_IOTA_PRL_RSP_MSG,
+    MSG_ID_VAL_OTASP_CONN_IND_MSG,
+    MSG_ID_VAL_OTASP_DISCONN_IND_MSG,
+    MSG_ID_VAL_OTASP_IND_MSG,      /* ??? nobody is sending this message */
+    MSG_ID_VAL_OTASP_PREMATURE_TERM_IND_MSG,
+    MSG_ID_VAL_OTASP_RX_IND_MSG,
+    MSG_ID_VAL_OTASP_START_IND_MSG,
+    MSG_ID_VAL_OTASP_STOP_IND_MSG,
+    MSG_ID_VAL_OTASP_SYSTEM_ERROR_IND_MSG,
+    MSG_ID_VAL_OTASP_TX_RSP_MSG,
+
+    /*-----------------------------------------------------------------
+    * 1xCSFB Handler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_CSFB_GCSNA_UL_MSG,
+    MSG_ID_VAL_CSFB_REGISTER_FAIL_MSG,
+    MSG_ID_VAL_CSFB_MEASURE_RSP_MSG,
+    MSG_ID_VAL_CSFB_HO_PREP_XFER_MSG,
+    MSG_ID_VAL_CSFB_EVENT_MSG,
+    MSG_ID_VAL_CSFB_TST_SET_BUFFER_MSG,
+    MSG_ID_VAL_CSFB_TST_PARM_RSP_MSG,
+    MSG_ID_VAL_CSFB_TST_SIB8_MSG,
+    MSG_ID_VAL_CSFB_TST_GCSNA_DL_MSG,
+    MSG_ID_VAL_CSFB_TST_MEAS_REQ_MSG,
+    MSG_ID_VAL_CSFB_TST_HO_EUTRA_PREP_MSG,
+    MSG_ID_VAL_CSFB_TST_MOB_FROM_EUTRA_MSG,
+
+    /*-----------------------------------------------------------------
+    * LocHandler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_LOC_RESP_MSG,
+    MSG_ID_VAL_LOC_ERROR_MSG,
+    MSG_ID_VAL_LOC_PILOT_PHASE_MEAS_MSG,
+    MSG_ID_VAL_LOC_PSEUDO_RANGE_MSG,
+    MSG_ID_VAL_LOC_GET_SECTOR_INFO_RSP_MSG,
+    MSG_ID_VAL_LOC_DONE_MSG,
+    MSG_ID_VAL_LOC_TCP_CONN_REQ_MSG,
+    MSG_ID_VAL_LOC_TCP_CLOSE_REQ_MSG,
+    MSG_ID_VAL_GPS_NET_EVT_MSG,
+    MSG_ID_VAL_GPS_TCPB_SEND_DATA_MSG,
+    MSG_ID_VAL_GPS_ALM_EPH_UPDATE_MSG,
+    MSG_ID_VAL_SEC_AESCRYPT_RSP_MSG,
+    MSG_ID_VAL_RESET_RSP_MSG,
+    MSG_ID_VAL_LOC_PPP_RECONN_REQ_MSG,
+    MSG_ID_VAL_LOC_ACTIVE_IND_MSG,
+
+    MSG_ID_VAL_GPS_WRITE_OFFSET_INFO_ETS,
+    MSG_ID_VAL_GPS_READ_OFFSET_INFO_ETS,
+
+    MSG_ID_VAL_GPS_FIX_MODE_GET_RSP_MSG,
+
+    MSG_ID_VAL_GPS_FACTORY_RF_CNO_MSG,
+
+    MSG_ID_VAL_GPS_CT_MPC_IP_CFG_MSG,
+
+    MSG_ID_VAL_LOC_PPP_DELAY_REQ_MSG,
+    MSG_ID_VAL_GPS_CT_MPC_USERNME_PSWRD_CFG_MSG,
+
+    MSG_ID_VAL_GPS_READY_MSG,
+    MSG_ID_VAL_LOC_MPC_CONN_REQ_MSG,
+
+    MSG_ID_VAL_MPC_TIME_CALLBACK_MSG,
+    MSG_ID_VAL_MPC_GPS_CALLBACK_MSG,
+    MSG_ID_VAL_MPC_GPS_NET_EVT_MSG,
+    MSG_ID_VAL_MPC_CLOSE_CONN_MSG,
+    MSG_ID_VAL_LOC_STATE_GET_MSG,
+    MSG_ID_VAL_GPS_AFLT_DATA_MSG,
+
+
+    MSG_ID_VAL_TLS_CONN_RSP,
+    MSG_ID_VAL_TLS_SEND_RSP,
+    MSG_ID_VAL_TLS_RX_IND,
+    MSG_ID_VAL_TLS_CLOSE_RSP,
+    /*-----------------------------------------------------------------
+    * PSWAmpsHandler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_DTMF_TONE_GEN_MSG,
+    MSG_ID_VAL_AMPS_EXT_PROTO_MSG,
+
+    /*-----------------------------------------------------------------
+    * DbmHandler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_DBM_GET_EHRPD_MODE_RSP_MSG,
+    /*-----------------------------------------------------------------
+    * PSWHandler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_ACCESS_MAX_CAPSULE_SIZE_MSG,
+    MSG_ID_VAL_BS_CO_ORD_MSG,
+    MSG_ID_VAL_NAM_MSG,
+    MSG_ID_VAL_NAM_RPT_ACTIVE_NAM_MSG,
+    MSG_ID_VAL_ACTIVE_NAM_RSP_MSG,
+    MSG_ID_VAL_CHANGE_AKEY_MSG,
+    MSG_ID_VAL_GET_AKEY_CHECKSUM_RSP_MSG,
+    MSG_ID_VAL_AKEY_CHANGE_RSP_MSG,
+    MSG_ID_VAL_NWK_RETRIEVE_CHANNEL_MSG,
+    MSG_ID_VAL_SET_MIP_PASSWORD_RSP_MSG,
+    MSG_ID_VAL_ADC_MEAS_RESPONSE_MSG,
+
+    MSG_ID_VAL_NWK_RPT_ALERT_MSG,
+    MSG_ID_VAL_NWK_RPT_ALERT_MORE_INFO_REC_MSG,
+    MSG_ID_VAL_NWK_RPT_BURST_DTMF_MSG,
+    MSG_ID_VAL_NWK_RPT_CP_EVENT_MSG,/* 111 */
+    MSG_ID_VAL_NWK_RPT_CP_RESPONSE_MSG,
+    MSG_ID_VAL_NWK_RPT_CP_STATUS_MSG,
+    MSG_ID_VAL_NWK_RPT_DATA_BURST_MSG,
+    MSG_ID_VAL_NWK_RPT_FEAT_NOTIF_MORE_INFO_REC_MSG,
+    MSG_ID_VAL_NWK_RPT_FEATURE_NOTIFICATION_MSG,
+    MSG_ID_VAL_NWK_RPT_FLASH_MORE_INFO_REC_MSG,
+    MSG_ID_VAL_NWK_RPT_FLASH_MSG,
+    MSG_ID_VAL_NWK_RPT_HANDOFF_MSG,
+    MSG_ID_VAL_NWK_RPT_LOCK_MSG,
+    MSG_ID_VAL_NWK_RPT_MAINTENANCE_REQUIRED_MSG,
+    MSG_ID_VAL_NWK_RPT_ORDER_MSG,
+    MSG_ID_VAL_NWK_RPT_REGISTRATION_ACCEPT_MSG,
+    MSG_ID_VAL_NWK_RPT_REGISTRATION_REJECT_MSG,
+    MSG_ID_VAL_NWK_RPT_SERVICE_CONFIG_MSG,
+    MSG_ID_VAL_NWK_RPT_SERVICE_READY_MSG,
+    MSG_ID_VAL_NWK_RPT_SERVICE_NEGOTIATION_MODE_MSG,
+    MSG_ID_VAL_NWK_RPT_START_CONTINUOUS_DTMF_MSG,
+    MSG_ID_VAL_NWK_RPT_STOP_CONTINUOUS_DTMF_MSG,
+    MSG_ID_VAL_NWK_RPT_SYSTEM_TIME_MSG,
+    MSG_ID_VAL_NWK_RPT_UNLOCK_MSG,
+    MSG_ID_VAL_NWK_RPT_PKT_STATE_MSG,
+    MSG_ID_VAL_NWK_RPT_PKT_DORM_TMR_MSG,
+    MSG_ID_VAL_NWK_RPT_PREV_PREVINUSE_MSG,
+
+    MSG_ID_VAL_PRL_INFO_MSG,
+    MSG_ID_VAL_PSW_E911_MODE_MSG,
+    MSG_ID_VAL_ROAM_INDICATION_MSG,
+    MSG_ID_VAL_RPT_CQA_MSG,
+    MSG_ID_VAL_ORIG_FINISHED_MSG,
+    MSG_ID_VAL_SET_DEFAULT_SO_MSG,
+
+    MSG_ID_VAL_SET_PSW_PARM_RSP_MSG,
+    MSG_ID_VAL_GET_PSW_PARM_RSP_MSG,
+    MSG_ID_VAL_PLL_CHANNEL_CONFIG_RSP_MSG,
+    MSG_ID_VAL_LOCK_FEATURE_CHECK_ERR_MSG,
+    MSG_ID_VAL_NWK_RPT_MCC_MNC_MSG,
+
+    MSG_ID_VAL_PSW_CP_PWR_MSG_CTRL, /* 146 */
+    MSG_ID_VAL_CSS_MARK_CURRENT_1X_SYSTEM_AS_NEGATIVE_MSG,
+
+    MSG_ID_VAL_AT_SET_PSW_PARM_RSP_MSG,
+    MSG_ID_VAL_AT_GET_PSW_PARM_RSP_MSG,
+    MSG_ID_VAL_AT_HLP_PARM_SET_RSP_MSG,
+    MSG_ID_VAL_AT_SET_MOBILE_ID_RSP_MSG,
+    MSG_ID_VAL_RLP_RPT_STAT_MSG,
+    MSG_ID_VAL_ALL_DATA_INIT_MSG,
+    MSG_ID_VAL_SET_UI_PARM_RSP_MSG,
+    MSG_ID_VAL_GET_ALERT_STATUS_MSG,
+    MSG_ID_VAL_PSW_CP_PWR_CYCLE,
+    MSG_ID_VAL_CLC_CELL_INFO_MSG,
+    MSG_ID_VAL_AT_SET_CSS_PARM_RSP_MSG,
+    MSG_ID_VAL_AT_GET_CSS_PARM_RSP_MSG,
+    //MSG_ID_VAL_CSS_CP_PWR_CTRL_MSG,/* 160 */
+    MSG_ID_VAL_CSS_POWER_DOWN_DONE_MSG,
+    MSG_ID_VAL_CSS_PRL_READ_FINISHED_MSG,
+    MSG_ID_VAL_NWK_EXISTENCE_INFO_MSG,
+    MSG_ID_VAL_CSS_PRL_IND_MSG,
+    MSG_ID_VAL_AT_VERIFY_SPC_RSP_MSG,
+    MSG_ID_VAL_AT_GET_DO_PARM_RSP_MSG,
+    MSG_ID_VAL_PSW_RPT_SERVICE_OPTION_MSG,
+
+#ifdef MTK_DEV_C2K_IRAT
+    MSG_ID_VAL_CSS_CS_REG_STATUS_NOTIFY_IND_MSG,
+#endif
+
+#ifdef MTK_CBP_ENCRYPT_VOICE
+    MSG_ID_VAL_PSW_ENCRYPT_VOICE_RSP_MSG,
+#endif
+
+    /*-----------------------------------------------------------------
+    * SMSHandler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_SMS_BCAST_ERROR_MSG,
+    MSG_ID_VAL_SMS_BCAST_IND_PARMS_MSG,
+    MSG_ID_VAL_SMS_CAUSE_CODE_STATUS_MSG,
+    MSG_ID_VAL_SMS_DELIVER_IND_DATA_MSG,
+    MSG_ID_VAL_SMS_DELIVER_IND_PARMS_MSG,
+    MSG_ID_VAL_SMS_ERROR_MSG,
+    MSG_ID_VAL_SMS_RX_IND_MSG,
+    MSG_ID_VAL_SMS_TX_RSP_MSG,
+    MSG_ID_VAL_SMS_CAUSE_CODE_MSG,
+    MSG_ID_VAL_SMS_ACK_L2_ACKED_MSG,
+
+    MSG_ID_VAL_SMS_TST_CONNECT_MSG,
+    MSG_ID_VAL_SMS_TST_BCAST_CONNECT_MSG,
+    MSG_ID_VAL_SMS_TST_BCAST_DISCONNECT_MSG,
+    MSG_ID_VAL_SMS_TST_BCAST_PREF_MSG,
+    MSG_ID_VAL_SMS_TST_CANCEL_MSG,
+    MSG_ID_VAL_SMS_TST_CAUSE_CODE_STATUS_MSG,
+    MSG_ID_VAL_SMS_TST_DISCONNECT_MSG,
+    MSG_ID_VAL_SMS_TST_PREF_SRV_OPT_MSG,
+    MSG_ID_VAL_SMS_TST_SUBMIT_MSG,
+    MSG_ID_VAL_SMS_TST_TERM_STATUS_MSG,
+    MSG_ID_VAL_SMS_TST_USER_ACK_MSG,
+    MSG_ID_VAL_SMS_TST_RETX_AMOUNT_MSG,
+    MSG_ID_VAL_SMS_TST_CAUSE_CODE_MSG,
+    MSG_ID_VAL_SMS_GET_COUNT_MSG,
+    MSG_ID_VAL_SMS_GET_FIRST_MSG,
+    MSG_ID_VAL_SMS_GET_NEXT_MSG,
+    MSG_ID_VAL_SMS_WRITE_MSG,
+    MSG_ID_VAL_SMS_DEL_ALL_MSG,
+    MSG_ID_VAL_SMS_DEL_MSG,
+    MSG_ID_VAL_SMS_SEND_MSG,
+    MSG_ID_VAL_SMS_SEND_INDEX_MSG,
+    MSG_ID_VAL_SMS_SET_STATUS_MSG,
+    MSG_ID_VAL_SMS_UNKNOWN_ERROR_MSG,
+    MSG_ID_VAL_SMS_UNKNOWN_IND_PARMS_MSG,
+#ifdef __TC10_IPC_CDMA_SUPPORT__
+	MSG_ID_VAL_SMS_POWER_STATUS_MSG,
+#endif
+    /*-----------------------------------------------------------------
+    * HLP Power down Handler
+    *-----------------------------------------------------------------*/
+    MSG_ID_VAL_HLP_POWER_DOWN_DONE_MSG, /* 201 */
+
+    /*-----------------------------------------------------------------
+    * EVDO stack Handler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_HRPD_SESSION_STATUS_MSG,
+    MSG_ID_VAL_HRPD_NTWK_ACQD_MSG,
+    MSG_ID_VAL_HRPD_CONN_STATUS_MSG,
+    MSG_ID_VAL_HRPD_STAT_PEEK_RSP_MSG,
+    MSG_ID_VAL_CLC_POWER_EV_MSG,/* 206 */
+    MSG_ID_VAL_CLC_AT_STATUS_MSG,
+    MSG_ID_VAL_CLC_NBR_FREQS_RPT_MSG,
+    MSG_ID_VAL_CLC_DO_PARA_CHANGE_IND,
+    MSG_ID_VAL_HRPD_CHAN_CHANGE_IND,
+
+    MSG_ID_VAL_HRPD_A12_STATUS_MSG,
+    /*-----------------------------------------------------------------
+    * HWD Handler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_HWD_BATTERY_READ_DATA_MSG,
+    MSG_ID_VAL_HWD_TEMPERATURE_READ_DATA_MSG,
+    MSG_ID_VAL_HWD_RX_TX_POWER_INFO_DATA_MSG,
+    MSG_ID_VAL_PSW_PILOT_PWR_RPT_MSG,
+    MSG_ID_VAL_DO_RX_TX_POWER_INFO_DATA_MSG,
+    MSG_ID_VAL_CL1TST_RX_TX_POWER_DETECTOR_MSG,
+    MSG_ID_VAL_CL1TST_GET_ANT_INFO_CFG_MSG,
+    MSG_ID_VAL_CL1TST_GET_ANT_INFO_IND_MSG,
+#ifdef __RF_SCAN_FOR_DESENSE_TEST__
+    MSG_ID_VAL_CL1TST_RX_SCAN_RSP_MSG,
+#endif
+
+    MSG_ID_RMC_VAL_DO_RX_TX_TIME_INFO_DATA_REQ_MSG,
+    MSG_ID_VAL_RMC_DO_RX_TX_TIME_INFO_DATA_RSP_MSG,
+    MSG_ID_VAL_L1D_RX_TX_TIME_INFO_DATA_REQ_MSG,
+    MSG_ID_VAL_L1D_RX_TX_TIME_INFO_DATA_RSP_MSG,
+
+    /*-----------------------------------------------------------------
+    * USERINFO Handler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_EMERGENCY_MODE_TEST_MSG,
+    MSG_ID_VAL_GET_RSSI_ACK_MSG,
+    MSG_ID_VAL_L1D_RSSI_RPT_MSG,
+    MSG_ID_VAL_HRPD_RSSI_RPT_MSG,
+    MSG_ID_VAL_L1D_TAS_RPT_MSG,
+
+    /*-----------------------------------------------------------------
+    * Datacard Sw Support API Handler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_DATACARD_GET_NETWORK_INFO_MSG,
+    MSG_ID_VAL_DATACARD_OTA_ACTIVATE_MSG,
+    MSG_ID_VAL_DATACARD_SET_DEV_PARAM_ETS,
+    MSG_ID_VAL_DATACARD_GET_DEV_PARAM_ETS,
+    MSG_ID_VAL_DATACARD_GET_CONN_INFO_MSG,
+    MSG_ID_VAL_DATACARD_GET_NTWK_ERR_STR_MSG,
+
+    MSG_ID_VAL_HSPD_HLP_PARM_SET_ETS,        /* Individual HL HSPD param - menu choice */
+    MSG_ID_VAL_HSPD_HLP_PARM_GET_ETS,
+    MSG_ID_VAL_SET_PSW_PARM_MSG,
+    MSG_ID_VAL_GET_PSW_PARM_MSG,
+    MSG_ID_VAL_UI_PARM_SET_MSG,
+    MSG_ID_VAL_UI_PARM_GET_MSG,
+    MSG_ID_VAL_PSW_MDN_UPDATED_MSG,
+    MSG_ID_VAL_PSW_ESN_UPDATED_MSG,
+    MSG_ID_VAL_SET_UI_LOCK_CODE_RSP_MSG,
+    MSG_ID_VAL_SLEEPOVER_INDICATOR_MSG,
+    MSG_ID_VAL_UICC_PARM_SET_MSG,
+    MSG_ID_VAL_UICC_PARM_GET_MSG,
+    MSG_ID_VAL_SET_UICC_PARM_RSP_MSG,
+    MSG_ID_VAL_GET_UICC_PARM_RSP_MSG,
+    MSG_ID_VAL_GET_TRANSMIT_INFO_RSP_MSG,
+    MSG_ID_VAL_SET_SYS_PARM_MSG,
+    MSG_ID_VAL_GET_SYS_PARM_MSG,
+    MSG_ID_VAL_AUTO_POWER_UP_SET_MSG,
+    MSG_ID_VAL_AUTO_POWER_UP_GET_MSG,
+    MSG_ID_VAL_SET_CSS_PARM_MSG,
+    MSG_ID_VAL_GET_CSS_PARM_MSG,
+    MSG_ID_VAL_SET_CSS_PARM_RSP_MSG,
+    MSG_ID_VAL_GET_CSS_PARM_RSP_MSG,
+    MSG_ID_VAL_HLP_HSPD_SEG_INIT_RSP_MSG,
+    MSG_ID_VAL_HLP_HSPD_SEG_PROFILE_INIT_RSP_MSG,
+
+    /* Other EVDO Params */
+    MSG_ID_VAL_DO_PARM_SET_ETS,
+    MSG_ID_VAL_DO_PARM_GET_ETS,
+    /*CUSTOMIZED flags*/
+    MSG_ID_VAL_SET_AUTOREG_INFO_MSG,
+    MSG_ID_VAL_CP_AUTOREG_SET_ETS,
+    MSG_ID_VAL_CP_AUTOREG_GET_ETS,
+    MSG_ID_VAL_CP_DB_WRITE_ACK_MSG,
+    MSG_ID_VAL_CP_DB_READ_ACK_MSG,
+    MSG_ID_VAL_CP_SMS_AUTOREG_MSG,
+    /* VAL_CP_SMS_NWINIT_REG_MSG  */
+    MSG_ID_VAL_CP_SMSREG_TIMER_EXPIRE_MSG,
+    MSG_ID_VAL_CP_SMSREG_TRIGGER_REQ_MSG,
+    MSG_ID_VAL_GPS_OPEN_DEVICE_HW_INIT_ETS,
+    MSG_ID_VAL_GPS_CLOSE_DEVICE_ETS,
+    MSG_ID_VAL_GPS_POSITION_GET_ETS,
+    MSG_ID_VAL_GPS_START_FIX_ETS,
+    MSG_ID_VAL_GPS_QUERY_FIX_ETS,
+    MSG_ID_VAL_GPS_STOP_FIX_ETS,
+    MSG_ID_VAL_GPS_CONFIG_FIX_MODE_SET_ETS,
+    MSG_ID_VAL_GPS_CONFIG_FIX_RATE_SET_ETS,
+    MSG_ID_VAL_GPS_CONFIG_QOS_SET_ETS,
+    MSG_ID_VAL_GPS_WRITE_SERVER_CONFIG_ETS,
+    MSG_ID_VAL_GPS_ENABLE_SECURITY_ETS,
+
+    MSG_ID_VAL_GPS_WRITE_SECURITY_CONFIG_ETS,
+    MSG_ID_VAL_GPS_READ_SECURITY_CONFIG_ETS,
+    MSG_ID_VAL_GPS_READ_ENCRYPT_CONFIG_ETS,
+    MSG_ID_VAL_GPS_LBS_PRIVACY_SETTING_GET_ETS,
+    MSG_ID_VAL_GPS_LBS_PRIVACY_SETTING_SET_ETS,
+    MSG_ID_VAL_GPS_BASESSD_GET_ETS,
+    MSG_ID_VAL_GPS_RAND_PERIOD_SET_ETS,
+    MSG_ID_VAL_GPS_RESET_ASSIST_ETS,
+
+    MSG_ID_VAL_LOC_TCP_CONN_ETS,
+    MSG_ID_VAL_LOC_TCP_CLOSE_ETS,
+
+    MSG_ID_VAL_NMEA_CFG_SET_ETS,
+    MSG_ID_VAL_NMEA_CFG_GET_ETS,
+    MSG_ID_VAL_GPS_RESTART_FIX_ETS,
+
+    MSG_ID_VAL_GPS_SEC_SET_ETS,
+    MSG_ID_VAL_GPS_CONFIG_TECH_ETS,
+
+    MSG_ID_VAL_GPS_DBM_READ_RSP_MSG,
+    MSG_ID_VAL_GPS_BASESSD_SET_MSG,
+
+    MSG_ID_VAL_GPS_GET_FIX_MODE_MSG,
+    MSG_ID_VAL_GPS_START_MODE_SET_MSG,
+    MSG_ID_VAL_GPS_SESSION_OPEN_MSG,
+
+    MSG_ID_VAL_GPS_READ_SECURITY_CONFIG_W_STATUS_ETS,
+    MSG_ID_VAL_GPS_READ_ENCRYPT_CONFIG_W_STATUS_ETS,
+    MSG_ID_VAL_GPS_NMEA_OUTPUT_SETTING_ETS,
+    MSG_ID_VAL_GPS_CONFIG_FIX_RATE_GET_ETS,
+    MSG_ID_VAL_GPS_SESSION_CANCEL_MSG,
+    MSG_ID_VAL_GPS_PROCESS_RX_MSG,
+    MSG_ID_VAL_GPS_READ_SERVER_CONFIG_ETS,
+    MSG_ID_VAL_GPS_PPM_RSP_MSG,
+    MSG_ID_VAL_GPS_SUPL_CELL_INFO_GET_MSG,
+
+    /* VALAPI_GPS response messages */
+    MSG_ID_VAL_GPS_OPEN_DEVICE_HW_INIT_CONF_MSG,
+    MSG_ID_VAL_GPS_START_MODE_SET_CONF_MSG,
+    MSG_ID_VAL_GPS_SECURITY_SET_CONF_MSG,
+    MSG_ID_VAL_GPS_BASE_SSD_SET_CONF_MSG,
+    MSG_ID_VAL_GPS_WRITE_SERVER_CONFIG_CONF_MSG,
+    MSG_ID_VAL_GPS_GET_FIX_MODE_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_OPEN_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_ENABLE_SECURITY_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_RANDOM_PERIOD_SET_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_CONFIGURE_FIX_MODE_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_CONFIGURE_FIX_RATE_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_CONFIGURE_QOS_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_START_FIX_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_GET_POSITION_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_STOP_FIX_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_READ_SECURITY_CONFIG_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_WRITE_SECURITY_CONFIG_CONF_MSG,
+    MSG_ID_VAL_GPS_SESSION_READ_ENCRYPT_CONFIG_CONF_MSG,
+    MSG_ID_VAL_USERMODE_MSG,
+    MSG_ID_VAL_TESTMODE_MSG,
+    MSG_ID_VAL_APMODE_MSG,
+    MSG_ID_VAL_GPS_RESET_ASSISTDATA_CONF_MSG,
+    MSG_ID_VAL_GPS_SUPL_CELL_INFO_MSG,
+    MSG_ID_VAL_GPS_TEST_MODE_SET_MSG,
+    MSG_ID_VAL_GPS_RFDEALY_SET_MSG,
+    MSG_ID_VAL_CONFIG_SBP_INFO_MSG,
+
+    /* PGPS Messages */
+    MSG_ID_VAL_PGPS_DBM_READ_RSP_MSG,
+    MSG_ID_VAL_PGPS_DBM_WRITE_RSP_MSG,
+    MSG_ID_VAL_PGPS_CFG_SET_ETS,
+    MSG_ID_VAL_PGPS_CFG_GET_ETS,
+    MSG_ID_VAL_PGPS_START_ETS,
+    MSG_ID_VAL_PGPS_PDA_TIMER_MSG,
+    MSG_ID_VAL_PGPS_PDA_NETWORK_START,
+    MSG_ID_VAL_PGPS_SOCKET_CONNECTED,
+    MSG_ID_VAL_PGPS_SOCKET_READ,
+    MSG_ID_VAL_PGPS_PDA_PROCESS,
+    MSG_ID_VAL_PGPS_SOCKET_CLOSED,
+    MSG_ID_VAL_PGPS_NET_UNREGISTER,
+
+    /* PGPS on AP Messages */
+    MSG_ID_VAL_PGPS_SYS_TIME_REQ_TO_AP_MSG,
+    MSG_ID_VAL_PGPS_GET_EE_REQ_TO_AP_MSG,
+    MSG_ID_VAL_PGPS_SET_EE_REQ_TO_AP_MSG,
+
+    MSG_ID_VAL_PGPS_GET_CELLID_INFOR_MSG,
+    MSG_ID_VAL_PGPS_GET_CELLID_INFOR_UPDATE_MSG,
+
+    /* GPS on AP Messages */
+    MSG_ID_VAL_AP_GPS_DEVICE_POWER_ON_REQ_MSG,
+    MSG_ID_VAL_AP_GPS_PRECISE_TIME_AIDING_RSP_MSG,
+    MSG_ID_VAL_AP_GPS_ASSISTACQUIST_DATA_MSG,
+    MSG_ID_VAL_AP_GPS_QOS_DATA_MSG,
+    MSG_ID_VAL_AP_GPS_FREQUENCY_AIDING_RSP_MSG,
+    MSG_ID_VAL_AP_GPS_CANCELLATION_REQ_MSG,
+    MSG_ID_VAL_AP_GPS_CP_LOCATION_RESPONSE_MSG,
+    MSG_ID_VAL_AP_GPS_REFERENCE_LOCATION_RESP_MSG,
+    MSG_ID_VAL_AP_GPS_ASSIST_DATA_REQ_MSG,
+    MSG_ID_VAL_AP_GPS_SETEPH_PRN_MSG,
+    MSG_ID_VAL_AP_GPS_SETALM_PRN_MSG,
+    MSG_ID_VAL_AP_GPS_SETION_MSG,
+    MSG_ID_VAL_AP_GPS_SET_REFLOC_MSG,
+
+    MSG_ID_VAL_AP_GPS_ASSIST_FINISH_MSG,
+    MSG_ID_VAL_AP_GPS_START_ACK,
+    MSG_ID_VAL_AP_GPS_STOP_ACK,   //CP ACK
+    MSG_ID_VAL_AP_GPS_STOP_REQ,
+    MSG_ID_VAL_AP_GPS_CANCEL_IND,
+    MSG_ID_VAL_AP_GPS_DELETE_ASSIST_DATA_MSG,
+    MSG_ID_VAL_AP_GPS_FAKE_STOP_REQ_MSG,
+    MSG_ID_VAL_AP_GPS_MS_INFO_REQ_RECVD_MSG,
+    MSG_ID_VAL_AP_GPS_SOCKET_CREATE_REQ_MSG,
+    MSG_ID_VAL_AP_GPS_SOCKET_CREATE_RSP_MSG,
+    MSG_ID_VAL_AP_GPS_TCP_SEND_DATA_REQ_MSG,
+    MSG_ID_VAL_AP_GPS_TCP_SEND_RSP_MSG,
+    MSG_ID_VAL_AP_GPS_TCP_DATA_RECV_MSG,
+    MSG_ID_VAL_AP_GPS_TCP_DATA_RECV_RSP_MSG,
+    MSG_ID_VAL_AP_GPS_SOCKET_CLOSE_REQ_MSG,
+    MSG_ID_VAL_AP_GPS_SOCKET_CLOSE_RSP_MSG,
+    MSG_ID_VAL_AP_GPS_RAT_MODE_QUERY_MSG,
+    MSG_ID_VAL_AP_GPS_RAT_MODE_RSP_MSG,
+    MSG_ID_VAL_AP_GPS_CONNECTION_STATUS_IND,
+
+    MSG_ID_VAL_AP_GPS_TIME_IND,
+    MSG_ID_VAL_AP_GPS_FAKE_POWER_ON_REQ_MSG,
+    MSG_ID_VAL_AP_GPS_EMERGENCY_CALL_IND_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_TIME_AIDING_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_PSEUDORANGE_MEAS_RPT_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_ASSIST_DATA_REQ_MSA_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_ASSIST_DATA_REQ_MSB_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_STOP_ACK_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_POWER_ON_ACK_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_NI_POS_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_RAT_MODE_SETTING_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_RAT_MODE_RSP_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_SOCKET_CREATE_RSP_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_SOCKET_CLOSE_RSP_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_TCP_DATA_SEND_RSP_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_SUPL_TCP_DATA_SEND_RSP_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_TCP_DATA_RECV_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_SUPL_TCP_DATA_RECV_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_DATA_CONN_STATUS_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_POWER_ON_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_STOP_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_SUPL_CELL_ID_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_SUPL_GET_NETWORK_TYPE_MSG,
+    MSG_ID_VAL_GPS_RPC_REV_SUPL_GET_NETWORK_MODE_MSG,
+
+    MSG_ID_VAL_GPS_RPC_FWD_PARSED_POS_RPT_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_STATUS_RPT_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_AFLT_LOC_RPT_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_ASSIST_EPH_RPT_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_ASSIST_ALM_RPT_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_ASSIST_ION_RPT_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_ASSIST_DATA_DONE_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_EVT_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_DELETE_ASSIST_DATA_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_INJECT_ASSIST_DATA_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_POWER_ON_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_DATA_CALL_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_FRAME_SYNC_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_NI_POS_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_STOP_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_STOP_ACK_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_POWER_ON_ACK_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_SOCKET_CREATE_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_SOCKET_CLOSE_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_TCP_DATA_SEND_REQ_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_TCP_DATA_RECV_RSP_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_QUERY_RAT_MODE_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_GET_NT_TYPE_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_GET_OP_MODE_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_GET_CELL_INFO_MSG,
+    MSG_ID_VAL_GPS_RPC_FWD_PPM_RPT_MSG,
+    MSG_ID_VAL_GPS_POWER_DOWN_MSG,
+    MSG_ID_VAL_GPS_POWER_UP_MSG,
+
+    /*-----------------------------------------------------------------
+    * Silent Logging
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_SILENT_LOG_CFG_CREATE_MSG,
+    MSG_ID_VAL_SILENT_LOG_PARMS_SET_MSG,
+    MSG_ID_VAL_SILENT_LOG_PARMS_GET_MSG,
+    MSG_ID_VAL_SILENT_LOG_DATA_INFO_GET_MSG,
+    MSG_ID_VAL_SILENT_LOG_PAUSE_MSG,
+    MSG_ID_VAL_SILENT_LOG_RESUME_MSG,
+    MSG_ID_VAL_SILENT_LOG_PARMS_UPDATE_MSG,
+
+    /*-----------------------------------------------------------------
+    * DBM Handler
+    *----------------------------------------------------------------*/
+    MSG_ID_VAL_FLUSH_ACK_MSG,
+    MSG_ID_VAL_FLUSH_RF_ACK_MSG,
+    MSG_ID_VAL_NV_MSG_ACK_MSG,
+    MSG_ID_VAL_L1DTST_GETPHONESTATUS,
+    MSG_ID_VAL_SET_MOBILE_ID_MSG,
+    MSG_ID_VAL_GET_ERI_VERSION_MSG,
+
+    /* PHB Msg */
+    MSG_ID_VAL_UIM_GET_PHB_REC_PARAMS_MSG,/* 483 */
+    MSG_ID_VAL_UIM_GET_PHB_REC_MSG,
+    MSG_ID_VAL_UIM_UPDATE_PHB_REC_MSG,
+    MSG_ID_VAL_UIM_ERASE_PHB_REC_MSG,
+    MSG_ID_VAL_UIM_GET_SDN_REC_PARAMS_MSG,
+    MSG_ID_VAL_UIM_GET_SDN_REC_MSG,
+
+    MSG_ID_VAL_AT_UIM_ERASE_PHB_REC_MSG,
+    MSG_ID_VAL_AT_UIM_UPDATE_PHB_REC_MSG,
+
+    /* Sms Msg */
+    MSG_ID_VAL_UIM_GET_SMS_REC_PARAMS_MSG, /* 491 */
+    MSG_ID_VAL_UIM_GET_SMS_REC_MSG,
+    MSG_ID_VAL_UIM_UPDATE_SMS_REC_MSG,
+    MSG_ID_VAL_UIM_ERASE_SMS_REC_MSG,
+
+    MSG_ID_VAL_UTK_PROAVTIVE_CMD_AT_UTC_MSG,
+    MSG_ID_VAL_UIM_GET_FDN_REC_MSG,
+    MSG_ID_VAL_UIM_GET_FDN_STATUS_MSG,
+    MSG_ID_VAL_AT_UIM_SET_FDN_MSG,
+    MSG_ID_VAL_AT_UIM_ERASE_FDN_REC_MSG,
+    MSG_ID_VAL_AT_UIM_UPDATE_FDN_REC_MSG,
+    MSG_ID_VAL_UIM_UPDATE_FDN_REC_MSG,
+    MSG_ID_VAL_UIM_ERASE_FDN_REC_MSG,
+    MSG_ID_VAL_UIM_ECC_LIST_IND_MSG,
+    MSG_ID_VAL_UIM_INDEX_REGISTER_RSP_MSG,
+
+
+    /* Chv Msg */
+    MSG_ID_VAL_CHV_GET_STATUS_MSG,/* 504 */
+    MSG_ID_VAL_CHV_VERIFY_MSG,
+    MSG_ID_VAL_CHV_CHANGE_MSG,
+    MSG_ID_VAL_CHV_ENABLE_MSG,
+    MSG_ID_VAL_CHV_DISABLE_MSG,
+    MSG_ID_VAL_CHV_UNBLOCK_MSG,
+    MSG_ID_VAL_CHV_STATUS_CHANGE_MSG,
+    MSG_ID_VAL_CHV_LOCAL_VERIFY_MSG,
+    /*Utk Msg */
+    MSG_ID_VAL_UTK_TERMINAL_PROFILE_MSG,/* 512 */
+    MSG_ID_VAL_UTK_MENU_SELECTION_MSG,
+    MSG_ID_VAL_UTK_SMS_PP_DOWNLOAD_MSG,
+    MSG_ID_VAL_UTK_TERMINAL_RESPONSE_MSG,
+    MSG_ID_VAL_UTK_REQUEST_UIMVER_MSG,
+    MSG_ID_VAL_UTK_REQUEST_IMG_MSG,
+    MSG_ID_VAL_UTK_REQUEST_IMG_DATA_MSG,
+    MSG_ID_VAL_UTK_PROAVTIVE_CMD_MSG,
+    MSG_ID_VAL_UTK_CALL_CONTROL_MSG,
+    /* Event download Msg */
+    MSG_ID_VAL_UTK_DATA_AVAILABLE_MSG,
+    MSG_ID_VAL_UTK_MT_CALL_EVT_MSG,
+    MSG_ID_VAL_UTK_CALL_CONN_EVT_MSG,
+    MSG_ID_VAL_UTK_CALL_DISC_EVT_MSG,
+    MSG_ID_VAL_UTK_LOC_STATUS_EVT_MSG,
+    MSG_ID_VAL_UTK_ACCTECH_CHANGE_EVT_MSG,
+    MSG_ID_VAL_UTK_APP_INIT_TERM_MSG,
+    MSG_ID_VAL_UTK_IMS_REG_STATUS_UPDATE_IND,
+    MSG_ID_VAL_UTK_IMS_TIMER_EXPIRED_MSG,
+
+    /* Utk test */
+    MSG_ID_VAL_UTK_TST_GET_INPUT_DONE_MSG,
+    MSG_ID_VAL_UTK_TST_SELECT_ITEM_DONE_MSG,
+    MSG_ID_VAL_UTK_TST_COMMON_DONE_MSG,
+    MSG_ID_VAL_UTK_TST_SELECT_MENU_MSG,
+    MSG_ID_VAL_UTK_TST_INIT_MSG,
+    MSG_ID_VAL_UTK_TST_SMS_DOWN_MSG,
+    MSG_ID_VAL_UTK_TST_EXIT_MSG,
+
+    /* VAL UIM MDN messages  */
+    MSG_ID_VAL_UIM_GET_MDN_REC_NUM_MSG,/* 537 */
+    MSG_ID_VAL_UIM_READ_MDN_REC_MSG,
+    MSG_ID_VAL_UIM_UPDATE_MDN_REC_MSG,
+    MSG_ID_VAL_UIM_DEL_MDN_REC_MSG,
+    MSG_ID_VAL_UIM_NOTIFY_REGISTER_MSG,
+    MSG_ID_VAL_UIM_GET_SP_NAME_MSG,
+    MSG_ID_VAL_UIM_IN_CALL_DETECT_MSG,
+
+    MSG_ID_VAL_UIM_GET_GSM_IMSI_MSG,
+    MSG_ID_VAL_UIM_GET_ICCID_MSG,
+    MSG_ID_VAL_UIM_RESET_RESPONSE_MSG,
+
+    MSG_ID_VAL_UIM_GET_SMSVP_REC_NUM_MSG,
+    MSG_ID_VAL_UIM_READ_SMSVP_REC_MSG,
+    MSG_ID_VAL_UIM_UPDATE_SMSVP_REC_MSG,
+    MSG_ID_VAL_UIM_GET_PREF_LANG,
+    MSG_ID_VAL_UIM_GET_UIM_CARD_ID,
+    MSG_ID_VAL_UIM_GET_PROVIDER_NAME,
+
+    MSG_ID_VAL_UIM_STORE_ESN_MSG,/* 553 */
+    MSG_ID_VAL_UIM_GET_ESN_MSG,
+    MSG_ID_VAL_UIM_GET_CST_MSG,
+    MSG_ID_VAL_UIM_GET_EST_MSG,
+
+    /* VAL UIM Detect message*/
+    MSG_ID_VAL_UIM_CARD_REMOVED_MSG,
+    MSG_ID_VAL_UIM_PROACTIVE_CMD_MSG,/* 558 */
+#if defined (__TC10__) && defined (__TC10_IPC_CDMA_SUPPORT__)
+    MSG_ID_VAL_UIM_TERMINAL_RESPONSE_RSP_MSG,
+#endif    
+    MSG_ID_VAL_UIM_SMS_PP_DOWNLOAD_RSP_MSG,
+    MSG_ID_VAL_UIM_UTK_REFRESH_RSP_MSG,
+    MSG_ID_VAL_UIM_HLP_FILE_CHANGE_COMPLETED,
+
+
+    /* VAL sms memory status Msg*/
+    MSG_ID_VAL_SMS_MEMORY_STATUS_MSG,
+    MSG_ID_VAL_GET_DEBUG_INFO_MSG,
+
+    /* VAL ATC handle*/
+    MSG_ID_VAL_AT_FSM_RESET_REQ_MSG,
+    MSG_ID_VAL_ASYNC_ALERT_IND_MSG,
+
+    MSG_ID_VAL_EIA617_BREAK_REQ_MSG,
+    MSG_ID_VAL_C108_IND_MSG,
+    MSG_ID_VAL_ONLINE_CMD_REQ_MSG,
+    MSG_ID_VAL_BAUD_RATE_IND_MSG,
+    MSG_ID_VAL_REV_TX_REQ_MSG,
+    MSG_ID_VAL_FWD_TX_REQ_MSG,
+    MSG_ID_VAL_TIMER_EXPIRED_MSG,
+    /*MSG_ID_VAL_AT_DBM_WRITE_RSP_MSG,*/
+   /* MSG_ID_VAL_AT_DBM_READ_RSP_MSG,*/
+    MSG_ID_VAL_AT_SET_DEFAULT_REQ_MSG,
+    MSG_ID_VAL_AT_INIT_REQ_MSG,
+    MSG_ID_VAL_AT_FLUSH_REQ_MSG,
+    MSG_ID_VAL_AT_SYS_INIT_MSG,
+    MSG_ID_VAL_SET_QNC_DIAL_STR_MSG,
+    MSG_ID_VAL_ENHANCED_AT_CMD_REQ_MSG,
+    MSG_ID_VAL_ENHANCED_CMD_BUFFER_ACK_MSG,
+    MSG_ID_VAL_ENHANCED_AT_CMD_RSP_MSG,
+
+    /*MSG_ID_VAL_ATC_POWERUP_IND_MSG,*/
+   /* MSG_ID_VAL_ATC_NVM_INITED_MSG,*/
+
+    MSG_ID_VAL_AT_UIM_RUN_CAVE_ACK_MSG,
+
+    MSG_ID_VAL_AT_CSIM_ACK_MSG,
+
+    MSG_ID_VAL_ENHANCED_AT_GGSMIMSI,
+    MSG_ID_VAL_AT_CRSM_ACK_MSG,             /* used by both AT and generic uim API */
+    MSG_ID_VAL_DO_PARM_SET_SUC_MSG,
+#if defined (__TC10__) && defined (__TC10_IPC_CDMA_SUPPORT__)
+    MSG_ID_VAL_PSW_ENGINE_TEST_MODE_GET_CNF_MSG,
+    MSG_ID_VAL_PSW_GET_SERVICE_CONFIG_CNF_MSG,
+#endif
+    MSG_ID_VAL_NO_SVC_IND_MSG,               /* To indicate no service.         */
+    MSG_ID_VAL_IOP_FWD_TX_RSP_MSG,
+    MSG_ID_VAL_IOP_SET_BAUD_RSP_MSG,
+    MSG_ID_VAL_IOP_MUX_EVEVT_MSG,
+    MSG_ID_VAL_AT_L1D_RSSI_MSG,
+    MSG_ID_VAL_AT_BATTERY_STATUS_MSG,
+   /* MSG_ID_VAL_SET_IPSERVICE_TYPE_MSG, To set the IPService type from VAL or ETS*/
+   /*MSG_ID_VAL_GET_IPSERVICE_TYPE_MSG,*/
+    MSG_ID_VAL_HLP_PARM_SET_RSP_MSG,
+    MSG_ID_VAL_HLP_PARM_GET_RSP_MSG,
+    MSG_ID_VAL_DO_PARM_SET_RSP_MSG,
+    MSG_ID_VAL_DO_PARM_SET_NO_RSP,
+    MSG_ID_VAL_DO_PARM_GET_RSP_MSG,
+    MSG_ID_VAL_AT_PENDSMS_TM_EXPIRE,
+    MSG_ID_VAL_AT_UTK_SMS_PP_DOWNLOAD_RSP_MSG,
+    MSG_ID_VAL_AT_PENDING_SMS_EXPIRE,
+
+    MSG_ID_VAL_AT_CHAN_CTRL_ETS,
+    /*MSG_ID_VAL_AT_FWD_TX_REQ_ETS,*/
+    MSG_ID_VAL_AT_REV_TX_REQ_ETS,
+    MSG_ID_VAL_HLP_CTA_UPDATE_MSG,
+    MSG_ID_VAL_IOP_CHAN_ONOFF_MSG,
+    MSG_ID_VAL_IOP_CHAN_SWITCH_MSG,
+    MSG_ID_VAL_IOP_CHAN_QUERY_ON_MSG,
+    MSG_ID_VAL_IOP_CHAN_QUERY_SW_MSG,
+
+    /* uicc messages */
+    MSG_ID_VAL_UIM_EXT_INFO_GET_RSP_MSG,
+    MSG_ID_VAL_UICC_LOGI_CHAN_OPEN_RSP_MSG,
+    MSG_ID_VAL_UICC_LOGI_CHAN_CLOSE_RSP_MSG,
+    MSG_ID_VAL_UICC_RESTRIC_ACCESS_RSP_MSG,
+    MSG_ID_VAL_UICC_GENERIC_ACCESS_RSP_MSG,
+
+    MSG_ID_VAL_AT_CCSS_ACK_MSG,
+    MSG_ID_VAL_ENG_INFO_RPT_TIMER_EXPIRED_MSG,
+    MSG_ID_VAL_DEEPSLEEP_CALLBACK_EXPIRED_MSG,
+    MSG_ID_VAL_UIM_UTK_TIMER_EXPIRED_MSG,
+    MSG_ID_VAL_UIM_NO_SERVICE_EXPIRED_MSG,
+    MSG_ID_VAL_ESWLA_TIMER_EXPIRED_MSG,
+    //MSG_ID_VAL_MD1_EFUN_STATE_IND,
+    //MSG_ID_VAL_MD1_EMDSTATUS_FLOW_VERSION_IND,
+    MSG_ID_VAL_SEND_TX_IND_MSG,
+    MSG_ID_VAL_UT_GLOBAL_VAL_SET_MSG,
+    /* VAL Test Mode Msgs */
+    //MSG_ID_VAL_DSPM_VER_RSP_MSG,
+    //MSG_ID_VAL_DSPV_VER_RSP_MSG,
+    //MSG_ID_VAL_CP_VER_RSP_MSG,
+    //MSG_ID_VAL_START_REFURBISH_TEST,
+
+    MSG_ID_VAL_FAKE_RESET_NOTIFY,       /* For pass CT test, SHOULD BE REMOVED */
+    MSG_ID_VAL_IMS_CONN_SETUP_MSG,
+    MSG_ID_VAL_IMS_CONN_RELEASE_MSG,
+    MSG_ID_VAL_IMS_APP_SETUP_MSG,
+    MSG_ID_VAL_IMS_APP_RELEASE_MSG,
+
+    MSG_ID_APP_IMS_NETWK_CONN_RSP,
+    MSG_ID_APP_IMS_NETWK_END_RSP,
+    MSG_ID_APP_IMS_SETUP_RSP,
+    MSG_ID_APP_IMS_REL_RSP,
+    MSG_ID_APP_IMS_SETUP_IND,
+    MSG_ID_APP_IMS_REL_IND,
+    MSG_ID_APP_IMS_NETWK_REL_IND,
+    MSG_ID_APP_IMS_PPP_CONN_IND,
+
+    MSG_ID_VAL_AT_UIM_CAVE_RSP,
+    MSG_ID_VAL_AT_UIM_SSDUPD_RSP,
+    MSG_ID_VAL_AT_UIM_SSDUPDCFM_RSP,
+    MSG_ID_VAL_AT_UIM_VPM_TIMER_EXP,
+    MSG_ID_VAL_AT_UIM_MD5_RSP,
+
+    MSG_ID_VAL_IOP_ETS_RPC_CMD,
+    MSG_ID_VAL_RPC_GPS_RX_MSG,
+    MSG_ID_VAL_RPC_GPS_CALL_TMO_MSG,
+    MSG_ID_VAL_RPC_GPS_DEFFER_ACTION_MSG,
+    MSG_ID_VAL_RPC_IRAT_RX_MSG,
+    MSG_ID_VAL_RPC_IRAT_CALL_TMO_MSG,
+    MSG_ID_VAL_RPC_IRAT_DEFFER_ACTION_MSG,
+    /*MSG_ID_VAL_AT_CSS_IRAT_MSG,*/
+    MSG_ID_VAL_MMC_RPC_MSG,
+
+    MSG_ID_VAL_TCPIP_RECV_RSP_MSG,    /*used by tcpip module*/
+    MSG_ID_VAL_TCPIP_RECV_DATA_MSG,
+    MSG_ID_VAL_TCPIP_C108LOW_MSG,        /*used by tcpip module*/
+    MSG_ID_VAL_TCPIP_SOCKET_EVT_MSG,
+    MSG_ID_VAL_IOP_DATAMGR_INIT_DONE_MSG,
+
+    MSG_ID_VAL_AT_TURN_OFF_DTMF_SOUND_MSG,
+    MSG_ID_VAL_AT_CRING_CALLBACK_MSG,
+    MSG_ID_VAL_AT_CNMA_RP_ERROR_CALLBACK_MSG,
+    MSG_ID_VAL_AT_VSER_CALLBACK_MSG,
+
+    MSG_ID_VAL_AT_GET_DEBUG_INFO_MSG,
+    MSG_ID_VAL_AT_NAM_WRITE_ACK_MSG,
+   /*
+    MSG_ID_VAL_FAULT_HEADER_READ_MSG,
+    MSG_ID_VAL_FAULT_RECORD_READ_MSG,
+    MSG_ID_VAL_FAULT_LOG_ERASE_MSG,
+    */
+    MSG_ID_VAL_PPP_A12_AUTH_NOT_FAIL_MSG,
+    MSG_ID_VAL_PPP_A12_AUTH_FAIL_MSG,
+    MSG_ID_VAL_ATC_C109_IND_MSG,
+    MSG_ID_VAL_AT_SUSPEND_CALLBACK_MSG,
+
+    MSG_ID_VAL_GET_MOBILE_ID_RSP_MSG,
+    /*MSG_ID_VAL_PSW_GET_IMSI_MSG,*/
+    MSG_ID_VAL_AT_1X_MRU_WRITE_ACK_MSG,
+    MSG_ID_VAL_AT_DO_MRU_WRITE_ACK_MSG,
+    MSG_ID_VAL_UIM_GET_NAM_DATA_MSG,
+    MSG_ID_VAL_AT_DIAL_NUM_CHECK_REG_MSG,
+
+    MSG_ID_VAL_NST_LIST_SET_MSG,
+    MSG_ID_VAL_PSW_NST_LIST_SET_RSP_MSG,
+
+    /*MSG_ID_VAL_SET_LOCK_FEATURE_MSG,*/
+    MSG_ID_VAL_UIM_GET_UIMID_EUIMID_MSG,
+    /*MSG_ID_VAL_HLP_PPP_RECONNECT_MSG,*/
+    MSG_ID_VAL_DATA_ROAMING_CHG_MSG,
+/*MSG_ID_VAL_LIGHT_CTRL_MSG,
+    MSG_ID_VAL_DBM_DATA_NAM_MSG,
+    MSG_ID_VAL_STORAGE_DATA_INIT_MSG,
+
+    MSG_ID_VAL_PEN_MSG,
+    MSG_ID_VAL_SCREEN_CALIBRATION_CNF_MSG, */
+    MSG_ID_VAL_AT_VECIOURC_CALLBACK_MSG,
+    MSG_ID_VAL_RPT_C2K_RSVAS_EVENT_MSG,
+    MSG_ID_VAL_CSS_IRAT_POWER_CTRL_CNF, /* 713 */
+
+    MSG_ID_VAL_UIM_BTSAP_CONNECT_MSG,
+    MSG_ID_VAL_UIM_BTSAP_DISCONNECT_MSG,
+    MSG_ID_VAL_UIM_BTSAP_POWER_ON_MSG,
+    MSG_ID_VAL_UIM_BTSAP_POWER_OFF_MSG,
+    MSG_ID_VAL_UIM_BTSAP_RESET_MSG,
+    MSG_ID_VAL_UIM_BTSAP_TRANSFER_APDU_MSG,
+    //MSG_ID_VAL_UIM_EMDSTATUS_UPDATE_IND_MSG, /* 720 */
+    MSG_ID_VAL_UIM_PRE_STORED_CARD_ESNME_IND_MSG,
+
+    //MSG_ID_VAL_LINK2SDRV_MSG,
+
+#if defined(MTK_PLT_ON_PC_UT)
+	MSG_ID_VAL_SMS_MOC_KEY_REQ_MSG,
+	MSG_ID_VAL_SMS_REMOTE_CTRL_INS_RSP_MSG,
+#endif
+#ifdef MTK_CBP_ENCRYPT_VOICE
+	MSG_ID_VAL_SMS_T101_EXPIRE_MSG,
+	MSG_ID_VAL_SMS_T201_EXPIRE_MSG,
+	MSG_ID_VAL_SMS_T301_EXPIRE_MSG,
+	MSG_ID_VAL_SMS_T401_EXPIRE_MSG,
+	MSG_ID_VAL_SMS_ENCRY_KEY_REQ_MSG,
+	MSG_ID_VAL_SMS_ENCRY_CLEAR_CONTEXT_MSG,
+	MSG_ID_VAL_SMS_ENCRY_REMOTE_CTRL_INS_RSP_MSG,
+#endif
+
+    MSG_ID_VAL_DANDCN_HYSTMR_EXPR_MSG,
+    /* DAN DCN msg */
+
+    MSG_ID_VAL_UIM_VALIDATE_SPC_MSG,
+    MSG_ID_VAL_UIM_IMSI_M_PROGRAM_STATE_IND_MSG,
+    MSG_ID_VAL_UIM_OTA_UPDATE_NAM_DATA_MSG,
+
+    MSG_ID_VAL_CSS_NETWORK_STATE_CHANGE_IND,
+    MSG_ID_VAL_CSS_L2C_RESEL_CNF,
+    MSG_ID_VAL_CSS_L2C_REDIRECT_CNF,
+    MSG_ID_VAL_CSS_L2C_CMP_CNF,
+    MSG_ID_VAL_CSS_C2L_RESEL_IND,
+    MSG_ID_VAL_CSS_DATA_DEACTIVATE_IND,
+    MSG_ID_VAL_CSS_C2L_3GPP_NORMAL_SERVICE_IND,
+    MSG_ID_VAL_CSS_LOCAL_DETACH_IND,
+    MSG_ID_VAL_CSS_PS_STATUS_CHANGE_NOTIFY,
+
+    /* VAL signals */
+     /*MSG_ID_VAL_STARTUP_1_SIGNAL,                from HWD MS, after dspv alive is rcvd */
+     /* MSG_ID_VAL_STARTUP_2_SIGNAL,  // 775      from L1D after 32kHz Osc is validated */
+     /*MSG_ID_VAL_STARTUP_3_SIGNAL,                from IOP task */
+    /*MSG_ID_VAL_VREC_TIMEOUT_SIGNAL,              timeout in training or recogn */
+    MSG_ID_VAL_REV_TX_REQ_PPP_SIGNAL,           /* signal for rev PPP data on interface 0 */
+    MSG_ID_VAL_FWD_TX_RSP_PPP_SIGNAL,           /* signal for fwd PPP data on interface 0 */
+
+    MSG_ID_VAL_REV_TX_REQ_AT_1_SIGNAL,          /* signal for rev ATC data on logical AT channel 1 */
+    MSG_ID_VAL_FWD_TX_RSP_AT_1_SIGNAL,          /* signal for fwd ATC data on logical AT channel 1 */
+    MSG_ID_VAL_REV_TX_REQ_AT_2_SIGNAL,          /* signal for rev ATC data on logical AT channel 2 */
+    MSG_ID_VAL_FWD_TX_RSP_AT_2_SIGNAL,          /* signal for fwd ATC data on logical AT channel 2 */
+
+    MSG_ID_VAL_REV_TX_REQ_AT_3_SIGNAL,          /* signal for rev ATC data on logical AT channel 3 */
+    MSG_ID_VAL_FWD_TX_RSP_AT_3_SIGNAL,          /* signal for fwd ATC data on logical AT channel 3 */
+
+    MSG_ID_VAL_REV_TX_REQ_AT_4_SIGNAL,          /* signal for rev ATC data on logical AT channel 4 */
+    MSG_ID_VAL_FWD_TX_RSP_AT_4_SIGNAL,          /* signal for fwd ATC data on logical AT channel 4 */
+
+    MSG_ID_VAL_REV_TX_REQ_AT_5_SIGNAL,          /* signal for rev ATC data on logical AT channel 5 */
+    MSG_ID_VAL_FWD_TX_RSP_AT_5_SIGNAL,          /* signal for fwd ATC data on logical AT channel 5 */
+    MSG_ID_VAL_REV_TX_REQ_AT_6_SIGNAL,          /* signal for rev ATC data on logical AT channel 6*/
+    MSG_ID_VAL_FWD_TX_RSP_AT_6_SIGNAL,          /* signal for fwd ATC data on logical AT channel 6 */
+    MSG_ID_VAL_REV_TX_REQ_AT_7_SIGNAL,          /* signal for rev ATC data on logical AT channel 7 */
+    MSG_ID_VAL_FWD_TX_RSP_AT_7_SIGNAL,          /* signal for fwd ATC data on logical AT channel 7 */
+    MSG_ID_VAL_REV_TX_REQ_AT_8_SIGNAL,          /* signal for rev ATC data on logical AT channel 8 */
+    MSG_ID_VAL_FWD_TX_RSP_AT_8_SIGNAL,          /* signal for fwd ATC data on logical AT channel 8 */
+
+    MSG_ID_VAL_FWD_TX_RSP_AT_ETS_SIGNAL,
+
+    /*MSG_ID_VAL_SPH_REV_AP_CMD_SIGNAL,*/
+    MSG_ID_VAL_CSS_READY_SIGNAL,
+    MSG_ID_VAL_REV_TX_REQ_IP_SIGNAL,            /* signal for rev ip data on logical AT channel 0 */
+    /* other signals are defined in valdefs.h, and start from _11 up */
+    /*MSG_ID_VAL_USERINFO_TIMEOUT_SIGNAL,*/
+
+    MSG_ID_VAL_UT_CONFIGURE_REQ_MSG,
+
+/*-----------------------------------------------------------------
+    * EPOF flow
+    *----------------------------------------------------------------*/
+    MSG_ID_L4C_C2K_POWER_OFF_REQ,
+    MSG_ID_L4C_C2K_RF_OFF_REQ,
+
+    MSG_ID_L4C_C2K_POWER_OFF_CNF,
+    MSG_ID_L4C_C2K_RF_OFF_CNF,
+
+    /* temp for cross core modification */
+    /* C2K_LTE_SAP */
+    MSG_ID_C2K_LTE_RAT_CHANGE_REQ,
+    MSG_ID_C2K_LTE_RAT_CHANGE_CNF,
+    /* LTE_C2K_SAP */
+    MSG_ID_LTE_C2K_RAT_CHANGE_REQ,
+    MSG_ID_LTE_C2K_RAT_CHANGE_CNF,
+    MSG_ID_LTE_C2K_IA_PDN_QUERY_REQ,
+    MSG_ID_LTE_C2K_IA_PDN_QUERY_CNF,
+    /* VAL_RAC_SAP */
+    MSG_ID_VAL_RAC_RAT_CHANGE_START_REQ,
+    MSG_ID_VAL_RAC_RAT_CHANGE_FINISH_REQ,
+
+    MSG_ID_RAC_VAL_SET_RAT_MODE_REQ,
+    MSG_ID_RAC_VAL_SET_RAT_MODE_CNF,
+    MSG_ID_RAC_VAL_INIT_REQ,
+    /* temp for cross core modification end */
+
+
+/*porting cross core interface*/
+    MSG_ID_L4C_C2K_IMS_REG_STATUS_UPDATE_IND,
+
+    /* MD3 inform MD1 about roaming status*/
+    MSG_ID_L4C_C2K_ROAMING_SETTING_SYNC_REQ,
+
+    MSG_ID_L4C_C2K_1X_LOOP_BACK_CALL_REQ,
+    MSG_ID_L4C_C2K_1X_LOOP_BACK_CALL_CNF,
+
+    MSG_ID_L4C_C2K_TXRX_ACTIVE_TIME_REQ,
+    MSG_ID_L4C_C2K_TXRX_ACTIVE_TIME_CNF,
+
+    MSG_ID_L4C_C2K_GET_ANT_INFO_REQ,
+    MSG_ID_L4C_C2K_GET_ANT_INFO_CNF,
+    MSG_ID_L4C_C2K_GET_ANT_INFO_IND,
+#ifdef __EM_MAX_TX_POWER_SUPPORT__
+    MSG_ID_L4C_C2K_CL1_SET_MAX_TX_POWER_REQ,
+    MSG_ID_L4C_C2K_CL1_SET_MAX_TX_POWER_CNF,
+#endif
+    MSG_ID_L4C_VAL_SET_PWL_THRHD_REQ,
+    MSG_ID_L4C_VAL_SET_PWL_THRHD_CNF,
+    MSG_ID_VAL_L4C_PWR_LEVEL_IND,
+
+    MSG_ID_C2K_LTE_PDN_CONTEXT_TRANSFER_REQ,
+    MSG_ID_C2K_LTE_PDN_CONTEXT_TRANSFER_CNF,
+    MSG_ID_LTE_C2K_PDN_CONTEXT_TRANSFER_REQ,
+    MSG_ID_LTE_C2K_PDN_CONTEXT_TRANSFER_CNF,
+
+    /* C2K MT SMS from IMS, need sent to MD3 (not used currently) */
+    MSG_ID_IMCSMS_CVAL_C2K_SMS_RECV_REQ,
+    MSG_ID_IMCSMS_CVAL_C2K_SMS_RECV_CNF,
+    /* used in TC01 */
+    MSG_ID_IMCSMS_CVAL_C2K_SMS_SEND_REQ,
+    MSG_ID_IMCSMS_CVAL_C2K_SMS_SEND_CNF,
+
+    MSG_ID_VAL_SMS_OVER_C2K_SEND_REQ,
+    MSG_ID_VAL_SMS_OVER_IMS_SEND_REQ,
+    MSG_ID_VAL_SMS_IMCSMS_SEND_REQ,
+    MSG_ID_VAL_SMS_SDM_SEND_RSP,
+    MSG_ID_IMCSMS_VAL_C2K_SMS_RECV_REQ,
+    MSG_ID_IMCSMS_VAL_C2K_SMS_RECV_CNF,
+
+    /* L4B --> CVAL */
+    MSG_ID_L4B_CVAL_AT_CMD_REQ,
+    MSG_ID_L4B_CVAL_ECSQ_CONFIG_IND,
+
+    MSG_ID_L4BPDN_CVAL_MSG_FROM_L4BPDN_BEGIN,
+        MSG_ID_L4BPDN_CVAL_CGACT_REQ,
+        MSG_ID_L4BPDN_CVAL_PDN_REVIVE_REQ,
+        MSG_ID_L4BPDN_CVAL_PDN_REVIVE_ABORT_REQ,
+        MSG_ID_L4BPDN_CVAL_DISABLE_EHRPD_REQ,
+        MSG_ID_L4BPDN_CVAL_EGACT_REQ,
+    MSG_ID_L4BPDN_CVAL_MSG_FROM_L4BPDN_END,
+
+    MSG_ID_L4BPDN_CVAL_MSG_FROM_CVAL_BEGIN,
+        MSG_ID_L4BPDN_CVAL_CMD_CNF,
+        MSG_ID_L4BPDN_CVAL_CGEV_IND,
+        MSG_ID_L4BPDN_CVAL_PDN_REVIVE_CNF,
+        MSG_ID_L4BPDN_CVAL_PDN_REVIVE_ABORT_CNF,
+    MSG_ID_L4BPDN_CVAL_MSG_FROM_CVAL_END,
+
+    MSG_ID_L4BPDN_CVAL_BEARER_MSG_BEGIN,
+        MSG_ID_L4BPDN_CVAL_BEARER_ACT_IND,
+        MSG_ID_L4BPDN_CVAL_BEARER_MODIFY_IND,
+        MSG_ID_L4BPDN_CVAL_BEARER_DEACT_IND,
+        MSG_ID_L4BPDN_CVAL_PCO_RDP_UPDATE_IND,
+    MSG_ID_L4BPDN_CVAL_BEARER_MSG_END,
+
+    MSG_ID_TCM_CVAL_PDP_DEFINE_REQ,
+    MSG_ID_TCM_CVAL_EAPNSYNC_DEFINE_REQ,
+    MSG_ID_TCM_CVAL_VZW_APN_DEFINE_REQ,
+
+    MSG_ID_L4BPDN_CVAL_EACTDELAYT_REQ,
+    MSG_ID_L4BPDN_CVAL_EACTDELAYT_CNF,
+
+    MSG_ID_L4BNW_CVAL_PS_TYPE_CONFIG_REQ,
+    MSG_ID_L4BNW_CVAL_PS_TYPE_CONFIG_CNF,
+
+    MSG_ID_SDM_CVAL_C2K_SMS_SEND_REQ,
+    MSG_ID_SDM_CVAL_C2K_SMS_RSP,
+    MSG_ID_VDM_CVAL_SEND_DCN_REQ,
+    MSG_ID_VDM_CVAL_SEND_DCN_START_RSP,
+    MSG_ID_VDM_CVAL_IMS_REG_STATUS_IND,
+
+/* SCC/VAL interface optimization */
+#ifdef MTK_CBP_REL_OPTIMIZE
+    MSG_ID_VAL_VS_CNTD_IND_MSG,
+    MSG_ID_VAL_VS_REL_IND_MSG,
+#endif
+    MSG_ID_VAL_VS_CONN_REL_IND_MSG,
+
+
+    MSG_ID_VAL_IPC_RATE_REDUCTION_MSG,
+
+    /* SIM related messages for Gemini */
+    MSG_ID_VAL_UIM1_GET_MDN_CNF_MSG,
+    MSG_ID_VAL_UIM2_GET_MDN_CNF_MSG,
+    MSG_ID_VAL_UIM1_UPDATE_MDN_REC_MSG,
+    MSG_ID_VAL_UIM2_UPDATE_MDN_REC_MSG,
+    MSG_ID_VAL_UIM1_DEL_MDN_REC_MSG,
+    MSG_ID_VAL_UIM2_DEL_MDN_REC_MSG,
+    MSG_ID_VAL_UIM1_GET_HOME_SID_NID_CNF_MSG,
+    MSG_ID_VAL_UIM2_GET_HOME_SID_NID_CNF_MSG,
+    MSG_ID_VAL_UIM1_GET_IMSI_CNF_MSG,
+    MSG_ID_VAL_UIM2_GET_IMSI_CNF_MSG,
+    MSG_ID_VAL_UIM1_GET_MIN_CNF_MSG,
+    MSG_ID_VAL_UIM2_GET_MIN_CNF_MSG,
+    MSG_ID_VAL_UIM1_GET_CHV_STATUS_CNF_MSG,
+    MSG_ID_VAL_UIM2_GET_CHV_STATUS_CNF_MSG,
+    MSG_ID_VAL_UIM1_VERIFY_CHV_CNF_MSG,
+    MSG_ID_VAL_UIM2_VERIFY_CHV_CNF_MSG,
+    MSG_ID_VAL_UIM1_CHANGE_CHV_CNF_MSG,
+    MSG_ID_VAL_UIM2_CHANGE_CHV_CNF_MSG,
+    MSG_ID_VAL_UIM1_UNBLOCK_CHV_CNF_MSG,
+    MSG_ID_VAL_UIM2_UNBLOCK_CHV_CNF_MSG,
+    MSG_ID_VAL_UIM1_ENABLE_CHV_CNF_MSG,
+    MSG_ID_VAL_UIM2_ENABLE_CHV_CNF_MSG,
+    MSG_ID_VAL_UIM1_DISABLE_CHV_CNF_MSG,
+    MSG_ID_VAL_UIM2_DISABLE_CHV_CNF_MSG,
+    MSG_ID_VAL_UIM1_GET_CRSM_ACK_MSG,
+    MSG_ID_VAL_UIM2_GET_CRSM_ACK_MSG,
+    MSG_ID_VAL_UIM1_UICC_RESTRIC_ACCESS_RSP_MSG,
+    MSG_ID_VAL_UIM2_UICC_RESTRIC_ACCESS_RSP_MSG,
+    MSG_ID_VAL_UIM1_UICC_GENERIC_ACCESS_RSP_MSG,
+    MSG_ID_VAL_UIM2_UICC_GENERIC_ACCESS_RSP_MSG,
+    MSG_ID_VAL_UIM1_GET_ICCID_MSG,
+    MSG_ID_VAL_UIM2_GET_ICCID_MSG,
+    MSG_ID_VAL_UIM1_GET_APP_INFO_RSP_MSG,
+    MSG_ID_VAL_UIM2_GET_APP_INFO_RSP_MSG,
+    MSG_ID_VAL_EM_UNSL_TIMER_EXPIRED_MSG,
+    MSG_ID_VAL_UIM_UTK_FILE_CHANGED_IND_MSG,
+#if defined (__TC10__) && defined (__TC10_IPC_CDMA_SUPPORT__)
+    MSG_ID_VAL_UIM_APDU_STATUS_WORD_NOTIFY_MSG,
+    MSG_ID_VAL_UIM_REFRESH_NOTI_IND_MSG,
+    MSG_ID_VAL_UIM_REFRESH_IND_MSG,
+#endif
+    MSG_ID_VAL_UIM_ME_LOCK_INFO_IND_MSG,
+
+    MSG_ID_VAL_UIM_AT_ENVELOPE_RSP_MSG,
+
+    MSG_ID_VAL_UIM1_GET_UIMID_CNF_MSG,
+    MSG_ID_VAL_UIM2_GET_UIMID_CNF_MSG,
+    MSG_ID_VAL_UIM1_GET_CIMI_CNF_MSG,
+    MSG_ID_VAL_UIM2_GET_CIMI_CNF_MSG,
+    MSG_ID_VAL_UIM1_GET_CST_INFO_RSP_MSG,
+    MSG_ID_VAL_UIM2_GET_CST_INFO_RSP_MSG,
+    MSG_ID_VAL_UIM1_UICC_LOGI_CHAN_OPEN_RSP_MSG,
+    MSG_ID_VAL_UIM2_UICC_LOGI_CHAN_OPEN_RSP_MSG,
+    MSG_ID_VAL_UIM1_UICC_LOGI_CHAN_CLOSE_RSP_MSG,
+    MSG_ID_VAL_UIM2_UICC_LOGI_CHAN_CLOSE_RSP_MSG,
+    MSG_ID_VAL_UIM1_AT_ENVELOPE_RSP_MSG,
+    MSG_ID_VAL_UIM2_AT_ENVELOPE_RSP_MSG,
+
+    MSG_ID_VAL_UIM1_AT_CARD_ERROR_IND_MSG,
+    MSG_ID_VAL_UIM2_AT_CARD_ERROR_IND_MSG,
+    MSG_ID_VAL_UIM1_AT_CARD_TYPE_IND_MSG,
+    MSG_ID_VAL_UIM2_AT_CARD_TYPE_IND_MSG,
+
+    MSG_ID_VAL_UIM_CARD_APP_INFO_IND_MSG,
+    MSG_ID_VAL_UIM_PIN_INFO_IND_MSG,
+    MSG_ID_VAL_UIM1_CARD_NOT_READY_IND_MSG,
+    MSG_ID_VAL_UIM2_CARD_NOT_READY_IND_MSG,
+
+    MSG_ID_VAL_UIM_CACHE_FCP_INFO_IND_MSG,
+    MSG_ID_VAL_UIM_CACHE_RECORD_INFO_IND_MSG,
+	MSG_ID_VAL_UIM_CACHE_BINARY_INFO_IND_MSG,
+	MSG_ID_VAL_UIM_CACHE_MDN_REC_IND_MSG,
+	MSG_ID_VAL_SWITCH_CACHE_IND_MSG,
+
+#if defined (__TC10__) && defined (__TC10_IPC_CDMA_SUPPORT__)
+	MSG_ID_VAL_UIM_GET_FACTORY_MODE_RSP_MSG,
+	MSG_ID_VAL_UIM_SET_FACTORY_MODE_RSP_MSG,
+#endif
+
+    MSG_ID_L4C_C2K_EFUN_STATE_IND = MSG_ID_CVAL_CODE_BEGIN + 1000,
+
+    MSG_ID_L4C_VAL_MDSTATUS_FLOW_VERSION_IND,
+    MSG_ID_L4C_VAL_MDSTATUS_TK_BSP_IND,
+    MSG_ID_L4C_VAL_CS_SERVICE_IND,
+    MSG_ID_L4C_VAL_C2K_RF_TEST_REQ,
+    MSG_ID_L4C_VAL_C2K_RF_TEST_CNF,
+
+    MSG_ID_VDM_CVAL_CALL_STATUS_REQ,
+
+#if defined(MTK_DEV_SLT)
+    MSG_ID_VAL_SLT_SET_RAT_MODE_IND,
+#endif
+    MSG_ID_VAL_RMC_DO_DAT_CFG_RSP_MSG,
+    MSG_ID_L4B_CVAL_SIM_LOCK_IND,
+    MSG_ID_L4C_C2K_CELL_INFO_IND,
+
+    MSG_ID_VAL_L1D_1X_DAT_CFG_RSP_MSG,
+    MSG_ID_L4C_VAL_SML_STATUS_IND,
+#if defined (__TC10__) && defined (__TC10_IPC_CDMA_SUPPORT__)
+    MSG_ID_VAL_SVC_INFO_RPT_TIMER_EXPIRED_MSG,
+#endif
+
+    MSG_ID_VAL_UIM1_EXTENDED_RAW_CMD_DATA_MSG,
+    MSG_ID_VAL_UIM2_EXTENDED_RAW_CMD_DATA_MSG,
+
+    MSG_ID_SDM_CVAL_SCBM_START_IND,
+    MSG_ID_SDM_CVAL_SCBM_STOP_IND,
+
+	MSG_ID_VAL_CSS_RAT_MODE_CHG_CNF,
+#ifdef __CARRIER_RESTRICTION__
+    MSG_ID_SMU_CVAL_CARRIER_RESTRICTION_STATUS_IND,
+    MSG_ID_SMU_CVAL_CARRIER_RESTRICTION_SYNC_IND,
+    MSG_ID_CVAL_SMU_CARRIER_RESTRICTION_STATUS_IND,
+    MSG_ID_UIM_CVAL_CARD_ERROR_IND_MSG,
+#endif
+    MSG_ID_VDM_CVAL_ECBM_START_IND,
+    MSG_ID_VDM_CVAL_ECBM_END_IND,
+MODULE_MSG_END(MSG_ID_CVAL_CODE_TAIL)
+
+#endif
+
diff --git a/mcu/interface/sap/md/vdm_msgid.h b/mcu/interface/sap/md/vdm_msgid.h
new file mode 100644
index 0000000..8e96dc6
--- /dev/null
+++ b/mcu/interface/sap/md/vdm_msgid.h
@@ -0,0 +1,352 @@
+/*****************************************************************************
+*  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:
+ * ------------
+ *   vdm_msgid.h
+ *
+ * Project:
+ * ------------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   This file defines the identities of the messages received by VDM and the identities of
+ *   VDM internal messages.
+ *
+ * Author:
+ * -----------
+ * -------
+ *****************************************************************************/
+
+#ifndef _VDM_MSGID_H_
+#define _VDM_MSGID_H_
+
+#include "module_msg_range.h"
+
+
+MODULE_MSG_BEGIN( MSG_ID_VDM_CODE_BEGIN )
+
+/****************************************************************************
+ *                       <1> Desitnation: VDM
+ ****************************************************************************/
+
+// <1.1> From ATP
+
+// for VDM TRK
+MSG_ID_VDM_ATP_CMD_DIAL_IND = MSG_ID_VDM_CODE_BEGIN,
+    MSG_ID_VDM_ATP_CMD_DIAL_URI_IND,
+    MSG_ID_VDM_ATP_CMD_DIAL_EMERG_IND,
+    MSG_ID_VDM_ATP_CMD_DIAL_EMERG_RETRY_IND,
+    MSG_ID_VDM_ATP_CMD_DIAL_CONF_IND,
+    MSG_ID_VDM_ATP_CMD_CDV_IND,
+    MSG_ID_VDM_ATP_CMD_STK_CALL_IND,
+    MSG_ID_VDM_ATP_CMD_DIAL_CALL_PULL_IND,
+    MSG_ID_VDM_ATP_CMD_DIAL_FROM_LINE_IND,
+#if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)
+    MSG_ID_VDM_ATP_CMD_DIAL_ECALL_IND,
+#endif
+    MSG_ID_VDM_ATP_CMD_MT_CALL_APPROVE_IND,
+    MSG_ID_VDM_ATP_CMD_MT_CALL_ACCEPT_IND,
+    MSG_ID_VDM_ATP_CMD_MT_VT_SPECIAL_ACCEPT_IND,
+    MSG_ID_VDM_ATP_CMD_HANGUP_ALL_IND,
+    MSG_ID_VDM_ATP_CMD_FORCE_HANGUP_IND,
+    MSG_ID_VDM_ATP_CMD_CALL_RELATED_SS_IND,
+    MSG_ID_VDM_ATP_CMD_DTMF_IND,
+    MSG_ID_VDM_ATP_CMD_EXT_DTMF_IND,
+    MSG_ID_VDM_ATP_CMD_EXT_ERROR_REPORT_IND,
+    MSG_ID_VDM_ATP_CMD_LIST_CURRENT_CALLS_IND,
+    MSG_ID_VDM_ATP_CMD_LIST_CURRENT_CALLS_EXT_IND,
+    MSG_ID_VDM_ATP_CMD_ADS_RESULT_REPORT_IND,
+    MSG_ID_VDM_ATP_CMD_IMS_CALL_EXIST_IND,
+    MSG_ID_VDM_ATP_CMD_EMERG_SERV_CAT_IND,
+    MSG_ID_VDM_ATP_CMD_RTT_CAPABILITY_IND,
+    MSG_ID_VDM_ATP_CMD_ENH_VOLTE_SI_IND,
+    MSG_ID_VDM_ATP_CMD_CALL_NW_SCAN_IND,
+    MSG_ID_VDM_ATP_CMD_CALL_STATUS_IND,
+
+    // __97_VDM__ move from L4
+    MSG_ID_ATP_VDM_CMD_VMEMEXIT_IND,
+    MSG_ID_ATP_VDM_CMD_EMCSS_IND,
+    MSG_ID_ATP_VDM_CMD_EMCS_REQ,
+    MSG_ID_ATP_VDM_CMD_ECBM_REQ,
+
+    // for VDM ADS
+    MSG_ID_VDM_ATP_UE_MODE_IND,
+    MSG_ID_VDM_ATP_NAS_REG_STATUS_IND,
+    MSG_ID_VDM_ATP_CELL_INFO_UPDATE_IND,
+    MSG_ID_VDM_ATP_IMS_REG_STATUS_IND,
+    MSG_ID_VDM_ATP_CMD_ADS_MODE_IND,
+    MSG_ID_VDM_ATP_CMD_WFC_PROFILE_IND,
+    MSG_ID_VDM_ATP_IMS_HANDOVER_START_IND,
+    MSG_ID_VDM_ATP_IMS_HANDOVER_END_IND,
+    MSG_ID_VDM_ATP_CMD_VIDEO_CAPABILITY_IND,
+    MSG_ID_VDM_ATP_CMD_VOICE_CALL_PREFER_C2K_IND,
+    MSG_ID_VDM_ATP_CMD_IMS_CONFIG_IND,
+    MSG_ID_VDM_ATP_CMD_ADS_DIGITS_TRN_IND,
+    MSG_ID_VDM_ATP_CMD_SELF_ACTIVATION_IND,
+    MSG_ID_VDM_ATP_CMD_SWITCH_TO_EMERGENCY_IND,
+    MSG_ID_VDM_ATP_C2K_SERVICE_STATE_IND,
+    MSG_ID_VDM_ATP_C2K_1X_CONN_STATUS_IND,
+    MSG_ID_VDM_ATP_GMSS_SET_HVOLTE_MODE_CNF,
+    MSG_ID_VDM_ATP_EMC_SERVICE_SCAN_CNF,
+    MSG_ID_VDM_ATP_IMS_DOMAIN_PREFERENCE_IND,
+    MSG_ID_VDM_ATP_HVOLTE_SILENT_REDIAL_IND,
+    MSG_ID_VDM_ATP_ECFG_SET_IND,
+    MSG_ID_VDM_ATP_RF_STATE_IND,
+    MSG_ID_VDM_ATP_C2K_MCCMNC_IND,
+    MSG_ID_VDM_ATP_SSAC_RESEL_RESULT_IND,
+    MSG_ID_VDM_ATP_CMD_EVODATA_CONFIG_IND,
+
+    // for VDM VCC
+    MSG_ID_VDM_ATP_CMD_SRVCC_CONTEXT_TRANSFER_IND,
+
+    // for VDM CTRL
+    MSG_ID_VDM_ATP_CS_CC_MT_CALL_RING_IND,
+
+    // From L4C
+    MSG_ID_VDM_L4C_FDN_ECC_CHECK_CNF,
+    MSG_ID_VDM_L4C_CS_CC_MO_CALL_CNF,
+    MSG_ID_VDM_L4C_CS_CC_EMERG_SERV_CAT_CNF,
+    MSG_ID_VDM_L4C_CS_CC_LIST_CURRENT_CALLS_CNF,
+    MSG_ID_VDM_L4C_CS_CC_EXT_ERROR_REPORT_CNF,
+    MSG_ID_VDM_L4C_CS_CC_SEND_DIGIT_CNF,
+    MSG_ID_VDM_L4C_CS_CC_HANGUP_ALL_CNF,
+    MSG_ID_VDM_L4C_CS_CC_FORCE_HANGUP_CNF,
+    MSG_ID_VDM_L4C_CS_CC_MT_CALL_ACCEPT_CNF,
+    MSG_ID_VDM_L4C_CS_CC_CALL_RELATED_SS_CNF,
+    MSG_ID_VDM_L4C_CS_CC_MT_CALL_PRESENT_IND,
+    MSG_ID_VDM_L4C_CS_CC_MT_CALL_SETUP_IND,
+    MSG_ID_VDM_L4C_CS_CC_CALL_DISCONNECT_IND,
+    MSG_ID_VDM_L4C_CS_CC_ECPI_TRANSLATE_IND,
+    MSG_ID_VDM_L4C_CS_CC_STK_CALL_CNF,
+    MSG_ID_VDM_L4C_SAT_SETUP_CALL_IND,
+    MSG_ID_VDM_L4C_GET_SSAC_PARAM_CNF,
+    MSG_ID_VDM_L4C_UAC_PARAM_CHECK_CNF,
+    MSG_ID_VDM_L4C_UAC_ALLEVIATION_IND,
+    MSG_ID_VDM_L4C_SRVCC_CONTEXT_TRANSFER_CNF,
+    MSG_ID_VDM_L4C_NW_FEATURE_IND,
+    MSG_ID_VDM_L4C_SRVCC_STATUS_UPDATE_IND,
+    MSG_ID_VDM_L4C_NW_SEARCH_STATUS_IND,
+    MSG_ID_VDM_L4C_UEMODE_PARAM_UPDATE_IND,
+    MSG_ID_VDM_L4C_OOS_START_IND,
+    MSG_ID_VDM_L4C_OOS_END_IND,
+    MSG_ID_VDM_L4C_C2K_SERVICE_STATE_IND,
+    MSG_ID_VDM_L4C_IMS_DOMAIN_PREFERENCE_IND,
+    MSG_ID_VDM_L4C_RAT_MODE_IND,
+    MSG_ID_VDM_L4C_INTER_RAT_STATUS_IND,
+    MSG_ID_VDM_L4C_RADIO_LINK_QUALITY_IND,
+    MSG_ID_VDM_L4C_REPORTED_RAT_CHANGE_IND,
+    MSG_ID_VDM_L4C_IMS_CALL_SCM_CNF,
+    MSG_ID_VDM_L4C_ECBM_MODE_IND,
+    MSG_ID_VDM_L4C_GMSS_SET_HVOLTE_MODE_CNF,
+    MSG_ID_VDM_L4C_CS_CC_STK_TR_INFO_IND,
+    MSG_ID_VDM_L4C_ATTACHED_RAT_IND,
+    MSG_ID_VDM_L4C_EMERGENCY_SERVICE_CNF,
+    MSG_ID_VDM_L4C_EMERGENCY_SERVICE_IND,
+    MSG_ID_VDM_L4C_EMERGENCY_SERVICE_FALLBACK_CNF,
+#if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)
+    MSG_ID_VDM_L4C_CS_CC_CECALL_CNF,
+#endif
+
+    // <1.2> From IMC
+
+    // for VDM TRK
+    MSG_ID_VDM_IMC_IMS_CC_MO_CALL_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_STK_CALL_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_MO_CALL_DOMAIN_CONFLICT_RSP,
+    MSG_ID_VDM_IMC_IMS_CC_MO_CONF_CALL_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_MT_CALL_PRESENT_IND,
+    MSG_ID_VDM_IMC_IMS_CC_MT_CALL_SETUP_IND,
+    MSG_ID_VDM_IMC_IMS_CC_MT_CALL_ABORT_IND,
+    MSG_ID_VDM_IMC_IMS_CC_MT_CALL_ACCEPT_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_MT_VT_SPECIAL_ACCEPT_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_HANGUP_ALL_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_FORCE_HANGUP_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_CALL_DISCONNECT_IND,
+    MSG_ID_VDM_IMC_IMS_CC_CALL_PROGRESS_IND,
+    MSG_ID_VDM_IMC_IMS_CC_CALL_RELATED_SS_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_EXT_ERROR_REPORT_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_SEND_DIGIT_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_START_SEND_DIGIT_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_STOP_SEND_DIGIT_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_LIST_CURRENT_CALLS_CNF,
+    MSG_ID_VDM_IMC_IMS_CC_ALLOC_CONF_CALL_IND,
+
+    // for VDM ADS
+    MSG_ID_VDM_IMC_ADS_CTRL_IND,
+    MSG_ID_VDM_IMC_IMS_CC_SET_HVOLTE_CALL_DOMAIN_CNF,
+    MSG_ID_VDM_IMC_TIMER_EPDG_CS_STATUS_IND,
+
+    // for VDM VCC
+    MSG_ID_VDM_IMC_SRVCC_CONTEXT_TRANSFER_IND,
+
+    // for VDM CTRL
+    MSG_ID_VDM_IMC_IMS_CC_MT_CALL_RING_IND,
+    MSG_ID_VDM_IMC_ECBM_START_RSP,
+    MSG_ID_VDM_IMC_ECBM_END_RSP,
+    MSG_ID_VDM_IMC_IS_CS_ALLOWED_REQ,
+    MSG_ID_VDM_IMC_NORMAL_SERVICE_SCAN_IND,
+
+    // ENH_VOLTE_SI
+    MSG_ID_VDM_IMC_ENH_VOLTE_SI_CALL_STATUS_IND,
+
+    // <1.3> From CVAL
+    MSG_ID_VDM_CVAL_CALL_STATUS_CNF,
+
+    // for VDM ADS
+    MSG_ID_VDM_CVAL_SEND_DCN_START_IND,
+    MSG_ID_VDM_CVAL_SEND_DCN_END_IND,
+
+
+    // <1.4> From L4
+    MSG_ID_VDM_L4C_IMS_SYS_INFO_IND,
+
+    // for VDM TRK
+    MSG_ID_VDM_L4B_C2K_CC_MO_CALL_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_EMERG_CALL_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_STK_CALL_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_MT_CALL_PRESENT_IND,
+    MSG_ID_VDM_L4B_C2K_CC_MT_CALL_SETUP_IND,
+    MSG_ID_VDM_L4B_C2K_CC_MT_CALL_ACCEPT_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_HANGUP_ALL_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_FORCE_HANGUP_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_CALL_DISCONNECT_IND,
+    MSG_ID_VDM_L4B_C2K_CC_CALL_RELATED_SS_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_EXT_ERROR_REPORT_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_SEND_DIGIT_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_START_SEND_DIGIT_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_STOP_SEND_DIGIT_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_LIST_CURRENT_CALLS_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_ECPI_TRANSLATE_IND,
+    MSG_ID_VDM_L4B_C2K_CC_EMERG_SERV_CAT_CNF,
+    MSG_ID_VDM_L4B_C2K_CC_LINECON_IND,
+
+    MSG_ID_VDM_L4B_STK_CALL_NUM_IND,
+    MSG_ID_VDM_L4B_SND_STK_CALL_TR_CNF,
+#if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)
+    MSG_ID_VDM_L4B_CS_CC_ECALL_CNF,
+#endif    
+
+    // <1.5> from GMSS
+    MSG_ID_VDM_GMSS_EMC_SERVICE_IND,
+    MSG_ID_VDM_GMSS_CAMPING_INFO_IND,
+    MSG_ID_VDM_GMSS_C2K_SILENT_REDIAL_IND,
+    MSG_ID_VDM_GMSS_SERVICE_SCAN_CNF,
+
+    // <1.6> From L4C
+    MSG_ID_VDM_L4C_REG_COMBINED_CAUSE_IND,
+	MSG_ID_L4CVDM_DATA_ALLOW_REQ,
+#if defined(__NG_ECALL_SUPPORT__)
+    MSG_ID_VDM_L4C_ECALL_TEST_CALL_ATTACH_CNF,
+    MSG_ID_VDM_L4C_ECALL_ABORT_TEST_CALL_ATTACH_CNF,
+#endif
+    // <1.7> From SDM
+    MSG_ID_VDM_SDM_ECBM_MODE_IND,
+
+    /****************************************************************************
+ *                   <2> Destination: VDM TRK
+ ****************************************************************************/
+    // <2.2> From VDM ADS
+    MSG_ID_VDM_TRK_ADS_INIT_CNF,
+    MSG_ID_VDM_TRK_ADS_SELECT_CNF,
+    MSG_ID_VDM_TRK_ADS_END_CNF,
+    MSG_ID_VDM_TRK_ADS_IMS_HANDOVER_START_IND,
+    MSG_ID_VDM_TRK_ADS_IMS_HANDOVER_END_IND,
+
+    // <2.3> From VDM VCC
+    MSG_ID_VDM_TRK_VCC_SRVCC_START_IND,
+    MSG_ID_VDM_TRK_VCC_SRVCC_END_IND,
+    MSG_ID_VDM_TRK_VCC_CONF_SRVCC_IND, // for R10 SRVCC
+    MSG_ID_VDM_TRK_VCC_ATP_SRVCC_CONTEXT_TRANSFER_IND,
+
+    /****************************************************************************
+ *                          <3> Destination: VDM ADS
+ ****************************************************************************/
+    // <3.2> From VDM TRK
+    MSG_ID_VDM_TRK_ADS_INIT_REQ,
+    MSG_ID_VDM_TRK_ADS_SELECT_REQ,
+    MSG_ID_VDM_TRK_ADS_END_REQ,
+
+
+    // <3.3> From VDM VCC
+    MSG_ID_VDM_ADS_VCC_SRVCC_START_IND,
+    MSG_ID_VDM_ADS_VCC_SRVCC_END_IND,
+
+
+    /****************************************************************************
+ *                          <4> Destination: VDM VCC
+ ****************************************************************************/
+
+    // <4.2> From VDM TRK
+    MSG_ID_VDM_TRK_VCC_CONF_SRVCC_RSP, // for R10 SRVCC
+
+
+    // <4.3> From VDM ADS
+
+    /****************************************************************************
+ *                   <6> For UT
+ ****************************************************************************/
+    // For VDM UT
+    MSG_ID_VDM_UT_CONFIG,
+    MSG_ID_VDM_UT_READ_STATUS,
+    MSG_ID_VDM_DUMP_COMMON_CONTEXT_IND,
+
+    // For VDM TRK UT
+    MSG_ID_VDM_TRK_UT_CONFIG,
+    MSG_ID_VDM_TRK_UT_READ_STATUS,
+    MSG_ID_VDM_TRK_UT_STATUS_REPORT,
+
+    // For VDM ADS UT
+    MSG_ID_VDM_ADS_UT_CONFIG,
+    MSG_ID_VDM_ADS_UT_READ_STATUS,
+    MSG_ID_VDM_ADS_UT_STATUS_REPORT,
+
+    // For VDM VCC UT
+    MSG_ID_VDM_VCC_UT_CONFIG,
+    MSG_ID_VDM_VCC_UT_READ_STATUS,
+    MSG_ID_VDM_VCC_UT_STATUS_REPORT,
+
+    // For update call status
+    MSG_ID_VDM_ME_CALL_STATUS_REQ,
+
+    MSG_ID_VDM_CODE_END,
+
+    MODULE_MSG_END(MSG_ID_VDM_CODE_TAIL)
+
+
+#endif // _VDM_MSGID_H_
+
diff --git a/mcu/interface/sap/md/vgmm_msgid.h b/mcu/interface/sap/md/vgmm_msgid.h
new file mode 100644
index 0000000..6260116
--- /dev/null
+++ b/mcu/interface/sap/md/vgmm_msgid.h
@@ -0,0 +1,153 @@
+/*****************************************************************************
+*  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).
+*
+*****************************************************************************/
+
+/********************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _VGMM_MSGID_H
+#define _VGMM_MSGID_H
+
+/*-----------------------VGMM_MSG_CODE_BEGIN------------------*/
+MODULE_MSG_BEGIN( MSG_ID_VGMM_CODE_BEGIN )
+    MSG_ID_VGMM_START = MSG_ID_VGMM_CODE_BEGIN,
+
+    /* Fake timer expiry message used for UTT/GTest */
+    MSG_ID_VGMM_FAKE_TIMER_EXPIRY,
+
+    /* Messages from NAS_SV */
+    MSG_ID_NAS_SV_VGMM_PLMN_SEARCH_ALLOWED_REQ,
+    MSG_ID_NAS_SV_VGMM_SYS_INFO_UPDATE_REQ,
+    MSG_ID_NAS_SV_VGMM_SET_RAT_MODE_REQ,
+    MSG_ID_NAS_SV_VGMM_NAS_CTXT_TRANSFER_REQ,
+    MSG_ID_NAS_SV_VGMM_VG_OPTION_UPDATE_REQ,
+    MSG_ID_NAS_SV_VGMM_UEMODE_PARAM_UPDATE_REQ,
+    MSG_ID_NAS_SV_VGMM_RESUME_REQ,
+    MSG_ID_NAS_SV_VGMM_SOR_OPLMN_LIST_UPDATE_RSP,
+    MSG_ID_NAS_SV_VGMM_MANUAL_MODE_UPDATE_REQ,
+    MSG_ID_NAS_SV_VGMM_REGN_STATUS_UPDATE_REQ,
+    MSG_ID_NAS_SV_VGMM_INVALID_SIM_RECOVER_REQ,
+    MSG_ID_NAS_SV_VGMM_C2K_FORCE_TO_LOCAL_DETACH_REQ,
+    MSG_ID_NAS_SV_VGMM_GLOBAL_MODE_CHANGE_START_REQ,
+    MSG_ID_NAS_SV_VGMM_NRRC_DEACTIVATE_NTF,
+    MSG_ID_NAS_SV_VGMM_PLMN_LIST_STATUS_UPDATE_REQ,
+    MSG_ID_NAS_SV_VGMM_N1_REENABLE_CLEAR_FORBIDDEN_TA_LIST_REQ,
+
+    /* MSGs from NRRC  */
+    MSG_ID_VGMM_NRRC_NAS_CONTAINER_IND,
+	MSG_ID_VGMM_NRRC_NAS_CONTAINER_RSP,
+    MSG_ID_VGMM_NRRC_UAC_CHECK_CNF,
+    MSG_ID_VGMM_NRRC_UAC_STATUS_IND, // TODO: Remove
+    MSG_ID_VGMM_NRRC_UAC_ALLEVIATION_IND,
+    MSG_ID_VGMM_NRRC_ESTABLISH_CNF,
+    MSG_ID_VGMM_NRRC_RELEASE_IND,
+    MSG_ID_VGMM_NRRC_SUSPEND_IND,
+    MSG_ID_VGMM_NRRC_RESUME_CNF,
+    MSG_ID_VGMM_NRRC_RESUME_IND,
+    MSG_ID_VGMM_NRRC_FALLBACK_IND,
+    MSG_ID_VGMM_NRRC_PAGING_IND,
+    MSG_ID_VGMM_NRRC_DATA_CNF,
+    MSG_ID_VGMM_NRRC_DATA_IND,
+    MSG_ID_VGMM_NRRC_GEMINI_SUSPEND_IND,
+    MSG_ID_VGMM_NRRC_GEMINI_RESUME_IND,	
+    MSG_ID_VGMM_NRRC_USER_PLANE_RESOURCES_IND,
+    MSG_ID_VGMM_NRRC_EMERGENCY_STATUS_NEEDED_IND,
+    MSG_ID_VGMM_NRRC_DATA_INACTIVITY_IND,
+    MSG_ID_VGMM_NRRC_DATA_ABORT_CNF,
+    MSG_ID_VGMM_NRRC_CAPABILITY_CHANGE_IND,
+    MSG_ID_VGMM_NRRC_RE_EST_COMPLETE_IND,
+
+    /* MSGs from SMS */
+    MSG_ID_SMS_VGMM_EST_REQ,
+    MSG_ID_SMS_VGMM_DATA_REQ,
+	MSG_ID_SMS_VGMM_STATUS_REQ,
+	MSG_ID_SMS_VGMM_SESSION_END_REQ,
+	
+    /* MSGs from VGSM */
+    MSG_ID_VGSM_VGMM_DATA_REQ,
+    MSG_ID_VGSM_VGMM_SYNC_PDUS_STATUS_REQ,
+    MSG_ID_VGSM_VGMM_GET_PDUS_STATUS_RSP,
+    /* TODO: Don't know yet where 5GSM wants these message IDs.
+             Move to another file when that is decided */
+    MSG_ID_VGSM_VGMM_REGISTERED_IND,
+
+    //MSGs from RATDM
+    MSG_ID_VGMM_RATDM_REESTABLISH_CONN_IND,
+    MSG_ID_VGMM_RATDM_QUERY_UL_DATA_STATUS_CNF,
+
+    /* MSGs from UPDS */
+    MSG_ID_UPDS_VGMM_GET_UE_STATE_INDICATION_RSP,
+    MSG_ID_UPDS_VGMM_DATA_REQ,
+
+    /* MSGs to URSP */
+    MSG_ID_URSP_VGMM_NSSAI_CONFIGURATION_IND,
+
+    //MSGs from LPP
+    MSG_ID_LPP_VGMM_DATA_REQ,
+
+    //MSGs from RAC
+    MSG_ID_RAC_VGMM_INIT_REQ, // VGMM treated as Provider
+    MSG_ID_RAC_VGMM_SET_MS_SV_REQ,
+    MSG_ID_RAC_VGMM_REJECT_CAUSE_MAPPING_REQ,
+	MSG_ID_RAC_VGMM_IMS_REG_STATUS_UPDATE_REQ,
+    MSG_ID_RAC_VGMM_IMS_SERVICE_STATUS_REQ,
+    MSG_ID_RAC_VGMM_IMS_UAC_REQ,
+    MSG_ID_RAC_VGMM_DATA_SERVICE_STATUS_UPDATE_REQ,
+    MSG_ID_RAC_VGMM_USER_SELECTED_MAIN_PS_REQ,
+    MSG_ID_RAC_VGMM_EMERGENCY_SERVICE_REQ,
+    MSG_ID_RAC_VGMM_EMERGENCY_SERVICE_FALLBACK_REQ,
+	MSG_ID_RAC_VGMM_GET_NSSAI_REQ,
+	MSG_ID_RAC_VGMM_SET_NSSAI_REQ,
+	MSG_ID_RAC_VGMM_SET_PREF_NSSAI_REQ,
+    MSG_ID_RAC_VGMM_5GSLOCI_CLEAR_REQ,
+    MSG_ID_RAC_VGMM_IMS_UAC_ABORT_REQ,
+
+    //MSGs from DDM
+    MSG_ID_DDM_VGMM_CRLADN_REQ,
+
+    //MSGs from UPCM
+    MSG_ID_VGMM_UPCM_START_RELEASE_PAGING_TIMER_IND,
+
+    /* MSG for dump NASMSG */
+    MSG_ID_VGMM_NASMSG_DUMP_IND,
+    MSG_ID_VGMM_TST_MSG_DUMP_IND,
+
+    /* MSG for dump VGMM context */
+    MSG_ID_VGMM_CONTEXT_DUMP_IND,
+
+    MSG_ID_VGMM_END,
+
+MODULE_MSG_END( MSG_ID_VGMM_CODE_TAIL )
+#endif
+/*----------------------- VGMM_MSG_CODE_END--------------------*/
diff --git a/mcu/interface/sap/md/vgsm_msgid.h b/mcu/interface/sap/md/vgsm_msgid.h
new file mode 100644
index 0000000..ca42a27
--- /dev/null
+++ b/mcu/interface/sap/md/vgsm_msgid.h
@@ -0,0 +1,213 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   
+ *
+ * Project:
+ * --------
+ *   
+ *
+ * Description:
+ * ------------
+ *   
+ *
+ * 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!! 
+ *==============================================================================
+ *******************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _VGSM_MSGID_H
+#define _VGSM_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_VGSM_CODE_BEGIN )
+MSG_ID_VGSM_MSG_ID_START = MSG_ID_VGSM_CODE_BEGIN,
+    /* SM Core <-> SM Conn */
+    MSG_ID_VGSM_CONN_ID_START,
+    MSG_ID_VGSM_CONN_SEND_REQ,
+    MSG_ID_VGSM_CONN_SEND_CNF,
+    MSG_ID_VGSM_CONN_SEND_FAIL,
+    MSG_ID_VGSM_CONN_HURRY_UP_THE_SEND_REQ,
+    MSG_ID_VGSM_CONN_FORGET_THE_SEND_REQ,
+    MSG_ID_VGSM_CONN_ABORT_ALL_PDU_SESSION_ONGOING_PROC_IND,
+    MSG_ID_VGSM_CONN_CONNECTION_NOT_GOOD_IND,
+
+    /* SM AL <-> SM Core */
+    MSG_ID_VGSM_INIT_PDU_SESSION_MOD_REQ,
+    MSG_ID_VGSM_INIT_PDU_SESSION_REL_REQ,
+    MSG_ID_VGSM_ABORT_THIS_PDU_SESSION_PROC_NTF,
+    MSG_ID_VGSM_FORCE_LOCAL_RELEASE_PDU_SESSION_NTF,
+
+    /* MSGs from PAM */
+    MSG_ID_PAM_VGSM_ID_START    = MSG_ID_VGSM_CONN_ID_START + 30,   // VGSM_CONN_ID_NUM = 30
+    MSG_ID_PAM_VGSM_PDU_SESSION_EST_REQ,
+    MSG_ID_PAM_VGSM_PDU_SESSION_MOD_REQ,
+    MSG_ID_PAM_VGSM_PDU_SESSION_REL_REQ,
+    MSG_ID_PAM_VGSM_CONGESTION_UPDATE_REQ,
+
+    /* MSGs from VGMM */
+    MSG_ID_VGSM_VGMM_ID_START   = MSG_ID_PAM_VGSM_ID_START + 20,    // PAM_VGSM_ID_NUM = 20
+
+    MSG_ID_VGSM_VGMM_DATA_CNF,
+    MSG_ID_VGSM_VGMM_DATA_IND,
+    MSG_ID_VGSM_VGMM_SUSPEND_IND,
+    MSG_ID_VGSM_VGMM_RESUME_IND,
+    MSG_ID_VGSM_VGMM_UPDATE_PDUS_STATUS_IND,
+    MSG_ID_VGSM_VGMM_GET_PDUS_STATUS_IND,
+    MSG_ID_VGSM_VGMM_LADN_INFO_UPDATE_IND,
+    MSG_ID_VGSM_VGMM_LADN_INOUT_IND,
+    MSG_ID_VGSM_VGMM_DEREG_IND,
+    MSG_ID_VGSM_VGMM_CAPABILITY_UPDATE_IND,
+    MSG_ID_VGSM_VGMM_STOP_CONGESTION_TIMERS_IND,
+    MSG_ID_VGSM_VGMM_ENTER_EMERGENCY_REGISTRATION_IND,
+    MSG_ID_VGSM_VGMM_LEAVE_EMERGENCY_REGISTRATION_IND,
+    MSG_ID_VGSM_VGMM_RB_UPDATE_IND,
+    MSG_ID_VGSM_VGMM_AS_CONNECTION_EVENT_IND,
+
+    /* MSGs from RATDM */
+    MSG_ID_VGSM_RATDM_ID_START  = MSG_ID_VGSM_VGMM_ID_START + 30,   // VGSM_VGMM_ID_NUM = 30
+
+    /* MSGs from NAS_SV */
+    MSG_ID_NAS_SV_VGSM_ID_START = MSG_ID_VGSM_RATDM_ID_START + 10,  // VGSM_RATDM_ID_NUM = 10
+    MSG_ID_NAS_SV_VGSM_GEMINI_RESUME_REQ,
+    
+    /* MSGs from ESM */
+    MSG_ID_ESM_VGSM_ID_START    = MSG_ID_NAS_SV_VGSM_ID_START + 10, // NAS_SV_VGSM_ID_NUM = 10
+    MSG_ID_ESM_VGSM_ATTACH_PDN_ACTIVATED_IND,
+    MSG_ID_ESM_VGSM_CONTEXT_TRANSFER_REQ_NTF,
+
+    /* MSGs from TFTLIB */
+    MSG_ID_TFTLIB_VGSM_ID_START = MSG_ID_ESM_VGSM_ID_START + 10,    // ESM_VGSM_ID_NUM = 10
+    MSG_ID_TFTLIB_VGSM_RQOS_UPDATE_REQ,
+
+    /* MSGs from Others */
+    MSG_ID_VGSM_OTHERS_ID_START = MSG_ID_TFTLIB_VGSM_ID_START + 10,    // TFTLIB_VGSM_ID_NUM = 10
+    MSG_ID_VGSM_DEBUG_TIMER_STARTED,  //for Timer Debug
+    MSG_ID_VGSM_DEBUG_TIMER_STOPPED,  //for Timer Debug
+    MSG_ID_VGSM_DEBUG_TIMER_EXPIRED,  //for Timer Debug
+    MSG_ID_VGSM_UT_FRIENDLY_DATA_IND,
+    MSG_ID_VGSM_DEBUG_ASSERT_HAPPENED,
+    MSG_ID_VGSM_DEBUG_PDU_SESSION_CONTEXT_INFO,
+    MSG_ID_VGSM_DEBUG_PT_CONTEXT_INFO,
+    MSG_ID_VGSM_DEBUG_ICD_REPORT_MSG_INFO,
+    MSG_ID_VGSM_DEBUG_PDUS_CTX_FROM_SMIC,
+    MSG_ID_VGSM_DEBUG_TRANSFER_PDUS_INFO,
+    MSG_ID_VGSM_DEBUG_DATA_IND,
+    MSG_ID_VGSM_DEBUG_USIR_CLEAN_OTA_MSG,
+    MSG_ID_VGSM_DEBUG_USIR_DUMP_CONTEXT,
+    MSG_ID_L4C_VGSM_VDM_IMS_VOICE_STATUS_NTF,
+
+MSG_ID_VGSM_MSG_ID_END,
+MODULE_MSG_END( MSG_ID_VGSM_CODE_TAIL )
+
+#endif /* _VGSM_MSGID_H */
diff --git a/mcu/interface/sap/md/wifi_proxy_msgid.h b/mcu/interface/sap/md/wifi_proxy_msgid.h
new file mode 100644
index 0000000..d06aeaa
--- /dev/null
+++ b/mcu/interface/sap/md/wifi_proxy_msgid.h
@@ -0,0 +1,111 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   wifi_proxy_msgid.h
+ *
+ * Project:
+ * --------
+ *   VMOLY
+ *
+ * Description:
+ * ------------
+ *   WIFI Proxy msgid definition.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ * 07 09 2020 po-chun.lee
+ * [MOLY00544309] [USIM][G.8.1] tcpip and wifiproxy
+ * 	
+ * 	.
+ *
+ * 07 15 2019 konark.mehra
+ * [MOLY00411914] [New feature check-ins] WIFI Proxy feature check-ins
+ * 	
+ * 	Wifi Proxy check-ins
+ *
+ * 04 04 2019 konark.mehra
+ * [MOLY00358616] [WIFI Proxy] Feature development
+ * 	
+ * 	Change description:
+ * 	1. Add new interfaces.
+ * 	2. Bug fixes
+ * 	3. Integrate with Kal and DHL
+ * 	4. Error handling
+ * 	4. Update XGEN INC
+ *
+ * 03 12 2019 konark.mehra
+ * [MOLY00358616] [WIFI Proxy] Feature development
+ * 	WIFI Proxy feature check-ins [7709668]
+ *
+ *
+ ****************************************************************************/
+
+
+#ifndef __WIFI_PROXY_MSGID_H
+#define __WIFI_PROXY_MSGID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN(MSG_ID_WIFI_PROXY_CODE_BEGIN)
+    MSG_ID_WIFI_PROXY_BEGIN = MSG_ID_WIFI_PROXY_CODE_BEGIN,
+    MSG_ID_WIFIPROXY_UL_PKT_ENQUEUE = MSG_ID_WIFI_PROXY_BEGIN,
+    MSG_ID_WIFIPROXY_DL_PKT_ENQUEUE,
+    MSG_ID_WIFIPROXY_FILTER_CB_IND,
+    MSG_ID_WIFIPROXY_CB_IND = MSG_ID_WIFIPROXY_FILTER_CB_IND,
+    MSG_ID_WIFIPROXY_FILTER_ENQUEUE,
+    MSG_ID_WIFIPROXY_FILTER_DEREG_ENQUEUE,
+    MSG_ID_WIFIPROXY_BUFFER_RELEASE_IND,
+    MSG_ID_WIFIPROXY_FILTER_PARAM_UPDATE,
+    MSG_ID_WIFIPROXY_PATH_CONFIG,
+    MSG_ID_WIFIPROXY_ML_FILTER_CB_IND,
+
+    MSG_ID_MNWI_WIFI_STATUS_IND,
+    MSG_ID_MNWI_TX_REQ,
+    MSG_ID_MNWI_RX_REQ,
+    MSG_ID_UWF_TICK_IND,
+
+    MSG_ID_WIFI_PROXY_END,
+MODULE_MSG_END(MSG_ID_WIFI_PROXY_CODE_TAIL)
+
+#endif  /* !__WIFI_PROXY_MSGID_H */
diff --git a/mcu/interface/sap/md/wo_msgid.h b/mcu/interface/sap/md/wo_msgid.h
new file mode 100644
index 0000000..db44e70
--- /dev/null
+++ b/mcu/interface/sap/md/wo_msgid.h
@@ -0,0 +1,130 @@
+/*****************************************************************************
+*  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).
+*
+*****************************************************************************/
+
+#ifndef _WO_MSGID_H
+#define _WO_MSGID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_WO_CODE_BEGIN )
+
+    // From DSBP
+    MSG_ID_WO_DSBP_RECONFIGURE_IND = MSG_ID_WO_CODE_BEGIN,
+
+    // From ATP
+    MSG_ID_ATP_WO_EWIFIASC_REQ,
+    MSG_ID_ATP_WO_EWIFIADDR_REQ,
+    MSG_ID_ATP_WO_EWIFINATT_REQ,
+    MSG_ID_ATP_WO_EIMSGEO_REQ,
+    MSG_ID_ATP_WO_EPVSSET_REQ,
+    MSG_ID_ATP_WO_EWOCFGSET_REQ,
+    MSG_ID_ATP_WO_EWOCFGGET_REQ,
+    MSG_ID_ATP_WO_EEPDG_REQ,
+    MSG_ID_ATP_WO_ECFGDRP_REQ,
+    MSG_ID_ATP_WO_EIFCONFIG_REQ,
+    MSG_ID_ATP_WO_EPOF_REQ,
+    MSG_ID_ATP_WO_EWOTEST_REQ,
+
+    // From D2RM
+    MSG_ID_D2RM_WO_ACT_DATA_CALL_REQ,
+    MSG_ID_D2RM_WO_DEACT_DATA_CALL_REQ,
+    MSG_ID_D2RM_WO_ABORT_DATA_CALL_REQ,
+    MSG_ID_D2RM_WO_PDN_HO_NOTIFY_REQ,
+    MSG_ID_D2RM_WO_GET_DATA_CALL_LIST_REQ,
+    MSG_ID_D2RM_WO_GET_DYNAMIC_PARAM_REQ,
+    MSG_ID_D2RM_WO_GET_PDP_ADDRESS_REQ,
+    MSG_ID_D2RM_WO_GET_SECONDARY_DYNAMIC_PARAM_REQ,
+    MSG_ID_D2RM_WO_GET_QOS_REQ,
+    MSG_ID_D2RM_WO_GET_TFT_REQ,
+    MSG_ID_D2RM_WO_SET_PACKET_FILTER_REQ,
+    MSG_ID_D2RM_WO_GET_PACKET_FILTER_REQ,
+    MSG_ID_D2RM_WO_MODIFY_DATA_CALL_REQ,
+    MSG_ID_D2RM_WO_GET_RETRYTMR_REQ,
+    MSG_ID_D2RM_WO_SET_RETRYTMR_REQ,
+
+    MSG_ID_WO_D2RM_GET_EPDG_INFO_CNF,
+    MSG_ID_WO_D2RM_GET_EPDG_INFO_IND,
+
+    MSG_ID_D2RM_WO_PDN_BIND_REQ,
+    MSG_ID_D2RM_WO_PDN_UNBIND_REQ,
+
+    // To D2RM
+    MSG_ID_D2RM_WO_ACT_DATA_CALL_CNF,
+    MSG_ID_D2RM_WO_DEACT_DATA_CALL_CNF,
+    MSG_ID_D2RM_WO_ABORT_DATA_CALL_CNF,
+    MSG_ID_D2RM_WO_GET_DATA_CALL_LIST_CNF,
+    MSG_ID_D2RM_WO_GET_DYNAMIC_PARAM_CNF,
+    MSG_ID_D2RM_WO_GET_PDP_ADDRESS_CNF,
+    MSG_ID_D2RM_WO_GET_SECONDARY_DYNAMIC_PARAM_CNF,
+    MSG_ID_D2RM_WO_GET_QOS_CNF,
+    MSG_ID_D2RM_WO_GET_TFT_CNF,
+    MSG_ID_D2RM_WO_GET_PACKET_FILTER_CNF,
+    MSG_ID_D2RM_WO_SET_PACKET_FILTER_CNF,
+    MSG_ID_D2RM_WO_MODIFY_DATA_CALL_CNF,
+    MSG_ID_D2RM_WO_GET_RETRYTMR_CNF,
+    MSG_ID_D2RM_WO_SET_RETRYTMR_CNF,
+
+    MSG_ID_D2RM_WO_PDN_DISCONN_IND,
+    MSG_ID_D2RM_WO_GET_DATA_CALL_LIST_IND,
+    MSG_ID_D2RM_WO_GET_DYNAMIC_PARAM_IND,
+    MSG_ID_D2RM_WO_GET_PDP_ADDRESS_IND,
+    MSG_ID_D2RM_WO_GET_SECONDARY_DYNAMIC_PARAM_IND,
+    MSG_ID_D2RM_WO_GET_QOS_IND,
+    MSG_ID_D2RM_WO_GET_TFT_IND,
+    MSG_ID_D2RM_WO_GET_PACKET_FILTER_IND,
+    MSG_ID_D2RM_WO_PING_STATUS_IND,
+    MSG_ID_D2RM_WO_MODIFY_DATA_CALL_IND,
+    MSG_ID_D2RM_WO_RST_RETRYTMR_IND,
+
+    MSG_ID_WO_D2RM_GET_EPDG_INFO_REQ,
+
+    MSG_ID_D2RM_WO_PDN_BIND_CNF,
+    MSG_ID_D2RM_WO_PDN_UNBIND_CNF,
+
+    // From IWLAN
+    MSG_ID_IWLAN_WO_DPD_REQ,
+
+    // To IWLAN
+    MSG_ID_IWLAN_WO_DPD_CNF,
+    MSG_ID_IWLAN_WO_STATUS_IND,
+    MSG_ID_IWLAN_WO_MOBIKE_IND,
+
+    // To internal module
+    MSG_ID_WO_ADPT_PENDING_WOMSG_REQ,
+
+MODULE_MSG_END( MSG_ID_WO_CODE_TAIL )
+
+#endif  //_WO_MSGID_H
+
diff --git a/mcu/interface/sap/md/xcap_msgid.h b/mcu/interface/sap/md/xcap_msgid.h
new file mode 100644
index 0000000..2349a6e
--- /dev/null
+++ b/mcu/interface/sap/md/xcap_msgid.h
@@ -0,0 +1,274 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   xcap_msgid.h
+ *
+ * Description:
+ * ------------
+ *   XCAP 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!
+ *
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+
+
+#include "module_msg_range.h"
+
+#ifndef _XCAP_MSGID_H
+#define _XCAP_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_XCAP_CODE_BEGIN ) 
+// MOD_XCAP
+/* ATP --> XCAP Client */
+MSG_ID_ATP_XCAP_IMS_REG_STATUS_IND,
+MSG_ID_ATP_XCAP_XUI_INFO_IND,
+MSG_ID_ATP_XCAP_EGBA_ATCMD_REQ,
+MSG_ID_ATP_XCAP_EXCAPUAS_IND,
+// ATP --> MOD_XCAP_CM
+MSG_ID_ATP_XCAP_CONN_MGR_EGREG_IND, //get ps state
+MSG_ID_ATP_XCAP_CONN_MGR_EIREG_IND, //get ims rat
+MSG_ID_ATP_XCAP_ECNCFG_IND,         //get mobile data and roaming
+MSG_ID_ATP_XCAP_EVODATA_IND,        //get vodata state
+
+// MOD_XCAP_CLIENT
+MSG_ID_SSDS_XCAP_SS_ATCMD_REQ,
+MSG_ID_SSDS_XCAP_SS_CSFB_START_REQ,
+MSG_ID_XCAP_CLIENT_MGR_EXE_TIMEOUT_IND,
+MSG_ID_XCAP_SIM_MGR_FORCE_ABORT_IND,
+MSG_ID_XCAP_SIM_MGR_FORCE_ABORT_CNF,
+MSG_ID_SSDS_XCAP_STKSS_REQ,
+
+// MOD_XCAP_CM
+MSG_ID_XCAP_CONN_MGR_CREATE_CONNECTION_REQ,
+MSG_ID_XCAP_CONN_MGR_CREATE_CONNECTION_RSP,
+MSG_ID_XCAP_CONN_MGR_CLOSE_CONNECTION_IND,
+MSG_ID_XCAP_CONN_MGR_CLOSE_CONNECTION_CNF,
+MSG_ID_XCAP_CONN_MGR_DISCONNECTION_REQ,
+MSG_ID_XCAP_CONN_MGR_DISCONNECTION_RSP,
+MSG_ID_XCAP_CONN_MGR_SIM_ERROR_IND,
+MSG_ID_XCAP_CONN_MGR_SIM_ERROR_CNF,
+MSG_ID_XCAP_CONN_MGR_SS_ATCMD_CNF,
+MSG_ID_XCAP_CONN_MGR_NO_PDN_RELEASE_IND,
+MSG_ID_XCAP_CONN_MGR_NO_PS_CONTINUE_CREATE_IND,
+MSG_ID_XCAP_CONN_MGR_RELEASE_TIMEOUT_IND,
+MSG_ID_XCAP_CONN_MGR_RETRY_TIMEOUT_IND,
+// MOD_XCAP_SIM_MGR
+MSG_ID_XCAP_SIM_MGR_QUERY_SIM_INFO_REQ,
+MSG_ID_XCAP_SIM_MGR_QUERY_SIM_INFO_RSP,
+MSG_ID_XCAP_SIM_MGR_GBA_AUTH_REQ,
+MSG_ID_XCAP_SIM_MGR_GBA_AUTH_RSP,
+MSG_ID_XCAP_SIM_MGR_AKA_AUTH_REQ,
+MSG_ID_XCAP_SIM_MGR_AKA_AUTH_RSP,
+MSG_ID_XCAP_SIM_MGR_GBABP_WRITE_REQ,
+MSG_ID_XCAP_SIM_MGR_GBABP_WRITE_RSP,
+MSG_ID_XCAP_SIM_MGR_SIM_ERROR_IND,
+MSG_ID_XCAP_SIM_MGR_SIM_ERROR_CNF,
+// MOD_XCAP_CONFIG
+MSG_ID_XCAP_CONFIG_RECONFIG_IND,
+MSG_ID_XCAP_CONFIG_RECONFIG_CNF,
+MSG_ID_XCAP_CONFIG_DSBP_RECONFIG_IND,
+MSG_ID_XCAP_CONFIG_DSBP_RECONFIG_CNF,
+MSG_ID_ATP_XCAP_EXCAPCFGSET_REQ,
+MSG_ID_ATP_XCAP_EXCAPCFGGET_REQ,
+MSG_ID_XCAP_CONFIG_DUMP_REQ,
+MSG_ID_XCAP_CONFIG_DUMP_CNF,
+// MOD_XCAP_GBA
+
+MSG_ID_XCAP_GBA_UA_SEND_REQ,
+MSG_ID_XCAP_GBA_UA_SEND_RSP,
+MSG_ID_XCAP_GBA_UA_SIM_ERROR_IND,
+MSG_ID_XCAP_GBA_UA_SIM_ERROR_CNF,
+MSG_ID_XCAP_GBA_UA_FORCE_ABORT_IND,
+MSG_ID_XCAP_GBA_UA_FORCE_ABORT_CNF,
+MSG_ID_XCAP_GBA_UB_SEND_REQ,
+MSG_ID_XCAP_GBA_UB_SEND_RSP,
+MSG_ID_XCAP_GBA_UB_SIM_ERROR_IND,
+MSG_ID_XCAP_GBA_UB_SIM_ERROR_CNF,
+MSG_ID_XCAP_GBA_UB_FORCE_ABORT_IND,
+MSG_ID_XCAP_GBA_UB_FORCE_ABORT_CNF,
+MSG_ID_XCAP_GBA_UB_AT_EGBA_REQ,
+MSG_ID_XCAP_GBA_UB_AT_EGBA_RSP,
+MSG_ID_XCAP_GBA_READY_IND,
+MSG_ID_XCAP_GBA_READY_CNF,
+
+// MOD_XCAP_HTTP_CONNECTION
+MSG_ID_XCAP_HTTP_CONNECTION_READY_IND,
+MSG_ID_XCAP_HTTP_CONNECTION_READY_CNF,
+MSG_ID_XCAP_HTTP_CONNECTION_SEND_HTTP_REQ,
+MSG_ID_XCAP_HTTP_CONNECTION_SEND_HTTP_RSP,
+MSG_ID_XCAP_HTTP_CONNECTION_PDN_ON_IND,
+MSG_ID_XCAP_HTTP_CONNECTION_PDN_OFF_IND,
+MSG_ID_XCAP_HTTP_CONNECTION_FORCE_ABORT_IND,
+MSG_ID_XCAP_HTTP_CONNECTION_FORCE_ABORT_CNF,
+MSG_ID_XCAP_HTTP_CONNECTION_FORCE_CLOSE_CONNECTION_IND,
+
+// MOD_XCAP_DNS
+MSG_ID_XCAP_DNS_NAPTR_RESOLVE_REQ,
+MSG_ID_XCAP_DNS_NAPTR_RESOLVE_RSP,
+MSG_ID_XCAP_DNS_A_AAA_RESOLVE_REQ,
+MSG_ID_XCAP_DNS_A_AAA_RESOLVE_RSP,
+
+// please align these msg_id with AP side
+// MOD_XCAP_HTTP_DELEGATE
+#if !defined(__HTTP_TLS_SUPPORT__)
+MSG_ID_XCAP_AP_SIDE_MODULE_START,
+MSG_ID_XCAP_HTTP_DELEGATE_SEND_HTTP_REQ = MSG_ID_XCAP_AP_SIDE_MODULE_START,
+MSG_ID_XCAP_HTTP_DELEGATE_SEND_HTTP_RSP,
+MSG_ID_XCAP_HTTP_DELEGATE_READY_IND,
+MSG_ID_XCAP_HTTP_DELEGATE_READY_CNF,
+MSG_ID_XCAP_AP_SIDE_MODULE_END,
+#else
+MSG_ID_XCAP_HTTP_TLS_SEND_HTTP_REQ,
+MSG_ID_XCAP_AP_SIDE_MODULE_START = MSG_ID_XCAP_HTTP_TLS_SEND_HTTP_REQ,
+MSG_ID_XCAP_HTTP_DELEGATE_SEND_HTTP_REQ = MSG_ID_XCAP_HTTP_TLS_SEND_HTTP_REQ,
+MSG_ID_XCAP_HTTP_TLS_SEND_HTTP_RSP,
+MSG_ID_XCAP_HTTP_DELEGATE_SEND_HTTP_RSP = MSG_ID_XCAP_HTTP_TLS_SEND_HTTP_RSP,
+MSG_ID_XCAP_HTTP_TLS_READY_IND,
+MSG_ID_XCAP_HTTP_DELEGATE_READY_IND = MSG_ID_XCAP_HTTP_TLS_READY_IND,
+MSG_ID_XCAP_HTTP_TLS_READY_CNF,
+MSG_ID_XCAP_HTTP_DELEGATE_READY_CNF = MSG_ID_XCAP_HTTP_TLS_READY_CNF,
+MSG_ID_XCAP_HTTP_TLS_END,
+MSG_ID_XCAP_AP_SIDE_MODULE_END = MSG_ID_XCAP_HTTP_TLS_END,
+#endif
+
+// please align these msg_id with MD side
+
+// MOD_XCAP_MD_AGENT
+MSG_ID_XCAP_MD_AGENT_SEND_HDR_DONE_IND,
+MSG_ID_XCAP_MD_AGENT_RECV_HDR_DONE_IND,
+
+/*IMC -> XCAP*/
+MSG_ID_XCAP_IMC_IMS_DEREG_CNF,                             /*IMS deregistration cnf*/
+MSG_ID_XCAP_IMC_IMS_CALL_STATUS_IND,                       /*IMS call status*/
+
+
+MODULE_MSG_END( MSG_ID_XCAP_CODE_TAIL )
+
+#endif  /* _XCAP_MSGID_H */
diff --git a/mcu/interface/sap/md/xl1r_msgid.h b/mcu/interface/sap/md/xl1r_msgid.h
new file mode 100644
index 0000000..3da92da
--- /dev/null
+++ b/mcu/interface/sap/md/xl1r_msgid.h
@@ -0,0 +1,71 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *  el1b_msgid.h
+ *
+ * Project:
+ * --------
+ *  U4G adaptor
+ *
+ * Description:
+ * ------------
+ *  XL1R message id definitions
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ *
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef XL1R_MSGID_H
+#define XL1R_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_XL1R_CODE_BEGIN )
+/****************************************************************************/
+
+MSG_ID_XL1R_DATA_IND                = MSG_ID_XL1R_CODE_BEGIN,
+MSG_ID_XL1R_LISR_USB_MSG, 
+/****************************************************************************/
+MODULE_MSG_END( MSG_ID_XL1R_CODE_TAIL )
+
+#endif /* XL1R_MSGID_H */
diff --git a/mcu/interface/sap/md_drv_sap.h b/mcu/interface/sap/md_drv_sap.h
new file mode 100644
index 0000000..e01696c
--- /dev/null
+++ b/mcu/interface/sap/md_drv_sap.h
@@ -0,0 +1,14 @@
+#ifndef MD_DRV_SAP_H
+#define MD_DRV_SAP_H
+
+#include "sap_range.h"
+
+MODULE_SAP_BEGIN(SAP_ID_MD_DRV_CODE_BEGIN)
+	CMUX_SAP = SAP_ID_MD_DRV_CODE_BEGIN,
+	DRIVER_PS_SAP,
+	L4C_CMUX_SAP,
+	DPMAIFDRV_DP_SAP,
+	DPMAIFDRV_DP_RETRY_SAP,
+MODULE_SAP_END(SAP_ID_MD_DRV_CODE_TAIL)
+
+#endif /* MD_DRV_SAP_H */
diff --git a/mcu/interface/sap/md_mmi_sap.h b/mcu/interface/sap/md_mmi_sap.h
new file mode 100644
index 0000000..da1bc8c
--- /dev/null
+++ b/mcu/interface/sap/md_mmi_sap.h
@@ -0,0 +1,11 @@
+#ifndef MD_MMI_SAP_H
+#define MD_MMI_SAP_H
+
+#include "sap_range.h"
+
+MODULE_SAP_BEGIN(SAP_ID_MD_MMI_CODE_BEGIN)
+	MMI_AS_SAP = SAP_ID_MD_MMI_CODE_BEGIN,
+	MMI_L4C_SAP,
+MODULE_SAP_END(SAP_ID_MD_MMI_CODE_TAIL)
+
+#endif /* MD_MMI_SAP_H */
diff --git a/mcu/interface/sap/md_mw_sap.h b/mcu/interface/sap/md_mw_sap.h
new file mode 100644
index 0000000..8fcbc83
--- /dev/null
+++ b/mcu/interface/sap/md_mw_sap.h
@@ -0,0 +1,38 @@
+#ifndef MD_MW_SAP_H
+#define MD_MW_SAP_H
+
+#include "sap_range.h"
+
+MODULE_SAP_BEGIN(SAP_ID_MD_MW_CODE_BEGIN)
+	CSM_VT_SAP = SAP_ID_MD_MW_CODE_BEGIN,
+	DATA_MPAL_SAP,
+	EXTMODEM_PPP_SAP,
+	FT_FTA_SAP,
+	FT_FTC_SAP,
+	FTA_FT_SAP,
+	FTC_FT_SAP,
+	GPS_LCSP_SAP,
+	L2R_PPP_SAP,
+	NDIS_RATDM_SAP,
+	PPP_L4C_SAP,
+	RABM_NDIS_SAP,
+	RABM_PPP_SAP,
+	RABM_TCPIP_SAP,
+	RATDM_PPP_SAP,
+	RATDM_TCPIP_SAP, 
+	SMSAL_SOC_SAP,
+	SNDCP_PPP_SAP,
+	PPP_RAT_TCM_SAP,
+	TCM_TCPIP_SAP,
+	TDT_PPP_SAP,
+	UPS_SAP,
+	VT_CSR_SAP,
+	VT_F_CSR_SAP,
+	VT_L4C_SAP,
+	VT_SAP,
+    FT_MMRF_SAP,
+    LTECSR_EPDCP_SAP,
+    N3SAM_WT_SAP,
+MODULE_SAP_END(SAP_ID_MD_MW_CODE_TAIL)
+
+#endif // MD_MW_SAP_H 
diff --git a/mcu/interface/sap/md_sap.h b/mcu/interface/sap/md_sap.h
new file mode 100644
index 0000000..089a558
--- /dev/null
+++ b/mcu/interface/sap/md_sap.h
@@ -0,0 +1,1657 @@
+
+#include "sap_range.h"
+
+#ifndef MD_SAP_H
+#define MD_SAP_H
+
+MODULE_SAP_BEGIN(SAP_ID_MD_CODE_BEGIN)
+    L1_L4C_SAP = SAP_ID_MD_CODE_BEGIN,
+    L4C_L1_SAP,
+    L4C_UL1_SAP,
+    L4C_EL1_SAP,
+    ADR_DRLC_SAP,
+    ADR_TL1_SAP,
+    ADR_UL1_SAP,
+    ADR_ADR_SAP,
+    AS_L4C_SAP,
+    ATCI_SAP,
+    //PROXY_ATCI_SAP,
+    ATP_IO_SAP,
+    BMC_DRLC_SAP,
+    CISS_CISS_SAP,
+    CSCE_CSE_SAP,
+    CSCE_MEME_SAP,
+    CSCE_SIBE_SAP,
+    CSCE_SLCE_SAP,
+    CSCE_TL1_SAP,
+    CSCE_UL1_SAP,
+    CSCE_USIME_SAP,
+    CSCE_LCSCE_SAP,
+    LCSCE_LMEME_SAP,
+    LCSCE_MEME_SAP,
+    LCSCE_UL1_SAP,
+    CSE_MEME_SAP,
+    CSE_RSVAU_SAP,
+    CSE_SIBE_SAP,
+    CSE_SLCE_SAP,
+    CSE_TL1_SAP,
+    CSE_UL1_SAP,
+    CSM_L2R_SAP,
+    CSM_L4C_SAP,
+    CSM_SIM_SAP,
+    CSM_T30_SAP,
+    CSM_TDT_SAP,
+    CSR_DRLC_SAP,
+    CSR_L1AUD_SAP,
+    CSR_UMAC_SAP,
+    DRIVER_L1_SAP,
+    DRLC_UMAC_SAP,
+    DRLC_URLC_SAP,
+    DT_L4C_SAP,
+    EM_L1_SAP,
+    EM_PS_SAP,
+    EXTMODEM_L4C_SAP,
+    FA_RA_SAP,
+    FT_UL1TST_SAP,
+    GAS_COMMON_SAP,
+    GAS_CSCE_SAP,
+    EAS_CSCE_SAP,
+    GAS_MEME_SAP,
+    EAS_MEME_SAP,
+    GAS_MEME_MEAS_REPORT_SAP,
+    GAS_RRCE_SAP,
+    EAS_RRCE_SAP,
+    GAS_RSVAG_SAP,
+    GAS_UL2_SAP,
+    GAS_UL2D_SAP,
+    GAS_USIME_SAP,
+    GAS_EAS_SAP,
+    GMM_RLC_SAP,
+    GMM_SM_SAP,
+    GMMREG_SAP,
+    GPS_L1_SAP,
+    GPS_SUPL_SAP,
+    GPS_UL1_SAP,
+    GPS_EL1_SAP,
+    L1_AS_SAP,
+    L1_EM_SAP,
+    L1_GAS_SAP,
+    L1_L1_SAP,
+    L1_LAPDM_SAP,
+    L1_MPAL_SAP,
+    L1_GL1PCORE_SAP,
+    L1_UAS_SAP,
+    L1HISR_AS_SAP,
+    L1HISR_GAS_SAP,
+    L2R_RLP_SAP,
+    L2R_SMU_SAP,
+    L4_AUD_SAP,
+    L4C_MEME_SAP,
+    L4C_RRCE_SAP,
+    L4C_RATDM_SAP,
+    L4C_RRLP_SAP, //agps_up_cp_conflict
+    L4C_SAP,
+	CCCI_L4C_SAP,
+    PSDM_L4C_SAP,
+    LAPDM_MPAL_SAP,
+    LLC_GMM_SAP,
+    LLC_RLC_SAP,
+    LLC_SMS_SAP,
+    LLC_SNDCP_SAP,
+    MAC_L1_SAP,
+    MAC_MPAL_SAP,
+    MAC_RRM_SAP,
+    MEME_DRLC_SAP,
+    MEME_SIBE_SAP,
+    MEME_SLCE_SAP,
+    MEME_TL1_SAP,
+    MEME_TL1_MEAS_REPORT_SAP,
+    MEME_UL1_SAP,
+    MEME_UMAC_SAP,
+    MEME_LMEME_SAP,
+    LMEME_UL1_SAP,
+    MM_AS_SAP,
+    MM_CC_SAP,
+    MM_RATCM_SAP,
+    MM_RATDM_SAP,
+    MM_SIM_SAP,
+    MM_SMS_SAP,
+    MM_SS_SAP,
+    MMREG_SAP,
+    MNCC_SAP,
+    MNSMS_SAP,
+    MNSS_SAP,
+    MPAL_L1_SAP,
+    MPAL_UL1_SAP,
+    PDCP_DRLC_SAP,
+    PDCP_RABM_SAP,
+    PDCP_URLC_SAP,
+    PHB_L4C_SAP,
+    PS_SIM_SAP,
+    PSDM_SAP,
+    RAC_L4C_SAP,
+    RAC_MEME_SAP,
+    RATCM_BMC_SAP,
+    RATCM_CSCE_SAP,
+    RATCM_CSE_SAP,
+    RATCM_CSR_SAP,
+    RATCM_GAS_SAP,
+    RATCM_L4C_SAP,
+    RATCM_LLC_SAP,
+    RATCM_RATDM_SAP,
+    RATCM_RLC_SAP,
+    RATCM_RRCE_SAP,
+    RATCM_SLCE_SAP,
+    RATCM_URLC_SAP,
+    RATCM_USIME_SAP,
+    RATCM_UL2_SAP,
+    RATCM_UL2D_SAP,
+    RATDM_RABM_SAP,
+    RATDM_RATDM_SAP,
+    RATDM_SNDCP_SAP,
+    RATDM_URLC_SAP,
+    RATDM_PDCP_SAP,
+    RATDM_EPDCP_SAP,
+    LTM_EPDCP_SAP = RATDM_EPDCP_SAP,
+    RATDM_EMAC_SAP,
+    LTM_EMAC_SAP = RATDM_EMAC_SAP,
+    RATDM_SDAP_SAP,
+    RATDM_ENPDCP_SAP,
+    RLC_MAC_SAP,
+    RLC_MPAL_SAP,
+    MPAL_MPAL_SAP,
+    RLC_REASM_SAP,
+    RLC_RRM_SAP,
+    RLP_RA_SAP,
+    RR_PRR_SAP,
+    RR_RRLP_SAP,
+    RRCE_BMC_SAP,
+    RRCE_CSCE_SAP,
+    RRCE_DRLC_SAP,
+    RRCE_MEME_SAP,
+    RRCE_PDCP_SAP,
+    RRCE_RABM_SAP,
+    RRCE_RRCE_SAP,
+    RRCE_SIBE_SAP,
+    RRCE_SLCE_SAP,
+    RRCE_TL1_SAP,
+    RRCE_UL1_SAP,
+    RRCE_UMAC_SAP,
+    RRCE_URLC_SAP,
+    RRCE_USIME_SAP,
+	RRCE_LRRCE_SAP,//TISE PAGING,LRRCE->RRCE
+	LRRCE_LURLC_SAP,//TISE PAGING,LURLC->LRRCE
+    RRLP_GAS_SAP,
+    RRLP_RATCM_SAP,
+    RRM_LAPDM_SAP,
+    RRM_MPAL_SAP,
+    RSVAK_SAP,
+    RSVAU_UL1_SAP,
+    SEQ_SEQ_SAP,
+    SEQ_UL1_SAP,
+    SIBE_SLCE_SAP,
+    SIBE_TL1_SAP,
+    SIBE_UL1_SAP,
+    SLCE_BMC_SAP,
+    SLCE_CSR_SAP,
+    SLCE_PDCP_SAP,
+    SLCE_RABM_SAP,
+    SLCE_RSVAU_SAP,
+    SLCE_SLCE_SAP,
+    SLCE_TL1_SAP,
+    SLCE_UL1_SAP,
+    SLCE_UL2SEQ_SAP,
+    SLCE_UMAC_SAP,
+    SLCE_URLC_SAP,
+    SM_RATDM_SAP,
+    SM_SNDCP_SAP,
+    SME_TIMER_SAP,
+    TCM_PAM_SAP, // UGTCM <--> PAM
+    SMREG_SAP, // PAM <--> SM
+    SMSAL_AS_SAP,
+    SMSAL_L4C_SAP,
+    SMSAL_RATCM_SAP,
+    SMU_L4C_SAP,
+    SNDCP_REG_SAP,
+    T30_FA_SAP,
+    T30_L4C_SAP,
+    L4C_RAT_TCM_SAP,
+    RAT_TCM_TCM_SAP,
+    TCM_RATDM_SAP,
+    TL1_FTA_SAP,
+    TL1_LL1_SAP,
+    TL1_TL1_SAP,
+    TL1_TL1DATA_SAP,
+    TL1_TL1HISR_SAP,
+    UAGPS_CP_CSCE_SAP,
+    UAGPS_CP_L4C_SAP,
+    UAGPS_CP_MEME_SAP,
+    UAGPS_CP_RATCM_SAP,
+    UAGPS_CP_SIBE_SAP,
+    UAS_GAS_SAP,
+    UAS_L1_SAP,
+    UEM_L4C_SAP,
+    UL1_L1_SAP,
+    UL1_L4C_SAP,
+    UL1_MPAL_SAP,
+    UL1_UL1_SAP,
+    UL1_UL1DATA_SAP,
+    UL1C_SAP,
+    UL1HISR_UL1_SAP,
+    UL1SM_SAP,
+    UL1_L1SP_SAP,
+    UL1TST_FT_SAP,
+    UMAC_SEQ_SAP,
+    UMAC_TL1_SAP,
+    UMAC_TL1DATA_SAP,
+    UMAC_UL1_SAP,
+    UMAC_UL1PCORE_SAP,
+    UMAC_UL2ACCRXHISR_SAP,
+    UMAC_UMAC_SAP,
+    URLC_SEQ_SAP,
+    URLC_UL1_SAP,
+    URLC_UL2ACCRXHISR_SAP,
+    URLC_UMAC_SAP,
+    URLC_URLC_SAP,
+    URR_RSVAU_SAP,
+    URR_SAP,
+    LURR_SAP,
+    GISE_SAP,
+    EAS_SAP,
+    EAS_RSVAE_SAP,
+    WISE_L4C_SAP,
+    DRLC_L2HWREASSIM_SAP,
+    UL2_L2HWACCSIM_SAP,
+    UL2_L2HWREASMSIM_SAP,
+    L1SIM_MAIN_TASK_SAP,
+    PROCCPU_TASK_SAP,
+    HAPLUS_TASK_SAP,
+    UEGW_L4C_SAP,
+    VMMI_L4C_SAP,
+    /* Add for LTE LAS related */
+    ERRC_LAS_SAP,
+    LAS_EL1_SAP,
+    LAS_EL1MPC_SAP,
+    MOB_LMOB_SAP,
+    LMOB_EL1_SAP,
+    LMOB_EL1MPC_SAP,
+    LMOB_LMEME_SAP,
+    LMOB_GISE_SAP,
+    MOB_LMEME_SAP, //for original LMOB to LMEME_FDD/TDD usage
+    MOB_GISE_SAP, //for original LMOB to GISE usage
+    /* Add by LTE SS for LTE related */
+    CLDMACORE_EL1_SAP,
+    ERRC_EL1_SAP,
+    ERRC_EL1MPC_SAP,
+    ERRC_NL1_SAP,
+    EMAC_EL1_SAP,
+    EL1HISR_EL1_SAP,
+    EL1_EL1_SAP,
+    EL1_EL1MPC_SAP,
+    EL1_EL1_PHS_SAP,
+    EL1_EL1_TX_SAP,
+    EL1_EL1_LOW_PRIO_SAP,
+    EL1_EL2_SAP,
+    EL1_L4C_SAP,
+    EMAC_EL1TX_SAP,
+    EL1_EL1TX_SAP,
+    LTE_DYN_SAP,
+    LTT_SAP, /* SAP added for LTT module use */
+	UTT_SAP,
+    L1_MLL1_SAP, /* for MM LL1 sap*/
+    MLL1_L1_SAP,
+    UL1_MLL1_SAP,
+    MLL1_UL1_SAP,
+    TL1_MLL1_SAP,
+    MLL1_TL1_SAP,
+    EL1_MLL1_SAP,
+    MLL1_EL1_SAP,
+    NL1_MLL1_SAP,
+    MLL1_NL1_SAP,
+    LTE_TIMER_SAP,
+    UPCM_SAP,
+    UPCM_IMS_SAP,
+    UPCM_DESC_SAP,
+    UPCM_UL_IP_TAG_ALL_PKT_SAP,
+    UPCM_DL_IP_TAG_ALL_PKT_SAP,
+    LTM_SAP,
+    HISR_EMAC_SAP,
+    SIM_SIM_SAP,
+    L4C_SM_SAP,
+    NRRC_NL1_SAP,
+    NMAC_NL1_SAP,
+    NMAC_NL1_SLIM_SAP,
+    EL1_NL1_SAP,
+    EL1MPC_NL1_SAP,  // __EL1_LPP_INTER_RAT_RSTD_SUPPORT_- 
+    NL1_EL1MPC_SAP,  // __EL1_LPP_INTER_RAT_RSTD_SUPPORT_ 
+    NL1_MMRF_XL1TST_SAP,
+    NL1_NL1_SAP,
+    NL1_NL1ICD_SAP,
+    NL1_L4C_SAP,
+
+    /* IDC */
+    EL1_IDC_SAP,
+    IDC_EL1_SAP,
+    NL1_IDC_SAP,
+    IDC_NL1_SAP,
+    EL1MPC_IDC_SAP,
+    IDC_EL1MPC_SAP,
+    ERRC_IDC_SAP,
+    IDC_ERRC_SAP,
+    EMAC_IDC_SAP,
+    IDC_EMAC_SAP,
+    IDC_CONSYS_SAP,
+    CONSYS_IDC_SAP,
+
+#if defined(CHIP10992)
+    IDC_L5_SAP,
+    L5_IDC_SAP,
+#endif
+    /* TFTLIB */
+    TFTLIB_SAP,
+    TFTLIB2_SAP,
+    TFTLIB_DHL_SAP,
+    TFTLIB_VGSM_SAP,
+
+    /* NWSEL */
+    RAC_NWSEL_SAP,
+    NWSEL_MM_SAP,
+    NWSEL_RATCM_SAP,
+    NWSEL_RATDM_SAP,
+    PAM_NWSEL_SAP,
+    NWSEL_USIME_SAP,
+    DDM_NWSEL_SAP,
+    /** ESM related SAP **/
+    SM_ESM_SAP,
+    ESM_RATDM_SAP,
+    ESM_LTM_SAP = ESM_RATDM_SAP,
+    NIL_ESM_SAP,
+    ESM_ESM_SAP,
+
+    /** ETC related SAP **/
+    L4C_ESM_SAP, // L4C <--> ESM
+    ESMREG_SAP, // PAM <--> ESM
+    UPCM_ETC_SAP,
+    ETC_EMM_SAP,
+    SMS_EMM_SAP,
+    ETC_NRRC_SAP,
+    ETC_VGMM_SAP,
+
+    /** EVAL related SAP **/
+    NWSEL_EVAL_SAP,
+    RAC_EVAL_SAP,
+    TCM_EVAL_SAP,
+    L4C_EVAL_SAP,
+    SMS_EVAL_SAP,
+    SMSAL_EVAL_SAP,
+    CISS_EVAL_SAP,
+    EVAL_EMM_SAP,
+    EVAL_ESM_SAP,
+    EVAL_ETC_SAP,
+    EVAL_ERRC_SAP,
+    EVAL_ERRC_TEMP_SAP,
+    EVAL_UPCM_SAP,
+
+    /* EMM External Related SAP (by layer order) */
+    EMM_ERRC_SAP,
+    ESM_EMM_SAP,
+    MM_EMM_SAP,
+    EMM_ENPDCP_SAP,
+
+    /* EMM Internal Related SAP (by alphabetical order) */
+    EMM_CALL_CONN_SAP,
+    EMM_CALL_ERRCIF_SAP,
+    EMM_CALL_ESMIF_SAP,
+    EMM_CALL_EVALIF_SAP,
+    EMM_CALL_MSPMIF_SAP,
+    EMM_CALL_EVTCTRL_SAP,
+    EMM_CALL_MMIF_SAP,
+    EMM_CALL_NASMSG_SAP,
+    EMM_CALL_PLMNSEL_SAP,
+    EMM_CALL_RATBAND_SAP,
+    EMM_CALL_RATCHG_SAP,
+    EMM_CALL_REG_SAP,
+    EMM_CALL_SEC_SAP,
+    EMM_CALL_SV_SAP,
+    EMM_CALL_TIMERMNG_SAP,
+    EMM_CMNPROC_ERRCIF_SAP,
+    EMM_CMNPROC_EVALIF_SAP,
+    EMM_CMNPROC_NASMSG_SAP,
+    EMM_CMNPROC_PLMNSEL_SAP,
+    EMM_CMNPROC_REG_SAP,
+    EMM_CONN_ERRCIF_SAP,
+    EMM_CONN_ESMIF_SAP,
+    EMM_CONN_ETCIF_SAP,
+    EMM_CONN_EVALIF_SAP,
+    EMM_CONN_EVTCTRL_SAP,
+    EMM_CONN_NASMSG_SAP,
+    EMM_CONN_PLMNSEL_SAP,
+    EMM_CONN_RATBAND_SAP,
+    EMM_CONN_RATCHG_SAP,
+    EMM_CONN_REG_SAP,
+    EMM_CONN_SEC_SAP,
+    EMM_CONN_SV_SAP,
+    EMM_CONN_TIMERMNG_SAP,
+    EMM_ERRCIF_ESMIF_SAP,
+    EMM_ERRCIF_ETCIF_SAP,
+    EMM_ERRCIF_EVTCTRL_SAP,
+    EMM_ERRCIF_NASMSG_SAP,
+    EMM_ERRCIF_PLMNSEL_SAP,
+    EMM_ERRCIF_RATBAND_SAP,
+    EMM_ERRCIF_RATCHG_SAP,
+    EMM_ERRCIF_REG_SAP,
+    EMM_ERRCIF_SEC_SAP,
+    EMM_ERRCIF_SV_SAP,
+    EMM_ESMIF_NASMSG_SAP,
+    EMM_ESMIF_RATCHG_SAP,
+    EMM_ESMIF_REG_SAP,
+    EMM_ESMIF_SV_SAP,
+    EMM_ESMIF_PLMNSEL_SAP, // for IMS
+    EMM_ESMIF_SEC_SAP, // for IMS
+    EMM_ESMIF_TIMERMNG_SAP,
+    EMM_ETCIF_NASMSG_SAP,
+    EMM_ETCIF_REG_SAP,
+    EMM_ETCIF_SV_SAP,
+    EMM_ETCIF_TIMERMNG_SAP,
+    EMM_ETCIF_PLMNSEL_SAP,
+    EMM_EVALIF_ERRCIF_SAP,
+    EMM_EVALIF_NASMSG_SAP,
+    EMM_EVALIF_PLMNSEL_SAP,
+    EMM_EVALIF_RATBAND_SAP,
+    EMM_EVALIF_RATCHG_SAP,
+    EMM_EVALIF_REG_SAP,
+    EMM_EVALIF_SEC_SAP,
+    EMM_EVALIF_SV_SAP,
+    EMM_EVALIF_TIMERMNG_SAP,
+    EMM_EVTCTRL_PLMNSEL_SAP,
+    EMM_EVTCTRL_RATBAND_SAP,
+    EMM_EVTCTRL_RATCHG_SAP,
+    EMM_EVTCTRL_REG_SAP,
+    EMM_EVTCTRL_SV_SAP,
+    EMM_EVTCTRL_TIMERMNG_SAP,
+    EMM_MMIF_RATCHG_SAP,
+    EMM_MMIF_REG_SAP,
+    EMM_MMIF_TIMERMNG_SAP,
+    EMM_MSPMIF_SEC_SAP,
+    EMM_NASMSG_PLMNSEL_SAP,
+    EMM_NASMSG_REG_SAP,
+    EMM_NASMSG_SEC_SAP,
+    EMM_PLMNSEL_RATCHG_SAP,
+    EMM_PLMNSEL_REG_SAP,
+    EMM_PLMNSEL_SEC_SAP,
+    EMM_PLMNSEL_SV_SAP,
+    EMM_PLMNSEL_TIMERMNG_SAP,
+    EMM_RATBAND_RATCHG_SAP,
+    EMM_RATBAND_REG_SAP,
+    EMM_RATBAND_SV_SAP,
+    EMM_RATBAND_TIMERMNG_SAP,
+    EMM_RATBAND_PLMNSEL_SAP,
+    EMM_RATCHG_REG_SAP,
+    EMM_RATCHG_SEC_SAP,
+    EMM_RATCHG_SV_SAP,
+    EMM_RATCHG_TIMERMNG_SAP,
+    EMM_REG_SEC_SAP,
+    EMM_REG_SV_SAP,
+    EMM_REG_TIMERMNG_SAP,
+    EMM_REG_MSPMIF_SAP,
+    EMM_SEC_SV_SAP,
+    EMM_SEC_TIMERMNG_SAP,
+    EMM_SV_TIMERMNG_SAP,
+
+    /** ERRC related SAP **/
+    //internal event use
+    EVTH_ALL_SAP,
+    RCM_CONN_SAP,
+    RCM_MOB_SAP,
+    RCM_SPV_SAP,
+    RCM_CEL_SAP,
+    RCM_LCEL_SAP,
+    CEL_CHM_SAP,
+    CEL_CONN_SAP,
+    CEL_MOB_SAP,
+    CEL_SPV_SAP,
+    CEL_SYS_SAP,
+    CHM_CONN_SAP,
+    CHM_MOB_SAP,
+    CHM_SPV_SAP,
+    CHM_SYS_SAP,
+    CONN_MOB_SAP,
+    CONN_SPV_SAP,
+    MOB_SPV_SAP,
+    SPV_SYS_SAP,
+    SPV_LSYS_SAP,
+    LCEL_CEL_SAP,
+    LCEL_SPV_SAP,
+    LSYS_SYS_SAP,
+    ERRC_CEL_SAP,
+    ERRC_CHM_SAP,
+    ERRC_CONN_SAP,
+    ERRC_MOB_SAP,
+    ERRC_RCM_SAP,
+    ERRC_SPV_SAP,
+    ERRC_SYS_SAP,
+    ERRC_LCEL_SAP,
+    ERRC_LSYS_SAP,
+    ERRC_LBS_SAP,
+    ERRC_GPS_SAP,
+
+    /* LTE L2 */
+    ERLCDL_ERLCUL_SAP,
+    ERLCUL_EMAC_SAP,
+    ERLCDL_EMAC_SAP,
+    EPDCP_ERLCDL_SAP,
+    EPDCP_ERLCUL_SAP,
+    EPDCP_EMAC_SAP,
+    ENPDCP_EMAC_SAP = EPDCP_EMAC_SAP,
+    EPDCP_EPDCP_SAP,
+    ENPDCP_ENPDCP_SAP = EPDCP_EPDCP_SAP,
+    EMAC_EMAC_SAP,
+    ERRC_EMAC_SAP,
+    ERRC_ERLCUL_SAP,
+    ERRC_ERLCDL_SAP,
+    ERRC_EPDCP_SAP,
+    ERRC_ENPDCP_SAP,
+    ERRC_EL2TASK_SAP,
+    L4C_ERLCUL_SAP,
+
+    // MT6293 New Architecture
+    EL2_ALL_SAP,
+    EL2_DEBUG_SAP,
+    EMAC_EMACDL_SAP,
+    EMACDL_EMACMCH_SAP,
+    EMACDL_ERLCDL_SAP,
+    EMACDL_EPDCP_SAP,
+    ERRC_EMACMCH_SAP,
+    EMACMCH_EL1_SAP,
+    ERLCDL_EMACMCH_SAP,
+    /* MRS */
+    MRS_CAS_SAP,
+    MRS_RAC_SAP,
+    MRS_RRM_SAP,
+    MRS_CSCE_SAP,
+    MRS_RRCE_SAP,
+    MRS_USIME_SAP,
+    MRS_SIM_SAP,
+    MRS_EAS_SAP,
+    MRS_NRRC_SAP,
+
+    /* RSVAS */
+    RSVAS_SAP,
+    RSVAS_NIL_SAP,
+    RSVAS_RSVAU_SAP,
+    RSVAS_L4C_SAP,
+    RSVAS_MRS_SAP,
+    RSVAS_URR_SAP,
+    RSVAS_RRCE_SAP,
+    RSVAS_CSCE_SAP,
+    RSVAS_UL2_SAP,
+    RSVAS_UL2D_SAP,
+    RSVAS_RRM_SAP,
+    RSVAS_MPAL_SAP,
+    RSVAS_ERRC_SAP,
+    RSVAS_EL2HPORTAL_SAP,
+    RSVAS_EMACDLPORTAL_SAP,
+    RSVAS_EL2PORTAL_SAP,
+    RSVAS_UL1_SAP,
+    RSVAS_TL1_SAP,
+    RSVAS_L1_SAP,
+    RSVAS_LL1_SAP,
+    RSVAS_EL1_SAP,
+    RSVAS_LAS_SAP,
+    RSVAS_RAC_SAP,
+    RSVAS_NRRC_SAP,
+    RSVAS_NL1_SAP,
+	RSVAS_NAS_SV_SAP,
+
+    /* MSPM */
+    MSPM_SAP,
+
+    /* EM SAP */
+    EM_EL2_SAP,
+    EM_EL1_SAP,
+    SM_SM_SAP,
+		MM_MM_SAP,
+
+	/*RAC GAS SAP for MMDS_DC*/
+	RAC_GAS_SAP,
+
+    RAT_TCM_SAP,
+    TCM_SAP,
+    GAS_TL1_SAP,
+    GAS_EL1_SAP,
+
+    /* IMC */
+    IMC_IMC_SAP,
+    ATP_IMC_SAP,
+    IMC_LTECSR_SAP,
+    IMCB_IMC_SAP,
+    DHL_IMC_SAP,
+    IMC_UPCM_SAP,
+    IMC_LBS_SAP,
+    IMC_SIMMNGR_SAP,
+
+    /* LTECSR */
+    LTECSR_ERRC_SAP,
+    LTECSR_DHL_SAP,
+
+    /* EL1 to LTECSR */
+    EL1_LTECSR_SAP,
+
+    /* SDM */
+    SDM_ATP_SAP,
+    SDM_IMC_SAP,
+    SDM_IWLAN_SAP,
+    SDM_L4C_SAP,
+
+    /* VDM */
+    VDM_ATP_SAP,
+    VDM_IMC_SAP,
+    VDM_SDM_SAP,
+    VDM_CTRL_TRK_SAP,
+    VDM_CTRL_ADS_SAP,
+    VDM_CTRL_VCC_SAP,
+    VDM_TRK_ADS_SAP,
+    VDM_TRK_VCC_SAP,
+    VDM_ADS_VCC_SAP,
+    VDM_RAC_SAP,
+    VDM_IDC_SAP,
+
+    /* IMCSMS */
+    IMCSMS_IMC_SAP,
+
+    SMSAL_SMSAL_SAP,
+
+    /* LPP SAP */
+    LCSP_GNSS_SAP,
+    LPP_EVAL_SAP,
+    LPP_ERRC_SAP,
+    LPP_LPP_SAP,
+    LPP_L4C_SAP,
+    LPP_LBS_SAP,
+    L4C_LBS_SAP,
+    ATCI_LBS_SAP,
+    LPP_LPPE_SAP,
+    LPP_NRRC_SAP,
+    LPP_ETC_SAP,
+    LPP_SASE_SAP,
+    LPP_MSPM_SAP,
+
+/* U4G adaptor.*/
+    MLL1_UL1B_SAP,
+    UMAC_UL1B_SAP,
+    SLCE_UL1B_SAP,
+    MEME_UL1B_SAP,
+    SIBE_UL1B_SAP,
+    ADR_UL1B_SAP,
+    N5GL1_NL1B_SAP,
+    N5GL1_UL1B_SAP,
+
+    ERRC_EL1B_SAP,
+    EMAC_EL1B_SAP,
+    EL1B_EL1B_SAP,
+    EMAC_EL1BTX_SAP,
+    EL1B_EL1BTX_SAP,
+    N5GL1_EL1B_SAP,
+
+    N5GL1_MNWI_SAP,
+
+    EL1B_XL1R_SAP,
+    /* MBMSAL SAP */
+    MBMSAL_SAP,
+    MBMSAL_ERRC_SAP,
+
+    /* GL1TST SAP */
+    GL1TST_FT_SAP,
+    FT_GL1TST_SAP,
+
+    /*PCORE_UMAC_HISR SAP*/
+    PCOREHISR_UMAC_SAP,
+    /* L2 copro log DMA sap */
+    L2CP_LOG_ENABLE_SAP,
+    L2CP_POLL_PERIOD_LV_SAP,
+    L2CP_BLOCK_SIZE_SAP,
+
+    /* GMSS SAP */
+    RAC_GMSS_SAP,
+    GMSS_NWSEL_SAP,
+    GMSS_LAS_SAP,
+    GMSS_CVAL_SAP,
+    GMSS_SAP,
+
+    L4C_ME_SAP,
+    /* dynamic SBP switch */
+    L4C_EL2_SAP,
+
+    /* Event scheduler: force timer expiry */
+    NIL_RRCE_EXPIRY_TIMER_SAP,
+
+    EM_LUMAC_SAP,
+
+    /* LWA */
+    L4C_ERRC_SAP,
+
+    /* L4C-MMRF SAP */
+    L4C_MMRF_SAP,
+
+    /* L4C */
+    L4C_LTECSR_SAP,
+
+    LTECSR_ATP_SAP,
+	L4C_CISS_SAP,
+
+    /* C2K SAP IDs */
+    CLEC_CPSW_SAP,
+    CLEC_CVAL_SAP,
+    CLEC_L1D_MDM_SAP,
+    CLEC_CIPC_SAP,
+    CPSW_XRLP_SAP,
+    CPSW_L1D_MDM_SAP,
+    CPSW_CVAL_SAP,
+    CPSW_CVAL_ATC_SAP,
+    CPSW_CVAL_STORAGE_SAP,
+    CPSW_CSS_SAP,
+    CPSW_EVCLC_SAP,
+    CPSW_DBM_SAP,
+    CPSW_CUIM_PROXY_SAP,
+    CPSW_SLT_SAP,
+    CPSW_CHWD_SAP,
+    CPSW_CIOP_SAP,
+    CPSW_S_CHLP_SAP,
+    CPSW_S_CPSW_SAP,
+    CPSW_SYSTEM_SAP,
+
+    LMD_XRLP_SAP,
+    LMD_CIPC_SAP,
+    LMD_L1D_MDM_SAP,
+    LMD_CPSW_SAP,
+    LMD_LMDS_SAP,
+    LMD_CHWD_SAP,
+    LMD_CVAL_SAP,
+    LMD_CVAL_ATC_SAP,
+    LMD_CVAL_STORAGE_SAP,
+    LMDS_CPSW_SAP,
+
+    CVAL_CHWD_SAP,
+    CVAL_ATC_CHWD_SAP,
+    CVAL_STORAGE_CHWD_SAP,
+    CVAL_CSS_SAP,
+    CVAL_XRLP_SAP,
+    CVAL_EVRMC_SAP,
+    CVAL_DBM_SAP,
+    CVAL_CUIM_SAP,
+    CVAL_CIOP_SAP,
+
+    CHLP_CVAL_SAP,
+    CVAL_CVAL_ATC_SAP,
+    CVAL_CLEC_SAP,
+    CVAL_CMON_SAP,
+    CVAL_CHSC_SAP,
+    CVAL_CPSW_SAP,
+    CVAL_CHLP_SAP,
+    CVAL_CSEC_SAP,
+    CVAL_VMMI_SAP,
+
+    CVAL_ATC_XRLP_SAP,
+    CVAL_ATC_EVRMC_SAP,
+    CVAL_ATC_DBM_SAP,
+    CVAL_ATC_CUIM_SAP,
+    CVAL_ATC_CIOP_SAP,
+    CVAL_ATC_CHSC_SAP,
+    CVAL_ATC_CMON_SAP,
+    CVAL_ATC_EVRCP_SAP,
+    CHLP_CVAL_ATC_SAP,
+    CVAL_ATC_SYSTEM_SAP,
+
+    CVAL_STORAGE_XRLP_SAP,
+    CVAL_STORAGE_EVRMC_SAP,
+    CVAL_STORAGE_DBM_SAP,
+    CVAL_STORAGE_CUIM_SAP,
+    CVAL_STORAGE_CIOP_SAP,
+    CHLP_CVAL_STORAGE_SAP,
+    CHLP_CUIM_PROXY_SAP,
+    CHLP_CIOP_SAP,
+    CHLP_DBM_SAP,
+    CHLP_CPSW_SAP,
+    CHLP_XRLP_SAP,
+    CHLP_CSS_SAP,
+    CHLP_EVCLC_SAP,
+    CHLP_EVFCP_SAP,
+    CHLP_EVRCP_SAP,
+    CHLP_EVSLC_SAP,
+    CHLP_CIPC_SAP,
+    CHLP_CSEC_SAP,
+    CIOP_XRLP_SAP,
+    CSEC_CVAL_SAP,
+    CSEC_CVAL_ATC_SAP,
+    CSEC_CVAL_STORAGE_SAP,
+    CSEC_CIOP_SAP,
+    CHSC_CSTUB_SAP,
+    CHSC_EVRMC_SAP,
+    CHSC_L1D_MDM_SAP,
+    CHSC_CPSW_SAP,
+    CMON_SAP,
+
+    CSS_CHSC_SAP,
+    CSS_CHLP_SAP,
+    CSS_CVAL_SAP,
+    CSS_CVAL_ATC_SAP,
+    CSS_CVAL_STORAGE_SAP,
+    CSS_DBM_SAP,
+    CSS_CUIM_PROXY_SAP,
+    CSS_CPSW_SAP,
+    CSS_EVCLC_SAP,
+    CSS_EVSLC_SAP,
+    CSS_EVRMC_SAP,
+
+    EVRMC_CSS_SAP,
+    EVRMC_EVCLC_SAP,
+    EVRMC_CHLP_SAP,
+    EVRMC_CHWD_SAP,
+    EVRMC_CIPC_SAP,
+    EVRMC_CLEC_SAP,
+    EVRMC_CIOP_SAP,
+    EVSLC_EVCLC_SAP,
+    EVSLC_EVRMC_SAP,
+    EVSLC_CPSW_S_SAP,
+    EVSLC_SLT_SAP,
+    EVFCP_EVRCP_SAP,
+    EVFCP_EVRMC_SAP,
+    EVFCP_EVCLC_SAP,
+    EVFCP_EVSLC_SAP,
+    EVFCP_CHLP_SAP,
+    EVRCP_EVRMC_SAP,
+    EVRCP_EVSLC_SAP,
+    EVRCP_EVCLC_SAP,
+    EVRCP_CHLP_SAP,
+    EVRCP_CSS_SAP,
+    EVRCP_CHWD_SAP,
+    EVCLC_CHSC_SAP,
+    EVCLC_CVAL_SAP,
+    EVCLC_CVAL_STORAGE_SAP,
+    EVCLC_CVAL_ATC_SAP,
+    EVCLC_ERRC_SAP,
+    EVCLC_L1D_MDM_SAP,
+    EVCLC_DBM_SAP,
+    EVCLC_SLT_SAP,
+    EVCLC_CHWD_SAP,
+    L1D_MDM_CVAL_SAP,
+    L1D_MDM_CVAL_STORAGE_SAP,
+    L1D_MDM_CVAL_ATC_SAP,
+    L1D_MDM_CLEC_SAP,
+    L1D_MDM_CHWD_SAP,
+    L1D_MDM_CSS_SAP,
+    L1D_MDM_CIPC_SAP,
+    CUIM_PROXY_UIM_SAP,
+    XRLP_SAP,
+    LMD_SAP,
+    LMDS_SAP,
+    CHLP_SAP,
+    CPSW_SAP,
+    EVRCP_SAP,
+    EVFCP_SAP,
+    EVCLC_SAP,
+    CVAL_SAP,
+    CVAL_ATC_SAP,
+    CSS_SAP,
+    EVSLC_SAP,
+    EVRMC_SAP,
+    CLEC_SAP,
+    EVL1_C2K_HWSIM_SAP,
+
+    CLEC_CHSC_SAP,
+
+
+    CHSC_RTTACTIONHISR_SAP,
+    LMD_RTTACTIONHISR_SAP,
+    L1D_MDM_RTTACTIONHISR_SAP,
+    CPSW_RTTACTIONHISR_SAP,
+    XRLP_RTTACTIONHISR_SAP,
+    EVCLC_RTTACTIONHISR_SAP,
+
+
+    CHSC_DOACTIONHISR_SAP,
+    LMD_DOACTIONHISR_SAP,
+    EVRCP_DOACTIONHISR_SAP,
+    EVFCP_DOACTIONHISR_SAP,
+    EVRMC_DOACTIONHISR_SAP,
+    EVCLC_DOACTIONHISR_SAP,
+
+
+    CHSC_RTTSLOTHISR_SAP,
+    LMD_RTTSLOTHISR_SAP,
+    L1D_MDM_RTTSLOTHISR_SAP,
+    CPSW_RTTSLOTHISR_SAP,
+    XRLP_RTTSLOTHISR_SAP,
+    EVCLC_RTTSLOTHISR_SAP,
+
+
+    CHSC_DOSLOTHISR_SAP,
+    LMD_DOSLOTHISR_SAP,
+    EVRCP_DOSLOTHISR_SAP,
+    EVFCP_DOSLOTHISR_SAP,
+    EVRMC_DOSLOTHISR_SAP,
+    EVCLC_DOSLOTHISR_SAP,
+
+
+    CHSC_FHMSGDELI_HISR_SAP,
+    LMD_FHMSGDELI_HISR_SAP,
+    EVRCP_FHMSGDELI_HISR_SAP,
+    L1D_MDM_FHMSGDELI_HISR_SAP,
+    CPSW_FHMSGDELI_HISR_SAP,
+    EVFCP_FHMSGDELI_HISR_SAP,
+    EVRMC_FHMSGDELI_HISR_SAP,
+    EVCLC_FHMSGDELI_HISR_SAP,
+
+
+    CHSC_SHMSGDELI_HISR_SAP,
+    LMD_SHMSGDELI_HISR_SAP,
+    EVRCP_SHMSGDELI_HISR_SAP,
+    L1D_MDM_SHMSGDELI_HISR_SAP,
+    CPSW_SHMSGDELI_HISR_SAP,
+    EVFCP_SHMSGDELI_HISR_SAP,
+    EVRMC_SHMSGDELI_HISR_SAP,
+    EVCLC_SHMSGDELI_HISR_SAP,
+    CSS_VMMI_SAP,
+    LMD_SPCH_SAP,
+    CHLP_SPY_SAP,
+
+    DBM_SAP,
+    CVAL_EVSLC_SAP,
+
+    /*For new irat sap */
+    GMSS_CSS_SAP,
+    RSVAS_CPSW_SAP,
+    RSVAS_CHSC_SAP,
+    CPSW_ERRC_SAP,
+    CHSC_MLL1_SAP,
+    VDM_CVAL_SAP,
+    SDM_CVAL_SAP,
+    EVAL_CPSW_SAP,
+    L4C_CVAL_SAP,
+    RSVAC_CSS_SAP,
+    UIM_SIM_SAP,
+    MRS_CSS_SAP,
+    IMCSMS_CVAL_SAP,
+
+    /* DHL */
+    DHL_LBS_SAP,
+
+    /* IWLAN */
+    IWLAN_ERRC_SAP,
+    IWLAN_WIPC_SAP,
+    IWLAN_ATP_SAP,
+
+    /* LHIF CORE */
+    LHIF_HW_LOG_SAP,
+    LHIF_UPCM_HW_LOG_SAP,
+
+    RATDM_CHLP_SAP,
+    CVAL_RATDM_SAP,
+
+    EVSLC_CHLP_SAP,
+
+
+    /* L4B */
+    ATP_L4B_SAP,
+//    DDM_L4BPDN_SAP,
+    L4B_ATCI_SAP,
+    L4B_CVAL_SAP,
+    L4B_L4BPWR_SAP,
+    L4BPDN_L4C_SAP,
+    L4BPDN_CVAL_SAP,
+    L4BPDN_TCM_SAP,
+    L4BPDN_SAP,
+    L4B_L4BSMS_SAP,
+    L4B_L4BSIM_SAP,
+    L4B_L4BSAT_SAP,
+    L4B_L4BSS_SAP,
+    L4B_L4BCC_SAP,
+    L4B_L4BNW_SAP,
+    L4B_L4BSBP_SAP,
+    L4BSBP_ME_SAP,
+    VDM_L4B_SAP,
+    ATP_L4BSBP_SAP,
+    L4BPWR_L4BSBP_SAP,
+
+    TCM_CVAL_SAP,
+    L4BNW_L4BPDN_SAP,
+    ATP_IO_L4C_SAP,
+    RAC_CVAL_SAP,
+    CVAL_CUIM_PROXY_SAP,
+    CVAL_ATC_CUIM_PROXY_SAP,
+    PS_CUIM_SAP,
+    L4C_META_SAP,
+
+    DDM_L4APS_SAP,
+    DDM_L4C_SAP,
+    L4APS_L4BPDN_SAP,
+    L4APS_TCM_SAP,
+
+    /*ADT TEST*/
+    L1ADT_TL1_SAP,
+    L1ADT_UL1_SAP,
+    L1ADT_EL1_SAP,
+
+     /* LPM SAP */
+    LPM_SAP,
+
+  	DUMMY_SAP, // for MoDIS UT
+
+    /* IWLAN */
+    IMSP_IWLAN_SAP,
+    IWLAN_WMOB_SAP,
+    D2RM_IWLAN_SAP,
+    IWLAN_EVHD_WMOB_SAP,
+    IWLAN_EVHD_WSEM_SAP,
+    D2RM_DDM_SAP,
+
+    /* ATP - D2/DDM */
+    ATP_IMSM_SAP,
+    ATP_D2AT_SAP,
+    ATP_D2AM_SAP,
+    ATP_D2CM_SAP,
+    ATP_D2PM_SAP,
+    ATP_DDM_SAP,
+
+	/* IMSM */
+    IMSM_DAST_SAP,
+    IMSM_SIMMNGR_SAP,
+    IMSM_D2CM_SAP,
+    IMSM_IMSM_SAP,
+
+    D2AM_DDM_SAP,
+    DHL_RAC_SAP,
+    DDM_L4BNW_SAP,
+
+    /* D2CM */
+    ME_D2CM_SAP,
+
+    /* D2UM */
+    ME_D2UM_SAP,
+    D2UM_D2APN_SAP,
+    D2UM_D2PM_SAP,
+    D2UM_D2RM_SAP,
+    D2UM_DDM_SAP,
+
+    /* D2APN */
+    ME_D2APN_SAP,
+
+    /* D2 */
+    D2_SAP,
+
+    /* D2PM */
+    ME_D2PM_SAP, 
+    D2PM_D2APN_SAP, 
+    D2PM_D2RM_SAP,
+    D2PM_DDM_SAP,
+
+    /* D2APN */
+    D2APN_D2CUST_SAP,
+
+    /* URSP */
+    D2APN_URSP_SAP, 
+    D2PM_URSP_SAP, 
+    D2RM_URSP_SAP, 
+    DDM_URSP_SAP, 
+    URSP_UPDS_SAP, 
+    URSP_VGMM_SAP, 
+
+    /* D2SSC */
+    D2SSC_D2_SAP,
+
+    /* D2UX */
+    D2UX_D2_SAP,
+
+    /*SIMMNGR*/
+    SIMMNGR_PS_SAP,
+    ATP_SIMMNGR_SAP,
+
+    DHL_SIM_SAP,
+
+    L4C_IPCORE_SAP,
+
+    IMC_IWLAN_SAP,
+    WIPC_IWLAN_SAP,
+    ATP_IWLAN_SAP,
+
+    /* WO */
+    D2RM_WO_SAP,
+    IWLAN_WO_SAP,
+    SIMMNGR_WO_SAP,
+    ATP_WO_SAP,
+    WO_L4BNW_SAP,
+    WO_ADPT_SAP,
+
+    /* WIPC */
+    WIPC_SAP,
+
+   /*RRM to RR_SMP */
+    RRM_RR_SMP_SAP,
+
+    /* CSM SAP */
+    CSM_RRCE_SAP,
+
+    L4C_CSS_SAP,
+    CPSW_L4C_SAP,
+    EVCLC_L4C_SAP,
+    EVRMC_L4C_SAP,
+    L4C_SMS_SAP,
+
+    IWLAN_LTECSR_SAP,
+
+    L1ADT_L4C_SAP,
+    D2_IMC_SAP,
+
+    /* SSDS */
+    ATP_SSDS_SAP,
+    SSDS_XCAP_SAP,
+    SSDS_SIMMNGR_SAP,
+    SSDS_D2CM_SAP,
+    IMSM_SSDS_SAP,
+    SSDS_L4C_SAP,
+    SSDS_IMC_SAP,
+
+    ATP_D2RM_SAP,
+    IMC_D2RM_SAP,
+    L4BNW_L4C_SAP,
+    L4BSBP_L4C_SAP,
+
+    DHL_L4C_SAP,
+
+    CVAL_PHB_SAP,
+
+    ATP_L4BNW_SAP,
+    D2AM_SAP,
+    CUIM_SAP,
+    IWLAN_L4C_SAP,
+    CUIM_CPSW_SAP,
+
+    IMSM_DDM_SAP,
+    CUIM_PHB_SAP,
+
+    L4BNW_CVAL_SAP,
+
+    NWSEL_NWSEL_SAP,
+    IMSM_L4BNW_SAP,
+    IWLAN_L4BNW_SAP,
+
+    /* ENL1 SAP */
+    EL1HISR_ENL1_SAP,
+    ENL1_L4C_SAP,
+    ENL1_DCLC_SAP,
+
+	/* MML1 UTAS SAP */
+	ENL1_EL1_SAP,
+	ENL1_NL1_SAP,
+
+    ATP_SLT_SAP,
+    D2RM_D2RM_SAP,
+    L4C_IMC_SAP,
+    DDM_EVAL_SAP,
+    DDM_PAM_SAP,
+
+    UL1_DCLC_SAP,
+    LIO_LBS_SAP,
+
+    ATP_L4BPWR_SAP,
+    L4BPWR_SAP,
+    VDM_L4C_SAP,
+
+    ATP_L4C_SAP,
+	ATP_SMSAL_SAP,
+	ATP_SMS_SAP,
+	SDM_SMS_SAP,
+    L4BNW_SAP,
+    VDM_DDM_SAP,
+    SSDS_SSDS_SAP,
+    TL1_DCLC_SAP,
+
+    ATP_MT_SAP,
+
+    IWLAN_L4BPWR_SAP,
+    DHL_SMU_SAP,
+	BMC_URLC_SAP,
+
+    /* NL2 SAP */
+    NRRC_NRLCDL_SAP,
+    NRRC_NRLCUL_SAP,
+    NRRC_NMAC_SAP,
+    NRLCDL_NRLCUL_SAP,
+    NRLCDL_SAP,
+    NRLCUL_SAP,
+    NRLCUL_NMAC_SAP,
+    NMACDL_SAP,
+    NMAC_SAP,
+    NRLCDL_NMAC_SAP,
+    UPCM_NMAC_SAP,
+    NRLCDL_NL1_SAP,
+    NL1_NRLCUL_SAP,
+    RSVAS_NMAC_SAP,
+    L4C_NRLCUL_SAP,
+    LHIF_NRLCUL_SAP,
+
+    /* ENPDCP SAP */
+    NRRC_ENPDCP_SAP,
+    ENPDCP_ERLCUL_SAP,
+    ENPDCP_ERLCDL_SAP,
+    ENPDCP_NRLCUL_SAP,
+    ENPDCP_NRLCDL_SAP,
+    ENPDCP_NRLCP_SAP,
+    ENPDCP_NMACDL_SAP,
+    ENPDCP_NMAC_SAP,
+    ENPDCP_NL1_SAP,
+    L2NOTIFHISR_ENPDCP_SAP,
+
+    /* ENL2_FREE SAP */
+    ENL2_FREE_SAP,
+
+    /* L2 SAP */
+    L2_ALL_SAP,
+
+    /* XCAP */
+    ATP_XCAP_SAP,
+
+    /* XCAP */
+    IMSM_XCAP_SAP,
+
+    /*MM-ERRC SAP*/
+    MM_ERRC_SAP,
+
+    /* NRRC SAP */
+    RR_NRRC_SAP,
+    RRC_NRRC_SAP,
+    ERRC_NRRC_SAP,
+    NRRC_NRRC_SAP,
+    L4C_NRRC_SAP,       /* pws */
+    SMSAL_NRRC_SAP,     /* pws */
+    NRRC_RSVAN_SAP,
+    RAC_NRRC_SAP,
+    TMC_NRRC_SAP,
+	LTECSR_NRRC_SAP,
+    ERM_NRRC_SAP,
+    GMSS_NRRC_SAP,
+
+    /* NRRC internal SAP */
+    NRRC_INT_MAIN_SCG_SAP,
+    NRRC_INT_MAIN_IDLE_SAP,
+    NRRC_INT_MAIN_NCONN_SAP,
+    NRRC_INT_MAIN_BACKGROUND_SAP,
+    NRRC_INT_MAIN_SI_SAP, /* stored sib expire */
+    NRRC_INT_MAIN_SEARCH_SAP,
+    NRRC_INT_MAIN_CONFIG_SAP,
+    NRRC_INT_MAIN_MEAS_SAP,
+    NRRC_INT_SCG_CONFIG_SAP,
+    NRRC_INT_SCG_MEAS_SAP,
+    NRRC_INT_IDLE_CONFIG_SAP,
+    NRRC_INT_IDLE_SEARCH_SAP,
+    NRRC_INT_IDLE_SI_SAP,
+    NRRC_INT_IDLE_MEAS_SAP,
+    NRRC_INT_NCONN_CONFIG_SAP,
+    NRRC_INT_NCONN_SEARCH_SAP,
+    NRRC_INT_NCONN_SI_SAP,
+    NRRC_INT_NCONN_MEAS_SAP,
+    NRRC_INT_MEAS_CONFIG_SAP,
+    NRRC_INT_BACKGROUND_SEARCH_SAP,
+    NRRC_INT_MAIN_SAP,
+    NRRC_INT_SCG_SAP,
+    NRRC_INT_IDLE_SAP,
+    NRRC_INT_NCONN_SAP,
+    NRRC_INT_BACKGROUND_SAP,
+    NRRC_INT_CONFIG_SAP,
+    NRRC_INT_MEAS_SAP,
+    NRRC_INT_SEARCH_SAP,
+    NRRC_INT_SI_SAP,
+
+    /* NAS_SV */
+    NAS_SV_SAP,
+    RAC_NAS_SV_SAP,
+    L4C_NAS_SV_SAP,
+    NAS_SV_ERRC_SAP,
+    NAS_SV_C2K_SAP,
+
+    VDM_GMSS_SAP,
+    VDM_EVAL_SAP,
+    /* VGMM SAP */
+    LPP_VGMM_SAP,
+    NAS_SV_VGMM_SAP,
+    RAC_VGMM_SAP,
+    RATDM_VGMM_SAP,
+    SMS_VGMM_SAP,
+    VGMM_NRRC_SAP,
+    VGMM_RATDM_SAP,
+    ERM_VGMM_SAP,
+    DDM_VGMM_SAP,
+    VGMM_UPCM_SAP,
+    L4C_VGMM_SAP,
+
+    /* SMIC SAP */
+    SMIC_SAP,
+
+    /* VGSM SAP */
+    VGSM_SAP,
+    PAM_VGSM_SAP,
+    VGSM_VGMM_SAP,
+    VGSM_RATDM_SAP,
+    ESM_VGSM_SAP,
+    L4C_VGSM_SAP,
+    
+    DHL_MRS_SAP,
+    DHL_GMSS_SAP,
+
+    NAS_SV_RATDM_SAP,
+    NAS_SV_NRRC_SAP,
+    NAS_SV_EVAL_SAP,
+    NAS_SV_EMM_SAP,
+    NAS_SV_SIM_SAP,
+    DHL_NWSEL_SAP,
+
+    /* UPDS SAP */
+    URSP_SAP,
+    UPDS_VGMM_SAP,
+
+    /* D2AT */
+    D2AT_D2RM_SAP,
+    D2AT_D2PM_SAP,
+    D2AT_D2CM_SAP,
+    D2AT_DDM_SAP,
+
+    /* D2UX */
+    D2UX_DDM_SAP,
+
+    D2_NETIF_SAP,
+    D2_NETIF_SENSITIVE_SAP,
+    D2_USER_SENSITIVE_SAP,
+    ATP_D2_USER_SENSITIVE_SAP,
+
+    /* Protocol Exception Recovery Framework */
+    PERF_SAP,
+    /* Error Recovery Module */
+    ERM_SAP,
+    PERF_ERRC_SAP,
+
+    /* IWLAN */
+    IWLAN_TIMER_SAP,
+    IWLAN_MASF_SAP,
+
+    /* MCF */
+    MCF_L4C_SAP,
+
+    /* IMCB */
+    IMSM_IMCB_SAP,
+    IMSVT_IMCB_SAP,
+    IMCB_IMCB_SAP,
+    HIF_IMCB_SAP,
+    ATP_IMCB_SAP,
+
+    /* IMS STACK */
+    IMS_SIPTX_SAP,
+    IMS_SIPTX_IMCB_SAP,
+
+    /* IMSUA */
+    IMCB_IMSUA_SAP,
+    IMCSMS_IMSUA_SAP,
+    IMC_IMSUA_SAP,
+
+    L4BPWR_L4C_SAP,
+    L4BPWR_CVAL_SAP,
+    L4BPWR_L4BNW_SAP,
+
+    LBS_SAP,
+    GNSS_TC_LBS_SAP,
+    GNSS_TC_ERRC_SAP,
+    GNSS_TC_NRRC_SAP,
+    GNSS_TC_EL1_SAP,
+    GNSS_TC_NL1_SAP,
+    GNSS_TC_UL1_SAP,
+
+    /* GAS to NRAS */
+    GAS_NRAS_SAP,
+
+    L4C_ENPDCP_SAP,
+
+    /* STKBRG */
+    STKBRG_ATP_SAP,
+    STKBRG_IPSEC_SAP,
+
+    /* WIFI Proxy SAP */
+    WIFI_PROXY_SAP,
+
+    /*DISPATCHER SAP*/
+    DISPATCHER_SAP,
+
+    /* SENSITIVE SAP */
+    XCAP_USER_SENSITIVE_SAP,
+    CHLP_USER_SENSITIVE_SAP,
+    LMD_USER_SENSITIVE_SAP,
+    EVAL_USER_SENSITIVE_SAP,
+    TCM_USER_SENSITIVE_SAP,
+    RRM_USER_SENSITIVE_SAP,
+    GISE_USER_SENSITIVE_SAP,
+    CC_USER_SENSITIVE_SAP,
+    UIM_PROXY_USER_SENSITIVE_SAP,
+    CUIM_USER_SENSITIVE_SAP,
+    SIM_USER_SENSITIVE_SAP,
+    FCP_USER_SENSITIVE_SAP,
+    RCP_USER_SENSITIVE_SAP,
+    IWLAN_USER_SENSITIVE_SAP,
+    PAM_USER_SENSITIVE_SAP,
+    TFTLIB_USER_SENSITIVE_SAP,
+    GMSS_USER_SENSITIVE_SAP,
+    ESM_USER_SENSITIVE_SAP,
+    IMC_USER_SENSITIVE_SAP,
+    N3X_USER_SENSITIVE_SAP,
+    WO_USER_SENSITIVE_SAP,
+    SMU_USER_SENSITIVE_SAP,
+    EMM_USER_SENSITIVE_SAP,
+    ETC_USER_SENSITIVE_SAP,
+    SIMMNGR_USER_SENSITIVE_SAP,
+	RAC_USER_SENSITIVE_SAP,
+    UPCM_USER_SENSITIVE_SAP,
+    ERRC_USER_SENSITIVE_SAP,
+    CLEC_USER_SENSITIVE_SAP,
+    CPSW_USER_SENSITIVE_SAP,
+    SYSTEM_USER_SENSITIVE_SAP,
+    CVAL_USER_SENSITIVE_SAP,
+    MM_USER_SENSITIVE_SAP,
+    RATCM_USER_SENSITIVE_SAP,
+	CSM_USER_SENSITIVE_SAP,
+	VDM_USER_SENSITIVE_SAP,
+    L4BPDN_USER_SENSITIVE_SAP,
+    SMSAL_1_USER_SENSITIVE_SAP,
+	SMSAL_2_USER_SENSITIVE_SAP,
+    SMS_1_USER_SENSITIVE_SAP,
+	SMS_2_USER_SENSITIVE_SAP,
+    ATP_USER_SENSITIVE_SAP,
+    L4B_USER_SENSITIVE_SAP,
+    CISS_USER_SENSITIVE_SAP,
+    ATCI_USER_SENSITIVE_SAP,
+    SSDS_USER_SENSITIVE_SAP,
+    L4BCC_USER_SENSITIVE_SAP,
+    L4C_USER_SENSITIVE_SAP,
+    SM_USER_SENSITIVE_SAP,
+    SMREG_USER_SENSITIVE_SAP,
+    RAT_TCM_USER_SENSITIVE_SAP,
+    DDM_USER_SENSITIVE_SAP,
+    NWSEL_USER_SENSITIVE_SAP,
+    RRCE_USER_SENSITIVE_SAP,
+    PSW_USER_SENSITIVE_SAP,
+    SDM_USER_SENSITIVE_SAP,
+    NAS_SV_USER_SENSITIVE_SAP,
+    L4APS_USER_SENSITIVE_SAP,
+    DISPATCHER_USER_SENSITIVE_SAP,
+	IMCSMS_1_USER_SENSITIVE_SAP,
+    IMCSMS_2_USER_SENSITIVE_SAP,
+	VGSM_USER_SENSITIVE_HEADER_ONLY_SAP,
+	VGSM_USER_SENSITIVE_HEADER_LOCALPARA_SAP,
+    IMCB_USER_SENSITIVE_SAP,
+    IMS_STACK_USER_SENSITIVE_SAP,
+    HTTP_TLS_USER_SENSITIVE_SAP,
+    MT_L4C_SAP,
+
+    /* N3CF */
+    N3CF_L4C_SAP,
+    
+    /* N3SAM */
+    N3SAM_N3SAM_SAP,
+    N3EPC_N3SAM_SAP,
+
+    ATP_N3CF_SAP,
+
+    /* N3EPC */
+    D2RM_N3EPC_SAP,
+    IWLAN_N3EPC_SAP,
+    N3EPC_SIMMNGR_SAP,
+
+    /* N3ANS */
+    N3EPC_N3ANS_SAP,
+    N3ANS_SIMMNGR_SAP,
+    N3ANS_L4BNW_SAP,
+    
+    /* N3SYS */
+    N3SYS_SAP,
+
+    /* EAP */
+    USER_EAP_SAP,
+    EAP_SIM_SAP,
+
+    /* HTTP TLS SAP */
+    APP_HTTP_SAP,
+    HTTP_TLS_SAP,
+
+    IMCSMS_EVAL_SAP,
+    SMS_IMCSMS_SAP,
+	DHL_SMS_SAP,
+	
+    ERRC_MT_SAP,
+    IMS_UA_USER_SENSITIVE_SAP,
+	
+	XCAP_IMC_SAP,
+	SASE_IMC_SAP,
+    SMU_CVAL_SAP,
+    L4BPWR_MT_SAP,
+
+	CC_GAS_SAP,
+	
+	MT_USER_SENSITIVE_SAP,
+	
+    SBP_CSS_SAP,
+    
+    /* SASE to ERRC */
+    SASE_ERRC_SAP,
+    /* SASE to NRRC */
+    SASE_NRRC_SAP,
+    /* SASE to L4C */
+    SASE_L4C_SAP,
+    /* SASE to iWLAN */
+    SASE_IWLAN_SAP,
+    /* SASE to NL1 */
+    SASE_NL1_SAP,
+    /* SASE TO LPP */
+    SASE_LPP_SAP,
+	/* VDM to SASE */
+	VDM_SASE_SAP,
+	/* ATP to SASE */
+	ATP_SASE_SAP,
+	SASE_SAP,
+	IMSM_MSPM_SAP,
+	
+    /*OSTD SAP*/
+    OSTD_SAP,
+
+
+    SMSAL_IMCSMS_SAP,
+    IMCSMS_IMCSMS_SAP,
+    MRS_L4C_SAP,
+    MRS_UPCM_SAP,
+
+    TMC_L4BPWR_SAP,
+
+
+#ifdef __IPC_ADAPTER__
+/* IPC Adapter */
+    IPCA_ATP_SAP, 
+    IPCA_PWR_SAP,
+    IPCA_SMS_SAP,
+    IPCA_SAT_SAP,
+    IPCA_SMU_SAP,
+    IPCA_PHB_SAP,
+    IPCA_GPRS_SAP,
+    IPCA_CC_SAP,
+    IPCA_SS_SAP,
+    IPCA_NW_SAP,
+    IPCA_MISC_SAP,
+    IPCA_UT_SAP,
+    IPCA_OEM_SAP,
+    IPCA_DSPL_SAP,
+    IPCA_SND_SAP,
+    IPCA_SAP_SAP,
+    IPCA_CTRL_SAP,
+    IPCA_EM_SAP,
+    IPCA_FACTORY_SAP,
+    IPCA_IMS_SAP,
+    IPCA_CFG_SAP,    
+    IPCA_NW_GPRS_SAP,
+    IPCA_GPRS_ROUTINE_SAP,
+    IPCA_LEISIM_SAP,
+    IPCA_EMBMS_SAP,
+    IPCA_WM_SAP,
+    IPCA_SRLTE_SAP,
+#ifdef __TC10_IPC_CDMA_SUPPORT__
+    IPCA_IR_SAP,
+#endif
+    IPCA_JPN_SAP,
+    IPC_SMU_SAP,    // For msg between IPCA modules and MOD_SMU
+    L4BSIM_IPCA_SRLTE_SAP,
+
+    DHL_IPCA_SMU_SAP,
+    IPCA_SBP_SAP,    
+    IPCA_UPCM_SAP,
+    IPCA_DOMESTIC_SAP,
+    IPCA_SMU_SIM_SAP,
+    
+#endif
+    D2AT_IPCA_GPRS_SAP,
+
+    /* L5*/    
+    L5IO_SAP,
+    L5IO_L5U_SAP,
+    L5IO_USWITCH_SAP,
+    L5IO_L5USS_SAP,
+    L5IO_L5UCAT_SAP,
+    L5IO_L5URF_SAP,
+    L5IO_L5UCC_SAP,
+    L5IO_L5USIM_SAP,
+    L5IO_L5USMS_SAP,
+    L5USMS_L5USMS_SAP,
+    L5IO_L5UECALL_SAP,
+    L5UECALL_L5UECALL_SAP,
+    L5IO_ATP_SAP,
+    L5IO_L4C_SAP,
+    L5IO_L5UPDN_SAP,
+    L5U_L5UCAT_SAP,
+    L5U_L5USS_SAP,
+    L5U_L5USWITH_SAP,
+    L5U_L5UCC_SAP,
+    L5U_L5USIM_SAP,
+    L5U_L5URF_SAP,
+    L5U_ATP_SAP,
+    L5_USER_SENSITIVE_SAP,
+    L5IO_USER_SENSITIVE_SAP,
+    L5U_SAP,
+
+    L5UNW_L4BNW_SAP,
+    L5USS_L5USS_SAP,	
+	L5IO_L5USYS_SAP,
+	L5UPDN_D2CM_SAP,
+    L5UPDN_D2_SAP,
+	L5IO_L4BSBP_SAP,
+	L5IO_L5IO_SAP,
+	L5UIMS_SAP,
+    L5UNW_L4C_SAP,
+	L5URF_L4C_SAP,
+    NL1_MT_SAP,
+    L5IO_SLT_SAP,
+    L5USIM_L5USWITCH_SAP,
+MODULE_SAP_END(SAP_ID_MD_CODE_TAIL)
+
+#endif /* MD_SAP_H */
diff --git a/mcu/interface/sap/md_svc_sap.h b/mcu/interface/sap/md_svc_sap.h
new file mode 100644
index 0000000..1dcfab7
--- /dev/null
+++ b/mcu/interface/sap/md_svc_sap.h
@@ -0,0 +1,15 @@
+#ifndef MD_SVC_SAP_H
+#define MD_SVC_SAP_H
+
+#include "sap_range.h"
+
+MODULE_SAP_BEGIN(SAP_ID_MD_SVC_CODE_BEGIN)
+	UART_L4C_SAP = SAP_ID_MD_SVC_CODE_BEGIN,
+    MCF_SAP,
+
+    MCF_UTFWK_SAP,
+    N3CF_SAP,
+    N3SAM_CRPTBRG_SAP,
+MODULE_SAP_END(SAP_ID_MD_SVC_CODE_TAIL)
+
+#endif /* MD_SVC_SAP_H */
\ No newline at end of file
diff --git a/mcu/interface/sap/middleware_modid.h b/mcu/interface/sap/middleware_modid.h
new file mode 100644
index 0000000..d8e68fc
--- /dev/null
+++ b/mcu/interface/sap/middleware_modid.h
@@ -0,0 +1,182 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   middleware_modid.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file provides the module index enum built.
+ *
+ * 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#ifndef MIDDLEWARE_MODULE_ID_H
+#define MIDDLEWARE_MODULE_ID_H
+
+#include "module_id_range.h"
+
+/* undef unused macro */
+#undef TASK_PRIORITY_MACRO
+#undef task_name
+#undef task_queue_name
+#undef task_priority
+#undef task_stack_size
+#undef null_task_create_entry
+#undef compatible_code
+#undef task_create_function
+#undef task_stack_internalRAM
+#undef task_external_queue_size
+#undef task_internal_queue_size
+#undef task_boot_mode
+#undef task_affinity_group
+#undef task_affinity_group_id
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+#undef task_index
+#undef task_module_map
+
+/* define all unused macros as empty */
+#define task_name(p1)
+#define task_queue_name(p1)
+#define task_priority(p1,p2)
+#define task_stack_size(p1)
+#define null_task_create_entry(p1)
+#define task_create_function(p1)
+#define task_stack_internalRAM(p1)
+#define task_external_queue_size(p1)
+#define task_internal_queue_size(p1)
+#define task_boot_mode(p1)
+#define task_affinity_group(p1)
+#define task_affinity_group_id(p1)
+#define task_index(p1)
+
+/* define the macro which provides the MOD ID*/
+#define task_module_map(task, mod)                                  mod,
+#define compatible_code(expr)                                       expr,
+#define MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM(mod)            mod,
+#define MODULE_ID_FOR_PRINT_TRACE(mod)                              mod,
+
+
+MODULE_MOD_BEGIN(MOD_ID_MIDDLEWARE_CODE_BEGIN)
+    #include "middleWare_task_config.h"
+/* customer add module id at here */
+MODULE_MOD_END(MOD_ID_MIDDLEWARE_CODE_TAIL)
+
+    
+/* clean unuse defination */
+#undef task_module_map
+#undef compatible_code
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+
+
+#endif /* MIDDLEWARE_MODULE_ID_H */
diff --git a/mcu/interface/sap/modem_2g3g_modid.h b/mcu/interface/sap/modem_2g3g_modid.h
new file mode 100644
index 0000000..a54a758
--- /dev/null
+++ b/mcu/interface/sap/modem_2g3g_modid.h
@@ -0,0 +1,178 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   modem_2g3g_modid.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file provides the module index enum built.
+ *
+ * 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#ifndef MODEM_2G3G_MODULE_ID_H
+#define MODEM_2G3G_MODULE_ID_H
+
+#include "module_id_range.h"
+
+/* undef unused macro */
+#undef TASK_PRIORITY_MACRO
+#undef task_name
+#undef task_queue_name
+#undef task_priority
+#undef task_stack_size
+#undef null_task_create_entry
+#undef compatible_code
+#undef task_create_function
+#undef task_stack_internalRAM
+#undef task_external_queue_size
+#undef task_internal_queue_size
+#undef task_boot_mode
+#undef task_affinity_group
+#undef task_affinity_group_id
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+#undef task_index
+#undef task_module_map
+
+/* define all unused macros as empty */
+#define task_name(p1)
+#define task_queue_name(p1)
+#define task_priority(p1,p2)
+#define task_stack_size(p1)
+#define null_task_create_entry(p1)
+#define task_create_function(p1)
+#define task_stack_internalRAM(p1)
+#define task_external_queue_size(p1)
+#define task_internal_queue_size(p1)
+#define task_boot_mode(p1)
+#define task_affinity_group(p1)
+#define task_affinity_group_id(p1)
+#define task_index(p1)
+
+/* define the macro which provides the MOD ID*/
+#define task_module_map(task, mod)                                  mod,
+#define compatible_code(expr)                                       expr,
+#define MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM(mod)            mod,
+#define MODULE_ID_FOR_PRINT_TRACE(mod)                              mod,
+
+
+MODULE_MOD_BEGIN(MOD_ID_MODEM_2G3G_CODE_BEGIN)
+    #include "modem_2g3g_task_config.h"
+/* customer add module id at here */
+MODULE_MOD_END(MOD_ID_MODEM_2G3G_CODE_TAIL)
+
+    
+/* clean unuse defination */
+#undef task_module_map
+#undef compatible_code
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+
+
+#endif /* MODEM_2G3G_MODULE_ID_H */
diff --git a/mcu/interface/sap/modem_4g_modid.h b/mcu/interface/sap/modem_4g_modid.h
new file mode 100644
index 0000000..0ea1f38
--- /dev/null
+++ b/mcu/interface/sap/modem_4g_modid.h
@@ -0,0 +1,170 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   modem_4g_modid.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file provides the module index enum built.
+ *
+ * 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#ifndef MODEM_4G_MODULE_ID_H
+#define MODEM_4G_MODULE_ID_H
+
+#include "module_id_range.h"
+
+/* undef unused macro */
+#undef TASK_PRIORITY_MACRO
+#undef task_name
+#undef task_queue_name
+#undef task_priority
+#undef task_stack_size
+#undef null_task_create_entry
+#undef compatible_code
+#undef task_create_function
+#undef task_stack_internalRAM
+#undef task_external_queue_size
+#undef task_internal_queue_size
+#undef task_boot_mode
+#undef task_affinity_group
+#undef task_affinity_group_id
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+#undef task_index
+#undef task_module_map
+
+/* define all unused macros as empty */
+#define task_name(p1)
+#define task_queue_name(p1)
+#define task_priority(p1,p2)
+#define task_stack_size(p1)
+#define null_task_create_entry(p1)
+#define task_create_function(p1)
+#define task_stack_internalRAM(p1)
+#define task_external_queue_size(p1)
+#define task_internal_queue_size(p1)
+#define task_boot_mode(p1)
+#define task_affinity_group(p1)
+#define task_affinity_group_id(p1)
+#define task_index(p1)
+
+/* define the macro which provides the MOD ID*/
+#define task_module_map(task, mod)                                  mod,
+#define compatible_code(expr)                                       expr,
+#define MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM(mod)            mod,
+#define MODULE_ID_FOR_PRINT_TRACE(mod)                              mod,
+
+
+MODULE_MOD_BEGIN(MOD_ID_MODEM_4G_CODE_BEGIN)
+    #include "modem_4g_task_config.h"
+/* customer add module id at here */
+MODULE_MOD_END(MOD_ID_MODEM_4G_CODE_TAIL)
+
+    
+/* clean unuse defination */
+#undef task_module_map
+#undef compatible_code
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+
+
+#endif /* MODEM_4G_MODULE_ID_H */
diff --git a/mcu/interface/sap/modem_5g_modid.h b/mcu/interface/sap/modem_5g_modid.h
new file mode 100644
index 0000000..723d80b
--- /dev/null
+++ b/mcu/interface/sap/modem_5g_modid.h
@@ -0,0 +1,129 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   modem_5g_modid.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file provides the module index enum built.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ *============================================================================
+ *             HISTORY
+ * Below this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *------------------------------------------------------------------------------
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#ifndef MODEM_5G_MODULE_ID_H
+#define MODEM_5G_MODULE_ID_H
+
+#include "module_id_range.h"
+
+/* undef unused macro */
+#undef TASK_PRIORITY_MACRO
+#undef task_name
+#undef task_queue_name
+#undef task_priority
+#undef task_stack_size
+#undef null_task_create_entry
+#undef compatible_code
+#undef task_create_function
+#undef task_stack_internalRAM
+#undef task_external_queue_size
+#undef task_internal_queue_size
+#undef task_boot_mode
+#undef task_affinity_group
+#undef task_affinity_group_id
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+#undef task_index
+#undef task_module_map
+
+/* define all unused macros as empty */
+#define task_name(p1)
+#define task_queue_name(p1)
+#define task_priority(p1,p2)
+#define task_stack_size(p1)
+#define null_task_create_entry(p1)
+#define task_create_function(p1)
+#define task_stack_internalRAM(p1)
+#define task_external_queue_size(p1)
+#define task_internal_queue_size(p1)
+#define task_boot_mode(p1)
+#define task_affinity_group(p1)
+#define task_affinity_group_id(p1)
+#define task_index(p1)
+
+/* define the macro which provides the MOD ID*/
+#define task_module_map(task, mod)                                  mod,
+#define compatible_code(expr)                                       expr,
+#define MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM(mod)            mod,
+#define MODULE_ID_FOR_PRINT_TRACE(mod)                              mod,
+
+
+MODULE_MOD_BEGIN(MOD_ID_MODEM_5G_CODE_BEGIN)
+    #include "modem_5g_task_config.h"
+/* customer add module id at here */
+MODULE_MOD_END(MOD_ID_MODEM_5G_CODE_TAIL)
+
+    
+/* clean unuse defination */
+#undef task_module_map
+#undef compatible_code
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+
+
+#endif /* MODEM_5G_MODULE_ID_H */
diff --git a/mcu/interface/sap/module_hisrid_range.h b/mcu/interface/sap/module_hisrid_range.h
new file mode 100644
index 0000000..1b6a190
--- /dev/null
+++ b/mcu/interface/sap/module_hisrid_range.h
@@ -0,0 +1,13 @@
+#ifndef MODULE_HISRID_RANGE_H
+#define MODULE_HISRID_RANGE_H
+
+typedef enum {
+    HISR_ID_CODE_RESERVED = 0,    
+    HISR_ID_SS_CODE_BEGIN = HISR_ID_CODE_RESERVED,
+    HISR_ID_MODEM_CODE_BEGIN = HISR_ID_SS_CODE_BEGIN + 9,
+    HISR_ID_DRV_CODE_BEGIN = HISR_ID_MODEM_CODE_BEGIN + 66,
+    HISR_ID_CODE_MAX = 130
+} HISR_ID_CODE_BEGIN;
+
+
+#endif /* MODULE_HISRID_RANGE_H */
diff --git a/mcu/interface/sap/module_id_range.h b/mcu/interface/sap/module_id_range.h
new file mode 100644
index 0000000..8257a92
--- /dev/null
+++ b/mcu/interface/sap/module_id_range.h
@@ -0,0 +1,300 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   stack_config.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file provides the task index and module index configuration.
+ *
+ * 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!
+ * 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!!
+ *============================================================================
+ ****************************************************************************/
+
+#ifndef MODULE_ID_RANGE_H
+#define MODULE_ID_RANGE_H
+
+#define KAL_MAX_NUM_NORMAL_HISRS  (90 + 40)
+#define KAL_MAX_NUM_LISR2HISRS  (0)
+#define KAL_MAX_NUM_HISRS  (KAL_MAX_NUM_NORMAL_HISRS+KAL_MAX_NUM_LISR2HISRS)
+#define KAL_MAX_NUM_LISRS  372 //NUM_IRQ_SOURCES
+
+#if defined(__MD93__) || defined(__MD95__)
+#define MODEM_5G_MOD_ID_NUM_MAX   3
+
+#elif defined(__MD97__) || defined(__MD97P__)
+#define MODEM_5G_MOD_ID_NUM_MAX   100
+
+#endif
+
+typedef enum {
+    MOD_ID_SRV_CODE_BEGIN, MOD_ID_SRV_CODE_TAIL = MOD_ID_SRV_CODE_BEGIN + 150,
+	
+    MOD_ID_MODEM_2G3G_CODE_BEGIN, MOD_ID_MODEM_2G3G_CODE_TAIL = MOD_ID_MODEM_2G3G_CODE_BEGIN + 530,
+
+    MOD_ID_MODEM_4G_CODE_BEGIN, MOD_ID_MODEM_4G_CODE_TAIL = MOD_ID_MODEM_4G_CODE_BEGIN + 200,
+
+    MOD_ID_MODEM_5G_CODE_BEGIN, MOD_ID_MODEM_5G_CODE_TAIL = MOD_ID_MODEM_5G_CODE_BEGIN + MODEM_5G_MOD_ID_NUM_MAX,
+	
+    MOD_ID_MIDDLEWARE_CODE_BEGIN, MOD_ID_MIDDLEWARE_CODE_TAIL = MOD_ID_MIDDLEWARE_CODE_BEGIN + 150,
+	
+    MOD_ID_DRV_CODE_BEGIN, MOD_ID_DRV_CODE_TAIL = MOD_ID_DRV_CODE_BEGIN + 200,
+
+    MOD_ID_HISR_CODE_BEGIN, 
+
+    MOD_ID_HISR_CODE_TAIL = MOD_ID_HISR_CODE_BEGIN + KAL_MAX_NUM_HISRS + 1,
+
+    MOD_ID_LISR_CODE_BEGIN, 
+
+    MOD_ID_LISR_CODE_TAIL = MOD_ID_LISR_CODE_BEGIN + KAL_MAX_NUM_LISRS + 1,
+		
+    MOD_ID_CODE_END,
+    MOD_ID_END = MOD_ID_CODE_END,
+    //To enlarge END_OF_MOD_ID_BEGIN, please discuss with DHL owner if there is enough space in NVRAM.
+    END_OF_MOD_ID_BEGIN = 2000, END_OF_MOD_ID_TAIL,
+
+
+}MODULE_ID_TYPE;
+
+typedef unsigned int module_id_boundary_check1[END_OF_MOD_ID_BEGIN - MOD_ID_CODE_END];
+
+/**************************************************************
+**********  Should not change the following MACROS defines  *************
+**********  Should not define MODULE ID with "MOD_TAG_"     *************
+***************************************************************/
+#ifdef GEN_FOR_PC
+    #define MODULE_MOD_BEGIN(BEGIN_POS)  typedef enum __cgen_module_type_id_##BEGIN_POS{MODULE_TAG_##BEGIN_POS = BEGIN_POS,
+    #define MODULE_MOD_END(END_POS) MODULE_ID_CGEN_PARSE_LAST_ID=END_POS }_cgen_module_type_id_##END_POS;
+#else
+    #define MODULE_MOD_BEGIN(BEGIN_POS)   enum { MODULE_TAG_##BEGIN_POS = BEGIN_POS,
+    #define MODULE_MOD_END(END_POS)     };    
+#endif /* GEN_FOR_PC */
+
+
+MODULE_MOD_BEGIN(END_OF_MOD_ID_BEGIN)
+	END_OF_MOD_ID,
+MODULE_MOD_END(END_OF_MOD_ID_TAIL)
+
+
+#endif /* MODULE_ID_RANGE_H */
diff --git a/mcu/interface/sap/module_msg_range.h b/mcu/interface/sap/module_msg_range.h
new file mode 100644
index 0000000..5c3a214
--- /dev/null
+++ b/mcu/interface/sap/module_msg_range.h
@@ -0,0 +1,704 @@
+#ifndef MODULE_MSG_RANGE_H
+#define MODULE_MSG_RANGE_H
+
+typedef enum {
+    MSG_ID_XXX_CODE_BASE = 500,
+
+    MSG_ID_SYSDEBUG_CODE_BEGIN, MSG_ID_SYSDEBUG_CODE_TAIL = MSG_ID_SYSDEBUG_CODE_BEGIN + 100,
+
+    MSG_ID_CC_CODE_BEGIN, MSG_ID_CC_CODE_TAIL = MSG_ID_CC_CODE_BEGIN + 100,
+
+    MSG_ID_CISS_CODE_BEGIN, MSG_ID_CISS_CODE_TAIL = MSG_ID_CISS_CODE_BEGIN + 150,
+
+    MSG_ID_MM_CODE_BEGIN, MSG_ID_MM_CODE_TAIL = MSG_ID_MM_CODE_BEGIN + 200,
+
+    MSG_ID_SMS_CODE_BEGIN, MSG_ID_SMS_CODE_TAIL = MSG_ID_SMS_CODE_BEGIN + 100,
+
+    MSG_ID_SIM_PUBLIC_CODE_BEGIN, MSG_ID_SIM_PUBLIC_CODE_TAIL = MSG_ID_SIM_PUBLIC_CODE_BEGIN + 100,
+
+    MSG_ID_SIM_PS_CODE_BEGIN, MSG_ID_SIM_PS_CODE_TAIL = MSG_ID_SIM_PS_CODE_BEGIN + 300,
+
+    MSG_ID_L4_PUBLIC_CODE_BEGIN, MSG_ID_L4_PUBLIC_CODE_TAIL = MSG_ID_L4_PUBLIC_CODE_BEGIN + 100,
+
+    MSG_ID_L4C_INTERNAL_CODE_BEGIN, MSG_ID_L4C_INTERNAL_CODE_TAIL = MSG_ID_L4C_INTERNAL_CODE_BEGIN + 600,
+
+    MSG_ID_L4C_EXTERNAL_CODE_BEGIN, MSG_ID_L4C_EXTERNAL_CODE_TAIL = MSG_ID_L4C_EXTERNAL_CODE_BEGIN + 250,
+
+    MSG_ID_RAT_TCM_CODE_BEGIN, MSG_ID_RAT_TCM_CODE_TAIL = MSG_ID_RAT_TCM_CODE_BEGIN + 200,
+
+    MSG_ID_TCM_CODE_BEGIN, MSG_ID_TCM_CODE_TAIL = MSG_ID_TCM_CODE_BEGIN + 200,
+
+    MSG_ID_CSM_CODE_BEGIN, MSG_ID_CSM_CODE_TAIL = MSG_ID_CSM_CODE_BEGIN + 200,
+
+    MSG_ID_SMSAL_CODE_BEGIN, MSG_ID_SMSAL_CODE_TAIL = MSG_ID_SMSAL_CODE_BEGIN + 150,
+
+    MSG_ID_SMU_CODE_BEGIN, MSG_ID_SMU_CODE_TAIL = MSG_ID_SMU_CODE_BEGIN + 100,
+
+    MSG_ID_UEM_CODE_BEGIN, MSG_ID_UEM_CODE_TAIL = MSG_ID_UEM_CODE_BEGIN + 150,
+
+    MSG_ID_RAC_CODE_BEGIN, MSG_ID_RAC_CODE_TAIL = MSG_ID_RAC_CODE_BEGIN + 350,
+
+    MSG_ID_USAT_CODE_BEGIN, MSG_ID_USAT_CODE_TAIL = MSG_ID_USAT_CODE_BEGIN + 100,
+
+    MSG_ID_PHB_CODE_BEGIN, MSG_ID_PHB_CODE_TAIL = MSG_ID_PHB_CODE_BEGIN + 150,
+
+    MSG_ID_PS_CODE_BEGIN, MSG_ID_PS_CODE_TAIL = MSG_ID_PS_CODE_BEGIN + 150,
+
+    MSG_ID_MBCI_CODE_BEGIN, MSG_ID_MBCI_CODE_TAIL = MSG_ID_MBCI_CODE_BEGIN + 20,
+
+    MSG_ID_ATCI_CODE_BEGIN, MSG_ID_ATCI_CODE_TAIL = MSG_ID_ATCI_CODE_BEGIN + 150,
+
+    MSG_ID_ENG_CODE_BEGIN, MSG_ID_ENG_CODE_TAIL = MSG_ID_ENG_CODE_BEGIN + 150,
+
+    MSG_ID_PSDM_CODE_BEGIN, MSG_ID_PSDM_CODE_TAIL = MSG_ID_PSDM_CODE_BEGIN + 30,
+
+    MSG_ID_VMMI_CODE_BEGIN, MSG_ID_VMMI_CODE_TAIL = MSG_ID_VMMI_CODE_BEGIN + 100,
+
+    MSG_ID_RLC_CODE_BEGIN, MSG_ID_RLC_CODE_TAIL = MSG_ID_RLC_CODE_BEGIN + 100,
+
+    MSG_ID_RLC_TDD_CODE_BEGIN, MSG_ID_RLC_TDD_CODE_TAIL = MSG_ID_RLC_TDD_CODE_BEGIN + 100,
+
+    MSG_ID_RRM_COMMON_CODE_BEGIN, MSG_ID_RRM_COMMON_CODE_TAIL = MSG_ID_RRM_COMMON_CODE_BEGIN + 100,
+
+    MSG_ID_RRM_COMMON_TDD_CODE_BEGIN, MSG_ID_RRM_COMMON_TDD_CODE_TAIL = MSG_ID_RRM_COMMON_TDD_CODE_BEGIN + 100,
+
+    MSG_ID_RCS_CODE_BEGIN, MSG_ID_RCS_CODE_TAIL = MSG_ID_RCS_CODE_BEGIN + 100,
+
+    MSG_ID_RCS_TDD_CODE_BEGIN, MSG_ID_RCS_TDD_CODE_TAIL = MSG_ID_RCS_TDD_CODE_BEGIN + 100,
+
+    MSG_ID_RMPC_CODE_BEGIN, MSG_ID_RMPC_CODE_TAIL = MSG_ID_RMPC_CODE_BEGIN + 100,
+
+    MSG_ID_RMPC_TDD_CODE_BEGIN, MSG_ID_RMPC_TDD_CODE_TAIL = MSG_ID_RMPC_TDD_CODE_BEGIN + 100,
+
+    MSG_ID_RRM_MPAL_MM_CODE_BEGIN, MSG_ID_RRM_MPAL_MM_CODE_TAIL = MSG_ID_RRM_MPAL_MM_CODE_BEGIN + 100,
+
+    MSG_ID_RRM_MPAL_MM_TDD_CODE_BEGIN, MSG_ID_RRM_MPAL_MM_TDD_CODE_TAIL = MSG_ID_RRM_MPAL_MM_TDD_CODE_BEGIN + 100,
+
+    MSG_ID_MAC_CODE_BEGIN, MSG_ID_MAC_CODE_TAIL = MSG_ID_MAC_CODE_BEGIN + 100,
+
+    MSG_ID_MAC_TDD_CODE_BEGIN, MSG_ID_MAC_TDD_CODE_TAIL = MSG_ID_MAC_TDD_CODE_BEGIN + 100,
+
+    MSG_ID_LAPDM_CODE_BEGIN, MSG_ID_LAPDM_CODE_TAIL = MSG_ID_LAPDM_CODE_BEGIN + 100,
+
+    MSG_ID_LAPDM_TDD_CODE_BEGIN, MSG_ID_LAPDM_TDD_CODE_TAIL = MSG_ID_LAPDM_TDD_CODE_BEGIN + 100,
+
+    MSG_ID_REASM_CODE_BEGIN, MSG_ID_REASM_CODE_TAIL = MSG_ID_REASM_CODE_BEGIN + 100,
+
+    MSG_ID_REASM_TDD_CODE_BEGIN, MSG_ID_REASM_TDD_CODE_TAIL = MSG_ID_REASM_TDD_CODE_BEGIN + 100,
+
+    MSG_ID_MPAL_CODE_BEGIN, MSG_ID_MPAL_CODE_TAIL = MSG_ID_MPAL_CODE_BEGIN + 100,
+
+    MSG_ID_MPAL_TDD_CODE_BEGIN, MSG_ID_MPAL_TDD_CODE_TAIL = MSG_ID_MPAL_TDD_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_GAS_CODE_BEGIN, MSG_ID_FDD_GAS_CODE_TAIL = MSG_ID_FDD_GAS_CODE_BEGIN + 50,
+
+    MSG_ID_TDD_GAS_CODE_BEGIN, MSG_ID_TDD_GAS_CODE_TAIL = MSG_ID_TDD_GAS_CODE_BEGIN + 50,
+
+    MSG_ID_LLC_CODE_BEGIN, MSG_ID_LLC_CODE_TAIL = MSG_ID_LLC_CODE_BEGIN + 100,
+
+    MSG_ID_P2P_CODE_BEGIN, MSG_ID_P2P_CODE_TAIL = MSG_ID_P2P_CODE_BEGIN + 100,
+
+    MSG_ID_SND_CODE_BEGIN, MSG_ID_SND_CODE_TAIL = MSG_ID_SND_CODE_BEGIN + 100,
+
+    MSG_ID_SM_CODE_BEGIN, MSG_ID_SM_CODE_TAIL = MSG_ID_SM_CODE_BEGIN + 100,
+
+    MSG_ID_PAM_CODE_BEGIN, MSG_ID_PAM_CODE_TAIL = MSG_ID_PAM_CODE_BEGIN + 50,
+
+    MSG_ID_TDT_CODE_BEGIN, MSG_ID_TDT_CODE_TAIL = MSG_ID_TDT_CODE_BEGIN + 100,
+
+    MSG_ID_T30_CODE_BEGIN, MSG_ID_T30_CODE_TAIL = MSG_ID_T30_CODE_BEGIN + 50,
+
+    MSG_ID_FA_CODE_BEGIN, MSG_ID_FA_CODE_TAIL = MSG_ID_FA_CODE_BEGIN + 50,
+
+    MSG_ID_L2R_CODE_BEGIN, MSG_ID_L2R_CODE_TAIL = MSG_ID_L2R_CODE_BEGIN + 100,
+
+    MSG_ID_RLP_CODE_BEGIN, MSG_ID_RLP_CODE_TAIL = MSG_ID_RLP_CODE_BEGIN + 100,
+
+    MSG_ID_PS_PUBLIC_VT_MSG_CODE_BEGIN, MSG_ID_PS_PUBLIC_VT_MSG_CODE_TAIL = MSG_ID_PS_PUBLIC_VT_MSG_CODE_BEGIN + 30,
+
+    MSG_ID_VT_CODE_BEGIN, MSG_ID_VT_CODE_TAIL = MSG_ID_VT_CODE_BEGIN + 70,    
+
+    MSG_ID_NVRAM_CODE_BEGIN, MSG_ID_NVRAM_CODE_TAIL = MSG_ID_NVRAM_CODE_BEGIN + 100,
+
+    MSG_ID_L1_CODE_BEGIN, MSG_ID_L1_CODE_TAIL = MSG_ID_L1_CODE_BEGIN + 300,
+
+    MSG_ID_HAL_L1_CODE_BEGIN, MSG_ID_HAL_L1_CODE_TAIL = MSG_ID_HAL_L1_CODE_BEGIN + 40,
+
+    MSG_ID_L1HISR_CODE_BEGIN, MSG_ID_L1HISR_CODE_TAIL = MSG_ID_L1HISR_CODE_BEGIN + 40,    
+
+    MSG_ID_FT_CODE_BEGIN, MSG_ID_FT_CODE_TAIL = MSG_ID_FT_CODE_BEGIN + 100,
+
+    MSG_ID_TST_CODE_BEGIN, MSG_ID_TST_CODE_TAIL = MSG_ID_TST_CODE_BEGIN + 1200,    
+
+    MSG_ID_AUDIO_MSG_CODE_BEGIN, MSG_ID_AUDIO_MSG_CODE_TAIL = MSG_ID_AUDIO_MSG_CODE_BEGIN + 100,
+
+    MSG_ID_RATCM_CODE_BEGIN, MSG_ID_RATCM_CODE_TAIL = MSG_ID_RATCM_CODE_BEGIN + 300,
+
+    MSG_ID_RATDM_CODE_BEGIN, MSG_ID_RATDM_CODE_TAIL = MSG_ID_RATDM_CODE_BEGIN + 130,
+
+    MSG_ID_FDD_ADR_CODE_BEGIN, MSG_ID_FDD_ADR_CODE_TAIL = MSG_ID_FDD_ADR_CODE_BEGIN + 20,
+
+    MSG_ID_FDD_CSCE_CODE_BEGIN, MSG_ID_FDD_CSCE_CODE_TAIL = MSG_ID_FDD_CSCE_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_CSE_CODE_BEGIN, MSG_ID_FDD_CSE_CODE_TAIL = MSG_ID_FDD_CSE_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_MEME_CODE_BEGIN, MSG_ID_FDD_MEME_CODE_TAIL = MSG_ID_FDD_MEME_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_RRCE_CODE_BEGIN, MSG_ID_FDD_RRCE_CODE_TAIL = MSG_ID_FDD_RRCE_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_SIBE_CODE_BEGIN, MSG_ID_FDD_SIBE_CODE_TAIL = MSG_ID_FDD_SIBE_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_SLCE_CODE_BEGIN, MSG_ID_FDD_SLCE_CODE_TAIL = MSG_ID_FDD_SLCE_CODE_BEGIN + 200,
+
+    MSG_ID_FDD_DBME_CODE_BEGIN, MSG_ID_FDD_DBME_CODE_TAIL = MSG_ID_FDD_DBME_CODE_BEGIN + 20,
+
+	MSG_ID_FDD_USIME_CODE_BEGIN, MSG_ID_FDD_USIME_CODE_TAIL = MSG_ID_FDD_USIME_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_URR_CODE_BEGIN, MSG_ID_FDD_URR_CODE_TAIL = MSG_ID_FDD_URR_CODE_BEGIN + 50,
+
+    MSG_ID_TDD_ADR_CODE_BEGIN, MSG_ID_TDD_ADR_CODE_TAIL = MSG_ID_TDD_ADR_CODE_BEGIN + 20,
+
+    MSG_ID_TDD_CSCE_CODE_BEGIN, MSG_ID_TDD_CSCE_CODE_TAIL = MSG_ID_TDD_CSCE_CODE_BEGIN + 100,
+
+    MSG_ID_TDD_CSE_CODE_BEGIN, MSG_ID_TDD_CSE_CODE_TAIL = MSG_ID_TDD_CSE_CODE_BEGIN + 100,
+
+    MSG_ID_TDD_MEME_CODE_BEGIN, MSG_ID_TDD_MEME_CODE_TAIL = MSG_ID_TDD_MEME_CODE_BEGIN + 100,
+
+	MSG_ID_TDD_RRCE_CODE_BEGIN, MSG_ID_TDD_RRCE_CODE_TAIL = MSG_ID_TDD_RRCE_CODE_BEGIN + 100,
+
+    MSG_ID_TDD_SIBE_CODE_BEGIN, MSG_ID_TDD_SIBE_CODE_TAIL = MSG_ID_TDD_SIBE_CODE_BEGIN + 100,
+
+	MSG_ID_TDD_SLCE_CODE_BEGIN, MSG_ID_TDD_SLCE_CODE_TAIL = MSG_ID_TDD_SLCE_CODE_BEGIN + 200,
+
+    MSG_ID_TDD_DBME_CODE_BEGIN, MSG_ID_TDD_DBME_CODE_TAIL = MSG_ID_TDD_DBME_CODE_BEGIN + 20,
+
+    MSG_ID_TDD_USIME_CODE_BEGIN, MSG_ID_TDD_USIME_CODE_TAIL = MSG_ID_TDD_USIME_CODE_BEGIN + 100,
+
+    MSG_ID_TDD_URR_CODE_BEGIN, MSG_ID_TDD_URR_CODE_TAIL = MSG_ID_TDD_URR_CODE_BEGIN + 50,
+
+   	MSG_ID_TDD_UMAC_CODE_BEGIN, MSG_ID_TDD_UMAC_CODE_TAIL = MSG_ID_TDD_UMAC_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_UMAC_CODE_BEGIN, MSG_ID_FDD_UMAC_CODE_TAIL = MSG_ID_FDD_UMAC_CODE_BEGIN + 100,
+
+    MSG_ID_TDD_URLC_CODE_BEGIN, MSG_ID_TDD_URLC_CODE_TAIL = MSG_ID_TDD_URLC_CODE_BEGIN + 150,
+
+	MSG_ID_FDD_SEQ_CODE_BEGIN, MSG_ID_FDD_SEQ_CODE_TAIL = MSG_ID_FDD_SEQ_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_URLC_CODE_BEGIN, MSG_ID_FDD_URLC_CODE_TAIL = MSG_ID_FDD_URLC_CODE_BEGIN + 150,
+
+    MSG_ID_FDD_UL2_CODE_BEGIN, MSG_ID_FDD_UL2_CODE_TAIL = MSG_ID_FDD_UL2_CODE_BEGIN + 100,
+
+    MSG_ID_BMC_CODE_BEGIN, MSG_ID_BMC_CODE_TAIL = MSG_ID_BMC_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_CSR_CODE_BEGIN, MSG_ID_FDD_CSR_CODE_TAIL = MSG_ID_FDD_CSR_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_DRLC_CODE_BEGIN, MSG_ID_FDD_DRLC_CODE_TAIL = MSG_ID_FDD_DRLC_CODE_BEGIN + 100,
+
+    MSG_ID_TDD_PDCP_CODE_BEGIN, MSG_ID_TDD_PDCP_CODE_TAIL = MSG_ID_TDD_PDCP_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_PDCP_CODE_BEGIN, MSG_ID_FDD_PDCP_CODE_TAIL = MSG_ID_FDD_PDCP_CODE_BEGIN + 100,
+
+    MSG_ID_RABM_TDD_CODE_BEGIN, MSG_ID_RABM_TDD_CODE_TAIL = MSG_ID_RABM_TDD_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_RABM_CODE_BEGIN, MSG_ID_FDD_RABM_CODE_TAIL = MSG_ID_FDD_RABM_CODE_BEGIN + 100,
+
+	MSG_ID_BMC_TDD_CODE_BEGIN, MSG_ID_BMC_TDD_CODE_TAIL = MSG_ID_BMC_TDD_CODE_BEGIN + 100,
+
+	MSG_ID_CSR_TDD_CODE_BEGIN, MSG_ID_CSR_TDD_CODE_TAIL = MSG_ID_CSR_TDD_CODE_BEGIN + 100,
+
+	MSG_ID_TDD_DRLC_CODE_BEGIN, MSG_ID_TDD_DRLC_CODE_TAIL = MSG_ID_TDD_DRLC_CODE_BEGIN + 100,  
+
+    MSG_ID_TDD_UL2D_CODE_BEGIN, MSG_ID_TDD_UL2D_CODE_TAIL = MSG_ID_TDD_UL2D_CODE_BEGIN + 100,
+
+    MSG_ID_UL2D_CODE_BEGIN, MSG_ID_UL2D_CODE_TAIL = MSG_ID_UL2D_CODE_BEGIN + 100,
+
+    MSG_ID_DM_CSCE_CODE_BEGIN, MSG_ID_DM_CSCE_CODE_TAIL = MSG_ID_DM_CSCE_CODE_BEGIN + 100,
+
+    MSG_ID_UAS_GAS_CODE_BEGIN, MSG_ID_UAS_GAS_CODE_TAIL = MSG_ID_UAS_GAS_CODE_BEGIN + 100,
+
+    MSG_ID_EAS_GAS_CODE_BEGIN, MSG_ID_EAS_GAS_CODE_TAIL = MSG_ID_EAS_GAS_CODE_BEGIN + 100,
+
+    MSG_ID_DM_MEME_CODE_BEGIN, MSG_ID_DM_MEME_CODE_TAIL = MSG_ID_DM_MEME_CODE_BEGIN + 100,
+
+    MSG_ID_DM_RRCE_CODE_BEGIN, MSG_ID_DM_RRCE_CODE_TAIL = MSG_ID_DM_RRCE_CODE_BEGIN + 100,
+
+    MSG_ID_DM_RRCE_TDD_CODE_BEGIN, MSG_ID_DM_RRCE_TDD_CODE_TAIL = MSG_ID_DM_RRCE_TDD_CODE_BEGIN + 100,
+
+    MSG_ID_GEMINI_UAS_CODE_BEGIN, MSG_ID_GEMINI_UAS_CODE_TAIL = MSG_ID_GEMINI_UAS_CODE_BEGIN + 100,
+
+    MSG_ID_GEMINI_GAS_CODE_BEGIN, MSG_ID_GEMINI_GAS_CODE_TAIL = MSG_ID_GEMINI_GAS_CODE_BEGIN + 100,
+
+    MSG_ID_FDD_UL1_MSG_CODE_BEGIN, MSG_ID_FDD_UL1_MSG_CODE_TAIL = MSG_ID_FDD_UL1_MSG_CODE_BEGIN + 300,
+
+    MSG_ID_GNSS_TC_UL1_MSG_CODE_BEGIN ,MSG_ID_GNSS_TC_UL1_MSG_CODE_TAIL = MSG_ID_GNSS_TC_UL1_MSG_CODE_BEGIN +5,
+    MSG_ID_UL1DATA_MSG_CODE_BEGIN, MSG_ID_UL1DATA_MSG_CODE_TAIL = MSG_ID_UL1DATA_MSG_CODE_BEGIN + 20,
+
+    MSG_ID_UL1HISR_MSG_CODE_BEGIN, MSG_ID_UL1HISR_MSG_CODE_TAIL = MSG_ID_UL1HISR_MSG_CODE_BEGIN + 5,
+
+    MSG_ID_UL1C_MSG_CODE_BEGIN, MSG_ID_UL1C_MSG_CODE_TAIL = MSG_ID_UL1C_MSG_CODE_BEGIN + 20,
+
+    MSG_ID_LL1_MSG_CODE_BEGIN, MSG_ID_LL1_MSG_CODE_TAIL = MSG_ID_LL1_MSG_CODE_BEGIN + 150,
+
+    MSG_ID_UL1TST_MSG_CODE_BEGIN, MSG_ID_UL1TST_MSG_CODE_TAIL = MSG_ID_UL1TST_MSG_CODE_BEGIN + 50,
+
+    MSG_ID_UAGPS_CP_CODE_BEGIN, MSG_ID_UAGPS_CP_CODE_TAIL = MSG_ID_UAGPS_CP_CODE_BEGIN + 30,
+
+    MSG_ID_GPS_MSG_CODE_BEGIN, MSG_ID_GPS_MSG_CODE_TAIL = MSG_ID_GPS_MSG_CODE_BEGIN + 100,
+
+    MSG_ID_TL1_MSG_CODE_BEGIN, MSG_ID_TL1_MSG_CODE_TAIL = MSG_ID_TL1_MSG_CODE_BEGIN + 200,
+
+    MSG_ID_TL1DATA_AST_MSG_CODE_BEGIN, MSG_ID_TL1DATA_AST_MSG_CODE_TAIL = MSG_ID_TL1DATA_AST_MSG_CODE_BEGIN + 200,
+
+    MSG_ID_TL1HISR_AST_MSG_CODE_BEGIN, MSG_ID_TL1HISR_AST_MSG_CODE_TAIL = MSG_ID_TL1HISR_AST_MSG_CODE_BEGIN + 50,
+
+    MSG_ID_TL1FTA_AST_MSG_CODE_BEGIN, MSG_ID_TL1FTA_AST_MSG_CODE_TAIL = MSG_ID_TL1FTA_AST_MSG_CODE_BEGIN + 50,
+
+    MSG_ID_RSVAS_CODE_BEGIN, MSG_ID_RSVAS_CODE_TAIL = MSG_ID_RSVAS_CODE_BEGIN + 120,
+
+    MSG_ID_RSVAK_CODE_BEGIN, MSG_ID_RSVAK_CODE_TAIL = MSG_ID_RSVAK_CODE_BEGIN + 50,
+
+    MSG_ID_RSVAU_CODE_BEGIN, MSG_ID_RSVAU_CODE_TAIL = MSG_ID_RSVAU_CODE_BEGIN + 50,
+
+    MSG_ID_RSVAG_CODE_BEGIN, MSG_ID_RSVAG_CODE_TAIL = MSG_ID_RSVAG_CODE_BEGIN + 50,
+
+    MSG_ID_RSVAE_CODE_BEGIN, MSG_ID_RSVAE_CODE_TAIL = MSG_ID_RSVAE_CODE_BEGIN + 50,
+
+    MSG_ID_RSVAN_CODE_BEGIN, MSG_ID_RSVAN_CODE_TAIL = MSG_ID_RSVAN_CODE_BEGIN + 50,
+
+    MSG_ID_MSPM_CODE_BEGIN, MSG_ID_MSPM_CODE_TAIL = MSG_ID_MSPM_CODE_BEGIN + 50,
+
+    MSG_ID_NDIS_MSG_CODE_BEGIN, MSG_ID_NDIS_MSG_CODE_TAIL = MSG_ID_NDIS_MSG_CODE_BEGIN + 20,
+
+    MSG_ID_UPS_PUBLIC_CODE_BEGIN, MSG_ID_UPS_PUBLIC_CODE_TAIL = MSG_ID_UPS_PUBLIC_CODE_BEGIN + 20,
+
+    MSG_ID_UPS_MSG_CODE_BEGIN, MSG_ID_UPS_MSG_CODE_TAIL = MSG_ID_UPS_MSG_CODE_BEGIN + 100,
+    
+    MSG_ID_KPALV_MSG_CODE_BEGIN, MSG_ID_KPALV_MSG_CODE_TAIL = MSG_ID_KPALV_MSG_CODE_BEGIN + 5,
+    
+    MSG_ID_PS_PUBLIC_SUPL_MSG_CODE_BEGIN, MSG_ID_PS_PUBLIC_SUPL_MSG_CODE_TAIL = MSG_ID_PS_PUBLIC_SUPL_MSG_CODE_BEGIN + 30,
+
+    MSG_ID_SUPL_MSG_CODE_BEGIN, MSG_ID_SUPL_MSG_CODE_TAIL = MSG_ID_SUPL_MSG_CODE_BEGIN + 20,
+
+    MSG_ID_CMUX_CODE_BEGIN, MSG_ID_CMUX_CODE_TAIL = MSG_ID_CMUX_CODE_BEGIN + 100,
+
+    MSG_ID_PPP_CODE_BEGIN, MSG_ID_PPP_CODE_TAIL = MSG_ID_PPP_CODE_BEGIN + 100,
+
+    MSG_ID_EXT_MODEM_CODE_BEGIN, MSG_ID_EXT_MODEM_CODE_TAIL = MSG_ID_EXT_MODEM_CODE_BEGIN + 50,
+
+    MSG_ID_WMT_MSG_CODE_BEGIN, MSG_ID_WMT_MSG_CODE_TAIL = MSG_ID_WMT_MSG_CODE_BEGIN + 100,
+
+    MSG_ID_EM_CODE_BEGIN, MSG_ID_EM_CODE_TAIL = MSG_ID_EM_CODE_BEGIN + 1000,
+
+    MSG_ID_HOSTAP_MSG_CODE_BEGIN, MSG_ID_HOSTAP_MSG_CODE_TAIL = MSG_ID_HOSTAP_MSG_CODE_BEGIN + 100,
+
+    MSG_ID_FS_CODE_BEGIN, MSG_ID_FS_CODE_TAIL = MSG_ID_FS_CODE_BEGIN + 60,
+
+    MSG_ID_MED_CODE_BEGIN, MSG_ID_MED_CODE_TAIL = MSG_ID_MED_CODE_BEGIN + 100,
+
+    MSG_ID_DPS_CODE_BEGIN, MSG_ID_DPS_CODE_TAIL = MSG_ID_DPS_CODE_BEGIN + 150,
+
+    MSG_ID_UDPS_CODE_BEGIN, MSG_ID_UDPS_CODE_TAIL = MSG_ID_UDPS_CODE_BEGIN + 1000,
+
+    MSG_ID_DRIVER_CODE_BEGIN, MSG_ID_DRIVER_CODE_TAIL = MSG_ID_DRIVER_CODE_BEGIN + 1000,
+
+    MSG_ID_MEUT_MSG_CODE_BEGIN, MSG_ID_MEUT_MSG_CODE_TAIL = MSG_ID_MEUT_MSG_CODE_BEGIN + 500,
+
+	MSG_ID_L1_EXT_CODE_BEGIN,MSG_ID_L1_EXT_CODE_TAIL = MSG_ID_L1_EXT_CODE_BEGIN + 30,
+
+	MSG_ID_HAPLUS_MSG_CODE_BEGIN,MSG_ID_HAPLUS_MSG_CODE_TAIL = MSG_ID_HAPLUS_MSG_CODE_BEGIN + 200,
+
+	MSG_ID_MRS_CODE_BEGIN,MSG_ID_MRS_CODE_TAIL = MSG_ID_MRS_CODE_BEGIN + 50,
+
+    /* Add by LTE SS */
+    MSG_ID_EL1_CODE_BEGIN, MSG_ID_EL1_CODE_TAIL = MSG_ID_EL1_CODE_BEGIN + 400,
+
+    MSG_ID_NL1_MSG_CODE_BEGIN, MSG_ID_NL1_MSG_CODE_TAIL = MSG_ID_NL1_MSG_CODE_BEGIN + 350,
+
+    MSG_ID_L1EDPS_CODE_BEGIN, MSG_ID_L1EDPS_CODE_TAIL = MSG_ID_L1EDPS_CODE_BEGIN + 1000,
+
+    MSG_ID_MLL1_MSG_CODE_BEGIN, MSG_ID_MLL1_MSG_CODE_TAIL = MSG_ID_MLL1_MSG_CODE_BEGIN + 250,
+
+    MSG_ID_EL2_CODE_BEGIN, MSG_ID_EL2_CODE_TAIL = MSG_ID_EL2_CODE_BEGIN + 200,
+
+    MSG_ID_ERRC_CODE_BEGIN, MSG_ID_ERRC_CODE_TAIL = MSG_ID_ERRC_CODE_BEGIN + 750,
+
+    MSG_ID_EL1_PHS_CODE_BEGIN, MSG_ID_EL1_PHS_CODE_TAIL = MSG_ID_EL1_PHS_CODE_BEGIN + 40,
+
+    MSG_ID_EL1_TX_CODE_BEGIN, MSG_ID_EL1_TX_CODE_TAIL = MSG_ID_EL1_TX_CODE_BEGIN + 10,
+
+    MSG_ID_IDC_CODE_BEGIN, MSG_ID_IDC_CODE_TAIL = MSG_ID_IDC_CODE_BEGIN + 50,
+
+    MSG_ID_IDC_MD_CODE_BEGIN, MSG_ID_IDC_MD_CODE_TAIL = MSG_ID_IDC_MD_CODE_BEGIN + 100,
+	
+	MSG_ID_SASE_CODE_BEGIN, MSG_ID_SASE_CODE_TAIL = MSG_ID_SASE_CODE_BEGIN + 50,
+
+#if defined(L1_SIM) || defined(ESIM_BUILD_CONFIG) || defined(__DUMMY_L1_ON_TARGET_4G5G__)
+    MSG_ID_SCRIPT_CODE_BEGIN, MSG_ID_SCRIPT_CODE_TAIL = MSG_ID_SCRIPT_CODE_BEGIN + 150,
+    MSG_ID_NR_SCRIPT_CODE_BEGIN, MSG_ID_NR_SCRIPT_CODE_TAIL = MSG_ID_NR_SCRIPT_CODE_BEGIN + 150,
+    MSG_ID_IDC_SCRIPT_CODE_BEGIN, MSG_ID_IDC_SCRIPT_CODE_TAIL = MSG_ID_IDC_SCRIPT_CODE_BEGIN + 100,
+#endif
+    MSG_ID_CLDMACORE_CODE_BEGIN, MSG_ID_CLDMACORE_CODE_END = MSG_ID_CLDMACORE_CODE_BEGIN + 5,
+
+    MSG_ID_CCIFCORE_CODE_BEGIN, MSG_ID_CCIFCORE_CODE_END = MSG_ID_CCIFCORE_CODE_BEGIN + 5,
+
+    MSG_ID_TFTLIB_CODE_BEGIN, MSG_ID_TFTLIB_CODE_TAIL = MSG_ID_TFTLIB_CODE_BEGIN + 200,
+
+    MSG_ID_NWSEL_CODE_BEGIN, MSG_ID_NWSEL_CODE_TAIL = MSG_ID_NWSEL_CODE_BEGIN + 200,
+
+    MSG_ID_EMM_CODE_BEGIN, MSG_ID_EMM_CODE_TAIL = MSG_ID_EMM_CODE_BEGIN + 1000,
+
+    MSG_ID_EVAL_CODE_BEGIN, MSG_ID_EVAL_CODE_TAIL = MSG_ID_EVAL_CODE_BEGIN + 250,
+
+    MSG_ID_ETC_CODE_BEGIN, MSG_ID_ETC_CODE_TAIL = MSG_ID_ETC_CODE_BEGIN + 150,
+
+    MSG_ID_ESM_CODE_BEGIN, MSG_ID_ESM_CODE_TAIL = MSG_ID_ESM_CODE_BEGIN + 100,
+
+    MSG_ID_HIF_MW_CODE_BEGIN, MSG_ID_HIF_MW_CODE_TAIL = MSG_ID_HIF_MW_CODE_BEGIN + 1500,
+
+    MSG_ID_HIF_SVC_CODE_BEGIN, MSG_ID_HIF_SVC_CODE_TAIL = MSG_ID_HIF_SVC_CODE_BEGIN + 1000,
+
+    MSG_ID_UPCM_CODE_BEGIN, MSG_ID_UPCM_CODE_TAIL = MSG_ID_UPCM_CODE_BEGIN + 60,
+
+    MSG_ID_DISPATCHER_CODE_BEGIN , MSG_ID_DISPATCHER_CODE_TAIL = MSG_ID_DISPATCHER_CODE_BEGIN + 10,
+
+    MSG_ID_PROXY_CODE_BEGIN, MSG_ID_PROXY_CODE_TAIL = MSG_ID_PROXY_CODE_BEGIN + 20,
+
+    MSG_ID_LTECSR_CODE_BEGIN, MSG_ID_LTECSR_CODE_TAIL = MSG_ID_LTECSR_CODE_BEGIN + 60,
+
+    MSG_ID_IMC_CODE_BEGIN, MSG_ID_IMC_CODE_TAIL = MSG_ID_IMC_CODE_BEGIN + 1000,
+
+    MSG_ID_SDM_CODE_BEGIN, MSG_ID_SDM_CODE_TAIL = MSG_ID_SDM_CODE_BEGIN + 500,
+
+    MSG_ID_VDM_CODE_BEGIN, MSG_ID_VDM_CODE_TAIL = MSG_ID_VDM_CODE_BEGIN + 1000,
+
+    MSG_ID_IMCSMS_CODE_BEGIN, MSG_ID_IMCSMS_CODE_TAIL = MSG_ID_IMCSMS_CODE_BEGIN + 32,
+
+    MSG_ID_ATP_CODE_BEGIN, MSG_ID_ATP_CODE_TAIL = MSG_ID_ATP_CODE_BEGIN + 500,
+
+    MSG_ID_AS_LOG_CODE_BEGIN, MSG_ID_AS_LOG_CODE_TAIL = MSG_ID_AS_LOG_CODE_BEGIN + 100,
+
+    MSG_ID_LBS_CODE_BEGIN ,  MSG_ID_LBS_CODE_TAIL = MSG_ID_LBS_CODE_BEGIN + 100,
+
+    MSG_ID_LPP_CODE_BEGIN, MSG_ID_LPP_CODE_TAIL = MSG_ID_LPP_CODE_BEGIN + 200,
+
+    MSG_ID_UL1B_CODE_BEGIN, MSG_ID_UL1B_CODE_TAIL = MSG_ID_UL1B_CODE_BEGIN+100,
+
+    MSG_ID_EL1B_CODE_BEGIN, MSG_ID_EL1B_CODE_TAIL = MSG_ID_EL1B_CODE_BEGIN+100,
+
+    MSG_ID_NL1B_CODE_BEGIN, MSG_ID_NL1B_CODE_TAIL = MSG_ID_NL1B_CODE_BEGIN+100,
+
+    MSG_ID_XL1R_CODE_BEGIN, MSG_ID_XL1R_CODE_TAIL = MSG_ID_XL1R_CODE_BEGIN+100,
+
+    MSG_ID_MBMSAL_CODE_BEGIN, MSG_ID_MBMSAL_CODE_TAIL = MSG_ID_MBMSAL_CODE_BEGIN + 20,
+
+    MSG_ID_MMRF_CODE_BEGIN, MSG_ID_MMRF_CODE_TAIL = MSG_ID_MMRF_CODE_BEGIN + 27,
+
+    MSG_ID_MMRF_PCORE_CODE_BEGIN, MSG_ID_MMRF_PCORE_CODE_TAIL = MSG_ID_MMRF_PCORE_CODE_BEGIN + 20,
+
+    MSG_ID_LAS_CODE_BEGIN, MSG_ID_LAS_CODE_TAIL = MSG_ID_LAS_CODE_BEGIN + 150,
+
+    MSG_ID_EL1TST_CODE_BEGIN, MSG_ID_EL1TST_CODE_TAIL = MSG_ID_EL1TST_CODE_BEGIN + 10,
+
+    MSG_ID_CL1TST_CODE_BEGIN, MSG_ID_CL1TST_CODE_TAIL = MSG_ID_CL1TST_CODE_BEGIN + 10,
+    MSG_ID_CL1TST_L1PS_CODE_BEGIN, MSG_ID_CL1TST_L1PS_CODE_TAIL = MSG_ID_CL1TST_L1PS_CODE_BEGIN + 30,
+
+    MSG_ID_GL1TST_CODE_BEGIN, MSG_ID_GL1TST_CODE_TAIL = MSG_ID_GL1TST_CODE_BEGIN + 100,
+
+    MSG_ID_GMSS_CODE_BEGIN, MSG_ID_GMSS_CODE_TAIL = MSG_ID_GMSS_CODE_BEGIN + 200,
+
+    MSG_ID_CCISMCORE_CODE_BEGIN, MSG_ID_CCISMCORE_CODE_END = MSG_ID_CCISMCORE_CODE_BEGIN + 10,
+
+    MSG_ID_CCISMCORE_SCP_CODE_BEGIN, MSG_ID_CCISMCORE_SCP_CODE_END = MSG_ID_CCISMCORE_SCP_CODE_BEGIN + 10,
+
+    MSG_ID_CSCDCORE_CODE_BEGIN, MSG_ID_CSCDCORE_CODE_END = MSG_ID_CSCDCORE_CODE_BEGIN + 10,
+
+    MSG_ID_LHIFCORE_CODE_BEGIN, MSG_ID_LHIFCORE_CODE_END = MSG_ID_LHIFCORE_CODE_BEGIN + 10,
+
+    MSG_ID_DPAMIF_CODE_BEGIN, MSG_ID_DPMAIF_CODE_TAIL = MSG_ID_DPAMIF_CODE_BEGIN + 10,
+
+    MSG_ID_IWLAN_CODE_BEGIN, MSG_ID_IWLAN_CODE_TAIL = MSG_ID_IWLAN_CODE_BEGIN + 1000,
+
+    /* C2K message Ranges */
+    MSG_ID_XL1_CODE_BEGIN, MSG_ID_XL1_CODE_TAIL = MSG_ID_XL1_CODE_BEGIN + 160,
+    MSG_ID_VRF_CODE_BEGIN, MSG_ID_VRF_CODE_TAIL = MSG_ID_VRF_CODE_BEGIN + 20,
+
+    /* 1xRTT MSG ID Range */
+    MSG_ID_L1D_MDM_CODE_BEGIN, MSG_ID_L1D_MDM_CODE_TAIL = MSG_ID_L1D_MDM_CODE_BEGIN + 300,
+
+    MSG_ID_LMD_CODE_BEGIN, MSG_ID_LMD_CODE_TAIL = MSG_ID_LMD_CODE_BEGIN + 100,
+
+    MSG_ID_LMDS_CODE_BEGIN, MSG_ID_LMDS_CODE_TAIL = MSG_ID_LMDS_CODE_BEGIN + 30,
+
+    MSG_ID_CXRLP_CODE_BEGIN, MSG_ID_CXRLP_CODE_TAIL = MSG_ID_CXRLP_CODE_BEGIN + 30,
+
+    MSG_ID_CPSW_CODE_BEGIN, MSG_ID_CPSW_CODE_TAIL = MSG_ID_CPSW_CODE_BEGIN + 500,
+
+    MSG_ID_CPSWS_CODE_BEGIN, MSG_ID_CPSWS_CODE_TAIL = MSG_ID_CPSWS_CODE_BEGIN + 30,
+
+    /* EVDO MSG ID Range */
+    MSG_ID_DO_CODE_BEGIN,
+
+    /* HSC */
+    MSG_ID_HSC_CODE_BEGIN       = MSG_ID_DO_CODE_BEGIN,
+    MSG_ID_HSC_CODE_TAIL        = MSG_ID_HSC_CODE_BEGIN + 200,
+
+    /* SLC */
+    MSG_ID_SLC_CODE_BEGIN, MSG_ID_SLC_CODE_TAIL = MSG_ID_SLC_CODE_BEGIN + 100,
+    /* CLC */
+    MSG_ID_CLC_CODE_BEGIN, MSG_ID_CLC_CODE_TAIL = MSG_ID_CLC_CODE_BEGIN + 200,
+    /* RMC */
+    MSG_ID_RMC_CODE_BEGIN, MSG_ID_RMC_CODE_TAIL = MSG_ID_RMC_CODE_BEGIN + 300,
+
+    /* FCP */
+    MSG_ID_FCP_CODE_BEGIN, MSG_ID_FCP_CODE_TAIL = MSG_ID_FCP_CODE_BEGIN + 300,
+
+    /* RCP */
+    MSG_ID_RCP_CODE_BEGIN, MSG_ID_RCP_CODE_TAIL = MSG_ID_RCP_CODE_BEGIN + 300,
+
+    /* SEC */
+    MSG_ID_SEC_CODE_BEGIN, MSG_ID_SEC_CODE_TAIL = MSG_ID_SEC_CODE_BEGIN + 100,
+
+    MSG_ID_DO_CODE_TAIL         = MSG_ID_SEC_CODE_TAIL,
+
+    MSG_ID_CHLP_CODE_BEGIN, MSG_ID_CHLP_CODE_TAIL = MSG_ID_CHLP_CODE_BEGIN + 350,
+
+    MSG_ID_CSS_CODE_BEGIN, MSG_ID_CSS_CODE_TAIL = MSG_ID_CSS_CODE_BEGIN + 300,
+
+    MSG_ID_CVAL_CODE_BEGIN, MSG_ID_CVAL_CODE_TAIL = MSG_ID_CVAL_CODE_BEGIN + 1250,
+
+    MSG_ID_LEC_CODE_BEGIN, MSG_ID_LEC_CODE_TAIL = MSG_ID_LEC_CODE_BEGIN + 300,
+
+    MSG_ID_CUIM_CODE_BEGIN, MSG_ID_CUIM_CODE_TAIL = MSG_ID_CUIM_CODE_BEGIN + 1000,
+
+    MSG_ID_ELT_CODE_BEGIN, MSG_ID_ELT_CODE_TAIL = MSG_ID_ELT_CODE_BEGIN + 1000,
+
+    MSG_ID_ELT_OTA_CODE_BEGIN, MSG_ID_ELT_OTA_CODE_TAIL = MSG_ID_ELT_OTA_CODE_BEGIN + 30,
+
+    // For demo/integration verification
+    MSG_ID_C2K_DUMMY_L1_CODE_BEGIN, MSG_ID_C2K_DUMMY_L1_CODE_TAIL = MSG_ID_C2K_DUMMY_L1_CODE_BEGIN + 30,
+
+    /* for MD1UT */
+    MSG_ID_C2K_MD1UT_CODE_BEGIN, MSG_ID_C2K_MD1UT_CODE_TAIL  = MSG_ID_C2K_MD1UT_CODE_BEGIN + 50,
+
+    MSG_ID_C2K_IRAT_CODE_BEGIN, MSG_ID_C2K_IRAT_CODE_TAIL  = MSG_ID_C2K_IRAT_CODE_BEGIN + 50,
+
+    MSG_ID_MON_CODE_BEGIN, MSG_ID_MON_CODE_TAIL = MSG_ID_MON_CODE_BEGIN + 1000,
+
+    MSG_ID_NVRAM_TEST_CODE_BEGIN, MSG_ID_NVRAM_TEST_CODE_TAIL = MSG_ID_NVRAM_TEST_CODE_BEGIN + 20,
+
+    MSG_ID_STUB_CODE_BEGIN, MSG_ID_STUB_CODE_TAIL = MSG_ID_STUB_CODE_BEGIN + 200,
+
+    MSG_ID_L4C2K_CODE_BEGIN, MSG_ID_L4C2K_CODE_TAIL = MSG_ID_L4C2K_CODE_BEGIN + 30,
+
+    MSG_ID_RSVAC_CODE_BEGIN, MSG_ID_RSVAC_CODE_TAIL = MSG_ID_RSVAC_CODE_BEGIN + 50,
+
+    MSG_ID_MD_BOOT_MODE_BEGIN, MSG_ID_MD_BOOT_MODE_TAIL = MSG_ID_MD_BOOT_MODE_BEGIN + 10,
+
+    MSG_ID_ATPIO_CODE_BEGIN, MSG_ID_ATPIO_CODE_TAIL = MSG_ID_ATPIO_CODE_BEGIN + 20,
+
+    MSG_ID_L4APS_CODE_BEGIN, MSG_ID_L4APS_CODE_TAIL = MSG_ID_L4APS_CODE_BEGIN + 150,
+
+    MSG_ID_L4B_CODE_BEGIN, MSG_ID_L4B_CODE_TAIL = MSG_ID_L4B_CODE_BEGIN + 500,
+
+    MSG_ID_L4BPDN_CODE_BEGIN, MSG_ID_L4BPDN_CODE_TAIL = MSG_ID_L4BPDN_CODE_BEGIN + 350,
+
+    MSG_ID_D2_CODE_BEGIN, MSG_ID_D2_CODE_TAIL = MSG_ID_D2_CODE_BEGIN + 350,
+
+    MSG_ID_DDM_CODE_BEGIN, MSG_ID_DDM_CODE_TAIL = MSG_ID_DDM_CODE_BEGIN + 200,
+
+    MSG_ID_SIMMNGR_CODE_BEGIN, MSG_ID_SIMMNGR_CODE_TAIL = MSG_ID_SIMMNGR_CODE_BEGIN + 100,
+
+    MSG_ID_WO_CODE_BEGIN, MSG_ID_WO_CODE_TAIL = MSG_ID_WO_CODE_BEGIN + 100,
+
+    MSG_ID_TCPIP_BEGIN, MSG_ID_TCPIP_TAIL = MSG_ID_TCPIP_BEGIN + 50,
+
+    MSG_ID_BIP_CODE_BEGIN, MSG_ID_BIP_CODE_TAIL = MSG_ID_BIP_CODE_BEGIN + 100,
+
+    MSG_ID_RR_SMP_BEGIN, MSG_ID_RR_SMP_TAIL = MSG_ID_RR_SMP_BEGIN + 10,
+
+    MSG_ID_IMSM_CODE_BEGIN, MSG_ID_IMSM_CODE_TAIL = MSG_ID_IMSM_CODE_BEGIN + 20,
+
+    MSG_ID_SSDS_CODE_BEGIN, MSG_ID_SSDS_CODE_TAIL = MSG_ID_SSDS_CODE_BEGIN + 50,
+
+    MSG_ID_LIO_CODE_BEGIN, MSG_ID_LIO_CODE_TAIL = MSG_ID_LIO_CODE_BEGIN + 100,
+
+    MSG_ID_NL2_CODE_BEGIN, MSG_ID_NL2_CODE_TAIL = MSG_ID_NL2_CODE_BEGIN + 200,
+
+    MSG_ID_ENPDCP_CODE_BEGIN, MSG_ID_ENPDCP_CODE_TAIL = MSG_ID_ENPDCP_CODE_BEGIN + 200,
+
+    MSG_ID_ENL2_FREE_CODE_BEGIN, MSG_ID_ENL2_FREE_CODE_TAIL = MSG_ID_ENL2_FREE_CODE_BEGIN + 20,
+
+    MSG_ID_EL2_V2_CODE_BEGIN, MSG_ID_EL2_V2_CODE_TAIL = MSG_ID_EL2_V2_CODE_BEGIN + 200,
+
+    MSG_ID_MCIF_BEGIN, MSG_ID_MCIF_TAIL = MSG_ID_MCIF_BEGIN + 10,
+
+    MSG_ID_WSVC_BEGIN, MSG_ID_WSVC_TAIL = MSG_ID_WSVC_BEGIN + 15,
+
+    MSG_ID_WFPM_CODE_BEGIN, MSG_ID_WFPM_CODE_TAIL = MSG_ID_WFPM_CODE_BEGIN + 20,
+
+    MSG_ID_MDFPM_CODE_BEGIN, MSG_ID_MDFPM_CODE_TAIL = MSG_ID_MDFPM_CODE_BEGIN + 100,
+
+    MSG_ID_WRPM_CODE_BEGIN, MSG_ID_WRPM_CODE_TAIL = MSG_ID_WRPM_CODE_BEGIN + 20,
+
+    MSG_ID_XCAP_CODE_BEGIN, MSG_ID_XCAP_CODE_TAIL = MSG_ID_XCAP_CODE_BEGIN + 100,
+
+    MSG_ID_NAS_SV_CODE_BEGIN, MSG_ID_NAS_SV_CODE_TAIL = MSG_ID_NAS_SV_CODE_BEGIN + 3000,
+
+    MSG_ID_VGMM_CODE_BEGIN, MSG_ID_VGMM_CODE_TAIL = MSG_ID_VGMM_CODE_BEGIN + 200,
+
+    MSG_ID_VGSM_CODE_BEGIN, MSG_ID_VGSM_CODE_TAIL = MSG_ID_VGSM_CODE_BEGIN + 150,
+
+    MSG_ID_SMIC_CODE_BEGIN, MSG_ID_SMIC_CODE_TAIL = MSG_ID_SMIC_CODE_BEGIN + 30,
+
+    MSG_ID_UPDS_CODE_BEGIN, MSG_ID_UPDS_CODE_TAIL = MSG_ID_UPDS_CODE_BEGIN + 30,
+
+    MSG_ID_UTT_CODE_BEGIN, MSG_ID_UTT_CODE_TAIL = MSG_ID_UTT_CODE_BEGIN + 100,
+
+	MSG_ID_NRRC_CODE_BEGIN, MSG_ID_NRRC_CODE_TAIL = MSG_ID_NRRC_CODE_BEGIN + 600,
+
+    MSG_ID_RR_NRRC_CODE_BEGIN, MSG_ID_RR_NRRC_CODE_TAIL = MSG_ID_RR_NRRC_CODE_BEGIN + 50,
+
+    MSG_ID_RRC_NRRC_CODE_BEGIN, MSG_ID_RRC_NRRC_CODE_TAIL = MSG_ID_RRC_NRRC_CODE_BEGIN + 50,
+
+    MSG_ID_IMCB_CODE_BEGIN, MSG_ID_IMCB_CODE_TAIL = MSG_ID_IMCB_CODE_BEGIN + 300,
+
+    MSG_ID_IMS_STACK_CODE_BEGIN, MSG_ID_IMS_STACK_CODE_TAIL = MSG_ID_IMS_STACK_CODE_BEGIN + 180,
+
+    MSG_ID_IMSUA_CODE_BEGIN, MSG_ID_IMSUA_CODE_TAIL = MSG_ID_IMSUA_CODE_BEGIN + 250,
+
+    MSG_ID_MCF_CODE_BEGIN, MSG_ID_MCF_CODE_TAIL = MSG_ID_MCF_CODE_BEGIN + 50,
+
+    MSG_ID_MTF_CODE_BEGIN, MSG_ID_MTF_CODE_TAIL = MSG_ID_MTF_CODE_BEGIN + 200,
+
+    MSG_ID_CRYPTO_CODE_BEGIN, MSG_ID_CRYPTO_CODE_TAIL = MSG_ID_CRYPTO_CODE_BEGIN + 50,
+
+    MSG_ID_IPSEC_CODE_BEGIN, MSG_ID_IPSEC_CODE_TAIL = MSG_ID_IPSEC_CODE_BEGIN + 100,
+
+    MSG_ID_DNS_CODE_BEGIN, MSG_ID_DNS_CODE_TAIL = MSG_ID_DNS_CODE_BEGIN + 10,
+
+    MSG_ID_SAP_REALYER_CODE_BEGIN, MSG_ID_SAP_REALYER_CODE_TAIL = MSG_ID_SAP_REALYER_CODE_BEGIN + 10,
+
+    MSG_ID_PERF_CODE_BEGIN, MSG_ID_PERF_CODE_TAIL = MSG_ID_PERF_CODE_BEGIN + 30,
+
+    MSG_ID_NAL_CODE_BEGIN, MSG_ID_NAL_CODE_TAIL = MSG_ID_NAL_CODE_BEGIN + 10,
+
+    MSG_ID_FCS_CODE_BEGIN, MSG_ID_FCS_CODE_TAIL = MSG_ID_FCS_CODE_BEGIN + 10,
+
+    MSG_ID_WIFI_PROXY_CODE_BEGIN, MSG_ID_WIFI_PROXY_CODE_TAIL = MSG_ID_WIFI_PROXY_CODE_BEGIN + 50,
+
+    MSG_ID_WTUNNEL_CODE_BEGIN, MSG_ID_WTUNNEL_CODE_TAIL = MSG_ID_WTUNNEL_CODE_BEGIN + 10,
+
+    MSG_ID_N3SAM_CODE_BEGIN, MSG_ID_N3SAM_CODE_TAIL = MSG_ID_N3SAM_CODE_BEGIN + 200,    
+
+    MSG_ID_WLC_CODE_BEGIN, MSG_ID_WLC_CODE_TAIL = MSG_ID_WLC_CODE_BEGIN + 100,
+
+    MSG_ID_N3CF_CODE_BEGIN, MSG_ID_N3CF_CODE_TAIL = MSG_ID_N3CF_CODE_BEGIN + 50,
+    
+    MSG_ID_N3EPC_CODE_BEGIN, MSG_ID_N3EPC_CODE_TAIL = MSG_ID_N3EPC_CODE_BEGIN + 100,
+    
+    MSG_ID_N3ANS_CODE_BEGIN, MSG_ID_N3ANS_CODE_TAIL = MSG_ID_N3ANS_CODE_BEGIN + 50,
+
+    MSG_ID_EAP_CODE_BEGIN, MSG_ID_EAP_CODE_TAIL = MSG_ID_EAP_CODE_BEGIN + 10,
+
+    MSG_ID_CERT_CODE_BEGIN, MSG_ID_CERT_CODE_TAIL = MSG_ID_CERT_CODE_BEGIN + 30,
+
+    MSG_ID_ETHSVC_CODE_BEGIN, MSG_ID_ETHSVC_CODE_TAIL = MSG_ID_ETHSVC_CODE_BEGIN + 20,
+
+    MSG_ID_HTTP_TLS_CODE_BEGIN, MSG_ID_HTTP_TLS_CODE_TAIL = MSG_ID_HTTP_TLS_CODE_BEGIN + 50,
+
+    MSG_ID_GNSS_TC_CODE_BEGIN, MSG_ID_GNSS_TC_CODE_TAIL = MSG_ID_GNSS_TC_CODE_BEGIN + 100,
+
+    MSG_ID_L5_CODE_BEGIN, MSG_ID_L5_CODE_TAIL = MSG_ID_L5_CODE_BEGIN + 1000,  
+
+    MSG_ID_L1MISC_CODE_BEGIN, MSG_ID_L1MISC_CODE_TAIL = MSG_ID_L1MISC_CODE_BEGIN + 30, 
+
+#ifdef __IPC_ADAPTER__
+    MSG_ID_IPC_ADAPTER_CODE_BEGIN, MSG_ID_IPC_ADAPTER_CODE_TAIL = MSG_ID_IPC_ADAPTER_CODE_BEGIN + 300,
+
+    MSG_ID_IPCA_PWR_CODE_BEGIN, MSG_ID_IPCA_PWR_CODE_TAIL = MSG_ID_IPCA_PWR_CODE_BEGIN + 50,
+    
+    MSG_ID_IPCA_SAT_CODE_BEGIN, MSG_ID_IPCA_SAT_CODE_TAIL = MSG_ID_IPCA_SAT_CODE_BEGIN + 20,
+
+    MSG_ID_IPCA_SMS_CODE_BEGIN, MSG_ID_IPCA_SMS_CODE_TAIL = MSG_ID_IPCA_SMS_CODE_BEGIN + 50,
+
+    MSG_ID_IPCA_SMU_CODE_BEGIN, MSG_ID_IPCA_SMU_CODE_TAIL = MSG_ID_IPCA_SMU_CODE_BEGIN + 100,
+
+    MSG_ID_IPCA_PHB_CODE_BEGIN, MSG_ID_IPCA_PHB_CODE_TAIL = MSG_ID_IPCA_PHB_CODE_BEGIN + 30,
+
+    MSG_ID_IPCA_CC_CODE_BEGIN, MSG_ID_IPCA_CC_CODE_TAIL = MSG_ID_IPCA_CC_CODE_BEGIN + 50, 
+
+    MSG_ID_IPCA_SS_CODE_BEGIN, MSG_ID_IPCA_SS_CODE_TAIL = MSG_ID_IPCA_SS_CODE_BEGIN + 50,
+
+    MSG_ID_IPCA_NW_CODE_BEGIN, MSG_ID_IPCA_NW_CODE_TAIL = MSG_ID_IPCA_NW_CODE_BEGIN + 100,
+
+    MSG_ID_IPCA_MISC_CODE_BEGIN, MSG_ID_IPCA_MISC_CODE_TAIL = MSG_ID_IPCA_MISC_CODE_BEGIN + 30,
+
+    MSG_ID_IPCA_GPRS_CODE_BEGIN, MSG_ID_IPCA_GPRS_CODE_TAIL = MSG_ID_IPCA_GPRS_CODE_BEGIN + 100,
+
+    MSG_ID_IPCA_GPRS_ROUTINE_CODE_BEGIN, MSG_ID_IPCA_GPRS_ROUTINE_CODE_TAIL = MSG_ID_IPCA_GPRS_ROUTINE_CODE_BEGIN + 20,
+
+    MSG_ID_IPCA_FACTORY_CODE_BEGIN, MSG_ID_IPCA_FACTORY_CODE_TAIL = MSG_ID_IPCA_FACTORY_CODE_BEGIN + 50,
+    
+    MSG_ID_IPCA_DSPL_CODE_BEGIN, MSG_ID_IPCA_DSPL_CODE_TAIL = MSG_ID_IPCA_DSPL_CODE_BEGIN + 20,
+
+    MSG_ID_IPCA_SND_CODE_BEGIN, MSG_ID_IPCA_SND_CODE_TAIL = MSG_ID_IPCA_SND_CODE_BEGIN + 30,
+
+    MSG_ID_IPCA_SAP_CODE_BEGIN, MSG_ID_IPCA_SAP_CODE_TAIL = MSG_ID_IPCA_SAP_CODE_BEGIN + 30,
+
+    MSG_ID_IPCA_EM_CODE_BEGIN, MSG_ID_IPCA_EM_CODE_TAIL = MSG_ID_IPCA_EM_CODE_BEGIN + 150,
+
+    MSG_ID_IPCA_IMS_CODE_BEGIN, MSG_ID_IPCA_IMS_CODE_TAIL = MSG_ID_IPCA_IMS_CODE_BEGIN + 50,
+    
+    MSG_ID_IPCA_CFG_CODE_BEGIN, MSG_ID_IPCA_CFG_CODE_TAIL = MSG_ID_IPCA_CFG_CODE_BEGIN + 50,
+
+    MSG_ID_IPCA_IMEI_CODE_BEGIN, MSG_ID_IPCA_IMEI_CODE_TAIL = MSG_ID_IPCA_IMEI_CODE_BEGIN + 20,   
+
+    MSG_ID_IPCA_SRLTE_CODE_BEGIN, MSG_ID_IPCA_SRLTE_CODE_TAIL = MSG_ID_IPCA_SRLTE_CODE_BEGIN + 20,
+
+    MSG_ID_IPCA_EMBMS_CODE_BEGIN, MSG_ID_IPCA_EMBMS_CODE_TAIL = MSG_ID_IPCA_EMBMS_CODE_BEGIN + 30,
+
+#ifdef __TC10_IPC_CDMA_SUPPORT__
+    MSG_ID_IPCA_IR_CODE_BEGIN, MSG_ID_IPCA_IR_CODE_TAIL = MSG_ID_IPCA_IR_CODE_BEGIN + 20,
+#endif
+
+    MSG_ID_IPCA_DOMESTIC_CODE_BEGIN, MSG_ID_IPCA_DOMESTIC_CODE_TAIL = MSG_ID_IPCA_DOMESTIC_CODE_BEGIN + 100,
+
+    MSG_ID_IPCA_JPN_CODE_BEGIN, MSG_ID_IPCA_JPN_CODE_TAIL = MSG_ID_IPCA_JPN_CODE_BEGIN + 30,
+#endif
+
+#ifdef __TC01__ 
+    MSG_ID_CUSTOM_CODE_BEGIN, MSG_ID_CUSTOM_CODE_TAIL = MSG_ID_CUSTOM_CODE_BEGIN+20,
+#endif
+    MSG_ID_INTCTRL_CODE_BEGIN, MSG_ID_INTCTRL_CODE_TAIL = MSG_ID_INTCTRL_CODE_BEGIN + 20,
+
+    MSG_ID_MAIF_CODE_BEGIN, MSG_ID_MAIF_CODE_TAIL = MSG_ID_MAIF_CODE_BEGIN + 50,  
+
+    /* Reserved for CCCI, please should add mew MSG group before this line */
+    MSG_ID_CCCI_MSG_CODE_BEGIN = 0xFF00, MSG_ID_CCCI_MSG_CODE_TAIL = MSG_ID_CCCI_MSG_CODE_BEGIN + 254,
+
+    MSG_ID_CODE_END,  
+    END_OF_MSG_ID_BEGIN = MSG_ID_CODE_END,
+    END_OF_MSG_ID_TAIL = MSG_ID_CODE_END,
+} MSG_ID_CODE_BEGIN;
+
+#ifdef GEN_FOR_PC
+    #define MODULE_MSG_BEGIN(BEGIN_POS)  typedef enum __cgen_msg_type_id_##BEGIN_POS{MSG_TAG_##BEGIN_POS = BEGIN_POS,
+    #define MODULE_MSG_END(END_POS) MSG_ID_CGEN_PARSE_LAST_ID=END_POS }_cgen_msg_type_id_##END_POS;
+#else
+    #define MODULE_MSG_BEGIN(BEGIN_POS)   enum { MSG_TAG_##BEGIN_POS = BEGIN_POS,
+    #define MODULE_MSG_END(END_POS)     };    
+#endif /* GEN_FOR_PC */
+
+/* user defined name */
+#define CMUX_MSG_CODE_BEGIN                    MSG_ID_CMUX_CODE_BEGIN
+#define DRIVER_MSG_CODE_BEGIN                  MSG_ID_DRIVER_CODE_BEGIN
+#define FT_MSG_CODE_BEGIN                      MSG_ID_FT_CODE_BEGIN
+#define L1_MSG_CODE_BEGIN                      MSG_ID_L1_CODE_BEGIN
+#define TST_MSG_CODE_BEGIN                     MSG_ID_TST_CODE_BEGIN
+#define MAIF_MSG_CODE_BEGIN                    MSG_ID_MAIF_CODE_BEGIN
+
+MODULE_MSG_BEGIN(END_OF_MSG_ID_BEGIN)
+    MSG_ID_END = END_OF_MSG_ID_BEGIN,
+MODULE_MSG_END(END_OF_MSG_ID_TAIL)
+
+#endif /* MODULE_MSG_RANGE_H */
diff --git a/mcu/interface/sap/module_taskid_range.h b/mcu/interface/sap/module_taskid_range.h
new file mode 100644
index 0000000..c6264f3
--- /dev/null
+++ b/mcu/interface/sap/module_taskid_range.h
@@ -0,0 +1,29 @@
+#ifndef MODULE_TASKID_RANGE_H
+#define MODULE_TASKID_RANGE_H
+
+#if defined(__MD93__) || defined(__MD95__)
+#define MODEM_5G_TASK_NUM_MAX   3
+
+#elif defined(__MD97__)
+#define MODEM_5G_TASK_NUM_MAX   15
+
+#endif
+
+typedef enum {
+    TASK_ID_CODE_RESERVED = 0,    
+    TASK_ID_SRV_CODE_BEGIN = TASK_ID_CODE_RESERVED,
+
+    TASK_ID_MODEM_2G3G_CODE_BEGIN = TASK_ID_SRV_CODE_BEGIN + 45,
+    
+    TASK_ID_MODEM_4G_CODE_BEGIN = TASK_ID_MODEM_2G3G_CODE_BEGIN + 80,
+
+    TASK_ID_MODEM_5G_CODE_BEGIN = TASK_ID_MODEM_4G_CODE_BEGIN + 40,
+    
+    TASK_ID_MW_CODE_BEGIN = TASK_ID_MODEM_5G_CODE_BEGIN + MODEM_5G_TASK_NUM_MAX,
+
+    TASK_ID_DRV_CODE_BEGIN = TASK_ID_MW_CODE_BEGIN + 32,
+
+    TASK_ID_CODE_MAX = 255
+} TASK_ID_CODE_BEGIN;
+
+#endif /* MODULE_TASKID_RANGE_H */
diff --git a/mcu/interface/sap/mw/dpfm_msgid_source.h b/mcu/interface/sap/mw/dpfm_msgid_source.h
new file mode 100644
index 0000000..e59f02f
--- /dev/null
+++ b/mcu/interface/sap/mw/dpfm_msgid_source.h
@@ -0,0 +1,4 @@
+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,
diff --git a/mcu/interface/sap/mw/ft_msgid.h b/mcu/interface/sap/mw/ft_msgid.h
new file mode 100644
index 0000000..16346c4
--- /dev/null
+++ b/mcu/interface/sap/mw/ft_msgid.h
@@ -0,0 +1,150 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ * ft_sap.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   FT and TST 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef FT_MSGID_H
+#define FT_MSGID_H
+
+/* Request for TST */
+
+MODULE_MSG_BEGIN( FT_MSG_CODE_BEGIN )
+MSG_ID_FT_TO_TST = FT_MSG_CODE_BEGIN,
+MSG_ID_TST_TO_FT,
+MSG_ID_FT_TO_GL1TST,
+MSG_ID_FT_TO_UL1TST,
+MSG_ID_FT_TO_EL1TST,
+MSG_ID_FT_TO_MMRF,
+MSG_ID_FTA_BASIC_REQ,
+MSG_ID_FTA_BASIC_CNF,
+MSG_ID_FTC_BASIC_REQ,
+MSG_ID_FTC_BASIC_CNF,
+MSG_ID_FT_CAL_DATA_ADD_ONE_REQ,
+MSG_ID_FT_CAL_DATA_ADD_ONE_CNF,
+MSG_ID_FT_TO_NL1,
+MODULE_MSG_END( MSG_ID_FT_CODE_TAIL )
+#endif  //FT_MSGID_H
diff --git a/mcu/interface/sap/mw/gps_msgid.h b/mcu/interface/sap/mw/gps_msgid.h
new file mode 100644
index 0000000..eafef36
--- /dev/null
+++ b/mcu/interface/sap/mw/gps_msgid.h
@@ -0,0 +1,429 @@
+/*****************************************************************************
+*  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) 2003
+ *
+ *******************************************************************************/
+
+ /*******************************************************************************
+ * Filename:
+ * ---------
+ *  gps_sap.h
+ *
+ * Project:
+ * --------
+ *  MAUI
+ *
+ * Description:
+ * ------------
+ *  GIS SAP
+ *
+ * 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!
+ *
+ * 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 GPS_MSGID_H
+#define GPS_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_GPS_MSG_CODE_BEGIN )
+MSG_ID_GPS_UART_OPEN_SWITCH_REQ,
+MSG_ID_GPS_UART_CLOSE_SWITCH_REQ,
+
+MSG_ID_GPS_POS_GAD_CNF,
+MSG_ID_GPS_LCSP_MSG_CODE_BEGIN = MSG_ID_GPS_POS_GAD_CNF,
+MSG_ID_GPS_LCSP_MEAS_GAD_CNF,
+MSG_ID_GPS_LCSP_ASSIST_DATA_CNF,
+MSG_ID_GPS_LCSP_MSG_CODE_END = MSG_ID_GPS_LCSP_ASSIST_DATA_CNF,
+MSG_ID_GPS_POS_GAD_REQ,
+MSG_ID_GPS_LCSP_MEAS_GAD_REQ,
+MSG_ID_GPS_LCSP_ASSIST_DATA_REQ,
+MSG_ID_GPS_LCSP_ABORT_REQ,
+MSG_ID_GPS_LCSP_AGPS_RESTART_IND,
+
+/* RTC -> GPS */
+MSG_ID_RTC_GPS_TIME_CHANGE_IND,
+/* GPS EINT HISR -> GPS */
+MSG_ID_GPS_HOST_WAKE_UP_IND,
+
+MSG_ID_UAGPS_CP_GPS_ASSIST_DATA_ENQUIRY_IND,
+MSG_ID_UAGPS_CP_GPS_SFN_GPS_TOW_DRIFT_TIME_REQ,
+MSG_ID_UAGPS_CP_GPS_SFN_GPS_TOW_DRIFT_TIME_CNF,
+MSG_ID_UAGPS_CP_GPS_SFN_GPS_TOW_DRIFT_TIME_CANCEL_REQ,
+MSG_ID_GPS_AREA_EVENT_ADD_RSP,
+MSG_ID_GPS_AREA_EVENT_ADD_REQ,
+MSG_ID_GPS_AREA_EVENT_DEL_REQ,
+MSG_ID_GPS_AREA_EVENT_HAPPEN_IND,
+MSG_ID_UAGPS_CP_GPS_POS_CHANGE_EVALUATION_REQ,
+MSG_ID_UAGPS_CP_GPS_POS_CHANGE_EVALUATION_RSP,
+MSG_ID_UAGPS_CP_GPS_POS_CHANGE_EVALUATION_DEL,
+
+/* LCSP -> GNSS Task */
+MSG_ID_LCSP_GNSS_OPEN_REQ,
+MSG_ID_LCSP_GNSS_CLOSE_REQ,
+MSG_ID_LCSP_GNSS_COMMON_ASSIST_DATA_REQ,
+MSG_ID_LCSP_GNSS_GENERIC_ASSIST_DATA_REQ,
+MSG_ID_LCSP_GNSS_POS_REQ,
+MSG_ID_LCSP_GNSS_MEAS_REQ,
+MSG_ID_LCSP_GNSS_ABORT_REQ,
+MSG_ID_LCSP_GNSS_RESET_UE_STORED_POS_INFO,
+
+/* GNSS Task -> LCSP */
+MSG_ID_LCSP_GNSS_COMMON_ASSIST_DATA_CNF,
+MSG_ID_LCSP_GNSS_GENERIC_ASSIST_DATA_CNF,
+MSG_ID_LCSP_GNSS_POS_CNF,
+MSG_ID_LCSP_GNSS_MEAS_CNF,
+MSG_ID_LCSP_GNSS_ADDITIONAL_ASSIST_DATA_REQ,
+
+/* LPP_EXT -> GNSS */
+MSG_ID_LCSP_GNSS_HA_COMMON_IONOSPHERIC_MODEL_REQ,
+MSG_ID_LCSP_GNSS_HA_COMMON_TROPOSPHERE_MODEL_REQ,
+MSG_ID_LCSP_GNSS_HA_COMMON_ALTITUDE_ASSIST_REQ,
+MSG_ID_LCSP_GNSS_HA_COMMON_SOLAR_RADIATION_REQ,
+MSG_ID_LCSP_GNSS_HA_COMMON_CCP_ASSIST_REQ,
+MSG_ID_LCSP_GNSS_HA_GENERIC_CCP_ASSIST_REQ,
+MSG_ID_LCSP_GNSS_HA_GENERIC_DEGRADATION_MODEL_REQ,
+
+/* LBS -> GNSS */
+MSG_ID_LBS_GNSS_HA_ASSIST_CNF,
+
+/*LBS -> L4C*/
+//MSG_ID_LBS_MOLR_BEGIN_REQ,
+//MSG_ID_LBS_MOLR_END_REQ,
+//MSG_ID_L4C_SERVICE_STATE_REQ,
+//MSG_ID_L4C_ROAMING_STATE_REQ,
+//MSG_ID_L4C_DATA_CONN_STATE_REQ,
+
+/*GPS-> LBS*/
+MSG_ID_LBS_GNSS_PMTK_IND,
+MSG_ID_LBS_GNSS_GPS_CLOSE_REQ,
+MSG_ID_LBS_GNSS_GPS_OPEN_REQ,
+MSG_ID_LBS_GNSS_AGNSS_RESTART_IND,
+MSG_ID_LCSP_GNSS_STANDALONE_POS_IND,
+
+/*LBS->GPS*/
+MSG_ID_LBS_GNSS_PMTK_REQ,
+MSG_ID_LBS_GNSS_STANDALONE_PMTK_REQ,
+MSG_ID_LBS_GNSS_STANDALONE_QUERY_REQ,
+MSG_ID_LBS_GNSS_STANDALONE_OPEN_REQ,
+MSG_ID_LBS_GNSS_STANDALONE_CLOSE_REQ,
+
+/*LBS -> ATCI*/
+//MSG_ID_LBSAP_DATA_SEND_REQ,
+
+
+
+
+#ifdef UNIT_TEST
+/* GPS -> GPS */
+MSG_ID_GPS_UT_SET_EVENT_IND,
+MSG_ID_GPS_UT_WRITE_DATA_IND,
+#endif
+
+MODULE_MSG_END( MSG_ID_GPS_MSG_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_LBS_CODE_BEGIN )
+    /*L4C -> LBS*/
+    MSG_ID_LBS_MTLR_BEGIN_IND,
+    MSG_ID_LBS_MTLR_BEGIN_RES_RSP,
+    /* AERQ, AERP, AECL not used now*/
+    MSG_ID_LBS_AERQ_BEGIN_IND,
+    MSG_ID_LBS_AERQ_BEGIN_RES_RSP,
+    MSG_ID_LBS_AERP_BEGIN_RSP,
+    MSG_ID_LBS_AERP_END_RSP,
+    MSG_ID_LBS_AECL_BEGIN_IND,
+    MSG_ID_LBS_AECL_BEGIN_RES_RSP,
+    MSG_ID_LBS_MOLR_BEGIN_RSP,
+    MSG_ID_LBS_MOLR_END_RSP,
+    MSG_ID_AGPS_RESET_POSITIONING_IND,
+    MSG_ID_AGPS_CP_START_IND,
+    MSG_ID_AGPS_CP_END_IND,
+    MSG_ID_L4C_LBS_SERVICE_STATE_RSP,
+    MSG_ID_L4C_LBS_ROAMING_STATE_RSP,
+    MSG_ID_L4C_LBS_DATA_CONN_STATE_RSP,
+    MSG_ID_L4C_LBS_CURRENT_RAT_RSP,
+    MSG_ID_L4C_LBS_ACTIVE_SIM_RSP,    
+    MSG_ID_L4C_LBS_EMT_INFO_IND,
+    /*IMC -> LBS*/
+    MSG_ID_IMC_LBS_POS_NTF,
+#ifdef UNIT_TEST
+    /* LBS -> LBS */
+    MSG_ID_GPS_UT_LBS_HEADER_IND,
+    
+#endif
+    /*ERRC ->LBS*/
+     MSG_ID_ERRC_LBS_GNSS_POS_REQ,
+
+    /* DHL -> LBS */
+    MSG_ID_DHL_LBS_POS_NTF,
+
+    /* LPP -> LBS */
+    MSG_ID_LPP_LBS_EXT_WLAN_POS_ASSIST_DATA_PROVIDE_IND,
+    MSG_ID_LPP_LBS_EXT_BT_POS_ASSIST_DATA_PROVIDE_IND,
+    MSG_ID_LPP_LBS_EXT_SENSOR_POS_ASSIST_DATA_PROVIDE_IND,
+
+    MSG_ID_LPP_LBS_EXT_WLAN_MEAS_QUERY_REQ,
+    MSG_ID_LPP_LBS_EXT_BT_MEAS_QUERY_REQ,
+    MSG_ID_LPP_LBS_EXT_SENSOR_MEAS_QUERY_REQ,
+    MSG_ID_LPP_LBS_EXT_NETWORK_MEAS_QUERY_REQ,
+    MSG_ID_LPP_LBS_EXT_IPADDRESS_MEAS_QUERY_REQ,
+
+    MSG_ID_LPP_LBS_EXT_WLAN_START_IND,
+    MSG_ID_LPP_LBS_EXT_BT_START_IND,
+    MSG_ID_LPP_LBS_EXT_SENSOR_START_IND,
+    MSG_ID_LPP_LBS_EXT_NETWORK_START_IND,
+
+    MSG_ID_LPP_LBS_EXT_WLAN_STOP_IND,
+    MSG_ID_LPP_LBS_EXT_BT_STOP_IND,
+    MSG_ID_LPP_LBS_EXT_SENSOR_STOP_IND,
+    MSG_ID_LPP_LBS_EXT_NETWORK_STOP_IND,
+
+    /* The below 3 MSG_IDs is provided for other modules to get location information.
+            It is started from Gen97.*/
+    MSG_ID_LBS_LOC_INFO_REQ,
+    MSG_ID_LBS_LOC_INFO_CNF,
+    MSG_ID_LBS_LOC_INFO_IND,
+    /* GNSS_TC -> LBS */
+    MSG_ID_LBS_GNSS_TC_ACTIVE_SIM_REQ,
+    MSG_ID_LBS_GNSS_TC_TIME_SYNC_CNF,
+    MSG_ID_LBS_GNSS_TC_TIME_SYNC_IND,
+MODULE_MSG_END( MSG_ID_LBS_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_LIO_CODE_BEGIN )
+    MSG_ID_LIO_UT_UART_TX_IND,
+    MSG_ID_LIO_UT_UART_RX_IND,
+MODULE_MSG_END( MSG_ID_LIO_CODE_TAIL )
+
+MODULE_MSG_BEGIN( MSG_ID_GNSS_TC_CODE_BEGIN )
+/* RRC -> GNSS_TC */
+    MSG_ID_LBS_ERRC_READ_TIME_SIB_IND,
+    MSG_ID_GNSS_TC_NRRC_READ_TIME_SIB_CNF,
+
+/* LBS-> GNSS_TC */
+    MSG_ID_LBS_GNSS_TC_ACTIVE_SIM_RSP,
+    MSG_ID_LBS_GNSS_TC_TIME_SYNC_REQ,
+    MSG_ID_LBS_GNSS_TC_TIME_SYNC_RSP,
+    MSG_ID_LBS_GNSS_TC_TIME_INFO_RSP,
+
+/* EL1 -> GNSS_TC */
+    MSG_ID_GNSS_TC_EL1_SYNC_CNF,
+
+/* NL1 -> GNSS_TC */
+    MSG_ID_GNSS_TC_NL1_SYNC_CNF,
+
+/* UL1 -> GNSS_TC */
+    MSG_ID_GNSS_TC_UL1_SYNC_CNF,
+
+    
+MODULE_MSG_END( MSG_ID_GNSS_TC_CODE_TAIL )
+
+#endif //GPS_MSGID_H
diff --git a/mcu/interface/sap/mw/hif_mw_msgid.h b/mcu/interface/sap/mw/hif_mw_msgid.h
new file mode 100644
index 0000000..42c93e4
--- /dev/null
+++ b/mcu/interface/sap/mw/hif_mw_msgid.h
@@ -0,0 +1,478 @@
+/*****************************************************************************
+*  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_mw_msgid.h
+ *
+ * Project:
+ * --------
+ *   TATAKA
+ *
+ * Description:
+ * ------------
+ *   HIF middleware 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!
+ * 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!
+ * 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_MW_MSGID_H
+#define __INC_HIF_MW_MSGID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_HIF_MW_CODE_BEGIN )
+
+    MSG_ID_IPCORE_CODE_BEGIN = MSG_ID_HIF_MW_CODE_BEGIN,
+    MSG_ID_IPCORE_LINK_UP_REQ,
+    MSG_ID_IPCORE_LINK_DOWN_REQ,
+    MSG_ID_LMS_DL_SDU,
+    MSG_ID_LMS_NETIF_ATTACH,
+    MSG_ID_LMS_PROCESS_UL_QUEUE_REQ,
+    MSG_ID_IPF_IT_DL_IT_REQ,
+    MSG_ID_LMS_IT_DL_ENQUEUE_REQ,
+    MSG_ID_IPCORE_PROCESS_UL_QUEUE_REQ,
+    MSG_ID_IPCORE_RETRY_UL_RELOAD_REQ,
+    MSG_ID_IPCORE_DL_PACKET_FILTERED_REQ,
+    MSG_ID_IPCORE_UL_PACKET_FILTERED_REQ,
+    MSG_ID_IPCORE_IP_UP_REQ,
+    MSG_ID_IPCORE_IP_DOWN_REQ,
+    MSG_ID_IPCORE_LINK_UP_IND,
+    MSG_ID_IPCORE_IP_UP_IND,
+    MSG_ID_IPCORE_LINK_UP_RSP,
+    MSG_ID_IPCORE_IP_UP_RSP,
+    MSG_ID_IPCORE_QUERY_INFO_REQ,
+    MSG_ID_IPCORE_QUERY_INFO_CNF,
+    MSG_ID_IPCORE_DL_PACKET_FILTERED_WITH_INFO_REQ,
+    MSG_ID_IPCORE_UL_PACKET_FILTERED_WITH_INFO_REQ,
+    MSG_ID_IPCORE_SET_UL_THROTTLE,
+    MSG_ID_IPCORE_VDM_IMS_EMERGENCY_CALL_IND,
+    MSG_ID_IPCORE_RESTORE_NETIF_IND,
+    MSG_ID_IPCORE_UDP_IGMP_REG_FILTER_REQ,
+    MSG_ID_IPCORE_UDP_IGMP_DEREG_FILTER_REQ,
+    MSG_ID_IPC_FRAG_DL_RAW_DATA,
+    MSG_ID_IPC_FRAG_UL_RAW_DATA,
+    MSG_ID_D2CM_IPCORE_INFO_IND,
+
+    MSG_ID_TMC_EMAC_NW_STATUS_IND,
+    MSG_ID_TMC_NMAC_NW_STATUS_IND,
+    MSG_ID_TMC_EMAC_THERMAL_CONTROL_CNF,
+    MSG_ID_TMC_NMAC_THERMAL_CONTROL_CNF,
+    MSG_ID_TMC_CONTROL_REQ,
+    MSG_ID_TMC_NL1_NW_STATUS_IND,
+
+    /* MSGs from NRRC */
+    MSG_ID_TMC_NRRC_ASSISTANCE_INFO_SUPPORT_IND,
+    MSG_ID_TMC_NRRC_ASSISTANCE_INFO_SEND_CNF,
+    MSG_ID_TMC_NRRC_ASSISTANCE_INFO_SENDING_ALLOWED_IND,
+
+    MSG_ID_L5IO_TMC_ACTUATOR_NUM_REQ,
+    MSG_ID_L5IO_TMC_ACTUATOR_NUM_CNF,
+    MSG_ID_L5IO_TMC_ACTUATOR_STATE_QUERY_REQ,
+    MSG_ID_L5IO_TMC_ACTUATOR_STATE_QUERY_CNF,
+    MSG_ID_L5IO_TMC_ACTUATOR_SET_REQ,
+    MSG_ID_L5IO_TMC_ACTUATOR_SET_CNF,
+
+    MSG_ID_DPFM_RESET_REQ,
+    MSG_ID_DPFM_SET_TRACK_TABLE_TIMER,
+    MSG_ID_IPCORE_LHIFCORE_QUEUE_MAPPING_REQ,
+    MSG_ID_IPCORE_LHIFCORE_QUEUE_MAPPING_RSP,
+    MSG_ID_IPCORE_PROCESS_DL_QUEUE_REQ,
+    MSG_ID_IPCORE_REGISTER_FILTER_REQ,
+    MSG_ID_IPCORE_DEREGISTER_FILTER_REQ,
+    MSG_ID_IPCORE_NAS_RQ_INFO_IND,
+    MSG_ID_DPFM_PROCESS_HW_CMD_Q_IND,
+    MSG_ID_DPFM_LAN_DEV_DEL_FILTER_IND,
+    MSG_ID_IPCORE_CODE_TAIL = MSG_ID_IPCORE_CODE_BEGIN + 80,
+
+    MSG_ID_ETHERCORE_CODE_BEGIN,
+    MSG_ID_ETHERCORE_HANDLE_PACKET_REQ,
+    MSG_ID_ETHERCORE_LINK_UP_REQ,
+    MSG_ID_ETHERCORE_LINK_DOWN_REQ,
+    MSG_ID_ETHERCORE_CODE_TAIL = MSG_ID_ETHERCORE_CODE_BEGIN + 40,
+
+    MSG_ID_DHCP4C_CODE_BEGIN,
+    MSG_ID_DHCP4C_ACTIVATE_REQ,
+    MSG_ID_DHCP4C_DEACTIVATE_REQ,
+    MSG_ID_DHCP4C_PACKET_REQ,
+    MSG_ID_DHCP4C_ACTIVATE_RSP,
+    MSG_ID_DHCP4C_DEACTIVATE_RSP,
+    MSG_ID_DHCP4C_IP_UP_IND,
+    MSG_ID_DHCP4C_IP_DOWN_IND,
+    MSG_ID_DHCP4C_PACKET_IND,
+    MSG_ID_DHCP4C_CODE_TAIL = MSG_ID_DHCP4C_CODE_BEGIN + 40,
+
+    MSG_ID_NDPC_CODE_BEGIN,
+    MSG_ID_NDPC_ACTIVATE_REQ,
+    MSG_ID_NDPC_DEACTIVATE_REQ,
+    MSG_ID_NDPC_PACKET_REQ,
+    MSG_ID_NDPC_ACTIVATE_RSP,
+    MSG_ID_NDPC_DEACTIVATE_RSP,
+    MSG_ID_NDPC_IP_UP_IND,
+    MSG_ID_NDPC_IP_DOWN_IND,
+    MSG_ID_NDPC_PACKET_IND,
+    MSG_ID_NDPC_CODE_TAIL = MSG_ID_NDPC_CODE_BEGIN + 40,
+
+    MSG_ID_RNDIS_CODE_BEGIN,
+    MSG_ID_RNDIS_RELOAD_UL_BUFFER_REQ,
+    MSG_ID_RNDIS_START_HAD_REQ,
+    MSG_ID_RNDIS_START_DATA_PATH_REQ,
+    MSG_ID_RNDIS_STOP_DATA_PATH_REQ,
+    MSG_ID_RNDIS_DISCONNECTED_DEV_SHUTDOWN_REQ,
+    MSG_ID_RNDIS_CONNECTED_DEV_SHUTDOWN_REQ,
+    MSG_ID_RNDIS_CODE_TAIL = MSG_ID_RNDIS_CODE_BEGIN + 40,
+
+    MSG_ID_CCCI_TTY_CODE_BEGIN,
+    MSG_ID_CCCI_TTY_SESSION_INIT_REQ,
+    MSG_ID_CCCI_TTY_SESSION_DEINIT_REQ,
+    MSG_ID_CCCI_TTY_UL_DEQUEUE_REQ,
+    MSG_ID_CCCI_TTY_CODE_TAIL = MSG_ID_CCCI_TTY_CODE_BEGIN + 40,
+
+    MSG_ID_CCMNI_CODE_BEGIN,
+    MSG_ID_CCMNI_LINK_UP_REQ,
+    MSG_ID_CCMNI_LINK_DOWN_REQ,
+    MSG_ID_CCMNI_SESSION_INIT_REQ,
+    MSG_ID_CCMNI_SESSION_DEINIT_REQ,
+    MSG_ID_CCMNI_RETRY_UL_RELOAD_REQ,
+    MSG_ID_CCMNI_CODE_TAIL = MSG_ID_CCMNI_CODE_BEGIN + 40,
+
+	MSG_ID_MS_CODE_BEGIN,
+	MSG_ID_MS_CTRL_USB_SETUP_PKT,
+	MSG_ID_MS_CTRL_USB_CTRL_COMPLETED,
+	MSG_ID_MS_CTRL_USB_ATTACHED,
+	MSG_ID_MS_CTRL_USB_SUSPENDING,
+	MSG_ID_MS_CTRL_USB_RESUME,
+	MSG_ID_MS_CTRL_USB_DETACHING,
+	MSG_ID_MS_CTRL_USB_RESET,
+	MSG_ID_MS_CTRL_USB_SPEED_CHANGED,
+	MSG_ID_MS_CTRL_REINIT_REQ,
+	MSG_ID_MS_CTRL_UL_RELOAD_REQ,
+	MSG_ID_MS_DATA_RX_COMPLETED,
+	MSG_ID_MS_DATA_TX_COMPLETED,
+	MSG_ID_MS_BULKIN_EP_STALL,
+	MSG_ID_MS_BULKOUT_EP_STALL,
+	MSG_ID_MS_SET_USB_MODE_REQ,
+	MSG_ID_MS_RESET_DEVICE_REQ,
+	MSG_ID_MS_CODE_TAIL = MSG_ID_MS_CODE_BEGIN + 40,
+
+    MSG_ID_AOMGR_CODE_BEGIN,
+    MSG_ID_AOMGR_LINK_DOWN_IND,
+    MSG_ID_AOMGR_CODE_TAIL = MSG_ID_AOMGR_CODE_BEGIN + 40,
+
+    MSG_ID_USBCORE_CODE_BEGIN,
+    MSG_ID_USBCORE_SUSPEND_TO_IDLE,
+    MSG_ID_USBCORE_IDLE_NOTIFY_TO_L4,
+    MSG_ID_USBCORE_DUAL_OWNER_MSG_RECEIVE,
+    MSG_ID_USBCORE_CODE_TAIL = MSG_ID_USBCORE_CODE_BEGIN + 20,
+
+    MSG_ID_CDCECM_CODE_BEGIN,
+    MSG_ID_CDCECM_RELOAD_UPLINK_REQ,
+    MSG_ID_CDCECM_START_DATA_PATH_REQ,
+    MSG_ID_CDCECM_STOP_DATA_PATH_REQ,
+    MSG_ID_CDCECM_CODE_TAIL = MSG_ID_CDCECM_CODE_BEGIN + 20,
+
+    MSG_ID_ESL_COSIM_HIF_CODE_BEGIN,
+    MSG_ID_USBCLASS_USBCORE_ESL_ENTER_CONNECTED_STATE_REQ,
+    MSG_ID_HIF_IPCORE_ESL_ATTACH_DONE_IND,
+    MSG_ID_ESL_COSIM_HIF_CODE_TAIL = MSG_ID_ESL_COSIM_HIF_CODE_BEGIN + 10,
+
+    MSG_ID_UFPM_CODE_BEGIN,
+    MSG_ID_UFPM_EM_DUMP_CTX,
+    MSG_ID_UFPM_CODE_TAIL = MSG_ID_UFPM_CODE_BEGIN + 10,
+
+    MSG_ID_NCCMNI_CODE_BEGIN,
+    MSG_ID_NCCMNI_NETIF_UL_REQ,
+    MSG_ID_NCCMNI_NETIF_DL_REQ,
+    MSG_ID_NCCMNI_DATA_POLL_ALL_HIF_IND,
+    MSG_ID_NCCMNI_CODE_TAIL = MSG_ID_NCCMNI_CODE_BEGIN + 10,
+
+    MSG_ID_D2_NCCMNI_CODE_BEGIN,
+        MSG_ID_D2_NCCMNI_ESTABLISHPDN_REQ,
+        MSG_ID_D2_NCCMNI_ESTABLISHPDN_CNF,
+        MSG_ID_D2_NCCMNI_IFCHANGE_REQ,
+        MSG_ID_D2_NCCMNI_IFCHANGE_CNF,
+        MSG_ID_D2_NCCMNI_DISCONNECTPDN_REQ,
+        MSG_ID_D2_NCCMNI_DISCONNECTPDN_CNF,
+    MSG_ID_D2_NCCMNI_CODE_TAIL = MSG_ID_D2_NCCMNI_CODE_BEGIN + 10,
+
+MODULE_MSG_END( MSG_ID_HIF_MW_CODE_TAIL )
+
+#endif /* __INC_HIF_MW_MSGID_H */
diff --git a/mcu/interface/sap/mw/kpalv_msgid.h b/mcu/interface/sap/mw/kpalv_msgid.h
new file mode 100644
index 0000000..c820e88
--- /dev/null
+++ b/mcu/interface/sap/mw/kpalv_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:
+ * ---------
+ *   kpalv_msgid.h
+ *
+ * Project:
+ * --------
+ *   
+ *
+ * Description:
+ * ------------
+ *  Keep alive ILM messages
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ * ==========================================================================
+ * $Log$
+ *
+ *
+ *
+ ****************************************************************************/
+
+#include "module_msg_range.h"
+
+#ifndef _KPALV_MSGID_H
+#define _KPALV_MSGID_H
+
+MODULE_MSG_BEGIN( MSG_ID_KPALV_MSG_CODE_BEGIN )
+/** from ATP->KPALV */
+MSG_ID_ATP_KPALV_KEEPALIVE_REQ = MSG_ID_KPALV_MSG_CODE_BEGIN,
+
+MODULE_MSG_END( MSG_ID_KPALV_MSG_CODE_TAIL )
+#endif  /* _KPALV_MSGID_H */
diff --git a/mcu/interface/sap/mw/ltecsr_msgid.h b/mcu/interface/sap/mw/ltecsr_msgid.h
new file mode 100644
index 0000000..579c17d
--- /dev/null
+++ b/mcu/interface/sap/mw/ltecsr_msgid.h
@@ -0,0 +1,358 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   ltecsr_msgid.h
+ *
+ * Project:
+ * --------
+ *   MOLY
+ *
+ * Description:
+ * ------------
+ *   IMX and LTECSR SAP message 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!
+ * 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!!
+ *============================================================================
+ ****************************************************************************/
+
+/* LTECSR INTERFACE */
+
+#include "module_msg_range.h"
+
+#ifndef _LTECSR_MSG_H
+#define _LTECSR_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_LTECSR_CODE_BEGIN )
+
+/* FROM: IMC External */
+
+    MSG_ID_LTECSR_MEDIA_NEW=MSG_ID_LTECSR_CODE_BEGIN,
+    MSG_ID_LTECSR_MEDIA_DEL,
+    MSG_ID_LTECSR_MEDIA_UPDATE,
+    MSG_ID_LTECSR_MEDIA_ACTIVE,
+    
+    MSG_ID_LTECSR_DTMF_REQ, /* IN: cid, (sid), digit, in/out band, time:0-stop, non-zero: play, -1: periodically */
+
+    /* Handover event with ebi */
+    MSG_ID_LTECSR_HANDOVER_BEGIN,
+    MSG_ID_LTECSR_HANDOVER_END,
+
+/* FROM: MOD_L1SP */
+
+    MSG_ID_LTECSR_VOICE_UL_DATA_NOTIFY,
+    MSG_ID_LTECSR_VOICE_DL_DATA_NOTIFY,
+    MSG_ID_LTECSR_VOICE_UL_MUTE_NOTIFY,
+    MSG_ID_LTECSR_VOICE_DL_MUTE_NOTIFY,
+    MSG_ID_LTECSR_AV_SYNC_NOTIFY,
+
+/* LTECSR Internal */
+
+    /* media */
+    MSG_ID_LTECSR_MEDIA_START, /* IN: cid, sid OUT: result */
+    MSG_ID_LTECSR_MEDIA_STOP, /* IN: cid, sid OUT: result */
+
+    /* transmit mode */
+    MSG_ID_LTECSR_MEDIA_XMIT_MODE_SET, /* IN: cid, sid, xmit_mode */
+    MSG_ID_LTECSR_MEDIA_XMIT_MODE_GET, /* IN: cid, sid OUT: xmit_mode */
+
+    /* dtmf */
+    MSG_ID_LTECSR_DTMF_PLAY, /* IN: cid, (sid), digit, direction:0-local, 1-remote, duration:-1(infinite), 0(stop), others(ms) */
+    MSG_ID_LTECSR_DTMF_STOP, /* IN: cid*/
+
+    /* codec payload type */
+    MSG_ID_LTECSR_MEDIA_PT_SET, /* IN: cid, sid, codec, pt */
+    //MSG_ID_LTECSR_MEDIA_PT_GET, /* IN: cid, sid */
+
+    /* rtcp */
+    MSG_ID_LTECSR_RTCP_SEND_INTERVAL_SET, /* IN: cid, sid, rtcp send interval */
+    //MSG_ID_LTECSR_RTCP_SEND_INTERVAL_GET, /* IN: cid, sid OUT: cid, sid */
+
+/* LTECSR EPDG Handover */
+    MSG_ID_LTECSR_EPDG_HO_IND,
+
+    MSG_ID_LTECSR_WFC_SUPPORT_IND,
+
+    MSG_ID_LTECSR_RTP_SAMPLE_TIME_IND,
+    MSG_ID_LTECSR_RTP_SAMPLE_TIME_CNF,
+
+    MSG_ID_LTECSR_IMS_NOTIFY_IND,
+
+    MSG_ID_LTECSR_IMS_NOTIFY_REQ,
+
+/* L1C to LTECSR Latency Test Detection */
+    MSG_ID_LTECSR_L1C_LATENCY_TEST_DETECTION_IND,
+
+/*TC01 MUSESRVCC CIREPH - START*/
+#ifdef __TC01__
+    MSG_ID_LTECSR_SRVCC_HO_START_IND,
+    MSG_ID_LTECSR_SRVCC_HO_FAILURE_IND,
+#endif
+/*TC01 MUSESRVCC CIREPH - END*/
+
+/* IWLAN <---> LTECSR */
+    //MSG_ID_IWLAN_LTECSR_PKTINFO_CFG_REQ,
+    //MSG_ID_IWLAN_LTECSR_PKTINFO_CFG_CNF,
+    //MSG_ID_IWLAN_LTECSR_PKTINFO_RPT_IND,
+    MSG_ID_IWLAN_LTECSR_INFO_CFG_REQ,
+    MSG_ID_IWLAN_LTECSR_INFO_CFG_CNF,
+    MSG_ID_IWLAN_LTECSR_INFO_RPT_IND,
+
+    MSG_ID_IWLAN_LTECSR_INFO_QUERY_REQ,
+    MSG_ID_IWLAN_LTECSR_INFO_QUERY_CNF,
+    MSG_ID_IWLAN_LTECSR_INFO_QUERY_IND,
+
+/* LTECSR Self Profile(NVRAM) dump */
+    MSG_ID_LTECSR_PROFILE_DUMP,    
+
+/* ATP --> LTECSR*/
+    MSG_ID_ATP_LTECSR_ECFG_SET_REQ,
+    MSG_ID_ATP_LTECSR_ECFG_GET_REQ,
+    MSG_ID_ATP_LTECSR_DUMP_RUNTIME_PARA_REQ,
+    MSG_ID_ATP_LTECSR_IMS_AUDIO_SILENCE_IND_REQ,
+
+/* ERRC --> LTECSR */
+    MSG_ID_LTECSR_ERRC_DELAY_BUDGET_RPT_REQ,
+    MSG_ID_LTECSR_ERRC_DELAY_BUDGET_RESULT_IND,
+
+/*ANBR, LTECSR<--->UPCM*/
+    MSG_ID_LTECSR_UPCM_ANBRQ_CONFIG_IND,
+    MSG_ID_LTECSR_UPCM_ANBR_IND,
+    MSG_ID_LTECSR_UPCM_ANBRQ_REQ,
+    MSG_ID_LTECSR_UPCM_IPV4V6_REQ,
+
+/* NRRC --> LTECSR */
+    MSG_ID_NRRC_LTECSR_DELAY_BUDGET_REPORT_REQ,
+    MSG_ID_NRRC_LTECSR_DELAY_BUDGET_RESULT_HANDLE_REQ,
+
+/* LTECSR <-> IPC_ADAPTER */
+/* Response MSGs are in ipc_adapter_msg_id,
+ * maybe they should be put here.
+ * or IPCA can handle the GET request      */
+#if defined(__IPC_ADAPTER__)
+    MSG_ID_LTECSR_TITAN_BEGIN,
+    MSG_ID_LTECSR_TITAN_OPTION_GET = MSG_ID_LTECSR_TITAN_BEGIN, // NOT phase 1
+    MSG_ID_LTECSR_TITAN_OPTION_RSP,                             // NOT phase 1
+    MSG_ID_LTECSR_TITAN_OPTION_SET,
+    MSG_ID_LTECSR_TITAN_OPTION_NOTIFY,
+//  MSG_ID_LTECSR_TITAN_REFRESH_SESSION_GET,
+//  MSG_ID_LTECSR_TITAN_REGISTRATION_GET,
+    MSG_ID_LTECSR_TITAN_FRAME_TIME_GET,
+    MSG_ID_LTECSR_TITAN_FRAME_TIME_RSP,
+    MSG_ID_LTECSR_TITAN_FRAME_TIME_SET,
+    MSG_ID_LTECSR_TITAN_FRAME_TIME_NOTIFY,
+//  MSG_ID_LTECSR_TITAN_CP_STATE_GET,
+    MSG_ID_LTECSR_TITAN_ENGINE_SET,
+    MSG_ID_LTECSR_TITAN_TAIL,
+#endif
+
+MODULE_MSG_END( MSG_ID_LTECSR_CODE_TAIL )
+
+#endif  /* _LTECSR_MSG_H */
+
diff --git a/mcu/interface/sap/mw/med_msgid.h b/mcu/interface/sap/mw/med_msgid.h
new file mode 100644
index 0000000..9ad89c6
--- /dev/null
+++ b/mcu/interface/sap/mw/med_msgid.h
@@ -0,0 +1,181 @@
+/*****************************************************************************
+*  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) 2003
+ *
+ *******************************************************************************/
+
+ /*******************************************************************************
+ * Filename:
+ * ---------
+ *   med_msgid.h
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   Media task HAL 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!
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *==============================================================================
+ *******************************************************************************/
+#include "module_msg_range.h"
+
+//kmoly
+#ifndef MED_MSG_H
+#define MED_MSG_H
+
+   /*------------------------MED_HAL_MSG_CODE_BEGIN ---------------*/
+MODULE_MSG_BEGIN( MSG_ID_MED_CODE_BEGIN )
+    MSG_ID_MED_STARTUP_REQ = MSG_ID_MED_CODE_BEGIN,
+    MSG_ID_MED_STARTUP_CNF,
+    MSG_ID_MEDIA_IN_PROC_CALL_REQ,
+    MSG_ID_MEDIA_IN_PROC_CALL_CNF,
+
+    MSG_ID_MEDIA_AUD_SET_AUDIO_MODE_REQ,
+    MSG_ID_MED_AUD_HAL_CODE_BEGIN = MSG_ID_MEDIA_AUD_SET_AUDIO_MODE_REQ,
+    MSG_ID_MEDIA_AUD_SET_AUDIO_MODE_CNF,
+    MSG_ID_MEDIA_AUD_GET_AUDIO_PROFILE_REQ,
+    MSG_ID_MEDIA_AUD_GET_AUDIO_PROFILE_CNF,
+    MSG_ID_MEDIA_AUD_SET_AUDIO_PROFILE_REQ,
+    MSG_ID_MEDIA_AUD_SET_AUDIO_PROFILE_CNF,
+    MSG_ID_MEDIA_AUD_GET_AUDIO_PARAM_REQ,
+    MSG_ID_MEDIA_AUD_GET_AUDIO_PARAM_CNF,
+    MSG_ID_MEDIA_AUD_SET_AUDIO_PARAM_REQ,
+    MSG_ID_MEDIA_AUD_SET_AUDIO_PARAM_CNF,
+
+    MSG_ID_MEDIA_AUD_GET_VOLUME_REQ,
+    MSG_ID_MEDIA_AUD_GET_VOLUME_CNF,
+    MSG_ID_MEDIA_AUD_SET_VOLUME_REQ,
+    MSG_ID_MEDIA_AUD_SET_VOLUME_CNF,
+    MSG_ID_MEDIA_AUD_SET_DEVICE_REQ,
+    MSG_ID_MEDIA_AUD_SET_DEVICE_CNF,
+    MSG_ID_MEDIA_AUD_MUTE_REQ,
+    MSG_ID_MEDIA_AUD_MUTE_CNF,
+
+    MSG_ID_MEDIA_AUD_PLAY_BY_ID_REQ,
+    MSG_ID_MEDIA_AUD_PLAY_BY_ID_CNF,
+    MSG_ID_MEDIA_AUD_STOP_BY_ID_REQ,
+    MSG_ID_MEDIA_AUD_STOP_BY_ID_CNF,
+    MSG_ID_MEDIA_AUD_PLAY_BY_STRING_REQ,
+    MSG_ID_MEDIA_AUD_PLAY_BY_STRING_CNF,
+    MSG_ID_MEDIA_AUD_STOP_BY_STRING_REQ,
+    MSG_ID_MEDIA_AUD_STOP_BY_STRING_CNF,
+    MSG_ID_MEDIA_AUD_PLAY_BY_FILE_REQ,
+    MSG_ID_MEDIA_AUD_PLAY_BY_FILE_CNF,
+    MSG_ID_MEDIA_AUD_STOP_REQ,
+    MSG_ID_MEDIA_AUD_STOP_CNF,
+    MSG_ID_MEDIA_AUD_PLAY_FINISH_IND,
+
+    MSG_ID_MEDIA_AUD_EMSD_MONITOR_REQ,
+    MSG_ID_MEDIA_AUD_EMSD_CODE_BEGIN = MSG_ID_MEDIA_AUD_EMSD_MONITOR_REQ,
+    MSG_ID_MEDIA_AUD_EMSD_MONITOR_CNF,
+    MSG_ID_MEDIA_AUD_EMSD_SET_REQ,
+    MSG_ID_MEDIA_AUD_EMSD_SET_CNF,
+    MSG_ID_MEDIA_AUD_EMSD_PUSH_REQ,
+    MSG_ID_MEDIA_AUD_EMSD_PUSH_CNF,
+    MSG_ID_MEDIA_AUD_EMSD_PULL_IND,
+    MSG_ID_MEDIA_AUD_EMSD_HACK_IND,
+    MSG_ID_MEDIA_AUD_EMSD_LACK_IND,
+    MSG_ID_MEDIA_AUD_EMSD_SYNC_IND,
+    MSG_ID_MEDIA_AUD_EMSD_PSAP_MONITOR_REQ,
+    MSG_ID_MEDIA_AUD_EMSD_PSAP_MONITOR_CNF,
+    MSG_ID_MEDIA_AUD_EMSD_PSAP_PULL_REQ,
+    MSG_ID_MEDIA_AUD_EMSD_PSAP_PULL_CNF,
+    MSG_ID_MEDIA_AUD_EMSD_PSAP_DATA_IND,
+    MSG_ID_MEDIA_AUD_EMSD_CODE_END = MSG_ID_MEDIA_AUD_EMSD_PSAP_DATA_IND,
+
+    MSG_ID_MEDIA_AUD_SP_SET_MODE_REQ,
+    MSG_ID_MEDIA_AUD_SP_SET_MODE_CNF,
+    MSG_ID_MEDIA_AUD_SP_SET_FIR_COEFF_REQ,
+    MSG_ID_MEDIA_AUD_GET_AUDIO_WB_INPUT_FIR_PARAM_REQ,
+    MSG_ID_MEDIA_AUD_GET_AUDIO_WB_INPUT_FIR_PARAM_CNF,
+    MSG_ID_MEDIA_AUD_GET_AUDIO_WB_OUTPUT_FIR_PARAM_REQ,
+    MSG_ID_MEDIA_AUD_GET_AUDIO_WB_OUTPUT_FIR_PARAM_CNF,
+    MSG_ID_MEDIA_AUD_GET_AUDIO_WB_MODE_PARAM_REQ,
+    MSG_ID_MEDIA_AUD_GET_AUDIO_WB_MODE_PARAM_CNF,
+    MSG_ID_MEDIA_AUD_SET_AUDIO_WB_INPUT_FIR_PARAM_REQ,
+    MSG_ID_MEDIA_AUD_SET_AUDIO_WB_INPUT_FIR_PARAM_CNF,
+    MSG_ID_MEDIA_AUD_SET_AUDIO_WB_OUTPUT_FIR_PARAM_REQ,
+    MSG_ID_MEDIA_AUD_SET_AUDIO_WB_OUTPUT_FIR_PARAM_CNF,
+    MSG_ID_MEDIA_AUD_SET_AUDIO_WB_MODE_PARAM_REQ,
+    MSG_ID_MEDIA_AUD_SET_AUDIO_WB_MODE_PARAM_CNF,
+    MSG_ID_MEDIA_AUD_SP_SET_ENHANCE_MODE_REQ,
+
+    MSG_ID_MED_CODE_END = MSG_ID_MEDIA_AUD_SP_SET_ENHANCE_MODE_REQ,
+
+MODULE_MSG_END( MSG_ID_MED_CODE_TAIL )
+/*------------------------MED_HAL_MSG_CODE_END -----------------*/
+#endif  //MED_MSG_H
diff --git a/mcu/interface/sap/mw/ndis_msgid.h b/mcu/interface/sap/mw/ndis_msgid.h
new file mode 100644
index 0000000..6508564
--- /dev/null
+++ b/mcu/interface/sap/mw/ndis_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) 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:
+ * ---------
+ *   ndis_sap.h
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   
+ *
+ * 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!
+ *
+ *
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef NDIS_MSG_H
+#define NDIS_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_NDIS_MSG_CODE_BEGIN )
+/* RATDM INTERFACE */
+
+MSG_ID_NDIS_RATDM_DATA_ACTIVATE_IND=MSG_ID_NDIS_MSG_CODE_BEGIN,
+MSG_ID_NDIS_RATDM_DATA_ACTIVATE_RSP,
+MSG_ID_NDIS_RATDM_DATA_DEACTIVATE_IND,
+MSG_ID_NDIS_RATDM_DATA_DEACTIVATE_RSP,
+/* NDIS_RATDM_SAP */
+MODULE_MSG_END( MSG_ID_NDIS_MSG_CODE_TAIL )
+
+#endif //NDIS_MSG_H
diff --git a/mcu/interface/sap/mw/pfm_msgid_source.h b/mcu/interface/sap/mw/pfm_msgid_source.h
new file mode 100644
index 0000000..468ecbb
--- /dev/null
+++ b/mcu/interface/sap/mw/pfm_msgid_source.h
@@ -0,0 +1,10 @@
+MSG_ID_PFM_REGISTER_FILTER_REQ,
+MSG_ID_PFM_DEREGISTER_FILTER_REQ,
+MSG_ID_AP_STATUS_IND,
+MSG_ID_PFM_PCIE_STATE_CHANGE_IND,
+MSG_ID_PFM_ICMP_PING_REG_FILTER_REQ,
+MSG_ID_PFM_ICMP_PING_DEREG_FILTER_REQ,
+MSG_ID_PFM_UL_DISABLE_ALL_PACKETS_REG_FILTER_REQ,
+MSG_ID_PFM_UL_DISABLE_ALL_PACKETS_DEREG_FILTER_REQ,
+MSG_ID_PFM_UL_ICMP_PING_WHITELIST_REG_FILTER_REQ,
+MSG_ID_PFM_UL_ICMP_PING_WHITELIST_DEREG_FILTER_REQ,
diff --git a/mcu/interface/sap/mw/ps_public_ups_msgid.h b/mcu/interface/sap/mw/ps_public_ups_msgid.h
new file mode 100644
index 0000000..939b884
--- /dev/null
+++ b/mcu/interface/sap/mw/ps_public_ups_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) 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:
+ * ---------
+ *  ps_public_ups_sap.h
+ *
+ * Project:
+ * --------
+ *  MAUI
+ *
+ * Description:
+ * ------------
+ *  This file is the common public SAP of module UPS. 
+ *
+ * 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!
+ *
+ *
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#include "module_msg_range.h"
+
+#ifndef _PS_PUB_UPS_MSG_H
+#define _PS_PUB_UPS_MSG_H
+
+/* ABM INTERFACE */
+
+MODULE_MSG_BEGIN( MSG_ID_UPS_PUBLIC_CODE_BEGIN )
+MSG_ID_ABM_RNDIS_ACTIVATE_REQ=MSG_ID_UPS_PUBLIC_CODE_BEGIN,
+MSG_ID_ABM_RNDIS_ACTIVATE_CNF,
+MSG_ID_ABM_RNDIS_DEACTIVATE_REQ,
+MSG_ID_ABM_RNDIS_DEACTIVATE_CNF,
+MSG_ID_ABM_RNDIS_DEACTIVATE_IND,
+/* RNDIS_ABM_SAP */
+
+/* TCPIP INTERFACE */
+MSG_ID_RNDIS_DATA_REQ,
+MSG_ID_RNDIS_DATA_IND,
+MSG_ID_RNDIS_STATISTICS_IND,
+/* RNDIS_TCPIP_SAP */
+MODULE_MSG_END( MSG_ID_UPS_PUBLIC_CODE_TAIL )
+
+#endif  //_PS_PUB_UPS_MSG_H
diff --git a/mcu/interface/sap/mw/ufpm_msgid_source.h b/mcu/interface/sap/mw/ufpm_msgid_source.h
new file mode 100644
index 0000000..63b5ec1
--- /dev/null
+++ b/mcu/interface/sap/mw/ufpm_msgid_source.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) 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_mw_msgid.h
+ *
+ * Project:
+ * --------
+ *   TATAKA
+ *
+ * Description:
+ * ------------
+ *   UFPM message identity definition
+ *
+ * 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 __INC_UFPM_MSGID_H
+#define __INC_UFPM_MSGID_H
+
+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,
+
+#endif /* __INC_UFPM_MSGID_H */
diff --git a/mcu/interface/sap/mw/ups_msgid.h b/mcu/interface/sap/mw/ups_msgid.h
new file mode 100644
index 0000000..14e6443
--- /dev/null
+++ b/mcu/interface/sap/mw/ups_msgid.h
@@ -0,0 +1,142 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   ups_sap.h
+ *
+ * Project:
+ * --------
+ *   MAUI
+ *
+ * Description:
+ * ------------
+ *   
+ *
+ * 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!
+ *
+ *
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+
+/* UPS INTERFACE */
+#include "module_msg_range.h"
+
+#ifndef _UPS_MSG_H
+#define _UPS_MSG_H
+
+MODULE_MSG_BEGIN( MSG_ID_UPS_MSG_CODE_BEGIN )
+MSG_ID_UPS_BATCH_STATE_IND=MSG_ID_UPS_MSG_CODE_BEGIN,
+
+/* UPS UT INTERFACE */
+MSG_ID_UPS_UT_UART_DATA_IND,
+MSG_ID_UPS_UT_UART_DATA_REQ,
+
+/* FLC2 INTERFACE */
+MSG_ID_UPS_FLC_DATA_RESUME_IND,
+MSG_ID_UPS_FLC_DATA_SUSPEND_IND,
+/* STACK_TIMER_SAP */
+
+/* UPS PORT ACTIVATION INTERFACE */
+MSG_ID_L4CUPS_PORT_ACTIVATE_REQ,
+MSG_ID_L4CUPS_PORT_ACTIVATE_CNF,
+MSG_ID_L4CUPS_PORT_DEACTIVATE_IND,
+
+/* MBIM INTERFACE */
+MSG_ID_MBIM_CLOSE_REQ,
+MSG_ID_MBIM_CLOSE_CNF,
+MSG_ID_MBIM_CONNECT_IND,
+MSG_ID_MBIM_DISCONNECT_IND,
+
+/* UPS_SAP */
+MODULE_MSG_END( MSG_ID_UPS_MSG_CODE_TAIL )
+
+#endif  //_UPS_MSG_H
diff --git a/mcu/interface/sap/mw/wtunnel_msgid.h b/mcu/interface/sap/mw/wtunnel_msgid.h
new file mode 100644
index 0000000..8e7b542
--- /dev/null
+++ b/mcu/interface/sap/mw/wtunnel_msgid.h
@@ -0,0 +1,19 @@
+#ifndef _WTUNNEL_MSG_ID_H
+#define _WTUNNEL_MSG_ID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_WTUNNEL_CODE_BEGIN )
+
+    MSG_ID_N3SAM_WT_WIFI_FILTER_ADD_REQ,        // no rsp
+    MSG_ID_N3SAM_WT_WIFI_FILTER_DELETE_REQ,     // no rsp
+    MSG_ID_N3SAM_WT_SA_ADD_REQ,
+    MSG_ID_N3SAM_WT_SA_MODIFY_REQ,
+    MSG_ID_N3SAM_WT_SA_DELETE_REQ,
+    MSG_ID_N3SAM_WT_SA_ADD_CNF,
+    MSG_ID_N3SAM_WT_SA_MODIFY_CNF,
+    MSG_ID_N3SAM_WT_SA_DELETE_CNF,
+
+MODULE_MSG_END( MSG_ID_WTUNNEL_CODE_TAIL )
+
+#endif  //_WTUNNEL_MSG_ID_H
diff --git a/mcu/interface/sap/mw_sap.h b/mcu/interface/sap/mw_sap.h
new file mode 100644
index 0000000..a0f1566
--- /dev/null
+++ b/mcu/interface/sap/mw_sap.h
@@ -0,0 +1,65 @@
+#ifndef MW_SAP_H
+#define MW_SAP_H
+
+#include "sap_range.h"
+
+MODULE_SAP_BEGIN(SAP_ID_MW_CODE_BEGIN)
+    ABM_APP_SAP = SAP_ID_MW_CODE_BEGIN,
+    ABM_MMI_SAP,
+    ABM_SOC_SAP,
+    DHCP_ABM_SAP,
+    DHCP_SIP_SAP,
+    DRMT_APP_SAP,
+    DRMT_MMI_SAP,
+    DRMT_WAP_SAP,
+    L4C_ABM_SAP,
+    LCSP_APP_SAP,
+    MED_SAP,
+    MED_V_SAP,
+    MED_WISE_IPT_SAP,
+    MMI_ABM_SAP,
+    MNL_BEE_SAP,
+    OBEX_APP_SAP,
+    PPP_TCPIP_SAP,
+    RNDIS_ABM_SAP,
+    RNDIS_TCPIP_SAP,
+    RTSP_APP_SAP,
+    SOC_APP_SAP,
+    SOC_MMI_SAP,
+    SUPC_ABM_SAP,
+    SUPC_MMI_SAP,
+    SUPL_INT_SAP,   
+    SUPL_LCSP_SAP,
+    SUPL_MMI_SAP,
+    TCPIP_ABM_SAP,
+    TCPIP_DHCP_SAP,
+    TCPIP_LOOP_SAP,	
+    TCPIP_SOC_SAP,
+    TLS_APP_SAP,
+    V2DEC_SAP,
+    VFILE_SAP,
+    XDM_APP_SAP,
+    MMI_MMI_SAP,
+    IPCORE_SAP,
+    ETHERCORE_SAP,
+    SDIOCORE_SAP,
+    DHCP4C_SAP,
+    NDPC_SAP,
+    RNDIS_SAP,
+    CCCITTY_SAP,
+    CCMNI_SAP,
+    MSD_SAP,
+    AOMGR_SAP,
+    GPS_LBS_SAP,
+    IPCORE_DATAPATH_SAP,
+    CDCECM_SAP,
+    UFPM_SAP,
+    TMC_SAP,
+    IPCORE_USER_SENSITIVE_SAP,
+    GMMGR_SAP,
+    KPALV_SAP,
+    KPALV_USER_SENSITIVE_SAP,
+    LHIF_SAP,
+MODULE_SAP_END(SAP_ID_MW_CODE_TAIL)
+	   
+#endif  /* MW_SAP_H */
diff --git a/mcu/interface/sap/sap_range.h b/mcu/interface/sap/sap_range.h
new file mode 100644
index 0000000..007e294
--- /dev/null
+++ b/mcu/interface/sap/sap_range.h
@@ -0,0 +1,46 @@
+#ifndef SAP_RANGE_H
+#define SAP_RANGE_H
+
+typedef enum {
+    SAP_ID_XXX_CODE_BASE = 0,	
+
+    SAP_ID_SVC_CODE_BEGIN = SAP_ID_XXX_CODE_BASE, SAP_ID_SVC_CODE_TAIL = SAP_ID_SVC_CODE_BEGIN + 60,
+
+    SAP_ID_MD_CODE_BEGIN, SAP_ID_MD_CODE_TAIL = SAP_ID_MD_CODE_BEGIN + 250 + 250 + 250 + 200 + 350 + 40,/* +250 for LTE MD, + 250 for 91, +200 for C2K, +250 for 97 + 40 for IPC adapter*/ 
+
+    SAP_ID_MD_SVC_CODE_BEGIN, SAP_ID_MD_SVC_CODE_TAIL = SAP_ID_MD_SVC_CODE_BEGIN + 20,
+
+    SAP_ID_MD_DRV_CODE_BEGIN, SAP_ID_MD_DRV_CODE_TAIL = SAP_ID_MD_DRV_CODE_BEGIN + 30,
+
+    SAP_ID_MD_MMI_CODE_BEGIN, SAP_ID_MD_MMI_CODE_TAIL = SAP_ID_MD_MMI_CODE_BEGIN + 40,
+
+    SAP_ID_MD_MW_CODE_BEGIN, SAP_ID_MD_MW_CODE_TAIL = SAP_ID_MD_MW_CODE_BEGIN + 100,
+    
+    SAP_ID_MW_CODE_BEGIN, SAP_ID_MW_CODE_TAIL = SAP_ID_MW_CODE_BEGIN + 50 + 100, /* +100 for LTE MW */
+    
+    SAP_ID_DRV_CODE_BEGIN, SAP_ID_DRV_CODE_TAIL = SAP_ID_DRV_CODE_BEGIN + 200,
+
+    // LAST_SAP_CODE is defined at this scope, so please keep it at last.
+    SAP_ID_SYSSERVICE_CODE_BEGIN, SAP_ID_SYSSERVICE_CODE_TAIL = SAP_ID_SYSSERVICE_CODE_BEGIN + 10,
+
+    SAP_ID_CODE_END,
+}SAP_ID_TYPE;
+
+/**************************************************************
+**********  Should not change the following MACROS defines     *************
+**********  Should not define SAP ID with "SAP_TAG_"              *************
+***************************************************************/
+#ifdef GEN_FOR_PC
+    #define MODULE_SAP_BEGIN(BEGIN_POS)  typedef enum __cgen_sap_type_id_##BEGIN_POS{SAP_TAG_##BEGIN_POS = BEGIN_POS,
+    #define MODULE_SAP_END(END_POS) SAP_ID_CGEN_PARSE_LAST_ID=END_POS }_cgen_sap_type_id_##END_POS;
+#else
+    #define MODULE_SAP_BEGIN(BEGIN_POS)   enum { SAP_TAG_##BEGIN_POS = BEGIN_POS,
+    #define MODULE_SAP_END(END_POS)     };    
+#endif /* GEN_FOR_PC */
+
+#define INLINE_CUSTOM_ILM_FLAG_SAP 0x4000  /* bit14 is used by inline ILM that use custom logging */
+#define INLINE_ILM_FLAG_SAP 0x8000  /* bit15 is used by inline ILM */
+#define RESERVE_FOR_INLINE_ILM_SAP 0xFFF /* INLINE_ILM_SAP is hard-defined, it can be enlarged once SAP_ID_CODE_END is larger than it */
+typedef unsigned int sap_id_boundary_check1[(RESERVE_FOR_INLINE_ILM_SAP-1) - SAP_ID_CODE_END];
+
+#endif /* SAP_RANGE_H */
diff --git a/mcu/interface/sap/srv_modid.h b/mcu/interface/sap/srv_modid.h
new file mode 100644
index 0000000..45c49c2
--- /dev/null
+++ b/mcu/interface/sap/srv_modid.h
@@ -0,0 +1,188 @@
+/*****************************************************************************
+*  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:
+ * ---------
+ *   srv_modid.h
+ *
+ * Project:
+ * --------
+ *   Maui_Software
+ *
+ * Description:
+ * ------------
+ *   This file provides the module index enum built.
+ *
+ * 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!
+ *------------------------------------------------------------------------------
+ * Upper this line, this part is controlled by PVCS VM. DO NOT MODIFY!!
+ *============================================================================
+ ****************************************************************************/
+#ifndef SERVICE_MODULE_ID_H
+#define SERVICE_MODULE_ID_H
+
+#include "module_id_range.h"
+
+/* undef unused macro */
+#undef TASK_PRIORITY_MACRO
+#undef task_name
+#undef task_queue_name
+#undef task_priority
+#undef task_stack_size
+#undef null_task_create_entry
+#undef compatible_code
+#undef task_create_function
+#undef task_stack_internalRAM
+#undef task_external_queue_size
+#undef task_internal_queue_size
+#undef task_boot_mode
+#undef task_affinity_group
+#undef task_affinity_group_id
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+#undef task_index
+#undef task_module_map
+
+/* define all unused macros as empty */
+#define task_name(p1)
+#define task_queue_name(p1)
+#define task_priority(p1,p2)
+#define task_stack_size(p1)
+#define null_task_create_entry(p1)
+#define task_create_function(p1)
+#define task_stack_internalRAM(p1)
+#define task_external_queue_size(p1)
+#define task_internal_queue_size(p1)
+#define task_boot_mode(p1)
+#define task_affinity_group(p1)
+#define task_affinity_group_id(p1)
+#define task_index(p1)
+
+/* define the macro which provides the MOD ID*/
+#define task_module_map(task, mod)                                  mod,
+#define compatible_code(expr)                                       expr,
+#define MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM(mod)            mod,
+#define MODULE_ID_FOR_PRINT_TRACE(mod)                              mod,
+
+
+MODULE_MOD_BEGIN(MOD_ID_SRV_CODE_BEGIN) 
+    MOD_NIL = MOD_ID_SRV_CODE_BEGIN, 
+    #include "srv_task_config.h"
+/* customer add module id at here */
+MODULE_MOD_END(MOD_ID_SRV_CODE_TAIL)
+
+    
+/* clean unuse defination */
+#undef task_module_map
+#undef compatible_code
+#undef MODULE_ID_MAP_TO_NULL_TASK_CAN_ALLOCATE_ILM
+#undef MODULE_ID_FOR_PRINT_TRACE
+
+
+#endif /* SERVICE_MODULE_ID_H */
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_ 
diff --git a/mcu/interface/sap/svc_sap.h b/mcu/interface/sap/svc_sap.h
new file mode 100644
index 0000000..660f929
--- /dev/null
+++ b/mcu/interface/sap/svc_sap.h
@@ -0,0 +1,76 @@
+#ifndef SVC_SAP_H
+#define SVC_SAP_H
+
+#include "sap_range.h"
+
+MODULE_SAP_BEGIN(SAP_ID_SVC_CODE_BEGIN)
+  INVALID_SAP = SAP_ID_SVC_CODE_BEGIN,
+  INLINE_ILM_SAP,
+  FS_SAP,
+  FT_TST_SAP,
+  PS_NVRAM_SAP,
+  STACK_SIM_TIMER_SAP,
+  STACK_TIMER_SAP,
+  /* Add by LTE SS */
+  DHL_ETSTM_SAP,
+  ETSTM_DHL_SAP,
+  EL1_DHL_SAP,
+  DHL_MDDBG_SAP,
+  MDDBG_DHL_SAP,
+  CCCISRV_SAP,
+  DHL_EL1TST_SAP,
+  EL1TST_DHL_SAP,
+  MMRFTST_DHL_SAP,
+  /* Add by [PS][RRCE], UT manual inject Timer Expiry */
+  NIL_RRCE_INJECT_TIMER_SAP,
+  DHL_CL1TST_SAP,
+  CL1TST_DHL_SAP,
+  D2_NCCMNI_USER_SENSITIVE_SAP,
+  STKBRG_D2_USER_SENSITIVE_SAP,
+  STKBRG_D2_SAP,
+  STKBRG_IMS_USER_SENSITIVE_SAP,
+  STKBRG_IMS_SAP,
+  STKBRG_D2CM_SAP,
+  STKBRG_DHL_SAP,
+  STKEVTD_EVT_SAP,
+  NALTP_DBG_SAP,
+  EM_MMRFTST_SAP,
+  MCIF_SAP,
+  IPSEC_SAP,
+  NL1_FT_SAP,
+  CRPTBRG_SAP,
+  SAP_RELAYER_LOGGING_SAP,
+  SAP_RELAYER_CTRL_SAP,
+  NAL_MONITOR_SAP,
+  FCS_SAP,
+  MDFPM_SAP,
+  WFPM_SAP,
+  ETHSVC_SAP,
+  STKBRG_ETHSVC_SAP,
+  /* WLC */
+  WLC_ATP_SAP,
+  ATP_WLC_SAP,
+  WLC_USER_SAP,
+  NAL_DNS_SAP,
+  N3SAM_CERT_SAP,
+  TLS_CERT_SAP,
+  MTF_SAP,
+  /* INTCTRL */
+  INTCTRL_USER_SAP,
+  DDM_INTCTRL_SAP,
+  IPSEC_USER_SENSITIVE_SAP,
+MODULE_SAP_END(SAP_ID_SVC_CODE_TAIL)
+
+MODULE_SAP_BEGIN(SAP_ID_SYSSERVICE_CODE_BEGIN)
+   LAST_SAP_CODE,
+MODULE_SAP_END(SAP_ID_SYSSERVICE_CODE_TAIL)
+
+/*************************************************************************
+   * Should NOT add SAP after RESERVE_FOR_ILM_SAP, INLINE_ILM_FLAG_SAP,
+     or INLINE_ILM_SAP
+ *************************************************************************/
+#define INLINE_ILM_SAP (INLINE_ILM_FLAG_SAP | RESERVE_FOR_INLINE_ILM_SAP)
+
+#define MAX_CUSTOM_SAP_ID         10     /* Maximum custom SAP ID */ /* Don't modify */
+
+#endif /* SVC_SAP_H */