[Feature][ZXW-41] merged 0601 version
Change-Id: I667af6bb09d65581d455b73f8984c160b2c67ad8
diff --git a/pub/include/nv/ref_rw.h b/pub/include/nv/ref_rw.h
new file mode 100644
index 0000000..d99a830
--- /dev/null
+++ b/pub/include/nv/ref_rw.h
@@ -0,0 +1,16 @@
+typedef struct
+{
+ BYTE nvInerVersion[100];
+ BYTE nvExVersion[100];
+ BYTE nvHWVersion[100];
+ BYTE nvInerModelNum[32];
+ BYTE nvExModelNum[32];
+ BYTE nvSSID[100];
+ BYTE nvCGMI[100];
+ BYTE nvWIFIKey[65];
+ BYTE nvUnlockTimes[4];
+ BYTE nvVersionMode;
+ BYTE nvZisms;
+ BYTE nvDm;
+}T_ZCtrm_NV_FILE_INFO;
+
diff --git a/pub/include/ps_phy/rpmsg_channel.h b/pub/include/ps_phy/rpmsg_channel.h
index ab4993e..cbf455b 100644
--- a/pub/include/ps_phy/rpmsg_channel.h
+++ b/pub/include/ps_phy/rpmsg_channel.h
@@ -85,6 +85,7 @@
//PHY<->M0
#define RP_MSG_PHY_M0_AXI_DFS channel_1 //axiµ÷ƵͨµÀ
#define RP_MSG_M0_PHY_WDT channel_2 //m0¡¢zspÖ®¼äµÄWDT
+#define RP_MSG_PHY_M0_LOG_CHANNEL channel_4 //m0¡¢zspÖ®¼äµÄLog»½ÐÑͨµÀ
//PS<->M0
#define RP_MSG_PS_M0_AXI_DFS channel_1 //axiµ÷ƵͨµÀ
diff --git a/pub/include/tools/ZspTrace.h b/pub/include/tools/ZspTrace.h
index 047d65a..71bae28 100755
--- a/pub/include/tools/ZspTrace.h
+++ b/pub/include/tools/ZspTrace.h
@@ -33,6 +33,8 @@
#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_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))
////PHY<->PS ringbuffer(TD)
#define ZCAT_PHY_LOG_CONTROL_SIZE (0x200UL>>CPU_SHIFT)