[Feature][T8TSK-289]Upgrade code repository structure-4
<merge platform ril source>
Only Configure: No
Affected branch: MR3.0-Merge2.0
Affected module: RIL
Is it affected on both ZXIC and MTK: only MTK
Self-test: Yes
Doc Update: No
Change-Id: I82a129d512f2f921f321ebbf8c0d61994577919e
diff --git a/LYNQ_PUBLIC/framework/lynq-ril-service/src/lynq_interface.cpp b/LYNQ_PUBLIC/framework/lynq-ril-service/src/lynq_interface.cpp
deleted file mode 100755
index f0943aa..0000000
--- a/LYNQ_PUBLIC/framework/lynq-ril-service/src/lynq_interface.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "lynq_interface.h"
\ No newline at end of file
diff --git a/LYNQ_PUBLIC/framework/lynq-ril-service/src/lynq_interface.h b/LYNQ_PUBLIC/framework/lynq-ril-service/src/lynq_interface.h
deleted file mode 100755
index 4a94b10..0000000
--- a/LYNQ_PUBLIC/framework/lynq-ril-service/src/lynq_interface.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#define LYNQ_REQUEST_VENDOR_BASE 8000
-#define LYNQ_URC_VENDOR_BASE 9000
-#define LYNQ_AT_SNED (LYNQ_REQUEST_VENDOR_BASE +1)
-#define LYNQ_URC_CALL_STATUS_IND (LYNQ_URC_VENDOR_BASE+1)
-#define LYNQ_URC_DATA_STATUS_IND (LYNQ_URC_VENDOR_BASE+2)
-#define LYNQ_URC_DATA_CALL_STATUS_IND (LYNQ_URC_VENDOR_BASE+3)
-#define LYNQ_AUTO_ANSWER_CALL (LYNQ_REQUEST_VENDOR_BASE +2)
-#define LYNQ_REQUEST_SET_DTMF_VOLUME (LYNQ_REQUEST_VENDOR_BASE +3)
-#define LYNQ_URC_MODIFY_APNDB (LYNQ_URC_VENDOR_BASE+4)
-#define LYNQ_URC_RESET_APNDB (LYNQ_URC_VENDOR_BASE+5)
-
-
-#define LYNQ_REQUEST_WRITE_SMS_TO_MEMORY (LYNQ_REQUEST_VENDOR_BASE +4)
-#define LYNQ_REQUEST_READ_SMS_FROM_MEMORY (LYNQ_REQUEST_VENDOR_BASE + 5)
-#define LYNQ_REQUEST_DELETE_SMS_FROM_MEMORY (LYNQ_REQUEST_VENDOR_BASE + 6)
-#define LYNQ_REQUEST_LIST_SMS_FROM_MEMORY (LYNQ_REQUEST_VENDOR_BASE + 7)
-#define LYNQ_REQUEST_SET_DEFAULT_SIM_ALL (LYNQ_REQUEST_VENDOR_BASE + 8)
-
-#define LYNQ_REQUEST_SET_SPEECH_VOLUME (LYNQ_REQUEST_VENDOR_BASE +9)
-#define LYNQ_REQUEST_GET_SPEECH_VOLUME (LYNQ_REQUEST_VENDOR_BASE +10)
-#define LYNQ_REQUEST_RECORD (LYNQ_REQUEST_VENDOR_BASE +11)
-#define LYNQ_REQUEST_OOS_RECOVER_TIMER_INTERVAL (LYNQ_REQUEST_VENDOR_BASE +12)
-#define LYNQ_REQUEST_OOS_DEEP_SLEEP_RECOVER_TIMER_INTERVAL (LYNQ_REQUEST_VENDOR_BASE +13)
-#define LYNQ_REQUEST_CHANGE_SCREEN_STATE (LYNQ_REQUEST_VENDOR_BASE + 14)/*jb.qi add for two sim suspend 2022/9/19*/
-#define LYNQ_REQUEST_CHANGE_RADIO (LYNQ_REQUEST_VENDOR_BASE + 15)
-#ifdef ECALL_SUPPORT
-#define RIL_UNSOL_ECALL_T2_TIMER_OUT 9000
-#define RIL_UNSOL_ECALL_T5_TIMER_OUT 9001
-#define RIL_UNSOL_ECALL_T6_TIMER_OUT 9002
-#define RIL_UNSOL_ECALL_T7_TIMER_OUT 9003
-#define RIL_UNSOL_ECALL_REDIAL_TIMER_OUT 9004
-#define RIL_UNSOL_ECALL_AUTO_ANS_TIMER_OUT 9005
-#define RIL_UNSOL_ECALL_AUTO_ANS_IMS_TIMER_OUT 9006
-#endif
-
-typedef struct{
- int request;
- int waitTime;
- char * name;
-}lynq_sp_command_t;
diff --git a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
index 27311ec..dc9d217 100755
--- a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
+++ b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
@@ -209,7 +209,7 @@
#TCXO support
#TCXO_SUPPORT = "no"
#Typethree@2023.2.01 modify for TCXO hw version end
-MTK_LED_SUPPORT = "no"
+MTK_LED_SUPPORT = "yes"
#xf.li@20230207 modiry for version number start
LYNQ_CONFIG_VERSION = "T800_UNSET_v02.MP1_MR3.02b06.00.01"
diff --git a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-main.conf b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-main.conf
index d2ede59..f56a7ce 100755
--- a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-main.conf
+++ b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-main.conf
@@ -24,5 +24,8 @@
NAND_CHIP_NAME = "MT29F8G08ADBFA"
#support lynq_atsvc [hong.liu add for lynq atsvc on 2022.12.1]
LYNQ_ATSVC_SUPPORT = "yes"
+#support AT Port switch value: PLATFORM,WOM [dong.yu add for lynq atsvc on 2023]
+MOBILETEK_ATCID_CFG = "PLATFORM"
#you.chen@20230927 add for console log level
CFG_TEE_LOG_LEVEL = "1"
+
diff --git a/meta/meta-mediatek-mt2735/recipes-telephonyware/atcid/atci_1.0.0.bb b/meta/meta-mediatek-mt2735/recipes-telephonyware/atcid/atci_1.0.0.bb
index c614084..9022fdd 100755
--- a/meta/meta-mediatek-mt2735/recipes-telephonyware/atcid/atci_1.0.0.bb
+++ b/meta/meta-mediatek-mt2735/recipes-telephonyware/atcid/atci_1.0.0.bb
@@ -21,8 +21,8 @@
-I${STAGING_DIR_HOST}/${libdir}\
-DENABLE_TRM \
"
-
-EXTRA_OEMAKE = "'LYNQ_ATSVC_SUPPORT = ${LYNQ_ATSVC_SUPPORT}'"
+EXTRA_OEMAKE = "'LYNQ_ATSVC_SUPPORT = ${LYNQ_ATSVC_SUPPORT}'\
+ 'MOBILETEK_ATCID_CFG = ${MOBILETEK_ATCID_CFG}'"
CFLAGS_append = "${ATCID_CFLAGS_ADD}"
CXXFLAGS_append = "${ATCID_CFLAGS_ADD}"
diff --git a/src/telephonyware/3.0/atcid/atci/src/Makefile b/src/telephonyware/3.0/atcid/atci/src/Makefile
index 77f997a..7a5d595 100755
--- a/src/telephonyware/3.0/atcid/atci/src/Makefile
+++ b/src/telephonyware/3.0/atcid/atci/src/Makefile
@@ -7,6 +7,10 @@
FLAGS += -DLYNQ_ATSVC
endif
+ifeq ($(strip $(MOBILETEK_ATCID_CFG)), WOM)
+ FLAGS += -DCONFIG_WOM_ATCID
+endif
+
INCLUDES := -I. \
-I./platform \
-I./lynq-private \
diff --git a/src/telephonyware/3.0/atcid/atci/src/atcid.c b/src/telephonyware/3.0/atcid/atci/src/atcid.c
index 0eaff4f..54f1c5e 100755
--- a/src/telephonyware/3.0/atcid/atci/src/atcid.c
+++ b/src/telephonyware/3.0/atcid/atci/src/atcid.c
@@ -94,6 +94,27 @@
listenVCOM = 1;
}
#else
+#ifdef CONFIG_WOM_ATCID
+ /*dongyu@2023.5.2 VCOM port as AT port in WOM platform meta mode, ELT port as AT port in normal mode start*/
+ snprintf(serial.devicename[0], strlen(TTY_GS0) + 1, "%s", TTY_GS0);
+ int listenVCOM = 1;
+ int bootMode = readSys_int(BOOTMODE_PATH);
+
+ LOGATCI(LOG_INFO, "bootMode = %d", bootMode);
+
+ if(bootMode == META_BOOT)
+ {
+ LOGATCI(LOG_INFO, "meta mode for CPE/ IVT, listen VCOM");
+ listenVCOM = 0;
+ }
+ else if(bootMode == NORMAL_BOOT)
+ {
+ LOGATCI(LOG_INFO, "normal mode for CPE/ IVT, listen ELT");
+ snprintf(serial.devicename[0], strlen(TTY_GS3) + 1, "%s", TTY_GS3);
+ listenVCOM = 1;
+ }
+ /*dongyu@2023.4.2 VCOM port as AT port in WOM platform meta mode, ELT port as AT port in normal mode end*/
+#else
//for CPE / IVT listen TTYGS0
snprintf(serial.devicename[0], strlen(TTY_GS0) + 1, "%s", TTY_GS0);
int listenVCOM = 1; //listen ETS port as default
@@ -106,6 +127,7 @@
listenVCOM = 0;
}
#endif
+#endif
if (listenVCOM == 1) {
for (i = 0; i < MAX_DEVICE_VCOM_NUM; i++) {
diff --git a/src/telephonyware/3.0/atcid/atci/src/lynq-private/lynq_atsvc_plugin.xml b/src/telephonyware/3.0/atcid/atci/src/lynq-private/lynq_atsvc_plugin.xml
index 3cdb250..ddb6a95 100755
--- a/src/telephonyware/3.0/atcid/atci/src/lynq-private/lynq_atsvc_plugin.xml
+++ b/src/telephonyware/3.0/atcid/atci/src/lynq-private/lynq_atsvc_plugin.xml
@@ -6,7 +6,7 @@
/>
<module name="/lib64/liblynq-gnss.so"
register="lynq_register_gnss"
- cmd="AT+CGPS;AT+CGPSNMEA"
+ cmd="AT+CGPS;AT+CGPSNMEA;AT+CGPSINFO"
/>
<module name="/lib64/liblynq-at-common.so"
register="lynq_register_at_common"
@@ -16,4 +16,8 @@
register="lynq_register_at_factory"
cmd="AT+LYNQFACTORY"
/>
+ <module name="/lib64/liblynq-at-fota.so"
+ register="lynq_register_fota"
+ cmd="AT+FOTA;AT+LYNQFOTA"
+ />
</lynq_atsvc_plugin>
\ No newline at end of file