Merge branch 'force-gsm' into 'master'

Add ForceGsmForNonDataSlots configuration option See merge request mer-core/ofono!239
sailfishos · Oct 10, 2019 · 53233b4 · 53233b4
2 parents 4458fbf + ae29a08
commit 53233b4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/ofono/drivers/ril/ril_data.c b/ofono/drivers/ril/ril_data.c
@@ -2,6 +2,7 @@
  *  oFono - Open Source Telephony - RIL-based devices
  *
  *  Copyright (C) 2016-2019 Jolla Ltd.
+ *  Copyright (C) 2019 Open Mobile Platform LLC.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -1646,7 +1647,8 @@ static void ril_data_manager_check_network_mode(struct ril_data_manager *self)
 {
 	GSList *l;
 
-	if (ril_data_manager_handover(self)) {
+	if ((self->flags & RIL_DATA_MANAGER_FORCE_GSM_ON_OTHER_SLOTS) &&
+		ril_data_manager_handover(self)) {
 		struct ril_network *lte_network = NULL;
 		int non_gsm_count = 0;
 

diff --git a/ofono/drivers/ril/ril_data.h b/ofono/drivers/ril/ril_data.h
@@ -2,6 +2,7 @@
  *  oFono - Open Source Telephony - RIL-based devices
  *
  *  Copyright (C) 2016-2019 Jolla Ltd.
+ *  Copyright (C) 2019 Open Mobile Platform LLC.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -54,7 +55,8 @@ struct ril_data {
 };
 
 enum ril_data_manager_flags {
-	RIL_DATA_MANAGER_3GLTE_HANDOVER = 0x01
+	RIL_DATA_MANAGER_3GLTE_HANDOVER = 0x01,
+	RIL_DATA_MANAGER_FORCE_GSM_ON_OTHER_SLOTS = 0x02
 };
 
 enum ril_data_allow_data_opt {

diff --git a/ofono/drivers/ril/ril_plugin.c b/ofono/drivers/ril/ril_plugin.c
@@ -2,6 +2,7 @@
  *  oFono - Open Source Telephony - RIL-based devices
  *
  *  Copyright (C) 2015-2019 Jolla Ltd.
+ *  Copyright (C) 2019 Open Mobile Platform LLC.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -76,7 +77,8 @@
 #define RILMODEM_DEFAULT_TIMEOUT    0 /* No timeout */
 #define RILMODEM_DEFAULT_SIM_FLAGS  RIL_SIM_CARD_V9_UICC_SUBSCRIPTION_WORKAROUND
 #define RILMODEM_DEFAULT_DATA_OPT   RIL_ALLOW_DATA_AUTO
-#define RILMODEM_DEFAULT_DM_FLAGS   RIL_DATA_MANAGER_3GLTE_HANDOVER
+#define RILMODEM_DEFAULT_DM_FLAGS  (RIL_DATA_MANAGER_3GLTE_HANDOVER | \
+                                    RIL_DATA_MANAGER_FORCE_GSM_ON_OTHER_SLOTS)
 #define RILMODEM_DEFAULT_START_TIMEOUT 20000 /* ms */
 #define RILMODEM_DEFAULT_DATA_CALL_FORMAT RIL_DATA_CALL_FORMAT_AUTO
 #define RILMODEM_DEFAULT_DATA_CALL_RETRY_LIMIT 4
@@ -106,6 +108,7 @@
 #define RILCONF_SETTINGS_EMPTY              "EmptyConfig"
 #define RILCONF_SETTINGS_IDENTITY           "Identity"
 #define RILCONF_SETTINGS_3GHANDOVER         "3GLTEHandover"
+#define RILCONF_SETTINGS_GSM_NON_DATA_SLOTS "ForceGsmForNonDataSlots"
 #define RILCONF_SETTINGS_SET_RADIO_CAP      "SetRadioCapability"
 
 #define RILCONF_MODEM_PREFIX                "ril_"
@@ -1817,6 +1820,12 @@ static GSList *ril_plugin_parse_config_file(GKeyFile *file,
 				RIL_DATA_MANAGER_3GLTE_HANDOVER,
 				&ps->dm_flags);
 
+			/* ForceGsmForNonDataSlots */
+			ril_config_get_flag(file, group,
+				RILCONF_SETTINGS_GSM_NON_DATA_SLOTS,
+				RIL_DATA_MANAGER_FORCE_GSM_ON_OTHER_SLOTS,
+				&ps->dm_flags);
+
 			/* SetRadioCapability */
 			if (ril_config_get_enum(file, group,
 				RILCONF_SETTINGS_SET_RADIO_CAP, &ival,

diff --git a/ofono/drivers/ril/ril_subscription.conf b/ofono/drivers/ril/ril_subscription.conf
@@ -42,6 +42,13 @@
 #
 #3GLTEHandover=true
 
+# If this option is on, preferred technology is set to GSM for non-data
+# slots.
+#
+# Default true (for historical reasons)
+#
+#ForceGsmForNonDataSlots=true
+
 # RIL_REQUEST_SET_RADIO_CAPABILITY may or may not be supported by your RIL.
 # This option allows you to forcibly enable or disable use of this request.
 # It's involved in 3G/LTE handover between the modems, meaning that it only