[Feature][ZXW-265]merge P56U03 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: I873f6df64e2605a77b8b8bfec35b21e7f33c5444
diff --git a/pub/include/ps_phy/atipsevent.h b/pub/include/ps_phy/atipsevent.h
index 35b9d4e..205c7a8 100755
--- a/pub/include/ps_phy/atipsevent.h
+++ b/pub/include/ps_phy/atipsevent.h
@@ -985,6 +985,7 @@
#define MMIA_UMM_ECALLSPT_QUERY_CNF_EV (DWORD)(MMIA_UMM_RSP_EVENT + 30)
#define MMIA_UMM_ECALLONLY_QUERY_CNF_EV (DWORD)(MMIA_UMM_RSP_EVENT + 31)
#define MMIA_UMM_CAUSE_IND_EV (DWORD)(MMIA_UMM_RSP_EVENT + 32)
+#define MMIA_UMM_T10DEREG_IND_EV (DWORD)(MMIA_UMM_RSP_EVENT + 33)
/* ========================================================================
MMIA£CCÏûÏ¢ºÅ¶¨Òå
======================================================================== */
@@ -1005,6 +1006,10 @@
#define MMIA_CC_STATE_REQ_EV (DWORD)(MMIA_CC_EVENT_BASE + 14)
#define MMIA_CC_OPEN_VOICECHNL_REQ_EV (DWORD)(MMIA_CC_EVENT_BASE + 15)
#define MMIA_CC_SRVCC_NOTOPEN_VOICECHNL_REQ_EV (DWORD)(MMIA_CC_EVENT_BASE + 16)
+#define MMIA_CC_T9TIMER_SET_REQ_EV (DWORD)(MMIA_CC_EVENT_BASE + 17)
+#define MMIA_CC_T9TIMER_QRY_REQ_EV (DWORD)(MMIA_CC_EVENT_BASE + 18)
+#define MMIA_CC_VOICEMODE_QRY_REQ_EV (DWORD)(MMIA_CC_EVENT_BASE + 19)
+#define MMIA_CC_RESETIVS_REQ_EV (DWORD)(MMIA_CC_EVENT_BASE + 20)
#define MMIA_CC_MOC_CNF_EV (DWORD)(MMIA_CC_RSP_EVENT + 0)
#define MMIA_CC_MTC_IND_EV (DWORD)(MMIA_CC_RSP_EVENT + 1)
@@ -1037,6 +1042,10 @@
#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)
+#define MMIA_CC_T9TIMER_QRY_CNF_EV (DWORD)(MMIA_CC_RSP_EVENT + 31)
+#define MMIA_CC_CALLBACK_EVENT_EV (DWORD)(MMIA_CC_RSP_EVENT + 32)
+#define MMIA_CC_VOICEMODE_QRY_CNF_EV (DWORD)(MMIA_CC_RSP_EVENT + 33)
+#define MMIA_CC_RESETIVS_CNF_EV (DWORD)(MMIA_CC_RSP_EVENT + 34)
/* ========================================================================
MMIA£SMSÏûÏ¢ºÅ¶¨Òå
@@ -1156,6 +1165,7 @@
#ifdef BTRUNK_SUPPORT
#define PTT_MMIA_ESM_TAUTYPE_REQ_EV (DWORD)(MMIA_ESM_EVENT_BASE + 6) /*¼¯ÈºÌí¼Ó*/
#endif
+#define MMIA_ESM_PDP_CAUSE_QUERY_REQ_EV (DWORD)(MMIA_ESM_EVENT_BASE + 7)
#define MMIA_ESM_EPS_BEARER_ACT_IND_EV (DWORD)(MMIA_ESM_RSP_EVENT + 0)
#define MMIA_ESM_EPS_BEARER_DEACT_IND_EV (DWORD)(MMIA_ESM_RSP_EVENT + 1)
@@ -1170,6 +1180,7 @@
#ifdef BTRUNK_SUPPORT
#define PTT_MMIA_ESM_TAUTYPE_CNF_EV (DWORD)(MMIA_ESM_RSP_EVENT + 10) /*¼¯ÈºÌí¼Ó*/
#endif
+#define MMIA_ESM_PDP_CAUSE_QUERY_CNF_EV (DWORD)(MMIA_ESM_RSP_EVENT + 11)
/* ========================================================================
MMIA£CBSÏûÏ¢ºÅ¶¨Òå
diff --git a/pub/include/ps_phy/psevent.h b/pub/include/ps_phy/psevent.h
index a615c21..d1fbdf8 100755
--- a/pub/include/ps_phy/psevent.h
+++ b/pub/include/ps_phy/psevent.h
@@ -1585,7 +1585,7 @@
#define CC_IVS_MSD_IND_EV (DWORD)(CM_MM_EVENT_BASE + 23)
/*IVS·¢¸øCC*/
#define IVS_CC_MSD_REQ_EV (DWORD)(CM_MM_EVENT_BASE + 24)
-#define IVS_CC_HLACK_IND_EV (DWORD)(CM_MM_EVENT_BASE + 25)
+#define IVS_CC_MSD_STATE_IND_EV (DWORD)(CM_MM_EVENT_BASE + 25)
#define PSAP_UL_PCM_IND_EV (DWORD)(CM_MM_EVENT_BASE + 26)