[Feature][Modem]Add Modem Patch P1

Change-Id: Idee4f9fd6700b484f7db86704cf5639cec4d71a2
diff --git a/mcu/interface/sap/md/gmss_msgid.h b/mcu/interface/sap/md/gmss_msgid.h
old mode 100644
new mode 100755
index ce1bfbf..2067dc6
--- a/mcu/interface/sap/md/gmss_msgid.h
+++ b/mcu/interface/sap/md/gmss_msgid.h
@@ -76,6 +76,11 @@
  *
  * removed!
  * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
  *
  * removed!
  *
@@ -642,6 +647,8 @@
     MSG_ID_RAC_GMSS_PLMN_SEARCH_STOP_REQ,
     MSG_ID_RAC_GMSS_INACTIVE_MODE_CONFIGURATION_REQ,
     MSG_ID_RAC_GMSS_SCREEN_OFF_REQ,
+    MSG_ID_RAC_GMSS_SIM_ARREARAGE_MECHANISM_START_REQ,
+    MSG_ID_RAC_GMSS_SIM_ARREARAGE_MECHANISM_STOP_REQ,
 
 /* messages for allowed MCC list */
     MSG_ID_RAC_GMSS_SET_ALLOWED_MCC_LIST_REQ,
@@ -740,6 +747,8 @@
 /* messages for allowed MCC list */
     MSG_ID_GMSS_NWSEL_SET_ALLOWED_MCC_LIST_CNF,
 
+    MSG_ID_GMSS_NWSEL_ALL_RAT_SEARCH_FINISH_IND,
+
 /* messages for +ECAMPUI */
     MSG_ID_RAC_GMSS_CAMP_UI_IND,
 
diff --git a/mcu/interface/sap/md/ims_stack_msgid.h b/mcu/interface/sap/md/ims_stack_msgid.h
old mode 100644
new mode 100755
index 702f799..9cdc331
--- a/mcu/interface/sap/md/ims_stack_msgid.h
+++ b/mcu/interface/sap/md/ims_stack_msgid.h
@@ -52,6 +52,16 @@
  * ==========================================================================
  * $Log$
  *
+ * 09 06 2022 kai-cheng.chiu
+ * [MOLY00838475] [Lab][MT6889][Petrus][TMO-US][CCP][Simulation][22Q4][IODT][s0][HQ][R&S][Protocol_IMS & VoLTE][L_IMS_VoLTE_524172]("REGISTER request received - expected: 200 response")
+ * 	
+ * 	.
+ *
+ * 07 28 2022 ot_gang.zhang
+ * [MOLY00823817] [MT6879][Figeac][S0][R2][JAPAN][SOFTBANK][TB][TrialNW][SIP PANI Info][CR Review Excluded] Supporting OTR-Voice-032066
+ * 	
+ * 	.
+ *
  * 06 21 2022 kai-cheng.chiu
  * [MOLY00765081] [FeatureDevelopment][ALPSAR06336232] TMOUS 22Q1 Requirement Gap Development - UE MO Timer F1
  * 	
@@ -73,16 +83,16 @@
  * 	.
  *
  * 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
+ * [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)
+ * [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)
+ * [MOLY00588036] ï¿???20131?��?DVT?��测�?��???��?��?��?ï¿???��?��?�CT+CMCC(2G+IMS),主ï¿???�电ï¿??2G?��ï¿???过�?�中?��ï¿???ï¿????��ï¿???�移?��VoLTE消失(1/10)
  * 	
  * 	.
  *
@@ -263,6 +273,7 @@
         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 */
+        MSG_ID_VOLTE_SIPTX_PANI_INFO_IND,               /* VoLTE_Event_UA_Stack_PANI_Info_t*/
 
         /* TO SIPTX_REG */
         MSG_ID_VOLTE_SIPTX_REG_REG_REQ,                 /* VoLTE_Event_Reg_Item_t */
@@ -418,7 +429,6 @@
         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 */
@@ -433,7 +443,7 @@
         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_ID_SIP_PANI_INFO_IND,
 
         /* MSG TO APP */
         MSG_ID_SIP_CREATE_CONN_RSP,                     /* MD UA: VoLTE_Stack_Result_t; AP UA: structure is VoLTE_Event_IMS_HIF_Data */
