commit 9d1a0e121234a7fd2844e8583174b8662dbaad4b
author xf.li <xf.li@mobiletek.cn> Wed Sep 20 01:43:20 2023 -0700
committer xf.li <xf.li@mobiletek.cn> Wed Sep 20 01:43:20 2023 -0700
tree f688a232b251d86e7af4206ca6704e54a4a5da96
parent d7e85d1c54d3940850d139a0f3c41792931d8c3b

[Feature][ZXW-136]merge P50U04 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: I7b6a8e22777591bc7a9ede91d6695d9415116f81

pub/include/ps_phy/atipsevent.h

diff --git a/pub/include/ps_phy/atipsevent.h b/pub/include/ps_phy/atipsevent.h
index 9fbc55a..4b16bf0 100755
--- a/pub/include/ps_phy/atipsevent.h
+++ b/pub/include/ps_phy/atipsevent.h
@@ -332,9 +332,10 @@
 #define AP_UICC_EFSTATUS_MODIFY_CNF_EV           (DWORD)(AP_UICC_RSP_EVENT + 36)  

 #define AP_UICC_PREPERSNREC_SRCH_CNF_EV          (DWORD)(AP_UICC_RSP_EVENT + 37)  

 #define AP_UICC_PB_SEARCH_CNF_EV                 (DWORD)(AP_UICC_RSP_EVENT + 38)     /* ·ÖÅäÁË50ÌõÏûÏ¢Çø¼ä£¬ÒÑÓÃÁË39¸ö */ 

-#define AP_UICC_REFRESH_HAPPEN_IND_EV          (DWORD)(AP_UICC_RSP_EVENT + 39) 

-#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_REFRESH_HAPPEN_IND_EV            (DWORD)(AP_UICC_RSP_EVENT + 39) 

+#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)

 

 /* ========================================================================

    MMIA¶ÔÍâÌṩÏûÏ¢ºÅ¶¨Òå

pub/include/tools/ZspTrace.h

diff --git a/pub/include/tools/ZspTrace.h b/pub/include/tools/ZspTrace.h
index 71bae28..0712c6e 100755
--- a/pub/include/tools/ZspTrace.h
+++ b/pub/include/tools/ZspTrace.h
@@ -36,6 +36,14 @@
 #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)) 

 

+////zCat Log Rule

+#define ZCAT_RULE_LTE_ENABLED              (ZCAT_PHY_LOG_VEHICLE_SIGN + (4>>CPU_SHIFT)) 

+#define ZCAT_RULE_SIG_ENABLED              (ZCAT_RULE_LTE_ENABLED + (4>>CPU_SHIFT)) 

+#define ZCAT_RULE_TD_ENABLED               (ZCAT_RULE_SIG_ENABLED + (4>>CPU_SHIFT)) 

+#define ZCAT_RULE_WCDMA_ENABLED            (ZCAT_RULE_TD_ENABLED + (4>>CPU_SHIFT)) 

+#define ZCAT_RULE_AP2APP_ENABLED           (ZCAT_RULE_WCDMA_ENABLED + (4>>CPU_SHIFT)) 

+#define ZCAT_RULE_AP2KERNEL_ENABLED        (ZCAT_RULE_AP2APP_ENABLED + (4>>CPU_SHIFT)) 

+

 ////PHY<->PS ringbuffer(TD)

 #define ZCAT_PHY_LOG_CONTROL_SIZE           (0x200UL>>CPU_SHIFT)

 #define ZCAT_PHY_LOG_CONTROL_LEN            (ZCAT_PHY_LOG_CONTROL_SIZE - (4 >> CPU_SHIFT))