[Feature][Modem]Merge MTK release P3 P4 patch
Change-Id: I1ef3d69e36378ee73a422ecb2721488d6b416427
diff --git a/mcu/interface/sap/md/imc_msgid.h b/mcu/interface/sap/md/imc_msgid.h
index c4ccce8..c362789 100755
--- a/mcu/interface/sap/md/imc_msgid.h
+++ b/mcu/interface/sap/md/imc_msgid.h
@@ -194,6 +194,10 @@
/* +EGMR */
MSG_ID_ATP_IMC_QUERY_IMEI_SVN_CNF,
+
+ /* EMSDUPDATE*/
+ MSG_ID_ATP_IMC_MSD_UPDATE_REQ,
+
MSG_ID_ATP_IMC_END,
/* with vdm */
diff --git a/mcu/interface/sap/md/imcb_msgid.h b/mcu/interface/sap/md/imcb_msgid.h
index 3ab884c..51dd9e2 100755
--- a/mcu/interface/sap/md/imcb_msgid.h
+++ b/mcu/interface/sap/md/imcb_msgid.h
@@ -52,7 +52,15 @@
* ==========================================================================
* $Log$
*
+ * 09 16 2022 xin.ni
+ * [MOLY00827342] [FOCUS][MT6879][Figeac][S0][R2][JAPAN][SOFTBANK][SIM][Lab][OTR-Voice-032031] VoLTE 4sec cancel timer to apply to EPS-FB case
+ *
+ * .
+ *
* 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
*
@@ -429,6 +437,9 @@
MSG_ID_IMCB_IMC_IMS_RESET_SUGGESTION_TIMER_REQ, /* IMCB -> IMC */
+ /* Attached RAT indication from IMC */
+ MSG_ID_IMCB_IMC_ATTACHED_RAT_IND,
+
MSG_ID_IMCB_IMC_END,
/* with NCCCI */
diff --git a/mcu/interface/sap/md/l5_msgid.h b/mcu/interface/sap/md/l5_msgid.h
index 689bbd6..602bbfa 100755
--- a/mcu/interface/sap/md/l5_msgid.h
+++ b/mcu/interface/sap/md/l5_msgid.h
@@ -179,6 +179,10 @@
MSG_ID_L5IO_SYS_SAR_SET_CNF,
MSG_ID_L5USYS_CONNECTIVITY_STATISTICS_CNF,
MSG_ID_L5IO_SYS_QUERY_SBP_CNF,
+ MSG_ID_L5USYS_GET_WAKEUP_REASON_CNF,
+ MSG_ID_L5USYS_SET_SLEEP_TIMER_CNF,
+ MSG_ID_L5USYS_GET_SLEEP_TIMER_CNF,
+ MSG_ID_L5USYS_SET_SLEEP_MODE_CNF,
MSG_ID_L5IO_SYS_CNF_RANGE_END,
/*L5UXXX,please add cnf to L5IO here*/
@@ -390,6 +394,7 @@
MSG_ID_L5IO_L5UNW_ENWREJAC_IND,
MSG_ID_L5IO_L5UNW_OS_ID_UPDATE_REQ,
MSG_ID_L5IO_L5UNW_OS_ID_UPDATE_CNF,
+ MSG_ID_L5IO_L5UNW_EMSR_IND,
MSG_ID_L5UNW_MSG_END,
/*MSG_ID_L5IO->L5USIM*/
@@ -447,10 +452,15 @@
MSG_ID_L5USYS_ESBPID_IND,
MSG_ID_L5USYS_CIEV_IND,
MSG_ID_L5USYS_EIMSGEO_IND,
+ MSG_ID_L5USYS_TIMER_EXPIRE_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_L5USYS_GET_WAKEUP_REASON_REQ,
+ MSG_ID_L5USYS_SET_SLEEP_MODE_REQ,
+ MSG_ID_L5USYS_SET_SLEEP_TIMER_REQ,
+ MSG_ID_L5USYS_GET_SLEEP_TIMER_REQ,
MSG_ID_L5IO_USYS_MSG_END,
MSG_ID_L5USMS_MSG_BEGIN,
diff --git a/mcu/interface/sap/md/sase_msgid.h b/mcu/interface/sap/md/sase_msgid.h
index b02f5e0..1ffc62d 100755
--- a/mcu/interface/sap/md/sase_msgid.h
+++ b/mcu/interface/sap/md/sase_msgid.h
@@ -132,15 +132,18 @@
MSG_ID_ATP_SASE_IMS_REG_STATUS_IND,
// IMC -> SASE, IMS call status
MSG_ID_SASE_IMC_IMS_CALL_STATUS_IND,
+// ATP -> SASE
+MSG_ID_SASE_ATP_IMS_HANDOVER_START_IND,
+MSG_ID_SASE_ATP_IMS_HANDOVER_END_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
+// LPP -> SASE
MSG_ID_LPP_SASE_START_OTDOA_MEAS_REQ,
MSG_ID_LPP_SASE_STOP_OTDOA_MEAS_REQ,
-//NL1 -> SASE
+// NL1 -> SASE
MSG_ID_SASE_NL1_LTE_POS_START_CNF,
MODULE_MSG_END( MSG_ID_SASE_CODE_TAIL )