diff --git a/mcu/interface/sap/md/l4_msgid.h b/mcu/interface/sap/md/l4_msgid.h
old mode 100644
new mode 100755
index b49a3c3..412addd
--- a/mcu/interface/sap/md/l4_msgid.h
+++ b/mcu/interface/sap/md/l4_msgid.h
@@ -159,6 +159,7 @@
 #if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)
     MSG_ID_VDM_L4C_CS_CC_CECALL_REQ,
 #endif
+    MSG_ID_VDM_L4C_NR_EMC_SERVICE_AVAILABILITY_IND,
     MSG_ID_VDM_L4C_MSG_END = MSG_ID_VDM_L4C_MSG_BEGIN + 50,
 
     // ATP -> L4C
@@ -1250,6 +1251,7 @@
    MSG_ID_L4CRAC_SET_HVOLTE_MODE_REQ,
    MSG_ID_L4CRAC_EMC_SESSION_START_REQ,
    MSG_ID_L4CRAC_EMC_SESSION_STOP_REQ,
+   MSG_ID_L4CRAC_NR_EMC_SERVICE_AVAILABILITY_IND,
    MSG_ID_L4CRAC_OMADM_UPDATE_REQ,
    MSG_ID_L4CRAC_PTMSI_CLEAR_REQ,
    MSG_ID_L4CRAC_LOCI_CLEAR_REQ,
@@ -1265,6 +1267,12 @@
    MSG_ID_L4CRAC_SET_NSSAI_REQ,
    MSG_ID_L4CRAC_SET_PREF_NSSAI_REQ,
    /* end of NSSAI network slicing */
+
+
+   MSG_ID_L4C_RAC_SIM_ARREARAGE_MECHANISM_START_REQ,
+   MSG_ID_L4C_RAC_SIM_ARREARAGE_MECHANISM_STOP_REQ,
+   MSG_ID_L4C_RAC_ALL_RAT_SEARCH_FINISH_IND,
+
 #if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)
    MSG_ID_L4CRAC_SET_TIMER_REQ,
    MSG_ID_L4CRAC_ECALL_REGISTRATION_STATE_IND,
@@ -1454,6 +1462,7 @@
    MSG_ID_L4CRAC_NR_IMS_SERVICE_STATUS_REQ,
    MSG_ID_L4CRAC_UAC_ABORT_REQ,
    MSG_ID_RAC_GMSS_ILLEGAL_ME_IND,
+   MSG_ID_RAC_GMSS_ALL_RAT_SEARCH_FINISH_IND,
 
    /* RAC -> VDM */
    MSG_ID_VDM_RAC_NW_FEATURE_IND,
@@ -1478,6 +1487,7 @@
    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_CAUSE_INFO_IND,
    MSG_ID_RAC_VGMM_NW_PARAMS_IND,
 
    MSG_ID_L4CRAC_USER_SELECTED_MAIN_PS_REQ,
diff --git a/mcu/interface/sap/md/l5_msgid.h b/mcu/interface/sap/md/l5_msgid.h
old mode 100644
new mode 100755
index 1fb3e8c..44ffe2c
--- a/mcu/interface/sap/md/l5_msgid.h
+++ b/mcu/interface/sap/md/l5_msgid.h
@@ -387,6 +387,7 @@
         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_L5IO_L5UNW_ENWREJAC_IND,
     MSG_ID_L5UNW_MSG_END,
 
         /*MSG_ID_L5IO->L5USIM*/
@@ -477,6 +478,8 @@
         MSG_ID_L5USMS_SCBM_REQ,
         MSG_ID_L5USMS_SCBM_CNF,
         MSG_ID_L5USMS_SCBM_IND,
+        MSG_ID_L5USMS_DOMAIN_REQ,
+        MSG_ID_L5USMS_DOMAIN_CNF,
         /* L5USMS -> L5USMS */
         MSG_ID_L5USMS_HANDLE_NEXT_NTF,
         MSG_ID_L5USMS_EIND_URC,
@@ -649,6 +652,7 @@
         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_CC_RECV_DTMF_IND,
     MSG_ID_L5IO_L5UCC_IND_MSG_END,
 
     MSG_ID_L5_THERMAL_STATE_INFO_IND,
