[Feature][ZXW-130]merge P50U02 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: I4f29ec5bb7c59385f23738d2b7ca84e67c100f69
diff --git a/ap/app/zte_log_agent/log_agent.h b/ap/app/zte_log_agent/log_agent.h
index b118802..661e983 100755
--- a/ap/app/zte_log_agent/log_agent.h
+++ b/ap/app/zte_log_agent/log_agent.h
@@ -70,10 +70,10 @@
 /* ͨѶģ¿éºÅ */

 #define MDL_TOOLS_BASE            (100)

 #define SUBMDL_TOOLAGENT_SET      (85)

-#define MDL_ZCAT                  (MDL_TOOLS_BASE + 15)      /* ZCAT¹¤¾ß          */

-#define SUBMDL_ZCATAGT            (SUBMDL_TOOLAGENT_SET + 0)  /* ZCAT¹¤¾ß´úÀí */

+#define MDL_ZCAT                  (MDL_TOOLS_BASE + 15)      /* ZCAT¹¤¾ß     */

+#define SUBMDL_ZCATAGT            (SUBMDL_TOOLAGENT_SET + 0) /* ZCAT¹¤¾ß´úÀí */

 

-#define MDL_PHONE                 (1)                     /* ÊÖ»ú             */

+#define MDL_PHONE                 (1)                        /* ÊÖ»ú         */

 

 /* ÈÕÖ¾Á÷ÏòÖ¾ */

 #define DIR_LOG_TCARD_VALUE 0x01

@@ -221,8 +221,10 @@
     ZCAT_MODE_CP_NET,

     ZCAT_MODE_CP_FS,

 #ifdef USE_CAP_SUPPORT

-    ZCAT_MODE_CAP_FS

+    ZCAT_MODE_CAP_FS,

+    ZCAT_MODE_CAP_NET,

 #endif

+    ZCAT_MODE_LOG_OFF,

 } E_ZCAT_MODE;

 

 typedef enum

@@ -238,6 +240,7 @@
 #ifdef USE_CAP_SUPPORT

     ZCAT_IPC_ALLOC_CAP_SMLOGBUF,

 #endif

+    ZCAT_IPC_READ_IRAM_ZCAT_MODE,

 } E_ZCAT_IPC_HANDSHAKE;