[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/infra/pub_debug_info.h b/pub/include/infra/pub_debug_info.h
index 93b5a80..10357aa 100755
--- a/pub/include/infra/pub_debug_info.h
+++ b/pub/include/infra/pub_debug_info.h
@@ -26,6 +26,7 @@
#define MODULE_ID_AP_PSM (304)
#define MODULE_ID_AP_NAND (305)
#define MODULE_ID_AP_MMC (306)
+#define MODULE_ID_AP_WIFI (307)
#define MODULE_ID_AP_DRIVES_END (400)
#define MODULE_ID_CAP_DRIVES_START (401)
@@ -35,6 +36,7 @@
#define MODULE_ID_CAP_NAND (404)
#define MODULE_ID_CAP_SPI (405)
#define MODULE_ID_CAP_MMC (406)
+#define MODULE_ID_CAP_UART (407)
#define MODULE_ID_CAP_DRIVES_END (500)
#define MODULE_ID_AP_FS_START (501)
diff --git a/pub/include/infra/pub_flags.h b/pub/include/infra/pub_flags.h
index 107cc5f..5ec8b26 100755
--- a/pub/include/infra/pub_flags.h
+++ b/pub/include/infra/pub_flags.h
@@ -54,6 +54,7 @@
#define NVRO_INIT (0) /* initial state */
#define NVRO_BACKED_UP (0xBACE) /* nvro backed up already */
+#define NVRO_BACKING_UP (0xBAC1) /* nvro back up next boot */
#define NVRO_RESTORING (0x2E20) /* nvro restoring */
#define NVRO_INVALID (0xDEAD) /* nvro invalid */
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¶¨Ê±Æ÷ÏûÏ¢ºÅ¶¨Òå
diff --git a/pub/include/tools/ZspTrace.h b/pub/include/tools/ZspTrace.h
index 343e77b..c48bf96 100755
--- a/pub/include/tools/ZspTrace.h
+++ b/pub/include/tools/ZspTrace.h
@@ -32,9 +32,10 @@
#define ZCAT_PHY_LOG_UNIT_TAIL (ZCAT_PHY_LOG_UNIT_HEAD + (4>>CPU_SHIFT))
#define ZCAT_PHY_LOG_Free_UNIT_BUF (ZCAT_PHY_LOG_UNIT_TAIL + (4>>CPU_SHIFT))
#define ZCAT_PHY_LOG_Free_UNIT_LEN (96>>CPU_SHIFT) /* (24 * 4)B = 384K*/
-#define ZCAT_PHY_LOG_OFF (ZCAT_PHY_LOG_UNIT_HEAD + (16>>CPU_SHIFT) + ZCAT_PHY_LOG_Free_UNIT_LEN) /* ¶àÔ¤ÁôÁË8×Ö½Ú */
+#define ZCAT_PHY_LOG_OFF (ZCAT_PHY_LOG_UNIT_HEAD + (12>>CPU_SHIFT) + ZCAT_PHY_LOG_Free_UNIT_LEN) /* ¶àÔ¤ÁôÁË4×Ö½Ú */
#define ZCAT_PHY_LOG_ZSP_BUF_READY (ZCAT_PHY_LOG_OFF + (4>>CPU_SHIFT))
-#define ZCAT_PHY_LOG_VEHICLE_SIGN (ZCAT_PHY_LOG_ZSP_BUF_READY + (4>>CPU_SHIFT))
+#define ZCAT_PS_LOG_VEHICLE_SIGN (ZCAT_PHY_LOG_ZSP_BUF_READY + (4>>CPU_SHIFT))
+#define ZCAT_PHY_LOG_VEHICLE_SIGN (ZCAT_PS_LOG_VEHICLE_SIGN + (4>>CPU_SHIFT))
/*ά²âÐÅÏ¢Log¿ª¹Ø*/
#define ZCAT_DEBUG_INFO_DISABLE (ZCAT_PHY_LOG_VEHICLE_SIGN + (4>>CPU_SHIFT))