diff --git a/mcu/interface/sap/md/mtf_msgid.h b/mcu/interface/sap/md/mtf_msgid.h
old mode 100644
new mode 100755
index e5ede56..43ee4b8
--- a/mcu/interface/sap/md/mtf_msgid.h
+++ b/mcu/interface/sap/md/mtf_msgid.h
@@ -54,6 +54,11 @@
  *===========================================================
  * $Log$
  *
+ * 08 25 2022 bingking.li
+ * [MOLY00800186] DUT selects back to serving selll after SA to SA redirect failure and it causes very bad user experience on subway
+ * 	
+ * 	.
+ *
  * 06 17 2022 bingking.li
  * [MOLY00778775] NR->NRºÍNR->LTEÇл»ÓÅ»¯Âñµãµ¼ÈëM80
  *
@@ -107,6 +112,8 @@
 
 
 MSG_ID_NL1MOB_MT_DMF_CUSTOM_ENH_IND,
+MSG_ID_NL1MOB_MT_DMF_POSTPONE_A2_FOR_B1B2_IND,
+
 MODULE_MSG_END( MSG_ID_MTF_CODE_TAIL )
 
 
diff --git a/mcu/interface/sap/md/nas_sv_msgid.h b/mcu/interface/sap/md/nas_sv_msgid.h
old mode 100644
new mode 100755
index 565a89f..0c68275
--- a/mcu/interface/sap/md/nas_sv_msgid.h
+++ b/mcu/interface/sap/md/nas_sv_msgid.h
@@ -74,7 +74,8 @@
     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,
-
+    MSG_ID_RAC_NAS_SV_NR_EMC_SERVICE_AVAILABILITY_IND,
+    MSG_ID_RAC_NAS_SV_NR_EMC_SERVICE_AVAILABILITY_RSP,
 
     /* RAT_TCM <> SV */
     MSG_ID_RAT_TCM_NAS_SV_BEGIN = MSG_ID_NAS_SV_CODE_BEGIN + 100,
@@ -209,11 +210,13 @@
     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_PROC_RESULT_IND,
     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,
+	MSG_ID_NWSEL_NAS_SV_NR_EMC_SERVICE_AVAILABILITY_RSP,
 
     /* SV<>EVAL */
     /* SV<>EMM */
@@ -396,6 +399,7 @@
     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_PROC_RESULT_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,
diff --git a/mcu/interface/sap/md/nl1_msgid.h b/mcu/interface/sap/md/nl1_msgid.h
old mode 100644
new mode 100755
index c343539..2014069
--- a/mcu/interface/sap/md/nl1_msgid.h
+++ b/mcu/interface/sap/md/nl1_msgid.h
@@ -347,6 +347,7 @@
 MSG_ID_NL1_NL1MOB_SA_SILENCE_CTRL_NTF,
 MSG_ID_NL1_NL1MOB_HANDOVER_EVENT_NTF,
 MSG_ID_NL1_NL1MOB_GEMINI_SHARE_NTF,
+MSG_ID_NL1_NL1MOB_GEMINI_PAGING_SHARE_RESULT_NTF,
 
 /****************************************************************************
  *                          NL1CSM - NL1MOB
diff --git a/mcu/interface/sap/md/nrrc_msgid.h b/mcu/interface/sap/md/nrrc_msgid.h
old mode 100644
new mode 100755
index 5f558a3..d59615a
--- a/mcu/interface/sap/md/nrrc_msgid.h
+++ b/mcu/interface/sap/md/nrrc_msgid.h
@@ -134,6 +134,7 @@
     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,
+    MSG_ID_NRRC_NL1_SEARCH_STARTED_IND,
 
     /* MSGs from NMAC  */
     MSG_ID_NRRC_NMAC_CONFIG_CNF,
@@ -302,6 +303,7 @@
     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_CUSTOMIZED_PAGING_CYCLE_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,
diff --git a/mcu/interface/sap/md/nwsel_msgid.h b/mcu/interface/sap/md/nwsel_msgid.h
old mode 100644
new mode 100755
index 9a02e4e..4679ed2
--- a/mcu/interface/sap/md/nwsel_msgid.h
+++ b/mcu/interface/sap/md/nwsel_msgid.h
@@ -177,6 +177,10 @@
 /* messages for +ECAMPUI */
     MSG_ID_GMSS_NWSEL_CAMP_UI_IND,
 
