[ril] Provide SmsHistory interface for all modems. JB#49955

The SmsHistory plugin uses a global variable to determine if it is already registered. Because of that, Ofono provides org.ofono.SmsHistory only for the first modem, and SMS delivery notifications do not work on the others. After this commit is applied, the plugin will be registered for each modem.
[ril] Stop repeating requests on RADIO_NOT_AVAILABLE. JB#49471
2020-05-20 17:21:06 +03:00 · 2020-04-01 19:44:54 +03:00 · 2020-04-01 19:43:57 +03:00 · 2020-04-01 19:43:57 +03:00 · 2020-04-01 19:43:57 +03:00 · 2020-03-16 21:26:40 +02:00
189 changed files with 9528 additions and 13814 deletions
--- a/ofono/.gitignore
+++ b/ofono/.gitignore
@@ -9,7 +9,7 @@ Makefile.in
 aclocal.m4
 config.guess
 config.h
-config.h.in*
+config.h.in
 config.log
 config.status
 config.sub
@@ -42,13 +42,9 @@ unit/test-sms-root
 unit/test-simutil
 unit/test-mux
 unit/test-caif
-unit/test-cell-info
-unit/test-cell-info-dbus
 unit/test-stkutil
 unit/test-cdmasms
-unit/test-conf
 unit/test-dbus-access
-unit/test-dbus-clients
 unit/test-dbus-queue
 unit/test-gprs-filter
 unit/test-ril_config
@@ -61,10 +57,13 @@ unit/test-rilmodem-cs
 unit/test-rilmodem-gprs
 unit/test-rilmodem-sms
 unit/test-sailfish_access
-unit/test-slot-manager
+unit/test-sailfish_cell_info
+unit/test-sailfish_cell_info_dbus
+unit/test-sailfish_manager
+unit/test-sailfish_sim_info
+unit/test-sailfish_sim_info_dbus
+unit/test-config
 unit/test-watch
-unit/test-sim-info
-unit/test-sim-info-dbus
 unit/test-sms-filter
 unit/test-voicecall-filter
 unit/test-*.log
--- a/ofono/AUTHORS
+++ b/ofono/AUTHORS
@@ -130,8 +130,3 @@ Joey Hewitt <joey@joeyhewitt.com>
 Richard Röjfors <richard.rojfors@gmail.com>
 Philippe De Swert <philippe.deswert@nomovok.com>
 Gabriel Lucas <gabriel.lucas@smile.fr>
-Mariem Cherif <mariem.cherif@ardia.com.tn>
-Bassem Boubaker <bassem.boubaker@actia.fr>
-Bob Ham <bob.ham@puri.sm>
-Varun Gargi <varun.gargi@intel.com>
-Florent Beillonnet <florent.beillonnet@gmail.com>
--- a/ofono/ChangeLog
+++ b/ofono/ChangeLog
@@ -1,21 +1,3 @@
-ver 1.24:
-	Fix issue with property changed signals and CDMA networks.
-	Fix issue with handling SIM filesystem and SIM removal.
-	Fix issue with handling PIN state and incorrect codes.
-	Fix issue with handling of parsing AID type.
-	Fix issue with SIM detection and QMI devices.
-	Fix issue with PIN handling and QMI devices.
-	Fix issue with USSD handling and QMI devices.
-	Fix issue with handling USSD TERMINATED response.
-	Fix issue with handling USSD reset and STK REFRESH.
-	Add support for detecting Gemalto ALS3 modems.
-	Add support for SIMCom based SIM7100E modems.
-
-ver 1.23:
-	Fix issue with handling SIM AID sessions.
-	Add support for QMI LTE bearer handling.
-	Add support for memory location dialing.
-
 ver 1.22:
 	Fix issue with GPIO handling and Nokia modems.
 	Fix issue with SIM state callback and AT modems.
--- a/ofono/Makefile.am
+++ b/ofono/Makefile.am
@@ -26,11 +26,9 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/sms-filter.h include/gprs-filter.h \
 			include/voicecall-filter.h include/dbus-access.h \
 			include/ril-constants.h include/ril-transport.h \
-			include/watch.h gdbus/gdbus.h include/dbus-clients.h \
+			include/watch.h gdbus/gdbus.h \
 			include/netmon.h include/lte.h include/ims.h \
-			include/slot.h include/cell-info.h \
-			include/storage.h include/conf.h include/misc.h \
-			include/mtu-limit.h
+			include/storage.h

 nodist_pkginclude_HEADERS = include/version.h

@@ -121,15 +119,22 @@ builtin_modules += udevng
 builtin_sources += plugins/udevng.c
 endif

+if SAILFISH_MANAGER
+builtin_modules += sailfish_manager
+builtin_sources += plugins/sailfish_manager/sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_cell_info_dbus.c \
+			plugins/sailfish_manager/sailfish_manager.c \
+			plugins/sailfish_manager/sailfish_manager_dbus.c \
+			plugins/sailfish_manager/sailfish_sim_info.c \
+			plugins/sailfish_manager/sailfish_sim_info_dbus.c
+endif
+
+
 if SAILFISH_ACCESS
 builtin_modules += sailfish_access
 builtin_sources += plugins/sailfish_access.c
 endif

-if DATAFILES
-dist_conf_DATA += drivers/ril/ril_subscription.conf
-endif
-
 if RILMODEM
 if SAILFISH_RILMODEM

@@ -176,6 +181,10 @@ builtin_sources +=	drivers/ril/ril_call_barring.c \
 # Vendor specific extensions
 builtin_sources +=	drivers/ril/ril_vendor_mtk.c

+if DATAFILES
+dist_conf_DATA += drivers/ril/ril_subscription.conf
+endif
+
 else

 builtin_sources += $(gril_sources)
@@ -298,7 +307,6 @@ builtin_sources += $(qmi_sources) \
 			drivers/qmimodem/ussd.c \
 			drivers/qmimodem/gprs.c \
 			drivers/qmimodem/gprs-context.c \
-			drivers/qmimodem/lte.c \
 			drivers/qmimodem/radio-settings.c \
 			drivers/qmimodem/location-reporting.c \
 			drivers/qmimodem/netmon.c
@@ -564,12 +572,6 @@ builtin_sources += plugins/samsung.c
 builtin_modules += sim900
 builtin_sources += plugins/sim900.c

-builtin_modules += sim7100
-builtin_sources += plugins/sim7100.c
-
-builtin_modules += connman
-builtin_sources += plugins/connman.c
-
 builtin_modules += telit
 builtin_sources += plugins/telit.c

@@ -745,6 +747,7 @@ endif
 sbin_PROGRAMS = src/ofonod

 src_ofonod_SOURCES = $(builtin_sources) $(gatchat_sources) src/ofono.ver \
+			src/mtu-watch.c \
 			src/main.c src/ofono.h src/log.c src/plugin.c \
 			src/modem.c src/common.h src/common.c \
 			src/manager.c src/dbus.c src/util.h src/util.c \
@@ -771,15 +774,11 @@ src_ofonod_SOURCES = $(builtin_sources) $(gatchat_sources) src/ofono.ver \
 			src/handsfree-audio.c src/bluetooth.h \
 			src/sim-mnclength.c src/voicecallagent.c \
 			src/sms-filter.c src/gprs-filter.c \
-			src/dbus-clients.c src/dbus-queue.c src/dbus-access.c \
+			src/dbus-queue.c src/dbus-access.c src/config.c \
 			src/voicecall-filter.c src/ril-transport.c \
 			src/hfp.h src/siri.c src/watchlist.c \
 			src/netmon.c src/lte.c src/ims.c \
-			src/netmonagent.c src/netmonagent.h \
-			src/slot-manager.c src/slot-manager-dbus.c \
-			src/cell-info.c src/cell-info-dbus.c \
-			src/sim-info.c src/sim-info-dbus.c \
-			src/conf.c src/mtu-limit.c
+			src/netmonagent.c src/netmonagent.h

 src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
 			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
@@ -806,7 +805,8 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \

 AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/src \
 			-I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat \
-			-I$(srcdir)/btio -I$(srcdir)/gril
+			-I$(srcdir)/btio -I$(srcdir)/gril \
+			-I$(srcdir)/plugins/sailfish_manager

 doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
 		doc/manager-api.txt doc/modem-api.txt doc/network-api.txt \
@@ -966,50 +966,61 @@ unit_tests = unit/test-common unit/test-util unit/test-idmap \
 				unit/test-simutil unit/test-stkutil \
 				unit/test-sms unit/test-cdmasms

-unit_test_cell_info_SOURCES = unit/test-cell-info.c src/cell-info.c src/log.c
-unit_test_cell_info_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
-unit_test_cell_info_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_cell_info_OBJECTS)
-unit_tests += unit/test-cell-info
+if SAILFISH_MANAGER

-unit_test_cell_info_dbus_SOURCES = unit/test-dbus.c \
-			unit/test-cell-info-dbus.c unit/fake_cell_info.c \
-			src/cell-info.c src/cell-info-dbus.c \
-			gdbus/object.c src/dbus-clients.c \
+unit_test_sailfish_cell_info_SOURCES = unit/test-sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_cell_info.c
+unit_test_sailfish_cell_info_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
+unit_test_sailfish_cell_info_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_cell_info_OBJECTS)
+unit_tests += unit/test-sailfish_cell_info
+
+unit_test_sailfish_cell_info_dbus_SOURCES = unit/test-dbus.c \
+			unit/test-sailfish_cell_info_dbus.c \
+			unit/fake_sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_cell_info_dbus.c \
+			gdbus/object.c \
 			src/dbus.c src/log.c
-unit_test_cell_info_dbus_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
+unit_test_sailfish_cell_info_dbus_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
 			@DBUS_GLIB_CFLAGS@
-unit_test_cell_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_cell_info_dbus_OBJECTS)
-unit_tests += unit/test-cell-info-dbus
+unit_test_sailfish_cell_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_cell_info_dbus_OBJECTS)
+unit_tests += unit/test-sailfish_cell_info_dbus

-unit_test_sim_info_SOURCES = unit/test-sim-info.c unit/fake_watch.c \
-			src/sim-info.c src/storage.c src/watchlist.c src/log.c
-unit_test_sim_info_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
+unit_test_sailfish_sim_info_SOURCES = unit/test-sailfish_sim_info.c \
+			unit/fake_watch.c \
+			plugins/sailfish_manager/sailfish_sim_info.c \
+			src/storage.c src/watchlist.c src/log.c
+unit_test_sailfish_sim_info_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
 			-DSTORAGEDIR='"/tmp/ofono"'
-unit_test_sim_info_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_sim_info_OBJECTS)
-unit_tests += unit/test-sim-info
+unit_test_sailfish_sim_info_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_sim_info_OBJECTS)
+unit_tests += unit/test-sailfish_sim_info

-unit_test_sim_info_dbus_SOURCES = unit/test-sim-info-dbus.c \
+unit_test_sailfish_sim_info_dbus_SOURCES = unit/test-sailfish_sim_info_dbus.c \
 			unit/test-dbus.c unit/fake_watch.c \
-			src/sim-info.c src/sim-info-dbus.c \
+			plugins/sailfish_manager/sailfish_sim_info.c \
+			plugins/sailfish_manager/sailfish_sim_info_dbus.c \
 			gdbus/object.c \
 			src/dbus.c src/storage.c src/watchlist.c src/log.c
-unit_test_sim_info_dbus_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
+unit_test_sailfish_sim_info_dbus_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
 			@DBUS_GLIB_CFLAGS@ -DSTORAGEDIR='"/tmp/ofono"'
-unit_test_sim_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_sim_info_dbus_OBJECTS)
-unit_tests += unit/test-sim-info-dbus
+unit_test_sailfish_sim_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_sim_info_dbus_OBJECTS)
+unit_tests += unit/test-sailfish_sim_info_dbus

-unit_test_slot_manager_SOURCES = unit/test-slot-manager.c unit/fake_watch.c \
-			src/slot-manager.c src/cell-info.c src/sim-info.c \
+unit_test_sailfish_manager_SOURCES = unit/test-sailfish_manager.c \
+			unit/fake_watch.c \
+			plugins/sailfish_manager/sailfish_manager.c \
+			plugins/sailfish_manager/sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_sim_info.c \
 			src/storage.c src/log.c
-unit_test_slot_manager_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
+unit_test_sailfish_manager_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
 			-DSTORAGEDIR='"/tmp/ofono"'
-unit_test_slot_manager_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_slot_manager_OBJECTS)
-unit_tests += unit/test-slot-manager
+unit_test_sailfish_manager_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_manager_OBJECTS)
+unit_tests += unit/test-sailfish_manager

 unit_test_watch_SOURCES = unit/test-watch.c src/watch.c \
 			src/log.c src/watchlist.c
@@ -1019,6 +1030,15 @@ unit_test_watch_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_watch_OBJECTS)
 unit_tests += unit/test-watch

+endif
+
+unit_test_config_SOURCES = unit/test-config.c drivers/ril/ril_util.c \
+				src/config.c src/log.c
+unit_test_config_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
+unit_test_config_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_config_OBJECTS)
+unit_tests += unit/test-config
+
 if SAILFISH_ACCESS
 unit_test_sailfish_access_SOURCES = unit/test-sailfish_access.c \
 			plugins/sailfish_access.c src/dbus-access.c src/log.c
@@ -1038,15 +1058,8 @@ unit_tests += unit/test-dbus-access
 if RILMODEM
 if SAILFISH_RILMODEM

-unit_test_conf_SOURCES = unit/test-conf.c drivers/ril/ril_util.c \
-			src/conf.c src/util.c src/log.c
-unit_test_conf_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
-unit_test_conf_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_conf_OBJECTS)
-unit_tests += unit/test-conf
-
 unit_test_ril_config_SOURCES = unit/test-ril_config.c drivers/ril/ril_util.c \
-			drivers/ril/ril_config.c src/conf.c src/util.c src/log.c
+				drivers/ril/ril_config.c src/log.c
 unit_test_ril_config_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_ril_config_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_ril_config_OBJECTS)
@@ -1060,7 +1073,7 @@ unit_objects += $(unit_test_ril_ecclist_OBJECTS)
 unit_tests += unit/test-ril_ecclist

 unit_test_ril_util_SOURCES = unit/test-ril_util.c drivers/ril/ril_util.c \
-			src/util.c src/log.c
+				src/log.c
 unit_test_ril_util_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_ril_util_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_ril_util_OBJECTS)
@@ -1068,7 +1081,7 @@ unit_tests += unit/test-ril_util

 unit_test_ril_vendor_SOURCES = unit/test-ril_vendor.c unit/fake_watch.c \
 	drivers/ril/ril_vendor.c drivers/ril/ril_vendor_mtk.c  \
-	drivers/ril/ril_util.c src/util.c src/log.c
+	drivers/ril/ril_util.c src/log.c
 unit_test_ril_vendor_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_ril_vendor_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_ril_vendor_OBJECTS)
@@ -1150,14 +1163,6 @@ unit_test_caif_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_caif_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_caif_OBJECTS)

-unit_test_dbus_clients_SOURCES = unit/test-dbus-clients.c unit/test-dbus.c \
-				src/dbus-clients.c gdbus/object.c \
-				src/dbus.c src/log.c
-unit_test_dbus_clients_CFLAGS =  @DBUS_GLIB_CFLAGS@ $(COVERAGE_OPT) $(AM_CFLAGS)
-unit_test_dbus_clients_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_dbus_clients_OBJECTS)
-unit_tests += unit/test-dbus-clients
-
 unit_test_dbus_queue_SOURCES = unit/test-dbus-queue.c unit/test-dbus.c \
 				src/dbus-queue.c gdbus/object.c \
 				src/dbus.c src/log.c
--- a/ofono/configure.ac
+++ b/ofono/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(ofono, 1.24)
+AC_INIT(ofono, 1.22)

 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AC_CONFIG_HEADERS(config.h)
@@ -183,14 +183,14 @@ AC_ARG_ENABLE(sailfish-rilmodem, AC_HELP_STRING([--enable-sailfish-rilmodem],
 				[enable_sailfish_rilmodem="no"])
 AM_CONDITIONAL(SAILFISH_RILMODEM, test "${enable_sailfish_rilmodem}" != "no")

-PKG_CHECK_MODULES(GLIBUTIL, libglibutil >= 1.0.49, dummy=yes,
-			AC_MSG_ERROR(libglibutil >= 1.0.49 is required))
+PKG_CHECK_MODULES(GLIBUTIL, libglibutil >= 1.0.35, dummy=yes,
+			AC_MSG_ERROR(libglibutil >= 1.0.35 is required))
 CFLAGS="$CFLAGS $GLIBUTIL_CFLAGS"
 LIBS="$LIBS $GLIBUTIL_LIBS"

 if (test "${enable_sailfish_rilmodem}" = "yes"); then
-	PKG_CHECK_MODULES(GRILIO, libgrilio >= 1.0.38, dummy=yes,
-				AC_MSG_ERROR(libgrilio >= 1.0.38 is required))
+	PKG_CHECK_MODULES(GRILIO, libgrilio >= 1.0.35, dummy=yes,
+				AC_MSG_ERROR(libgrilio >= 1.0.35 is required))
 	PKG_CHECK_MODULES(LIBMCE, libmce-glib >= 1.0.6, dummy=yes,
 				AC_MSG_ERROR(libmce-glib >= 1.0.6 is required))
 	CFLAGS="$CFLAGS $GRILIO_CFLAGS $LIBMCE_CFLAGS"
--- a/ofono/doc/connman-api.txt
+++ b/ofono/doc/connman-api.txt
@@ -278,13 +278,6 @@ Properties	boolean Active [readwrite]
 				via this proxy.  All other values are left
 				out in this case.

-			array{string} ProxyCSCF [readonly, optional]
-
-				Holds the list of P-CSCF (SIP proxy) for this
-				context. Only used by IMS connections.
-
-				This is a Sailfish OS specific extension.
-
 		dict IPv6.Settings [readonly, optional]

 			Holds all the IPv6 network settings
@@ -311,13 +304,6 @@ Properties	boolean Active [readwrite]

 				Holds the gateway IP for this connection.

-			array{string} ProxyCSCF [readonly, optional]
-
-				Holds the list of P-CSCF (SIP proxy) for this
-				context. Only used by IMS connections.
-
-				This is a Sailfish OS specific extension.
-
 		string MessageProxy [readwrite, MMS only]

 			Holds the MMS Proxy setting.
--- a/ofono/doc/modem-api.txt
+++ b/ofono/doc/modem-api.txt
@@ -95,13 +95,6 @@ Properties	boolean Powered [readwrite]
 			String representing the software version number of the
 			modem device.

-		string SystemPath [readonly, optional]
-
-			String representing the system path for the modem
-			device.
-			For modems detected by udev events, this corresponds to
-			the modem sysfs path.
-
 		array{string} Features [readonly]

 			List of currently enabled features. It uses simple
--- a/ofono/doc/voicecallmanager-api.txt
+++ b/ofono/doc/voicecallmanager-api.txt
@@ -69,17 +69,6 @@ Methods		dict GetProperties()
 					 [service].Error.NotImplemented
 					 [service].Error.Failed

-		object DialMemory(string memory position, string hide_callerid)
-
-			Initiates a new outgoing call to the number in the given memory
-			position/favourite. For callerid see the Dial method.
-
-			Possible Errors: [service].Error.InProgress
-					 [service].Error.InvalidArguments
-					 [service].Error.InvalidFormat
-					 [service].Error.NotImplemented
-					 [service].Error.Failed
-
 		void Transfer()

 			Joins the currently Active (or Outgoing, depending
--- a/ofono/drivers/atmodem/cbs.c
+++ b/ofono/drivers/atmodem/cbs.c
@@ -48,51 +48,6 @@ struct cbs_data {
 	unsigned int vendor;
 };

-static void at_xmm_etw_sec_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_cbs *cbs = user_data;
-	const char *hexpdu;
-	int pdulen;
-	GAtResultIter iter;
-	unsigned char pdu[88];
-	long hexpdulen;
-
-	DBG("");
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+XETWSECWARN:"))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &pdulen))
-		return;
-
-	if (pdulen != 88) {
-		ofono_error("Got a CBM message with invalid PDU size!");
-		return;
-	}
-
-	hexpdu = g_at_result_pdu(result);
-	if (hexpdu == NULL) {
-		ofono_error("Got a CBM, but no PDU.  Are we in text mode?");
-		return;
-	}
-
-	DBG("Got new Cell Broadcast via XETWSECWARN: %s, %d", hexpdu, pdulen);
-
-	if (decode_hex_own_buf(hexpdu, -1, &hexpdulen, 0, pdu) == NULL) {
-		ofono_error("Unable to hex-decode the PDU");
-		return;
-	}
-
-	if (hexpdulen != pdulen) {
-		ofono_error("hexpdu length not equal to reported pdu length");
-		return;
-	}
-
-	ofono_cbs_notify(cbs, pdu, pdulen);
-}
-
 static void at_cbm_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_cbs *cbs = user_data;
@@ -169,10 +124,6 @@ static void at_cbs_set_topics(struct ofono_cbs *cbs, const char *topics,
 		g_at_chat_send(data->chat, "AT+CSCB=0", none_prefix,
 				NULL, NULL, NULL);
 		break;
-	case OFONO_VENDOR_XMM:
-		g_at_chat_send(data->chat, "AT+XETWNTFYSTART=2", none_prefix,
-				NULL, NULL, NULL);
-		break;
 	default:
 		break;
 	}
@@ -200,10 +151,6 @@ static void at_cbs_clear_topics(struct ofono_cbs *cbs,

 	DBG("");

-	if (data->vendor == OFONO_VENDOR_XMM)
-                g_at_chat_send(data->chat, "AT+XETWNTFYSTOP=2", none_prefix,
-                                NULL, NULL, NULL);
-
 	if (g_at_chat_send(data->chat, "AT+CSCB=0", none_prefix,
 				at_cscb_set_cb, cbd, g_free) > 0)
 		return;
@@ -228,10 +175,6 @@ static void at_cbs_register(gboolean ok, GAtResult *result, gpointer user)
 	 */
 	g_at_chat_register(data->chat, "+CBM:", at_cbm_notify, TRUE, cbs, NULL);

-	if (data->vendor == OFONO_VENDOR_XMM)
-		g_at_chat_register(data->chat, "+XETWSECWARN:",
-					at_xmm_etw_sec_notify, TRUE, cbs, NULL);
-
 	ofono_cbs_register(cbs);
 }

@@ -280,13 +223,6 @@ static int at_cbs_probe(struct ofono_cbs *cbs, unsigned int vendor,

 	ofono_cbs_set_data(cbs, data);

-	if (vendor == OFONO_VENDOR_XMM) {
-		g_at_chat_send(data->chat, "AT+XCMAS=1", cscb_prefix,
-				NULL, NULL, NULL);
-		g_at_chat_send(data->chat, "AT+XETWCFG=1,1,0,0; ", none_prefix,
-				NULL, NULL, NULL);
-	}
-
 	g_at_chat_send(data->chat, "AT+CSCB=?", cscb_prefix,
 			at_cscb_support_cb, cbs, NULL);

--- a/ofono/drivers/atmodem/lte.c
+++ b/ofono/drivers/atmodem/lte.c
@@ -91,7 +91,7 @@ static gboolean lte_delayed_register(gpointer user_data)
 	return FALSE;
 }

-static int at_lte_probe(struct ofono_lte *lte, unsigned int vendor, void *data)
+static int at_lte_probe(struct ofono_lte *lte, void *data)
 {
 	GAtChat *chat = data;
 	struct lte_driver_data *ldd;
--- a/ofono/drivers/atmodem/network-registration.c
+++ b/ofono/drivers/atmodem/network-registration.c
@@ -48,7 +48,6 @@ static const char *cops_prefix[] = { "+COPS:", NULL };
 static const char *csq_prefix[] = { "+CSQ:", NULL };
 static const char *cind_prefix[] = { "+CIND:", NULL };
 static const char *cmer_prefix[] = { "+CMER:", NULL };
-static const char *smoni_prefix[] = { "^SMONI:", NULL };
 static const char *zpas_prefix[] = { "+ZPAS:", NULL };
 static const char *option_tech_prefix[] = { "_OCTI:", "_OUWCTI:", NULL };

@@ -179,31 +178,6 @@ static int option_parse_tech(GAtResult *result)
 	return tech;
 }

-static int cinterion_parse_tech(GAtResult *result)
-{
-	int tech = -1;
-	GAtResultIter iter;
-	const char *technology;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "^SMONI: "))
-		return tech;
-
-	if (!g_at_result_iter_next_unquoted_string(&iter, &technology))
-		return tech;
-
-	if (strcmp(technology, "2G") == 0) {
-		tech = ACCESS_TECHNOLOGY_GSM_EGPRS;
-	} else if (strcmp(technology, "3G") == 0) {
-		tech = ACCESS_TECHNOLOGY_UTRAN;
-	} else if (strcmp(technology, "4G") == 0) {
-		tech = ACCESS_TECHNOLOGY_EUTRAN;
-	}
-
-	return tech;
-}
-
 static void at_creg_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -231,18 +205,6 @@ static void at_creg_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	cb(&error, status, lac, ci, tech, cbd->data);
 }

-static void cinterion_query_tech_cb(gboolean ok, GAtResult *result,
-                                              gpointer user_data)
-{
-	struct tech_query *tq = user_data;
-	int tech;
-
-	tech = cinterion_parse_tech(result);
-
-	ofono_netreg_status_notify(tq->netreg,
-			tq->status, tq->lac, tq->ci, tech);
-}
-
 static void zte_tech_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -1556,12 +1518,6 @@ static void creg_notify(GAtResult *result, gpointer user_data)
 					option_query_tech_cb, tq, g_free) > 0)
 			return;
 		break;
-    case OFONO_VENDOR_CINTERION:
-              if (g_at_chat_send(nd->chat, "AT^SMONI",
-                                      smoni_prefix,
-                                      cinterion_query_tech_cb, tq, g_free) > 0)
-                      return;
-              break;
 	}

 	g_free(tq);
--- a/ofono/drivers/atmodem/sim.c
+++ b/ofono/drivers/atmodem/sim.c
@@ -1359,12 +1359,12 @@ static void at_pin_send_puk(struct ofono_sim *sim, const char *puk,
 	char buf[64];
 	int ret;

-	cbd->user = sim;
+	cbd->user = sd;

 	snprintf(buf, sizeof(buf), "AT+CPIN=\"%s\",\"%s\"", puk, passwd);

 	ret = g_at_chat_send(sd->chat, buf, none_prefix,
-				at_pin_send_cb, cbd, g_free);
+				at_pin_send_cb, cbd, NULL);

 	memset(buf, 0, sizeof(buf));

--- a/ofono/drivers/atmodem/sms.c
+++ b/ofono/drivers/atmodem/sms.c
@@ -104,7 +104,7 @@ static void at_csca_set(struct ofono_sms *sms,
 {
 	struct sms_data *data = ofono_sms_get_data(sms);
 	struct cb_data *cbd = cb_data_new(cb, user_data);
-	char buf[128];
+	char buf[64];

 	snprintf(buf, sizeof(buf), "AT+CSCA=\"%s\",%d", sca->number, sca->type);

--- a/ofono/drivers/atmodem/voicecall.c
+++ b/ofono/drivers/atmodem/voicecall.c
@@ -1120,7 +1120,6 @@ static int at_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,

 	switch (vd->vendor) {
 	case OFONO_VENDOR_QUALCOMM_MSM:
-	case OFONO_VENDOR_SIMCOM:
 		g_at_chat_send(vd->chat, "AT+COLP=0", NULL, NULL, NULL, NULL);
 		break;
 	default:
--- a/ofono/drivers/hfpmodem/voicecall.c
+++ b/ofono/drivers/hfpmodem/voicecall.c
@@ -422,28 +422,6 @@ static void hfp_dial_last(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb,
 	CALLBACK_WITH_FAILURE(cb, data);

 }
-
-static void hfp_dial_memory(struct ofono_voicecall *vc,
-				unsigned int memory_location,
-				ofono_voicecall_cb_t cb, void *data)
-{
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	char buf[256];
-
-	cbd->user = vc;
-	DBG("Calling memory location %d\n", memory_location);
-	snprintf(buf, sizeof(buf), "ATD>%d;", memory_location);
-
-	if (g_at_chat_send(vd->chat, buf, none_prefix,
-				atd_cb, cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-	DBG("at_chat_failed");
-	CALLBACK_WITH_FAILURE(cb, data);
-}
-
 static void hfp_template(const char *cmd, struct ofono_voicecall *vc,
 			GAtResultFunc result_cb, unsigned int affected_types,
 			ofono_voicecall_cb_t cb, void *data)
@@ -1309,7 +1287,6 @@ static struct ofono_voicecall_driver driver = {
 	.remove			= hfp_voicecall_remove,
 	.dial			= hfp_dial,
 	.dial_last		= hfp_dial_last,
-	.dial_memory		= hfp_dial_memory,
 	.answer			= hfp_answer,
 	.hangup_active		= hfp_hangup,
 	.hold_all_active	= hfp_hold_all_active,
--- a/ofono/drivers/qmimodem/devinfo.c
+++ b/ofono/drivers/qmimodem/devinfo.c
@@ -129,7 +129,6 @@ static void get_ids_cb(struct qmi_result *result, void *user_data)
 	str = qmi_result_get_string(result, QMI_DMS_RESULT_ESN);
 	/* Telit qmi modems return a "0" string when ESN is not available. */
 	if (!str || strcmp(str, "0") == 0) {
-		qmi_free(str);
 		str = qmi_result_get_string(result, QMI_DMS_RESULT_IMEI);
 		if (!str) {
 			CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
--- a/ofono/drivers/qmimodem/gprs.c
+++ b/ofono/drivers/qmimodem/gprs.c
@@ -29,16 +29,12 @@

 #include "qmi.h"
 #include "nas.h"
-#include "wds.h"

 #include "src/common.h"
 #include "qmimodem.h"

 struct gprs_data {
-	struct qmi_device *dev;
 	struct qmi_service *nas;
-	struct qmi_service *wds;
-	unsigned int last_auto_context_id;
 };

 static bool extract_ss_info(struct qmi_result *result, int *status, int *tech)
@@ -68,124 +64,8 @@ static bool extract_ss_info(struct qmi_result *result, int *status, int *tech)
 	return true;
 }

-static void get_lte_attach_param_cb(struct qmi_result *result, void *user_data)
-{
-	struct ofono_gprs *gprs = user_data;
-	struct gprs_data *data = ofono_gprs_get_data(gprs);
-	char *apn = NULL;
-	uint16_t error;
-	uint8_t iptype;
-
-	DBG("");
-
-	if (qmi_result_set_error(result, &error)) {
-		ofono_error("Failed to query LTE attach params: %hd", error);
-		goto noapn;
-	}
-
-	/* APN */
-	apn = qmi_result_get_string(result, 0x10);
-	if (!apn) {
-		DBG("Default profile has no APN setting");
-		goto noapn;
-	}
-
-	if (qmi_result_get_uint8(result, 0x11, &iptype))
-		ofono_info("LTE attach IP type: %hhd", iptype);
-
-	ofono_gprs_cid_activated(gprs, data->last_auto_context_id, apn);
-	g_free(apn);
-
-	return;
-
-noapn:
-	data->last_auto_context_id = 0;
-	ofono_error("LTE bearer established but APN not set");
-}
-
-static void get_default_profile_cb(struct qmi_result *result, void *user_data)
-{
-	struct ofono_gprs* gprs = user_data;
-	struct gprs_data *data = ofono_gprs_get_data(gprs);
-	uint16_t error;
-	uint8_t index;
-
-	DBG("");
-
-	if (qmi_result_set_error(result, &error)) {
-		ofono_error("Get default profile error: %hd", error);
-		goto error;
-	}
-
-	/* Profile index */
-	if (!qmi_result_get_uint8(result, 0x01, &index)) {
-		ofono_error("Failed query default profile");
-		goto error;
-	}
-
-	DBG("Default profile index: %hhd", index);
-
-	data->last_auto_context_id = index;
-
-	/* Get LTE Attach Parameters */
-	if (qmi_service_send(data->wds, 0x85, NULL,
-				get_lte_attach_param_cb, gprs, NULL) > 0)
-		return;
-
-error:
-	data->last_auto_context_id = 0;
-	ofono_error("LTE bearer established but APN not set");
-}
-
-/*
- * Query the settings in effect on the default bearer.  These may be
- * implicit or may even be something other than requested as the gateway
- * is allowed to override whatever was requested by the user.
- */
-static void get_lte_attach_params(struct ofono_gprs* gprs)
-{
-	struct gprs_data *data = ofono_gprs_get_data(gprs);
-	struct {
-		uint8_t type;
-		uint8_t family;
-	} __attribute((packed)) p = {
-		.type = 0,   /* 3GPP */
-		.family = 0, /* embedded */
-	};
-	struct qmi_param *param;
-
-	DBG("");
-
-	if (data->last_auto_context_id != 0)
-		return; /* Established or in progress */
-
-	/* Set query in progress */
-	data->last_auto_context_id = -1;
-
-	/* First we query the default profile in order to find out which
-	 * context the modem has activated.
-	 */
-	param = qmi_param_new();
-	if (!param)
-		goto error;
-
-	/* Profile type */
-	qmi_param_append(param, 0x1, sizeof(p), &p);
-
-	/* Get default profile */
-	if (qmi_service_send(data->wds, 0x49, param,
-				get_default_profile_cb, gprs, NULL) > 0)
-		return;
-
-	qmi_param_free(param);
-
-error:
-	ofono_warn("Unable to query LTE APN... will not activate context");
-}
-
 static int handle_ss_info(struct qmi_result *result, struct ofono_gprs *gprs)
 {
-	struct gprs_data *data = ofono_gprs_get_data(gprs);
 	int status;
 	int tech;

@@ -194,20 +74,17 @@ static int handle_ss_info(struct qmi_result *result, struct ofono_gprs *gprs)
 	if (!extract_ss_info(result, &status, &tech))
 		return -1;

-	if (status == NETWORK_REGISTRATION_STATUS_REGISTERED) {
+	if (status == NETWORK_REGISTRATION_STATUS_REGISTERED)
 		if (tech == ACCESS_TECHNOLOGY_EUTRAN) {
 			/* On LTE we are effectively always attached; and
 			 * the default bearer is established as soon as the
-			 * network is joined.  We just need to query the
-			 * parameters in effect on the default bearer and
-			 * let the ofono core know about the activated
-			 * context.
+			 * network is joined.
 			 */
-			get_lte_attach_params(gprs);
+			/* FIXME: query default profile number and APN
+			 * instead of assuming profile 1 and ""
+			 */
+			ofono_gprs_cid_activated(gprs, 1 , "automatic");
 		}
-	} else {
-		data->last_auto_context_id = 0;
-	}

 	return status;
 }
@@ -321,7 +198,7 @@ static void qmi_attached_status(struct ofono_gprs *gprs,
 	g_free(cbd);
 }

-static void create_wds_cb(struct qmi_service *service, void *user_data)
+static void create_nas_cb(struct qmi_service *service, void *user_data)
 {
 	struct ofono_gprs *gprs = user_data;
 	struct gprs_data *data = ofono_gprs_get_data(gprs);
@@ -329,12 +206,12 @@ static void create_wds_cb(struct qmi_service *service, void *user_data)
 	DBG("");

 	if (!service) {
-		ofono_error("Failed to request WDS service");
+		ofono_error("Failed to request NAS service");
 		ofono_gprs_remove(gprs);
 		return;
 	}

-	data->wds = qmi_service_ref(service);
+	data->nas = qmi_service_ref(service);

 	/*
 	 * First get the SS info - the modem may already be connected,
@@ -351,25 +228,6 @@ static void create_wds_cb(struct qmi_service *service, void *user_data)
 	ofono_gprs_register(gprs);
 }

-static void create_nas_cb(struct qmi_service *service, void *user_data)
-{
-	struct ofono_gprs *gprs = user_data;
-	struct gprs_data *data = ofono_gprs_get_data(gprs);
-
-	DBG("");
-
-	if (!service) {
-		ofono_error("Failed to request NAS service");
-		ofono_gprs_remove(gprs);
-		return;
-	}
-
-	data->nas = qmi_service_ref(service);
-
-	qmi_service_create_shared(data->dev, QMI_SERVICE_WDS,
-						create_wds_cb, gprs, NULL);
-}
-
 static int qmi_gprs_probe(struct ofono_gprs *gprs,
 				unsigned int vendor, void *user_data)
 {
@@ -382,8 +240,6 @@ static int qmi_gprs_probe(struct ofono_gprs *gprs,

 	ofono_gprs_set_data(gprs, data);

-	data->dev = device;
-
 	qmi_service_create_shared(device, QMI_SERVICE_NAS,
 						create_nas_cb, gprs, NULL);

@@ -398,9 +254,6 @@ static void qmi_gprs_remove(struct ofono_gprs *gprs)

 	ofono_gprs_set_data(gprs, NULL);

-	qmi_service_unregister_all(data->wds);
-	qmi_service_unref(data->wds);
-
 	qmi_service_unregister_all(data->nas);

 	qmi_service_unref(data->nas);
--- a/ofono/drivers/qmimodem/lte.c
+++ b/ofono/drivers/qmimodem/lte.c
@@ -1,265 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2018  Jonas Bonn. All rights reserved.
- *  Copyright (C) 2018  Norrbonn AB. All rights reserved.
- *  Copyright (C) 2018  Data Respons ASA. All rights reserved.
- *
- *  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
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define _GNU_SOURCE
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include <glib.h>
-
-#include <ofono/modem.h>
-#include <ofono/gprs-context.h>
-#include <ofono/log.h>
-#include <ofono/lte.h>
-
-#include "qmi.h"
-#include "wds.h"
-
-#include "qmimodem.h"
-
-struct lte_data {
-	struct qmi_service *wds;
-	uint8_t default_profile;
-};
-
-static void modify_profile_cb(struct qmi_result *result, void *user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_lte_cb_t cb = cbd->cb;
-	uint16_t error;
-
-	DBG("");
-
-	if (qmi_result_set_error(result, &error)) {
-		DBG("Failed to modify profile: %d", error);
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
-		return;
-	}
-
-	CALLBACK_WITH_SUCCESS(cb, cbd->data);
-}
-
-static void qmimodem_lte_set_default_attach_info(const struct ofono_lte *lte,
-			const struct ofono_lte_default_attach_info *info,
-			ofono_lte_cb_t cb, void *data)
-{
-	struct lte_data *ldd = ofono_lte_get_data(lte);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	struct qmi_param* param;
-	struct {
-		uint8_t type;
-		uint8_t index;
-	} __attribute__((packed)) p = {
-		.type = 0, /* 3GPP */
-	};
-
-	DBG("");
-
-	p.index = ldd->default_profile;
-
-	param = qmi_param_new();
-	if (!param)
-		goto error;
-
-	/* Profile selector */
-	qmi_param_append(param, 0x01, sizeof(p), &p);
-
-	/* WDS APN Name */
-	qmi_param_append(param, QMI_WDS_PARAM_APN,
-				strlen(info->apn), info->apn);
-
-	/* Modify profile */
-	if (qmi_service_send(ldd->wds, 0x28, param,
-					modify_profile_cb, cbd, g_free) > 0)
-		return;
-
-	qmi_param_free(param);
-
-error:
-	CALLBACK_WITH_FAILURE(cb, cbd->data);
-}
-
-static void reset_profile_cb(struct qmi_result *result, void *user_data)
-{
-	struct ofono_lte *lte = user_data;
-	uint16_t error;
-
-	DBG("");
-
-	if (qmi_result_set_error(result, &error))
-		ofono_error("Reset profile error: %hd", error);
-
-	ofono_lte_register(lte);
-}
-
-static void get_default_profile_cb(struct qmi_result *result, void *user_data)
-{
-	struct ofono_lte *lte = user_data;
-	struct lte_data *ldd = ofono_lte_get_data(lte);
-	uint16_t error;
-	uint8_t index;
-	struct qmi_param *param;
-	struct {
-		uint8_t type;
-		uint8_t index;
-	} __attribute__((packed)) p = {
-		.type = 0, /* 3GPP */
-	};
-
-	DBG("");
-
-	if (qmi_result_set_error(result, &error)) {
-		ofono_error("Get default profile error: %hd", error);
-		goto error;
-	}
-
-	/* Profile index */
-	if (!qmi_result_get_uint8(result, 0x01, &index)) {
-		ofono_error("Failed query default profile");
-		goto error;
-	}
-
-	DBG("Default profile index: %hhd", index);
-
-	ldd->default_profile = index;
-
-	p.index = index;
-
-	param = qmi_param_new();
-	if (!param)
-		goto error;
-
-	/* Profile selector */
-	qmi_param_append(param, 0x01, sizeof(p), &p);
-
-	/* Reset profile */
-	if (qmi_service_send(ldd->wds, 0x4b, param,
-				reset_profile_cb, lte, NULL) > 0)
-		return;
-
-	qmi_param_free(param);
-
-error:
-	ofono_error("Failed to reset profile %hhd", index);
-	ofono_lte_remove(lte);
-}
-
-static void create_wds_cb(struct qmi_service *service, void *user_data)
-{
-	struct ofono_lte *lte = user_data;
-	struct lte_data *ldd = ofono_lte_get_data(lte);
-	struct qmi_param *param;
-	struct {
-		uint8_t type;
-		uint8_t family;
-	} __attribute((packed)) p = {
-		.type = 0,   /* 3GPP */
-		.family = 0, /* embedded */
-	};
-
-	DBG("");
-
-	if (!service) {
-		ofono_error("Failed to request WDS service");
-		ofono_lte_remove(lte);
-		return;
-	}
-
-	ldd->wds = qmi_service_ref(service);
-
-	/* Query the default profile */
-	param = qmi_param_new();
-	if (!param)
-		goto error;
-
-	/* Profile type */
-	qmi_param_append(param, 0x1, sizeof(p), &p);
-
-	/* Get default profile */
-	if (qmi_service_send(ldd->wds, 0x49, param,
-				get_default_profile_cb, lte, NULL) > 0)
-		return;
-
-	qmi_param_free(param);
-
-error:
-	ofono_error("Failed to query default profile");
-	ofono_lte_register(lte);
-}
-
-static int qmimodem_lte_probe(struct ofono_lte *lte,
-					unsigned int vendor, void *data)
-{
-	struct qmi_device *device = data;
-	struct lte_data *ldd;
-
-	DBG("qmimodem lte probe");
-
-	ldd = g_try_new0(struct lte_data, 1);
-	if (!ldd)
-		return -ENOMEM;
-
-	ofono_lte_set_data(lte, ldd);
-
-	qmi_service_create_shared(device, QMI_SERVICE_WDS,
-					create_wds_cb, lte, NULL);
-
-	return 0;
-}
-
-static void qmimodem_lte_remove(struct ofono_lte *lte)
-{
-	struct lte_data *ldd = ofono_lte_get_data(lte);
-
-	DBG("");
-
-	ofono_lte_set_data(lte, NULL);
-
-	qmi_service_unregister_all(ldd->wds);
-
-	qmi_service_unref(ldd->wds);
-
-	g_free(ldd);
-}
-
-static struct ofono_lte_driver driver = {
-	.name				= "qmimodem",
-	.probe				= qmimodem_lte_probe,
-	.remove				= qmimodem_lte_remove,
-	.set_default_attach_info	= qmimodem_lte_set_default_attach_info,
-};
-
-void qmi_lte_init(void)
-{
-	ofono_lte_driver_register(&driver);
-}
-
-void qmi_lte_exit(void)
-{
-	ofono_lte_driver_unregister(&driver);
-}
--- a/ofono/drivers/qmimodem/qmi.c
+++ b/ofono/drivers/qmimodem/qmi.c
@@ -47,13 +47,6 @@ struct discovery {
 	qmi_destroy_func_t destroy;
 };

-struct qmi_version {
-	uint8_t type;
-	uint16_t major;
-	uint16_t minor;
-	const char *name;
-};
-
 struct qmi_device {
 	int ref_count;
 	int fd;
@@ -87,6 +80,7 @@ struct qmi_device {
 struct qmi_service {
 	int ref_count;
 	struct qmi_device *device;
+	bool shared;
 	uint8_t type;
 	uint16_t major;
 	uint16_t minor;
@@ -167,25 +161,25 @@ void qmi_free(void *ptr)

 static struct qmi_request *__request_alloc(uint8_t service,
 				uint8_t client, uint16_t message,
-				const void *data,
+				uint16_t headroom, const void *data,
 				uint16_t length, qmi_message_func_t func,
-				void *user_data)
+				void *user_data, void **head)
 {
 	struct qmi_request *req;
 	struct qmi_mux_hdr *hdr;
 	struct qmi_message_hdr *msg;
-	uint16_t headroom;

-	req = g_new0(struct qmi_request, 1);
-
-	if (service == QMI_SERVICE_CONTROL)
-		headroom = QMI_CONTROL_HDR_SIZE;
-	else
-		headroom = QMI_SERVICE_HDR_SIZE;
+	req = g_try_new0(struct qmi_request, 1);
+	if (!req)
+		return NULL;

 	req->len = QMI_MUX_HDR_SIZE + headroom + QMI_MESSAGE_HDR_SIZE + length;

-	req->buf = g_malloc(req->len);
+	req->buf = g_try_malloc(req->len);
+	if (!req->buf) {
+		g_free(req);
+		return NULL;
+	}

 	req->client = client;

@@ -209,6 +203,8 @@ static struct qmi_request *__request_alloc(uint8_t service,
 	req->callback = func;
 	req->user_data = user_data;

+	*head = req->buf + QMI_MUX_HDR_SIZE;
+
 	return req;
 }

@@ -260,6 +256,9 @@ static gboolean __service_compare_shared(gpointer key, gpointer value,
 	struct qmi_service *service = value;
 	uint8_t type = GPOINTER_TO_UINT(user_data);

+	if (!service->shared)
+		return FALSE;
+
 	if (service->type == type)
 		return TRUE;

@@ -696,37 +695,14 @@ static void wakeup_writer(struct qmi_device *device)
 				can_write_data, device, write_watch_destroy);
 }

-static uint16_t __request_submit(struct qmi_device *device,
-				struct qmi_request *req)
+static void __request_submit(struct qmi_device *device,
+				struct qmi_request *req, uint16_t transaction)
 {
-	struct qmi_mux_hdr *mux;
-
-	mux = req->buf;
-
-	if (mux->service == QMI_SERVICE_CONTROL) {
-		struct qmi_control_hdr *hdr;
-
-		hdr = req->buf + QMI_MUX_HDR_SIZE;
-		hdr->type = 0x00;
-		hdr->transaction = device->next_control_tid++;
-		if (device->next_control_tid == 0)
-			device->next_control_tid = 1;
-		req->tid = hdr->transaction;
-	} else {
-		struct qmi_service_hdr *hdr;
-		hdr = req->buf + QMI_MUX_HDR_SIZE;
-		hdr->type = 0x00;
-		hdr->transaction = device->next_service_tid++;
-		if (device->next_service_tid < 256)
-			device->next_service_tid = 256;
-		req->tid = hdr->transaction;
-	}
+	req->tid = transaction;

 	g_queue_push_tail(device->req_queue, req);

 	wakeup_writer(device);
-
-	return req->tid;
 }

 static void service_notify(gpointer key, gpointer value, gpointer user_data)
@@ -985,9 +961,6 @@ struct qmi_device *qmi_device_new(int fd)
 	device->service_list = g_hash_table_new_full(g_direct_hash,
 					g_direct_equal, NULL, service_destroy);

-	device->next_control_tid = 1;
-	device->next_service_tid = 256;
-
 	return device;
 }

@@ -1105,41 +1078,6 @@ static const void *tlv_get(const void *data, uint16_t size,
 	return NULL;
 }

-bool qmi_device_get_service_version(struct qmi_device *device, uint8_t type,
-					uint16_t *major, uint16_t *minor)
-{
-	struct qmi_version *info;
-	int i;
-
-	for (i = 0, info = device->version_list;
-			i < device->version_count;
-			i++, info++) {
-		if (info->type == type) {
-			*major = info->major;
-			*minor = info->minor;
-			return true;
-		}
-	}
-
-	return false;
-}
-
-bool qmi_device_has_service(struct qmi_device *device, uint8_t type)
-{
-	struct qmi_version *info;
-	int i;
-
-	for (i = 0, info = device->version_list;
-			i < device->version_count;
-			i++, info++) {
-		if (info->type == type) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 struct discover_data {
 	struct discovery super;
 	struct qmi_device *device;
@@ -1239,7 +1177,7 @@ done:
 	device->version_count = count;

 	if (data->func)
-		data->func(data->user_data);
+		data->func(count, list, data->user_data);

 	__qmi_device_discovery_complete(data->device, &data->super);
 }
@@ -1275,7 +1213,8 @@ static gboolean discover_reply(gpointer user_data)
 	}

 	if (data->func)
-		data->func(data->user_data);
+		data->func(device->version_count,
+				device->version_list, data->user_data);

 	__qmi_device_discovery_complete(data->device, &data->super);
 	__request_free(req, NULL);
@@ -1288,7 +1227,7 @@ bool qmi_device_discover(struct qmi_device *device, qmi_discover_func_t func,
 {
 	struct discover_data *data;
 	struct qmi_request *req;
-	uint8_t tid;
+	struct qmi_control_hdr *hdr;

 	if (!device)
 		return false;
@@ -1312,12 +1251,21 @@ bool qmi_device_discover(struct qmi_device *device, qmi_discover_func_t func,
 	}

 	req = __request_alloc(QMI_SERVICE_CONTROL, 0x00,
-			QMI_CTL_GET_VERSION_INFO,
-			NULL, 0, discover_callback, data);
+			QMI_CTL_GET_VERSION_INFO, QMI_CONTROL_HDR_SIZE,
+			NULL, 0, discover_callback, data, (void **) &hdr);
+	if (!req) {
+		g_free(data);
+		return false;
+	}

-	tid = __request_submit(device, req);
+	if (device->next_control_tid < 1)
+		device->next_control_tid = 1;

-	data->tid = tid;
+	hdr->type = 0x00;
+	hdr->transaction = device->next_control_tid++;
+	data->tid = hdr->transaction;
+
+	__request_submit(device, req, hdr->transaction);

 	data->timeout = g_timeout_add_seconds(5, discover_reply, data);
 	__qmi_device_discovery_started(device, &data->super);
@@ -1331,13 +1279,24 @@ static void release_client(struct qmi_device *device,
 {
 	unsigned char release_req[] = { 0x01, 0x02, 0x00, type, client_id };
 	struct qmi_request *req;
+	struct qmi_control_hdr *hdr;

 	req = __request_alloc(QMI_SERVICE_CONTROL, 0x00,
-			QMI_CTL_RELEASE_CLIENT_ID,
+			QMI_CTL_RELEASE_CLIENT_ID, QMI_CONTROL_HDR_SIZE,
 			release_req, sizeof(release_req),
-			func, user_data);
+			func, user_data, (void **) &hdr);
+	if (!req) {
+		func(0x0000, 0x0000, NULL, user_data);
+		return;
+	}

-	__request_submit(device, req);
+	if (device->next_control_tid < 1)
+		device->next_control_tid = 1;
+
+	hdr->type = 0x00;
+	hdr->transaction = device->next_control_tid++;
+
+	__request_submit(device, req, hdr->transaction);
 }

 static void shutdown_destroy(gpointer user_data)
@@ -1415,6 +1374,7 @@ bool qmi_device_sync(struct qmi_device *device,
 		     qmi_sync_func_t func, void *user_data)
 {
 	struct qmi_request *req;
+	struct qmi_control_hdr *hdr;
 	struct sync_data *func_data;

 	if (!device)
@@ -1427,11 +1387,17 @@ bool qmi_device_sync(struct qmi_device *device,
 	func_data->user_data = user_data;

 	req = __request_alloc(QMI_SERVICE_CONTROL, 0x00,
-			QMI_CTL_SYNC,
+			QMI_CTL_SYNC, QMI_CONTROL_HDR_SIZE,
 			NULL, 0,
-			qmi_device_sync_callback, func_data);
+			qmi_device_sync_callback, func_data, (void **) &hdr);

-	__request_submit(device, req);
+	if (device->next_control_tid < 1)
+		device->next_control_tid = 1;
+
+	hdr->type = 0x00;
+	hdr->transaction = device->next_control_tid++;
+
+	__request_submit(device, req, hdr->transaction);

 	return true;
 }
@@ -1932,6 +1898,7 @@ bool qmi_result_get_uint64(struct qmi_result *result, uint8_t type,
 struct service_create_data {
 	struct discovery super;
 	struct qmi_device *device;
+	bool shared;
 	uint8_t type;
 	uint16_t major;
 	uint16_t minor;
@@ -2002,6 +1969,7 @@ static void service_create_callback(uint16_t message, uint16_t length,

 	service->ref_count = 1;
 	service->device = data->device;
+	service->shared = data->shared;

 	service->type = data->type;
 	service->major = data->major;
@@ -2024,52 +1992,100 @@ done:
 	__qmi_device_discovery_complete(data->device, &data->super);
 }

-static bool service_create(struct qmi_device *device,
-				uint8_t type, qmi_create_func_t func,
-				void *user_data, qmi_destroy_func_t destroy)
+static void service_create_discover(uint8_t count,
+			const struct qmi_version *list, void *user_data)
 {
-	struct service_create_data *data;
-	unsigned char client_req[] = { 0x01, 0x01, 0x00, type };
+	struct service_create_data *data = user_data;
+	struct qmi_device *device = data->device;
 	struct qmi_request *req;
-	int i;
+	struct qmi_control_hdr *hdr;
+	unsigned char client_req[] = { 0x01, 0x01, 0x00, data->type };
+	unsigned int i;

-	data = g_try_new0(struct service_create_data, 1);
-	if (!data)
-		return false;
+	__debug_device(device, "service create [type=%d]", data->type);

-	if (!device->version_list)
-		return false;
-
-	data->super.destroy = service_create_data_free;
-	data->device = device;
-	data->type = type;
-	data->func = func;
-	data->user_data = user_data;
-	data->destroy = destroy;
-
-	__debug_device(device, "service create [type=%d]", type);
-
-	for (i = 0; i < device->version_count; i++) {
-		if (device->version_list[i].type == data->type) {
-			data->major = device->version_list[i].major;
-			data->minor = device->version_list[i].minor;
+	for (i = 0; i < count; i++) {
+		if (list[i].type == data->type) {
+			data->major = list[i].major;
+			data->minor = list[i].minor;
 			break;
 		}
 	}

 	req = __request_alloc(QMI_SERVICE_CONTROL, 0x00,
-			QMI_CTL_GET_CLIENT_ID,
+			QMI_CTL_GET_CLIENT_ID, QMI_CONTROL_HDR_SIZE,
 			client_req, sizeof(client_req),
-			service_create_callback, data);
+			service_create_callback, data, (void **) &hdr);
+	if (!req) {
+		if (data->timeout > 0)
+			g_source_remove(data->timeout);

-	__request_submit(device, req);
+		data->timeout = g_timeout_add_seconds(0,
+						service_create_reply, data);
+		__qmi_device_discovery_started(device, &data->super);
+		return;
+	}

+	if (device->next_control_tid < 1)
+		device->next_control_tid = 1;
+
+	hdr->type = 0x00;
+	hdr->transaction = device->next_control_tid++;
+
+	__request_submit(device, req, hdr->transaction);
+}
+
+static bool service_create(struct qmi_device *device, bool shared,
+				uint8_t type, qmi_create_func_t func,
+				void *user_data, qmi_destroy_func_t destroy)
+{
+	struct service_create_data *data;
+
+	data = g_try_new0(struct service_create_data, 1);
+	if (!data)
+		return false;
+
+	data->super.destroy = service_create_data_free;
+	data->device = device;
+	data->shared = shared;
+	data->type = type;
+	data->func = func;
+	data->user_data = user_data;
+	data->destroy = destroy;
+
+	if (device->version_list) {
+		service_create_discover(device->version_count,
+						device->version_list, data);
+		goto done;
+	}
+
+	if (qmi_device_discover(device, service_create_discover, data, NULL))
+		goto done;
+
+	g_free(data);
+
+	return false;
+
+done:
 	data->timeout = g_timeout_add_seconds(8, service_create_reply, data);
 	__qmi_device_discovery_started(device, &data->super);

 	return true;
 }

+bool qmi_service_create(struct qmi_device *device,
+				uint8_t type, qmi_create_func_t func,
+				void *user_data, qmi_destroy_func_t destroy)
+{
+	if (!device || !func)
+		return false;
+
+	if (type == QMI_SERVICE_CONTROL)
+		return false;
+
+	return service_create(device, false, type, func, user_data, destroy);
+}
+
 struct service_create_shared_data {
 	struct discovery super;
 	struct qmi_service *service;
@@ -2145,15 +2161,7 @@ bool qmi_service_create_shared(struct qmi_device *device,
 		return 0;
 	}

-	return service_create(device, type, func, user_data, destroy);
-}
-
-bool qmi_service_create(struct qmi_device *device,
-				uint8_t type, qmi_create_func_t func,
-				void *user_data, qmi_destroy_func_t destroy)
-{
-	return qmi_service_create_shared(device, type, func,
-						user_data, destroy);
+	return service_create(device, true, type, func, user_data, destroy);
 }

 static void service_release_callback(uint16_t message, uint16_t length,
@@ -2230,6 +2238,8 @@ bool qmi_service_get_version(struct qmi_service *service,
 }

 struct service_send_data {
+	struct qmi_service *service;
+	struct qmi_param *param;
 	qmi_result_func_t func;
 	void *user_data;
 	qmi_destroy_func_t destroy;
@@ -2240,6 +2250,8 @@ static void service_send_free(struct service_send_data *data)
 	if (data->destroy)
 		data->destroy(data->user_data);

+	qmi_param_free(data->param);
+
 	g_free(data);
 }

@@ -2280,7 +2292,7 @@ uint16_t qmi_service_send(struct qmi_service *service,
 	struct qmi_device *device;
 	struct service_send_data *data;
 	struct qmi_request *req;
-	uint16_t tid;
+	struct qmi_service_hdr *hdr;

 	if (!service)
 		return 0;
@@ -2296,21 +2308,31 @@ uint16_t qmi_service_send(struct qmi_service *service,
 	if (!data)
 		return 0;

+	data->service = service;
+	data->param = param;
 	data->func = func;
 	data->user_data = user_data;
 	data->destroy = destroy;

 	req = __request_alloc(service->type, service->client_id,
-				message,
-				param ? param->data : NULL,
-				param ? param->length : 0,
-				service_send_callback, data);
+				message, QMI_SERVICE_HDR_SIZE,
+				data->param ? data->param->data : NULL,
+				data->param ? data->param->length : 0,
+				service_send_callback, data, (void **) &hdr);
+	if (!req) {
+		g_free(data);
+		return 0;
+	}

-	qmi_param_free(param);
+	if (device->next_service_tid < 256)
+		device->next_service_tid = 256;

-	tid = __request_submit(device, req);
+	hdr->type = 0x00;
+	hdr->transaction = device->next_service_tid++;

-	return tid;
+	__request_submit(device, req, hdr->transaction);
+
+	return hdr->transaction;
 }

 bool qmi_service_cancel(struct qmi_service *service, uint16_t id)
--- a/ofono/drivers/qmimodem/qmi.h
+++ b/ofono/drivers/qmimodem/qmi.h
@@ -61,6 +61,13 @@ enum qmi_device_expected_data_format {
 	QMI_DEVICE_EXPECTED_DATA_FORMAT_RAW_IP,
 };

+struct qmi_version {
+	uint8_t type;
+	uint16_t major;
+	uint16_t minor;
+	const char *name;
+};
+
 void qmi_free(void *ptr);

 typedef void (*qmi_destroy_func_t)(void *user_data);
@@ -71,7 +78,8 @@ struct qmi_device;
 typedef void (*qmi_debug_func_t)(const char *str, void *user_data);
 typedef void (*qmi_sync_func_t)(void *user_data);
 typedef void (*qmi_shutdown_func_t)(void *user_data);
-typedef void (*qmi_discover_func_t)(void *user_data);
+typedef void (*qmi_discover_func_t)(uint8_t count,
+			const struct qmi_version *list, void *user_data);

 struct qmi_device *qmi_device_new(int fd);

@@ -88,10 +96,6 @@ bool qmi_device_discover(struct qmi_device *device, qmi_discover_func_t func,
 bool qmi_device_shutdown(struct qmi_device *device, qmi_shutdown_func_t func,
 				void *user_data, qmi_destroy_func_t destroy);

-bool qmi_device_has_service(struct qmi_device *device, uint8_t type);
-bool qmi_device_get_service_version(struct qmi_device *device, uint8_t type,
-					uint16_t *major, uint16_t *minor);
-
 bool qmi_device_sync(struct qmi_device *device,
 		     qmi_sync_func_t func, void *user_data);
 bool qmi_device_is_sync_supported(struct qmi_device *device);
--- a/ofono/drivers/qmimodem/qmimodem.c
+++ b/ofono/drivers/qmimodem/qmimodem.c
@@ -39,7 +39,6 @@ static int qmimodem_init(void)
 	qmi_ussd_init();
 	qmi_gprs_init();
 	qmi_gprs_context_init();
-	qmi_lte_init();
 	qmi_radio_settings_init();
 	qmi_location_reporting_init();
 	qmi_netmon_init();
@@ -52,7 +51,6 @@ static void qmimodem_exit(void)
 	qmi_netmon_exit();
 	qmi_location_reporting_exit();
 	qmi_radio_settings_exit();
-	qmi_lte_exit();
 	qmi_gprs_context_exit();
 	qmi_gprs_exit();
 	qmi_ussd_exit();
--- a/ofono/drivers/qmimodem/qmimodem.h
+++ b/ofono/drivers/qmimodem/qmimodem.h
@@ -48,9 +48,6 @@ extern void qmi_gprs_exit(void);
 extern void qmi_gprs_context_init(void);
 extern void qmi_gprs_context_exit(void);

-extern void qmi_lte_init(void);
-extern void qmi_lte_exit(void);
-
 extern void qmi_radio_settings_init(void);
 extern void qmi_radio_settings_exit(void);

--- a/ofono/drivers/qmimodem/radio-settings.c
+++ b/ofono/drivers/qmimodem/radio-settings.c
@@ -277,9 +277,6 @@ static void qmi_radio_settings_remove(struct ofono_radio_settings *rs)

 	ofono_radio_settings_set_data(rs, NULL);

-	qmi_service_unregister_all(data->dms);
-	qmi_service_unref(data->dms);
-
 	qmi_service_unregister_all(data->nas);

 	qmi_service_unref(data->nas);
--- a/ofono/drivers/qmimodem/sim.c
+++ b/ofono/drivers/qmimodem/sim.c
@@ -493,15 +493,8 @@ static bool get_card_status(const struct qmi_uim_slot_info *slot,
 	case 0x03:	/* PUK1 or PUK for UPIN is required */
 		sim_stat->passwd_state = OFONO_SIM_PASSWORD_SIM_PUK;
 		break;
-	case 0x00:	/* Unknown */
-	case 0x01:	/* Detected */
 	case 0x04:	/* Personalization state must be checked. */
-	case 0x05:	/* PIN1 blocked */
-	case 0x06:	/* Illegal */
-		/*
-		 * This could be temporary, we should retry and
-		 * expect another result
-		 */
+		/* This is temporary, we could retry and get another result */
 		sim_stat->passwd_state = OFONO_SIM_PASSWORD_INVALID;
 		need_retry = true;
 		break;
@@ -564,7 +557,7 @@ static enum get_card_status_result handle_get_card_status_result(

 			index = GUINT16_FROM_LE(status->index_gw_pri);

-			if ((index & 0xff) == n && (index >> 8) == i) {
+			if ((index & 0xff) == i && (index >> 8) == n) {
 				if (get_card_status(slot, info1, info2,
 								sim_stat))
 					res = GET_CARD_STATUS_RESULT_TEMP_ERROR;
@@ -602,32 +595,20 @@ static void query_passwd_state_cb(struct qmi_result *result,
 	struct sim_status sim_stat;
 	enum get_card_status_result res;
 	struct cb_data *retry_cbd;
-	unsigned int i;
-
-	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
-		sim_stat.retries[i] = -1;

 	res = handle_get_card_status_result(result, &sim_stat);
 	switch (res) {
 	case GET_CARD_STATUS_RESULT_OK:
 		DBG("passwd state %d", sim_stat.passwd_state);
 		data->retry_count = 0;
-		if (sim_stat.passwd_state == OFONO_SIM_PASSWORD_INVALID) {
-			CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-			ofono_sim_inserted_notify(sim, FALSE);
-		} else
-			CALLBACK_WITH_SUCCESS(cb, sim_stat.passwd_state,
-								cbd->data);
+		CALLBACK_WITH_SUCCESS(cb, sim_stat.passwd_state, cbd->data);
 		break;
 	case GET_CARD_STATUS_RESULT_TEMP_ERROR:
 		data->retry_count++;
 		if (data->retry_count > MAX_RETRY_COUNT) {
-			DBG("Failed after %d attempts. Card state:%d",
-							data->retry_count,
-							sim_stat.card_state);
+			DBG("Failed after %d attempts", data->retry_count);
 			data->retry_count = 0;
 			CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-			ofono_sim_inserted_notify(sim, FALSE);
 		} else {
 			DBG("Retry command");
 			retry_cbd = cb_data_new(cb, cbd->data);
@@ -641,7 +622,6 @@ static void query_passwd_state_cb(struct qmi_result *result,
 		DBG("Command failed");
 		data->retry_count = 0;
 		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-		ofono_sim_inserted_notify(sim, FALSE);
 		break;
 	}
 }
@@ -670,13 +650,9 @@ static void query_pin_retries_cb(struct qmi_result *result, void *user_data)
 	struct cb_data *cbd = user_data;
 	ofono_sim_pin_retries_cb_t cb = cbd->cb;
 	struct sim_status sim_stat;
-	unsigned int i;

 	DBG("");

-	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
-		sim_stat.retries[i] = -1;
-
 	if (handle_get_card_status_result(result, &sim_stat) !=
 					GET_CARD_STATUS_RESULT_OK) {
 		CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
--- a/ofono/drivers/qmimodem/ussd.c
+++ b/ofono/drivers/qmimodem/ussd.c
@@ -251,7 +251,6 @@ static void qmi_ussd_request(struct ofono_ussd *ussd, int dcs,
 	qmi_ussd->dcs = QMI_USSD_DCS_ASCII;
 	qmi_ussd->length = len;
 	memcpy(qmi_ussd->data, utf8, utf8_len);
-	g_free(utf8);

 	param = qmi_param_new();
 	if (param == NULL)
@@ -266,6 +265,7 @@ static void qmi_ussd_request(struct ofono_ussd *ussd, int dcs,

 	qmi_param_free(param);
 error:
+	g_free(utf8);
 	g_free(cbd);
 	CALLBACK_WITH_FAILURE(cb, data);
 }
--- a/ofono/drivers/ril/ril_call_barring.c
+++ b/ofono/drivers/ril/ril_call_barring.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
 *
 *  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
@@ -18,6 +18,8 @@
 #include "ril_util.h"
 #include "ril_log.h"

+#include "common.h"
+
 /* See 3GPP 27.007 7.4 for possible values */
 #define RIL_MAX_SERVICE_LENGTH 3

--- a/ofono/drivers/ril/ril_call_forward.c
+++ b/ofono/drivers/ril/ril_call_forward.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2017 Jolla Ltd.
 *
 *  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
@@ -17,7 +17,7 @@
 #include "ril_util.h"
 #include "ril_log.h"

-#include <ofono/netreg.h>
+#include "common.h"

 struct ril_call_forward {
 	GRilIoQueue *q;
--- a/ofono/drivers/ril/ril_call_settings.c
+++ b/ofono/drivers/ril/ril_call_settings.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2017 Jolla Ltd.
 *
 *  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
@@ -17,6 +17,8 @@
 #include "ril_util.h"
 #include "ril_log.h"

+#include "common.h"
+
 struct ril_call_settings {
 	GRilIoQueue *q;
 	guint timer_id;
--- a/ofono/drivers/ril/ril_cbs.c
+++ b/ofono/drivers/ril/ril_cbs.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2020 Jolla Ltd.
+ *  Copyright (C) 2015-2017 Jolla Ltd.
 *
 *  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
@@ -24,7 +24,6 @@ struct ril_cbs {
 	GRilIoChannel *io;
 	GRilIoQueue *q;
 	char *log_prefix;
-	guint register_id;
 	gulong event_id;
 };

@@ -52,12 +51,6 @@ static struct ril_cbs_cbd *ril_cbs_cbd_new(struct ril_cbs *cd,
 	return cbd;
 }

-static gboolean ril_cbs_retry(GRilIoRequest *request, int ril_status,
-               const void *resp_data, guint resp_len, void *user_data)
-{
-       return ril_status == RIL_E_INVALID_STATE;
-}
-
 static void ril_cbs_request_activation(struct ril_cbs *cd,
 		gboolean activate, GRilIoChannelResponseFunc response,
 		GDestroyNotify destroy, void* user_data)
@@ -68,9 +61,6 @@ static void ril_cbs_request_activation(struct ril_cbs *cd,
 	grilio_request_append_int32(req, activate ? 0 :1);

 	DBG_(cd, "%sactivating CB", activate ? "" : "de");
-	grilio_request_set_retry_func(req, ril_cbs_retry);
-	grilio_request_set_retry(req, RIL_CBS_CHECK_RETRY_MS,
-				RIL_CBS_CHECK_RETRY_COUNT);
 	grilio_queue_send_request_full(cd->q, req,
 				RIL_REQUEST_GSM_SMS_BROADCAST_ACTIVATION,
 				response, destroy, user_data);
@@ -107,9 +97,6 @@ static void ril_cbs_set_config(struct ril_cbs *cd, const char *topics,
 	}

 	DBG_(cd, "configuring CB");
-	grilio_request_set_retry_func(req, ril_cbs_retry);
-	grilio_request_set_retry(req, RIL_CBS_CHECK_RETRY_MS,
-			RIL_CBS_CHECK_RETRY_COUNT);
 	grilio_queue_send_request_full(cd->q, req,
 			RIL_REQUEST_GSM_SET_BROADCAST_SMS_CONFIG,
 			response, destroy, user_data);
@@ -157,41 +144,27 @@ static void ril_cbs_notify(GRilIoChannel *io, guint code,
 				const void *data, guint len, void *user_data)
 {
 	struct ril_cbs *cd = user_data;
-	GRilIoParser rilp;
-	guint32 pdu_len;

 	GASSERT(code == RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS);
-	grilio_parser_init(&rilp, data, len);
-	if (grilio_parser_get_uint32(&rilp, &pdu_len)) {
-		const void* pdu = grilio_parser_get_bytes(&rilp, pdu_len);
-
-		/*
-		 * By default assume that it's a length followed by the
-		 * binary PDU data.
-		 */
-		if (pdu && grilio_parser_bytes_remaining(&rilp) < 4) {
-			DBG_(cd, "%u bytes", pdu_len);
-			ofono_cbs_notify(cd->cbs, pdu, pdu_len);
-		} else {
-			/*
-			 * But I've seen cell broadcasts arriving without
-			 * the length, simply as a blob.
-			 */
-			ofono_cbs_notify(cd->cbs, data, len);
-		}
-	}
+	DBG_(cd, "%u bytes", len);
+	ofono_cbs_notify(cd->cbs, data, len);
 }

-static gboolean ril_cbs_register(void *user_data)
+static void ril_cbs_probe_done_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
 {
 	struct ril_cbs *cd = user_data;

-	DBG_(cd, "registering for CB");
-	cd->register_id = 0;
-	cd->event_id = grilio_channel_add_unsol_event_handler(cd->io,
-		ril_cbs_notify, RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS, cd);
-	ofono_cbs_register(cd->cbs);
-	return G_SOURCE_REMOVE;
+	if (status == RIL_E_SUCCESS) {
+		DBG_(cd, "registering for CB");
+		cd->event_id = grilio_channel_add_unsol_event_handler(cd->io,
+			ril_cbs_notify, RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS,
+									cd);
+		ofono_cbs_register(cd->cbs);
+	} else {
+		DBG_(cd, "failed to query CB config");
+		ofono_cbs_remove(cd->cbs);
+	}
 }

 static int ril_cbs_probe(struct ofono_cbs *cbs, unsigned int vendor,
@@ -199,6 +172,7 @@ static int ril_cbs_probe(struct ofono_cbs *cbs, unsigned int vendor,
 {
 	struct ril_modem *modem = data;
 	struct ril_cbs *cd = g_try_new0(struct ril_cbs, 1);
+	GRilIoRequest* req = grilio_request_new();

 	ofono_cbs_set_data(cbs, cd);
 	cd->log_prefix = (modem->log_prefix && modem->log_prefix[0]) ?
@@ -208,7 +182,20 @@ static int ril_cbs_probe(struct ofono_cbs *cbs, unsigned int vendor,
 	DBG_(cd, "");
 	cd->io = grilio_channel_ref(ril_modem_io(modem));
 	cd->q = grilio_queue_new(cd->io);
-	cd->register_id = g_idle_add(ril_cbs_register, cd);
+
+	/*
+	 * RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG often fails at startup
+	 * especially if other RIL requests are running in parallel. We may
+	 * have to retry a few times. Also, make it blocking in order to
+	 * improve the chance of success.
+	 */
+	grilio_request_set_retry(req, RIL_CBS_CHECK_RETRY_MS,
+						RIL_CBS_CHECK_RETRY_COUNT);
+	grilio_request_set_blocking(req, TRUE);
+	grilio_queue_send_request_full(cd->q, req,
+				RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG,
+				ril_cbs_probe_done_cb, NULL, cd);
+	grilio_request_unref(req);
 	return 0;
 }

@@ -217,9 +204,6 @@ static void ril_cbs_remove(struct ofono_cbs *cbs)
 	struct ril_cbs *cd = ofono_cbs_get_data(cbs);

 	DBG_(cd, "");
-	if (cd->register_id) {
-		g_source_remove(cd->register_id);
-	}
 	ofono_cbs_set_data(cbs, NULL);
 	grilio_channel_remove_handler(cd->io, cd->event_id);
 	grilio_channel_unref(cd->io);
--- a/ofono/drivers/ril/ril_cell_info.c
+++ b/ofono/drivers/ril/ril_cell_info.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2021 Jolla Ltd.
+ *  Copyright (C) 2016-2020 Jolla Ltd.
 *  Copyright (C) 2020 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,6 @@
 #include <grilio_parser.h>

 #include <gutil_idlepool.h>
-#include <gutil_macros.h>
 #include <gutil_misc.h>

 #define DEFAULT_UPDATE_RATE_MS  (10000) /* 10 sec */
@@ -36,8 +35,7 @@ typedef struct ril_cell_info RilCellInfo;

 struct ril_cell_info {
 	GObject object;
-	struct ofono_cell_info info;
-	struct ofono_cell **cells;
+	struct sailfish_cell_info info;
 	GRilIoChannel *io;
 	struct ril_radio *radio;
 	struct ril_sim_card *sim_card;
@@ -49,7 +47,6 @@ struct ril_cell_info {
 	gulong event_id;
 	guint query_id;
 	guint set_rate_id;
-	gboolean enabled;
 };

 enum ril_cell_info_signal {
@@ -61,18 +58,26 @@ enum ril_cell_info_signal {

 static guint ril_cell_info_signals[SIGNAL_COUNT] = { 0 };

-#define PARENT_TYPE G_TYPE_OBJECT
-#define PARENT_CLASS ril_cell_info_parent_class
-#define THIS_TYPE (ril_cell_info_get_type())
-#define THIS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), THIS_TYPE, RilCellInfo))
-
-G_DEFINE_TYPE(RilCellInfo, ril_cell_info, PARENT_TYPE)
+G_DEFINE_TYPE(RilCellInfo, ril_cell_info, G_TYPE_OBJECT)
+#define RIL_CELL_INFO_TYPE (ril_cell_info_get_type())
+#define RIL_CELL_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
+	RIL_CELL_INFO_TYPE, RilCellInfo))

 #define DBG_(self,fmt,args...) DBG("%s" fmt, (self)->log_prefix, ##args)

+static inline void ril_cell_free(struct sailfish_cell *cell)
+{
+	g_slice_free(struct sailfish_cell, cell);
+}
+
+static void ril_cell_free1(gpointer cell)
+{
+	ril_cell_free(cell);
+}
+
 static const char *ril_cell_info_int_format(int value, const char *format)
 {
-	if (value == OFONO_CELL_INVALID_VALUE) {
+	if (value == SAILFISH_CELL_INVALID_VALUE) {
 		return "";
 	} else {
 		static GUtilIdlePool *ril_cell_info_pool = NULL;
@@ -84,56 +89,41 @@ static const char *ril_cell_info_int_format(int value, const char *format)
 	}
 }

-static gint ril_cell_info_list_sort_cb(gconstpointer a, gconstpointer b)
+static gboolean ril_cell_info_list_identical(GSList *l1, GSList *l2)
 {
-	return ofono_cell_compare_location(*(struct ofono_cell **)a,
-		*(struct ofono_cell **)b);
-}
-
-static gboolean ril_cell_info_list_identical(const ofono_cell_ptr *l1,
-	const ofono_cell_ptr *l2)
-{
-	if (l1 && l2) {
-		while (*l1 && *l2) {
-			if (memcmp(*l1, *l2, sizeof(struct ofono_cell))) {
-				return FALSE;
-			}
-			l1++;
-			l2++;
+	while (l1 && l2) {
+		if (memcmp(l1->data, l2->data, sizeof(struct sailfish_cell))) {
+			return FALSE;
 		}
-		return !*l1 && !*l2;
-	} else {
-		return (!l1 || !*l1) && (!l2 || !*l2);
+		l1 = l1->next;
+		l2 = l2->next;
 	}
+	return !l1 && !l2;
 }

-/* Takes ownership of GPtrArray */
-static void ril_cell_info_update_cells(RilCellInfo *self, GPtrArray *l)
+static void ril_cell_info_update_cells(struct ril_cell_info *self, GSList *l)
 {
-	if (l && !ril_cell_info_list_identical(self->cells,
-		(struct ofono_cell **)l->pdata)) {
-		gutil_ptrv_free((void**)self->cells);
-		self->info.cells = (struct ofono_cell **)
-			g_ptr_array_free(l, FALSE);
+	if (!ril_cell_info_list_identical(self->info.cells, l)) {
+		g_slist_free_full(self->info.cells, ril_cell_free1);
+		self->info.cells = l;
 		g_signal_emit(self, ril_cell_info_signals
 			[SIGNAL_CELLS_CHANGED], 0);
-	} else if (l) {
-		g_ptr_array_set_free_func(l, g_free);
-		g_ptr_array_free(l, TRUE);
+	} else {
+		g_slist_free_full(l, ril_cell_free1);
 	}
 }

-static struct ofono_cell *ril_cell_info_parse_cell_gsm(GRilIoParser *rilp,
+static struct sailfish_cell *ril_cell_info_parse_cell_gsm(GRilIoParser *rilp,
 					guint version, gboolean registered)
 {
-	struct ofono_cell *cell = g_new0(struct ofono_cell, 1);
-	struct ofono_cell_info_gsm *gsm = &cell->info.gsm;
+	struct sailfish_cell *cell = g_slice_new0(struct sailfish_cell);
+	struct sailfish_cell_info_gsm *gsm = &cell->info.gsm;

 	/* Optional RIL_CellIdentityGsm_v12 part */
-	gsm->arfcn = OFONO_CELL_INVALID_VALUE;
-	gsm->bsic = OFONO_CELL_INVALID_VALUE;
+	gsm->arfcn = SAILFISH_CELL_INVALID_VALUE;
+	gsm->bsic = SAILFISH_CELL_INVALID_VALUE;
 	/* Optional RIL_GSM_SignalStrength_v12 part */
-	gsm->timingAdvance = OFONO_CELL_INVALID_VALUE;
+	gsm->timingAdvance = SAILFISH_CELL_INVALID_VALUE;
 	/* RIL_CellIdentityGsm */
 	if (grilio_parser_get_int32(rilp, &gsm->mcc) &&
 		grilio_parser_get_int32(rilp, &gsm->mnc) &&
@@ -158,24 +148,24 @@ static struct ofono_cell *ril_cell_info_parse_cell_gsm(GRilIoParser *rilp,
 							",strength=%d"),
 			ril_cell_info_int_format(gsm->bitErrorRate, ",err=%d"),
 			ril_cell_info_int_format(gsm->timingAdvance, ",t=%d"));
-		cell->type = OFONO_CELL_TYPE_GSM;
+		cell->type = SAILFISH_CELL_TYPE_GSM;
 		cell->registered = registered;
 		return cell;
 	}

 	ofono_error("failed to parse GSM cell info");
-	g_free(cell);
+	ril_cell_free(cell);
 	return NULL;
 }

-static struct ofono_cell *ril_cell_info_parse_cell_wcdma(GRilIoParser *rilp,
+static struct sailfish_cell *ril_cell_info_parse_cell_wcdma(GRilIoParser *rilp,
 					guint version, gboolean registered)
 {
-	struct ofono_cell *cell = g_new0(struct ofono_cell, 1);
-	struct ofono_cell_info_wcdma *wcdma = &cell->info.wcdma;
+	struct sailfish_cell *cell = g_slice_new0(struct sailfish_cell);
+	struct sailfish_cell_info_wcdma *wcdma = &cell->info.wcdma;

 	/* Optional RIL_CellIdentityWcdma_v12 part */
-	wcdma->uarfcn = OFONO_CELL_INVALID_VALUE;
+	wcdma->uarfcn = SAILFISH_CELL_INVALID_VALUE;
 	if (grilio_parser_get_int32(rilp, &wcdma->mcc) &&
 		grilio_parser_get_int32(rilp, &wcdma->mnc) &&
 		grilio_parser_get_int32(rilp, &wcdma->lac) &&
@@ -195,24 +185,24 @@ static struct ofono_cell *ril_cell_info_parse_cell_wcdma(GRilIoParser *rilp,
 							",strength=%d"),
 			ril_cell_info_int_format(wcdma->bitErrorRate,
 							",err=%d"));
-		cell->type = OFONO_CELL_TYPE_WCDMA;
+		cell->type = SAILFISH_CELL_TYPE_WCDMA;
 		cell->registered = registered;
 		return cell;
 	}

 	ofono_error("failed to parse WCDMA cell info");
-	g_free(cell);
+	ril_cell_free(cell);
 	return NULL;
 }

-static struct ofono_cell *ril_cell_info_parse_cell_lte(GRilIoParser *rilp,
+static struct sailfish_cell *ril_cell_info_parse_cell_lte(GRilIoParser *rilp,
 					guint version, gboolean registered)
 {
-	struct ofono_cell *cell = g_new0(struct ofono_cell, 1);
-	struct ofono_cell_info_lte *lte = &cell->info.lte;
+	struct sailfish_cell *cell = g_slice_new0(struct sailfish_cell);
+	struct sailfish_cell_info_lte *lte = &cell->info.lte;

 	/* Optional RIL_CellIdentityLte_v12 part */
-	lte->earfcn = OFONO_CELL_INVALID_VALUE;
+	lte->earfcn = SAILFISH_CELL_INVALID_VALUE;
 	if (grilio_parser_get_int32(rilp, &lte->mcc) &&
 		grilio_parser_get_int32(rilp, &lte->mnc) &&
 		grilio_parser_get_int32(rilp, &lte->ci) &&
@@ -239,18 +229,18 @@ static struct ofono_cell *ril_cell_info_parse_cell_lte(GRilIoParser *rilp,
 			ril_cell_info_int_format(lte->rssnr, ",rssnr=%d"),
 			ril_cell_info_int_format(lte->cqi, ",cqi=%d"),
 			ril_cell_info_int_format(lte->timingAdvance, ",t=%d"));
-		cell->type = OFONO_CELL_TYPE_LTE;
+		cell->type = SAILFISH_CELL_TYPE_LTE;
 		cell->registered = registered;
 		return cell;
 	}

 	ofono_error("failed to parse LTE cell info");
-	g_free(cell);
+	ril_cell_free(cell);
 	return NULL;
 }

 static gboolean ril_cell_info_parse_cell(GRilIoParser *rilp, guint v,
-					struct ofono_cell **cell_ptr)
+					struct sailfish_cell **cell_ptr)
 {
 	int type, reg;

@@ -259,7 +249,7 @@ static gboolean ril_cell_info_parse_cell(GRilIoParser *rilp, guint v,
 			/* Skip timestamp */
 			grilio_parser_get_int32_array(rilp, NULL, 3)) {
 		int skip = 0;
-		struct ofono_cell *cell = NULL;
+		struct sailfish_cell *cell = NULL;

 		/* Normalize the boolean value */
 		reg = (reg != FALSE);
@@ -300,25 +290,23 @@ static gboolean ril_cell_info_parse_cell(GRilIoParser *rilp, guint v,
 	return FALSE;
 }

-static GPtrArray *ril_cell_info_parse_list(guint v, const void *data, guint len)
+static GSList *ril_cell_info_parse_list(guint v, const void *data, guint len)
 {
-	GPtrArray *l = NULL;
+	GSList *l = NULL;
 	GRilIoParser rilp;
 	int i, n;

 	grilio_parser_init(&rilp, data, len);
 	if (grilio_parser_get_int32(&rilp, &n) && n > 0) {
-		struct ofono_cell *c;
+		struct sailfish_cell *c;

-		l = g_ptr_array_sized_new(n + 1);
 		DBG("%d cell(s):", n);
 		for (i=0; i<n && ril_cell_info_parse_cell(&rilp, v, &c); i++) {
 			if (c) {
-				g_ptr_array_add(l, c);
+				l = g_slist_insert_sorted(l, c,
+						sailfish_cell_compare_func);
 			}
 		}
-		g_ptr_array_sort(l, ril_cell_info_list_sort_cb);
-		g_ptr_array_add(l, NULL);
 	}

 	GASSERT(grilio_parser_at_end(&rilp));
@@ -328,7 +316,7 @@ static GPtrArray *ril_cell_info_parse_list(guint v, const void *data, guint len)
 static void ril_cell_info_list_changed_cb(GRilIoChannel *io, guint code,
 				const void *data, guint len, void *user_data)
 {
-	RilCellInfo *self = THIS(user_data);
+	struct ril_cell_info *self = RIL_CELL_INFO(user_data);

 	DBG_(self, "");
 	ril_cell_info_update_cells(self, ril_cell_info_parse_list
@@ -338,41 +326,38 @@ static void ril_cell_info_list_changed_cb(GRilIoChannel *io, guint code,
 static void ril_cell_info_list_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
-	RilCellInfo *self = THIS(user_data);
+	struct ril_cell_info *self = RIL_CELL_INFO(user_data);

 	DBG_(self, "");
 	GASSERT(self->query_id);
 	self->query_id = 0;
-	ril_cell_info_update_cells(self,
-		(status == RIL_E_SUCCESS && self->enabled) ?
+	ril_cell_info_update_cells(self, (status == RIL_E_SUCCESS) ?
 		ril_cell_info_parse_list(io->ril_version, data, len) : NULL);
 }

 static void ril_cell_info_set_rate_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
-	RilCellInfo *self = THIS(user_data);
+	struct ril_cell_info *self = RIL_CELL_INFO(user_data);

 	DBG_(self, "");
 	GASSERT(self->set_rate_id);
 	self->set_rate_id = 0;
 }

-static gboolean ril_cell_info_retry(GRilIoRequest *request, int ril_status,
-		const void *response_data, guint response_len, void *user_data)
+static gboolean ril_cell_info_retry(GRilIoRequest* request, int ril_status,
+		const void* response_data, guint response_len, void* user_data)
 {
-	RilCellInfo *self = THIS(user_data);
-
 	switch (ril_status) {
 	case RIL_E_SUCCESS:
 	case RIL_E_RADIO_NOT_AVAILABLE:
 		return FALSE;
 	default:
-		return self->enabled;
+		return TRUE;
 	}
 }

-static void ril_cell_info_query(RilCellInfo *self)
+static void ril_cell_info_query(struct ril_cell_info *self)
 {
 	GRilIoRequest *req = grilio_request_new();

@@ -385,11 +370,10 @@ static void ril_cell_info_query(RilCellInfo *self)
 	grilio_request_unref(req);
 }

-static void ril_cell_info_set_rate(RilCellInfo *self)
+static void ril_cell_info_set_rate(struct ril_cell_info *self)
 {
 	GRilIoRequest *req = grilio_request_array_int32_new(1,
-		(self->update_rate_ms >= 0 && self->enabled) ?
-		self->update_rate_ms : INT_MAX);
+		(self->update_rate_ms > 0) ? self->update_rate_ms : INT_MAX);

 	grilio_request_set_retry(req, RIL_RETRY_MS, MAX_RETRIES);
 	grilio_request_set_retry_func(req, ril_cell_info_retry);
@@ -400,11 +384,10 @@ static void ril_cell_info_set_rate(RilCellInfo *self)
 	grilio_request_unref(req);
 }

-static void ril_cell_info_refresh(RilCellInfo *self)
+static void ril_cell_info_refresh(struct ril_cell_info *self)
 {
 	/* RIL_REQUEST_GET_CELL_INFO_LIST fails without SIM card */
-	if (self->enabled && self->radio->state == RADIO_STATE_ON &&
-						self->sim_card_ready) {
+	if (self->radio->state == RADIO_STATE_ON && self->sim_card_ready) {
 		ril_cell_info_query(self);
 	} else {
 		ril_cell_info_update_cells(self, NULL);
@@ -413,7 +396,7 @@ static void ril_cell_info_refresh(RilCellInfo *self)

 static void ril_cell_info_radio_state_cb(struct ril_radio *radio, void *arg)
 {
-	RilCellInfo *self = THIS(arg);
+	struct ril_cell_info *self = RIL_CELL_INFO(arg);

 	DBG_(self, "%s", ril_radio_state_to_string(radio->state));
 	ril_cell_info_refresh(self);
@@ -421,7 +404,7 @@ static void ril_cell_info_radio_state_cb(struct ril_radio *radio, void *arg)

 static void ril_cell_info_sim_status_cb(struct ril_sim_card *sim, void *arg)
 {
-	RilCellInfo *self = THIS(arg);
+	struct ril_cell_info *self = RIL_CELL_INFO(arg);

 	self->sim_card_ready = ril_sim_card_ready(sim);
 	DBG_(self, "%sready", self->sim_card_ready ? "" : "not ");
@@ -431,57 +414,60 @@ static void ril_cell_info_sim_status_cb(struct ril_sim_card *sim, void *arg)
 	}
 }

-/* ofono_cell_info interface callbacks */
+/* sailfish_cell_info interface callbacks */

-typedef struct ril_cell_info_closure {
+struct ril_cell_info_closure {
 	GCClosure cclosure;
-	ofono_cell_info_cb_t cb;
+	sailfish_cell_info_cb_t cb;
 	void *arg;
-} RilCellInfoClosure;
+};

-static inline RilCellInfo *ril_cell_info_cast(struct ofono_cell_info *info)
+static inline struct ril_cell_info *ril_cell_info_cast
+					(struct sailfish_cell_info *info)
 {
-	return G_CAST(info, RilCellInfo, info);
+	return G_CAST(info, struct ril_cell_info, info);
 }

-static void ril_cell_info_ref_proc(struct ofono_cell_info *info)
+static void ril_cell_info_ref_proc(struct sailfish_cell_info *info)
 {
 	g_object_ref(ril_cell_info_cast(info));
 }

-static void ril_cell_info_unref_proc(struct ofono_cell_info *info)
+static void ril_cell_info_unref_proc(struct sailfish_cell_info *info)
 {
 	g_object_unref(ril_cell_info_cast(info));
 }

-static void ril_cell_info_cells_changed_cb(RilCellInfo *self,
-	RilCellInfoClosure *closure)
+static void ril_cell_info_cells_changed_cb(struct ril_cell_info *self,
+					struct ril_cell_info_closure *closure)
 {
 	closure->cb(&self->info, closure->arg);
 }

 static gulong ril_cell_info_add_cells_changed_handler_proc
-	(struct ofono_cell_info *info, ofono_cell_info_cb_t cb, void *arg)
+				(struct sailfish_cell_info *info,
+					sailfish_cell_info_cb_t cb, void *arg)
 {
 	if (cb) {
-		RilCellInfoClosure *closure = (RilCellInfoClosure *)
-			g_closure_new_simple(sizeof(RilCellInfoClosure), NULL);
-		GCClosure *cc = &closure->cclosure;
+		struct ril_cell_info_closure *closure =
+			(struct ril_cell_info_closure *) g_closure_new_simple
+				(sizeof(struct ril_cell_info_closure), NULL);
+		GCClosure* cc = &closure->cclosure;

 		cc->closure.data = closure;
 		cc->callback = G_CALLBACK(ril_cell_info_cells_changed_cb);
 		closure->cb = cb;
 		closure->arg = arg;
 		return g_signal_connect_closure_by_id(ril_cell_info_cast(info),
-			ril_cell_info_signals[SIGNAL_CELLS_CHANGED], 0,
-			&cc->closure, FALSE);
+				ril_cell_info_signals[SIGNAL_CELLS_CHANGED], 0,
+				&cc->closure, FALSE);
 	} else {
 		return 0;
 	}
 }

-static void ril_cell_info_remove_handler_proc(struct ofono_cell_info *info,
-	gulong id)
+static void ril_cell_info_remove_handler_proc(struct sailfish_cell_info *info,
+								gulong id)
 {
 	if (G_LIKELY(id)) {
 		g_signal_handler_disconnect(ril_cell_info_cast(info), id);
@@ -489,40 +475,34 @@ static void ril_cell_info_remove_handler_proc(struct ofono_cell_info *info,
 }

 static void ril_cell_info_set_update_interval_proc
-	(struct ofono_cell_info *info, int ms)
+				(struct sailfish_cell_info *info, int ms)
 {
-	RilCellInfo *self = ril_cell_info_cast(info);
+	struct ril_cell_info *self = ril_cell_info_cast(info);

 	if (self->update_rate_ms != ms) {
 		self->update_rate_ms = ms;
 		DBG_(self, "%d ms", ms);
-		if (self->enabled && self->sim_card_ready) {
-			ril_cell_info_set_rate(self);
-		}
-	}
-}
-
-void ril_cell_info_set_enabled_proc(struct ofono_cell_info *info,
-	gboolean enabled)
-{
-	RilCellInfo *self = ril_cell_info_cast(info);
-
-	if (self->enabled != enabled) {
-		self->enabled = enabled;
-		DBG_(self, "%d", enabled);
-		ril_cell_info_refresh(self);
 		if (self->sim_card_ready) {
 			ril_cell_info_set_rate(self);
 		}
 	}
 }

-struct ofono_cell_info *ril_cell_info_new(GRilIoChannel *io,
-	const char *log_prefix, struct ril_radio *radio,
-	struct ril_sim_card *sim_card)
+struct sailfish_cell_info *ril_cell_info_new(GRilIoChannel *io,
+			const char *log_prefix, struct ril_radio *radio,
+			struct ril_sim_card *sim_card)
 {
-	RilCellInfo *self = g_object_new(THIS_TYPE, 0);
+	static const struct sailfish_cell_info_proc ril_cell_info_proc = {
+		ril_cell_info_ref_proc,
+		ril_cell_info_unref_proc,
+		ril_cell_info_add_cells_changed_handler_proc,
+		ril_cell_info_remove_handler_proc,
+		ril_cell_info_set_update_interval_proc
+	};

+	struct ril_cell_info *self = g_object_new(RIL_CELL_INFO_TYPE, 0);
+
+	self->info.proc = &ril_cell_info_proc;
 	self->io = grilio_channel_ref(io);
 	self->radio = ril_radio_ref(radio);
 	self->sim_card = ril_sim_card_ref(sim_card);
@@ -539,34 +519,20 @@ struct ofono_cell_info *ril_cell_info_new(GRilIoChannel *io,
 			ril_cell_info_sim_status_cb, self);
 	self->sim_card_ready = ril_sim_card_ready(sim_card);
 	ril_cell_info_refresh(self);
-
-	/* Disable updates by default */
-	self->enabled = FALSE;
 	if (self->sim_card_ready) {
 		ril_cell_info_set_rate(self);
 	}
 	return &self->info;
 }

-static void ril_cell_info_init(RilCellInfo *self)
+static void ril_cell_info_init(struct ril_cell_info *self)
 {
-	static const struct ofono_cell_info_proc ril_cell_info_proc = {
-		ril_cell_info_ref_proc,
-		ril_cell_info_unref_proc,
-		ril_cell_info_add_cells_changed_handler_proc,
-		ril_cell_info_remove_handler_proc,
-		ril_cell_info_set_update_interval_proc,
-		ril_cell_info_set_enabled_proc
-	};
-
 	self->update_rate_ms = DEFAULT_UPDATE_RATE_MS;
-	self->info.cells = self->cells = g_new0(struct ofono_cell*, 1);
-	self->info.proc = &ril_cell_info_proc;
 }

 static void ril_cell_info_dispose(GObject *object)
 {
-	RilCellInfo *self = THIS(object);
+	struct ril_cell_info *self = RIL_CELL_INFO(object);

 	grilio_channel_remove_handlers(self->io, &self->event_id, 1);
 	if (self->query_id) {
@@ -578,25 +544,23 @@ static void ril_cell_info_dispose(GObject *object)
 									FALSE);
 		self->set_rate_id = 0;
 	}
-	/* xxx_remove_handlers() zero the ids */
-	ril_radio_remove_handlers(self->radio,
-		&self->radio_state_event_id, 1);
+	ril_radio_remove_handlers(self->radio, &self->radio_state_event_id, 1);
 	ril_sim_card_remove_handlers(self->sim_card,
-		&self->sim_status_event_id, 1);
-	G_OBJECT_CLASS(PARENT_CLASS)->dispose(object);
+					&self->sim_status_event_id, 1);
+	G_OBJECT_CLASS(ril_cell_info_parent_class)->dispose(object);
 }

 static void ril_cell_info_finalize(GObject *object)
 {
-	RilCellInfo *self = THIS(object);
+	struct ril_cell_info *self = RIL_CELL_INFO(object);

 	DBG_(self, "");
-	gutil_ptrv_free((void**)self->cells);
 	g_free(self->log_prefix);
 	grilio_channel_unref(self->io);
 	ril_radio_unref(self->radio);
 	ril_sim_card_unref(self->sim_card);
-	G_OBJECT_CLASS(PARENT_CLASS)->finalize(object);
+	g_slist_free_full(self->info.cells, ril_cell_free1);
+	G_OBJECT_CLASS(ril_cell_info_parent_class)->finalize(object);
 }

 static void ril_cell_info_class_init(RilCellInfoClass *klass)
--- a/ofono/drivers/ril/ril_cell_info.h
+++ b/ofono/drivers/ril/ril_cell_info.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2021 Jolla Ltd.
+ *  Copyright (C) 2016-2019 Jolla Ltd.
 *
 *  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
@@ -18,9 +18,9 @@

 #include "ril_types.h"

-#include <ofono/cell-info.h>
+#include <sailfish_cell_info.h>

-struct ofono_cell_info *ril_cell_info_new(GRilIoChannel *io,
+struct sailfish_cell_info *ril_cell_info_new(GRilIoChannel *io,
 			const char *log_prefix, struct ril_radio *radio,
 			struct ril_sim_card *sim_card);

--- a/ofono/drivers/ril/ril_config.c
+++ b/ofono/drivers/ril/ril_config.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2020 Jolla Ltd.
 *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -28,10 +28,234 @@

 /* Utilities for parsing ril_subscription.conf */

+char *ril_config_get_string(GKeyFile *file, const char *group, const char *key)
+{
+	char *val = g_key_file_get_string(file, group, key, NULL);
+
+	if (!val && strcmp(group, RILCONF_SETTINGS_GROUP)) {
+		/* Check the common section */
+		val = g_key_file_get_string(file, RILCONF_SETTINGS_GROUP, key,
+									NULL);
+	}
+	return val;
+}
+
+char **ril_config_get_strings(GKeyFile *file, const char *group,
+					const char *key, char delimiter)
+{
+	char *str = ril_config_get_string(file, group, key);
+
+	if (str) {
+		char **strv, **p;
+		char delimiter_str[2];
+
+		delimiter_str[0] = delimiter;
+		delimiter_str[1] = 0;
+		strv = g_strsplit(str, delimiter_str, -1);
+
+		/* Strip whitespaces */
+		for (p = strv; *p; p++) {
+			*p = g_strstrip(*p);
+		}
+
+		g_free(str);
+		return strv;
+	}
+
+	return NULL;
+}
+
+gboolean ril_config_get_integer(GKeyFile *file, const char *group,
+					const char *key, int *out_value)
+{
+	GError *error = NULL;
+	int value = g_key_file_get_integer(file, group, key, &error);
+
+	if (!error) {
+		if (out_value) {
+			*out_value = value;
+		}
+		return TRUE;
+	} else {
+		g_error_free(error);
+		if (strcmp(group, RILCONF_SETTINGS_GROUP)) {
+			/* Check the common section */
+			error = NULL;
+			value = g_key_file_get_integer(file,
+					RILCONF_SETTINGS_GROUP, key, &error);
+			if (!error) {
+				if (out_value) {
+					*out_value = value;
+				}
+				return TRUE;
+			}
+			g_error_free(error);
+		}
+		return FALSE;
+	}
+}
+
+gboolean ril_config_get_boolean(GKeyFile *file, const char *group,
+					const char *key, gboolean *out_value)
+{
+	GError *error = NULL;
+	gboolean value = g_key_file_get_boolean(file, group, key, &error);
+
+	if (!error) {
+		if (out_value) {
+			*out_value = value;
+		}
+		return TRUE;
+	} else {
+		g_error_free(error);
+		if (strcmp(group, RILCONF_SETTINGS_GROUP)) {
+			/* Check the common section */
+			error = NULL;
+			value = g_key_file_get_boolean(file,
+					RILCONF_SETTINGS_GROUP, key, &error);
+			if (!error) {
+				if (out_value) {
+					*out_value = value;
+				}
+				return TRUE;
+			}
+			g_error_free(error);
+		}
+		return FALSE;
+	}
+}
+
+gboolean ril_config_get_flag(GKeyFile *file, const char *group,
+					const char *key, int flag, int *flags)
+{
+	gboolean value;
+
+	if (ril_config_get_boolean(file, group, key, &value)) {
+		if (value) {
+			*flags |= flag;
+		} else {
+			*flags &= ~flag;
+		}
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
+gboolean ril_config_get_enum(GKeyFile *file, const char *group,
+					const char *key, int *result,
+					const char *name, int value, ...)
+{
+	char *str = ril_config_get_string(file, group, key);
+
+	if (str) {
+		/*
+		 * Some people are thinking that # is a comment
+		 * anywhere on the line, not just at the beginning
+		 */
+		char *comment = strchr(str, '#');
+
+		if (comment) *comment = 0;
+		g_strstrip(str);
+		if (strcasecmp(str, name)) {
+			va_list args;
+			va_start(args, value);
+			while ((name = va_arg(args, char*)) != NULL) {
+				value = va_arg(args, int);
+				if (!strcasecmp(str, name)) {
+					break;
+				}
+			}
+			va_end(args);
+		}
+
+		if (!name) {
+			ofono_error("Invalid %s config value (%s)", key, str);
+		}
+
+		g_free(str);
+
+		if (name) {
+			if (result) {
+				*result = value;
+			}
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+gboolean ril_config_get_mask(GKeyFile *file, const char *group,
+					const char *key, int *result,
+					const char *name, int value, ...)
+{
+	char *str = ril_config_get_string(file, group, key);
+	gboolean ok = FALSE;
+	
+	if (result) {
+		*result = 0;
+	}
+
+	if (str) {
+		/*
+		 * Some people are thinking that # is a comment
+		 * anywhere on the line, not just at the beginning
+		 */
+		char *comment = strchr(str, '#');
+		char **values, **ptr;
+
+		if (comment) *comment = 0;
+		values = g_strsplit(str, "+", -1);
+
+		for (ok = TRUE, ptr = values; *ptr && ok; ptr++) {
+			const char* found_str = NULL;
+			const char* s = g_strstrip(*ptr);
+
+			if (!strcasecmp(s, name)) {
+				found_str = name;
+				if (result) {
+					*result |= value;
+				}
+			} else {
+				va_list args;
+				const char* known;
+
+				va_start(args, value);
+				while ((known = va_arg(args, char*)) != NULL) {
+					const int bit = va_arg(args, int);
+
+					if (!strcasecmp(s, known)) {
+						found_str = known;
+						if (result) {
+							*result |= bit;
+						}
+						break;
+					}
+				}
+				va_end(args);
+			}
+
+			if (!found_str) {
+				ofono_error("Unknown bit '%s' in %s", s, key);
+				ok = FALSE;
+			}
+		}
+
+		g_strfreev(values);
+		g_free(str);
+	}
+
+	if (!ok && result) {
+		*result = 0;
+	}
+	return ok;
+}
+
 GUtilInts *ril_config_get_ints(GKeyFile *file, const char *group,
 					const char *key)
 {
-	char *value = ofono_conf_get_string(file, group, key);
+	char *value = ril_config_get_string(file, group, key);

 	if (value) {
 		GUtilIntArray *array = gutil_int_array_new();
--- a/ofono/drivers/ril/ril_config.h
+++ b/ofono/drivers/ril/ril_config.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2020 Jolla Ltd.
 *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,28 @@

 #include "ril_types.h"

-#include <ofono/conf.h>
+/* Utilities for parsing ril_subscription.conf */

-#define RILCONF_SETTINGS_GROUP OFONO_COMMON_SETTINGS_GROUP
+#define RILCONF_SETTINGS_GROUP      "Settings"

+char *ril_config_get_string(GKeyFile *file, const char *group,
+					const char *key);
+char **ril_config_get_strings(GKeyFile *file, const char *group,
+			      const char *key, char delimiter);
+gboolean ril_config_get_integer(GKeyFile *file, const char *group,
+					const char *key, int *value);
+gboolean ril_config_get_boolean(GKeyFile *file, const char *group,
+					const char *key, gboolean *value);
+gboolean ril_config_get_flag(GKeyFile *file, const char *group,
+					const char *key, int flag, int *flags);
+gboolean ril_config_get_enum(GKeyFile *file, const char *group,
+					const char *key, int *result,
+					const char *name, int value, ...)
+					G_GNUC_NULL_TERMINATED;
+gboolean ril_config_get_mask(GKeyFile *file, const char *group,
+					const char *key, int *result,
+					const char *name, int value, ...)
+					G_GNUC_NULL_TERMINATED;
 GUtilInts *ril_config_get_ints(GKeyFile *file, const char *group,
 					const char *key);
 char *ril_config_ints_to_string(GUtilInts *ints, char separator);
--- a/ofono/drivers/ril/ril_connman.c
+++ b/ofono/drivers/ril/ril_connman.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2019-2021 Jolla Ltd.
+ *  Copyright (C) 2019 Jolla Ltd.
 *
 *  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
@@ -16,7 +16,8 @@
 #include "ril_connman.h"

 #include <ofono/log.h>
-#include <ofono/gdbus.h>
+
+#include <gdbus.h>

 #include <gutil_macros.h>
 #include <gutil_misc.h>
--- a/ofono/drivers/ril/ril_constants.h
+++ b/ofono/drivers/ril/ril_constants.h
@@ -1,6 +1,6 @@
 /*
 *  Copyright (C) 2013 Canonical Ltd.
- *  Copyright (C) 2013-2020 Jolla Ltd.
+ *  Copyright (C) 2013-2019 Jolla Ltd.
 *
 *  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
@@ -205,44 +205,10 @@ enum ril_data_call_fail_cause {
 	PDP_FAIL_SERVICE_OPTION_OUT_OF_ORDER = 0x22,
 	PDP_FAIL_NSAPI_IN_USE = 0x23,
 	PDP_FAIL_REGULAR_DEACTIVATION = 0x24,
-	PDP_FAIL_QOS_NOT_ACCEPTED = 0x25,
-	PDP_FAIL_NETWORK_FAILURE = 0x26,
-	PDP_FAIL_UMTS_REACTIVATION_REQ = 0x27,
-	PDP_FAIL_FEATURE_NOT_SUPP = 0x28,
-	PDP_FAIL_TFT_SEMANTIC_ERROR = 0x29,
-	PDP_FAIL_TFT_SYTAX_ERROR = 0x2A,
-	PDP_FAIL_UNKNOWN_PDP_CONTEXT = 0x2B,
-	PDP_FAIL_FILTER_SEMANTIC_ERROR = 0x2C,
-	PDP_FAIL_FILTER_SYTAX_ERROR = 0x2D,
-	PDP_FAIL_PDP_WITHOUT_ACTIVE_TFT = 0x2E,
 	PDP_FAIL_ONLY_IPV4_ALLOWED = 0x32,
 	PDP_FAIL_ONLY_IPV6_ALLOWED = 0x33,
 	PDP_FAIL_ONLY_SINGLE_BEARER_ALLOWED = 0x34,
-	PDP_FAIL_ESM_INFO_NOT_RECEIVED = 0x35,
-	PDP_FAIL_PDN_CONN_DOES_NOT_EXIST = 0x36,
-	PDP_FAIL_MULTI_CONN_TO_SAME_PDN_NOT_ALLOWED = 0x37,
-	PDP_FAIL_MAX_ACTIVE_PDP_CONTEXT_REACHED = 0x41,
-	PDP_FAIL_UNSUPPORTED_APN_IN_CURRENT_PLMN = 0x42,
-	PDP_FAIL_INVALID_TRANSACTION_ID = 0x51,
-	PDP_FAIL_MESSAGE_INCORRECT_SEMANTIC = 0x5F,
-	PDP_FAIL_INVALID_MANDATORY_INFO = 0x60,
-	PDP_FAIL_MESSAGE_TYPE_UNSUPPORTED = 0x61,
-	PDP_FAIL_MSG_TYPE_NONCOMPATIBLE_STATE = 0x62,
-	PDP_FAIL_UNKNOWN_INFO_ELEMENT = 0x63,
-	PDP_FAIL_CONDITIONAL_IE_ERROR = 0x64,
-	PDP_FAIL_MSG_AND_PROTOCOL_STATE_UNCOMPATIBLE = 0x65,
 	PDP_FAIL_PROTOCOL_ERRORS = 0x6F,
-	PDP_FAIL_APN_TYPE_CONFLICT = 0x70,
-	PDP_FAIL_INVALID_PCSCF_ADDR = 0x71,
-	PDP_FAIL_INTERNAL_CALL_PREEMPT_BY_HIGH_PRIO_APN = 0x72,
-	PDP_FAIL_EMM_ACCESS_BARRED = 0x73,
-	PDP_FAIL_EMERGENCY_IFACE_ONLY = 0x74,
-	PDP_FAIL_IFACE_MISMATCH = 0x75,
-	PDP_FAIL_COMPANION_IFACE_IN_USE = 0x76,
-	PDP_FAIL_IP_ADDRESS_MISMATCH = 0x77,
-	PDP_FAIL_IFACE_AND_POL_FAMILY_MISMATCH = 0x78,
-	PDP_FAIL_EMM_ACCESS_BARRED_INFINITE_RETRY = 0x79,
-	PDP_FAIL_AUTH_FAILURE_ON_EMERGENCY_CALL = 0x7A,
 	PDP_FAIL_VOICE_REGISTRATION_FAIL = -1,
 	PDP_FAIL_DATA_REGISTRATION_FAIL = -2,
 	PDP_FAIL_SIGNAL_LOST = -3,
--- a/ofono/drivers/ril/ril_data.c
+++ b/ofono/drivers/ril/ril_data.c
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2021 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  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
@@ -14,8 +14,6 @@
 *  GNU General Public License for more details.
 */

-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-
 #include "ril_data.h"
 #include "ril_radio.h"
 #include "ril_network.h"
@@ -79,7 +77,6 @@ typedef struct ril_data RilData;
 enum ril_data_io_event_id {
 	IO_EVENT_DATA_CALL_LIST_CHANGED,
 	IO_EVENT_RESTRICTED_STATE_CHANGED,
-	IO_EVENT_EOF,
 	IO_EVENT_COUNT
 };

@@ -118,7 +115,6 @@ struct ril_data_priv {
 	gulong io_event_id[IO_EVENT_COUNT];
 	gulong settings_event_id[SETTINGS_EVENT_COUNT];
 	GHashTable* grab;
-	gboolean downgraded_tech; /* Status 55 workaround */
 };

 enum ril_data_signal {
@@ -191,7 +187,6 @@ struct ril_data_request_allow_data {

 static void ril_data_manager_check_network_mode(struct ril_data_manager *dm);
 static void ril_data_call_deact_cid(struct ril_data *data, int cid);
-static void ril_data_cancel_all_requests(struct ril_data *self);
 static void ril_data_power_update(struct ril_data *self);
 static void ril_data_signal_emit(struct ril_data *self, enum ril_data_signal id)
 {
@@ -241,7 +236,6 @@ struct ril_data_call *ril_data_call_dup(const struct ril_data_call *call)
 		dc->dnses = g_strdupv(call->dnses);
 		dc->gateways = g_strdupv(call->gateways);
 		dc->addresses = g_strdupv(call->addresses);
-		dc->pcscf = g_strdupv(call->pcscf);
 		return dc;
 	} else {
 		return NULL;
@@ -252,9 +246,8 @@ static void ril_data_call_destroy(struct ril_data_call *call)
 {
 	g_free(call->ifname);
 	g_strfreev(call->dnses);
-	g_strfreev(call->gateways);
 	g_strfreev(call->addresses);
-	g_strfreev(call->pcscf);
+	g_strfreev(call->gateways);
 }

 void ril_data_call_free(struct ril_data_call *call)
@@ -322,7 +315,8 @@ static gboolean ril_data_call_parse_default(struct ril_data_call *call,

 	/* RIL_Data_Call_Response_v9 */
 	if (version >= 9) {
-		call->pcscf = grilio_parser_split_utf8(rilp, " ");
+		/* PCSCF */
+		grilio_parser_skip_string(rilp);

 		/* RIL_Data_Call_Response_v11 */
 		if (version >= 11) {
@@ -353,19 +347,16 @@ static struct ril_data_call *ril_data_call_parse(struct ril_vendor *vendor,

 	if (parsed) {
 		DBG("[status=%d,retry=%d,cid=%d,active=%d,type=%s,ifname=%s,"
-			"mtu=%d,address=%s,dns=%s %s,gateways=%s,pcscf=%s %s]",
+			"mtu=%d,address=%s,dns=%s %s,gateways=%s]",
 			call->status, call->retry_time,
 			call->cid, call->active,
 			ril_protocol_from_ofono(call->prot),
 			call->ifname, call->mtu,
-			call->addresses ? call->addresses[0] : "",
-			call->dnses ? call->dnses[0] : "",
+			call->addresses ? call->addresses[0] : NULL,
+			call->dnses ? call->dnses[0] : NULL,
 			(call->dnses && call->dnses[0] &&
 			call->dnses[1]) ? call->dnses[1] : "",
-			call->gateways ? call->gateways[0] : "",
-			call->pcscf ? call->pcscf[0] : "",
-			(call->pcscf && call->pcscf[0] &&
-			call->pcscf[1]) ? call->pcscf[1] : "");
+			call->gateways ? call->gateways[0] : NULL);
 		return call;
 	} else {
 		ril_data_call_free(call);
@@ -431,8 +422,7 @@ static gboolean ril_data_call_equal(const struct ril_data_call *c1,
 			!g_strcmp0(c1->ifname, c2->ifname) &&
 			gutil_strv_equal(c1->dnses, c2->dnses) &&
 			gutil_strv_equal(c1->gateways, c2->gateways) &&
-			gutil_strv_equal(c1->addresses, c2->addresses) &&
-			gutil_strv_equal(c1->pcscf, c2->pcscf);
+			gutil_strv_equal(c1->addresses, c2->addresses);
 	} else {
 		return FALSE;
 	}
@@ -825,31 +815,6 @@ static gboolean ril_data_call_setup_retry(void *user_data)
 	return G_SOURCE_REMOVE;
 }

-static gboolean ril_data_call_retry(struct ril_data_request_setup *setup)
-{
-	struct ril_data_request *req = &setup->req;
-	const struct ril_data_options *options = &req->data->priv->options;
-
-	if (setup->retry_count < options->data_call_retry_limit) {
-		req->pending_id = 0;
-		GASSERT(!setup->retry_delay_id);
-		if (!setup->retry_count) {
-			/* No delay first time */
-			setup->retry_count++;
-			DBG("silent retry %u out of %u", setup->retry_count,
-					options->data_call_retry_limit);
-			req->submit(req);
-		} else {
-			const guint ms = options->data_call_retry_delay_ms;
-			DBG("silent retry scheduled in %u ms", ms);
-			setup->retry_delay_id = g_timeout_add(ms,
-					ril_data_call_setup_retry, setup);
-		}
-		return TRUE;
-	}
-	return FALSE;
-}
-
 static void ril_data_call_setup_cb(GRilIoChannel *io, int ril_status,
 				const void *data, guint len, void *user_data)
 {
@@ -874,49 +839,33 @@ static void ril_data_call_setup_cb(GRilIoChannel *io, int ril_status,
 		}
 	}

-	if (call) {
-		switch (call->status) {
+	if (call && call->status == PDP_FAIL_ERROR_UNSPECIFIED &&
+		setup->retry_count < priv->options.data_call_retry_limit) {
 		/*
 		 * According to the comment from ril.h we should silently
-		 * retry. First time we retry immediately and if that doesn't
+		 * retry. First time we retry immediately and if that doedsn't
 		 * work, then after certain delay.
 		 */
-		case PDP_FAIL_ERROR_UNSPECIFIED:
-			if (ril_data_call_retry(setup)) {
-				ril_data_call_list_free(list);
-				return;
-			}
-			break;
-		/*
-		 * With some networks we sometimes start getting error 55
-		 * (Multiple PDN connections for a given APN not allowed)
-		 * when trying to setup an LTE data call and this error
-		 * doesn't go away until we successfully establish a data
-		 * call over 3G. Then we can switch back to LTE.
-		 */
-		case PDP_FAIL_MULTI_CONN_TO_SAME_PDN_NOT_ALLOWED:
-			if (priv->network->data.access_tech ==
-					OFONO_ACCESS_TECHNOLOGY_EUTRAN &&
-						!priv->downgraded_tech) {
-				DBG("downgrading preferred technology");
-				priv->downgraded_tech = TRUE;
-				ril_data_manager_check_network_mode(priv->dm);
-				/* And let this call fail */
-			}
-			break;
-		default:
-			break;
+		req->pending_id = 0;
+		GASSERT(!setup->retry_delay_id);
+		if (!setup->retry_count) {
+			setup->retry_count++;
+			DBG("silent retry %u out of %u", setup->retry_count,
+					priv->options.data_call_retry_limit);
+			req->submit(req);
+		} else {
+			guint ms = priv->options.data_call_retry_delay_ms;
+			DBG("silent retry scheduled in %u ms", ms);
+			setup->retry_delay_id = g_timeout_add(ms,
+					ril_data_call_setup_retry, setup);
 		}
+		ril_data_call_list_free(list);
+		return;
 	}

 	ril_data_request_completed(req);

 	if (call && call->status == PDP_FAIL_NONE) {
-		if (priv->downgraded_tech) {
-			DBG("done with status 55 workaround");
-			priv->downgraded_tech = FALSE;
-			ril_data_manager_check_network_mode(priv->dm);
-		}
 		if (ril_data_call_list_move_calls(self->data_calls, list) > 0) {
 			DBG("data call(s) added");
 			ril_data_signal_emit(self, SIGNAL_CALLS_CHANGED);
@@ -954,10 +903,15 @@ static gboolean ril_data_call_setup_submit(struct ril_data_request *req)
 	 *
 	 * Makes little sense but it is what it is.
 	 */
-	tech = (setup->profile_id == RIL_DATA_PROFILE_IMS) ?
-			RADIO_TECH_LTE : priv->network->data.ril_tech;
+	tech = priv->network->data.ril_tech;
 	if (tech > 2) {
 		tech += 2;
+	} else {
+		/*
+		 * This value used to be hardcoded, let's keep using it
+		 * as the default.
+		 */
+		tech = RADIO_TECH_HSPA;
 	}

 	if (setup->username && setup->username[0]) {
@@ -1012,22 +966,10 @@ static struct ril_data_request *ril_data_call_setup_new(struct ril_data *data,
 		g_new0(struct ril_data_request_setup, 1);
 	struct ril_data_request *req = &setup->req;

-	setup->profile_id = RIL_DATA_PROFILE_DEFAULT;
-	if (priv->use_data_profiles) {
-		switch (context_type) {
-		case OFONO_GPRS_CONTEXT_TYPE_MMS:
-			setup->profile_id = priv->mms_data_profile_id;
-			break;
-		case OFONO_GPRS_CONTEXT_TYPE_IMS:
-			setup->profile_id = RIL_DATA_PROFILE_IMS;
-			break;
-		case OFONO_GPRS_CONTEXT_TYPE_ANY:
-		case OFONO_GPRS_CONTEXT_TYPE_INTERNET:
-		case OFONO_GPRS_CONTEXT_TYPE_WAP:
-			break;
-		}
-	}
-
+	setup->profile_id = (priv->use_data_profiles &&
+		context_type == OFONO_GPRS_CONTEXT_TYPE_MMS) ?
+			priv->mms_data_profile_id :
+			RIL_DATA_PROFILE_DEFAULT;
 	setup->apn = g_strdup(ctx->apn);
 	setup->username = g_strdup(ctx->username);
 	setup->password = g_strdup(ctx->password);
@@ -1206,39 +1148,9 @@ static struct ril_data_request *ril_data_allow_new(struct ril_data *data,
 	return req;
 }

-static gboolean ril_data_allow_can_submit(struct ril_data *self)
-{
-	if (self) {
-		switch (self->priv->options.allow_data) {
-		case RIL_ALLOW_DATA_ENABLED:
-			return TRUE;
-		case RIL_ALLOW_DATA_DISABLED:
-		case RIL_ALLOW_DATA_AUTO:
-			break;
-		}
-	}
-	return FALSE;
-}
-
-static gboolean ril_data_allow_submit_request(struct ril_data *data,
-							gboolean allow)
-{
-	if (ril_data_allow_can_submit(data)) {
-		ril_data_request_queue(ril_data_allow_new(data, allow));
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
 /*==========================================================================*
 * ril_data
 *==========================================================================*/
-static enum ofono_radio_access_mode ril_data_max_mode(struct ril_data *self)
-{
-	return self->priv->downgraded_tech ? OFONO_RADIO_ACCESS_MODE_UMTS :
-						OFONO_RADIO_ACCESS_MODE_ANY;
-}

 gulong ril_data_add_allow_changed_handler(struct ril_data *self,
 						ril_data_cb_t cb, void *arg)
@@ -1261,39 +1173,12 @@ void ril_data_remove_handler(struct ril_data *self, gulong id)
 	}
 }

-static void ril_data_imsi_changed(struct ril_sim_settings *settings,
-							void *user_data)
-{
-	struct ril_data *self = RIL_DATA(user_data);
-	struct ril_data_priv *priv = self->priv;
-
-	if (!settings->imsi) {
-		/*
-		 * Most likely, SIM removal. In any case, no data requests
-		 * make sense when IMSI is unavailable.
-		 */
-		ril_data_cancel_all_requests(self);
-	}
-	ril_data_manager_check_network_mode(priv->dm);
-}
-
 static void ril_data_settings_changed(struct ril_sim_settings *settings,
 							void *user_data)
 {
 	ril_data_manager_check_network_mode(RIL_DATA(user_data)->priv->dm);
 }

-static void ril_data_ril_disconnected_cb(GRilIoChannel *io, void *user_data)
-{
-	struct ril_data *self = RIL_DATA(user_data);
-	struct ril_data_priv *priv = self->priv;
-
-	DBG_(self, "disconnected");
-	priv->flags = RIL_DATA_FLAG_NONE;
-	priv->restricted_state = 0;
-	ril_data_cancel_all_requests(self);
-}
-
 static gint ril_data_compare_cb(gconstpointer a, gconstpointer b)
 {
 	const struct ril_data *d1 = a;
@@ -1353,13 +1238,10 @@ struct ril_data *ril_data_new(struct ril_data_manager *dm, const char *name,
 			grilio_channel_add_unsol_event_handler(io,
 				ril_data_restricted_state_changed_cb,
 				RIL_UNSOL_RESTRICTED_STATE_CHANGED, self);
-		priv->io_event_id[IO_EVENT_EOF] =
-			grilio_channel_add_disconnected_handler(io,
-				ril_data_ril_disconnected_cb, self);

 		priv->settings_event_id[SETTINGS_EVENT_IMSI_CHANGED] =
 			ril_sim_settings_add_imsi_changed_handler(settings,
-					ril_data_imsi_changed, self);
+					ril_data_settings_changed, self);
 		priv->settings_event_id[SETTINGS_EVENT_PREF_MODE] =
 			ril_sim_settings_add_pref_mode_changed_handler(settings,
 					ril_data_settings_changed, self);
@@ -1482,20 +1364,6 @@ static void ril_data_cancel_requests(struct ril_data *self,
 	}
 }

-static void ril_data_cancel_all_requests(struct ril_data *self)
-{
-	struct ril_data_priv *priv = self->priv;
-	struct ril_data_request *req = priv->req_queue;
-
-	ril_data_request_do_cancel(priv->pending_req);
-	while (req) {
-		struct ril_data_request *next = req->next;
-
-		ril_data_request_do_cancel(req);
-		req = next;
-	}
-}
-
 static void ril_data_disallow(struct ril_data *self)
 {
 	struct ril_data_priv *priv = self->priv;
@@ -1517,8 +1385,10 @@ static void ril_data_disallow(struct ril_data *self)
 	 */
 	ril_data_deactivate_all(self);

-	/* Tell rild that the data is now disabled */
-	if (!ril_data_allow_submit_request(self, FALSE)) {
+	if (priv->options.allow_data == RIL_ALLOW_DATA_ENABLED) {
+		/* Tell rild that the data is now disabled */
+		ril_data_request_queue(ril_data_allow_new(self, FALSE));
+	} else {
 		priv->flags &= ~RIL_DATA_FLAG_ON;
 		GASSERT(!ril_data_allowed(self));
 		DBG_(self, "data off");
@@ -1665,11 +1535,24 @@ static void ril_data_dispose(GObject *object)
 	struct ril_data *self = RIL_DATA(object);
 	struct ril_data_priv *priv = self->priv;
 	struct ril_data_manager	*dm = priv->dm;
+	struct ril_network *network = priv->network;
+	struct ril_sim_settings *settings = network->settings;
+	struct ril_data_request *req;

+	ril_sim_settings_remove_handlers(settings, priv->settings_event_id,
+					G_N_ELEMENTS(priv->settings_event_id));
+	grilio_channel_remove_all_handlers(priv->io, priv->io_event_id);
 	grilio_queue_cancel_all(priv->q, FALSE);
 	priv->query_id = 0;

-	ril_data_cancel_all_requests(self);
+	ril_data_request_do_cancel(priv->pending_req);
+	req = priv->req_queue;
+	while (req) {
+		struct ril_data_request *next = req->next;
+		ril_data_request_do_cancel(req);
+		req = next;
+	}
+
 	dm->data_list = g_slist_remove(dm->data_list, self);
 	ril_data_manager_check_data(dm);
 	g_hash_table_destroy(priv->grab);
@@ -1680,11 +1563,6 @@ static void ril_data_finalize(GObject *object)
 {
 	struct ril_data *self = RIL_DATA(object);
 	struct ril_data_priv *priv = self->priv;
-	struct ril_network *network = priv->network;
-	struct ril_sim_settings *settings = network->settings;
-
-	ril_sim_settings_remove_all_handlers(settings, priv->settings_event_id);
-	grilio_channel_remove_all_handlers(priv->io, priv->io_event_id);

 	g_free(priv->log_prefix);
 	grilio_queue_unref(priv->q);
@@ -1770,39 +1648,34 @@ static void ril_data_manager_check_network_mode(struct ril_data_manager *self)

 	if ((self->flags & RIL_DATA_MANAGER_FORCE_GSM_ON_OTHER_SLOTS) &&
 		ril_data_manager_handover(self)) {
-		struct ril_network *lte_network = NULL, *best_network = NULL;
-		enum ofono_radio_access_mode best_mode =
-						OFONO_RADIO_ACCESS_MODE_ANY;
+		struct ril_network *lte_network = NULL;
+		int non_gsm_count = 0;

-		/* Find a SIM for internet access */
+		/*
+		 * Count number of SIMs for which non-GSM mode is selected
+		 */
 		for (l= self->data_list; l; l = l->next) {
 			struct ril_data *data = l->data;
 			struct ril_data_priv *priv = data->priv;
 			struct ril_network *network = priv->network;
 			struct ril_sim_settings *sim = network->settings;
-			enum ofono_radio_access_mode mode;

-			/* Select the first network with internet role */
-			if ((sim->pref_mode != OFONO_RADIO_ACCESS_MODE_GSM) &&
-				(priv->flags & RIL_DATA_FLAG_MAX_SPEED)) {
-				lte_network = network;
-				break;
-			}
-
-			/* At the same time, look for a suitable slot */
-			mode = ril_network_max_supported_mode(network);
-			if (mode > best_mode) {
-				best_network = network;
-				best_mode = mode;
+			if (sim->pref_mode != OFONO_RADIO_ACCESS_MODE_GSM) {
+				non_gsm_count++;
+				if ((priv->flags & RIL_DATA_FLAG_MAX_SPEED) &&
+							!lte_network) {
+					lte_network = network;
+				}
 			}
 		}

 		/*
 		 * If there's no SIM selected for internet access
-		 * then use a slot with highest capabilities for LTE.
+		 * then choose the first slot for LTE.
 		 */
 		if (!lte_network) {
-			lte_network = best_network;
+			struct ril_data *data = self->data_list->data;
+			lte_network = data->priv->network;
 		}

 		for (l= self->data_list; l; l = l->next) {
@@ -1811,7 +1684,7 @@ static void ril_data_manager_check_network_mode(struct ril_data_manager *self)

 			ril_network_set_max_pref_mode(network,
 					(network == lte_network) ?
-					ril_data_max_mode(data) :
+					OFONO_RADIO_ACCESS_MODE_ANY :
 					OFONO_RADIO_ACCESS_MODE_GSM,
 					FALSE);
 		}
@@ -1821,21 +1694,19 @@ static void ril_data_manager_check_network_mode(struct ril_data_manager *self)
 		for (l= self->data_list; l; l = l->next) {
 			struct ril_data *data = l->data;
 			ril_network_set_max_pref_mode(data->priv->network,
-					ril_data_max_mode(data), FALSE);
+					OFONO_RADIO_ACCESS_MODE_ANY, FALSE);
 		}
 	}
 }

 static struct ril_data *ril_data_manager_allowed(struct ril_data_manager *self)
 {
-	if (self) {
-		GSList *l;
+	GSList *l;

-		for (l= self->data_list; l; l = l->next) {
-			struct ril_data *data = l->data;
-			if (data->priv->flags & RIL_DATA_FLAG_ALLOWED) {
-				return data;
-			}
+	for (l= self->data_list; l; l = l->next) {
+		struct ril_data *data = l->data;
+		if (data->priv->flags & RIL_DATA_FLAG_ALLOWED) {
+			return data;
 		}
 	}

@@ -1852,10 +1723,12 @@ static void ril_data_manager_switch_data_on(struct ril_data_manager *self,

 	if (ril_data_manager_handover(self)) {
 		ril_network_set_max_pref_mode(priv->network,
-					ril_data_max_mode(data), TRUE);
+					OFONO_RADIO_ACCESS_MODE_ANY, TRUE);
 	}

-	if (!ril_data_allow_submit_request(data, TRUE)) {
+	if (priv->options.allow_data == RIL_ALLOW_DATA_ENABLED) {
+		ril_data_request_queue(ril_data_allow_new(data, TRUE));
+	} else {
 		priv->flags |= RIL_DATA_FLAG_ON;
 		GASSERT(ril_data_allowed(data));
 		DBG_(data, "data on");
@@ -1879,7 +1752,12 @@ void ril_data_manager_check_data(struct ril_data_manager *self)

 void ril_data_manager_assert_data_on(struct ril_data_manager *self)
 {
-	ril_data_allow_submit_request(ril_data_manager_allowed(self), TRUE);
+	if (self) {
+		struct ril_data *data = ril_data_manager_allowed(self);
+		if (data) {
+			ril_data_request_queue(ril_data_allow_new(data, TRUE));
+		}
+	}
 }

 /*
--- a/ofono/drivers/ril/ril_data.h
+++ b/ofono/drivers/ril/ril_data.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2021 Jolla Ltd.
+ *  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
@@ -40,7 +40,6 @@ struct ril_data_call {
 	char **dnses;
 	char **gateways;
 	char **addresses;
-	char **pcscf;
 };

 struct ril_data_call_list {
@@ -80,6 +79,12 @@ struct ril_data_options {
 	unsigned int data_call_retry_delay_ms;
 };

+enum ril_data_role {
+	RIL_DATA_ROLE_NONE,    /* Data not allowed */
+	RIL_DATA_ROLE_MMS,     /* Data is allowed at any speed */
+	RIL_DATA_ROLE_INTERNET /* Data is allowed at full speed */
+};
+
 struct ril_data_manager;
 struct ril_data_manager *ril_data_manager_new(enum ril_data_manager_flags flg);
 struct ril_data_manager *ril_data_manager_ref(struct ril_data_manager *dm);
--- a/ofono/drivers/ril/ril_devmon.c
+++ b/ofono/drivers/ril/ril_devmon.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2019-2021 Jolla Ltd.
+ *  Copyright (C) 2019 Jolla Ltd.
 *
 *  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
@@ -16,7 +16,7 @@
 #include "ril_devmon.h"

 struct ril_devmon_io *ril_devmon_start_io(struct ril_devmon *devmon,
-		GRilIoChannel *channel, struct ofono_cell_info *cell_info)
+		GRilIoChannel *channel, struct sailfish_cell_info *cell_info)
 {
 	return devmon ? devmon->start_io(devmon, channel, cell_info) : NULL;
 }
--- a/ofono/drivers/ril/ril_devmon.h
+++ b/ofono/drivers/ril/ril_devmon.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2019-2021 Jolla Ltd.
+ *  Copyright (C) 2019-2020 Jolla Ltd.
 *  Copyright (C) 2020 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -17,9 +17,7 @@
 #ifndef RIL_DEVMON_H
 #define RIL_DEVMON_H

-#include "ril_types.h"
-
-#include <ofono/cell-info.h>
+#include "ril_cell_info.h"

 /*
 * Separate instance of ril_devmon is created for each modem.
@@ -33,32 +31,36 @@ struct ril_devmon_io {
 struct ril_devmon {
 	void (*free)(struct ril_devmon *devmon);
 	struct ril_devmon_io *(*start_io)(struct ril_devmon *devmon,
-		GRilIoChannel *channel, struct ofono_cell_info *cell_info);
+		GRilIoChannel *channel, struct sailfish_cell_info *cell_info);
 };

+/* Cell info update intervals */
+#define RIL_CELL_INFO_INTERVAL_SHORT_MS (2000) /* 2 sec */
+#define RIL_CELL_INFO_INTERVAL_LONG_MS (30000) /* 30 sec */
+
 /*
 * Legacy Device Monitor uses RIL_REQUEST_SCREEN_STATE to tell
 * the modem when screen turns on and off.
 */
-struct ril_devmon *ril_devmon_ss_new(const struct ril_slot_config *config);
+struct ril_devmon *ril_devmon_ss_new(void);

 /*
 * This Device Monitor uses RIL_REQUEST_SEND_DEVICE_STATE to let
 * the modem choose the right power saving strategy. It basically
 * mirrors the logic of Android's DeviceStateMonitor class.
 */
-struct ril_devmon *ril_devmon_ds_new(const struct ril_slot_config *config);
+struct ril_devmon *ril_devmon_ds_new(void);

 /*
 * This Device Monitor implementation controls network state updates
 * by sending SET_UNSOLICITED_RESPONSE_FILTER.
 */
-struct ril_devmon *ril_devmon_ur_new(const struct ril_slot_config *config);
+struct ril_devmon *ril_devmon_ur_new(void);

 /*
 * This one selects the type based on the RIL version.
 */
-struct ril_devmon *ril_devmon_auto_new(const struct ril_slot_config *config);
+struct ril_devmon *ril_devmon_auto_new(void);

 /*
 * This one combines several methods. Takes ownership of ril_devmon objects.
@@ -67,7 +69,7 @@ struct ril_devmon *ril_devmon_combine(struct ril_devmon *devmon[], guint n);

 /* Utilities (NULL tolerant) */
 struct ril_devmon_io *ril_devmon_start_io(struct ril_devmon *devmon,
-		GRilIoChannel *channel, struct ofono_cell_info *cell_info);
+		GRilIoChannel *channel, struct sailfish_cell_info *cell_info);
 void ril_devmon_io_free(struct ril_devmon_io *devmon_io);
 void ril_devmon_free(struct ril_devmon *devmon);

--- a/ofono/drivers/ril/ril_devmon_auto.c
+++ b/ofono/drivers/ril/ril_devmon_auto.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2019-2021 Jolla Ltd.
+ *  Copyright (C) 2019 Jolla Ltd.
 *
 *  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
@@ -31,7 +31,7 @@ static inline DevMon *ril_devmon_auto_cast(struct ril_devmon *pub)
 }

 static struct ril_devmon_io *ril_devmon_auto_start_io(struct ril_devmon *devmon,
-		GRilIoChannel *io, struct ofono_cell_info *cell_info)
+		GRilIoChannel *io, struct sailfish_cell_info *cell_info)
 {
 	DevMon *self = ril_devmon_auto_cast(devmon);

@@ -65,7 +65,7 @@ static void ril_devmon_auto_free(struct ril_devmon *devmon)
 	g_free(self);
 }

-struct ril_devmon *ril_devmon_auto_new(const struct ril_slot_config *config)
+struct ril_devmon *ril_devmon_auto_new()
 {
 	DevMon *self = g_new0(DevMon, 1);

@@ -78,8 +78,8 @@ struct ril_devmon *ril_devmon_auto_new(const struct ril_slot_config *config)
 	 */
 	self->pub.free = ril_devmon_auto_free;
 	self->pub.start_io = ril_devmon_auto_start_io;
-	self->ss = ril_devmon_ss_new(config);
-	self->ds = ril_devmon_ds_new(config);
+	self->ss = ril_devmon_ss_new();
+	self->ds = ril_devmon_ds_new();
 	return &self->pub;
 }

--- a/ofono/drivers/ril/ril_devmon_combine.c
+++ b/ofono/drivers/ril/ril_devmon_combine.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2020-2021 Jolla Ltd.
+ *  Copyright (C) 2020 Jolla Ltd.
 *  Copyright (C) 2020 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -52,7 +52,7 @@ static void ril_devmon_combine_io_free(struct ril_devmon_io *io)
 }

 static struct ril_devmon_io *ril_devmon_combine_start_io(struct ril_devmon *dm,
-			GRilIoChannel *chan, struct ofono_cell_info *ci)
+			GRilIoChannel *chan, struct sailfish_cell_info *ci)
 {
 	guint i;
 	DevMon *self = ril_devmon_combine_cast(dm);
--- a/ofono/drivers/ril/ril_devmon_ds.c
+++ b/ofono/drivers/ril/ril_devmon_ds.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2019-2021 Jolla Ltd.
+ *  Copyright (C) 2019 Jolla Ltd.
 *
 *  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
@@ -65,14 +65,12 @@ typedef struct ril_devmon_ds {
 	MceBattery *battery;
 	MceCharger *charger;
 	MceDisplay *display;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
 } DevMon;

 typedef struct ril_devmon_ds_io {
 	struct ril_devmon_io pub;
 	struct ril_connman *connman;
-	struct ofono_cell_info *cell_info;
+	struct sailfish_cell_info *cell_info;
 	MceBattery *battery;
 	MceCharger *charger;
 	MceDisplay *display;
@@ -88,8 +86,6 @@ typedef struct ril_devmon_ds_io {
 	gulong charger_event_id[CHARGER_EVENT_COUNT];
 	gulong display_event_id[DISPLAY_EVENT_COUNT];
 	guint req_id;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
 } DevMonIo;

 #define DBG_(self,fmt,args...) DBG("%s: " fmt, (self)->io->name, ##args)
@@ -201,12 +197,12 @@ static void ril_devmon_ds_io_update_low_data(DevMonIo *self)

 static void ril_devmon_ds_io_set_cell_info_update_interval(DevMonIo *self)
 {
-	ofono_cell_info_set_update_interval(self->cell_info,
+	sailfish_cell_info_set_update_interval(self->cell_info,
 		(ril_devmon_ds_display_on(self->display) &&
 			(ril_devmon_ds_charging(self->charger) ||
 				ril_devmon_ds_battery_ok(self->battery))) ?
-					self->cell_info_interval_short_ms :
-					self->cell_info_interval_long_ms);
+					RIL_CELL_INFO_INTERVAL_SHORT_MS :
+					RIL_CELL_INFO_INTERVAL_LONG_MS);
 }

 static void ril_devmon_ds_io_connman_cb(struct ril_connman *connman,
@@ -257,12 +253,12 @@ static void ril_devmon_ds_io_free(struct ril_devmon_io *devmon_io)
 	grilio_channel_cancel_request(self->io, self->charging_req_id, FALSE);
 	grilio_channel_unref(self->io);

-	ofono_cell_info_unref(self->cell_info);
+	sailfish_cell_info_unref(self->cell_info);
 	g_free(self);
 }

 static struct ril_devmon_io *ril_devmon_ds_start_io(struct ril_devmon *devmon,
-		GRilIoChannel *io, struct ofono_cell_info *cell_info)
+		GRilIoChannel *io, struct sailfish_cell_info *cell_info)
 {
 	DevMon *ds = ril_devmon_ds_cast(devmon);
 	DevMonIo *self = g_new0(DevMonIo, 1);
@@ -271,7 +267,7 @@ static struct ril_devmon_io *ril_devmon_ds_start_io(struct ril_devmon *devmon,
 	self->low_data_supported = TRUE;
 	self->charging_supported = TRUE;
 	self->io = grilio_channel_ref(io);
-	self->cell_info = ofono_cell_info_ref(cell_info);
+	self->cell_info = sailfish_cell_info_ref(cell_info);

 	self->connman = ril_connman_ref(ds->connman);
 	self->connman_event_id[CONNMAN_EVENT_VALID] =
@@ -307,11 +303,6 @@ static struct ril_devmon_io *ril_devmon_ds_start_io(struct ril_devmon *devmon,
 		mce_display_add_state_changed_handler(self->display,
 			ril_devmon_ds_io_display_cb, self);

-	self->cell_info_interval_short_ms =
-				ds->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-				ds->cell_info_interval_long_ms;
-
 	ril_devmon_ds_io_update_low_data(self);
 	ril_devmon_ds_io_update_charging(self);
 	ril_devmon_ds_io_set_cell_info_update_interval(self);
@@ -329,7 +320,7 @@ static void ril_devmon_ds_free(struct ril_devmon *devmon)
 	g_free(self);
 }

-struct ril_devmon *ril_devmon_ds_new(const struct ril_slot_config *config)
+struct ril_devmon *ril_devmon_ds_new()
 {
 	DevMon *self = g_new0(DevMon, 1);

@@ -339,10 +330,6 @@ struct ril_devmon *ril_devmon_ds_new(const struct ril_slot_config *config)
 	self->battery = mce_battery_new();
 	self->charger = mce_charger_new();
 	self->display = mce_display_new();
-	self->cell_info_interval_short_ms =
-				config->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-				config->cell_info_interval_long_ms;
 	return &self->pub;
 }

--- a/ofono/drivers/ril/ril_devmon_ss.c
+++ b/ofono/drivers/ril/ril_devmon_ss.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2019-2021 Jolla Ltd.
+ *  Copyright (C) 2019 Jolla Ltd.
 *
 *  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
@@ -50,13 +50,11 @@ typedef struct ril_devmon_ss {
 	MceBattery *battery;
 	MceCharger *charger;
 	MceDisplay *display;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
 } DevMon;

 typedef struct ril_devmon_ss_io {
 	struct ril_devmon_io pub;
-	struct ofono_cell_info *cell_info;
+	struct sailfish_cell_info *cell_info;
 	MceBattery *battery;
 	MceCharger *charger;
 	MceDisplay *display;
@@ -67,8 +65,6 @@ typedef struct ril_devmon_ss_io {
 	gulong charger_event_id[CHARGER_EVENT_COUNT];
 	gulong display_event_id[DISPLAY_EVENT_COUNT];
 	guint req_id;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
 } DevMonIo;

 inline static DevMon *ril_devmon_ss_cast(struct ril_devmon *pub)
@@ -131,11 +127,11 @@ static void ril_devmon_ss_io_send_screen_state(DevMonIo *self)

 static void ril_devmon_ss_io_set_cell_info_update_interval(DevMonIo *self)
 {
-	ofono_cell_info_set_update_interval(self->cell_info,
+	sailfish_cell_info_set_update_interval(self->cell_info,
 		(self->display_on && (ril_devmon_ss_charging(self->charger) ||
 				ril_devmon_ss_battery_ok(self->battery))) ?
-					self->cell_info_interval_short_ms :
-					self->cell_info_interval_long_ms);
+					RIL_CELL_INFO_INTERVAL_SHORT_MS :
+					RIL_CELL_INFO_INTERVAL_LONG_MS);
 }

 static void ril_devmon_ss_io_battery_cb(MceBattery *battery, void *user_data)
@@ -176,12 +172,12 @@ static void ril_devmon_ss_io_free(struct ril_devmon_io *devmon_io)
 	grilio_channel_cancel_request(self->io, self->req_id, FALSE);
 	grilio_channel_unref(self->io);

-	ofono_cell_info_unref(self->cell_info);
+	sailfish_cell_info_unref(self->cell_info);
 	g_free(self);
 }

 static struct ril_devmon_io *ril_devmon_ss_start_io(struct ril_devmon *devmon,
-		GRilIoChannel *io, struct ofono_cell_info *cell_info)
+		GRilIoChannel *io, struct sailfish_cell_info *cell_info)
 {
 	DevMon *ss = ril_devmon_ss_cast(devmon);
 	DevMonIo *self = g_new0(DevMonIo, 1);
@@ -189,7 +185,7 @@ static struct ril_devmon_io *ril_devmon_ss_start_io(struct ril_devmon *devmon,
 	self->pub.free = ril_devmon_ss_io_free;
 	self->screen_state_supported = TRUE;
 	self->io = grilio_channel_ref(io);
-	self->cell_info = ofono_cell_info_ref(cell_info);
+	self->cell_info = sailfish_cell_info_ref(cell_info);

 	self->battery = mce_battery_ref(ss->battery);
 	self->battery_event_id[BATTERY_EVENT_VALID] =
@@ -216,11 +212,6 @@ static struct ril_devmon_io *ril_devmon_ss_start_io(struct ril_devmon *devmon,
 		mce_display_add_state_changed_handler(self->display,
 			ril_devmon_ss_io_display_cb, self);

-	self->cell_info_interval_short_ms =
-			ss->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-			ss->cell_info_interval_long_ms;
-
 	ril_devmon_ss_io_send_screen_state(self);
 	ril_devmon_ss_io_set_cell_info_update_interval(self);
 	return &self->pub;
@@ -236,7 +227,7 @@ static void ril_devmon_ss_free(struct ril_devmon *devmon)
 	g_free(self);
 }

-struct ril_devmon *ril_devmon_ss_new(const struct ril_slot_config *config)
+struct ril_devmon *ril_devmon_ss_new()
 {
 	DevMon *self = g_new0(DevMon, 1);

@@ -245,10 +236,6 @@ struct ril_devmon *ril_devmon_ss_new(const struct ril_slot_config *config)
 	self->battery = mce_battery_new();
 	self->charger = mce_charger_new();
 	self->display = mce_display_new();
-	self->cell_info_interval_short_ms =
-			config->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-			config->cell_info_interval_long_ms;
 	return &self->pub;
 }

--- a/ofono/drivers/ril/ril_devmon_ur.c
+++ b/ofono/drivers/ril/ril_devmon_ur.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2019-2021 Jolla Ltd.
+ *  Copyright (C) 2019 Jolla Ltd.
 *  Copyright (C) 2020 Open Mobile Platform LLC
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -55,13 +55,11 @@ typedef struct ril_devmon_ur {
 	MceBattery *battery;
 	MceCharger *charger;
 	MceDisplay *display;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
 } DevMon;

 typedef struct ril_devmon_ur_io {
 	struct ril_devmon_io pub;
-	struct ofono_cell_info *cell_info;
+	struct sailfish_cell_info *cell_info;
 	MceBattery *battery;
 	MceCharger *charger;
 	MceDisplay *display;
@@ -72,8 +70,6 @@ typedef struct ril_devmon_ur_io {
 	gulong charger_event_id[CHARGER_EVENT_COUNT];
 	gulong display_event_id[DISPLAY_EVENT_COUNT];
 	guint req_id;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
 } DevMonIo;

 #define DBG_(self,fmt,args...) DBG("%s: " fmt, (self)->io->name, ##args)
@@ -137,11 +133,11 @@ static void ril_devmon_ur_io_set_unsol_response_filter(DevMonIo *self)

 static void ril_devmon_ur_io_set_cell_info_update_interval(DevMonIo *self)
 {
-	ofono_cell_info_set_update_interval(self->cell_info,
+	sailfish_cell_info_set_update_interval(self->cell_info,
 		(self->display_on && (ril_devmon_ur_charging(self->charger) ||
 				ril_devmon_ur_battery_ok(self->battery))) ?
-					self->cell_info_interval_short_ms :
-					self->cell_info_interval_long_ms);
+					RIL_CELL_INFO_INTERVAL_SHORT_MS :
+					RIL_CELL_INFO_INTERVAL_LONG_MS);
 }

 static void ril_devmon_ur_io_battery_cb(MceBattery *battery, void *user_data)
@@ -182,12 +178,12 @@ static void ril_devmon_ur_io_free(struct ril_devmon_io *devmon_io)
 	grilio_channel_cancel_request(self->io, self->req_id, FALSE);
 	grilio_channel_unref(self->io);

-	ofono_cell_info_unref(self->cell_info);
+	sailfish_cell_info_unref(self->cell_info);
 	g_free(self);
 }

 static struct ril_devmon_io *ril_devmon_ur_start_io(struct ril_devmon *devmon,
-		GRilIoChannel *io, struct ofono_cell_info *cell_info)
+		GRilIoChannel *io, struct sailfish_cell_info *cell_info)
 {
 	DevMon *ur = ril_devmon_ur_cast(devmon);
 	DevMonIo *self = g_new0(DevMonIo, 1);
@@ -195,7 +191,7 @@ static struct ril_devmon_io *ril_devmon_ur_start_io(struct ril_devmon *devmon,
 	self->pub.free = ril_devmon_ur_io_free;
 	self->unsol_filter_supported = TRUE;
 	self->io = grilio_channel_ref(io);
-	self->cell_info = ofono_cell_info_ref(cell_info);
+	self->cell_info = sailfish_cell_info_ref(cell_info);

 	self->battery = mce_battery_ref(ur->battery);
 	self->battery_event_id[BATTERY_EVENT_VALID] =
@@ -222,11 +218,6 @@ static struct ril_devmon_io *ril_devmon_ur_start_io(struct ril_devmon *devmon,
 		mce_display_add_state_changed_handler(self->display,
 			ril_devmon_ur_io_display_cb, self);

-	self->cell_info_interval_short_ms =
-			ur->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-			ur->cell_info_interval_long_ms;
-
 	ril_devmon_ur_io_set_unsol_response_filter(self);
 	ril_devmon_ur_io_set_cell_info_update_interval(self);
 	return &self->pub;
@@ -242,7 +233,7 @@ static void ril_devmon_ur_free(struct ril_devmon *devmon)
 	g_free(self);
 }

-struct ril_devmon *ril_devmon_ur_new(const struct ril_slot_config *config)
+struct ril_devmon *ril_devmon_ur_new()
 {
 	DevMon *self = g_new0(DevMon, 1);

@@ -251,10 +242,6 @@ struct ril_devmon *ril_devmon_ur_new(const struct ril_slot_config *config)
 	self->battery = mce_battery_new();
 	self->charger = mce_charger_new();
 	self->display = mce_display_new();
-	self->cell_info_interval_short_ms =
-			config->cell_info_interval_short_ms;
-	self->cell_info_interval_long_ms =
-			config->cell_info_interval_long_ms;
 	return &self->pub;
 }

--- a/ofono/drivers/ril/ril_ecclist.c
+++ b/ofono/drivers/ril/ril_ecclist.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2020 Jolla Ltd.
+ *  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
@@ -14,8 +14,6 @@
 *  GNU General Public License for more details.
 */

-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-
 #include "ril_ecclist.h"
 #include "ril_log.h"

--- a/ofono/drivers/ril/ril_gprs.c
+++ b/ofono/drivers/ril/ril_gprs.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2016 Jolla Ltd.
 *
 *  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
@@ -15,12 +15,11 @@

 #include "ril_plugin.h"
 #include "ril_network.h"
-#include "ril_netreg.h"
 #include "ril_data.h"
 #include "ril_util.h"
 #include "ril_log.h"

-#include <ofono/misc.h>
+#include "common.h"

 /*
 * This module is the ofono_gprs_driver implementation for rilmodem.
@@ -48,7 +47,7 @@ struct ril_gprs {
 	GRilIoQueue *q;
 	gboolean attached;
 	int max_cids;
-	enum ofono_netreg_status registration_status;
+	enum network_registration_status registration_status;
 	guint register_id;
 	gulong network_event_id;
 	gulong data_event_id;
@@ -79,11 +78,11 @@ static struct ril_gprs_cbd *ril_gprs_cbd_new(struct ril_gprs *gd,
 	return cbd;
 }

-static enum ofono_netreg_status ril_gprs_fix_registration_status(
-		struct ril_gprs *gd, enum ofono_netreg_status status)
+static enum network_registration_status ril_gprs_fix_registration_status(
+		struct ril_gprs *gd, enum network_registration_status status)
 {
 	if (!ril_data_allowed(gd->data)) {
-		return OFONO_NETREG_STATUS_NOT_REGISTERED;
+		return NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
 	} else {
 		/* TODO: need a way to make sure that SPDI information has
 		 * already been read from the SIM (i.e. sim_spdi_read_cb in
@@ -95,13 +94,13 @@ static enum ofono_netreg_status ril_gprs_fix_registration_status(

 static void ril_gprs_data_update_registration_state(struct ril_gprs *gd)
 {
-	const enum ofono_netreg_status status =
+	const enum network_registration_status status =
 		ril_gprs_fix_registration_status(gd, gd->network->data.status);

 	if (gd->registration_status != status) {
 		ofono_info("data reg changed %d -> %d (%s), attached %d",
 				gd->registration_status, status,
-				ofono_netreg_status_to_string(status),
+				registration_status_to_string(status),
 				gd->attached);
 		gd->registration_status = status;
 		ofono_gprs_status_notify(gd->gprs, gd->registration_status);
@@ -189,10 +188,12 @@ static void ril_gprs_registration_status(struct ofono_gprs *gprs,
 {
 	struct ril_gprs *gd = ril_gprs_get_data(gprs);
 	struct ofono_error error;
-	const enum ofono_netreg_status status = gd->attached ?
-		gd->registration_status : OFONO_NETREG_STATUS_NOT_REGISTERED;
+	const enum network_registration_status status = gd->attached ?
+		gd->registration_status :
+		NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;

-	DBG("%d (%s)", status, ofono_netreg_status_to_string(status));
+
+	DBG("%d (%s)", status, registration_status_to_string(status));
 	cb(ril_error_ok(&error), status, data);
 }

--- a/ofono/drivers/ril/ril_gprs_context.c
+++ b/ofono/drivers/ril/ril_gprs_context.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
 *
 *  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
@@ -15,20 +15,21 @@

 #include "ril_plugin.h"
 #include "ril_network.h"
-#include "ril_netreg.h"
 #include "ril_data.h"
 #include "ril_util.h"
 #include "ril_log.h"

-#include <ofono/mtu-limit.h>
-
 #include <gutil_strv.h>

 #include <arpa/inet.h>

+#include "ofono.h"
+#include "common.h"
+#include "mtu-watch.h"
+
 #define CTX_ID_NONE ((unsigned int)(-1))

-#define MAX_MMS_MTU 1280
+#define MAX_MTU 1280

 struct ril_gprs_context_call {
 	struct ril_data_request *req;
@@ -43,7 +44,7 @@ struct ril_gprs_context {
 	struct ril_data *data;
 	guint active_ctx_cid;
 	gulong calls_changed_id;
-	struct ofono_mtu_limit *mtu_limit;
+	struct mtu_watch *mtu_watch;
 	struct ril_data_call *active_call;
 	struct ril_gprs_context_call activate;
 	struct ril_gprs_context_call deactivate;
@@ -95,9 +96,9 @@ static void ril_gprs_context_free_active_call(struct ril_gprs_context *gcd)
 		ril_data_remove_handler(gcd->data, gcd->calls_changed_id);
 		gcd->calls_changed_id = 0;
 	}
-	if (gcd->mtu_limit) {
-		ofono_mtu_limit_free(gcd->mtu_limit);
-		gcd->mtu_limit = NULL;
+	if (gcd->mtu_watch) {
+		mtu_watch_free(gcd->mtu_watch);
+		gcd->mtu_watch = NULL;
 	}
 }

@@ -107,18 +108,10 @@ static void ril_gprs_context_set_active_call(struct ril_gprs_context *gcd,
 	if (call) {
 		ril_data_call_free(gcd->active_call);
 		gcd->active_call = ril_data_call_dup(call);
-		if (ofono_gprs_context_get_type(gcd->gc) ==
-					OFONO_GPRS_CONTEXT_TYPE_MMS) {
-			/*
-			 * Some MMS providers have a problem with MTU
-			 * greater than 1280. Let's be safe.
-			 */
-			if (!gcd->mtu_limit) {
-				gcd->mtu_limit =
-					ofono_mtu_limit_new(MAX_MMS_MTU);
-			}
+		if (!gcd->mtu_watch) {
+			gcd->mtu_watch = mtu_watch_new(MAX_MTU);
 		}
-		ofono_mtu_limit_set_ifname(gcd->mtu_limit, call->ifname);
+		mtu_watch_set_ifname(gcd->mtu_watch, call->ifname);
 		ril_data_call_grab(gcd->data, call->cid, gcd);
 	} else {
 		ril_gprs_context_free_active_call(gcd);
@@ -254,59 +247,34 @@ static void ril_gprs_context_set_gateway(struct ofono_gprs_context *gc,
 	ofono_gprs_context_set_ipv6_gateway(gc, ipv6_gw);
 }

-typedef void (*ofono_gprs_context_list_setter_t)(struct ofono_gprs_context *gc,
-				const char **list);
-
-static void ril_gprs_context_set_servers(struct ofono_gprs_context *gc,
-		char * const *list, ofono_gprs_context_list_setter_t set_ipv4,
-		ofono_gprs_context_list_setter_t set_ipv6)
+static void ril_gprs_context_set_dns_servers(struct ofono_gprs_context *gc,
+					const struct ril_data_call *call)
 {
 	int i;
-	const char **ip_list = NULL, **ip_ptr = NULL;
-	const char **ipv6_list = NULL, **ipv6_ptr = NULL;
+	char * const *list = call->dnses;
 	const int n = gutil_strv_length(list);
+	const char **ip_dns = g_new0(const char *, n+1);
+	const char **ipv6_dns = g_new0(const char *, n+1);
+	const char **ip_ptr = ip_dns;
+	const char **ipv6_ptr = ipv6_dns;

 	for (i = 0; i < n; i++) {
 		const char *addr = list[i];
 		switch (ril_gprs_context_address_family(addr)) {
 		case AF_INET:
-			if (!ip_ptr) {
-				ip_list = g_new0(const char *, n - i + 1);
-				ip_ptr = ip_list;
-			}
 			*ip_ptr++ = addr;
 			break;
 		case AF_INET6:
-			if (!ipv6_ptr) {
-				ipv6_list = g_new0(const char *, n - i + 1);
-				ipv6_ptr = ipv6_list;
-			}
 			*ipv6_ptr++ = addr;
 			break;
 		}
 	}

-	set_ipv4(gc, ip_list);
-	set_ipv6(gc, ipv6_list);
+	ofono_gprs_context_set_ipv4_dns_servers(gc, ip_dns);
+	ofono_gprs_context_set_ipv6_dns_servers(gc, ipv6_dns);

-	g_free(ip_list);
-	g_free(ipv6_list);
-}
-
-static void ril_gprs_context_set_dns_servers(struct ofono_gprs_context *gc,
-					const struct ril_data_call *call)
-{
-	ril_gprs_context_set_servers(gc, call->dnses,
-				ofono_gprs_context_set_ipv4_dns_servers,
-				ofono_gprs_context_set_ipv6_dns_servers);
-}
-
-static void ril_gprs_context_set_proxy_cscf(struct ofono_gprs_context *gc,
-					const struct ril_data_call *call)
-{
-	ril_gprs_context_set_servers(gc, call->pcscf,
-				ofono_gprs_context_set_ipv4_proxy_cscf,
-				ofono_gprs_context_set_ipv6_proxy_cscf);
+	g_free(ip_dns);
+	g_free(ipv6_dns);
 }

 /* Only compares the stuff that's important to us */
@@ -314,8 +282,7 @@ static void ril_gprs_context_set_proxy_cscf(struct ofono_gprs_context *gc,
 #define DATA_CALL_ADDRESS_CHANGED   (0x02)
 #define DATA_CALL_GATEWAY_CHANGED   (0x04)
 #define DATA_CALL_DNS_CHANGED       (0x08)
-#define DATA_CALL_PCSCF_CHANGED     (0x10)
-#define DATA_CALL_ALL_CHANGED       (0x1f)
+#define DATA_CALL_ALL_CHANGED       (0x0f)
 static int ril_gprs_context_data_call_change(
 			const struct ril_data_call *c1,
 			const struct ril_data_call *c2)
@@ -341,10 +308,6 @@ static int ril_gprs_context_data_call_change(
 			changes |= DATA_CALL_DNS_CHANGED;
 		}

-		if (!gutil_strv_equal(c1->pcscf, c2->pcscf)) {
-			changes |= DATA_CALL_PCSCF_CHANGED;
-		}
-
 		return changes;
 	} else {
 		return DATA_CALL_ALL_CHANGED;
@@ -417,11 +380,6 @@ static void ril_gprs_context_call_list_changed(struct ril_data *data, void *arg)
 		ril_gprs_context_set_dns_servers(gc, call);
 	}

-	if (change & DATA_CALL_PCSCF_CHANGED) {
-		DBG("P-CSCF changed");
-		ril_gprs_context_set_proxy_cscf(gc, call);
-	}
-
 	ofono_gprs_context_signal_change(gc, gcd->active_ctx_cid);
 	ril_data_call_free(prev_call);
 }
@@ -463,7 +421,6 @@ static void ril_gprs_context_activate_primary_cb(struct ril_data *data,
 		ril_gprs_context_set_address(gc, call);
 		ril_gprs_context_set_gateway(gc, call);
 		ril_gprs_context_set_dns_servers(gc, call);
-		ril_gprs_context_set_proxy_cscf(gc, call);
 		ril_error_init_ok(&error);
 	}

@@ -487,14 +444,14 @@ static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
 {
 	struct ril_gprs_context *gcd = ril_gprs_context_get_data(gc);
 	struct ofono_netreg *netreg = ril_modem_ofono_netreg(gcd->modem);
-	const enum ofono_netreg_status rs = ofono_netreg_get_status(netreg);
+	const int rs = ofono_netreg_get_status(netreg);

 	/* Let's make sure that we aren't connecting when roaming not allowed */
-	if (rs == OFONO_NETREG_STATUS_ROAMING) {
+	if (rs == NETWORK_REGISTRATION_STATUS_ROAMING) {
 		struct ofono_gprs *gprs = ril_modem_ofono_gprs(gcd->modem);
-		if (!ofono_gprs_get_roaming_allowed(gprs) &&
+		if (!__ofono_gprs_get_roaming_allowed(gprs) &&
 			ril_netreg_check_if_really_roaming(netreg, rs) ==
-					OFONO_NETREG_STATUS_ROAMING) {
+					NETWORK_REGISTRATION_STATUS_ROAMING) {
 			struct ofono_error error;
 			ofono_info("Can't activate context %u (roaming)",
 								ctx->cid);
@@ -511,7 +468,7 @@ static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
 	gcd->activate.cb = cb;
 	gcd->activate.data = data;
 	gcd->activate.req = ril_data_call_setup(gcd->data, ctx,
-				ofono_gprs_context_get_assigned_type(gc),
+				__ofono_gprs_context_get_assigned_type(gc),
 				ril_gprs_context_activate_primary_cb, gcd);
 }

@@ -623,7 +580,7 @@ static void ril_gprs_context_remove(struct ofono_gprs_context *gc)
 	ril_data_unref(gcd->data);
 	ril_network_unref(gcd->network);
 	ril_data_call_free(gcd->active_call);
-	ofono_mtu_limit_free(gcd->mtu_limit);
+	mtu_watch_free(gcd->mtu_watch);
 	g_free(gcd);
 }

--- a/ofono/drivers/ril/ril_modem.c
+++ b/ofono/drivers/ril/ril_modem.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  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
@@ -25,11 +25,11 @@
 #include "ril_util.h"
 #include "ril_log.h"

-#include <ofono/message-waiting.h>
-#include <ofono/cell-info.h>
-#include <ofono/sim-auth.h>
+#include "ofono.h"
+
 #include <ofono/watch.h>

+#define MAX_PDP_CONTEXTS        (2)
 #define ONLINE_TIMEOUT_SECS     (15) /* 20 sec is hardcoded in ofono core */

 enum ril_modem_power_state {
@@ -92,26 +92,40 @@ static struct ril_modem_data *ril_modem_data_from_ofono(struct ofono_modem *o)
 	return md;
 }

-struct ofono_sim *ril_modem_ofono_sim(struct ril_modem *m)
+static void *ril_modem_get_atom_data(struct ril_modem *modem,
+						enum ofono_atom_type type)
 {
-	return (m && m->ofono) ? ofono_modem_get_sim(m->ofono) : NULL;
+	if (modem && modem->ofono) {
+		struct ofono_atom *atom =
+			__ofono_modem_find_atom(modem->ofono, type);
+
+		if (atom) {
+			return __ofono_atom_get_data(atom);
+		}
+	}
+
+	return NULL;
 }

-struct ofono_gprs *ril_modem_ofono_gprs(struct ril_modem *m)
+struct ofono_sim *ril_modem_ofono_sim(struct ril_modem *modem)
 {
-	return (m && m->ofono) ? ofono_modem_get_gprs(m->ofono) : NULL;
+	return ril_modem_get_atom_data(modem, OFONO_ATOM_TYPE_SIM);
 }

-struct ofono_netreg *ril_modem_ofono_netreg(struct ril_modem *m)
+struct ofono_gprs *ril_modem_ofono_gprs(struct ril_modem *modem)
 {
-	return (m && m->ofono) ? ofono_modem_get_netreg(m->ofono) : NULL;
+	return ril_modem_get_atom_data(modem, OFONO_ATOM_TYPE_GPRS);
+}
+
+struct ofono_netreg *ril_modem_ofono_netreg(struct ril_modem *modem)
+{
+	return ril_modem_get_atom_data(modem, OFONO_ATOM_TYPE_NETREG);
 }

 static inline struct ofono_radio_settings *ril_modem_radio_settings(
 						struct ril_modem *modem)
 {
-	return (modem && modem->ofono) ?
-			ofono_modem_get_radio_settings(modem->ofono) : NULL;
+	return ril_modem_get_atom_data(modem, OFONO_ATOM_TYPE_RADIO_SETTINGS);
 }

 void ril_modem_delete(struct ril_modem *md)
@@ -205,21 +219,22 @@ static void ril_modem_schedule_online_check(struct ril_modem_data *md)
 static void ril_modem_update_radio_settings(struct ril_modem_data *md)
 {
 	struct ril_modem *m = &md->modem;
-	struct ofono_radio_settings *rs = ril_modem_radio_settings(m);
-
-	if (md->watch->imsi) {
+	if (m->radio->state == RADIO_STATE_ON && md->watch->imsi) {
 		/* radio-settings.c assumes that IMSI is available */
-		if (!rs) {
+		if (!ril_modem_radio_settings(m)) {
 			DBG_(md, "initializing radio settings interface");
 			ofono_radio_settings_create(m->ofono, 0,
 						RILMODEM_DRIVER, md);
 		}
-	} else if (rs) {
-		DBG_(md, "removing radio settings interface");
-		ofono_radio_settings_remove(rs);
 	} else {
 		/* ofono core may remove radio settings atom internally */
-		DBG_(md, "radio settings interface is already gone");
+		struct ofono_radio_settings *rs = ril_modem_radio_settings(m);
+		if (rs) {
+			DBG_(md, "removing radio settings interface");
+			ofono_radio_settings_remove(rs);
+		} else {
+			DBG_(md, "radio settings interface is already gone");
+		}
 	}
 }

@@ -228,6 +243,7 @@ static void ril_modem_radio_state_cb(struct ril_radio *radio, void *data)
 	struct ril_modem_data *md = data;

 	GASSERT(md->modem.radio == radio);
+	ril_modem_update_radio_settings(md);
 	ril_modem_update_online_state(md);
 }

@@ -291,22 +307,15 @@ static void ril_modem_post_sim(struct ofono_modem *modem)
 	ofono_sms_create(modem, 0, RILMODEM_DRIVER, md);
 	gprs = ofono_gprs_create(modem, 0, RILMODEM_DRIVER, md);
 	if (gprs) {
-		guint i;
-		static const enum ofono_gprs_context_type ap_types[] = {
-			OFONO_GPRS_CONTEXT_TYPE_INTERNET,
-			OFONO_GPRS_CONTEXT_TYPE_MMS,
-			OFONO_GPRS_CONTEXT_TYPE_IMS
-		};
+		int i;

-		/* Create a context for each type */
-		for (i = 0; i < G_N_ELEMENTS(ap_types); i++) {
+		for (i = 0; i < MAX_PDP_CONTEXTS; i++) {
 			struct ofono_gprs_context *gc =
 				ofono_gprs_context_create(modem, 0,
 						RILMODEM_DRIVER, md);
 			if (gc == NULL)
 				break;

-			ofono_gprs_context_set_type(gc, ap_types[i]);
 			ofono_gprs_add_context(gprs, gc);
 		}
 	}
@@ -327,7 +336,6 @@ static void ril_modem_post_sim(struct ofono_modem *modem)
 	if (md->modem.config.enable_cbs) {
 		ofono_cbs_create(modem, 0, RILMODEM_DRIVER, md);
 	}
-	ofono_sim_auth_create(modem);
 }

 static void ril_modem_post_online(struct ofono_modem *modem)
@@ -409,7 +417,6 @@ static void ril_modem_remove(struct ofono_modem *ofono)
 	ofono_modem_set_data(ofono, NULL);

 	ril_radio_remove_handler(modem->radio, md->radio_state_event_id);
-	ril_radio_set_online(modem->radio, FALSE);
 	ril_radio_power_off(modem->radio, RADIO_POWER_TAG(md));
 	ril_radio_set_online(modem->radio, FALSE);
 	ril_radio_unref(modem->radio);
@@ -434,7 +441,7 @@ static void ril_modem_remove(struct ofono_modem *ofono)
 	ril_network_unref(modem->network);
 	ril_sim_card_unref(modem->sim_card);
 	ril_data_unref(modem->data);
-	ofono_cell_info_unref(modem->cell_info);
+	sailfish_cell_info_unref(modem->cell_info);
 	grilio_channel_unref(modem->io);
 	grilio_queue_cancel_all(md->q, FALSE);
 	grilio_queue_unref(md->q);
@@ -453,7 +460,7 @@ struct ril_modem *ril_modem_create(GRilIoChannel *io, const char *log_prefix,
 		struct ril_radio *radio, struct ril_network *network,
 		struct ril_sim_card *card, struct ril_data *data,
 		struct ril_sim_settings *settings, struct ril_vendor *vendor,
-		struct ofono_cell_info *cell_info)
+		struct sailfish_cell_info *cell_info)
 {
 	/* Skip the slash from the path, it looks like "/ril_0" */
 	struct ofono_modem *ofono = ofono_modem_create(path + 1,
@@ -484,7 +491,7 @@ struct ril_modem *ril_modem_create(GRilIoChannel *io, const char *log_prefix,
 		modem->network = ril_network_ref(network);
 		modem->sim_card = ril_sim_card_ref(card);
 		modem->sim_settings = ril_sim_settings_ref(settings);
-		modem->cell_info = ofono_cell_info_ref(cell_info);
+		modem->cell_info = sailfish_cell_info_ref(cell_info);
 		modem->data = ril_data_ref(data);
 		modem->io = grilio_channel_ref(io);
 		md->q = grilio_queue_new(io);
--- a/ofono/drivers/ril/ril_netmon.c
+++ b/ofono/drivers/ril/ril_netmon.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2021 Jolla Ltd.
+ *  Copyright (C) 2016-2018 Jolla Ltd.
 *
 *  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
@@ -17,12 +17,13 @@
 #include "ril_util.h"
 #include "ril_log.h"

-#include <ofono/sim-mnclength.h>
-#include <ofono/cell-info.h>
+#include <sailfish_cell_info.h>
+
+#include "ofono.h"

 struct ril_netmon {
 	struct ofono_netmon *netmon;
-	struct ofono_cell_info *cell_info;
+	struct sailfish_cell_info *cell_info;
 	guint register_id;
 };

@@ -47,9 +48,7 @@ static void ril_netmon_format_mccmnc(char *s_mcc, char *s_mnc, int mcc, int mnc)
 	if (mcc >= 0 && mcc <= 999) {
 		snprintf(s_mcc, OFONO_MAX_MCC_LENGTH + 1, "%03d", mcc);
 		if (mnc >= 0 && mnc <= 999) {
-			const int mnclen =
-				ofono_sim_mnclength_get_mnclength_mccmnc(mcc,
-									mnc);
+			const unsigned int mnclen = mnclength(mcc, mnc);
 			const char *format[] = { "%d", "%02d", "%03d" };
 			const char *fmt = (mnclen > 0 &&
 				mnclen <= G_N_ELEMENTS(format)) ? 
@@ -70,7 +69,7 @@ static void ril_netmon_notify_ofono(struct ofono_netmon *netmon,
 	/* Better not to push uninitialized data to the stack ... */
 	for (i = nparams; i < RIL_NETMON_MAX_OFONO_PARAMS; i++) {
 		params[i].type = OFONO_NETMON_INFO_INVALID;
-		params[i].value = OFONO_CELL_INVALID_VALUE;
+		params[i].value = SAILFISH_CELL_INVALID_VALUE;
 	}

 	ril_netmon_format_mccmnc(s_mcc, s_mnc, mcc, mnc);
@@ -89,36 +88,36 @@ static void ril_netmon_notify_ofono(struct ofono_netmon *netmon,
 }

 static void ril_netmon_notify_gsm(struct ofono_netmon *netmon,
-				const struct ofono_cell_info_gsm *gsm)
+				const struct sailfish_cell_info_gsm *gsm)
 {
 	struct ril_netmon_ofono_param params[RIL_NETMON_MAX_OFONO_PARAMS];
 	int n = 0;

-	if (gsm->lac != OFONO_CELL_INVALID_VALUE) {
+	if (gsm->lac != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_LAC;
 		params[n].value = gsm->lac;
 		n++;
 	}

-	if (gsm->cid != OFONO_CELL_INVALID_VALUE) {
+	if (gsm->cid != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_CI;
 		params[n].value = gsm->cid;
 		n++;
 	}

-	if (gsm->arfcn != OFONO_CELL_INVALID_VALUE) {
+	if (gsm->arfcn != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_ARFCN;
 		params[n].value = gsm->arfcn;
 		n++;
 	}

-	if (gsm->signalStrength != OFONO_CELL_INVALID_VALUE) {
+	if (gsm->signalStrength != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_RSSI;
 		params[n].value = gsm->signalStrength;
 		n++;
 	}

-	if (gsm->bitErrorRate != OFONO_CELL_INVALID_VALUE) {
+	if (gsm->bitErrorRate != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_BER;
 		params[n].value = gsm->bitErrorRate;
 		n++;
@@ -129,42 +128,42 @@ static void ril_netmon_notify_gsm(struct ofono_netmon *netmon,
 }

 static void ril_netmon_notify_wcdma(struct ofono_netmon *netmon,
-				const struct ofono_cell_info_wcdma *wcdma)
+				const struct sailfish_cell_info_wcdma *wcdma)
 {
 	struct ril_netmon_ofono_param params[RIL_NETMON_MAX_OFONO_PARAMS];
 	int n = 0;

-	if (wcdma->lac != OFONO_CELL_INVALID_VALUE) {
+	if (wcdma->lac != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_LAC;
 		params[n].value = wcdma->lac;
 		n++;
 	}

-	if (wcdma->cid != OFONO_CELL_INVALID_VALUE) {
+	if (wcdma->cid != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_CI;
 		params[n].value = wcdma->cid;
 		n++;
 	}

-	if (wcdma->psc != OFONO_CELL_INVALID_VALUE) {
+	if (wcdma->psc != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_PSC;
 		params[n].value = wcdma->psc;
 		n++;
 	}

-	if (wcdma->uarfcn != OFONO_CELL_INVALID_VALUE) {
+	if (wcdma->uarfcn != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_ARFCN;
 		params[n].value = wcdma->uarfcn;
 		n++;
 	}

-	if (wcdma->signalStrength != OFONO_CELL_INVALID_VALUE) {
+	if (wcdma->signalStrength != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_RSSI;
 		params[n].value = wcdma->signalStrength;
 		n++;
 	}

-	if (wcdma->bitErrorRate != OFONO_CELL_INVALID_VALUE) {
+	if (wcdma->bitErrorRate != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_BER;
 		params[n].value = wcdma->bitErrorRate;
 		n++;
@@ -175,48 +174,48 @@ static void ril_netmon_notify_wcdma(struct ofono_netmon *netmon,
 }

 static void ril_netmon_notify_lte(struct ofono_netmon *netmon,
-				const struct ofono_cell_info_lte *lte)
+				const struct sailfish_cell_info_lte *lte)
 {
 	struct ril_netmon_ofono_param params[RIL_NETMON_MAX_OFONO_PARAMS];
 	int n = 0;

-	if (lte->ci != OFONO_CELL_INVALID_VALUE) {
+	if (lte->ci != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_CI;
 		params[n].value = lte->ci;
 		n++;
 	}

-	if (lte->earfcn != OFONO_CELL_INVALID_VALUE) {
+	if (lte->earfcn != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_EARFCN;
 		params[n].value = lte->earfcn;
 		n++;
 	}

-	if (lte->signalStrength != OFONO_CELL_INVALID_VALUE) {
+	if (lte->signalStrength != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_RSSI;
 		params[n].value = lte->signalStrength;
 		n++;
 	}

-	if (lte->rsrp != OFONO_CELL_INVALID_VALUE) {
+	if (lte->rsrp != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_RSRQ;
 		params[n].value = lte->rsrp;
 		n++;
 	}

-	if (lte->rsrq != OFONO_CELL_INVALID_VALUE) {
+	if (lte->rsrq != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_RSRP;
 		params[n].value = lte->rsrq;
 		n++;
 	}

-	if (lte->cqi != OFONO_CELL_INVALID_VALUE) {
+	if (lte->cqi != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_CQI;
 		params[n].value = lte->cqi;
 		n++;
 	}

-	if (lte->timingAdvance != OFONO_CELL_INVALID_VALUE) {
+	if (lte->timingAdvance != SAILFISH_CELL_INVALID_VALUE) {
 		params[n].type = OFONO_NETMON_INFO_TIMING_ADVANCE;
 		params[n].value = lte->timingAdvance;
 		n++;
@@ -230,32 +229,28 @@ static void ril_netmon_request_update(struct ofono_netmon *netmon,
 		ofono_netmon_cb_t cb, void *data)
 {
 	struct ril_netmon *nm = ril_netmon_get_data(netmon);
-	const ofono_cell_ptr *cells = nm->cell_info->cells;
 	struct ofono_error error;
+	GSList *l;

-	if (cells) {
-		const ofono_cell_ptr *ptr;
+	for (l = nm->cell_info->cells; l; l = l->next) {
+		const struct sailfish_cell *cell = l->data;

-		for (ptr = cells; *ptr; ptr++) {
-			const struct ofono_cell *cell = *ptr;
-
-			if (cell->registered) {
-				switch (cell->type) {
-				case OFONO_CELL_TYPE_GSM:
-					ril_netmon_notify_gsm(netmon,
-						&cell->info.gsm);
-					break;
-				case OFONO_CELL_TYPE_WCDMA:
-					ril_netmon_notify_wcdma(netmon,
-						&cell->info.wcdma);
-					break;
-				case OFONO_CELL_TYPE_LTE:
-					ril_netmon_notify_lte(netmon,
-						&cell->info.lte);
-					break;
-				default:
-					break;
-				}
+		if (cell->registered) {
+			switch (cell->type) {
+			case SAILFISH_CELL_TYPE_GSM:
+				ril_netmon_notify_gsm(netmon,
+							&cell->info.gsm);
+				break;
+			case SAILFISH_CELL_TYPE_WCDMA:
+				ril_netmon_notify_wcdma(netmon,
+							&cell->info.wcdma);
+				break;
+			case SAILFISH_CELL_TYPE_LTE:
+				ril_netmon_notify_lte(netmon,
+							&cell->info.lte);
+				break;
+			default:
+				break;
 			}
 		}
 	}
@@ -283,7 +278,7 @@ static int ril_netmon_probe(struct ofono_netmon *netmon, unsigned int vendor,
 	if (modem->cell_info) {
 		struct ril_netmon *nm = g_slice_new0(struct ril_netmon);

-		nm->cell_info = ofono_cell_info_ref(modem->cell_info);
+		nm->cell_info = sailfish_cell_info_ref(modem->cell_info);
 		nm->netmon = netmon;

 		ofono_netmon_set_data(netmon, nm);
@@ -309,7 +304,7 @@ static void ril_netmon_remove(struct ofono_netmon *netmon)
 		g_source_remove(nm->register_id);
 	}

-	ofono_cell_info_unref(nm->cell_info);
+	sailfish_cell_info_unref(nm->cell_info);
 	g_slice_free(struct ril_netmon, nm);
 }

--- a/ofono/drivers/ril/ril_netreg.c
+++ b/ofono/drivers/ril/ril_netreg.c
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  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
@@ -16,13 +16,12 @@

 #include "ril_plugin.h"
 #include "ril_network.h"
-#include "ril_netreg.h"
 #include "ril_util.h"
 #include "ril_vendor.h"
 #include "ril_log.h"

-#include <ofono/watch.h>
-#include <ofono/gprs-provision.h>
+#include "common.h"
+#include "simutil.h"

 #define REGISTRATION_MAX_RETRIES (2)

@@ -41,11 +40,7 @@ enum ril_netreg_network_events {
 struct ril_netreg {
 	GRilIoChannel *io;
 	GRilIoQueue *q;
-	gboolean replace_strange_oper;
 	gboolean network_selection_manual_0;
-	int signal_strength_dbm_weak;
-	int signal_strength_dbm_strong;
-	struct ofono_watch *watch;
 	struct ofono_netreg *netreg;
 	struct ril_network *network;
 	struct ril_vendor *vendor;
@@ -91,17 +86,20 @@ static struct ril_netreg_cbd *ril_netreg_cbd_new(struct ril_netreg *nd,
 	return cbd;
 }

-enum ofono_netreg_status ril_netreg_check_if_really_roaming
-	(struct ofono_netreg *netreg, enum ofono_netreg_status status)
+int ril_netreg_check_if_really_roaming(struct ofono_netreg *netreg,
+								gint status)
 {
-	if (status == OFONO_NETREG_STATUS_ROAMING) {
+	if (status == NETWORK_REGISTRATION_STATUS_ROAMING) {
 		/* These functions tolerate NULL argument */
 		const char *net_mcc = ofono_netreg_get_mcc(netreg);
 		const char *net_mnc = ofono_netreg_get_mnc(netreg);
+		struct sim_spdi *spdi = ofono_netreg_get_spdi(netreg);

-		if (ofono_netreg_spdi_lookup(netreg, net_mcc, net_mnc)) {
-			ofono_info("not roaming based on spdi");
-			return OFONO_NETREG_STATUS_REGISTERED;
+		if (spdi && net_mcc && net_mnc) {
+			if (sim_spdi_lookup(spdi, net_mcc, net_mnc)) {
+				ofono_info("not roaming based on spdi");
+				return NETWORK_REGISTRATION_STATUS_REGISTERED;
+			}
 		}
 	}

@@ -192,74 +190,11 @@ static void ril_netreg_current_operator(struct ofono_netreg *netreg,
 					ril_netreg_cbd_free);
 }

-static gboolean ril_netreg_strange(const struct ofono_network_operator *op,
-							struct ofono_sim *sim)
-{
-	gsize mcclen;
-
-	if (sim && op->status != OFONO_OPERATOR_STATUS_CURRENT) {
-		const char *spn = ofono_sim_get_spn(sim);
-		const char *mcc = ofono_sim_get_mcc(sim);
-		const char *mnc = ofono_sim_get_mnc(sim);
-
-		if (spn && mcc && mnc && !strcmp(op->name, spn) &&
-			(strcmp(op->mcc, mcc) || strcmp(op->mnc, mnc))) {
-			/*
-			 * Status is not "current", SPN matches the SIM, but
-			 * MCC and/or MNC don't (e.g. Sony Xperia X where all
-			 * operators could be reported with the same name
-			 * which equals SPN).
-			 */
-			DBG("%s %s%s (sim spn?)", op->name, op->mcc, op->mnc);
-			return TRUE;
-		}
-	}
-
-	mcclen = strlen(op->mcc);
-	if (!strncmp(op->name, op->mcc, mcclen) &&
-				!strcmp(op->name + mcclen, op->mnc)) {
-		/* Some MediaTek RILs only report numeric operator name */
-		DBG("%s %s%s (numeric?)", op->name, op->mcc, op->mnc);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void ril_netreg_process_operators(struct ril_netreg *nd,
-			struct ofono_network_operator *ops, int nops)
-{
-	if (nd->replace_strange_oper) {
-		int i;
-
-		for (i = 0; i < nops; i++) {
-			struct ofono_network_operator *op = ops + i;
-			struct ofono_gprs_provision_data *prov = NULL;
-			int np = 0;
-
-			if (ril_netreg_strange(op, nd->watch->sim) &&
-				ofono_gprs_provision_get_settings(op->mcc,
-						op->mnc, NULL, &prov, &np)) {
-				/* Use the first entry */
-				if (np > 0 && prov->provider_name &&
-						prov->provider_name[0]) {
-					DBG("%s %s%s -> %s", op->name, op->mcc,
-						op->mnc, prov->provider_name);
-					strncpy(op->name, prov->provider_name,
-						OFONO_MAX_OPERATOR_NAME_LENGTH);
-				}
-				ofono_gprs_provision_free_settings(prov, np);
-			}
-		}
-	}
-}
-
 static void ril_netreg_list_operators_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
 	struct ril_netreg_cbd *cbd = user_data;
 	ofono_netreg_operator_list_cb_t cb = cbd->cb.operator_list;
-	struct ril_netreg *nd = cbd->nd;
 	struct ofono_network_operator *list;
 	struct ofono_error error;
 	int noperators = 0, i;
@@ -301,22 +236,21 @@ static void ril_netreg_list_operators_cb(GRilIoChannel *io, int status,
 		}

 		/* Set the proper status  */
-		op->status = OFONO_OPERATOR_STATUS_UNKNOWN;
-		if (status) {
-			if (!strcmp(status, "available")) {
-				op->status = OFONO_OPERATOR_STATUS_AVAILABLE;
-			} else if (!strcmp(status, "current")) {
-				op->status = OFONO_OPERATOR_STATUS_CURRENT;
-			} else if (!strcmp(status, "forbidden")) {
-				op->status = OFONO_OPERATOR_STATUS_FORBIDDEN;
-			}
+		if (!strcmp(status, "available")) {
+			list[i].status = OPERATOR_STATUS_AVAILABLE;
+		} else if (!strcmp(status, "current")) {
+			list[i].status = OPERATOR_STATUS_CURRENT;
+		} else if (!strcmp(status, "forbidden")) {
+			list[i].status = OPERATOR_STATUS_FORBIDDEN;
+		} else {
+			list[i].status = OPERATOR_STATUS_UNKNOWN;
 		}

 		op->tech = -1;
 		ok = ril_parse_mcc_mnc(numeric, op);
 		if (ok) {
 			if (op->tech < 0) {
-				op->tech = nd->network->voice.access_tech;
+				op->tech = cbd->nd->network->voice.access_tech;
 			}
 			DBG("[operator=%s, %s, %s, status: %s]", op->name,
 						op->mcc, op->mnc, status);
@@ -331,7 +265,6 @@ static void ril_netreg_list_operators_cb(GRilIoChannel *io, int status,
 	}

 	if (ok) {
-		ril_netreg_process_operators(nd, list, noperators);
 		cb(ril_error_ok(&error), noperators, list, cbd->data);
 	} else {
 		cb(ril_error_failure(&error), 0, NULL, cbd->data);
@@ -430,6 +363,7 @@ static void ril_netreg_register_manual(struct ofono_netreg *netreg,
 	ofono_info("nw select manual: %s%s%s", mcc, mnc, suffix);
 	grilio_request_append_format(req, "%s%s%s", mcc, mnc, suffix);
 	grilio_request_set_timeout(req, nd->network_selection_timeout);
+	grilio_request_set_retry(req, 0, REGISTRATION_MAX_RETRIES);
 	grilio_queue_send_request_full(nd->q, req,
 			RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL,
 			ril_netreg_register_cb, ril_netreg_cbd_free,
@@ -437,17 +371,17 @@ static void ril_netreg_register_manual(struct ofono_netreg *netreg,
 	grilio_request_unref(req);
 }

-static int ril_netreg_qdbm_to_percentage(struct ril_netreg *nd, int qdbm)
+static int ril_netreg_qdbm_to_percentage(int qdbm /* 4*dBm */)
 {
-	const int min_qdbm = 4 * nd->signal_strength_dbm_weak;    /* 4*dBm */
-	const int max_qdbm = 4 * nd->signal_strength_dbm_strong;  /* 4*dBm */
+	const int min_qdbm = -4*100; /* very weak signal, 0.0000000001 mW */
+	const int max_qdbm = -4*60;  /* strong signal, 0.000001 mW */

 	return (qdbm <= min_qdbm) ? 1 :
 		(qdbm >= max_qdbm) ? 100 :
 		(100 * (qdbm - min_qdbm) / (max_qdbm - min_qdbm));
 }

-static int ril_netreg_get_signal_strength(struct ril_netreg *nd,
+static int ril_netreg_get_signal_strength(struct ril_vendor *vendor,
 					const void *data, guint len)
 {
 	GRilIoParser rilp;
@@ -457,8 +391,8 @@ static int ril_netreg_get_signal_strength(struct ril_netreg *nd,
 	signal.gsm = INT_MAX;
 	signal.lte = INT_MAX;
 	signal.qdbm = 0;
-
-	if (!ril_vendor_signal_strength_parse(nd->vendor, &signal, &rilp)) {
+	
+	if (!ril_vendor_signal_strength_parse(vendor, &signal, &rilp)) {
 		gint32 rsrp = 0, tdscdma_dbm = 0;

 		/* Apply default parsing algorithm */
@@ -496,7 +430,7 @@ static int ril_netreg_get_signal_strength(struct ril_netreg *nd,
 			signal.qdbm = -4 * tdscdma_dbm;
 		} else if (signal.lte == 99 && rsrp >= 44 && rsrp <= 140) {
 			/* RSRP range: 44 to 140 dBm per 3GPP TS 36.133 */
-			signal.qdbm = -4 * rsrp;
+			signal.qdbm = -rsrp;
 		}
 	}

@@ -517,7 +451,7 @@ static int ril_netreg_get_signal_strength(struct ril_netreg *nd,
 	}

 	if (signal.qdbm < 0) {
-		return ril_netreg_qdbm_to_percentage(nd, signal.qdbm);
+		return ril_netreg_qdbm_to_percentage(signal.qdbm);
 	} else if (signal.gsm == 0) {
 		return 0;
 	} else {
@@ -532,7 +466,7 @@ static void ril_netreg_strength_notify(GRilIoChannel *io, guint ril_event,
 	int strength;

 	GASSERT(ril_event == RIL_UNSOL_SIGNAL_STRENGTH);
-	strength = ril_netreg_get_signal_strength(nd, data, len);
+	strength = ril_netreg_get_signal_strength(nd->vendor, data, len);
 	DBG_(nd, "%d", strength);
 	if (strength >= 0) {
 		ofono_netreg_strength_notify(nd->netreg, strength);
@@ -548,7 +482,7 @@ static void ril_netreg_strength_cb(GRilIoChannel *io, int status,

 	if (status == RIL_E_SUCCESS) {
 		cb(ril_error_ok(&error), ril_netreg_get_signal_strength
-				(cbd->nd, data, len), cbd->data);
+				(cbd->nd->vendor, data, len), cbd->data);
 	} else {
 		ofono_error("Failed to retrive the signal strength: %s",
 						ril_error_to_string(status));
@@ -658,14 +592,10 @@ static int ril_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
 	DBG_(nd, "%p", netreg);
 	nd->io = grilio_channel_ref(ril_modem_io(modem));
 	nd->q = grilio_queue_new(nd->io);
-	nd->watch = ofono_watch_new(ril_modem_get_path(modem));
 	nd->vendor = ril_vendor_ref(modem->vendor);
 	nd->network = ril_network_ref(modem->network);
 	nd->netreg = netreg;
-	nd->replace_strange_oper = config->replace_strange_oper;
 	nd->network_selection_manual_0 = config->network_selection_manual_0;
-	nd->signal_strength_dbm_weak = config->signal_strength_dbm_weak;
-	nd->signal_strength_dbm_strong = config->signal_strength_dbm_strong;
 	nd->network_selection_timeout = config->network_selection_timeout;

 	ofono_netreg_set_data(netreg, nd);
@@ -693,7 +623,6 @@ static void ril_netreg_remove(struct ofono_netreg *netreg)
 		g_source_remove(nd->current_operator_id);
 	}

-	ofono_watch_unref(nd->watch);
 	ril_network_remove_all_handlers(nd->network, nd->network_event_id);
 	ril_network_unref(nd->network);
 	ril_vendor_unref(nd->vendor);
--- a/ofono/drivers/ril/ril_netreg.h
+++ b/ofono/drivers/ril/ril_netreg.h
@@ -1,34 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2021 Jolla Ltd.
- *
- *  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
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- */
-
-#ifndef RIL_NETREG_H
-#define RIL_NETREG_H
-
-#include "ril_types.h"
-
-#include <ofono/netreg.h>
-
-enum ofono_netreg_status ril_netreg_check_if_really_roaming
-		(struct ofono_netreg *reg, enum ofono_netreg_status status);
-
-#endif /* RIL_NETREG_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_network.c
+++ b/ofono/drivers/ril/ril_network.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2020 Jolla Ltd.
 *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -14,11 +14,8 @@
 *  GNU General Public License for more details.
 */

-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-
 #include "ril_network.h"
 #include "ril_radio.h"
-#include "ril_radio_caps.h"
 #include "ril_sim_card.h"
 #include "ril_sim_settings.h"
 #include "ril_vendor.h"
@@ -34,9 +31,10 @@

 #include <ofono/netreg.h>
 #include <ofono/watch.h>
-#include <ofono/misc.h>
 #include <ofono/gprs.h>

+#include "common.h"
+
 #define SET_PREF_MODE_HOLDOFF_SEC RIL_RETRY_SECS

 typedef GObjectClass RilNetworkClass;
@@ -54,12 +52,6 @@ enum ril_network_radio_event {
 	RADIO_EVENT_COUNT
 };

-enum ril_network_radio_caps_mgr_events {
-	RADIO_CAPS_MGR_TX_DONE,
-	RADIO_CAPS_MGR_TX_ABORTED,
-	RADIO_CAPS_MGR_EVENT_COUNT
-};
-
 enum ril_network_sim_events {
 	SIM_EVENT_STATUS_CHANGED,
 	SIM_EVENT_IO_ACTIVE_CHANGED,
@@ -68,6 +60,7 @@ enum ril_network_sim_events {

 enum ril_network_unsol_event {
 	UNSOL_EVENT_NETWORK_STATE,
+	UNSOL_EVENT_RADIO_CAPABILITY,
 	UNSOL_EVENT_COUNT
 };

@@ -95,7 +88,6 @@ struct ril_network_priv {
 	GRilIoChannel *io;
 	GRilIoQueue *q;
 	struct ril_radio *radio;
-	struct ril_radio_caps *caps;
 	struct ril_sim_card *simcard;
 	struct ril_vendor *vendor;
 	struct ofono_watch *watch;
@@ -112,8 +104,6 @@ struct ril_network_priv {
 	gulong set_rat_id;
 	gulong unsol_event_id[UNSOL_EVENT_COUNT];
 	gulong settings_event_id;
-	gulong supported_modes_event_id;
-	gulong caps_mgr_event_id[RADIO_CAPS_MGR_EVENT_COUNT];
 	gulong radio_event_id[RADIO_EVENT_COUNT];
 	gulong simcard_event_id[SIM_EVENT_COUNT];
 	gulong watch_ids[WATCH_EVENT_COUNT];
@@ -133,6 +123,7 @@ enum ril_network_signal {
 	SIGNAL_VOICE_STATE_CHANGED,
 	SIGNAL_DATA_STATE_CHANGED,
 	SIGNAL_PREF_MODE_CHANGED,
+	SIGNAL_MAX_PREF_MODE_CHANGED,
 	SIGNAL_COUNT
 };

@@ -140,6 +131,7 @@ enum ril_network_signal {
 #define SIGNAL_VOICE_STATE_CHANGED_NAME   "ril-network-voice-state-changed"
 #define SIGNAL_DATA_STATE_CHANGED_NAME    "ril-network-data-state-changed"
 #define SIGNAL_PREF_MODE_CHANGED_NAME     "ril-network-pref-mode-changed"
+#define SIGNAL_MAX_PREF_MODE_CHANGED_NAME "ril-network-max-pref-mode-changed"

 static guint ril_network_signals[SIGNAL_COUNT] = { 0 };

@@ -186,7 +178,7 @@ static void ril_network_stop_timer(struct ril_network *self,
 static void ril_network_reset_state(struct ril_registration_state *reg)
 {
 	memset(reg, 0, sizeof(*reg));
-	reg->status = OFONO_NETREG_STATUS_NONE;
+	reg->status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
 	reg->access_tech = -1;
 	reg->ril_tech = -1;
 	reg->lac = -1;
@@ -272,10 +264,10 @@ static gboolean ril_network_parse_response(struct ril_network *self,
 	reg->access_tech = ril_parse_tech(stech, &reg->ril_tech);

 	DBG_(self, "%s,%s,%s,%d,%s,%s,%s",
-			ofono_netreg_status_to_string(reg->status),
-			slac, sci, reg->ril_tech,
-			ofono_access_technology_to_string(reg->access_tech),
-			sreason, smax);
+				registration_status_to_string(reg->status),
+				slac, sci, reg->ril_tech,
+				registration_tech_to_string(reg->access_tech),
+				sreason, smax);

 	g_free(sstatus);
 	g_free(slac);
@@ -341,7 +333,7 @@ static void ril_network_poll_operator_cb(GRilIoChannel *io, int req_status,
 		op.tech = -1;
 		if (ril_parse_mcc_mnc(numeric, &op)) {
 			if (op.tech < 0) op.tech = self->voice.access_tech;
-			op.status = OFONO_OPERATOR_STATUS_CURRENT;
+			op.status = OPERATOR_STATUS_CURRENT;
 			op.name[0] = 0;
 			if (lalpha) {
 				strncpy(op.name, lalpha, sizeof(op.name));
@@ -370,8 +362,7 @@ static void ril_network_poll_operator_cb(GRilIoChannel *io, int req_status,
 					"%s, mcc=%s, mnc=%s, %s",
 					lalpha, salpha, numeric,
 					op.name, op.mcc, op.mnc,
-					ofono_access_technology_to_string
-								(op.tech));
+					registration_tech_to_string(op.tech));
 			} else {
 				DBG_(self, "no operator");
 			}
@@ -443,13 +434,14 @@ static guint ril_network_poll_and_retry(struct ril_network *self, guint id,
 {
 	struct ril_network_priv *priv = self->priv;

-	/* Don't wait for retry timeout to expire */
-	if (!id || !grilio_channel_retry_request(priv->io, id)) {
+	if (id) {
+		/* Retry right away, don't wait for retry timeout to expire */
+		grilio_channel_retry_request(priv->io, id);
+	} else {
 		GRilIoRequest *req = grilio_request_new();

 		grilio_request_set_retry(req, RIL_RETRY_SECS*1000, -1);
 		grilio_request_set_retry_func(req, ril_network_retry);
-		grilio_queue_cancel_request(priv->q, id, FALSE);
 		id = grilio_queue_send_request_full(priv->q, req, code, fn,
 								NULL, self);
 		grilio_request_unref(req);
@@ -531,17 +523,6 @@ static int ril_network_mode_to_rat(struct ril_network *self,
 	}
 }

-enum ofono_radio_access_mode ril_network_max_supported_mode
-						(struct ril_network *self)
-{
-	struct ril_sim_settings *settings = self->settings;
-	struct ril_network_priv *priv = self->priv;
-	const struct ril_radio_caps *caps = priv->caps;
-
-	return caps ? ofono_radio_access_max_mode(caps->supported_modes) :
-				ofono_radio_access_max_mode(settings->techs);
-}
-
 static enum ofono_radio_access_mode ril_network_actual_pref_mode
 						(struct ril_network *self)
 {
@@ -565,16 +546,9 @@ static enum ofono_radio_access_mode ril_network_actual_pref_mode
 	 * and max_pref_mode are not ANY, we pick the smallest value.
 	 * Otherwise we take any non-zero value if there is one.
 	 */
-	const enum ofono_radio_access_mode pref_mode =
-		(settings->pref_mode && max_pref_mode) ?
+	return (settings->pref_mode && max_pref_mode) ?
 		MIN(settings->pref_mode, max_pref_mode) :
 		settings->pref_mode ? settings->pref_mode : max_pref_mode;
-
-	/* Do not try to set unsupported mode */
-	const enum ofono_radio_access_mode max_mode =
-				ril_network_max_supported_mode(self);
-
-	return pref_mode ? MIN(pref_mode, max_mode) : max_mode;
 }

 static gboolean ril_network_need_initial_attach_apn(struct ril_network *self)
@@ -585,9 +559,9 @@ static gboolean ril_network_need_initial_attach_apn(struct ril_network *self)

 	if (watch->gprs && radio->state == RADIO_STATE_ON) {
 		switch (ril_network_actual_pref_mode(self)) {
+		case OFONO_RADIO_ACCESS_MODE_ANY:
 		case OFONO_RADIO_ACCESS_MODE_LTE:
 			return TRUE;
-		case OFONO_RADIO_ACCESS_MODE_ANY:
 		case OFONO_RADIO_ACCESS_MODE_UMTS:
 		case OFONO_RADIO_ACCESS_MODE_GSM:
 			break;
@@ -695,7 +669,7 @@ struct ril_network_data_profile *ril_network_data_profile_new
 	ptr += G_ALIGN8(sizeof(*profile));

 	profile->profile_id = profile_id;
-	profile->type = RIL_PROFILE_COMMON;
+	profile->type = RIL_PROFILE_3GPP;
 	profile->auth_method = auth_method;
 	profile->proto = context->proto;
 	profile->enabled = TRUE;
@@ -824,9 +798,6 @@ static void ril_network_check_data_profiles(struct ril_network *self)
 		const struct ofono_gprs_primary_context* mms =
 			ofono_gprs_context_settings_by_type(gprs,
 				OFONO_GPRS_CONTEXT_TYPE_MMS);
-		const struct ofono_gprs_primary_context* ims =
-			ofono_gprs_context_settings_by_type(gprs,
-				OFONO_GPRS_CONTEXT_TYPE_IMS);
 		GSList *l = NULL;

 		if (internet) {
@@ -842,12 +813,6 @@ static void ril_network_check_data_profiles(struct ril_network *self)
 				ril_network_data_profile_new(mms,
 					priv->mms_data_profile_id));
 		}
-		if (ims) {
-			DBG_(self, "ims apn \"%s\"", ims->apn);
-			l = g_slist_append(l,
-				ril_network_data_profile_new(ims,
-					RIL_DATA_PROFILE_IMS));
-		}

 		if (ril_network_data_profiles_equal(priv->data_profiles, l)) {
 			ril_network_data_profiles_free(l);
@@ -1001,14 +966,6 @@ static void ril_network_check_pref_mode(struct ril_network *self,
 	}
 }

-static void ril_network_assert_pref_mode(struct ril_network *self)
-{
-	struct ril_network_priv *priv = self->priv;
-
-	priv->assert_rat = TRUE;
-	ril_network_check_pref_mode(self, FALSE);
-}
-
 static int ril_network_parse_pref_resp(const void *data, guint len)
 {
 	GRilIoParser rilp;
@@ -1038,10 +995,10 @@ static void ril_network_startup_query_pref_mode_cb(GRilIoChannel *io,
 		}

 		/*
-		 * At startup, the device may have an inconsistency between
-		 * voice and data network modes, so it needs to be asserted.
+		 * Unlike ril_network_query_pref_mode_cb, this one always
+		 * checks the preferred mode.
 		 */
-		ril_network_assert_pref_mode(self);
+		ril_network_check_pref_mode(self, FALSE);
 	}
 }

@@ -1094,79 +1051,19 @@ void ril_network_set_max_pref_mode(struct ril_network *self,
 			DBG_(self, "rat mode %d (%s)", max_mode,
 				ofono_radio_access_mode_to_string(max_mode));
 			self->max_pref_mode = max_mode;
+			ril_network_emit(self, SIGNAL_MAX_PREF_MODE_CHANGED);
 			ril_network_check_initial_attach_apn(self);
 		}
 		ril_network_check_pref_mode(self, TRUE);
 	}
 }

-static void ril_network_supported_modes_handler(struct ril_radio_caps *caps,
-							void *user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-
-	DBG_(self, "%s", ofono_radio_access_mode_to_string
-						(caps->supported_modes));
-	ril_network_check_pref_mode(self, TRUE);
-}
-
-static void ril_network_radio_capability_tx_done_cb
-		(struct ril_radio_caps_manager *mgr, void *user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-
-	DBG_(self, "");
-	ril_network_assert_pref_mode(self);
-}
-
-static void ril_network_release_radio_caps(struct ril_network *self)
-{
-	struct ril_network_priv *priv = self->priv;
-	struct ril_radio_caps *caps = priv->caps;
-
-	if (caps) {
-		ril_radio_caps_manager_remove_all_handlers(caps->mgr,
-					priv->caps_mgr_event_id);
-		ril_radio_caps_remove_handler(caps,
-					priv->supported_modes_event_id);
-		ril_radio_caps_unref(caps);
-
-		priv->caps = NULL;
-		priv->supported_modes_event_id = 0;
-	}
-}
-
-static void ril_network_attach_radio_caps(struct ril_network *self,
-						struct ril_radio_caps *caps)
+void ril_network_assert_pref_mode(struct ril_network *self, gboolean immediate)
 {
 	struct ril_network_priv *priv = self->priv;

-	priv->caps = ril_radio_caps_ref(caps);
-	priv->supported_modes_event_id =
-		ril_radio_caps_add_supported_modes_handler(caps,
-			ril_network_supported_modes_handler, self);
-	priv->caps_mgr_event_id[RADIO_CAPS_MGR_TX_DONE] =
-		ril_radio_caps_manager_add_tx_done_handler(caps->mgr,
-			ril_network_radio_capability_tx_done_cb, self);
-	priv->caps_mgr_event_id[RADIO_CAPS_MGR_TX_ABORTED] =
-		ril_radio_caps_manager_add_tx_aborted_handler(caps->mgr,
-			ril_network_radio_capability_tx_done_cb, self);
-}
-
-void ril_network_set_radio_caps(struct ril_network *self,
-						struct ril_radio_caps *caps)
-{
-	if (self) {
-		struct ril_network_priv *priv = self->priv;
-
-		if (priv->caps != caps) {
-			ril_network_release_radio_caps(self);
-			if (caps) {
-				ril_network_attach_radio_caps(self, caps);
-			}
-			ril_network_check_pref_mode(self, TRUE);
-		}
-	}
+	priv->assert_rat = TRUE;
+	ril_network_check_pref_mode(self, immediate);
 }

 gulong ril_network_add_operator_changed_handler(struct ril_network *self,
@@ -1197,6 +1094,13 @@ gulong ril_network_add_pref_mode_changed_handler(struct ril_network *self,
 		SIGNAL_PREF_MODE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
 }

+gulong ril_network_add_max_pref_mode_changed_handler(struct ril_network *self,
+					ril_network_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_MAX_PREF_MODE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
 void ril_network_remove_handler(struct ril_network *self, gulong id)
 {
 	if (G_LIKELY(self) && G_LIKELY(id)) {
@@ -1219,6 +1123,16 @@ static void ril_network_state_changed_cb(GRilIoChannel *io, guint code,
 	ril_network_poll_state(self);
 }

+static void ril_network_radio_capability_changed_cb(GRilIoChannel *io,
+		guint code, const void *data, guint len, void *user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+
+	DBG_(self, "");
+	GASSERT(code == RIL_UNSOL_RADIO_CAPABILITY);
+	ril_network_assert_pref_mode(self, FALSE);
+}
+
 static void ril_network_radio_state_cb(struct ril_radio *radio, void *data)
 {
 	struct ril_network *self = RIL_NETWORK(data);
@@ -1351,6 +1265,10 @@ struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 		grilio_channel_add_unsol_event_handler(priv->io,
 			ril_network_state_changed_cb,
 			RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED, self);
+	priv->unsol_event_id[UNSOL_EVENT_RADIO_CAPABILITY] =
+		grilio_channel_add_unsol_event_handler(priv->io,
+			ril_network_radio_capability_changed_cb,
+			RIL_UNSOL_RADIO_CAPABILITY, self);

 	priv->radio_event_id[RADIO_EVENT_STATE_CHANGED] =
 		ril_radio_add_state_changed_handler(priv->radio,
@@ -1445,7 +1363,6 @@ static void ril_network_finalize(GObject *object)
 	grilio_channel_remove_all_handlers(priv->io, priv->unsol_event_id);
 	grilio_channel_unref(priv->io);
 	grilio_queue_unref(priv->q);
-	ril_network_release_radio_caps(self);
 	ril_radio_remove_all_handlers(priv->radio, priv->radio_event_id);
 	ril_radio_unref(priv->radio);
 	ril_sim_card_remove_all_handlers(priv->simcard, priv->simcard_event_id);
@@ -1467,6 +1384,7 @@ static void ril_network_class_init(RilNetworkClass *klass)
 	RIL_NETWORK_SIGNAL(klass, VOICE_STATE);
 	RIL_NETWORK_SIGNAL(klass, DATA_STATE);
 	RIL_NETWORK_SIGNAL(klass, PREF_MODE);
+	RIL_NETWORK_SIGNAL(klass, MAX_PREF_MODE);
 }

 /*
--- a/ofono/drivers/ril/ril_network.h
+++ b/ofono/drivers/ril/ril_network.h
@@ -1,8 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
- *  Copyright (C) 2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
 *
 *  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
@@ -19,16 +18,13 @@

 #include "ril_types.h"

-#include <ofono/netreg.h>
-
 #include <glib-object.h>

 struct ofono_network_operator;
-struct ril_radio_caps;

 struct ril_registration_state {
-	enum ofono_netreg_status status;
-	enum ofono_access_technology access_tech;
+	int status;        /* enum network_registration_status */
+	int access_tech;   /* enum access_technology or -1 if none */
 	int ril_tech;
 	int max_calls;
 	int lac;
@@ -46,6 +42,7 @@ struct ril_network {
 	struct ril_sim_settings *settings;
 };

+struct ofono_sim;
 typedef void (*ril_network_cb_t)(struct ril_network *net, void *arg);

 struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
@@ -57,13 +54,10 @@ struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 struct ril_network *ril_network_ref(struct ril_network *net);
 void ril_network_unref(struct ril_network *net);

-void ril_network_set_radio_caps(struct ril_network *net,
-				struct ril_radio_caps *caps);
 void ril_network_set_max_pref_mode(struct ril_network *net,
 				enum ofono_radio_access_mode max_pref_mode,
 				gboolean force_check);
-enum ofono_radio_access_mode ril_network_max_supported_mode
-						(struct ril_network *self);
+void ril_network_assert_pref_mode(struct ril_network *net, gboolean immediate);
 void ril_network_query_registration_state(struct ril_network *net);
 gulong ril_network_add_operator_changed_handler(struct ril_network *net,
 					ril_network_cb_t cb, void *arg);
@@ -73,6 +67,8 @@ gulong ril_network_add_data_state_changed_handler(struct ril_network *net,
 					ril_network_cb_t cb, void *arg);
 gulong ril_network_add_pref_mode_changed_handler(struct ril_network *net,
 					ril_network_cb_t cb, void *arg);
+gulong ril_network_add_max_pref_mode_changed_handler(struct ril_network *net,
+					ril_network_cb_t cb, void *arg);
 void ril_network_remove_handler(struct ril_network *net, gulong id);
 void ril_network_remove_handlers(struct ril_network *net, gulong *ids, int n);

--- a/ofono/drivers/ril/ril_oem_raw.c
+++ b/ofono/drivers/ril/ril_oem_raw.c
@@ -1,8 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
- *  Copyright (C) 2020 Open Mobile Platform LLC.
+ *  Copyright (C) 2015-2017 Jolla Ltd.
 *
 *  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
@@ -18,9 +17,8 @@
 #include "ril_util.h"
 #include "ril_log.h"

-#include <ofono/gdbus.h>
-#include <ofono/dbus.h>
-#include <ofono/dbus-access.h>
+#include "gdbus.h"
+#include "ofono.h"

 #define RIL_OEM_RAW_INTERFACE "org.ofono.OemRaw"
 #define RIL_OEM_RAW_TIMEOUT   (60*1000) /* 60 sec */
@@ -34,11 +32,6 @@ struct ril_oem_raw {

 #define DBG_(oem,fmt,args...) DBG("%s" fmt, (oem)->log_prefix, ##args)

-static void ril_oem_raw_send_done(void *msg)
-{
-	dbus_message_unref(msg);
-}
-
 static void ril_oem_raw_send_cb(GRilIoChannel *io, int ril_status,
 			const void *data, guint len, void *user_data)
 {
@@ -47,23 +40,30 @@ static void ril_oem_raw_send_cb(GRilIoChannel *io, int ril_status,

 	if (ril_status == RIL_E_SUCCESS) {
 		DBusMessageIter it, array;
+		const guchar* bytes = data;
+		guint i;

 		reply = dbus_message_new_method_return(msg);
 		dbus_message_iter_init_append(reply, &it);
 		dbus_message_iter_open_container(&it, DBUS_TYPE_ARRAY,
 					DBUS_TYPE_BYTE_AS_STRING, &array);
-		dbus_message_iter_append_fixed_array(&array, DBUS_TYPE_BYTE,
-					&data, len);
+
+		for (i = 0; i < len; i++) {
+			guchar byte = bytes[i];
+			dbus_message_iter_append_basic(&array, DBUS_TYPE_BYTE,
+									&byte);
+		}
+
 		dbus_message_iter_close_container(&it, &array);
 	} else if (ril_status == GRILIO_STATUS_TIMEOUT) {
 		DBG("Timed out");
-		reply = ofono_dbus_error_timed_out(msg);
+		reply = __ofono_error_timed_out(msg);
 	} else {
 		DBG("Error %s", ril_error_to_string(ril_status));
-		reply = ofono_dbus_error_failed(msg);
+		reply = __ofono_error_failed(msg);
 	}

-	g_dbus_send_message(ofono_dbus_get_connection(), reply);
+	__ofono_dbus_pending_reply(&msg, reply);
 }

 static DBusMessage *ril_oem_raw_send(DBusConnection *conn, DBusMessage *msg,
@@ -72,12 +72,6 @@ static DBusMessage *ril_oem_raw_send(DBusConnection *conn, DBusMessage *msg,
 	DBusMessageIter it;
 	struct ril_oem_raw *oem = user_data;

-	if (!ofono_dbus_access_method_allowed(dbus_message_get_sender(msg),
-					OFONO_DBUS_ACCESS_INTF_OEMRAW,
-					OFONO_DBUS_ACCESS_OEMRAW_SEND, NULL)) {
-		return ofono_dbus_error_access_denied(msg);
-	}
-
 	dbus_message_iter_init(msg, &it);
 	if (dbus_message_iter_get_arg_type(&it) == DBUS_TYPE_ARRAY &&
 		dbus_message_iter_get_element_type(&it) == DBUS_TYPE_BYTE) {
@@ -100,12 +94,12 @@ static DBusMessage *ril_oem_raw_send(DBusConnection *conn, DBusMessage *msg,
 		grilio_request_append_bytes(req, data, data_len);
 		grilio_queue_send_request_full(oem->q, req,
 				RIL_REQUEST_OEM_HOOK_RAW, ril_oem_raw_send_cb,
-				ril_oem_raw_send_done, dbus_message_ref(msg));
+				NULL, dbus_message_ref(msg));
 		grilio_request_unref(req);
 		return NULL;
 	} else {
 		DBG_(oem, "Unexpected signature");
-		return ofono_dbus_error_invalid_args(msg);
+		return __ofono_error_invalid_args(msg);
 	}
 }

--- a/ofono/drivers/ril/ril_phonebook.c
+++ b/ofono/drivers/ril/ril_phonebook.c
@@ -5,7 +5,8 @@
 *  Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 *  Copyright (C) ST-Ericsson SA 2010.
 *  Copyright (C) 2008-2011 Intel Corporation. All rights reserved.
- *  Copyright (C) 2013-2021 Jolla Ltd
+ *  Copyright (C) 2013-2016 Jolla Ltd
+ *  Contact: Jussi Kangas <jussi.kangas@tieto.com>
 *  Copyright (C) 2014  Canonical Ltd
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -20,9 +21,10 @@

 #include "ril_plugin.h"

-#include <ofono/modem.h>
-#include <ofono/misc.h>
-#include <ofono/log.h>
+#include <ofono.h>
+
+#include "simutil.h"
+#include "util.h"

 #define CALLBACK_WITH_FAILURE(cb, args...)		\
 	do {						\
@@ -42,8 +44,6 @@
 	} while (0)

 #define SIM_EFPBR_FILEID 0x4F30
-#define SIM_EFADN_FILEID 0x6F3A
-#define SIM_EFEXT1_FILEID 0x6F4A

 #define UNUSED	0xFF

@@ -148,7 +148,8 @@ static gint comp_int(gconstpointer a, gconstpointer b)
 	return a_val - b_val;
 }

-static const struct pb_file_info *ext1_info(const GSList *pb_files)
+static const struct pb_file_info *
+ext1_info(const GSList *pb_files)
 {
 	const GSList *l;
 	for (l = pb_files; l; l = l->next) {
@@ -169,7 +170,7 @@ static struct phonebook_entry *handle_adn(size_t len, const unsigned char *msg,
 	unsigned extension_record = UNUSED;
 	unsigned i, prefix;
 	char *number = NULL;
-	char *name = ofono_sim_string_to_utf8(msg, name_length);
+	char *name = sim_string_to_utf8(msg, name_length);
 	struct phonebook_entry *new_entry;

 	/* Length contains also TON & NPI */
@@ -244,7 +245,7 @@ static struct phonebook_entry *handle_adn(size_t len, const unsigned char *msg,
 	return new_entry;

 end:
-	ofono_sim_string_free(name);
+	g_free(name);
 	g_free(number);

 	return NULL;
@@ -302,7 +303,7 @@ static void handle_sne(size_t len, const unsigned char *msg,
 	if (rec_data->set_by_iap)
 		len -= 2;

-	sne = ofono_sim_string_to_utf8(msg, len);
+	sne = sim_string_to_utf8(msg, len);

 	if (sne && *sne != '\0') {
 		struct phonebook_entry *entry;
@@ -311,17 +312,19 @@ static void handle_sne(size_t len, const unsigned char *msg,
 				GINT_TO_POINTER(rec_data->adn_idx));
 		if (entry) {
 			/* If one already exists, delete it */
-			ofono_sim_string_free(entry->sne);
+			if (entry->sne)
+				g_free(entry->sne);

 			DBG("Adding SNE %s to %d", sne, rec_data->adn_idx);
 			DBG("name %s", entry->name);

 			entry->sne = sne;
-			sne = NULL;
+		} else {
+			g_free(sne);
 		}
+	} else {
+		g_free(sne);
 	}
-
-	ofono_sim_string_free(sne);
 }

 static void handle_anr(size_t len,
@@ -415,31 +418,33 @@ static void handle_email(size_t len, const unsigned char *msg,
 			const struct record_to_read *rec_data)
 {
 	char *email;
+	struct phonebook_entry *entry;

 	/* There are additional fields for type 2 files */
 	if (rec_data->set_by_iap)
 		len -= 2;

-	email = ofono_sim_string_to_utf8(msg, len);
-
-	if (email && *email) {
-		struct phonebook_entry *entry;
-
-		entry = g_tree_lookup(ref->phonebook,
-				GINT_TO_POINTER(rec_data->adn_idx));
-		if (entry) {
-			/* if one already exists, delete it */
-			ofono_sim_string_free(entry->email);
-
-			DBG("Adding email to entry %d", rec_data->adn_idx);
-			DBG("name %s", entry->name);
-
-			entry->email = email;
-			email = NULL;
-		}
+	email = sim_string_to_utf8(msg, len);
+	if (email == NULL || *email == '\0') {
+		g_free(email);
+		return;
 	}

-	ofono_sim_string_free(email);
+	entry = g_tree_lookup(ref->phonebook,
+				GINT_TO_POINTER(rec_data->adn_idx));
+	if (entry == NULL) {
+		g_free(email);
+		return;
+	}
+
+	/* if one already exists, delete it */
+	if (entry->email)
+		g_free(entry->email);
+
+	DBG("Adding email to entry %d", rec_data->adn_idx);
+	DBG("name %s", entry->name);
+
+	entry->email = email;
 }

 static void handle_ext1(size_t len, const unsigned char *msg,
@@ -566,11 +571,11 @@ static gboolean free_entry(gpointer key, gpointer value, gpointer data)
 {
 	struct phonebook_entry *entry = value;

-	ofono_sim_string_free(entry->name);
-	ofono_sim_string_free(entry->email);
-	ofono_sim_string_free(entry->sne);
+	g_free(entry->name);
 	g_free(entry->number);
+	g_free(entry->email);
 	g_free(entry->anr);
+	g_free(entry->sne);
 	g_free(entry);

 	return FALSE;
@@ -993,9 +998,8 @@ static void ril_export_entries(struct ofono_phonebook *pb,
 	pbd->df_path = usim_path;
 	pbd->df_size = sizeof(usim_path);

-	ofono_sim_read_path(pbd->sim_context, SIM_EFPBR_FILEID,
+	ofono_sim_read(pbd->sim_context, SIM_EFPBR_FILEID,
 			OFONO_SIM_FILE_STRUCTURE_FIXED,
-			pbd->df_path, pbd->df_size,
 			pb_reference_data_cb, pb);
 }

@@ -1017,7 +1021,7 @@ static int ril_phonebook_probe(struct ofono_phonebook *pb,
 	if (pd == NULL)
 		return -ENOMEM;

-	pd->sim = ofono_modem_get_sim(modem);
+	pd->sim = __ofono_atom_find(OFONO_ATOM_TYPE_SIM, modem);
 	if (pd->sim == NULL)
 		return -ENOENT;

--- a/ofono/drivers/ril/ril_plugin.c
+++ b/ofono/drivers/ril/ril_plugin.c
--- a/ofono/drivers/ril/ril_plugin.h
+++ b/ofono/drivers/ril/ril_plugin.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  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
@@ -18,6 +18,7 @@
 #define RIL_PLUGIN_H

 #include "ril_types.h"
+#include "sailfish_manager.h"

 #include <ofono/modem.h>
 #include <ofono/call-barring.h>
@@ -51,7 +52,7 @@ struct ril_modem {
 	const char *log_prefix;
 	const char *ecclist_file;
 	struct ofono_modem *ofono;
-	struct ofono_cell_info *cell_info;
+	struct sailfish_cell_info *cell_info;
 	struct ril_vendor *vendor;
 	struct ril_radio *radio;
 	struct ril_data *data;
@@ -72,7 +73,7 @@ struct ril_modem *ril_modem_create(GRilIoChannel *io, const char *log_prefix,
 		struct ril_radio *radio, struct ril_network *network,
 		struct ril_sim_card *card, struct ril_data *data,
 		struct ril_sim_settings *settings, struct ril_vendor *vendor,
-		struct ofono_cell_info *cell_info);
+		struct sailfish_cell_info *cell_info);
 void ril_modem_delete(struct ril_modem *modem);
 struct ofono_sim *ril_modem_ofono_sim(struct ril_modem *modem);
 struct ofono_gprs *ril_modem_ofono_gprs(struct ril_modem *modem);
@@ -84,6 +85,7 @@ struct ofono_netreg *ril_modem_ofono_netreg(struct ril_modem *modem);
 #define ril_modem_io(modem) ((modem)->io)

 int ril_sim_app_type(struct ofono_sim *sim);
+int ril_netreg_check_if_really_roaming(struct ofono_netreg *reg, gint status);

 extern const struct ofono_call_barring_driver ril_call_barring_driver;
 extern const struct ofono_call_forwarding_driver ril_call_forwarding_driver;
--- a/ofono/drivers/ril/ril_radio.c
+++ b/ofono/drivers/ril/ril_radio.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2020 Jolla Ltd.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
 *
 *  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
@@ -13,8 +13,6 @@
 *  GNU General Public License for more details.
 */

-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-
 #include "ril_radio.h"
 #include "ril_util.h"
 #include "ril_log.h"
--- a/ofono/drivers/ril/ril_radio_caps.c
+++ b/ofono/drivers/ril/ril_radio_caps.c
--- a/ofono/drivers/ril/ril_radio_caps.h
+++ b/ofono/drivers/ril/ril_radio_caps.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2017-2020 Jolla Ltd.
+ *  Copyright (C) 2017 Jolla Ltd.
 *
 *  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
@@ -19,16 +19,12 @@
 #include "ril_types.h"

 struct ril_data_manager;
-struct ril_sim_settings;
 struct ril_radio_caps;
 struct ril_radio_caps_manager;
 struct ril_radio_capability;
-struct ril_radio_caps_request;

-typedef void (*ril_radio_caps_cb_t)(struct ril_radio_caps *caps, void *arg);
 typedef void (*ril_radio_caps_manager_cb_t)(struct ril_radio_caps_manager *mgr,
 							void *user_data);
-
 /* ril_radio_capability pointer is NULL if functionality is unsupported */
 typedef void (*ril_radio_caps_check_cb_t)
 		(const struct ril_radio_capability *cap, void *user_data);
@@ -43,47 +39,21 @@ struct ril_radio_caps_manager *ril_radio_caps_manager_new
 struct ril_radio_caps_manager *ril_radio_caps_manager_ref
 					(struct ril_radio_caps_manager *mgr);
 void ril_radio_caps_manager_unref(struct ril_radio_caps_manager *mgr);
-gulong ril_radio_caps_manager_add_tx_aborted_handler
-				(struct ril_radio_caps_manager *mgr,
-				ril_radio_caps_manager_cb_t cb, void *arg);
-gulong ril_radio_caps_manager_add_tx_done_handler
+gulong ril_radio_caps_manager_add_aborted_handler
 				(struct ril_radio_caps_manager *mgr,
 				ril_radio_caps_manager_cb_t cb, void *arg);
 void ril_radio_caps_manager_remove_handler(struct ril_radio_caps_manager *mgr,
-						gulong id);
-void ril_radio_caps_manager_remove_handlers(struct ril_radio_caps_manager *mgr,
-						gulong *ids, int count);
-#define ril_radio_caps_manager_remove_all_handlers(mgr, ids) \
-	ril_radio_caps_manager_remove_handlers(mgr, ids, G_N_ELEMENTS(ids))
+								gulong id);

 /* And one ril_radio_caps object per modem */
-
-struct ril_radio_caps {
-	struct ril_radio_caps_manager *mgr;
-	enum ofono_radio_access_mode supported_modes;
-};
-
 struct ril_radio_caps *ril_radio_caps_new(struct ril_radio_caps_manager *mgr,
 		const char *log_prefix, GRilIoChannel *io,
-		struct ofono_watch *watch,
 		struct ril_data *data, struct ril_radio *radio,
-		struct ril_sim_card *sim, struct ril_sim_settings *settings,
+		struct ril_sim_card *sim, struct ril_network *net,
 		const struct ril_slot_config *config,
 		const struct ril_radio_capability *cap);
 struct ril_radio_caps *ril_radio_caps_ref(struct ril_radio_caps *caps);
 void ril_radio_caps_unref(struct ril_radio_caps *caps);
-void ril_radio_caps_drop(struct ril_radio_caps *caps);
-gulong ril_radio_caps_add_supported_modes_handler
-				(struct ril_radio_caps *caps,
-					ril_radio_caps_cb_t cb, void *arg);
-void ril_radio_caps_remove_handler(struct ril_radio_caps *caps, gulong id);
-
-/* Data requests */
-
-struct ril_radio_caps_request *ril_radio_caps_request_new
-		(struct ril_radio_caps *caps, enum ofono_radio_access_mode mode,
-						enum ril_data_role role);
-void ril_radio_caps_request_free(struct ril_radio_caps_request *req);

 #endif /* RIL_RADIO_CAPS_H */

--- a/ofono/drivers/ril/ril_sim.c
+++ b/ofono/drivers/ril/ril_sim.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
 *
 *  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
@@ -18,10 +18,11 @@
 #include "ril_util.h"
 #include "ril_log.h"

-#include <ofono/misc.h>
 #include <ofono/watch.h>

-#include <gutil_misc.h>
+#include "simutil.h"
+#include "util.h"
+#include "ofono.h"

 #define SIM_STATE_CHANGE_TIMEOUT_SECS (5)
 #define FAC_LOCK_QUERY_TIMEOUT_SECS   (10)
@@ -85,7 +86,6 @@ struct ril_sim {
 	gboolean empty_pin_query_allowed;
 	gboolean inserted;
 	guint idle_id; /* Used by register and SIM reset callbacks */
-	guint list_apps_id;
 	gulong card_event_id[SIM_CARD_EVENT_COUNT];
 	gulong io_event_id[IO_EVENT_COUNT];
 	guint query_pin_retries_id;
@@ -118,25 +118,12 @@ struct ril_sim_cbd_io {
 		ofono_sim_write_cb_t write;
 		ofono_sim_imsi_cb_t imsi;
 		ofono_query_facility_lock_cb_t query_facility_lock;
-		ofono_sim_open_channel_cb_t open_channel;
-		ofono_sim_close_channel_cb_t close_channel;
 		gpointer ptr;
 	} cb;
 	gpointer data;
 	guint req_id;
 };

-struct ril_sim_session_cbd {
-	struct ril_sim *sd;
-	struct ril_sim_card *card;
-	ofono_sim_logical_access_cb_t cb;
-	gpointer data;
-	int ref_count;
-	int session_id;
-	int cla;
-	guint req_id;
-};
-
 struct ril_sim_pin_cbd {
 	struct ril_sim *sd;
 	ofono_sim_lock_unlock_cb_t cb;
@@ -163,16 +150,6 @@ struct ril_sim_retry_query {
 	GRilIoRequest *(*new_req)(struct ril_sim *sd);
 };

-/* TS 102.221 */
-#define APP_TEMPLATE_TAG 0x61
-#define APP_ID_TAG 0x4F
-
-struct ril_sim_list_apps {
-	struct ril_sim *sd;
-	ofono_sim_list_apps_cb_t cb;
-	void *data;
-};
-
 static GRilIoRequest *ril_sim_empty_sim_pin_req(struct ril_sim *sd);
 static GRilIoRequest *ril_sim_empty_sim_puk_req(struct ril_sim *sd);
 static void ril_sim_query_retry_count_cb(GRilIoChannel *io, int status,
@@ -241,45 +218,6 @@ static void ril_sim_cbd_io_start(struct ril_sim_cbd_io *cbd, GRilIoRequest* req,
 	ril_sim_card_sim_io_started(cbd->card, cbd->req_id);
 }

-static struct ril_sim_session_cbd *ril_sim_session_cbd_new(struct ril_sim *sd,
-	int session_id, int cla, ofono_sim_logical_access_cb_t cb, void *data)
-{
-	struct ril_sim_session_cbd *cbd = g_new0(struct ril_sim_session_cbd, 1);
-
-	cbd->sd = sd;
-	cbd->cb = cb;
-	cbd->data = data;
-	cbd->card = ril_sim_card_ref(sd->card);
-	cbd->session_id = session_id;
-	cbd->cla = cla;
-	cbd->ref_count = 1;
-	return cbd;
-}
-
-static void ril_sim_session_cbd_unref(void *data)
-{
-	struct ril_sim_session_cbd *cbd = data;
-
-	if (--(cbd->ref_count) < 1) {
-		ril_sim_card_sim_io_finished(cbd->card, cbd->req_id);
-		ril_sim_card_unref(cbd->card);
-		g_free(cbd);
-	}
-}
-
-static void ril_sim_session_cbd_start(struct ril_sim_session_cbd *cbd,
-		GRilIoRequest* req, guint code, GRilIoChannelResponseFunc cb)
-{
-	struct ril_sim *sd = cbd->sd;
-	const guint finished_req = cbd->req_id;
-
-	cbd->ref_count++;
-	cbd->req_id = grilio_queue_send_request_full(sd->q, req, code, cb,
-					ril_sim_session_cbd_unref, cbd);
-	ril_sim_card_sim_io_started(cbd->card, cbd->req_id);
-	ril_sim_card_sim_io_finished(cbd->card, finished_req);
-}
-
 static void ril_sim_pin_cbd_state_event_count_cb(struct ril_sim_card *sc,
 							void *user_data)
 {
@@ -348,7 +286,7 @@ static void ril_sim_append_path(struct ril_sim *sd, GRilIoRequest *req,
 		const int fileid, const guchar *path, const guint path_len)
 {
 	const enum ril_app_type app_type = ril_sim_card_app_type(sd->card);
-	guchar db_path[OFONO_EF_PATH_BUFFER_SIZE] = { 0x00 };
+	guchar db_path[6] = { 0x00 };
 	char *hex_path = NULL;
 	int len;

@@ -356,26 +294,43 @@ static void ril_sim_append_path(struct ril_sim *sd, GRilIoRequest *req,
 		memcpy(db_path, path, path_len);
 		len = path_len;
 	} else if (app_type == RIL_APPTYPE_USIM) {
-		len = ofono_get_ef_path_3g(fileid, db_path);
+		len = sim_ef_db_get_path_3g(fileid, db_path);
 	} else if (app_type == RIL_APPTYPE_SIM) {
-		len = ofono_get_ef_path_2g(fileid, db_path);
+		len = sim_ef_db_get_path_2g(fileid, db_path);
 	} else {
 		ofono_error("Unsupported app type %d", app_type);
 		len = 0;
 	}

 	if (len > 0) {
-		hex_path = ril_encode_hex(db_path, len);
+		hex_path = encode_hex(db_path, len, 0);
 		grilio_request_append_utf8(req, hex_path);
 		DBG_(sd, "%s", hex_path);
 		g_free(hex_path);
+	} else if (fileid == SIM_EF_ICCID_FILEID || fileid == SIM_EFPL_FILEID) {
+		/*
+		 * Special catch-all for EF_ICCID (unique card ID)
+		 * and EF_PL files which exist in the root directory.
+		 * As the sim_info_cb function may not have yet
+		 * recorded the app_type for the SIM, and the path
+		 * for both files is the same for 2g|3g, just hard-code.
+		 *
+		 * See 'struct ef_db' in:
+		 * ../../src/simutil.c for more details.
+		 */
+		DBG_(sd, "%s", ROOTMF);
+		grilio_request_append_utf8(req, ROOTMF);
 	} else {
 		/*
-		 * Catch-all for EF_ICCID, EF_PL and other files absent
-		 * from ef_db table in src/simutil.c, hard-code ROOTMF.
+		 * The only known case of this is EFPHASE_FILED (0x6FAE).
+		 * The ef_db table ( see /src/simutil.c ) entry for
+		 * EFPHASE contains a value of 0x0000 for it's
+		 * 'parent3g' member.  This causes a NULL path to
+		 * be returned.
 		 */
-		DBG_(sd, "%s (default)", ROOTMF);
-		grilio_request_append_utf8(req, ROOTMF);
+
+		DBG_(sd, "returning empty path.");
+		grilio_request_append_utf8(req, NULL);
 	}
 }

@@ -390,15 +345,17 @@ static struct ril_sim_io_response *ril_sim_parse_io_response(const void *data,

 	if (grilio_parser_get_int32(&rilp, &sw1) &&
 			grilio_parser_get_int32(&rilp, &sw2)) {
-		char *hex = grilio_parser_get_utf8(&rilp);
+		char *hex_data = grilio_parser_get_utf8(&rilp);

-		DBG("sw1=0x%02X,sw2=0x%02X,%s", sw1, sw2, hex);
+		DBG("sw1=0x%02X,sw2=0x%02X,%s", sw1, sw2, hex_data);
 		res = g_slice_new0(struct ril_sim_io_response);
 		res->sw1 = sw1;
 		res->sw2 = sw2;
-		if (hex) {
-			res->data = ril_decode_hex(hex, -1, &res->data_len);
-			g_free(hex);
+		if (hex_data) {
+			long num_bytes = 0;
+			res->data = decode_hex(hex_data, -1, &num_bytes, 0);
+			res->data_len = num_bytes;
+			g_free(hex_data);
 		}
 	}

@@ -504,15 +461,15 @@ static void ril_sim_file_info_cb(GRilIoChannel *io, int status,
 		gboolean ok = FALSE;
 		guchar access[3] = { 0x00, 0x00, 0x00 };
 		guchar file_status = EF_STATUS_VALID;
-		unsigned int flen = 0, rlen = 0, str = 0;
+		int flen = 0, rlen = 0, str = 0;

 		if (res->data_len) {
 			if (res->data[0] == 0x62) {
-				ok = ofono_parse_get_response_3g(res->data,
+				ok = sim_parse_3g_get_response(res->data,
 					res->data_len, &flen, &rlen, &str,
 					access, NULL);
 			} else {
-				ok = ofono_parse_get_response_2g(res->data,
+				ok = sim_parse_2g_get_response(res->data,
 					res->data_len, &flen, &rlen, &str,
 					access, &file_status);
 			}
@@ -653,8 +610,7 @@ static void ril_sim_write(struct ofono_sim *sim, guint cmd, int fileid,
 			ofono_sim_write_cb_t cb, void *data)
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
-	char *hex_data = ril_encode_hex(value, length);
-
+	char *hex_data = encode_hex(value, length, 0);
 	ril_sim_request_io(sd, cmd, fileid, p1, p2, length, hex_data, path,
 		path_len, ril_sim_write_cb, ril_sim_cbd_io_new(sd, cb, data));
 	g_free(hex_data);
@@ -1197,7 +1153,8 @@ static void ril_sim_pin_change_state_cb(GRilIoChannel *io, int ril_status,
 			ril_status, cbd->passwd_type, retry_count);

 	if (ril_status == RIL_E_SUCCESS && retry_count == 0) {
-		enum ofono_sim_password_type pin_type = ofono_sim_puk2pin(type);
+		enum ofono_sim_password_type associated_pin =
+						__ofono_sim_puk2pin(type);
 		/*
 		 * If PIN/PUK request has succeeded, zero retry count
 		 * makes no sense, we have to assume that it's unknown.
@@ -1205,9 +1162,9 @@ static void ril_sim_pin_change_state_cb(GRilIoChannel *io, int ril_status,
 		 * it can't be queried it will remain unknown.
 		 */
 		sd->retries[type] = -1;
-		if (pin_type != OFONO_SIM_PASSWORD_INVALID) {
+		if (associated_pin != OFONO_SIM_PASSWORD_INVALID) {
 			/* Successful PUK requests affect PIN retry count */
-			sd->retries[pin_type] = -1;
+			sd->retries[associated_pin] = -1;
 		}
 	} else {
 		sd->retries[type] = retry_count;
@@ -1465,293 +1422,6 @@ static void ril_sim_query_facility_lock(struct ofono_sim *sim,
 	grilio_request_unref(req);
 }

-static gboolean ril_sim_list_apps_cb(void *data)
-{
-	struct ril_sim_list_apps *rd = data;
-	struct ril_sim *sd = rd->sd;
-	const struct ril_sim_card_status *status = sd->card->status;
-	struct ofono_error error;
-
-	GASSERT(sd->list_apps_id);
-	sd->list_apps_id = 0;
-
-	if (status) {
-		int i, n = status->num_apps;
-		GByteArray *tlv = g_byte_array_sized_new(n * 20);
-
-		/* Reconstruct EFdir contents */
-		for (i = 0; i < n; i++) {
-			const char *hex = status->apps[i].aid;
-			gsize hex_len = hex ? strlen(hex) : 0;
-			guint8 aid[16];
-
-			if (hex_len >= 2 && hex_len <= 2 * sizeof(aid) &&
-				gutil_hex2bin(hex, hex_len, aid)) {
-				const guint8 aid_size = (guint8)hex_len/2;
-				guint8 buf[4];
-
-				/*
-				 * TS 102.221
-				 * 13 Application independent files
-				 * 13.1 EFdir
-				 *
-				 * Application template TLV object.
-				 */
-				buf[0] = APP_TEMPLATE_TAG;
-				buf[1] = aid_size + 2;
-				buf[2] = APP_ID_TAG;
-				buf[3] = aid_size;
-				g_byte_array_append(tlv, buf, sizeof(buf));
-				g_byte_array_append(tlv, aid, aid_size);
-			}
-		}
-		DBG_(sd, "reporting %u apps %u bytes", n, tlv->len);
-		rd->cb(ril_error_ok(&error), tlv->data, tlv->len, rd->data);
-		g_byte_array_unref(tlv);
-	} else {
-		DBG_(sd, "no SIM card, no apps");
-		rd->cb(ril_error_failure(&error), NULL, 0, rd->data);
-	}
-	return G_SOURCE_REMOVE;
-}
-
-static void ril_sim_list_apps(struct ofono_sim *sim,
-			ofono_sim_list_apps_cb_t cb, void *data)
-{
-	struct ril_sim *sd = ril_sim_get_data(sim);
-	struct ril_sim_list_apps *rd = g_new(struct ril_sim_list_apps, 1);
-
-	rd->sd = sd;
-	rd->cb = cb;
-	rd->data = data;
-	if (sd->list_apps_id) {
-		g_source_remove(sd->list_apps_id);
-	}
-	sd->list_apps_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-				ril_sim_list_apps_cb, rd, g_free);
-}
-
-static void ril_sim_open_channel_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sim_cbd_io *cbd = user_data;
-	ofono_sim_open_channel_cb_t cb = cbd->cb.open_channel;
-	struct ofono_error error;
-
-	if (status == RIL_E_SUCCESS) {
-		guint32 n, session_id;
-		GRilIoParser rilp;
-
-		grilio_parser_init(&rilp, data, len);
-		if (grilio_parser_get_uint32(&rilp, &n) && n >= 1 &&
-			grilio_parser_get_uint32(&rilp, &session_id)) {
-			DBG_(cbd->sd, "%u", session_id);
-			cb(ril_error_ok(&error), session_id, cbd->data);
-			return;
-		}
-	} else {
-		ofono_error("Open logical channel failure: %s",
-					ril_error_to_string(status));
-	}
-
-	cb(ril_error_failure(&error), 0, cbd->data);
-}
-
-static void ril_sim_open_channel(struct ofono_sim *sim,
-		const unsigned char *aid, unsigned int len,
-		ofono_sim_open_channel_cb_t cb, void *data)
-{
-	struct ril_sim *sd = ril_sim_get_data(sim);
-	struct ril_sim_cbd_io *cbd = ril_sim_cbd_io_new(sd, cb, data);
-	GRilIoRequest *req = grilio_request_new();
-	char *aid_hex = ril_encode_hex(aid, len);
-
-	DBG_(sd, "%s", aid_hex);
-	grilio_request_append_utf8(req, aid_hex);
-	grilio_request_append_int32(req, 0);
-	grilio_request_set_timeout(req, SIM_IO_TIMEOUT_SECS * 1000);
-	ril_sim_cbd_io_start(cbd, req, RIL_REQUEST_SIM_OPEN_CHANNEL,
-						ril_sim_open_channel_cb);
-	grilio_request_unref(req);
-	g_free(aid_hex);
-}
-
-static void ril_sim_close_channel_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sim_cbd_io *cbd = user_data;
-	struct ofono_error error;
-
-	if (status == RIL_E_SUCCESS) {
-		ril_error_init_ok(&error);
-	} else {
-		ofono_error("Close logical channel failure: %s",
-					ril_error_to_string(status));
-		ril_error_init_failure(&error);
-	}
-	cbd->cb.close_channel(&error, cbd->data);
-}
-
-static void ril_sim_close_channel(struct ofono_sim *sim, int session_id,
-		ofono_sim_close_channel_cb_t cb, void *data)
-{
-	struct ril_sim *sd = ril_sim_get_data(sim);
-	struct ril_sim_cbd_io *cbd = ril_sim_cbd_io_new(sd, cb, data);
-	GRilIoRequest *req = grilio_request_new();
-
-	DBG_(sd, "%u", session_id);
-	grilio_request_append_int32(req, 1);
-	grilio_request_append_int32(req, session_id);
-	grilio_request_set_timeout(req, SIM_IO_TIMEOUT_SECS * 1000);
-	ril_sim_cbd_io_start(cbd, req, RIL_REQUEST_SIM_CLOSE_CHANNEL,
-						ril_sim_close_channel_cb);
-	grilio_request_unref(req);
-}
-
-static void ril_sim_logical_access_get_results_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sim_session_cbd *cbd = user_data;
-	ofono_sim_logical_access_cb_t cb = cbd->cb;
-	struct ril_sim_io_response *res;
-	struct ofono_error err;
-
-	res = ril_sim_parse_io_response(data, len);
-	if (ril_sim_io_response_ok(res) && status == RIL_E_SUCCESS) {
-		cb(ril_error_ok(&err), res->data, res->data_len, cbd->data);
-	} else if (res) {
-		cb(ril_error_sim(&err, res->sw1, res->sw2), NULL, 0, cbd->data);
-	} else {
-		cb(ril_error_failure(&err), NULL, 0, cbd->data);
-	}
-	ril_sim_io_response_free(res);
-}
-
-static void ril_sim_logical_access_transmit(struct ril_sim_session_cbd *cbd,
-		int ins, int p1, int p2, int p3, const char *hex_data,
-		GRilIoChannelResponseFunc cb)
-{
-	GRilIoRequest *req = grilio_request_new();
-
-	DBG_(cbd->sd, "session=%u,cmd=%02X,%02X,%02X,%02X,%02X,%s",
-				cbd->session_id, cbd->cla, ins, p1, p2, p3,
-				hex_data ? hex_data : "");
-	grilio_request_append_int32(req, cbd->session_id);
-	grilio_request_append_int32(req, cbd->cla);
-	grilio_request_append_int32(req, ins);
-	grilio_request_append_int32(req, p1);
-	grilio_request_append_int32(req, p2);
-	grilio_request_append_int32(req, p3);
-	grilio_request_append_utf8(req, hex_data);
-	grilio_request_set_timeout(req, SIM_IO_TIMEOUT_SECS * 1000);
-	ril_sim_session_cbd_start(cbd, req,
-				RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL, cb);
-	grilio_request_unref(req);
-}
-
-static void ril_sim_logical_access_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sim_session_cbd *cbd = user_data;
-	ofono_sim_logical_access_cb_t cb = cbd->cb;
-	struct ril_sim_io_response *res;
-	struct ofono_error error;
-
-	DBG_(cbd->sd, "");
-	cbd->req_id = 0;
-	res = ril_sim_parse_io_response(data, len);
-	if (res && status == RIL_E_SUCCESS) {
-		/*
-		 * TS 102 221
-		 * 7.3.1.1.5.2 Case 4 commands
-		 *
-		 * If the UICC receives a case 4 command, after processing
-		 * the data sent with the C-APDU, it shall return:
-		 *
-		 * a) procedure bytes '61 xx' instructing the transport
-		 * layer of the terminal to issue a GET RESPONSE command
-		 * with a maximum length of 'xx'; or
-		 * b) status indicating a warning or error condition (but
-		 * not SW1 SW2 = '90 00').
-		 *
-		 * The GET RESPONSE command so issued is then treated as
-		 * described for case 2 commands.
-		 */
-		if (res->sw1 == 0x61) {
-			ril_sim_logical_access_transmit(cbd,
-				CMD_GET_RESPONSE, 0, 0, res->sw2, NULL,
-				ril_sim_logical_access_get_results_cb);
-		} else if (ril_sim_io_response_ok(res)) {
-			cb(ril_error_ok(&error), res->data, res->data_len,
-								cbd->data);
-		} else {
-			cb(ril_error_sim(&error, res->sw1, res->sw2), NULL, 0,
-								cbd->data);
-		}
-	} else {
-		cb(ril_error_failure(&error), NULL, 0, cbd->data);
-	}
-	ril_sim_io_response_free(res);
-}
-
-static void ril_sim_logical_access(struct ofono_sim *sim, int session_id,
-			const unsigned char *pdu, unsigned int len,
-			ofono_sim_logical_access_cb_t cb, void *data)
-{
-	/* SIM Command APDU: CLA INS P1 P2 P3 Data */
-	struct ril_sim *sd = ril_sim_get_data(sim);
-	const char* hex_data;
-	char *tmp;
-	struct ril_sim_session_cbd *cbd = ril_sim_session_cbd_new(sd,
-						session_id, pdu[0], cb, data);
-
-	GASSERT(len >= 5);
-	if (len > 5) {
-		hex_data = tmp = ril_encode_hex(pdu + 5, len - 5);
-	} else {
-		tmp = NULL;
-		hex_data = "";
-	}
-
-	ril_sim_logical_access_transmit(cbd, pdu[1], pdu[2], pdu[3], pdu[4],
-					hex_data, ril_sim_logical_access_cb);
-	ril_sim_session_cbd_unref(cbd);
-	g_free(tmp);
-}
-
-static void ril_sim_session_read_binary(struct ofono_sim *sim, int session,
-			int fileid, int start, int length,
-			const unsigned char *path, unsigned int path_len,
-			ofono_sim_read_cb_t cb, void *data)
-{
-	struct ofono_error error;
-
-	ofono_error("session_read_binary not implemented");
-	cb(ril_error_failure(&error), NULL, 0, data);
-}
-
-static void ril_sim_session_read_record(struct ofono_sim *sim, int session_id,
-			int fileid, int record, int length,
-			const unsigned char *path, unsigned int path_len,
-			ofono_sim_read_cb_t cb, void *data)
-{
-	struct ofono_error error;
-
-	ofono_error("session_read_record not implemented");
-	cb(ril_error_failure(&error), NULL, 0, data);
-}
-
-static void ril_sim_session_read_info(struct ofono_sim *sim, int session_id,
-			int fileid, const unsigned char *path,
-			unsigned int path_len, ofono_sim_file_info_cb_t cb,
-			void *data)
-{
-	struct ofono_error error;
-
-	ofono_error("session_read_info not implemented");
-	cb(ril_error_failure(&error), -1, -1, -1, NULL, 0, data);
-}
-
 static void ril_sim_refresh_cb(GRilIoChannel *io, guint code,
 				const void *data, guint len, void *user_data)
 {
@@ -1762,7 +1432,7 @@ static void ril_sim_refresh_cb(GRilIoChannel *io, guint code,
 	 * so we could be more descrete here. However I have't actually
 	 * seen that in real life, let's just refresh everything for now.
 	 */
-	ofono_sim_refresh_full(sd->sim);
+	__ofono_sim_refresh(sd->sim, NULL, TRUE, TRUE);
 }

 static gboolean ril_sim_register(gpointer user)
@@ -1833,9 +1503,6 @@ static void ril_sim_remove(struct ofono_sim *sim)
 	grilio_queue_cancel_all(sd->q, FALSE);
 	ofono_sim_set_data(sim, NULL);

-	if (sd->list_apps_id) {
-		g_source_remove(sd->list_apps_id);
-	}
 	if (sd->idle_id) {
 		g_source_remove(sd->idle_id);
 	}
@@ -1880,14 +1547,7 @@ const struct ofono_sim_driver ril_sim_driver = {
 	.reset_passwd           = ril_sim_pin_send_puk,
 	.change_passwd          = ril_sim_change_passwd,
 	.query_pin_retries      = ril_sim_query_pin_retries,
-	.query_facility_lock    = ril_sim_query_facility_lock,
-	.list_apps              = ril_sim_list_apps,
-	.open_channel2          = ril_sim_open_channel,
-	.close_channel          = ril_sim_close_channel,
-	.session_read_binary    = ril_sim_session_read_binary,
-	.session_read_record    = ril_sim_session_read_record,
-	.session_read_info      = ril_sim_session_read_info,
-	.logical_access         = ril_sim_logical_access
+	.query_facility_lock    = ril_sim_query_facility_lock
 };

 /*
--- a/ofono/drivers/ril/ril_sim_card.c
+++ b/ofono/drivers/ril/ril_sim_card.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2020 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
 *
 *  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
@@ -13,8 +13,6 @@
 *  GNU General Public License for more details.
 */

-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-
 #include "ril_sim_card.h"
 #include "ril_radio.h"
 #include "ril_util.h"
--- a/ofono/drivers/ril/ril_sim_settings.c
+++ b/ofono/drivers/ril/ril_sim_settings.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2020 Jolla Ltd.
+ *  Copyright (C) 2016-2019 Jolla Ltd.
 *
 *  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
@@ -13,8 +13,6 @@
 *  GNU General Public License for more details.
 */

-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-
 #include "ril_sim_settings.h"
 #include "ril_log.h"

--- a/ofono/drivers/ril/ril_sim_settings.h
+++ b/ofono/drivers/ril/ril_sim_settings.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2020 Jolla Ltd.
+ *  Copyright (C) 2016-2018 Jolla Ltd.
 *
 *  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
@@ -45,8 +45,6 @@ gulong ril_sim_settings_add_pref_mode_changed_handler(struct ril_sim_settings *s
 void ril_sim_settings_remove_handler(struct ril_sim_settings *s, gulong id);
 void ril_sim_settings_remove_handlers(struct ril_sim_settings *s, gulong *ids,
 								int count);
-#define ril_sim_settings_remove_all_handlers(s,ids) \
-	ril_sim_settings_remove_handlers(s, ids, G_N_ELEMENTS(ids))

 #endif /* RIL_SIM_SETTINGS_H */

--- a/ofono/drivers/ril/ril_sms.c
+++ b/ofono/drivers/ril/ril_sms.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2017 Jolla Ltd.
 *
 *  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
@@ -17,6 +17,10 @@
 #include "ril_util.h"
 #include "ril_log.h"

+#include "smsutil.h"
+#include "util.h"
+#include "simutil.h"
+
 #define RIL_SMS_ACK_RETRY_MS    1000
 #define RIL_SMS_ACK_RETRY_COUNT 10

@@ -242,10 +246,10 @@ static void ril_sms_submit(struct ofono_sms *sms, const unsigned char *pdu,
 	/* TPDU:
 	 *
 	 * 'pdu' is a raw hexadecimal string
-	 *  ril_encode_hex() turns it into an ASCII/hex buffer (subset of utf8)
+	 *  encode_hex() turns it into an ASCII/hex UTF8 buffer
 	 *  grilio_request_append_utf8() encodes utf8 -> utf16
 	 */
-	tpdu = ril_encode_hex(pdu + smsc_len, tpdu_len);
+	tpdu = encode_hex(pdu + smsc_len, tpdu_len, 0);
 	grilio_request_append_utf8(req, tpdu);

 	DBG("%s", tpdu);
@@ -292,7 +296,7 @@ static void ril_sms_notify(GRilIoChannel *io, guint ril_event,
 	char *ril_pdu;
 	int ril_pdu_len;
 	unsigned int smsc_len;
-	guint ril_buf_len;
+	long ril_buf_len;
 	guchar *ril_data;

 	ril_pdu = NULL;
@@ -308,7 +312,7 @@ static void ril_sms_notify(GRilIoChannel *io, guint ril_event,
 	ril_pdu_len = strlen(ril_pdu);

 	DBG("ril_pdu_len is %d", ril_pdu_len);
-	ril_data = ril_decode_hex(ril_pdu, ril_pdu_len, &ril_buf_len);
+	ril_data = decode_hex(ril_pdu, ril_pdu_len, &ril_buf_len, -1);
 	if (ril_data == NULL)
 		goto error;

@@ -321,16 +325,14 @@ static void ril_sms_notify(GRilIoChannel *io, guint ril_event,
 	ofono_info("sms received, smsc_len is %d", smsc_len);
 	DBG("(%s)", ril_pdu);

-	if (ril_buf_len >= smsc_len) {
-		if (ril_event == RIL_UNSOL_RESPONSE_NEW_SMS) {
-			/* Last parameter is tpdu_len (substract SMSC length) */
-			ofono_sms_deliver_notify(sd->sms, ril_data, ril_buf_len,
+	if (ril_event == RIL_UNSOL_RESPONSE_NEW_SMS) {
+		/* Last parameter is 'tpdu_len' ( substract SMSC length ) */
+		ofono_sms_deliver_notify(sd->sms, ril_data, ril_buf_len,
 						ril_buf_len - smsc_len);
-		} else {
-			/* RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT */
-			ofono_sms_status_notify(sd->sms, ril_data, ril_buf_len,
+	} else {
+		GASSERT(ril_event == RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT);
+		ofono_sms_status_notify(sd->sms, ril_data, ril_buf_len,
 						ril_buf_len - smsc_len);
-		}
 	}

 	g_free(ril_pdu);
--- a/ofono/drivers/ril/ril_stk.c
+++ b/ofono/drivers/ril/ril_stk.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2017 Jolla Ltd.
 *
 *  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
@@ -17,6 +17,8 @@
 #include "ril_util.h"
 #include "ril_log.h"

+#include "util.h"
+
 #ifndef UI_LANG
 #  define UI_LANG "/var/lib/environment/nemo/locale.conf"
 #endif
@@ -81,7 +83,7 @@ static void ril_stk_envelope(struct ofono_stk *stk, int length,
 {
 	struct ril_stk *sd = ril_stk_get_data(stk);
 	GRilIoRequest *req = grilio_request_new();
-	char *hex_envelope = ril_encode_hex(cmd, length);
+	char *hex_envelope = encode_hex(cmd, length, 0);

 	DBG("%s", hex_envelope);
 	grilio_request_append_utf8(req, hex_envelope);
@@ -115,7 +117,7 @@ static void ril_stk_terminal_response(struct ofono_stk *stk, int length,
 {
 	struct ril_stk *sd = ril_stk_get_data(stk);
 	GRilIoRequest *req = grilio_request_new();
-	char *hex_tr = ril_encode_hex(resp, length);
+	char *hex_tr = encode_hex(resp, length, 0);

 	DBG("rilmodem terminal response: %s", hex_tr);
 	grilio_request_append_utf8(req, hex_tr);
@@ -148,21 +150,19 @@ static void ril_stk_pcmd_notify(GRilIoChannel *io, guint code,
 	struct ril_stk *sd = user_data;
 	GRilIoParser rilp;
 	char *pcmd;
-	void *pdu;
-	guint len;
+	guchar *pdu;
+	long len = 0;

 	GASSERT(code == RIL_UNSOL_STK_PROACTIVE_COMMAND);
 	grilio_parser_init(&rilp, data, data_len);
 	pcmd = grilio_parser_get_utf8(&rilp);
-	pdu = ril_decode_hex(pcmd, -1, &len);
-	if (pdu) {
-		DBG("pcmd: %s", pcmd);
-		ofono_stk_proactive_command_notify(sd->stk, len, pdu);
-		g_free(pdu);
-	} else {
-		ofono_warn("Failed to parse STK command %s", pcmd);
-	}
+	DBG("pcmd: %s", pcmd);
+
+	pdu = decode_hex(pcmd, strlen(pcmd), &len, -1);
 	g_free(pcmd);
+
+	ofono_stk_proactive_command_notify(sd->stk, len, pdu);
+	g_free(pdu);
 }

 static void ril_stk_event_notify(GRilIoChannel *io, guint code,
@@ -170,23 +170,20 @@ static void ril_stk_event_notify(GRilIoChannel *io, guint code,
 {
 	struct ril_stk *sd = user_data;
 	GRilIoParser rilp;
-	char *pcmd;
-	void *pdu;
-	guint len;
+	char *pcmd = NULL;
+	guchar *pdu = NULL;
+	long len;

 	/* Proactive command has been handled by the modem. */
 	GASSERT(code == RIL_UNSOL_STK_EVENT_NOTIFY);
 	grilio_parser_init(&rilp, data, data_len);
 	pcmd = grilio_parser_get_utf8(&rilp);
-	pdu = ril_decode_hex(pcmd, -1, &len);
-	if (pdu) {
-		DBG("pcmd: %s", pcmd);
-		ofono_stk_proactive_command_handled_notify(sd->stk, len, pdu);
-		g_free(pdu);
-	} else {
-		ofono_warn("Failed to parse STK event %s", pcmd);
-	}
+	DBG("pcmd: %s", pcmd);
+	pdu = decode_hex(pcmd, strlen(pcmd), &len, -1);
 	g_free(pcmd);
+
+	ofono_stk_proactive_command_handled_notify(sd->stk, len, pdu);
+	g_free(pdu);
 }

 static void ril_stk_session_end_notify(GRilIoChannel *io, guint code,
--- a/ofono/drivers/ril/ril_subscription.conf
+++ b/ofono/drivers/ril/ril_subscription.conf
@@ -231,12 +231,6 @@ socket=/dev/socket/rild
 #
 #lteNetworkMode=9

-# UMTS network mode.
-#
-# Default 3 (PREF_NET_TYPE_GSM_WCDMA_AUTO)
-#
-#umtsNetworkMode=3
-
 # Timeout for RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, in milliseconds.
 #
 # Default 20000 (20 seconds)
@@ -250,17 +244,6 @@ socket=/dev/socket/rild
 #
 #networkSelectionTimeout=100000

-# Comma-separated signal strength range, in dBm.
-#
-# These values are used for translating dBm values returned by the modem in
-# LTE mode into signal strength percentage. If you are getting significantly
-# different signal strength readings in GSM and LTE modes, you may need to
-# tweak those.
-#
-# Default -100,-60
-#
-#signalStrengthRange=-100,-60
-
 # Cycle radio power at startup.
 #
 # Default true (cycle the power)
@@ -288,16 +271,6 @@ socket=/dev/socket/rild
 #
 #singleDataContext=false

-# With some RILs, RIL_REQUEST_QUERY_AVAILABLE_NETWORKS returns strange
-# operator names, i.e. numeric MCC+MNC values or the same name for all
-# operators (which is actually SPN fetched from the SIM). Such strange
-# names can be replaced with operator names from MBPI database, based
-# on the operator's MCC and MNC. That may not be 100% accurate, though.
-#
-# Default false (i.e. trust RIL to report the actual names)
-#
-#replaceStrangeOperatorNames=false
-
 # Configures whether +0 is added to MCCMNC string passed to
 # RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL. Some Qualcomm RILs
 # require it, some MediaTek RILs don't like it.
@@ -345,29 +318,3 @@ socket=/dev/socket/rild
 # Default true (false for MTK RILs)
 #
 #forceGsmWhenRadioOff=true
-
-# Configures a period between RIL_UNSOL_CELL_INFO_LIST events when the device
-# is awake. Possible values are:
-#
-#   0 = invoke RIL_UNSOL_CELL_INFO_LIST when any of the reported information
-#       changes
-#   1..INT_MAX-1 (2147483646) = sets update period in milliseconds
-#   negative value or INT_MAX = never issue a RIL_UNSOL_CELL_INFO_LIST
-#
-# On MediaTek devices the period of RIL_UNSOL_CELL_INFO_LIST events can't be
-# configured. The parameter RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE has
-# non-standard meaning:
-#
-#   0 = enable RIL_UNSOL_CELL_INFO_LIST
-#   any other value = disable RIL_UNSOL_CELL_INFO_LIST
-#
-# Default 2000
-#
-#cellInfoIntervalShortMs=2000
-
-# Configures period between RIL_UNSOL_CELL_INFO_LIST events when the device is
-# in a power saving mode. For possible values, look cellInfoIntervalShortMs.
-#
-# Default 30000
-#
-#cellInfoIntervalLongMs=30000
--- a/ofono/drivers/ril/ril_types.h
+++ b/ofono/drivers/ril/ril_types.h
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  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
@@ -24,7 +24,6 @@
 #include <grilio_types.h>
 #include <gutil_macros.h>

-struct ofono_watch;
 struct ofono_modem;
 struct ofono_sim;

@@ -50,12 +49,6 @@ struct ril_network;
 struct ril_sim_card;
 struct ril_vendor;

-enum ril_data_role {
-	RIL_DATA_ROLE_NONE,    /* Mobile data not required */
-	RIL_DATA_ROLE_MMS,     /* Data is needed at any speed */
-	RIL_DATA_ROLE_INTERNET /* Data is needed at full speed */
-};
-
 struct ril_slot_config {
 	guint slot;
 	enum ofono_radio_access_mode techs;
@@ -63,8 +56,6 @@ struct ril_slot_config {
 	enum ril_pref_net_type umts_network_mode;
 	int network_mode_timeout;
 	int network_selection_timeout;
-	int signal_strength_dbm_weak;
-	int signal_strength_dbm_strong;
 	gboolean query_available_band_mode;
 	gboolean empty_pin_query;
 	gboolean radio_power_cycle;
@@ -72,31 +63,12 @@ struct ril_slot_config {
 	gboolean enable_voicecall;
 	gboolean enable_cbs;
 	gboolean enable_stk;
-	gboolean replace_strange_oper;
 	gboolean network_selection_manual_0;
 	gboolean force_gsm_when_radio_off;
 	gboolean use_data_profiles;
 	guint mms_data_profile_id;
 	GUtilInts *local_hangup_reasons;
 	GUtilInts *remote_hangup_reasons;
-	int cell_info_interval_short_ms;
-	int cell_info_interval_long_ms;
-};
-
-/* Some values copied from ofono's internal common.h */
-
-/* 27.007 Section 7.11 */
-enum bearer_class {
-	BEARER_CLASS_VOICE =		1,
-	BEARER_CLASS_DATA =		2,
-	BEARER_CLASS_FAX =		4,
-	BEARER_CLASS_DEFAULT =		7,
-	BEARER_CLASS_SMS =		8,
-	BEARER_CLASS_DATA_SYNC =	16,
-	BEARER_CLASS_DATA_ASYNC =	32,
-	BEARER_CLASS_SS_DEFAULT =	61,
-	BEARER_CLASS_PACKET =		64,
-	BEARER_CLASS_PAD =		128
 };

 #endif /* RIL_TYPES_H */
--- a/ofono/drivers/ril/ril_ussd.c
+++ b/ofono/drivers/ril/ril_ussd.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  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
@@ -18,7 +18,8 @@
 #include "ril_util.h"
 #include "ril_log.h"

-#include <ofono/misc.h>
+#include "smsutil.h"
+#include "util.h"

 #define USSD_REQUEST_TIMEOUT_SEC (30)
 #define USSD_CANCEL_TIMEOUT_SEC (20)
@@ -95,7 +96,7 @@ static void ril_ussd_request(struct ofono_ussd *ussd, int dcs,
 	const unsigned char *pdu, int len, ofono_ussd_cb_t cb, void *data)
 {
 	struct ofono_error error;
-	enum ofono_sms_charset charset;
+	enum sms_charset charset;
 	struct ril_ussd *ud = ril_ussd_get_data(ussd);

 	ofono_info("send ussd, len:%d", len);
@@ -105,42 +106,47 @@ static void ril_ussd_request(struct ofono_ussd *ussd, int dcs,
 		ud->request_id = 0;
 	}

-	if (ofono_decode_cbs_dcs_charset(dcs, &charset) &&
-		charset == OFONO_SMS_CHARSET_7BIT) {
-		char unpacked[182];
-		unsigned int written = ofono_unpack_7bit(pdu, len,
-			OFONO_UNPACK_7BIT_USSD, unpacked, sizeof(unpacked)-1);
+	if (cbs_dcs_decode(dcs, NULL, NULL, &charset, NULL, NULL, NULL)) {
+		if (charset == SMS_CHARSET_7BIT) {
+			unsigned char unpacked_buf[182];
+			long written = 0;

-		unpacked[written] = 0;
-		if (written >= 1) {
-			/*
-			 * When USSD was packed, additional CR
-			 * might have been added (according to
-			 * 23.038 6.1.2.3.1). So if the last
-			 * character is CR, it should be removed
-			 * here.
-			 *
-			 * Over 2 characters long USSD string must
-			 * end with # (checked in valid_ussd_string),
-			 * so it should be safe to remove extra CR.
-			 */
-			GRilIoRequest *req = grilio_request_new();
-			int length = strlen(unpacked);
+			unpack_7bit_own_buf(pdu, len, 0, TRUE,
+					sizeof(unpacked_buf)-1, &written, 0,
+					unpacked_buf);

-			while (length > 2 && unpacked[length-1] == '\r') {
-				unpacked[--length] = 0;
-			}
-			grilio_request_append_utf8_chars(req, (char*)
-					unpacked, length);
-			grilio_request_set_timeout(req,
+			unpacked_buf[written] = 0;
+			if (written >= 1) {
+				/*
+				 * When USSD was packed, additional CR
+				 * might have been added (according to
+				 * 23.038 6.1.2.3.1). So if the last
+				 * character is CR, it should be removed
+				 * here.
+				 *
+				 * Over 2 characters long USSD string must
+				 * end with # (checked in valid_ussd_string),
+				 * so it should be safe to remove extra CR.
+				 */
+				GRilIoRequest *req = grilio_request_new();
+				int length = strlen((char *)unpacked_buf);
+				while (length > 2 &&
+					unpacked_buf[length-1] == '\r') {
+					unpacked_buf[--length] = 0;
+				}
+				grilio_request_append_utf8_chars(req, (char*)
+						unpacked_buf, length);
+				grilio_request_set_timeout(req,
 					USSD_REQUEST_TIMEOUT_SEC * 1000);
-			ud->request_id = grilio_queue_send_request_full(ud->q,
-					req, RIL_REQUEST_SEND_USSD,
-					ril_ussd_response,
-					ril_ussd_cbd_free,
-					ril_ussd_cbd_new(ud, cb, data));
-			grilio_request_unref(req);
-			return;
+				ud->request_id =
+					grilio_queue_send_request_full(ud->q,
+						req, RIL_REQUEST_SEND_USSD,
+						ril_ussd_response,
+						ril_ussd_cbd_free,
+						ril_ussd_cbd_new(ud, cb, data));
+				grilio_request_unref(req);
+				return;
+			}
 		}
 	}

--- a/ofono/drivers/ril/ril_util.c
+++ b/ofono/drivers/ril/ril_util.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
 *
 *  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
@@ -20,10 +20,12 @@

 #include <gutil_misc.h>

-#include <ofono/netreg.h>
-#include <ofono/misc.h>
+#include <sys/socket.h>
 #include <ctype.h>

+#include "common.h"
+#include "netreg.h"
+
 #define RIL_PROTO_IP_STR "IP"
 #define RIL_PROTO_IPV6_STR "IPV6"
 #define RIL_PROTO_IPV4V6_STR "IPV4V6"
@@ -379,43 +381,43 @@ enum ril_auth ril_auth_method_from_ofono(enum ofono_gprs_auth_method auth)
 	return RIL_AUTH_BOTH;
 }

-enum ofono_access_technology ril_parse_tech(const char *stech, int *ril_tech)
+/* Returns enum access_technology or -1 on failure. */
+int ril_parse_tech(const char *stech, int *ril_tech)
 {
+	int access_tech = -1;
 	int tech = -1;
-	enum ofono_access_technology access_tech =
-		OFONO_ACCESS_TECHNOLOGY_NONE;
-
 	if (gutil_parse_int(stech, 0, &tech)) {
 		switch (tech) {
 		case RADIO_TECH_GPRS:
 		case RADIO_TECH_GSM:
-			access_tech = OFONO_ACCESS_TECHNOLOGY_GSM;
+			access_tech = ACCESS_TECHNOLOGY_GSM;
 			break;
 		case RADIO_TECH_EDGE:
-			access_tech = OFONO_ACCESS_TECHNOLOGY_GSM_EGPRS;
+			access_tech = ACCESS_TECHNOLOGY_GSM_EGPRS;
 			break;
 		case RADIO_TECH_UMTS:
-			access_tech = OFONO_ACCESS_TECHNOLOGY_UTRAN;
+			access_tech = ACCESS_TECHNOLOGY_UTRAN;
 			break;
 		case RADIO_TECH_HSDPA:
-			access_tech = OFONO_ACCESS_TECHNOLOGY_UTRAN_HSDPA;
+			access_tech = ACCESS_TECHNOLOGY_UTRAN_HSDPA;
 			break;
 		case RADIO_TECH_HSUPA:
-			access_tech = OFONO_ACCESS_TECHNOLOGY_UTRAN_HSUPA;
+			access_tech = ACCESS_TECHNOLOGY_UTRAN_HSUPA;
 			break;
 		case RADIO_TECH_HSPA:
 		case RADIO_TECH_HSPAP:
-			access_tech = OFONO_ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA;
+			access_tech = ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA;
 			break;
 		case RADIO_TECH_LTE:
 		case RADIO_TECH_LTE_CA:
-			access_tech = OFONO_ACCESS_TECHNOLOGY_EUTRAN;
+			access_tech = ACCESS_TECHNOLOGY_EUTRAN;
 			break;
 		default:
 			DBG("Unknown RIL tech %s", stech);
 			/* no break */
 		case RADIO_TECH_IWLAN:
 		case RADIO_TECH_UNKNOWN:
+			tech = -1;
 			break;
 		}

@@ -470,39 +472,6 @@ gboolean ril_parse_mcc_mnc(const char *str, struct ofono_network_operator *op)
 	return FALSE;
 }

-char* ril_encode_hex(const void *in, guint size)
-{
-	char *out = g_new(char, size * 2 + 1);
-
-	ofono_encode_hex(in, size, out);
-	return out;
-}
-
-void *ril_decode_hex(const char *hex, int len, guint *out_size)
-{
-	void *out = NULL;
-	guint size = 0;
-
-	if (hex) {
-		if (len < 0) {
-			len = (int) strlen(hex);
-		}
-		if (len > 0 && !(len & 1)) {
-			size = len/2;
-			out = g_malloc(size);
-			if (!gutil_hex2bin(hex, len, out)) {
-				g_free(out);
-				out = NULL;
-				size = 0;
-			}
-		}
-	}
-	if (out_size) {
-		*out_size = size;
-	}
-	return out;
-}
-
 /*
 * Local Variables:
 * mode: C
--- a/ofono/drivers/ril/ril_util.h
+++ b/ofono/drivers/ril/ril_util.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
 *
 *  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
@@ -29,7 +29,7 @@ const char *ril_radio_state_to_string(int radio_state);
 const char *ril_protocol_from_ofono(enum ofono_gprs_proto proto);
 int ril_protocol_to_ofono(const char *str);
 enum ril_auth ril_auth_method_from_ofono(enum ofono_gprs_auth_method auth);
-enum ofono_access_technology ril_parse_tech(const char *stech, int *ril_tech);
+int ril_parse_tech(const char *stech, int *ril_tech);
 gboolean ril_parse_mcc_mnc(const char *str, struct ofono_network_operator *op);

 #define ril_error_init_ok(err) \
@@ -43,9 +43,6 @@ gboolean ril_parse_mcc_mnc(const char *str, struct ofono_network_operator *op);
 #define ril_error_failure(err) (ril_error_init_failure(err), err)
 #define ril_error_sim(err,sw1,sw2) (ril_error_init_sim_error(err,sw1,sw2), err)

-char *ril_encode_hex(const void *in, guint size);
-void *ril_decode_hex(const char *hex, int len, guint *out_size);
-
 #endif /* RIL_UTIL_H */

 /*
--- a/ofono/drivers/ril/ril_vendor.h
+++ b/ofono/drivers/ril/ril_vendor.h
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2020 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  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
@@ -24,7 +24,6 @@ struct ril_vendor_defaults {
 	gboolean legacy_imei_query;
 	gboolean enable_cbs;
 	gboolean enable_stk;
-	gboolean replace_strange_oper;
 	gboolean query_available_band_mode;
 	gboolean use_data_profiles;
 	gboolean force_gsm_when_radio_off;
--- a/ofono/drivers/ril/ril_vendor_mtk.c
+++ b/ofono/drivers/ril/ril_vendor_mtk.c
@@ -1,8 +1,8 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2016-2020 Jolla Ltd.
- *  Copyright (C) 2019-2020 Open Mobile Platform LLC.
+ *  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
@@ -509,7 +509,6 @@ static void ril_vendor_mtk_get_defaults(struct ril_vendor_defaults *defaults)
 	defaults->empty_pin_query = FALSE;
 	defaults->legacy_imei_query = TRUE;
 	defaults->force_gsm_when_radio_off = FALSE;
-	defaults->replace_strange_oper = TRUE;
 }

 static void ril_vendor_mtk_base_init(RilVendorMtk *self, GRilIoChannel *io,
--- a/ofono/drivers/ril/ril_voicecall.c
+++ b/ofono/drivers/ril/ril_voicecall.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2021 Jolla Ltd.
+ *  Copyright (C) 2015-2019 Jolla Ltd.
 *
 *  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
@@ -18,13 +18,13 @@
 #include "ril_util.h"
 #include "ril_log.h"

+#include "common.h"
+
 #include <gutil_ints.h>
 #include <gutil_ring.h>
 #include <gutil_idlequeue.h>
 #include <gutil_intarray.h>

-#include <ofono/misc.h>
-
 #define FLAG_NEED_CLIP 1

 #define VOICECALL_BLOCK_TIMEOUT_MS (5*1000)
@@ -138,11 +138,7 @@ static GSList *ril_voicecall_parse_clcc(const void *data, guint len)
 		gint tmp;

 		ofono_call_init(call);
-
-		tmp = OFONO_CALL_STATUS_DISCONNECTED;
-		grilio_parser_get_int32(&rilp, &tmp);
-		call->status = tmp;
-
+		grilio_parser_get_int32(&rilp, &call->status);
 		grilio_parser_get_uint32(&rilp, &call->id);
 		grilio_parser_get_int32(&rilp, &call->phone_number.type);
 		grilio_parser_get_int32(&rilp, NULL); /* isMpty */
@@ -150,8 +146,8 @@ static GSList *ril_voicecall_parse_clcc(const void *data, guint len)
 		tmp = 0;
 		grilio_parser_get_int32(&rilp, &tmp);
 		call->direction = (tmp ?              /* isMT */
-			OFONO_CALL_DIRECTION_MOBILE_TERMINATED :
-			OFONO_CALL_DIRECTION_MOBILE_ORIGINATED);
+			CALL_DIRECTION_MOBILE_TERMINATED :
+			CALL_DIRECTION_MOBILE_ORIGINATED);

 		grilio_parser_get_int32(&rilp, NULL); /* als */
 		grilio_parser_get_int32(&rilp, &call->type); /* isVoice */
@@ -297,21 +293,21 @@ static void ril_voicecall_lastcause_cb(GRilIoChannel *io, int status,

 		case CALL_FAIL_NORMAL_UNSPECIFIED:
 			call_status = ril_voicecall_status_with_id(vc, id);
-			if (call_status == OFONO_CALL_STATUS_ACTIVE ||
-			    call_status == OFONO_CALL_STATUS_HELD ||
-			    call_status == OFONO_CALL_STATUS_DIALING ||
-			    call_status == OFONO_CALL_STATUS_ALERTING) {
+			if (call_status == CALL_STATUS_ACTIVE ||
+			    call_status == CALL_STATUS_HELD ||
+			    call_status == CALL_STATUS_DIALING ||
+			    call_status == CALL_STATUS_ALERTING) {
 				reason = OFONO_DISCONNECT_REASON_REMOTE_HANGUP;
-			} else if (call_status == OFONO_CALL_STATUS_INCOMING) {
+			} else if (call_status == CALL_STATUS_INCOMING) {
 				reason = OFONO_DISCONNECT_REASON_LOCAL_HANGUP;
 			}
 			break;

 		case CALL_FAIL_ERROR_UNSPECIFIED:
 			call_status = ril_voicecall_status_with_id(vc, id);
-			if (call_status == OFONO_CALL_STATUS_DIALING ||
-			    call_status == OFONO_CALL_STATUS_ALERTING ||
-			    call_status == OFONO_CALL_STATUS_INCOMING) {
+			if (call_status == CALL_STATUS_DIALING ||
+			    call_status == CALL_STATUS_ALERTING ||
+			    call_status == CALL_STATUS_INCOMING) {
 				reason = OFONO_DISCONNECT_REASON_REMOTE_HANGUP;
 			}
 			break;
@@ -424,7 +420,7 @@ static void ril_voicecall_clcc_poll_cb(GRilIoChannel *io, int status,
 			 * arrives, or RING is used, then signal the call
 			 * here
 			 */
-			if (nc->status == OFONO_CALL_STATUS_INCOMING &&
+			if (nc->status == CALL_STATUS_INCOMING &&
 					(vd->flags & FLAG_NEED_CLIP)) {
 				if (nc->type) {
 					ofono_voicecall_notify(vd->vc, nc);
@@ -552,8 +548,7 @@ static void ril_voicecall_dial(struct ofono_voicecall *vc,
 			void *data)
 {
 	struct ril_voicecall *vd = ril_voicecall_get_data(vc);
-	char phbuf[OFONO_PHONE_NUMBER_BUFFER_SIZE];
-	const char *phstr = ofono_phone_number_to_string(ph, phbuf);
+	const char *phstr =  phone_number_to_string(ph);
 	GRilIoRequest *req = grilio_request_new();

 	ofono_info("dialing \"%s\"", phstr);
@@ -636,14 +631,14 @@ static void ril_voicecall_hangup(struct ofono_voicecall *vc,
 static gboolean ril_voicecall_hangup_active_filter(struct ofono_call *call)
 {
 	switch (call->status) {
-	case OFONO_CALL_STATUS_ACTIVE:
-	case OFONO_CALL_STATUS_DIALING:
-	case OFONO_CALL_STATUS_ALERTING:
-	case OFONO_CALL_STATUS_INCOMING:
+	case CALL_STATUS_ACTIVE:
+	case CALL_STATUS_DIALING:
+	case CALL_STATUS_ALERTING:
+	case CALL_STATUS_INCOMING:
 		return TRUE;
-	case OFONO_CALL_STATUS_HELD:
-	case OFONO_CALL_STATUS_WAITING:
-	case OFONO_CALL_STATUS_DISCONNECTED:
+	case CALL_STATUS_HELD:
+	case CALL_STATUS_WAITING:
+	case CALL_STATUS_DISCONNECTED:
 		break;
 	}
 	return FALSE;
--- a/ofono/drivers/rilmodem/call-forwarding.c
+++ b/ofono/drivers/rilmodem/call-forwarding.c
@@ -38,8 +38,6 @@
 #include <ofono/call-forwarding.h>
 #include "common.h"

-#pragma GCC diagnostic ignored "-Wrestrict"
-
 #include "gril.h"

 #include "rilmodem.h"
--- a/ofono/drivers/rilmodem/lte.c
+++ b/ofono/drivers/rilmodem/lte.c
@@ -108,8 +108,7 @@ static gboolean lte_delayed_register(gpointer user_data)
 	return FALSE;
 }

-static int ril_lte_probe(struct ofono_lte *lte,
-				unsigned int vendor, void *user_data)
+static int ril_lte_probe(struct ofono_lte *lte, void *user_data)
 {
 	GRil *ril = user_data;
 	struct ril_lte_data *ld;
--- a/ofono/drivers/rilmodem/network-registration.c
+++ b/ofono/drivers/rilmodem/network-registration.c
@@ -37,8 +37,6 @@
 #include <ofono/modem.h>
 #include <ofono/netreg.h>

-#pragma GCC diagnostic ignored "-Wrestrict"
-
 #include <gril/gril.h>

 #include "common.h"
--- a/ofono/drivers/ubloxmodem/lte.c
+++ b/ofono/drivers/ubloxmodem/lte.c
@@ -91,8 +91,7 @@ static gboolean lte_delayed_register(gpointer user_data)
 	return FALSE;
 }

-static int ublox_lte_probe(struct ofono_lte *lte,
-					unsigned int vendor, void *data)
+static int ublox_lte_probe(struct ofono_lte *lte, void *data)
 {
 	GAtChat *chat = data;
 	struct lte_driver_data *ldd;
--- a/ofono/drivers/xmm7modem/ims.c
+++ b/ofono/drivers/xmm7modem/ims.c
--- a/ofono/gatchat/gatmux.c
+++ b/ofono/gatchat/gatmux.c
@@ -30,9 +30,6 @@
 #include <string.h>
 #include <alloca.h>

-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wcast-function-type"
-
 #include <glib.h>

 #include "ringbuffer.h"
--- a/ofono/include/conf.h
+++ b/ofono/include/conf.h
@@ -1,61 +0,0 @@
-/*
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2021 Jolla Ltd.
- *
- *  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
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
-
-#ifndef OFONO_CONF_H
-#define OFONO_CONF_H
-
-/* This API exists since mer/1.24+git2 */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <glib.h>
-
-/* If a value isn't found in the specified group, it's looked up in this one */
-#define OFONO_COMMON_SETTINGS_GROUP "Settings"
-
-/* Utilities for parsing config files */
-void ofono_conf_merge_files(GKeyFile *conf, const char *file);
-char *ofono_conf_get_string(GKeyFile *conf, const char *group,
-	const char *key) G_GNUC_WARN_UNUSED_RESULT;
-char **ofono_conf_get_strings(GKeyFile *conf, const char *group,
-	const char *key, char delimiter) G_GNUC_WARN_UNUSED_RESULT;
-gboolean ofono_conf_get_integer(GKeyFile *conf, const char *group,
-	const char *key, int *value);
-gboolean ofono_conf_get_boolean(GKeyFile *conf, const char *group,
-	const char *key, gboolean *value);
-gboolean ofono_conf_get_flag(GKeyFile *conf, const char *group,
-	const char *key, int flag, int *flags);
-gboolean ofono_conf_get_enum(GKeyFile *conf, const char *group,
-	const char *key, int *result, const char *name, int value, ...)
-	G_GNUC_NULL_TERMINATED;
-gboolean ofono_conf_get_mask(GKeyFile *conf, const char *group,
-	const char *key, int *result, const char *name, int value, ...)
-	G_GNUC_NULL_TERMINATED;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OFONO_CONF_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/include/dbus-access.h
+++ b/ofono/include/dbus-access.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony
 *
- *  Copyright (C) 2019-2021 Jolla Ltd.
+ *  Copyright (C) 2019-2020 Jolla Ltd.
 *  Copyright (C) 2020 Open Mobile Platform LLC.
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,6 @@ enum ofono_dbus_access_intf {
 	OFONO_DBUS_ACCESS_INTF_MODEM,         /* org.ofono.Modem */
 	OFONO_DBUS_ACCESS_INTF_RADIOSETTINGS, /* org.ofono.RadioSettings */
 	OFONO_DBUS_ACCESS_INTF_STK,           /* org.ofono.SimToolkit */
-	OFONO_DBUS_ACCESS_INTF_OEMRAW,        /* org.ofono.OemRaw */
 	OFONO_DBUS_ACCESS_INTF_COUNT
 };

@@ -125,12 +124,6 @@ enum ofono_dbus_access_stk_method {
 	OFONO_DBUS_ACCESS_STK_METHOD_COUNT
 };

-/* OFONO_DBUS_ACCESS_INTF_OEMRAW */
-enum ofono_dbus_access_oemraw_method {
-	OFONO_DBUS_ACCESS_OEMRAW_SEND,
-	OFONO_DBUS_ACCESS_OEMRAW_METHOD_COUNT
-};
-
 #define OFONO_DBUS_ACCESS_PRIORITY_LOW     (-100)
 #define OFONO_DBUS_ACCESS_PRIORITY_DEFAULT (0)
 #define OFONO_DBUS_ACCESS_PRIORITY_HIGH    (100)
@@ -158,10 +151,6 @@ const char *ofono_dbus_access_intf_name(enum ofono_dbus_access_intf intf);
 const char *ofono_dbus_access_method_name(enum ofono_dbus_access_intf intf,
 								int method);

-/* Since mer/1.24+git2 */
-ofono_bool_t ofono_dbus_access_method_allowed(const char *sender,
-	enum ofono_dbus_access_intf iface, int method, const char *arg);
-
 #ifdef __cplusplus
 }
 #endif
--- a/ofono/include/dbus-clients.h
+++ b/ofono/include/dbus-clients.h
@@ -1,55 +0,0 @@
-/*
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2021 Jolla Ltd.
- *  Copyright (C) 2021 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
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
-
-#ifndef OFONO_DBUS_CLIENTS_H
-#define OFONO_DBUS_CLIENTS_H
-
-#include <ofono/types.h>
-#include <ofono/dbus.h>
-
-/* Since mer/1.23+git31 */
-
-struct ofono_dbus_clients;
-
-typedef void (*ofono_dbus_clients_notify_func)(const char *name,
-							void *user_data);
-
-struct ofono_dbus_clients *ofono_dbus_clients_new(DBusConnection *conn,
-		ofono_dbus_clients_notify_func notify, void *user_data);
-void ofono_dbus_clients_free(struct ofono_dbus_clients *clients);
-
-unsigned int ofono_dbus_clients_count(struct ofono_dbus_clients *clients);
-
-ofono_bool_t ofono_dbus_clients_add(struct ofono_dbus_clients *clients,
-							const char *name);
-ofono_bool_t ofono_dbus_clients_remove(struct ofono_dbus_clients *clients,
-							const char *name);
-
-void ofono_dbus_clients_signal(struct ofono_dbus_clients *clients,
-							DBusMessage *signal);
-void ofono_dbus_clients_signal_property_changed(struct ofono_dbus_clients *dc,
-		const char *path, const char *interface, const char *name,
-		int type, const void *value);
-
-#endif /* OFONO_DBUS_CLIENTS_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/include/dbus.h
+++ b/ofono/include/dbus.h
@@ -3,7 +3,7 @@
 *  oFono - Open Telephony stack for Linux
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2013-2021  Jolla Ltd.
+ *  Copyright (C) 2013-2016 Jolla Ltd.
 *
 *  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
@@ -14,6 +14,10 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
 */

 #ifndef __OFONO_DBUS_H
@@ -79,8 +83,6 @@ extern "C" {
 					DBUS_TYPE_VARIANT_AS_STRING \
 					DBUS_DICT_ENTRY_END_CHAR_AS_STRING

-#define OFONO_ERROR_INTERFACE "org.ofono.Error"
-
 DBusConnection *ofono_dbus_get_connection(void);

 void ofono_dbus_dict_append(DBusMessageIter *dict, const char *key, int type,
@@ -108,36 +110,6 @@ int ofono_dbus_signal_dict_property_changed(DBusConnection *conn,
 						const char *name, int type,
 						const void *value);

-/* Since mer/1.23+git31 */
-DBusMessage *ofono_dbus_signal_new_property_changed(const char *path,
-					const char *interface,
-					const char *name,
-					int type, const void *value);
-
-/* Since mer/1.24+git2 */
-DBusMessage *ofono_dbus_error_invalid_args(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_invalid_format(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_not_implemented(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_failed(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_busy(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_not_found(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_not_active(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_not_supported(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_not_available(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_timed_out(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_sim_not_ready(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_in_use(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_not_attached(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_attach_in_progress(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_not_registered(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_canceled(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_access_denied(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_emergency_active(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_incorrect_password(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_not_allowed(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_not_recognized(DBusMessage *msg);
-DBusMessage *ofono_dbus_error_network_terminated(DBusMessage *msg);
-
 #ifdef __cplusplus
 }
 #endif
--- a/ofono/include/gprs-context.h
+++ b/ofono/include/gprs-context.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  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
@@ -129,8 +128,6 @@ void ofono_gprs_context_set_ipv4_gateway(struct ofono_gprs_context *gc,
 						const char *gateway);
 void ofono_gprs_context_set_ipv4_dns_servers(struct ofono_gprs_context *gc,
 						const char **dns);
-void ofono_gprs_context_set_ipv4_proxy_cscf(struct ofono_gprs_context *gc,
-				const char **pcscf); /* Since mer/1.23+git30 */

 void ofono_gprs_context_set_ipv6_address(struct ofono_gprs_context *gc,
 						const char *address);
@@ -140,15 +137,10 @@ void ofono_gprs_context_set_ipv6_gateway(struct ofono_gprs_context *gc,
 						const char *gateway);
 void ofono_gprs_context_set_ipv6_dns_servers(struct ofono_gprs_context *gc,
 						const char **dns);
-void ofono_gprs_context_set_ipv6_proxy_cscf(struct ofono_gprs_context *gc,
-				const char **pcscf); /* Since mer/1.23+git30 */

 void ofono_gprs_context_signal_change(struct ofono_gprs_context *gc,
 							unsigned int cid);

-enum ofono_gprs_context_type ofono_gprs_context_get_assigned_type(
-		struct ofono_gprs_context *gc); /* Since mer/1.24+git2 */
-
 #ifdef __cplusplus
 }
 #endif
--- a/ofono/include/gprs-provision.h
+++ b/ofono/include/gprs-provision.h
@@ -3,7 +3,6 @@
 *  oFono - Open Telephony stack for Linux
 *
 *  Copyright (C) 2011  Nokia Corporation and/or its subsidiary(-ies).
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  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
@@ -56,14 +55,6 @@ int ofono_gprs_provision_driver_register(
 void ofono_gprs_provision_driver_unregister(
 			const struct ofono_gprs_provision_driver *driver);

-/* Since mer/1.24+git2 */
-ofono_bool_t ofono_gprs_provision_get_settings(const char *mcc,
-				const char *mnc, const char *spn,
-				struct ofono_gprs_provision_data **settings,
-				int *count);
-void ofono_gprs_provision_free_settings(
-				struct ofono_gprs_provision_data *settings,
-				int count);
 #ifdef __cplusplus
 }
 #endif
--- a/ofono/include/gprs.h
+++ b/ofono/include/gprs.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2017-2021  Jolla Ltd.
 *
 *  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
@@ -88,9 +87,6 @@ void ofono_gprs_attached_update(struct ofono_gprs *gprs);
 const struct ofono_gprs_primary_context *ofono_gprs_context_settings_by_type
 		(struct ofono_gprs *gprs, enum ofono_gprs_context_type type);

-/* Since mer/1.24+git2 */
-ofono_bool_t ofono_gprs_get_roaming_allowed(struct ofono_gprs *gprs);
-
 #ifdef __cplusplus
 }
 #endif
--- a/ofono/include/lte.h
+++ b/ofono/include/lte.h
@@ -38,7 +38,7 @@ typedef void (*ofono_lte_cb_t)(const struct ofono_error *error, void *data);

 struct ofono_lte_driver {
 	const char *name;
-	int (*probe)(struct ofono_lte *lte, unsigned int vendor, void *data);
+	int (*probe)(struct ofono_lte *lte, void *data);
 	void (*remove)(struct ofono_lte *lte);
 	void (*set_default_attach_info)(const struct ofono_lte *lte,
 			const struct ofono_lte_default_attach_info *info,
@@ -50,7 +50,6 @@ int ofono_lte_driver_register(const struct ofono_lte_driver *d);
 void ofono_lte_driver_unregister(const struct ofono_lte_driver *d);

 struct ofono_lte *ofono_lte_create(struct ofono_modem *modem,
-					unsigned int vendor,
 					const char *driver, void *data);

 void ofono_lte_register(struct ofono_lte *lte);
--- a/ofono/include/misc.h
+++ b/ofono/include/misc.h
@@ -1,67 +0,0 @@
-/*
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2021 Jolla Ltd.
- *
- *  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
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
-
-#ifndef __OFONO_MISC_H
-#define __OFONO_MISC_H
-
-/*
- * Miscellaneous utilities which do not fall into any other category.
- *
- * This file exists since mer/1.24+git2
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ofono/netreg.h>
-
-const char *ofono_netreg_status_to_string(enum ofono_netreg_status status);
-const char *ofono_access_technology_to_string(enum ofono_access_technology t);
-
-char *ofono_sim_string_to_utf8(const unsigned char *buffer, int length);
-void ofono_sim_string_free(char *str);
-
-void ofono_encode_hex(const void *in, unsigned int n, char out[/* 2*n+1 */]);
-
-#define OFONO_UNPACK_7BIT_USSD (0x01) /* flags */
-unsigned int ofono_unpack_7bit(const void *in, unsigned int len,
-		unsigned int flags, void *out_buf, unsigned int out_buf_size);
-
-#define OFONO_PHONE_NUMBER_BUFFER_SIZE (OFONO_MAX_PHONE_NUMBER_LENGTH + 2)
-const char *ofono_phone_number_to_string(const struct ofono_phone_number *ph,
-			char buffer[/* OFONO_PHONE_NUMBER_BUFFER_SIZE */]);
-
-#define OFONO_EF_PATH_BUFFER_SIZE 6
-unsigned int ofono_get_ef_path_2g(unsigned short id,
-			unsigned char path[/* OFONO_EF_PATH_BUFFER_SIZE */]);
-unsigned int ofono_get_ef_path_3g(unsigned short id,
-			unsigned char path[/* OFONO_EF_PATH_BUFFER_SIZE */]);
-ofono_bool_t ofono_parse_get_response_2g(const void *response, unsigned int len,
-			unsigned int *file_len, unsigned int *record_len,
-			unsigned int *structure, unsigned char *access,
-			unsigned char *file_status);
-ofono_bool_t ofono_parse_get_response_3g(const void *response, unsigned int len,
-			unsigned int *file_len, unsigned int *record_len,
-			unsigned int *structure, unsigned char *access,
-			unsigned short *efid);
-ofono_bool_t ofono_decode_cbs_dcs_charset(unsigned char dcs,
-			enum ofono_sms_charset *charset);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __OFONO_MISC_H */
--- a/ofono/include/modem.h
+++ b/ofono/include/modem.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  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
@@ -87,9 +86,6 @@ const char *ofono_modem_get_path(struct ofono_modem *modem);
 struct ofono_sim *ofono_modem_get_sim(struct ofono_modem *modem);
 struct ofono_gprs *ofono_modem_get_gprs(struct ofono_modem *modem);
 struct ofono_voicecall *ofono_modem_get_voicecall(struct ofono_modem *modem);
-struct ofono_netreg *ofono_modem_get_netreg(struct ofono_modem *modem);
-struct ofono_radio_settings *ofono_modem_get_radio_settings
-			(struct ofono_modem *modem); /* Since mer/1.24+git2 */

 void ofono_modem_set_data(struct ofono_modem *modem, void *data);
 void *ofono_modem_get_data(struct ofono_modem *modem);
--- a/ofono/include/netreg.h
+++ b/ofono/include/netreg.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  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
@@ -29,28 +28,8 @@ extern "C" {

 #include <ofono/types.h>

-struct ofono_modem;
 struct ofono_netreg;

-enum ofono_netreg_status {
-	OFONO_NETREG_STATUS_NONE = -1,
-	/* 27.007 Section 7.2 <stat> */
-	OFONO_NETREG_STATUS_NOT_REGISTERED = 0,
-	OFONO_NETREG_STATUS_REGISTERED = 1,
-	OFONO_NETREG_STATUS_SEARCHING = 2,
-	OFONO_NETREG_STATUS_DENIED = 3,
-	OFONO_NETREG_STATUS_UNKNOWN = 4,
-	OFONO_NETREG_STATUS_ROAMING = 5
-}; /* Since mer/1.24+git2 */
-
-/* 27.007 Section 7.3 <stat> */
-enum ofono_operator_status {
-	OFONO_OPERATOR_STATUS_UNKNOWN =	0,
-	OFONO_OPERATOR_STATUS_AVAILABLE = 1,
-	OFONO_OPERATOR_STATUS_CURRENT = 2,
-	OFONO_OPERATOR_STATUS_FORBIDDEN = 3
-}; /* Since mer/1.24+git2 */
-
 /* Theoretical limit is 16, but each GSM char can be encoded into
 *  * 3 UTF8 characters resulting in 16*3=48 chars
 *   */
@@ -60,8 +39,8 @@ struct ofono_network_operator {
 	char name[OFONO_MAX_OPERATOR_NAME_LENGTH + 1];
 	char mcc[OFONO_MAX_MCC_LENGTH + 1];
 	char mnc[OFONO_MAX_MNC_LENGTH + 1];
-	enum ofono_operator_status status;
-	enum ofono_access_technology tech;
+	int status;
+	int tech;
 };

 typedef void (*ofono_netreg_operator_cb_t)(const struct ofono_error *error,
@@ -131,17 +110,13 @@ void *ofono_netreg_get_data(struct ofono_netreg *netreg);

 int ofono_netreg_get_location(struct ofono_netreg *netreg);
 int ofono_netreg_get_cellid(struct ofono_netreg *netreg);
-enum ofono_netreg_status ofono_netreg_get_status(struct ofono_netreg *netreg);
+int ofono_netreg_get_status(struct ofono_netreg *netreg);
 int ofono_netreg_get_technology(struct ofono_netreg *netreg);
 const char *ofono_netreg_get_mcc(struct ofono_netreg *netreg);
 const char *ofono_netreg_get_mnc(struct ofono_netreg *netreg);
 const char *ofono_netreg_get_name(struct ofono_netreg *netreg);
 struct sim_spdi *ofono_netreg_get_spdi(struct ofono_netreg *netreg);

-/* Since mer/1.24+git2 */
-ofono_bool_t ofono_netreg_spdi_lookup(struct ofono_netreg *netreg,
-					const char *mcc, const char *mnc);
-
 #ifdef __cplusplus
 }
 #endif
--- a/ofono/include/radio-settings.h
+++ b/ofono/include/radio-settings.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2010  Nokia Corporation and/or its subsidiary(-ies).
- *  Copyright (C) 2015-2021 Jolla Ltd.
 *
 *  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
@@ -140,8 +139,6 @@ struct ofono_modem *ofono_radio_settings_get_modem(
 const char *ofono_radio_access_mode_to_string(enum ofono_radio_access_mode m);
 ofono_bool_t ofono_radio_access_mode_from_string(const char *str,
 					enum ofono_radio_access_mode *mode);
-enum ofono_radio_access_mode ofono_radio_access_max_mode( /* mer/1.24+git2 */
-					enum ofono_radio_access_mode mask);

 #ifdef __cplusplus
 }
--- a/ofono/include/sim-mnclength.h
+++ b/ofono/include/sim-mnclength.h
@@ -4,7 +4,6 @@
 *
 *  Copyright (C) 2011  Nokia Corporation and/or its subsidiary(-ies).
 *  Copyright (C) 2013  Canonical Ltd.
- *  Copyright (C) 2015-2021 Jolla Ltd.
 *
 *  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
@@ -28,21 +27,17 @@
 extern "C" {
 #endif

+
 struct ofono_sim_mnclength_driver {
 	const char *name;
 	int (*get_mnclength)(const char *imsi);
-	/* Since mer/1.24+git2 */
-	int (*get_mnclength_mccmnc)(int mcc, int mnc);
 };

 int ofono_sim_mnclength_driver_register(
-			const struct ofono_sim_mnclength_driver *driver);
+			struct ofono_sim_mnclength_driver *driver);
 void ofono_sim_mnclength_driver_unregister(
 			const struct ofono_sim_mnclength_driver *driver);

-/* Since mer/1.24+git2 */
-int ofono_sim_mnclength_get_mnclength(const char *imsi);
-int ofono_sim_mnclength_get_mnclength_mccmnc(int mcc, int mnc);

 #ifdef __cplusplus
 }
--- a/ofono/include/sim.h
+++ b/ofono/include/sim.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  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
@@ -211,10 +210,6 @@ struct ofono_sim_driver {
 	void (*logical_access)(struct ofono_sim *sim, int session_id,
 			const unsigned char *pdu, unsigned int len,
 			ofono_sim_logical_access_cb_t cb, void *data);
-	/* Since mer/1.23+git28 */
-	void (*open_channel2)(struct ofono_sim *sim, const unsigned char *aid,
-			unsigned int len, ofono_sim_open_channel_cb_t cb,
-			void *data);
 };

 int ofono_sim_driver_register(const struct ofono_sim_driver *d);
@@ -241,10 +236,6 @@ const unsigned char *ofono_sim_get_cphs_service_table(struct ofono_sim *sim);

 enum ofono_sim_password_type ofono_sim_get_password_type(struct ofono_sim *sim);

-void ofono_sim_refresh_full(struct ofono_sim *sim); /* Since mer/1.24+git2 */
-enum ofono_sim_password_type ofono_sim_puk2pin( /* Since mer/1.24+git2 */
-					enum ofono_sim_password_type type);
-
 unsigned int ofono_sim_add_state_watch(struct ofono_sim *sim,
 					ofono_sim_state_event_cb_t cb,
 					void *data, ofono_destroy_func destroy);
--- a/ofono/include/slot.h
+++ b/ofono/include/slot.h
@@ -1,159 +0,0 @@
-/*
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2017-2021 Jolla Ltd.
- *
- *  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
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
-
-#ifndef __OFONO_SLOT_H
-#define __OFONO_SLOT_H
-
-/*
- * Slots are built-in non-removable modems. Which may or may not apprear
- * in the list reported by org.ofono.Manager.GetModems D-Bus call.
- *
- * This API exists since mer/1.24+git2
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ofono_modem;
-
-#include <ofono/types.h>
-#include <ofono/radio-settings.h>
-
-enum ofono_slot_sim_presence {
-	OFONO_SLOT_SIM_UNKNOWN,
-	OFONO_SLOT_SIM_ABSENT,
-	OFONO_SLOT_SIM_PRESENT
-};
-
-/* Should be treated as a bitmask although currently it's not */
-enum ofono_slot_data_role {
-	OFONO_SLOT_DATA_NONE = 0,
-	OFONO_SLOT_DATA_MMS = 0x01,
-	OFONO_SLOT_DATA_INTERNET = 0x02
-};
-
-enum ofono_slot_property {
-	OFONO_SLOT_PROPERTY_ANY,
-	OFONO_SLOT_PROPERTY_ENABLED,
-	OFONO_SLOT_PROPERTY_SIM_PRESENCE,
-	OFONO_SLOT_PROPERTY_DATA_ROLE
-#define	OFONO_SLOT_PROPERTY_LAST OFONO_SLOT_PROPERTY_DATA_ROLE
-};
-
-enum ofono_slot_manager_property {
-	OFONO_SLOT_MANAGER_PROPERTY_ANY,
-	OFONO_SLOT_MANAGER_PROPERTY_MMS_IMSI,
-	OFONO_SLOT_MANAGER_PROPERTY_MMS_PATH,
-	OFONO_SLOT_MANAGER_PROPERTY_DEFAULT_VOICE_IMSI,
-	OFONO_SLOT_MANAGER_PROPERTY_DEFAULT_DATA_IMSI,
-	OFONO_SLOT_MANAGER_PROPERTY_DEFAULT_VOICE_PATH,
-	OFONO_SLOT_MANAGER_PROPERTY_DEFAULT_DATA_PATH,
-	OFONO_SLOT_MANAGER_PROPERTY_READY
-#define	OFONO_SLOT_MANAGER_PROPERTY_LAST OFONO_SLOT_MANAGER_PROPERTY_READY
-};
-
-enum ofono_slot_flags {
-	OFONO_SLOT_NO_FLAGS = 0,
-	/* Normally we should be able to have two simultaneously active
-	 * data contexts - one for mobile data and one for MMS. The flag
-	 * below says that for whatever reason it's impossible and mobile
-	 * data has to be disconnected before we can send or receive MMS.
-	 * On such devices it may not be a good idea to automatically
-	 * download MMS because that would kill active mobile data
-	 * connections. */
-	OFONO_SLOT_FLAG_SINGLE_CONTEXT = 0x01
-};
-
-typedef struct ofono_slot {
-	const char *path;
-	const char *imei;
-	const char *imeisv;
-	ofono_bool_t enabled;
-	enum ofono_slot_sim_presence sim_presence;
-	enum ofono_slot_data_role data_role;
-} const *ofono_slot_ptr;
-
-struct ofono_slot_manager {
-	const char *mms_imsi;
-	const char *mms_path;
-	const char *default_voice_imsi;
-	const char *default_data_imsi;
-	const char *default_voice_path;
-	const char *default_data_path;
-	const ofono_slot_ptr *slots;
-	ofono_bool_t ready;
-};
-
-#define OFONO_SLOT_API_VERSION (1)
-
-struct ofono_slot_driver {
-	const char *name;
-	int api_version;        /* OFONO_SLOT_API_VERSION */
-
-	struct ofono_slot_driver_data *(*init)(struct ofono_slot_manager *m);
-	unsigned int (*start)(struct ofono_slot_driver_data *d);
-	void (*cancel)(struct ofono_slot_driver_data *d, unsigned int id);
-	void (*cleanup)(struct ofono_slot_driver_data *d);
-};
-
-typedef void (*ofono_slot_property_cb)(struct ofono_slot *slot,
-	enum ofono_slot_property property, void* user_data);
-typedef void (*ofono_slot_manager_property_cb)(struct ofono_slot_manager *m,
-	enum ofono_slot_property property, void* user_data);
-
-struct ofono_slot_driver_data;
-struct ofono_slot_driver_reg;
-struct ofono_slot_driver_reg *ofono_slot_driver_register
-	(const struct ofono_slot_driver *driver);
-struct ofono_slot_driver_data *ofono_slot_driver_get_data
-	(struct ofono_slot_driver_reg *reg);
-void ofono_slot_driver_unregister(struct ofono_slot_driver_reg *reg);
-void ofono_slot_driver_started(struct ofono_slot_driver_reg *reg);
-
-struct ofono_slot_manager *ofono_slot_manager_ref(struct ofono_slot_manager *m);
-void ofono_slot_manager_unref(struct ofono_slot_manager *m);
-void ofono_slot_manager_error(struct ofono_slot_manager *m, const char *key,
-	const char *message);
-unsigned long ofono_slot_manager_add_property_handler
-	(struct ofono_slot_manager *m, enum ofono_slot_manager_property p,
-		ofono_slot_manager_property_cb cb, void* data);
-void ofono_slot_manager_remove_handler(struct ofono_slot_manager *m,
-	unsigned long id);
-void ofono_slot_manager_remove_handlers(struct ofono_slot_manager *m,
-	unsigned long *ids, unsigned int n);
-
-struct ofono_cell_info;
-struct ofono_slot *ofono_slot_add(struct ofono_slot_manager *m,
-	const char *path, enum ofono_radio_access_mode techs, const char *imei,
-	const char *imeisv, enum ofono_slot_sim_presence sim_presence,
-	enum ofono_slot_flags flags);
-struct ofono_slot *ofono_slot_ref(struct ofono_slot *s);
-void ofono_slot_unref(struct ofono_slot *s);
-void ofono_slot_error(struct ofono_slot *s, const char *key, const char *msg);
-void ofono_slot_set_cell_info(struct ofono_slot *s, struct ofono_cell_info *ci);
-unsigned long ofono_slot_add_property_handler(struct ofono_slot *s,
-	enum ofono_slot_property p, ofono_slot_property_cb cb, void* data);
-void ofono_slot_remove_handler(struct ofono_slot *s, unsigned long id);
-void ofono_slot_remove_handlers(struct ofono_slot *s, unsigned long *ids,
-	unsigned int n);
-void ofono_slot_set_sim_presence(struct ofono_slot *s,
-	enum ofono_slot_sim_presence sim_presence);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __OFONO_SLOT_H */
--- a/ofono/include/types.h
+++ b/ofono/include/types.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2015-2021  Jolla Ltd.
 *
 *  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
@@ -43,61 +42,11 @@ typedef int		ofono_bool_t;

 typedef void (*ofono_destroy_func)(void *data);

-enum ofono_access_technology {
-	OFONO_ACCESS_TECHNOLOGY_NONE = -1,
-	/* 27.007 Section 7.3 <AcT> */
-	OFONO_ACCESS_TECHNOLOGY_GSM = 0,
-	OFONO_ACCESS_TECHNOLOGY_GSM_COMPACT = 1,
-	OFONO_ACCESS_TECHNOLOGY_UTRAN = 2,
-	OFONO_ACCESS_TECHNOLOGY_GSM_EGPRS = 3,
-	OFONO_ACCESS_TECHNOLOGY_UTRAN_HSDPA = 4,
-	OFONO_ACCESS_TECHNOLOGY_UTRAN_HSUPA = 5,
-	OFONO_ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA = 6,
-	OFONO_ACCESS_TECHNOLOGY_EUTRAN = 7
-};
-
 /* 27.007 Section 6.2 */
 enum ofono_clir_option {
 	OFONO_CLIR_OPTION_DEFAULT = 0,
-	OFONO_CLIR_OPTION_INVOCATION = 1,
-	OFONO_CLIR_OPTION_SUPPRESSION = 2,
-};
-
-/* 27.007 Section 7.6 */
-enum ofono_clip_validity {
-	OFONO_CLIP_VALIDITY_VALID = 0,
-	OFONO_CLIP_VALIDITY_WITHHELD = 1,
-	OFONO_CLIP_VALIDITY_NOT_AVAILABLE = 2
-};
-
-/* 27.007 Section 7.30 */
-enum ofono_cnap_validity {
-	OFONO_CNAP_VALIDITY_VALID = 0,
-	OFONO_CNAP_VALIDITY_WITHHELD = 1,
-	OFONO_CNAP_VALIDITY_NOT_AVAILABLE = 2
-};
-
-/* 27.007 Section 7.18 */
-enum ofono_call_status {
-	OFONO_CALL_STATUS_ACTIVE = 0,
-	OFONO_CALL_STATUS_HELD = 1,
-	OFONO_CALL_STATUS_DIALING = 2,
-	OFONO_CALL_STATUS_ALERTING = 3,
-	OFONO_CALL_STATUS_INCOMING = 4,
-	OFONO_CALL_STATUS_WAITING = 5,
-	OFONO_CALL_STATUS_DISCONNECTED
-};
-
-/* 27.007 Section 7.18 */
-enum ofono_call_direction {
-	OFONO_CALL_DIRECTION_MOBILE_ORIGINATED = 0,
-	OFONO_CALL_DIRECTION_MOBILE_TERMINATED = 1
-};
-
-enum ofono_sms_charset {
-	OFONO_SMS_CHARSET_7BIT = 0,
-	OFONO_SMS_CHARSET_8BIT = 1,
-	OFONO_SMS_CHARSET_UCS2 = 2
+	OFONO_CLIR_OPTION_INVOCATION,
+	OFONO_CLIR_OPTION_SUPPRESSION,
 };

 enum ofono_error_type {
@@ -147,13 +96,13 @@ struct ofono_cdma_phone_number {
 struct ofono_call {
 	unsigned int id;
 	int type;
-	enum ofono_call_direction direction;
-	enum ofono_call_status status;
+	int direction;
+	int status;
 	struct ofono_phone_number phone_number;
 	struct ofono_phone_number called_number;
 	char name[OFONO_MAX_CALLER_NAME_LENGTH + 1];
-	enum ofono_clip_validity clip_validity;
-	enum ofono_cnap_validity cnap_validity;
+	int clip_validity;
+	int cnap_validity;
 };

 struct ofono_network_time {
--- a/ofono/include/voicecall-filter.h
+++ b/ofono/include/voicecall-filter.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony
 *
- *  Copyright (C) 2018-2021 Jolla Ltd.
+ *  Copyright (C) 2018 Jolla Ltd.
 *
 *  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
@@ -22,6 +22,37 @@ extern "C" {

 #include <ofono/voicecall.h>

+/* 27.007 Section 7.6 */
+enum ofono_clip_validity {
+	OFONO_CLIP_VALIDITY_VALID = 0,
+	OFONO_CLIP_VALIDITY_WITHHELD,
+	OFONO_CLIP_VALIDITY_NOT_AVAILABLE
+};
+
+/* 27.007 Section 7.18 */
+enum ofono_call_status {
+	OFONO_CALL_STATUS_ACTIVE = 0,
+	OFONO_CALL_STATUS_HELD,
+	OFONO_CALL_STATUS_DIALING,
+	OFONO_CALL_STATUS_ALERTING,
+	OFONO_CALL_STATUS_INCOMING,
+	OFONO_CALL_STATUS_WAITING,
+	OFONO_CALL_STATUS_DISCONNECTED
+};
+
+/* 27.007 Section 7.18 */
+enum ofono_call_direction {
+	OFONO_CALL_DIRECTION_MOBILE_ORIGINATED = 0,
+	OFONO_CALL_DIRECTION_MOBILE_TERMINATED
+};
+
+/* 27.007 Section 7.30 */
+enum ofono_cnap_validity {
+	OFONO_CNAP_VALIDITY_VALID = 0,
+	OFONO_CNAP_VALIDITY_WITHHELD,
+	OFONO_CNAP_VALIDITY_NOT_AVAILABLE
+};
+
 enum ofono_voicecall_filter_dial_result {
 	OFONO_VOICECALL_FILTER_DIAL_CONTINUE,     /* Run the next filter */
 	OFONO_VOICECALL_FILTER_DIAL_BLOCK         /* Don't dial*/
--- a/ofono/include/voicecall.h
+++ b/ofono/include/voicecall.h
@@ -139,12 +139,7 @@ struct ofono_voicecall_driver {
 	/* Dials the last number again, this handles the hfp profile last number
 	 * dialing with the +BLDN AT command
 	 */
-	void (*dial_last)(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb,
-			void *data);
-	/* dials a number at a given memory location */
-	void (*dial_memory)(struct ofono_voicecall *vc,
-			unsigned int memory_location, ofono_voicecall_cb_t cb,
-			void *data);
+	void (*dial_last)(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb, void *data);
 };

 void ofono_voicecall_en_list_notify(struct ofono_voicecall *vc,
--- a/ofono/include/watch.h
+++ b/ofono/include/watch.h
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony
 *
- *  Copyright (C) 2017-2021 Jolla Ltd.
+ *  Copyright (C) 2017-2019 Jolla Ltd.
 *
 *  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
@@ -17,12 +17,21 @@
 #define OFONO_WATCH_H

 #include <ofono/gprs-context.h>
-#include <ofono/netreg.h>

 struct ofono_modem;
 struct ofono_sim;
 struct ofono_netreg;

+enum ofono_netreg_status {
+	OFONO_NETREG_STATUS_NONE =             -1,
+	OFONO_NETREG_STATUS_NOT_REGISTERED =    0,
+	OFONO_NETREG_STATUS_REGISTERED =        1,
+	OFONO_NETREG_STATUS_SEARCHING =         2,
+	OFONO_NETREG_STATUS_DENIED =            3,
+	OFONO_NETREG_STATUS_UNKNOWN =           4,
+	OFONO_NETREG_STATUS_ROAMING =           5
+};
+
 /* This object watches ofono modem and various other things */
 struct ofono_watch {
 	const char *path;
--- a/ofono/plugins/gemalto.c
+++ b/ofono/plugins/gemalto.c
@@ -53,11 +53,6 @@

 #define HARDWARE_MONITOR_INTERFACE OFONO_SERVICE ".cinterion.HardwareMonitor"

-/* Supported gemalto's modem */
-#define GEMALTO_MODEL_PHS8P	"0053"
-/* ALS3, PLS8-E, and PLS8-X family */
-#define GEMALTO_MODEL_ALS3_PLS8x	"0061"
-
 static const char *none_prefix[] = { NULL };
 static const char *sctm_prefix[] = { "^SCTM:", NULL };
 static const char *sbv_prefix[] = { "^SBV:", NULL };
@@ -75,8 +70,6 @@ struct gemalto_data {
 	gboolean have_sim;
 	struct at_util_sim_state_query *sim_state_query;
 	struct gemalto_hardware_monitor *hm;
-	guint modem_ready_id;
-	guint trial_cmd_id;
 };

 static int gemalto_probe(struct ofono_modem *modem)
@@ -114,26 +107,10 @@ static GAtChat *open_device(const char *device)
 	GAtSyntax *syntax;
 	GIOChannel *channel;
 	GAtChat *chat;
-	GHashTable *options;
-
-	options = g_hash_table_new(g_str_hash, g_str_equal);
-	if (options == NULL)
-		return NULL;
-
-	g_hash_table_insert(options, "Baud", "115200");
-	g_hash_table_insert(options, "StopBits", "1");
-	g_hash_table_insert(options, "DataBits", "8");
-	g_hash_table_insert(options, "Parity", "none");
-	g_hash_table_insert(options, "XonXoff", "off");
-	g_hash_table_insert(options, "RtsCts", "on");
-	g_hash_table_insert(options, "Local", "on");
-	g_hash_table_insert(options, "Read", "on");

 	DBG("Opening device %s", device);

-	channel = g_at_tty_open(device, options);
-	g_hash_table_destroy(options);
-
+	channel = g_at_tty_open(device, NULL);
 	if (channel == NULL)
 		return NULL;

@@ -148,72 +125,6 @@ static GAtChat *open_device(const char *device)
 	return chat;
 }

-static void sim_ready_cb(gboolean present, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct gemalto_data *data = ofono_modem_get_data(modem);
-	struct ofono_sim *sim = data->sim;
-
-	at_util_sim_state_query_free(data->sim_state_query);
-	data->sim_state_query = NULL;
-
-	DBG("sim present: %d", present);
-
-	ofono_sim_inserted_notify(sim, present);
-}
-
-static void gemalto_ciev_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct gemalto_data *data = ofono_modem_get_data(modem);
-	struct ofono_sim *sim = data->sim;
-
-	const char *sim_status = "simstatus";
-	const char *ind_str;
-	int status;
-	GAtResultIter iter;
-
-	g_at_result_iter_init(&iter, result);
-
-	/* Example: +CIEV: simstatus,<status> */
-	if (!g_at_result_iter_next(&iter, "+CIEV:"))
-		return;
-
-	if (!g_at_result_iter_next_unquoted_string(&iter, &ind_str))
-		return;
-
-	if (!g_str_equal(sim_status, ind_str))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &status))
-		return;
-
-	DBG("sim status %d", status);
-
-	switch (status) {
-	/* SIM is removed from the holder */
-	case 0:
-		ofono_sim_inserted_notify(sim, FALSE);
-		break;
-
-	/* SIM is inserted inside the holder */
-	case 1:
-		/* The SIM won't be ready yet */
-		data->sim_state_query = at_util_sim_state_query_new(data->app,
-					1, 20, sim_ready_cb, modem,
-					NULL);
-		break;
-
-	/* USIM initialization completed. UE has finished reading USIM data. */
-	case 5:
-		ofono_sim_initialized_notify(sim);
-		break;
-
-	default:
-		break;
-	}
-}
-
 static void sim_state_cb(gboolean present, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
@@ -224,13 +135,6 @@ static void sim_state_cb(gboolean present, gpointer user_data)

 	data->have_sim = present;
 	ofono_modem_set_powered(modem, TRUE);
-
-	/* Register for specific sim status reports */
-	g_at_chat_register(data->app, "+CIEV:",
-			gemalto_ciev_notify, FALSE, modem, NULL);
-
-	g_at_chat_send(data->app, "AT^SIND=\"simstatus\",1", none_prefix,
-			NULL, NULL, NULL);
 }

 static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
@@ -396,79 +300,6 @@ static int gemalto_hardware_monitor_enable(struct ofono_modem *modem)
 	return 0;
 }

-static void gemalto_initialize(struct ofono_modem *modem)
-{
-	struct gemalto_data *data = ofono_modem_get_data(modem);
-	const char *mdm;
-
-	DBG("");
-
-	mdm = ofono_modem_get_string(modem, "Modem");
-
-	if (mdm == NULL)
-		return;
-
-	/* Open devices */
-	data->mdm = open_device(mdm);
-	if (data->mdm == NULL) {
-		g_at_chat_unref(data->app);
-		data->app = NULL;
-		return;
-	}
-
-	if (getenv("OFONO_AT_DEBUG")) {
-		g_at_chat_set_debug(data->app, gemalto_debug, "App");
-		g_at_chat_set_debug(data->mdm, gemalto_debug, "Mdm");
-	}
-
-	g_at_chat_send(data->mdm, "ATE0", none_prefix, NULL, NULL, NULL);
-	g_at_chat_send(data->app, "ATE0 +CMEE=1", none_prefix,
-			NULL, NULL, NULL);
-	g_at_chat_send(data->mdm, "AT&C0", none_prefix, NULL, NULL, NULL);
-	g_at_chat_send(data->app, "AT&C0", none_prefix, NULL, NULL, NULL);
-
-	g_at_chat_send(data->app, "AT+CFUN=4", none_prefix,
-			cfun_enable, modem, NULL);
-
-	gemalto_hardware_monitor_enable(modem);
-}
-
-static void gemalto_modem_ready(GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct gemalto_data *data = ofono_modem_get_data(modem);
-	const char *app = ofono_modem_get_string(modem, "Application");
-
-	DBG("");
-
-	/*
-	 * As the modem wasn't ready to handle AT commands when we opened
-	 * it, we have to close and reopen the device app.
-	 */
-	data->modem_ready_id = 0;
-	data->trial_cmd_id = 0;
-
-	g_at_chat_unref(data->app);
-
-	data->app = open_device(app);
-	if (data->app == NULL) {
-		ofono_modem_set_powered(modem, FALSE);
-	} else {
-		gemalto_initialize(modem);
-	}
-}
-
-static void gemalto_at_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct gemalto_data *data = ofono_modem_get_data(modem);
-
-	g_at_chat_unregister(data->app, data->modem_ready_id);
-	data->modem_ready_id = 0;
-
-	gemalto_initialize(modem);
-}
-
 static int gemalto_enable(struct ofono_modem *modem)
 {
 	struct gemalto_data *data = ofono_modem_get_data(modem);
@@ -487,11 +318,28 @@ static int gemalto_enable(struct ofono_modem *modem)
 	if (data->app == NULL)
 		return -EINVAL;

-	/* Try the AT command. If it doesn't work, wait for ^SYSSTART */
-	data->modem_ready_id = g_at_chat_register(data->app, "^SYSSTART",
-				gemalto_modem_ready, FALSE, modem, NULL);
-	data->trial_cmd_id = g_at_chat_send(data->app, "ATE0 AT",
-				none_prefix, gemalto_at_cb, modem, NULL);
+	data->mdm = open_device(mdm);
+	if (data->mdm == NULL) {
+		g_at_chat_unref(data->app);
+		data->app = NULL;
+		return -EINVAL;
+	}
+
+	if (getenv("OFONO_AT_DEBUG")) {
+		g_at_chat_set_debug(data->app, gemalto_debug, "App");
+		g_at_chat_set_debug(data->mdm, gemalto_debug, "Mdm");
+	}
+
+	g_at_chat_send(data->mdm, "ATE0", none_prefix, NULL, NULL, NULL);
+	g_at_chat_send(data->app, "ATE0 +CMEE=1", none_prefix,
+			NULL, NULL, NULL);
+	g_at_chat_send(data->mdm, "AT&C0", none_prefix, NULL, NULL, NULL);
+	g_at_chat_send(data->app, "AT&C0", none_prefix, NULL, NULL, NULL);
+
+	g_at_chat_send(data->app, "AT+CFUN=4", none_prefix,
+			cfun_enable, modem, NULL);
+
+	gemalto_hardware_monitor_enable(modem);

 	return -EINPROGRESS;
 }
@@ -566,16 +414,17 @@ static void gemalto_set_online(struct ofono_modem *modem, ofono_bool_t online,
 static void gemalto_pre_sim(struct ofono_modem *modem)
 {
 	struct gemalto_data *data = ofono_modem_get_data(modem);
+	struct ofono_sim *sim;

 	DBG("%p", modem);

 	ofono_devinfo_create(modem, 0, "atmodem", data->app);
 	ofono_location_reporting_create(modem, 0, "gemaltomodem", data->app);
-	data->sim = ofono_sim_create(modem, OFONO_VENDOR_CINTERION, "atmodem",
+	sim = ofono_sim_create(modem, OFONO_VENDOR_CINTERION, "atmodem",
 						data->app);

-	if (data->sim && data->have_sim == TRUE)
-		ofono_sim_inserted_notify(data->sim, TRUE);
+	if (sim && data->have_sim == TRUE)
+		ofono_sim_inserted_notify(sim, TRUE);
 }

 static void gemalto_post_sim(struct ofono_modem *modem)
@@ -583,7 +432,6 @@ static void gemalto_post_sim(struct ofono_modem *modem)
 	struct gemalto_data *data = ofono_modem_get_data(modem);
 	struct ofono_gprs *gprs;
 	struct ofono_gprs_context *gc;
-	const char *model = ofono_modem_get_string(modem, "Model");

 	DBG("%p", modem);

@@ -596,10 +444,6 @@ static void gemalto_post_sim(struct ofono_modem *modem)

 	if (gprs && gc)
 		ofono_gprs_add_context(gprs, gc);
-
-	if (!g_strcmp0(model, GEMALTO_MODEL_ALS3_PLS8x))
-		ofono_lte_create(modem, OFONO_VENDOR_CINTERION,
-						"atmodem", data->app);
 }

 static void gemalto_post_online(struct ofono_modem *modem)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Denis Grigorev	3e82beca36	[ril] Provide SmsHistory interface for all modems. JB#49955 The SmsHistory plugin uses a global variable to determine if it is already registered. Because of that, Ofono provides org.ofono.SmsHistory only for the first modem, and SMS delivery notifications do not work on the others. After this commit is applied, the plugin will be registered for each modem.	2020-05-20 17:21:06 +03:00
Slava Monich	d3ddce9661	[ril] Stop repeating requests on RADIO_NOT_AVAILABLE. JB#49471 If the modem is powered off, this error is repeated indefinitely, causing unnecessary wakeups.	2020-04-01 19:44:54 +03:00
Slava Monich	54ef7e78a3	[ril] Tweaked power state confirmation logic. JB#49471 Changed ril_radio_confirm_power_on() to send RADIO_POWER request even if we think that modem is powered on. Some RILs change power state without letting us know and that's what this function is for - to make sure that power is on when we think that it's on.	2020-04-01 19:43:57 +03:00
Slava Monich	a54b74cbe6	[ril] Take modem offline when ril_modem is deleted. JB#49471 Also, mobile data need to be disallowed before deleting the modem object, so that power keep-on request could be submitted before bringing the modem offline, to keep power on while data call is being deactivated (if there was one).	2020-04-01 19:43:57 +03:00
Slava Monich	b136997e5c	[ril] Fixed ref vs unref mixup. RilRadioCapsManager was never freed :/ That was leaving 472 bytes in 8 blocks still reachable on exit.	2020-04-01 19:43:57 +03:00
Denis Grigorev	af29f9a9f9	[ril] Do not trigger automatic PLMN selection if not needed. JB#49322 On some devices SET_NETWORK_SELECTION_AUTOMATIC takes significant time, because it triggers a complete scan of available PLMNs. If applied, this commit will make ofono to issue QUERY_NETWORK_SELECTION_MODE first and check whether the mode actually needs to be changed.	2020-03-16 21:26:40 +02:00
Denis Grigorev	59e8853c77	[ril] Add networkSelectionTimeout config option. JB#49322 On some devices (such as BQ Aquarius NS208) SET_NETWORK_SELECTION_AUTOMATIC takes a long time and ofono fails with timeout. If applied, this commit will make network selection timeout configurable.	2020-03-16 21:26:17 +02:00
Slava Monich	c03a508622	[ril] Support combinations of device state tracking methods. JB#49175 In addition to specifying ss, ds or ur method, one can specify a combination of methods, e.g. ds+ur	2020-03-10 15:35:08 +02:00
Slava Monich	1fd2f955ec	[ril] Added ril_config_get_mask. JB#49175	2020-03-10 15:35:08 +02:00
Denis Grigorev	124a3bf982	[ril] Add a new device state management method. JB#49175 If applied, this commit will add a new ril_devmon implementation which controls network state updates by sending SET_UNSOLICITED_RESPONSE_FILTER. This is useful for devices with RIL version >= 15 if they ignore both SEND_DEVICE_STATE and SEND_SCREEN_STATE requests as some Qualcomm- based devices do.	2020-03-06 15:41:59 +02:00
Slava Monich	4ed6bf1d51	[ofono] Access control for SIM Toolkit agent. Fixes JB#49163 Non-privileged process will get org.ofono.Error.AccessDenied from RegisterAgent. Other methods already check that D-Bus call is coming from a registered agent.	2020-03-04 15:33:25 +02:00
Slava Monich	7c07139439	[ofono] Store one-time data SIM selection. JB#48462 This way, automatic choice survives a reboot.	2020-02-13 20:11:38 +03:00