[Feature][ZXW-241]merge P56U01 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: I7985538dde6951dd824c36149bf9a1e3ca23c734
diff --git a/pub/include/infra/pub_flags.h b/pub/include/infra/pub_flags.h
index 5ec8b26..29db943 100755
--- a/pub/include/infra/pub_flags.h
+++ b/pub/include/infra/pub_flags.h
@@ -36,6 +36,9 @@
#define OTA_PARTITION_NUM_MAX 15
+#define IMG_NAME_LEN 16
+#define IMG_NUM_MAX 15
+
/*******************************************************************************
* Type definitions *
@@ -88,13 +91,21 @@
char fs_ubi_vol_name[16];
} T_UBIFS_STATUS;
-typedef struct {
+typedef struct
+{
int mtdnum;
unsigned int len;
} T_AA_PARTITION_INFO;
typedef struct
{
+ char name[IMG_NAME_LEN];
+ unsigned int size_a;
+ unsigned int size_b;
+} T_IMG_SIZE;
+
+typedef struct
+{
unsigned int magic_start; /* Êý¾ÝÓÐЧÐÔħÊõ×Ö */
T_BOOT_FOTA_FLAG boot_fota_flag;
@@ -104,9 +115,13 @@
unsigned int crc32;
T_BOOT_TARGET ota_system; /* Éý¼¶Ê±ÊÇϵͳA»¹ÊÇϵͳB */
T_AA_PARTITION_INFO ota_partiton_info[OTA_PARTITION_NUM_MAX]; /* ÈÝÄÉ×î¶à15¸öÉý¼¶·ÖÇøµÄimage¾µÏñ´óС */
- char reserve[52];
-
+ unsigned int poweron_time;
+ char reserve[48];
unsigned int magic_end; /* Êý¾ÝÓÐЧÐÔħÊõ×Ö */
+ T_IMG_SIZE img_size[IMG_NUM_MAX]; /* ±£´æϵͳ¾µÏñÎļþ´óС */
+ T_BOOT_TARGET sync_system; /* ͬ²½Ê±ÊÇϵͳA»¹ÊÇϵͳB */
+ unsigned int crc32_1;
+ int reserve2[292]; /* ±£ÁôÀ©Õ¹×ֶΠ*/
} T_FLAGS_INFO;
diff --git a/pub/include/ps_phy/atipsevent.h b/pub/include/ps_phy/atipsevent.h
index 6ebd1ab..7ac2437 100755
--- a/pub/include/ps_phy/atipsevent.h
+++ b/pub/include/ps_phy/atipsevent.h
@@ -982,6 +982,7 @@
#define MMIA_UMM_CARDSWITCH_REQ_IND_EV (DWORD)(MMIA_UMM_RSP_EVENT + 29)
#define MMIA_UMM_ECALLSPT_QUERY_CNF_EV (DWORD)(MMIA_UMM_RSP_EVENT + 30)
#define MMIA_UMM_ECALLONLY_QUERY_CNF_EV (DWORD)(MMIA_UMM_RSP_EVENT + 31)
+#define MMIA_UMM_CAUSE_IND_EV (DWORD)(MMIA_UMM_RSP_EVENT + 32)
/* ========================================================================
MMIA£CCÏûÏ¢ºÅ¶¨Òå
======================================================================== */
diff --git a/pub/project/zx297520v3/include/drv/NvParam_drv.h b/pub/project/zx297520v3/include/drv/NvParam_drv.h
index aba43bc..66c6f6d 100755
--- a/pub/project/zx297520v3/include/drv/NvParam_drv.h
+++ b/pub/project/zx297520v3/include/drv/NvParam_drv.h
@@ -115,7 +115,8 @@
/* 0x7D */ UINT8 uiccPreSwitch;
/* 0x7E */ UINT8 uicc1modeSwitch;
/* 0x7F */ UINT8 uicc1PreSwitch;
- UINT8 reserved[DRV_SYS_NV_SIZE - 124 - 4];
+ /* 0x80 */ UINT8 ishpnotsupported;
+ UINT8 reserved[DRV_SYS_NV_SIZE - 129];
} __attribute__ ((packed)) T_ZDrvNv_SysData;
/***********************************