+/* messages for SIM Arrearage */
+    MSG_ID_GMSS_NWSEL_SIM_ARREARAGE_MECHANISM_START_REQ,
+    MSG_ID_GMSS_NWSEL_SIM_ARREARAGE_MECHANISM_STOP_REQ,
+
 /* messages received from MM at NWSEL_MM_SAP */
     MSG_ID_NWSEL_MM_PLMN_LOSS_IND,
     MSG_ID_NWSEL_MM_OUT_OF_SERVICE_IND,
@@ -252,6 +256,9 @@
     //#endif
     MSG_ID_NWSEL_NWSEL_PLMN_LIST_UPDATE_IND,
 
+/* messages received from NAS_SV at NAS_SV_NWSEL_SAP */
+    MSG_ID_NWSEL_NAS_SV_NR_EMC_SERVICE_AVAILABILITY_IND,
+
 /*TBD*/
 /* messages received from RATCM at NWSEL_RATCM_SAP */
     MSG_ID_NWSEL_RATCM_CELL_CHANGE_START_IND,
diff --git a/mcu/interface/sap/md/ps_public_l4_msgid.h b/mcu/interface/sap/md/ps_public_l4_msgid.h
old mode 100644
new mode 100755
index 2830389..3e82c7e
--- a/mcu/interface/sap/md/ps_public_l4_msgid.h
+++ b/mcu/interface/sap/md/ps_public_l4_msgid.h
@@ -23,7 +23,7 @@
 *  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. 
+*  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
@@ -49,7 +49,7 @@
  *
  * Author: Danny Kuo
  * -------
- *   
+ *
  *
  *==============================================================================
  *******************************************************************************/
@@ -59,7 +59,7 @@
 #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_IND = MSG_ID_L4_PUBLIC_CODE_BEGIN,
     MSG_ID_GATI_DATA_RSP,
     MSG_ID_GATI_DATA_REQ,
     MSG_ID_GATI_DATA_CNF,
@@ -70,8 +70,8 @@
     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_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,
@@ -81,9 +81,9 @@
     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_REQ,
     MSG_ID_L4C_NBR_CELL_INFO_REG_CNF,
-    MSG_ID_L4C_NBR_CELL_INFO_DEREG_REQ,    
+    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,
@@ -140,6 +140,9 @@
     MSG_ID_L4C_EONS_SIM_DATA_REQ,
     MSG_ID_L4C_EONS_SIM_DATA_CNF,
 	MSG_ID_L4C_PUBLIC_SIGNAL_INFO_IND,
+    MSG_ID_L4C_AS_BETTER_RAT_DETECT_REQ,
+    MSG_ID_L4C_AS_BETTER_RAT_DETECT_CNF,
+    MSG_ID_L4C_AS_BETTER_RAT_DETECT_IND,
     MSG_ID_L4_PUBLIC_CODE_END,
 MODULE_MSG_END( MSG_ID_L4_PUBLIC_CODE_TAIL )
 
diff --git a/mcu/interface/sap/md/vdm_msgid.h b/mcu/interface/sap/md/vdm_msgid.h
old mode 100644
new mode 100755
index 8e96dc6..a16493f
--- a/mcu/interface/sap/md/vdm_msgid.h
+++ b/mcu/interface/sap/md/vdm_msgid.h
@@ -181,7 +181,7 @@
 #if defined(__ECALL_SUPPORT__) || defined(__NG_ECALL_SUPPORT__)
     MSG_ID_VDM_L4C_CS_CC_CECALL_CNF,
 #endif
-
+    MSG_ID_VDM_L4C_NR_EMC_SERVICE_AVAILABILITY_RSP,
     // <1.2> From IMC
 
     // for VDM TRK
@@ -342,7 +342,10 @@
 
     // For update call status
     MSG_ID_VDM_ME_CALL_STATUS_REQ,
-
+    
+    // For Debug
+    MSG_ID_VDM_DHL_DUMP_NVRAM_CONTEXT_IND,
+    MSG_ID_VDM_DHL_DUMP_ADS_NVRAM_CONTEXT_IND,    
     MSG_ID_VDM_CODE_END,
 
     MODULE_MSG_END(MSG_ID_VDM_CODE_TAIL)
