[Feature][ZXW-452]merge P54U02 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I17e6795ab66e2b9d1cbbfec4b7c0028d666e177d
diff --git a/pub/include/ps_phy/atipsevent.h b/pub/include/ps_phy/atipsevent.h
index 303d66e..6ebd1ab 100755
--- a/pub/include/ps_phy/atipsevent.h
+++ b/pub/include/ps_phy/atipsevent.h
@@ -946,6 +946,8 @@
#define MMIA_UMM_CARDSWITCH_CMP_IND_EV (DWORD)(MMIA_UMM_EVENT_BASE + 31)
#define MMIA_UMM_ECALLSPT_QUERY_REQ_EV (DWORD)(MMIA_UMM_EVENT_BASE + 32)
#define MMIA_UMM_ECALLONLY_QUERY_REQ_EV (DWORD)(MMIA_UMM_EVENT_BASE + 33)
+#define MMIA_UMM_FREQ_SCAN_REQ_EV (DWORD)(MMIA_UMM_EVENT_BASE + 34)
+#define MMIA_UMM_FAST_FREQ_SCAN_REQ_EV (DWORD)(MMIA_UMM_EVENT_BASE + 35)
#define MMIA_UMM_PLMN_INFO_IND_EV (DWORD)(MMIA_UMM_RSP_EVENT + 0)
@@ -1031,6 +1033,7 @@
#define MMIA_CC_START_LOCALVOICE_IND_EV (DWORD)(MMIA_CC_RSP_EVENT + 27)
#define MMIA_CC_ZECALL_IND_EV (DWORD)(MMIA_CC_RSP_EVENT + 28)
#define MMIA_CC_CECN_IND_EV (DWORD)(MMIA_CC_RSP_EVENT + 29)
+#define MMIA_CC_ECALL_WORKSTATE_IND_EV (DWORD)(MMIA_CC_RSP_EVENT + 30)
/* ========================================================================
MMIA£SMSÏûÏ¢ºÅ¶¨Òå
diff --git a/pub/include/ps_phy/ps_ephy_interface.h b/pub/include/ps_phy/ps_ephy_interface.h
old mode 100644
new mode 100755
index d6251d0..93637d4
--- a/pub/include/ps_phy/ps_ephy_interface.h
+++ b/pub/include/ps_phy/ps_ephy_interface.h
@@ -437,6 +437,8 @@
WORD wBandNum;
WORD wProcId; /* Ôö¼Ó */
WORD wFreqScanType;
+ WORD wPadding;
+ WORD wFreqScanAct; /*µ±Ç°É¨ÆµÖÆʽ£¬È¡Öµ 0:TDDOnly, 1:FddOnly, 2:TddPref, 3:FddPref*/
T_zPS_LTE_P_FreqBand atFreqBandList[ZPS_LTE_P_MAX_NUM_OF_BAND];
} T_zPS_LTE_P_FreqScan_Req;
diff --git a/pub/include/ps_phy/psevent.h b/pub/include/ps_phy/psevent.h
index 1e15c11..62cace6 100755
--- a/pub/include/ps_phy/psevent.h
+++ b/pub/include/ps_phy/psevent.h
@@ -3169,6 +3169,8 @@
#define CC_T_T5_EXPIRY_EV (DWORD)(CC_TIMER_EVENT_BASE + 31)
#define CC_T_T6_EXPIRY_EV (DWORD)(CC_TIMER_EVENT_BASE + 32)
#define CC_T_T7_EXPIRY_EV (DWORD)(CC_TIMER_EVENT_BASE + 33)
+#define CC_T_TIDLE_EXPIRY_EV (DWORD)(CC_TIMER_EVENT_BASE + 34)
+#define CC_T_T9_EXPIRY_EV (DWORD)(CC_TIMER_EVENT_BASE + 35)
/* ========================================================================
SMS¶¨Ê±Æ÷ÏûÏ¢ºÅ¶¨Òå