From 4b5c22b5d658982952e0d5c8f00ddbcff9751727 Mon Sep 17 00:00:00 2001
From: Serhii Kostiuk <serhii.o.kostiuk@globallogic.com>
Date: Thu, 25 Jun 2020 11:40:20 +0300
Subject: [MTX-3489] mPower Oct20: Porting "LNA7 Intermediate Release" changes

Ported the Verizon LTE SMS format workaround from LNA7 to L4G1.
---
 src/atcmd.c      | 12 +++++++-----
 src/atcmd.h      |  2 +-
 src/sms_delete.c |  4 ++--
 src/sms_list.c   |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/atcmd.c b/src/atcmd.c
index 4eecb50..1fd3452 100644
--- a/src/atcmd.c
+++ b/src/atcmd.c
@@ -1553,11 +1553,13 @@ int is_vzw_lte(void)
           !strncmp(Global.core.model, "LE910-SV1", MODEL_LEN));
 }
 
-/* Detect LNA7 radio with Verizon SIM */
-int is_vzw_lna7(void)
+/* Detect LNA7/L4G1 radio with Verizon SIM */
+int is_quectel_dual_sms_format(void)
 {
-	if (!strncmp(Global.core.model, "EG95", MODEL_LEN)) {
-		log_debug("Found EG95");
+	if (!strncmp(Global.core.model, "EG95", MODEL_LEN) ||
+	    !strncmp(Global.core.model, "EG25", MODEL_LEN))
+	{
+		log_debug("Found Quectel radio with dual SMS format support");
 		/* Verizon Wireless SIM */
 		if (strncmp(Global.core.iccid,"891480",6) == 0) {
 			log_debug("Found VZW SIM");
@@ -1595,4 +1597,4 @@ int is_quectel_model()
 	}
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/src/atcmd.h b/src/atcmd.h
index 1390dff..28bc384 100644
--- a/src/atcmd.h
+++ b/src/atcmd.h
@@ -122,7 +122,7 @@ int atcmd_init(int fd, int read_timeout);
 int sms_device_close(int fd);
 int sms_device_open(void);
 int is_vzw_lte(void);
-int is_vzw_lna7(void);
+int is_quectel_dual_sms_format(void);
 int is_telit_model(void);
 int is_quectel_model(void);
 
diff --git a/src/sms_delete.c b/src/sms_delete.c
index 48afc06..7bd50d0 100644
--- a/src/sms_delete.c
+++ b/src/sms_delete.c
@@ -167,8 +167,8 @@ int sms_delete(int argc, char **argv)
 		return false;
 	}
 
-	// LNA7 with Verizon SIM SMS 3GPP, 3GPP2 WORKAROUND
-	if (is_vzw_lna7()) {
+	// LNA7/L4G1 with Verizon SIM SMS 3GPP, 3GPP2 WORKAROUND
+	if (is_quectel_dual_sms_format()) {
 		int tmp;
 		tmp = atcmd_plus_qcfg_write(fd, SMS_FORMAT_3GPP);
 		if (tmp == 0) {
diff --git a/src/sms_list.c b/src/sms_list.c
index d5ad263..2c39aa8 100644
--- a/src/sms_list.c
+++ b/src/sms_list.c
@@ -500,7 +500,7 @@ int sms_list(int argc, char **argv)
 	}
 
 	// LNA7 with Verizon SIM SMS 3GPP, 3GPP2 WORKAROUND
-	if (is_vzw_lna7()) {
+	if (is_quectel_dual_sms_format()) {
 		int tmp;
 		tmp = atcmd_plus_qcfg_write(fd, SMS_FORMAT_3GPP);
 		if (tmp == 0) {
-- 
cgit v1.2.3