diff --git a/mcu/interface/sap/md_sap.h b/mcu/interface/sap/md_sap.h
old mode 100644
new mode 100755
index 089a558..43d8b32
--- a/mcu/interface/sap/md_sap.h
+++ b/mcu/interface/sap/md_sap.h
@@ -633,6 +633,7 @@
     /* LTECSR */
     LTECSR_ERRC_SAP,
     LTECSR_DHL_SAP,
+    L5U_LTECSR_SAP,
 
     /* EL1 to LTECSR */
     EL1_LTECSR_SAP,
@@ -1650,6 +1651,8 @@
     L5UNW_L4C_SAP,
 	L5URF_L4C_SAP,
     NL1_MT_SAP,
+    DHL_VDM_SAP,
+
     L5IO_SLT_SAP,
     L5USIM_L5USWITCH_SAP,
 MODULE_SAP_END(SAP_ID_MD_CODE_TAIL)
diff --git a/mcu/interface/sap/module_msg_range.h b/mcu/interface/sap/module_msg_range.h
old mode 100644
new mode 100755
index 5c3a214..0007e8e
--- a/mcu/interface/sap/module_msg_range.h
+++ b/mcu/interface/sap/module_msg_range.h
@@ -554,7 +554,7 @@
 
     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_NRRC_CODE_BEGIN, MSG_ID_NRRC_CODE_TAIL = MSG_ID_NRRC_CODE_BEGIN + 650,
 
     MSG_ID_RR_NRRC_CODE_BEGIN, MSG_ID_RR_NRRC_CODE_TAIL = MSG_ID_RR_NRRC_CODE_BEGIN + 50,
 
@@ -562,7 +562,7 @@
 
     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_IMS_STACK_CODE_BEGIN, MSG_ID_IMS_STACK_CODE_TAIL = MSG_ID_IMS_STACK_CODE_BEGIN + 200,
 
     MSG_ID_IMSUA_CODE_BEGIN, MSG_ID_IMSUA_CODE_TAIL = MSG_ID_IMSUA_CODE_BEGIN + 250,
 
diff --git a/mcu/interface/sap/mw/gps_msgid.h b/mcu/interface/sap/mw/gps_msgid.h
old mode 100644
new mode 100755
index eafef36..2938a0a
--- a/mcu/interface/sap/mw/gps_msgid.h
+++ b/mcu/interface/sap/mw/gps_msgid.h
@@ -88,6 +88,11 @@
  * removed!
  * removed!
  * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
  *
  * removed!
  * removed!
@@ -353,6 +358,7 @@
     MSG_ID_L4C_LBS_CURRENT_RAT_RSP,
     MSG_ID_L4C_LBS_ACTIVE_SIM_RSP,    
     MSG_ID_L4C_LBS_EMT_INFO_IND,
+    MSG_ID_L4C_LBS_EMC_INFO_IND,
     /*IMC -> LBS*/
     MSG_ID_IMC_LBS_POS_NTF,
 #ifdef UNIT_TEST
diff --git a/mcu/interface/sap/mw/ltecsr_msgid.h b/mcu/interface/sap/mw/ltecsr_msgid.h
old mode 100644
new mode 100755
index 579c17d..d60f246
--- a/mcu/interface/sap/mw/ltecsr_msgid.h
+++ b/mcu/interface/sap/mw/ltecsr_msgid.h
@@ -59,6 +59,16 @@
  *
  * removed!
  * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
+ * removed!
+ * removed!
+ *
+ * removed!
+ * removed!
  *
  * removed!
  * removed!
@@ -317,6 +327,9 @@
     MSG_ID_ATP_LTECSR_DUMP_RUNTIME_PARA_REQ,
     MSG_ID_ATP_LTECSR_IMS_AUDIO_SILENCE_IND_REQ,
 
+/* LTECSR --> L5*/
+    MSG_ID_L5_LTECSR_RECV_DTMF_IND,
+
 /* ERRC --> LTECSR */
     MSG_ID_LTECSR_ERRC_DELAY_BUDGET_RPT_REQ,
     MSG_ID_LTECSR_ERRC_DELAY_BUDGET_RESULT_IND,