[Feature][Modem]1.merge MTK P2 patch 2.RF:bias modification of frequency band
Change-Id: I846de8f085e50c1b9557ad8c5d0b2cc088b18d86
diff --git a/mcu/interface/sap/md/errc_msgid.h b/mcu/interface/sap/md/errc_msgid.h
index 779a144..1daecee 100755
--- a/mcu/interface/sap/md/errc_msgid.h
+++ b/mcu/interface/sap/md/errc_msgid.h
@@ -1450,6 +1450,7 @@
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_MRS_ERRC_CH_LOCK_NTF,
MSG_ID_EXEVT_RCV_END,
MSG_ID_INEVT_BEGIN,
MSG_ID_ERRC_SPV_RCM_INIT_REQ,
diff --git a/mcu/interface/sap/md/l4_msgid.h b/mcu/interface/sap/md/l4_msgid.h
index 412addd..ca2000c 100755
--- a/mcu/interface/sap/md/l4_msgid.h
+++ b/mcu/interface/sap/md/l4_msgid.h
@@ -219,6 +219,7 @@
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_OS_ID_UPDATE_REQ,
MSG_ID_L5_L4C_MSG_END,
#endif
// DMF -> L4C
diff --git a/mcu/interface/sap/md/l5_msgid.h b/mcu/interface/sap/md/l5_msgid.h
index 44ffe2c..689bbd6 100755
--- a/mcu/interface/sap/md/l5_msgid.h
+++ b/mcu/interface/sap/md/l5_msgid.h
@@ -388,6 +388,8 @@
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_L5IO_L5UNW_OS_ID_UPDATE_REQ,
+ MSG_ID_L5IO_L5UNW_OS_ID_UPDATE_CNF,
MSG_ID_L5UNW_MSG_END,
/*MSG_ID_L5IO->L5USIM*/
@@ -480,6 +482,9 @@
MSG_ID_L5USMS_SCBM_IND,
MSG_ID_L5USMS_DOMAIN_REQ,
MSG_ID_L5USMS_DOMAIN_CNF,
+ MSG_ID_L5USMS_DUP_NEW_SMS_IND,
+ MSG_ID_L5USMS_CBM_CFG_REQ,
+ MSG_ID_L5USMS_CBM_CFG_CNF,
/* L5USMS -> L5USMS */
MSG_ID_L5USMS_HANDLE_NEXT_NTF,
MSG_ID_L5USMS_EIND_URC,
@@ -667,13 +672,16 @@
MSG_ID_L5U_L5UIMS_IND_BEGIN,
MSG_ID_L5U_L5UIMS_CIREGU_IND,
+ MSG_ID_L5U_L5UIMS_EIREG_IND,
MSG_ID_L5U_L5UIMS_EWFC_IND,
MSG_ID_L5U_L5UIMS_EIMSREGURI_IND,
MSG_ID_L5U_L5UIMS_EIMSREGRESP_IND,
+ MSG_ID_L5UIMS_PDN_IND,
MSG_ID_L5U_L5UIMS_IND_END,
MSG_ID_L5UIMS_IND_BEGIN,
MSG_ID_L5UIMS_CIREGU_IND,
+ MSG_ID_L5UIMS_EIREG_IND,
MSG_ID_L5UIMS_EWFC_IND,
MSG_ID_L5UIMS_EIMSREGURI_IND,
MSG_ID_L5UIMS_EIMSREGRESP_IND,
@@ -683,12 +691,14 @@
/* IO->IMS */
MSG_ID_L5UIMS_GET_STATE_REQ,
MSG_ID_L5UIMS_SET_EIMSCFG_REQ,
+ MSG_ID_L5UIMS_GET_PDN_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_L5UIMS_GET_PDN_CNF,
MSG_ID_L5IO_L5UIMS_CNF_MSG_END,
/* L5USIM IND */
diff --git a/mcu/interface/sap/md/mrs_msgid.h b/mcu/interface/sap/md/mrs_msgid.h
index 1958a1e..7bcf069 100755
--- a/mcu/interface/sap/md/mrs_msgid.h
+++ b/mcu/interface/sap/md/mrs_msgid.h
@@ -203,8 +203,9 @@
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_DUMP_VOICE_UNAVAIL_LEAVE_RAT_CONFIG_IND,
-MSG_ID_MRS_CODE_END = MSG_ID_MRS_DUMP_RAT_CAPABILITY_CONFIG_IND,
+MSG_ID_MRS_CODE_END = MSG_ID_MRS_DUMP_VOICE_UNAVAIL_LEAVE_RAT_CONFIG_IND,
MODULE_MSG_END( MSG_ID_MRS_CODE_TAIL )
diff --git a/mcu/interface/sap/md/mtf_msgid.h b/mcu/interface/sap/md/mtf_msgid.h
index 43ee4b8..b57c1fc 100755
--- a/mcu/interface/sap/md/mtf_msgid.h
+++ b/mcu/interface/sap/md/mtf_msgid.h
@@ -54,6 +54,16 @@
*===========================================================
* $Log$
*
+ * 11 08 2022 gavin.zhang
+ * [MOLY00716695] ?21041??SA??????????????????q-RxLevMin/q-QualMin???????????.
+ *
+ * .
+ *
+ * 10 25 2022 gavin.zhang
+ * [MOLY00733110] 1546071?21041??network??SA????????????SINR?????????OSS????????
+ *
+ * .
+ *
* 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
*
@@ -110,10 +120,14 @@
MSG_ID_L4C_MT_SCREEN_STATE_IND,
MSG_ID_MT_DMF_L4C_CUSTOM_CONFIG_CNF,
+MSG_ID_NRRC_MT_DMF_QRXLEVMIN_ADJ_IND,
+MSG_ID_NL1MOB_MT_DMF_QRXLEVMIN_ADJ_IND,
MSG_ID_NL1MOB_MT_DMF_CUSTOM_ENH_IND,
MSG_ID_NL1MOB_MT_DMF_POSTPONE_A2_FOR_B1B2_IND,
+MSG_ID_NL1MOB_MT_DMF_POOR_SINR_OOS_IND,
+
MODULE_MSG_END( MSG_ID_MTF_CODE_TAIL )
diff --git a/mcu/interface/sap/md/nl1_msgid.h b/mcu/interface/sap/md/nl1_msgid.h
index 2014069..881a783 100755
--- a/mcu/interface/sap/md/nl1_msgid.h
+++ b/mcu/interface/sap/md/nl1_msgid.h
@@ -114,6 +114,7 @@
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_NRRC_NL1_IRAT_FROM_NR_INFO_REQ,
MSG_ID_NL1_NRRC_DVFS_CONTROL_MSG,
MSG_ID_NRRC_NL1_HST_ENHANCE_CONFIG_REQ,
diff --git a/mcu/interface/sap/md/nrrc_msgid.h b/mcu/interface/sap/md/nrrc_msgid.h
index d59615a..07b7aba 100755
--- a/mcu/interface/sap/md/nrrc_msgid.h
+++ b/mcu/interface/sap/md/nrrc_msgid.h
@@ -731,6 +731,8 @@
MSG_ID_NRRC_SEARCH_DUMP_CONTEXT_IND,
MSG_ID_NRRC_SEARCH_DUMP_CARRIER_CONTROL_INFO_IND,
+ MSG_ID_MRS_NRRC_CH_LOCK_NTF,
+
MSG_ID_NRRC_MSG_ID_END,
MODULE_MSG_END( MSG_ID_NRRC_CODE_TAIL )
diff --git a/mcu/interface/sap/md/ps_public_l4_msgid.h b/mcu/interface/sap/md/ps_public_l4_msgid.h
index 3e82c7e..705f3b6 100755
--- a/mcu/interface/sap/md/ps_public_l4_msgid.h
+++ b/mcu/interface/sap/md/ps_public_l4_msgid.h
@@ -143,6 +143,7 @@
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_PHB_DHL_DUMP_CONTEXT_IND,
MSG_ID_L4_PUBLIC_CODE_END,
MODULE_MSG_END( MSG_ID_L4_PUBLIC_CODE_TAIL )
diff --git a/mcu/interface/sap/md/upds_msgid.h b/mcu/interface/sap/md/upds_msgid.h
index f50efeb..3bc6f4d 100755
--- a/mcu/interface/sap/md/upds_msgid.h
+++ b/mcu/interface/sap/md/upds_msgid.h
@@ -56,6 +56,9 @@
MSG_ID_URSP_UPDS_UE_POLICY_IND,
MSG_ID_URSP_UPDS_GET_UE_POLICY_INFO_IND,
+ /* MSGs from L4C */
+ MSG_ID_L4C_UPDS_OS_ID_UPDATE_REQ,
+
MSG_ID_UPDS_END,
MODULE_MSG_END( MSG_ID_UPDS_CODE_TAIL )