[Feature][ZXW-285]merge P56U05 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: Ied657102425a179a89ef41847170152e8a5d437c
diff --git a/pub/include/ps_phy/atipsevent.h b/pub/include/ps_phy/atipsevent.h
index 205c7a8..2bd5386 100755
--- a/pub/include/ps_phy/atipsevent.h
+++ b/pub/include/ps_phy/atipsevent.h
@@ -337,6 +337,7 @@
#define AP_UICC_AIR_AUTH_REQ_IND_EV (DWORD)(AP_UICC_RSP_EVENT + 40)
#define AP_UICC_READ_EID_CNF_EV (DWORD)(AP_UICC_RSP_EVENT + 41)
#define AP_UICC_CCHC_CNF_EV (DWORD)(AP_UICC_RSP_EVENT + 42)
+#define AP_UICC_LOC_STAT_IND (DWORD)(AP_UICC_RSP_EVENT + 43)
/* ========================================================================
MMIA¶ÔÍâÌṩÏûÏ¢ºÅ¶¨Òå
diff --git a/pub/include/ps_phy/ps_phy_nv.h b/pub/include/ps_phy/ps_phy_nv.h
old mode 100644
new mode 100755
index 5bc1ddc..79f67c9
--- a/pub/include/ps_phy/ps_phy_nv.h
+++ b/pub/include/ps_phy/ps_phy_nv.h
@@ -134,6 +134,8 @@
WORD wphyCfgFlg;/*AT+ZSET="phyCfg"[,<n>]ÎïÀí²ã¹¦ÄÜÅäÖã¬bit1:²âÁ¿²ßÂÔ´ò¿ª£¬bit2:Ñ°ºôÏÂÒÆ´ò¿ª£¬bit3:RFµ¥ÌìÏß½ÓÊÕ¿ª¹Ø,bitλ 0:¹Ø±Õ£¬1:´ò¿ª£¬Ä¬ÈÏ0*/
T_zPS_LTE_P_NV_UL_MaxPower_Backoff_FLAG tUlMaxpowerBackoffFlg;
T_zPS_LTE_P_NV_STRAY_AMPR tUlNvStrayAmpr;
+ WORD wphyCfgFlgbackup;
+ WORD padding;
}T_zPS_P_ATNV_LTE;
@@ -208,10 +210,10 @@
typedef struct
{
T_zPS_P_ATNV_LTE tAtNvLte;
- WORD wLtePading[AT_NV_SIZE_WORD_PER_MODE+13 - (sizeof(T_zPS_P_ATNV_LTE)/sizeof(WORD))];
+ WORD wLtePading[AT_NV_SIZE_WORD_PER_MODE+15 - (sizeof(T_zPS_P_ATNV_LTE)/sizeof(WORD))];
T_zPS_P_ATNV_LTEA tAtNvLtea;
- WORD wLteaPading[AT_NV_SIZE_WORD_PER_MODE-13 - (sizeof(T_zPS_P_ATNV_LTEA)/sizeof(WORD))];
+ WORD wLteaPading[AT_NV_SIZE_WORD_PER_MODE-15 - (sizeof(T_zPS_P_ATNV_LTEA)/sizeof(WORD))];
T_zPS_P_ATNV_W tAtNvW;
WORD wWPading[AT_NV_SIZE_WORD_PER_MODE - (sizeof(T_zPS_P_ATNV_W)/sizeof(WORD))];