Merge "[Bugfix][T106BUG-439]Customer chooses phy c22/c45 issues on"
diff --git a/ap/app/zte_mdl/zte_mdl.c b/ap/app/zte_mdl/zte_mdl.c
index 1142fb0..e3d50ce 100755
--- a/ap/app/zte_mdl/zte_mdl.c
+++ b/ap/app/zte_mdl/zte_mdl.c
@@ -88,7 +88,9 @@
}
void wlan_entry(char *arg)
{
+#if (defined _USE_VEHICLE_DC_REF)&&(defined _USE_VEHICLE_DC_REF_MMC0) //jb.qi add for wifi config on 20240301
wlan_main(0,NULL);
+#endif
return;
}
void fota_dm_entry(char *arg)
diff --git a/ap/build/libps_libs.mk b/ap/build/libps_libs.mk
index 1283364..3d23159 100755
--- a/ap/build/libps_libs.mk
+++ b/ap/build/libps_libs.mk
@@ -135,6 +135,9 @@
ifeq ($(USE_VEHICLE_DC_REF),yes)
KERNEL_EXT_CFLAGS += -D_USE_VEHICLE_DC_REF
+#jb.qi add for wifi config on 20240301 start
+#KERNEL_EXT_CFLAGS += -D_USE_VEHICLE_DC_REF_MMC0
+#jb.qi add for wifi config on 20240301 end
endif
KERNEL_EXT_CFLAGS += -DDDR_BASE_ADDR_LINUX_VA
@@ -177,4 +180,4 @@
ifeq ($(ALSA_CODEC_IN_CAP),yes)
KERNEL_EXT_CFLAGS += -D_ALSA_CODEC_IN_CAP
-endif
\ No newline at end of file
+endif
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_mm.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_mm.c
index 7bbbb3f..84375d3 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_mm.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_mm.c
@@ -1501,7 +1501,12 @@
err = at_send_command_singleline("AT+ZEMSCIQ?", "+ZEMSCIQ:", &p_response);
if (err < 0 || p_response->success == 0) {
- RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
+ //xy.he add for T106BUG-545 start
+ if(NULL!=t)
+ {
+ RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
+ }
+ //xy.he add for T106BUG-545 end
at_response_free(p_response);
return;
}
diff --git a/update_version.sh b/update_version.sh
index 74d4cf2..718b937 100755
--- a/update_version.sh
+++ b/update_version.sh
@@ -1,8 +1,8 @@
#!/bin/bash
#export LYNQ_VERSION="T106_lynq_version_ap_build_sh"
-LYNQ_AP_VERSION="T106-ZS03.V2.01.01.02P54U03.AP.11.00"
-LYNQ_CAP_INSIDE_VERSION="CAP.11.00"
-LYNQ_CAP_VERSION="CAP.11.00"
+LYNQ_AP_VERSION="T106-V2.01.01.02P54U03.AP.11.01"
+LYNQ_CAP_INSIDE_VERSION="CAP.11.01"
+LYNQ_CAP_VERSION="CAP.11.01"
COMMIT_ID="$(git rev-parse HEAD)"
LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"${LYNQ_AP_VERSION}_${LYNQ_CAP_INSIDE_VERSION}\""