[Feature][Modem]1.merge MTK P2 patch 2.RF:bias modification of frequency band
Change-Id: I846de8f085e50c1b9557ad8c5d0b2cc088b18d86
diff --git a/mcu/interface/protocol/general/l5_structs.h b/mcu/interface/protocol/general/l5_structs.h
index 63ee5c0..cd6847e 100755
--- a/mcu/interface/protocol/general/l5_structs.h
+++ b/mcu/interface/protocol/general/l5_structs.h
@@ -50,7 +50,7 @@
#define L5_L5IO_MBCI_MAX_PENDING_NUM (16)
#define L5_L5IO_MBCI_MAX_CONTROL_TRANSFER (4096)
#define L5_L5IO_MBCI_SUPPORT_VERSION (0x0100)
-#define L5_L5IO_MBCI_SUPPORT_EXT_VERSION (0x0300)
+#define L5_L5IO_MBCI_SUPPORT_EXT_VERSION (0x0400)
#define L5SEQ_ID_URC (0xffffffff)
/**********L5IO<->L5U***************/
diff --git a/mcu/interface/protocol/general/mrs_as_inter_core_enum.h b/mcu/interface/protocol/general/mrs_as_inter_core_enum.h
index f274fa8..f1f9619 100755
--- a/mcu/interface/protocol/general/mrs_as_inter_core_enum.h
+++ b/mcu/interface/protocol/general/mrs_as_inter_core_enum.h
@@ -136,5 +136,11 @@
MRS_CH_LOCK_STATE_NRAS_LOCK
} MRS_CH_LOCK_STATE;
+typedef enum
+{
+ MRS_CH_LOCK_SCENARIO_DEFAULT,
+ MRS_CH_LOCK_SCENARIO_USER
+} MRS_CH_LOCK_SCENARIO;
#endif /* __CHANNEL_LOCK__ */
+
#endif /* __MRS_AS_INTER_CORE_ENUM_H__ */
diff --git a/mcu/interface/protocol/general/perf_api.h b/mcu/interface/protocol/general/perf_api.h
index f445723..fc4504d 100755
--- a/mcu/interface/protocol/general/perf_api.h
+++ b/mcu/interface/protocol/general/perf_api.h
@@ -60,6 +60,7 @@
RECOVERY_TYPE_NR_RRC_REESTABLISH,
RECOVERY_TYPE_NR_SCG_FAILURE_INFO,
RECOVERY_TYPE_NR_RRC_REDIRECT_FAIL, // RRC ask ERM to notify scenario when redirection fail, and notify NRRC when scenario happened
+ RECOVERY_TYPE_NR_NW_REJECT_WITH_LONG_WAIT_TIME
} protocol_exception_recovery_type_enum;
typedef enum
diff --git a/mcu/interface/protocol/general/ps_public_enum.h b/mcu/interface/protocol/general/ps_public_enum.h
index 555fe57..e4e4706 100755
--- a/mcu/interface/protocol/general/ps_public_enum.h
+++ b/mcu/interface/protocol/general/ps_public_enum.h
@@ -115,6 +115,9 @@
#define MAX_NR_SET_STORED_NUM 10
#define MAX_LTE_SET_STORED_NUM 10
+#define UE_OS_ID_LEN 16 /* According to RFC 4122, OS_ID is defined as UUID(Universally Unique IDentifier) with length 128 bits (16 bytes) */
+#define MAX_UE_OS_ID_NUM 15 /* According to 24.501 D.6.6, UE could carry maximum 15 OS ID to NW */
+
#define VZW_5GUW_Allowed_default 0
#define VZW_FF03H_abnormal_default 0
@@ -4606,8 +4609,15 @@
typedef enum
{
GSM_CAPABILITY = 0x01,
+ UMTS_CAPABILITY = 0x02,
} rat_capability_enum;
+typedef enum
+{
+ LEAVE_LTE = 0x01,
+ LEAVE_NR = 0x02,
+} voice_unavail_leave_rat_enum;
+
#define VGSM_MAX_QFI_NUM 64
typedef enum {
diff --git a/mcu/interface/protocol/general/ps_public_struct.h b/mcu/interface/protocol/general/ps_public_struct.h
index 6427d24..bd12fa4 100755
--- a/mcu/interface/protocol/general/ps_public_struct.h
+++ b/mcu/interface/protocol/general/ps_public_struct.h
@@ -3110,4 +3110,9 @@
better_rat_detect_response_enum result;
} l4c_as_better_rat_detect_ind_struct;
+typedef struct
+{
+ kal_uint8 os_id[UE_OS_ID_LEN];
+} os_id_info_struct;
+
#endif /* _PS_PUBLIC_STRUCT_H_ */