Merge "[Feature][T106]version update to T106-V2.01.01.02P56U06.AP.15.14_CAP.15.14"
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/lynq-autosuspend.bb b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/lynq-autosuspend.bb
index a3df67f..f4e38fc 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/lynq-autosuspend.bb
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/lynq-autosuspend.bb
@@ -1,68 +1,48 @@
inherit externalsrc package systemd
DESCRIPTION = "autosuspend.service"
+LICENSE = "CLOSED"
-LICENSE = "MobileTekProprietary"
LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=44d8d2b6296ca24bcd4894bb7155bf27"
+DEPENDS += "${@bb.utils.contains('TARGET_PLATFORM', 'mt2735', 'audio-mixer-ctrl streamer1.0', '', d)} liblynq-log liblynq-uci libbsp libsctel libatutils libatreg liblynq-sim"
-SRC_URI = "file://autosuspend.c file://LICENSE \
- file://autosuspend.h \
- file://autosuspend_ops.h \
- file://autosuspend_wakeup_count.c \
- file://main.c \
- file://autosuspend.service \
- file://lynq-autosuspend.sh \
- file://makefile \
-"
-
+WORKONSRC = "${TOPDIR}/../src/lynq/framework/lynq-autosuspend"
+FILESEXTRAPATHS_prepend :="${TOPDIR}/../src/lynq/framework/:"
+SRC_URI = " \
+ file://lynq-autosuspend \
+ "
+SRC-DIR = "${S}/../lynq-autosuspend"
EXTRA_OEMAKE = "'TARGET_PLATFORM = ${TARGET_PLATFORM}'"
TARGET_CC_ARCH += "${LDFLAGS}"
-
-LOCAL_C_INCLUDES = "-I. "
-
-DEPENDS = "liblynq-log liblynq-uci"
-DEPENDS += "${@bb.utils.contains('TARGET_PLATFORM', 'mt2735', 'audio-mixer-ctrl streamer1.0', '', d)} liblynq-log liblynq-uci libbsp libsctel libatutils libatreg liblynq-sim"
-LOCAL_LIBS = "-L. -ldl -lstdc++ -lpthread -llog"
-SOURCES = "$(wildcard *.c )"
-
-OBJECTS = "$(SOURCES:.c=.o)"
-
-EXECUTABLE = "autosuspend"
-S = "${WORKDIR}"
-TARGET_CC_ARCH += "${LDFLAGS}"
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "autosuspend.service"
FILES_${PN} += "${systemd_unitdir}/system/autosuspend.service"
+
#INHIBIT_PACKAGE_STRIP = "1"
do_compile () {
#${CXX} -Wall ${LOCAL_C_INCLUDES} autosuspend.c autosuspend_wakeup_count.c main.c ${LOCAL_LIBS} -o ${EXECUTABLE}
if test "${PACKAGE_ARCH}" = "cortexa7hf-vfp-vfpv4-neon" || test "${PACKAGE_ARCH}" = "cortexa7hf-neon-vfpv4"; then
- oe_runmake all ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST} -mhard-float"
+ oe_runmake all -C ${SRC-DIR} ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST} -mhard-float"
else
- oe_runmake all ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST}"
+ oe_runmake all -C ${SRC-DIR} ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST}"
fi
}
do_install() {
install -d ${D}${bindir}/
- echo "Installing image PN ${PN}"
- echo "Installing image systemd_unitdir ${systemd_unitdir}"
- echo "Installing image D ${D}"
- echo "Installing image B ${B}"
+ install -m 0755 ${SRC-DIR}/autosuspend ${D}${bindir}/
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${B}/autosuspend.service ${D}${systemd_unitdir}/system
- else
+ else
install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${S}/lynq-autosuspend.sh ${D}${sysconfdir}/init.d/
- install -d ${D}${sysconfdir}/rcS.d
- ln -s ../init.d/lynq-autosuspend.sh ${D}${sysconfdir}/rcS.d/S82lynq-autosuspend-service
+ install -m 0755 ${SRC-DIR}/lynq-autosuspend.sh ${D}${sysconfdir}/init.d/
+ install -d ${D}${sysconfdir}/rcS.d
+ ln -s ../init.d/lynq-autosuspend.sh ${D}${sysconfdir}/rcS.d/S82lynq-autosuspend-service
fi
- install -m 0755 ${S}/autosuspend ${D}${bindir}/
- install -d ${D}${includedir}
}
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/lynq-fota-backup.bb b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/lynq-fota-backup.bb
index b89f7ab..89ed7f6 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/lynq-fota-backup.bb
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/lynq-fota-backup.bb
@@ -2,31 +2,28 @@
DESCRIPTION = "lynq-fota-backup.service"
-LICENSE = "MIT"
+LICENSE = "CLOSED"
##License checksum file is always required
LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=c794e8ff1acd3b7f156a6497e780dd54"
-SRC_URI = "file://lynq-fota-backup.cpp \
- file://lynq-fota-backup.sh \
- file://makefile \
- file://lynq-fota-backup.service \
- file://LICENSE \
-"
+WORKONSRC = "${TOPDIR}/../src/lynq/framework/lynq-fota-backup"
-
+FILESEXTRAPATHS_prepend :="${TOPDIR}/../src/lynq/framework/:"
+SRC_URI = " \
+ file://lynq-fota-backup \
+ "
+SRC-DIR = "${S}/../lynq-fota-backup"
TARGET_CC_ARCH += "${LDFLAGS}"
-
-
DEPENDS += "liblynq-log liblynq-uci liblynq-qser-fota"
-S = "${WORKDIR}"
+
#INHIBIT_PACKAGE_STRIP = "1"
do_compile () {
if test "${PACKAGE_ARCH}" = "cortexa7hf-vfp-vfpv4-neon" || test "${PACKAGE_ARCH}" = "cortexa7hf-neon-vfpv4"; then
- oe_runmake all ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST} -mhard-float"
+ oe_runmake all -C ${SRC-DIR} ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST} -mhard-float"
else
- oe_runmake all ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST}"
+ oe_runmake all -C ${SRC-DIR} ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST}"
fi
}
#INHIBIT_PACKAGE_STRIP = "1"
@@ -34,21 +31,16 @@
do_install() {
install -d ${D}${bindir}/
- echo "Installing image PN ${PN}"
- echo "Installing image systemd_unitdir ${systemd_unitdir}"
- echo "Installing image D ${D}"
- echo "Installing image B ${B}"
+ install -m 0755 ${SRC-DIR}/lynq-fota-backup ${D}${bindir}/
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${B}/lynq-fota-backup.service ${D}${systemd_unitdir}/system
else
install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${S}/lynq-fota-backup.sh ${D}${sysconfdir}/init.d/
+ install -m 0755 ${SRC-DIR}/lynq-fota-backup.sh ${D}${sysconfdir}/init.d/
install -d ${D}${sysconfdir}/rcS.d
ln -s ../init.d/lynq-fota-backup.sh ${D}${sysconfdir}/rcS.d/S82lynq-fota-backup-service
fi
- install -m 0755 ${S}/lynq-fota-backup ${D}${bindir}/
- install -d ${D}${includedir}
}
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-qser-voice-demo/files/lynq-qser-voice-demo.cpp b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-qser-voice-demo/files/lynq-qser-voice-demo.cpp
index 41c5c97..1bfc7c2 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-qser-voice-demo/files/lynq-qser-voice-demo.cpp
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-qser-voice-demo/files/lynq-qser-voice-demo.cpp
@@ -349,8 +349,12 @@
case 7:
{
char PhoneNum[32] = {0};
- printf("please input test phone number: \n");
- scanf("%s", PhoneNum);
+ printf("please input test phone number(input null means \"\"): \n");
+ scanf("%s", PhoneNum);
+ if(0 == strcmp(PhoneNum, "null"))
+ {
+ PhoneNum[0]='\0';
+ }
ret = qser_voice_set_test_num(&h_voice, E_QSER_VOICE_ECALL_SET_NUMBER, PhoneNum, strlen(PhoneNum)+1);
printf("qser_voice_set_test_num ret = %d\n", ret);
break;
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc_ref-normal-defconfig b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc_ref-normal-defconfig
index ef22244..49e7188 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc_ref-normal-defconfig
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-kernel/linux/files/zx297520v3/linux-5_10-vehicle_dc_ref-normal-defconfig
@@ -156,7 +156,7 @@
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
-# CONFIG_SHMEM is not set
+CONFIG_SHMEM=y
CONFIG_AIO=y
CONFIG_IO_URING=y
CONFIG_ADVISE_SYSCALLS=y
@@ -2491,6 +2491,10 @@
# CONFIG_PROC_CHILDREN is not set
CONFIG_KERNFS=y
CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_MEMFD_CREATE=y
# CONFIG_CONFIGFS_FS is not set
# end of Pseudo filesystems
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/LICENSE b/cap/zx297520v3/src/lynq/framework/lynq-autosuspend/LICENSE
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/LICENSE
rename to cap/zx297520v3/src/lynq/framework/lynq-autosuspend/LICENSE
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/autosuspend.c b/cap/zx297520v3/src/lynq/framework/lynq-autosuspend/autosuspend.c
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/autosuspend.c
rename to cap/zx297520v3/src/lynq/framework/lynq-autosuspend/autosuspend.c
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/autosuspend.h b/cap/zx297520v3/src/lynq/framework/lynq-autosuspend/autosuspend.h
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/autosuspend.h
rename to cap/zx297520v3/src/lynq/framework/lynq-autosuspend/autosuspend.h
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/autosuspend.service b/cap/zx297520v3/src/lynq/framework/lynq-autosuspend/autosuspend.service
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/autosuspend.service
rename to cap/zx297520v3/src/lynq/framework/lynq-autosuspend/autosuspend.service
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/autosuspend_ops.h b/cap/zx297520v3/src/lynq/framework/lynq-autosuspend/autosuspend_ops.h
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/autosuspend_ops.h
rename to cap/zx297520v3/src/lynq/framework/lynq-autosuspend/autosuspend_ops.h
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/autosuspend_wakeup_count.c b/cap/zx297520v3/src/lynq/framework/lynq-autosuspend/autosuspend_wakeup_count.c
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/autosuspend_wakeup_count.c
rename to cap/zx297520v3/src/lynq/framework/lynq-autosuspend/autosuspend_wakeup_count.c
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/lynq-autosuspend.sh b/cap/zx297520v3/src/lynq/framework/lynq-autosuspend/lynq-autosuspend.sh
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/lynq-autosuspend.sh
rename to cap/zx297520v3/src/lynq/framework/lynq-autosuspend/lynq-autosuspend.sh
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/main.c b/cap/zx297520v3/src/lynq/framework/lynq-autosuspend/main.c
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/main.c
rename to cap/zx297520v3/src/lynq/framework/lynq-autosuspend/main.c
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/makefile b/cap/zx297520v3/src/lynq/framework/lynq-autosuspend/makefile
similarity index 94%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/makefile
rename to cap/zx297520v3/src/lynq/framework/lynq-autosuspend/makefile
index ca263bf..7878aff 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-autosuspend/files/makefile
+++ b/cap/zx297520v3/src/lynq/framework/lynq-autosuspend/makefile
@@ -34,7 +34,9 @@
LOCAL_PATH = .
LOCAL_C_INCLUDES = \
- -I. -I$(ROOT)$(includedir)/liblog -I$(ROOT)$(includedir) \
+ -I. \
+ -I$(ROOT)$(includedir)/liblog \
+ -I$(ROOT)$(includedir) \
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/files/LICENSE b/cap/zx297520v3/src/lynq/framework/lynq-fota-backup/LICENSE
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/files/LICENSE
rename to cap/zx297520v3/src/lynq/framework/lynq-fota-backup/LICENSE
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/files/lynq-fota-backup.cpp b/cap/zx297520v3/src/lynq/framework/lynq-fota-backup/lynq-fota-backup.cpp
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/files/lynq-fota-backup.cpp
rename to cap/zx297520v3/src/lynq/framework/lynq-fota-backup/lynq-fota-backup.cpp
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/files/lynq-fota-backup.service b/cap/zx297520v3/src/lynq/framework/lynq-fota-backup/lynq-fota-backup.service
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/files/lynq-fota-backup.service
rename to cap/zx297520v3/src/lynq/framework/lynq-fota-backup/lynq-fota-backup.service
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/files/lynq-fota-backup.sh b/cap/zx297520v3/src/lynq/framework/lynq-fota-backup/lynq-fota-backup.sh
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/files/lynq-fota-backup.sh
rename to cap/zx297520v3/src/lynq/framework/lynq-fota-backup/lynq-fota-backup.sh
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/files/makefile b/cap/zx297520v3/src/lynq/framework/lynq-fota-backup/makefile
similarity index 100%
rename from cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-fota-backup/files/makefile
rename to cap/zx297520v3/src/lynq/framework/lynq-fota-backup/makefile
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_network.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_network.cpp
index 1fd2780..b8627a3 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_network.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_network.cpp
@@ -1745,7 +1745,9 @@
int resp_type;
int none = 0;
int NR_sum = 0;
- int size=p->dataSize();
+ int size=p->dataSize();
+ int rscp;
+ int ecno;
p->readInt32(&resp_type);
p->readInt32(&s_module_wait_urc_id);
p->readInt32(&s_module_urc_slot_id);
@@ -1805,12 +1807,14 @@
p->readInt32(&none);
p->readInt32(&s_network_urc_solSigStren.wcdma_signalstrength);
p->readInt32(&none);//bitErrorRate
- p->readInt32(&s_network_urc_solSigStren.rscp);
- p->readInt32(&s_network_urc_solSigStren.ecno);
+ p->readInt32(&rscp);
+ p->readInt32(&ecno);
if(is_rssi_valid(s_network_urc_solSigStren.wcdma_signalstrength))
{
s_network_urc_solSigStren.wcdma_sig_valid = 1;
- LYINFLOG("urc_WCDMA_signalstrength:%d",s_network_urc_solSigStren.wcdma_signalstrength);
+ convert_rscp(rscp,&s_network_urc_solSigStren.rscp);
+ convert_ecno(ecno,&s_network_urc_solSigStren.ecno);
+ LYINFLOG("urc_WCDMA_signalstrength:%d",s_network_urc_solSigStren.wcdma_signalstrength);
}else{
s_network_urc_solSigStren.wcdma_sig_valid = 0;
}
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/tty/tty_io.c b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/tty/tty_io.c
old mode 100644
new mode 100755
index 669aef7..8591d06
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/tty/tty_io.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/tty/tty_io.c
@@ -771,6 +771,12 @@
if (tty->stopped)
return;
tty->stopped = 1;
+
+ //l.yang add log for bug T106-134 start
+ if(tty->index == 1){
+ printk("__stop_tty got stop cmd\n");
+ }
+ //l.yang add log for bug T106-134 end
if (tty->ops->stop)
tty->ops->stop(tty);
}
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/reference-ril.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/reference-ril.c
index 1c8934a..1763151 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/reference-ril.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/reference-ril.c
@@ -906,7 +906,7 @@
}
ecalltestnum = (RIL_ECallNumSet *)data;
- if (NULL != ecalltestnum->address) {
+ if (2 == ecalltestnum->arg_num && NULL != ecalltestnum->address) { //modify by hq @20240903 for bug 165
free(ecalltestnum->address);
}