commit bdd93d52cf43d2991561d70e238bf11e422b794b
author xf.li <xf.li@mobiletek.cn> Fri May 12 07:10:14 2023 -0700
committer xf.li <xf.li@mobiletek.cn> Fri May 12 07:10:14 2023 -0700
tree e3c665259c7118a7df767253a572274319e37cbf
parent db4f43f0150836941f56a4d2e2923f7182328607

[Feature][ZXW-33]merge ZXW 0428 version

Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b

pub/include/infra/pub_debug_info.h

diff --git a/pub/include/infra/pub_debug_info.h b/pub/include/infra/pub_debug_info.h
index 73c79f2..5adb04b 100755
--- a/pub/include/infra/pub_debug_info.h
+++ b/pub/include/infra/pub_debug_info.h
@@ -20,11 +20,20 @@
 #define MODULE_ID_CAP_KERNEL_END     (300)
 
 #define MODULE_ID_AP_DRIVES_START    (301)
-#define MODULE_ID_AP_USB             (301)
+#define MODULE_ID_AP_USB		(301)
+#define MODULE_ID_AP_REBOOT	(302)
+#define MODULE_ID_AP_TSC		(303)
+#define MODULE_ID_AP_PSM		(304)
+#define MODULE_ID_AP_NAND		(305)
+
 #define MODULE_ID_AP_DRIVES_END      (400)
 
 #define MODULE_ID_CAP_DRIVES_START   (401)
 #define MODULE_ID_CAP_USB            (401)
+#define MODULE_ID_CAP_TSC		(402)
+#define MODULE_ID_CAP_PSM		(403)
+#define MODULE_ID_CAP_NAND		(404)
+
 #define MODULE_ID_CAP_DRIVES_END     (500)
 
 #define MODULE_ID_AP_FS_START        (501)

pub/include/ps_phy/atipsevent.h

diff --git a/pub/include/ps_phy/atipsevent.h b/pub/include/ps_phy/atipsevent.h
index f44c93a..a62bde7 100644
--- a/pub/include/ps_phy/atipsevent.h
+++ b/pub/include/ps_phy/atipsevent.h
@@ -1197,7 +1197,7 @@
 #define MMIA_AS_QUERY_ZCSQ_REQ_EV                (DWORD)(MMIA_AS_EVENT_BASE + 28)

 #define MMIA_AS_LBS_REQ_EV                       (DWORD)(MMIA_AS_EVENT_BASE + 29)

 #define MMIA_AS_IMS_DATA_DELETE_REQ_EV           (DWORD)(MMIA_AS_EVENT_BASE + 30)

-#define MMIA_L1E_CARD_SWITCH_REQ_EV              (DWORD)(MMIA_AS_EVENT_BASE + 31)

+#define MMIA_AS_CARD_SWITCH_REQ_EV               (DWORD)(MMIA_AS_EVENT_BASE + 31)

 #define MMIA_AS_CARD_SWITCH_IND_EV               (DWORD)(MMIA_AS_EVENT_BASE + 32)

 

 #define MMIA_AS_EM_UCELL_INFO_IND_EV             (DWORD)(MMIA_AS_RSP_EVENT + 0)

@@ -1239,7 +1239,7 @@
 #define MMIA_AS_QUERY_ZCSQ_CNF_EV                (DWORD)(MMIA_AS_RSP_EVENT + 36)

 #define MMIA_AS_LBS_CNF_EV                       (DWORD)(MMIA_AS_RSP_EVENT + 37)

 #define MMIA_AS_UL_PARAM_IND_EV                  (DWORD)(MMIA_AS_RSP_EVENT + 38)

-#define MMIA_L1E_CARD_SWITCH_CNF_EV              (DWORD)(MMIA_AS_RSP_EVENT + 39)

+#define MMIA_AS_CARD_SWITCH_CNF_EV               (DWORD)(MMIA_AS_RSP_EVENT + 39)

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

    PDI - ATI ÏûÏ¢ºÅ¶¨Òå

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