[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/allbins/tools/mkfs_sh/gen_ubi_para.sh b/allbins/tools/mkfs_sh/gen_ubi_para.sh
new file mode 100755
index 0000000..26f11f4
--- /dev/null
+++ b/allbins/tools/mkfs_sh/gen_ubi_para.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+
+#########可修改---开始#########
+#分区大小，单位MB，可以是带小数
+if [ $# -eq 0 ]; then
+ INPUT_MTD_SIZE=32
+else
+ INPUT_MTD_SIZE=$1
+fi
+
+#擦除块大小
+MTD_ERASE_SIZE=0x40000
+
+#flash页大小
+MTD_PAGE_SIZE=4096
+
+#子页subpage大小
+MTD_SUBPAGE_SIZE=4096
+
+#BEB保留数，每1024预留多少个给坏快
+BEB_RESERVE_LIMIT=20
+#########可修改---结束#########
+
+function gen_mtd_para()
+{
+ MTD_NAME=$1
+ MTD_SIZE_MB=$2
+ MTD_SIZE_KB=$(awk "BEGIN { print $MTD_SIZE_MB * 1024 }")
+ BLOCK_SIZE_KB=$[$MTD_ERASE_SIZE / 1024]
+ BLOCK_CNT_1MB=$[0x100000 / $MTD_ERASE_SIZE]
+ MTD_BLOCK_CNT=$(awk "BEGIN { print $MTD_SIZE_MB * $BLOCK_CNT_1MB }")
+ BEB_RESERVE_CNT=$(awk "BEGIN { print int($BEB_RESERVE_LIMIT * $MTD_BLOCK_CNT / 1024) }")
+ if [ $BEB_RESERVE_CNT -lt 2 ]; then
+ BEB_RESERVE_CNT=2
+ fi
+ MAX_LEB_CNT=$[$MTD_BLOCK_CNT - $BEB_RESERVE_CNT - 4]
+ if [ $MTD_SUBPAGE_SIZE -lt $MTD_PAGE_SIZE ]; then
+ LEB_SIZE=$[$MTD_ERASE_SIZE - $MTD_PAGE_SIZE]
+ else
+ LEB_SIZE=$[$MTD_ERASE_SIZE - $MTD_PAGE_SIZE - $MTD_PAGE_SIZE]
+ fi
+ LEB_SIZE_KB=$[$LEB_SIZE / 1024]
+ VOL_SIZE_KB=$[$LEB_SIZE_KB * $MAX_LEB_CNT]
+ VOL_SIZE_MB0=$(awk "BEGIN { print $VOL_SIZE_KB / 1024 }")
+ VOL_SIZE_MB=$(awk "BEGIN { print int($VOL_SIZE_KB / 1024) }")
+
+ echo "$MTD_NAME MKUBIFS_ARGS=\"-m $MTD_PAGE_SIZE -e $LEB_SIZE -c $MAX_LEB_CNT -x zlib -F\""
+ echo "$MTD_NAME UBINIZE_ARGS=\"-m $MTD_PAGE_SIZE -p $MTD_ERASE_SIZE -s $MTD_SUBPAGE_SIZE\""
+ #echo "$MTD_NAME vol_size=\"${VOL_SIZE_MB}MiB\""
+}
+
+echo "generate $INPUT_MTD_SIZE MB parameter"
+gen_mtd_para ubifs $INPUT_MTD_SIZE
+
diff --git a/allbins/tools/mkfs_sh/readme.txt b/allbins/tools/mkfs_sh/readme.txt
index ed531f9..8ce613a 100755
--- a/allbins/tools/mkfs_sh/readme.txt
+++ b/allbins/tools/mkfs_sh/readme.txt
@@ -23,11 +23,18 @@
oem重新打包类似。若开启selinux，需要提供selinux context文件。
-4、ubifs打包示例
-编辑ubifs_demo.sh，检查下面参数配置
+4、ubifs cfg打包示例
+编辑ubifs_from_cfg_demo.sh，检查下面参数配置
UBI_ARGS为nandflash UBI参数配置。参考oemdata-ubi-default.cfg配置自己的cfg文件。
-bash ubifs_demo.sh cap_oemdata.img oemdata-ubi-default.cfg
+bash ubifs_from_cfg_demo.sh cap_oemdata.img oemdata-ubi-default.cfg
cap_oemdata.img为输出文件，oemdata-ubi-default.cfg为配置文件。
特殊注明：避免将一个目录打包成ubifs镜像，否则需要mkfs.ubifs命令，并且要计算max leb count值，这样就会和很多参数耦合，也不利于ubifs异常恢复。
ubifs的预置文件可以放到squashfs文件系统里，第一次启动的时候拷贝到ubifs里。
+5、ubifs 目录打包示例
+编辑gen_ubi_para.sh，检查里面的下面参数MTD_ERASE_SIZE、MTD_PAGE_SIZE和MTD_SUBPAGE_SIZE是否和flash参数一致。
+运行bash gen_ubi_para.sh 分区大小（单位MB），将所得的参数配置到ubifs_from_dir_demo.sh,包括UBIFS_ARGS和UBI_ARGS
+UBIFS_ARGS和UBI_ARGS参数除了数字参数之外，其他参数可以手动调整或者增加。比如调整压缩算法。
+运行 ubifs_from_dir_demo.sh 输出文件名 打包目录 分区名
+例如：bash ubifs_from_dir_demo.sh cap_oemdata.bin oemdata oemdata
+
diff --git a/allbins/tools/mkfs_sh/rootfs_mksqushfs_demo.sh b/allbins/tools/mkfs_sh/rootfs_mksqushfs_demo.sh
index 6403a6b..8ea67d1 100755
--- a/allbins/tools/mkfs_sh/rootfs_mksqushfs_demo.sh
+++ b/allbins/tools/mkfs_sh/rootfs_mksqushfs_demo.sh
@@ -56,6 +56,7 @@
echo "dm-verity fail"
exit -1
fi
+ cp -v ${VOL_NAME}.dm ${OUT_NAME}.dm
mv ${VOL_NAME}.dm ${VOL_NAME}.out
else
echo "disable dm-verity"
diff --git a/allbins/tools/mkfs_sh/ubifs_demo.sh b/allbins/tools/mkfs_sh/ubifs_from_cfg_demo.sh
similarity index 100%
rename from allbins/tools/mkfs_sh/ubifs_demo.sh
rename to allbins/tools/mkfs_sh/ubifs_from_cfg_demo.sh
diff --git a/allbins/tools/mkfs_sh/ubifs_from_dir_demo.sh b/allbins/tools/mkfs_sh/ubifs_from_dir_demo.sh
new file mode 100755
index 0000000..53edcf4
--- /dev/null
+++ b/allbins/tools/mkfs_sh/ubifs_from_dir_demo.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+WORKDIR=$PWD
+export PATH=$WORKDIR/bin:$PATH
+
+UBIFS_ARGS="-m 4096 -e 253952 -c 702 -x zlib -F"
+UBI_ARGS="-m 0x1000 -p 0x40000 -s 0x1000 -Q 1024"
+
+if [ $# -lt 3 ]; then
+ echo "[error] $0 parameter to less"
+ echo "$0 outfile dir_name mtd_name"
+ exit -1
+fi
+outfile=$1
+dir_name=$2
+vol_name=vol_$3
+cfg_file_name=${outfile}.cfg
+
+echo "outfile:$outfile"
+echo "dir_name:$dir_name"
+echo "vol_name:$vol_name"
+echo "UBIFS_ARGS:$UBIFS_ARGS"
+echo "UBI_ARGS:$UBI_ARGS"
+
+rm -fr ${outfile} ${outfile}.ubifs ${outfile}.cfg
+
+mkfs.ubifs -r $dir_name $UBIFS_ARGS -o ${outfile}.ubifs
+if [ $? -ne 0 ]; then
+ echo "mkfs.ubifs error"
+ exit -1
+else
+ echo "mkfs.ubifs ok"
+fi
+
+filesize="$(stat -c%s ${outfile}.ubifs)"
+
+echo "[ubifs]" > $cfg_file_name
+echo "mode=ubi" >> $cfg_file_name
+echo "image=${outfile}.ubifs" >> $cfg_file_name
+echo "vol_id=0" >> $cfg_file_name
+echo "vol_size=${filesize}" >> $cfg_file_name
+echo "vol_type=dynamic" >> $cfg_file_name
+echo "vol_name=${vol_name}" >> $cfg_file_name
+echo "vol_flags=autoresize" >> $cfg_file_name
+
+#cat $cfg_file_name
+
+./ubinize-cfg.sh $outfile $cfg_file_name "$UBI_ARGS"
diff --git a/allbins/zx297520v3/prj_evb/nv/Ref_nvrw_0x26C00.bin b/allbins/zx297520v3/prj_evb/nv/Ref_nvrw_0x26C00.bin
index 116a803..2e6c39f 100755
--- a/allbins/zx297520v3/prj_evb/nv/Ref_nvrw_0x26C00.bin
+++ b/allbins/zx297520v3/prj_evb/nv/Ref_nvrw_0x26C00.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_evb/nv/config/PHY/PhyConfigTable.xlsx b/allbins/zx297520v3/prj_evb/nv/config/PHY/PhyConfigTable.xlsx
index 91fd081..e58d1d1 100755
--- a/allbins/zx297520v3/prj_evb/nv/config/PHY/PhyConfigTable.xlsx
+++ b/allbins/zx297520v3/prj_evb/nv/config/PHY/PhyConfigTable.xlsx
Binary files differ
diff --git "a/allbins/zx297520v3/prj_evb/nv/config/\345\236\213\345\217\267\346\234\272/AT\345\217\202\346\225\260\350\256\276\347\275\256.xml" "b/allbins/zx297520v3/prj_evb/nv/config/\345\236\213\345\217\267\346\234\272/AT\345\217\202\346\225\260\350\256\276\347\275\256.xml"
index 33c7b4a..fba0119 100755
--- "a/allbins/zx297520v3/prj_evb/nv/config/\345\236\213\345\217\267\346\234\272/AT\345\217\202\346\225\260\350\256\276\347\275\256.xml"
+++ "b/allbins/zx297520v3/prj_evb/nv/config/\345\236\213\345\217\267\346\234\272/AT\345\217\202\346\225\260\350\256\276\347\275\256.xml"
@@ -66,4 +66,8 @@
<NVPARAM name="OOSÃÅÏÞÖµ" UIType="text" type="number" value="0" minivalue="0" maxvalue="60" path="T_CommAtSetting.OosThresh" ParamDetail="È¡Öµ·¶Î§0-60£¬ÆäÖÐ0¶ÔÓ¦-20db,1¶ÔÓ¦-19db£¬2¶ÔÓ¦-18db£¬ÒÔ´ËÀàÍÆ60¶ÔÓ¦40db" />
<NVPARAM name="¹ÂµºÃÅÏÞÊÇ·ñÆôÓÃ" UIType="combobox" type="enum" select="¹Ø±Õ:0;´ò¿ª:1" value="" path="T_CommAtSetting.IslandThreshFlg" ParamDetail="" />
<NVPARAM name="¹ÂµºÃÅÏÞÖµ" UIType="text" type="number" value="0" minivalue="0" maxvalue="60" path="T_CommAtSetting.IslandThresh" ParamDetail="È¡Öµ·¶Î§0-60£¬ÆäÖÐ0¶ÔÓ¦-20db,1¶ÔÓ¦-19db£¬2¶ÔÓ¦-18db£¬ÒÔ´ËÀàÍÆ60¶ÔÓ¦40db" />
+ <NVPARAM name="×Ô¶¯ËÑÍøÑ¡ÔñRPLMN¹æÔò" UIType="combobox" type="enum" select="µ±Ê¹ÓÃRPLMN½øÐÐפÁôʱ£¬¿¨ÖÐRPLMNºÍNVÖÐRPLMN²»ÊDZØÐëÒ»ÖµÄ:0;RPLMNºÍNVÖÐRPLMNÒ»ÖÂʱ²ÅʹÓÃRPLMN½øÐÐפÁô£¬·ñÔòʹÓÃHPLMN:1" value="" path="T_CommAtSetting.wNasBitmap_bit1" ParamDetail="" />
+ <NVPARAM name="ÍøÂç¾Ü¾øºóUE×Ô¶¯»Ö¸´¶¨Ê±Æ÷ÊÇ·ñÆô¶¯" UIType="combobox" type="enum" select="Æô¶¯£¬¶¨Ê±Æ÷³¬Ê±ºó£¬½«É¾³ý½ûÖ¹ÁÐ±í£¬»Ö¸´¿¨×´Ì¬:0;²»Æô¶¯:1" value="" path="T_CommAtSetting.wNasBitmap_bit2" ParamDetail="" />
+ <NVPARAM name="PDN±»ÍøÂç#33ÔÒò¾Ü¾øºóÊÇ·ñÔÊÐíÔٴη¢Æð" UIType="combobox" type="enum" select="PDNÇëÇó±»ÍøÂç#33ÔÒò¾Ü¾øºóÔÊÐíÔٴη¢ÆðÏàͬµÄPDNÇëÇó:0;PDNÇëÇó±»ÍøÂç#33ÔÒò¾Ü¾øºó£¬ÏàͬAPNµÄPDNÇëÇ󽫲»»áÔٴη¢Æð£¬Ö±µ½ÖØÆô»òÕß»»¿¨:1" value="" path="T_CommAtSetting.wNasBitmap_bit3" ParamDetail="" />
+ <NVPARAM name="·ñ°áǨattach cidÉÏPDNÉÏÏÂÎĵ½Ð·¢ÆðµÄPDNÉÏ" UIType="combobox" type="enum" select="Ö»ÓÐattach cid´óÓÚ1ʱ²Å½øÐаáǨ:0;ÎÞÂÛattach cidÊÇ·ñ´óÓÚ1¶¼½øÐаáǨ:1" value="" path="T_CommAtSetting.wNasBitmap_bit4" ParamDetail="·¢ÆðPDNÇëÇóʱ£¬Èç¹ûAPNÓëattach cidÉϵÄPDN APNÏàͬʱ£¬ÊÇ·ñ°áǨattach cidÉÏPDNÉÏÏÂÎĵ½Ð·¢ÆðµÄPDNÉÏ" />
</FUNCTION>
diff --git "a/allbins/zx297520v3/prj_evb/nv/config/\345\236\213\345\217\267\346\234\272/\347\237\255\344\277\241\345\255\230\345\202\250\344\275\215\347\275\256.xml" "b/allbins/zx297520v3/prj_evb/nv/config/\345\236\213\345\217\267\346\234\272/\347\237\255\344\277\241\345\255\230\345\202\250\344\275\215\347\275\256.xml"
index 6085f07..b2adb50 100755
--- "a/allbins/zx297520v3/prj_evb/nv/config/\345\236\213\345\217\267\346\234\272/\347\237\255\344\277\241\345\255\230\345\202\250\344\275\215\347\275\256.xml"
+++ "b/allbins/zx297520v3/prj_evb/nv/config/\345\236\213\345\217\267\346\234\272/\347\237\255\344\277\241\345\255\230\345\202\250\344\275\215\347\275\256.xml"
@@ -4,4 +4,5 @@
<NVPARAM name="+CMSS/+CMGW´æ´¢Çø" UIType="combobox" type="enum" select="BM:0;ME:1;SM:3;SR:5;" value="BM" path="T_zDev_NV_PsData_Pri.tUserInfo.tSmsMemInfo[0].bMem2" ParamDetail="CMSS/CMGW´æ´¢Çø" />
<NVPARAM name="±£´æÐÂÏûÏ¢´æ´¢Çø" UIType="combobox" type="enum" select="BM:0;ME:1;SM:3;SR:5;" value="BM" path="T_zDev_NV_PsData_Pri.tUserInfo.tSmsMemInfo[0].bMem3" ParamDetail="" />
<NVPARAM name="¶ÌÐÅģʽ" UIType="combobox" type="enum" select="PDUģʽ:0;Îı¾Ä£Ê½:1;" value="PDUģʽ" path="T_zDev_NV_PsData_Pri.tUserInfo.tCmgfMode.bCmgfMode" ParamDetail="" />
+ <NVPARAM name="ÊÇ·ñĬÈÏ´ò¿ª+ZMMIÉϱ¨" UIType="combobox" type="enum" select="¹Ø±Õ:0;´ò¿ª:1;" value="" path="T_zDev_NV_PsData_Pri.tUserInfo.tNitzCfg.bZmmiSet" ParamDetail="" />
</FUNCTION>
diff --git "a/allbins/zx297520v3/prj_evb/nv/config/\351\251\261\345\212\250/\351\251\261\345\212\250.xml" "b/allbins/zx297520v3/prj_evb/nv/config/\351\251\261\345\212\250/\351\251\261\345\212\250.xml"
index 85b1c28..340ca08 100755
--- "a/allbins/zx297520v3/prj_evb/nv/config/\351\251\261\345\212\250/\351\251\261\345\212\250.xml"
+++ "b/allbins/zx297520v3/prj_evb/nv/config/\351\251\261\345\212\250/\351\251\261\345\212\250.xml"
@@ -61,4 +61,5 @@
<NVPARAM name="SIM1Çл»µ½Ä£Ê½" UIType="combobox" type="enum" select="SOFTSIM_CARD:5;CLOUD_CARD:4;UICC_ESIM_CARD:3;UICC_VSIM_AUTO:2;VSIM_CARD:1;UICC_CARD:0" value="" path="T_ZDrv_NvData.sysData.uicc1modeSwitch" ParamDetail="" />
<NVPARAM name="SIM1ÉÏ´Îģʽ" UIType="combobox" type="enum" select="SOFTSIM_CARD:5;CLOUD_CARD:4;UICC_ESIM_CARD:3;UICC_VSIM_AUTO:2;VSIM_CARD:1;UICC_CARD:0" value="" path="T_ZDrv_NvData.sysData.uicc1PreSwitch" ParamDetail="" />
<NVPARAM name="AdcRFdÊÇ·ñÆôÓñêÖ¾" UIType="text" type="number" value="" minivalue="0" maxvalue="255" path="T_ZDrv_NvData.sysData.tsc_config.AdcRFd_En" ParamDetail="0~0xff" />
+ <NVPARAM name="ÊÇ·ñ²»Ö§³ÖSIM¿¨ÈȲå°Î" UIType="combobox" type="enum" select="Ö§³Ö:1;²»Ö§³Ö:0" value="" path="T_ZDrv_NvData.sysData.ishpnotsupported" ParamDetail="" />
</FUNCTION>
diff --git a/allbins/zx297520v3/prj_evb/nv/nv.xml b/allbins/zx297520v3/prj_evb/nv/nv.xml
index 37491d6..55f5f1f 100755
--- a/allbins/zx297520v3/prj_evb/nv/nv.xml
+++ b/allbins/zx297520v3/prj_evb/nv/nv.xml
@@ -2914,6 +2914,17 @@
<child kind="struct" type="IInternetHostSecurityManagerVtbl" />
</child>
</TypeDefine>
+ <TypeDefine name="T_zMmiaUmm_Cause_Ind" kind="struct" len="8">
+ <child offset="0" name="bSrcIndex" kind="BaseType" type="BYTE" />
+ <child offset="1" name="bDesIndex" kind="BaseType" type="BYTE" />
+ <child offset="2" name="abPadding" kind="array" num="2">
+ <child kind="BaseType" type="BYTE" />
+ </child>
+ <child offset="4" name="bModType" kind="BaseType" type="BYTE" />
+ <child offset="5" name="bAct" kind="BaseType" type="BYTE" />
+ <child offset="6" name="bDomain" kind="BaseType" type="BYTE" />
+ <child offset="7" name="bCause" kind="BaseType" type="BYTE" />
+ </TypeDefine>
<TypeDefine name="T_z_UiccId_EccInfo" kind="struct" len="8">
<child offset="0" name="bEccNum" kind="BaseType" type="BYTE" />
<child offset="1" name="abPadding" kind="array" num="3">
@@ -7019,9 +7030,8 @@
<TypeDefine name="T_zDev_NV_NitzCfg" kind="struct" len="4">
<child offset="0" name="bOnOff" kind="BaseType" type="BYTE" />
<child offset="1" name="bRptMod" kind="BaseType" type="BYTE" />
- <child offset="2" name="abPadding" kind="array" num="2">
- <child kind="BaseType" type="BYTE" />
- </child>
+ <child offset="2" name="bZmmiSet" kind="BaseType" type="BYTE" />
+ <child offset="3" name="bPadding" kind="BaseType" type="BYTE" />
</TypeDefine>
<TypeDefine name="T_zEm_Td_EmInfo_Ind" kind="struct" len="3180">
<child offset="0" name="tScellPara" kind="struct" type="T_zEm_Td_SCellPara" />
@@ -9892,7 +9902,8 @@
</child>
<child offset="5224" name="tEcallCapa" kind="struct" type="T_zDev_NV_EcallCapa" />
<child offset="5228" name="tEcallNum" kind="struct" type="T_zDev_NV_EcallNum" />
- <child offset="5252" name="abpaddingSetInfo" kind="array" num="1256">
+ <child offset="5252" name="tEcallTime" kind="struct" type="T_zDev_NV_EcallTime" />
+ <child offset="5260" name="abpaddingSetInfo" kind="array" num="1248">
<child kind="BaseType" type="BYTE" />
</child>
</TypeDefine>
@@ -10129,6 +10140,14 @@
<child kind="BaseType" type="BYTE" />
</child>
</TypeDefine>
+ <TypeDefine name="T_zDev_NV_EcallTime" kind="struct" len="8">
+ <child offset="0" name="wT2Time" kind="BaseType" type="WORD" />
+ <child offset="2" name="wT7Time" kind="BaseType" type="WORD" />
+ <child offset="4" name="wT9Time" kind="BaseType" type="WORD" />
+ <child offset="6" name="abPadding" kind="array" num="2">
+ <child kind="BaseType" type="BYTE" />
+ </child>
+ </TypeDefine>
<TypeDefine name="T_zApMmia_PbTpmrUpdate_Req" kind="struct" len="8">
<child offset="0" name="bSrcIndex" kind="BaseType" type="BYTE" />
<child offset="1" name="bDesIndex" kind="BaseType" type="BYTE" />
@@ -14382,7 +14401,11 @@
<child offset="803" name="bOosScanThreshFlg" kind="BaseType" type="BYTE" />
<child offset="804" name="bOosScanThresh" kind="BaseType" type="BYTE" />
<child offset="805" name="bEcallFlg" kind="BaseType" type="BYTE" />
- <child offset="806" name="wNasBitmap" kind="BaseType" type="WORD" />
+ <child offset="806" name="wNasBitmap_bit0" kind="BITS" start="0" len="1" type="WORD" />
+ <child offset="806" name="wNasBitmap_bit1" kind="BITS" start="1" len="1" type="WORD" />
+ <child offset="806" name="wNasBitmap_bit2" kind="BITS" start="2" len="1" type="WORD" />
+ <child offset="806" name="wNasBitmap_bit3" kind="BITS" start="3" len="1" type="WORD" />
+ <child offset="806" name="wNasBitmap_bit4" kind="BITS" start="4" len="1" type="WORD" />
</TypeDefine>
<TypeDefine name="tagMCI_ANIM_WINDOW_PARMSA" kind="struct" len="16">
<child offset="0" name="dwCallback" kind="BaseType" type="DWORD" />
@@ -18793,9 +18816,8 @@
</child>
<child offset="64" name="bRoamNetSerch" kind="BaseType" type="BYTE" />
<child offset="65" name="bCecnSet" kind="BaseType" type="BYTE" />
- <child offset="66" name="abPadding2" kind="array" num="2">
- <child kind="BaseType" type="BYTE" />
- </child>
+ <child offset="66" name="bCauseIndSet" kind="BaseType" type="BYTE" />
+ <child offset="67" name="bPadding3" kind="BaseType" type="BYTE" />
</TypeDefine>
<TypeDefine name="T_ZOss_Mon_Thread" kind="struct" len="8">
<child offset="0" name="num" kind="BaseType" type="DWORD" />
@@ -20575,6 +20597,14 @@
<child kind="BaseType" type="DWORD" />
</child>
</TypeDefine>
+ <TypeDefine name="T_zAti_NV_EcallTime" kind="struct" len="8">
+ <child offset="0" name="wT2Time" kind="BaseType" type="WORD" />
+ <child offset="2" name="wT7Time" kind="BaseType" type="WORD" />
+ <child offset="4" name="wT9Time" kind="BaseType" type="WORD" />
+ <child offset="6" name="abPadding" kind="array" num="2">
+ <child kind="BaseType" type="BYTE" />
+ </child>
+ </TypeDefine>
<TypeDefine name="T_ZOss_Mon_Version" kind="struct" len="4">
<child offset="0" name="version" kind="pointer" type="char" />
</TypeDefine>
@@ -22898,7 +22928,8 @@
<child offset="125" name="uiccPreSwitch" kind="BaseType" type="BYTE" />
<child offset="126" name="uicc1modeSwitch" kind="BaseType" type="BYTE" />
<child offset="127" name="uicc1PreSwitch" kind="BaseType" type="BYTE" />
- <child offset="128" name="reserved" kind="array" num="2944">
+ <child offset="128" name="ishpnotsupported" kind="BaseType" type="BYTE" />
+ <child offset="129" name="reserved" kind="array" num="2943">
<child kind="BaseType" type="BYTE" />
</child>
</TypeDefine>
@@ -24734,9 +24765,8 @@
<TypeDefine name="T_zAti_NV_NitzCfg" kind="struct" len="4">
<child offset="0" name="bOnOff" kind="BaseType" type="BYTE" />
<child offset="1" name="bRptMod" kind="BaseType" type="BYTE" />
- <child offset="2" name="abPadding" kind="array" num="2">
- <child kind="BaseType" type="BYTE" />
- </child>
+ <child offset="2" name="bZmmiSet" kind="BaseType" type="BYTE" />
+ <child offset="3" name="bPadding" kind="BaseType" type="BYTE" />
</TypeDefine>
<TypeDefine name="IUrlMon" kind="struct" len="4">
<child offset="0" name="lpVtbl" kind="pointer">
@@ -26237,6 +26267,16 @@
<child kind="struct" type="HBITMAP__" />
</child>
</TypeDefine>
+ <TypeDefine name="T_zMmiaCc_ECallWorkStateInd" kind="struct" len="8">
+ <child offset="0" name="bSrcIndex" kind="BaseType" type="BYTE" />
+ <child offset="1" name="bDesIndex" kind="BaseType" type="BYTE" />
+ <child offset="2" name="bCallId" kind="BaseType" type="BYTE" />
+ <child offset="3" name="bDir" kind="BaseType" type="BYTE" />
+ <child offset="4" name="bECallState" kind="BaseType" type="BYTE" />
+ <child offset="5" name="abpadding" kind="array" num="3">
+ <child kind="BaseType" type="BYTE" />
+ </child>
+ </TypeDefine>
<TypeDefine name="T_ZOss_Mon_Timer" kind="struct" len="8">
<child offset="0" name="num" kind="BaseType" type="DWORD" />
<child offset="4" name="ele" kind="pointer">
diff --git a/allbins/zx297520v3/prj_evb/nv_230a/Ref_nvrw_0x26C00.bin b/allbins/zx297520v3/prj_evb/nv_230a/Ref_nvrw_0x26C00.bin
index e98e60e..59e7f24 100755
--- a/allbins/zx297520v3/prj_evb/nv_230a/Ref_nvrw_0x26C00.bin
+++ b/allbins/zx297520v3/prj_evb/nv_230a/Ref_nvrw_0x26C00.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_evb/nv_230a/config/PHY/PhyConfigTable.xlsx b/allbins/zx297520v3/prj_evb/nv_230a/config/PHY/PhyConfigTable.xlsx
index a72eaa9..d48fba4 100755
--- a/allbins/zx297520v3/prj_evb/nv_230a/config/PHY/PhyConfigTable.xlsx
+++ b/allbins/zx297520v3/prj_evb/nv_230a/config/PHY/PhyConfigTable.xlsx
Binary files differ
diff --git a/allbins/zx297520v3/prj_evb/nv_230a/psPriData_nvrw_0x00002000.bin b/allbins/zx297520v3/prj_evb/nv_230a/psPriData_nvrw_0x00002000.bin
index f1860ee..4284bf6 100755
--- a/allbins/zx297520v3/prj_evb/nv_230a/psPriData_nvrw_0x00002000.bin
+++ b/allbins/zx297520v3/prj_evb/nv_230a/psPriData_nvrw_0x00002000.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_evb/nv_230a_dcxo/Ref_nvrw_0x26C00.bin b/allbins/zx297520v3/prj_evb/nv_230a_dcxo/Ref_nvrw_0x26C00.bin
index e98e60e..59e7f24 100755
--- a/allbins/zx297520v3/prj_evb/nv_230a_dcxo/Ref_nvrw_0x26C00.bin
+++ b/allbins/zx297520v3/prj_evb/nv_230a_dcxo/Ref_nvrw_0x26C00.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_vehicle/nv/Ref_nvrw_0x26C00.bin b/allbins/zx297520v3/prj_vehicle/nv/Ref_nvrw_0x26C00.bin
index 3708589..12d94f9 100755
--- a/allbins/zx297520v3/prj_vehicle/nv/Ref_nvrw_0x26C00.bin
+++ b/allbins/zx297520v3/prj_vehicle/nv/Ref_nvrw_0x26C00.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_vehicle/nv/drv_nvrw_0x00012000.bin b/allbins/zx297520v3/prj_vehicle/nv/drv_nvrw_0x00012000.bin
index dd216a4..856876c 100755
--- a/allbins/zx297520v3/prj_vehicle/nv/drv_nvrw_0x00012000.bin
+++ b/allbins/zx297520v3/prj_vehicle/nv/drv_nvrw_0x00012000.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_vehicle/nv/flags.bin b/allbins/zx297520v3/prj_vehicle/nv/flags.bin
index bc004de..a60584b 100755
--- a/allbins/zx297520v3/prj_vehicle/nv/flags.bin
+++ b/allbins/zx297520v3/prj_vehicle/nv/flags.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_vehicle/nv_dc/Ref_nvrw_0x26C00.bin b/allbins/zx297520v3/prj_vehicle/nv_dc/Ref_nvrw_0x26C00.bin
index fae0f38..fd77e52 100755
--- a/allbins/zx297520v3/prj_vehicle/nv_dc/Ref_nvrw_0x26C00.bin
+++ b/allbins/zx297520v3/prj_vehicle/nv_dc/Ref_nvrw_0x26C00.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_vehicle/nv_dc_4Gb/Ref_nvrw_0x26C00.bin b/allbins/zx297520v3/prj_vehicle/nv_dc_4Gb/Ref_nvrw_0x26C00.bin
index 4ec459d..a4da08a 100755
--- a/allbins/zx297520v3/prj_vehicle/nv_dc_4Gb/Ref_nvrw_0x26C00.bin
+++ b/allbins/zx297520v3/prj_vehicle/nv_dc_4Gb/Ref_nvrw_0x26C00.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_vehicle/nv_dc_ref/Ref_nvrw_0x26C00.bin b/allbins/zx297520v3/prj_vehicle/nv_dc_ref/Ref_nvrw_0x26C00.bin
index e9f1e3f..d2006b5 100755
--- a/allbins/zx297520v3/prj_vehicle/nv_dc_ref/Ref_nvrw_0x26C00.bin
+++ b/allbins/zx297520v3/prj_vehicle/nv_dc_ref/Ref_nvrw_0x26C00.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_vehicle/nv_dc_systemd/Ref_nvrw_0x26C00.bin b/allbins/zx297520v3/prj_vehicle/nv_dc_systemd/Ref_nvrw_0x26C00.bin
index ff4d4b3..c550d31 100755
--- a/allbins/zx297520v3/prj_vehicle/nv_dc_systemd/Ref_nvrw_0x26C00.bin
+++ b/allbins/zx297520v3/prj_vehicle/nv_dc_systemd/Ref_nvrw_0x26C00.bin
Binary files differ