[rilmodem] Fix for Call Barring commit

Signed-off-by: Miia Leinonen <miia.leinonen@oss.tieto.com>
[rilmodem] Add Call Barring support
2025-11-24 19:39:44 +08:00 · 2014-01-16 09:52:30 +02:00 · 2014-01-16 09:52:30 +02:00 · 2014-01-16 09:52:30 +02:00
307 changed files with 2824 additions and 29210 deletions
--- a/ofono/AUTHORS
+++ b/ofono/AUTHORS
@@ -92,15 +92,3 @@ Jesper Larsen <jesper.larsen@ixonos.com>
 Slava Monich <slava.monich@jolla.com>
 Andrew Earl <andrewx.earl@intel.com>
 Krzysztof Wilk <krzysztofx.wilk@intel.com>
-Tony Espy <espy@canonical.com>
-Martin Pitt <martin.pitt@ubuntu.com>
-Alfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com>
-Jussi Pakkanen <jussi.pakkanen@canonical.com>
-Sergio Checa Blanco <sergio.checa@bmw-carit.de>
-Philip Paeps <philip@paeps.cx>
-Kuba Pawlak <kubax.t.pawlak@intel.com>
-Tommi Kenakkala <tommi.kenakkala@tieto.com>
-Alex J Lennon <ajlennon@dynamicdevices.co.uk>
-Sergey Alirzaev <zl29ah@gmail.com>
-Marko Sulejic <marko.sulejic@hale.at>
-Johannes 'josch' Schauer <josch@mister-muffin.de>
--- a/ofono/ChangeLog
+++ b/ofono/ChangeLog
@@ -1,33 +1,3 @@
-ver 1.17:
-	Fix issue with alphanumeric TP-OA handling.
-	Fix issue with push notification origin port.
-	Fix issue with reading of EF_MWIS records.
-	Fix issue with handling AT+CPINR results.
-	Fix issue with SIM state polling for Sierra modems.
-	Fix issue with HFP handling and AT command prefixes.
-	Fix issue with HFP and extra CCWA event handling.
-	Fix issue with HFP call state and +CHUP errors.
-
-ver 1.16:
-	Fix issue with PIN retry handling.
-	Fix issue with HFP and multiple calls.
-	Add support for Distracted Driving Reduction.
-	Add support for available technologies property.
-	Add support for Telit location reporting driver.
-	Add support for u-blox SARA-U270 modems.
-	Add support for Quectel UC15 modems.
-
-ver 1.15:
-	Fix issue with EF_PNN access affecting PLMN display.
-	Fix issue with SIM detection and Telit HE910 modems.
-	Fix issue with Mobile Provider Database provisioning.
-	Fix issue with bit-shifting and ID mapping allocations.
-	Fix issue with Handsfree and unsolicited notifications.
-	Fix issue with Handsfree and three way calling feature.
-	Add support for Handsfree subscriber number feature.
-	Add support for Handsfree multiple DTMF characters.
-	Add support for PAP authentication.
-
 ver 1.14:
 	Add support for Apple Siri specific Handsfree commands.
 	Add support for provisioning of MMSC and Message Proxy.
--- a/ofono/Makefile.am
+++ b/ofono/Makefile.am
@@ -21,9 +21,8 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/cdma-connman.h include/gnss.h \
 			include/private-network.h include/cdma-netreg.h \
 			include/cdma-provision.h include/handsfree.h \
-			include/handsfree-audio.h \
-			include/sim-mnclength.h \
-			include/siri.h
+			include/handsfree-audio.h include/sim-mnclength.h \
+			include/oemraw.h include/siri.h

 nodist_pkginclude_HEADERS = include/version.h

@@ -119,53 +118,8 @@ builtin_sources += plugins/udevng.c
 endif

 if RILMODEM
-if JOLLA_RILMODEM
-builtin_modules += ril
-builtin_sources +=	drivers/ril/ril_call_barring.c \
-			drivers/ril/ril_call_forward.c \
-			drivers/ril/ril_call_settings.c \
-			drivers/ril/ril_call_volume.c \
-			drivers/ril/ril_cell_info.c \
-			drivers/ril/ril_cell_info_dbus.c \
-			drivers/ril/ril_config.c \
-			drivers/ril/ril_cbs.c \
-			drivers/ril/ril_data.c \
-			drivers/ril/ril_devinfo.c \
-			drivers/ril/ril_ecclist.c \
-			drivers/ril/ril_gprs.c \
-			drivers/ril/ril_gprs_context.c \
-			drivers/ril/ril_mce.c \
-			drivers/ril/ril_modem.c \
-			drivers/ril/ril_mtu.c \
-			drivers/ril/ril_netreg.c \
-			drivers/ril/ril_network.c \
-			drivers/ril/ril_oem_raw.c \
-			drivers/ril/ril_phonebook.c \
-			drivers/ril/ril_plugin.c \
-			drivers/ril/ril_plugin_dbus.c \
-			drivers/ril/ril_radio.c \
-			drivers/ril/ril_radio_settings.c \
-			drivers/ril/ril_sim.c \
-			drivers/ril/ril_sim_card.c \
-			drivers/ril/ril_sim_info.c \
-			drivers/ril/ril_sim_info_dbus.c \
-			drivers/ril/ril_sim_settings.c \
-			drivers/ril/ril_sms.c \
-			drivers/ril/ril_stk.c \
-			drivers/ril/ril_ussd.c \
-			drivers/ril/ril_util.c \
-			drivers/ril/ril_voicecall.c
-
-if DATAFILES
-dist_conf_DATA += drivers/ril/ril_subscription.conf
-endif
-
-else
 builtin_sources += $(gril_sources)

-builtin_modules += rildev
-builtin_sources += plugins/rildev.c
-
 builtin_modules += ril
 builtin_sources += plugins/ril.c

@@ -189,14 +143,8 @@ builtin_sources += drivers/rilmodem/rilmodem.h \
 			drivers/rilmodem/call-forwarding.c \
 			drivers/rilmodem/cbs.c \
 			drivers/rilmodem/oemraw-messages.c \
-			drivers/rilmodem/call-barring.c \
-			drivers/rilmodem/stk.c
+			drivers/rilmodem/call-barring.c

-if DATAFILES
-dist_conf_DATA += gril/ril_subscription.conf
-endif
-
-endif
 endif

 if ISIMODEM
@@ -360,12 +308,6 @@ builtin_sources += drivers/atmodem/atutil.h \
 			drivers/mbmmodem/stk.c \
 			drivers/mbmmodem/location-reporting.c

-builtin_modules += telitmodem
-builtin_sources += drivers/atmodem/atutil.h \
-			drivers/telitmodem/telitmodem.h \
-			drivers/telitmodem/telitmodem.c \
-			drivers/telitmodem/location-reporting.c
-
 builtin_modules += hsomodem
 builtin_sources += drivers/atmodem/atutil.h \
 			drivers/hsomodem/hsomodem.h \
@@ -428,6 +370,9 @@ builtin_sources += plugins/phonesim.c

 if DATAFILES
 dist_conf_DATA += plugins/phonesim.conf
+if RILMODEM
+dist_conf_DATA += gril/ril_subscription.conf
+endif
 endif
 endif

@@ -483,8 +428,8 @@ builtin_sources += plugins/stemgr.c
 builtin_modules += caif
 builtin_sources += plugins/caif.c

-builtin_modules += cinterion
-builtin_sources += plugins/cinterion.c
+builtin_modules += tc65
+builtin_sources += plugins/tc65.c

 builtin_modules += nokia
 builtin_sources += plugins/nokia.c
@@ -512,20 +457,14 @@ builtin_sources += plugins/samsung.c

 builtin_modules += sim900
 builtin_sources += plugins/sim900.c
-
-builtin_modules += quectel
-builtin_sources += plugins/quectel.c
-
-builtin_modules += ublox
-builtin_sources += plugins/ublox.c
-
-builtin_modules += he910
-builtin_sources += plugins/he910.c
 endif

 builtin_modules += connman
 builtin_sources += plugins/connman.c

+builtin_modules += he910
+builtin_sources += plugins/he910.c
+
 if BLUETOOTH
 if BLUEZ4
 builtin_modules += bluez4
@@ -574,7 +513,7 @@ if PROVISION
 builtin_sources += plugins/mbpi.h plugins/mbpi.c

 builtin_modules += provision
-builtin_sources += plugins/provision.h plugins/provision.c
+builtin_sources += plugins/provision.c

 builtin_modules += cdma_provision
 builtin_sources += plugins/cdma-provision.c
@@ -601,9 +540,6 @@ builtin_sources += examples/private-network.c

 builtin_modules += stktest
 builtin_sources += plugins/stktest.c
-
-builtin_modules += emulator_fuzz
-builtin_sources += plugins/emulator_fuzz.c
 endif

 builtin_modules += smart_messaging
@@ -612,18 +548,6 @@ builtin_sources += plugins/smart-messaging.c
 builtin_modules += push_notification
 builtin_sources += plugins/push-notification.c

-if PUSHFORWARDER
-builtin_modules += push_forwarder
-builtin_sources += plugins/push-forwarder.c
-builtin_cflags += @WSPCODEC_CFLAGS@
-builtin_libadd += @WSPCODEC_LIBS@
-endif
-
-if DEBUGLOG
-builtin_modules += debuglog
-builtin_sources += plugins/debuglog.c
-endif
-
 builtin_modules += sms_history
 builtin_sources += plugins/smshistory.c

@@ -654,8 +578,8 @@ src_ofonod_SOURCES = $(builtin_sources) src/ofono.ver \
 			src/cdma-sms.c src/private-network.c src/cdma-netreg.c \
 			src/cdma-provision.c src/handsfree.c \
 			src/handsfree-audio.c src/bluetooth.h \
-			src/sim-mnclength.c src/voicecallagent.c \
-			src/hfp.h src/siri.c
+			src/hfp.h src/sim-mnclength.c src/oemraw.c \
+			src/siri.c

 src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
 			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
@@ -698,10 +622,9 @@ doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
 			doc/sim-api.txt doc/stk-api.txt \
 			doc/audio-settings-api.txt doc/text-telephony-api.txt \
 			doc/calypso-modem.txt doc/message-api.txt \
-			doc/location-reporting-api.txt \
-			doc/smshistory-api.txt doc/oemraw-api.txt \
-			doc/certification.txt doc/siri-api.txt \
-			doc/telit-modem.txt
+			doc/location-reporting-api.txt doc/smshistory-api.txt \
+			doc/oemraw-api.txt \
+			doc/certification.txt doc/siri-api.txt


 test_scripts = test/backtrace \
@@ -789,17 +712,13 @@ test_scripts = test/backtrace \
 		test/set-context-property \
 		test/test-gnss \
 		test/swap-calls \
-		test/transfer-call \
 		test/release-and-answer \
 		test/release-and-swap \
 		test/hold-and-answer \
 		test/hangup-multiparty \
 		test/hangup-call \
 		test/display-icon \
-		test/set-msisdn \
-		test/test-voicecallagent \
-		test/get-network-time \
-		test/set-ddr
+		test/set-msisdn

 if TEST
 testdir = $(pkglibdir)/test
@@ -820,8 +739,7 @@ unit_tests = unit/test-common unit/test-util unit/test-idmap \
 				unit/test-grilrequest \
 				unit/test-grilreply \
 				unit/test-grilunsol \
-				unit/test-sms unit/test-cdmasms \
-				unit/test-provision
+				unit/test-sms unit/test-cdmasms

 noinst_PROGRAMS = $(unit_tests) \
 			unit/test-sms-root unit/test-mux unit/test-caif
@@ -888,13 +806,6 @@ unit_test_grilunsol_SOURCES = unit/test-grilunsol.c $(gril_sources) \
 unit_test_grilunsol_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_grilunsol_OBJECTS)

-unit_test_provision_SOURCES = unit/test-provision.c \
-				plugins/provision.h plugins/provision.c \
-				plugins/mbpi.c src/gprs-provision.c \
-				src/log.c
-unit_test_provision_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_provision_OBJECTS)
-
 TESTS = $(unit_tests)

 if TOOLS
--- a/ofono/acinclude.m4
+++ b/ofono/acinclude.m4
@@ -12,7 +12,7 @@ AC_DEFUN([AC_PROG_CC_PIE], [

 AC_DEFUN([COMPILER_FLAGS], [
 	if (test "${CFLAGS}" = ""); then
-		CFLAGS="-Wall -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
+		CFLAGS="-Wall -O2 -D_FORTIFY_SOURCE=2"
 	fi
 	if (test "$USE_MAINTAINER_MODE" = "yes"); then
 		CFLAGS="$CFLAGS -Werror -Wextra"
--- a/ofono/configure.ac
+++ b/ofono/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(ofono, 1.17)
+AC_INIT(ofono, 1.14)

 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AC_CONFIG_HEADERS(config.h)
@@ -42,7 +42,6 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
 	if (test "${enableval}" = "yes" &&
 				test "${ac_cv_prog_cc_g}" = "yes"); then
 		CFLAGS="$CFLAGS -g"
-                CPPFLAGS="$CPPFLAGS -DDEBUG"
 	fi
 ])

@@ -167,20 +166,6 @@ AC_ARG_ENABLE(rilmodem, AC_HELP_STRING([--disable-rilmodem],
                                        [enable_rilmodem=${enableval}])
 AM_CONDITIONAL(RILMODEM, test "${enable_rilmodem}" != "no")

-AC_ARG_ENABLE(jolla-rilmodem,
-        AC_HELP_STRING([--enable-jolla-rilmodem], [enable Jolla RIL modem]),
-        [enable_jolla_rilmodem=${enableval}], [enable_jolla_rilmodem="no"])
-AM_CONDITIONAL(JOLLA_RILMODEM, test "${enable_jolla_rilmodem}" != "no")
-
-if (test "${enable_jolla_rilmodem}" = "yes"); then
-	PKG_CHECK_MODULES(GRILIO, libgrilio >= 1.0.6, dummy=yes,
-				AC_MSG_ERROR(libgrilio >= 1.0.6 is required))
-	PKG_CHECK_MODULES(GLIBUTIL, libglibutil >= 1.0.5, dummy=yes,
-				AC_MSG_ERROR(libglibutil >= 1.0.5 is required))
-	CFLAGS="$CFLAGS $GRILIO_CFLAGS $GLIBUTIL_CFLAGS"
-	LIBS="$LIBS $GRILIO_LIBS $GLIBUTIL_LIBS"
-fi
-
 AC_ARG_ENABLE(qmimodem, AC_HELP_STRING([--disable-qmimodem],
 				[disable Qualcomm QMI modem support]),
 					[enable_qmimodem=${enableval}])
@@ -207,16 +192,13 @@ AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no")
 AC_ARG_ENABLE(nettime, AC_HELP_STRING([--disable-nettime],
                                [disable Nettime plugin]),
                                        [enable_nettime=${enableval}])
-if (test "${enable_nettime}" != "no"); then
-	AC_SEARCH_LIBS([clock_gettime], [rt])
-fi
-AM_CONDITIONAL(NETTIME, test "${enable_nettime}" != "no")
+AM_CONDITIONAL(NETTIME, test "${enable_netttime}" != "no")

 AC_ARG_WITH([provisiondb], AC_HELP_STRING([--with-provisiondb=FILE],
 	[location of provision database]), [path_provisiondb=${withval}])

 AC_ARG_ENABLE(provision, AC_HELP_STRING([--disable-provision],
-				[disable provisioning support]),
+				[disable provisioning suport]),
 					[enable_provision=${enableval}])
 if (test "${enable_provision}" != "no"); then
 	if (test -n "${path_provisiondb}"); then
@@ -241,28 +223,6 @@ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
 					[enable_datafiles=${enableval}])
 AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")

-AC_ARG_ENABLE(pushforwarder, AC_HELP_STRING([--disable-pushforwarder],
-                                [disable Push Forwarder plugin]),
-                                        [enable_pushforwarder=${enableval}])
-AM_CONDITIONAL(PUSHFORWARDER, test "${enable_pushforwarder}" != "no")
-if (test "${enable_pushforwarder}" != "no"); then
-	PKG_CHECK_MODULES(WSPCODEC, libwspcodec >= 2.0, dummy=yes,
-		AC_MSG_ERROR(WSP decoder is required))
-	AC_SUBST(WSPCODEC_CFLAGS)
-	AC_SUBST(WSPCODEC_LIBS)
-fi
-
-AC_ARG_ENABLE(debuglog,
-	AC_HELP_STRING([--enable-debuglog], [enable log control plugin]),
-			[enable_debuglog=${enableval}], [enable_debuglog="no"])
-AM_CONDITIONAL(DEBUGLOG, test "${enable_debuglog}" != "no")
-if (test "${enable_debuglog}" = "yes"); then
-	PKG_CHECK_MODULES(DBUSLOG, libdbuslogserver-dbus, dummy=yes,
-				AC_MSG_ERROR(libdbuslogserver-dbus is required))
-	CFLAGS="$CFLAGS $DBUSLOG_CFLAGS"
-	LIBS="$LIBS $DBUSLOG_LIBS"
-fi
-
 if (test "${prefix}" = "NONE"); then
 	dnl no prefix and no localstatedir, so default to /var
 	if (test "$localstatedir" = '${prefix}/var'); then
--- a/ofono/doc/coding-style.txt
+++ b/ofono/doc/coding-style.txt
@@ -306,13 +306,6 @@ Example:
 2)
 0x1 << y	// Wrong

-M17: Avoid forward-declaration of static functions
-==================================================
-
-Functions that are static should not be forward-declared.  The only exception
-to this rule is if a circular dependency condition exists, and the forward
-declaration cannot be avoided.
-
 O1: Shorten the name
 ====================
 Better to use abbreviation, rather than full name, to name a variable,
--- a/ofono/doc/connman-api.txt
+++ b/ofono/doc/connman-api.txt
@@ -60,16 +60,6 @@ Methods		dict GetProperties()
 					 [service].Error.NotFound
 					 [service].Error.Failed

-		void ResetContexts()
-
-			Removes all contexts and re-provisions from the APN
-			database. Contexts must all be deactivated for this
-			method to work, and the atom must not be powered.
-
-			Possible Errors: [service].Error.InProgress
-					 [service].Error.InvalidArguments
-					 [service].Error.NotAllowed
-
 Signals		PropertyChanged(string property, variant value)

 			This signal indicates a changed value of the given
@@ -165,15 +155,6 @@ Methods		dict GetProperties()
 					 [service].Error.AttachInProgress
 					 [service].Error.NotImplemented

-Methods		void ProvisionContext()
-			Resets all properties back to default. Fails to make
-			any changes to the context if it is active or in the
-			process of being activated or deactivated.
-
-			Possible Errors: [service].Error.Failed
-					 [service].Error.InProgress
-					 [service].Error.NotAvailable
-
 Signals		PropertyChanged(string property, variant value)

 			This signal indicates a changed value of the given
@@ -199,10 +180,6 @@ Properties	boolean Active [readwrite]
 				"wap" - Used by WAP related services
 				"ims" - Used by IMS related services

-		string AuthenticationMethod [readwrite]
-			Holds the PPP authentication method to use.  Valid
-			values are "pap" and "chap".  Defaults to "chap".
-
 		string Username [readwrite]

 			Holds the username to be used for authentication
--- a/ofono/doc/handsfree-api.txt
+++ b/ofono/doc/handsfree-api.txt
@@ -19,8 +19,6 @@ Methods		dict GetProperties()

 			Possible Errors: [service].Error.InProgress
 					 [service].Error.InvalidArguments
-					 [service].Error.NotImplemented
-					 [service].Error.NotSupported

 		string RequestPhoneNumber()

@@ -47,13 +45,6 @@ Properties	array{string} Features [readonly]
 				"voice-recognition"
 				"attach-voice-tag"
 				"echo-canceling-and-noise-reduction"
-				"three-way-calling"
-				"release-all-held"
-				"release-specified-active-call"
-				"private-chat"
-				"create-multiparty"
-				"transfer"
-				"hf-indicators"

 		boolean InbandRinging [readonly]

@@ -66,7 +57,7 @@ Properties	array{string} Features [readonly]
 			to activate or deactivate the function from the HF, or
 			the AG could autonomously initiate it.

-		boolean EchoCancelingNoiseReduction [readwrite, optional]
+		boolean EchoCancelingNoiseReduction [readwrite]

 			Non-persistent Boolean property representing whether
 			echo canceling and noise reduction is enabled in the
@@ -79,14 +70,3 @@ Properties	array{string} Features [readonly]

 			The current charge level of the battery.  The value
 			can be between 0 and 5 respectively.
-
-		array{string} SubscriberNumbers [readonly]
-
-			List of subscriber numbers provided by the AG.
-
-		boolean DistractedDrivingReduction [readwrite, optional]
-
-			Non-persistent property representing whether
-			distracted driving reduction mode should be enabled in
-			the AG.  Support for this feature is optional on the
-			AG.
--- a/ofono/doc/network-api.txt
+++ b/ofono/doc/network-api.txt
@@ -57,11 +57,6 @@ Signals		PropertyChanged(string property, variant value)
 			This signal indicates a changed value of the given
 			property.

-		OperatorsChanged(array{object,dict})
-
-			Signal that gets emitted when operator list has
-			changed. It contains the current list of operators.
-
 Properties	string Mode [readonly]

 			The current registration mode. The default of this
--- a/ofono/doc/radio-settings-api.txt
+++ b/ofono/doc/radio-settings-api.txt
@@ -45,11 +45,6 @@ Properties	string TechnologyPreference [readwrite]
 				"umts"	Only UMTS used for radio access.
 				"lte"	Only LTE used for radio access.

-		array{string} AvailableTechnologies [readonly, optional]
-
-			List of values for TechnologyPreference property
-			supported by the modem.
-
 		string GsmBand [readwrite, optional]

 			Frequency band in which the modem is allowed to
--- a/ofono/doc/sim-api.txt
+++ b/ofono/doc/sim-api.txt
@@ -93,11 +93,6 @@ Properties	boolean Present [readonly]

 			Contains the IMSI of the SIM, if available.

-		string ServiceProviderName [readonly, optional]
-
-			Contains the service provider name fetched from the
-			SIM card, if available.
-
 		string MobileCountryCode [readonly, optional]

 			Contains the Mobile Country Code (MCC) of the home
--- a/ofono/doc/telit-modem.txt
+++ b/ofono/doc/telit-modem.txt
@@ -1,19 +0,0 @@
-oFono - Open Source Telephony
-*****************************
-
-Purpose
-=======
-The purpose of this document is to identify issues and configuration
-requirements with Telit's modems.
-
-HE910
-=====
-
-GPS:
-  To enable location reporting on the Telit HE910 the modem needs to be
-  switched to Port Configuration #8. Please refer to Telit's
-  'HE910 UE910 Family Ports Arrangements' section 4.1.3 for rationale and
-  'AT Commands Reference Guide' section 3.5.7.1.96 for specific AT command.
-  After setting the configuration, a power cycle is required.
-  Port Configiuration #8 is available since firmware 12.00.004. Firmware version
-  can be checked using 'AT+CGMR'.
--- a/ofono/doc/voicecallmanager-api.txt
+++ b/ofono/doc/voicecallmanager-api.txt
@@ -198,25 +198,6 @@ Methods		dict GetProperties()
 					 [service].Error.InvalidFormat
 					 [service].Error.Failed

-		void RegisterVoicecallAgent(object path)
-
-			Registers an agent which will be called whenever a
-			specific voice call related event requiring a client
-			action occurs. Currently, the only such action is
-			playing a ringback tone locally.
-
-			Possible Errors: [service].Error.InProgress
-					 [service].Error.InvalidArguments
-					 [service].Error.InvalidFormat
-					 [service].Error.Failed
-
-		void UnregisterVoicecallAgent(object path)
-
-			Unregisters an agent.
-
-			Possible Errors: [service].Error.InvalidArguments
-					 [service].Error.Failed
-
 Signals		CallAdded(object path, dict properties)

 			Signal that is sent when a new call is added.  It
@@ -276,26 +257,3 @@ Properties	array{string} EmergencyNumbers [readonly]
 			of numbers provided by the specification and any
 			extra numbers provisioned by the carrier on the
 			SIM.
-
-VoiceCallAgent Hierarchy
-========================
-
-Service		unique name
-Interface	org.ofono.VoiceCallAgent
-Object path	freely definable
-
-Methods		void RingbackTone(boolean playTone)
-
-			Requests the client to generate an alerting tone locally
-			(3GPP 24.008; 5.2.1.5). This can happen when an outgoing
-			voice call is made and network is not providing the
-			alerting tone. Value 0 stands for "stop playing ringback
-			tone" and 1 for "start playing ringback tone".
-
-		void Release() [noreply]
-
-			Agent is being released, possibly because of oFono
-			terminating, voicecall interface is being torn down or
-			modem is switched off. No UnregisterVoicecallAgent
-			call is needed.
-
--- a/ofono/drivers/atmodem/gprs-context.c
+++ b/ofono/drivers/atmodem/gprs-context.c
@@ -59,7 +59,6 @@ enum state {
 struct gprs_context_data {
 	GAtChat *chat;
 	unsigned int active_context;
-	GAtPPPAuthMethod auth_method;
 	char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
 	char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
 	GAtPPP *ppp;
@@ -155,7 +154,6 @@ static gboolean setup_ppp(struct ofono_gprs_context *gc)
 	if (getenv("OFONO_PPP_DEBUG"))
 		g_at_ppp_set_debug(gcd->ppp, ppp_debug, "PPP");

-	g_at_ppp_set_auth_method(gcd->ppp, gcd->auth_method);
 	g_at_ppp_set_credentials(gcd->ppp, gcd->username, gcd->password);

 	/* set connect and disconnect callbacks */
@@ -245,18 +243,6 @@ static void at_gprs_activate_primary(struct ofono_gprs_context *gc,
 	memcpy(gcd->username, ctx->username, sizeof(ctx->username));
 	memcpy(gcd->password, ctx->password, sizeof(ctx->password));

-	/* We only support CHAP and PAP */
-	switch (ctx->auth_method) {
-	case OFONO_GPRS_AUTH_METHOD_CHAP:
-		gcd->auth_method = G_AT_PPP_AUTH_METHOD_CHAP;
-		break;
-	case OFONO_GPRS_AUTH_METHOD_PAP:
-		gcd->auth_method = G_AT_PPP_AUTH_METHOD_PAP;
-		break;
-	default:
-		goto error;
-	}
-
 	gcd->state = STATE_ENABLING;

 	if (gcd->vendor == OFONO_VENDOR_ZTE) {
@@ -282,34 +268,9 @@ static void at_gprs_activate_primary(struct ofono_gprs_context *gc,

 	len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"", ctx->cid);

-	if (ctx->apn) {
-		switch (gcd->vendor) {
-		case OFONO_VENDOR_UBLOX:
-			/*
-			 * U-blox modems require a magic prefix to the APN to
-			 * specify the authentication method to use in the
-			 * network.  See UBX-13002752 - R21.
-			 *
-			 * As the response of the read command omits this magic
-			 * prefix, this is the least invasive place to set it.
-			 */
-			switch (ctx->auth_method) {
-			case OFONO_GPRS_AUTH_METHOD_CHAP:
-				snprintf(buf + len, sizeof(buf) - len - 3,
-						",\"CHAP:%s\"", ctx->apn);
-				break;
-			case OFONO_GPRS_AUTH_METHOD_PAP:
-				snprintf(buf + len, sizeof(buf) - len - 3,
-						",\"PAP:%s\"", ctx->apn);
-				break;
-			}
-			break;
-		default:
-			snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"",
-					ctx->apn);
-			break;
-		}
-	}
+	if (ctx->apn)
+		snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"",
+				ctx->apn);

 	if (g_at_chat_send(gcd->chat, buf, none_prefix,
 				at_cgdcont_cb, gc, NULL) > 0)
--- a/ofono/drivers/atmodem/gprs.c
+++ b/ofono/drivers/atmodem/gprs.c
@@ -282,44 +282,6 @@ static void telit_mode_notify(GAtResult *result, gpointer user_data)
 	ofono_gprs_bearer_notify(gprs, bearer);
 }

-static void ublox_ureg_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_gprs *gprs = user_data;
-	GAtResultIter iter;
-	gint state, bearer;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+UREG:"))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &state))
-		return;
-
-	switch (state) {
-	case 4:
-		bearer = 5;
-		break;
-	case 5:
-		bearer = 4;
-		break;
-	case 7:
-		/* XXX: reserved - assume none. */
-		bearer = 0;
-		break;
-	case 8:
-		bearer = 1;
-		break;
-	case 9:
-		bearer = 2;
-		break;
-	default:
-		bearer = state;
-	}
-
-	ofono_gprs_bearer_notify(gprs, bearer);
-}
-
 static void cpsb_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_gprs *gprs = user_data;
@@ -354,12 +316,6 @@ static void gprs_initialized(gboolean ok, GAtResult *result, gpointer user_data)
 		g_at_chat_register(gd->chat, "^MODE:", huawei_mode_notify,
 						FALSE, gprs, NULL);
 		break;
-	case OFONO_VENDOR_UBLOX:
-		g_at_chat_register(gd->chat, "+UREG:", ublox_ureg_notify,
-						FALSE, gprs, NULL);
-		g_at_chat_send(gd->chat, "AT+UREG=1", none_prefix,
-						NULL, NULL, NULL);
-		break;
 	case OFONO_VENDOR_TELIT:
 		g_at_chat_register(gd->chat, "#PSNT:", telit_mode_notify,
 						FALSE, gprs, NULL);
--- a/ofono/drivers/atmodem/network-registration.c
+++ b/ofono/drivers/atmodem/network-registration.c
@@ -838,39 +838,6 @@ static void telit_ciev_notify(GAtResult *result, gpointer user_data)
 	ofono_netreg_strength_notify(netreg, strength);
 }

-static void cinterion_ciev_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_netreg *netreg = user_data;
-	struct netreg_data *nd = ofono_netreg_get_data(netreg);
-	const char *signal_identifier = "rssi";
-	const char *ind_str;
-	int strength;
-	GAtResultIter iter;
-
-	g_at_result_iter_init(&iter, result);
-
-	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(signal_identifier, ind_str))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &strength))
-		return;
-
-	DBG("rssi %d", strength);
-
-	if (strength == nd->signal_invalid)
-		strength = -1;
-	else
-		strength = (strength * 100) / (nd->signal_max - nd->signal_min);
-
-	ofono_netreg_strength_notify(netreg, strength);
-}
-
 static void ctzv_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_netreg *netreg = user_data;
@@ -1948,27 +1915,6 @@ static void at_creg_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		g_at_chat_send(nd->chat, "AT*TLTS=1", none_prefix,
 						NULL, NULL, NULL);
 		break;
-	case OFONO_VENDOR_CINTERION:
-		/*
-		 * We can't set rssi bounds from Cinterion responses
-		 * so set them up to specified values here
-		 *
-		 * Cinterion rssi signal strength specified as:
-		 * 0      <= -112dBm
-		 * 1 - 4  signal strengh in 15 dB steps
-		 * 5      >= -51 dBm
-		 * 99     not known or undetectable
-		 */
-		nd->signal_min = 0;
-		nd->signal_max = 5;
-		nd->signal_invalid = 99;
-
-		/* Register for specific signal strength reports */
-		g_at_chat_send(nd->chat, "AT^SIND=\"rssi\",1", none_prefix,
-				NULL, NULL, NULL);
-		g_at_chat_register(nd->chat, "+CIEV:",
-				cinterion_ciev_notify, FALSE, netreg, NULL);
-		break;
 	case OFONO_VENDOR_NOKIA:
 	case OFONO_VENDOR_SAMSUNG:
 		/* Signal strength reporting via CIND is not supported */
--- a/ofono/drivers/atmodem/sim.c
+++ b/ofono/drivers/atmodem/sim.c
@@ -67,8 +67,6 @@ static const char *epin_prefix[] = { "*EPIN:", NULL };
 static const char *spic_prefix[] = { "+SPIC:", NULL };
 static const char *pct_prefix[] = { "#PCT:", NULL };
 static const char *pnnm_prefix[] = { "+PNNM:", NULL };
-static const char *qpinc_prefix[] = { "+QPINC:", NULL };
-static const char *upincnt_prefix[] = { "+UPINCNT:", NULL };
 static const char *none_prefix[] = { NULL };

 static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -827,7 +825,7 @@ static void at_cpinr_cb(gboolean ok, GAtResult *result, gpointer user_data)

 		for (i = 1; i < len; i++) {
 			if (!strcmp(name, at_sim_name[i].name)) {
-				retries[at_sim_name[i].type] = val;
+				retries[i] = val;
 				break;
 			}
 		}
@@ -969,90 +967,6 @@ error:
 	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
 }

-static void at_qpinc_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_sim_pin_retries_cb_t cb = cbd->cb;
-	const char *final = g_at_result_final_response(result);
-	GAtResultIter iter;
-	struct ofono_error error;
-	int retries[OFONO_SIM_PASSWORD_INVALID];
-	size_t i;
-
-	decode_at_error(&error, final);
-
-	if (!ok) {
-		cb(&error, NULL, cbd->data);
-		return;
-	}
-
-	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
-		retries[i] = -1;
-
-	g_at_result_iter_init(&iter, result);
-
-	while (g_at_result_iter_next(&iter, "+QPINC:")) {
-		const char *name;
-		int pin, puk;
-
-		if (!g_at_result_iter_next_string(&iter, &name))
-			continue;
-		if (!g_at_result_iter_next_number(&iter, &pin))
-			continue;
-		if (!g_at_result_iter_next_number(&iter, &puk))
-			continue;
-
-		if (!strcmp(name, "SC")) {
-			retries[OFONO_SIM_PASSWORD_SIM_PIN] = pin;
-			retries[OFONO_SIM_PASSWORD_SIM_PUK] = puk;
-		} else if (!strcmp(name, "P2")) {
-			retries[OFONO_SIM_PASSWORD_SIM_PIN2] = pin;
-			retries[OFONO_SIM_PASSWORD_SIM_PUK2] = puk;
-		}
-	}
-
-	cb(&error, retries, cbd->data);
-}
-
-static void upincnt_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_sim_pin_retries_cb_t cb = cbd->cb;
-	const char *final = g_at_result_final_response(result);
-	GAtResultIter iter;
-	struct ofono_error error;
-	int retries[OFONO_SIM_PASSWORD_INVALID];
-	size_t i;
-	static enum ofono_sim_password_type password_types[] = {
-		OFONO_SIM_PASSWORD_SIM_PIN,
-		OFONO_SIM_PASSWORD_SIM_PIN2,
-		OFONO_SIM_PASSWORD_SIM_PUK,
-		OFONO_SIM_PASSWORD_SIM_PUK2,
-	};
-
-	decode_at_error(&error, final);
-
-	if (!ok) {
-		cb(&error, NULL, cbd->data);
-		return;
-	}
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+UPINCNT:"))
-		goto error;
-
-	BUILD_PIN_RETRIES_ARRAY(password_types, ARRAY_SIZE(password_types),
-				retries);
-
-	cb(&error, retries, cbd->data);
-
-	return;
-
-error:
-	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
-}
-
 static void at_pin_retries_query(struct ofono_sim *sim,
 					ofono_sim_pin_retries_cb_t cb,
 					void *data)
@@ -1114,16 +1028,6 @@ static void at_pin_retries_query(struct ofono_sim *sim,
 					at_pnnm_cb, cbd, g_free) > 0)
 			return;
 		break;
-	case OFONO_VENDOR_QUECTEL:
-		if (g_at_chat_send(sd->chat, "AT+QPINC?", qpinc_prefix,
-					at_qpinc_cb, cbd, g_free) > 0)
-			return;
-		break;
-	case OFONO_VENDOR_UBLOX:
-		if (g_at_chat_send(sd->chat, "AT+UPINCNT", upincnt_prefix,
-					upincnt_cb, cbd, g_free) > 0)
-			return;
-		break;
 	default:
 		if (g_at_chat_send(sd->chat, "AT+CPINR", cpinr_prefixes,
 					at_cpinr_cb, cbd, g_free) > 0)
@@ -1350,7 +1254,6 @@ static void at_pin_send_cb(gboolean ok, GAtResult *result,
 	case OFONO_VENDOR_ALCATEL:
 	case OFONO_VENDOR_HUAWEI:
 	case OFONO_VENDOR_SIMCOM:
-	case OFONO_VENDOR_SIERRA:
 		/*
 		 * On ZTE modems, after pin is entered, SIM state is checked
 		 * by polling CPIN as their modem doesn't provide unsolicited
--- a/ofono/drivers/atmodem/vendor.h
+++ b/ofono/drivers/atmodem/vendor.h
@@ -42,8 +42,5 @@ enum ofono_vendor {
 	OFONO_VENDOR_SIMCOM_SIM900,
 	OFONO_VENDOR_ICERA,
 	OFONO_VENDOR_WAVECOM_Q2XXX,
-	OFONO_VENDOR_ALCATEL,
-	OFONO_VENDOR_QUECTEL,
-	OFONO_VENDOR_UBLOX,
-	OFONO_VENDOR_CINTERION,
+	OFONO_VENDOR_ALCATEL
 };
--- a/ofono/drivers/hfpmodem/handsfree.c
+++ b/ofono/drivers/hfpmodem/handsfree.c
@@ -45,12 +45,10 @@

 static const char *binp_prefix[] = { "+BINP:", NULL };
 static const char *bvra_prefix[] = { "+BVRA:", NULL };
-static const char *none_prefix[] = { NULL };

 struct hf_data {
 	GAtChat *chat;
 	unsigned int ag_features;
-	unsigned int ag_chld_features;
 	int battchg_index;
 	guint register_source;
 };
@@ -126,108 +124,6 @@ static void ciev_notify(GAtResult *result, gpointer user_data)
 	ofono_handsfree_battchg_notify(hf, value);
 }

-static void cnum_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_handsfree_cnum_query_cb_t cb = cbd->cb;
-	GAtResultIter iter;
-	struct ofono_phone_number *list = NULL;
-	int num = 0;
-	struct ofono_error error;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok)
-		goto out;
-
-	g_at_result_iter_init(&iter, result);
-
-	while (g_at_result_iter_next(&iter, "+CNUM:"))
-		num++;
-
-	if (num == 0)
-		goto out;
-
-	list = g_new0(struct ofono_phone_number, num);
-
-	g_at_result_iter_init(&iter, result);
-
-	for (num = 0; g_at_result_iter_next(&iter, "+CNUM:"); ) {
-		const char *number;
-		int service;
-		int type;
-
-		if (!g_at_result_iter_skip_next(&iter))
-			continue;
-
-		if (!g_at_result_iter_next_string(&iter, &number))
-			continue;
-
-		if (!g_at_result_iter_next_number(&iter, &type))
-			continue;
-
-		if (!g_at_result_iter_skip_next(&iter))
-			continue;
-
-		if (!g_at_result_iter_next_number(&iter, &service))
-			continue;
-
-		/* We are only interested in Voice services */
-		if (service != 4)
-			continue;
-
-		strncpy(list[num].number, number,
-				OFONO_MAX_PHONE_NUMBER_LENGTH);
-		list[num].number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
-		list[num].type = type;
-
-		DBG("cnum_notify:%s", list[num].number);
-		num++;
-	}
-
-out:
-	cb(&error, num, list, cbd->data);
-
-	g_free(list);
-
-}
-
-static void hfp_cnum_query(struct ofono_handsfree *hf,
-				ofono_handsfree_cnum_query_cb_t cb, void *data)
-{
-	struct hf_data *hd = ofono_handsfree_get_data(hf);
-	struct cb_data *cbd = cb_data_new(cb, data);
-
-	if (g_at_chat_send(hd->chat, "AT+CNUM", none_prefix,
-					cnum_query_cb, cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, -1, NULL, data);
-}
-
-static void bind_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_handsfree *hf = user_data;
-	int hf_indicator;
-	int active;
-	GAtResultIter iter;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+BIND:"))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &hf_indicator))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &active))
-		return;
-
-	ofono_handsfree_hf_indicator_active_notify(hf, hf_indicator, active);
-}
-
 static gboolean hfp_handsfree_register(gpointer user_data)
 {
 	struct ofono_handsfree *hf = user_data;
@@ -238,13 +134,11 @@ static gboolean hfp_handsfree_register(gpointer user_data)
 	g_at_chat_register(hd->chat, "+BSIR:", bsir_notify, FALSE, hf, NULL);
 	g_at_chat_register(hd->chat, "+BVRA:", bvra_notify, FALSE, hf, NULL);
 	g_at_chat_register(hd->chat, "+CIEV:", ciev_notify, FALSE, hf, NULL);
-	g_at_chat_register(hd->chat, "+BIND:", bind_notify, FALSE, hf, NULL);

 	if (hd->ag_features & HFP_AG_FEATURE_IN_BAND_RING_TONE)
 		ofono_handsfree_set_inband_ringing(hf, TRUE);

 	ofono_handsfree_set_ag_features(hf, hd->ag_features);
-	ofono_handsfree_set_ag_chld_features(hf, hd->ag_chld_features);
 	ofono_handsfree_register(hf);

 	return FALSE;
@@ -255,13 +149,11 @@ static int hfp_handsfree_probe(struct ofono_handsfree *hf,
 {
 	struct hfp_slc_info *info = data;
 	struct hf_data *hd;
-	unsigned int i;

 	DBG("");
 	hd = g_new0(struct hf_data, 1);
 	hd->chat = g_at_chat_clone(info->chat);
 	hd->ag_features = info->ag_features;
-	hd->ag_chld_features = info->ag_mpty_features;

 	ofono_handsfree_set_data(hf, hd);

@@ -269,14 +161,6 @@ static int hfp_handsfree_probe(struct ofono_handsfree *hf,
 	ofono_handsfree_battchg_notify(hf,
 					info->cind_val[HFP_INDICATOR_BATTCHG]);

-	ofono_handsfree_set_hf_indicators(hf, info->hf_indicators,
-						info->num_hf_indicators);
-
-	for (i = 0; i < info->num_hf_indicators; i++)
-		ofono_handsfree_hf_indicator_active_notify(hf,
-			info->hf_indicators[i],
-			info->hf_indicator_active_map & (1 << i));
-
 	hd->register_source = g_idle_add(hfp_handsfree_register, hf);

 	return 0;
@@ -383,27 +267,8 @@ static void hfp_disable_nrec(struct ofono_handsfree *hf,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	const char *buf = "AT+NREC=0";

-	if (g_at_chat_send(hd->chat, buf, none_prefix,
-				hf_generic_set_cb, cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, data);
-}
-
-static void hfp_hf_indicator(struct ofono_handsfree *hf,
-				unsigned short indicator, unsigned int value,
-				ofono_handsfree_cb_t cb, void *data)
-{
-	struct hf_data *hd = ofono_handsfree_get_data(hf);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	char buf[128];
-
-	snprintf(buf, sizeof(buf), "AT+BIEV=%u,%u", indicator, value);
-
-	if (g_at_chat_send(hd->chat, buf, none_prefix,
-				hf_generic_set_cb, cbd, g_free) > 0)
+	if (g_at_chat_send(hd->chat, buf, NULL, hf_generic_set_cb,
+							cbd, g_free) > 0)
 		return;

 	g_free(cbd);
@@ -415,11 +280,9 @@ static struct ofono_handsfree_driver driver = {
 	.name			= "hfpmodem",
 	.probe			= hfp_handsfree_probe,
 	.remove			= hfp_handsfree_remove,
-	.cnum_query		= hfp_cnum_query,
 	.request_phone_number	= hfp_request_phone_number,
 	.voice_recognition	= hfp_voice_recognition,
 	.disable_nrec		= hfp_disable_nrec,
-	.hf_indicator		= hfp_hf_indicator,
 };

 void hfp_handsfree_init(void)
--- a/ofono/drivers/hfpmodem/network-registration.c
+++ b/ofono/drivers/hfpmodem/network-registration.c
@@ -46,7 +46,6 @@

 static const char *cops_prefix[] = { "+COPS:", NULL };
 static const char *cind_prefix[] = { "+CIND:", NULL };
-static const char *none_prefix[] = { NULL };

 struct netreg_data {
 	GAtChat *chat;
@@ -264,7 +263,7 @@ static void hfp_current_operator(struct ofono_netreg *netreg,

 	cbd->user = netreg;

-	ok = g_at_chat_send(nd->chat, "AT+COPS=3,0", none_prefix,
+	ok = g_at_chat_send(nd->chat, "AT+COPS=3,0", NULL,
 			NULL, cbd, NULL);

 	if (ok)
--- a/ofono/drivers/hfpmodem/slc.c
+++ b/ofono/drivers/hfpmodem/slc.c
@@ -41,12 +41,10 @@
 #include "hfp.h"
 #include "slc.h"

-static const char *none_prefix[] = { NULL };
 static const char *brsf_prefix[] = { "+BRSF:", NULL };
 static const char *cind_prefix[] = { "+CIND:", NULL };
 static const char *cmer_prefix[] = { "+CMER:", NULL };
 static const char *chld_prefix[] = { "+CHLD:", NULL };
-static const char *bind_prefix[] = { "+BIND:", NULL };

 struct slc_establish_data {
 	gint ref_count;
@@ -78,14 +76,6 @@ void hfp_slc_info_init(struct hfp_slc_info *info, guint16 version)

 	info->hf_features |= HFP_HF_FEATURE_CODEC_NEGOTIATION;

-	if (version < HFP_VERSION_1_7)
-		goto done;
-
-	info->hf_features |= HFP_HF_FEATURE_HF_INDICATORS;
-	memset(info->hf_indicators, 0, sizeof(info->hf_indicators));
-	info->num_hf_indicators = 0;
-	info->hf_indicator_active_map = 0;
-
 done:
 	memset(info->cind_val, 0, sizeof(info->cind_val));
 	memset(info->cind_pos, 0, sizeof(info->cind_pos));
@@ -113,109 +103,10 @@ static void slc_established(struct slc_establish_data *sed)
 {
 	struct hfp_slc_info *info = sed->info;

-	g_at_chat_send(info->chat, "AT+CMEE=1", none_prefix,
-			NULL, NULL, NULL);
+	g_at_chat_send(info->chat, "AT+CMEE=1", NULL, NULL, NULL, NULL);
 	sed->connect_cb(sed->userdata);
 }

-static void bind_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct slc_establish_data *sed = user_data;
-	struct hfp_slc_info *info = sed->info;
-	GAtResultIter iter;
-	int hf_indicator;
-	int enabled;
-	unsigned int i;
-
-	if (!ok)
-		goto error;
-
-	g_at_result_iter_init(&iter, result);
-
-	while (g_at_result_iter_next(&iter, "+BIND:")) {
-		if (!g_at_result_iter_next_number(&iter, &hf_indicator))
-			goto error;
-
-		if (!g_at_result_iter_next_number(&iter, &enabled))
-			goto error;
-
-		ofono_info("AG wants indicator %d %s",
-				hf_indicator, enabled ? "enabled" : "disabled");
-
-		for (i = 0; i < info->num_hf_indicators; i++) {
-			if (info->hf_indicators[i] != hf_indicator)
-				continue;
-
-			info->hf_indicator_active_map |= enabled << i;
-		}
-
-		ofono_info("Active map: %02x", info->hf_indicator_active_map);
-	}
-
-	slc_established(sed);
-	return;
-
-error:
-	slc_failed(sed);
-}
-
-static void bind_support_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct slc_establish_data *sed = user_data;
-	struct hfp_slc_info *info = sed->info;
-	GAtResultIter iter;
-	int hf_indicator;
-
-	if (!ok)
-		goto error;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+BIND:"))
-		goto error;
-
-	if (!g_at_result_iter_open_list(&iter))
-		goto error;
-
-	while (g_at_result_iter_next_number(&iter, &hf_indicator)) {
-		if (info->num_hf_indicators >= 20)
-			goto error;
-
-		ofono_info("AG supports the following HF indicator: %d",
-				hf_indicator);
-
-		info->hf_indicators[info->num_hf_indicators] = hf_indicator;
-		info->num_hf_indicators += 1;
-	}
-
-	if (!g_at_result_iter_close_list(&iter))
-		goto error;
-
-	slc_establish_data_ref(sed);
-	g_at_chat_send(info->chat, "AT+BIND?", bind_prefix,
-				bind_query_cb, sed, slc_establish_data_unref);
-
-	return;
-
-error:
-	slc_failed(sed);
-}
-
-static void bind_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct slc_establish_data *sed = user_data;
-	struct hfp_slc_info *info = sed->info;
-
-	if (!ok) {
-		slc_failed(sed);
-		return;
-	}
-
-	slc_establish_data_ref(sed);
-	g_at_chat_send(info->chat, "AT+BIND=?", bind_prefix,
-				bind_support_cb, sed, slc_establish_data_unref);
-}
-
 static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct slc_establish_data *sed = user_data;
@@ -237,19 +128,19 @@ static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)

 	while (g_at_result_iter_next_unquoted_string(&iter, &str)) {
 		if (!strcmp(str, "0"))
-			ag_mpty_feature |= HFP_AG_CHLD_0;
+			ag_mpty_feature |= AG_CHLD_0;
 		else if (!strcmp(str, "1"))
-			ag_mpty_feature |= HFP_AG_CHLD_1;
+			ag_mpty_feature |= AG_CHLD_1;
 		else if (!strcmp(str, "1x"))
-			ag_mpty_feature |= HFP_AG_CHLD_1x;
+			ag_mpty_feature |= AG_CHLD_1x;
 		else if (!strcmp(str, "2"))
-			ag_mpty_feature |= HFP_AG_CHLD_2;
+			ag_mpty_feature |= AG_CHLD_2;
 		else if (!strcmp(str, "2x"))
-			ag_mpty_feature |= HFP_AG_CHLD_2x;
+			ag_mpty_feature |= AG_CHLD_2x;
 		else if (!strcmp(str, "3"))
-			ag_mpty_feature |= HFP_AG_CHLD_3;
+			ag_mpty_feature |= AG_CHLD_3;
 		else if (!strcmp(str, "4"))
-			ag_mpty_feature |= HFP_AG_CHLD_4;
+			ag_mpty_feature |= AG_CHLD_4;
 	}

 	if (!g_at_result_iter_close_list(&iter))
@@ -257,14 +148,7 @@ static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)

 	info->ag_mpty_features = ag_mpty_feature;

-	if ((info->ag_features & HFP_AG_FEATURE_HF_INDICATORS) &&
-			(info->hf_features & HFP_HF_FEATURE_HF_INDICATORS)) {
-		slc_establish_data_ref(sed);
-		g_at_chat_send(info->chat, "AT+BIND=1", none_prefix,
-				bind_set_cb, sed, slc_establish_data_unref);
-	} else
-		slc_established(sed);
-
+	slc_established(sed);
 	return;

 error:
@@ -435,8 +319,8 @@ static void brsf_cb(gboolean ok, GAtResult *result, gpointer user_data)
 			sprintf(str, "AT+BAC=%d", HFP_CODEC_CVSD);

 		slc_establish_data_ref(sed);
-		g_at_chat_send(info->chat, str, none_prefix, bac_cb,
-				sed, slc_establish_data_unref);
+		g_at_chat_send(info->chat, str, NULL, bac_cb, sed,
+						slc_establish_data_unref);
 		return;
 	}

--- a/ofono/drivers/hfpmodem/slc.h
+++ b/ofono/drivers/hfpmodem/slc.h
@@ -19,6 +19,14 @@
 *
 */

+#define AG_CHLD_0	0x01
+#define AG_CHLD_1	0x02
+#define AG_CHLD_1x	0x04
+#define AG_CHLD_2	0x08
+#define AG_CHLD_2x	0x10
+#define AG_CHLD_3	0x20
+#define AG_CHLD_4	0x40
+
 enum hfp_indicator {
 	HFP_INDICATOR_SERVICE = 0,
 	HFP_INDICATOR_CALL,
@@ -39,9 +47,6 @@ struct hfp_slc_info {
 	unsigned int hf_features;
 	unsigned char cind_pos[HFP_INDICATOR_LAST];
 	unsigned int cind_val[HFP_INDICATOR_LAST];
-	unsigned short hf_indicators[20];
-	unsigned char num_hf_indicators;
-	unsigned int hf_indicator_active_map;
 };

 void hfp_slc_info_init(struct hfp_slc_info *info, guint16 version);
--- a/ofono/drivers/hfpmodem/voicecall.c
+++ b/ofono/drivers/hfpmodem/voicecall.c
@@ -37,7 +37,6 @@
 #include <ofono/voicecall.h>

 #include "common.h"
-#include "hfp.h"

 #include "hfpmodem.h"
 #include "slc.h"
@@ -46,7 +45,6 @@
 #define POLL_CLCC_DELAY 50
 #define EXPECT_RELEASE_DELAY 50
 #define CLIP_TIMEOUT 500
-#define EXPECT_RING_DELAY 200

 static const char *none_prefix[] = { NULL };
 static const char *clcc_prefix[] = { "+CLCC:", NULL };
@@ -295,7 +293,7 @@ static void clcc_poll_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	 * we won't get indicator update if any of them is released by CHLD=1x.
 	 * So we have to poll it.
 	 */
-	if ((num_active > 1 || num_held > 1) && !vd->clcc_source)
+	if (num_active > 1 || num_held > 1)
 		vd->clcc_source = g_timeout_add(POLL_CLCC_INTERVAL, poll_clcc,
 							vc);
 }
@@ -333,10 +331,6 @@ static void generic_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		}
 	}

-	if (!ok && vd->calls)
-		g_at_chat_send(vd->chat, "AT+CLCC", clcc_prefix,
-					clcc_poll_cb, req->vc, NULL);
-
 	req->cb(&error, req->data);
 }

@@ -453,7 +447,7 @@ static void hfp_hold_all_active(struct ofono_voicecall *vc,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);

-	if (vd->ag_mpty_features & HFP_AG_CHLD_2) {
+	if (vd->ag_mpty_features & AG_CHLD_2) {
 		hfp_template("AT+CHLD=2", vc, generic_cb, 0, cb, data);
 		return;
 	}
@@ -467,7 +461,7 @@ static void hfp_release_all_held(struct ofono_voicecall *vc,
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	unsigned int held_status = 1 << CALL_STATUS_HELD;

-	if (vd->ag_mpty_features & HFP_AG_CHLD_0) {
+	if (vd->ag_mpty_features & AG_CHLD_0) {
 		hfp_template("AT+CHLD=0", vc, generic_cb, held_status,
 				cb, data);
 		return;
@@ -482,7 +476,7 @@ static void hfp_set_udub(struct ofono_voicecall *vc,
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	unsigned int incoming_or_waiting = 1 << CALL_STATUS_WAITING;

-	if (vd->ag_mpty_features & HFP_AG_CHLD_0) {
+	if (vd->ag_mpty_features & AG_CHLD_0) {
 		hfp_template("AT+CHLD=0", vc, generic_cb, incoming_or_waiting,
 				cb, data);
 		return;
@@ -504,19 +498,6 @@ static gboolean expect_release(gpointer user_data)
 	return FALSE;
 }

-static gboolean expect_ring(gpointer user_data)
-{
-	struct ofono_voicecall *vc = user_data;
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-
-	g_at_chat_send(vd->chat, "AT+CLCC", clcc_prefix,
-				clcc_poll_cb, vc, NULL);
-
-	vd->clip_source = 0;
-
-	return FALSE;
-}
-
 static void release_all_active_cb(gboolean ok, GAtResult *result,
 							gpointer user_data)
 {
@@ -547,7 +528,7 @@ static void hfp_release_all_active(struct ofono_voicecall *vc,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);

-	if (vd->ag_mpty_features & HFP_AG_CHLD_1) {
+	if (vd->ag_mpty_features & AG_CHLD_1) {
 		hfp_template("AT+CHLD=1", vc, release_all_active_cb, 0x1, cb,
 									data);
 		return;
@@ -578,7 +559,7 @@ static void hfp_release_specific(struct ofono_voicecall *vc, int id,
 	struct release_id_req *req = NULL;
 	char buf[32];

-	if (!(vd->ag_mpty_features & HFP_AG_CHLD_1x))
+	if (!(vd->ag_mpty_features & AG_CHLD_1x))
 		goto error;

 	req = g_try_new0(struct release_id_req, 1);
@@ -609,7 +590,7 @@ static void hfp_private_chat(struct ofono_voicecall *vc, int id,
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	char buf[32];

-	if (vd->ag_mpty_features & HFP_AG_CHLD_2x) {
+	if (vd->ag_mpty_features & AG_CHLD_2x) {
 		snprintf(buf, sizeof(buf), "AT+CHLD=2%d", id);

 		hfp_template(buf, vc, generic_cb, 0, cb, data);
@@ -625,7 +606,7 @@ static void hfp_create_multiparty(struct ofono_voicecall *vc,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);

-	if (vd->ag_mpty_features & HFP_AG_CHLD_3) {
+	if (vd->ag_mpty_features & AG_CHLD_3) {
 		hfp_template("AT+CHLD=3", vc, generic_cb, 0, cb, data);

 		return;
@@ -644,7 +625,7 @@ static void hfp_transfer(struct ofono_voicecall *vc,
 	 */
 	unsigned int transfer = 0x1 | 0x2 | 0x4 | 0x8;

-	if (vd->ag_mpty_features & HFP_AG_CHLD_4) {
+	if (vd->ag_mpty_features & AG_CHLD_4) {
 		hfp_template("AT+CHLD=4", vc, generic_cb, transfer, cb, data);

 		return;
@@ -658,10 +639,8 @@ static void hfp_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	struct change_state_req *req = g_try_new0(struct change_state_req, 1);
-	int len = strlen(dtmf);
 	char *buf;
 	int s;
-	int i;

 	if (req == NULL)
 		goto error;
@@ -671,15 +650,12 @@ static void hfp_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
 	req->data = data;
 	req->affected_types = 0;

-	/* strlen("AT") + (n-1) * strlen("+VTS=T;") + strlen(+VTS=T) + null */
-	buf = g_try_new(char, len * 7 + 2);
+	/* strlen("AT+VTS=) = 7 + NULL */
+	buf = g_try_new(char, strlen(dtmf) + 8);
 	if (buf == NULL)
 		goto error;

-	s = sprintf(buf, "AT+VTS=%c", dtmf[0]);
-
-	for (i = 1; i < len; i++)
-		s += sprintf(buf + s, ";+VTS=%c", dtmf[i]);
+	sprintf(buf, "AT+VTS=%s", dtmf);

 	s = g_at_chat_send(vd->chat, buf, none_prefix,
 				generic_cb, req, g_free);
@@ -715,16 +691,6 @@ static void ccwa_notify(GAtResult *result, gpointer user_data)
 				at_util_call_compare_by_status))
 		return;

-	/* some phones may send extra CCWA after active call is ended
-	 * this would trigger creation of second call in state 'WAITING'
-	 * as our previous WAITING call has been promoted to INCOMING
-	 */
-	if (g_slist_find_custom(vd->calls,
-				GINT_TO_POINTER(CALL_STATUS_INCOMING),
-				at_util_call_compare_by_status))
-		return;
-
-
 	g_at_result_iter_init(&iter, result);

 	if (!g_at_result_iter_next(&iter, "+CCWA:"))
@@ -785,11 +751,6 @@ static void ring_notify(GAtResult *result, gpointer user_data)
 	struct ofono_call *call;
 	GSList *waiting;

-	if (vd->clip_source) {
-		g_source_remove(vd->clip_source);
-		vd->clip_source = 0;
-	}
-
 	/* RING can repeat, ignore if we already have an incoming call */
 	if (g_slist_find_custom(vd->calls,
 				GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -1014,15 +975,7 @@ static void ciev_callsetup_notify(struct ofono_voicecall *vc,
 		break;

 	case 1:
-		/*
-		 * Handled in RING/CCWA most of the time, however sometimes
-		 * the call is answered before the RING unsolicited
-		 * notification has a chance to be generated on the device.
-		 * In this case, we use a failsafe CLCC poll in expect_ring
-		 * callback.
-		 * */
-		vd->clip_source = g_timeout_add(EXPECT_RING_DELAY,
-							expect_ring, vc);
+		/* Handled in RING/CCWA */
 		break;

 	case 2:
@@ -1148,10 +1101,6 @@ static void hfp_clcc_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	struct ofono_voicecall *vc = user_data;
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	unsigned int mpty_ids;
-	GSList *n;
-	struct ofono_call *nc;
-	unsigned int num_active = 0;
-	unsigned int num_held = 0;

 	if (!ok)
 		return;
@@ -1160,22 +1109,6 @@ static void hfp_clcc_cb(gboolean ok, GAtResult *result, gpointer user_data)

 	g_slist_foreach(vd->calls, voicecall_notify, vc);
 	ofono_voicecall_mpty_hint(vc, mpty_ids);
-
-	n = vd->calls;
-
-	while (n) {
-		nc = n->data;
-
-		if (nc->status == CALL_STATUS_ACTIVE)
-			num_active++;
-		else if (nc->status == CALL_STATUS_HELD)
-			num_held++;
-
-		n = n->next;
-	}
-
-	if ((num_active > 1 || num_held > 1) && !vd->clcc_source)
-		vd->clcc_source = g_timeout_add(POLL_CLCC_INTERVAL, poll_clcc, vc);
 }

 static void hfp_voicecall_initialized(gboolean ok, GAtResult *result,
@@ -1217,8 +1150,8 @@ static int hfp_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,

 	ofono_voicecall_set_data(vc, vd);

-	g_at_chat_send(vd->chat, "AT+CLIP=1", none_prefix, NULL, NULL, NULL);
-	g_at_chat_send(vd->chat, "AT+CCWA=1", none_prefix,
+	g_at_chat_send(vd->chat, "AT+CLIP=1", NULL, NULL, NULL, NULL);
+	g_at_chat_send(vd->chat, "AT+CCWA=1", NULL,
 				hfp_voicecall_initialized, vc, NULL);
 	return 0;
 }
--- a/ofono/drivers/isimodem/cbs.c
+++ b/ofono/drivers/isimodem/cbs.c
@@ -134,9 +134,7 @@ static void routing_resp_cb(const GIsiMessage *msg, void *data)
 	struct cbs_data *cd = ofono_cbs_get_data(cbs);

 	if (!check_resp(msg, SMS_GSM_CB_ROUTING_RESP)) {
-		/* on shutdown, cbs is already being removed */
-		if (g_isi_msg_error(msg) != -ESHUTDOWN)
-			ofono_cbs_remove(cbs);
+		ofono_cbs_remove(cbs);
 		return;
 	}

--- a/ofono/drivers/ril/ril_call_barring.c
+++ b/ofono/drivers/ril/ril_call_barring.c
@@ -1,284 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2015 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.
- */
-
-#include "ril_plugin.h"
-#include "ril_util.h"
-#include "ril_log.h"
-#include "ril_constants.h"
-
-#include "common.h"
-
-/* See 3GPP 27.007 7.4 for possible values */
-#define RIL_MAX_SERVICE_LENGTH 3
-
-/*
- * ril.h does not state that string count must be given, but that is
- * still expected by the modem
- */
-#define RIL_QUERY_STRING_COUNT 4
-#define RIL_SET_STRING_COUNT 5
-#define RIL_SET_PW_STRING_COUNT 3
-
-struct ril_call_barring {
-	GRilIoQueue *q;
-	guint timer_id;
-};
-
-struct ril_call_barring_cbd {
-	struct ril_call_barring *bd;
-	union _ofono_call_barring_cb {
-		ofono_call_barring_query_cb_t query;
-		ofono_call_barring_set_cb_t set;
-		gpointer ptr;
-	} cb;
-	gpointer data;
-};
-
-#define ril_call_barring_cbd_free g_free
-
-static inline struct ril_call_barring *ril_call_barring_get_data(
-					struct ofono_call_barring *b)
-{
-	return ofono_call_barring_get_data(b);
-}
-
-static struct ril_call_barring_cbd *ril_call_barring_cbd_new(
-			struct ril_call_barring *bd, void *cb, void *data)
-{
-	struct ril_call_barring_cbd *cbd;
-
-	cbd = g_new0(struct ril_call_barring_cbd, 1);
-	cbd->bd = bd;
-	cbd->cb.ptr = cb;
-	cbd->data = data;
-	return cbd;
-}
-
-static inline void ril_call_barring_submit_request(struct ril_call_barring *bd,
-	GRilIoRequest* req, guint code, GRilIoChannelResponseFunc response,
-							void *cb, void *data)
-{
-	grilio_queue_send_request_full(bd->q, req, code, response,
-				ril_call_barring_cbd_free,
-				ril_call_barring_cbd_new(bd, cb, data));
-}
-
-static void ril_call_barring_query_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_call_barring_cbd *cbd = user_data;
-	ofono_call_barring_query_cb_t cb = cbd->cb.query;
-
-	if (status == RIL_E_SUCCESS) {
-		int bearer_class = 0;
-		GRilIoParser rilp;
-
-		/*
-		 * Services for which the specified barring facility is active.
-		 * "0" means "disabled for all, -1 if unknown"
-		 */
-		grilio_parser_init(&rilp, data, len);
-		grilio_parser_get_int32(&rilp, NULL); /* count */
-		grilio_parser_get_int32(&rilp, &bearer_class);
-		DBG("Active services: %d", bearer_class);
-		cb(ril_error_ok(&error), bearer_class, cbd->data);
-	} else {
-		ofono_error("Call Barring query error %d", status);
-		cb(ril_error_failure(&error), 0, cbd->data);
-	}
-}
-
-static void ril_call_barring_query(struct ofono_call_barring *b,
-			const char *lock, int cls,
-			ofono_call_barring_query_cb_t cb, void *data)
-{
-	struct ril_call_barring *bd = ofono_call_barring_get_data(b);
-	char cls_textual[RIL_MAX_SERVICE_LENGTH];
-	GRilIoRequest *req = grilio_request_new();
-
-	DBG("lock: %s, services to query: %d", lock, cls);
-
-	/*
-	 * RIL modems do not support 7 as default bearer class. According to
-	 * the 22.030 Annex C: When service code is not given it corresponds to
-	 * "All tele and bearer services"
-	 */
-	if (cls == BEARER_CLASS_DEFAULT) {
-		cls = SERVICE_CLASS_NONE;
-	}
-
-	sprintf(cls_textual, "%d", cls);
-
-	/*
-	 * See 3GPP 27.007 7.4 for parameter descriptions.
-	 * According to ril.h password should be empty string "" when not
-	 * needed, but in reality we only need to give string length as 0
-	 */
-	grilio_request_append_int32(req, RIL_QUERY_STRING_COUNT);
-	grilio_request_append_utf8(req, lock);    /* Facility code */
-	grilio_request_append_int32(req, 0);      /* Password length */
-	grilio_request_append_utf8(req, cls_textual);
-	grilio_request_append_utf8(req, NULL);    /* AID (not yet supported) */
-
-	ril_call_barring_submit_request(bd, req,
-				RIL_REQUEST_QUERY_FACILITY_LOCK,
-				ril_call_barring_query_cb, cb, data);
-	grilio_request_unref(req);
-}
-
-static void ril_call_barring_set_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_call_barring_cbd *cbd = user_data;
-	ofono_call_barring_set_cb_t cb = cbd->cb.set;
-
-	if (status == RIL_E_SUCCESS) {
-		cb(ril_error_ok(&error), cbd->data);
-	} else {
-		ofono_error("Call Barring Set error %d", status);
-		cb(ril_error_failure(&error), cbd->data);
-	}
-}
-
-static void ril_call_barring_set(struct ofono_call_barring *b,
-		const char *lock, int enable, const char *passwd, int cls,
-		ofono_call_barring_set_cb_t cb, void *data)
-{
-	struct ril_call_barring *bd = ofono_call_barring_get_data(b);
-	char cls_textual[RIL_MAX_SERVICE_LENGTH];
-	GRilIoRequest *req = grilio_request_new();
-
-	DBG("lock: %s, enable: %i, bearer class: %i", lock, enable, cls);
-
-	/*
-	 * RIL modem does not support 7 as default bearer class. According to
-	 * the 22.030 Annex C: When service code is not given it corresponds to
-	 * "All tele and bearer services"
-	 */
-	if (cls == BEARER_CLASS_DEFAULT) {
-		cls = SERVICE_CLASS_NONE;
-	}
-
-	sprintf(cls_textual, "%d", cls);
-
-	/* See 3GPP 27.007 7.4 for parameter descriptions */
-	grilio_request_append_int32(req, RIL_SET_STRING_COUNT);
-	grilio_request_append_utf8(req, lock);  /* Facility code */
-	grilio_request_append_utf8(req, enable ?
-					RIL_FACILITY_LOCK :
-					RIL_FACILITY_UNLOCK);
-	grilio_request_append_utf8(req, passwd);
-	grilio_request_append_utf8(req, cls_textual);
-	grilio_request_append_utf8(req, NULL);  /* AID (not yet supported) */
-
-	ril_call_barring_submit_request(bd, req,
-				RIL_REQUEST_SET_FACILITY_LOCK,
-				ril_call_barring_set_cb, cb, data);
-	grilio_request_unref(req);
-}
-
-static void ril_call_barring_set_passwd_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_call_barring_cbd *cbd = user_data;
-	ofono_call_barring_set_cb_t cb = cbd->cb.set;
-
-	if (status == RIL_E_SUCCESS) {
-		cb(ril_error_ok(&error), cbd->data);
-	} else {
-		ofono_error("Call Barring Set PW error %d", status);
-		cb(ril_error_failure(&error), cbd->data);
-	}
-}
-
-static void ril_call_barring_set_passwd(struct ofono_call_barring *b,
-		const char *lock, const char *old_passwd,
-		const char *new_passwd, ofono_call_barring_set_cb_t cb,
-		void *data)
-{
-	struct ril_call_barring *bd = ofono_call_barring_get_data(b);
-	GRilIoRequest *req = grilio_request_new();
-
-	DBG("");
-	grilio_request_append_int32(req, RIL_SET_PW_STRING_COUNT);
-	grilio_request_append_utf8(req, lock);            /* Facility code */
-	grilio_request_append_utf8(req, old_passwd);
-	grilio_request_append_utf8(req, new_passwd);
-
-	ril_call_barring_submit_request(bd, req,
-			RIL_REQUEST_CHANGE_BARRING_PASSWORD,
-			ril_call_barring_set_passwd_cb, cb, data);
-	grilio_request_unref(req);
-}
-
-static gboolean ril_call_barring_register(gpointer user_data)
-{
-	struct ofono_call_barring *b = user_data;
-	struct ril_call_barring *bd = ril_call_barring_get_data(b);
-
-	GASSERT(bd->timer_id);
-	bd->timer_id = 0;
-	ofono_call_barring_register(b);
-	return FALSE;
-}
-
-static int ril_call_barring_probe(struct ofono_call_barring *b,
-					unsigned int vendor, void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_call_barring *bd = g_new0(struct ril_call_barring, 1);
-
-	DBG("");
-	bd->q = grilio_queue_new(ril_modem_io(modem));
-	bd->timer_id = g_idle_add(ril_call_barring_register, b);
-	ofono_call_barring_set_data(b, bd);
-	return 0;
-}
-
-static void ril_call_barring_remove(struct ofono_call_barring *b)
-{
-	struct ril_call_barring *bd = ril_call_barring_get_data(b);
-
-	DBG("");
-	ofono_call_barring_set_data(b, NULL);
-
-	if (bd->timer_id > 0) {
-		g_source_remove(bd->timer_id);
-	}
-
-	grilio_queue_cancel_all(bd->q, FALSE);
-	grilio_queue_unref(bd->q);
-	g_free(bd);
-}
-
-const struct ofono_call_barring_driver ril_call_barring_driver = {
-	.name           = RILMODEM_DRIVER,
-	.probe          = ril_call_barring_probe,
-	.remove         = ril_call_barring_remove,
-	.query          = ril_call_barring_query,
-	.set            = ril_call_barring_set,
-	.set_passwd	= ril_call_barring_set_passwd
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_call_forward.c
+++ b/ofono/drivers/ril/ril_call_forward.c
@@ -1,315 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2015 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.
- */
-
-#include "ril_plugin.h"
-#include "ril_util.h"
-#include "ril_log.h"
-#include "ril_constants.h"
-
-#include "common.h"
-
-struct ril_call_forward {
-	GRilIoQueue *q;
-	guint timer_id;
-};
-
-enum ril_call_forward_cmd {
-	CF_ACTION_DISABLE,
-	CF_ACTION_ENABLE,
-	CF_ACTION_UNUSED,
-	CF_ACTION_REGISTRATION,
-	CF_ACTION_ERASURE
-};
-
-struct ril_call_forward_cbd {
-	struct ril_call_forward *fd;
-	union _ofono_call_forward_cb {
-		ofono_call_forwarding_query_cb_t query;
-		ofono_call_forwarding_set_cb_t set;
-		gpointer ptr;
-	} cb;
-	gpointer data;
-};
-
-#define ril_call_forward_cbd_free g_free
-
-static inline struct ril_call_forward *ril_call_forward_get_data(
-					struct ofono_call_forwarding *cf)
-{
-	return ofono_call_forwarding_get_data(cf);
-}
-
-static struct ril_call_forward_cbd *ril_call_forward_cbd_new(void *cb,
-								void *data)
-{
-	struct ril_call_forward_cbd *cbd;
-
-	cbd = g_new0(struct ril_call_forward_cbd, 1);
-	cbd->cb.ptr = cb;
-	cbd->data = data;
-	return cbd;
-}
-
-static inline void ril_call_forward_submit_request(struct ril_call_forward *fd,
-	GRilIoRequest* req, guint code, GRilIoChannelResponseFunc response,
-							void *cb, void *data)
-{
-	grilio_queue_send_request_full(fd->q, req, code, response,
-				ril_call_forward_cbd_free,
-				ril_call_forward_cbd_new(cb, data));
-}
-
-static void ril_forward_set_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_call_forward_cbd *cbd = user_data;
-	ofono_call_forwarding_set_cb_t cb = cbd->cb.set;
-
-	if (status == RIL_E_SUCCESS) {
-		cb(ril_error_ok(&error), cbd->data);
-	} else {
-		ofono_error("CF setting failed");
-		cb(ril_error_failure(&error), cbd->data);
-	}
-}
-
-static void ril_call_forward_registration(struct ofono_call_forwarding *cf,
-		int type, int cls, const struct ofono_phone_number *number,
-		int time, ofono_call_forwarding_set_cb_t cb, void *data)
-{
-	struct ril_call_forward *fd = ril_call_forward_get_data(cf);
-	GRilIoRequest *req = grilio_request_new();
-
-	ofono_info("cf registration");
-	grilio_request_append_int32(req, CF_ACTION_REGISTRATION);
-	grilio_request_append_int32(req, type);
-
-	/*
-	 * Modem seems to respond with error to all queries
-	 * or settings made with bearer class
-	 * BEARER_CLASS_DEFAULT. Design decision: If given
-	 * class is BEARER_CLASS_DEFAULT let's map it to
-	 * BEARER_CLASS_VOICE as per RIL design.
-	 */
-	if (cls == BEARER_CLASS_DEFAULT) {
-		cls = BEARER_CLASS_VOICE;
-	}
-
-	grilio_request_append_int32(req, cls);
-	grilio_request_append_int32(req, number->type);
-	grilio_request_append_utf8(req, number->number);
-	grilio_request_append_int32(req, time);
-
-	ril_call_forward_submit_request(fd, req, RIL_REQUEST_SET_CALL_FORWARD,
-					ril_forward_set_cb, cb, data);
-	grilio_request_unref(req);
-}
-
-static void ril_call_forward_send_cmd(struct ofono_call_forwarding *cf,
-		int type, int cls, ofono_call_forwarding_set_cb_t cb,
-		void *data, int action)
-{
-	struct ril_call_forward *fd = ril_call_forward_get_data(cf);
-	GRilIoRequest *req = grilio_request_new();
-
-	grilio_request_append_int32(req, action);
-	grilio_request_append_int32(req, type);
-
-	/*
-	 * Modem seems to respond with error to all queries
-	 * or settings made with bearer class
-	 * BEARER_CLASS_DEFAULT. Design decision: If given
-	 * class is BEARER_CLASS_DEFAULT let's map it to
-	 * BEARER_CLASS_VOICE as per RIL design.
-	 */
-	if (cls == BEARER_CLASS_DEFAULT) {
-		cls = BEARER_CLASS_VOICE;
-	}
-
-	grilio_request_append_int32(req, cls);          /* Service class */
-
-	/* Following 3 values have no real meaning in erasure
-	 * but apparently RIL expects them so fields need to
-	 * be filled. Otherwise there is no response
-	 */
-	grilio_request_append_int32(req, 0x81);		/* TOA unknown */
-	grilio_request_append_utf8(req, "1234567890");
-	grilio_request_append_int32(req, 60);
-
-	ril_call_forward_submit_request(fd, req, RIL_REQUEST_SET_CALL_FORWARD,
-					ril_forward_set_cb, cb, data);
-	grilio_request_unref(req);
-}
-
-static void ril_call_forward_erasure(struct ofono_call_forwarding *cf,
-	int type, int cls, ofono_call_forwarding_set_cb_t cb, void *data)
-{
-	ofono_info("CF_ACTION_ERASURE");
-	ril_call_forward_send_cmd(cf, type, cls, cb, data, CF_ACTION_ERASURE);
-}
-
-static void ril_call_forward_deactivate(struct ofono_call_forwarding *cf,
-	int type, int cls, ofono_call_forwarding_set_cb_t cb, void *data)
-{
-	ofono_info("CF_ACTION_DISABLE");
-	ril_call_forward_send_cmd(cf, type, cls, cb, data, CF_ACTION_DISABLE);
-}
-
-static void ril_call_forward_activate(struct ofono_call_forwarding *cf,
-	int type, int cls, ofono_call_forwarding_set_cb_t cb, void *data)
-{
-	ofono_info("CF_ACTION_ENABLE");
-	ril_call_forward_send_cmd(cf, type, cls, cb, data, CF_ACTION_ENABLE);
-}
-
-static void ril_call_forward_query_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_call_forward_cbd *cbd = user_data;
-	ofono_call_forwarding_query_cb_t cb = cbd->cb.query;
-
-	if (status == RIL_E_SUCCESS) {
-		struct ofono_call_forwarding_condition *list = NULL;
-		GRilIoParser rilp;
-		int count = 0;
-		int i;
-
-		grilio_parser_init(&rilp, data, len);
-		grilio_parser_get_int32(&rilp, &count);
-
-		list = g_new0(struct ofono_call_forwarding_condition, count);
-		for (i = 0; i < count; i++) {
-			struct ofono_call_forwarding_condition *fw = list + i;
-			char *str;
-
-			grilio_parser_get_int32(&rilp, &fw->status);
-			grilio_parser_get_int32(&rilp, NULL);
-			grilio_parser_get_int32(&rilp, &fw->cls);
-			grilio_parser_get_int32(&rilp, &fw->phone_number.type);
-			str = grilio_parser_get_utf8(&rilp);
-			if (str) {
-				strncpy(fw->phone_number.number, str,
-					OFONO_MAX_PHONE_NUMBER_LENGTH);
-				fw->phone_number.number[
-					OFONO_MAX_PHONE_NUMBER_LENGTH] = 0;
-				g_free(str);
-			}
-			grilio_parser_get_int32(&rilp, &fw->time);
-		}
-
-		cb(ril_error_ok(&error), count, list, cbd->data);
-		g_free(list);
-	} else {
-		ofono_error("CF query failed");
-		cb(ril_error_failure(&error), 0, NULL, cbd->data);
-	}
-}
-
-static void ril_call_forward_query(struct ofono_call_forwarding *cf, int type,
-		int cls, ofono_call_forwarding_query_cb_t cb, void *data)
-{
-	struct ril_call_forward *fd = ril_call_forward_get_data(cf);
-	GRilIoRequest *req = grilio_request_new();
-
-	ofono_info("cf query");
-	grilio_request_append_int32(req, 2);
-	grilio_request_append_int32(req, type);
-
-	/*
-	 * Modem seems to respond with error to all queries
-	 * or settings made with bearer class
-	 * BEARER_CLASS_DEFAULT. Design decision: If given
-	 * class is BEARER_CLASS_DEFAULT let's map it to
-	 * SERVICE_CLASS_NONE as per RIL design.
-	 */
-	if (cls == BEARER_CLASS_DEFAULT) {
-		cls = SERVICE_CLASS_NONE;
-	}
-
-	grilio_request_append_int32(req, cls);
-
-	/* Following 3 values have no real meaning in query
-	 * but apparently RIL expects them so fields need to
-	 * be filled. Otherwise there is no response
-	 */
-	grilio_request_append_int32(req, 0x81);	        /* TOA unknown */
-	grilio_request_append_utf8(req, "1234567890");
-	grilio_request_append_int32(req, 0);
-
-	ril_call_forward_submit_request(fd, req,
-					RIL_REQUEST_QUERY_CALL_FORWARD_STATUS,
-					ril_call_forward_query_cb, cb, data);
-	grilio_request_unref(req);
-}
-
-static gboolean ril_call_forward_register(gpointer user_data)
-{
-	struct ofono_call_forwarding *cf = user_data;
-	struct ril_call_forward *fd = ril_call_forward_get_data(cf);
-
-	fd->timer_id = 0;
-	ofono_call_forwarding_register(cf);
-	return FALSE;
-}
-
-static int ril_call_forward_probe(struct ofono_call_forwarding *cf,
-					unsigned int vendor, void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_call_forward *fd = g_try_new0(struct ril_call_forward, 1);
-
-	DBG("");
-	fd->q = grilio_queue_new(ril_modem_io(modem));
-	fd->timer_id = g_idle_add(ril_call_forward_register, cf);
-	ofono_call_forwarding_set_data(cf, fd);
-	return 0;
-}
-
-static void ril_call_forward_remove(struct ofono_call_forwarding *cf)
-{
-	struct ril_call_forward *fd = ril_call_forward_get_data(cf);
-
-	DBG("");
-	ofono_call_forwarding_set_data(cf, NULL);
-
-	if (fd->timer_id > 0) {
-		g_source_remove(fd->timer_id);
-	}
-
-	grilio_queue_cancel_all(fd->q, FALSE);
-	grilio_queue_unref(fd->q);
-	g_free(fd);
-}
-
-const struct ofono_call_forwarding_driver ril_call_forwarding_driver = {
-	.name           = RILMODEM_DRIVER,
-	.probe          = ril_call_forward_probe,
-	.remove         = ril_call_forward_remove,
-	.erasure        = ril_call_forward_erasure,
-	.deactivation	= ril_call_forward_deactivate,
-	.query          = ril_call_forward_query,
-	.registration   = ril_call_forward_registration,
-	.activation     = ril_call_forward_activate
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_call_settings.c
+++ b/ofono/drivers/ril/ril_call_settings.c
@@ -1,309 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2015 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.
- */
-
-#include "ril_plugin.h"
-#include "ril_util.h"
-#include "ril_log.h"
-#include "ril_constants.h"
-
-#include "common.h"
-
-struct ril_call_settings {
-	GRilIoQueue *q;
-	guint timer_id;
-};
-
-struct ril_call_settings_cbd {
-	union _ofono_call_settings_cb {
-		ofono_call_settings_status_cb_t status;
-		ofono_call_settings_set_cb_t set;
-		ofono_call_settings_clir_cb_t clir;
-		gpointer ptr;
-	} cb;
-	gpointer data;
-};
-
-#define ril_call_settings_cbd_free g_free
-
-static inline struct ril_call_settings *ril_call_settings_get_data(
-					struct ofono_call_settings *b)
-{
-	return ofono_call_settings_get_data(b);
-}
-
-static struct ril_call_settings_cbd *ril_call_settings_cbd_new(void *cb,
-								void *data)
-{
-	struct ril_call_settings_cbd *cbd;
-
-	cbd = g_new0(struct ril_call_settings_cbd, 1);
-	cbd->cb.ptr = cb;
-	cbd->data = data;
-	return cbd;
-}
-
-static inline void ril_call_settings_submit_req(struct ril_call_settings *sd,
-	GRilIoRequest* req, guint code, GRilIoChannelResponseFunc response,
-							void *cb, void *data)
-{
-	grilio_queue_send_request_full(sd->q, req, code, response,
-				ril_call_settings_cbd_free,
-				ril_call_settings_cbd_new(cb, data));
-}
-
-static void ril_call_settings_clip_query_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_call_settings_cbd *cbd = user_data;
-	ofono_call_settings_status_cb_t cb = cbd->cb.status;
-
-	if (status == RIL_E_SUCCESS) {
-		GRilIoParser rilp;
-		int res = 0;
-
-		/* data length of the response */
-		grilio_parser_init(&rilp, data, len);
-		if (grilio_parser_get_int32(&rilp, &res) && res > 0) {
-			grilio_parser_get_int32(&rilp, &res);
-		}
-
-		cb(ril_error_ok(&error), res, cbd->data);
-	} else {
-		cb(ril_error_failure(&error), -1, cbd->data);
-	}
-}
-
-static void ril_call_settings_set_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_call_settings_cbd *cbd = user_data;
-	ofono_call_settings_set_cb_t cb = cbd->cb.set;
-
-	if (status == RIL_E_SUCCESS) {
-		cb(ril_error_ok(&error), cbd->data);
-	} else {
-		cb(ril_error_failure(&error), cbd->data);
-	}
-}
-
-static void ril_call_settings_cw_set(struct ofono_call_settings *cs, int mode,
-			int cls, ofono_call_settings_set_cb_t cb, void *data)
-{
-	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
-	GRilIoRequest *req = grilio_request_sized_new(12);
-
-	grilio_request_append_int32(req, 2);    /* Number of params */
-	grilio_request_append_int32(req, mode); /* on/off */
-
-	/* Modem seems to respond with error to all queries
-	 * or settings made with bearer class
-	 * BEARER_CLASS_DEFAULT. Design decision: If given
-	 * class is BEARER_CLASS_DEFAULT let's map it to
-	 * SERVICE_CLASS_VOICE effectively making it the
-	 * default bearer. This in line with API which is
-	 * contains only voice anyways.
-	 */
-	if (cls == BEARER_CLASS_DEFAULT) {
-		cls = BEARER_CLASS_VOICE;
-	}
-
-	grilio_request_append_int32(req, cls);  /* Service class */
-
-	ril_call_settings_submit_req(sd, req, RIL_REQUEST_SET_CALL_WAITING,
-					ril_call_settings_set_cb, cb, data);
-	grilio_request_unref(req);
-}
-
-static void ril_call_settings_cw_query_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_call_settings_cbd *cbd = user_data;
-	ofono_call_settings_status_cb_t cb = cbd->cb.status;
-
-	if (status == RIL_E_SUCCESS) {
-		GRilIoParser rilp;
-		int res = 0;
-		int sv = 0;
-
-		grilio_parser_init(&rilp, data, len);
-
-		/* first value in int[] is len so let's skip that */
-		grilio_parser_get_int32(&rilp, NULL);
-
-		/* status of call waiting service, disabled is returned only if
-		 * service is not active for any service class */
-		grilio_parser_get_int32(&rilp, &res);
-		DBG("CW enabled/disabled: %d", res);
-
-		if (res > 0) {
-			/* services for which call waiting is enabled,
-			   27.007 7.12 */
-			grilio_parser_get_int32(&rilp, &sv);
-			DBG("CW enabled for: %d", sv);
-		}
-
-		cb(ril_error_ok(&error), sv, cbd->data);
-	} else {
-		cb(ril_error_failure(&error), -1, cbd->data);
-	}
-}
-
-static void ril_call_settings_cw_query(struct ofono_call_settings *cs, int cls,
-				ofono_call_settings_status_cb_t cb, void *data)
-{
-	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
-	GRilIoRequest *req = grilio_request_sized_new(8);
-
-	grilio_request_append_int32(req, 1);		/* Number of params */
-
-	/*
-	 * RILD expects service class to be 0 as certain carriers can reject
-	 * the query with specific service class
-	 */
-	grilio_request_append_int32(req, 0);
-
-	ril_call_settings_submit_req(sd, req, RIL_REQUEST_QUERY_CALL_WAITING,
-				ril_call_settings_cw_query_cb, cb, data);
-	grilio_request_unref(req);
-}
-
-static void ril_call_settings_clip_query(struct ofono_call_settings *cs,
-			ofono_call_settings_status_cb_t cb, void *data)
-{
-	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
-
-	ril_call_settings_submit_req(sd, NULL, RIL_REQUEST_QUERY_CLIP,
-				ril_call_settings_clip_query_cb, cb, data);
-}
-
-static void ril_call_settings_clir_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_call_settings_cbd *cbd = user_data;
-	ofono_call_settings_clir_cb_t cb = cbd->cb.clir;
-
-	if (status == RIL_E_SUCCESS) {
-		GRilIoParser rilp;
-		int override = -1, network = -1;
-
-		grilio_parser_init(&rilp, data, len);
-		/*first value in int[] is len so let's skip that*/
-		grilio_parser_get_int32(&rilp, NULL);
-		/* Set HideCallerId property from network */
-		grilio_parser_get_int32(&rilp, &override);
-		/* CallingLineRestriction indicates the state of
-		the CLIR supplementary service in the network */
-		grilio_parser_get_int32(&rilp, &network);
-
-		cb(ril_error_ok(&error), override, network, cbd->data);
-	} else {
-		cb(ril_error_failure(&error), -1, -1, cbd->data);
-	}
-}
-
-static void ril_call_settings_clir_query(struct ofono_call_settings *cs,
-			ofono_call_settings_clir_cb_t cb, void *data)
-{
-	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
-
-	ril_call_settings_submit_req(sd, NULL, RIL_REQUEST_GET_CLIR,
-					ril_call_settings_clir_cb, cb, data);
-}
-
-static void ril_call_settings_clir_set(struct ofono_call_settings *cs,
-			int mode, ofono_call_settings_set_cb_t cb, void *data)
-{
-	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
-	GRilIoRequest *req = grilio_request_sized_new(8);
-
-	grilio_request_append_int32(req, 1); /* Number of params */
-	grilio_request_append_int32(req, mode); /* for outgoing calls */
-
-	ril_call_settings_submit_req(sd, req, RIL_REQUEST_SET_CLIR,
-					ril_call_settings_set_cb, cb, data);
-	grilio_request_unref(req);
-}
-
-static gboolean ril_call_settings_register(gpointer user_data)
-{
-	struct ofono_call_settings *cs = user_data;
-	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
-
-	DBG("");
-	GASSERT(sd->timer_id);
-	sd->timer_id = 0;
-	ofono_call_settings_register(cs);
-
-	/* Single-shot */
-	return FALSE;
-}
-
-static int ril_call_settings_probe(struct ofono_call_settings *cs,
-					unsigned int vendor, void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_call_settings *sd = g_try_new0(struct ril_call_settings, 1);
-
-	DBG("");
-	sd->q = grilio_queue_new(ril_modem_io(modem));
-	sd->timer_id = g_idle_add(ril_call_settings_register, cs);
-	ofono_call_settings_set_data(cs, sd);
-	return 0;
-}
-
-static void ril_call_settings_remove(struct ofono_call_settings *cs)
-{
-	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
-
-	DBG("");
-	ofono_call_settings_set_data(cs, NULL);
-
-	if (sd->timer_id > 0) {
-		g_source_remove(sd->timer_id);
-        }
-
-	grilio_queue_cancel_all(sd->q, FALSE);
-	grilio_queue_unref(sd->q);
-	g_free(sd);
-}
-
-const struct ofono_call_settings_driver ril_call_settings_driver = {
-	.name           = RILMODEM_DRIVER,
-	.probe          = ril_call_settings_probe,
-	.remove         = ril_call_settings_remove,
-	.clip_query	= ril_call_settings_clip_query,
-	.cw_query       = ril_call_settings_cw_query,
-	.cw_set         = ril_call_settings_cw_set,
-	.clir_query     = ril_call_settings_clir_query,
-	.clir_set       = ril_call_settings_clir_set
-
-	/*
-	 * Not supported in RIL API
-	 * .colp_query     = ril_call_settings_colp_query,
-	 * .colr_query     = ril_call_settings_colr_query
-	 */
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_call_volume.c
+++ b/ofono/drivers/ril/ril_call_volume.c
@@ -1,151 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2015 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.
- */
-
-#include "ril_plugin.h"
-#include "ril_util.h"
-#include "ril_log.h"
-#include "ril_constants.h"
-
-struct ril_call_volume {
-	struct ofono_call_volume *v;
-	GRilIoQueue *q;
-	guint timer_id;
-};
-
-struct ril_call_volume_req {
-	ofono_call_volume_cb_t cb;
-	gpointer data;
-};
-
-static inline struct ril_call_volume *ril_call_volume_get_data(
-					struct ofono_call_volume *v)
-{
-	return ofono_call_volume_get_data(v);
-}
-
-static void ril_call_volume_mute_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_call_volume_req *cbd = user_data;
-	ofono_call_volume_cb_t cb = cbd->cb;
-
-	if (status == RIL_E_SUCCESS) {
-		cb(ril_error_ok(&error), cbd->data);
-	} else {
-		ofono_error("Could not set the ril mute state");
-		cb(ril_error_failure(&error), cbd->data);
-	}
-}
-
-static void ril_call_volume_mute(struct ofono_call_volume *v, int muted,
-				ofono_call_volume_cb_t cb, void *data)
-{
-	struct ril_call_volume *vd = ril_call_volume_get_data(v);
-	struct ril_call_volume_req *cbd;
-	GRilIoRequest *req = grilio_request_sized_new(8);
-
-	cbd = g_new(struct ril_call_volume_req, 1);
-	cbd->cb = cb;
-	cbd->data = data;
-
-	DBG("%d", muted);
-	grilio_request_append_int32(req, 1);
-	grilio_request_append_int32(req, muted);
-	grilio_queue_send_request_full(vd->q, req, RIL_REQUEST_SET_MUTE,
-				 ril_call_volume_mute_cb, g_free, cbd);
-	grilio_request_unref(req);
-}
-
-static void ril_call_volume_query_mute_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_call_volume *vd = user_data;
-
-	if (status == RIL_E_SUCCESS) {
-		int muted = 0;
-		GRilIoParser rilp;
-
-		grilio_parser_init(&rilp, data, len);
-		grilio_parser_get_int32(&rilp, NULL); /* Array length */
-		grilio_parser_get_int32(&rilp, &muted);
-		DBG("{%d}", muted);
-		ofono_call_volume_set_muted(vd->v, muted);
-	} else {
-		ofono_error("Could not retrive the ril mute state");
-	}
-}
-
-static gboolean ril_call_volume_register(gpointer user_data)
-{
-	struct ril_call_volume *vd = user_data;
-
-	DBG("");
-	GASSERT(vd->timer_id);
-	vd->timer_id = 0;
-	ofono_call_volume_register(vd->v);
-
-	/* Probe the mute state */
-	grilio_queue_send_request_full(vd->q, NULL,
-		RIL_REQUEST_GET_MUTE, ril_call_volume_query_mute_cb, NULL, vd);
-
-	/* This makes the timeout a single-shot */
-	return FALSE;
-}
-
-static int ril_call_volume_probe(struct ofono_call_volume *v,
-				unsigned int vendor, void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_call_volume *vd = g_new0(struct ril_call_volume, 1);
-
-	DBG("");
-	vd->v = v;
-	vd->q = grilio_queue_new(ril_modem_io(modem));
-	vd->timer_id = g_idle_add(ril_call_volume_register, vd);
-	ofono_call_volume_set_data(v, vd);
-	return 0;
-}
-
-static void ril_call_volume_remove(struct ofono_call_volume *v)
-{
-	struct ril_call_volume *vd = ril_call_volume_get_data(v);
-
-	DBG("");
-	ofono_call_volume_set_data(v, NULL);
-
-	if (vd->timer_id) {
-		g_source_remove(vd->timer_id);
-	}
-
-	grilio_queue_cancel_all(vd->q, FALSE);
-	grilio_queue_unref(vd->q);
-	g_free(vd);
-}
-
-const struct ofono_call_volume_driver ril_call_volume_driver = {
-	.name       = RILMODEM_DRIVER,
-	.probe      = ril_call_volume_probe,
-	.remove     = ril_call_volume_remove,
-	.mute       = ril_call_volume_mute,
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_cbs.c
+++ b/ofono/drivers/ril/ril_cbs.c
@@ -1,119 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2015 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.
- */
-
-#include "ril_plugin.h"
-#include "ril_util.h"
-#include "ril_log.h"
-#include "ril_constants.h"
-
-struct ril_cbs {
-	struct ofono_cbs *cbs;
-	GRilIoChannel *io;
-	guint timer_id;
-	gulong event_id;
-};
-
-static void ril_set_topics(struct ofono_cbs *cbs, const char *topics,
-				ofono_cbs_set_cb_t cb, void *data)
-{
-	struct ofono_error error;
-	cb(ril_error_ok(&error), data);
-}
-
-static void ril_clear_topics(struct ofono_cbs *cbs,
-				ofono_cbs_set_cb_t cb, void *data)
-{
-	struct ofono_error error;
-	cb(ril_error_ok(&error), data);
-}
-
-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;
-	char* pdu;
-
-	GASSERT(code == RIL_UNSOL_ON_USSD);
-	grilio_parser_init(&rilp, data, len);
-	pdu = grilio_parser_get_utf8(&rilp);
-	DBG("%s", pdu);
-	if (pdu) {
-		ofono_cbs_notify(cd->cbs, (const guchar *)pdu, strlen(pdu));
-		g_free(pdu);
-	}
-}
-
-static gboolean ril_cbs_register(gpointer user_data)
-{
-	struct ril_cbs *cd = user_data;
-
-	DBG("");
-	GASSERT(cd->timer_id);
-	cd->timer_id = 0;
-	ofono_cbs_register(cd->cbs);
-
-	cd->event_id = grilio_channel_add_unsol_event_handler(cd->io,
-		ril_cbs_notify, RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS, cd);
-
-	/* Single-shot */
-	return FALSE;
-}
-
-static int ril_cbs_probe(struct ofono_cbs *cbs, unsigned int vendor,
-								void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_cbs *cd = g_try_new0(struct ril_cbs, 1);
-
-	DBG("");
-	cd->cbs = cbs;
-	cd->io = grilio_channel_ref(ril_modem_io(modem));
-	cd->timer_id = g_idle_add(ril_cbs_register, cd);
-	ofono_cbs_set_data(cbs, cd);
-	return 0;
-}
-
-static void ril_cbs_remove(struct ofono_cbs *cbs)
-{
-	struct ril_cbs *cd = ofono_cbs_get_data(cbs);
-
-	DBG("");
-	ofono_cbs_set_data(cbs, NULL);
-
-	if (cd->timer_id > 0) {
-		g_source_remove(cd->timer_id);
-	}
-
-	grilio_channel_remove_handler(cd->io, cd->event_id);
-	grilio_channel_unref(cd->io);
-	g_free(cd);
-}
-
-const struct ofono_cbs_driver ril_cbs_driver = {
-	.name           = RILMODEM_DRIVER,
-	.probe          = ril_cbs_probe,
-	.remove         = ril_cbs_remove,
-	.set_topics     = ril_set_topics,
-	.clear_topics   = ril_clear_topics
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_cell_info.c
+++ b/ofono/drivers/ril/ril_cell_info.c
@@ -1,537 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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.
- */
-
-#include "ril_cell_info.h"
-#include "ril_sim_card.h"
-#include "ril_radio.h"
-#include "ril_util.h"
-#include "ril_mce.h"
-#include "ril_log.h"
-
-#include <grilio_channel.h>
-#include <grilio_request.h>
-#include <grilio_parser.h>
-
-#define DISPLAY_ON_UPDATE_RATE  (1000)  /* 1 sec */
-#define DISPLAY_OFF_UPDATE_RATE (60000) /* 1 min */
-
-typedef GObjectClass RilCellInfoClass;
-typedef struct ril_cell_info RilCellInfo;
-
-struct ril_cell_info_priv {
-	GRilIoChannel *io;
-	struct ril_mce *mce;
-	struct ril_radio *radio;
-	struct ril_sim_card *sim_card;
-	gulong display_state_event_id;
-	gulong radio_state_event_id;
-	gulong sim_status_event_id;
-	gboolean sim_card_ready;
-	char *log_prefix;
-	gulong event_id;
-	guint query_id;
-	guint set_rate_id;
-};
-
-enum ril_cell_info_signal {
-	SIGNAL_CELLS_CHANGED,
-	SIGNAL_COUNT
-};
-
-#define SIGNAL_CELLS_CHANGED_NAME   "ril-cell-info-cells-changed"
-
-static guint ril_cell_info_signals[SIGNAL_COUNT] = { 0 };
-
-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)->priv->log_prefix, ##args)
-
-gint ril_cell_compare_location(const struct ril_cell *c1,
-					const struct ril_cell *c2)
-{
-	if (c1 && c2) {
-		if (c1->type != c2->type) {
-			return c1->type - c2->type;
-		} else if (c1->type == RIL_CELL_INFO_TYPE_GSM) {
-			const struct ril_cell_info_gsm *g1 = &c1->info.gsm;
-			const struct ril_cell_info_gsm *g2 = &c2->info.gsm;
-
-			if (g1->lac != g2->lac) {
-				return g1->lac - g2->lac;
-			} else {
-				return g1->cid - g2->cid;
-			}
-		} else if (c2->type == RIL_CELL_INFO_TYPE_WCDMA) {
-			const struct ril_cell_info_wcdma *w1 = &c1->info.wcdma;
-			const struct ril_cell_info_wcdma *w2 = &c2->info.wcdma;
-
-			if (w1->lac != w2->lac) {
-				return w1->lac - w2->lac;
-			} else {
-				return w1->cid - w2->cid;
-			}
-		} else {
-			const struct ril_cell_info_lte *l1 = &c1->info.lte;
-			const struct ril_cell_info_lte *l2 = &c2->info.lte;
-
-			GASSERT(c1->type == RIL_CELL_INFO_TYPE_LTE);
-			if (l1->ci != l2->ci) {
-				return l1->ci - l2->ci;
-			} else if (l1->pci != l2->pci) {
-				return l1->pci - l2->pci;
-			} else {
-				return l1->tac - l2->tac;
-			}
-		}
-	} else if (c1) {
-		return 1;
-	} else if (c2) {
-		return -1;
-	} else {
-		return 0;
-	}
-}
-
-gint ril_cell_compare_func(gconstpointer v1, gconstpointer v2)
-{
-	return ril_cell_compare_location(v1, v2);
-}
-
-static gboolean ril_cell_info_list_identical(GSList *l1, GSList *l2)
-{
-	while (l1 && l2) {
-		if (memcmp(l1->data, l2->data, sizeof(struct ril_cell))) {
-			return FALSE;
-		}
-		l1 = l1->next;
-		l2 = l2->next;
-	}
-	return !l1 && !l2;
-}
-
-static void ril_cell_info_update_cells(struct ril_cell_info *self, GSList *l)
-{
-	if (!ril_cell_info_list_identical(self->cells, l)) {
-		g_slist_free_full(self->cells, g_free);
-		self->cells = l;
-		g_signal_emit(self, ril_cell_info_signals[
-						SIGNAL_CELLS_CHANGED], 0);
-	} else {
-		g_slist_free_full(l, g_free);
-	}
-}
-
-static struct ril_cell *ril_cell_info_parse_cell_gsm(GRilIoParser *rilp,
-							gboolean registered)
-{
-	struct ril_cell *cell = g_new0(struct ril_cell, 1);
-	struct ril_cell_info_gsm *gsm = &cell->info.gsm;
-
-	if (grilio_parser_get_int32(rilp, &gsm->mcc) &&
-		grilio_parser_get_int32(rilp, &gsm->mnc) &&
-		grilio_parser_get_int32(rilp, &gsm->lac) &&
-		grilio_parser_get_int32(rilp, &gsm->cid) &&
-		grilio_parser_get_int32(rilp, &gsm->signalStrength) &&
-		grilio_parser_get_int32(rilp, &gsm->bitErrorRate)) {
-		DBG("[gsm] reg=%d,mcc=%d,mnc=%d,lac=%d,cid=%d,"
-			"strength=%d,err=%d", registered, gsm->mcc, gsm->mnc,
-			gsm->lac, gsm->cid, gsm->signalStrength,
-			gsm->bitErrorRate);
-		cell->type = RIL_CELL_INFO_TYPE_GSM;
-		cell->registered = registered;
-		return cell;
-	}
-
-	ofono_error("failed to parse GSM cell info");
-	g_free(cell);
-	return NULL;
-}
-
-static struct ril_cell *ril_cell_info_parse_cell_wcdma(GRilIoParser *rilp,
-							gboolean registered)
-{
-	struct ril_cell *cell = g_new0(struct ril_cell, 1);
-	struct ril_cell_info_wcdma *wcdma = &cell->info.wcdma;
-
-	if (grilio_parser_get_int32(rilp, &wcdma->mcc) &&
-		grilio_parser_get_int32(rilp, &wcdma->mnc) &&
-		grilio_parser_get_int32(rilp, &wcdma->lac) &&
-		grilio_parser_get_int32(rilp, &wcdma->cid) &&
-		grilio_parser_get_int32(rilp, &wcdma->psc) &&
-		grilio_parser_get_int32(rilp, &wcdma->signalStrength) &&
-		grilio_parser_get_int32(rilp, &wcdma->bitErrorRate)) {
-		DBG("[wcdma] reg=%d,mcc=%d,mnc=%d,lac=%d,cid=%d,psc=%d,"
-			"strength=%d,err=%d", registered, wcdma->mcc,
-			wcdma->mnc, wcdma->lac, wcdma->cid, wcdma->psc,
-			wcdma->signalStrength, wcdma->bitErrorRate);
-		cell->type = RIL_CELL_INFO_TYPE_WCDMA;
-		cell->registered = registered;
-		return cell;
-	}
-
-	ofono_error("failed to parse WCDMA cell info");
-	g_free(cell);
-	return NULL;
-}
-
-static struct ril_cell *ril_cell_info_parse_cell_lte(GRilIoParser *rilp,
-							gboolean registered)
-{
-	struct ril_cell *cell = g_new0(struct ril_cell, 1);
-	struct ril_cell_info_lte *lte = &cell->info.lte;
-
-	if (grilio_parser_get_int32(rilp, &lte->mcc) &&
-		grilio_parser_get_int32(rilp, &lte->mnc) &&
-		grilio_parser_get_int32(rilp, &lte->ci) &&
-		grilio_parser_get_int32(rilp, &lte->pci) &&
-		grilio_parser_get_int32(rilp, &lte->tac) &&
-		grilio_parser_get_int32(rilp, &lte->signalStrength) &&
-		grilio_parser_get_int32(rilp, &lte->rsrp) &&
-		grilio_parser_get_int32(rilp, &lte->rsrq) &&
-		grilio_parser_get_int32(rilp, &lte->rssnr) &&
-		grilio_parser_get_int32(rilp, &lte->cqi) &&
-		grilio_parser_get_int32(rilp, &lte->timingAdvance)) {
-		DBG("[lte] reg=%d,mcc=%d,mnc=%d,ci=%d,pci=%d,tac=%d,"
-			"strength=%d,rsrp=%d,rsrq=0x%x,rssnr=0x%x,cqi=%d,"
-			"t=0x%x", registered, lte->mcc, lte->mnc, lte->ci,
-			lte->pci, lte->tac, lte->signalStrength, lte->rsrp,
-			lte->rsrq, lte->rssnr, lte->cqi, lte->timingAdvance);
-		cell->type = RIL_CELL_INFO_TYPE_LTE;
-		cell->registered = registered;
-		return cell;
-	}
-
-	ofono_error("failed to parse LTE cell info");
-	g_free(cell);
-	return NULL;
-}
-
-static enum ril_cell_info_type ril_cell_info_parse_cell(GRilIoParser *rilp,
-						struct ril_cell **cell_ptr)
-{
-	int type, reg;
-
-	if (grilio_parser_get_int32(rilp, &type) &&
-			grilio_parser_get_int32(rilp, &reg) &&
-			grilio_parser_get_int32_array(rilp, NULL, 3)) {
-		int skip = 0;
-		struct ril_cell *cell = NULL;
-
-		switch (type) {
-		case RIL_CELL_INFO_TYPE_GSM:
-			cell = ril_cell_info_parse_cell_gsm(rilp, reg);
-			break;
-		case RIL_CELL_INFO_TYPE_WCDMA:
-			cell = ril_cell_info_parse_cell_wcdma(rilp, reg);
-			break;
-		case RIL_CELL_INFO_TYPE_LTE:
-			cell = ril_cell_info_parse_cell_lte(rilp, reg);
-			break;
-		case RIL_CELL_INFO_TYPE_CDMA:
-			skip = 10;
-			break;
-		case RIL_CELL_INFO_TYPE_TD_SCDMA:
-			skip = 6;
-			break;
-		default:
-			skip = 0;
-			break;
-		}
-
-		if (cell) {
-			*cell_ptr = cell;
-			return type;
-		}
-
-		if (skip && grilio_parser_get_int32_array(rilp, NULL, skip)) {
-			*cell_ptr = NULL;
-			return type;
-		}
-	}
-
-	*cell_ptr = NULL;
-	return RIL_CELL_INFO_TYPE_NONE;
-}
-
-static GSList *ril_cell_info_parse_list(const void *data, guint len)
-{
-	GSList *l = NULL;
-	GRilIoParser rilp;
-	int i, n;
-
-	grilio_parser_init(&rilp, data, len);
-	if (grilio_parser_get_int32(&rilp, &n) && n > 0) {
-		struct ril_cell *c;
-
-		DBG("%d cell(s):", n);
-		for (i=0; i<n && ril_cell_info_parse_cell(&rilp, &c); i++) {
-			if (c) {
-				l = g_slist_insert_sorted(l, c,
-						ril_cell_compare_func);
-			}
-		}
-	}
-
-	return l;
-}
-
-static void ril_cell_info_list_changed_cb(GRilIoChannel *io, guint code,
-				const void *data, guint len, void *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(data, len));
-}
-
-static void ril_cell_info_list_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_cell_info *self = RIL_CELL_INFO(user_data);
-	struct ril_cell_info_priv *priv = self->priv;
-
-	DBG_(self, "");
-	GASSERT(priv->query_id);
-	priv->query_id = 0;
-	ril_cell_info_update_cells(self, ril_cell_info_parse_list(data, len));
-}
-
-static void ril_cell_info_set_rate_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_cell_info *self = RIL_CELL_INFO(user_data);
-	struct ril_cell_info_priv *priv = self->priv;
-
-	DBG_(self, "");
-	GASSERT(priv->set_rate_id);
-	priv->set_rate_id = 0;
-}
-
-static void ril_cell_info_query(struct ril_cell_info *self)
-{
-	struct ril_cell_info_priv *priv = self->priv;
-	GRilIoRequest *req = grilio_request_new();
-
-	grilio_request_set_retry(req, RIL_RETRY_MS, -1);
-	grilio_channel_cancel_request(priv->io, priv->query_id, FALSE);
-	priv->query_id = grilio_channel_send_request_full(priv->io, req,
-		RIL_REQUEST_GET_CELL_INFO_LIST, ril_cell_info_list_cb,
-		NULL, self);
-	grilio_request_unref(req);
-}
-
-static void ril_cell_info_set_rate(struct ril_cell_info *self, int ms)
-{
-	struct ril_cell_info_priv *priv = self->priv;
-	GRilIoRequest *req = grilio_request_sized_new(8);
-
-	grilio_request_append_int32(req, 1);
-	grilio_request_append_int32(req, ms);
-	grilio_request_set_retry(req, RIL_RETRY_MS, -1);
-	grilio_channel_cancel_request(priv->io, priv->set_rate_id, FALSE);
-	priv->set_rate_id = grilio_channel_send_request_full(priv->io, req,
-			RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE,
-			ril_cell_info_set_rate_cb, NULL, self);
-	grilio_request_unref(req);
-}
-
-static void ril_cell_info_update_rate(struct ril_cell_info *self)
-{
-	struct ril_cell_info_priv *priv = self->priv;
-
-	ril_cell_info_set_rate(self,
-		(priv->mce->display_state == RIL_MCE_DISPLAY_OFF) ?
-		DISPLAY_OFF_UPDATE_RATE : DISPLAY_ON_UPDATE_RATE);
-}
-
-static void ril_cell_info_display_state_cb(struct ril_mce *mce, void *arg)
-{
-	struct ril_cell_info *self = RIL_CELL_INFO(arg);
-	struct ril_cell_info_priv *priv = self->priv;
-
-	if (priv->sim_card_ready) {
-		ril_cell_info_update_rate(self);
-	}
-}
-
-static void ril_cell_info_refresh(struct ril_cell_info *self)
-{
-	struct ril_cell_info_priv *priv = self->priv;
-
-	/* RIL_REQUEST_GET_CELL_INFO_LIST fails without SIM card */
-	if (priv->radio->state == RADIO_STATE_ON && priv->sim_card_ready) {
-		ril_cell_info_query(self);
-	} else {
-		ril_cell_info_update_cells(self, NULL);
-	}
-}
-
-static void ril_cell_info_radio_state_cb(struct ril_radio *radio, void *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);
-}
-
-static void ril_cell_info_sim_status_cb(struct ril_sim_card *sim, void *arg)
-{
-	struct ril_cell_info *self = RIL_CELL_INFO(arg);
-	struct ril_cell_info_priv *priv = self->priv;
-	const gboolean sim_card_was_ready = priv->sim_card_ready;
-
-	DBG_(self, "%sready", ril_sim_card_ready(sim) ? "" : "not ");
-	priv->sim_card_ready = ril_sim_card_ready(sim);
-	if (priv->sim_card_ready != sim_card_was_ready) {
-		ril_cell_info_refresh(self);
-		if (priv->sim_card_ready) {
-			ril_cell_info_update_rate(self);
-		}
-	}
-}
-
-gulong ril_cell_info_add_cells_changed_handler(struct ril_cell_info *self,
-					ril_cell_info_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_CELLS_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-void ril_cell_info_remove_handler(struct ril_cell_info *self, gulong id)
-{
-	if (G_LIKELY(self) && G_LIKELY(id)) {
-		g_signal_handler_disconnect(self, id);
-	}
-}
-
-struct ril_cell_info *ril_cell_info_new(GRilIoChannel *io,
-		const char *log_prefix, struct ril_mce *mce,
-		struct ril_radio *radio, struct ril_sim_card *sim_card)
-{
-	struct ril_cell_info *self = g_object_new(RIL_CELL_INFO_TYPE, 0);
-	struct ril_cell_info_priv *priv = self->priv;
-
-	priv->io = grilio_channel_ref(io);
-	priv->mce = ril_mce_ref(mce);
-	priv->radio = ril_radio_ref(radio);
-	priv->sim_card = ril_sim_card_ref(sim_card);
-	priv->log_prefix = (log_prefix && log_prefix[0]) ?
-		g_strconcat(log_prefix, " ", NULL) : g_strdup("");
-	DBG_(self, "");
-	priv->event_id = grilio_channel_add_unsol_event_handler(priv->io,
-		ril_cell_info_list_changed_cb, RIL_UNSOL_CELL_INFO_LIST, self);
-	priv->display_state_event_id =
-		ril_mce_add_display_state_changed_handler(mce,
-			ril_cell_info_display_state_cb, self);
-	priv->radio_state_event_id =
-		ril_radio_add_state_changed_handler(radio,
-			ril_cell_info_radio_state_cb, self);
-	priv->sim_status_event_id =
-		ril_sim_card_add_status_changed_handler(priv->sim_card,
-			ril_cell_info_sim_status_cb, self);
-	priv->sim_card_ready = ril_sim_card_ready(sim_card);
-	if (priv->sim_card_ready) {
-		ril_cell_info_query(self);
-		ril_cell_info_update_rate(self);
-	}
-	return self;
-}
-
-struct ril_cell_info *ril_cell_info_ref(struct ril_cell_info *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_ref(RIL_CELL_INFO(self));
-		return self;
-	} else {
-		return NULL;
-	}
-}
-
-void ril_cell_info_unref(struct ril_cell_info *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_unref(RIL_CELL_INFO(self));
-	}
-}
-
-static void ril_cell_info_init(struct ril_cell_info *self)
-{
-	self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, RIL_CELL_INFO_TYPE,
-						struct ril_cell_info_priv);
-}
-
-static void ril_cell_info_dispose(GObject *object)
-{
-	struct ril_cell_info *self = RIL_CELL_INFO(object);
-	struct ril_cell_info_priv *priv = self->priv;
-
-	grilio_channel_remove_handlers(priv->io, &priv->event_id, 1);
-	if (priv->query_id) {
-		grilio_channel_cancel_request(priv->io, priv->query_id, FALSE);
-		priv->query_id = 0;
-	}
-	if (priv->set_rate_id) {
-		grilio_channel_cancel_request(priv->io, priv->set_rate_id,
-									FALSE);
-		priv->set_rate_id = 0;
-	}
-	if (priv->display_state_event_id) {
-		ril_mce_remove_handler(priv->mce, priv->display_state_event_id);
-		priv->display_state_event_id = 0;
-	}
-	ril_radio_remove_handlers(priv->radio, &priv->radio_state_event_id, 1);
-	ril_sim_card_remove_handlers(priv->sim_card,
-					&priv->sim_status_event_id, 1);
-	G_OBJECT_CLASS(ril_cell_info_parent_class)->dispose(object);
-}
-
-static void ril_cell_info_finalize(GObject *object)
-{
-	struct ril_cell_info *self = RIL_CELL_INFO(object);
-	struct ril_cell_info_priv *priv = self->priv;
-
-	DBG_(self, "");
-	g_free(priv->log_prefix);
-	grilio_channel_unref(priv->io);
-	ril_mce_unref(priv->mce);
-	ril_radio_unref(priv->radio);
-	ril_sim_card_unref(priv->sim_card);
-	g_slist_free_full(self->cells, g_free);
-	G_OBJECT_CLASS(ril_cell_info_parent_class)->finalize(object);
-}
-
-static void ril_cell_info_class_init(RilCellInfoClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
-	object_class->dispose = ril_cell_info_dispose;
-	object_class->finalize = ril_cell_info_finalize;
-	g_type_class_add_private(klass, sizeof(struct ril_cell_info_priv));
-	ril_cell_info_signals[SIGNAL_CELLS_CHANGED] =
-		g_signal_new(SIGNAL_CELLS_CHANGED_NAME,
-			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
-			0, NULL, NULL, NULL, G_TYPE_NONE, 0);
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_cell_info.h
+++ b/ofono/drivers/ril/ril_cell_info.h
@@ -1,63 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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_CELL_INFO_H
-#define RIL_CELL_INFO_H
-
-#include "ril_types.h"
-
-struct ril_cell {
-	enum ril_cell_info_type type;
-	gboolean registered;
-	union {
-		struct ril_cell_info_gsm gsm;
-		struct ril_cell_info_wcdma wcdma;
-		struct ril_cell_info_lte lte;
-	} info;
-};
-
-struct ril_cell_info_priv;
-struct ril_cell_info {
-	GObject object;
-	struct ril_cell_info_priv *priv;
-	GSList *cells;
-};
-
-typedef void (*ril_cell_info_cb_t)(struct ril_cell_info *info, void *arg);
-
-gint ril_cell_compare_func(gconstpointer v1, gconstpointer v2);
-gint ril_cell_compare_location(const struct ril_cell *c1,
-					const struct ril_cell *c2);
-
-struct ril_cell_info *ril_cell_info_new(GRilIoChannel *io,
-		const char *log_prefix, struct ril_mce *mce,
-		struct ril_radio *radio, struct ril_sim_card *sim_card);
-struct ril_cell_info *ril_cell_info_ref(struct ril_cell_info *info);
-void ril_cell_info_unref(struct ril_cell_info *info);
-struct ril_cell *ril_cell_find_cell(struct ril_cell_info *info,
-						const struct ril_cell *cell);
-gulong ril_cell_info_add_cells_changed_handler(struct ril_cell_info *info,
-					ril_cell_info_cb_t cb, void *arg);
-void ril_cell_info_remove_handler(struct ril_cell_info *info, gulong id);
-
-#endif /* RIL_CELL_INFO_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_cell_info_dbus.c
+++ b/ofono/drivers/ril/ril_cell_info_dbus.c
@@ -1,586 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_cell_info.h"
-#include "ril_log.h"
-
-#include <ofono/dbus.h>
-
-#include <gdbus.h>
-
-struct ril_cell_entry {
-	guint cell_id;
-	char *path;
-	struct ril_cell cell;
-};
-
-struct ril_cell_info_dbus {
-	struct ril_modem *md;
-	struct ril_cell_info *info;
-	DBusConnection *conn;
-	char *path;
-	gulong handler_id;
-	guint next_cell_id;
-	GSList *entries;
-};
-
-#define RIL_CELL_INFO_DBUS_INTERFACE             "org.nemomobile.ofono.CellInfo"
-#define RIL_CELL_INFO_DBUS_CELLS_ADDED_SIGNAL    "CellsAdded"
-#define RIL_CELL_INFO_DBUS_CELLS_REMOVED_SIGNAL  "CellsRemoved"
-
-#define RIL_CELL_DBUS_INTERFACE_VERSION          (1)
-#define RIL_CELL_DBUS_INTERFACE                  "org.nemomobile.ofono.Cell"
-#define RIL_CELL_DBUS_REGISTERED_CHANGED_SIGNAL  "RegisteredChanged"
-#define RIL_CELL_DBUS_PROPERTY_CHANGED_SIGNAL    "PropertyChanged"
-#define RIL_CELL_DBUS_REMOVED_SIGNAL             "Removed"
-
-struct ril_cell_property {
-	const char *name;
-	glong off;
-	int flag;
-};
-
-#define RIL_CELL_GSM_PROPERTY(value,name) \
-	{ #name, G_STRUCT_OFFSET(struct ril_cell_info_gsm,name), value }
-#define RIL_CELL_WCDMA_PROPERTY(value,name) \
-	{ #name, G_STRUCT_OFFSET(struct ril_cell_info_wcdma,name), value }
-#define RIL_CELL_LTE_PROPERTY(value,name) \
-	{ #name, G_STRUCT_OFFSET(struct ril_cell_info_lte,name), value }
-
-static const struct ril_cell_property ril_cell_gsm_properties [] = {
-	RIL_CELL_GSM_PROPERTY(0x01,mcc),
-	RIL_CELL_GSM_PROPERTY(0x02,mnc),
-	RIL_CELL_GSM_PROPERTY(0x04,lac),
-	RIL_CELL_GSM_PROPERTY(0x08,cid),
-	RIL_CELL_GSM_PROPERTY(0x10,signalStrength),
-	RIL_CELL_GSM_PROPERTY(0x20,bitErrorRate)
-};
-
-static const struct ril_cell_property ril_cell_wcdma_properties [] = {
-	RIL_CELL_WCDMA_PROPERTY(0x01,mcc),
-	RIL_CELL_WCDMA_PROPERTY(0x02,mnc),
-	RIL_CELL_WCDMA_PROPERTY(0x04,lac),
-	RIL_CELL_WCDMA_PROPERTY(0x08,cid),
-	RIL_CELL_WCDMA_PROPERTY(0x10,psc),
-	RIL_CELL_WCDMA_PROPERTY(0x20,signalStrength),
-	RIL_CELL_WCDMA_PROPERTY(0x40,bitErrorRate)
-};
-
-static const struct ril_cell_property ril_cell_lte_properties [] = {
-	RIL_CELL_LTE_PROPERTY(0x001,mcc),
-	RIL_CELL_LTE_PROPERTY(0x002,mnc),
-	RIL_CELL_LTE_PROPERTY(0x004,ci),
-	RIL_CELL_LTE_PROPERTY(0x008,pci),
-	RIL_CELL_LTE_PROPERTY(0x010,tac),
-	RIL_CELL_LTE_PROPERTY(0x020,signalStrength),
-	RIL_CELL_LTE_PROPERTY(0x040,rsrp),
-	RIL_CELL_LTE_PROPERTY(0x080,rsrq),
-	RIL_CELL_LTE_PROPERTY(0x100,rssnr),
-	RIL_CELL_LTE_PROPERTY(0x200,cqi),
-	RIL_CELL_LTE_PROPERTY(0x400,timingAdvance)
-};
-
-#define RIL_CELL_PROPERTY_REGISTERED 0x1000
-
-typedef void (*ril_cell_info_dbus_append_fn)(DBusMessageIter *it,
-					const struct ril_cell_entry *entry);
-
-static const char *ril_cell_info_dbus_cell_type_str(enum ril_cell_info_type t)
-{
-	switch (t) {
-	case RIL_CELL_INFO_TYPE_GSM:
-		return "gsm";
-	case RIL_CELL_INFO_TYPE_CDMA:
-		return "cdma";
-	case RIL_CELL_INFO_TYPE_LTE:
-		return "lte";
-	case RIL_CELL_INFO_TYPE_WCDMA:
-		return "wcdma";
-	case RIL_CELL_INFO_TYPE_TD_SCDMA:
-		return "tdscdma";
-	case RIL_CELL_INFO_TYPE_NONE:
-	default:
-		return "unknown";
-	}
-};
-
-static const struct ril_cell_property *ril_cell_info_dbus_cell_properties(
-				enum ril_cell_info_type type, int *count)
-{
-	switch (type) {
-	case RIL_CELL_INFO_TYPE_GSM:
-		*count = G_N_ELEMENTS(ril_cell_gsm_properties);
-		return ril_cell_gsm_properties;
-	case RIL_CELL_INFO_TYPE_WCDMA:
-		*count = G_N_ELEMENTS(ril_cell_wcdma_properties);
-		return ril_cell_wcdma_properties;
-	case RIL_CELL_INFO_TYPE_LTE:
-		*count = G_N_ELEMENTS(ril_cell_lte_properties);
-		return ril_cell_lte_properties;
-	default:
-		*count = 0;
-		return NULL;
-	}
-};
-
-static void ril_cell_info_destroy_entry(struct ril_cell_entry *entry)
-{
-	if (entry) {
-		g_free(entry->path);
-		g_free(entry);
-	}
-}
-
-static DBusMessage *ril_cell_info_dbus_reply(DBusMessage *msg,
-				const struct ril_cell_entry *entry,
-				ril_cell_info_dbus_append_fn append)
-{
-	DBusMessage *reply = dbus_message_new_method_return(msg);
-	DBusMessageIter it;
-
-	dbus_message_iter_init_append(reply, &it);
-	append(&it, entry);
-	return reply;
-}
-
-static void ril_cell_info_dbus_append_version(DBusMessageIter *it,
-					const struct ril_cell_entry *entry)
-{
-	dbus_int32_t version = RIL_CELL_DBUS_INTERFACE_VERSION;
-
-	dbus_message_iter_append_basic(it, DBUS_TYPE_INT32, &version);
-}
-
-static void ril_cell_info_dbus_append_type(DBusMessageIter *it,
-					const struct ril_cell_entry *entry)
-{
-	const char *type = ril_cell_info_dbus_cell_type_str(entry->cell.type);
-
-	dbus_message_iter_append_basic(it, DBUS_TYPE_STRING, &type);
-}
-
-static void ril_cell_info_dbus_append_registered(DBusMessageIter *it,
-					const struct ril_cell_entry *entry)
-{
-	dbus_bool_t registered = entry->cell.registered;
-
-	dbus_message_iter_append_basic(it, DBUS_TYPE_BOOLEAN, &registered);
-}
-
-static void ril_cell_info_dbus_append_properties(DBusMessageIter *it,
-					const struct ril_cell_entry *entry)
-{
-	int i, n;
-	DBusMessageIter dict;
-	const struct ril_cell *cell = &entry->cell;
-	const struct ril_cell_property *prop =
-		ril_cell_info_dbus_cell_properties(cell->type, &n);
-
-	dbus_message_iter_open_container(it, DBUS_TYPE_ARRAY, "{sv}", &dict);
-	for (i = 0; i < n; i++) {
-		gint32 value = G_STRUCT_MEMBER(int, &cell->info, prop[i].off);
-		if (value != INT_MAX) {
-			ofono_dbus_dict_append(&dict, prop[i].name,
-						DBUS_TYPE_INT32, &value);
-		}
-	}
-	dbus_message_iter_close_container(it, &dict);
-}
-
-static void ril_cell_info_dbus_append_all(DBusMessageIter *it,
-					const struct ril_cell_entry *entry)
-{
-	ril_cell_info_dbus_append_version(it, entry);
-	ril_cell_info_dbus_append_type(it, entry);
-	ril_cell_info_dbus_append_registered(it, entry);
-	ril_cell_info_dbus_append_properties(it, entry);
-}
-
-static DBusMessage *ril_cell_info_dbus_cell_get_all(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_cell_info_dbus_reply(msg, (struct ril_cell_entry*)data,
-				ril_cell_info_dbus_append_all);
-}
-
-static DBusMessage *ril_cell_info_dbus_cell_get_version(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_cell_info_dbus_reply(msg, (struct ril_cell_entry*)data,
-				ril_cell_info_dbus_append_version);
-}
-
-static DBusMessage *ril_cell_info_dbus_cell_get_type(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_cell_info_dbus_reply(msg, (struct ril_cell_entry*)data,
-				ril_cell_info_dbus_append_type);
-}
-
-static DBusMessage *ril_cell_info_dbus_cell_get_registered(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_cell_info_dbus_reply(msg, (struct ril_cell_entry*)data,
-				ril_cell_info_dbus_append_registered);
-}
-
-static DBusMessage *ril_cell_info_dbus_cell_get_properties(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_cell_info_dbus_reply(msg, (struct ril_cell_entry*)data,
-				ril_cell_info_dbus_append_properties);
-}
-
-static const GDBusMethodTable ril_cell_info_dbus_cell_methods[] = {
-	{ GDBUS_METHOD("GetAll", NULL,
-			GDBUS_ARGS({ "version", "i" },
-			           { "type", "s" },
-			           { "registered", "b" },
-			           { "properties", "a{sv}" }),
-			ril_cell_info_dbus_cell_get_all) },
-	{ GDBUS_METHOD("GetInterfaceVersion", NULL,
-			GDBUS_ARGS({ "version", "i" }),
-			ril_cell_info_dbus_cell_get_version) },
-	{ GDBUS_METHOD("GetType", NULL,
-			GDBUS_ARGS({ "type", "s" }),
-			ril_cell_info_dbus_cell_get_type) },
-	{ GDBUS_METHOD("GetRegistered", NULL,
-			GDBUS_ARGS({ "registered", "b" }),
-			ril_cell_info_dbus_cell_get_registered) },
-	{ GDBUS_METHOD("GetProperties", NULL,
-			GDBUS_ARGS({ "properties", "a{sv}" }),
-			ril_cell_info_dbus_cell_get_properties) },
-	{ }
-};
-
-static const GDBusSignalTable ril_cell_info_dbus_cell_signals[] = {
-	{ GDBUS_SIGNAL(RIL_CELL_DBUS_REGISTERED_CHANGED_SIGNAL,
-			GDBUS_ARGS({ "registered", "b" })) },
-	{ GDBUS_SIGNAL(RIL_CELL_DBUS_PROPERTY_CHANGED_SIGNAL,
-			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
-	{ GDBUS_SIGNAL(RIL_CELL_DBUS_REMOVED_SIGNAL,
-			GDBUS_ARGS({})) },
-	{ }
-};
-
-static struct ril_cell_entry *ril_cell_info_dbus_find_id(
-		struct ril_cell_info_dbus *dbus, guint id)
-{
-	GSList *l;
-	for (l = dbus->entries; l; l = l->next) {
-		struct ril_cell_entry *entry = l->data;
-		if (entry->cell_id == id) {
-			return entry;
-		}
-	}
-	return NULL;
-}
-
-static guint ril_cell_info_dbus_next_cell_id(struct ril_cell_info_dbus *dbus)
-{
-	while (ril_cell_info_dbus_find_id(dbus, dbus->next_cell_id)) {
-		dbus->next_cell_id++;
-	}
-	return dbus->next_cell_id++;
-}
-
-static struct ril_cell_entry *ril_cell_info_dbus_find_cell(
-		struct ril_cell_info_dbus *dbus, const struct ril_cell *cell)
-{
-	if (cell) {
-		GSList *l;
-		for (l = dbus->entries; l; l = l->next) {
-			struct ril_cell_entry *entry = l->data;
-			if (!ril_cell_compare_location(&entry->cell, cell)) {
-				return entry;
-			}
-		}
-	}
-	return NULL;
-}
-
-static void ril_cell_info_dbus_emit_path_list(struct ril_cell_info_dbus *dbus,
-					const char *name, GPtrArray *list)
-{
-	guint i;
-	DBusMessageIter it, array;
-	DBusMessage *signal = dbus_message_new_signal(dbus->path,
-					RIL_CELL_INFO_DBUS_INTERFACE, name);
-
-	dbus_message_iter_init_append(signal, &it);
-	dbus_message_iter_open_container(&it, DBUS_TYPE_ARRAY, "o", &array);
-	for (i = 0; i < list->len; i++) {
-		const char* path = list->pdata[i];
-		dbus_message_iter_append_basic(&array, DBUS_TYPE_OBJECT_PATH,
-								&path);
-	}
-	dbus_message_iter_close_container(&it, &array);
-
-	g_dbus_send_message(dbus->conn, signal);
-}
-
-static int ril_cell_info_dbus_compare(const struct ril_cell *c1,
-					const struct ril_cell *c2)
-{
-	if (c1->type == c2->type) {
-		int i, n, mask = 0;
-		const struct ril_cell_property *prop =
-			ril_cell_info_dbus_cell_properties(c1->type, &n);
-
-		if (c1->registered != c2->registered) {
-			mask |= RIL_CELL_PROPERTY_REGISTERED;
-		}
-
-		for (i = 0; i < n; i++) {
-			const glong offset = prop[i].off;
-			gint32 v1 = G_STRUCT_MEMBER(int, &c1->info, offset);
-			gint32 v2 = G_STRUCT_MEMBER(int, &c2->info, offset);
-			if (v1 != v2) {
-				mask |= prop[i].flag;
-			}
-		}
-
-		return mask;
-	} else {
-		return -1;
-	}
-}
-
-static void ril_cell_info_dbus_property_changed(struct ril_cell_info_dbus *dbus,
-				const struct ril_cell_entry *entry, int mask)
-{
-	int i, n;
-	const struct ril_cell *cell = &entry->cell;
-	const struct ril_cell_property *prop =
-		ril_cell_info_dbus_cell_properties(cell->type, &n);
-
-	if (mask & RIL_CELL_PROPERTY_REGISTERED) {
-		dbus_bool_t registered = cell->registered;
-		g_dbus_emit_signal(dbus->conn, entry->path,
-			RIL_CELL_DBUS_INTERFACE,
-			RIL_CELL_DBUS_REGISTERED_CHANGED_SIGNAL,
-			DBUS_TYPE_BOOLEAN, &registered, DBUS_TYPE_INVALID);
-		mask &= ~RIL_CELL_PROPERTY_REGISTERED;
-	}
-
-	for (i = 0; i < n && mask; i++) {
-		if (mask & prop[i].flag) {
-			ofono_dbus_signal_property_changed(dbus->conn,
-				entry->path, RIL_CELL_DBUS_INTERFACE,
-				prop[i].name, DBUS_TYPE_INT32,
-				G_STRUCT_MEMBER_P(&cell->info, prop[i].off));
-			mask &= ~prop[i].flag;
-		}
-	}
-}
-
-static void ril_cell_info_dbus_update_entries(struct ril_cell_info_dbus *dbus,
-							gboolean emit_signals)
-{
-	GSList *l;
-	GPtrArray* added = NULL;
-	GPtrArray* removed = NULL;
-
-	/* Remove non-existent cells */
-	l = dbus->entries;
-	while (l) {
-		GSList *next = l->next;
-		struct ril_cell_entry *entry = l->data;
-		if (!g_slist_find_custom(dbus->info->cells, &entry->cell,
-						ril_cell_compare_func)) {
-			DBG("%s removed", entry->path);
-			dbus->entries = g_slist_delete_link(dbus->entries, l);
-			g_dbus_emit_signal(dbus->conn, entry->path,
-					RIL_CELL_DBUS_INTERFACE,
-					RIL_CELL_DBUS_REMOVED_SIGNAL,
-					DBUS_TYPE_INVALID);
-			g_dbus_unregister_interface(dbus->conn, entry->path,
-						RIL_CELL_DBUS_INTERFACE);
-			if (emit_signals) {
-				if (!removed) {
-					removed =
-						g_ptr_array_new_with_free_func(
-								g_free);
-				}
-				/* Steal the path */
-				g_ptr_array_add(removed, entry->path);
-				entry->path = NULL;
-			}
-			ril_cell_info_destroy_entry(entry);
-		}
-		l = next;
-	}
-
-	/* Add new cells */
-	for (l = dbus->info->cells; l; l = l->next) {
-		const struct ril_cell *cell = l->data;
-		struct ril_cell_entry *entry =
-			ril_cell_info_dbus_find_cell(dbus, cell);
-
-		if (entry) {
-			if (emit_signals) {
-				int diff = ril_cell_info_dbus_compare(cell,
-								&entry->cell);
-				entry->cell = *cell;
-				ril_cell_info_dbus_property_changed(dbus,
-								entry, diff);
-			} else {
-				entry->cell = *cell;
-			}
-		} else {
-			entry = g_new0(struct ril_cell_entry, 1);
-			entry->cell = *cell;
-			entry->cell_id = ril_cell_info_dbus_next_cell_id(dbus);
-			entry->path = g_strdup_printf("%s/cell_%u", dbus->path,
-							entry->cell_id);
-			dbus->entries = g_slist_append(dbus->entries, entry);
-			DBG("%s added", entry->path);
-			g_dbus_register_interface(dbus->conn, entry->path,
-					RIL_CELL_DBUS_INTERFACE,
-					ril_cell_info_dbus_cell_methods,
-					ril_cell_info_dbus_cell_signals, NULL,
-					entry, NULL);
-			if (emit_signals) {
-				if (!added) {
-					added = g_ptr_array_new();
-				}
-				g_ptr_array_add(added, entry->path);
-			}
-		}
-	}
-
-	if (removed) {
-		ril_cell_info_dbus_emit_path_list(dbus,
-			RIL_CELL_INFO_DBUS_CELLS_REMOVED_SIGNAL, removed);
-		g_ptr_array_free(removed, TRUE);
-	}
-
-	if (added) {
-		ril_cell_info_dbus_emit_path_list(dbus,
-			RIL_CELL_INFO_DBUS_CELLS_ADDED_SIGNAL, added);
-		g_ptr_array_free(added, TRUE);
-	}
-}
-
-static void ril_cell_info_dbus_cells_changed_cb(struct ril_cell_info *info,
-								void *arg)
-{
-	DBG("");
-	ril_cell_info_dbus_update_entries((struct ril_cell_info_dbus *)arg,
-								TRUE);
-}
-
-static DBusMessage *ril_cell_info_dbus_get_cells(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_cell_info_dbus *dbus = data;
-	DBusMessage *reply = dbus_message_new_method_return(msg);
-	DBusMessageIter it, array;
-	GSList *l;
-
-	dbus_message_iter_init_append(reply, &it);
-	dbus_message_iter_open_container(&it, DBUS_TYPE_ARRAY, "o", &array);
-	for (l = dbus->entries; l; l = l->next) {
-		const struct ril_cell_entry *entry = l->data;
-		dbus_message_iter_append_basic(&array, DBUS_TYPE_OBJECT_PATH,
-								&entry->path);
-	}
-	dbus_message_iter_close_container(&it, &array);
-	return reply;
-}
-
-static const GDBusMethodTable ril_cell_info_dbus_methods[] = {
-	{ GDBUS_METHOD("GetCells", NULL,
-			GDBUS_ARGS({ "paths", "ao" }),
-			ril_cell_info_dbus_get_cells) },
-	{ }
-};
-
-static const GDBusSignalTable ril_cell_info_dbus_signals[] = {
-	{ GDBUS_SIGNAL(RIL_CELL_INFO_DBUS_CELLS_ADDED_SIGNAL,
-			GDBUS_ARGS({ "paths", "ao" })) },
-	{ GDBUS_SIGNAL(RIL_CELL_INFO_DBUS_CELLS_REMOVED_SIGNAL,
-			GDBUS_ARGS({ "paths", "ao" })) },
-	{ }
-};
-
-struct ril_cell_info_dbus *ril_cell_info_dbus_new(struct ril_modem *md,
-						struct ril_cell_info *info)
-{
-	struct ril_cell_info_dbus *dbus = g_new0(struct ril_cell_info_dbus, 1);
-
-	DBG("%s", ril_modem_get_path(md));
-	dbus->md = md;
-	dbus->path = g_strdup(ril_modem_get_path(md));
-	dbus->conn = dbus_connection_ref(ofono_dbus_get_connection());
-	dbus->info = ril_cell_info_ref(info);
-	dbus->handler_id = ril_cell_info_add_cells_changed_handler(info,
-				ril_cell_info_dbus_cells_changed_cb, dbus);
-
-	/* Register D-Bus interface */
-	if (g_dbus_register_interface(dbus->conn, dbus->path,
-			RIL_CELL_INFO_DBUS_INTERFACE, ril_cell_info_dbus_methods,
-			ril_cell_info_dbus_signals, NULL, dbus, NULL)) {
-		ofono_modem_add_interface(md->ofono,
-						RIL_CELL_INFO_DBUS_INTERFACE);
-		ril_cell_info_dbus_update_entries(dbus, FALSE);
-		return dbus;
-	} else {
-		ofono_error("RIL D-Bus register failed");
-		ril_cell_info_dbus_free(dbus);
-		return NULL;
-	}
-}
-
-void ril_cell_info_dbus_free(struct ril_cell_info_dbus *dbus)
-{
-	if (dbus) {
-		GSList *l;
-
-		DBG("%s", dbus->path);
-		g_dbus_unregister_interface(dbus->conn, dbus->path,
-						RIL_CELL_INFO_DBUS_INTERFACE);
-		ofono_modem_remove_interface(dbus->md->ofono,
-						RIL_CELL_INFO_DBUS_INTERFACE);
-
-		/* Unregister cells */
-		l = dbus->entries;
-		while (l) {
-			struct ril_cell_entry *entry = l->data;
-			g_dbus_unregister_interface(dbus->conn, entry->path,
-						RIL_CELL_DBUS_INTERFACE);
-			ril_cell_info_destroy_entry(entry);
-			l = l->next;
-		}
-		g_slist_free(dbus->entries);
-
-		dbus_connection_unref(dbus->conn);
-
-		ril_cell_info_remove_handler(dbus->info, dbus->handler_id);
-		ril_cell_info_unref(dbus->info);
-
-		g_free(dbus->path);
-		g_free(dbus);
-	}
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_config.c
+++ b/ofono/drivers/ril/ril_config.c
@@ -1,115 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_config.h"
-
-/* 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;
-}
-
-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;
-	}
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_config.h
+++ b/ofono/drivers/ril/ril_config.h
@@ -1,41 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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_CONFIG_H
-#define RIL_CONFIG_H
-
-#include "ril_types.h"
-
-/* Utilities for parsing ril_subscription.conf */
-
-#define RILCONF_SETTINGS_GROUP      "Settings"
-
-char* ril_config_get_string(GKeyFile *file, const char *group, const char *key);
-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);
-
-#endif /* RIL_CONFIG_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_constants.h
+++ b/ofono/drivers/ril/ril_constants.h
@@ -1,521 +0,0 @@
-/*
- *
- *  RIL constants adopted from AOSP's header:
- *
- *  /hardware/ril/reference_ril/ril.h
- *
- *  Copyright (C) 2013 Canonical 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
- *  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_CONSTANTS_H
-#define __RIL_CONSTANTS_H 1
-
-/* Error Codes */
-#define RIL_E_SUCCESS 0
-#define RIL_E_RADIO_NOT_AVAILABLE 1
-#define RIL_E_GENERIC_FAILURE 2
-#define RIL_E_PASSWORD_INCORRECT 3
-#define RIL_E_SIM_PIN2 4
-#define RIL_E_SIM_PUK2 5
-#define RIL_E_REQUEST_NOT_SUPPORTED 6
-#define RIL_E_CANCELLED 7
-#define RIL_E_OP_NOT_ALLOWED_DURING_VOICE_CALL 8
-#define RIL_E_OP_NOT_ALLOWED_BEFORE_REG_TO_NW 9
-#define RIL_E_SMS_SEND_FAIL_RETRY 10
-#define RIL_E_SIM_ABSENT 11
-#define RIL_E_SUBSCRIPTION_NOT_AVAILABLE 12
-#define RIL_E_MODE_NOT_SUPPORTED 13
-#define RIL_E_FDN_CHECK_FAILURE 14
-#define RIL_E_ILLEGAL_SIM_OR_ME 15
-#define RIL_E_UNUSED 16
-#define RIL_E_DIAL_MODIFIED_TO_USSD 17
-#define RIL_E_DIAL_MODIFIED_TO_SS 18
-#define RIL_E_DIAL_MODIFIED_TO_DIAL 19
-#define RIL_E_USSD_MODIFIED_TO_DIAL 20
-#define RIL_E_USSD_MODIFIED_TO_SS 21
-#define RIL_E_USSD_MODIFIED_TO_USSD 22
-#define RIL_E_SS_MODIFIED_TO_DIAL 23
-#define RIL_E_SS_MODIFIED_TO_USSD 24
-#define RIL_E_SS_MODIFIED_TO_SS 25
-#define RIL_E_SUBSCRIPTION_NOT_SUPPORTED 26
-#define RIL_E_MISSING_RESOURCE 27
-#define RIL_E_NO_SUCH_ELEMENT 28
-#define RIL_E_INVALID_PARAMETER 29
-
-/* call states */
-enum ril_call_state {
-	RIL_CALL_ACTIVE   = 0,
-	RIL_CALL_HOLDING  = 1,
-	RIL_CALL_DIALING  = 2,
-	RIL_CALL_ALERTING = 3,
-	RIL_CALL_INCOMING = 4,
-	RIL_CALL_WAITING  = 5
-};
-
-/* Radio state */
-enum ril_radio_state {
-	RADIO_STATE_OFF                   = 0,
-	RADIO_STATE_UNAVAILABLE           = 1,
-	RADIO_STATE_SIM_NOT_READY         = 2,
-	RADIO_STATE_SIM_LOCKED_OR_ABSENT  = 3,
-	RADIO_STATE_SIM_READY             = 4,
-	RADIO_STATE_RUIM_NOT_READY        = 5,
-	RADIO_STATE_RUIM_READY            = 6,
-	RADIO_STATE_RUIM_LOCKED_OR_ABSENT = 7,
-	RADIO_STATE_NV_NOT_READY          = 8,
-	RADIO_STATE_NV_READY              = 9,
-	RADIO_STATE_ON                    = 10
-};
-
-/* Preferred network types */
-enum ril_pref_net_type {
-	PREF_NET_TYPE_GSM_WCDMA                 = 0,
-	PREF_NET_TYPE_GSM_ONLY                  = 1,
-	PREF_NET_TYPE_WCDMA                     = 2,
-	PREF_NET_TYPE_GSM_WCDMA_AUTO            = 3,
-	PREF_NET_TYPE_CDMA_EVDO_AUTO            = 4,
-	PREF_NET_TYPE_CDMA_ONLY                 = 5,
-	PREF_NET_TYPE_EVDO_ONLY                 = 6,
-	PREF_NET_TYPE_GSM_WCDMA_CDMA_EVDO_AUTO  = 7,
-	PREF_NET_TYPE_LTE_CDMA_EVDO             = 8,
-	PREF_NET_TYPE_LTE_GSM_WCDMA             = 9,
-	PREF_NET_TYPE_LTE_CMDA_EVDO_GSM_WCDMA   = 10,
-	PREF_NET_TYPE_LTE_ONLY                  = 11,
-	PREF_NET_TYPE_LTE_WCDMA                 = 12
-};
-
-/* Radio technologies */
-enum ril_radio_tech {
-	RADIO_TECH_UNKNOWN  = 0,
-	RADIO_TECH_GPRS     = 1,
-	RADIO_TECH_EDGE     = 2,
-	RADIO_TECH_UMTS     = 3,
-	RADIO_TECH_IS95A    = 4,
-	RADIO_TECH_IS95B    = 5,
-	RADIO_TECH_1xRTT    = 6,
-	RADIO_TECH_EVDO_0   = 7,
-	RADIO_TECH_EVDO_A   = 8,
-	RADIO_TECH_HSDPA    = 9,
-	RADIO_TECH_HSUPA    = 10,
-	RADIO_TECH_HSPA     = 11,
-	RADIO_TECH_EVDO_B   = 12,
-	RADIO_TECH_EHRPD    = 13,
-	RADIO_TECH_LTE      = 14,
-	RADIO_TECH_HSPAP    = 15,
-	RADIO_TECH_GSM      = 16,
-	RADIO_TECH_TD_SCDMA = 17,
-	RADIO_TECH_IWLAN    = 18
-};
-
-/* See RIL_REQUEST_LAST_CALL_FAIL_CAUSE */
-#define CALL_FAIL_UNOBTAINABLE_NUMBER 1
-#define CALL_FAIL_NORMAL 16
-#define CALL_FAIL_BUSY 17
-#define CALL_FAIL_CONGESTION 34
-#define CALL_FAIL_ACM_LIMIT_EXCEEDED 68
-#define CALL_FAIL_CALL_BARRED 240
-#define CALL_FAIL_FDN_BLOCKED 241
-#define CALL_FAIL_IMSI_UNKNOWN_IN_VLR 242
-#define CALL_FAIL_IMEI_NOT_ACCEPTED 243
-#define CALL_FAIL_DIAL_MODIFIED_TO_USSD 244
-#define CALL_FAIL_DIAL_MODIFIED_TO_SS 245
-#define CALL_FAIL_DIAL_MODIFIED_TO_DIAL 246
-#define CALL_FAIL_CDMA_LOCKED_UNTIL_POWER_CYCLE 1000
-#define CALL_FAIL_CDMA_DROP 1001
-#define CALL_FAIL_CDMA_INTERCEPT 1002
-#define CALL_FAIL_CDMA_REORDER 1003
-#define CALL_FAIL_CDMA_SO_REJECT 1004
-#define CALL_FAIL_CDMA_RETRY_ORDER 1005
-#define CALL_FAIL_CDMA_ACCESS_FAILURE 1006
-#define CALL_FAIL_CDMA_PREEMPTED 1007
-#define CALL_FAIL_CDMA_NOT_EMERGENCY 1008
-#define CALL_FAIL_CDMA_ACCESS_BLOCKED 1009
-#define CALL_FAIL_ERROR_UNSPECIFIED 0xffff
-
-/* Not defined in ril.h but valid 3GPP specific cause values
- * for call control. See 3GPP TS 24.008 Annex H. */
-#define CALL_FAIL_NO_ROUTE_TO_DESTINATION 3
-#define CALL_FAIL_CHANNEL_UNACCEPTABLE 6
-#define CALL_FAIL_OPERATOR_DETERMINED_BARRING 8
-#define CALL_FAIL_NO_USER_RESPONDING 18
-#define CALL_FAIL_USER_ALERTING_NO_ANSWER 19
-#define CALL_FAIL_CALL_REJECTED 21
-#define CALL_FAIL_NUMBER_CHANGED 22
-#define CALL_FAIL_ANONYMOUS_CALL_REJECTION 24
-#define CALL_FAIL_PRE_EMPTION 25
-#define CALL_FAIL_DESTINATION_OUT_OF_ORDER 27
-#define CALL_FAIL_INCOMPLETE_NUMBER 28
-#define CALL_FAIL_FACILITY_REJECTED 29
-#define CALL_FAIL_NORMAL_UNSPECIFIED 31
-
-enum ril_data_call_fail_cause {
-    PDP_FAIL_NONE = 0,
-    PDP_FAIL_OPERATOR_BARRED = 0x08,
-    PDP_FAIL_INSUFFICIENT_RESOURCES = 0x1A,
-    PDP_FAIL_MISSING_UKNOWN_APN = 0x1B,
-    PDP_FAIL_UNKNOWN_PDP_ADDRESS_TYPE = 0x1C,
-    PDP_FAIL_USER_AUTHENTICATION = 0x1D,
-    PDP_FAIL_ACTIVATION_REJECT_GGSN = 0x1E,
-    PDP_FAIL_ACTIVATION_REJECT_UNSPECIFIED = 0x1F,
-    PDP_FAIL_SERVICE_OPTION_NOT_SUPPORTED = 0x20,
-    PDP_FAIL_SERVICE_OPTION_NOT_SUBSCRIBED = 0x21,
-    PDP_FAIL_SERVICE_OPTION_OUT_OF_ORDER = 0x22,
-    PDP_FAIL_NSAPI_IN_USE = 0x23,
-    PDP_FAIL_REGULAR_DEACTIVATION = 0x24,
-    PDP_FAIL_ONLY_IPV4_ALLOWED = 0x32,
-    PDP_FAIL_ONLY_IPV6_ALLOWED = 0x33,
-    PDP_FAIL_ONLY_SINGLE_BEARER_ALLOWED = 0x34,
-    PDP_FAIL_PROTOCOL_ERRORS = 0x6F,
-    PDP_FAIL_VOICE_REGISTRATION_FAIL = -1,
-    PDP_FAIL_DATA_REGISTRATION_FAIL = -2,
-    PDP_FAIL_SIGNAL_LOST = -3,
-    PDP_FAIL_PREF_RADIO_TECH_CHANGED = -4,
-    PDP_FAIL_RADIO_POWER_OFF = -5,
-    PDP_FAIL_TETHERED_CALL_ACTIVE = -6,
-    PDP_FAIL_ERROR_UNSPECIFIED = 0xffff
-};
-
-/* RIL_REQUEST_DEACTIVATE_DATA_CALL parameter */
-#define RIL_DEACTIVATE_DATA_CALL_NO_REASON 0
-#define RIL_DEACTIVATE_DATA_CALL_RADIO_SHUTDOWN 1
-
-/* RIL_REQUEST_SETUP_DATA_CALL */
-enum ril_data_profile {
-	RIL_DATA_PROFILE_DEFAULT = 0,
-	RIL_DATA_PROFILE_TETHERED = 1,
-	RIL_DATA_PROFILE_IMS = 2,
-	RIL_DATA_PROFILE_FOTA = 3,
-	RIL_DATA_PROFILE_CBS = 4,
-	RIL_DATA_PROFILE_OEM_BASE = 1000,
-	RIL_DATA_PROFILE_INVALID = 0xFFFFFFFF
-};
-
-enum ril_auth {
-	RIL_AUTH_NONE = 0,
-	RIL_AUTH_PAP = 1,
-	RIL_AUTH_CHAP = 2,
-	RIL_AUTH_BOTH = 3
-};
-
-#define RIL_CARD_MAX_APPS 8
-
-/* SIM card states */
-enum ril_card_state {
-	RIL_CARDSTATE_UNKNOWN = -1,
-	RIL_CARDSTATE_ABSENT  = 0,
-	RIL_CARDSTATE_PRESENT = 1,
-	RIL_CARDSTATE_ERROR   = 2
-};
-
-/* SIM personalization substates */
-enum ril_perso_substate {
-	RIL_PERSOSUBSTATE_UNKNOWN                   = 0,
-	RIL_PERSOSUBSTATE_IN_PROGRESS               = 1,
-	RIL_PERSOSUBSTATE_READY                     = 2,
-	RIL_PERSOSUBSTATE_SIM_NETWORK               = 3,
-	RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET        = 4,
-	RIL_PERSOSUBSTATE_SIM_CORPORATE             = 5,
-	RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER      = 6,
-	RIL_PERSOSUBSTATE_SIM_SIM                   = 7,
-	RIL_PERSOSUBSTATE_SIM_NETWORK_PUK           = 8,
-	RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK    = 9,
-	RIL_PERSOSUBSTATE_SIM_CORPORATE_PUK         = 10,
-	RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK  = 11,
-	RIL_PERSOSUBSTATE_SIM_SIM_PUK               = 12,
-	RIL_PERSOSUBSTATE_RUIM_NETWORK1             = 13,
-	RIL_PERSOSUBSTATE_RUIM_NETWORK2             = 14,
-	RIL_PERSOSUBSTATE_RUIM_HRPD                 = 15,
-	RIL_PERSOSUBSTATE_RUIM_CORPORATE            = 16,
-	RIL_PERSOSUBSTATE_RUIM_SERVICE_PROVIDER     = 17,
-	RIL_PERSOSUBSTATE_RUIM_RUIM                 = 18,
-	RIL_PERSOSUBSTATE_RUIM_NETWORK1_PUK         = 19,
-	RIL_PERSOSUBSTATE_RUIM_NETWORK2_PUK         = 20,
-	RIL_PERSOSUBSTATE_RUIM_HRPD_PUK             = 21,
-	RIL_PERSOSUBSTATE_RUIM_CORPORATE_PUK        = 22,
-	RIL_PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_PUK = 23,
-	RIL_PERSOSUBSTATE_RUIM_RUIM_PUK             = 24
-};
-
-/* SIM - App states */
-enum ril_app_state {
-	RIL_APPSTATE_ILLEGAL            = -1,
-	RIL_APPSTATE_UNKNOWN            = 0,
-	RIL_APPSTATE_DETECTED           = 1,
-	RIL_APPSTATE_PIN                = 2,
-	RIL_APPSTATE_PUK                = 3,
-	RIL_APPSTATE_SUBSCRIPTION_PERSO = 4,
-	RIL_APPSTATE_READY              = 5
-};
-
-/* SIM - PIN states */
-enum ril_pin_state {
-	RIL_PINSTATE_UNKNOWN              = 0,
-	RIL_PINSTATE_ENABLED_NOT_VERIFIED = 1,
-	RIL_PINSTATE_ENABLED_VERIFIED     = 2,
-	RIL_PINSTATE_DISABLED             = 3,
-	RIL_PINSTATE_ENABLED_BLOCKED      = 4,
-	RIL_PINSTATE_ENABLED_PERM_BLOCKED = 5
-};
-
-/* SIM - App types */
-enum ril_app_type {
-	RIL_APPTYPE_UNKNOWN = 0,
-	RIL_APPTYPE_SIM     = 1,
-	RIL_APPTYPE_USIM    = 2,
-	RIL_APPTYPE_RUIM    = 3,
-	RIL_APPTYPE_CSIM    = 4,
-	RIL_APPTYPE_ISIM    = 5
-};
-
-/* Cell info */
-enum ril_cell_info_type {
-	RIL_CELL_INFO_TYPE_NONE     = 0,
-	RIL_CELL_INFO_TYPE_GSM      = 1,
-	RIL_CELL_INFO_TYPE_CDMA     = 2,
-	RIL_CELL_INFO_TYPE_LTE      = 3,
-	RIL_CELL_INFO_TYPE_WCDMA    = 4,
-	RIL_CELL_INFO_TYPE_TD_SCDMA = 5
-};
-
-struct ril_cell_info_gsm {
-	int mcc;            /* Mobile Country Code (0..999) */
-	int mnc;            /* Mobile Network Code (0..999) */
-	int lac;            /* Location Area Code (0..65535) */
-	int cid;            /* GSM Cell Identity (0..65535) TS 27.007 */
-	int signalStrength; /* (0-31, 99) TS 27.007 */
-	int bitErrorRate;   /* (0-7, 99) TS 27.007 */
-};
-
-struct ril_cell_info_wcdma {
-	int mcc;            /* Mobile Country Code (0..999) */
-	int mnc;            /* Mobile Network Code (0..999) */
-	int lac;            /* Location Area Code (0..65535) */
-	int cid;            /* UMTS Cell Identity (0..268435455) TS 25.331 */
-	int psc;            /* Primary Scrambling Code (0..511) TS 25.331) */
-	int signalStrength; /* (0-31, 99) TS 27.007 */
-	int bitErrorRate;   /* (0-7, 99) TS 27.007 */
-};
-
-struct ril_cell_info_lte {
-	int mcc;            /* Mobile Country Code (0..999) */
-	int mnc;            /* Mobile Network Code (0..999) */
-	int ci;             /* Cell Identity */
-	int pci;            /* Physical cell id (0..503) */
-	int tac;            /* Tracking area code */
-	int signalStrength; /* (0-31, 99) TS 27.007 8.5 */
-	int rsrp;           /* Reference Signal Receive Power TS 36.133 */
-	int rsrq;           /* Reference Signal Receive Quality TS 36.133 */
-	int rssnr;          /* Reference Signal-to-Noise Ratio TS 36.101*/
-	int cqi;            /* Channel Quality Indicator TS 36.101 */
-	int timingAdvance;  /* (Distance = 300m/us) TS 36.321 */
-};
-
-/* RIL Request Messages */
-#define RIL_REQUEST_GET_SIM_STATUS 1
-#define RIL_REQUEST_ENTER_SIM_PIN 2
-#define RIL_REQUEST_ENTER_SIM_PUK 3
-#define RIL_REQUEST_ENTER_SIM_PIN2 4
-#define RIL_REQUEST_ENTER_SIM_PUK2 5
-#define RIL_REQUEST_CHANGE_SIM_PIN 6
-#define RIL_REQUEST_CHANGE_SIM_PIN2 7
-#define RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION 8
-#define RIL_REQUEST_GET_CURRENT_CALLS 9
-#define RIL_REQUEST_DIAL 10
-#define RIL_REQUEST_GET_IMSI 11
-#define RIL_REQUEST_HANGUP 12
-#define RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND 13
-#define RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND 14
-#define RIL_REQUEST_SWITCH_HOLDING_AND_ACTIVE 15
-#define RIL_REQUEST_CONFERENCE 16
-#define RIL_REQUEST_UDUB 17
-#define RIL_REQUEST_LAST_CALL_FAIL_CAUSE 18
-#define RIL_REQUEST_SIGNAL_STRENGTH 19
-#define RIL_REQUEST_VOICE_REGISTRATION_STATE 20
-#define RIL_REQUEST_DATA_REGISTRATION_STATE 21
-#define RIL_REQUEST_OPERATOR 22
-#define RIL_REQUEST_RADIO_POWER 23
-#define RIL_REQUEST_DTMF 24
-#define RIL_REQUEST_SEND_SMS 25
-#define RIL_REQUEST_SEND_SMS_EXPECT_MORE 26
-#define RIL_REQUEST_SETUP_DATA_CALL 27
-#define RIL_REQUEST_SIM_IO 28
-#define RIL_REQUEST_SEND_USSD 29
-#define RIL_REQUEST_CANCEL_USSD 30
-#define RIL_REQUEST_GET_CLIR 31
-#define RIL_REQUEST_SET_CLIR 32
-#define RIL_REQUEST_QUERY_CALL_FORWARD_STATUS 33
-#define RIL_REQUEST_SET_CALL_FORWARD 34
-#define RIL_REQUEST_QUERY_CALL_WAITING 35
-#define RIL_REQUEST_SET_CALL_WAITING 36
-#define RIL_REQUEST_SMS_ACKNOWLEDGE  37
-#define RIL_REQUEST_GET_IMEI 38
-#define RIL_REQUEST_GET_IMEISV 39
-#define RIL_REQUEST_ANSWER 40
-#define RIL_REQUEST_DEACTIVATE_DATA_CALL 41
-#define RIL_REQUEST_QUERY_FACILITY_LOCK 42
-#define RIL_REQUEST_SET_FACILITY_LOCK 43
-#define RIL_REQUEST_CHANGE_BARRING_PASSWORD 44
-#define RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE 45
-#define RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC 46
-#define RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL 47
-#define RIL_REQUEST_QUERY_AVAILABLE_NETWORKS 48
-#define RIL_REQUEST_DTMF_START 49
-#define RIL_REQUEST_DTMF_STOP 50
-#define RIL_REQUEST_BASEBAND_VERSION 51
-#define RIL_REQUEST_SEPARATE_CONNECTION 52
-#define RIL_REQUEST_SET_MUTE 53
-#define RIL_REQUEST_GET_MUTE 54
-#define RIL_REQUEST_QUERY_CLIP 55
-#define RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE 56
-#define RIL_REQUEST_DATA_CALL_LIST 57
-#define RIL_REQUEST_RESET_RADIO 58
-#define RIL_REQUEST_OEM_HOOK_RAW 59
-#define RIL_REQUEST_OEM_HOOK_STRINGS 60
-#define RIL_REQUEST_SCREEN_STATE 61
-#define RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION 62
-#define RIL_REQUEST_WRITE_SMS_TO_SIM 63
-#define RIL_REQUEST_DELETE_SMS_ON_SIM 64
-#define RIL_REQUEST_SET_BAND_MODE 65
-#define RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE 66
-#define RIL_REQUEST_STK_GET_PROFILE 67
-#define RIL_REQUEST_STK_SET_PROFILE 68
-#define RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND 69
-#define RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE 70
-#define RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM 71
-#define RIL_REQUEST_EXPLICIT_CALL_TRANSFER 72
-#define RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE 73
-#define RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE 74
-#define RIL_REQUEST_GET_NEIGHBORING_CELL_IDS 75
-#define RIL_REQUEST_SET_LOCATION_UPDATES 76
-#define RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE 77
-#define RIL_REQUEST_CDMA_SET_ROAMING_PREFERENCE 78
-#define RIL_REQUEST_CDMA_QUERY_ROAMING_PREFERENCE 79
-#define RIL_REQUEST_SET_TTY_MODE 80
-#define RIL_REQUEST_QUERY_TTY_MODE 81
-#define RIL_REQUEST_CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE 82
-#define RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE 83
-#define RIL_REQUEST_CDMA_FLASH 84
-#define RIL_REQUEST_CDMA_BURST_DTMF 85
-#define RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY 86
-#define RIL_REQUEST_CDMA_SEND_SMS 87
-#define RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE 88
-#define RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG 89
-#define RIL_REQUEST_GSM_SET_BROADCAST_SMS_CONFIG 90
-#define RIL_REQUEST_GSM_SMS_BROADCAST_ACTIVATION 91
-#define RIL_REQUEST_CDMA_GET_BROADCAST_SMS_CONFIG 92
-#define RIL_REQUEST_CDMA_SET_BROADCAST_SMS_CONFIG 93
-#define RIL_REQUEST_CDMA_SMS_BROADCAST_ACTIVATION 94
-#define RIL_REQUEST_CDMA_SUBSCRIPTION 95
-#define RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM 96
-#define RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM 97
-#define RIL_REQUEST_DEVICE_IDENTITY 98
-#define RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE 99
-#define RIL_REQUEST_GET_SMSC_ADDRESS 100
-#define RIL_REQUEST_SET_SMSC_ADDRESS 101
-#define RIL_REQUEST_REPORT_SMS_MEMORY_STATUS 102
-#define RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING 103
-#define RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE 104
-#define RIL_REQUEST_ISIM_AUTHENTICATION 105
-#define RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU 106
-#define RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS 107
-#define RIL_REQUEST_VOICE_RADIO_TECH 108
-#define RIL_REQUEST_GET_CELL_INFO_LIST 109
-#define RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE 110
-#define RIL_REQUEST_SET_INITIAL_ATTACH_APN 111
-#define RIL_REQUEST_IMS_REGISTRATION_STATE 112
-#define RIL_REQUEST_IMS_SEND_SMS 113
-#define RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC 114
-#define RIL_REQUEST_SIM_OPEN_CHANNEL 115
-#define RIL_REQUEST_SIM_CLOSE_CHANNEL 116
-#define RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL 117
-#define RIL_REQUEST_NV_READ_ITEM 118
-#define RIL_REQUEST_NV_WRITE_ITEM 119
-#define RIL_REQUEST_NV_WRITE_CDMA_PRL 120
-#define RIL_REQUEST_NV_RESET_CONFIG 121
-/* SET_UICC_SUBSCRIPTION was 115 in v9 and 122 in v10 and later */
-#define RIL_REQUEST_V9_SET_UICC_SUBSCRIPTION  115
-#define RIL_REQUEST_SET_UICC_SUBSCRIPTION  122
-#define RIL_REQUEST_ALLOW_DATA  123
-#define RIL_REQUEST_GET_HARDWARE_CONFIG 124
-#define RIL_REQUEST_SIM_AUTHENTICATION 125
-#define RIL_REQUEST_GET_DC_RT_INFO 126
-#define RIL_REQUEST_SET_DC_RT_INFO_RATE 127
-#define RIL_REQUEST_SET_DATA_PROFILE 128
-#define RIL_REQUEST_SHUTDOWN 129
-#define RIL_REQUEST_GET_RADIO_CAPABILITY 130
-#define RIL_REQUEST_SET_RADIO_CAPABILITY 131
-
-/* RIL Unsolicited Messages */
-#define RIL_UNSOL_RESPONSE_BASE 1000
-#define RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED 1000
-#define RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED 1001
-#define RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED 1002
-#define RIL_UNSOL_RESPONSE_NEW_SMS 1003
-#define RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT 1004
-#define RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM 1005
-#define RIL_UNSOL_ON_USSD 1006
-#define RIL_UNSOL_ON_USSD_REQUEST 1007
-#define RIL_UNSOL_NITZ_TIME_RECEIVED  1008
-#define RIL_UNSOL_SIGNAL_STRENGTH  1009
-#define RIL_UNSOL_DATA_CALL_LIST_CHANGED 1010
-#define RIL_UNSOL_SUPP_SVC_NOTIFICATION 1011
-#define RIL_UNSOL_STK_SESSION_END 1012
-#define RIL_UNSOL_STK_PROACTIVE_COMMAND 1013
-#define RIL_UNSOL_STK_EVENT_NOTIFY 1014
-#define RIL_UNSOL_STK_CALL_SETUP 1015
-#define RIL_UNSOL_SIM_SMS_STORAGE_FULL 1016
-#define RIL_UNSOL_SIM_REFRESH 1017
-#define RIL_UNSOL_CALL_RING 1018
-#define RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED 1019
-#define RIL_UNSOL_RESPONSE_CDMA_NEW_SMS 1020
-#define RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS 1021
-#define RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL 1022
-#define RIL_UNSOL_RESTRICTED_STATE_CHANGED 1023
-#define RIL_UNSOL_ENTER_EMERGENCY_CALLBACK_MODE 1024
-#define RIL_UNSOL_CDMA_CALL_WAITING 1025
-#define RIL_UNSOL_CDMA_OTA_PROVISION_STATUS 1026
-#define RIL_UNSOL_CDMA_INFO_REC 1027
-#define RIL_UNSOL_OEM_HOOK_RAW 1028
-#define RIL_UNSOL_RINGBACK_TONE 1029
-#define RIL_UNSOL_RESEND_INCALL_MUTE 1030
-#define RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED 1031
-#define RIL_UNSOL_CDMA_PRL_CHANGED 1032
-#define RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE 1033
-#define RIL_UNSOL_RIL_CONNECTED 1034
-#define RIL_UNSOL_VOICE_RADIO_TECH_CHANGED 1035
-#define RIL_UNSOL_CELL_INFO_LIST 1036
-#define RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED 1037
-#define RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED 1038
-#define RIL_UNSOL_SRVCC_STATE_NOTIFY 1039
-#define RIL_UNSOL_HARDWARE_CONFIG_CHANGED 1040
-#define RIL_UNSOL_DC_RT_INFO_CHANGED 1041
-#define RIL_UNSOL_RADIO_CAPABILITY 1042
-#define RIL_UNSOL_ON_SS 1043
-#define RIL_UNSOL_STK_CC_ALPHA_NOTIFY 1044
-
-/* Suplementary services Service class*/
-#define SERVICE_CLASS_NONE 0
-
-/* RIL_FACILITY_LOCK parameters */
-#define RIL_FACILITY_UNLOCK "0"
-#define RIL_FACILITY_LOCK "1"
-
-#endif /*__RIL_CONSTANTS_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_data.c
+++ b/ofono/drivers/ril/ril_data.c
--- a/ofono/drivers/ril/ril_data.h
+++ b/ofono/drivers/ril/ril_data.h
@@ -1,118 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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_DATA_H
-#define RIL_DATA_H
-
-#include "ril_types.h"
-#include <ofono/gprs-context.h>
-
-enum ril_data_call_active {
-	RIL_DATA_CALL_INACTIVE = 0,
-	RIL_DATA_CALL_LINK_DOWN = 1,
-	RIL_DATA_CALL_ACTIVE = 2
-};
-
-struct ril_data_call {
-	int cid;
-	enum ril_data_call_fail_cause status;
-	enum ril_data_call_active active;
-	enum ofono_gprs_proto prot;
-	int retry_time;
-	int mtu;
-	char *ifname;
-	char **dnses;
-	char **gateways;
-	char **addresses;
-};
-
-struct ril_data_call_list {
-	guint version;
-	guint num;
-	GSList *calls;
-};
-
-struct ril_data {
-	GObject object;
-	struct ril_data_priv *priv;
-	struct ril_data_call_list *data_calls;
-};
-
-enum ril_data_manager_flags {
-	RIL_DATA_MANAGER_3GLTE_HANDOVER = 0x01
-};
-
-enum ril_data_allow_data_opt {
-	RIL_ALLOW_DATA_AUTO,
-	RIL_ALLOW_DATA_ON,
-	RIL_ALLOW_DATA_OFF
-};
-
-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);
-void ril_data_manager_unref(struct ril_data_manager *dm);
-
-typedef void (*ril_data_cb_t)(struct ril_data *data, void *arg);
-typedef void (*ril_data_call_setup_cb_t)(struct ril_data *data,
-			int ril_status, const struct ril_data_call *call,
-			void *arg);
-typedef void (*ril_data_call_deactivate_cb_t)(struct ril_data *data,
-			int ril_status, void *arg);
-
-struct ril_data *ril_data_new(struct ril_data_manager *dm, const char *name,
-			struct ril_radio *radio, struct ril_network *network,
-			GRilIoChannel *io, enum ril_data_allow_data_opt opt);
-struct ril_data *ril_data_ref(struct ril_data *data);
-void ril_data_unref(struct ril_data *data);
-gboolean ril_data_allowed(struct ril_data *data);
-
-gulong ril_data_add_allow_changed_handler(struct ril_data *data,
-					ril_data_cb_t cb, void *arg);
-gulong ril_data_add_calls_changed_handler(struct ril_data *data,
-					ril_data_cb_t cb, void *arg);
-void ril_data_remove_handler(struct ril_data *data, gulong id);
-
-void ril_data_allow(struct ril_data *data, enum ril_data_role role);
-
-struct ril_data_request;
-struct ril_data_request *ril_data_call_setup(struct ril_data *data,
-				const struct ofono_gprs_primary_context *ctx,
-				ril_data_call_setup_cb_t cb, void *arg);
-struct ril_data_request *ril_data_call_deactivate(struct ril_data *data,
-			int cid, ril_data_call_deactivate_cb_t cb, void *arg);
-void ril_data_request_detach(struct ril_data_request *req);
-void ril_data_request_cancel(struct ril_data_request *req);
-
-void ril_data_call_free(struct ril_data_call *call);
-struct ril_data_call *ril_data_call_dup(const struct ril_data_call *call);
-struct ril_data_call *ril_data_call_find(struct ril_data_call_list *list,
-								int cid);
-
-#endif /* RIL_DATA_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_devinfo.c
+++ b/ofono/drivers/ril/ril_devinfo.c
@@ -1,193 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_util.h"
-#include "ril_log.h"
-
-/*
- * TODO: No public RIL api to query manufacturer or model.
- * Check where to get, could /system/build.prop be updated to have good values?
- */
-
-struct ril_devinfo {
-	struct ofono_devinfo *info;
-	GRilIoQueue *q;
-	guint register_id;
-	guint imei_id;
-	char *imei;
-};
-
-struct ril_devinfo_cbd {
-	struct ril_devinfo *di;
-	ofono_devinfo_query_cb_t cb;
-	gpointer data;
-};
-
-#define ril_devinfo_cbd_free g_free
-
-static inline struct ril_devinfo *ril_devinfo_get_data(
-					struct ofono_devinfo *info)
-{
-	return ofono_devinfo_get_data(info);
-}
-
-struct ril_devinfo_cbd *ril_devinfo_cbd_new(struct ril_devinfo *di,
-				ofono_devinfo_query_cb_t cb, void *data)
-{
-	struct ril_devinfo_cbd *cbd = g_new0(struct ril_devinfo_cbd, 1);
-
-	cbd->di = di;
-	cbd->cb = cb;
-	cbd->data = data;
-	return cbd;
-}
-
-static void ril_devinfo_query_unsupported(struct ofono_devinfo *info,
-			ofono_devinfo_query_cb_t cb, void *data)
-{
-	struct ofono_error error;
-	cb(ril_error_failure(&error), "", data);
-}
-
-static void ril_devinfo_query_cb(GRilIoChannel *io, int status,
-			const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_devinfo_cbd *cbd = user_data;
-
-	if (status == RIL_E_SUCCESS) {
-		char *res;
-		GRilIoParser rilp;
-		grilio_parser_init(&rilp, data, len);
-		res = grilio_parser_get_utf8(&rilp);
-		DBG("%s", res);
-		cbd->cb(ril_error_ok(&error), res ? res : "", cbd->data);
-		g_free(res);
-	} else {
-		cbd->cb(ril_error_failure(&error), NULL, cbd->data);
-	}
-}
-
-static void ril_devinfo_query_revision(struct ofono_devinfo *info,
-				ofono_devinfo_query_cb_t cb, void *data)
-{
-	struct ril_devinfo *di = ril_devinfo_get_data(info);
-
-	DBG("");
-	grilio_queue_send_request_full(di->q, NULL, RIL_REQUEST_BASEBAND_VERSION,
-				ril_devinfo_query_cb, ril_devinfo_cbd_free,
-				ril_devinfo_cbd_new(di, cb, data));
-}
-
-static gboolean ril_devinfo_query_serial_cb(void *user_data)
-{
-	struct ril_devinfo_cbd *cbd = user_data;
-	struct ril_devinfo *di = cbd->di;
-	struct ofono_error error;
-
-	GASSERT(di->imei_id);
-	di->imei_id = 0;
-
-	cbd->cb(ril_error_ok(&error), di->imei, cbd->data);
-	return FALSE;
-}
-
-static void ril_devinfo_query_serial(struct ofono_devinfo *info,
-				ofono_devinfo_query_cb_t cb,
-				void *data)
-{
-	struct ril_devinfo *di = ril_devinfo_get_data(info);
-
-	GASSERT(!di->imei_id);
-	if (di->imei_id) {
-		g_source_remove(di->imei_id);
-		di->imei_id = 0;
-	}
-
-	DBG("%s", di->imei);
-	di->imei_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-					ril_devinfo_query_serial_cb,
-					ril_devinfo_cbd_new(di, cb, data),
-					ril_devinfo_cbd_free);
-}
-
-static gboolean ril_devinfo_register(gpointer user_data)
-{
-	struct ril_devinfo *di = user_data;
-
-	DBG("");
-	di->register_id = 0;
-	ofono_devinfo_register(di->info);
-
-	/* This makes the timeout a single-shot */
-	return FALSE;
-}
-
-static int ril_devinfo_probe(struct ofono_devinfo *info, unsigned int vendor,
-				void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_devinfo *di = g_new0(struct ril_devinfo, 1);
-
-	DBG("%s %s %p", ril_modem_get_path(modem), modem->imei, di);
-	GASSERT(modem->imei);
-	di->q = grilio_queue_new(ril_modem_io(modem));
-	di->info = info;
-	di->imei = g_strdup(modem->imei);
-
-	di->register_id = g_idle_add(ril_devinfo_register, di);
-	ofono_devinfo_set_data(info, di);
-	return 0;
-}
-
-static void ril_devinfo_remove(struct ofono_devinfo *info)
-{
-	struct ril_devinfo *di = ril_devinfo_get_data(info);
-
-	DBG("%p", di);
-	ofono_devinfo_set_data(info, NULL);
-
-	if (di->register_id > 0) {
-		g_source_remove(di->register_id);
-	}
-
-	if (di->imei_id > 0) {
-		g_source_remove(di->imei_id);
-	}
-
-	grilio_queue_cancel_all(di->q, FALSE);
-	grilio_queue_unref(di->q);
-	g_free(di->imei);
-	g_free(di);
-}
-
-const struct ofono_devinfo_driver ril_devinfo_driver = {
-	.name                   = RILMODEM_DRIVER,
-	.probe                  = ril_devinfo_probe,
-	.remove                 = ril_devinfo_remove,
-	.query_manufacturer     = ril_devinfo_query_unsupported,
-	.query_model            = ril_devinfo_query_unsupported,
-	.query_revision         = ril_devinfo_query_revision,
-	.query_serial           = ril_devinfo_query_serial
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_ecclist.c
+++ b/ofono/drivers/ril/ril_ecclist.c
@@ -1,258 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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.
- */
-
-#include "ril_ecclist.h"
-#include "ril_log.h"
-
-#include <gutil_strv.h>
-#include <gutil_inotify.h>
-
-#include <sys/inotify.h>
-
-typedef GObjectClass RilEccListClass;
-typedef struct ril_ecclist RilEccList;
-
-struct ril_ecclist_priv {
-	struct ofono_sim *sim;
-	GUtilInotifyWatchCallback *dir_watch;
-	GUtilInotifyWatchCallback *file_watch;
-	char *dir;
-	char *path;
-	char *name;
-};
-
-enum ril_ecclist_signal {
-	SIGNAL_LIST_CHANGED,
-	SIGNAL_COUNT
-};
-
-#define SIGNAL_LIST_CHANGED_NAME        "ril-ecclist-changed"
-
-static guint ril_ecclist_signals[SIGNAL_COUNT] = { 0 };
-
-G_DEFINE_TYPE(RilEccList, ril_ecclist, G_TYPE_OBJECT)
-#define RIL_ECCLIST_TYPE (ril_ecclist_get_type())
-#define RIL_ECCLIST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
-	RIL_ECCLIST_TYPE, RilEccList))
-
-static char **ril_ecclist_read(struct ril_ecclist *self)
-{
-	struct ril_ecclist_priv *priv = self->priv;
-	char **list = NULL;
-
-	if (g_file_test(priv->path, G_FILE_TEST_EXISTS)) {
-		gsize len = 0;
-		gchar *content = NULL;
-		GError *error = NULL;
-
-		if (g_file_get_contents(priv->path, &content, &len, &error)) {
-			char **ptr;
-
-			DBG("%s = %s", priv->name, content);
-			list = g_strsplit(content, ",", 0);
-			for (ptr = list; *ptr; ptr++) {
-				*ptr = g_strstrip(*ptr);
-			}
-
-			gutil_strv_sort(list, TRUE);
-		} else if (error) {
-			DBG("%s: %s", priv->path, GERRMSG(error));
-			g_error_free(error);
-		}
-
-		g_free (content);
-	} else {
-		DBG("%s doesn't exist", priv->path);
-	}
-
-	return list;
-}
-
-static void ril_ecclist_update(struct ril_ecclist *self)
-{
-	struct ril_ecclist_priv *priv = self->priv;
-	char **list = ril_ecclist_read(self);
-
-	if (!gutil_strv_equal(self->list, list)) {
-		DBG("%s changed", priv->name);
-		g_strfreev(self->list);
-		self->list = list;
-		g_signal_emit(self, ril_ecclist_signals[SIGNAL_LIST_CHANGED], 0);
-	} else {
-		g_strfreev(list);
-	}
-}
-
-static void ril_ecclist_changed(GUtilInotifyWatch *watch, guint mask,
-			guint cookie, const char *name, void *user_data)
-{
-	struct ril_ecclist *self = RIL_ECCLIST(user_data);
-	struct ril_ecclist_priv *priv = self->priv;
-
-	ril_ecclist_update(self);
-
-	if (mask & IN_IGNORED) {
-		DBG("file %s is gone", priv->path);
-		gutil_inotify_watch_callback_free(priv->file_watch);
-		priv->file_watch = NULL;
-	}
-}
-
-static void ril_ecclist_dir_changed(GUtilInotifyWatch *watch, guint mask,
-			guint cookie, const char *name, void *user_data)
-{
-	struct ril_ecclist *self = RIL_ECCLIST(user_data);
-	struct ril_ecclist_priv *priv = self->priv;
-
-	DBG("0x%04x %s", mask, name);
-	if (!priv->file_watch && !g_strcmp0(name, priv->name)) {
-		priv->file_watch = gutil_inotify_watch_callback_new(priv->path,
-					IN_MODIFY | IN_CLOSE_WRITE,
-					ril_ecclist_changed, self);
-		if (priv->file_watch) {
-			DBG("watching %s", priv->path);
-			ril_ecclist_update(self);
-		}
-	}
-
-	if (mask & IN_IGNORED) {
-		DBG("%s is gone", priv->dir);
-		gutil_inotify_watch_callback_free(priv->dir_watch);
-		priv->dir_watch = NULL;
-	}
-}
-
-gulong ril_ecclist_add_list_changed_handler(struct ril_ecclist *self,
-					ril_ecclist_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_LIST_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-void ril_ecclist_remove_handler(struct ril_ecclist *self, gulong id)
-{
-	if (G_LIKELY(self) && G_LIKELY(id)) {
-		g_signal_handler_disconnect(self, id);
-	}
-}
-
-struct ril_ecclist *ril_ecclist_new(const char *path)
-{
-	if (path) {
-		struct ril_ecclist *self = g_object_new(RIL_ECCLIST_TYPE, 0);
-		struct ril_ecclist_priv *priv = self->priv;
-
-		DBG("%s", path);
-		priv->path = g_strdup(path);
-		priv->name = g_path_get_basename(path);
-		priv->dir = g_path_get_dirname(path);
-		priv->dir_watch = gutil_inotify_watch_callback_new(priv->dir,
-				IN_MODIFY|IN_MOVED_FROM|IN_MOVED_TO|IN_DELETE|
-				IN_CREATE|IN_DELETE_SELF|IN_CLOSE_WRITE,
-				ril_ecclist_dir_changed, self);
-		if (priv->dir_watch) {
-			DBG("watching %s", priv->dir);
-		}
-
-		self->list = ril_ecclist_read(self);
-		priv->file_watch = gutil_inotify_watch_callback_new(priv->path,
-				IN_MODIFY | IN_CLOSE_WRITE,
-				ril_ecclist_changed, self);
-		if (priv->file_watch) {
-			DBG("watching %s", priv->path);
-		}
-
-		return self;
-	}
-
-	return NULL;
-}
-
-struct ril_ecclist *ril_ecclist_ref(struct ril_ecclist *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_ref(RIL_ECCLIST(self));
-		return self;
-	} else {
-		return NULL;
-	}
-}
-
-void ril_ecclist_unref(struct ril_ecclist *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_unref(RIL_ECCLIST(self));
-	}
-}
-
-static void ril_ecclist_init(struct ril_ecclist *self)
-{
-	self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, RIL_ECCLIST_TYPE,
-						struct ril_ecclist_priv);
-}
-
-static void ril_ecclist_dispose(GObject *object)
-{
-	struct ril_ecclist *self = RIL_ECCLIST(object);
-	struct ril_ecclist_priv *priv = self->priv;
-
-	if (priv->dir_watch) {
-		gutil_inotify_watch_callback_free(priv->dir_watch);
-		priv->dir_watch = NULL;
-	}
-
-	if (priv->file_watch) {
-		gutil_inotify_watch_callback_free(priv->file_watch);
-		priv->file_watch = NULL;
-	}
-
-	G_OBJECT_CLASS(ril_ecclist_parent_class)->dispose(object);
-}
-
-static void ril_ecclist_finalize(GObject *object)
-{
-	struct ril_ecclist *self = RIL_ECCLIST(object);
-	struct ril_ecclist_priv *priv = self->priv;
-
-	GASSERT(!priv->dir_watch);
-	GASSERT(!priv->file_watch);
-	g_free(priv->dir);
-	g_free(priv->path);
-	g_free(priv->name);
-	g_strfreev(self->list);
-
-	G_OBJECT_CLASS(ril_ecclist_parent_class)->finalize(object);
-}
-
-static void ril_ecclist_class_init(RilEccListClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
-	object_class->dispose = ril_ecclist_dispose;
-	object_class->finalize = ril_ecclist_finalize;
-	g_type_class_add_private(klass, sizeof(struct ril_ecclist_priv));
-	ril_ecclist_signals[SIGNAL_LIST_CHANGED] =
-		g_signal_new(SIGNAL_LIST_CHANGED_NAME,
-			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
-			0, NULL, NULL, NULL, G_TYPE_NONE, 0);
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_ecclist.h
+++ b/ofono/drivers/ril/ril_ecclist.h
@@ -1,46 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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_ECCLIST_H
-#define RIL_ECCLIST_H
-
-#include "ril_types.h"
-
-struct ril_ecclist_priv;
-
-struct ril_ecclist {
-	GObject object;
-	struct ril_ecclist_priv *priv;
-	char **list;
-};
-
-typedef void (*ril_ecclist_cb_t)(struct ril_ecclist *ecc, void *arg);
-
-struct ril_ecclist *ril_ecclist_new(const char *path);
-struct ril_ecclist *ril_ecclist_ref(struct ril_ecclist *ecc);
-void ril_ecclist_unref(struct ril_ecclist *ecc);
-gulong ril_ecclist_add_list_changed_handler(struct ril_ecclist *ecc,
-					ril_ecclist_cb_t cb, void *arg);
-void ril_ecclist_remove_handler(struct ril_ecclist *ecc, gulong id);
-
-#endif /* RIL_ECCLIST_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_gprs.c
+++ b/ofono/drivers/ril/ril_gprs.c
@@ -1,283 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_network.h"
-#include "ril_data.h"
-#include "ril_util.h"
-#include "ril_log.h"
-
-#include "common.h"
-
-/*
- * This module is the ofono_gprs_driver implementation for rilmodem.
- *
- * Notes:
- *
- * 1. ofono_gprs_suspend/resume() are not used by this module, as
- *    the concept of suspended GPRS is not exposed by RILD.
- *
- * 2. ofono_gprs_bearer_notify() is never called as RILD does not
- *    expose an unsolicited event equivalent to +CPSB ( see 27.007
- *    7.29 ), and the tech values returned by REQUEST_DATA/VOICE
- *    _REGISTRATION requests do not match the values defined for
- *    <AcT> in the +CPSB definition.  Note, the values returned by
- *    the *REGISTRATION commands are aligned with those defined by
- *    +CREG ( see 27.003 7.2 ).
- */
-
-struct ril_gprs {
-	struct ofono_gprs *gprs;
-	struct ril_modem *md;
-	struct ril_data *data;
-	struct ril_network *network;
-	GRilIoChannel *io;
-	GRilIoQueue *q;
-	gboolean attached;
-	int max_cids;
-	enum network_registration_status registration_status;
-	guint register_id;
-	gulong network_event_id;
-	gulong data_event_id;
-	guint set_attached_id;
-};
-
-struct ril_gprs_cbd {
-	struct ril_gprs *gd;
-	ofono_gprs_cb_t cb;
-	gpointer data;
-};
-
-#define ril_gprs_cbd_free g_free
-
-static struct ril_gprs *ril_gprs_get_data(struct ofono_gprs *ofono)
-{
-	return ofono ? ofono_gprs_get_data(ofono) : NULL;
-}
-
-static struct ril_gprs_cbd *ril_gprs_cbd_new(struct ril_gprs *gd,
-						ofono_gprs_cb_t cb, void *data)
-{
-	struct ril_gprs_cbd *cbd = g_new0(struct ril_gprs_cbd, 1);
-
-	cbd->gd = gd;
-	cbd->cb = cb;
-	cbd->data = data;
-	return cbd;
-}
-
-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 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
-		 * network.c has been called) */
-		struct ofono_netreg *netreg = ril_modem_ofono_netreg(gd->md);
-		return ril_netreg_check_if_really_roaming(netreg, status);
-	}
-}
-
-static void ril_gprs_data_update_registration_state(struct ril_gprs *gd)
-{
-	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,
-				registration_status_to_string(status),
-				gd->attached);
-		gd->registration_status = status;
-		ofono_gprs_status_notify(gd->gprs, gd->registration_status);
-	}
-}
-
-static void ril_gprs_check_data_allowed(struct ril_gprs *gd)
-{
-	DBG("%s %d %d", ril_modem_get_path(gd->md), ril_data_allowed(gd->data),
-								gd->attached);
-	if (!ril_data_allowed(gd->data) && gd->attached) {
-		gd->attached = FALSE;
-		if (gd->gprs) {
-			ofono_gprs_detached_notify(gd->gprs);
-		}
-	}
-
-	ril_gprs_data_update_registration_state(gd);
-}
-
-static gboolean ril_gprs_set_attached_cb(gpointer user_data)
-{
-	struct ofono_error error;
-	struct ril_gprs_cbd *cbd = user_data;
-	struct ril_gprs *gd = cbd->gd;
-
-	GASSERT(gd->set_attached_id);
-	gd->set_attached_id = 0;
-	ril_gprs_check_data_allowed(gd);
-	cbd->cb(ril_error_ok(&error), cbd->data);
-	return FALSE;
-}
-
-static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,
-					ofono_gprs_cb_t cb, void *data)
-{
-	struct ril_gprs *gd = ril_gprs_get_data(gprs);
-
-	if (ril_data_allowed(gd->data) || !attached) {
-		DBG("%s attached: %d", ril_modem_get_path(gd->md), attached);
-		if (gd->set_attached_id) {
-			g_source_remove(gd->set_attached_id);
-		}
-		gd->attached = attached;
-		gd->set_attached_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-					ril_gprs_set_attached_cb,
-					ril_gprs_cbd_new(gd, cb, data),
-					ril_gprs_cbd_free);
-	} else {
-		struct ofono_error error;
-		DBG("%s not allowed to attach", ril_modem_get_path(gd->md));
-		cb(ril_error_failure(&error), data);
-	}
-}
-
-static void ril_gprs_allow_data_changed(struct ril_data *data, void *user_data)
-{
-	struct ril_gprs *gd = user_data;
-
-	GASSERT(gd->data == data);
-	DBG("%s %d", ril_modem_get_path(gd->md), ril_data_allowed(data));
-	if (!gd->set_attached_id) {
-		ril_gprs_check_data_allowed(gd);
-	}
-}
-
-static void ril_gprs_data_registration_state_changed(struct ril_network *net,
-							void *user_data)
-{
-	struct ril_gprs *gd = user_data;
-	const struct ril_registration_state *data = &net->data;
-
-	GASSERT(gd->network == net);
-	if (data->max_calls > gd->max_cids) {
-		DBG("Setting max cids to %d", data->max_calls);
-		gd->max_cids = data->max_calls;
-		ofono_gprs_set_cid_range(gd->gprs, 1, gd->max_cids);
-	}
-
-	ril_gprs_data_update_registration_state(gd);
-}
-
-static void ril_gprs_registration_status(struct ofono_gprs *gprs,
-				ofono_gprs_status_cb_t cb, void *data)
-{
-	struct ril_gprs *gd = ril_gprs_get_data(gprs);
-	struct ofono_error error;
-	const enum network_registration_status status = gd->attached ?
-		gd->registration_status :
-		NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
-
-
-	DBG("%d (%s)", status, registration_status_to_string(status));
-	cb(ril_error_ok(&error), status, data);
-}
-
-static gboolean ril_gprs_register(gpointer user_data)
-{
-	struct ril_gprs *gd = user_data;
-
-	gd->register_id = 0;
-	gd->network_event_id = ril_network_add_data_state_changed_handler(
-		gd->network, ril_gprs_data_registration_state_changed, gd);
-	gd->data_event_id = ril_data_add_allow_changed_handler(gd->data,
-		ril_gprs_allow_data_changed, gd);
-	gd->registration_status = ril_gprs_fix_registration_status(gd,
-						gd->network->data.status);
-
-	gd->max_cids = gd->network->data.max_calls;
-	if (gd->max_cids > 0) {
-		DBG("Setting max cids to %d", gd->max_cids);
-		ofono_gprs_set_cid_range(gd->gprs, 1, gd->max_cids);
-	}
-
-	ofono_gprs_register(gd->gprs);
-	return FALSE;
-}
-
-static int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor,
-								void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_gprs *gd = g_new0(struct ril_gprs, 1);
-
-	DBG("%s", ril_modem_get_path(modem));
-	gd->md = modem;
-	gd->io = grilio_channel_ref(ril_modem_io(modem));
-        gd->q = grilio_queue_new(gd->io);
-	gd->data = ril_data_ref(modem->data);
-	gd->network = ril_network_ref(modem->network);
-	gd->gprs = gprs;
-	ofono_gprs_set_data(gprs, gd);
-
-	/* ofono crashes if we register right away */
-	gd->register_id = g_idle_add(ril_gprs_register, gd);
-	return 0;
-}
-
-static void ril_gprs_remove(struct ofono_gprs *gprs)
-{
-	struct ril_gprs *gd = ril_gprs_get_data(gprs);
-
-	DBG("%s", ril_modem_get_path(gd->md));
-	ofono_gprs_set_data(gprs, NULL);
-
-	if (gd->set_attached_id) {
-		g_source_remove(gd->set_attached_id);
-	}
-
-	if (gd->register_id) {
-		g_source_remove(gd->register_id);
-	}
-
-	ril_network_remove_handler(gd->network, gd->network_event_id);
-	ril_network_unref(gd->network);
-
-	ril_data_remove_handler(gd->data, gd->data_event_id);
-	ril_data_unref(gd->data);
-
-	grilio_channel_unref(gd->io);
-	grilio_queue_cancel_all(gd->q, FALSE);
-	grilio_queue_unref(gd->q);
-	g_free(gd);
-}
-
-const struct ofono_gprs_driver ril_gprs_driver = {
-	.name                   = RILMODEM_DRIVER,
-	.probe                  = ril_gprs_probe,
-	.remove                 = ril_gprs_remove,
-	.set_attached           = ril_gprs_set_attached,
-	.attached_status        = ril_gprs_registration_status,
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_gprs_context.c
+++ b/ofono/drivers/ril/ril_gprs_context.c
@@ -1,680 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_network.h"
-#include "ril_data.h"
-#include "ril_util.h"
-#include "ril_mtu.h"
-#include "ril_log.h"
-
-#include <gutil_strv.h>
-
-#include <arpa/inet.h>
-
-#include "common.h"
-
-#define CTX_ID_NONE ((unsigned int)(-1))
-
-#define MAX_MTU 1280
-
-struct ril_gprs_context_call {
-	struct ril_data_request *req;
-	ofono_gprs_context_cb_t cb;
-	gpointer data;
-};
-
-struct ril_gprs_context {
-	struct ofono_gprs_context *gc;
-	struct ril_modem *modem;
-	struct ril_network *network;
-	struct ril_data *data;
-	guint active_ctx_cid;
-	gulong calls_changed_event_id;
-	struct ril_mtu_watch *mtu_watch;
-	struct ril_data_call *active_call;
-	struct ril_gprs_context_call activate;
-	struct ril_gprs_context_call deactivate;
-};
-
-static inline struct ril_gprs_context *ril_gprs_context_get_data(
-					struct ofono_gprs_context *gprs)
-{
-	return ofono_gprs_context_get_data(gprs);
-}
-
-static char *ril_gprs_context_netmask(const char *address)
-{
-	if (address) {
-		const char *suffix = strchr(address, '/');
-		if (suffix) {
-			int nbits = atoi(suffix + 1);
-			if (nbits > 0 && nbits < 33) {
-				const char* str;
-				struct in_addr in;
-				in.s_addr = htonl((nbits == 32) ? 0xffffffff :
-					((1 << nbits)-1) << (32-nbits));
-				str = inet_ntoa(in);
-				if (str) {
-					return g_strdup(str);
-				}
-			}
-		}
-	}
-	return g_strdup("255.255.255.0");
-}
-
-static void ril_gprs_context_set_ipv4(struct ofono_gprs_context *gc,
-						char * const *ip_addr)
-{
-	const guint n = gutil_strv_length(ip_addr);
-
-	if (n > 0) {
-		ofono_gprs_context_set_ipv4_address(gc, ip_addr[0], TRUE);
-		if (n > 1) {
-			ofono_gprs_context_set_ipv4_netmask(gc, ip_addr[1]);
-		}
-	}
-}
-
-static void ril_gprs_context_set_ipv6(struct ofono_gprs_context *gc,
-						char * const *ipv6_addr)
-{
-	const guint n = gutil_strv_length(ipv6_addr);
-
-	if (n > 0) {
-		ofono_gprs_context_set_ipv6_address(gc, ipv6_addr[0]);
-		if (n > 1) {
-			const int p = atoi(ipv6_addr[1]);
-			if (p > 0 && p <= 128) {
-				ofono_gprs_context_set_ipv6_prefix_length(gc, p);
-			}
-		}
-	}
-}
-
-static void ril_gprs_context_free_active_call(struct ril_gprs_context *gcd)
-{
-	if (gcd->active_call) {
-		ril_data_call_free(gcd->active_call);
-		gcd->active_call = NULL;
-	}
-	if (gcd->calls_changed_event_id) {
-		ril_data_remove_handler(gcd->data, gcd->calls_changed_event_id);
-		gcd->calls_changed_event_id = 0;
-	}
-	if (gcd->mtu_watch) {
-		ril_mtu_watch_free(gcd->mtu_watch);
-		gcd->mtu_watch = NULL;
-	}
-}
-
-static void ril_gprs_context_set_active_call(struct ril_gprs_context *gcd,
-					const struct ril_data_call *call)
-{
-	if (call) {
-		ril_data_call_free(gcd->active_call);
-		gcd->active_call = ril_data_call_dup(call);
-		if (!gcd->mtu_watch) {
-			gcd->mtu_watch = ril_mtu_watch_new(MAX_MTU);
-		}
-		ril_mtu_watch_set_ifname(gcd->mtu_watch, call->ifname);
-	} else {
-		ril_gprs_context_free_active_call(gcd);
-	}
-}
-
-static void ril_gprs_context_set_disconnected(struct ril_gprs_context *gcd)
-{
-	if (gcd->active_call) {
-		ril_gprs_context_free_active_call(gcd);
-		if (gcd->deactivate.req) {
-			struct ril_gprs_context_call deact = gcd->deactivate;
-
-			/*
-			 * Complete the deactivate request. We need to
-			 * clear gcd->deactivate first because cancelling
-			 * the deactivation request will probably result
-			 * in ril_gprs_context_deactivate_primary_cb() being
-			 * invoked with GRILIO_CANCELLED status. And we don't
-			 * want to fail the disconnect request because this
-			 * is a success (we wanted to disconnect the data
-			 * call and it's gone).
-			 *
-			 * Additionally, we need to make sure that we don't
-			 * complete the same request twice - that would crash
-			 * the core.
-			 */
-			memset(&gcd->deactivate, 0, sizeof(gcd->deactivate));
-			ril_data_request_cancel(deact.req);
-			if (deact.cb) {
-				struct ofono_error error;
-				ofono_info("Deactivated data call");
-				deact.cb(ril_error_ok(&error), deact.data);
-			}
-		}
-	}
-	if (gcd->active_ctx_cid != CTX_ID_NONE) {
-		guint id = gcd->active_ctx_cid;
-		gcd->active_ctx_cid = CTX_ID_NONE;
-		DBG("ofono context %u deactivated", id);
-		ofono_gprs_context_deactivated(gcd->gc, id);
-	}
-}
-
-static void ril_gprs_split_ip_by_protocol(char **ip_array,
-						char ***split_ip_addr,
-						char ***split_ipv6_addr)
-{
-	const int n = gutil_strv_length(ip_array);
-	int i;
-
-	*split_ipv6_addr = *split_ip_addr = NULL;
-	for (i = 0; i < n && (!*split_ipv6_addr || !*split_ip_addr); i++) {
-		const char *addr = ip_array[i];
-		switch (ril_address_family(addr)) {
-		case AF_INET:
-			if (!*split_ip_addr) {
-				char *mask = ril_gprs_context_netmask(addr);
-				*split_ip_addr = g_strsplit(addr, "/", 2);
-				if (gutil_strv_length(*split_ip_addr) == 2) {
-					g_free((*split_ip_addr)[1]);
-					(*split_ip_addr)[1] = mask;
-				} else {
-					/* This is rather unlikely to happen */
-					*split_ip_addr =
-						gutil_strv_add(*split_ip_addr,
-									mask);
-					g_free(mask);
-				}
-			}
-			break;
-		case AF_INET6:
-			if (!*split_ipv6_addr) {
-				*split_ipv6_addr = g_strsplit(addr, "/", 2);
-			}
-		}
-	}
-}
-
-static void ril_gprs_split_gw_by_protocol(char **gw_array, char **ip_gw,
-								char **ipv6_gw)
-{
-	const int n = gutil_strv_length(gw_array);
-	int i;
-
-	*ip_gw = *ipv6_gw = NULL;
-	for (i = 0; i < n && (!*ipv6_gw || !*ip_gw); i++) {
-		const char *gw_addr = gw_array[i];
-		switch (ril_address_family(gw_addr)) {
-		case AF_INET:
-			if (!*ip_gw) *ip_gw = g_strdup(gw_addr);
-			break;
-		case AF_INET6:
-			if (!*ipv6_gw) *ipv6_gw = g_strdup(gw_addr);
-			break;
-		}
-	}
-}
-
-static void ril_gprs_split_dns_by_protocol(char **dns_array, char ***dns_addr,
-							char ***dns_ipv6_addr)
-{
-	const int n = gutil_strv_length(dns_array);
-	int i;
-
-	*dns_ipv6_addr = *dns_addr = 0;
-	for (i = 0; i < n; i++) {
-		const char *addr = dns_array[i];
-		switch (ril_address_family(addr)) {
-		case AF_INET:
-			*dns_addr = gutil_strv_add(*dns_addr, addr);
-			break;
-		case AF_INET6:
-			*dns_ipv6_addr = gutil_strv_add(*dns_ipv6_addr, addr);
-			break;
-		}
-	}
-}
-
-/* Only compares the stuff that's important to us */
-static gboolean ril_gprs_context_data_call_equal(
-			const struct ril_data_call *c1,
-			const struct ril_data_call *c2)
-{
-	if (!c1 && !c2) {
-		return TRUE;
-	} else if (c1 && c2) {
-		return c1->cid == c2->cid &&
-			c1->active == c2->active && c1->prot == c2->prot &&
-			!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);
-	} else {
-		return FALSE;
-	}
-}
-
-static void ril_gprs_context_call_list_changed(struct ril_data *data, void *arg)
-{
-	struct ril_gprs_context *gcd = arg;
-	struct ofono_gprs_context *gc = gcd->gc;
-
-	/*
-	 * gcd->active_call can't be NULL here because this callback
-	 * is only registered when we have the active call and released
-	 * when active call is dropped.
-	 */
-	struct ril_data_call *prev_call = gcd->active_call;
-	const struct ril_data_call *call =
-		ril_data_call_find(data->data_calls, prev_call->cid);
-
-	if (call) {
-		/* Check if the call has been disconnected */
-		if (call->active == RIL_DATA_CALL_INACTIVE) {
-			ofono_error("Clearing active context");
-			ril_gprs_context_set_disconnected(gcd);
-			call = NULL;
-
-		/* Compare it against the last known state */
-		} else if (ril_gprs_context_data_call_equal(call, prev_call)) {
-			DBG("call %u didn't change", call->cid);
-			call = NULL;
-
-		} else {
-			DBG("call %u changed", call->cid);
-		}
-	} else {
-		ofono_error("Clearing active context");
-		ril_gprs_context_set_disconnected(gcd);
-	}
-
-	if (!call) {
-		/* We are not interested */
-		return;
-	}
-
-	/*
-	 * prev_call points to the previous active call, and it will
-	 * be deallocated at the end of the this function. Clear the
-	 * gcd->active_call pointer so that we don't deallocate it twice.
-	 */
-	gcd->active_call = NULL;
-	ril_gprs_context_set_active_call(gcd, call);
-
-	if (call->status != PDP_FAIL_NONE) {
-		ofono_info("data call status: %d", call->status);
-	}
-
-	if (call->active == RIL_DATA_CALL_ACTIVE) {
-		gboolean signal = FALSE;
-
-		if (call->ifname && g_strcmp0(call->ifname, prev_call->ifname)) {
-			DBG("interface changed");
-			signal = TRUE;
-			ofono_gprs_context_set_interface(gc, call->ifname);
-		}
-
-		if (!gutil_strv_equal(call->addresses, prev_call->addresses)) {
-			char **split_ip_addr = NULL;
-			char **split_ipv6_addr = NULL;
-
-			DBG("address changed");
-			signal = TRUE;
-
-			/* Pick 1 address of each protocol */
-			ril_gprs_split_ip_by_protocol(call->addresses,
-					&split_ip_addr, &split_ipv6_addr);
-
-			if ((call->prot == OFONO_GPRS_PROTO_IPV4V6 ||
-					call->prot == OFONO_GPRS_PROTO_IPV6) &&
-						split_ipv6_addr) {
-				ril_gprs_context_set_ipv6(gc, split_ipv6_addr);
-			}
-
-			if ((call->prot == OFONO_GPRS_PROTO_IPV4V6 ||
-					call->prot == OFONO_GPRS_PROTO_IP) &&
-						split_ip_addr) {
-				ril_gprs_context_set_ipv4(gc, split_ip_addr);
-			}
-
-			g_strfreev(split_ip_addr);
-			g_strfreev(split_ipv6_addr);
-		}
-
-		if (!gutil_strv_equal(call->gateways, prev_call->gateways)){
-			char *ip_gw = NULL;
-			char *ipv6_gw = NULL;
-
-			DBG("gateway changed");
-			signal = TRUE;
-
-			/* Pick 1 gw for each protocol*/
-			ril_gprs_split_gw_by_protocol(call->gateways,
-							&ip_gw, &ipv6_gw);
-
-			if ((call->prot == OFONO_GPRS_PROTO_IPV4V6 ||
-					call->prot == OFONO_GPRS_PROTO_IPV6) &&
-						ipv6_gw) {
-				ofono_gprs_context_set_ipv6_gateway(gc, ipv6_gw);
-			}
-
-			if ((call->prot == OFONO_GPRS_PROTO_IPV4V6 ||
-					call->prot == OFONO_GPRS_PROTO_IP) &&
-						ip_gw) {
-				ofono_gprs_context_set_ipv4_gateway(gc, ip_gw);
-			}
-
-			g_free(ip_gw);
-			g_free(ipv6_gw);
-		}
-
-		if (!gutil_strv_equal(call->dnses, prev_call->dnses)){
-			char **dns_ip = NULL;
-			char **dns_ipv6 = NULL;
-
-			DBG("name server(s) changed");
-			signal = TRUE;
-
-			/* split based on protocol*/
-			ril_gprs_split_dns_by_protocol(call->dnses,
-							&dns_ip, &dns_ipv6);
-
-			if ((call->prot == OFONO_GPRS_PROTO_IPV4V6 ||
-					call->prot == OFONO_GPRS_PROTO_IPV6) &&
-						dns_ipv6) {
-				ofono_gprs_context_set_ipv6_dns_servers(gc,
-						(const char **) dns_ipv6);
-			}
-
-			if ((call->prot == OFONO_GPRS_PROTO_IPV4V6 ||
-				call->prot == OFONO_GPRS_PROTO_IP) && dns_ip) {
-				ofono_gprs_context_set_ipv4_dns_servers(gc,
-							(const char**)dns_ip);
-			}
-
-			g_strfreev(dns_ip);
-			g_strfreev(dns_ipv6);
-		}
-
-		if (signal) {
-			ofono_gprs_context_signal_change(gc, call->cid);
-		}
-	}
-
-	ril_data_call_free(prev_call);
-}
-
-static void ril_gprs_context_activate_primary_cb(struct ril_data *data,
-			int ril_status, const struct ril_data_call *call,
-			void *user_data)
-{
-	struct ril_gprs_context *gcd = user_data;
-	struct ofono_gprs_context *gc = gcd->gc;
-	struct ofono_error error;
-	char **split_ip_addr = NULL;
-	char **split_ipv6_addr = NULL;
-	char* ip_gw = NULL;
-	char* ipv6_gw = NULL;
-	char** dns_addr = NULL;
-	char** dns_ipv6_addr = NULL;
-	ofono_gprs_context_cb_t cb;
-	gpointer cb_data;
-
-	ril_error_init_failure(&error);
-	if (ril_status != RIL_E_SUCCESS) {
-		ofono_error("GPRS context: Reply failure: %s",
-					ril_error_to_string(ril_status));
-		goto done;
-	}
-
-	if (call->status != PDP_FAIL_NONE) {
-		ofono_error("Unexpected data call status %d", call->status);
-		error.type = OFONO_ERROR_TYPE_CMS;
-		error.error = call->status;
-		goto done;
-	}
-
-	/* Must have interface */
-	if (!call->ifname) {
-		ofono_error("GPRS context: No interface");
-		goto done;
-	}
-
-	ofono_info("setting up data call");
-
-	/* Check the ip address */
-	ril_gprs_split_ip_by_protocol(call->addresses, &split_ip_addr,
-						&split_ipv6_addr);
-	if (!split_ip_addr && !split_ipv6_addr) {
-		ofono_error("GPRS context: No IP address");
-		goto done;
-	}
-
-	ril_error_init_ok(&error);
-	ril_gprs_context_set_active_call(gcd, call);
-
-	GASSERT(!gcd->calls_changed_event_id);
-	ril_data_remove_handler(gcd->data, gcd->calls_changed_event_id);
-	gcd->calls_changed_event_id =
-		ril_data_add_calls_changed_handler(gcd->data,
-			ril_gprs_context_call_list_changed, gcd);
-
-	ofono_gprs_context_set_interface(gc, call->ifname);
-	ril_gprs_split_gw_by_protocol(call->gateways, &ip_gw, &ipv6_gw);
-	ril_gprs_split_dns_by_protocol(call->dnses, &dns_addr, &dns_ipv6_addr);
-
-	if (split_ipv6_addr &&
-			(call->prot == OFONO_GPRS_PROTO_IPV6 ||
-			call->prot == OFONO_GPRS_PROTO_IPV4V6)) {
-		ril_gprs_context_set_ipv6(gc, split_ipv6_addr);
-		ofono_gprs_context_set_ipv6_gateway(gc, ipv6_gw);
-		ofono_gprs_context_set_ipv6_dns_servers(gc,
-						(const char **) dns_ipv6_addr);
-	}
-
-	if (split_ip_addr &&
-			(call->prot == OFONO_GPRS_PROTO_IP ||
-			call->prot == OFONO_GPRS_PROTO_IPV4V6)) {
-		ril_gprs_context_set_ipv4(gc, split_ip_addr);
-		ofono_gprs_context_set_ipv4_gateway(gc, ip_gw);
-		ofono_gprs_context_set_ipv4_dns_servers(gc,
-						(const char **) dns_addr);
-	}
-
-done:
-	g_strfreev(split_ip_addr);
-	g_strfreev(split_ipv6_addr);
-	g_strfreev(dns_addr);
-	g_strfreev(dns_ipv6_addr);
-	g_free(ip_gw);
-	g_free(ipv6_gw);
-
-	cb = gcd->activate.cb;
-	cb_data = gcd->activate.data;
-	GASSERT(gcd->activate.req);
-	memset(&gcd->activate, 0, sizeof(gcd->activate));
-
-	if (cb) {
-		if (error.type != OFONO_ERROR_TYPE_NO_ERROR) {
-			gcd->active_ctx_cid = CTX_ID_NONE;
-		}
-		cb(&error, cb_data);
-	}
-}
-
-static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
-				const struct ofono_gprs_primary_context *ctx,
-				ofono_gprs_context_cb_t cb, void *data)
-{
-	struct ril_gprs_context *gcd = ril_gprs_context_get_data(gc);
-	struct ofono_netreg *netreg = ril_modem_ofono_netreg(gcd->modem);
-	const int rs = ofono_netreg_get_status(netreg);
-
-	/* Let's make sure that we aren't connecting when roaming not allowed */
-	if (rs == NETWORK_REGISTRATION_STATUS_ROAMING) {
-		struct ofono_gprs *gprs = ril_modem_ofono_gprs(gcd->modem);
-		if (!ofono_gprs_get_roaming_allowed(gprs) &&
-			ril_netreg_check_if_really_roaming(netreg, rs) ==
-					NETWORK_REGISTRATION_STATUS_ROAMING) {
-			struct ofono_error error;
-			ofono_info("Can't activate context %d (roaming)",
-								ctx->cid);
-			cb(ril_error_failure(&error), data);
-			return;
-		}
-	}
-
-	ofono_info("Activating context: %d", ctx->cid);
-	GASSERT(!gcd->activate.req);
-	GASSERT(ctx->cid != CTX_ID_NONE);
-
-	gcd->active_ctx_cid = ctx->cid;
-	gcd->activate.cb = cb;
-	gcd->activate.data = data;
-	gcd->activate.req = ril_data_call_setup(gcd->data, ctx,
-				ril_gprs_context_activate_primary_cb, gcd);
-}
-
-static void ril_gprs_context_deactivate_primary_cb(struct ril_data *data,
-					int ril_status, void *user_data)
-{
-	struct ril_gprs_context *gcd = user_data;
-
-	/*
-	 * Data call list may change before the completion of the deactivate
-	 * request, in that case ril_gprs_context_set_disconnected will be
-	 * invoked and gcd->deactivate.req will be NULL.
-	 */
-	if (gcd->deactivate.req) {
-		struct ofono_error error;
-		ofono_gprs_context_cb_t cb = gcd->deactivate.cb;
-		gpointer cb_data = gcd->deactivate.data;
-
-		if (ril_status == RIL_E_SUCCESS) {
-			GASSERT(gcd->active_call);
-			ril_error_init_ok(&error);
-			ofono_info("Deactivated data call");
-		} else {
-			ril_error_init_failure(&error);
-			ofono_error("Deactivate failure: %s",
-					ril_error_to_string(ril_status));
-		}
-
-		memset(&gcd->deactivate, 0, sizeof(gcd->deactivate));
-		if (cb) {
-			ril_gprs_context_free_active_call(gcd);
-			cb(&error, cb_data);
-			return;
-		}
-	}
-
-	/* Make sure we are in the disconnected state */
-	ril_gprs_context_set_disconnected(gcd);
-}
-
-static void ril_gprs_context_deactivate_primary(struct ofono_gprs_context *gc,
-		unsigned int id, ofono_gprs_context_cb_t cb, void *data)
-{
-	struct ril_gprs_context *gcd = ril_gprs_context_get_data(gc);
-
-	GASSERT(gcd->active_call && gcd->active_ctx_cid == id);
-	ofono_info("Deactivate primary");
-
-	if (gcd->active_call && gcd->active_ctx_cid == id) {
-		gcd->deactivate.cb = cb;
-		gcd->deactivate.data = data;
-		gcd->deactivate.req = ril_data_call_deactivate(gcd->data,
-				gcd->active_call->cid,
-				ril_gprs_context_deactivate_primary_cb, gcd);
-	} else if (cb) {
-		struct ofono_error error;
-		cb(ril_error_ok(&error), data);
-	}
-}
-
-static void ril_gprs_context_detach_shutdown(struct ofono_gprs_context *gc,
-						unsigned int id)
-{
-	DBG("%d", id);
-	ril_gprs_context_deactivate_primary(gc, id, NULL, NULL);
-}
-
-static int ril_gprs_context_probe(struct ofono_gprs_context *gc,
-					unsigned int vendor, void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_gprs_context *gcd = g_new0(struct ril_gprs_context, 1);
-
-	DBG("");
-	gcd->gc = gc;
-	gcd->modem = modem;
-	gcd->network = ril_network_ref(modem->network);
-	gcd->data = ril_data_ref(modem->data);
-	gcd->active_ctx_cid = CTX_ID_NONE;
-	ofono_gprs_context_set_data(gc, gcd);
-	return 0;
-}
-
-static void ril_gprs_context_remove(struct ofono_gprs_context *gc)
-{
-	struct ril_gprs_context *gcd = ril_gprs_context_get_data(gc);
-
-	DBG("");
-	ofono_gprs_context_set_data(gc, NULL);
-
-	if (gcd->activate.req) {
-		/*
-		 * The core has already completed its pending D-Bus
-		 * request, invoking the completion callback will
-		 * cause libdbus to panic.
-		 */
-		ril_data_request_detach(gcd->activate.req);
-		ril_data_request_cancel(gcd->activate.req);
-	}
-
-	if (gcd->deactivate.req) {
-		/* Let it complete but we won't be around to be notified. */
-		ril_data_request_detach(gcd->deactivate.req);
-	} else if (gcd->active_call) {
-		ril_data_call_deactivate(gcd->data, gcd->active_call->cid,
-								NULL, NULL);
-	}
-
-	ril_data_remove_handler(gcd->data, gcd->calls_changed_event_id);
-	ril_data_unref(gcd->data);
-	ril_network_unref(gcd->network);
-	ril_data_call_free(gcd->active_call);
-	ril_mtu_watch_free(gcd->mtu_watch);
-	g_free(gcd);
-}
-
-const struct ofono_gprs_context_driver ril_gprs_context_driver = {
-	.name                   = RILMODEM_DRIVER,
-	.probe                  = ril_gprs_context_probe,
-	.remove                 = ril_gprs_context_remove,
-	.activate_primary       = ril_gprs_context_activate_primary,
-	.deactivate_primary     = ril_gprs_context_deactivate_primary,
-	.detach_shutdown        = ril_gprs_context_detach_shutdown,
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_log.h
+++ b/ofono/drivers/ril/ril_log.h
@@ -1,31 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2015 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_LOG_H
-#define RIL_LOG_H
-
-#define GLOG_MODULE_NAME ril_log
-#include <gutil_log.h>
-#include <ofono/log.h>
-
-#endif /* RIL_LOG_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_mce.c
+++ b/ofono/drivers/ril/ril_mce.c
@@ -1,268 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_mce.h"
-#include "ril_log.h"
-
-#include <ofono/dbus.h>
-
-#include <gdbus.h>
-
-/* <mce/dbus-names.h> */
-#define MCE_SERVICE             "com.nokia.mce"
-#define MCE_SIGNAL_IF           "com.nokia.mce.signal"
-#define MCE_REQUEST_IF          "com.nokia.mce.request"
-#define MCE_REQUEST_PATH        "/com/nokia/mce/request"
-#define MCE_DISPLAY_STATUS_GET  "get_display_status"
-#define MCE_DISPLAY_SIG         "display_status_ind"
-#define MCE_DISPLAY_DIM_STRING  "dimmed"
-#define MCE_DISPLAY_ON_STRING   "on"
-#define MCE_DISPLAY_OFF_STRING  "off"
-
-typedef GObjectClass RilMceClass;
-typedef struct ril_mce RilMce;
-
-struct ril_mce_priv {
-	GRilIoChannel *io;
-	DBusConnection *conn;
-	DBusPendingCall *req;
-	guint daemon_watch;
-	guint signal_watch;
-};
-
-enum ril_mce_signal {
-	SIGNAL_DISPLAY_STATE_CHANGED,
-	SIGNAL_COUNT
-};
-
-#define SIGNAL_DISPLAY_STATE_CHANGED_NAME   "ril-mce-display-state-changed"
-
-static guint ril_mce_signals[SIGNAL_COUNT] = { 0 };
-
-G_DEFINE_TYPE(RilMce, ril_mce, G_TYPE_OBJECT)
-#define RIL_MCE_TYPE (ril_mce_get_type())
-#define RIL_MCE(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj,RIL_MCE_TYPE,RilMce))
-
-static const char *ril_mce_display_state_string(enum ril_mce_display_state ds)
-{
-	switch (ds) {
-	case RIL_MCE_DISPLAY_OFF:
-		return MCE_DISPLAY_OFF_STRING;
-	case RIL_MCE_DISPLAY_DIM:
-		return MCE_DISPLAY_DIM_STRING;
-	case RIL_MCE_DISPLAY_ON:
-		return MCE_DISPLAY_ON_STRING;
-	default:
-		return NULL;
-	}
-}
-
-static enum ril_mce_display_state ril_mce_parse_display_state(DBusMessage *msg)
-{
-	DBusMessageIter it;
-
-	if (dbus_message_iter_init(msg, &it) &&
-		dbus_message_iter_get_arg_type(&it) == DBUS_TYPE_STRING) {
-		const char *value = NULL;
-
-		dbus_message_iter_get_basic(&it, &value);
-		if (!g_strcmp0(value, MCE_DISPLAY_OFF_STRING)) {
-			return RIL_MCE_DISPLAY_OFF;
-		} else if (!g_strcmp0(value, MCE_DISPLAY_DIM_STRING)) {
-			return RIL_MCE_DISPLAY_DIM;
-		} else {
-			GASSERT(!g_strcmp0(value, MCE_DISPLAY_ON_STRING));
-		}
-	}
-
-	return RIL_MCE_DISPLAY_ON;
-}
-
-static void ril_mce_update_display_state(struct ril_mce *self,
-					enum ril_mce_display_state state)
-{
-	if (self->display_state != state) {
-		self->display_state = state;
-		g_signal_emit(self, ril_mce_signals[
-					SIGNAL_DISPLAY_STATE_CHANGED], 0);
-	}
-}
-
-static gboolean ril_mce_display_changed(DBusConnection *conn,
-					DBusMessage *msg, void *user_data)
-{
-	enum ril_mce_display_state state = ril_mce_parse_display_state(msg);
-
-	DBG("%s", ril_mce_display_state_string(state));
-	ril_mce_update_display_state(RIL_MCE(user_data), state);
-	return TRUE;
-}
-
-static void ril_mce_display_status_reply(DBusPendingCall *call, void *user_data)
-{
-	struct ril_mce *self = RIL_MCE(user_data);
-	struct ril_mce_priv *priv = self->priv;
-	DBusMessage *reply = dbus_pending_call_steal_reply(call);
-	enum ril_mce_display_state state = ril_mce_parse_display_state(reply);
-
-	GASSERT(priv->req);
-	dbus_message_unref(reply);
-	dbus_pending_call_unref(priv->req);
-	priv->req = NULL;
-
-	DBG("%s", ril_mce_display_state_string(state));
-	ril_mce_update_display_state(self, state);
-}
-
-static void ril_mce_connect(DBusConnection *conn, void *user_data)
-{
-	struct ril_mce *self = RIL_MCE(user_data);
-	struct ril_mce_priv *priv = self->priv;
-
-	DBG("");
-	if (!priv->req) {
-		DBusMessage *msg = dbus_message_new_method_call(MCE_SERVICE,
-					MCE_REQUEST_PATH, MCE_REQUEST_IF,
-					MCE_DISPLAY_STATUS_GET);
-		if (g_dbus_send_message_with_reply(conn, msg, &priv->req, -1)) {
-			dbus_pending_call_set_notify(priv->req,
-						ril_mce_display_status_reply,
-						self, NULL);
-			dbus_message_unref(msg);
-		}
-	}
-	if (!priv->signal_watch) {
-		priv->signal_watch = g_dbus_add_signal_watch(conn,
-			MCE_SERVICE, NULL, MCE_SIGNAL_IF, MCE_DISPLAY_SIG,
-			ril_mce_display_changed, self, NULL);
-	}
-}
-
-static void ril_mce_disconnect(DBusConnection *conn, void *user_data)
-{
-	struct ril_mce *self = user_data;
-	struct ril_mce_priv *priv = self->priv;
-
-	DBG("");
-	if (priv->signal_watch) {
-		g_dbus_remove_watch(conn, priv->signal_watch);
-		priv->signal_watch = 0;
-	}
-	if (priv->req) {
-		dbus_pending_call_cancel(priv->req);
-		dbus_pending_call_unref(priv->req);
-	}
-}
-
-struct ril_mce *ril_mce_new()
-{
-	struct ril_mce *self = g_object_new(RIL_MCE_TYPE, NULL);
-	struct ril_mce_priv *priv = self->priv;
-
-	DBG("");
-	priv->daemon_watch = g_dbus_add_service_watch(priv->conn, MCE_SERVICE,
-		ril_mce_connect, ril_mce_disconnect, self, NULL);
-	return self;
-}
-
-struct ril_mce *ril_mce_ref(struct ril_mce *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_ref(RIL_MCE(self));
-		return self;
-	} else {
-		return NULL;
-	}
-}
-
-void ril_mce_unref(struct ril_mce *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_unref(RIL_MCE(self));
-	}
-}
-
-gulong ril_mce_add_display_state_changed_handler(struct ril_mce *self,
-					ril_mce_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_DISPLAY_STATE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-void ril_mce_remove_handler(struct ril_mce *self, gulong id)
-{
-	if (G_LIKELY(self) && G_LIKELY(id)) {
-		g_signal_handler_disconnect(self, id);
-	}
-}
-
-static void ril_mce_init(struct ril_mce *self)
-{
-	struct ril_mce_priv *priv = G_TYPE_INSTANCE_GET_PRIVATE(self,
-		RIL_MCE_TYPE, struct ril_mce_priv);
-
-	priv->conn = dbus_connection_ref(ofono_dbus_get_connection());
-	self->priv = priv;
-}
-
-static void ril_mce_dispose(GObject *object)
-{
-	struct ril_mce *self = RIL_MCE(object);
-	struct ril_mce_priv *priv = self->priv;
-
-	if (priv->signal_watch) {
-		g_dbus_remove_watch(priv->conn, priv->signal_watch);
-		priv->signal_watch = 0;
-	}
-	if (priv->daemon_watch) {
-		g_dbus_remove_watch(priv->conn, priv->daemon_watch);
-		priv->daemon_watch = 0;
-	}
-	if (priv->req) {
-		dbus_pending_call_cancel(priv->req);
-		dbus_pending_call_unref(priv->req);
-	}
-	G_OBJECT_CLASS(ril_mce_parent_class)->dispose(object);
-}
-
-static void ril_mce_finalize(GObject *object)
-{
-	struct ril_mce *self = RIL_MCE(object);
-	struct ril_mce_priv *priv = self->priv;
-
-	dbus_connection_unref(priv->conn);
-	G_OBJECT_CLASS(ril_mce_parent_class)->finalize(object);
-}
-
-static void ril_mce_class_init(RilMceClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
-	object_class->dispose = ril_mce_dispose;
-	object_class->finalize = ril_mce_finalize;
-	g_type_class_add_private(klass, sizeof(struct ril_mce_priv));
-	ril_mce_signals[SIGNAL_DISPLAY_STATE_CHANGED] =
-		g_signal_new(SIGNAL_DISPLAY_STATE_CHANGED_NAME,
-			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
-			0, NULL, NULL, NULL, G_TYPE_NONE, 0);
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_mce.h
+++ b/ofono/drivers/ril/ril_mce.h
@@ -1,51 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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_MCE_H
-#define RIL_MCE_H
-
-#include "ril_types.h"
-
-enum ril_mce_display_state {
-	RIL_MCE_DISPLAY_OFF,
-	RIL_MCE_DISPLAY_DIM,
-	RIL_MCE_DISPLAY_ON
-};
-
-struct ril_mce_priv;
-struct ril_mce {
-	GObject object;
-	struct ril_mce_priv *priv;
-	enum ril_mce_display_state display_state;
-};
-
-struct ril_mce *ril_mce_new(void);
-struct ril_mce *ril_mce_ref(struct ril_mce *mce);
-void ril_mce_unref(struct ril_mce *mce);
-
-typedef void (*ril_mce_cb_t)(struct ril_mce *mce, void *arg);
-gulong ril_mce_add_display_state_changed_handler(struct ril_mce *mce,
-					ril_mce_cb_t cb, void *arg);
-void ril_mce_remove_handler(struct ril_mce *mce, gulong id);
-
-#endif /* RIL_MCE_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_modem.c
+++ b/ofono/drivers/ril/ril_modem.c
@@ -1,505 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_network.h"
-#include "ril_radio.h"
-#include "ril_sim_card.h"
-#include "ril_sim_settings.h"
-#include "ril_data.h"
-#include "ril_util.h"
-#include "ril_log.h"
-
-#include "ofono.h"
-
-#define MAX_PDP_CONTEXTS        (2)
-#define ONLINE_TIMEOUT_SECS     (15) /* 20 sec is hardcoded in ofono core */
-
-enum ril_modem_power_state {
-	POWERED_OFF,
-	POWERED_ON,
-	POWERING_OFF
-};
-
-enum ril_modem_online_state {
-	OFFLINE,
-	GOING_ONLINE,
-	ONLINE,
-	GOING_OFFLINE
-};
-
-struct ril_modem_online_request {
-	ofono_modem_online_cb_t cb;
-	struct ril_modem_data *md;
-	void *data;
-	guint timeout_id;
-};
-
-struct ril_modem_data {
-	struct ril_modem modem;
-	GRilIoQueue *q;
-	struct ofono_radio_settings *radio_settings;
-	char *imei;
-	char *ecclist_file;
-	gboolean pre_sim_done;
-	gboolean allow_data;
-
-	guint online_check_id;
-	enum ril_modem_power_state power_state;
-	gulong radio_state_event_id;
-
-	ril_modem_cb_t removed_cb;
-	void *removed_cb_data;
-
-	ril_modem_online_cb_t online_cb;
-	void *online_cb_data;
-
-	struct ril_modem_online_request set_online;
-	struct ril_modem_online_request set_offline;
-};
-
-#define RADIO_POWER_TAG(md) (md)
-
-static struct ril_modem_data *ril_modem_data_from_ofono(struct ofono_modem *o)
-{
-	struct ril_modem_data *md = ofono_modem_get_data(o);
-	GASSERT(md->modem.ofono == o);
-	return md;
-}
-
-static struct ril_modem_data *ril_modem_data_from_modem(struct ril_modem *m)
-{
-	return m ? G_CAST(m, struct ril_modem_data, modem) : NULL;
-}
-
-static void *ril_modem_get_atom_data(struct ril_modem *modem,
-						enum ofono_atom_type type)
-{
-	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_sim *ril_modem_ofono_sim(struct ril_modem *modem)
-{
-	return ril_modem_get_atom_data(modem, OFONO_ATOM_TYPE_SIM);
-}
-
-struct ofono_gprs *ril_modem_ofono_gprs(struct ril_modem *modem)
-{
-	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);
-}
-
-void ril_modem_delete(struct ril_modem *md)
-{
-	if (md && md->ofono) {
-		ofono_modem_remove(md->ofono);
-	}
-}
-
-void ril_modem_set_removed_cb(struct ril_modem *modem, ril_modem_cb_t cb,
-								void *data)
-{
-	struct ril_modem_data *md = ril_modem_data_from_modem(modem);
-
-	md->removed_cb = cb;
-	md->removed_cb_data = data;
-}
-
-void ril_modem_set_online_cb(struct ril_modem *modem, ril_modem_online_cb_t cb,
-								void *data)
-{
-	struct ril_modem_data *md = ril_modem_data_from_modem(modem);
-
-	md->online_cb = cb;
-	md->online_cb_data = data;
-}
-
-static void ril_modem_online_request_ok(struct ril_modem_online_request *req)
-{
-	if (req->timeout_id) {
-		g_source_remove(req->timeout_id);
-		req->timeout_id = 0;
-	}
-
-	if (req->cb) {
-		struct ofono_error error;
-		ofono_modem_online_cb_t cb = req->cb;
-		void *data = req->data;
-
-		req->cb = NULL;
-		req->data = NULL;
-		cb(ril_error_ok(&error), data);
-	}
-}
-
-static void ril_modem_update_online_state(struct ril_modem_data *md)
-{
-	switch (md->modem.radio->state) {
-	case RADIO_STATE_ON:
-		DBG("online");
-		ril_modem_online_request_ok(&md->set_online);
-		break;
-
-	case RADIO_STATE_OFF:
-	case RADIO_STATE_UNAVAILABLE:
-		DBG("offline");
-		ril_modem_online_request_ok(&md->set_offline);
-		break;
-
-	default:
-		break;
-	}
-
-	if (!md->set_offline.timeout_id && !md->set_online.timeout_id &&
-					md->power_state == POWERING_OFF) {
-		md->power_state = POWERED_OFF;
-		if (md->modem.ofono) {
-			ofono_modem_set_powered(md->modem.ofono, FALSE);
-		}
-	}
-}
-
-static gboolean ril_modem_online_request_timeout(gpointer data)
-{
-	struct ril_modem_online_request *req = data;
-	struct ofono_error error;
-	ofono_modem_online_cb_t cb = req->cb;
-	void *cb_data = req->data;
-
-	GASSERT(req->timeout_id);
-	GASSERT(cb);
-
-	req->timeout_id = 0;
-	req->cb = NULL;
-	req->data = NULL;
-	cb(ril_error_failure(&error), cb_data);
-	ril_modem_update_online_state(req->md);
-
-	return G_SOURCE_REMOVE;
-}
-
-static gboolean ril_modem_online_check(gpointer data)
-{
-	struct ril_modem_data *md = data;
-
-	GASSERT(md->online_check_id);
-	md->online_check_id = 0;
-	ril_modem_update_online_state(md);
-	return FALSE;
-}
-
-static void ril_modem_schedule_online_check(struct ril_modem_data *md)
-{
-	if (!md->online_check_id) {
-		md->online_check_id = g_idle_add(ril_modem_online_check, md);
-	}
-}
-
-static void ril_modem_update_radio_settings(struct ril_modem_data *md)
-{
-	if (md->modem.radio->state == RADIO_STATE_ON) {
-		if (!md->radio_settings) {
-			DBG("Initializing radio settings interface");
-			md->radio_settings =
-				ofono_radio_settings_create(md->modem.ofono, 0,
-							RILMODEM_DRIVER, md);
-		}
-	} else if (md->radio_settings) {
-		DBG("Removing radio settings interface");
-		ofono_radio_settings_remove(md->radio_settings);
-		md->radio_settings = NULL;
-	}
-}
-
-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);
-}
-
-static void ril_modem_pre_sim(struct ofono_modem *modem)
-{
-	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
-
-	DBG("%s", ofono_modem_get_path(modem));
-	md->pre_sim_done = TRUE;
-	ofono_devinfo_create(modem, 0, RILMODEM_DRIVER, md);
-	ofono_sim_create(modem, 0, RILMODEM_DRIVER, md);
-	ofono_voicecall_create(modem, 0, RILMODEM_DRIVER, md);
-	ril_modem_update_radio_settings(md);
-	if (!md->radio_state_event_id) {
-		md->radio_state_event_id =
-			ril_radio_add_state_changed_handler(md->modem.radio,
-					ril_modem_radio_state_cb, md);
-	}
-}
-
-static void ril_modem_post_sim(struct ofono_modem *modem)
-{
-	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
-	struct ofono_gprs *gprs;
-
-	DBG("%s", ofono_modem_get_path(modem));
-	ofono_sms_create(modem, 0, RILMODEM_DRIVER, md);
-	gprs = ofono_gprs_create(modem, 0, RILMODEM_DRIVER, md);
-	if (gprs) {
-		int 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_add_context(gprs, gc);
-		}
-	}
-
-	ofono_phonebook_create(modem, 0, RILMODEM_DRIVER, md);
-	ofono_call_forwarding_create(modem, 0, RILMODEM_DRIVER, md);
-	ofono_call_barring_create(modem, 0, RILMODEM_DRIVER, md);
-	ofono_stk_create(modem, 0, RILMODEM_DRIVER, md);
-	ofono_message_waiting_register(ofono_message_waiting_create(modem));
-}
-
-static void ril_modem_post_online(struct ofono_modem *modem)
-{
-	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
-
-	DBG("%s", ofono_modem_get_path(modem));
-	ofono_call_volume_create(modem, 0, RILMODEM_DRIVER, md);
-	ofono_netreg_create(modem, 0, RILMODEM_DRIVER, md);
-	ofono_ussd_create(modem, 0, RILMODEM_DRIVER, md);
-	ofono_call_settings_create(modem, 0, RILMODEM_DRIVER, md);
-}
-
-static void ril_modem_set_online(struct ofono_modem *modem, ofono_bool_t online,
-				ofono_modem_online_cb_t cb, void *data)
-{
-	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
-	struct ril_modem_online_request *req;
-
-	DBG("%s going %sline", ofono_modem_get_path(modem),
-						online ? "on" : "off");
-
-	if (md->online_cb) {
-		md->online_cb(&md->modem, online, md->online_cb_data);
-	}
-
-	if (online) {
-		ril_radio_power_on(md->modem.radio, RADIO_POWER_TAG(md));
-		req = &md->set_online;
-	} else {
-		ril_radio_power_off(md->modem.radio, RADIO_POWER_TAG(md));
-		req = &md->set_offline;
-	}
-
-	req->cb = cb;
-	req->data = data;
-	if (req->timeout_id) {
-		g_source_remove(req->timeout_id);
-	}
-	req->timeout_id = g_timeout_add_seconds(ONLINE_TIMEOUT_SECS,
-					ril_modem_online_request_timeout, req);
-	ril_modem_schedule_online_check(md);
-}
-
-static int ril_modem_enable(struct ofono_modem *modem)
-{
-	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
-
-	DBG("%s", ofono_modem_get_path(modem));
-	md->power_state = POWERED_ON;
-	return 0;
-}
-
-static int ril_modem_disable(struct ofono_modem *modem)
-{
-	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
-
-	DBG("%s", ofono_modem_get_path(modem));
-	if (md->set_online.timeout_id || md->set_offline.timeout_id) {
-		md->power_state = POWERING_OFF;
-		return -EINPROGRESS;
-	} else {
-		md->power_state = POWERED_OFF;
-		return 0;
-	}
-}
-
-static int ril_modem_probe(struct ofono_modem *modem)
-{
-	DBG("%s", ofono_modem_get_path(modem));
-	return 0;
-}
-
-static void ril_modem_remove(struct ofono_modem *ofono)
-{
-	struct ril_modem_data *md = ril_modem_data_from_ofono(ofono);
-	struct ril_modem *modem = &md->modem;
-
-	DBG("%s", ril_modem_get_path(modem));
-	if (md->removed_cb) {
-		ril_modem_cb_t cb = md->removed_cb;
-		void *data = md->removed_cb_data;
-
-		md->removed_cb = NULL;
-		md->removed_cb_data = NULL;
-		cb(modem, data);
-	}
-
-	ofono_modem_set_data(ofono, NULL);
-
-	ril_radio_remove_handler(modem->radio, md->radio_state_event_id);
-	ril_radio_power_off(modem->radio, RADIO_POWER_TAG(md));
-	ril_radio_unref(modem->radio);
-
-	if (md->online_check_id) {
-		g_source_remove(md->online_check_id);
-	}
-
-	if (md->set_online.timeout_id) {
-		g_source_remove(md->set_online.timeout_id);
-	}
-
-	if (md->set_offline.timeout_id) {
-		g_source_remove(md->set_offline.timeout_id);
-	}
-
-	ril_network_unref(modem->network);
-	ril_sim_card_unref(modem->sim_card);
-	ril_sim_settings_unref(modem->sim_settings);
-	ril_data_unref(modem->data);
-	grilio_channel_unref(modem->io);
-	grilio_queue_cancel_all(md->q, FALSE);
-	grilio_queue_unref(md->q);
-	g_free(md->ecclist_file);
-	g_free(md->imei);
-	g_free(md);
-}
-
-struct ril_modem *ril_modem_create(GRilIoChannel *io, const char *log_prefix,
-		const struct ril_slot_info *slot, struct ril_radio *radio,
-		struct ril_network *network, struct ril_sim_card *card,
-		struct ril_data *data, struct ril_sim_settings *settings)
-{
-	/* Skip the slash from the path, it looks like "/ril_0" */
-	struct ofono_modem *ofono = ofono_modem_create(slot->path + 1,
-							RILMODEM_DRIVER);
-	if (ofono) {
-		int err;
-		struct ril_modem_data *md = g_new0(struct ril_modem_data, 1);
-		struct ril_modem *modem = &md->modem;
-
-		/*
-		 * ril_plugin.c must wait until IMEI becomes known before
-		 * creating the modem
-		 */
-		GASSERT(slot->imei);
-
-		/* Copy config */
-		modem->config = *slot->config;
-		modem->imei = md->imei = g_strdup(slot->imei);
-		modem->log_prefix = log_prefix;
-		modem->ecclist_file =
-		md->ecclist_file = g_strdup(slot->ecclist_file);
-
-		modem->ofono = ofono;
-		modem->radio = ril_radio_ref(radio);
-		modem->network = ril_network_ref(network);
-		modem->sim_card = ril_sim_card_ref(card);
-		modem->sim_settings = ril_sim_settings_ref(settings);
-		modem->data = ril_data_ref(data);
-		modem->io = grilio_channel_ref(io);
-		md->q = grilio_queue_new(io);
-		md->set_online.md = md;
-		md->set_offline.md = md;
-		ofono_modem_set_data(ofono, md);
-		err = ofono_modem_register(ofono);
-		if (!err) {
-			ril_radio_power_cycle(modem->radio);
-			GASSERT(io->connected);
-
-			/*
-			 * ofono_modem_reset sets Powered to TRUE without
-			 * issuing PropertyChange signal.
-			 */
-			ofono_modem_set_powered(modem->ofono, FALSE);
-			ofono_modem_set_powered(modem->ofono, TRUE);
-			md->power_state = POWERED_ON;
-
-			/*
-			 * With some RIL implementations, querying available
-			 * band modes causes some magic Android properties to
-			 * appear. Otherwise this request is pretty harmless
-			 * and useless.
-			 */
-			grilio_queue_send_request(md->q, NULL,
-				RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE);
-			return modem;
-		} else {
-			ofono_error("Error %d registering %s",
-				    err, RILMODEM_DRIVER);
-
-			/*
-			 * If ofono_modem_register() failed, then
-			 * ofono_modem_remove() won't invoke
-			 * ril_modem_remove() callback.
-			 */
-			ril_modem_remove(ofono);
-		}
-
-		ofono_modem_remove(ofono);
-	}
-
-	return NULL;
-}
-
-const struct ofono_modem_driver ril_modem_driver = {
-	.name           = RILMODEM_DRIVER,
-	.probe          = ril_modem_probe,
-	.remove         = ril_modem_remove,
-	.enable         = ril_modem_enable,
-	.disable        = ril_modem_disable,
-	.pre_sim        = ril_modem_pre_sim,
-	.post_sim       = ril_modem_post_sim,
-	.post_online    = ril_modem_post_online,
-	.set_online     = ril_modem_set_online
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_mtu.c
+++ b/ofono/drivers/ril/ril_mtu.c
@@ -1,223 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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.
- */
-
-#include "ril_mtu.h"
-#include "ril_log.h"
-
-#include <net/if.h>
-#include <sys/ioctl.h>
-
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-
-struct ril_mtu_watch {
-	int max_mtu;
-	char *ifname;
-	void *buf;
-	int bufsize;
-	GIOChannel *channel;
-	guint io_watch;
-	int fd;
-};
-
-static void ril_mtu_watch_limit_mtu(struct ril_mtu_watch *self)
-{
-	int fd = socket(PF_INET, SOCK_DGRAM, 0);
-	if (fd >= 0) {
-		struct ifreq ifr;
-		memset(&ifr, 0, sizeof(ifr));
-		strncpy(ifr.ifr_name, self->ifname, IFNAMSIZ);
-		if (ioctl(fd, SIOCGIFMTU, &ifr) < 0 ||
-					ifr.ifr_mtu > self->max_mtu) {
-			DBG("%s mtu %d => %d", self->ifname, ifr.ifr_mtu,
-								self->max_mtu);
-			ifr.ifr_mtu = self->max_mtu;
-			if (ioctl(fd, SIOCSIFMTU, &ifr) < 0) {
-				ofono_error("Failed to set MTU");
-			}
-		}
-		close(fd);
-	}
-}
-
-static void ril_mtu_watch_handle_rtattr(struct ril_mtu_watch *self,
-					const struct rtattr *rta, int len)
-{
-	int mtu = 0;
-	const char *ifname = NULL;
-	while (len > 0 && RTA_OK(rta, len) && (!mtu || !ifname)) {
-		switch (rta->rta_type) {
-		case IFLA_IFNAME:
-			ifname = RTA_DATA(rta);
-			break;
-		case IFLA_MTU:
-			mtu = *((int*)RTA_DATA(rta));
-			break;
-		}
-		rta = RTA_NEXT(rta, len);
-	}
-	if (mtu > self->max_mtu && !g_strcmp0(ifname, self->ifname)) {
-		DBG("%s %d", ifname, mtu);
-		ril_mtu_watch_limit_mtu(self);
-	}
-}
-
-static void ril_mtu_watch_handle_ifinfomsg(struct ril_mtu_watch *self,
-					const struct ifinfomsg *ifi, int len)
-{
-	if (ifi->ifi_flags & IFF_UP) {
-		const struct rtattr *rta = IFLA_RTA(ifi);
-		ril_mtu_watch_handle_rtattr(self, rta,
-					len - ((char*)rta - (char*)ifi));
-	}
-}
-
-static void ril_mtu_watch_handle_nlmsg(struct ril_mtu_watch *self,
-					const struct nlmsghdr *hdr, int len)
-{
-	while (len > 0 && NLMSG_OK(hdr, len)) {
-		if (hdr->nlmsg_type == RTM_NEWLINK) {
-			ril_mtu_watch_handle_ifinfomsg(self, NLMSG_DATA(hdr),
-						IFLA_PAYLOAD(hdr));
-		}
-		hdr = NLMSG_NEXT(hdr, len);
-        }
-}
-
-static gboolean ril_mtu_watch_event(GIOChannel *ch, GIOCondition cond,
-							gpointer data)
-{
-	struct ril_mtu_watch *self = data;
-	struct sockaddr_nl addr;
-	socklen_t addrlen = sizeof(addr);
-	ssize_t result = recvfrom(self->fd, self->buf, self->bufsize, 0,
-				(struct sockaddr *)&addr, &addrlen);
-	if (result > 0) {
-		if (!addr.nl_pid) {
-			ril_mtu_watch_handle_nlmsg(self, self->buf, result);
-		}
-		return G_SOURCE_CONTINUE;
-	} else if (result == 0 || errno == EINTR || errno == EAGAIN) {
-		return G_SOURCE_CONTINUE;
-	} else {
-		DBG("%s error %d", self->ifname, errno);
-		self->io_watch = 0;
-		return G_SOURCE_REMOVE;
-	}
-}
-
-static gboolean ril_mtu_watch_open_socket(struct ril_mtu_watch *self)
-{
-	GASSERT(self->fd < 0);
-	self->fd = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-	if (self->fd >= 0) {
-		struct sockaddr_nl nl;
-		memset(&nl, 0, sizeof(nl));
-		nl.nl_pid = getpid();
-		nl.nl_family = AF_NETLINK;
-		nl.nl_groups = RTMGRP_IPV4_IFADDR | RTMGRP_IPV4_ROUTE |
-				RTMGRP_IPV6_IFADDR | RTMGRP_IPV6_ROUTE |
-				RTMGRP_LINK;
-
-		if (bind(self->fd, (struct sockaddr*)&nl, sizeof(nl)) >= 0) {
-			return TRUE;
-		}
-		close(self->fd);
-		self->fd = -1;
-	}
-	return FALSE;
-}
-
-static gboolean ril_mtu_watch_start(struct ril_mtu_watch *self)
-{
-	if (self->fd >= 0) {
-		return TRUE;
-	} else if (ril_mtu_watch_open_socket(self)) {
-		GASSERT(!self->channel);
-		GASSERT(!self->io_watch);
-		self->channel = g_io_channel_unix_new(self->fd);
-		if (self->channel) {
-			g_io_channel_set_encoding(self->channel, NULL, NULL);
-			g_io_channel_set_buffered(self->channel, FALSE);
-			self->io_watch = g_io_add_watch(self->channel,
-					G_IO_IN | G_IO_NVAL | G_IO_HUP,
-					ril_mtu_watch_event, self);
-			return TRUE;
-		}
-		close(self->fd);
-		self->fd = -1;
-	}
-	return FALSE;
-}
-
-static void ril_mtu_watch_stop(struct ril_mtu_watch *self)
-{
-	if (self->io_watch) {
-		g_source_remove(self->io_watch);
-		self->io_watch = 0;
-	}
-	if (self->channel) {
-		g_io_channel_shutdown(self->channel, TRUE, NULL);
-		g_io_channel_unref(self->channel);
-		self->channel = NULL;
-	}
-	if (self->fd >= 0) {
-		close(self->fd);
-		self->fd = -1;
-	}
-}
-
-struct ril_mtu_watch *ril_mtu_watch_new(int max_mtu)
-{
-	struct ril_mtu_watch *self = g_new0(struct ril_mtu_watch, 1);
-	self->fd = -1;
-	self->max_mtu = max_mtu;
-	self->bufsize = 4096;
-	self->buf = g_malloc(self->bufsize);
-	return self;
-}
-
-void ril_mtu_watch_free(struct ril_mtu_watch *self)
-{
-	if (self) {
-		ril_mtu_watch_stop(self);
-		g_free(self->ifname);
-		g_free(self->buf);
-		g_free(self);
-	}
-}
-
-void ril_mtu_watch_set_ifname(struct ril_mtu_watch *self, const char *ifname)
-{
-	if (self && g_strcmp0(self->ifname, ifname)) {
-		g_free(self->ifname);
-		if (ifname) {
-			self->ifname = g_strdup(ifname);
-			ril_mtu_watch_limit_mtu(self);
-			ril_mtu_watch_start(self);
-		} else {
-			self->ifname = NULL;
-			ril_mtu_watch_stop(self);
-		}
-	}
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_mtu.h
+++ b/ofono/drivers/ril/ril_mtu.h
@@ -1,33 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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_MTU_H
-#define RIL_MTU_H
-
-#include "ril_types.h"
-
-struct ril_mtu_watch *ril_mtu_watch_new(int max_mtu);
-void ril_mtu_watch_free(struct ril_mtu_watch *mw);
-void ril_mtu_watch_set_ifname(struct ril_mtu_watch *mw, const char *ifname);
-
-#endif /* RIL_MTU_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_netreg.c
+++ b/ofono/drivers/ril/ril_netreg.c
@@ -1,552 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_network.h"
-#include "ril_util.h"
-#include "ril_log.h"
-
-#include "common.h"
-#include "simutil.h"
-
-enum ril_netreg_events {
-	NETREG_RIL_EVENT_NITZ_TIME_RECEIVED,
-	NETREG_RIL_EVENT_SIGNAL_STRENGTH,
-	NETREG_RIL_EVENT_COUNT
-};
-
-enum ril_netreg_network_events {
-	NETREG_NETWORK_EVENT_OPERATOR_CHANGED,
-	NETREG_NETWORK_EVENT_VOICE_STATE_CHANGED,
-	NETREG_NETWORK_EVENT_COUNT
-};
-
-struct ril_netreg {
-	GRilIoChannel *io;
-	GRilIoQueue *q;
-	struct ofono_netreg *netreg;
-	struct ril_network *network;
-	char *log_prefix;
-	guint timer_id;
-	guint notify_id;
-	guint current_operator_id;
-	gulong ril_event_id[NETREG_RIL_EVENT_COUNT];
-	gulong network_event_id[NETREG_NETWORK_EVENT_COUNT];
-};
-
-struct ril_netreg_cbd {
-	struct ril_netreg *nd;
-	union {
-		ofono_netreg_status_cb_t status;
-		ofono_netreg_operator_cb_t operator;
-		ofono_netreg_operator_list_cb_t operator_list;
-		ofono_netreg_register_cb_t reg;
-		ofono_netreg_strength_cb_t strength;
-		gpointer ptr;
-	} cb;
-	gpointer data;
-};
-
-#define ril_netreg_cbd_free g_free
-
-static inline struct ril_netreg *ril_netreg_get_data(struct ofono_netreg *ofono)
-{
-	return ofono ? ofono_netreg_get_data(ofono) : NULL;
-}
-
-static struct ril_netreg_cbd *ril_netreg_cbd_new(struct ril_netreg *nd,
-						void *cb, void *data)
-{
-	struct ril_netreg_cbd *cbd = g_new0(struct ril_netreg_cbd, 1);
-
-	cbd->nd = nd;
-	cbd->cb.ptr = cb;
-	cbd->data = data;
-	return cbd;
-}
-
-int ril_netreg_check_if_really_roaming(struct ofono_netreg *netreg,
-								gint status)
-{
-	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 (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;
-			}
-		}
-	}
-
-	return status;
-}
-
-static int ril_netreg_check_status(struct ril_netreg *nd, int status)
-{
-	return (nd && nd->netreg) ?
-		ril_netreg_check_if_really_roaming(nd->netreg, status) :
-		status;
-}
-
-static gboolean ril_netreg_status_notify_cb(gpointer user_data)
-{
-	struct ril_netreg *nd = user_data;
-	const struct ril_registration_state *reg = &nd->network->voice;
-
-	DBG("%s", nd->log_prefix);
-	GASSERT(nd->notify_id);
-	nd->notify_id = 0;
-	ofono_netreg_status_notify(nd->netreg,
-			ril_netreg_check_status(nd, reg->status),
-			reg->lac, reg->ci, reg->access_tech);
-	return FALSE;
-}
-
-static void ril_netreg_status_notify(struct ril_network *net, void *user_data)
-{
-	struct ril_netreg *nd = user_data;
-
-	/* Coalesce multiple notifications into one */
-	if (nd->notify_id) {
-		DBG("%snotification aready queued", nd->log_prefix);
-	} else {
-		DBG("%squeuing notification", nd->log_prefix);
-		nd->notify_id = g_idle_add(ril_netreg_status_notify_cb, nd);
-	}
-}
-
-static void ril_netreg_registration_status(struct ofono_netreg *netreg,
-			ofono_netreg_status_cb_t cb, void *data)
-{
-	struct ril_netreg *nd = ril_netreg_get_data(netreg);
-	const struct ril_registration_state *reg = &nd->network->voice;
-	struct ofono_error error;
-
-	DBG("%s", nd->log_prefix);
-	cb(ril_error_ok(&error),
-			ril_netreg_check_status(nd, reg->status),
-			reg->lac, reg->ci, reg->access_tech, data);
-}
-
-static gboolean ril_netreg_current_operator_cb(void *user_data)
-{
-	struct ril_netreg_cbd *cbd = user_data;
-	struct ril_netreg *nd = cbd->nd;
-	ofono_netreg_operator_cb_t cb = cbd->cb.operator;
-	struct ofono_error error;
-
-	DBG("%s", nd->log_prefix);
-	GASSERT(nd->current_operator_id);
-	nd->current_operator_id = 0;
-
-	cb(ril_error_ok(&error), nd->network->operator, cbd->data);
-	return FALSE;
-}
-
-static void ril_netreg_current_operator(struct ofono_netreg *netreg,
-				ofono_netreg_operator_cb_t cb, void *data)
-{
-	struct ril_netreg *nd = ril_netreg_get_data(netreg);
-
-	/*
-	 * Calling ofono_netreg_status_notify() may result in
-	 * ril_netreg_current_operator() being invoked even if one
-	 * is already pending. Since ofono core doesn't associate
-	 * any context with individual calls, we can safely assume
-	 * that such a call essentially cancels the previous one.
-	 */
-	if (nd->current_operator_id) {
-		g_source_remove(nd->current_operator_id);
-	}
-
-	nd->current_operator_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-					ril_netreg_current_operator_cb,
-					ril_netreg_cbd_new(nd, cb, data),
-					ril_netreg_cbd_free);
-}
-
-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 ofono_network_operator *list;
-	struct ofono_error error;
-	int noperators = 0, i;
-	GRilIoParser rilp;
-	gboolean ok = TRUE;
-
-	if (status != RIL_E_SUCCESS) {
-		ofono_error("Failed to retrive the list of operators: %s",
-						ril_error_to_string(status));
-		cb(ril_error_failure(&error), 0, NULL, cbd->data);
-		return;
-	}
-
-	grilio_parser_init(&rilp, data, len);
-
-	/* Number of operators at the list (4 strings for every operator) */
-	grilio_parser_get_int32(&rilp, &noperators);
-	GASSERT(!(noperators % 4));
-	noperators /= 4;
-	ofono_info("noperators = %d", noperators);
-
-	list = g_new0(struct ofono_network_operator, noperators);
-	for (i = 0; i < noperators && ok; i++) {
-		struct ofono_network_operator *op = list + i;
-		char *lalpha = grilio_parser_get_utf8(&rilp);
-		char *salpha = grilio_parser_get_utf8(&rilp);
-		char *numeric = grilio_parser_get_utf8(&rilp);
-		char *status = grilio_parser_get_utf8(&rilp);
-
-		/* Try to use long by default */
-		if (lalpha) {
-			strncpy(op->name, lalpha,
-					OFONO_MAX_OPERATOR_NAME_LENGTH);
-		} else if (salpha) {
-			strncpy(op->name, salpha,
-					OFONO_MAX_OPERATOR_NAME_LENGTH);
-		} else {
-			op->name[0] = 0;
-		}
-
-		/* Set the proper status  */
-		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 = cbd->nd->network->voice.access_tech;
-			}
-			DBG("[operator=%s, %s, %s, status: %s]", op->name,
-						op->mcc, op->mnc, status);
-		} else {
-			DBG("failed to parse operator list");
-		}
-
-		g_free(lalpha);
-		g_free(salpha);
-		g_free(numeric);
-		g_free(status);
-	}
-
-	if (ok) {
-		cb(ril_error_ok(&error), noperators, list, cbd->data);
-	} else {
-		cb(ril_error_failure(&error), 0, NULL, cbd->data);
-	}
-
-	g_free(list);
-}
-
-static void ril_netreg_list_operators(struct ofono_netreg *netreg,
-				ofono_netreg_operator_list_cb_t cb, void *data)
-{
-	struct ril_netreg *nd = ril_netreg_get_data(netreg);
-
-	grilio_queue_send_request_full(nd->q, NULL,
-			RIL_REQUEST_QUERY_AVAILABLE_NETWORKS,
-			ril_netreg_list_operators_cb, ril_netreg_cbd_free,
-			ril_netreg_cbd_new(nd, cb, data));
-}
-
-static void ril_netreg_register_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_netreg_cbd *cbd = user_data;
-	ofono_netreg_register_cb_t cb = cbd->cb.reg;
-	struct ofono_error error;
-
-	if (status == RIL_E_SUCCESS) {
-		cb(ril_error_ok(&error), cbd->data);
-	} else {
-		ofono_error("registration failed, ril result %d", status);
-		cb(ril_error_failure(&error), cbd->data);
-	}
-}
-
-static void ril_netreg_register_auto(struct ofono_netreg *netreg,
-				ofono_netreg_register_cb_t cb, void *data)
-{
-	struct ril_netreg *nd = ril_netreg_get_data(netreg);
-
-	ofono_info("nw select automatic");
-	grilio_queue_send_request_full(nd->q, NULL,
-			RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC,
-			ril_netreg_register_cb, ril_netreg_cbd_free,
-			ril_netreg_cbd_new(nd, cb, data));
-}
-
-static void ril_netreg_register_manual(struct ofono_netreg *netreg,
-				const char *mcc, const char *mnc,
-				ofono_netreg_register_cb_t cb, void *data)
-{
-	struct ril_netreg *nd = ril_netreg_get_data(netreg);
-	GRilIoRequest *req = grilio_request_new();
-
-	ofono_info("nw select manual: %s%s", mcc, mnc);
-	grilio_request_append_format(req, "%s%s+0", mcc, mnc);
-	grilio_queue_send_request_full(nd->q, req,
-			RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL,
-			ril_netreg_register_cb, ril_netreg_cbd_free,
-			ril_netreg_cbd_new(nd, cb, data));
-	grilio_request_unref(req);
-}
-
-static int ril_netreg_get_signal_strength(const void *data, guint len)
-{
-	GRilIoParser rilp;
-	int gw_signal = 0, cdma_dbm = 0, evdo_dbm = 0, lte_signal = 0;
-
-	grilio_parser_init(&rilp, data, len);
-
-	/* RIL_SignalStrength_v6 */
-	/* GW_SignalStrength */
-	grilio_parser_get_int32(&rilp, &gw_signal);
-	grilio_parser_get_int32(&rilp, NULL); /* bitErrorRate */
-
-	/* CDMA_SignalStrength */
-	grilio_parser_get_int32(&rilp, &cdma_dbm);
-	grilio_parser_get_int32(&rilp, NULL); /* ecio */
-
-	/* EVDO_SignalStrength */
-	grilio_parser_get_int32(&rilp, &evdo_dbm);
-	grilio_parser_get_int32(&rilp, NULL); /* ecio */
-	grilio_parser_get_int32(&rilp, NULL); /* signalNoiseRatio */
-
-	/* LTE_SignalStrength */
-	grilio_parser_get_int32(&rilp, &lte_signal);
-	grilio_parser_get_int32(&rilp, NULL); /* rsrp */
-	grilio_parser_get_int32(&rilp, NULL); /* rsrq */
-	grilio_parser_get_int32(&rilp, NULL); /* rssnr */
-	grilio_parser_get_int32(&rilp, NULL); /* cqi */
-
-	DBG("gw: %d, cdma: %d, evdo: %d, lte: %d", gw_signal, cdma_dbm,
-							evdo_dbm, lte_signal);
-
-	/* Return the first valid one */
-	if (gw_signal != 99 && gw_signal != -1) {
-		return (gw_signal * 100) / 31;
-	}
-
-	if (lte_signal != 99 && lte_signal != -1) {
-		return (lte_signal * 100) / 31;
-	}
-
-	/* In case of dbm, return the value directly */
-	if (cdma_dbm != -1) {
-		return MIN(cdma_dbm, 100);
-	}
-
-	if (evdo_dbm != -1) {
-		return MIN(evdo_dbm, 100);
-	}
-
-	return -1;
-}
-
-static void ril_netreg_strength_notify(GRilIoChannel *io, guint ril_event,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_netreg *nd = user_data;
-	int strength;
-
-	GASSERT(ril_event == RIL_UNSOL_SIGNAL_STRENGTH);
-	strength = ril_netreg_get_signal_strength(data, len);
-	DBG("%d", strength);
-	ofono_netreg_strength_notify(nd->netreg, strength);
-}
-
-static void ril_netreg_strength_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_netreg_cbd *cbd = user_data;
-	ofono_netreg_strength_cb_t cb = cbd->cb.strength;
-	struct ofono_error error;
-
-	if (status == RIL_E_SUCCESS) {
-		int strength = ril_netreg_get_signal_strength(data, len);
-		cb(ril_error_ok(&error), strength, cbd->data);
-	} else {
-		ofono_error("Failed to retrive the signal strength: %s",
-						ril_error_to_string(status));
-		cb(ril_error_failure(&error), -1, cbd->data);
-	}
-}
-
-static void ril_netreg_strength(struct ofono_netreg *netreg,
-				ofono_netreg_strength_cb_t cb, void *data)
-{
-	struct ril_netreg *nd = ril_netreg_get_data(netreg);
-	GRilIoRequest* req = grilio_request_new();
-
-	grilio_request_set_retry(req, RIL_RETRY_MS, -1);
-	grilio_queue_send_request_full(nd->q, req,
-			RIL_REQUEST_SIGNAL_STRENGTH, ril_netreg_strength_cb,
-			ril_netreg_cbd_free, ril_netreg_cbd_new(nd, cb, data));
-	grilio_request_unref(req);
-}
-
-static void ril_netreg_nitz_notify(GRilIoChannel *io, guint ril_event,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_netreg *nd = user_data;
-	GRilIoParser rilp;
-	struct ofono_network_time time;
-	int year, mon, mday, hour, min, sec, dst, tzi;
-	char tzs, tz[4];
-	gchar *nitz;
-
-	GASSERT(ril_event == RIL_UNSOL_NITZ_TIME_RECEIVED);
-
-	grilio_parser_init(&rilp, data, len);
-	nitz = grilio_parser_get_utf8(&rilp);
-
-	DBG("%s", nitz);
-	sscanf(nitz, "%u/%u/%u,%u:%u:%u%c%u,%u", &year, &mon, &mday,
-			&hour, &min, &sec, &tzs, &tzi, &dst);
-	snprintf(tz, sizeof(tz), "%c%d", tzs, tzi);
-
-	time.utcoff = atoi(tz) * 15 * 60;
-	time.dst = dst;
-	time.sec = sec;
-	time.min = min;
-	time.hour = hour;
-	time.mday = mday;
-	time.mon = mon;
-	time.year = 2000 + year;
-
-	ofono_netreg_time_notify(nd->netreg, &time);
-	g_free(nitz);
-}
-
-static gboolean ril_netreg_register(gpointer user_data)
-{
-	struct ril_netreg *nd = user_data;
-
-	GASSERT(nd->timer_id);
-	nd->timer_id = 0;
-	ofono_netreg_register(nd->netreg);
-
-	/* Register for network state changes */
-	nd->network_event_id[NETREG_NETWORK_EVENT_OPERATOR_CHANGED] =
-		ril_network_add_operator_changed_handler(nd->network,
-			ril_netreg_status_notify, nd);
-	nd->network_event_id[NETREG_NETWORK_EVENT_VOICE_STATE_CHANGED] =
-		ril_network_add_voice_state_changed_handler(nd->network,
-			ril_netreg_status_notify, nd);
-
-	/* Register for network time updates */
-	nd->ril_event_id[NETREG_RIL_EVENT_NITZ_TIME_RECEIVED] =
-		grilio_channel_add_unsol_event_handler(nd->io,
-			ril_netreg_nitz_notify, 
-			RIL_UNSOL_NITZ_TIME_RECEIVED, nd);
-
-	/* Register for signal strength changes */
-	nd->ril_event_id[NETREG_RIL_EVENT_SIGNAL_STRENGTH] =
-		grilio_channel_add_unsol_event_handler(nd->io,
-			ril_netreg_strength_notify,
-			RIL_UNSOL_SIGNAL_STRENGTH, nd);
-
-	/* This makes the timeout a single-shot */
-	return FALSE;
-}
-
-static int ril_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
-				void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_netreg *nd = g_new0(struct ril_netreg, 1);
-	guint slot = ril_modem_slot(modem);
-
-	DBG("[%u] %p", slot, netreg);
-	nd->log_prefix = g_strdup_printf("%s_%u ", RILMODEM_DRIVER, slot);
-	nd->io = grilio_channel_ref(ril_modem_io(modem));
-	nd->q = grilio_queue_new(nd->io);
-	nd->network = ril_network_ref(modem->network);
-	nd->netreg = netreg;
-
-	ofono_netreg_set_data(netreg, nd);
-	nd->timer_id = g_idle_add(ril_netreg_register, nd);
-	return 0;
-}
-
-static void ril_netreg_remove(struct ofono_netreg *netreg)
-{
-	struct ril_netreg *nd = ril_netreg_get_data(netreg);
-	int i;
-
-	DBG("%p", netreg);
-	grilio_queue_cancel_all(nd->q, FALSE);
-	ofono_netreg_set_data(netreg, NULL);
-
-	if (nd->timer_id > 0) {
-		g_source_remove(nd->timer_id);
-	}
-
-	if (nd->notify_id) {
-		g_source_remove(nd->notify_id);
-	}
-
-	if (nd->current_operator_id) {
-		g_source_remove(nd->current_operator_id);
-	}
-
-	for (i=0; i<G_N_ELEMENTS(nd->network_event_id); i++) {
-		ril_network_remove_handler(nd->network, nd->network_event_id[i]);
-	}
-	ril_network_unref(nd->network);
-
-	grilio_channel_remove_handlers(nd->io, nd->ril_event_id,
-						G_N_ELEMENTS(nd->ril_event_id));
-
-	grilio_channel_unref(nd->io);
-	grilio_queue_unref(nd->q);
-	g_free(nd->log_prefix);
-	g_free(nd);
-}
-
-const struct ofono_netreg_driver ril_netreg_driver = {
-	.name                   = RILMODEM_DRIVER,
-	.probe                  = ril_netreg_probe,
-	.remove                 = ril_netreg_remove,
-	.registration_status    = ril_netreg_registration_status,
-	.current_operator       = ril_netreg_current_operator,
-	.list_operators         = ril_netreg_list_operators,
-	.register_auto          = ril_netreg_register_auto,
-	.register_manual        = ril_netreg_register_manual,
-	.strength               = ril_netreg_strength
-};
-
-/*
- * 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,850 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_network.h"
-#include "ril_radio.h"
-#include "ril_sim_card.h"
-#include "ril_sim_settings.h"
-#include "ril_util.h"
-#include "ril_log.h"
-
-#include <grilio_queue.h>
-#include <grilio_request.h>
-#include <grilio_parser.h>
-
-#include <gutil_misc.h>
-
-#include <ofono/netreg.h>
-
-#include "common.h"
-
-#define SET_PREF_MODE_HOLDOFF_SEC RIL_RETRY_SECS
-
-typedef GObjectClass RilNetworkClass;
-typedef struct ril_network RilNetwork;
-
-enum ril_network_timer {
-	TIMER_SET_RAT_HOLDOFF,
-	TIMER_FORCE_CHECK_PREF_MODE,
-	TIMER_COUNT
-};
-
-enum ril_network_radio_event {
-	RADIO_EVENT_STATE_CHANGED,
-	RADIO_EVENT_ONLINE_CHANGED,
-	RADIO_EVENT_COUNT
-};
-
-struct ril_network_priv {
-	GRilIoChannel *io;
-	GRilIoQueue *q;
-	struct ril_radio *radio;
-	struct ril_sim_card *sim_card;
-	enum ofono_radio_access_mode max_pref_mode;
-	int rat;
-	char *log_prefix;
-	guint operator_poll_id;
-	guint voice_poll_id;
-	guint data_poll_id;
-	guint timer[TIMER_COUNT];
-	gulong query_rat_id;
-	gulong set_rat_id;
-	gulong ril_event_id;
-	gulong settings_event_id;
-	gulong sim_status_event_id;
-	gulong radio_event_id[RADIO_EVENT_COUNT];
-	struct ofono_network_operator operator;
-};
-
-enum ril_network_signal {
-	SIGNAL_OPERATOR_CHANGED,
-	SIGNAL_VOICE_STATE_CHANGED,
-	SIGNAL_DATA_STATE_CHANGED,
-	SIGNAL_PREF_MODE_CHANGED,
-	SIGNAL_COUNT
-};
-
-#define SIGNAL_OPERATOR_CHANGED_NAME    "ril-network-operator-changed"
-#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"
-
-static guint ril_network_signals[SIGNAL_COUNT] = { 0 };
-
-G_DEFINE_TYPE(RilNetwork, ril_network, G_TYPE_OBJECT)
-#define RIL_NETWORK_TYPE (ril_network_get_type())
-#define RIL_NETWORK(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj,\
-        RIL_NETWORK_TYPE,RilNetwork))
-
-#define RIL_NETWORK_SIGNAL(klass,name) \
-	ril_network_signals[SIGNAL_##name##_CHANGED] = \
-		g_signal_new(SIGNAL_##name##_CHANGED_NAME, \
-			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST, \
-			0, NULL, NULL, NULL, G_TYPE_NONE, 0)
-
-#define DBG_(self,fmt,args...) DBG("%s" fmt, (self)->priv->log_prefix, ##args)
-
-/* Some assumptions: */
-G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_ANY == 0);
-G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_GSM > OFONO_RADIO_ACCESS_MODE_ANY);
-G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_UMTS > OFONO_RADIO_ACCESS_MODE_GSM);
-G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_LTE > OFONO_RADIO_ACCESS_MODE_UMTS);
-
-static void ril_network_query_pref_mode(struct ril_network *self);
-static void ril_network_set_pref_mode(struct ril_network *self, int rat);
-
-static void ril_network_emit(struct ril_network *self,
-						enum ril_network_signal sig)
-{
-	g_signal_emit(self, ril_network_signals[sig], 0);
-}
-
-static void ril_network_stop_timer(struct ril_network *self,
-					enum ril_network_timer tid)
-{
-	struct ril_network_priv *priv = self->priv;
-
-	if (priv->timer[tid]) {
-		g_source_remove(priv->timer[tid]);
-		priv->timer[tid] = 0;
-	}
-}
-
-static void ril_network_reset_state(struct ril_registration_state *reg)
-{
-	memset(reg, 0, sizeof(*reg));
-	reg->status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
-	reg->access_tech = -1;
-	reg->ril_tech = -1;
-	reg->lac = -1;
-	reg->ci = -1;
-}
-
-static gboolean ril_network_parse_response(struct ril_network *self,
-	const void *data, guint len, struct ril_registration_state *reg)
-{
-	int nparams, ril_status;
-	gchar *sstatus = NULL, *slac = NULL, *sci = NULL;
-	gchar *stech = NULL, *sreason = NULL, *smax = NULL;
-	GRilIoParser rilp;
-
-	ril_network_reset_state(reg);
-
-	/* Size of response string array. The minimum seen in the wild is 3 */
-	grilio_parser_init(&rilp, data, len);
-	if (!grilio_parser_get_int32(&rilp, &nparams) || nparams < 3) {
-		DBG_(self, "broken response");
-		return FALSE;
-	}
-
-	sstatus = grilio_parser_get_utf8(&rilp);              /* response[0] */
-	if (!sstatus) {
-		DBG_(self, "No sstatus value returned!");
-		return FALSE;
-	}
-
-	slac = grilio_parser_get_utf8(&rilp);                 /* response[1] */
-	sci = grilio_parser_get_utf8(&rilp);                  /* response[2] */
-
-	if (nparams > 3) {
-		stech = grilio_parser_get_utf8(&rilp);        /* response[3] */
-	}
-
-	ril_status = atoi(sstatus);
-	if (ril_status > 10) {
-		reg->status = ril_status - 10;
-	} else {
-		reg->status = ril_status;
-	}
-
-	/* FIXME: need to review VOICE_REGISTRATION response
-	 * as it returns up to 15 parameters ( vs. 6 for DATA ).
-	 *
-	 * The first four parameters are the same for both
-	 * responses ( although status includes values for
-	 * emergency calls for VOICE response ).
-	 *
-	 * Parameters 5 & 6 have different meanings for
-	 * voice & data response.
-	 */
-	if (nparams > 4) {
-		/* TODO: different use for CDMA */
-		sreason = grilio_parser_get_utf8(&rilp);      /* response[4] */
-		if (nparams > 5) {
-			/* TODO: different use for CDMA */
-			smax = grilio_parser_get_utf8(&rilp); /* response[5] */
-			if (smax) {
-				reg->max_calls = atoi(smax);
-			}
-		}
-	}
-
-	/*
-	 * Some older RILs don't provide max calls, in that case let's
-	 * supply some reasonable default. We don't need more than 2
-	 * simultaneous data calls anyway.
-	 */
-	if (nparams <= 5) {
-		reg->max_calls = 2;
-	}
-
-	reg->lac = slac ? strtol(slac, NULL, 16) : -1;
-	reg->ci = sci ? strtol(sci, NULL, 16) : -1;
-	reg->access_tech = ril_parse_tech(stech, &reg->ril_tech);
-
-	DBG_(self, "%s,%s,%s,%d,%s,%s,%s",
-				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);
-	g_free(sci);
-	g_free(stech);
-	g_free(sreason);
-	g_free(smax);
-	return TRUE;
-}
-
-static void ril_network_op_copy(struct ofono_network_operator *dest,
-				const struct ofono_network_operator *src)
-{
-	strncpy(dest->mcc, src->mcc, sizeof(dest->mcc));
-	strncpy(dest->mnc, src->mnc, sizeof(dest->mnc));
-	strncpy(dest->name, src->name, sizeof(dest->name));
-	dest->mcc[sizeof(dest->mcc)-1] = 0;
-	dest->mnc[sizeof(dest->mnc)-1] = 0;
-	dest->name[sizeof(dest->name)-1] = 0;
-	dest->status = src->status;
-	dest->tech = src->tech;
-}
-
-static gboolean ril_network_op_equal(const struct ofono_network_operator *op1,
-				const struct ofono_network_operator *op2)
-{
-	if (op1 == op2) {
-		return TRUE;
-	} else if (!op1 || !op2) {
-		return FALSE;
-	} else {
-		return op1->status == op2->status &&
-			op1->tech == op2->tech &&
-			!strncmp(op1->mcc, op2->mcc, sizeof(op2->mcc)) &&
-			!strncmp(op1->mnc, op2->mnc, sizeof(op2->mnc)) &&
-			!strncmp(op1->name, op2->name, sizeof(op2->name));
-	}
-}
-
-static void ril_network_poll_operator_cb(GRilIoChannel *io, int req_status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-	struct ril_network_priv *priv = self->priv;
-
-	GASSERT(priv->operator_poll_id);
-	priv->operator_poll_id = 0;
-
-	if (req_status == RIL_E_SUCCESS) {
-		struct ofono_network_operator op;
-		gboolean changed = FALSE;
-		gchar *lalpha;
-		char *salpha;
-		char *numeric;
-		GRilIoParser rilp;
-
-		grilio_parser_init(&rilp, data, len);
-		grilio_parser_get_int32(&rilp, NULL);
-		lalpha = grilio_parser_get_utf8(&rilp);
-		salpha = grilio_parser_get_utf8(&rilp);
-		numeric = grilio_parser_get_utf8(&rilp);
-
-		op.tech = -1;
-		if (ril_parse_mcc_mnc(numeric, &op)) {
-			if (op.tech < 0) op.tech = self->voice.access_tech;
-			op.status = OPERATOR_STATUS_CURRENT;
-			op.name[0] = 0;
-			if (lalpha) {
-				strncpy(op.name, lalpha, sizeof(op.name));
-			} else if (salpha) {
-				strncpy(op.name, salpha, sizeof(op.name));
-			} else {
-				strncpy(op.name, numeric, sizeof(op.name));
-			}
-			op.name[sizeof(op.name)-1] = 0;
-			if (!self->operator) {
-				self->operator = &priv->operator;
-				ril_network_op_copy(&priv->operator, &op);
-				changed = TRUE;
-			} else if (!ril_network_op_equal(&op, &priv->operator)) {
-				ril_network_op_copy(&priv->operator, &op);
-				changed = TRUE;
-			}
-		} else if (self->operator) {
-			self->operator = NULL;
-			changed = TRUE;
-		}
-
-		if (changed) {
-			if (self->operator) {
-				DBG_(self, "lalpha=%s, salpha=%s, numeric=%s, "
-					"%s, mcc=%s, mnc=%s, %s",
-					lalpha, salpha, numeric,
-					op.name, op.mcc, op.mnc,
-					registration_tech_to_string(op.tech));
-			} else {
-				DBG_(self, "no operator");
-			}
-			ril_network_emit(self, SIGNAL_OPERATOR_CHANGED);
-		}
-
-		g_free(lalpha);
-		g_free(salpha);
-		g_free(numeric);
-	}
-}
-
-static void ril_network_poll_voice_state_cb(GRilIoChannel *io, int req_status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-	struct ril_network_priv *priv = self->priv;
-
-	GASSERT(priv->voice_poll_id);
-	priv->voice_poll_id = 0;
-
-	if (req_status == RIL_E_SUCCESS) {
-		struct ril_registration_state state;
-
-		ril_network_parse_response(self, data, len, &state);
-		if (memcmp(&state, &self->voice, sizeof(state))) {
-			DBG_(self, "voice registration changed");
-			self->voice = state;
-			ril_network_emit(self, SIGNAL_VOICE_STATE_CHANGED);
-		}
-	}
-}
-
-static void ril_network_poll_data_state_cb(GRilIoChannel *io, int req_status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-	struct ril_network_priv *priv = self->priv;
-
-	GASSERT(priv->data_poll_id);
-	priv->data_poll_id = 0;
-
-	if (req_status == RIL_E_SUCCESS) {
-		struct ril_registration_state state;
-
-		ril_network_parse_response(self, data, len, &state);
-		if (memcmp(&state, &self->data, sizeof(state))) {
-			DBG_(self, "data registration changed");
-			self->data = state;
-			ril_network_emit(self, SIGNAL_DATA_STATE_CHANGED);
-		}
-	}
-}
-
-static guint ril_network_poll_and_retry(struct ril_network *self, guint id,
-					int code, GRilIoChannelResponseFunc fn)
-{
-	struct ril_network_priv *priv = self->priv;
-
-	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);
-		id = grilio_queue_send_request_full(priv->q, req, code, fn,
-								NULL, self);
-		grilio_request_unref(req);
-	}
-
-	return id;
-}
-
-static void ril_network_poll_state(struct ril_network *self)
-{
-	struct ril_network_priv *priv = self->priv;
-
-	DBG_(self, "");
-	priv->operator_poll_id = ril_network_poll_and_retry(self,
-		priv->operator_poll_id, RIL_REQUEST_OPERATOR,
-		ril_network_poll_operator_cb);
-	priv->voice_poll_id = ril_network_poll_and_retry(self,
-		priv->voice_poll_id, RIL_REQUEST_VOICE_REGISTRATION_STATE,
-		ril_network_poll_voice_state_cb);
-	priv->data_poll_id = ril_network_poll_and_retry(self,
-		priv->data_poll_id, RIL_REQUEST_DATA_REGISTRATION_STATE,
-		ril_network_poll_data_state_cb);
-}
-
-static enum ofono_radio_access_mode ril_network_rat_to_mode(int rat)
-{
-	switch (rat) {
-	case PREF_NET_TYPE_LTE_CDMA_EVDO:
-	case PREF_NET_TYPE_LTE_GSM_WCDMA:
-	case PREF_NET_TYPE_LTE_CMDA_EVDO_GSM_WCDMA:
-	case PREF_NET_TYPE_LTE_ONLY:
-	case PREF_NET_TYPE_LTE_WCDMA:
-		return OFONO_RADIO_ACCESS_MODE_LTE;
-	case PREF_NET_TYPE_GSM_WCDMA_AUTO:
-	case PREF_NET_TYPE_WCDMA:
-	case PREF_NET_TYPE_GSM_WCDMA:
-		return OFONO_RADIO_ACCESS_MODE_UMTS;
-	default:
-		DBG("unexpected rat mode %d", rat);
-	case PREF_NET_TYPE_GSM_ONLY:
-		return OFONO_RADIO_ACCESS_MODE_GSM;
-	}
-}
-
-static int ril_network_mode_to_rat(struct ril_network *self,
-					enum ofono_radio_access_mode mode)
-{
-	switch (mode) {
-	case OFONO_RADIO_ACCESS_MODE_ANY:
-	case OFONO_RADIO_ACCESS_MODE_LTE:
-		if (self->settings->enable_4g) {
-			return PREF_NET_TYPE_LTE_GSM_WCDMA;
-		}
-		/* no break */
-	default:
-	case OFONO_RADIO_ACCESS_MODE_UMTS:
-		return PREF_NET_TYPE_GSM_WCDMA_AUTO;
-	case OFONO_RADIO_ACCESS_MODE_GSM:
-		return PREF_NET_TYPE_GSM_ONLY;
-	}
-}
-
-static int ril_network_pref_mode_expected(struct ril_network *self)
-{
-	struct ril_sim_settings *settings = self->settings;
-	struct ril_network_priv *priv = self->priv;
-	const enum ofono_radio_access_mode pref_mode = priv->max_pref_mode ?
-		MIN(settings->pref_mode, priv->max_pref_mode) :
-		settings->pref_mode;
-	return ril_network_mode_to_rat(self, pref_mode);
-}
-
-static gboolean ril_network_can_set_pref_mode(struct ril_network *self)
-{
-	struct ril_network_priv *priv = self->priv;
-
-	return priv->radio->online && ril_sim_card_ready(priv->sim_card);
-}
-
-static gboolean ril_network_set_rat_holdoff_cb(gpointer user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-	struct ril_network_priv *priv = self->priv;
-	const int rat = ril_network_pref_mode_expected(self);
-
-	DBG_(self, "rat mode %d, expected %d", priv->rat, rat);
-	GASSERT(priv->timer[TIMER_SET_RAT_HOLDOFF]);
-	priv->timer[TIMER_SET_RAT_HOLDOFF] = 0;
-
-	/*
-	 * Don't retry the request if modem is offline or SIM card isn't
-	 * ready, to avoid spamming system log with error messages. Radio
-	 * and SIM card state change callbacks will schedule a new check
-	 * when it's appropriate.
-	 */
-	if (priv->rat != rat) {
-		if (ril_network_can_set_pref_mode(self)) {
-			ril_network_set_pref_mode(self, rat);
-		} else {
-			DBG_(self, "giving up");
-		}
-	}
-
-	return G_SOURCE_REMOVE;
-}
-
-static void ril_network_set_pref_mode_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-	struct ril_network_priv *priv = self->priv;
-
-	GASSERT(priv->set_rat_id);
-	priv->set_rat_id = 0;
-	if (status != RIL_E_SUCCESS) {
-		ofono_error("failed to set rat mode");
-	}
-
-	ril_network_query_pref_mode(self);
-}
-
-static void ril_network_set_pref_mode(struct ril_network *self, int rat)
-{
-	struct ril_network_priv *priv = self->priv;
-	GRilIoRequest *req = grilio_request_sized_new(8);
-
-	DBG_(self, "setting rat mode %d", rat);
-	grilio_request_append_int32(req, 1);    /* Number of params */
-	grilio_request_append_int32(req, rat);
-
-	grilio_queue_cancel_request(priv->q, priv->set_rat_id, FALSE);
-	priv->set_rat_id = grilio_queue_send_request_full(priv->q, req,
-				RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE,
-				ril_network_set_pref_mode_cb, NULL, self);
-	grilio_request_unref(req);
-
-	/* Don't do it too often */
-	GASSERT(!priv->timer[TIMER_SET_RAT_HOLDOFF]);
-	priv->timer[TIMER_SET_RAT_HOLDOFF] =
-		g_timeout_add_seconds(SET_PREF_MODE_HOLDOFF_SEC,
-			ril_network_set_rat_holdoff_cb, self);
-}
-
-static void ril_network_check_pref_mode(struct ril_network *self,
-							gboolean force)
-{
-	struct ril_network_priv *priv = self->priv;
-	const int rat = ril_network_pref_mode_expected(self);
-
-	if (priv->timer[TIMER_FORCE_CHECK_PREF_MODE]) {
-		ril_network_stop_timer(self, TIMER_FORCE_CHECK_PREF_MODE);
-		/*
-		 * TIMER_FORCE_CHECK_PREF_MODE is scheduled by
-		 * ril_network_pref_mode_changed_cb and is meant
-		 * to force radio tech check right now.
-		 */
-		force = TRUE;
-	}
-
-	if (priv->rat == rat || force) {
-		ril_network_stop_timer(self, TIMER_SET_RAT_HOLDOFF);
-	}
-
-	if (priv->rat != rat) {
-		/* Something isn't right, we need to fix it */
-		if (!priv->timer[TIMER_SET_RAT_HOLDOFF]) {
-			ril_network_set_pref_mode(self, rat);
-		} else {
-			/* OK, later */
-			DBG_(self, "need to set rat mode %d", rat);
-		}
-	}
-}
-
-static int ril_network_parse_pref_resp(const void *data, guint len)
-{
-	GRilIoParser rilp;
-	int pref = -1;
-
-	grilio_parser_init(&rilp, data, len);
-	grilio_parser_get_int32(&rilp, NULL);
-	grilio_parser_get_int32(&rilp, &pref);
-	return pref;
-}
-
-static void ril_network_query_pref_mode_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-	struct ril_network_priv *priv = self->priv;
-	const enum ofono_radio_access_mode pref_mode = self->pref_mode;
-
-	/* This request never fails because in case of error it gets retried */
-	GASSERT(status == RIL_E_SUCCESS);
-	GASSERT(priv->query_rat_id);
-
-	priv->query_rat_id = 0;
-	priv->rat = ril_network_parse_pref_resp(data, len);
-	self->pref_mode = ril_network_rat_to_mode(priv->rat);
-	DBG_(self, "rat mode %d (%s)", priv->rat,
-			ofono_radio_access_mode_to_string(self->pref_mode));
-
-	if (self->pref_mode != pref_mode) {
-		ril_network_emit(self, SIGNAL_PREF_MODE_CHANGED);
-	}
-
-	if (ril_network_can_set_pref_mode(self)) {
-		ril_network_check_pref_mode(self, FALSE);
-	}
-}
-
-static void ril_network_query_pref_mode(struct ril_network *self)
-{
-	struct ril_network_priv *priv = self->priv;
-	GRilIoRequest *req = grilio_request_new();
-
-	grilio_request_set_retry(req, RIL_RETRY_SECS*1000, -1);
-	grilio_queue_cancel_request(priv->q, priv->query_rat_id, FALSE);
-	priv->query_rat_id = grilio_queue_send_request_full(priv->q, req,
-				RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE,
-				ril_network_query_pref_mode_cb, NULL, self);
-	grilio_request_unref(req);
-}
-
-void ril_network_set_max_pref_mode(struct ril_network *self,
-				enum ofono_radio_access_mode max_mode,
-				gboolean force_check)
-{
-	if (G_LIKELY(self)) {
-		struct ril_network_priv *priv = self->priv;
-		if (priv->max_pref_mode != max_mode || force_check) {
-			DBG_(self, "rat mode %d (%s)", max_mode,
-				ofono_radio_access_mode_to_string(max_mode));
-			priv->max_pref_mode = max_mode;
-			ril_network_check_pref_mode(self, TRUE);
-		}
-	}
-}
-
-gulong ril_network_add_operator_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_OPERATOR_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-gulong ril_network_add_voice_state_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_VOICE_STATE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-gulong ril_network_add_data_state_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_DATA_STATE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-gulong ril_network_add_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_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)) {
-		g_signal_handler_disconnect(self, id);
-	}
-}
-
-void ril_network_remove_handlers(struct ril_network *self, gulong *ids, int n)
-{
-	gutil_disconnect_handlers(self, ids, n);
-}
-
-static void ril_network_voice_state_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_RESPONSE_VOICE_NETWORK_STATE_CHANGED);
-	ril_network_poll_state(self);
-}
-
-static void ril_network_radio_state_cb(struct ril_radio *radio, void *data)
-{
-	if (radio->state == RADIO_STATE_ON) {
-		ril_network_poll_state(RIL_NETWORK(data));
-	}
-}
-
-static void ril_network_radio_online_cb(struct ril_radio *radio, void *data)
-{
-	struct ril_network *self = RIL_NETWORK(data);
-
-	if (ril_network_can_set_pref_mode(self)) {
-		ril_network_check_pref_mode(self, TRUE);
-	}
-}
-
-static gboolean ril_network_check_pref_mode_cb(gpointer user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-	struct ril_network_priv *priv = self->priv;
-
-	GASSERT(priv->timer[TIMER_FORCE_CHECK_PREF_MODE]);
-	priv->timer[TIMER_FORCE_CHECK_PREF_MODE] = 0;
-
-	DBG_(self, "checking pref mode");
-	ril_network_check_pref_mode(self, TRUE);
-
-	return G_SOURCE_REMOVE;
-}
-
-static void ril_network_pref_mode_changed_cb(struct ril_sim_settings *settings,
-							void *user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-	struct ril_network_priv *priv = self->priv;
-
-	/*
-	 * Postpone ril_network_check_pref_mode because other pref_mode
-	 * listeners (namely, ril_data) may want to tweak max_pref_mode
-	 */
-	if (!priv->timer[TIMER_FORCE_CHECK_PREF_MODE]) {
-		DBG_(self, "scheduling pref mode check");
-		priv->timer[TIMER_FORCE_CHECK_PREF_MODE] =
-			g_idle_add(ril_network_check_pref_mode_cb, self);
-	} else {
-		DBG_(self, "pref mode check already scheduled");
-	}
-}
-
-static void ril_network_sim_status_changed_cb(struct ril_sim_card *sc,
-							void *user_data)
-{
-	struct ril_network *self = RIL_NETWORK(user_data);
-
-	if (ril_network_can_set_pref_mode(self)) {
-		ril_network_check_pref_mode(self, FALSE);
-	}
-}
-
-struct ril_network *ril_network_new(GRilIoChannel *io, const char *log_prefix,
-			struct ril_radio *radio, struct ril_sim_card *sim_card,
-			struct ril_sim_settings *settings)
-{
-	struct ril_network *self = g_object_new(RIL_NETWORK_TYPE, NULL);
-	struct ril_network_priv *priv = self->priv;
-
-	self->settings = ril_sim_settings_ref(settings);
-	priv->io = grilio_channel_ref(io);
-	priv->q = grilio_queue_new(priv->io);
-	priv->radio = ril_radio_ref(radio);
-	priv->sim_card = ril_sim_card_ref(sim_card);
-	priv->log_prefix = (log_prefix && log_prefix[0]) ?
-		g_strconcat(log_prefix, " ", NULL) : g_strdup("");
-	DBG_(self, "");
-	priv->ril_event_id = grilio_channel_add_unsol_event_handler(priv->io,
-			ril_network_voice_state_changed_cb,
-			RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED, self);
-	priv->radio_event_id[RADIO_EVENT_STATE_CHANGED] =
-		ril_radio_add_state_changed_handler(priv->radio,
-			ril_network_radio_state_cb, self);
-	priv->radio_event_id[RADIO_EVENT_ONLINE_CHANGED] =
-		ril_radio_add_online_changed_handler(priv->radio,
-			ril_network_radio_online_cb, self);
-	priv->settings_event_id =
-		ril_sim_settings_add_pref_mode_changed_handler(settings,
-			ril_network_pref_mode_changed_cb, self);
-	priv->sim_status_event_id =
-		ril_sim_card_add_status_changed_handler(priv->sim_card,
-			ril_network_sim_status_changed_cb, self);
-
-	/*
-	 * Query the initial state. Querying network state before the radio
-	 * has been turned on makes RIL unhappy.
-	 */
-	if (radio->state == RADIO_STATE_ON) {
-		ril_network_poll_state(self);
-	}
-
-	return self;
-}
-
-struct ril_network *ril_network_ref(struct ril_network *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_ref(RIL_NETWORK(self));
-		return self;
-	} else {
-		return NULL;
-	}
-}
-
-void ril_network_unref(struct ril_network *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_unref(RIL_NETWORK(self));
-	}
-}
-
-static void ril_network_init(struct ril_network *self)
-{
-	struct ril_network_priv *priv = G_TYPE_INSTANCE_GET_PRIVATE(self,
-		RIL_NETWORK_TYPE, struct ril_network_priv);
-
-	self->priv = priv;
-	ril_network_reset_state(&self->voice);
-	ril_network_reset_state(&self->data);
-	priv->rat = -1;
-}
-
-static void ril_network_dispose(GObject *object)
-{
-	struct ril_network *self = RIL_NETWORK(object);
-	struct ril_network_priv *priv = self->priv;
-	enum ril_network_timer tid;
-
-	grilio_channel_remove_handlers(priv->io, &priv->ril_event_id, 1);
-	ril_radio_remove_handlers(priv->radio, priv->radio_event_id,
-					G_N_ELEMENTS(priv->radio_event_id));
-	ril_sim_settings_remove_handlers(self->settings,
-						&priv->settings_event_id, 1);
-	ril_sim_card_remove_handlers(priv->sim_card,
-						&priv->sim_status_event_id, 1);
-
-	for (tid=0; tid<TIMER_COUNT; tid++) {
-		ril_network_stop_timer(self, tid);
-	}
-
-	grilio_queue_cancel_all(priv->q, FALSE);
-	priv->set_rat_id = 0;
-	priv->query_rat_id = 0;
-
-	G_OBJECT_CLASS(ril_network_parent_class)->dispose(object);
-}
-
-static void ril_network_finalize(GObject *object)
-{
-	struct ril_network *self = RIL_NETWORK(object);
-	struct ril_network_priv *priv = self->priv;
-
-	DBG_(self, "");
-	g_free(priv->log_prefix);
-	grilio_channel_unref(priv->io);
-	grilio_queue_unref(priv->q);
-	ril_radio_unref(priv->radio);
-	ril_sim_card_unref(priv->sim_card);
-	ril_sim_settings_unref(self->settings);
-	G_OBJECT_CLASS(ril_network_parent_class)->finalize(object);
-}
-
-static void ril_network_class_init(RilNetworkClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
-	object_class->dispose = ril_network_dispose;
-	object_class->finalize = ril_network_finalize;
-	g_type_class_add_private(klass, sizeof(struct ril_network_priv));
-	RIL_NETWORK_SIGNAL(klass, OPERATOR);
-	RIL_NETWORK_SIGNAL(klass, VOICE_STATE);
-	RIL_NETWORK_SIGNAL(klass, DATA_STATE);
-	RIL_NETWORK_SIGNAL(klass, PREF_MODE);
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_network.h
+++ b/ofono/drivers/ril/ril_network.h
@@ -1,75 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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_NETWORK_H
-#define RIL_NETWORK_H
-
-#include "ril_types.h"
-
-#include <ofono/radio-settings.h>
-
-struct ofono_network_operator;
-
-struct ril_registration_state {
-	int status;        /* enum network_registration_status */
-	int access_tech;   /* enum access_technology or -1 if none */
-	int ril_tech;
-	int max_calls;
-	int lac;
-	int ci;
-};
-
-struct ril_network {
-	GObject object;
-	struct ril_network_priv *priv;
-	struct ril_registration_state voice;
-	struct ril_registration_state data;
-	const struct ofono_network_operator *operator;
-	enum ofono_radio_access_mode pref_mode;
-	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(GRilIoChannel *io, const char *log_prefix,
-			struct ril_radio *radio, struct ril_sim_card *sim_card,
-			struct ril_sim_settings *settings);
-struct ril_network *ril_network_ref(struct ril_network *net);
-void ril_network_unref(struct ril_network *net);
-
-void ril_network_set_max_pref_mode(struct ril_network *net,
-				enum ofono_radio_access_mode max_pref_mode,
-				gboolean force_check);
-gulong ril_network_add_operator_changed_handler(struct ril_network *net,
-					ril_network_cb_t cb, void *arg);
-gulong ril_network_add_voice_state_changed_handler(struct ril_network *net,
-					ril_network_cb_t cb, void *arg);
-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);
-void ril_network_remove_handler(struct ril_network *net, gulong id);
-void ril_network_remove_handlers(struct ril_network *net, gulong *ids, int n);
-
-#endif /* RIL_NETWORK_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_oem_raw.c
+++ b/ofono/drivers/ril/ril_oem_raw.c
@@ -1,166 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_util.h"
-#include "ril_log.h"
-
-#include "gdbus.h"
-#include "ofono.h"
-
-#define RIL_OEM_RAW_INTERFACE "org.ofono.OemRaw"
-#define RIL_OEM_RAW_TIMEOUT   (60*1000) /* 60 sec */
-
-struct ril_oem_raw {
-	struct ril_modem *modem;
-	GRilIoQueue *q;
-	DBusConnection *conn;
-	char *path;
-	char *log_prefix;
-};
-
-#define DBG_(oem,fmt,args...) DBG("%s" fmt, (oem)->log_prefix, ##args)
-
-static void ril_oem_raw_send_cb(GRilIoChannel *io, int ril_status,
-			const void *data, guint len, void *user_data)
-{
-	DBusMessage *msg = user_data;
-	DBusMessage *reply;
-
-	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);
-
-		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_error_timed_out(msg);
-	} else {
-		DBG("Error %s", ril_error_to_string(ril_status));
-		reply = __ofono_error_failed(msg);
-	}
-
-	__ofono_dbus_pending_reply(&msg, reply);
-}
-
-static DBusMessage *ril_oem_raw_send(DBusConnection *conn, DBusMessage *msg,
-							void *user_data)
-{
-	DBusMessageIter it;
-	struct ril_oem_raw *oem = user_data;
-
-	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) {
-		char *data;
-		int data_len;
-		DBusMessageIter array;
-		GRilIoRequest *req;
-
-		/* Fetch the data */
-		dbus_message_iter_recurse(&it, &array);
-		dbus_message_iter_get_fixed_array(&array, &data, &data_len);
-		DBG_(oem, "%d bytes", data_len);
-
-		/*
-		 * And forward it to rild. Set a timeout because rild may
-		 * never respond to invalid requests.
-		 */
-		req = grilio_request_sized_new(data_len);
-		grilio_request_set_timeout(req, RIL_OEM_RAW_TIMEOUT);
-		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,
-				NULL, dbus_message_ref(msg));
-		grilio_request_unref(req);
-		return NULL;
-	} else {
-		DBG_(oem, "Unexpected signature");
-		return __ofono_error_invalid_args(msg);
-	}
-}
-
-static const GDBusMethodTable ril_oem_raw_methods[] = {
-	{ GDBUS_ASYNC_METHOD("Send",
-			GDBUS_ARGS({ "request", "ay" }),
-			GDBUS_ARGS({ "response", "ay" }),
-			ril_oem_raw_send) },
-	{ }
-};
-
-struct ril_oem_raw *ril_oem_raw_new(struct ril_modem *modem,
-						const char *log_prefix)
-{
-	struct ril_oem_raw *oem = g_new0(struct ril_oem_raw, 1);
-
-	DBG("%s", ril_modem_get_path(modem));
-	oem->modem = modem;
-	oem->path = g_strdup(ril_modem_get_path(modem));
-	oem->conn = dbus_connection_ref(ofono_dbus_get_connection());
-	oem->q = grilio_queue_new(ril_modem_io(modem));
-	oem->log_prefix = (log_prefix && log_prefix[0]) ?
-			g_strconcat(log_prefix, " ", NULL) : g_strdup("");
-
-	/* Register D-Bus interface */
-	if (g_dbus_register_interface(oem->conn, oem->path,
-			RIL_OEM_RAW_INTERFACE, ril_oem_raw_methods,
-			NULL, NULL, oem, NULL)) {
-		ofono_modem_add_interface(modem->ofono, RIL_OEM_RAW_INTERFACE);
-		return oem;
-	} else {
-		ofono_error("OemRaw D-Bus register failed");
-		ril_oem_raw_free(oem);
-		return NULL;
-	}
-}
-
-void ril_oem_raw_free(struct ril_oem_raw *oem)
-{
-	if (oem) {
-		DBG("%s", oem->path);
-		g_dbus_unregister_interface(oem->conn, oem->path,
-						RIL_OEM_RAW_INTERFACE);
-		ofono_modem_remove_interface(oem->modem->ofono,
-						RIL_OEM_RAW_INTERFACE);
-		dbus_connection_unref(oem->conn);
-
-		grilio_queue_cancel_all(oem->q, TRUE);
-		grilio_queue_unref(oem->q);
-
-		g_free(oem->log_prefix);
-		g_free(oem->path);
-		g_free(oem);
-	}
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_phonebook.c
+++ b/ofono/drivers/ril/ril_phonebook.c
--- 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,172 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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_PLUGIN_H
-#define RIL_PLUGIN_H
-
-#include "ril_types.h"
-
-#include <ofono/modem.h>
-#include <ofono/call-barring.h>
-#include <ofono/call-forwarding.h>
-#include <ofono/call-settings.h>
-#include <ofono/call-volume.h>
-#include <ofono/cbs.h>
-#include <ofono/devinfo.h>
-#include <ofono/gprs-context.h>
-#include <ofono/gprs.h>
-#include <ofono/netreg.h>
-#include <ofono/phonebook.h>
-#include <ofono/radio-settings.h>
-#include <ofono/sim.h>
-#include <ofono/sms.h>
-#include <ofono/stk.h>
-#include <ofono/ussd.h>
-#include <ofono/voicecall.h>
-
-#include <grilio_queue.h>
-#include <grilio_request.h>
-#include <grilio_parser.h>
-
-#define RILMODEM_DRIVER         "ril"
-
-typedef struct ril_slot_info const *ril_slot_info_ptr;
-
-struct ril_slot_info {
-	const char *path;
-	const char *imei;
-	const char *ecclist_file;
-	gboolean enabled;
-	gboolean sim_present;
-	const struct ril_slot_config *config;
-};
-
-struct ril_plugin {
-	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 ril_slot_info_ptr *slots;
-	gboolean ready;
-};
-
-struct ril_modem {
-	GRilIoChannel *io;
-	const char *imei;
-	const char *log_prefix;
-	const char *ecclist_file;
-	struct ofono_modem *ofono;
-	struct ril_radio *radio;
-	struct ril_data *data;
-	struct ril_network *network;
-	struct ril_sim_card *sim_card;
-	struct ril_sim_settings *sim_settings;
-	struct ril_slot_config config;
-};
-
-#define RIL_PLUGIN_SIGNAL_VOICE_IMSI    (0x01)
-#define RIL_PLUGIN_SIGNAL_DATA_IMSI     (0x02)
-#define RIL_PLUGIN_SIGNAL_VOICE_PATH    (0x04)
-#define RIL_PLUGIN_SIGNAL_DATA_PATH     (0x08)
-#define RIL_PLUGIN_SIGNAL_ENABLED_SLOTS (0x10)
-#define RIL_PLUGIN_SIGNAL_MMS_IMSI      (0x20)
-#define RIL_PLUGIN_SIGNAL_MMS_PATH      (0x40)
-#define RIL_PLUGIN_SIGNAL_READY         (0x80)
-
-typedef void (*ril_modem_cb_t)(struct ril_modem *modem, void *data);
-typedef void (*ril_modem_online_cb_t)(struct ril_modem *modem, gboolean online,
-								void *data);
-
-void ril_plugin_set_enabled_slots(struct ril_plugin *plugin, char **slots);
-gboolean ril_plugin_set_mms_imsi(struct ril_plugin *plugin, const char *imsi);
-void ril_plugin_set_default_voice_imsi(struct ril_plugin *plugin,
-							const char *imsi);
-void ril_plugin_set_default_data_imsi(struct ril_plugin *plugin,
-							const char *imsi);
-
-struct ril_oem_raw;
-struct ril_oem_raw *ril_oem_raw_new(struct ril_modem *md,
-						const char *log_prefix);
-void ril_oem_raw_free(struct ril_oem_raw *raw);
-
-struct ril_sim_info_dbus;
-struct ril_sim_info_dbus *ril_sim_info_dbus_new(struct ril_modem *md,
-						struct ril_sim_info *info);
-void ril_sim_info_dbus_free(struct ril_sim_info_dbus *dbus);
-
-struct ril_cell_info_dbus;
-struct ril_cell_info_dbus *ril_cell_info_dbus_new(struct ril_modem *md,
-						struct ril_cell_info *info);
-void ril_cell_info_dbus_free(struct ril_cell_info_dbus *dbus);
-
-struct ril_plugin_dbus;
-struct ril_plugin_dbus *ril_plugin_dbus_new(struct ril_plugin *plugin);
-void ril_plugin_dbus_free(struct ril_plugin_dbus *dbus);
-void ril_plugin_dbus_block_imei_requests(struct ril_plugin_dbus *dbus,
-							gboolean clock);
-void ril_plugin_dbus_signal(struct ril_plugin_dbus *dbus, int mask);
-void ril_plugin_dbus_signal_sim(struct ril_plugin_dbus *dbus, int index,
-							gboolean present);
-
-struct ril_modem *ril_modem_create(GRilIoChannel *io, const char *log_prefix,
-		const struct ril_slot_info *slot, struct ril_radio *radio,
-		struct ril_network *network, struct ril_sim_card *card,
-		struct ril_data *data, struct ril_sim_settings *settings);
-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);
-struct ofono_netreg *ril_modem_ofono_netreg(struct ril_modem *modem);
-void ril_modem_set_removed_cb(struct ril_modem *modem, ril_modem_cb_t cb,
-								void *data);
-void ril_modem_set_online_cb(struct ril_modem *modem, ril_modem_online_cb_t cb,
-								void *data);
-
-#define ril_modem_get_path(modem) ofono_modem_get_path((modem)->ofono)
-#define ril_modem_4g_enabled(modem) ((modem)->config.enable_4g)
-#define ril_modem_slot(modem) ((modem)->config.slot)
-#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 *netreg, gint status);
-
-extern const struct ofono_call_barring_driver ril_call_barring_driver;
-extern const struct ofono_call_forwarding_driver ril_call_forwarding_driver;
-extern const struct ofono_call_settings_driver ril_call_settings_driver;
-extern const struct ofono_call_volume_driver ril_call_volume_driver;
-extern const struct ofono_cbs_driver ril_cbs_driver;
-extern const struct ofono_devinfo_driver ril_devinfo_driver;
-extern const struct ofono_gprs_context_driver ril_gprs_context_driver;
-extern const struct ofono_gprs_driver ril_gprs_driver;
-extern const struct ofono_modem_driver ril_modem_driver;
-extern const struct ofono_netreg_driver ril_netreg_driver;
-extern const struct ofono_phonebook_driver ril_phonebook_driver;
-extern const struct ofono_radio_settings_driver ril_radio_settings_driver;
-extern const struct ofono_sim_driver ril_sim_driver;
-extern const struct ofono_sms_driver ril_sms_driver;
-extern const struct ofono_stk_driver ril_stk_driver;
-extern const struct ofono_ussd_driver ril_ussd_driver;
-extern const struct ofono_voicecall_driver ril_voicecall_driver;
-
-#endif /* RIL_PLUGIN_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_plugin_dbus.c
+++ b/ofono/drivers/ril/ril_plugin_dbus.c
@@ -1,851 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_plugin.h"
-
-#include <ofono/log.h>
-#include <ofono/dbus.h>
-
-#include <gutil_strv.h>
-#include <gutil_log.h>
-#include <gdbus.h>
-
-#include "ofono.h"
-
-typedef void (*ril_plugin_dbus_append_fn)(DBusMessageIter *it,
-					struct ril_plugin_dbus *dbus);
-typedef gboolean (*ril_plugin_dbus_slot_select_fn)
-					(const struct ril_slot_info *slot);
-typedef const char *(*ril_plugin_dbus_slot_string_fn)
-					(const struct ril_slot_info *slot);
-
-struct ril_plugin_dbus_request {
-	DBusMessage *msg;
-	ril_plugin_dbus_append_fn fn;
-};
-
-struct ril_plugin_dbus {
-	struct ril_plugin *plugin;
-	DBusConnection *conn;
-	gboolean block_imei_req;
-	GSList *blocked_imei_req;
-	guint mms_watch;
-};
-
-#define RIL_DBUS_PATH               "/"
-#define RIL_DBUS_INTERFACE          "org.nemomobile.ofono.ModemManager"
-#define RIL_DBUS_INTERFACE_VERSION  (5)
-
-#define RIL_DBUS_SIGNAL_ENABLED_MODEMS_CHANGED      "EnabledModemsChanged"
-#define RIL_DBUS_SIGNAL_PRESENT_SIMS_CHANGED        "PresentSimsChanged"
-#define RIL_DBUS_SIGNAL_DEFAULT_VOICE_SIM_CHANGED   "DefaultVoiceSimChanged"
-#define RIL_DBUS_SIGNAL_DEFAULT_DATA_SIM_CHANGED    "DefaultDataSimChanged"
-#define RIL_DBUS_SIGNAL_DEFAULT_VOICE_MODEM_CHANGED "DefaultVoiceModemChanged"
-#define RIL_DBUS_SIGNAL_DEFAULT_DATA_MODEM_CHANGED  "DefaultDataModemChanged"
-#define RIL_DBUS_SIGNAL_MMS_SIM_CHANGED             "MmsSimChanged"
-#define RIL_DBUS_SIGNAL_MMS_MODEM_CHANGED           "MmsModemChanged"
-#define RIL_DBUS_SIGNAL_READY_CHANGED               "ReadyChanged"
-#define RIL_DBUS_IMSI_AUTO                          "auto"
-
-static gboolean ril_plugin_dbus_enabled(const struct ril_slot_info *slot)
-{
-	return slot->enabled;
-}
-
-static gboolean ril_plugin_dbus_present(const struct ril_slot_info *slot)
-{
-	return slot->sim_present;
-}
-
-static const char *ril_plugin_dbus_imei(const struct ril_slot_info *slot)
-{
-	return slot->imei;
-}
-
-static void ril_plugin_dbus_append_path_array(DBusMessageIter *it,
-	struct ril_plugin_dbus *dbus, ril_plugin_dbus_slot_select_fn selector)
-{
-	DBusMessageIter array;
-	const struct ril_slot_info *const *ptr = dbus->plugin->slots;
-
-	dbus_message_iter_open_container(it, DBUS_TYPE_ARRAY,
-				DBUS_TYPE_OBJECT_PATH_AS_STRING, &array);
-
-	while (*ptr) {
-		const struct ril_slot_info *slot = *ptr++;
-		if (!selector || selector(slot)) {
-			const char *path = slot->path;
-			dbus_message_iter_append_basic(&array,
-						DBUS_TYPE_OBJECT_PATH, &path);
-		}
-	}
-
-	dbus_message_iter_close_container(it, &array);
-}
-
-static void ril_plugin_dbus_append_string_array(DBusMessageIter *it,
-	struct ril_plugin_dbus *dbus, ril_plugin_dbus_slot_string_fn fn)
-{
-	DBusMessageIter array;
-	const struct ril_slot_info *const *ptr = dbus->plugin->slots;
-
-	dbus_message_iter_open_container(it, DBUS_TYPE_ARRAY,
-				DBUS_TYPE_STRING_AS_STRING, &array);
-
-	while (*ptr) {
-		const struct ril_slot_info *slot = *ptr++;
-		const char *str = fn(slot);
-
-		if (!str) str = "";
-		dbus_message_iter_append_basic(&array, DBUS_TYPE_STRING, &str);
-	}
-
-	dbus_message_iter_close_container(it, &array);
-}
-
-static void ril_plugin_dbus_append_boolean_array(DBusMessageIter *it,
-	struct ril_plugin_dbus *dbus, ril_plugin_dbus_slot_select_fn value)
-{
-	DBusMessageIter array;
-	const struct ril_slot_info *const *ptr = dbus->plugin->slots;
-
-	dbus_message_iter_open_container(it, DBUS_TYPE_ARRAY,
-				DBUS_TYPE_BOOLEAN_AS_STRING, &array);
-
-	while (*ptr) {
-		const struct ril_slot_info *slot = *ptr++;
-		dbus_bool_t b = value(slot);
-
-		dbus_message_iter_append_basic(&array, DBUS_TYPE_BOOLEAN, &b);
-	}
-
-	dbus_message_iter_close_container(it, &array);
-}
-
-static void ril_plugin_dbus_append_boolean(DBusMessageIter *it, dbus_bool_t b)
-{
-	dbus_message_iter_append_basic(it, DBUS_TYPE_BOOLEAN, &b);
-}
-
-static void ril_plugin_dbus_append_string(DBusMessageIter *it, const char *str)
-{
-	if (!str) str = "";
-	dbus_message_iter_append_basic(it, DBUS_TYPE_STRING, &str);
-}
-
-static void ril_plugin_dbus_append_imsi(DBusMessageIter *it, const char *imsi)
-{
-	if (!imsi) imsi = RIL_DBUS_IMSI_AUTO;
-	dbus_message_iter_append_basic(it, DBUS_TYPE_STRING, &imsi);
-}
-
-static void ril_plugin_dbus_append_path(DBusMessageIter *it, const char *path)
-{
-	if (!path) path = "";
-	/* It's DBUS_TYPE_STRING because DBUS_TYPE_OBJECT_PATH can't be empty */
-	dbus_message_iter_append_basic(it, DBUS_TYPE_STRING, &path);
-}
-
-static void ril_plugin_dbus_message_append_path_array(DBusMessage *msg,
-	struct ril_plugin_dbus *dbus, ril_plugin_dbus_slot_select_fn fn)
-{
-	DBusMessageIter iter;
-
-	dbus_message_iter_init_append(msg, &iter);
-	ril_plugin_dbus_append_path_array(&iter, dbus, fn);
-}
-
-static void ril_plugin_dbus_signal_path_array(struct ril_plugin_dbus *dbus,
-			const char *name, ril_plugin_dbus_slot_select_fn fn)
-{
-	DBusMessage *signal = dbus_message_new_signal(RIL_DBUS_PATH,
-						RIL_DBUS_INTERFACE, name);
-
-	ril_plugin_dbus_message_append_path_array(signal, dbus, fn);
-	g_dbus_send_message(dbus->conn, signal);
-}
-
-static inline void ril_plugin_dbus_signal_imsi(struct ril_plugin_dbus *dbus,
-				const char *name, const char *imsi)
-{
-	if (!imsi) imsi = RIL_DBUS_IMSI_AUTO;
-	g_dbus_emit_signal(dbus->conn, RIL_DBUS_PATH, RIL_DBUS_INTERFACE,
-			name, DBUS_TYPE_STRING, &imsi, DBUS_TYPE_INVALID);
-}
-
-static inline void ril_plugin_dbus_signal_string(struct ril_plugin_dbus *dbus,
-				const char *name, const char *str)
-{
-	if (!str) str = "";
-	g_dbus_emit_signal(dbus->conn, RIL_DBUS_PATH, RIL_DBUS_INTERFACE,
-			name, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID);
-}
-
-static inline void ril_plugin_dbus_signal_boolean(struct ril_plugin_dbus *dbus,
-				const char *name, dbus_bool_t value)
-{
-	g_dbus_emit_signal(dbus->conn, RIL_DBUS_PATH, RIL_DBUS_INTERFACE,
-			name, DBUS_TYPE_BOOLEAN, &value, DBUS_TYPE_INVALID);
-}
-
-void ril_plugin_dbus_signal(struct ril_plugin_dbus *dbus, int mask)
-{
-	if (dbus) {
-		if (mask & RIL_PLUGIN_SIGNAL_VOICE_IMSI) {
-			ril_plugin_dbus_signal_imsi(dbus,
-				RIL_DBUS_SIGNAL_DEFAULT_VOICE_SIM_CHANGED,
-				dbus->plugin->default_voice_imsi);
-		}
-		if (mask & RIL_PLUGIN_SIGNAL_DATA_IMSI) {
-			ril_plugin_dbus_signal_imsi(dbus,
-				RIL_DBUS_SIGNAL_DEFAULT_DATA_SIM_CHANGED,
-				dbus->plugin->default_data_imsi);
-		}
-		if (mask & RIL_PLUGIN_SIGNAL_MMS_IMSI) {
-			ril_plugin_dbus_signal_string(dbus,
-				RIL_DBUS_SIGNAL_MMS_SIM_CHANGED,
-				dbus->plugin->mms_imsi);
-		}
-		if (mask & RIL_PLUGIN_SIGNAL_ENABLED_SLOTS) {
-			ril_plugin_dbus_signal_path_array(dbus,
-				RIL_DBUS_SIGNAL_ENABLED_MODEMS_CHANGED,
-				ril_plugin_dbus_enabled);
-		}
-		if (mask & RIL_PLUGIN_SIGNAL_VOICE_PATH) {
-			ril_plugin_dbus_signal_string(dbus,
-				RIL_DBUS_SIGNAL_DEFAULT_VOICE_MODEM_CHANGED,
-				dbus->plugin->default_voice_path);
-		}
-		if (mask & RIL_PLUGIN_SIGNAL_DATA_PATH) {
-			ril_plugin_dbus_signal_string(dbus,
-				RIL_DBUS_SIGNAL_DEFAULT_DATA_MODEM_CHANGED,
-				dbus->plugin->default_data_path);
-		}
-		if (mask & RIL_PLUGIN_SIGNAL_MMS_PATH) {
-			ril_plugin_dbus_signal_string(dbus,
-				RIL_DBUS_SIGNAL_MMS_MODEM_CHANGED,
-				dbus->plugin->mms_path);
-		}
-		if (mask & RIL_PLUGIN_SIGNAL_READY) {
-			ril_plugin_dbus_signal_boolean(dbus,
-				RIL_DBUS_SIGNAL_READY_CHANGED,
-				dbus->plugin->ready);
-		}
-	}
-}
-
-void ril_plugin_dbus_signal_sim(struct ril_plugin_dbus *dbus, int index,
-							gboolean present)
-{
-	dbus_bool_t value = present;
-	g_dbus_emit_signal(dbus->conn, RIL_DBUS_PATH, RIL_DBUS_INTERFACE,
-			RIL_DBUS_SIGNAL_PRESENT_SIMS_CHANGED,
-			DBUS_TYPE_INT32, &index,
-			DBUS_TYPE_BOOLEAN, &value,
-			DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *ril_plugin_dbus_reply_with_path_array(DBusMessage *msg,
-	struct ril_plugin_dbus *dbus, ril_plugin_dbus_slot_select_fn fn)
-{
-	DBusMessage *reply = dbus_message_new_method_return(msg);
-
-	ril_plugin_dbus_message_append_path_array(reply, dbus, fn);
-	return reply;
-}
-
-static DBusMessage *ril_plugin_dbus_reply(DBusMessage *msg,
-		struct ril_plugin_dbus *dbus, ril_plugin_dbus_append_fn append)
-{
-	DBusMessage *reply = dbus_message_new_method_return(msg);
-	DBusMessageIter iter;
-
-	dbus_message_iter_init_append(reply, &iter);
-	append(&iter, dbus);
-	return reply;
-}
-
-static void ril_plugin_dbus_unblock_request(gpointer data, gpointer user_data)
-{
-	struct ril_plugin_dbus_request *req = data;
-
-	DBG("unblocking IMEI request %p", req);
-	__ofono_dbus_pending_reply(&req->msg, ril_plugin_dbus_reply(req->msg,
-				(struct ril_plugin_dbus *)user_data, req->fn));
-	g_free(req);
-}
-
-static void ril_plugin_dbus_cancel_request(gpointer data)
-{
-	struct ril_plugin_dbus_request *req = data;
-
-	DBG("canceling IMEI request %p", req);
-	__ofono_dbus_pending_reply(&req->msg, __ofono_error_canceled(req->msg));
-	g_free(req);
-}
-
-void ril_plugin_dbus_block_imei_requests(struct ril_plugin_dbus *dbus,
-								gboolean block)
-{
-	dbus->block_imei_req = block;
-	if (!block && dbus->blocked_imei_req) {
-		g_slist_foreach(dbus->blocked_imei_req,
-				ril_plugin_dbus_unblock_request, dbus);
-		g_slist_free(dbus->blocked_imei_req);
-		dbus->blocked_imei_req = NULL;
-	}
-}
-
-static DBusMessage *ril_plugin_dbus_imei_reply(DBusMessage *msg,
-		struct ril_plugin_dbus *dbus, ril_plugin_dbus_append_fn fn)
-{
-	if (dbus->block_imei_req) {
-		struct ril_plugin_dbus_request *req =
-			g_new(struct ril_plugin_dbus_request, 1);
-
-		req->msg = dbus_message_ref(msg);
-		req->fn = fn;
-		dbus->blocked_imei_req = g_slist_append(dbus->blocked_imei_req,
-									req);
-		DBG("blocking IMEI request %p", req);
-		return NULL;
-	} else {
-		return ril_plugin_dbus_reply(msg, dbus, fn);
-	}
-}
-
-static void ril_plugin_dbus_append_version(DBusMessageIter *it,
-						struct ril_plugin_dbus *dbus)
-{
-	dbus_int32_t version = RIL_DBUS_INTERFACE_VERSION;
-
-	dbus_message_iter_append_basic(it, DBUS_TYPE_INT32, &version);
-}
-
-static void ril_plugin_dbus_append_all(DBusMessageIter *it,
-						struct ril_plugin_dbus *dbus)
-{
-	ril_plugin_dbus_append_version(it, dbus);
-	ril_plugin_dbus_append_path_array(it, dbus, NULL);
-	ril_plugin_dbus_append_path_array(it, dbus, ril_plugin_dbus_enabled);
-	ril_plugin_dbus_append_imsi(it, dbus->plugin->default_data_imsi);
-	ril_plugin_dbus_append_imsi(it, dbus->plugin->default_voice_imsi);
-	ril_plugin_dbus_append_path(it, dbus->plugin->default_data_path);
-	ril_plugin_dbus_append_path(it, dbus->plugin->default_voice_path);
-}
-
-static void ril_plugin_dbus_append_all2(DBusMessageIter *it,
-						struct ril_plugin_dbus *dbus)
-{
-	ril_plugin_dbus_append_all(it, dbus);
-	ril_plugin_dbus_append_boolean_array(it, dbus, ril_plugin_dbus_present);
-}
-
-static void ril_plugin_dbus_append_all3(DBusMessageIter *it,
-						struct ril_plugin_dbus *dbus)
-{
-	ril_plugin_dbus_append_all2(it, dbus);
-	ril_plugin_dbus_append_string_array(it, dbus, ril_plugin_dbus_imei);
-}
-
-static void ril_plugin_dbus_append_all4(DBusMessageIter *it,
-						struct ril_plugin_dbus *dbus)
-{
-	ril_plugin_dbus_append_all3(it, dbus);
-	ril_plugin_dbus_append_string(it, dbus->plugin->mms_imsi);
-	ril_plugin_dbus_append_path(it, dbus->plugin->mms_path);
-}
-
-static void ril_plugin_dbus_append_all5(DBusMessageIter *it,
-						struct ril_plugin_dbus *dbus)
-{
-	ril_plugin_dbus_append_all4(it, dbus);
-	ril_plugin_dbus_append_boolean(it, dbus->plugin->ready);
-}
-
-static DBusMessage *ril_plugin_dbus_get_all(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_plugin_dbus_reply(msg, (struct ril_plugin_dbus *)data,
-						ril_plugin_dbus_append_all);
-}
-
-static DBusMessage *ril_plugin_dbus_get_all2(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_plugin_dbus_reply(msg, (struct ril_plugin_dbus *)data,
-						ril_plugin_dbus_append_all2);
-}
-
-static DBusMessage *ril_plugin_dbus_get_all3(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_plugin_dbus_imei_reply(msg, (struct ril_plugin_dbus *)data,
-						ril_plugin_dbus_append_all3);
-}
-
-static DBusMessage *ril_plugin_dbus_get_all4(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_plugin_dbus_imei_reply(msg, (struct ril_plugin_dbus *)data,
-						ril_plugin_dbus_append_all4);
-}
-
-static DBusMessage *ril_plugin_dbus_get_all5(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_plugin_dbus_imei_reply(msg, (struct ril_plugin_dbus *)data,
-						ril_plugin_dbus_append_all5);
-}
-
-static DBusMessage *ril_plugin_dbus_get_interface_version(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_plugin_dbus_reply(msg, (struct ril_plugin_dbus *)data,
-						ril_plugin_dbus_append_version);
-}
-
-static DBusMessage *ril_plugin_dbus_get_available_modems(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_plugin_dbus_reply_with_path_array(msg,
-					(struct ril_plugin_dbus *)data, NULL);
-}
-
-static DBusMessage *ril_plugin_dbus_get_enabled_modems(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_plugin_dbus_reply_with_path_array(msg,
-		(struct ril_plugin_dbus *)data, ril_plugin_dbus_enabled);
-}
-
-static void ril_plugin_dbus_append_present_sims(DBusMessageIter *it,
-						struct ril_plugin_dbus *dbus)
-{
-	ril_plugin_dbus_append_boolean_array(it, dbus, ril_plugin_dbus_present);
-}
-
-static DBusMessage *ril_plugin_dbus_get_present_sims(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_plugin_dbus_reply(msg, (struct ril_plugin_dbus *)data,
-				ril_plugin_dbus_append_present_sims);
-}
-
-static void ril_plugin_dbus_append_imei_array(DBusMessageIter *it,
-						struct ril_plugin_dbus *dbus)
-{
-	ril_plugin_dbus_append_string_array(it, dbus, ril_plugin_dbus_imei);
-}
-
-static DBusMessage *ril_plugin_dbus_get_imei(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	return ril_plugin_dbus_imei_reply(msg, (struct ril_plugin_dbus *)data,
-					ril_plugin_dbus_append_imei_array);
-}
-
-static DBusMessage *ril_plugin_dbus_reply_with_string(DBusMessage *msg,
-							const char *str)
-{
-	DBusMessage *reply = dbus_message_new_method_return(msg);
-	DBusMessageIter iter;
-
-	dbus_message_iter_init_append(reply, &iter);
-	ril_plugin_dbus_append_string(&iter, str);
-	return reply;
-}
-
-static DBusMessage *ril_plugin_dbus_reply_with_imsi(DBusMessage *msg,
-							const char *imsi)
-{
-	DBusMessage *reply = dbus_message_new_method_return(msg);
-	DBusMessageIter iter;
-
-	dbus_message_iter_init_append(reply, &iter);
-	ril_plugin_dbus_append_imsi(&iter, imsi);
-	return reply;
-}
-
-static DBusMessage *ril_plugin_dbus_get_default_data_sim(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_plugin_dbus *dbus = data;
-
-	return ril_plugin_dbus_reply_with_imsi(msg,
-					dbus->plugin->default_data_imsi);
-}
-
-static DBusMessage *ril_plugin_dbus_get_default_voice_sim(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_plugin_dbus *dbus = data;
-
-	return ril_plugin_dbus_reply_with_imsi(msg,
-					dbus->plugin->default_voice_imsi);
-}
-
-static DBusMessage *ril_plugin_dbus_get_mms_sim(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_plugin_dbus *dbus = data;
-
-	return ril_plugin_dbus_reply_with_string(msg, dbus->plugin->mms_imsi);
-}
-
-static DBusMessage *ril_plugin_dbus_reply_with_path(DBusMessage *msg,
-							const char *path)
-{
-	DBusMessage *reply = dbus_message_new_method_return(msg);
-	DBusMessageIter iter;
-
-	dbus_message_iter_init_append(reply, &iter);
-	ril_plugin_dbus_append_path(&iter, path);
-	return reply;
-}
-
-static DBusMessage *ril_plugin_dbus_get_default_data_modem(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_plugin_dbus *dbus = data;
-
-	return ril_plugin_dbus_reply_with_path(msg,
-					dbus->plugin->default_data_path);
-}
-
-static DBusMessage *ril_plugin_dbus_get_default_voice_modem(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_plugin_dbus *dbus = data;
-
-	return ril_plugin_dbus_reply_with_path(msg,
-					dbus->plugin->default_voice_path);
-}
-
-static DBusMessage *ril_plugin_dbus_get_mms_modem(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_plugin_dbus *dbus = data;
-
-	return ril_plugin_dbus_reply_with_path(msg, dbus->plugin->mms_path);
-}
-
-static DBusMessage *ril_plugin_dbus_get_ready(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_plugin_dbus *dbus = data;
-	DBusMessage *reply = dbus_message_new_method_return(msg);
-	DBusMessageIter it;
-
-	dbus_message_iter_init_append(reply, &it);
-	ril_plugin_dbus_append_boolean(&it, dbus->plugin->ready);
-	return reply;
-}
-
-static DBusMessage *ril_plugin_dbus_set_enabled_modems(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_plugin_dbus *dbus = data;
-	DBusMessageIter iter;
-
-	dbus_message_iter_init(msg, &iter);
-	if (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_ARRAY) {
-		char **paths = NULL;
-		DBusMessageIter array;
-
-		dbus_message_iter_recurse(&iter, &array);
-		while (dbus_message_iter_get_arg_type(&array) ==
-						DBUS_TYPE_OBJECT_PATH) {
-			DBusBasicValue value;
-
-			dbus_message_iter_get_basic(&array, &value);
-			paths = gutil_strv_add(paths, value.str);
-			dbus_message_iter_next(&array);
-		}
-
-		ril_plugin_set_enabled_slots(dbus->plugin, paths);
-		g_strfreev(paths);
-		return dbus_message_new_method_return(msg);
-	} else {
-		return __ofono_error_invalid_args(msg);
-	}
-}
-
-static DBusMessage *ril_plugin_dbus_set_imsi(struct ril_plugin_dbus *dbus,
-		DBusMessage *msg, void (*apply)(struct ril_plugin *plugin,
-							const char *imsi))
-{
-	DBusMessageIter iter;
-
-	dbus_message_iter_init(msg, &iter);
-	if (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING) {
-		DBusBasicValue value;
-		const char *imsi;
-
-		dbus_message_iter_get_basic(&iter, &value);
-		imsi = value.str;
-		if (!g_strcmp0(imsi, RIL_DBUS_IMSI_AUTO)) imsi = NULL; 
-		apply(dbus->plugin, imsi);
-		return dbus_message_new_method_return(msg);
-	} else {
-		return __ofono_error_invalid_args(msg);
-	}
-}
-
-static DBusMessage *ril_plugin_dbus_set_default_voice_sim(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_plugin_dbus *dbus = data;
-
-	GASSERT(conn == dbus->conn);
-	return ril_plugin_dbus_set_imsi(dbus, msg,
-					ril_plugin_set_default_voice_imsi);
-}
-
-static DBusMessage *ril_plugin_dbus_set_default_data_sim(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_plugin_dbus *dbus = data;
-
-	GASSERT(conn == dbus->conn);
-	return ril_plugin_dbus_set_imsi(dbus, msg,
-					ril_plugin_set_default_data_imsi);
-}
-
-static void ril_plugin_dbus_mms_disconnect(DBusConnection *conn, void *data)
-{
-	struct ril_plugin_dbus *dbus = data;
-
-	dbus->mms_watch = 0;
-	if (dbus->plugin->mms_imsi) {
-		DBG("MMS client is gone");
-		ril_plugin_set_mms_imsi(dbus->plugin, NULL);
-	}
-}
-
-static DBusMessage *ril_plugin_dbus_set_mms_sim(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusMessageIter iter;
-	struct ril_plugin_dbus *dbus = data;
-
-	GASSERT(conn == dbus->conn);
-	dbus_message_iter_init(msg, &iter);
-	if (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING) {
-		DBusBasicValue value;
-		const char *imsi;
-
-		dbus_message_iter_get_basic(&iter, &value);
-		imsi = value.str;
-
-		/*
-		 * MMS IMSI is not persistent and has to be eventually
-		 * reset by the client or cleaned up if the client
-		 * unexpectedly disappears.
-		 */
-		if (ril_plugin_set_mms_imsi(dbus->plugin, imsi)) {
-
-			/*
-			 * Clear the previous MMS owner
-			 */
-			if (dbus->mms_watch) {
-				g_dbus_remove_watch(dbus->conn, dbus->mms_watch);
-				dbus->mms_watch = 0;
-			}
-
-			if (dbus->plugin->mms_imsi &&
-						dbus->plugin->mms_imsi[0]) {
-				/*
-				 * This client becomes the owner
-				 */
-				DBG("Owner: %s", dbus_message_get_sender(msg));
-				dbus->mms_watch =
-					g_dbus_add_disconnect_watch(dbus->conn,
-						dbus_message_get_sender(msg),
-						ril_plugin_dbus_mms_disconnect,
-						dbus, NULL);
-			}
-
-			return ril_plugin_dbus_reply_with_string(msg,
-						dbus->plugin->mms_path);
-		} else {
-			return __ofono_error_not_available(msg);
-		}
-	} else {
-		return __ofono_error_invalid_args(msg);
-	}
-}
-
-/*
- * The client can call GetInterfaceVersion followed by the appropriate
- * GetAllx call to get all settings in two steps. Alternatively, it can
- * call GetAll followed by GetAllx based on the interface version returned
- * by GetAll. In either case, two D-Bus calls are required, unless the
- * client is willing to make the assumption about the ofono version it's
- * talking to.
- */
-
-#define RIL_DBUS_GET_ALL_ARGS \
-	{"version", "i" }, \
-	{"availableModems", "ao" }, \
-	{"enabledModems", "ao" }, \
-	{"defaultDataSim", "s" }, \
-	{"defaultVoiceSim", "s" }, \
-	{"defaultDataModem", "s" }, \
-	{"defaultVoiceModem" , "s"}
-#define RIL_DBUS_GET_ALL2_ARGS \
-	RIL_DBUS_GET_ALL_ARGS, \
-	{"presentSims" , "ab"}
-#define RIL_DBUS_GET_ALL3_ARGS \
-	RIL_DBUS_GET_ALL2_ARGS, \
-	{"imei" , "as"}
-#define RIL_DBUS_GET_ALL4_ARGS \
-	RIL_DBUS_GET_ALL3_ARGS, \
-	{"mmsSim", "s" }, \
-	{"mmsModem" , "s"}
-#define RIL_DBUS_GET_ALL5_ARGS \
-	RIL_DBUS_GET_ALL4_ARGS, \
-	{"ready" , "b"}
-
-static const GDBusMethodTable ril_plugin_dbus_methods[] = {
-	{ GDBUS_METHOD("GetAll",
-			NULL, GDBUS_ARGS(RIL_DBUS_GET_ALL_ARGS),
-			ril_plugin_dbus_get_all) },
-	{ GDBUS_METHOD("GetAll2",
-			NULL, GDBUS_ARGS(RIL_DBUS_GET_ALL2_ARGS),
-			ril_plugin_dbus_get_all2) },
-	{ GDBUS_ASYNC_METHOD("GetAll3",
-			NULL, GDBUS_ARGS(RIL_DBUS_GET_ALL3_ARGS),
-			ril_plugin_dbus_get_all3) },
-	{ GDBUS_ASYNC_METHOD("GetAll4",
-			NULL, GDBUS_ARGS(RIL_DBUS_GET_ALL4_ARGS),
-			ril_plugin_dbus_get_all4) },
-	{ GDBUS_ASYNC_METHOD("GetAll5",
-			NULL, GDBUS_ARGS(RIL_DBUS_GET_ALL5_ARGS),
-			ril_plugin_dbus_get_all5) },
-	{ GDBUS_METHOD("GetInterfaceVersion",
-			NULL, GDBUS_ARGS({ "version", "i" }),
-			ril_plugin_dbus_get_interface_version) },
-	{ GDBUS_METHOD("GetAvailableModems",
-			NULL, GDBUS_ARGS({ "modems", "ao" }),
-			ril_plugin_dbus_get_available_modems) },
-	{ GDBUS_METHOD("GetEnabledModems",
-			NULL, GDBUS_ARGS({ "modems", "ao" }),
-			ril_plugin_dbus_get_enabled_modems) },
-	{ GDBUS_METHOD("GetPresentSims",
-			NULL, GDBUS_ARGS({ "presentSims", "ab" }),
-			ril_plugin_dbus_get_present_sims) },
-	{ GDBUS_ASYNC_METHOD("GetIMEI",
-			NULL, GDBUS_ARGS({ "imei", "as" }),
-			ril_plugin_dbus_get_imei) },
-	{ GDBUS_METHOD("GetDefaultDataSim",
-			NULL, GDBUS_ARGS({ "imsi", "s" }),
-			ril_plugin_dbus_get_default_data_sim) },
-	{ GDBUS_METHOD("GetDefaultVoiceSim",
-			NULL, GDBUS_ARGS({ "imsi", "s" }),
-			ril_plugin_dbus_get_default_voice_sim) },
-	{ GDBUS_METHOD("GetMmsSim",
-			NULL, GDBUS_ARGS({ "imsi", "s" }),
-			ril_plugin_dbus_get_mms_sim) },
-	{ GDBUS_METHOD("GetDefaultDataModem",
-			NULL, GDBUS_ARGS({ "path", "s" }),
-			ril_plugin_dbus_get_default_data_modem) },
-	{ GDBUS_METHOD("GetDefaultVoiceModem",
-			NULL, GDBUS_ARGS({ "path", "s" }),
-			ril_plugin_dbus_get_default_voice_modem) },
-	{ GDBUS_METHOD("GetMmsModem",
-			NULL, GDBUS_ARGS({ "path", "s" }),
-			ril_plugin_dbus_get_mms_modem) },
-	{ GDBUS_METHOD("GetReady",
-			NULL, GDBUS_ARGS({ "ready", "b" }),
-			ril_plugin_dbus_get_ready) },
-	{ GDBUS_METHOD("SetEnabledModems",
-			GDBUS_ARGS({ "modems", "ao" }), NULL,
-			ril_plugin_dbus_set_enabled_modems) },
-	{ GDBUS_METHOD("SetDefaultDataSim",
-			GDBUS_ARGS({ "imsi", "s" }), NULL,
-			ril_plugin_dbus_set_default_data_sim) },
-	{ GDBUS_METHOD("SetDefaultVoiceSim",
-			GDBUS_ARGS({ "imsi", "s" }), NULL,
-			ril_plugin_dbus_set_default_voice_sim) },
-	{ GDBUS_METHOD("SetMmsSim",
-			GDBUS_ARGS({ "imsi", "s" }), NULL,
-			ril_plugin_dbus_set_mms_sim) },
-	{ }
-};
-
-static const GDBusSignalTable ril_plugin_dbus_signals[] = {
-	{ GDBUS_SIGNAL(RIL_DBUS_SIGNAL_ENABLED_MODEMS_CHANGED,
-			GDBUS_ARGS({ "modems", "ao" })) },
-	{ GDBUS_SIGNAL(RIL_DBUS_SIGNAL_PRESENT_SIMS_CHANGED,
-			GDBUS_ARGS({"index", "i" },
-			{"present" , "b"})) },
-	{ GDBUS_SIGNAL(RIL_DBUS_SIGNAL_DEFAULT_DATA_SIM_CHANGED,
-			GDBUS_ARGS({ "imsi", "s" })) },
-	{ GDBUS_SIGNAL(RIL_DBUS_SIGNAL_DEFAULT_VOICE_SIM_CHANGED,
-			GDBUS_ARGS({ "imsi", "s" })) },
-	{ GDBUS_SIGNAL(RIL_DBUS_SIGNAL_DEFAULT_DATA_MODEM_CHANGED,
-			GDBUS_ARGS({ "path", "s" })) },
-	{ GDBUS_SIGNAL(RIL_DBUS_SIGNAL_DEFAULT_VOICE_MODEM_CHANGED,
-			GDBUS_ARGS({ "path", "s" })) },
-	{ GDBUS_SIGNAL(RIL_DBUS_SIGNAL_MMS_SIM_CHANGED,
-			GDBUS_ARGS({ "imsi", "s" })) },
-	{ GDBUS_SIGNAL(RIL_DBUS_SIGNAL_MMS_MODEM_CHANGED,
-			GDBUS_ARGS({ "path", "s" })) },
-	{ GDBUS_SIGNAL(RIL_DBUS_SIGNAL_READY_CHANGED,
-			GDBUS_ARGS({ "ready", "b" })) },
-	{ }
-};
-
-struct ril_plugin_dbus *ril_plugin_dbus_new(struct ril_plugin *plugin)
-{
-	struct ril_plugin_dbus *dbus = g_new0(struct ril_plugin_dbus, 1);
-
-	dbus->conn = dbus_connection_ref(ofono_dbus_get_connection());
-	dbus->plugin = plugin;
-	if (g_dbus_register_interface(dbus->conn, RIL_DBUS_PATH,
-			RIL_DBUS_INTERFACE, ril_plugin_dbus_methods,
-			ril_plugin_dbus_signals, NULL, dbus, NULL)) {
-		return dbus;
-	} else {
-		ofono_error("RIL D-Bus register failed");
-		ril_plugin_dbus_free(dbus);
-		return NULL;
-	}
-}
-
-void ril_plugin_dbus_free(struct ril_plugin_dbus *dbus)
-{
-	if (dbus) {
-		if (dbus->mms_watch) {
-			g_dbus_remove_watch(dbus->conn, dbus->mms_watch);
-		}
-
-		g_slist_free_full(dbus->blocked_imei_req,
-					ril_plugin_dbus_cancel_request);
-		g_dbus_unregister_interface(dbus->conn, RIL_DBUS_PATH,
-							RIL_DBUS_INTERFACE);
-		dbus_connection_unref(dbus->conn);
-		g_free(dbus);
-	}
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_radio.c
+++ b/ofono/drivers/ril/ril_radio.c
@@ -1,450 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_radio.h"
-#include "ril_util.h"
-#include "ril_log.h"
-
-#include <grilio_queue.h>
-#include <grilio_request.h>
-#include <grilio_parser.h>
-
-#include <gutil_misc.h>
-
-typedef GObjectClass RilRadioClass;
-typedef struct ril_radio RilRadio;
-
-/*
- * Object states:
- *
- * 1. Idle (!pending && !retry)
- * 2. Power on/off request pending (pending)
- * 3. Power on retry has been scheduled (retry)
- */
-struct ril_radio_priv {
-	GRilIoChannel *io;
-	GRilIoQueue *q;
-	gulong state_event_id;
-	char *log_prefix;
-	GHashTable *req_table;
-	guint pending_id;
-	guint retry_id;
-	guint state_changed_while_request_pending;
-	enum ril_radio_state last_known_state;
-	gboolean power_cycle;
-	gboolean next_state_valid;
-	gboolean next_state;
-};
-
-enum ril_radio_signal {
-	SIGNAL_STATE_CHANGED,
-	SIGNAL_ONLINE_CHANGED,
-	SIGNAL_COUNT
-};
-
-#define POWER_RETRY_SECS (1)
-
-#define SIGNAL_STATE_CHANGED_NAME       "ril-radio-state-changed"
-#define SIGNAL_ONLINE_CHANGED_NAME      "ril-radio-online-changed"
-
-static guint ril_radio_signals[SIGNAL_COUNT] = { 0 };
-
-#define NEW_SIGNAL(klass,name) \
-	ril_radio_signals[SIGNAL_##name##_CHANGED] = \
-		g_signal_new(SIGNAL_##name##_CHANGED_NAME, \
-			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST, \
-			0, NULL, NULL, NULL, G_TYPE_NONE, 0)
-
-G_DEFINE_TYPE(RilRadio, ril_radio, G_TYPE_OBJECT)
-#define RIL_RADIO_TYPE (ril_radio_get_type())
-#define RIL_RADIO(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj,RIL_RADIO_TYPE,RilRadio))
-
-static void ril_radio_submit_power_request(struct ril_radio *self, gboolean on);
-
-static inline gboolean ril_radio_power_should_be_on(struct ril_radio *self)
-{
-	struct ril_radio_priv *priv = self->priv;
-
-	return self->online && !priv->power_cycle &&
-				g_hash_table_size(priv->req_table) > 0;
-}
-
-static inline gboolean ril_radio_state_off(enum ril_radio_state radio_state)
-{
-	return radio_state == RADIO_STATE_OFF;
-}
-
-static inline gboolean ril_radio_state_on(enum ril_radio_state radio_state)
-{
-	return !ril_radio_state_off(radio_state);
-}
-
-static inline void ril_radio_emit_signal(struct ril_radio *self,
-						enum ril_radio_signal id)
-{
-	g_signal_emit(self, ril_radio_signals[id], 0);
-}
-
-static gboolean ril_radio_power_request_retry_cb(gpointer user_data)
-{
-	struct ril_radio *self = user_data;
-	struct ril_radio_priv *priv = self->priv;
-
-	DBG("%s", priv->log_prefix);
-	GASSERT(priv->retry_id);
-	priv->retry_id = 0;
-	ril_radio_submit_power_request(self, ril_radio_power_should_be_on(self));
-
-	return G_SOURCE_REMOVE;
-}
-
-static void ril_radio_cancel_retry(struct ril_radio *self)
-{
-	struct ril_radio_priv *priv = self->priv;
-
-	if (priv->retry_id) {
-		DBG("%sretry cancelled", priv->log_prefix);
-		g_source_remove(priv->retry_id);
-		priv->retry_id = 0;
-	}
-}
-
-static void ril_radio_check_state(struct ril_radio *self)
-{
-	struct ril_radio_priv *priv = self->priv;
-
-	if (!priv->pending_id) {
-		const gboolean should_be_on = ril_radio_power_should_be_on(self);
-
-		if (ril_radio_state_on(self->priv->last_known_state) ==
-								should_be_on) {
-			/* All is good, cancel pending retry if there is one */
-			ril_radio_cancel_retry(self);
-		} else if (priv->state_changed_while_request_pending) {
-			/* Hmm... RIL's reaction was inadequate, repeat */
-			ril_radio_submit_power_request(self, should_be_on);
-		} else if (!priv->retry_id) {
-			/* There has been no reaction so far, wait a bit */
-			DBG("%sretry scheduled", priv->log_prefix);
-			priv->retry_id = g_timeout_add_seconds(POWER_RETRY_SECS,
-					ril_radio_power_request_retry_cb, self);
-		}
-	}
-
-	/* Don't update public state while something is pending */
-	if (!priv->pending_id && !priv->retry_id &&
-				self->state != priv->last_known_state) {
-		DBG("%s%s -> %s", priv->log_prefix,
-			ril_radio_state_to_string(self->state),
-			ril_radio_state_to_string(priv->last_known_state));
-		self->state = priv->last_known_state;
-		ril_radio_emit_signal(self, SIGNAL_STATE_CHANGED);
-	}
-}
-
-static void ril_radio_power_request_cb(GRilIoChannel *channel, int ril_status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_radio *self = user_data;
-	struct ril_radio_priv *priv = self->priv;
-
-	GASSERT(priv->pending_id);
-	priv->pending_id = 0;
-
-	if (ril_status != RIL_E_SUCCESS) {
-		ofono_error("Power request failed: %s",
-					ril_error_to_string(ril_status));
-	}
-
-	if (priv->next_state_valid) {
-		ril_radio_submit_power_request(self, priv->next_state);
-	} else {
-		ril_radio_check_state(self);
-	}
-}
-
-static void ril_radio_submit_power_request(struct ril_radio *self, gboolean on)
-{
-	struct ril_radio_priv *priv = self->priv;
-	GRilIoRequest *req = grilio_request_sized_new(8);
-
-	grilio_request_append_int32(req, 1);
-	grilio_request_append_int32(req, on); /* Radio ON=1, OFF=0 */
-
-	priv->next_state_valid = FALSE;
-	priv->next_state = on;
-	priv->state_changed_while_request_pending = 0;
-	ril_radio_cancel_retry(self);
-
-	GASSERT(!priv->pending_id);
-	priv->pending_id = grilio_queue_send_request_full(priv->q, req,
-		RIL_REQUEST_RADIO_POWER, ril_radio_power_request_cb, NULL, self);
-	grilio_request_unref(req);
-}
-
-static void ril_radio_power_request(struct ril_radio *self, gboolean on,
-							gboolean allow_repeat)
-{
-	struct ril_radio_priv *priv = self->priv;
-	const char *on_off = on ? "on" : "off";
-
-	if (priv->pending_id) {
-		if (allow_repeat || priv->next_state != on) {
-			/* Wait for the pending request to complete */
-			priv->next_state_valid = TRUE;
-			priv->next_state = on;
-			DBG("%s%s (queued)", priv->log_prefix, on_off);
-		} else {
-			DBG("%s%s (ignored)", priv->log_prefix, on_off);
-		}
-	} else {
-		DBG("%s%s", priv->log_prefix, on_off);
-		ril_radio_submit_power_request(self, on);
-	}
-}
-
-void ril_radio_confirm_power_on(struct ril_radio *self)
-{
-	if (G_LIKELY(self) && ril_radio_power_should_be_on(self)) {
-		ril_radio_power_request(self, TRUE, TRUE);
-	}
-}
-
-void ril_radio_power_cycle(struct ril_radio *self)
-{
-	if (G_LIKELY(self)) {
-		struct ril_radio_priv *priv = self->priv;
-
-		if (ril_radio_state_off(priv->last_known_state)) {
-			DBG("%spower is already off", priv->log_prefix);
-			GASSERT(!priv->power_cycle);
-		} else if (priv->power_cycle) {
-			DBG("%salready in progress", priv->log_prefix);
-		} else {
-			DBG("%sinitiated", priv->log_prefix);
-			priv->power_cycle = TRUE;
-			if (!priv->pending_id) {
-				ril_radio_submit_power_request(self, FALSE);
-			}
-		}
-	}
-}
-
-void ril_radio_power_on(struct ril_radio *self, gpointer tag)
-{
-	if (G_LIKELY(self)) {
-		struct ril_radio_priv *priv = self->priv;
-
-		if (!g_hash_table_contains(priv->req_table, tag)) {
-			gboolean was_on = ril_radio_power_should_be_on(self);
-
-			DBG("%s%p", priv->log_prefix, tag);
-			g_hash_table_insert(priv->req_table, tag, tag);
-			if (!was_on && ril_radio_power_should_be_on(self)) {
-				ril_radio_power_request(self, TRUE, FALSE);
-			}
-		}
-	}
-}
-
-void ril_radio_power_off(struct ril_radio *self, gpointer tag)
-{
-	if (G_LIKELY(self)) {
-		struct ril_radio_priv *priv = self->priv;
-
-		if (g_hash_table_remove(priv->req_table, tag)) {
-			DBG("%s%p", priv->log_prefix, tag);
-			if (!ril_radio_power_should_be_on(self)) {
-				/* The last one turns the lights off */
-				ril_radio_power_request(self, FALSE, FALSE);
-			}
-		}
-	}
-}
-
-void ril_radio_set_online(struct ril_radio *self, gboolean online)
-{
-	if (G_LIKELY(self) && self->online != online) {
-		gboolean on, was_on = ril_radio_power_should_be_on(self);
-		self->online = online;
-		on = ril_radio_power_should_be_on(self);
-		if (was_on != on) {
-			ril_radio_power_request(self, on, FALSE);
-		}
-		ril_radio_emit_signal(self, SIGNAL_ONLINE_CHANGED);
-	}
-}
-
-gulong ril_radio_add_state_changed_handler(struct ril_radio *self,
-					ril_radio_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_STATE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-gulong ril_radio_add_online_changed_handler(struct ril_radio *self,
-					ril_radio_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_ONLINE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-void ril_radio_remove_handler(struct ril_radio *self, gulong id)
-{
-	if (G_LIKELY(self) && G_LIKELY(id)) {
-		g_signal_handler_disconnect(self, id);
-	}
-}
-
-void ril_radio_remove_handlers(struct ril_radio *self, gulong *ids, int count)
-{
-	gutil_disconnect_handlers(self, ids, count);
-}
-
-enum ril_radio_state ril_radio_state_parse(const void *data, guint len)
-{
-	GRilIoParser rilp;
-	int radio_state;
-
-	grilio_parser_init(&rilp, data, len);
-	if (grilio_parser_get_int32(&rilp, &radio_state)) {
-		return radio_state;
-	} else {
-		ofono_error("Error parsing radio state");
-		return RADIO_STATE_UNAVAILABLE;
-	}
-}
-
-static void ril_radio_state_changed(GRilIoChannel *io, guint code,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_radio *self = user_data;
-	enum ril_radio_state radio_state = ril_radio_state_parse(data, len);
-
-	GASSERT(code == RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED);
-	if (radio_state != RADIO_STATE_UNAVAILABLE) {
-		struct ril_radio_priv *priv = self->priv;
-
-		DBG("%s%s", priv->log_prefix,
-			ril_radio_state_to_string(radio_state));
-		GASSERT(!priv->pending_id || !priv->retry_id);
-
-		if (priv->power_cycle && ril_radio_state_off(radio_state)) {
-			DBG("%sswitched off for power cycle", priv->log_prefix);
-			priv->power_cycle = FALSE;
-		}
-
-		if (priv->pending_id) {
-			priv->state_changed_while_request_pending++;
-		}
-
-		priv->last_known_state = radio_state;
-		ril_radio_check_state(self);
-	}
-}
-
-struct ril_radio *ril_radio_new(GRilIoChannel *io)
-{
-	struct ril_radio *self = g_object_new(RIL_RADIO_TYPE, NULL);
-	struct ril_radio_priv *priv = self->priv;
-
-	priv->io = grilio_channel_ref(io);
-	priv->q = grilio_queue_new(priv->io);
-	priv->log_prefix =
-		(io && io->name && io->name[0] && strcmp(io->name, "RIL")) ?
-		g_strconcat(io->name, " ", NULL) : g_strdup("");
-	DBG("%s", priv->log_prefix);
-	priv->state_event_id = grilio_channel_add_unsol_event_handler(priv->io,
-				ril_radio_state_changed,
-				RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED, self);
-	return self;
-}
-
-struct ril_radio *ril_radio_ref(struct ril_radio *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_ref(RIL_RADIO(self));
-		return self;
-	} else {
-		return NULL;
-	}
-}
-
-void ril_radio_unref(struct ril_radio *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_unref(RIL_RADIO(self));
-	}
-}
-
-static void ril_radio_init(struct ril_radio *self)
-{
-	struct ril_radio_priv *priv = G_TYPE_INSTANCE_GET_PRIVATE(self,
-					RIL_RADIO_TYPE, struct ril_radio_priv);
-	self->priv = priv;
-	priv->req_table = g_hash_table_new_full(g_direct_hash, g_direct_equal,
-								NULL, NULL);
-}
-
-static void ril_radio_dispose(GObject *object)
-{
-	struct ril_radio *self = RIL_RADIO(object);
-	struct ril_radio_priv *priv = self->priv;
-
-	if (priv->state_event_id) {
-		grilio_channel_remove_handler(priv->io, priv->state_event_id);
-		priv->state_event_id = 0;
-	}
-	if (priv->pending_id) {
-		grilio_queue_cancel_request(priv->q, priv->pending_id, FALSE);
-		priv->pending_id = 0;
-	}
-	priv->next_state_valid = FALSE;
-	ril_radio_cancel_retry(self);
-	grilio_queue_cancel_all(priv->q, FALSE);
-	G_OBJECT_CLASS(ril_radio_parent_class)->dispose(object);
-}
-
-static void ril_radio_finalize(GObject *object)
-{
-	struct ril_radio *self = RIL_RADIO(object);
-	struct ril_radio_priv *priv = self->priv;
-
-	DBG("%s", priv->log_prefix);
-	g_free(priv->log_prefix);
-	grilio_channel_unref(priv->io);
-	grilio_queue_unref(priv->q);
-	g_hash_table_unref(priv->req_table);
-	G_OBJECT_CLASS(ril_radio_parent_class)->finalize(object);
-}
-
-static void ril_radio_class_init(RilRadioClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
-	object_class->dispose = ril_radio_dispose;
-	object_class->finalize = ril_radio_finalize;
-	g_type_class_add_private(klass, sizeof(struct ril_radio_priv));
-	NEW_SIGNAL(klass, STATE);
-	NEW_SIGNAL(klass, ONLINE);
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_radio.h
+++ b/ofono/drivers/ril/ril_radio.h
@@ -1,55 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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_RADIO_H
-#define RIL_RADIO_H
-
-#include "ril_types.h"
-
-struct ril_radio {
-	GObject object;
-	struct ril_radio_priv *priv;
-	enum ril_radio_state state;
-	gboolean online;
-};
-
-typedef void (*ril_radio_cb_t)(struct ril_radio *radio, void *arg);
-
-struct ril_radio *ril_radio_new(GRilIoChannel *io);
-struct ril_radio *ril_radio_ref(struct ril_radio *radio);
-void ril_radio_unref(struct ril_radio *radio);
-
-void ril_radio_power_on(struct ril_radio *radio, gpointer tag);
-void ril_radio_power_off(struct ril_radio *radio, gpointer tag);
-void ril_radio_power_cycle(struct ril_radio *radio);
-void ril_radio_confirm_power_on(struct ril_radio *radio);
-void ril_radio_set_online(struct ril_radio *radio, gboolean online);
-gulong ril_radio_add_state_changed_handler(struct ril_radio *radio,
-					ril_radio_cb_t cb, void *arg);
-gulong ril_radio_add_online_changed_handler(struct ril_radio *radio,
-					ril_radio_cb_t cb, void *arg);
-void ril_radio_remove_handler(struct ril_radio *radio, gulong id);
-void ril_radio_remove_handlers(struct ril_radio *radio, gulong *ids, int n);
-enum ril_radio_state ril_radio_state_parse(const void *data, guint len);
-
-#endif /* RIL_RADIO_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_radio_settings.c
+++ b/ofono/drivers/ril/ril_radio_settings.c
@@ -1,199 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_sim_settings.h"
-#include "ril_util.h"
-#include "ril_log.h"
-#include "ril_constants.h"
-
-struct ril_radio_settings {
-	struct ofono_radio_settings *rs;
-	struct ril_sim_settings *settings;
-	const char *log_prefix;
-	char *allocated_log_prefix;
-	guint source_id;
-};
-
-struct ril_radio_settings_cbd {
-	struct ril_radio_settings *rsd;
-	union _ofono_radio_settings_cb {
-		ofono_radio_settings_rat_mode_set_cb_t rat_mode_set;
-		ofono_radio_settings_rat_mode_query_cb_t rat_mode_query;
-		ofono_radio_settings_available_rats_query_cb_t available_rats;
-		gpointer ptr;
-	} cb;
-	gpointer data;
-};
-
-#define DBG_(rsd,fmt,args...) DBG("%s" fmt, (rsd)->log_prefix, ##args)
-
-static inline struct ril_radio_settings *ril_radio_settings_get_data(
-					struct ofono_radio_settings *rs)
-{
-	return ofono_radio_settings_get_data(rs);
-}
-
-static void ril_radio_settings_later(struct ril_radio_settings *rsd,
-				GSourceFunc fn, void *cb, void *data)
-{
-	struct ril_radio_settings_cbd *cbd;
-
-	cbd = g_new0(struct ril_radio_settings_cbd, 1);
-	cbd->rsd = rsd;
-	cbd->cb.ptr = cb;
-	cbd->data = data;
-
-	GASSERT(!rsd->source_id);
-	rsd->source_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-							fn, cbd, g_free);
-}
-
-static gboolean ril_radio_settings_set_rat_mode_cb(gpointer user_data)
-{
-	struct ofono_error error;
-	struct ril_radio_settings_cbd *cbd = user_data;
-	struct ril_radio_settings *rsd = cbd->rsd;
-
-	GASSERT(rsd->source_id);
-	rsd->source_id = 0;
-	cbd->cb.rat_mode_set(ril_error_ok(&error), cbd->data);
-	return G_SOURCE_REMOVE;
-}
-
-static void ril_radio_settings_set_rat_mode(struct ofono_radio_settings *rs,
-		enum ofono_radio_access_mode mode,
-		ofono_radio_settings_rat_mode_set_cb_t cb, void *data)
-{
-	struct ril_radio_settings *rsd = ril_radio_settings_get_data(rs);
-	DBG_(rsd, "%s", ofono_radio_access_mode_to_string(mode));
-	ril_sim_settings_set_pref_mode(rsd->settings, mode);
-	ril_radio_settings_later(rsd, ril_radio_settings_set_rat_mode_cb,
-								cb, data);
-}
-
-static gboolean ril_radio_settings_query_rat_mode_cb(gpointer user_data)
-{
-	struct ril_radio_settings_cbd *cbd = user_data;
-	struct ril_radio_settings *rsd = cbd->rsd;
-	enum ofono_radio_access_mode mode = rsd->settings->pref_mode;
-	struct ofono_error error;
-
-	DBG_(rsd, "rat mode %s", ofono_radio_access_mode_to_string(mode));
-	GASSERT(rsd->source_id);
-	rsd->source_id = 0;
-	cbd->cb.rat_mode_query(ril_error_ok(&error), mode, cbd->data);
-	return G_SOURCE_REMOVE;
-}
-
-static void ril_radio_settings_query_rat_mode(struct ofono_radio_settings *rs,
-		ofono_radio_settings_rat_mode_query_cb_t cb, void *data)
-{
-	struct ril_radio_settings *rsd = ril_radio_settings_get_data(rs);
-
-	DBG_(rsd, "");
-	ril_radio_settings_later(rsd, ril_radio_settings_query_rat_mode_cb,
-								cb, data);
-}
-
-static gboolean ril_radio_settings_query_available_rats_cb(gpointer data)
-{
-	struct ofono_error error;
-	struct ril_radio_settings_cbd *cbd = data;
-	struct ril_radio_settings *rsd = cbd->rsd;
-	guint rats = OFONO_RADIO_ACCESS_MODE_GSM | OFONO_RADIO_ACCESS_MODE_UMTS;
-
-	if (cbd->rsd->settings->enable_4g) {
-		rats |= OFONO_RADIO_ACCESS_MODE_LTE;
-	}
-
-	GASSERT(cbd->rsd->source_id);
-	rsd->source_id = 0;
-	cbd->cb.available_rats(ril_error_ok(&error), rats, cbd->data);
-	return G_SOURCE_REMOVE;
-}
-
-static void ril_radio_settings_query_available_rats(
-		struct ofono_radio_settings *rs,
-		ofono_radio_settings_available_rats_query_cb_t cb, void *data)
-{
-	struct ril_radio_settings *rsd = ril_radio_settings_get_data(rs);
-
-	DBG_(rsd, "");
-	ril_radio_settings_later(rsd, ril_radio_settings_query_available_rats_cb,
-								cb, data);
-}
-
-static gboolean ril_radio_settings_register(gpointer user_data)
-{
-	struct ril_radio_settings *rsd = user_data;
-	GASSERT(rsd->source_id);
-	rsd->source_id = 0;
-	ofono_radio_settings_register(rsd->rs);
-	return G_SOURCE_REMOVE;
-}
-
-static int ril_radio_settings_probe(struct ofono_radio_settings *rs,
-					unsigned int vendor, void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_radio_settings *rsd = g_new0(struct ril_radio_settings, 1);
-
-	DBG("%s", modem->log_prefix);
-	rsd->rs = rs;
-	rsd->settings = ril_sim_settings_ref(modem->sim_settings);
-	rsd->source_id = g_idle_add(ril_radio_settings_register, rsd);
-
-	if (modem->log_prefix && modem->log_prefix[0]) {
-		rsd->log_prefix = rsd->allocated_log_prefix =
-			g_strconcat(modem->log_prefix, " ", NULL);
-	} else {
-		rsd->log_prefix = "";
-	}
-
-	ofono_radio_settings_set_data(rs, rsd);
-	return 0;
-}
-
-static void ril_radio_settings_remove(struct ofono_radio_settings *rs)
-{
-	struct ril_radio_settings *rsd = ril_radio_settings_get_data(rs);
-
-	DBG_(rsd, "");
-	ofono_radio_settings_set_data(rs, NULL);
-	if (rsd->source_id) {
-		g_source_remove(rsd->source_id);
-        }
-	ril_sim_settings_unref(rsd->settings);
-	g_free(rsd->allocated_log_prefix);
-	g_free(rsd);
-}
-
-const struct ofono_radio_settings_driver ril_radio_settings_driver = {
-	.name                 = RILMODEM_DRIVER,
-	.probe                = ril_radio_settings_probe,
-	.remove               = ril_radio_settings_remove,
-	.query_rat_mode       = ril_radio_settings_query_rat_mode,
-	.set_rat_mode         = ril_radio_settings_set_rat_mode,
-	.query_available_rats = ril_radio_settings_query_available_rats
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_sim.c
+++ b/ofono/drivers/ril/ril_sim.c
--- a/ofono/drivers/ril/ril_sim_card.c
+++ b/ofono/drivers/ril/ril_sim_card.c
@@ -1,547 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_sim_card.h"
-#include "ril_radio.h"
-#include "ril_util.h"
-#include "ril_log.h"
-
-#include <grilio_queue.h>
-#include <grilio_request.h>
-#include <grilio_parser.h>
-
-#include <gutil_misc.h>
-
-typedef GObjectClass RilSimCardClass;
-typedef struct ril_sim_card RilSimCard;
-
-enum ril_sim_card_event {
-	EVENT_SIM_STATUS_CHANGED,
-	EVENT_UICC_SUBSCRIPTION_STATUS_CHANGED,
-	EVENT_COUNT
-};
-
-struct ril_sim_card_priv {
-	GRilIoChannel *io;
-	GRilIoQueue *q;
-	int flags;
-	guint status_req_id;
-	gulong event_id[EVENT_COUNT];
-};
-
-enum ril_sim_card_signal {
-	SIGNAL_STATUS_RECEIVED,
-	SIGNAL_STATUS_CHANGED,
-	SIGNAL_STATE_CHANGED,
-	SIGNAL_APP_CHANGED,
-	SIGNAL_COUNT
-};
-
-#define SIGNAL_STATUS_RECEIVED_NAME     "ril-simcard-status-received"
-#define SIGNAL_STATUS_CHANGED_NAME      "ril-simcard-status-changed"
-#define SIGNAL_STATE_CHANGED_NAME       "ril-simcard-state-changed"
-#define SIGNAL_APP_CHANGED_NAME         "ril-simcard-app-changed"
-
-static guint ril_sim_card_signals[SIGNAL_COUNT] = { 0 };
-
-G_DEFINE_TYPE(RilSimCard, ril_sim_card, G_TYPE_OBJECT)
-#define RIL_SIMCARD_TYPE (ril_sim_card_get_type())
-#define RIL_SIMCARD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-	RIL_SIMCARD_TYPE, RilSimCard))
-
-#define RIL_SIMCARD_STATE_CHANGED  (0x01)
-#define RIL_SIMCARD_STATUS_CHANGED (0x02)
-
-static void ril_sim_card_request_status(struct ril_sim_card *self);
-
-static gboolean ril_sim_card_app_equal(const struct ril_sim_card_app *a1,
-					const struct ril_sim_card_app *a2)
-{
-	if (a1 == a2) {
-		return TRUE;
-	} else if (!a1 || !a2) {
-		return FALSE;
-	} else {
-		return a1->app_type == a2->app_type &&
-			a1->app_state == a2->app_state &&
-			a1->perso_substate == a2->perso_substate &&
-			a1->pin_replaced == a2->pin_replaced &&
-			a1->pin1_state == a2->pin1_state &&
-			a1->pin2_state == a2->pin2_state &&
-			!g_strcmp0(a1->aid, a2->aid) &&
-			!g_strcmp0(a1->label, a2->label);
-	}
-}
-
-static int ril_sim_card_status_compare(const struct ril_sim_card_status *s1,
-					const struct ril_sim_card_status *s2)
-{
-	if (s1 == s2) {
-		return 0;
-	} else if (!s1 || !s2) {
-		return RIL_SIMCARD_STATE_CHANGED | RIL_SIMCARD_STATUS_CHANGED;
-	} else {
-		int diff = 0;
-
-		if (s1->card_state != s2->card_state) {
-			diff |= RIL_SIMCARD_STATE_CHANGED;
-		}
-
-		if (s1->pin_state != s2->pin_state ||
-			s1->gsm_umts_index != s2->gsm_umts_index ||
-			s1->cdma_index != s2->cdma_index ||
-			s1->ims_index != s2->ims_index ||
-			s1->num_apps != s2->num_apps) {
-			diff |= RIL_SIMCARD_STATUS_CHANGED;
-		} else {
-			int i;
-
-			for (i = 0; i < s1->num_apps; i++) {
-				if (!ril_sim_card_app_equal(s1->apps + i,
-							     s2->apps + i)) {
-					diff |= RIL_SIMCARD_STATUS_CHANGED;
-					break;
-				}
-			}
-		}
-
-		return diff;
-	}
-}
-
-static void ril_sim_card_status_free(struct ril_sim_card_status *status)
-{
-	if (status) {
-		if (status->apps) {
-			int i;
-
-			for (i = 0; i < status->num_apps; i++) {
-				g_free(status->apps[i].aid);
-				g_free(status->apps[i].label);
-			}
-			g_free(status->apps);
-		}
-		g_free(status);
-	}
-}
-
-static void ril_sim_card_subscribe(struct ril_sim_card *self,
-						int app_index, int sub_status)
-{
-	struct ril_sim_card_priv *priv = self->priv;
-	GRilIoRequest *req = grilio_request_sized_new(16);
-	const guint sub_id = self->slot;
-
-	DBG("%u,%d,%u,%d", self->slot, app_index, sub_id, sub_status);
-	grilio_request_append_int32(req, self->slot);
-	grilio_request_append_int32(req, app_index);
-	grilio_request_append_int32(req, sub_id);
-	grilio_request_append_int32(req, sub_status);
-	grilio_queue_send_request(priv->q, req, (priv->io->ril_version <= 9 &&
-		(priv->flags & RIL_SIM_CARD_V9_UICC_SUBSCRIPTION_WORKAROUND)) ?
-				RIL_REQUEST_V9_SET_UICC_SUBSCRIPTION :
-				RIL_REQUEST_SET_UICC_SUBSCRIPTION);
-	grilio_request_unref(req);
-}
-
-static int ril_sim_card_select_app(const struct ril_sim_card_status *status)
-{
-	int selected_app = -1;
-	guint i;
-
-	for (i = 0; i < status->num_apps; i++) {
-		const int type = status->apps[i].app_type;
-		if (type == RIL_APPTYPE_USIM || type == RIL_APPTYPE_RUIM) {
-			selected_app = i;
-			break;
-		} else if (type != RIL_APPTYPE_UNKNOWN && selected_app == -1) {
-			selected_app = i;
-		}
-	}
-
-	DBG("%d", selected_app);
-	return selected_app;
-}
-
-static void ril_sim_card_update_app(struct ril_sim_card *self)
-{
-	const struct ril_sim_card_app *old_app = self->app;
-	const struct ril_sim_card_status *status = self->status;
-	int app_index;
-
-	if (status->card_state == RIL_CARDSTATE_PRESENT) {
-		if (status->gsm_umts_index >= 0 &&
-				status->gsm_umts_index < status->num_apps) {
-			app_index = status->gsm_umts_index;
-		} else {
-			app_index = ril_sim_card_select_app(status);
-			if (app_index >= 0) {
-				ril_sim_card_subscribe(self, app_index, 1);
-			}
-		}
-	} else {
-		app_index = -1;
-	}
-
-	if (app_index >= 0 &&
-		status->apps[app_index].app_type != RIL_APPTYPE_UNKNOWN) {
-		self->app = status->apps + app_index;
-	} else {
-		self->app = NULL;
-	}
-
-	if (!ril_sim_card_app_equal(old_app, self->app)) {
-		g_signal_emit(self,
-			ril_sim_card_signals[SIGNAL_APP_CHANGED], 0);
-	}
-}
-
-static void ril_sim_card_update_status(struct ril_sim_card *self,
-					struct ril_sim_card_status *status)
-{
-	const int diff = ril_sim_card_status_compare(self->status, status);
-
-	if (diff) {
-		struct ril_sim_card_status *old_status = self->status;
-
-		self->status = status;
-		ril_sim_card_update_app(self);
-		g_signal_emit(self, ril_sim_card_signals[
-						SIGNAL_STATUS_RECEIVED], 0);
-		if (diff & RIL_SIMCARD_STATUS_CHANGED) {
-			DBG("status changed");
-			g_signal_emit(self, ril_sim_card_signals[
-						SIGNAL_STATUS_CHANGED], 0);
-		}
-		if (diff & RIL_SIMCARD_STATE_CHANGED) {
-			DBG("state changed");
-			g_signal_emit(self, ril_sim_card_signals[
-						SIGNAL_STATE_CHANGED], 0);
-		}
-		ril_sim_card_status_free(old_status);
-	} else {
-		ril_sim_card_status_free(status);
-		g_signal_emit(self, ril_sim_card_signals[
-						SIGNAL_STATUS_RECEIVED], 0);
-	}
-}
-
-static gboolean ril_sim_card_app_parse(GRilIoParser *rilp,
-						struct ril_sim_card_app *app)
-{
-	gint32 app_type, app_state, perso_substate;
-	gint32 pin_replaced, pin1_state, pin2_state;
-
-	grilio_parser_get_int32(rilp, &app_type);
-	grilio_parser_get_int32(rilp, &app_state);
-
-	/*
-	 * Consider RIL_APPSTATE_ILLEGAL also READY. Even if app state is
-	 * RIL_APPSTATE_ILLEGAL (-1), ICC operations must be permitted.
-	 * Network access requests will anyway be rejected and ME will be
-	 * in limited service.
-	 */
-	if (app_state == RIL_APPSTATE_ILLEGAL) {
-		DBG("RIL_APPSTATE_ILLEGAL => RIL_APPSTATE_READY");
-		app_state = RIL_APPSTATE_READY;
-	}
-
-	grilio_parser_get_int32(rilp, &perso_substate);
-	app->aid = grilio_parser_get_utf8(rilp);
-	app->label = grilio_parser_get_utf8(rilp);
-
-	if (grilio_parser_get_int32(rilp, &pin_replaced) &&
-		grilio_parser_get_int32(rilp, &pin1_state) &&
-		grilio_parser_get_int32(rilp, &pin2_state)) {
-
-		app->app_type = app_type;
-		app->app_state = app_state;
-		app->perso_substate = perso_substate;
-		app->pin_replaced = pin_replaced;
-		app->pin1_state = pin1_state;
-		app->pin2_state = pin2_state;
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static struct ril_sim_card_status *ril_sim_card_status_parse(const void *data,
-								guint len)
-{
-	GRilIoParser rilp;
-	gint32 card_state, pin_state, gsm_umts_index, cdma_index;
-        gint32 ims_index, num_apps;
-
-	grilio_parser_init(&rilp, data, len);
-
-	if (!grilio_parser_get_int32(&rilp, &card_state) ||
-		!grilio_parser_get_int32(&rilp, &pin_state) ||
-		!grilio_parser_get_int32(&rilp, &gsm_umts_index) ||
-		!grilio_parser_get_int32(&rilp, &cdma_index) ||
-		!grilio_parser_get_int32(&rilp, &ims_index) ||
-		!grilio_parser_get_int32(&rilp, &num_apps)) {
-		ofono_error("Failed to parse SIM card status request");
-		return NULL;
-	} else if (num_apps < 0 || num_apps > RIL_CARD_MAX_APPS) {
-		ofono_error("Invalid SIM app count %d", num_apps);
-		return NULL;
-	} else {
-		int i;
-		struct ril_sim_card_status *status =
-			g_new0(struct ril_sim_card_status, 1);
-
-		DBG("card_state=%d, universal_pin_state=%d, gsm_umts_index=%d, "
-			"cdma_index=%d, ims_index=%d, num_apps=%d",
-			card_state, pin_state, gsm_umts_index, cdma_index,
-			ims_index, num_apps);
-
-		status->card_state = card_state;
-		status->pin_state = pin_state;
-		status->gsm_umts_index = gsm_umts_index;
-		status->cdma_index = cdma_index;
-		status->ims_index = ims_index;
-		status->num_apps = num_apps;
-
-		if (num_apps > 0) {
-			status->apps = g_new0(struct ril_sim_card_app, num_apps);
-		}
-
-		for (i = 0; i < num_apps; i++) {
-			struct ril_sim_card_app *app = status->apps + i;
-
-			if (ril_sim_card_app_parse(&rilp, app)) {
-				DBG("app[%d]: type=%d, state=%d, "
-					"perso_substate=%d, aid_ptr=%s, "
-					"label=%s, pin1_replaced=%d, pin1=%d, "
-					"pin2=%d", i, app->app_type,
-					app->app_state, app->perso_substate,
-					app->aid, app->label,
-					app->pin_replaced, app->pin1_state,
-					app->pin2_state);
-			} else {
-				break;
-			}
-		}
-
-		if (i == num_apps) {
-			return status;
-		} else {
-			ril_sim_card_status_free(status);
-			return NULL;
-		}
-	}
-}
-
-static void ril_sim_card_status_cb(GRilIoChannel *io, int ril_status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sim_card *self = user_data;
-	struct ril_sim_card_priv *priv = self->priv;
-
-	GASSERT(priv->status_req_id);
-	priv->status_req_id = 0;
-
-	if (ril_status == RIL_E_SUCCESS) {
-		struct ril_sim_card_status *status =
-			ril_sim_card_status_parse(data, len);
-
-		if (status) {
-			ril_sim_card_update_status(self, status);
-		}
-	}
-}
-
-static void ril_sim_card_request_status(struct ril_sim_card *self)
-{
-	struct ril_sim_card_priv *priv = self->priv;
-
-	if (priv->status_req_id) {
-		/* Retry right away, don't wait for retry timeout to expire */
-		grilio_channel_retry_request(priv->io, priv->status_req_id);
-	} else {
-		GRilIoRequest* req = grilio_request_new();
-
-		grilio_request_set_retry(req, RIL_RETRY_SECS*1000, -1);
-		priv->status_req_id = grilio_queue_send_request_full(priv->q,
-					req, RIL_REQUEST_GET_SIM_STATUS,
-					ril_sim_card_status_cb, NULL, self);
-		grilio_request_unref(req);
-	}
-}
-
-static void ril_sim_card_status_changed(GRilIoChannel *io, guint code,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sim_card *self = user_data;
-
-	ril_sim_card_request_status(self);
-}
-
-struct ril_sim_card *ril_sim_card_new(GRilIoChannel *io, guint slot, int flags)
-{
-	struct ril_sim_card *self = g_object_new(RIL_SIMCARD_TYPE, NULL);
-	struct ril_sim_card_priv *priv = self->priv;
-
-	/*
-	 * We need to know the RIL version (for UICC subscription hack),
-	 * so we must be connected. The caller is supposed to make sure
-	 * that we get connected first.
-	 */
-	DBG("%u", slot);
-	GASSERT(io->connected);
-
-	self->slot = slot;
-	priv->io = grilio_channel_ref(io);
-	priv->q = grilio_queue_new(io);
-	priv->flags = flags;
-
-	priv->event_id[EVENT_SIM_STATUS_CHANGED] =
-		grilio_channel_add_unsol_event_handler(priv->io,
-			ril_sim_card_status_changed,
-			RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED, self);
-	priv->event_id[EVENT_UICC_SUBSCRIPTION_STATUS_CHANGED] =
-		grilio_channel_add_unsol_event_handler(priv->io,
-			ril_sim_card_status_changed,
-			RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED, self);
-	ril_sim_card_request_status(self);
-	return self;
-}
-
-struct ril_sim_card *ril_sim_card_ref(struct ril_sim_card *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_ref(RIL_SIMCARD(self));
-		return self;
-	} else {
-		return NULL;
-	}
-}
-
-void ril_sim_card_unref(struct ril_sim_card *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_unref(RIL_SIMCARD(self));
-	}
-}
-
-gboolean ril_sim_card_ready(struct ril_sim_card *self)
-{
-	return self && self->app &&
-		((self->app->app_state == RIL_APPSTATE_READY) ||
-		(self->app->app_state == RIL_APPSTATE_SUBSCRIPTION_PERSO &&
-		self->app->perso_substate == RIL_PERSOSUBSTATE_READY));
-}
-
-gulong ril_sim_card_add_status_received_handler(struct ril_sim_card *self,
-					ril_sim_card_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_STATUS_RECEIVED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-gulong ril_sim_card_add_status_changed_handler(struct ril_sim_card *self,
-					ril_sim_card_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_STATUS_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-gulong ril_sim_card_add_state_changed_handler(struct ril_sim_card *self,
-					ril_sim_card_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_STATE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-gulong ril_sim_card_add_app_changed_handler(struct ril_sim_card *self,
-					ril_sim_card_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_APP_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-void ril_sim_card_remove_handler(struct ril_sim_card *self, gulong id)
-{
-	if (G_LIKELY(self) && G_LIKELY(id)) {
-		g_signal_handler_disconnect(self, id);
-	}
-}
-
-void ril_sim_card_remove_handlers(struct ril_sim_card *self, gulong *ids, int n)
-{
-	gutil_disconnect_handlers(self, ids, n);
-}
-
-static void ril_sim_card_init(struct ril_sim_card *self)
-{
-	self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, RIL_SIMCARD_TYPE,
-						struct ril_sim_card_priv);
-}
-
-static void ril_sim_card_dispose(GObject *object)
-{
-	struct ril_sim_card *self = RIL_SIMCARD(object);
-	struct ril_sim_card_priv *priv = self->priv;
-
-	grilio_channel_remove_handlers(priv->io, priv->event_id, EVENT_COUNT);
-	grilio_queue_cancel_all(priv->q, TRUE);
-	G_OBJECT_CLASS(ril_sim_card_parent_class)->dispose(object);
-}
-
-static void ril_sim_card_finalize(GObject *object)
-{
-	struct ril_sim_card *self = RIL_SIMCARD(object);
-	struct ril_sim_card_priv *priv = self->priv;
-
-	grilio_channel_unref(priv->io);
-	grilio_queue_unref(priv->q);
-	ril_sim_card_status_free(self->status);
-	G_OBJECT_CLASS(ril_sim_card_parent_class)->finalize(object);
-}
-
-static void ril_sim_card_class_init(RilSimCardClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
-	object_class->dispose = ril_sim_card_dispose;
-	object_class->finalize = ril_sim_card_finalize;
-	g_type_class_add_private(klass, sizeof(struct ril_sim_card_priv));
-	ril_sim_card_signals[SIGNAL_STATUS_RECEIVED] =
-		g_signal_new(SIGNAL_STATUS_RECEIVED_NAME,
-			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
-			0, NULL, NULL, NULL, G_TYPE_NONE, 0);
-	ril_sim_card_signals[SIGNAL_STATUS_CHANGED] =
-		g_signal_new(SIGNAL_STATUS_CHANGED_NAME,
-			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
-			0, NULL, NULL, NULL, G_TYPE_NONE, 0);
-	ril_sim_card_signals[SIGNAL_STATE_CHANGED] =
-		g_signal_new(SIGNAL_STATE_CHANGED_NAME,
-			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
-			0, NULL, NULL, NULL, G_TYPE_NONE, 0);
-	ril_sim_card_signals[SIGNAL_APP_CHANGED] =
-		g_signal_new(SIGNAL_APP_CHANGED_NAME,
-			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
-			0, NULL, NULL, NULL, G_TYPE_NONE, 0);
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_sim_card.h
+++ b/ofono/drivers/ril/ril_sim_card.h
@@ -1,83 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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_SIM_CARD_H
-#define RIL_SIM_CARD_H
-
-#include "ril_types.h"
-
-struct ril_sim_card_app {
-	enum ril_app_type app_type;
-	enum ril_app_state app_state;
-	enum ril_perso_substate perso_substate;
-	char *aid;
-	char *label;
-	guint pin_replaced;
-	enum ril_pin_state pin1_state;
-	enum ril_pin_state pin2_state;
-};
-
-struct ril_sim_card_status {
-	enum ril_card_state card_state;
-	enum ril_pin_state pin_state;
-	int gsm_umts_index;
-	int cdma_index;
-	int ims_index;
-	int num_apps;
-	struct ril_sim_card_app *apps;
-};
-
-struct ril_sim_card {
-	GObject object;
-	struct ril_sim_card_priv *priv;
-	struct ril_sim_card_status *status;
-	const struct ril_sim_card_app *app;
-	guint slot;
-};
-
-typedef void (*ril_sim_card_cb_t)(struct ril_sim_card *sc, void *arg);
-
-/* Flags for ril_sim_card_new */
-#define RIL_SIM_CARD_V9_UICC_SUBSCRIPTION_WORKAROUND    (0x01)
-
-struct ril_sim_card *ril_sim_card_new(GRilIoChannel *io, guint slot, int flags);
-struct ril_sim_card *ril_sim_card_ref(struct ril_sim_card *sc);
-void ril_sim_card_unref(struct ril_sim_card *sc);
-gboolean ril_sim_card_ready(struct ril_sim_card *sc);
-gulong ril_sim_card_add_status_received_handler(struct ril_sim_card *sc,
-					ril_sim_card_cb_t cb, void *arg);
-gulong ril_sim_card_add_status_changed_handler(struct ril_sim_card *sc,
-					ril_sim_card_cb_t cb, void *arg);
-gulong ril_sim_card_add_state_changed_handler(struct ril_sim_card *sc,
-					ril_sim_card_cb_t cb, void *arg);
-gulong ril_sim_card_add_app_changed_handler(struct ril_sim_card *sc,
-					ril_sim_card_cb_t cb, void *arg);
-void ril_sim_card_remove_handler(struct ril_sim_card *sc, gulong id);
-void ril_sim_card_remove_handlers(struct ril_sim_card *sc, gulong *ids, int n);
-
-/* Inline wrappers */
-static inline enum ril_app_type
-ril_sim_card_app_type(struct ril_sim_card *sc)
-	{ return (sc && sc->app) ? sc->app->app_type : RIL_APPTYPE_UNKNOWN; }
-
-#endif /* RIL_SIM_CARD_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_sim_info.c
+++ b/ofono/drivers/ril/ril_sim_info.c
@@ -1,653 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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.
- */
-
-#include "ril_sim_info.h"
-#include "ril_network.h"
-#include "ril_log.h"
-
-#include <ofono/sim.h>
-
-#include "ofono.h"
-#include "storage.h"
-
-#define RIL_SIM_INFO_STORE          "cache"
-#define RIL_SIM_INFO_STORE_GROUP    "sim"
-#define RIL_SIM_INFO_STORE_SPN      "spn"
-
-/* ICCID -> IMSI map */
-#define RIL_SIM_ICCID_MAP           "iccidmap"
-#define RIL_SIM_ICCID_MAP_IMSI      "imsi"
-
-#define RIL_SIM_DEFAULT_SPN_BUFSIZE 8
-G_STATIC_ASSERT(RIL_SIM_DEFAULT_SPN_BUFSIZE >= \
-	OFONO_MAX_MCC_LENGTH + OFONO_MAX_MNC_LENGTH + 1);
-
-typedef GObjectClass RilSimInfoClass;
-typedef struct ril_sim_info RilSimInfo;
-
-typedef void (*ril_sim_info_remove_cb_t)(struct ofono_sim *sim,
-							unsigned int id);
-typedef void (*ril_sim_info_set_value_cb_t)(struct ril_sim_info *info,
-							const char *value);
-
-struct ril_sim_info_watch {
-	ril_sim_info_set_value_cb_t set_value;
-	ril_sim_info_remove_cb_t remove;
-	struct ril_sim_info *info;
-	unsigned int id;
-};
-
-struct ril_sim_info_priv {
-	char *log_prefix;
-	char *iccid;
-	char *imsi;
-	char *cached_spn;
-	char *sim_spn;
-	char *public_spn;
-	char default_spn[RIL_SIM_DEFAULT_SPN_BUFSIZE];
-	struct ofono_sim *sim;
-	struct ril_sim_info_watch state_watch;
-	struct ril_sim_info_watch iccid_watch;
-	struct ril_sim_info_watch imsi_watch;
-	struct ril_sim_info_watch spn_watch;
-	struct ril_network *network;
-	gulong network_operator_changed_id;
-	gboolean update_imsi_cache;
-	gboolean update_iccid_map;
-};
-
-enum ril_sim_info_signal {
-	SIGNAL_ICCID_CHANGED,
-	SIGNAL_IMSI_CHANGED,
-	SIGNAL_SPN_CHANGED,
-	SIGNAL_COUNT
-};
-
-#define SIGNAL_ICCID_CHANGED_NAME   "ril-sim-info-iccid-changed"
-#define SIGNAL_IMSI_CHANGED_NAME    "ril-sim-info-imsi-changed"
-#define SIGNAL_SPN_CHANGED_NAME     "ril-sim-info-spn-changed"
-
-static guint ril_sim_info_signals[SIGNAL_COUNT] = { 0 };
-
-G_DEFINE_TYPE(RilSimInfo, ril_sim_info, G_TYPE_OBJECT)
-#define RIL_SIMINFO_TYPE (ril_sim_info_get_type())
-#define RIL_SIMINFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
-	RIL_SIMINFO_TYPE, RilSimInfo))
-
-#define NEW_SIGNAL(klass,name) \
-	ril_sim_info_signals[SIGNAL_##name##_CHANGED] = \
-		g_signal_new(SIGNAL_##name##_CHANGED_NAME, \
-			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST, \
-			0, NULL, NULL, NULL, G_TYPE_NONE, 0)
-
-#define DBG_(info,fmt,args...) DBG("%s" fmt, (info)->priv->log_prefix, ##args)
-
-static void ril_sim_info_signal_emit(struct ril_sim_info *self,
-						enum ril_sim_info_signal id)
-{
-	g_signal_emit(self, ril_sim_info_signals[id], 0);
-}
-
-static void ril_sim_info_watch_remove(struct ril_sim_info_watch *watch)
-{
-	if (watch->id) {
-		struct ril_sim_info_priv *priv = watch->info->priv;
-
-		GASSERT(priv->sim);
-		if (priv->sim) {
-			watch->remove(priv->sim, watch->id);
-			GASSERT(!watch->id);
-		}
-
-		watch->id = 0;
-	}
-
-	if (watch->set_value) {
-		watch->set_value(watch->info, NULL);
-	}
-}
-
-static void ril_sim_info_remove_spn_watch(struct ofono_sim *sim,
-							unsigned int id)
-{
-	ofono_sim_remove_spn_watch(sim, &id);
-}
-
-static void ril_sim_info_update_imsi_cache(struct ril_sim_info *self)
-{
-	struct ril_sim_info_priv *priv = self->priv;
-
-	if (priv->update_imsi_cache && priv->imsi && priv->imsi[0] &&
-				priv->cached_spn && priv->cached_spn[0]) {
-		gboolean save = FALSE;
-		const char *store = RIL_SIM_INFO_STORE;
-		GKeyFile *cache = storage_open(priv->imsi, store);
-		char *spn = g_key_file_get_string(cache,
-					RIL_SIM_INFO_STORE_GROUP,
-					RIL_SIM_INFO_STORE_SPN, NULL);
-
-		if (g_strcmp0(priv->cached_spn, spn)) {
-			save = TRUE;
-			g_key_file_set_string(cache, RIL_SIM_INFO_STORE_GROUP,
-				RIL_SIM_INFO_STORE_SPN, priv->cached_spn);
-		}
-
-		/*
-		 * Since we are most likely running on flash which
-		 * supports a limited number of writes, don't overwrite
-		 * the file unless something has actually changed.
-		 */
-		if (save) {
-			DBG_(self, "updating " STORAGEDIR "/%s/%s",
-							priv->imsi, store);
-			storage_close(priv->imsi, store, cache, TRUE);
-		} else {
-			g_key_file_free(cache);
-		}
-
-		g_free(spn);
-		priv->update_imsi_cache = FALSE;
-	}
-}
-
-static void ril_sim_info_update_iccid_map(struct ril_sim_info *self)
-{
-	struct ril_sim_info_priv *priv = self->priv;
-
-	if (priv->update_iccid_map && priv->iccid && priv->iccid[0] &&
-						priv->imsi && priv->imsi[0]) {
-		const char *store = RIL_SIM_ICCID_MAP;
-		GKeyFile *map = storage_open(NULL, store);
-		char *imsi = g_key_file_get_string(map, RIL_SIM_ICCID_MAP_IMSI,
-							priv->iccid, NULL);
-
-		/*
-		 * Since we are most likely running on flash which
-		 * supports a limited number of writes, don't overwrite
-		 * the file unless something has actually changed.
-		 */
-		if (g_strcmp0(imsi, priv->imsi)) {
-			DBG_(self, "updating " STORAGEDIR "/%s", store);
-			g_key_file_set_string(map, RIL_SIM_ICCID_MAP_IMSI,
-						priv->iccid, priv->imsi);
-			storage_close(NULL, store, map, TRUE);
-		} else {
-			g_key_file_free(map);
-		}
-
-		g_free(imsi);
-		priv->update_iccid_map = FALSE;
-	}
-}
-
-static void ril_sim_info_set_imsi(struct ril_sim_info *self, const char *imsi)
-{
-	struct ril_sim_info_priv *priv = self->priv;
-
-	if (g_strcmp0(priv->imsi, imsi)) {
-		g_free(priv->imsi);
-		self->imsi = priv->imsi = g_strdup(imsi);
-		priv->update_iccid_map = TRUE;
-		ril_sim_info_update_iccid_map(self);
-		ril_sim_info_update_imsi_cache(self);
-		ril_sim_info_signal_emit(self, SIGNAL_IMSI_CHANGED);
-	}
-}
-
-static void ril_sim_info_update_public_spn(struct ril_sim_info *self)
-{
-	struct ril_sim_info_priv *priv = self->priv;
-	const char *spn = priv->sim_spn ? priv->sim_spn :
-				priv->cached_spn ? priv->cached_spn :
-				priv->default_spn;
-
-	if (g_strcmp0(priv->public_spn, spn)) {
-		g_free(priv->public_spn);
-		self->spn = priv->public_spn = g_strdup(spn);
-		ril_sim_info_signal_emit(self, SIGNAL_SPN_CHANGED);
-	}
-}
-
-static void ril_sim_info_set_cached_spn(struct ril_sim_info *self,
-							const char *spn)
-{
-	struct ril_sim_info_priv *priv = self->priv;
-
-	if (g_strcmp0(priv->cached_spn, spn)) {
-		DBG_(self, "cached spn \"%s\"", spn);
-		g_free(priv->cached_spn);
-		priv->cached_spn = g_strdup(spn);
-		priv->update_imsi_cache = TRUE;
-		ril_sim_info_update_imsi_cache(self);
-		ril_sim_info_update_public_spn(self);
-	}
-}
-
-static void ril_sim_info_set_sim_spn(struct ril_sim_info *self,
-							const char *spn)
-{
-	struct ril_sim_info_priv *priv = self->priv;
-
-	if (g_strcmp0(priv->sim_spn, spn)) {
-		g_free(priv->sim_spn);
-		priv->sim_spn = g_strdup(spn);
-		priv->update_imsi_cache = TRUE;
-		ril_sim_info_set_cached_spn(self, spn);
-		ril_sim_info_update_imsi_cache(self);
-		ril_sim_info_update_public_spn(self);
-	}
-}
-
-static void ril_sim_info_update_default_spn(struct ril_sim_info *self)
-{
-	struct ril_sim_info_priv *priv = self->priv;
-	char buf[RIL_SIM_DEFAULT_SPN_BUFSIZE];
-	const char *mcc = NULL;
-	const char *mnc = NULL;
-
-	if (priv->sim &&
-		ofono_sim_get_state(priv->sim) == OFONO_SIM_STATE_READY) {
-		mcc = ofono_sim_get_mcc(priv->sim);
-		mnc = ofono_sim_get_mnc(priv->sim);
-	}
-
-	if (mcc && mnc) {
-		snprintf(buf, RIL_SIM_DEFAULT_SPN_BUFSIZE, "%s%s", mcc, mnc);
-		buf[RIL_SIM_DEFAULT_SPN_BUFSIZE - 1] = 0;
-	} else {
-		buf[0] = 0;
-	}
-
-	if (strcmp(buf, priv->default_spn)) {
-		strncpy(priv->default_spn, buf, RIL_SIM_DEFAULT_SPN_BUFSIZE);
-		DBG_(self, "default spn \"%s\"", priv->default_spn);
-		ril_sim_info_update_public_spn(self);
-	}
-}
-
-static void ril_sim_info_network_check(struct ril_sim_info *self)
-{
-	struct ril_sim_info_priv *priv = self->priv;
-
-	if (priv->network && priv->network->operator && priv->sim &&
-		ofono_sim_get_state(priv->sim) == OFONO_SIM_STATE_READY) {
-		const char *mcc = ofono_sim_get_mcc(priv->sim);
-		const char *mnc = ofono_sim_get_mnc(priv->sim);
-		const struct ofono_network_operator *op =
-						priv->network->operator;
-
-		if (mcc && mcc[0] && !strcmp(mcc, op->mcc) &&
-				mnc && mnc[0] && !strcmp(mnc, op->mnc)) {
-
-			/*
-			 * If EFspn is present then sim_spn should be set
-			 * before we get registered with the network.
-			 */
-			DBG_(self, "home network \"%s\"", op->name);
-			if (!priv->sim_spn) {
-				ril_sim_info_set_cached_spn(self, op->name);
-			}
-		}
-	}
-}
-
-static void ril_sim_info_network_operator_changed(struct ril_network *network,
-							void *user_data)
-{
-	struct ril_sim_info *self = RIL_SIMINFO(user_data);
-
-	DBG_(self, "");
-	ril_sim_info_network_check(self);
-}
-
-static void ril_sim_info_load_cache(struct ril_sim_info *self)
-{
-	struct ril_sim_info_priv *priv = self->priv;
-
-	if (priv->iccid && priv->iccid[0]) {
-		GKeyFile *map = storage_open(NULL, RIL_SIM_ICCID_MAP);
-		char *imsi = g_key_file_get_string(map, RIL_SIM_ICCID_MAP_IMSI,
-							priv->iccid, NULL);
-		g_key_file_free(map);
-
-		if (imsi && imsi[0] && g_strcmp0(priv->imsi, imsi)) {
-			if (priv->imsi && priv->imsi[0]) {
-				/* Need to update ICCID -> IMSI map */
-				DBG_(self, "IMSI changed %s -> %s",
-							priv->imsi, imsi);
-				priv->update_imsi_cache = TRUE;
-			}
-			g_free(priv->imsi);
-			self->imsi = priv->imsi = imsi;
-			DBG_(self, "imsi[%s] = %s", priv->iccid, imsi);
-			ril_sim_info_update_iccid_map(self);
-			ril_sim_info_signal_emit(self, SIGNAL_IMSI_CHANGED);
-		} else if (imsi) {
-			g_free(imsi);
-		} else {
-			DBG_(self, "no imsi for iccid %s", priv->iccid);
-		}
-	}
-
-	if (priv->imsi && priv->imsi[0]) {
-		GKeyFile *cache = storage_open(priv->imsi, RIL_SIM_INFO_STORE);
-		char *spn = g_key_file_get_string(cache,
-					RIL_SIM_INFO_STORE_GROUP,
-					RIL_SIM_INFO_STORE_SPN, NULL);
-		g_key_file_free(cache);
-
-		if (spn && spn[0] && g_strcmp0(priv->cached_spn, spn)) {
-			if (priv->cached_spn && priv->cached_spn[0]) {
-				/* Need to update the cache file */
-				DBG_(self, "spn changing %s -> %s",
-						priv->cached_spn, spn);
-				priv->update_imsi_cache = TRUE;
-			}
-			g_free(priv->cached_spn);
-			priv->cached_spn = spn;
-			DBG_(self, "spn[%s] = \"%s\"", priv->imsi, spn);
-			ril_sim_info_update_imsi_cache(self);
-			ril_sim_info_update_public_spn(self);
-		} else if (spn) {
-			g_free(spn);
-		} else {
-			DBG_(self, "no spn for imsi %s", priv->imsi);
-		}
-	}
-}
-
-static void ril_sim_info_set_iccid(struct ril_sim_info *self, const char *iccid)
-{
-	struct ril_sim_info_priv *priv = self->priv;
-
-	if (g_strcmp0(priv->iccid, iccid)) {
-		g_free(priv->iccid);
-		self->iccid = priv->iccid = g_strdup(iccid);
-		ril_sim_info_signal_emit(self, SIGNAL_ICCID_CHANGED);
-		if (iccid) {
-			ril_sim_info_load_cache(self);
-		}
-	}
-}
-
-static void ril_sim_info_imsi_watch_cb(const char *imsi, void *data)
-{
-	struct ril_sim_info_watch *watch = data;
-
-	DBG_(watch->info, "%s", imsi);
-	ril_sim_info_set_imsi(watch->info, imsi);
-}
-
-static void ril_sim_info_spn_watch_cb(const char *spn, const char *dc,
-								void *data)
-{
-	struct ril_sim_info_watch *watch = data;
-
-	DBG_(watch->info, "%s", spn);
-	ril_sim_info_set_sim_spn(watch->info, spn);
-}
-
-static void ril_sim_info_iccid_watch_cb(const char *iccid, void *data)
-{
-	struct ril_sim_info_watch *watch = data;
-
-	DBG_(watch->info, "%s", iccid);
-	ril_sim_info_set_iccid(watch->info, iccid);
-}
-
-static void ril_sim_info_watch_done(void *data)
-{
-	struct ril_sim_info_watch *watch = data;
-
-	GASSERT(watch->id);
-	watch->id = 0;
-}
-
-static void ril_sim_info_handle_sim_state(struct ril_sim_info *self,
-						enum ofono_sim_state state)
-{
-	struct ril_sim_info_priv *priv = self->priv;
-	struct ril_sim_info_watch *watch;
-
-	DBG_(self, "%d", state);
-
-	switch (state) {
-	case OFONO_SIM_STATE_READY:
-		/* SPN */
-		watch = &priv->spn_watch;
-		if (!watch->id) {
-			ofono_sim_add_spn_watch(priv->sim, &watch->id,
-					ril_sim_info_spn_watch_cb, watch,
-					ril_sim_info_watch_done);
-			GASSERT(priv->spn_watch.id);
-		}
-		/* IMSI */
-		watch = &priv->imsi_watch;
-		if (!watch->id) {
-			watch->id = ofono_sim_add_imsi_watch(priv->sim,
-					ril_sim_info_imsi_watch_cb, watch,
-					ril_sim_info_watch_done);
-			GASSERT(watch->id);
-		}
-		/* no break */
-	case OFONO_SIM_STATE_INSERTED:
-	case OFONO_SIM_STATE_LOCKED_OUT:
-		/* ICCID */
-		watch = &priv->iccid_watch;
-		if (!watch->id) {
-			watch->id = ofono_sim_add_iccid_watch(priv->sim,
-					ril_sim_info_iccid_watch_cb, watch,
-					ril_sim_info_watch_done);
-			GASSERT(watch->id);
-		}
-		break;
-	case OFONO_SIM_STATE_NOT_PRESENT:
-	case OFONO_SIM_STATE_RESETTING:
-		ril_sim_info_watch_remove(&priv->spn_watch);
-		ril_sim_info_watch_remove(&priv->imsi_watch);
-		ril_sim_info_watch_remove(&priv->iccid_watch);
-		break;
-	}
-
-	ril_sim_info_update_default_spn(self);
-	ril_sim_info_network_check(self);
-}
-
-static void ril_sim_info_state_watch_cb(enum ofono_sim_state new_state,
-								void *data)
-{
-	struct ril_sim_info_watch *watch = data;
-	ril_sim_info_handle_sim_state(watch->info, new_state);
-}
-
-struct ril_sim_info *ril_sim_info_new(const char *log_prefix)
-{
-	struct ril_sim_info *self = g_object_new(RIL_SIMINFO_TYPE, NULL);
-
-	self->priv->log_prefix = (log_prefix && log_prefix[0]) ?
-		g_strconcat(log_prefix, " ", NULL) : g_strdup("");
-	return self;
-}
-
-struct ril_sim_info *ril_sim_info_ref(struct ril_sim_info *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_ref(RIL_SIMINFO(self));
-		return self;
-	} else {
-		return NULL;
-	}
-}
-
-void ril_sim_info_unref(struct ril_sim_info *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_unref(RIL_SIMINFO(self));
-	}
-}
-
-void ril_sim_info_set_ofono_sim(struct ril_sim_info *self,
-						struct ofono_sim *sim)
-{
-	if (G_LIKELY(self)) {
-		struct ril_sim_info_priv *priv = self->priv;
-
-		if (priv->sim != sim) {
-			ril_sim_info_watch_remove(&priv->state_watch);
-			ril_sim_info_watch_remove(&priv->iccid_watch);
-			ril_sim_info_watch_remove(&priv->imsi_watch);
-			ril_sim_info_watch_remove(&priv->spn_watch);
-
-			priv->update_imsi_cache = FALSE;
-			priv->update_iccid_map = FALSE;
-			priv->sim = sim;
-
-			if (sim) {
-				priv->state_watch.id =
-					ofono_sim_add_state_watch(sim,
-						ril_sim_info_state_watch_cb,
-						&priv->state_watch,
-						ril_sim_info_watch_done);
-				GASSERT(priv->state_watch.id);
-				DBG_(self, "attached to sim");
-				ril_sim_info_handle_sim_state(self,
-						ofono_sim_get_state(sim));
-			}
-
-			ril_sim_info_network_check(self);
-		}
-	}
-}
-
-void ril_sim_info_set_network(struct ril_sim_info *self,
-					struct ril_network *network)
-{
-	if (G_LIKELY(self) && self->priv->network != network) {
-		struct ril_sim_info_priv *priv = self->priv;
-
-		if (priv->network) {
-			ril_network_remove_handlers(priv->network,
-				&priv->network_operator_changed_id, 1);
-			ril_network_unref(priv->network);
-		}
-		if (network) {
-			priv->network_operator_changed_id =
-				ril_network_add_operator_changed_handler(network,
-					ril_sim_info_network_operator_changed,
-					self);
-			priv->network = ril_network_ref(network);
-			ril_sim_info_network_check(self);
-		} else {
-			priv->network = NULL;
-		}
-	}
-}
-
-gulong ril_sim_info_add_iccid_changed_handler(struct ril_sim_info *self,
-					ril_sim_info_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_ICCID_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-gulong ril_sim_info_add_imsi_changed_handler(struct ril_sim_info *self,
-					ril_sim_info_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_IMSI_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-gulong ril_sim_info_add_spn_changed_handler(struct ril_sim_info *self,
-					ril_sim_info_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_SPN_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-void ril_sim_info_remove_handler(struct ril_sim_info *self, gulong id)
-{
-	if (G_LIKELY(self) && G_LIKELY(id)) {
-		g_signal_handler_disconnect(self, id);
-	}
-}
-
-static void ril_sim_info_watch_init(struct ril_sim_info *self,
-				    struct ril_sim_info_watch *watch,
-				    ril_sim_info_set_value_cb_t set_value,
-				    ril_sim_info_remove_cb_t remove)
-{
-	watch->info = self;
-	watch->set_value = set_value;
-	watch->remove = remove;
-}
-
-static void ril_sim_info_init(struct ril_sim_info *self)
-{
-	struct ril_sim_info_priv *priv = G_TYPE_INSTANCE_GET_PRIVATE(self,
-				RIL_SIMINFO_TYPE, struct ril_sim_info_priv);
-
-	self->priv = priv;
-	ril_sim_info_watch_init(self, &priv->state_watch,
-		NULL, ofono_sim_remove_state_watch);
-	ril_sim_info_watch_init(self, &priv->iccid_watch,
-		ril_sim_info_set_iccid, ofono_sim_remove_iccid_watch);
-	ril_sim_info_watch_init(self, &priv->imsi_watch,
-		ril_sim_info_set_imsi, ofono_sim_remove_imsi_watch);
-	ril_sim_info_watch_init(self, &priv->spn_watch,
-		ril_sim_info_set_sim_spn, ril_sim_info_remove_spn_watch);
-}
-
-static void ril_sim_info_dispose(GObject *object)
-{
-	struct ril_sim_info *self = RIL_SIMINFO(object);
-
-	ril_sim_info_set_ofono_sim(self, NULL);
-	ril_sim_info_set_network(self, NULL);
-	G_OBJECT_CLASS(ril_sim_info_parent_class)->dispose(object);
-}
-
-static void ril_sim_info_finalize(GObject *object)
-{
-	struct ril_sim_info *self = RIL_SIMINFO(object);
-	struct ril_sim_info_priv *priv = self->priv;
-
-	g_free(priv->log_prefix);
-	g_free(priv->cached_spn);
-	g_free(priv->public_spn);
-	GASSERT(!priv->iccid);
-	GASSERT(!priv->imsi);
-	GASSERT(!priv->sim_spn);
-	G_OBJECT_CLASS(ril_sim_info_parent_class)->finalize(object);
-}
-
-static void ril_sim_info_class_init(RilSimInfoClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
-	object_class->dispose = ril_sim_info_dispose;
-	object_class->finalize = ril_sim_info_finalize;
-	g_type_class_add_private(klass, sizeof(struct ril_sim_info_priv));
-	NEW_SIGNAL(klass, ICCID);
-	NEW_SIGNAL(klass, IMSI);
-	NEW_SIGNAL(klass, SPN);
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_sim_info.h
+++ b/ofono/drivers/ril/ril_sim_info.h
@@ -1,53 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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_SIM_INFO_H
-#define RIL_SIM_INFO_H
-
-#include "ril_types.h"
-
-struct ril_sim_info {
-	GObject object;
-	struct ril_sim_info_priv *priv;
-	const char *iccid;
-	const char *imsi;
-	const char *spn;
-};
-
-struct ofono_sim;
-typedef void (*ril_sim_info_cb_t)(struct ril_sim_info *info, void *arg);
-
-struct ril_sim_info *ril_sim_info_new(const char *log_prefix);
-struct ril_sim_info *ril_sim_info_ref(struct ril_sim_info *info);
-void ril_sim_info_unref(struct ril_sim_info *si);
-void ril_sim_info_set_ofono_sim(struct ril_sim_info *si, struct ofono_sim *sim);
-void ril_sim_info_set_network(struct ril_sim_info *si, struct ril_network *net);
-gulong ril_sim_info_add_iccid_changed_handler(struct ril_sim_info *si,
-					ril_sim_info_cb_t cb, void *arg);
-gulong ril_sim_info_add_imsi_changed_handler(struct ril_sim_info *si,
-					ril_sim_info_cb_t cb, void *arg);
-gulong ril_sim_info_add_spn_changed_handler(struct ril_sim_info *si,
-					ril_sim_info_cb_t cb, void *arg);
-void ril_sim_info_remove_handler(struct ril_sim_info *si, gulong id);
-
-#endif /* RIL_SIM_INFO_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_sim_info_dbus.c
+++ b/ofono/drivers/ril/ril_sim_info_dbus.c
@@ -1,243 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_sim_info.h"
-#include "ril_log.h"
-
-#include <ofono/dbus.h>
-
-#include <gdbus.h>
-
-#include "ofono.h"
-#include "storage.h"
-
-enum sim_info_event_id {
-	SIM_INFO_EVENT_ICCID,
-	SIM_INFO_EVENT_IMSI,
-	SIM_INFO_EVENT_SPN,
-	SIM_INFO_EVENT_COUNT
-};
-
-struct ril_sim_info_dbus {
-	struct ril_modem *md;
-	struct ril_sim_info *info;
-	DBusConnection *conn;
-	char *path;
-	gulong handler_id[SIM_INFO_EVENT_COUNT];
-};
-
-#define RIL_SIM_INFO_DBUS_INTERFACE             "org.nemomobile.ofono.SimInfo"
-#define RIL_SIM_INFO_DBUS_INTERFACE_VERSION     (1)
-
-#define RIL_SIM_INFO_DBUS_ICCID_CHANGED_SIGNAL  "CardIdentifierChanged"
-#define RIL_SIM_INFO_DBUS_IMSI_CHANGED_SIGNAL   "SubscriberIdentityChanged"
-#define RIL_SIM_INFO_DBUS_SPN_CHANGED_SIGNAL    "ServiceProviderNameChanged"
-
-static void ril_sim_info_dbus_append_string(DBusMessageIter *it, const char *s)
-{
-	if (!s) s = "";
-	dbus_message_iter_append_basic(it, DBUS_TYPE_STRING, &s);
-}
-
-static DBusMessage *ril_sim_info_dbus_reply_with_string(DBusMessage *msg,
-							const char *str)
-{
-	DBusMessage *reply = dbus_message_new_method_return(msg);
-	DBusMessageIter iter;
-
-	dbus_message_iter_init_append(reply, &iter);
-	ril_sim_info_dbus_append_string(&iter, str);
-	return reply;
-}
-
-static DBusMessage *ril_sim_info_dbus_get_all(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_sim_info_dbus *dbus = data;
-	struct ril_sim_info *info = dbus->info;
-	DBusMessage *reply = dbus_message_new_method_return(msg);
-	const dbus_int32_t version = RIL_SIM_INFO_DBUS_INTERFACE_VERSION;
-	DBusMessageIter iter;
-
-	dbus_message_iter_init_append(reply, &iter);
-	dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &version);
-	ril_sim_info_dbus_append_string(&iter, info->iccid);
-	ril_sim_info_dbus_append_string(&iter, info->imsi);
-	ril_sim_info_dbus_append_string(&iter, info->spn);
-	return reply;
-}
-
-static DBusMessage *ril_sim_info_dbus_get_version(DBusConnection *dc,
-						DBusMessage *msg, void *data)
-{
-	DBusMessage *reply = dbus_message_new_method_return(msg);
-	dbus_int32_t version = RIL_SIM_INFO_DBUS_INTERFACE_VERSION;
-	DBusMessageIter iter;
-
-	dbus_message_iter_init_append(reply, &iter);
-	dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &version);
-	return reply;
-}
-
-static DBusMessage *ril_sim_info_dbus_get_iccid(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_sim_info_dbus *dbus = data;
-	return ril_sim_info_dbus_reply_with_string(msg, dbus->info->iccid);
-}
-
-static DBusMessage *ril_sim_info_dbus_get_imsi(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_sim_info_dbus *dbus = data;
-	return ril_sim_info_dbus_reply_with_string(msg, dbus->info->imsi);
-}
-
-static DBusMessage *ril_sim_info_dbus_get_spn(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	struct ril_sim_info_dbus *dbus = data;
-	return ril_sim_info_dbus_reply_with_string(msg, dbus->info->spn);
-}
-
-static const GDBusMethodTable ril_sim_info_dbus_methods[] = {
-	{ GDBUS_METHOD("GetAll",
-			NULL, GDBUS_ARGS({"version", "i" },
-					 {"iccid", "s" },
-					 {"imsi", "s" }, 
-					 {"spn" , "s"}),
-			ril_sim_info_dbus_get_all) },
-	{ GDBUS_METHOD("GetInterfaceVersion",
-			NULL, GDBUS_ARGS({ "version", "i" }),
-			ril_sim_info_dbus_get_version) },
-	{ GDBUS_METHOD("GetCardIdentifier",
-			NULL, GDBUS_ARGS({ "iccid", "s" }),
-			ril_sim_info_dbus_get_iccid) },
-	{ GDBUS_METHOD("GetSubscriberIdentity",
-			NULL, GDBUS_ARGS({ "imsi", "s" }),
-			ril_sim_info_dbus_get_imsi) },
-	{ GDBUS_METHOD("GetServiceProviderName",
-			NULL, GDBUS_ARGS({ "spn", "s" }),
-			ril_sim_info_dbus_get_spn) },
-	{ }
-};
-
-static const GDBusSignalTable ril_sim_info_dbus_signals[] = {
-	{ GDBUS_SIGNAL(RIL_SIM_INFO_DBUS_ICCID_CHANGED_SIGNAL,
-			GDBUS_ARGS({ "iccid", "s" })) },
-	{ GDBUS_SIGNAL(RIL_SIM_INFO_DBUS_IMSI_CHANGED_SIGNAL,
-			GDBUS_ARGS({ "imsi", "s" })) },
-	{ GDBUS_SIGNAL(RIL_SIM_INFO_DBUS_SPN_CHANGED_SIGNAL,
-			GDBUS_ARGS({ "spn", "s" })) },
-	{ }
-};
-
-static void ril_sim_info_dbus_emit(struct ril_sim_info_dbus *dbus,
-					const char *signal, const char *value)
-{
-	const char *arg = value;
-	if (!arg) arg = "";
-	g_dbus_emit_signal(dbus->conn, dbus->path, RIL_SIM_INFO_DBUS_INTERFACE,
-			signal, DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID);
-}
-
-static void ril_sim_info_dbus_iccid_cb(struct ril_sim_info *info, void *arg)
-{
-	struct ril_sim_info_dbus *dbus = arg;
-	ril_sim_info_dbus_emit(dbus, RIL_SIM_INFO_DBUS_ICCID_CHANGED_SIGNAL,
-								info->iccid);
-}
-
-static void ril_sim_info_dbus_imsi_cb(struct ril_sim_info *info, void *arg)
-{
-	struct ril_sim_info_dbus *dbus = arg;
-	ril_sim_info_dbus_emit(dbus, RIL_SIM_INFO_DBUS_IMSI_CHANGED_SIGNAL,
-								info->imsi);
-}
-
-static void ril_sim_info_dbus_spn_cb(struct ril_sim_info *info, void *arg)
-{
-	struct ril_sim_info_dbus *dbus = arg;
-	ril_sim_info_dbus_emit(dbus, RIL_SIM_INFO_DBUS_SPN_CHANGED_SIGNAL,
-								info->spn);
-}
-
-struct ril_sim_info_dbus *ril_sim_info_dbus_new(struct ril_modem *md,
-						struct ril_sim_info *info)
-{
-	struct ril_sim_info_dbus *dbus = g_new0(struct ril_sim_info_dbus, 1);
-
-	DBG("%s", ril_modem_get_path(md));
-	dbus->md = md;
-	dbus->path = g_strdup(ril_modem_get_path(md));
-	dbus->info = ril_sim_info_ref(info);
-	dbus->conn = dbus_connection_ref(ofono_dbus_get_connection());
-
-	/* Register D-Bus interface */
-	if (g_dbus_register_interface(dbus->conn, dbus->path,
-			RIL_SIM_INFO_DBUS_INTERFACE, ril_sim_info_dbus_methods,
-			ril_sim_info_dbus_signals, NULL, dbus, NULL)) {
-		ofono_modem_add_interface(md->ofono,
-						RIL_SIM_INFO_DBUS_INTERFACE);
-
-		dbus->handler_id[SIM_INFO_EVENT_ICCID] =
-			ril_sim_info_add_iccid_changed_handler(info,
-				ril_sim_info_dbus_iccid_cb, dbus);
-		dbus->handler_id[SIM_INFO_EVENT_IMSI] =
-			ril_sim_info_add_imsi_changed_handler(info,
-				ril_sim_info_dbus_imsi_cb, dbus);
-		dbus->handler_id[SIM_INFO_EVENT_SPN] =
-			ril_sim_info_add_spn_changed_handler(info,
-				ril_sim_info_dbus_spn_cb, dbus);
-
-		return dbus;
-	} else {
-		ofono_error("CellInfo D-Bus register failed");
-		ril_sim_info_dbus_free(dbus);
-		return NULL;
-	}
-}
-
-void ril_sim_info_dbus_free(struct ril_sim_info_dbus *dbus)
-{
-	if (dbus) {
-		unsigned int i;
-
-		DBG("%s", dbus->path);
-		g_dbus_unregister_interface(dbus->conn, dbus->path,
-						RIL_SIM_INFO_DBUS_INTERFACE);
-		ofono_modem_remove_interface(dbus->md->ofono,
-						RIL_SIM_INFO_DBUS_INTERFACE);
-		dbus_connection_unref(dbus->conn);
-
-		for (i=0; i<G_N_ELEMENTS(dbus->handler_id); i++) {
-			ril_sim_info_remove_handler(dbus->info,
-							dbus->handler_id[i]);
-		}
-		ril_sim_info_unref(dbus->info);
-
-		g_free(dbus->path);
-		g_free(dbus);
-	}
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_sim_settings.c
+++ b/ofono/drivers/ril/ril_sim_settings.c
@@ -1,305 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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.
- */
-
-#include "ril_sim_settings.h"
-#include "ril_log.h"
-
-#include <gutil_misc.h>
-
-#include <ofono/sim.h>
-
-#include "storage.h"
-
-#define RIL_SIM_STORE                   "ril"
-#define RIL_SIM_STORE_GROUP             "Settings"
-#define RIL_SIM_STORE_PREF_MODE         "TechnologyPreference"
-
-#define RIL_SIM_STORE_PREF_MODE_DEFAULT(self) ((self)->enable_4g ? \
-	OFONO_RADIO_ACCESS_MODE_LTE : OFONO_RADIO_ACCESS_MODE_UMTS)
-
-typedef GObjectClass RilSimSettingsClass;
-typedef struct ril_sim_settings RilSimSettings;
-
-struct ril_sim_settings_priv {
-	struct ofono_sim *sim;
-	guint imsi_watch_id;
-	guint state_watch_id;
-	GKeyFile *storage;
-	char *imsi;
-};
-
-enum ril_sim_settings_signal {
-	SIGNAL_IMSI_CHANGED,
-	SIGNAL_PREF_MODE_CHANGED,
-	SIGNAL_COUNT
-};
-
-#define SIGNAL_IMSI_CHANGED_NAME        "ril-sim-settings-imsi-changed"
-#define SIGNAL_PREF_MODE_CHANGED_NAME   "ril-sim-settings-pref-mode-changed"
-
-static guint ril_sim_settings_signals[SIGNAL_COUNT] = { 0 };
-
-G_DEFINE_TYPE(RilSimSettings, ril_sim_settings, G_TYPE_OBJECT)
-#define RIL_SIM_SETTINGS_TYPE (ril_sim_settings_get_type())
-#define RIL_SIM_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
-	RIL_SIM_SETTINGS_TYPE, RilSimSettings))
-
-#define NEW_SIGNAL(klass,name) \
-	ril_sim_settings_signals[SIGNAL_##name##_CHANGED] = \
-		g_signal_new(SIGNAL_##name##_CHANGED_NAME, \
-			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST, \
-			0, NULL, NULL, NULL, G_TYPE_NONE, 0)
-
-static void ril_sim_settings_signal_emit(struct ril_sim_settings *self,
-					enum ril_sim_settings_signal id)
-{
-	g_signal_emit(self, ril_sim_settings_signals[id], 0);
-}
-
-static void ril_sim_settings_reload(struct ril_sim_settings *self)
-{
-	struct ril_sim_settings_priv *priv = self->priv;
-
-	if (priv->storage) {
-		g_key_file_free(priv->storage);
-		priv->storage = NULL;
-	}
-
-	if (priv->imsi) {
-		char *mode_str;
-		enum ofono_radio_access_mode mode;
-		priv->storage = storage_open(priv->imsi, RIL_SIM_STORE);
-		mode_str = g_key_file_get_string(priv->storage,
-			RIL_SIM_STORE_GROUP, RIL_SIM_STORE_PREF_MODE, NULL);
-		if (ofono_radio_access_mode_from_string(mode_str, &mode)) {
-			if (!self->enable_4g &&
-					mode == OFONO_RADIO_ACCESS_MODE_LTE) {
-				mode = OFONO_RADIO_ACCESS_MODE_ANY;
-			}
-		} else {
-			mode = OFONO_RADIO_ACCESS_MODE_ANY;
-		}
-		if (mode == OFONO_RADIO_ACCESS_MODE_ANY) {
-			self->pref_mode = RIL_SIM_STORE_PREF_MODE_DEFAULT(self);
-		} else {
-			self->pref_mode = mode;
-		}
-		g_free(mode_str);
-	}
-}
-
-void ril_sim_settings_set_pref_mode(struct ril_sim_settings *self,
-					enum ofono_radio_access_mode mode)
-{
-	if (G_LIKELY(self) && self->pref_mode != mode) {
-		struct ril_sim_settings_priv *priv = self->priv;
-		const char *mode_str = ofono_radio_access_mode_to_string(mode);
-
-		GASSERT(priv->storage);
-		if (mode_str) {
-			if (priv->storage) {
-				g_key_file_set_string(priv->storage,
-					RIL_SIM_STORE_GROUP,
-					RIL_SIM_STORE_PREF_MODE, mode_str);
-				storage_sync(self->imsi, RIL_SIM_STORE,
-							priv->storage);
-			}
-			self->pref_mode = mode;
-			ril_sim_settings_signal_emit(self,
-						SIGNAL_PREF_MODE_CHANGED);
-		}
-	}
-}
-
-static void ril_sim_settings_set_imsi(struct ril_sim_settings *self,
-							const char *imsi)
-{
-	struct ril_sim_settings_priv *priv = self->priv;
-	if (g_strcmp0(priv->imsi, imsi)) {
-		enum ofono_radio_access_mode prev_mode = self->pref_mode;
-		g_free(priv->imsi);
-		self->imsi = priv->imsi = g_strdup(imsi);
-		ril_sim_settings_reload(self);
-		ril_sim_settings_signal_emit(self, SIGNAL_IMSI_CHANGED);
-		if (prev_mode != self->pref_mode) {
-			ril_sim_settings_signal_emit(self,
-						SIGNAL_PREF_MODE_CHANGED);
-		}
-	}
-}
-
-static void ril_sim_settings_imsi_watch_cb(const char *imsi, void *user_data)
-{
-	ril_sim_settings_set_imsi(RIL_SIM_SETTINGS(user_data), imsi);
-}
-
-static void ril_sim_settings_imsi_watch_done(void *user_data)
-{
-	struct ril_sim_settings *self = RIL_SIM_SETTINGS(user_data);
-	struct ril_sim_settings_priv *priv = self->priv;
-
-	GASSERT(priv->imsi_watch_id);
-	priv->imsi_watch_id = 0;
-}
-
-static void ril_sim_settings_ready(struct ril_sim_settings *self)
-{
-	struct ril_sim_settings_priv *priv = self->priv;
-
-	GASSERT(!priv->imsi_watch_id);
-	priv->imsi_watch_id = ofono_sim_add_imsi_watch(priv->sim,
-				ril_sim_settings_imsi_watch_cb, self,
-				ril_sim_settings_imsi_watch_done);
-}
-
-static void ril_sim_settings_state_watch(enum ofono_sim_state new_state,
-							void *user_data)
-{
-	if (new_state == OFONO_SIM_STATE_READY) {
-		ril_sim_settings_ready(RIL_SIM_SETTINGS(user_data));
-	}
-}
-
-static void ril_sim_settings_state_watch_done(void *user_data)
-{
-	struct ril_sim_settings *self = RIL_SIM_SETTINGS(user_data);
-	struct ril_sim_settings_priv *priv = self->priv;
-
-	GASSERT(priv->state_watch_id);
-	priv->state_watch_id = 0;
-}
-
-void ril_sim_settings_set_ofono_sim(struct ril_sim_settings *self,
-						struct ofono_sim *sim)
-{
-	if (G_LIKELY(self)) {
-		struct ril_sim_settings_priv *priv = self->priv;
-		if (priv->sim != sim) {
-			GASSERT(priv->sim || !priv->imsi_watch_id);
-			if (priv->imsi_watch_id) {
-				ofono_sim_remove_imsi_watch(priv->sim,
-							priv->imsi_watch_id);
-				/* ril_sim_settings_imsi_watch_done clears it */
-				GASSERT(!priv->imsi_watch_id);
-			}
-			if (priv->state_watch_id) {
-				ofono_sim_remove_state_watch(priv->sim,
-						priv->state_watch_id);
-				/* ril_sim_settings_state_watch_done clears it */
-				GASSERT(!priv->state_watch_id);
-			}
-			priv->sim = sim;
-			if (sim) {
-				priv->state_watch_id =
-					ofono_sim_add_state_watch(sim,
-					ril_sim_settings_state_watch, self,
-					ril_sim_settings_state_watch_done);
-				GASSERT(priv->state_watch_id);
-				if (ofono_sim_get_state(sim) ==
-						OFONO_SIM_STATE_READY) {
-					ril_sim_settings_ready(self);
-				}
-			} else {
-				ril_sim_settings_set_imsi(self, NULL);
-			}
-		}
-	}
-}
-
-gulong ril_sim_settings_add_imsi_changed_handler(struct ril_sim_settings *self,
-					ril_sim_settings_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_IMSI_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-gulong ril_sim_settings_add_pref_mode_changed_handler(
-					struct ril_sim_settings *self,
-					ril_sim_settings_cb_t cb, void *arg)
-{
-	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
-		SIGNAL_PREF_MODE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
-}
-
-void ril_sim_settings_remove_handler(struct ril_sim_settings *self, gulong id)
-{
-	if (G_LIKELY(self) && G_LIKELY(id)) {
-		g_signal_handler_disconnect(self, id);
-	}
-}
-
-void ril_sim_settings_remove_handlers(struct ril_sim_settings *self,
-						gulong *ids, int count)
-{
-	gutil_disconnect_handlers(self, ids, count);
-}
-
-struct ril_sim_settings *ril_sim_settings_new(const struct ril_slot_config *sc)
-{
-	struct ril_sim_settings *self = g_object_new(RIL_SIM_SETTINGS_TYPE, 0);
-	self->enable_4g = sc->enable_4g;
-	self->slot = sc->slot;
-	self->pref_mode = RIL_SIM_STORE_PREF_MODE_DEFAULT(self);
-	return self;
-}
-
-struct ril_sim_settings *ril_sim_settings_ref(struct ril_sim_settings *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_ref(RIL_SIM_SETTINGS(self));
-		return self;
-	} else {
-		return NULL;
-	}
-}
-
-void ril_sim_settings_unref(struct ril_sim_settings *self)
-{
-	if (G_LIKELY(self)) {
-		g_object_unref(RIL_SIM_SETTINGS(self));
-	}
-}
-
-static void ril_sim_settings_init(struct ril_sim_settings *self)
-{
-	self->priv =  G_TYPE_INSTANCE_GET_PRIVATE(self, RIL_SIM_SETTINGS_TYPE,
-						struct ril_sim_settings_priv);
-}
-
-static void ril_sim_settings_dispose(GObject *object)
-{
-	struct ril_sim_settings *self = RIL_SIM_SETTINGS(object);
-
-	ril_sim_settings_set_ofono_sim(self, NULL);
-	G_OBJECT_CLASS(ril_sim_settings_parent_class)->dispose(object);
-}
-
-static void ril_sim_settings_class_init(RilSimSettingsClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
-	object_class->dispose = ril_sim_settings_dispose;
-	g_type_class_add_private(klass, sizeof(struct ril_sim_settings_priv));
-	NEW_SIGNAL(klass, IMSI);
-	NEW_SIGNAL(klass, PREF_MODE);
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_sim_settings.h
+++ b/ofono/drivers/ril/ril_sim_settings.h
@@ -1,59 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 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
- *  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_SIM_SETTINGS_H
-#define RIL_SIM_SETTINGS_H
-
-#include "ril_types.h"
-
-#include <ofono/radio-settings.h>
-
-struct ril_sim_settings_priv;
-
-struct ril_sim_settings {
-	GObject object;
-	struct ril_sim_settings_priv *priv;
-	gboolean enable_4g;
-	guint slot;
-	const char *imsi;
-	enum ofono_radio_access_mode pref_mode;
-};
-
-typedef void (*ril_sim_settings_cb_t)(struct ril_sim_settings *s, void *arg);
-
-struct ril_sim_settings *ril_sim_settings_new(const struct ril_slot_config *sc);
-struct ril_sim_settings *ril_sim_settings_ref(struct ril_sim_settings *s);
-void ril_sim_settings_unref(struct ril_sim_settings *s);
-void ril_sim_settings_set_ofono_sim(struct ril_sim_settings *s,
-					struct ofono_sim *sim);
-void ril_sim_settings_set_pref_mode(struct ril_sim_settings *s,
-					enum ofono_radio_access_mode mode);
-gulong ril_sim_settings_add_imsi_changed_handler(struct ril_sim_settings *s,
-					ril_sim_settings_cb_t cb, void *arg);
-gulong ril_sim_settings_add_pref_mode_changed_handler(struct ril_sim_settings *s,
-					ril_sim_settings_cb_t cb, void *arg);
-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);
-
-#endif /* RIL_SIM_SETTINGS_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_sms.c
+++ b/ofono/drivers/ril/ril_sms.c
@@ -1,516 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_constants.h"
-#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
-
-#define SIM_EFSMS_FILEID        0x6F3C
-#define EFSMS_LENGTH            176
-
-#define TYPE_LOCAL              129
-#define TYPE_INTERNATIONAL      145
-
-static unsigned char sim_path[4] = {0x3F, 0x00, 0x7F, 0x10};
-
-enum ril_sms_events {
-	SMS_EVENT_NEW_SMS,
-	SMS_EVENT_NEW_STATUS_REPORT,
-	SMS_EVENT_NEW_SMS_ON_SIM,
-	SMS_EVENT_COUNT
-};
-
-struct ril_sms {
-	GRilIoChannel *io;
-	GRilIoQueue *q;
-	struct ril_modem *modem;
-	struct ofono_sms *sms;
-	struct ofono_sim_context *sim_context;
-	gulong event_id[SMS_EVENT_COUNT];
-	guint timer_id;
-};
-
-struct ril_sms_cbd {
-	union _ofono_sms_cb {
-		ofono_sms_sca_set_cb_t sca_set;
-		ofono_sms_sca_query_cb_t sca_query;
-		ofono_sms_submit_cb_t submit;
-		gpointer ptr;
-	} cb;
-	gpointer data;
-};
-
-struct ril_sms_on_sim_req {
-	struct ril_sms *sd;
-	int record;
-};
-
-#define ril_sms_cbd_free g_free
-#define ril_sms_on_sim_req_free g_free
-
-static inline struct ril_sms *ril_sms_get_data(struct ofono_sms *sms)
-{
-	return ofono_sms_get_data(sms);
-}
-
-struct ril_sms_cbd *ril_sms_cbd_new(struct ril_sms *sd, void *cb, void *data)
-{
-	struct ril_sms_cbd *cbd = g_new0(struct ril_sms_cbd, 1);
-
-	cbd->cb.ptr = cb;
-	cbd->data = data;
-	return cbd;
-}
-
-struct ril_sms_on_sim_req *ril_sms_on_sim_req_new(struct ril_sms *sd, int rec)
-{
-	struct ril_sms_on_sim_req *cbd = g_new0(struct ril_sms_on_sim_req, 1);
-
-	cbd->sd = sd;
-	cbd->record = rec;
-	return cbd;
-}
-
-static void ril_sms_sca_set_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_sms_cbd *cbd = user_data;
-	ofono_sms_sca_set_cb_t cb = cbd->cb.sca_set;
-
-	if (status == RIL_E_SUCCESS) {
-		cb(ril_error_ok(&error), cbd->data);
-	} else {
-		ofono_error("csca setting failed");
-		cb(ril_error_failure(&error), cbd->data);
-	}
-}
-
-static void ril_sms_sca_set(struct ofono_sms *sms,
-			const struct ofono_phone_number *sca,
-			ofono_sms_sca_set_cb_t cb, void *data)
-{
-	struct ril_sms *sd = ril_sms_get_data(sms);
-	GRilIoRequest *req = grilio_request_new();
-	char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 4];
-
-	if (sca->type == TYPE_LOCAL) {
-		snprintf(number, sizeof(number), "\"%s\"", sca->number);
-	} else {
-		snprintf(number, sizeof(number), "\"+%s\"", sca->number);
-	}
-
-	DBG("Setting sca: %s", number);
-	grilio_request_append_utf8(req, number);
-	grilio_queue_send_request_full(sd->q, req,
-			RIL_REQUEST_SET_SMSC_ADDRESS, ril_sms_sca_set_cb,
-			ril_sms_cbd_free, ril_sms_cbd_new(sd, cb, data));
-	grilio_request_unref(req);
-}
-
-static void ril_sms_sca_query_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sms_cbd *cbd = user_data;
-	ofono_sms_sca_query_cb_t cb = cbd->cb.sca_query;
-	struct ofono_error error;
-	GRilIoParser rilp;
-	gchar *temp_buf;
-
-	if (status != RIL_E_SUCCESS) {
-		ofono_error("csca query failed");
-		cb(ril_error_failure(&error), NULL, cbd->data);
-		return;
-	}
-
-	grilio_parser_init(&rilp, data, len);
-	temp_buf = grilio_parser_get_utf8(&rilp);
-
-	if (temp_buf) {
-		/* RIL gives address in quotes */
-		gchar *number = strtok(temp_buf, "\"");
-		struct ofono_phone_number sca;
-
-		strncpy(sca.number, number, OFONO_MAX_PHONE_NUMBER_LENGTH);
-		sca.number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
-		if (sca.number[0] == '+') {
-			number = number + 1;
-			sca.type = TYPE_INTERNATIONAL;
-		} else {
-			sca.type = TYPE_LOCAL;
-		}
-
-		DBG("csca_query_cb: %s, %d", sca.number, sca.type);
-		cb(ril_error_ok(&error), &sca, cbd->data);
-		g_free(temp_buf);
-	} else {
-		ofono_error("return value invalid");
-		cb(ril_error_failure(&error), NULL, cbd->data);
-	}
-}
-
-static void ril_sms_sca_query(struct ofono_sms *sms,
-			ofono_sms_sca_query_cb_t cb, void *data)
-{
-	struct ril_sms *sd = ril_sms_get_data(sms);
-
-	DBG("Sending csca_query");
-	grilio_queue_send_request_full(sd->q, NULL,
-			RIL_REQUEST_GET_SMSC_ADDRESS, ril_sms_sca_query_cb,
-			ril_sms_cbd_free, ril_sms_cbd_new(sd, cb, data));
-}
-
-static void ril_sms_submit_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sms_cbd *cbd = user_data;
-	ofono_sms_submit_cb_t cb = cbd->cb.submit;
-	struct ofono_error error;
-	int mr = 0;
-
-	if (status == RIL_E_SUCCESS) {
-		GRilIoParser rilp;
-		int err = -1;
-
-		grilio_parser_init(&rilp, data, len);
-
-		/* TP-Message-Reference for GSM/
-		 * BearerData MessageId for CDMA
-		 */
-		grilio_parser_get_int32(&rilp, &mr);
-		grilio_parser_skip_string(&rilp);
-
-		/* error: 3GPP 27.005, 3.2.5, -1 if unknown or not applicable */
-		grilio_parser_get_int32(&rilp, &err);
-		DBG("sms msg ref: %d, error: %d", mr, err);
-		ril_error_init_ok(&error);
-	} else if (status == RIL_E_GENERIC_FAILURE) {
-		ofono_info("not allowed by MO SMS control, do not retry");
-		error.type = OFONO_ERROR_TYPE_CMS;
-		error.error = 500;
-	} else {
-		ofono_error("sms sending failed, retry");
-		ril_error_init_failure(&error);
-	}
-
-	cb(&error, mr, cbd->data);
-}
-
-static void ril_sms_submit(struct ofono_sms *sms, const unsigned char *pdu,
-			int pdu_len, int tpdu_len, int mms,
-			ofono_sms_submit_cb_t cb, void *data)
-{
-	struct ril_sms *sd = ril_sms_get_data(sms);
-	GRilIoRequest *req = grilio_request_new();
-	int smsc_len;
-	char *tpdu;
-
-	DBG("pdu_len: %d, tpdu_len: %d mms: %d", pdu_len, tpdu_len, mms);
-
-	grilio_request_append_int32(req, 2);     /* Number of strings */
-
-	/* SMSC address:
-	 *
-	 * smsc_len == 1, then zero-length SMSC was spec'd
-	 * RILD expects a NULL string in this case instead
-	 * of a zero-length string.
-	 */
-	smsc_len = pdu_len - tpdu_len;
-	if (smsc_len > 1) {
-		/* TODO: encode SMSC & write to parcel */
-		DBG("SMSC address specified (smsc_len %d); NOT-IMPLEMENTED",
-								smsc_len);
-	}
-
-	grilio_request_append_utf8(req, NULL); /* default SMSC address */
-
-	/* TPDU:
-	 *
-	 * 'pdu' is a raw hexadecimal string
-	 *  encode_hex() turns it into an ASCII/hex UTF8 buffer
-	 *  grilio_request_append_utf8() encodes utf8 -> utf16
-	 */
-	tpdu = encode_hex(pdu + smsc_len, tpdu_len, 0);
-	grilio_request_append_utf8(req, tpdu);
-
-	DBG("%s", tpdu);
-	grilio_queue_send_request_full(sd->q, req,
-			RIL_REQUEST_SEND_SMS, ril_sms_submit_cb,
-			ril_sms_cbd_free, ril_sms_cbd_new(sd, cb, data));
-	grilio_request_unref(req);
-	g_free(tpdu);
-}
-
-static void ril_ack_delivery_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	if (status != RIL_E_SUCCESS) {
-		ofono_error("SMS acknowledgement failed: "
-				"Further SMS reception is not guaranteed");
-	}
-}
-
-static void ril_ack_delivery(struct ril_sms *sd, gboolean error)
-{
-	GRilIoRequest *req = grilio_request_sized_new(12);
-	const int code = (error ? 0 : 0xff);
-
-	DBG("(%d,%d)", error, code);
-	grilio_request_append_int32(req, 2);     /* Array size*/
-	grilio_request_append_int32(req, error); /* Success (1)/Failure (0) */
-	grilio_request_append_int32(req, code);  /* error code */
-
-	/* ACK the incoming NEW_SMS */
-	grilio_request_set_retry(req, RIL_SMS_ACK_RETRY_MS,
-						RIL_SMS_ACK_RETRY_COUNT);
-	grilio_queue_send_request_full(sd->q, req,
-		RIL_REQUEST_SMS_ACKNOWLEDGE, ril_ack_delivery_cb, NULL, NULL);
-	grilio_request_unref(req);
-}
-
-static void ril_sms_notify(GRilIoChannel *io, guint ril_event,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_sms *sd = user_data;
-	GRilIoParser rilp;
-	char *ril_pdu;
-	int ril_pdu_len;
-	unsigned int smsc_len;
-	long ril_buf_len;
-	guchar *ril_data;
-
-	ril_pdu = NULL;
-	ril_data = NULL;
-
-	DBG("event: %d; data_len: %d", ril_event, len);
-
-	grilio_parser_init(&rilp, data, len);
-	ril_pdu = grilio_parser_get_utf8(&rilp);
-	if (ril_pdu == NULL)
-		goto error;
-
-	ril_pdu_len = strlen(ril_pdu);
-
-	DBG("ril_pdu_len is %d", ril_pdu_len);
-	ril_data = decode_hex(ril_pdu, ril_pdu_len, &ril_buf_len, -1);
-	if (ril_data == NULL)
-		goto error;
-
-	/* The first octect in the pdu contains the SMSC address length
-	 * which is the X following octects it reads. We add 1 octet to
-	 * the read length to take into account this read octet in order
-	 * to calculate the proper tpdu length.
-	 */
-	smsc_len = ril_data[0] + 1;
-	ofono_info("sms received, smsc_len is %d", smsc_len);
-	DBG("(%s)", ril_pdu);
-
-	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 {
-		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);
-	g_free(ril_data);
-	ril_ack_delivery(sd, TRUE);
-	return;
-
-error:
-	g_free(ril_pdu);
-	g_free(ril_data);
-	ril_ack_delivery(sd, FALSE);
-	ofono_error("Unable to parse NEW_SMS notification");
-}
-
-static void ril_new_sms_on_sim_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	DBG("%d", status);
-	if (status == RIL_E_SUCCESS) {
-		ofono_info("sms deleted from sim");
-	} else {
-		ofono_error("deleting sms from sim failed");
-	}
-}
-
-static void ril_request_delete_sms_om_sim(struct ril_sms *sd, int record)
-{
-	GRilIoRequest *req = grilio_request_sized_new(8);
-
-	DBG("Deleting record: %d", record);
-
-	grilio_request_append_int32(req, 1);        /* Array length */
-	grilio_request_append_int32(req, record);
-	grilio_queue_send_request_full(sd->q, req,
-			RIL_REQUEST_DELETE_SMS_ON_SIM,
-			ril_new_sms_on_sim_cb, NULL, NULL);
-	grilio_request_unref(req);
-}
-
-static void ril_sms_on_sim_cb(int ok, int total_length, int record,
-		const unsigned char *sdata, int length, void *userdata)
-{
-	struct ril_sms_on_sim_req *cbd = userdata;
-	struct ril_sms *sd = cbd->sd;
-
-	/*
-	 * It seems when reading EFsms RIL returns the whole record including
-	 * the first status byte therefore we ignore that as we are only
-	 * interested of the following pdu
-	 */
-	/* The first octect in the pdu contains the SMSC address length
-	 * which is the X following octects it reads. We add 1 octet to
-	 * the read length to take into account this read octet in order
-	 * to calculate the proper tpdu length.
-	 */
-	if (ok) {
-		unsigned int smsc_len = sdata[1] + 1;
-		ofono_sms_deliver_notify(sd->sms, sdata + 1, length - 1,
-						length - smsc_len - 1);
-		ril_request_delete_sms_om_sim(sd, cbd->record);
-	} else {
-		ofono_error("cannot read sms from sim");
-	}
-
-	ril_sms_on_sim_req_free(cbd);
-}
-
-static void ril_sms_on_sim(GRilIoChannel *io, guint ril_event,
-			const void *data, guint len, void *user_data)
-{
-	struct ril_sms *sd = user_data;
-	struct ofono_sim *sim = ril_modem_ofono_sim(sd->modem);
-	int data_len = 0, rec = 0;
-	GRilIoParser rilp;
-
-	ofono_info("new sms on sim");
-	grilio_parser_init(&rilp, data, len);
-	if (sim &&
-		grilio_parser_get_int32(&rilp, &data_len) && data_len > 0 &&
-		grilio_parser_get_int32(&rilp, &rec)) {
-		DBG("rec %d", rec);
-		if (sd->sim_context) {
-			ofono_sim_read_record(sd->sim_context,
-					SIM_EFSMS_FILEID,
-					OFONO_SIM_FILE_STRUCTURE_FIXED,
-					rec, EFSMS_LENGTH,
-					sim_path, sizeof(sim_path),
-					ril_sms_on_sim_cb,
-					ril_sms_on_sim_req_new(sd,rec));
-		}
-	}
-}
-
-static gboolean ril_sms_register(gpointer user_data)
-{
-	struct ril_sms *sd = user_data;
-
-	DBG("");
-	GASSERT(sd->timer_id);
-	sd->timer_id = 0;
-	ofono_sms_register(sd->sms);
-
-	/* Register event handlers */
-	sd->event_id[SMS_EVENT_NEW_SMS] =
-		grilio_channel_add_unsol_event_handler(sd->io, ril_sms_notify,
-			RIL_UNSOL_RESPONSE_NEW_SMS, sd);
-	sd->event_id[SMS_EVENT_NEW_STATUS_REPORT] =
-		grilio_channel_add_unsol_event_handler(sd->io, ril_sms_notify,
-			RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT, sd);
-	sd->event_id[SMS_EVENT_NEW_SMS_ON_SIM] =
-		grilio_channel_add_unsol_event_handler(sd->io, ril_sms_on_sim,
-			RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM, sd);
-
-	/* Single-shot */
-	return FALSE;
-}
-
-static int ril_sms_probe(struct ofono_sms *sms, unsigned int vendor,
-								void *data)
-{
-	struct ril_modem *modem = data;
-	struct ofono_sim *sim = ril_modem_ofono_sim(modem);
-	struct ril_sms *sd = g_new0(struct ril_sms, 1);
-
-	sd->modem = modem;
-	sd->sms = sms;
-	sd->io = grilio_channel_ref(ril_modem_io(modem));
-	sd->sim_context = ofono_sim_context_create(sim);
-	sd->q = grilio_queue_new(sd->io);
-	sd->timer_id = g_idle_add(ril_sms_register, sd);
-	ofono_sms_set_data(sms, sd);
-
-	GASSERT(sd->sim_context);
-	return 0;
-}
-
-static void ril_sms_remove(struct ofono_sms *sms)
-{
-	int i;
-	struct ril_sms *sd = ril_sms_get_data(sms);
-
-	DBG("");
-	ofono_sms_set_data(sms, NULL);
-
-	if (sd->sim_context) {
-		ofono_sim_context_free(sd->sim_context);
-	}
-
-	for (i=0; i<G_N_ELEMENTS(sd->event_id); i++) {
-		grilio_channel_remove_handler(sd->io, sd->event_id[i]);
-
-	}
-
-	if (sd->timer_id > 0) {
-		g_source_remove(sd->timer_id);
-	}
-
-	grilio_channel_unref(sd->io);
-	grilio_queue_cancel_all(sd->q, FALSE);
-	grilio_queue_unref(sd->q);
-	g_free(sd);
-}
-
-const struct ofono_sms_driver ril_sms_driver = {
-	.name           = RILMODEM_DRIVER,
-	.probe          = ril_sms_probe,
-	.remove         = ril_sms_remove,
-	.sca_query      = ril_sms_sca_query,
-	.sca_set        = ril_sms_sca_set,
-	.submit         = ril_sms_submit,
-	.bearer_query   = NULL,          /* FIXME: needs investigation. */
-	.bearer_set     = NULL
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_stk.c
+++ b/ofono/drivers/ril/ril_stk.c
@@ -1,303 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2015 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.
- */
-
-#include "ril_plugin.h"
-#include "ril_util.h"
-#include "ril_log.h"
-#include "ril_constants.h"
-
-#include "util.h"
-
-#ifndef UI_LANG
-#  define UI_LANG "/var/lib/environment/nemo/locale.conf"
-#endif
-
-enum ril_stk_events {
-	STK_EVENT_PROACTIVE_COMMAND,
-	STK_EVENT_SESSION_END,
-	STK_EVENT_NOTIFY,
-	STK_EVENT_COUNT
-};
-
-struct ril_stk {
-	struct ofono_stk *stk;
-	GRilIoChannel *io;
-	GRilIoQueue *q;
-	gulong event_id[STK_EVENT_COUNT];
-};
-
-struct ril_stk_cbd {
-	union _ofono_stk_cb {
-		ofono_stk_envelope_cb_t envelope;
-		ofono_stk_generic_cb_t generic;
-		gpointer ptr;
-	} cb;
-	gpointer data;
-};
-
-#define ril_stk_cbd_free g_free
-
-static inline struct ril_stk *ril_stk_get_data(struct ofono_stk *stk)
-{
-	return ofono_stk_get_data(stk);
-}
-
-struct ril_stk_cbd *ril_stk_cbd_new(void *cb, void *data)
-{
-	struct ril_stk_cbd *cbd = g_new0(struct ril_stk_cbd, 1);
-
-	cbd->cb.ptr = cb;
-	cbd->data = data;
-	return cbd;
-}
-
-static void ril_stk_envelope_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_stk_cbd *cbd = user_data;
-	ofono_stk_envelope_cb_t cb = cbd->cb.envelope;
-
-	if (status == RIL_E_SUCCESS) {
-		DBG("%u bytes(s)", len);
-		cb(ril_error_ok(&error), NULL, 0, cbd->data);
-	} else {
-		DBG("Envelope reply failure: %s", ril_error_to_string(status));
-		cb(ril_error_failure(&error), NULL, 0, cbd->data);
-	}
-}
-
-static void ril_stk_envelope(struct ofono_stk *stk, int length,
-	const unsigned char *cmd, ofono_stk_envelope_cb_t cb, void *data)
-{
-	struct ril_stk *sd = ril_stk_get_data(stk);
-	GRilIoRequest *req = grilio_request_new();
-	char *hex_envelope = encode_hex(cmd, length, 0);
-
-	DBG("%s", hex_envelope);
-	grilio_request_append_utf8(req, hex_envelope);
-	g_free(hex_envelope);
-	grilio_queue_send_request_full(sd->q, req,
-			RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND,
-			ril_stk_envelope_cb, ril_stk_cbd_free,
-			ril_stk_cbd_new(cb, data));
-	grilio_request_unref(req);
-}
-
-static void ril_stk_terminal_response_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_stk_cbd *cbd = user_data;
-	ofono_stk_generic_cb_t cb = cbd->cb.generic;
-
-	DBG("");
-	if (status == RIL_E_SUCCESS) {
-		cb(ril_error_ok(&error), cbd->data);
-	} else {
-		ofono_error("Error in sending terminal response");
-		cb(ril_error_failure(&error), cbd->data);
-	}
-}
-
-static void ril_stk_terminal_response(struct ofono_stk *stk, int length,
-					const unsigned char *resp,
-					ofono_stk_generic_cb_t cb, void *data)
-{
-	struct ril_stk *sd = ril_stk_get_data(stk);
-	GRilIoRequest *req = grilio_request_new();
-	char *hex_tr = encode_hex(resp, length, 0);
-
-	DBG("rilmodem terminal response: %s", hex_tr);
-	grilio_request_append_utf8(req, hex_tr);
-	g_free(hex_tr);
-	grilio_queue_send_request_full(sd->q, req,
-				RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE,
-				ril_stk_terminal_response_cb,
-				ril_stk_cbd_free, ril_stk_cbd_new(cb, data));
-	grilio_request_unref(req);
-}
-
-static void ril_stk_user_confirmation(struct ofono_stk *stk,
-					ofono_bool_t confirm)
-{
-	struct ril_stk *sd = ril_stk_get_data(stk);
-	GRilIoRequest *req = grilio_request_sized_new(8);
-
-	DBG("%d", confirm);
-	grilio_request_append_int32(req, 1);            /* size of array */
-	grilio_request_append_int32(req, confirm);      /* yes/no */
-
-	grilio_queue_send_request(sd->q, req,
-		RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM);
-	grilio_request_unref(req);
-}
-
-static void ril_stk_pcmd_notify(GRilIoChannel *io, guint code,
-			const void *data, guint data_len, void *user_data)
-{
-	struct ril_stk *sd = user_data;
-	GRilIoParser rilp;
-	char *pcmd;
-	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);
-	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,
-			const void *data, guint data_len, void *user_data)
-{
-	struct ril_stk *sd = user_data;
-	GRilIoParser rilp;
-	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);
-	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,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_stk *sd = user_data;
-
-	DBG("");
-	GASSERT(code == RIL_UNSOL_STK_SESSION_END);
-	ofono_stk_proactive_session_end_notify(sd->stk);
-}
-
-static void ril_stk_agent_ready(struct ofono_stk *stk)
-{
-	struct ril_stk *sd = ril_stk_get_data(stk);
-
-	DBG("");
-	if (!sd->event_id[STK_EVENT_PROACTIVE_COMMAND]) {
-		DBG("Subscribing notifications");
-		sd->event_id[STK_EVENT_PROACTIVE_COMMAND] =
-			grilio_channel_add_unsol_event_handler(sd->io,
-				ril_stk_pcmd_notify,
-				RIL_UNSOL_STK_PROACTIVE_COMMAND, sd);
-
-		GASSERT(!sd->event_id[STK_EVENT_SESSION_END]);
-		sd->event_id[STK_EVENT_SESSION_END] =
-			grilio_channel_add_unsol_event_handler(sd->io,
-				ril_stk_session_end_notify,
-				RIL_UNSOL_STK_SESSION_END, sd);
-
-		GASSERT(!sd->event_id[STK_EVENT_NOTIFY]);
-		sd->event_id[STK_EVENT_NOTIFY] =
-			grilio_channel_add_unsol_event_handler(sd->io,
-				ril_stk_event_notify, 
-				RIL_UNSOL_STK_EVENT_NOTIFY, sd);
-
-		grilio_queue_send_request(sd->q, NULL,
-				RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING);
-	}
-}
-
-static void ril_stk_set_lang()
-{
-	GError *error = NULL;
-	GIOChannel* chan = g_io_channel_new_file(UI_LANG, "r", &error);
-	if (chan) {
-		GString* buf = g_string_new(NULL);
-		gsize term;
-		while (g_io_channel_read_line_string(chan, buf, &term, NULL) ==
-							G_IO_STATUS_NORMAL) {
-			char* lang;
-			g_string_set_size(buf, term);
-			lang = strstr(buf->str, "LANG=");
-			if (lang) {
-				setenv("LANG", lang + 5, TRUE);
-			}
-		}
-		g_string_free(buf, TRUE);
-		g_io_channel_unref(chan);
-	} else {
-		DBG("%s: %s", UI_LANG, error->message);
-		g_error_free(error);
-	}
-}
-
-static int ril_stk_probe(struct ofono_stk *stk, unsigned int vendor, void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_stk *sd = g_new0(struct ril_stk, 1);
-
-	DBG("");
-	sd->stk = stk;
-	sd->io = grilio_channel_ref(ril_modem_io(modem));
-	sd->q = grilio_queue_new(sd->io);
-
-	ofono_stk_set_data(stk, sd);
-	ofono_stk_register(stk);
-	ril_stk_set_lang();
-	return 0;
-}
-
-static void ril_stk_remove(struct ofono_stk *stk)
-{
-	struct ril_stk *sd = ril_stk_get_data(stk);
-	int i;
-
-	DBG("");
-	ofono_stk_set_data(stk, NULL);
-
-	for (i=0; i<G_N_ELEMENTS(sd->event_id); i++) {
-		grilio_channel_remove_handler(sd->io, sd->event_id[i]);
-	}
-
-	grilio_channel_unref(sd->io);
-	grilio_queue_cancel_all(sd->q, FALSE);
-	grilio_queue_unref(sd->q);
-	g_free(sd);
-}
-
-const struct ofono_stk_driver ril_stk_driver = {
-	.name                   = RILMODEM_DRIVER,
-	.probe                  = ril_stk_probe,
-	.remove                 = ril_stk_remove,
-	.envelope               = ril_stk_envelope,
-	.terminal_response      = ril_stk_terminal_response,
-	.user_confirmation      = ril_stk_user_confirmation,
-	.ready                  = ril_stk_agent_ready
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_subscription.conf
+++ b/ofono/drivers/ril/ril_subscription.conf
@@ -1,97 +0,0 @@
-# This is a sample configuration file for Jolla ril driver
-#
-# This file is expected to be installed in /etc/ofono
-#
-# Configuration for each modem is defined in its own [ril_x] section,
-# common settings are in the [Settings] section, all other sections
-# are ignored.
-#
-# If any value from [ril_x] section (except "socket") is defined
-# in the [Settings] section, it becomes the default for all modems.
-# Default values can still be redefined at [ril_x] level.
-#
-
-[Settings]
-
-# If the phone has more than one SIM slot, the 3G/LTE module may be
-# shared by all modems, meaning that only one of the slots can use
-# 3G/LTE. In order to "hand 4G over" to the other slot, the modem
-# currently using 3G/LTE has to drop to GSM, release 3G/LTE module
-# and only then 3G/LTE can be used by the other modem. This setting
-# allows to disable this behaviour (say, if your phone has independent
-# 3G/LTE modules for each slot or you don't need 4G for both slots).
-# Obviously, it only has any effect if you have more than one SIM.
-#
-# Default is true (switch the current data modem to 2G when changing
-# the data modems)
-#
-#3GLTEHandover=true
-
-[ril_0]
-
-# Required entry, defines the RIL socket path
-socket=/dev/socket/rild
-
-# Subscription string. Some (mostly, older) RILs require that 4 bytes
-# (usually SUB1 or SUB2) are written to the socket before rild starts
-# talking to us.
-#
-# Not sent by default.
-#
-#sub=SUB1
-
-# RIL logging prefix, to tell one socket from another in the log.
-# Makes sense if you have more than one modem configured.
-#
-# No prefix by default.
-#
-#name=RIL1
-
-# Slot id for SET_UICC_SUBSCRIPTION request.
-#
-# By default the first modem becomes slot 0, the next one slot 1 and so on.
-#
-#slot=0
-
-# RIL request timeout, in milliseconds.
-#
-# The default is zero (no timeout)
-#
-#timeout=0
-
-# Setting this one to false would disable 4G technology selection.
-#
-# By default 4G is enabled
-#
-#enable4G=true
-
-# RIL_REQUEST_SET_UICC_SUBSCRIPTION is 115 in RIL version 9 (or earlier)
-# and 122 in RIL version 10 and later. Since ofono doesn't know in advance
-# which RIL version it's dealing with, it makes the decision at runtime.
-# Settings it to false disables the workaround and always sends 122.
-#
-# Default is true (select SET_UICC_SUBSCRIPTION based on the RIL version)
-#
-#uiccWorkaround=true
-
-# Points to the file containing comma-separated ECC (Emergency List Codes)
-# list, e.g. 911,112,*911,#911. The file is tracked by ofono and when its
-# contents changes, it's reflected in the EmergencyNumbers property of
-# org.ofono.VoiceCallManager.
-#
-# If necessary, the contents of the file can be synchronized with the
-# Android system property by adding something like this to /init.rc:
-#
-# on property:ril.ecclist=*
-#     write /var/lib/ofono/ril.ecclist ${ril.ecclist}
-#     chmod 0644 /var/lib/ofono/ril.ecclist
-#
-#ecclistFile=/var/lib/ofono/ril.ecclist
-
-# RIL_REQUEST_ALLOW_DATA may or may not be supported by your RIL.
-# This option allows you to forcibly enable or disable use of this request.
-# Possible values are auto, on and off
-#
-# Default is auto (usage based on the RIL version)
-#
-#allowDataReq=auto
--- a/ofono/drivers/ril/ril_types.h
+++ b/ofono/drivers/ril/ril_types.h
@@ -1,65 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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_TYPES_H
-#define RIL_TYPES_H
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <grilio_types.h>
-#include <gutil_macros.h>
-
-#include <ofono/types.h>
-
-struct ofono_modem;
-struct ofono_sim;
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "ril_constants.h"
-
-#define RIL_RETRY_SECS (2)
-#define RIL_RETRY_MS   (RIL_RETRY_SECS*1000)
-
-struct ril_mce;
-struct ril_data;
-struct ril_modem;
-struct ril_radio;
-struct ril_network;
-struct ril_sim_card;
-struct ril_sim_info;
-struct ril_sim_settings;
-struct ril_cell_info;
-
-struct ril_slot_config {
-	guint slot;
-	gboolean enable_4g;
-};
-
-#endif /* RIL_TYPES_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_ussd.c
+++ b/ofono/drivers/ril/ril_ussd.c
@@ -1,223 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_util.h"
-#include "ril_log.h"
-#include "ril_constants.h"
-
-#include "smsutil.h"
-#include "util.h"
-
-struct ril_ussd {
-	struct ofono_ussd *ussd;
-	GRilIoChannel *io;
-	GRilIoQueue *q;
-	guint timer_id;
-	gulong event_id;
-};
-
-struct ril_ussd_cbd {
-	ofono_ussd_cb_t cb;
-	gpointer data;
-};
-
-#define ril_ussd_cbd_free g_free
-
-static inline struct ril_ussd *ril_ussd_get_data(struct ofono_ussd *ussd)
-{
-	return ofono_ussd_get_data(ussd);
-}
-
-static struct ril_ussd_cbd *ril_ussd_cbd_new(ofono_ussd_cb_t cb, void *data)
-{
-	struct ril_ussd_cbd *cbd = g_new0(struct ril_ussd_cbd, 1);
-
-	cbd->cb = cb;
-	cbd->data = data;
-	return cbd;
-}
-
-static void ril_ussd_cb(GRilIoChannel *io, int status,
-			const void *data, guint len, void *user_data)
-{
-	struct ofono_error error;
-	struct ril_ussd_cbd *cbd = user_data;
-
-	if (status == RIL_E_SUCCESS) {
-		cbd->cb(ril_error_ok(&error), cbd->data);
-	} else {
-		cbd->cb(ril_error_failure(&error), cbd->data);
-	}
-}
-
-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 sms_charset charset;
-	struct ril_ussd *ud = ril_ussd_get_data(ussd);
-
-	ofono_info("send ussd, len:%d", len);
-	if (cbs_dcs_decode(dcs, NULL, NULL, &charset, NULL, NULL, NULL)) {
-		if (charset == SMS_CHARSET_7BIT) {
-			unsigned char unpacked_buf[182];
-			long written = 0;
-
-			unpack_7bit_own_buf(pdu, len, 0, TRUE,
-					sizeof(unpacked_buf)-1, &written, 0,
-					unpacked_buf);
-
-			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_queue_send_request(ud->q, req,
-					RIL_REQUEST_SEND_USSD);
-				grilio_request_unref(req);
-				cb(ril_error_ok(&error), data);
-				return;
-			}
-		}
-	}
-
-	cb(ril_error_failure(&error), data);
-}
-
-static void ril_ussd_cancel(struct ofono_ussd *ussd,
-				ofono_ussd_cb_t cb, void *data)
-{
-	struct ril_ussd *ud = ril_ussd_get_data(ussd);
-
-	ofono_info("send ussd cancel");
-	grilio_queue_send_request_full(ud->q, NULL, RIL_REQUEST_CANCEL_USSD,
-		ril_ussd_cb, ril_ussd_cbd_free, ril_ussd_cbd_new(cb, data));
-}
-
-static void ril_ussd_notify(GRilIoChannel *io, guint code,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_ussd *ud = user_data;
-	GRilIoParser rilp;
-	char *ussd_from_network = NULL;
-	char *type = NULL;
-	int ussdtype = 0;
-
-	ofono_info("ussd_received");
-
-	GASSERT(code == RIL_UNSOL_ON_USSD);
-	grilio_parser_init(&rilp, data, len);
-	grilio_parser_get_uint32(&rilp, NULL);
-	type = grilio_parser_get_utf8(&rilp);
-	ussd_from_network = grilio_parser_get_utf8(&rilp);
-
-	ussdtype = g_ascii_xdigit_value(*type);
-
-	if (ussd_from_network) {
-		const int data_len = strlen(ussd_from_network);
-		DBG("ussd_received, length %d", data_len);
-		ofono_ussd_notify(ud->ussd, ussdtype, 0xFF,
-			(const unsigned char *) ussd_from_network, data_len);
-	} else {
-		ofono_ussd_notify(ud->ussd, ussdtype, 0, NULL, 0);
-	}
-
-	/* ussd_from_network not freed because core does that if dcs is 0xFF */
-	g_free(type);
-	return;
-}
-
-static gboolean ril_ussd_register(gpointer user_data)
-{
-	struct ril_ussd *ud = user_data;
-
-	DBG("");
-	GASSERT(ud->timer_id);
-	ud->timer_id = 0;
-	ofono_ussd_register(ud->ussd);
-
-	/* Register for USSD events */
-	ud->event_id = grilio_channel_add_unsol_event_handler(ud->io,
-				ril_ussd_notify, RIL_UNSOL_ON_USSD, ud);
-
-	/* Single-shot */
-	return FALSE;
-}
-
-static int ril_ussd_probe(struct ofono_ussd *ussd, unsigned int vendor,
-								void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_ussd *ud = g_try_new0(struct ril_ussd, 1);
-
-	DBG("");
-	ud->ussd = ussd;
-	ud->io = grilio_channel_ref(ril_modem_io(modem));
-	ud->q = grilio_queue_new(ud->io);
-	ud->timer_id = g_idle_add(ril_ussd_register, ud);
-	ofono_ussd_set_data(ussd, ud);
-	return 0;
-}
-
-static void ril_ussd_remove(struct ofono_ussd *ussd)
-{
-	struct ril_ussd *ud = ril_ussd_get_data(ussd);
-
-	DBG("");
-	ofono_ussd_set_data(ussd, NULL);
-
-	if (ud->timer_id > 0) {
-		g_source_remove(ud->timer_id);
-	}
-
-	grilio_channel_remove_handler(ud->io, ud->event_id);
-	grilio_channel_unref(ud->io);
-	grilio_queue_cancel_all(ud->q, FALSE);
-	grilio_queue_unref(ud->q);
-	g_free(ud);
-}
-
-const struct ofono_ussd_driver ril_ussd_driver = {
-	.name           = RILMODEM_DRIVER,
-	.probe          = ril_ussd_probe,
-	.remove         = ril_ussd_remove,
-	.request        = ril_ussd_request,
-	.cancel         = ril_ussd_cancel
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_util.c
+++ b/ofono/drivers/ril/ril_util.c
@@ -1,399 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_util.h"
-#include "ril_log.h"
-
-#include <grilio_channel.h>
-
-#include <sys/socket.h>
-#include <ctype.h>
-
-#include "common.h"
-#include "netreg.h"
-
-const char *ril_error_to_string(int error)
-{
-#define RIL_E_(name) case RIL_E_##name: return #name
-#define GRILIO_E_(name) case GRILIO_STATUS_##name: return "GRILIO_" #name
-	static char unknown[12];
-	switch (error) {
-	case RIL_E_SUCCESS: return "OK";
-	GRILIO_E_(TIMEOUT);
-	GRILIO_E_(CANCELLED);
-	RIL_E_(RADIO_NOT_AVAILABLE);
-	RIL_E_(GENERIC_FAILURE);
-	RIL_E_(PASSWORD_INCORRECT);
-	RIL_E_(SIM_PIN2);
-	RIL_E_(SIM_PUK2);
-	RIL_E_(REQUEST_NOT_SUPPORTED);
-	RIL_E_(CANCELLED);
-	RIL_E_(OP_NOT_ALLOWED_DURING_VOICE_CALL);
-	RIL_E_(OP_NOT_ALLOWED_BEFORE_REG_TO_NW);
-	RIL_E_(SMS_SEND_FAIL_RETRY);
-	RIL_E_(SIM_ABSENT);
-	RIL_E_(SUBSCRIPTION_NOT_AVAILABLE);
-	RIL_E_(MODE_NOT_SUPPORTED);
-	RIL_E_(FDN_CHECK_FAILURE);
-	RIL_E_(ILLEGAL_SIM_OR_ME);
-	RIL_E_(UNUSED);
-	RIL_E_(DIAL_MODIFIED_TO_USSD);
-	RIL_E_(DIAL_MODIFIED_TO_SS);
-	RIL_E_(DIAL_MODIFIED_TO_DIAL);
-	RIL_E_(USSD_MODIFIED_TO_DIAL);
-	RIL_E_(USSD_MODIFIED_TO_SS);
-	RIL_E_(USSD_MODIFIED_TO_USSD);
-	RIL_E_(SS_MODIFIED_TO_DIAL);
-	RIL_E_(SS_MODIFIED_TO_USSD);
-	RIL_E_(SS_MODIFIED_TO_SS);
-	RIL_E_(SUBSCRIPTION_NOT_SUPPORTED);
-	RIL_E_(MISSING_RESOURCE);
-	RIL_E_(NO_SUCH_ELEMENT);
-	RIL_E_(INVALID_PARAMETER);
-	default:
-		snprintf(unknown, sizeof(unknown), "%d", error);
-		return unknown;
-	}
-}
-
-const char *ril_request_to_string(guint request)
-{
-#define RIL_REQUEST_(name) case RIL_REQUEST_##name: return #name
-	static char unknown[24];
-	switch (request) {
-	RIL_REQUEST_(GET_SIM_STATUS);
-	RIL_REQUEST_(ENTER_SIM_PIN);
-	RIL_REQUEST_(ENTER_SIM_PUK);
-	RIL_REQUEST_(ENTER_SIM_PIN2);
-	RIL_REQUEST_(ENTER_SIM_PUK2);
-	RIL_REQUEST_(CHANGE_SIM_PIN);
-	RIL_REQUEST_(CHANGE_SIM_PIN2);
-	RIL_REQUEST_(ENTER_NETWORK_DEPERSONALIZATION);
-	RIL_REQUEST_(GET_CURRENT_CALLS);
-	RIL_REQUEST_(DIAL);
-	RIL_REQUEST_(GET_IMSI);
-	RIL_REQUEST_(HANGUP);
-	RIL_REQUEST_(HANGUP_WAITING_OR_BACKGROUND);
-	RIL_REQUEST_(HANGUP_FOREGROUND_RESUME_BACKGROUND);
-	RIL_REQUEST_(SWITCH_HOLDING_AND_ACTIVE);
-	RIL_REQUEST_(CONFERENCE);
-	RIL_REQUEST_(UDUB);
-	RIL_REQUEST_(LAST_CALL_FAIL_CAUSE);
-	RIL_REQUEST_(SIGNAL_STRENGTH);
-	RIL_REQUEST_(VOICE_REGISTRATION_STATE);
-	RIL_REQUEST_(DATA_REGISTRATION_STATE);
-	RIL_REQUEST_(OPERATOR);
-	RIL_REQUEST_(RADIO_POWER);
-	RIL_REQUEST_(DTMF);
-	RIL_REQUEST_(SEND_SMS);
-	RIL_REQUEST_(SEND_SMS_EXPECT_MORE);
-	RIL_REQUEST_(SETUP_DATA_CALL);
-	RIL_REQUEST_(SIM_IO);
-	RIL_REQUEST_(SEND_USSD);
-	RIL_REQUEST_(CANCEL_USSD);
-	RIL_REQUEST_(GET_CLIR);
-	RIL_REQUEST_(SET_CLIR);
-	RIL_REQUEST_(QUERY_CALL_FORWARD_STATUS);
-	RIL_REQUEST_(SET_CALL_FORWARD);
-	RIL_REQUEST_(QUERY_CALL_WAITING);
-	RIL_REQUEST_(SET_CALL_WAITING);
-	RIL_REQUEST_(SMS_ACKNOWLEDGE);
-	RIL_REQUEST_(GET_IMEI);
-	RIL_REQUEST_(GET_IMEISV);
-	RIL_REQUEST_(ANSWER);
-	RIL_REQUEST_(DEACTIVATE_DATA_CALL);
-	RIL_REQUEST_(QUERY_FACILITY_LOCK);
-	RIL_REQUEST_(SET_FACILITY_LOCK);
-	RIL_REQUEST_(CHANGE_BARRING_PASSWORD);
-	RIL_REQUEST_(QUERY_NETWORK_SELECTION_MODE);
-	RIL_REQUEST_(SET_NETWORK_SELECTION_AUTOMATIC);
-	RIL_REQUEST_(SET_NETWORK_SELECTION_MANUAL);
-	RIL_REQUEST_(QUERY_AVAILABLE_NETWORKS);
-	RIL_REQUEST_(DTMF_START);
-	RIL_REQUEST_(DTMF_STOP);
-	RIL_REQUEST_(BASEBAND_VERSION);
-	RIL_REQUEST_(SEPARATE_CONNECTION);
-	RIL_REQUEST_(SET_MUTE);
-	RIL_REQUEST_(GET_MUTE);
-	RIL_REQUEST_(QUERY_CLIP);
-	RIL_REQUEST_(LAST_DATA_CALL_FAIL_CAUSE);
-	RIL_REQUEST_(DATA_CALL_LIST);
-	RIL_REQUEST_(RESET_RADIO);
-	RIL_REQUEST_(OEM_HOOK_RAW);
-	RIL_REQUEST_(OEM_HOOK_STRINGS);
-	RIL_REQUEST_(SCREEN_STATE);
-	RIL_REQUEST_(SET_SUPP_SVC_NOTIFICATION);
-	RIL_REQUEST_(WRITE_SMS_TO_SIM);
-	RIL_REQUEST_(DELETE_SMS_ON_SIM);
-	RIL_REQUEST_(SET_BAND_MODE);
-	RIL_REQUEST_(QUERY_AVAILABLE_BAND_MODE);
-	RIL_REQUEST_(STK_GET_PROFILE);
-	RIL_REQUEST_(STK_SET_PROFILE);
-	RIL_REQUEST_(STK_SEND_ENVELOPE_COMMAND);
-	RIL_REQUEST_(STK_SEND_TERMINAL_RESPONSE);
-	RIL_REQUEST_(STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM);
-	RIL_REQUEST_(EXPLICIT_CALL_TRANSFER);
-	RIL_REQUEST_(SET_PREFERRED_NETWORK_TYPE);
-	RIL_REQUEST_(GET_PREFERRED_NETWORK_TYPE);
-	RIL_REQUEST_(GET_NEIGHBORING_CELL_IDS);
-	RIL_REQUEST_(SET_LOCATION_UPDATES);
-	RIL_REQUEST_(CDMA_SET_SUBSCRIPTION_SOURCE);
-	RIL_REQUEST_(CDMA_SET_ROAMING_PREFERENCE);
-	RIL_REQUEST_(CDMA_QUERY_ROAMING_PREFERENCE);
-	RIL_REQUEST_(SET_TTY_MODE);
-	RIL_REQUEST_(QUERY_TTY_MODE);
-	RIL_REQUEST_(CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE);
-	RIL_REQUEST_(CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE);
-	RIL_REQUEST_(CDMA_FLASH);
-	RIL_REQUEST_(CDMA_BURST_DTMF);
-	RIL_REQUEST_(CDMA_VALIDATE_AND_WRITE_AKEY);
-	RIL_REQUEST_(CDMA_SEND_SMS);
-	RIL_REQUEST_(CDMA_SMS_ACKNOWLEDGE);
-	RIL_REQUEST_(GSM_GET_BROADCAST_SMS_CONFIG);
-	RIL_REQUEST_(GSM_SET_BROADCAST_SMS_CONFIG);
-	RIL_REQUEST_(GSM_SMS_BROADCAST_ACTIVATION);
-	RIL_REQUEST_(CDMA_GET_BROADCAST_SMS_CONFIG);
-	RIL_REQUEST_(CDMA_SET_BROADCAST_SMS_CONFIG);
-	RIL_REQUEST_(CDMA_SMS_BROADCAST_ACTIVATION);
-	RIL_REQUEST_(CDMA_SUBSCRIPTION);
-	RIL_REQUEST_(CDMA_WRITE_SMS_TO_RUIM);
-	RIL_REQUEST_(CDMA_DELETE_SMS_ON_RUIM);
-	RIL_REQUEST_(DEVICE_IDENTITY);
-	RIL_REQUEST_(EXIT_EMERGENCY_CALLBACK_MODE);
-	RIL_REQUEST_(GET_SMSC_ADDRESS);
-	RIL_REQUEST_(SET_SMSC_ADDRESS);
-	RIL_REQUEST_(REPORT_SMS_MEMORY_STATUS);
-	RIL_REQUEST_(REPORT_STK_SERVICE_IS_RUNNING);
-	RIL_REQUEST_(CDMA_GET_SUBSCRIPTION_SOURCE);
-	RIL_REQUEST_(ISIM_AUTHENTICATION);
-	RIL_REQUEST_(ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU);
-	RIL_REQUEST_(STK_SEND_ENVELOPE_WITH_STATUS);
-	RIL_REQUEST_(VOICE_RADIO_TECH);
-	RIL_REQUEST_(GET_CELL_INFO_LIST);
-	RIL_REQUEST_(SET_UNSOL_CELL_INFO_LIST_RATE);
-	RIL_REQUEST_(SET_INITIAL_ATTACH_APN);
-	RIL_REQUEST_(IMS_REGISTRATION_STATE);
-	RIL_REQUEST_(IMS_SEND_SMS);
-	RIL_REQUEST_(SIM_TRANSMIT_APDU_BASIC);
-	RIL_REQUEST_(SIM_OPEN_CHANNEL);
-	RIL_REQUEST_(SIM_CLOSE_CHANNEL);
-	RIL_REQUEST_(SIM_TRANSMIT_APDU_CHANNEL);
-	RIL_REQUEST_(NV_READ_ITEM);
-	RIL_REQUEST_(NV_WRITE_ITEM);
-	RIL_REQUEST_(NV_WRITE_CDMA_PRL);
-	RIL_REQUEST_(NV_RESET_CONFIG);
-	RIL_REQUEST_(SET_UICC_SUBSCRIPTION);
-	RIL_REQUEST_(ALLOW_DATA);
-	RIL_REQUEST_(GET_HARDWARE_CONFIG);
-	RIL_REQUEST_(SIM_AUTHENTICATION);
-	RIL_REQUEST_(GET_DC_RT_INFO);
-	RIL_REQUEST_(SET_DC_RT_INFO_RATE);
-	RIL_REQUEST_(SET_DATA_PROFILE);
-	RIL_REQUEST_(SHUTDOWN);
-	RIL_REQUEST_(GET_RADIO_CAPABILITY);
-	RIL_REQUEST_(SET_RADIO_CAPABILITY);
-	default:
-		snprintf(unknown, sizeof(unknown), "RIL_REQUEST_%d", request);
-		return unknown;
-	}
-}
-
-const char *ril_unsol_event_to_string(guint event)
-{
-#define RIL_UNSOL_(name) case RIL_UNSOL_##name: return #name
-	static char unknown[24];
-	switch (event) {
-	RIL_UNSOL_(RESPONSE_RADIO_STATE_CHANGED);
-	RIL_UNSOL_(RESPONSE_CALL_STATE_CHANGED);
-	RIL_UNSOL_(RESPONSE_VOICE_NETWORK_STATE_CHANGED);
-	RIL_UNSOL_(RESPONSE_NEW_SMS);
-	RIL_UNSOL_(RESPONSE_NEW_SMS_STATUS_REPORT);
-	RIL_UNSOL_(RESPONSE_NEW_SMS_ON_SIM);
-	RIL_UNSOL_(ON_USSD);
-	RIL_UNSOL_(ON_USSD_REQUEST);
-	RIL_UNSOL_(NITZ_TIME_RECEIVED);
-	RIL_UNSOL_(SIGNAL_STRENGTH);
-	RIL_UNSOL_(DATA_CALL_LIST_CHANGED);
-	RIL_UNSOL_(SUPP_SVC_NOTIFICATION);
-	RIL_UNSOL_(STK_SESSION_END);
-	RIL_UNSOL_(STK_PROACTIVE_COMMAND);
-	RIL_UNSOL_(STK_EVENT_NOTIFY);
-	RIL_UNSOL_(STK_CALL_SETUP);
-	RIL_UNSOL_(SIM_SMS_STORAGE_FULL);
-	RIL_UNSOL_(SIM_REFRESH);
-	RIL_UNSOL_(CALL_RING);
-	RIL_UNSOL_(RESPONSE_SIM_STATUS_CHANGED);
-	RIL_UNSOL_(RESPONSE_CDMA_NEW_SMS);
-	RIL_UNSOL_(RESPONSE_NEW_BROADCAST_SMS);
-	RIL_UNSOL_(CDMA_RUIM_SMS_STORAGE_FULL);
-	RIL_UNSOL_(RESTRICTED_STATE_CHANGED);
-	RIL_UNSOL_(ENTER_EMERGENCY_CALLBACK_MODE);
-	RIL_UNSOL_(CDMA_CALL_WAITING);
-	RIL_UNSOL_(CDMA_OTA_PROVISION_STATUS);
-	RIL_UNSOL_(CDMA_INFO_REC);
-	RIL_UNSOL_(OEM_HOOK_RAW);
-	RIL_UNSOL_(RINGBACK_TONE);
-	RIL_UNSOL_(RESEND_INCALL_MUTE);
-	RIL_UNSOL_(CDMA_SUBSCRIPTION_SOURCE_CHANGED);
-	RIL_UNSOL_(CDMA_PRL_CHANGED);
-	RIL_UNSOL_(EXIT_EMERGENCY_CALLBACK_MODE);
-	RIL_UNSOL_(RIL_CONNECTED);
-	RIL_UNSOL_(VOICE_RADIO_TECH_CHANGED);
-	RIL_UNSOL_(CELL_INFO_LIST);
-	RIL_UNSOL_(RESPONSE_IMS_NETWORK_STATE_CHANGED);
-	RIL_UNSOL_(UICC_SUBSCRIPTION_STATUS_CHANGED);
-	RIL_UNSOL_(SRVCC_STATE_NOTIFY);
-	RIL_UNSOL_(HARDWARE_CONFIG_CHANGED);
-	RIL_UNSOL_(DC_RT_INFO_CHANGED);
-	RIL_UNSOL_(RADIO_CAPABILITY);
-	RIL_UNSOL_(ON_SS);
-	RIL_UNSOL_(STK_CC_ALPHA_NOTIFY);
-	default:
-		snprintf(unknown, sizeof(unknown), "RIL_UNSOL_%d", event);
-		return unknown;
-	}
-}
-
-const char *ril_radio_state_to_string(int radio_state)
-{
-#define RADIO_STATE_(name) case RADIO_STATE_##name: return #name
-	static char unknown[16];
-	switch (radio_state) {
-	RADIO_STATE_(OFF);
-	RADIO_STATE_(UNAVAILABLE);
-	RADIO_STATE_(SIM_NOT_READY);
-	RADIO_STATE_(SIM_LOCKED_OR_ABSENT);
-	RADIO_STATE_(SIM_READY);
-	RADIO_STATE_(RUIM_NOT_READY);
-	RADIO_STATE_(RUIM_READY);
-	RADIO_STATE_(RUIM_LOCKED_OR_ABSENT);
-	RADIO_STATE_(NV_NOT_READY);
-	RADIO_STATE_(NV_READY);
-	RADIO_STATE_(ON);
-	default:
-		snprintf(unknown, sizeof(unknown), "%d (?)", radio_state);
-		return unknown;
-	}
-}
-
-int ril_address_family(const char *addr)
-{
-	if (strchr(addr, ':')) {
-		return AF_INET6;
-	} else if (strchr(addr, '.')) {
-		return AF_INET;
-	} else {
-		return AF_UNSPEC;
-	}
-}
-
-/* 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;
-	if (stech && stech[0]) {
-		tech = atoi(stech);
-		switch (tech) {
-		case RADIO_TECH_GPRS:
-		case RADIO_TECH_GSM:
-			access_tech = ACCESS_TECHNOLOGY_GSM;
-			break;
-		case RADIO_TECH_EDGE:
-			access_tech = ACCESS_TECHNOLOGY_GSM_EGPRS;
-			break;
-		case RADIO_TECH_UMTS:
-			access_tech = ACCESS_TECHNOLOGY_UTRAN;
-			break;
-		case RADIO_TECH_HSDPA:
-			access_tech = ACCESS_TECHNOLOGY_UTRAN_HSDPA;
-			break;
-		case RADIO_TECH_HSUPA:
-			access_tech = ACCESS_TECHNOLOGY_UTRAN_HSUPA;
-			break;
-		case RADIO_TECH_HSPA:
-		case RADIO_TECH_HSPAP:
-			access_tech = ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA;
-			break;
-		case RADIO_TECH_LTE:
-			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;
-		}
-
-	}
-	if (ril_tech) {
-		*ril_tech = tech;
-	}
-	return access_tech;
-}
-
-gboolean ril_parse_mcc_mnc(const char *str, struct ofono_network_operator *op)
-{
-	if (str) {
-		int i;
-		const char *ptr = str;
-
-		/* Three digit country code */
-		for (i = 0;
-		     i < OFONO_MAX_MCC_LENGTH && *ptr && isdigit(*ptr);
-		     i++) {
-			op->mcc[i] = *ptr++;
-		}
-		op->mcc[i] = 0;
-
-		if (i == OFONO_MAX_MCC_LENGTH) {
-			/* Usually 2 but sometimes 3 digit network code */
-			for (i=0;
-			     i<OFONO_MAX_MNC_LENGTH && *ptr && isdigit(*ptr);
-			     i++) {
-				op->mnc[i] = *ptr++;
-			}
-			op->mnc[i] = 0;
-
-			if (i > 0) {
-
-				/*
-				 * Sometimes MCC/MNC are followed by + and
-				 * what looks like the technology code. This
-				 * is of course completely undocumented.
-				 */
-				if (*ptr == '+') {
-					int tech = ril_parse_tech(ptr+1, NULL);
-					if (tech >= 0) {
-						op->tech = tech;
-					}
-				}
-
-				return TRUE;
-			}
-		}
-	}
-	return FALSE;
-}
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_util.h
+++ b/ofono/drivers/ril/ril_util.h
@@ -1,47 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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_UTIL_H
-#define RIL_UTIL_H
-
-#include "ril_types.h"
-
-struct ofono_network_operator;
-
-const char *ril_error_to_string(int error);
-const char *ril_request_to_string(guint request);
-const char *ril_unsol_event_to_string(guint event);
-const char *ril_radio_state_to_string(int radio_state);
-int ril_parse_tech(const char *stech, int *ril_tech);
-int ril_address_family(const char *addr);
-gboolean ril_parse_mcc_mnc(const char *str, struct ofono_network_operator *op);
-
-#define ril_error_init_ok(err) \
-	((err)->error = 0, (err)->type = OFONO_ERROR_TYPE_NO_ERROR)
-#define ril_error_init_failure(err) \
-	((err)->error = 0, (err)->type = OFONO_ERROR_TYPE_FAILURE)
-
-#define ril_error_ok(err) (ril_error_init_ok(err), err)
-#define ril_error_failure(err) (ril_error_init_failure(err), err)
-
-#endif /* RIL_UTIL_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/ril/ril_voicecall.c
+++ b/ofono/drivers/ril/ril_voicecall.c
@@ -1,878 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  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
- *  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.
- */
-
-#include "ril_plugin.h"
-#include "ril_constants.h"
-#include "ril_ecclist.h"
-#include "ril_util.h"
-#include "ril_log.h"
-
-#include "common.h"
-
-#include <gutil_ring.h>
-
-#define FLAG_NEED_CLIP 1
-
-enum ril_voicecall_events {
-	VOICECALL_EVENT_CALL_STATE_CHANGED,
-	VOICECALL_EVENT_SUPP_SVC_NOTIFICATION,
-	VOICECALL_EVENT_RINGBACK_TONE,
-	VOICECALL_EVENT_COUNT,
-};
-
-struct ril_voicecall {
-	GSList *calls;
-	GRilIoChannel *io;
-	GRilIoQueue *q;
-	struct ofono_voicecall *vc;
-	struct ril_ecclist *ecclist;
-	unsigned int local_release;
-	unsigned char flags;
-	ofono_voicecall_cb_t cb;
-	void *data;
-	guint timer_id;
-	GUtilRing* dtmf_queue;
-	guint send_dtmf_id;
-	guint clcc_poll_id;
-	gulong event_id[VOICECALL_EVENT_COUNT];
-	gulong supp_svc_notification_id;
-	gulong ringback_tone_event_id;
-	gulong ecclist_change_id;
-};
-
-struct ril_voicecall_change_state_req {
-	struct ofono_voicecall *vc;
-	ofono_voicecall_cb_t cb;
-	gpointer data;
-	int affected_types;
-};
-
-struct lastcause_req {
-	struct ofono_voicecall *vc;
-	int id;
-};
-
-static void ril_voicecall_send_one_dtmf(struct ril_voicecall *vd);
-static void ril_voicecall_clear_dtmf_queue(struct ril_voicecall *vd);
-
-/*
- * structs ofono_voicecall and voicecall are fully defined
- * in src/voicecall.c; we need (read) access to the
- * call objects, so partially redefine them here.
- */
-struct ofono_voicecall {
-	GSList *call_list;
-	/* ... */
-};
-
-struct voicecall {
-	struct ofono_call *call;
-	/* ... */
-};
-
-static inline struct ril_voicecall *ril_voicecall_get_data(
-						struct ofono_voicecall *vc)
-{
-	return ofono_voicecall_get_data(vc);
-}
-
-static gint ril_voicecall_compare(gconstpointer a, gconstpointer b)
-{
-	const struct ofono_call *ca = a;
-	const struct ofono_call *cb = b;
-
-	if (ca->id < cb->id)
-		return -1;
-
-	if (ca->id > cb->id)
-		return 1;
-
-	return 0;
-}
-
-static GSList *ril_voicecall_parse_clcc(const void *data, guint len)
-{
-	GRilIoParser rilp;
-	GSList *l = NULL;
-	int num = 0, i;
-	gchar *number, *name;
-
-	grilio_parser_init(&rilp, data, len);
-
-	/* Number of RIL_Call structs */
-	
-	grilio_parser_get_int32(&rilp, &num);
-	for (i = 0; i < num; i++) {
-		struct ofono_call *call = g_new(struct ofono_call, 1);
-		gint tmp;
-
-		ofono_call_init(call);
-		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 */
-
-		tmp = 0;
-		grilio_parser_get_int32(&rilp, &tmp);
-		call->direction = (tmp ?              /* isMT */
-			CALL_DIRECTION_MOBILE_TERMINATED :
-			CALL_DIRECTION_MOBILE_ORIGINATED);
-
-		grilio_parser_get_int32(&rilp, NULL); /* als */
-		grilio_parser_get_int32(&rilp, &call->type); /* isVoice */
-		grilio_parser_get_int32(&rilp, NULL); /* isVoicePrivacy */
-		number = grilio_parser_get_utf8(&rilp);
-		if (number) {
-			strncpy(call->phone_number.number, number,
-				OFONO_MAX_PHONE_NUMBER_LENGTH);
-			g_free(number);
-		}
-		grilio_parser_get_int32(&rilp, NULL); /* numberPresentation */
-		name = grilio_parser_get_utf8(&rilp);
-		if (name) {
-			strncpy(call->name, name, OFONO_MAX_CALLER_NAME_LENGTH);
-			g_free(name);
-		}
-		grilio_parser_get_int32(&rilp, NULL); /* namePresentation */
-		grilio_parser_get_int32(&rilp, &tmp); /* uusInfo */
-		GASSERT(!tmp);
-
-		if (strlen(call->phone_number.number) > 0) {
-			call->clip_validity = 0;
-		} else {
-			call->clip_validity = 2;
-		}
-
-		DBG("[id=%d,status=%d,type=%d,number=%s,name=%s]",
-				call->id, call->status, call->type,
-				call->phone_number.number, call->name);
-
-		l = g_slist_insert_sorted(l, call, ril_voicecall_compare);
-	}
-
-	return l;
-}
-
-/* Valid call statuses have value >= 0 */
-static int call_status_with_id(struct ofono_voicecall *vc, int id)
-{
-	GSList *l;
-	struct voicecall *v;
-
-	GASSERT(vc);
-
-	for (l = vc->call_list; l; l = l->next) {
-		v = l->data;
-		if (v->call->id == id) {
-			return v->call->status;
-		}
-	}
-
-	return -1;
-}
-
-static void ril_voicecall_lastcause_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct lastcause_req *reqdata = user_data;
-	struct ofono_voicecall *vc = reqdata->vc;
-	int tmp;
-	int id = reqdata->id;
-	int call_status;
-
-	enum ofono_disconnect_reason reason = OFONO_DISCONNECT_REASON_ERROR;
-	int last_cause = CALL_FAIL_ERROR_UNSPECIFIED;
-	GRilIoParser rilp;
-	grilio_parser_init(&rilp, data, len);
-	if (grilio_parser_get_int32(&rilp, &tmp) && tmp > 0) {
-		grilio_parser_get_int32(&rilp, &last_cause);
-	}
-
-	/*
-	 * Not all call control cause values specified in 3GPP TS 24.008
-	 * "Mobile radio interface Layer 3 specification; Core network
-	 * protocols", Annex H, are properly reflected in the RIL API.
-	 * For example, cause #21 "call rejected" is mapped to
-	 * CALL_FAIL_ERROR_UNSPECIFIED, and thus indistinguishable
-	 * from a network failure.
-	 */
-	switch (last_cause) {
-		case CALL_FAIL_UNOBTAINABLE_NUMBER:
-		case CALL_FAIL_NORMAL:
-		case CALL_FAIL_BUSY:
-		case CALL_FAIL_NO_ROUTE_TO_DESTINATION:
-		case CALL_FAIL_CHANNEL_UNACCEPTABLE:
-		case CALL_FAIL_OPERATOR_DETERMINED_BARRING:
-		case CALL_FAIL_NO_USER_RESPONDING:
-		case CALL_FAIL_USER_ALERTING_NO_ANSWER:
-		case CALL_FAIL_CALL_REJECTED:
-		case CALL_FAIL_NUMBER_CHANGED:
-		case CALL_FAIL_ANONYMOUS_CALL_REJECTION:
-		case CALL_FAIL_PRE_EMPTION:
-		case CALL_FAIL_DESTINATION_OUT_OF_ORDER:
-		case CALL_FAIL_INCOMPLETE_NUMBER:
-		case CALL_FAIL_FACILITY_REJECTED:
-			reason = OFONO_DISCONNECT_REASON_REMOTE_HANGUP;
-			break;
-
-		case CALL_FAIL_NORMAL_UNSPECIFIED:
-			call_status = call_status_with_id(vc, id);
-			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 == CALL_STATUS_INCOMING) {
-				reason = OFONO_DISCONNECT_REASON_LOCAL_HANGUP;
-			}
-			break;
-
-		case CALL_FAIL_ERROR_UNSPECIFIED:
-			call_status = call_status_with_id(vc, id);
-			if (call_status == CALL_STATUS_DIALING ||
-			    call_status == CALL_STATUS_ALERTING) {
-				reason = OFONO_DISCONNECT_REASON_REMOTE_HANGUP;
-			}
-			break;
-
-		default:
-			reason = OFONO_DISCONNECT_REASON_ERROR;
-			break;
-	}
-
-	ofono_info("Call %d ended with RIL cause %d -> ofono reason %d",
-						id, last_cause, reason);
-
-	ofono_voicecall_disconnected(vc, id, reason, NULL);
-}
-
-static void ril_voicecall_clcc_poll_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_voicecall *vd = user_data;
-	GSList *calls;
-	GSList *n, *o;
-	struct ofono_error error;
-
-	GASSERT(vd->clcc_poll_id);
-	vd->clcc_poll_id = 0;
-
-	if (status != RIL_E_SUCCESS) {
-		ofono_error("We are polling CLCC and received an error");
-		ofono_error("All bets are off for call management");
-		return;
-	}
-
-	calls = ril_voicecall_parse_clcc(data, len);
-
-	n = calls;
-	o = vd->calls;
-
-	while (n || o) {
-		struct ofono_call *nc = n ? n->data : NULL;
-		struct ofono_call *oc = o ? o->data : NULL;
-
-		if (oc && (nc == NULL || (nc->id > oc->id))) {
-			if (vd->local_release & (1 << oc->id)) {
-				ofono_voicecall_disconnected(vd->vc, oc->id,
-					OFONO_DISCONNECT_REASON_LOCAL_HANGUP,
-					NULL);
-			} else {
-				/* Get disconnect cause before informing
-				 * oFono core */
-				struct lastcause_req *reqdata =
-					g_new0(struct lastcause_req, 1);
-
-				reqdata->vc = vd->vc;
-				reqdata->id = oc->id;
-				grilio_queue_send_request_full(vd->q, NULL,
-					RIL_REQUEST_LAST_CALL_FAIL_CAUSE,
-					ril_voicecall_lastcause_cb,
-					g_free, reqdata);
-			}
-
-			ril_voicecall_clear_dtmf_queue(vd);
-			o = o->next;
-
-		} else if (nc && (oc == NULL || (nc->id < oc->id))) {
-			/* new call, signal it */
-			if (nc->type) {
-				ofono_voicecall_notify(vd->vc, nc);
-				if (vd->cb) {
-					ofono_voicecall_cb_t cb = vd->cb;
-					void *cbdata = vd->data;
-					vd->cb = NULL;
-					vd->data = NULL;
-					cb(ril_error_ok(&error), cbdata);
-				}
-			}
-
-			n = n->next;
-
-		} else {
-			/*
-			 * Always use the clip_validity from old call
-			 * the only place this is truly told to us is
-			 * in the CLIP notify, the rest are fudged
-			 * anyway.  Useful when RING, CLIP is used,
-			 * and we're forced to use CLCC and clip_validity
-			 * is 1
-			 */
-			if (oc->clip_validity == 1) {
-				nc->clip_validity = oc->clip_validity;
-			}
-
-			nc->cnap_validity = oc->cnap_validity;
-
-			/*
-			 * CDIP doesn't arrive as part of CLCC, always
-			 * re-use from the old call
-			 */
-			memcpy(&nc->called_number, &oc->called_number,
-					sizeof(oc->called_number));
-
-			/*
-			 * If the CLIP is not provided and the CLIP never
-			 * arrives, or RING is used, then signal the call
-			 * here
-			 */
-			if (nc->status == CALL_STATUS_INCOMING &&
-					(vd->flags & FLAG_NEED_CLIP)) {
-				if (nc->type) {
-					ofono_voicecall_notify(vd->vc, nc);
-				}
-
-				vd->flags &= ~FLAG_NEED_CLIP;
-			} else if (memcmp(nc, oc, sizeof(*nc)) && nc->type) {
-				ofono_voicecall_notify(vd->vc, nc);
-			}
-
-			n = n->next;
-			o = o->next;
-		}
-	}
-
-	g_slist_free_full(vd->calls, g_free);
-
-	vd->calls = calls;
-	vd->local_release = 0;
-}
-
-static void ril_voicecall_clcc_poll(struct ril_voicecall *vd)
-{
-	GASSERT(vd);
-	if (!vd->clcc_poll_id) {
-		GRilIoRequest* req = grilio_request_new();
-		grilio_request_set_retry(req, RIL_RETRY_MS, -1);
-		vd->clcc_poll_id = grilio_queue_send_request_full(vd->q,
-					req, RIL_REQUEST_GET_CURRENT_CALLS,
-					ril_voicecall_clcc_poll_cb, NULL, vd);
-		grilio_request_unref(req);
-	}
-}
-
-static void ril_voicecall_request_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_voicecall_change_state_req *req = user_data;
-	struct ril_voicecall *vd = ril_voicecall_get_data(req->vc);
-	struct ofono_error error;
-
-	if (status == RIL_E_SUCCESS) {
-		GSList *l;
-
-		if (req->affected_types) {
-			for (l = vd->calls; l; l = l->next) {
-				struct ofono_call *call = l->data;
-
-				if (req->affected_types & (1 << call->status)) {
-					vd->local_release |= (1 << call->id);
-				}
-			}
-		}
-
-		ril_error_init_ok(&error);
-	} else {
-		ofono_error("generic fail");
-		ril_error_init_failure(&error);
-	}
-
-	ril_voicecall_clcc_poll(vd);
-
-	/* We have to callback after we schedule a poll if required */
-	if (req->cb) {
-		req->cb(&error, req->data);
-	}
-}
-
-static void ril_voicecall_request(const guint rreq, struct ofono_voicecall *vc,
-		unsigned int affected_types, GRilIoRequest *ioreq,
-		ofono_voicecall_cb_t cb, void *data)
-{
-	struct ril_voicecall *vd = ril_voicecall_get_data(vc);
-	struct ril_voicecall_change_state_req *req;
-
-	req = g_new0(struct ril_voicecall_change_state_req, 1);
-	req->vc = vc;
-	req->cb = cb;
-	req->data = data;
-	req->affected_types = affected_types;
-
-	grilio_queue_send_request_full(vd->q, ioreq, rreq,
-				ril_voicecall_request_cb, g_free, req);
-}
-
-static void ril_voicecall_dial_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_voicecall *vd = user_data;
-
-	if (status == RIL_E_SUCCESS) {
-		if (vd->cb) {
-			/* CLCC will update the oFono call list with
-			 * proper ids if it's not done yet */
-			ril_voicecall_clcc_poll(vd);
-		}
-	} else {
-		ofono_error("call failed.");
-
-		/*
-		 * Even though this dial request may have already been
-		 * completed (successfully) by ril_voicecall_clcc_poll_cb,
-		 * RIL_REQUEST_DIAL may still fail.
-		 */
-		if (vd->cb) {
-			struct ofono_error error;
-			ofono_voicecall_cb_t cb = vd->cb;
-			void *cbdata = vd->data;
-			vd->cb = NULL;
-			vd->data = NULL;
-			cb(ril_error_failure(&error), cbdata);
-		}
-	}
-}
-
-static void ril_voicecall_dial(struct ofono_voicecall *vc,
-			const struct ofono_phone_number *ph,
-			enum ofono_clir_option clir, ofono_voicecall_cb_t cb,
-			void *data)
-{
-	struct ril_voicecall *vd = ril_voicecall_get_data(vc);
-	const char *phstr =  phone_number_to_string(ph);
-	GRilIoRequest *req = grilio_request_new();
-
-	ofono_info("dialing \"%s\"", phstr);
-
-	DBG("%s,%d,0", phstr, clir);
-	GASSERT(!vd->cb);
-	vd->cb = cb;
-	vd->data = data;
-
-	grilio_request_append_utf8(req, phstr); /* Number to dial */
-	grilio_request_append_int32(req, clir); /* CLIR mode */
-	grilio_request_append_int32(req, 0);    /* UUS information (absent) */
-
-	grilio_queue_send_request_full(vd->q, req, RIL_REQUEST_DIAL,
-					ril_voicecall_dial_cb, NULL, vd);
-	grilio_request_unref(req);
-}
-
-static void ril_voicecall_hangup_all(struct ofono_voicecall *vc,
-			ofono_voicecall_cb_t cb, void *data)
-{
-	struct ril_voicecall *vd = ril_voicecall_get_data(vc);
-	struct ofono_error error;
-	GSList *l;
-
-	for (l = vd->calls; l; l = l->next) {
-		struct ofono_call *call = l->data;
-		GRilIoRequest *req = grilio_request_sized_new(8);
-
-		/* TODO: Hangup just the active ones once we have call
-		 * state tracking (otherwise it can't handle ringing) */
-		DBG("Hanging up call with id %d", call->id);
-		grilio_request_append_int32(req, 1); /* Always 1 - AT+CHLD=1x */
-		grilio_request_append_int32(req, call->id);
-
-		/* Send request to RIL */
-		ril_voicecall_request(RIL_REQUEST_HANGUP, vc, 0x3f, req,
-								NULL, NULL);
-		grilio_request_unref(req);
-	}
-
-	/* TODO: Deal in case of an error at hungup */
-	cb(ril_error_ok(&error), data);
-}
-
-static void ril_voicecall_hangup_specific(struct ofono_voicecall *vc,
-		int id, ofono_voicecall_cb_t cb, void *data)
-{
-	GRilIoRequest *req = grilio_request_sized_new(8);
-	struct ofono_error error;
-
-	DBG("Hanging up call with id %d", id);
-	grilio_request_append_int32(req, 1); /* Always 1 - AT+CHLD=1x */
-	grilio_request_append_int32(req, id);
-
-	/* Send request to RIL */
-	ril_voicecall_request(RIL_REQUEST_HANGUP, vc, 0x3f, req, NULL, NULL);
-	grilio_request_unref(req);
-	cb(ril_error_ok(&error), data);
-}
-
-static void ril_voicecall_call_state_changed_event(GRilIoChannel *io,
-		guint ril_event, const void *data, guint len, void *user_data)
-{
-	struct ril_voicecall *vd = user_data;
-
-	GASSERT(ril_event == RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED);
-
-	/* Just need to request the call list again */
-	ril_voicecall_clcc_poll(vd);
-}
-
-static void ril_voicecall_supp_svc_notification_event(GRilIoChannel *io,
-		guint ril_event, const void *data, guint len, void *user_data)
-{
-	GRilIoParser rilp;
-	struct ril_voicecall *vd = user_data;
-	struct ofono_phone_number phone;
-	int type = 0, code = 0, index = 0;
-	char *tmp = NULL;
-
-	GASSERT(ril_event == RIL_UNSOL_SUPP_SVC_NOTIFICATION);
-
-	grilio_parser_init(&rilp, data, len);
-	grilio_parser_get_int32(&rilp, &type);
-	grilio_parser_get_int32(&rilp, &code);
-	grilio_parser_get_int32(&rilp, &index);
-	grilio_parser_get_int32(&rilp, NULL);
-	tmp = grilio_parser_get_utf8(&rilp);
-
-	if (tmp) {
-		strncpy(phone.number, tmp, OFONO_MAX_PHONE_NUMBER_LENGTH);
-		phone.number[OFONO_MAX_PHONE_NUMBER_LENGTH] = 0;
-		g_free(tmp);
-	} else {
-		phone.number[0] = 0;
-	}
-
-	DBG("RIL data: MT/MO: %i, code: %i, index: %i",  type, code, index);
-
-	/* 0 stands for MO intermediate (support TBD), 1 for MT unsolicited */
-	if (type == 1) {
-		ofono_voicecall_ssn_mt_notify(vd->vc, 0, code, index, &phone);
-	} else {
-		ofono_error("Unknown SS notification");
-	}
-}
-
-static void ril_voicecall_answer(struct ofono_voicecall *vc,
-			ofono_voicecall_cb_t cb, void *data)
-{
-	/* Send request to RIL */
-	DBG("Answering current call");
-	ril_voicecall_request(RIL_REQUEST_ANSWER, vc, 0, NULL, cb, data);
-}
-
-static void ril_voicecall_send_dtmf_cb(GRilIoChannel *io, int status,
-				const void *data, guint len, void *user_data)
-{
-	struct ril_voicecall *vd = user_data;
-
-	GASSERT(vd->send_dtmf_id);
-	vd->send_dtmf_id = 0;
-
-	if (status == RIL_E_SUCCESS) {
-		/* Send the next one */
-		ril_voicecall_send_one_dtmf(vd);
-	} else {
-		DBG("error=%d", status);
-		ril_voicecall_clear_dtmf_queue(vd);
-	}
-}
-
-static void ril_voicecall_send_one_dtmf(struct ril_voicecall *vd)
-{
-	if (!vd->send_dtmf_id && gutil_ring_size(vd->dtmf_queue) > 0) {
-		GRilIoRequest *req = grilio_request_sized_new(4);
-		const char dtmf_char = (char)
-			GPOINTER_TO_UINT(gutil_ring_get(vd->dtmf_queue));
-
-		/* RIL wants just one character */
-		GASSERT(dtmf_char);
-		DBG("%c", dtmf_char);
-		grilio_request_append_utf8_chars(req, &dtmf_char, 1);
-		vd->send_dtmf_id = grilio_queue_send_request_full(vd->q, req,
-			RIL_REQUEST_DTMF, ril_voicecall_send_dtmf_cb, NULL, vd);
-		grilio_request_unref(req);
-	}
-}
-
-static void ril_voicecall_send_dtmf(struct ofono_voicecall *vc,
-		const char *dtmf, ofono_voicecall_cb_t cb, void *data)
-{
-	struct ril_voicecall *vd = ril_voicecall_get_data(vc);
-	struct ofono_error error;
-
-	/*
-	 * Queue any incoming DTMF, send them to RIL one-by-one,
-	 * immediately call back core with no error
-	 */
-	DBG("Queue '%s'", dtmf);
-	while (*dtmf) {
-		gutil_ring_put(vd->dtmf_queue, GUINT_TO_POINTER(*dtmf));
-		dtmf++;
-	}
-
-	ril_voicecall_send_one_dtmf(vd);
-	cb(ril_error_ok(&error), data);
-}
-
-static void ril_voicecall_clear_dtmf_queue(struct ril_voicecall *vd)
-{
-	gutil_ring_clear(vd->dtmf_queue);
-	if (vd->send_dtmf_id) {
-		grilio_channel_cancel_request(vd->io, vd->send_dtmf_id, FALSE);
-		vd->send_dtmf_id = 0;
-	}
-}
-
-static void ril_voicecall_clcc_poll_on_success(GRilIoChannel *io,
-		int status, const void *data, guint len, void *user_data)
-{
-	if (status == RIL_E_SUCCESS) {
-		ril_voicecall_clcc_poll((struct ril_voicecall *)user_data);
-	}
-}
-
-static void ril_voicecall_create_multiparty(struct ofono_voicecall *vc,
-			ofono_voicecall_cb_t cb, void *data)
-{
-	struct ril_voicecall *vd = ril_voicecall_get_data(vc);
-	grilio_queue_send_request_full(vd->q, NULL, RIL_REQUEST_CONFERENCE,
-			ril_voicecall_clcc_poll_on_success, NULL, vd);
-}
-
-static void ril_voicecall_transfer(struct ofono_voicecall *vc,
-			ofono_voicecall_cb_t cb, void *data)
-{
-	ril_voicecall_request(RIL_REQUEST_EXPLICIT_CALL_TRANSFER,
-			vc, 0, NULL, cb, data);
-}
-
-static void ril_voicecall_private_chat(struct ofono_voicecall *vc, int id,
-			ofono_voicecall_cb_t cb, void *data)
-{
-	struct ril_voicecall *vd = ril_voicecall_get_data(vc);
-	GRilIoRequest *req = grilio_request_sized_new(8);
-	grilio_request_append_int32(req, 1);
-	grilio_request_append_int32(req, id);
-	grilio_queue_send_request_full(vd->q, req,
-				RIL_REQUEST_SEPARATE_CONNECTION,
-				ril_voicecall_clcc_poll_on_success, NULL, vd);
-	grilio_request_unref(req);
-}
-
-static void ril_voicecall_swap_without_accept(struct ofono_voicecall *vc,
-			ofono_voicecall_cb_t cb, void *data)
-{
-	ril_voicecall_request(RIL_REQUEST_SWITCH_HOLDING_AND_ACTIVE,
-			vc, 0, NULL, cb, data);
-}
-
-static void ril_voicecall_hold_all_active(struct ofono_voicecall *vc,
-			ofono_voicecall_cb_t cb, void *data)
-{
-	ril_voicecall_request(RIL_REQUEST_SWITCH_HOLDING_AND_ACTIVE,
-			vc, 0, NULL, cb, data);
-}
-
-static void ril_voicecall_release_all_held(struct ofono_voicecall *vc,
-					ofono_voicecall_cb_t cb, void *data)
-{
-	ril_voicecall_request(RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND,
-			vc, 0, NULL, cb, data);
-}
-
-static void ril_voicecall_release_all_active(struct ofono_voicecall *vc,
-					ofono_voicecall_cb_t cb, void *data)
-{
-	ril_voicecall_request(RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND,
-			vc, 0, NULL, cb, data);
-}
-
-static void ril_voicecall_set_udub(struct ofono_voicecall *vc,
-					ofono_voicecall_cb_t cb, void *data)
-{
-	ril_voicecall_request(RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND,
-			vc, 0, NULL, cb, data);
-}
-
-static gboolean ril_voicecall_enable_supp_svc(struct ril_voicecall *vd)
-{
-	GRilIoRequest *req = grilio_request_sized_new(8);
-
-	grilio_request_append_int32(req, 1); /* size of array */
-	grilio_request_append_int32(req, 1); /* notifications enabled */
-
-	grilio_queue_send_request(vd->q, req,
-				RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION);
-	grilio_request_unref(req);
-
-	/* Makes this a single shot */
-	return FALSE;
-}
-
-static void ril_voicecall_ringback_tone_event(GRilIoChannel *io,
-		guint code, const void *data, guint len, void *user_data)
-{
-	struct ril_voicecall *vd = user_data;
-	GRilIoParser rilp;
-	guint32 playTone = FALSE;
-	int tmp;
-
-	GASSERT(code == RIL_UNSOL_RINGBACK_TONE);
-	grilio_parser_init(&rilp, data, len);
-	if (grilio_parser_get_int32(&rilp, &tmp) && tmp > 0) {
-		grilio_parser_get_uint32(&rilp, &playTone);
-	}
-
-	DBG("play ringback tone: %d", playTone);
-	ofono_voicecall_ringback_tone_notify(vd->vc, playTone);
-}
-
-static void ril_voicecall_ecclist_changed(struct ril_ecclist *list, void *data)
-{
-	struct ril_voicecall *vd = data;
-
-	ofono_voicecall_en_list_notify(vd->vc, vd->ecclist->list);
-}
-
-static gboolean ril_delayed_register(gpointer user_data)
-{
-	struct ril_voicecall *vd = user_data;
-
-	GASSERT(vd->timer_id);
-	vd->timer_id = 0;
-	ofono_voicecall_register(vd->vc);
-
-	/* Emergency Call Codes */
-	if (vd->ecclist) {
-		ofono_voicecall_en_list_notify(vd->vc, vd->ecclist->list);
-		vd->ecclist_change_id =
-			ril_ecclist_add_list_changed_handler(vd->ecclist,
-					ril_voicecall_ecclist_changed, vd);
-	}
-
-	/* Initialize call list */
-	ril_voicecall_clcc_poll(vd);
-
-	/* request supplementary service notifications*/
-	ril_voicecall_enable_supp_svc(vd);
-
-	/* Unsol when call state changes */
-	vd->event_id[VOICECALL_EVENT_CALL_STATE_CHANGED] =
-		grilio_channel_add_unsol_event_handler(vd->io,
-				ril_voicecall_call_state_changed_event,
-				RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED, vd);
-
-	/* Unsol when call set in hold */
-	vd->event_id[VOICECALL_EVENT_SUPP_SVC_NOTIFICATION] =
-		grilio_channel_add_unsol_event_handler(vd->io,
-				ril_voicecall_supp_svc_notification_event,
-				RIL_UNSOL_SUPP_SVC_NOTIFICATION, vd);
-
-	/* Register for ringback tone notifications */
-	vd->event_id[VOICECALL_EVENT_RINGBACK_TONE] =
-		grilio_channel_add_unsol_event_handler(vd->io,
-				ril_voicecall_ringback_tone_event,
-				RIL_UNSOL_RINGBACK_TONE, vd);
-
-	/* This makes the timeout a single-shot */
-	return FALSE;
-}
-
-static int ril_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
-				void *data)
-{
-	struct ril_modem *modem = data;
-	struct ril_voicecall *vd;
-
-	DBG("");
-	vd = g_new0(struct ril_voicecall, 1);
-	vd->io = grilio_channel_ref(ril_modem_io(modem));
-	vd->q = grilio_queue_new(vd->io);
-	vd->dtmf_queue = gutil_ring_new();
-	vd->vc = vc;
-	vd->timer_id = g_idle_add(ril_delayed_register, vd);
-	if (modem->ecclist_file) {
-		vd->ecclist = ril_ecclist_new(modem->ecclist_file);
-	}
-	ril_voicecall_clear_dtmf_queue(vd);
-	ofono_voicecall_set_data(vc, vd);
-	return 0;
-}
-
-static void ril_voicecall_remove(struct ofono_voicecall *vc)
-{
-	struct ril_voicecall *vd = ril_voicecall_get_data(vc);
-
-	DBG("");
-	ofono_voicecall_set_data(vc, NULL);
-	g_slist_free_full(vd->calls, g_free);
-
-	if (vd->timer_id > 0) {
-		g_source_remove(vd->timer_id);
-	}
-
-	ril_ecclist_remove_handler(vd->ecclist, vd->ecclist_change_id);
-	ril_ecclist_unref(vd->ecclist);
-
-	grilio_channel_remove_handlers(vd->io, vd->event_id,
-						G_N_ELEMENTS(vd->event_id));
-	grilio_channel_unref(vd->io);
-	grilio_queue_cancel_all(vd->q, FALSE);
-	grilio_queue_unref(vd->q);
-	gutil_ring_unref(vd->dtmf_queue);
-	g_free(vd);
-}
-
-const struct ofono_voicecall_driver ril_voicecall_driver = {
-	.name                   = RILMODEM_DRIVER,
-	.probe                  = ril_voicecall_probe,
-	.remove                 = ril_voicecall_remove,
-	.dial                   = ril_voicecall_dial,
-	.answer                 = ril_voicecall_answer,
-	.hangup_all             = ril_voicecall_hangup_all,
-	.release_specific       = ril_voicecall_hangup_specific,
-	.send_tones             = ril_voicecall_send_dtmf,
-	.create_multiparty      = ril_voicecall_create_multiparty,
-	.transfer               = ril_voicecall_transfer,
-	.private_chat           = ril_voicecall_private_chat,
-	.swap_without_accept    = ril_voicecall_swap_without_accept,
-	.hold_all_active        = ril_voicecall_hold_all_active,
-	.release_all_held       = ril_voicecall_release_all_held,
-	.set_udub               = ril_voicecall_set_udub,
-	.release_all_active     = ril_voicecall_release_all_active
-};
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */
--- a/ofono/drivers/rilmodem/call-barring.c
+++ b/ofono/drivers/rilmodem/call-barring.c
@@ -273,7 +273,7 @@ static int ril_call_barring_probe(struct ofono_call_barring *cb,

 	bd->ril = g_ril_clone(ril);
 	ofono_call_barring_set_data(cb, bd);
-	bd->timer_id = g_timeout_add_seconds(2, ril_delayed_register, cb);
+	g_timeout_add_seconds(2, ril_delayed_register, cb);

 	return 0;
 }
--- a/ofono/drivers/rilmodem/call-forwarding.c
+++ b/ofono/drivers/rilmodem/call-forwarding.c
@@ -3,7 +3,7 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2013-2014 Jolla Ltd
+ *  Copyright (C) 2013 Jolla Ltd
 *  Contact: Jussi Kangas <jussi.kangas@tieto.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -94,10 +94,11 @@ static void ril_registration(struct ofono_call_forwarding *cf, int type,
 	 * or settings made with bearer class
 	 * BEARER_CLASS_DEFAULT. Design decision: If given
 	 * class is BEARER_CLASS_DEFAULT let's map it to
-	 * BEARER_CLASS_VOICE as per RIL design.
+	 * SERVICE_CLASS_NONE as with it e.g. ./send-ussd '*21*<phone_number>#'
+	 * returns cls:53 i.e. 1+4+16+32 as service class.
 	*/
 	if (cls == BEARER_CLASS_DEFAULT)
-		cls = BEARER_CLASS_VOICE;
+		cls = SERVICE_CLASS_NONE;

 	parcel_w_int32(&rilp, cls);

@@ -139,10 +140,11 @@ static void ril_send_forward_cmd(struct ofono_call_forwarding *cf,
 	 * or settings made with bearer class
 	 * BEARER_CLASS_DEFAULT. Design decision: If given
 	 * class is BEARER_CLASS_DEFAULT let's map it to
-	 * BEARER_CLASS_VOICE as per RIL design.
+	 * SERVICE_CLASS_NONE as with it e.g. ./send-ussd '*21*<phone_number>#'
+	 * returns cls:53 i.e. 1+4+16+32 as service class.
 	*/
 	if (cls == BEARER_CLASS_DEFAULT)
-		cls = BEARER_CLASS_VOICE;
+		cls = SERVICE_CLASS_NONE;

 	parcel_w_int32(&rilp, cls);			/* Service class */

@@ -214,7 +216,7 @@ static void ril_query_cb(struct ril_msg *message, gpointer user_data)
 				nmbr_of_resps);

 		for (i = 0; i < nmbr_of_resps; i++) {
-			char *str = NULL;
+			const char *str;

 			list[i].status =  parcel_r_int32(&rilp);

@@ -225,16 +227,19 @@ static void ril_query_cb(struct ril_msg *message, gpointer user_data)
 			list[i].phone_number.type = parcel_r_int32(&rilp);

 			str = parcel_r_string(&rilp);
+
 			if (str) {
+
 				strncpy(list[i].phone_number.number,
 					str,
 					OFONO_MAX_PHONE_NUMBER_LENGTH);

 				list[i].phone_number.number[
 					OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
-				g_free(str);
+
+				list[i].time = parcel_r_int32(&rilp);
 			}
-			list[i].time = parcel_r_int32(&rilp);
+
 		}

 		CALLBACK_WITH_SUCCESS(cb, nmbr_of_resps, list, cbd->data);
@@ -268,7 +273,8 @@ static void ril_query(struct ofono_call_forwarding *cf, int type, int cls,
 	 * or settings made with bearer class
 	 * BEARER_CLASS_DEFAULT. Design decision: If given
 	 * class is BEARER_CLASS_DEFAULT let's map it to
-	 * SERVICE_CLASS_NONE as per RIL design.
+	 * SERVICE_CLASS_NONE as with it e.g. ./send-ussd '*21*<phone_number>#'
+	 * returns cls:53 i.e. 1+4+16+32 as service class.
 	*/
 	if (cls == BEARER_CLASS_DEFAULT)
 		cls = SERVICE_CLASS_NONE;
--- a/ofono/drivers/rilmodem/devinfo.c
+++ b/ofono/drivers/rilmodem/devinfo.c
@@ -42,8 +42,9 @@
 #include "rilmodem.h"

 /*
- * TODO: No public RIL api to query manufacturer or model.
- * Check where to get, could /system/build.prop be updated to have good values?
+ * TODO: The functions in this file are stubbed out, and
+ * will need to be re-worked to talk to the /gril layer
+ * in order to get real values from RILD.
 */
 guint timer_id;

@@ -51,14 +52,30 @@ static void ril_query_manufacturer(struct ofono_devinfo *info,
 					ofono_devinfo_query_cb_t cb,
 					void *data)
 {
-	CALLBACK_WITH_FAILURE(cb, "", data);
+	const char *attr = "Fake Manufacturer";
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct ofono_error error;
+	decode_ril_error(&error, "OK");
+
+	cb(&error, attr, cbd->data);
+
+	/* Note: this will need to change if cbd passed to gril layer */
+	g_free(cbd);
 }

 static void ril_query_model(struct ofono_devinfo *info,
 				ofono_devinfo_query_cb_t cb,
 				void *data)
 {
-	CALLBACK_WITH_FAILURE(cb, "", data);
+	const char *attr = "Fake Modem Model";
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct ofono_error error;
+	decode_ril_error(&error, "OK");
+
+	cb(&error, attr, cbd->data);
+
+	/* Note: this will need to change if cbd passed to gril layer */
+	g_free(cbd);
 }

 static void query_revision_cb(struct ril_msg *message, gpointer user_data)
@@ -81,7 +98,6 @@ static void query_revision_cb(struct ril_msg *message, gpointer user_data)
 	revision = parcel_r_string(&rilp);

 	cb(&error, revision, cbd->data);
-	g_free(revision);
 }

 static void ril_query_revision(struct ofono_devinfo *info,
@@ -121,10 +137,10 @@ static void query_serial_cb(struct ril_msg *message, gpointer user_data)
 	}

 	ril_util_init_parcel(message, &rilp);
+
 	imei = parcel_r_string(&rilp);

 	cb(&error, imei, cbd->data);
-	g_free(imei);
 }

 static void ril_query_serial(struct ofono_devinfo *info,
--- a/ofono/drivers/rilmodem/gprs-context.c
+++ b/ofono/drivers/rilmodem/gprs-context.c
@@ -43,16 +43,8 @@
 #include "grilrequest.h"
 #include "grilunsol.h"

-#include "common.h"
-
 #include "rilmodem.h"

-enum data_call_state {
-	DATA_CALL_INACTIVE,
-	DATA_CALL_LINK_DOWN,
-	DATA_CALL_ACTIVE,
-};
-
 enum state {
 	STATE_IDLE,
 	STATE_ENABLING,
@@ -66,111 +58,24 @@ struct gprs_context_data {
 	gint active_rild_cid;
 	enum state state;
 	guint regid;
-	struct unsol_data_call_list *old_list;
-	guint prev_active_status;
 };

+static void ril_gprs_context_deactivate_primary(struct ofono_gprs_context *gc,
+						unsigned int id,
+						ofono_gprs_context_cb_t cb, void *data);
+
 static void set_context_disconnected(struct gprs_context_data *gcd)
 {
+	DBG("");
+
 	gcd->active_ctx_cid = -1;
 	gcd->active_rild_cid = -1;
 	gcd->state = STATE_IDLE;
 }

-static void ril_gprs_split_ip_by_protocol(char **ip_array,
-						char ***split_ip_addr,
-						char ***split_ipv6_addr,
-						char **ip_addr)
+static void disconnect_context(struct ofono_gprs_context *gc)
 {
-	const char ipv6_delimiter = ':';
-	const char ip_delimiter = '.';
-	int i;
-
-	*split_ipv6_addr = *split_ip_addr = NULL;
-	for (i=0; i< g_strv_length(ip_array); i++) {
-		if (strchr(ip_array[i], ipv6_delimiter)) {
-			if (*split_ipv6_addr == NULL) {
-				*split_ipv6_addr = g_strsplit(
-							ip_array[i], "/",2);
-			}
-		} else if (strchr(ip_array[i], ip_delimiter)) {
-			if (*split_ip_addr == NULL) {
-				*ip_addr = g_strdup(ip_array[i]);
-				*split_ip_addr = g_strsplit(
-							ip_array[i], "/", 2);
-			}
-		}
-	}
-}
-
-static void ril_gprs_split_gw_by_protocol(char **gw_array, char **ip_gw,
-								char **ipv6_gw)
-{
-	const char ipv6_delimiter = ':';
-	const char ip_delimiter = '.';
-	int i;
-
-	*ip_gw = *ipv6_gw = NULL;
-	for (i=0; i< g_strv_length(gw_array); i++) {
-		if (strchr(gw_array[i],ipv6_delimiter)) {
-			if (*ipv6_gw == NULL) {
-				*ipv6_gw = g_strdup(gw_array[i]);
-			}
-		} else if (strchr(gw_array[i],ip_delimiter)) {
-			if (*ip_gw == NULL)
-				*ip_gw = g_strdup(gw_array[i]);
-		}
-	}
-}
-
-static void ril_gprs_split_dns_by_protocol(char **dns_array, char ***dns_addr,
-							char ***dns_ipv6_addr)
-{
-	const char ipv6_delimiter = ':';
-	const char ip_delimiter = '.';
-	char *temp = NULL;
-	char *temp1 = NULL;
-	char *dnsip = NULL;
-	char *dnsipv6 = NULL;
-	int i, dnsip_len, dnsipv6_len;
-
-	dnsip_len = dnsipv6_len = 0;
-
-	for (i=0; i< g_strv_length(dns_array); i++) {
-		if (strchr(dns_array[i],ipv6_delimiter)) {
-			if (dnsipv6 == NULL) {
-				dnsipv6 = g_strdup(dns_array[i]);
-			} else {
-				temp = g_strconcat(dnsipv6, ",", NULL);
-				g_free(dnsipv6);
-				temp1 = g_strconcat(temp, dns_array[i], NULL);
-				g_free(temp);
-				dnsipv6 = temp1;
-			}
-			dnsipv6_len++;
-		} else if (strchr(dns_array[i],ip_delimiter)) {
-			if (dnsip == NULL) {
-				dnsip = g_strdup(dns_array[i]);
-			} else {
-				temp = g_strconcat(dnsip, ",", NULL);
-				g_free(dnsip);
-				temp1 = g_strconcat(temp, dns_array[i], NULL);
-				g_free(temp);
-				dnsip = temp1;
-
-			}
-			dnsip_len++;
-		}
-	}
-
-	if (dnsip)
-		*dns_addr = g_strsplit(dnsip, ",", dnsip_len);
-
-	if (dnsipv6)
-		*dns_ipv6_addr = g_strsplit(dnsipv6, ",", dnsipv6_len);
-
-	g_free(dnsip);
-	g_free(dnsipv6);
+	ril_gprs_context_deactivate_primary(gc, 0, NULL, NULL);
 }

 static void ril_gprs_context_call_list_changed(struct ril_msg *message,
@@ -180,8 +85,8 @@ static void ril_gprs_context_call_list_changed(struct ril_msg *message,
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
 	struct data_call *call = NULL;
 	struct unsol_data_call_list *unsol;
+	gboolean active_cid_found = FALSE;
 	gboolean disconnect = FALSE;
-	gboolean signal = FALSE;
 	GSList *iterator = NULL;
 	struct ofono_error error;

@@ -190,164 +95,28 @@ static void ril_gprs_context_call_list_changed(struct ril_msg *message,
 	if (error.type != OFONO_ERROR_TYPE_NO_ERROR)
 		goto error;

-	if (g_ril_unsol_cmp_dcl(unsol,gcd->old_list,gcd->active_rild_cid))
-		goto error;
-
-	g_ril_unsol_free_data_call_list(gcd->old_list);
-	gcd->old_list = unsol;
-
 	DBG("number of call in call_list_changed is: %d", unsol->num);

 	for (iterator = unsol->call_list; iterator; iterator = iterator->next) {
 		call = (struct data_call *) iterator->data;

-		/*
-		 * Every context receives notifications about all data calls
-		 * but should only handle its own.
-		 */
-		if (call->cid != gcd->active_rild_cid)
-			continue;
+		if (call->cid == gcd->active_rild_cid) {
+			active_cid_found = TRUE;

-		if (call->active == DATA_CALL_LINK_DOWN)
-			gcd->prev_active_status = call->active;
-
-		if (call->status != 0)
-			ofono_info("data call status:%d", call->status);
-
-		if (call->active == DATA_CALL_INACTIVE) {
-			disconnect = TRUE;
-			gcd->prev_active_status = call->active;
-			ofono_gprs_context_deactivated(gc, gcd->active_ctx_cid);
-			break;
-		}
-
-		if (call->active == DATA_CALL_ACTIVE) {
-			int protocol = -1;
-
-			if (gcd->prev_active_status != DATA_CALL_LINK_DOWN)
-				signal = TRUE;
-
-			gcd->prev_active_status = call->active;
-
-			if (call->type)
-				protocol = ril_protocol_string_to_ofono_protocol(call->type);
-
-			if (call->ifname)
-				ofono_gprs_context_set_interface(gc,
-								call->ifname);
-
-			if (call->addresses) {
-				char **split_ip_addr = NULL;
-				char **ip_array = NULL;
-				char **split_ipv6_addr = NULL;
-				char *ip_addr = NULL;
-
-				/*addresses to an array*/
-				ip_array = g_strsplit(call->addresses, " ",-1);
-
-				/*pick 1 address of each protocol*/
-				ril_gprs_split_ip_by_protocol(ip_array,
-								&split_ip_addr,
-								&split_ipv6_addr,
-								&ip_addr);
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IPV6)
-						&& split_ipv6_addr != NULL){
-
-					ofono_gprs_context_set_ipv6_address(gc,
-							split_ipv6_addr[0]);
-				}
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IP)
-						&& split_ip_addr != NULL) {
-
-					ofono_gprs_context_set_ipv4_netmask(gc,
-						ril_util_get_netmask(ip_addr));
-					ofono_gprs_context_set_ipv4_address(gc,
-							split_ip_addr[0], TRUE);
-				}
-
-				g_strfreev(split_ip_addr);
-				g_strfreev(split_ipv6_addr);
-				g_strfreev(ip_array);
-				g_free(ip_addr);
+			if (call->active == 0) {
+				disconnect = TRUE;
+				ofono_gprs_context_deactivated(gc, gcd->active_ctx_cid);
 			}

-			if (call->gateways) {
-				char **gw_array = NULL;
-				char *ip_gw = NULL;
-				char *ipv6_gw = NULL;
-				/*addresses to an array*/
-				gw_array = g_strsplit(call->gateways, " ", -1);
-
-				/*pick 1 gw for each protocol*/
-				ril_gprs_split_gw_by_protocol(gw_array, &ip_gw,
-								&ipv6_gw);
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IPV6)
-						&& ipv6_gw != NULL)
-					ofono_gprs_context_set_ipv6_gateway(gc,
-								ipv6_gw);
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IP)
-						&& ip_gw != NULL)
-					ofono_gprs_context_set_ipv4_gateway(gc,
-								ip_gw);
-
-				g_strfreev(gw_array);
-				g_free(ip_gw);
-				g_free(ipv6_gw);
-			}
-
-			if (call->dnses) {
-				char **dns_array = NULL;
-				char **dns_ip = NULL;
-				char **dns_ipv6 = NULL;
-
-				/*addresses to an array*/
-				dns_array = g_strsplit(call->dnses, " ", -1);
-
-				/*split based on protocol*/
-				ril_gprs_split_dns_by_protocol(dns_array,
-								&dns_ip,
-								&dns_ipv6);
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IPV6)
-						&& dns_ipv6 != NULL)
-					ofono_gprs_context_set_ipv6_dns_servers(
-						gc, (const char **) dns_ipv6);
-
-				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
-						protocol == OFONO_GPRS_PROTO_IP)
-						&& dns_ip != NULL)
-					ofono_gprs_context_set_ipv4_dns_servers(
-						gc, (const char**)dns_ip);
-
-				g_strfreev(dns_ip);
-				g_strfreev(dns_ipv6);
-				g_strfreev(dns_array);
-			}
 			break;
 		}
 	}

-	if (disconnect) {
+	if (disconnect || active_cid_found == FALSE) {
 		ofono_error("Clearing active context");
 		set_context_disconnected(gcd);
-		gcd->old_list = NULL;
-		goto error;
 	}

-	if (signal)
-		ofono_gprs_context_signal_change(gc, gcd->active_ctx_cid);
-
-	return;
-
 error:
 	g_ril_unsol_free_data_call_list(unsol);
 }
@@ -361,12 +130,6 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 	struct ofono_error error;
 	struct reply_setup_data_call *reply = NULL;
 	char **split_ip_addr = NULL;
-	char **split_ipv6_addr = NULL;
-	char* ip_addr = NULL;
-	char* ip_gw = NULL;
-	char* ipv6_gw = NULL;
-	char** dns_addr = NULL;
-	char** dns_ipv6_addr = NULL;

 	ofono_info("setting up data call");

@@ -386,7 +149,10 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 	gcd->active_rild_cid = reply->cid;

 	if (error.type != OFONO_ERROR_TYPE_NO_ERROR) {
-		ofono_error("no active context. disconnect");
+		if (gcd->active_rild_cid != -1) {
+			ofono_error("no active context. disconnect");
+			disconnect_context(gc);
+		}
 		goto error;
 	}

@@ -398,16 +164,24 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 		error.type = OFONO_ERROR_TYPE_FAILURE;
 		error.error = reply->status;

+		set_context_disconnected(gcd);
 		goto error;
 	}

-	/*check the ip address protocol*/
-	ril_gprs_split_ip_by_protocol(reply->ip_addrs, &split_ip_addr,
-						&split_ipv6_addr, &ip_addr);
+	/*
+	 * TODO: consier moving this into parse_data_reply
+	 *
+	 * Note - the address may optionally include a prefix size
+	 * ( Eg. "/30" ).  As this confuses NetworkManager, we
+	 * explicitly strip any prefix after calculating the netmask.
+	 */
+	split_ip_addr = g_strsplit(reply->ip_addrs[0], "/", 2);

-	if (split_ip_addr == NULL && split_ipv6_addr == NULL) {
-		ofono_error("%s: No IP address returned",
-				__func__);
+	/* TODO: see note above re: invalid messages... */
+	if (split_ip_addr[0] == NULL) {
+		ofono_error("%s: invalid IP address field returned: %s",
+				__func__,
+				reply->ip_addrs[0]);

 		error.type = OFONO_ERROR_TYPE_FAILURE;
 		error.error = EINVAL;
@@ -420,55 +194,33 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)

 	ofono_gprs_context_set_interface(gc, reply->ifname);

-	ril_gprs_split_gw_by_protocol(reply->gateways, &ip_gw, &ipv6_gw);
-
-	ril_gprs_split_dns_by_protocol(reply->dns_addresses, &dns_addr,
-								&dns_ipv6_addr);
-
 	/* TODO:
-	 * RILD can return multiple addresses; oFono only supports setting
-	 * a single IPv4 and single IPV6 address. At this time, we only use
-	 * the first address. It's possible that a RIL may just specify
-	 * the end-points of the point-to-point connection, in which case this
-	 * code will need to changed to handle such a device.
+	 * RILD can return multiple addresses; oFono only supports
+	 * setting a single IPv4 address.  At this time, we only
+	 * use the first address.  It's possible that a RIL may
+	 * just specify the end-points of the point-to-point
+	 * connection, in which case this code will need to
+	 * changed to handle such a device.
 	 */
+	ofono_gprs_context_set_ipv4_netmask(gc,
+			ril_util_get_netmask(reply->ip_addrs[0]));

-	if (split_ipv6_addr != NULL &&
-			(reply->protocol == OFONO_GPRS_PROTO_IPV6 ||
-			reply->protocol == OFONO_GPRS_PROTO_IPV4V6)) {
+	ofono_gprs_context_set_ipv4_address(gc, split_ip_addr[0], TRUE);
+	ofono_gprs_context_set_ipv4_gateway(gc, reply->gateways[0]);

-		ofono_gprs_context_set_ipv6_address(gc, split_ipv6_addr[0]);
-		ofono_gprs_context_set_ipv6_gateway(gc, ipv6_gw);
-		ofono_gprs_context_set_ipv6_dns_servers(gc,
-						(const char **) dns_ipv6_addr);
-	}
+	ofono_gprs_context_set_ipv4_dns_servers(gc,
+						(const char **) reply->dns_addresses);

-	if (split_ip_addr != NULL &&
-			(reply->protocol == OFONO_GPRS_PROTO_IP ||
-			reply->protocol == OFONO_GPRS_PROTO_IPV4V6)) {
-		ofono_gprs_context_set_ipv4_netmask(gc,
-					ril_util_get_netmask(ip_addr));
-		ofono_gprs_context_set_ipv4_address(gc, split_ip_addr[0], TRUE);
-		ofono_gprs_context_set_ipv4_gateway(gc, ip_gw);
-		ofono_gprs_context_set_ipv4_dns_servers(gc,
-						(const char **) dns_addr);
-	}
 error:
 	g_ril_reply_free_setup_data_call(reply);
 	g_strfreev(split_ip_addr);
-	g_strfreev(split_ipv6_addr);
-	g_strfreev(dns_addr);
-	g_strfreev(dns_ipv6_addr);
-	g_free(ip_addr);
-	g_free(ip_gw);
-	g_free(ipv6_gw);

 	cb(&error, cbd->data);
 }

 static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
-				const struct ofono_gprs_primary_context *ctx,
-				ofono_gprs_context_cb_t cb, void *data)
+						const struct ofono_gprs_primary_context *ctx,
+						ofono_gprs_context_cb_t cb, void *data)
 {
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
 	struct cb_data *cbd = cb_data_new(cb, data);
@@ -477,19 +229,9 @@ static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
 	struct ofono_error error;
 	int reqid = RIL_REQUEST_SETUP_DATA_CALL;
 	int ret = 0;
-	int netreg_status;
-	int roaming = NETWORK_REGISTRATION_STATUS_ROAMING;

 	ofono_info("Activating context: %d", ctx->cid);

-	/* Let's make sure that we aren't connecting when roaming not allowed */
-	netreg_status = get_current_network_status();
-	if (netreg_status == roaming) {
-		if (!ril_roaming_allowed() && (roaming
-				== check_if_really_roaming(netreg_status)))
-			goto exit;
-	}
-
 	cbd->user = gc;

 	/* TODO: implement radio technology selection. */
@@ -503,7 +245,6 @@ static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
 	request.username = g_strdup(ctx->username);
 	request.password = g_strdup(ctx->password);
 	request.auth_type = RIL_AUTH_BOTH;
-
 	request.protocol = ctx->proto;

 	if (g_ril_request_setup_data_call(gcd->ril,
@@ -532,7 +273,7 @@ error:
 	g_free(request.apn);
 	g_free(request.username);
 	g_free(request.password);
-exit:
+
 	if (ret <= 0) {
 		ofono_error("Send RIL_REQUEST_SETUP_DATA_CALL failed.");

@@ -543,8 +284,7 @@ exit:
 	}
 }

-static void ril_deactivate_data_call_cb(struct ril_msg *message,
-						gpointer user_data)
+static void ril_deactivate_data_call_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
 	ofono_gprs_context_cb_t cb = cbd->cb;
@@ -582,8 +322,7 @@ static void ril_deactivate_data_call_cb(struct ril_msg *message,

 static void ril_gprs_context_deactivate_primary(struct ofono_gprs_context *gc,
 						unsigned int id,
-						ofono_gprs_context_cb_t cb,
-						void *data)
+						ofono_gprs_context_cb_t cb, void *data)
 {
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
 	struct cb_data *cbd = NULL;
@@ -636,7 +375,6 @@ error:
 	if (ret <= 0) {
 		ofono_error("Send RIL_REQUEST_DEACTIVATE_DATA_CALL failed.");
 		g_free(cbd);
-
 		if (cb)
 			CALLBACK_WITH_FAILURE(cb, data);
 	}
@@ -664,6 +402,7 @@ static int ril_gprs_context_probe(struct ofono_gprs_context *gc,
 	set_context_disconnected(gcd);

 	ofono_gprs_context_set_data(gc, gcd);
+	gcd->regid = -1;

 	gcd->regid = g_ril_register(gcd->ril, RIL_UNSOL_DATA_CALL_LIST_CHANGED,
 					ril_gprs_context_call_list_changed, gc);
@@ -676,15 +415,14 @@ static void ril_gprs_context_remove(struct ofono_gprs_context *gc)

 	DBG("");

-	g_ril_unsol_free_data_call_list(gcd->old_list);
-
-	if (gcd->state != STATE_IDLE)
+	if (gcd->state != STATE_IDLE) {
 		ril_gprs_context_detach_shutdown(gc, 0);
+	}

 	ofono_gprs_context_set_data(gc, NULL);
-
+	
 	if (gcd->regid != -1)
-		g_ril_unregister(gcd->ril, gcd->regid);
+		g_ril_unregister(gcd->ril,gcd->regid);

 	g_ril_unref(gcd->ril);
 	g_free(gcd);
@@ -694,9 +432,9 @@ static struct ofono_gprs_context_driver driver = {
 	.name			= RILMODEM,
 	.probe			= ril_gprs_context_probe,
 	.remove			= ril_gprs_context_remove,
-	.activate_primary	= ril_gprs_context_activate_primary,
-	.deactivate_primary	= ril_gprs_context_deactivate_primary,
-	.detach_shutdown	= ril_gprs_context_detach_shutdown,
+	.activate_primary       = ril_gprs_context_activate_primary,
+	.deactivate_primary     = ril_gprs_context_deactivate_primary,
+	.detach_shutdown        = ril_gprs_context_detach_shutdown,
 };

 void ril_gprs_context_init(void)
--- a/ofono/drivers/rilmodem/gprs.c
+++ b/ofono/drivers/rilmodem/gprs.c
@@ -45,8 +45,6 @@
 #include "rilmodem.h"

 #include <ofono/netreg.h>
-#include <ofono/sim.h>
-#include "storage.h"

 /*
 * This module is the ofono_gprs_driver implementation for rilmodem.
@@ -69,18 +67,12 @@ struct gprs_data {
 	GRil *ril;
 	gboolean ofono_attached;
 	int max_cids;
-	int rild_status; /* Driver Status */
+	int rild_status;
+	gboolean notified;
 	guint registerid;
 	guint timer_id;
 };

-/* Following constants are purely to improve readability */
-static const int roaming = NETWORK_REGISTRATION_STATUS_ROAMING;
-static const int registered = NETWORK_REGISTRATION_STATUS_REGISTERED;
-
-/*if we have called ofono_gprs_register or not*/
-static gboolean ofono_registered;
-
 static void ril_gprs_registration_status(struct ofono_gprs *gprs,
 					ofono_gprs_status_cb_t cb,
 					void *data);
@@ -89,10 +81,7 @@ static void ril_gprs_state_change(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_gprs *gprs = user_data;

-	g_assert(message->req ==
-				RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED);
-
-	DBG("");
+	g_assert(message->req == RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED);

 	/* We need to notify core always to cover situations when
 	 * connection drops temporarily for example when user is
@@ -108,7 +97,6 @@ static gboolean ril_gprs_set_attached_callback(gpointer user_data)
 	ofono_gprs_cb_t cb = cbd->cb;
 	struct ofono_gprs *gprs = cbd->user;
 	struct gprs_data *gd = ofono_gprs_get_data(gprs);
-
 	DBG("");

 	gd->timer_id = 0;
@@ -145,6 +133,7 @@ static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,

 	cbd->user = gprs;

+	ril_gprs_registration_status(gprs, NULL, NULL);
 	/*
 	* However we cannot respond immediately, since core sets the
 	* value of driver_attached after calling set_attached and that
@@ -155,30 +144,6 @@ static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,
 						cbd);
 }

-gboolean ril_roaming_allowed()
-{
-	GError *error;
-	error = NULL;
-	GKeyFile *settings;
-	struct ofono_sim *sim;
-
-	sim = get_sim();
-	const char *imsi = ofono_sim_get_imsi(sim);
-	settings = storage_open(imsi, "gprs");
-	gboolean roaming_allowed = g_key_file_get_boolean(settings,
-							"Settings",
-							"RoamingAllowed",
-							&error);
-
-	if (error)
-		g_error_free(error);
-
-	storage_close(imsi, "gprs", settings, FALSE);
-
-	DBG("roaming_allowed: %d", roaming_allowed);
-	return roaming_allowed;
-}
-
 static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -186,9 +151,9 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 	struct ofono_gprs *gprs = cbd->user;
 	struct gprs_data *gd = ofono_gprs_get_data(gprs);
 	struct ofono_error error;
-	int lac, ci, tech;
+	int status, lac, ci, tech;
 	int max_cids = 1;
-	int status = -1;
+	int id = RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED;

 	if (gd && message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
@@ -197,22 +162,24 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 				ril_error_to_string(message->error));
 		decode_ril_error(&error, "FAIL");
 		error.error = message->error;
-		goto exit;
+		status = -1;
+		goto error;
 	}

 	if (ril_util_parse_reg(gd->ril, message, &status,
 				&lac, &ci, &tech, &max_cids) == FALSE) {
 		ofono_error("Failure parsing data registration response.");
 		decode_ril_error(&error, "FAIL");
-		goto exit;
+		status = -1;
+		goto error;
 	}

-	if (status > 10)
-		status = status - 10;
-
-	if (!ofono_registered) {
+	if (gd->rild_status == -1) {
 		ofono_gprs_register(gprs);
-		ofono_registered = TRUE;
+
+		DBG("Starting to listen network status");
+		gd->registerid = g_ril_register(gd->ril,
+			id, ril_gprs_state_change, gprs);
 	}

 	if (max_cids > gd->max_cids) {
@@ -221,129 +188,70 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 		ofono_gprs_set_cid_range(gprs, 1, max_cids);
 	}

-	if (status == roaming)
+	ofono_info("data registration status is %d", status);
+
+	if (status == NETWORK_REGISTRATION_STATUS_ROAMING)
 		status = check_if_really_roaming(status);

-	/* Let's minimize logging */
-	if (status != gd->rild_status)
-		ofono_info("data reg changes %d (%d), attached %d",
-				status, gd->rild_status, gd->ofono_attached);
-
-	/* Must be attached if registered or roaming */
-	if ((gd->rild_status != registered) && (gd->rild_status != roaming)) {
-		if (status == registered)
-			gd->ofono_attached = TRUE;
-		else if ((status == roaming) && (ril_roaming_allowed() == TRUE))
+	if (gd->ofono_attached && !gd->notified) {
+		if (status == NETWORK_REGISTRATION_STATUS_ROAMING ||
+			status == NETWORK_REGISTRATION_STATUS_REGISTERED) {
+			DBG("connection becomes available");
 			gd->ofono_attached = TRUE;
+			ofono_gprs_status_notify(gprs, status);
+			gd->notified = TRUE;
+			gd->rild_status = status;
+		}
+		goto error;
 	}

-	if (!ofono_modem_get_online(ofono_gprs_get_modem(gprs)))
-		gd->ofono_attached = FALSE;
-
-	/* if unsolicitated and no state change let's not notify core */
-	if ((status == gd->rild_status) && gd->ofono_attached)
-		goto cb_out;
-
-	if (!gd->ofono_attached) {
-		if (!cb) {
-			if (status == roaming) {
-				if (ril_roaming_allowed() == FALSE)
-					ofono_gprs_detached_notify(gprs);
-
-				/*
-				 * This prevents core ending
-				 * into eternal loop with driver
-				 */
-				decode_ril_error(&error, "FAIL");
-			}
-
-			ofono_gprs_status_notify(gprs, status);
-
-		} else {
+	if (gd->ofono_attached &&
+			status != NETWORK_REGISTRATION_STATUS_SEARCHING) {
+		DBG("ofono attached, start faking responses");
+		if (status != NETWORK_REGISTRATION_STATUS_ROAMING) {
 			/*
-			 * This prevents core ending
-			 * into eternal loop with driver
-			 */
-			decode_ril_error(&error, "FAIL");
+			* Only core can succesfully drop the connection
+			* If we drop the connection from here it leads
+			* to race situation where core asks context
+			* deactivation and at the same time we get
+			* Registered notification from modem.
+			*/
+			status = NETWORK_REGISTRATION_STATUS_REGISTERED;
 		}

-		gd->rild_status = status;
-		goto exit;
-	}
+		if (gd->registerid != -1)
+			g_ril_unregister(gd->ril, gd->registerid);
+		gd->registerid = -1;
+	} else {
+		/*
+		 * Client is not approving succesful result
+		 * This covers the situation when context is
+		 * active in roaming situation and client closes
+		 * it directly by calling RoamingAllowed in API
+		 */
+		DBG("data registration status is %d", status);

-	if (!cb)
-		ofono_gprs_status_notify(gprs, status);
+		if (status != NETWORK_REGISTRATION_STATUS_SEARCHING) {
+			DBG("ofono not attached, notify core");
+			status = NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
+			ofono_gprs_detached_notify(gprs);
+			gd->notified = FALSE;
+			gd->ofono_attached = FALSE;
+		} else if (gd->notified) {
+			DBG("hide the searching state");
+			status = NETWORK_REGISTRATION_STATUS_REGISTERED;
+			ofono_gprs_status_notify(gprs, status);
+			gd->ofono_attached = TRUE;
+		}
+	}

 	gd->rild_status = status;

-exit:
-	DBG("data reg status %d, rild_status %d, attached %d",
-		status, gd->rild_status, gd->ofono_attached);
-cb_out:
+error:
 	if (cb)
 		cb(&error, status, cbd->data);
 }

-static void ril_data_probe_reg_cb(struct ril_msg *message, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	struct ofono_gprs *gprs = cbd->user;
-	struct gprs_data *gd = ofono_gprs_get_data(gprs);
-	struct ofono_error error;
-	int status, lac, ci, tech;
-	int max_cids = 1;
-	int id = RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED;
-
-	DBG("");
-
-	if (!(gd && message->error == RIL_E_SUCCESS)) {
-		ofono_error("ril_data_reg_cb: reply failure: %s",
-				ril_error_to_string(message->error));
-		decode_ril_error(&error, "FAIL");
-		error.error = message->error;
-		status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
-		goto out;
-	}
-
-	decode_ril_error(&error, "OK");
-	status = -1;
-
-	if (ril_util_parse_reg(gd->ril, message, &status,
-				&lac, &ci, &tech, &max_cids) == FALSE) {
-		ofono_error("Failure parsing data registration response.");
-		decode_ril_error(&error, "FAIL");
-
-		if (status == -1)
-			status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
-
-		goto out;
-	}
-
-	if (status > 10)
-		status = status - 10;
-
-	ofono_gprs_register(gprs);
-
-	ofono_registered = TRUE;
-
-	if (max_cids > gd->max_cids) {
-		DBG("Setting max cids to %d", max_cids);
-		gd->max_cids = max_cids;
-		ofono_gprs_set_cid_range(gprs, 1, max_cids);
-	}
-
-	if (status == roaming)
-		status = check_if_really_roaming(status);
-
-out:
-	ofono_info("data reg status probed %d", status);
-
-	gd->registerid = g_ril_register(gd->ril,
-			id, ril_gprs_state_change, gprs);
-
-	gd->rild_status = status;
-}
-
 static void ril_gprs_registration_status(struct ofono_gprs *gprs,
 					ofono_gprs_status_cb_t cb,
 					void *data)
@@ -353,27 +261,20 @@ static void ril_gprs_registration_status(struct ofono_gprs *gprs,
 	int request = RIL_REQUEST_DATA_REGISTRATION_STATE;
 	guint ret;

-	DBG("");
-
 	if (gd == NULL || cbd == NULL)
 		return;

 	cbd->user = gprs;

 	ret = g_ril_send(gd->ril, request,
-				NULL, 0,
-				((gd->rild_status == -1)
-				? ril_data_probe_reg_cb
-				: ril_data_reg_cb), cbd, g_free);
+				NULL, 0, ril_data_reg_cb, cbd, g_free);

 	g_ril_print_request_no_args(gd->ril, ret, request);

 	if (ret <= 0) {
-		ofono_error("Send RIL_REQUEST_DATA_RESTISTRATION_STATE fail.");
+		ofono_error("Send RIL_REQUEST_DATA_RESTISTRATION_STATE failed.");
 		g_free(cbd);
-
-		if (cb)
-			CALLBACK_WITH_FAILURE(cb, -1, data);
+		CALLBACK_WITH_FAILURE(cb, -1, data);
 	}
 }

@@ -391,11 +292,9 @@ static int ril_gprs_probe(struct ofono_gprs *gprs,
 	gd->ofono_attached = FALSE;
 	gd->max_cids = 0;
 	gd->rild_status = -1;
+	gd->notified = FALSE;
 	gd->registerid = -1;
 	gd->timer_id = 0;
-
-	ofono_registered = FALSE;
-
 	ofono_gprs_set_data(gprs, gd);

 	ril_gprs_registration_status(gprs, NULL, NULL);
--- a/ofono/drivers/rilmodem/network-registration.c
+++ b/ofono/drivers/rilmodem/network-registration.c
@@ -55,7 +55,14 @@ struct netreg_data {
 	guint nitz_timeout;
 	unsigned int vendor;
 	guint timer_id;
-	int corestatus; /* Registration status previously reported to core */
+};
+
+/* 27.007 Section 7.3 <stat> */
+enum operator_status {
+	OPERATOR_STATUS_UNKNOWN =	0,
+	OPERATOR_STATUS_AVAILABLE =	1,
+	OPERATOR_STATUS_CURRENT =	2,
+	OPERATOR_STATUS_FORBIDDEN =	3,
 };

 struct ofono_netreg *current_netreg;
@@ -71,20 +78,25 @@ static void extract_mcc_mnc(const char *str, char *mcc, char *mnc)
 	mnc[OFONO_MAX_MNC_LENGTH] = '\0';
 }

+/*
+ * TODO: The functions in this file are stubbed out, and
+ * will need to be re-worked to talk to the /gril layer
+ * in order to get real values from RILD.
+ */
+
 static void ril_creg_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
 	ofono_netreg_status_cb_t cb = cbd->cb;
 	struct netreg_data *nd = cbd->user;
 	struct ofono_error error;
-	int status, logstatus, lac, ci, tech;
+	int status, lac, ci, tech;

 	DBG("");

 	if (message->error != RIL_E_SUCCESS) {
 		decode_ril_error(&error, "FAIL");
-		ofono_error("voice registration status query fail");
-		nd->corestatus = -1;
+		ofono_error("Failed to pull registration state");
 		cb(&error, -1, -1, -1, -1, cbd->data);
 		return;
 	}
@@ -93,31 +105,20 @@ static void ril_creg_cb(struct ril_msg *message, gpointer user_data)

 	if (ril_util_parse_reg(nd->ril, message, &status,
 				&lac, &ci, &tech, NULL) == FALSE) {
-		DBG("voice registration status parsing fail");
-		nd->corestatus = -1;
 		CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, cbd->data);
 		return;
 	}

+	DBG("voice registration status is %d", status);
+
 	if (status > 10)
 		status = status - 10;

-	logstatus = status;
-
 	if (status == NETWORK_REGISTRATION_STATUS_ROAMING)
 		status = check_if_really_roaming(status);

-	DBG("status:%d corestatus:%d", status, nd->corestatus);
+	ofono_info("voice registration status is %d", status);

-	if (status != logstatus)
-		ofono_info("voice registration modified %d (%d)",
-				status, logstatus);
-
-	if (nd->corestatus != status)
-		ofono_info("voice registration changes %d (%d)",
-				status, nd->corestatus);
-
-	nd->corestatus = status;
 	nd->tech = tech;
 	cb(&error, status, lac, ci, tech, cbd->data);
 }
@@ -127,16 +128,15 @@ static void ril_creg_notify(struct ofono_error *error, int status, int lac,
 {
 	struct ofono_netreg *netreg = user_data;

-	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
-		DBG("Error during status notification");
-		return;
-	}
+        if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+                DBG("Error during status notification");
+                return;
+        }

 	ofono_netreg_status_notify(netreg, status, lac, ci, tech);
 }

-static void ril_network_state_change(struct ril_msg *message,
-		gpointer user_data)
+static void ril_network_state_change(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_netreg *netreg = user_data;
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
@@ -364,7 +364,6 @@ static void ril_cops_list_cb(struct ril_msg *message, gpointer user_data)

 	cb(&error, noperators, list, cbd->data);

-	g_free(list);
 	return;

 error:
@@ -406,8 +405,7 @@ static void ril_register_cb(struct ril_msg *message, gpointer user_data)
 		g_ril_print_response_no_args(nd->ril, message);

 	} else {
-		ofono_error("registration failed, ril result %d",
-				message->error);
+		ofono_error("registration failed");
 		decode_ril_error(&error, "FAIL");
 	}

@@ -423,8 +421,6 @@ static void ril_register_auto(struct ofono_netreg *netreg,
 	int ret;
 	cbd->user = nd;

-	ofono_info("nw select automatic");
-
 	ret = g_ril_send(nd->ril, request,
 				NULL, 0, ril_register_cb, cbd, g_free);

@@ -448,8 +444,6 @@ static void ril_register_manual(struct ofono_netreg *netreg,
 	int request = RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL;
 	int ret;

-	ofono_info("nw select manual: %s%s", mcc, mnc);
-
 	/* add *netreg_data to callback */
 	cbd->user = nd;

@@ -579,17 +573,6 @@ error:
 	ofono_error("Unable to notify ofono about nitz");
 }

-gboolean check_if_ok_to_attach()
-{
-	int status = NETWORK_REGISTRATION_STATUS_SEARCHING;
-	status = ofono_netreg_get_status(current_netreg);
-	if (status == NETWORK_REGISTRATION_STATUS_SEARCHING
-		|| status == NETWORK_REGISTRATION_STATUS_ROAMING
-		|| status == NETWORK_REGISTRATION_STATUS_REGISTERED)
-		return TRUE;
-	return FALSE;
-}
-
 gint check_if_really_roaming(gint status)
 {
 	const char *net_mcc = ofono_netreg_get_mcc(current_netreg);
@@ -597,20 +580,14 @@ gint check_if_really_roaming(gint status)
 	struct sim_spdi *spdi = ofono_netreg_get_spdi(current_netreg);

 	if (spdi && net_mcc && net_mnc) {
-		if (sim_spdi_lookup(spdi, net_mcc, net_mnc)) {
-			ofono_info("voice reg: not roaming based on spdi");
+		if (sim_spdi_lookup(spdi, net_mcc, net_mnc))
 			return NETWORK_REGISTRATION_STATUS_REGISTERED;
-		} else
+		else
 			return status;
 	} else
 		return status;
 }

-gint get_current_network_status()
-{
-	return ofono_netreg_get_status(current_netreg);
-}
-
 static gboolean ril_delayed_register(gpointer user_data)
 {
 	struct ofono_netreg *netreg = user_data;
@@ -655,7 +632,6 @@ static int ril_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
 	nd->time.year = -1;
 	nd->time.dst = 0;
 	nd->time.utcoff = 0;
-	nd->corestatus = -1;
 	current_netreg = netreg;

 	ofono_netreg_set_data(netreg, nd);
@@ -682,7 +658,6 @@ static void ril_netreg_remove(struct ofono_netreg *netreg)
 		g_source_remove(nd->nitz_timeout);

 	ofono_netreg_set_data(netreg, NULL);
-	current_netreg = NULL;

 	if (nd->timer_id > 0)
 		g_source_remove(nd->timer_id);
--- a/ofono/drivers/rilmodem/oemraw-messages.c
+++ b/ofono/drivers/rilmodem/oemraw-messages.c
@@ -38,18 +38,14 @@
 struct oem_raw_data {
 	GRil *ril;
 	unsigned int vendor;
-	guint timer_id;
 };

 static gboolean ril_oemraw_delayed_register(gpointer user_data)
 {
 	struct ofono_oem_raw *raw = user_data;
-	struct oem_raw_data *od = ofono_oem_raw_get_data(raw);

 	DBG("");

-	od->timer_id = 0;
-
 	ofono_oem_raw_dbus_register(raw);
 	return FALSE; /* This makes the timeout a single-shot */
 }
@@ -68,8 +64,7 @@ static int ril_oemraw_probe(struct ofono_oem_raw *raw, unsigned int vendor,
 	od->vendor = vendor;
 	ofono_oem_raw_set_data(raw, od);

-	od->timer_id = g_timeout_add_seconds(1, ril_oemraw_delayed_register,
-									raw);
+	g_timeout_add_seconds(1, ril_oemraw_delayed_register, raw);

 	return 0;
 }
@@ -84,9 +79,6 @@ static void ril_oemraw_remove(struct ofono_oem_raw *raw)

 	ofono_oem_raw_set_data(raw, NULL);

-	if (od->timer_id)
-		g_source_remove(od->timer_id);
-
 	g_ril_unref(od->ril);
 	g_free(od);
 }
--- a/ofono/drivers/rilmodem/phonebook.c
+++ b/ofono/drivers/rilmodem/phonebook.c
@@ -6,6 +6,7 @@
 *  Copyright (C) ST-Ericsson SA 2010.
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
 *  Copyright (C) 2013 Jolla Ltd
+ *  Contact: Jussi Kangas <jussi.kangas@tieto.com>
 *
 *  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
@@ -161,18 +162,11 @@ void handle_adn(size_t len, char *name, const unsigned char *msg,
 		char *number, struct pb_file_info *next_file,
 		struct pb_data *pbd)
 {
-	uint8_t name_length;
-	uint8_t number_start;
+	const uint8_t name_length = len - 14;
+	const uint8_t number_start = name_length;
 	uint8_t number_length = 0;
 	uint8_t extension_record = UNUSED;
 	uint8_t i, prefix;
-
-	if (len < 14)
-		return;
-
-	name_length = len - 14;
-	number_start = name_length;
-
 	name = sim_string_to_utf8(msg, name_length);
 	/* Length contains also TON&NPI */
 	number_length = msg[number_start];
@@ -262,19 +256,15 @@ void handle_adn(size_t len, char *name, const unsigned char *msg,
 	}
 }

-void handle_sne(size_t len, const unsigned char *msg, char *sne)
+void handle_sne(size_t len,
+				const unsigned char *msg,
+				char *sne)
 {
-	uint8_t sne_length;
-	uint8_t phonebook_entry_nbr;
+	const uint8_t sne_length = len - 2;
+	uint8_t phonebook_entry_nbr = msg[len - 1];

 	DBG("SNE");

-	if (len < 2)
-		return;
-
-	sne_length = len - 2;
-	phonebook_entry_nbr = msg[len - 1];
-
 	sne = sim_string_to_utf8(msg, sne_length);

 	if (sne) {
@@ -292,40 +282,37 @@ void handle_sne(size_t len, const unsigned char *msg, char *sne)
 				list_entry->data;

 			if (entry) {
+				/* If one already exists,
+						delete it */
+				if (entry->sne)
+					g_free(entry->sne);
+
 				DBG("Adding SNE to entry %d",
 					phonebook_entry_nbr);
 				DBG("name %s", entry->name);

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

-void handle_anr(size_t len,const unsigned char *msg,char *anr,
-			struct pb_file_info *next_file, struct pb_data *pbd)
+void handle_anr(size_t len,
+				const unsigned char *msg,
+				char *anr,
+				struct pb_file_info *next_file,
+				struct pb_data *pbd)
 {
 	uint8_t number_length = 0;
 	uint8_t extension_record = UNUSED;
 	uint8_t aas_record = UNUSED;
 	uint8_t i, prefix;
-	uint8_t phonebook_entry_nbr;
+	uint8_t phonebook_entry_nbr = msg[len - 1];
 	GSList *list_entry;

 	DBG("ANR");
-
-	if (!msg)
-		return;
-
-	if (len < 1)
-		return;
-
-	phonebook_entry_nbr = msg[len - 1];
-
 	if (msg[0] == UNUSED)
 		return;

@@ -341,7 +328,7 @@ void handle_anr(size_t len,const unsigned char *msg,char *anr,
 			prefix = 0;

 			if ((msg[2] & TON_MASK) ==
-				TON_INTERNATIONAL) {
+			    TON_INTERNATIONAL) {
 				anr[0] = '+';
 				prefix = 1;
 			}
@@ -411,18 +398,11 @@ void handle_anr(size_t len,const unsigned char *msg,char *anr,
 	}
 }

-void handle_email(size_t len, const unsigned char *msg, char *email)
+void handle_email(size_t len,
+			const unsigned char *msg,
+			char *email)
 {
-	uint8_t phonebook_entry_nbr;
-
-	if (!msg)
-		return;
-
-	if (len < 1)
-		return;
-
-	phonebook_entry_nbr = msg[len - 1];
-
+	uint8_t phonebook_entry_nbr = msg[len - 1];
 	email = sim_string_to_utf8(msg, len - 2);

 	/* GSlist nth counts from 0, PB entries from 1 */
@@ -454,13 +434,13 @@ void handle_email(size_t len, const unsigned char *msg, char *email)
 	}
 }

-void handle_ext1(struct pb_data *pbd, const unsigned char *msg,
-			char *ext_number, struct pb_file_info *next_file)
+void handle_ext1(struct pb_data *pbd,
+			const unsigned char *msg,
+			char *ext_number,
+			struct pb_file_info *next_file)
 {
 	uint8_t number_length, i, next_extension_record;

-	if (!msg)
-		return;

 	number_length = msg[1];

@@ -514,7 +494,7 @@ void handle_ext1(struct pb_data *pbd, const unsigned char *msg,
 						list_entry->data;
 				if (entry) {
 					strcat(entry->anr,
-						ext_number);
+				       ext_number);
 			}
 		}
 	}
@@ -630,10 +610,8 @@ static void pb_adn_sim_data_cb(const struct ofono_error *error,
 	file_info = cbd_outer->user;
 	cbd = cbd_outer->data;

-	if (!cbd) {
-		g_free(cbd_outer);
+	if (!cbd)
 		return;
-		}

 	pb = cbd->user;
 	cb = cbd->cb;
@@ -716,10 +694,8 @@ static void pb_adn_sim_data_cb(const struct ofono_error *error,
 			g_slist_free(phonebook_entry_start);
 			g_slist_free(pb_files);
 			g_free(cbd_outer);
-			void *pb = cbd->data;
-			g_free(cbd);
 			DBG("Finally all PB data read");
-			CALLBACK_WITH_SUCCESS(cb, pb);
+			CALLBACK_WITH_SUCCESS(cb, cbd->data);
 			return;
 		}
 	}
@@ -744,6 +720,9 @@ static void pb_adn_sim_info_cb(const struct ofono_error *error,
 	if (!cbd)
 		goto error;

+	pb = cbd->user;
+	cb = cbd->cb;
+	pbd = ofono_phonebook_get_data(pb);
 	file_info = NULL;

 	if (!pbd)
@@ -786,12 +765,8 @@ static void pb_adn_sim_info_cb(const struct ofono_error *error,
 	return;
 error:

-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
-	}
+	if (cb && cbd)
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
 }

 static gboolean is_reading_required(uint8_t file_type)
@@ -824,28 +799,9 @@ static void pb_content_data_cb(const struct ofono_error *error,
 	if (extension_file_info)
 		file_info = decode_read_response(extension_file_info, sdata,
 						 length, pb);
-	else {
-	/*
-	 * These checks are crash hacks.
-	 * AFAIK there's a possibility that we end up here and pb_next is NULL
-	 * in case remove has been called while phonebook reading is in
-	 * process. If you find better solution to this issue feel free to
-	 * change this.
-	 */
-		if (pb_next == NULL) {
-			ofono_error("phonebook reading failed");
-			if (cbd){
-				void *pb = cbd->data;
-				g_free(cbd);
-				if(cb && pbd)
-					CALLBACK_WITH_FAILURE(cb, pb);
-				}
-			return;
-		}
-
+	else
 		file_info =
 			decode_read_response(pb_next->data, sdata, length, pb);
-	}

 	if (file_info) {
 		DBG("Reading extension file %04X, record %d, structure %d",
@@ -862,7 +818,7 @@ static void pb_content_data_cb(const struct ofono_error *error,
 		file_info = pb_next->data;

 		if (((file_info->structure ==
-			OFONO_SIM_FILE_STRUCTURE_FIXED) ||
+		      OFONO_SIM_FILE_STRUCTURE_FIXED) ||
 			(file_info->structure ==
 			 OFONO_SIM_FILE_STRUCTURE_CYCLIC))
 			&& (file_info->record <
@@ -899,7 +855,7 @@ static void pb_content_data_cb(const struct ofono_error *error,
 				DBG("All data requested, start vCard creation");
 				while (list_entry) {
 					struct phonebook_entry *entry =
-							list_entry->data;
+					    list_entry->data;

 					if (entry) {
 						DBG("vCard:\nname=%s\n",
@@ -936,10 +892,8 @@ static void pb_content_data_cb(const struct ofono_error *error,

 				g_slist_free(phonebook_entry_start);
 				g_slist_free(pb_files);
-				void *pb = cbd->data;
-				g_free(cbd);
 				DBG("Finally all PB data read");
-				CALLBACK_WITH_SUCCESS(cb, pb);
+				CALLBACK_WITH_SUCCESS(cb, cbd->data);
 				return;
 			}

@@ -1004,12 +958,8 @@ static void pb_content_data_read(struct pb_data *pbd,
 	return;
 error:

-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
-	}
+	if (cb && cbd)
+		CALLBACK_WITH_FAILURE(cb, cbd->data);

 out:
 	DBG("Exiting");
@@ -1082,11 +1032,9 @@ static void pb_content_info_cb(const struct ofono_error *error,
 	return;
 error:

-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
+	if (cb && cbd) {
+		DBG("Error cbd=%p, pbd=%p, file_info=%p", cbd, pbd, file_info);
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
 	}
 }

@@ -1159,27 +1107,15 @@ static void pb_reference_data_cb(const struct ofono_error *error,
 			pbd->pb_reference_file_info.record_length)) {
 		pbd->pb_reference_file_info.record++;
 		DBG("Next EFpbr record %d", pbd->pb_reference_file_info.record);
-		if (RIL_APPTYPE_SIM == ril_get_app_type()) {
-			pbd->sim_driver->read_file_linear(get_sim(),
-					pbd->pb_reference_file_info.
-					file_id,
-					pbd->pb_reference_file_info.
-					record,
-					pbd->pb_reference_file_info.
-					record_length,
-					sim_path, sizeof(sim_path),
-					pb_reference_data_cb, cbd);
-		} else {
-			pbd->sim_driver->read_file_linear(get_sim(),
-					pbd->pb_reference_file_info.
-					file_id,
-					pbd->pb_reference_file_info.
-					record,
-					pbd->pb_reference_file_info.
-					record_length,
-					usim_path, sizeof(usim_path),
-					pb_reference_data_cb, cbd);
-		}
+		pbd->sim_driver->read_file_linear(get_sim(),
+						pbd->pb_reference_file_info.
+						file_id,
+						pbd->pb_reference_file_info.
+						record,
+						pbd->pb_reference_file_info.
+						record_length,
+						NULL, 0,
+						pb_reference_data_cb, cbd);
 	} else {
 		struct pb_file_info *file_info;
 		DBG("All EFpbr records read");
@@ -1201,12 +1137,8 @@ static void pb_reference_data_cb(const struct ofono_error *error,
 	return;
 error:

-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
-	}
+	if (cb && cbd)
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
 }

 static void pb_reference_info_cb(const struct ofono_error *error,
@@ -1257,12 +1189,8 @@ static void pb_reference_info_cb(const struct ofono_error *error,
 					pb_reference_data_cb, cbd);
 	return;
 error:
-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
-	}
+	if (cb && cbd)
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
 }

 static void ril_export_entries(struct ofono_phonebook *pb,
@@ -1301,12 +1229,10 @@ static void ril_export_entries(struct ofono_phonebook *pb,

 error:

-	if (cbd){
-		void *pb = cbd->data;
-		g_free(cbd);
-		if(cb)
-			CALLBACK_WITH_FAILURE(cb, pb);
-	}
+	if (cb && cbd)
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+
+	g_free(cbd);
 }

 static gboolean ril_delayed_register(gpointer user_data)
@@ -1354,7 +1280,7 @@ static struct ofono_phonebook_driver driver = {
 	.name				= "rilmodem",
 	.probe				= ril_phonebook_probe,
 	.remove				= ril_phonebook_remove,
-	.export_entries			= ril_export_entries
+	.export_entries		= ril_export_entries
 };

 void ril_phonebook_init(void)
--- a/ofono/drivers/rilmodem/radio-settings.c
+++ b/ofono/drivers/rilmodem/radio-settings.c
@@ -35,7 +35,6 @@
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/radio-settings.h>
-#include <ofono/sim.h>

 #include "gril.h"
 #include "grilutil.h"
@@ -75,7 +74,7 @@ static void ril_set_rat_mode(struct ofono_radio_settings *rs,
 	int pref = rd->ratmode;
 	int ret = 0;

-	ofono_info("rat mode set %d", mode);
+	ofono_info("setting rat mode");

 	parcel_init(&rilp);

@@ -116,8 +115,6 @@ static void ril_force_rat_mode(struct radio_data *rd, int pref)
 	if (pref == rd->ratmode)
 		return;

-	DBG("pref ril rat mode %d, ril current %d", pref, rd->ratmode);
-
 	parcel_init(&rilp);
 	parcel_w_int32(&rilp, 1);
 	parcel_w_int32(&rilp, rd->ratmode);
@@ -139,7 +136,7 @@ static void ril_rat_mode_cb(struct ril_msg *message, gpointer user_data)

 	if (message->error == RIL_E_SUCCESS) {
 		ril_util_init_parcel(message, &rilp);
-		/* first item in int[] is len so let's skip that */
+		/*first item in int[] is len so let's skip that*/
 		parcel_r_int32(&rilp);
 		pref = parcel_r_int32(&rilp);

@@ -169,7 +166,6 @@ static void ril_rat_mode_cb(struct ril_msg *message, gpointer user_data)
 		default:
 			break;
 		}
-		ofono_info("rat mode %d (ril %d)", mode, pref);
 		if (cb)
 			CALLBACK_WITH_SUCCESS(cb, mode, cbd->data);
 	} else {
@@ -204,17 +200,11 @@ static gboolean ril_get_net_config(struct radio_data *rsd)
 {
 	GKeyFile *keyfile;
 	GError *err = NULL;
-	char *config_path = RIL_CONFIG_DIR;
+	char *path = RIL_CONFIG;
 	char **alreadyset = NULL;
 	gboolean needsconfig = FALSE;
 	gboolean value = FALSE;
-	gboolean found = FALSE;
 	rsd->ratmode = PREF_NET_TYPE_GSM_WCDMA_AUTO;
-	GDir *config_dir;
-	const gchar *config_file;
-	gsize length;
-	gchar **codes = NULL;
-	int i;

 	/*
 	 * First we need to check should the LTE be on
@@ -225,45 +215,15 @@ static gboolean ril_get_net_config(struct radio_data *rsd)

 	g_key_file_set_list_separator(keyfile, ',');

-	config_dir = g_dir_open(config_path, 0, NULL);
-	while ((config_file = g_dir_read_name(config_dir)) != NULL) {
-		char *path = g_strconcat(RIL_CONFIG_DIR "/", config_file, NULL);
-		DBG("Rilconfig handling %s", path);
-		gboolean ok = g_key_file_load_from_file(keyfile, path, 0, &err);
-
-		g_free(path);
-		if (!ok) {
-			g_error_free(err);
-			DBG("Rilconfig file skipped");
-			continue;
-		}
-
+	if (g_key_file_load_from_file(keyfile, path, 0, &err)) {
 		if (g_key_file_has_group(keyfile, LTE_FLAG))
-			found = TRUE;
-		else if (g_key_file_has_group(keyfile, MCC_LIST)) {
-			codes = g_key_file_get_string_list(keyfile, MCC_LIST,
-						MCC_KEY, &length, NULL);
-			if (codes) {
-				for (i = 0; codes[i]; i++) {
-					if (g_str_equal(codes[i],
-						ofono_sim_get_mcc(get_sim()))
-							== TRUE) {
-						found = TRUE;
-						break;
-					}
-				}
-				g_strfreev(codes);
-			}
-		}
-
-		if (found) {
 			rsd->ratmode = PREF_NET_TYPE_LTE_GSM_WCDMA;
-			break;
-		}
+	} else {
+		g_error_free(err);
+		needsconfig = TRUE;
 	}

 	g_key_file_free(keyfile);
-	g_dir_close(config_dir);

 	/* Then we need to check if it already set */

@@ -290,7 +250,6 @@ static gboolean ril_get_net_config(struct radio_data *rsd)

 	storage_close(NULL, RIL_STORE, keyfile, TRUE);

-	DBG("needsconfig %d, rat mode %d", needsconfig, rsd->ratmode);
 	return needsconfig;
 }

--- a/ofono/drivers/rilmodem/rilmodem.c
+++ b/ofono/drivers/rilmodem/rilmodem.c
@@ -56,7 +56,6 @@ static int rilmodem_init(void)
 	ril_call_barring_init();
 	ril_cbs_init();
 	ril_oemraw_init();
-	ril_stk_init();

 	return 0;
 }
@@ -81,7 +80,6 @@ static void rilmodem_exit(void)
 	ril_call_barring_exit();
 	ril_cbs_exit();
 	ril_oemraw_exit();
-	ril_stk_exit();
 }

 OFONO_PLUGIN_DEFINE(rilmodem, "RIL modem driver", VERSION,
--- a/ofono/drivers/rilmodem/rilmodem.h
+++ b/ofono/drivers/rilmodem/rilmodem.h
@@ -28,14 +28,9 @@
 /* Shared constants */
 #define EF_STATUS_INVALIDATED 0
 #define EF_STATUS_VALID 1
-#define RIL_HW_CONFIG "/etc/ofono/ril_subscription.conf"
-#define RIL_CONFIG_DIR "/etc/ofono/"
+#define RIL_CONFIG "/etc/ofono/ril_subscription.conf"
 #define RIL_STORE "rilmodem"
 #define LTE_FLAG "4gOn"
-#define MCC_LIST "MCC-whitelist"
-#define MCC_KEY "Countries"
-#define UI_LANG "/var/lib/environment/nemo/locale.conf"
-#define CFG_LANG "LANG="

 extern void ril_devinfo_init(void);
 extern void ril_devinfo_exit(void);
@@ -84,7 +79,3 @@ extern void ril_phonebook_exit(void);

 extern void ril_oemraw_init(void);
 extern void ril_oemraw_exit(void);
-
-extern void ril_stk_init(void);
-extern void ril_stk_exit(void);
-
--- a/ofono/drivers/rilmodem/rilutil.c
+++ b/ofono/drivers/rilmodem/rilutil.c
@@ -375,14 +375,7 @@ gboolean ril_util_parse_sim_status(GRil *gril,
 	 * Do we just make a style-guide exception for PrintBuf operations?
 	 */
 	g_ril_append_print_buf(gril,
-				"card_state=%d,universal_pin_state=%d,gsm_umts_index=%d,cdma_index=%d,ims_index=%d, ",
-				status->card_state,
-				status->pin_state,
-				status->gsm_umts_index,
-				status->cdma_index,
-				status->ims_index);
-
-	DBG("card_state=%d, universal_pin_state=%d, gsm_umts_index=%d, cdma_index=%d, ims_index=%d",
+				"(card_state=%d,universal_pin_state=%d,gsm_umts_index=%d,cdma_index=%d,ims_index=%d, ",
 				status->card_state,
 				status->pin_state,
 				status->gsm_umts_index,
@@ -394,13 +387,13 @@ gboolean ril_util_parse_sim_status(GRil *gril,
 	else
 		goto done;

-	DBG("sim num_apps: %d", status->num_apps);
 	if (status->num_apps > MAX_UICC_APPS) {
 		ofono_error("SIM error; too many apps: %d", status->num_apps);
 		status->num_apps = MAX_UICC_APPS;
 	}

 	for (i = 0; i < status->num_apps; i++) {
+		DBG("processing app[%d]", i);
 		apps[i] = g_try_new0(struct sim_app, 1);
 		if (apps[i] == NULL) {
 			ofono_error("Can't allocate app_data");
@@ -409,25 +402,13 @@ gboolean ril_util_parse_sim_status(GRil *gril,

 		apps[i]->app_type = parcel_r_int32(&rilp);
 		apps[i]->app_state = parcel_r_int32(&rilp);
-
-		/*
-		 * Consider RIL_APPSTATE_ILLEGAL also READY. Even if app state
-		 * is  RIL_APPSTATE_ILLEGAL (-1), ICC operations must be
-		 * permitted. Network access requests will anyway be rejected
-		 * and ME will be in limited service.
-		 */
-		if (apps[i]->app_state == RIL_APPSTATE_ILLEGAL) {
-			DBG("RIL_APPSTATE_ILLEGAL => RIL_APPSTATE_READY");
-			apps[i]->app_state = RIL_APPSTATE_READY;
-		}
-
 		apps[i]->perso_substate = parcel_r_int32(&rilp);

 		/* TODO: we need a way to instruct parcel to skip
 		 * a string, without allocating memory...
 		 */
-		apps[i]->aid_str = parcel_r_string(&rilp); /* app ID (AID) */
-		apps[i]->app_str = parcel_r_string(&rilp); /* app label */
+		apps[i]->aid_str = parcel_r_string(&rilp); /* application ID (AID) */
+		apps[i]->app_str = parcel_r_string(&rilp); /* application label */

 		apps[i]->pin_replaced = parcel_r_int32(&rilp);
 		apps[i]->pin1_state = parcel_r_int32(&rilp);
@@ -444,16 +425,6 @@ gboolean ril_util_parse_sim_status(GRil *gril,
 					apps[i]->pin_replaced,
 					apps[i]->pin1_state,
 					apps[i]->pin2_state);
-
-		DBG("app[%d]: type=%d, state=%d, perso_substate=%d, aid_ptr=%s, app_label_ptr=%s, pin1_replaced=%d, pin1=%d, pin2=%d",
-					i, apps[i]->app_type,
-					apps[i]->app_state,
-					apps[i]->perso_substate,
-					apps[i]->aid_str,
-					apps[i]->app_str,
-					apps[i]->pin_replaced,
-					apps[i]->pin1_state,
-					apps[i]->pin2_state);
 	}

 done:
@@ -488,8 +459,7 @@ gboolean ril_util_parse_reg(GRil *gril,
 	 *   >= 4 for VOICE_REG reply
 	 *   >= 5 for DATA_REG reply
 	 */
-	tmp = parcel_r_int32(&rilp);
-	if (tmp < 4) {
+	if ((tmp = parcel_r_int32(&rilp)) < 4) {
 		DBG("Size of response array is too small: %d", tmp);
 		goto error;
 	}
@@ -512,12 +482,10 @@ gboolean ril_util_parse_reg(GRil *gril,
 	 * voice & data response.
 	 */
 	if (tmp--) {
-		/* TODO: different use for CDMA */
-		sreason = parcel_r_string(&rilp);
+		sreason = parcel_r_string(&rilp);        /* TODO: different use for CDMA */

 		if (tmp--) {
-			/* TODO: different use for CDMA */
-			smax = parcel_r_string(&rilp);
+			smax = parcel_r_string(&rilp);           /* TODO: different use for CDMA */

 			if (smax && max_calls)
 				*max_calls = atoi(smax);
@@ -550,7 +518,7 @@ gboolean ril_util_parse_reg(GRil *gril,

 	if (tech) {
 		if (stech) {
-			switch (atoi(stech)) {
+			switch(atoi(stech)) {
 			case RADIO_TECH_UNKNOWN:
 				*tech = -1;
 				break;
@@ -623,10 +591,8 @@ gint ril_util_parse_sms_response(GRil *gril, struct ril_msg *message)
 	 */
 	mr = parcel_r_int32(&rilp);
 	ack_pdu = parcel_r_string(&rilp);
-
-	/* error: 3GPP 27.005, 3.2.5, -1 if unknown or not applicable */
 	error = parcel_r_int32(&rilp);
-	DBG("sms msg ref: %d, error: %d, ack_pdu: %s", mr, error, ack_pdu);
+

 	g_ril_append_print_buf(gril, "{%d,%s,%d}",
 				mr, ack_pdu, error);
@@ -693,8 +659,7 @@ gint ril_util_get_signal(GRil *gril, struct ril_msg *message)
 	return -1;
 }

-void ril_util_free_sim_apps(struct sim_app **apps, guint num_apps)
-{
+void ril_util_free_sim_apps(struct sim_app **apps, guint num_apps) {
 	guint i;

 	for (i = 0; i < num_apps; i++) {
--- a/ofono/drivers/rilmodem/rilutil.h
+++ b/ofono/drivers/rilmodem/rilutil.h
@@ -62,6 +62,29 @@ enum at_util_charset {
 	RIL_UTIL_CHARSET_8859_H =	0x10000,
 };

+/* TODO: consider moving these to ril_constants.h */
+enum app_state {
+	APPSTATE_UNKNOWN,
+	APPSTATE_DETECTED,
+	APPSTATE_PIN,
+	APPSTATE_PUK,
+	APPSTATE_SUBSCRIPTION_PERSO,
+	APPSTATE_READY,
+};
+
+enum perso_state {
+	PERSOSUBSTATE_SIM_NETWORK = 3,
+	PERSOSUBSTATE_SIM_NETWORK_SUBSET,
+	PERSOSUBSTATE_SIM_CORPORATE,
+	PERSOSUBSTATE_SIM_SERVICE_PROVIDER,
+	PERSOSUBSTATE_SIM_SIM,
+	PERSOSUBSTATE_SIM_NETWORK_PUK,
+	PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK,
+	PERSOSUBSTATE_SIM_CORPORATE_PUK,
+	PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK,
+	PERSOSUBSTATE_SIM_SIM_PUK,
+};
+
 #define MAX_UICC_APPS 16

 struct sim_status {
@@ -123,12 +146,6 @@ struct ofono_sim *get_sim();

 gint check_if_really_roaming(gint status);

-gboolean ril_roaming_allowed();
-
-gboolean check_if_ok_to_attach();
-
-gint get_current_network_status();
-
 void ril_util_free_sim_apps(struct sim_app **apps, guint num_apps);

 struct cb_data {
@@ -153,7 +170,7 @@ static inline struct cb_data *cb_data_new2(void *user, void *cb,
 {
 	struct cb_data *ret;

-	ret = g_new0(struct cb_data, 1);
+	ret = g_try_new0(struct cb_data, 1);

 	if (ret) {
 		ret->cb = cb;
@@ -176,7 +193,7 @@ static inline int ril_util_convert_signal_strength(int strength)
 	return result;
 }

-#define DECLARE_FAILURE(e)			\
+#define DECLARE_FAILURE(e) 			\
 	struct ofono_error e;			\
 	e.type = OFONO_ERROR_TYPE_FAILURE;	\
 	e.error = 0				\
--- a/ofono/drivers/rilmodem/sim.c
+++ b/ofono/drivers/rilmodem/sim.c
@@ -4,7 +4,6 @@
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
 *  Copyright (C) 2013 Canonical, Ltd. All rights reserved.
- *  Copyright (C) 2014 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,7 +42,6 @@
 #include "util.h"

 #include "gril.h"
-#include "grilrequest.h"
 #include "grilutil.h"
 #include "parcel.h"
 #include "ril_constants.h"
@@ -98,12 +96,12 @@ struct sim_data {
 	guint app_type;
 	gchar *app_str;
 	guint app_index;
+	gboolean sim_registered;
 	enum ofono_sim_password_type passwd_type;
 	int retries[OFONO_SIM_PASSWORD_INVALID];
 	enum ofono_sim_password_type passwd_state;
+	guint card_state;
 	guint idle_id;
-	gboolean initialized;
-	gboolean removed;
 };

 static void ril_pin_change_state_cb(struct ril_msg *message,
@@ -127,8 +125,7 @@ static void set_path(struct sim_data *sd, struct parcel *rilp,
 	} else if (sd->app_type == RIL_APPTYPE_SIM) {
 		len = sim_ef_db_get_path_2g(fileid, db_path);
 	} else {
-		ofono_error("%s Unsupported app_type: 0%x", __func__,
-				sd->app_type);
+		ofono_error("Unsupported app_type: 0%x", sd->app_type);
 	}

 	if (len > 0) {
@@ -182,15 +179,6 @@ static void ril_file_info_cb(struct ril_msg *message, gpointer user_data)

 	DBG("");

-	/* In case sim card has been removed prior to this callback has been
-	 * called we must not call the core call back method as otherwise the
-	 * core will crash.
-	 */
-	if (sd->removed == TRUE) {
-		ofono_error("%s RIL_CARDSTATE_ABSENT", __func__);
-		return;
-	}
-
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
 	} else {
@@ -205,15 +193,14 @@ static void ril_file_info_cb(struct ril_msg *message, gpointer user_data)
 						&sw1,
 						&sw2,
 						&response_len)) == NULL) {
-		ofono_error("%s Can't parse SIM IO response", __func__);
+		ofono_error("Can't parse SIM IO response from RILD");
 		decode_ril_error(&error, "FAIL");
 		goto error;
 	}

 	if ((sw1 != 0x90 && sw1 != 0x91 && sw1 != 0x92 && sw1 != 0x9f) ||
 		(sw1 == 0x90 && sw2 != 0x00)) {
-		ofono_error("%s invalid values: sw1: %02x sw2: %02x", __func__,
-				sw1, sw2);
+		ofono_error("invalid values: sw1: %02x sw2: %02x", sw1, sw2);
 		memset(&error, 0, sizeof(error));

 		/* TODO: fix decode_ril_error to take type & error */
@@ -236,7 +223,7 @@ static void ril_file_info_cb(struct ril_msg *message, gpointer user_data)
 	}

 	if (!ok) {
-		ofono_error("%s parse response failed", __func__);
+		ofono_error("parse response failed");
 		decode_ril_error(&error, "FAIL");
 		goto error;
 	}
@@ -326,8 +313,8 @@ static void ril_file_io_cb(struct ril_msg *message, gpointer user_data)
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
 	} else {
-		ofono_error("%s RILD reply failure: %s", __func__,
-				ril_error_to_string(message->error));
+		ofono_error("RILD reply failure: %s",
+			    ril_error_to_string(message->error));
 		goto error;
 	}

@@ -337,7 +324,7 @@ static void ril_file_io_cb(struct ril_msg *message, gpointer user_data)
 						&sw1,
 						&sw2,
 						&response_len)) == NULL) {
-		ofono_error("%s Error parsing IO response", __func__);
+		ofono_error("Error parsing IO response");
 		goto error;
 	}

@@ -471,7 +458,7 @@ static void ril_imsi_cb(struct ril_msg *message, gpointer user_data)
 		DBG("GET IMSI reply - OK");
 		decode_ril_error(&error, "OK");
 	} else {
-		ofono_error("%s Reply failure: %s", __func__,
+		ofono_error("Reply failure: %s",
 			    ril_error_to_string(message->error));
 		decode_ril_error(&error, "FAIL");
 		cb(&error, NULL, cbd->data);
@@ -520,58 +507,91 @@ static void ril_read_imsi(struct ofono_sim *sim, ofono_sim_imsi_cb_t cb,
 	}
 }

+void set_pin_lock_state(struct ofono_sim *sim, struct sim_app *app)
+{
+	DBG("pin1:%u,pin2:%u", app->pin1_state, app->pin2_state);
+	/*
+	 * Updates only pin and pin2 state. Other locks are not dealt here. For
+	 * that a RIL_REQUEST_QUERY_FACILITY_LOCK request should be used.
+	 */
+	switch (app->pin1_state) {
+	case RIL_PINSTATE_ENABLED_NOT_VERIFIED:
+	case RIL_PINSTATE_ENABLED_VERIFIED:
+	case RIL_PINSTATE_ENABLED_BLOCKED:
+	case RIL_PINSTATE_ENABLED_PERM_BLOCKED:
+		ofono_set_pin_lock_state(sim, OFONO_SIM_PASSWORD_SIM_PIN, TRUE);
+		break;
+	case RIL_PINSTATE_DISABLED:
+		ofono_set_pin_lock_state(
+			sim, OFONO_SIM_PASSWORD_SIM_PIN, FALSE);
+		break;
+	default:
+		break;
+	}
+	switch (app->pin2_state) {
+	case RIL_PINSTATE_ENABLED_NOT_VERIFIED:
+	case RIL_PINSTATE_ENABLED_VERIFIED:
+	case RIL_PINSTATE_ENABLED_BLOCKED:
+	case RIL_PINSTATE_ENABLED_PERM_BLOCKED:
+		ofono_set_pin_lock_state(
+			sim, OFONO_SIM_PASSWORD_SIM_PIN2, TRUE);
+		break;
+	case RIL_PINSTATE_DISABLED:
+		ofono_set_pin_lock_state(
+			sim, OFONO_SIM_PASSWORD_SIM_PIN2, FALSE);
+		break;
+	default:
+		break;
+	}
+}
+
 static void configure_active_app(struct sim_data *sd,
 					struct sim_app *app,
 					guint index)
 {
 	sd->app_type = app->app_type;
-
-	g_free(sd->aid_str);
 	sd->aid_str = g_strdup(app->aid_str);
-
-	g_free(sd->app_str);
 	sd->app_str = g_strdup(app->app_str);
-
 	sd->app_index = index;

 	DBG("setting aid_str (AID) to: %s", sd->aid_str);
 	switch (app->app_state) {
-	case RIL_APPSTATE_PIN:
+	case APPSTATE_PIN:
 		sd->passwd_state = OFONO_SIM_PASSWORD_SIM_PIN;
 		break;
-	case RIL_APPSTATE_PUK:
+	case APPSTATE_PUK:
 		sd->passwd_state = OFONO_SIM_PASSWORD_SIM_PUK;
 		break;
-	case RIL_APPSTATE_SUBSCRIPTION_PERSO:
+	case APPSTATE_SUBSCRIPTION_PERSO:
 		switch (app->perso_substate) {
-		case RIL_PERSOSUBSTATE_SIM_NETWORK:
+		case PERSOSUBSTATE_SIM_NETWORK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNET_PIN;
 			break;
-		case RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET:
+		case PERSOSUBSTATE_SIM_NETWORK_SUBSET:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNETSUB_PIN;
 			break;
-		case RIL_PERSOSUBSTATE_SIM_CORPORATE:
+		case PERSOSUBSTATE_SIM_CORPORATE:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHCORP_PIN;
 			break;
-		case RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER:
+		case PERSOSUBSTATE_SIM_SERVICE_PROVIDER:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHSP_PIN;
 			break;
-		case RIL_PERSOSUBSTATE_SIM_SIM:
+		case PERSOSUBSTATE_SIM_SIM:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHSIM_PIN;
 			break;
-		case RIL_PERSOSUBSTATE_SIM_NETWORK_PUK:
+		case PERSOSUBSTATE_SIM_NETWORK_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNET_PUK;
 			break;
-		case RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK:
+		case PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNETSUB_PUK;
 			break;
-		case RIL_PERSOSUBSTATE_SIM_CORPORATE_PUK:
+		case PERSOSUBSTATE_SIM_CORPORATE_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHCORP_PUK;
 			break;
-		case RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK:
+		case PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHSP_PUK;
 			break;
-		case RIL_PERSOSUBSTATE_SIM_SIM_PUK:
+		case PERSOSUBSTATE_SIM_SIM_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHFSIM_PUK;
 			break;
 		default:
@@ -579,124 +599,54 @@ static void configure_active_app(struct sim_data *sd,
 			break;
 		};
 		break;
-	case RIL_APPSTATE_READY:
+	case APPSTATE_READY:
 		sd->passwd_state = OFONO_SIM_PASSWORD_NONE;
 		break;
-	case RIL_APPSTATE_UNKNOWN:
-	case RIL_APPSTATE_DETECTED:
+	case APPSTATE_UNKNOWN:
+	case APPSTATE_DETECTED:
 	default:
 		sd->passwd_state = OFONO_SIM_PASSWORD_INVALID;
 		break;
 	}
 }

-static void free_sim_state(struct sim_data *sd)
-{
-	guint i = 0;
-
-	sd->passwd_state = OFONO_SIM_PASSWORD_INVALID;
-
-	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
-		sd->retries[i] = -1;
-
-	sd->removed = TRUE;
-	sd->initialized = FALSE;
-}
-
-static void sim_send_set_uicc_subscription(struct sim_data *sd, int slot_id,
-				int app_index, int sub_id, int sub_status)
-{
-	struct parcel rilp;
-
-	DBG("");
-
-	g_ril_request_set_uicc_subscription(sd->ril, slot_id, app_index,
-						sub_id, sub_status, &rilp);
-
-	g_ril_send(sd->ril, RIL_REQUEST_SET_UICC_SUBSCRIPTION, rilp.data,
-		rilp.size, NULL, NULL, NULL);
-}
-
-static int sim_select_uicc_subscription(struct sim_data *sim,
-			struct sim_status *status, struct sim_app **apps)
-{
-	int slot_id = 0;
-	int selected_app = -1;
-	unsigned int i;
-
-	for (i = 0; i < status->num_apps; i++) {
-		switch (apps[i]->app_type) {
-		case RIL_APPTYPE_UNKNOWN:
-			continue;
-		case RIL_APPTYPE_USIM:
-		case RIL_APPTYPE_RUIM:
-			if (selected_app != -1) {
-				switch (apps[selected_app]->app_type) {
-				case RIL_APPTYPE_USIM:
-				case RIL_APPTYPE_RUIM:
-					break;
-				default:
-					selected_app = i;
-				}
-			} else {
-				selected_app = i;
-			}
-			break;
-		default:
-			if (selected_app == -1)
-				selected_app = i;
-		}
-	}
-
-	DBG("Select app %d for subscription.", selected_app);
-
-	if (selected_app != -1)
-		/* Number 1 means activates that app */
-		sim_send_set_uicc_subscription(sim, slot_id, selected_app,
-						slot_id, 1);
-
-	return selected_app;
-}
-
 static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_sim *sim = user_data;
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct sim_app *apps[MAX_UICC_APPS];
 	struct sim_status status;
+	guint i = 0;
+	guint search_index = -1;
 	struct parcel rilp;

 	DBG("");

-	if (ril_util_parse_sim_status(sd->ril, message, &status, apps) &&
+	if (ril_util_parse_sim_status(sd->ril, message,	&status, apps) &&
 		status.num_apps) {

+		DBG("num_apps: %d gsm_umts_index: %d", status.num_apps,
+			status.gsm_umts_index);
+
 		/* TODO(CDMA): need some kind of logic to
 		 * set the correct app_index,
 		 */
-		int app_index = status.gsm_umts_index;
+		search_index = status.gsm_umts_index;

-		if (app_index < 0) {
-			app_index = sim_select_uicc_subscription(sd,
-								&status, apps);
-		}
-		if (app_index >= 0 && app_index < (int)status.num_apps &&
-			apps[app_index]->app_type != RIL_APPTYPE_UNKNOWN) {
-			current_active_app = apps[app_index]->app_type;
-			configure_active_app(sd, apps[app_index], app_index);
+		for (i = 0; i < status.num_apps; i++) {
+			if (i == search_index &&
+				apps[i]->app_type != RIL_APPTYPE_UNKNOWN) {
+				current_active_app = apps[i]->app_type;
+				configure_active_app(sd, apps[i], i);
+				set_pin_lock_state(sim, apps[i]);
+				break;
+			}
 		}

-		sd->removed = FALSE;
-
-		if (sd->passwd_state != OFONO_SIM_PASSWORD_INVALID) {
-			/*
-			 * ril_util_parse_sim_status returns true only when
-			 * card status is RIL_CARDSTATE_PRESENT,
-			 * ofono_sim_inserted_notify returns if status doesn't
-			 * change. So can notify core always in this branch.
-			 */
-			ofono_sim_inserted_notify(sim, TRUE);
-
+		if (sd->sim_registered == FALSE) {
+			ofono_sim_register(sim);
+			sd->sim_registered = TRUE;
+		} else {
 			/* TODO: There doesn't seem to be any other
 			 * way to force the core SIM code to
 			 * recheck the PIN.
@@ -704,16 +654,47 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 			 * more appropriate call here??
 			 * __ofono_sim_refresh(sim, NULL, TRUE, TRUE);
 			 */
+			DBG("sd->card_state:%u", sd->card_state);
+			if (sd->card_state != RIL_CARDSTATE_PRESENT) {
+				ofono_sim_inserted_notify(sim, TRUE);
+				sd->card_state = RIL_CARDSTATE_PRESENT;
+			}
+		}
+
+		if (current_passwd) {
+			if (!strcmp(current_passwd, defaultpasswd)) {
+				__ofono_sim_recheck_pin(sim);
+			} else if (sd->passwd_state !=
+						OFONO_SIM_PASSWORD_SIM_PIN) {
+				__ofono_sim_recheck_pin(sim);
+			} else if (sd->passwd_state ==
+						OFONO_SIM_PASSWORD_SIM_PIN) {
+				parcel_init(&rilp);
+
+				parcel_w_int32(&rilp,
+					ENTER_SIM_PIN_PARAMS);
+				parcel_w_string(&rilp, current_passwd);
+				parcel_w_string(&rilp, sd->aid_str);
+
+				g_ril_send(sd->ril,
+						RIL_REQUEST_ENTER_SIM_PIN,
+						rilp.data, rilp.size, NULL,
+						NULL, g_free);
+
+				parcel_free(&rilp);
+			}
+		} else {
 			__ofono_sim_recheck_pin(sim);
 		}

 		if (current_online_state == RIL_ONLINE_PREF) {

+			parcel_init(&rilp);
+
 			parcel_init(&rilp);
 			parcel_w_int32(&rilp, 1);
 			parcel_w_int32(&rilp, 1);

-			ofono_info("RIL_REQUEST_RADIO_POWER ON");
 			g_ril_send(sd->ril,
 					RIL_REQUEST_RADIO_POWER,
 					rilp.data,
@@ -731,13 +712,17 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 			current_online_state = RIL_ONLINE_PREF;

 		if (status.card_state == RIL_CARDSTATE_ABSENT) {
-			ofono_info("%s: RIL_CARDSTATE_ABSENT", __func__);
-
-			free_sim_state(sd);
-
+			DBG("sd->card_state:%u,status.card_state:%u,",
+				sd->card_state, status.card_state);
 			ofono_sim_inserted_notify(sim, FALSE);
+			sd->card_state = RIL_CARDSTATE_ABSENT;
+
+			if (current_passwd)
+				g_stpcpy(current_passwd, defaultpasswd);
 		}
 	}
+
+	/* TODO: if no SIM present, handle emergency calling. */
 }

 static int send_get_sim_status(struct ofono_sim *sim)
@@ -774,73 +759,16 @@ static void ril_query_pin_retries(struct ofono_sim *sim,
 	CALLBACK_WITH_SUCCESS(cb, sd->retries, data);
 }

-static void ril_query_passwd_state_cb(struct ril_msg *message, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	struct ofono_sim *sim = cbd->user;
-	struct sim_data *sd = ofono_sim_get_data(sim);
-	ofono_sim_passwd_cb_t cb = cbd->cb;
-	void *data = cbd->data;
-	struct sim_app *apps[MAX_UICC_APPS];
-	struct sim_status status;
-	gint state = ofono_sim_get_state(sim);
-
-	if (ril_util_parse_sim_status(sd->ril, message, &status, apps) &&
-		status.num_apps) {
-
-		/* TODO(CDMA): need some kind of logic to
-		 * set the correct app_index,
-		 */
-		int app_index = status.gsm_umts_index;
-
-		if (app_index >= 0 && app_index < (int)status.num_apps &&
-			apps[app_index]->app_type != RIL_APPTYPE_UNKNOWN) {
-			current_active_app = apps[app_index]->app_type;
-			configure_active_app(sd, apps[app_index], app_index);
-		}
-
-		ril_util_free_sim_apps(apps, status.num_apps);
-	}
-	DBG("passwd_state %u", sd->passwd_state);
-
-	/* if pin code required cannot be initialized yet*/
-	if (sd->passwd_state == OFONO_SIM_PASSWORD_SIM_PIN)
-		sd->initialized = FALSE;
-	/*
-	 * To prevent double call to sim_initialize_after_pin from
-	 * sim_pin_query_cb we must prevent calling sim_pin_query_cb
-	 * when !OFONO_SIM_STATE_READY && OFONO_SIM_PASSWORD_NONE
-	*/
-	if ((state == OFONO_SIM_STATE_READY) || (sd->initialized == FALSE) ||
-				(sd->passwd_state != OFONO_SIM_PASSWORD_NONE)){
-
-		if (sd->passwd_state == OFONO_SIM_PASSWORD_NONE)
-			sd->initialized = TRUE;
-
-		if (state == OFONO_SIM_STATE_LOCKED_OUT)
-			sd->initialized = FALSE;
-
-		if (sd->passwd_state == OFONO_SIM_PASSWORD_INVALID)
-			CALLBACK_WITH_FAILURE(cb, -1, data);
-		else
-			CALLBACK_WITH_SUCCESS(cb, sd->passwd_state, data);
-	}
-
-}
-
 static void ril_query_passwd_state(struct ofono_sim *sim,
 					ofono_sim_passwd_cb_t cb, void *data)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
-	struct cb_data *cbd = cb_data_new2(sim, cb, data);
-	int request = RIL_REQUEST_GET_SIM_STATUS;
-	guint ret;
-
-	ret = g_ril_send(sd->ril, request,
-			NULL, 0, ril_query_passwd_state_cb, cbd, g_free);
-
-	g_ril_print_request_no_args(sd->ril, ret, request);
+	DBG("passwd_state %u", sd->passwd_state);

+	if (sd->passwd_state == OFONO_SIM_PASSWORD_INVALID)
+		CALLBACK_WITH_FAILURE(cb, -1, data);
+	else
+		CALLBACK_WITH_SUCCESS(cb, sd->passwd_state, data);
 }

 static void ril_pin_change_state_cb(struct ril_msg *message, gpointer user_data)
@@ -850,9 +778,8 @@ static void ril_pin_change_state_cb(struct ril_msg *message, gpointer user_data)
 	struct sim_data *sd = cbd->user;
 	struct parcel rilp;
 	int retry_count;
+	int retries[OFONO_SIM_PASSWORD_INVALID];
 	int passwd_type;
-	int i;
-
 	/* There is no reason to ask SIM status until
 	 * unsolicited sim status change indication
 	 * Looks like state does not change before that.
@@ -862,19 +789,20 @@ static void ril_pin_change_state_cb(struct ril_msg *message, gpointer user_data)
 	ril_util_init_parcel(message, &rilp);
 	parcel_r_int32(&rilp);
 	retry_count = parcel_r_int32(&rilp);
+	retries[passwd_type] = retry_count;
+	sd->retries[passwd_type] = retries[passwd_type];

-	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
-		sd->retries[i] = -1;
+	/*
+	 * TODO: re-bfactor to not use macro for FAILURE; doesn't return error!
+	 */

-	sd->retries[passwd_type] = retry_count;
-
-	DBG("result=%d passwd_type=%d retry_count=%d",
-		message->error, passwd_type, retry_count);
 	if (message->error == RIL_E_SUCCESS) {
 		CALLBACK_WITH_SUCCESS(cb, cbd->data);
 		g_ril_print_response_no_args(sd->ril, message);

 	} else {
+		if (current_passwd)
+			g_stpcpy(current_passwd, defaultpasswd);
 		CALLBACK_WITH_FAILURE(cb, cbd->data);
 	}

@@ -892,6 +820,9 @@ static void ril_pin_send(struct ofono_sim *sim, const char *passwd,
 	sd->passwd_type = OFONO_SIM_PASSWORD_SIM_PIN;
 	cbd->user = sd;

+	if (current_passwd)
+		g_stpcpy(current_passwd, passwd);
+
 	parcel_init(&rilp);

 	parcel_w_int32(&rilp, ENTER_SIM_PIN_PARAMS);
@@ -913,53 +844,11 @@ static void ril_pin_send(struct ofono_sim *sim, const char *passwd,
 	}
 }

-static int ril_perso_change_state(struct ofono_sim *sim,
-				enum ofono_sim_password_type passwd_type,
-				int enable, const char *passwd,
-				ofono_sim_lock_unlock_cb_t cb, void *data)
-{
-	struct sim_data *sd = ofono_sim_get_data(sim);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	struct parcel rilp;
-	int request = 0;
-	int ret = 0;
-	sd->passwd_type = passwd_type;
-	cbd->user = sd;
-
-	parcel_init(&rilp);
-
-	switch (passwd_type) {
-	case OFONO_SIM_PASSWORD_PHNET_PIN:
-		if (enable) {
-			DBG("Not supported, enable=%d", enable);
-			goto end;
-		}
-		request = RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION;
-		parcel_w_int32(&rilp, RIL_PERSOSUBSTATE_SIM_NETWORK);
-		parcel_w_string(&rilp, (char *) passwd);
-		break;
-	default:
-		DBG("Not supported, type=%d", passwd_type);
-		goto end;
-	}
-
-	ret = g_ril_send(sd->ril, request,
-				rilp.data, rilp.size, ril_pin_change_state_cb,
-				cbd, g_free);
-
-	g_ril_print_request(sd->ril, ret, request);
-
-end:
-	parcel_free(&rilp);
-	return ret;
-}
-
 static void ril_pin_change_state(struct ofono_sim *sim,
 				enum ofono_sim_password_type passwd_type,
 				int enable, const char *passwd,
 				ofono_sim_lock_unlock_cb_t cb, void *data)
 {
-	DBG("passwd_type=%d", passwd_type);
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data);
 	struct parcel rilp;
@@ -979,6 +868,8 @@ static void ril_pin_change_state(struct ofono_sim *sim,
 	 */
 	switch (passwd_type) {
 	case OFONO_SIM_PASSWORD_SIM_PIN:
+		if (current_passwd)
+			g_stpcpy(current_passwd, passwd);
 		g_ril_append_print_buf(sd->ril, "(SC,");
 		parcel_w_string(&rilp, "SC");
 		break;
@@ -995,9 +886,9 @@ static void ril_pin_change_state(struct ofono_sim *sim,
 		parcel_w_string(&rilp, "P2");
 		break;
 	case OFONO_SIM_PASSWORD_PHNET_PIN:
-		ret = ril_perso_change_state(sim, passwd_type, enable, passwd,
-						cb, data);
-		goto end;
+		g_ril_append_print_buf(sd->ril, "(PN,");
+		parcel_w_string(&rilp, "PN");
+		break;
 	case OFONO_SIM_PASSWORD_PHNETSUB_PIN:
 		g_ril_append_print_buf(sd->ril, "(PU,");
 		parcel_w_string(&rilp, "PU");
@@ -1011,7 +902,8 @@ static void ril_pin_change_state(struct ofono_sim *sim,
 		parcel_w_string(&rilp, "PC");
 		break;
 	default:
-		goto end;
+		CALLBACK_WITH_FAILURE(cb, data);
+		return;
 	}

 	if (enable)
@@ -1038,7 +930,6 @@ static void ril_pin_change_state(struct ofono_sim *sim,

 	g_ril_print_request(sd->ril, ret, request);

-end:
 	parcel_free(&rilp);

 	if (ret <= 0) {
@@ -1060,6 +951,9 @@ static void ril_pin_send_puk(struct ofono_sim *sim,
 	sd->passwd_type = OFONO_SIM_PASSWORD_SIM_PUK;
 	cbd->user = sd;

+	if (current_passwd)
+		g_stpcpy(current_passwd, passwd);
+
 	parcel_init(&rilp);

 	parcel_w_int32(&rilp, ENTER_SIM_PUK_PARAMS);
@@ -1108,6 +1002,8 @@ static void ril_change_passwd(struct ofono_sim *sim,

 	if (passwd_type == OFONO_SIM_PASSWORD_SIM_PIN2)
 		request = RIL_REQUEST_CHANGE_SIM_PIN2;
+	else if (current_passwd)
+		g_stpcpy(current_passwd, new_passwd);

 	ret = g_ril_send(sd->ril, request, rilp.data, rilp.size,
 			ril_pin_change_state_cb, cbd, g_free);
@@ -1133,14 +1029,15 @@ static gboolean ril_sim_register(gpointer user)

 	DBG("");

-	ofono_sim_register(sim);
+	sd->idle_id = 0;

 	send_get_sim_status(sim);

-	sd->idle_id = 0;
-	g_ril_register(sd->ril,
-			RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED,
+	g_ril_register(sd->ril, RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED,
 			(GRilNotifyFunc) ril_sim_status_changed, sim);
+
+	/* TODO: should we also register for RIL_UNSOL_SIM_REFRESH? */
+
 	return FALSE;
 }

@@ -1155,6 +1052,13 @@ static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,

 	sd = g_new0(struct sim_data, 1);
 	sd->ril = g_ril_clone(ril);
+	sd->aid_str = NULL;
+	sd->app_str = NULL;
+	sd->app_type = RIL_APPTYPE_UNKNOWN;
+	sd->passwd_state = OFONO_SIM_PASSWORD_NONE;
+	sd->passwd_type = OFONO_SIM_PASSWORD_NONE;
+	sd->sim_registered = FALSE;
+	sd->card_state = RIL_CARDSTATE_ABSENT;

 	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
 		sd->retries[i] = -1;
@@ -1181,18 +1085,13 @@ static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,

 static void ril_sim_remove(struct ofono_sim *sim)
 {
-	DBG("");
 	struct sim_data *sd = ofono_sim_get_data(sim);

 	ofono_sim_set_data(sim, NULL);

-	if (sd->idle_id > 0) {
+	if (sd->idle_id > 0)
 		g_source_remove(sd->idle_id);
-		sd->idle_id = 0;
-	}

-	g_free(sd->aid_str);
-	g_free(sd->app_str);
 	g_ril_unref(sd->ril);
 	g_free(sd);
 }
@@ -1213,6 +1112,17 @@ static struct ofono_sim_driver driver = {
 	.change_passwd		= ril_change_passwd,
 	.query_pin_retries	= ril_query_pin_retries,
 /*
+ * TODO: Implmenting PIN/PUK support requires defining
+ * the following driver methods.
+ *
+ * In the meanwhile, as long as the SIM card is present,
+ * and unlocked, the core SIM code will check for the
+ * presence of query_passwd_state, and if null, then the
+ * function sim_initialize_after_pin() is called.
+ *
+ *	.query_pin_retries	= ril_pin_retries_query,
+ *	.query_locked		= ril_pin_query_enabled,
+ *
 * TODO: Implementing SIM write file IO support requires
 * the following functions to be defined.
 *
--- a/ofono/drivers/rilmodem/sms.c
+++ b/ofono/drivers/rilmodem/sms.c
@@ -38,18 +38,10 @@
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/sms.h>
-#include <ofono/types.h>
-#include <ofono/sim.h>
-
 #include "smsutil.h"
 #include "util.h"
+
 #include "rilmodem.h"
-#include "simutil.h"
-
-#define SIM_EFSMS_FILEID	0x6F3C
-#define EFSMS_LENGTH		176
-
-unsigned char path[4] = {0x3F, 0x00, 0x7F, 0x10};

 struct sms_data {
 	GRil *ril;
@@ -139,7 +131,7 @@ static void ril_csca_query_cb(struct ril_msg *message, gpointer user_data)
 		sca.number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';

 		DBG("csca_query_cb: %s, %d", sca.number, sca.type);
-		g_free(temp_buf); /*g_utf16_to_utf8 used by parcel_r_string*/
+
 		cb(&error, &sca, cbd->data);
 	} else {
 		ofono_error("return value invalid");
@@ -176,14 +168,10 @@ static void submit_sms_cb(struct ril_msg *message, gpointer user_data)
 	int mr;

 	if (message->error == RIL_E_SUCCESS) {
-		ofono_info("sms sending successful");
+		ofono_info("sms sending succesful");
 		decode_ril_error(&error, "OK");
-	} else if (message->error == RIL_E_GENERIC_FAILURE) {
-		ofono_info("not allowed by MO SMS control, do not retry");
-		error.type = OFONO_ERROR_TYPE_CMS;
-		error.error = 500;
 	} else {
-		ofono_error("sms sending failed, retry");
+		ofono_error("sms sending failed");
 		decode_ril_error(&error, "FAIL");
 	}

@@ -242,8 +230,6 @@ static void ril_cmgs(struct ofono_sms *sms, const unsigned char *pdu,
 				submit_sms_cb, cbd, g_free);

 	g_ril_append_print_buf(sd->ril, "(%s)", tpdu);
-	g_free(tpdu);
-	tpdu = NULL;
 	g_ril_print_request(sd->ril, ret, request);

 	parcel_free(&rilp);
@@ -262,21 +248,19 @@ static void ril_ack_delivery_cb(struct ril_msg *message, gpointer user_data)
 			"SMS acknowledgement failed: Further SMS reception is not guaranteed");
 }

-static void ril_ack_delivery(struct ofono_sms *sms, int error)
+static void ril_ack_delivery(struct ofono_sms *sms)
 {
 	struct sms_data *sd = ofono_sms_get_data(sms);
 	struct parcel rilp;
 	int ret;
 	int request = RIL_REQUEST_SMS_ACKNOWLEDGE;
-	int code = 0;
-
-	if (!error)
-		code = 0xFF;

 	parcel_init(&rilp);
 	parcel_w_int32(&rilp, 2); /* Number of int32 values in array */
-	parcel_w_int32(&rilp, error); /* Successful (1)/Failed (0) receipt */
-	parcel_w_int32(&rilp, code); /* error code */
+	parcel_w_int32(&rilp, 1); /* Successful receipt */
+	parcel_w_int32(&rilp, 0); /* error code */
+
+	/* TODO: should ACK be sent for either of the error cases? */

 	/* ACK the incoming NEW_SMS */
 	ret = g_ril_send(sd->ril, request,
@@ -301,9 +285,6 @@ static void ril_sms_notify(struct ril_msg *message, gpointer user_data)
 	long ril_buf_len;
 	guchar *ril_data;

-	ril_pdu = NULL;
-	ril_data = NULL;
-
 	DBG("req: %d; data_len: %d", message->req, message->buf_len);

 	switch (message->req) {
@@ -336,8 +317,6 @@ static void ril_sms_notify(struct ril_msg *message, gpointer user_data)
 	ofono_info("sms received, smsc_len is %d", smsc_len);

 	g_ril_append_print_buf(sd->ril, "(%s)", ril_pdu);
-	g_free(ril_pdu);
-	ril_pdu = NULL;
 	g_ril_print_unsol(sd->ril, message);

 	if (message->req == RIL_UNSOL_RESPONSE_NEW_SMS) {
@@ -350,116 +329,14 @@ static void ril_sms_notify(struct ril_msg *message, gpointer user_data)
 						ril_buf_len - smsc_len);
 	}

-	g_free(ril_data);
-	ril_data = NULL;
-
-	ril_ack_delivery(sms, TRUE);
+	ril_ack_delivery(sms);

 	return;

 error:
-	g_free(ril_pdu);
-	ril_pdu = NULL;
-
-	g_free(ril_data);
-	ril_data = NULL;
-
-	ril_ack_delivery(sms, FALSE);
-
 	ofono_error("Unable to parse NEW_SMS notification");
 }

-static void ril_new_sms_on_sim_cb(struct ril_msg *message, gpointer user_data)
-{
-	DBG("");
-	if (message->error == RIL_E_SUCCESS)
-		ofono_info("sms deleted from sim");
-	else
-		ofono_error("deleting sms from sim failed");
-}
-
-static void ril_request_delete_sms_om_sim(struct ofono_sms *sms,int record)
-{
-	struct sms_data *data = ofono_sms_get_data(sms);
-	struct parcel rilp;
-	int request = RIL_REQUEST_DELETE_SMS_ON_SIM;
-	int ret;
-
-	DBG("Deleting record: %d", record);
-
-	parcel_init(&rilp);
-	parcel_w_int32(&rilp, 1); /* Number of int32 values in array */
-	parcel_w_int32(&rilp, record);
-
-	ret = g_ril_send(data->ril, request, rilp.data,
-				rilp.size, ril_new_sms_on_sim_cb, NULL, NULL);
-
-	parcel_free(&rilp);
-
-	if (ret <= 0)
-		ofono_error("cannot delete sms from sim");
-}
-
-static void ril_read_sms_on_sim_cb(const struct ofono_error *error,
-					const unsigned char *sdata,
-					int length, void *data)
-{
-	struct cb_data *cbd = data;
-	struct ofono_sms *sms = cbd->user;
-	int record;
-	unsigned int smsc_len;
-
-	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
-		ofono_error("cannot read sms from sim");
-		goto exit;
-	}
-
-	/*
-	 * It seems when reading EFsms RIL returns the whole record including
-	 * the first status byte therefore we ignore that as we are only
-	 * interested of the following pdu
-	 */
-	/* The first octect in the pdu contains the SMSC address length
-	 * which is the X following octects it reads. We add 1 octet to
-	 * the read length to take into account this read octet in order
-	 * to calculate the proper tpdu length.
-	 */
-	smsc_len = sdata[1] + 1;
-
-	ofono_sms_deliver_notify(sms, sdata + 1, length - 1,
-				 length - smsc_len - 1);
-
-	record = (int)cbd->data;
-	ril_request_delete_sms_om_sim(sms,record);
-
-exit:
-	g_free(cbd);
-}
-
-static void ril_new_sms_on_sim(struct ril_msg *message, gpointer user_data)
-{
-	struct ofono_sms *sms = user_data;
-	struct parcel rilp;
-	int record;
-
-	ofono_info("new sms on sim");
-
-	ril_util_init_parcel(message, &rilp);
-
-	/* data length of the response */
-	record = parcel_r_int32(&rilp);
-
-	if (record > 0) {
-		record = parcel_r_int32(&rilp);
-		struct cb_data *cbd = cb_data_new2(sms, NULL, (void*)record);
-		DBG(":%d", record);
-		get_sim_driver()->read_file_linear(get_sim(), SIM_EFSMS_FILEID,
-						record, EFSMS_LENGTH, path,
-						sizeof(path),
-						ril_read_sms_on_sim_cb, cbd);
-	}
-}
-
 static gboolean ril_delayed_register(gpointer user_data)
 {
 	struct ofono_sms *sms = user_data;
@@ -475,8 +352,6 @@ static gboolean ril_delayed_register(gpointer user_data)
 			ril_sms_notify, sms);
 	g_ril_register(data->ril, RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT,
 			ril_sms_notify, sms);
-	g_ril_register(data->ril, RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM,
-			ril_new_sms_on_sim, sms);

 	/* This makes the timeout a single-shot */
 	return FALSE;
--- a/ofono/drivers/rilmodem/stk.c
+++ b/ofono/drivers/rilmodem/stk.c
@@ -1,342 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2014 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.
- *
- *  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 <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include <glib.h>
-
-#include <ofono/log.h>
-#include <ofono/modem.h>
-#include <ofono/stk.h>
-
-#include "gril.h"
-#include "util.h"
-
-#include "rilmodem.h"
-#include "ril_constants.h"
-
-struct stk_data {
-	GRil *ril;
-};
-
-gboolean subscribed;
-
-static void ril_envelope_cb(struct ril_msg *message, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_stk_envelope_cb_t cb = cbd->cb;
-	struct ofono_error error;
-
-	DBG("");
-
-	if (message->error == RIL_E_SUCCESS) {
-		decode_ril_error(&error, "OK");
-	} else {
-		DBG("Envelope reply failure: %s",
-				ril_error_to_string(message->error));
-		decode_ril_error(&error, "FAIL");
-	}
-
-	cb(&error, NULL, 0, cbd->data);
-}
-
-static void ril_stk_envelope(struct ofono_stk *stk, int length,
-				const unsigned char *command,
-				ofono_stk_envelope_cb_t cb, void *data)
-{
-	struct stk_data *sd = ofono_stk_get_data(stk);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	struct parcel rilp;
-	char *hex_envelope = NULL;
-	int request = RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND;
-	guint ret;
-
-	DBG("");
-
-	hex_envelope = encode_hex(command, length, 0);
-	DBG("rilmodem envelope: %s", hex_envelope);
-
-	parcel_init(&rilp);
-	parcel_w_string(&rilp, hex_envelope);
-	g_free(hex_envelope);
-	hex_envelope = NULL;
-
-	ret = g_ril_send(sd->ril, request,
-				rilp.data, rilp.size, ril_envelope_cb,
-				cbd, g_free);
-
-	parcel_free(&rilp);
-
-	if (ret <= 0) {
-			g_free(cbd);
-			CALLBACK_WITH_FAILURE(cb, NULL, -1, data);
-		}
-}
-
-static void ril_tr_cb(struct ril_msg *message, gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_stk_generic_cb_t cb = cbd->cb;
-	struct ofono_error error;
-
-	DBG("");
-
-	if (message->error == RIL_E_SUCCESS) {
-		decode_ril_error(&error, "OK");
-	} else {
-		DBG("Error in sending terminal response");
-		ofono_error("Error in sending terminal response");
-		decode_ril_error(&error, "FAIL");
-	}
-
-	cb(&error, cbd->data);
-}
-
-static void ril_stk_terminal_response(struct ofono_stk *stk, int length,
-					const unsigned char *resp,
-					ofono_stk_generic_cb_t cb, void *data)
-{
-	struct stk_data *sd = ofono_stk_get_data(stk);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	struct parcel rilp;
-	char *hex_tr = NULL;
-	int request = RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE;
-	guint ret;
-
-	DBG("");
-
-	hex_tr = encode_hex(resp, length, 0);
-	DBG("rilmodem terminal response: %s", hex_tr);
-
-	parcel_init(&rilp);
-	parcel_w_string(&rilp, hex_tr);
-	g_free(hex_tr);
-	hex_tr = NULL;
-
-	ret = g_ril_send(sd->ril, request,
-				rilp.data, rilp.size, ril_tr_cb,
-				cbd, g_free);
-
-	parcel_free(&rilp);
-
-	if (ret <= 0) {
-			g_free(cbd);
-			CALLBACK_WITH_FAILURE(cb, data);
-		}
-}
-
-static void ril_stk_user_confirmation(struct ofono_stk *stk,
-					ofono_bool_t confirm)
-{
-	struct stk_data *sd = ofono_stk_get_data(stk);
-	struct parcel rilp;
-	int request = RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM;
-	int ret;
-
-	DBG("");
-
-	/* Only pcmd needing user confirmation is call set up
-	 * RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM
-	 */
-	parcel_init(&rilp);
-	parcel_w_int32(&rilp, 1);		/* size of array */
-	parcel_w_int32(&rilp, confirm);	/* yes/no */
-
-	/* fire and forget i.e. not waiting for the callback*/
-	ret = g_ril_send(sd->ril, request, rilp.data,
-		 rilp.size, NULL, NULL, NULL);
-
-	g_ril_print_request_no_args(sd->ril, ret, request);
-
-	parcel_free(&rilp);
-}
-
-static void ril_stk_pcmd_notify(struct ril_msg *message, gpointer user_data)
-{
-	struct ofono_stk *stk = user_data;
-	struct parcel rilp;
-	char *pcmd = NULL;
-	guchar *pdu = NULL;
-	long len;
-
-	DBG("");
-
-	ril_util_init_parcel(message, &rilp);
-	pcmd = parcel_r_string(&rilp);
-	DBG("pcmd: %s", pcmd);
-
-	pdu = decode_hex((const char *) pcmd,
-			strlen(pcmd),
-			&len, -1);
-
-	g_free(pcmd);
-	ofono_stk_proactive_command_notify(stk, len, (const guchar *)pdu);
-	g_free(pdu);
-}
-
-static void ril_stk_event_notify(struct ril_msg *message, gpointer user_data)
-{
-	struct ofono_stk *stk = user_data;
-	struct parcel rilp;
-	char *pcmd = NULL;
-	guchar *pdu = NULL;
-	long len;
-
-	DBG("");
-
-	/* Proactive command has been handled by the modem. */
-	ril_util_init_parcel(message, &rilp);
-	pcmd = parcel_r_string(&rilp);
-	DBG("pcmd: %s", pcmd);
-	pdu = decode_hex((const char *) pcmd,
-			strlen(pcmd),
-			&len, -1);
-	g_free(pcmd);
-	pcmd = NULL;
-	ofono_stk_proactive_command_handled_notify(stk, len,
-			(const guchar *)pdu);
-	g_free(pdu);
-}
-
-static void ril_stk_session_end_notify(struct ril_msg *message,
-					gpointer user_data)
-{
-	struct ofono_stk *stk = user_data;
-
-	DBG("");
-
-	ofono_stk_proactive_session_end_notify(stk);
-}
-
-static void ril_stk_agent_ready(struct ofono_stk *stk)
-{
-	struct stk_data *sd = ofono_stk_get_data(stk);
-	int request = RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING;
-	int ret;
-
-	DBG("");
-
-	if (!subscribed) {
-		DBG("Subscribing notifications");
-		g_ril_register(sd->ril, RIL_UNSOL_STK_PROACTIVE_COMMAND,
-				ril_stk_pcmd_notify, stk);
-
-		g_ril_register(sd->ril, RIL_UNSOL_STK_SESSION_END,
-				ril_stk_session_end_notify, stk);
-
-		g_ril_register(sd->ril, RIL_UNSOL_STK_EVENT_NOTIFY,
-				ril_stk_event_notify, stk);
-		subscribed = TRUE;
-	}
-
-	/* fire and forget i.e. not waiting for the callback*/
-	ret = g_ril_send(sd->ril, request, NULL, 0,
-		 NULL, NULL, NULL);
-
-	g_ril_print_request_no_args(sd->ril, ret, request);
-}
-
-void ril_stk_set_lang()
-{
-	gchar *contents;
-	GError *err = NULL;
-
-	if (!g_file_get_contents(UI_LANG, &contents, NULL, &err)) {
-		if (err)
-			ofono_error("cannot open %s error: %d: message: %s",
-					UI_LANG, err->code, err->message);
-		g_error_free(err);
-	} else {
-		gchar *pch = g_strrstr(contents, CFG_LANG);
-		/* Set System UI lang to env LANG */
-		if (pch) {
-			setenv("LANG", pch + strlen(CFG_LANG), 1);
-			DBG("LANG %s", getenv("LANG"));
-		}
-		g_free(contents);
-	}
-}
-
-static int ril_stk_probe(struct ofono_stk *stk, unsigned int vendor, void *data)
-{
-	GRil *ril = data;
-	struct stk_data *sd;
-
-	DBG("");
-
-	sd = g_try_new0(struct stk_data, 1);
-	if (sd == NULL)
-		return -ENOMEM;
-
-	sd->ril = g_ril_clone(ril);
-	ofono_stk_set_data(stk, sd);
-
-	/* Register interface in this phase for stk agent */
-	ofono_stk_register(stk);
-
-	subscribed = FALSE;
-
-	/* UI language for local info */
-	ril_stk_set_lang();
-
-	return 0;
-}
-
-static void ril_stk_remove(struct ofono_stk *stk)
-{
-	struct stk_data *sd = ofono_stk_get_data(stk);
-
-	DBG("");
-
-	ofono_stk_set_data(stk, NULL);
-
-	g_ril_unref(sd->ril);
-	g_free(sd);
-}
-
-static struct ofono_stk_driver driver = {
-	.name			= "rilmodem",
-	.probe			= ril_stk_probe,
-	.remove			= ril_stk_remove,
-	.envelope		= ril_stk_envelope,
-	.terminal_response	= ril_stk_terminal_response,
-	.user_confirmation	= ril_stk_user_confirmation,
-	.ready			= ril_stk_agent_ready
-};
-
-void ril_stk_init(void)
-{
-	ofono_stk_driver_register(&driver);
-}
-
-void ril_stk_exit(void)
-{
-	ofono_stk_driver_unregister(&driver);
-}
--- a/ofono/drivers/rilmodem/ussd.c
+++ b/ofono/drivers/rilmodem/ussd.c
@@ -68,37 +68,19 @@ static void ril_ussd_request(struct ofono_ussd *ussd, int dcs,
 	enum sms_charset charset;
 	int ret = -1;

-	ofono_info("send ussd, len:%d", len);
+	ofono_info("send ussd");

 	if (cbs_dcs_decode(dcs, NULL, NULL, &charset,
 					NULL, NULL, NULL)) {
 		if (charset == SMS_CHARSET_7BIT) {
 			unsigned char unpacked_buf[182] = "";
 			long written;
-			int length;

 			unpack_7bit_own_buf(pdu, len, 0, TRUE,
 					sizeof(unpacked_buf), &written, 0,
 					unpacked_buf);

 			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. And in addition written doesn't
-				   contain correct length...
-
-				   Over 2 characters long USSD string must
-				   end with # (checked in
-				   valid_ussd_string() ), so it should be
-				   safe to remove extra CR.
-				*/
-				length = strlen((char *)unpacked_buf);
-				if (length > 2 &&
-				    unpacked_buf[length-1] == '\r')
-					unpacked_buf[length-1] = 0;
 				struct parcel rilp;
 				parcel_init(&rilp);
 				parcel_w_string(&rilp, (char *)unpacked_buf);
@@ -167,9 +149,9 @@ static void ril_ussd_notify(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_ussd *ussd = user_data;
 	struct parcel rilp;
-	gchar *ussd_from_network = NULL;
-	gchar *type = NULL;
-	gint ussdtype = 0;
+	gchar *ussd_from_network;
+	gchar *type;
+	gint ussdtype;

 	ofono_info("ussd_received");

@@ -177,17 +159,13 @@ static void ril_ussd_notify(struct ril_msg *message, gpointer user_data)
 	parcel_r_int32(&rilp);
 	type = parcel_r_string(&rilp);
 	ussdtype = g_ascii_xdigit_value(*type);
-	g_free(type);
-	type = NULL;
 	ussd_from_network = parcel_r_string(&rilp);

-	/* ussd_from_network not freed because core does that if dcs is 0xFF */
-	if (ussd_from_network) {
-		DBG("ussd_received, length %d", strlen(ussd_from_network));
+	if (ussd_from_network)
 		ofono_ussd_notify(ussd, ussdtype, 0xFF,
 			(const unsigned char *)ussd_from_network,
 			strlen(ussd_from_network));
-	} else
+	else
 		ofono_ussd_notify(ussd, ussdtype, 0, NULL, 0);

 	return;
--- a/ofono/drivers/rilmodem/voicecall.c
+++ b/ofono/drivers/rilmodem/voicecall.c
@@ -4,7 +4,7 @@
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
 *  Copyright (C) 2012 Canonical Ltd.
- *  Copyright (C) 2014 Jolla Ltd.
+ *  Copyright (C) 2013 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,7 +45,9 @@

 /* Amount of ms we wait between CLCC calls */
 #define POLL_CLCC_INTERVAL 300
+
 #define FLAG_NEED_CLIP 1
+
 #define MAX_DTMF_BUFFER 32

 struct voicecall_data {
@@ -84,21 +86,6 @@ struct lastcause_req {
 static void send_one_dtmf(struct voicecall_data *vd);
 static void clear_dtmf_queue(struct voicecall_data *vd);

-/*
- * structs ofono_voicecall and voicecall are fully defined
- * in src/voicecall.c; we need (read) access to the
- * call objects, so partially redefine them here.
- */
-struct ofono_voicecall {
-	GSList *call_list;
-	/* ... */
-};
-
-struct voicecall {
-	struct ofono_call *call;
-	/* ... */
-};
-
 static void lastcause_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct lastcause_req *reqdata = user_data;
@@ -112,38 +99,11 @@ static void lastcause_cb(struct ril_msg *message, gpointer user_data)
 	if (parcel_r_int32(&rilp) > 0)
 		last_cause = parcel_r_int32(&rilp);

-	/*
-	 * Not all call control cause values specified in 3GPP TS 24.008
-	 * "Mobile radio interface Layer 3 specification; Core network protocols",
-	 * Annex H, are properly reflected in the RIL API. For example, cause
-	 * #21 "call rejected" is mapped to CALL_FAIL_ERROR_UNSPECIFIED, and
-	 * thus indistinguishable from a network failure.
-	 * We signal disconnect reason "remote" for cause values
-	 *   - #16 "normal call clearing"
-	 *   - #17 "user busy"
-	 *   - UNSPECIFIED for MO calls that are not yet connected
-	 * , and disconnect reason "network" otherwise.
-	 */
 	ofono_info("Call %d ended with RIL cause %d", id, last_cause);
 	if (last_cause == CALL_FAIL_NORMAL || last_cause == CALL_FAIL_BUSY) {
 		reason = OFONO_DISCONNECT_REASON_REMOTE_HANGUP;
 	}

-	if (last_cause == CALL_FAIL_ERROR_UNSPECIFIED) {
-		GSList *l;
-		struct voicecall *v;
-		for (l = vc->call_list; l; l = l->next) {
-			v = l->data;
-			if (v->call->id == id) {
-				if (v->call->status == CALL_STATUS_DIALING
-					|| v->call->status == CALL_STATUS_ALERTING) {
-					reason = OFONO_DISCONNECT_REASON_REMOTE_HANGUP;
-				}
-				break;
-			}
-		}
-	}
-
 	ofono_voicecall_disconnected(vc, id, reason, NULL);
 }

@@ -276,8 +236,6 @@ static void generic_cb(struct ril_msg *message, gpointer user_data)
 	int request = RIL_REQUEST_GET_CURRENT_CALLS;
 	int ret;

-	ofono_info("request:%d",message->req);
-
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
 	} else {
@@ -382,17 +340,15 @@ static void ril_dial(struct ofono_voicecall *vc,
 	struct parcel rilp;
 	int request = RIL_REQUEST_DIAL;
 	int ret;
-	char *phstr = NULL;

-	phstr = (char *) phone_number_to_string(ph);
-	ofono_info("dialing \"%s\"", phstr);
+	ofono_info("dialing");

 	cbd->user = vc;

 	parcel_init(&rilp);

 	/* Number to dial */
-	parcel_w_string(&rilp, phstr);
+        parcel_w_string(&rilp, (char *) phone_number_to_string(ph));
 	/* CLIR mode */
 	parcel_w_int32(&rilp, clir);
 	/* USS, need it twice for absent */
@@ -525,7 +481,6 @@ static void ril_ss_notify(struct ril_msg *message, gpointer user_data)
 				strncpy(number.number, tmp_number,
 					OFONO_MAX_PHONE_NUMBER_LENGTH);

-			g_free(tmp_number);
 			DBG("RIL data: MT/MO: %i, code: %i, index: %i",
 				notification_type, code, index);
 		break;
@@ -679,13 +634,6 @@ static void ril_create_multiparty(struct ofono_voicecall *vc,
 		cb(&error, data);
 }

-static void ril_transfer(struct ofono_voicecall *vc,
-			ofono_voicecall_cb_t cb, void *data)
-{
-	ril_template(RIL_REQUEST_EXPLICIT_CALL_TRANSFER, vc, generic_cb, 0,
-				NULL, 0, cb, data);
-}
-
 static void private_chat_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_error error;
@@ -779,23 +727,6 @@ static gboolean enable_supp_svc(gpointer user_data)
 	return FALSE;
 }

-static void ril_ringback_tone_notify(struct ril_msg *message,
-	gpointer user_data)
-{
-	struct parcel rilp;
-	struct ofono_voicecall *vc = user_data;
-	gboolean playTone = FALSE;
-
-	ril_util_init_parcel(message, &rilp);
-
-	if (message->req == RIL_UNSOL_RINGBACK_TONE) {
-		if (parcel_r_int32(&rilp) > 0)
-			playTone = parcel_r_int32(&rilp);
-		DBG("play ringback tone: %d", playTone);
-		ofono_voicecall_ringback_tone_notify(vc, playTone);
-	}
-}
-
 static gboolean ril_delayed_register(gpointer user_data)
 {
 	struct ofono_voicecall *vc = user_data;
@@ -816,10 +747,6 @@ static gboolean ril_delayed_register(gpointer user_data)
 	g_ril_register(vd->ril, RIL_UNSOL_SUPP_SVC_NOTIFICATION,
 			ril_ss_notify, vc);

-	/* Register for ringback tone notifications */
-	g_ril_register(vd->ril, RIL_UNSOL_RINGBACK_TONE,
-			ril_ringback_tone_notify, vc);
-
 	/* request supplementary service notifications*/
 	enable_supp_svc(vc);

@@ -876,7 +803,6 @@ static void ril_voicecall_remove(struct ofono_voicecall *vc)
 	if (vd->timer_id > 0)
 		g_source_remove(vd->timer_id);

-	g_free(vd->tone_queue);
 	g_ril_unref(vd->ril);
 	g_free(vd);
 }
@@ -891,13 +817,12 @@ static struct ofono_voicecall_driver driver = {
 	.release_specific		= ril_hangup_specific,
 	.send_tones			= ril_send_dtmf,
 	.create_multiparty		= ril_create_multiparty,
-	.transfer			= ril_transfer,
 	.private_chat			= ril_private_chat,
 	.swap_without_accept		= ril_swap_without_accept,
 	.hold_all_active		= ril_hold_all_active,
 	.release_all_held		= ril_release_all_held,
 	.set_udub			= ril_set_udub,
-	.release_all_active		= ril_release_all_active,
+	.release_all_active	= ril_release_all_active,
 };

 void ril_voicecall_init(void)
--- a/ofono/drivers/telitmodem/location-reporting.c
+++ b/ofono/drivers/telitmodem/location-reporting.c
@@ -1,315 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2014  Intel Corporation. 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 <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include <glib.h>
-
-#include <ofono/log.h>
-#include <ofono/modem.h>
-#include <ofono/location-reporting.h>
-
-#include "gatchat.h"
-#include "gatresult.h"
-#include "gattty.h"
-
-#include "telitmodem.h"
-
-static const char *none_prefix[] = { NULL };
-static const char *portcfg_prefix[] = { "#PORTCFG:", NULL };
-static const char *gpsctl_prefix[] = { "$GPSP:", NULL };
-
-struct gps_data {
-	GAtChat *chat;
-};
-
-static void telit_gps_disable_cb(gboolean ok, GAtResult *result,
-							gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	struct ofono_location_reporting *lr = cbd->user;
-	ofono_location_reporting_disable_cb_t cb = cbd->cb;
-
-	DBG("lr=%p, ok=%d", lr, ok);
-
-	if (!ok) {
-		struct ofono_error error;
-
-		decode_at_error(&error, g_at_result_final_response(result));
-		cb(&error, cbd->data);
-
-		return;
-	}
-
-	CALLBACK_WITH_SUCCESS(cb, cbd->data);
-}
-
-static void telit_location_reporting_disable(
-				struct ofono_location_reporting *lr,
-				ofono_location_reporting_disable_cb_t cb,
-				void *data)
-{
-	struct gps_data *gd = ofono_location_reporting_get_data(lr);
-	struct cb_data *cbd = cb_data_new(cb, data);
-
-	DBG("lr=%p", lr);
-
-	cbd->user = lr;
-
-	if (g_at_chat_send(gd->chat, "AT$GPSP=0", none_prefix,
-				telit_gps_disable_cb, cbd, g_free) > 0)
-		return;
-
-	CALLBACK_WITH_FAILURE(cb, data);
-
-	g_free(cbd);
-}
-
-static int enable_data_stream(struct ofono_location_reporting *lr)
-{
-	struct ofono_modem *modem;
-	const char *gps_dev;
-	GHashTable *options;
-	GIOChannel *channel;
-	int fd;
-
-	modem = ofono_location_reporting_get_modem(lr);
-	gps_dev = ofono_modem_get_string(modem, "GPS");
-
-	options = g_hash_table_new(g_str_hash, g_str_equal);
-	if (options == NULL)
-		return -1;
-
-	g_hash_table_insert(options, "Baud", "115200");
-
-	channel = g_at_tty_open(gps_dev, options);
-
-	g_hash_table_destroy(options);
-
-	if (channel == NULL)
-		return -1;
-
-	fd = g_io_channel_unix_get_fd(channel);
-
-	g_io_channel_set_close_on_unref(channel, FALSE);
-	g_io_channel_unref(channel);
-
-	return fd;
-}
-
-static void telit_gps_ctl_cb(gboolean ok, GAtResult *result,
-					gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_location_reporting_enable_cb_t cb = cbd->cb;
-	struct ofono_location_reporting *lr = cbd->user;
-	struct ofono_error error;
-	int fd;
-
-	DBG("lr=%p ok=%d", lr, ok);
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok) {
-		cb(&error, -1, cbd->data);
-
-		return;
-	}
-
-	fd = enable_data_stream(lr);
-
-	if (fd < 0) {
-		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-
-		return;
-	}
-
-	cb(&error, fd, cbd->data);
-	close(fd);
-}
-
-static void telit_gps_enable_cb(gboolean ok, GAtResult *result,
-					gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_location_reporting_enable_cb_t cb = cbd->cb;
-	struct ofono_location_reporting *lr = cbd->user;
-	struct gps_data *gd = ofono_location_reporting_get_data(lr);
-	struct ofono_error error;
-
-	DBG("lr=%p ok=%d", lr, ok);
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok) {
-		cb(&error, -1, cbd->data);
-
-		g_free(cbd);
-		return;
-	}
-
-	if (g_at_chat_send(gd->chat, "AT$GPSNMUN=1,0,0,0,0,0,0",
-				none_prefix, telit_gps_ctl_cb, cbd, g_free) > 0)
-		return;
-
-	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-	g_free(cbd);
-}
-
-static void telit_portcfg_check_cb(gboolean ok, GAtResult *result,
-					gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_location_reporting_enable_cb_t cb = cbd->cb;
-	struct ofono_location_reporting *lr = cbd->user;
-	struct gps_data *gd = ofono_location_reporting_get_data(lr);
-	struct ofono_error error;
-	int requested_portcfg, current_portcfg;
-	GAtResultIter iter;
-
-	DBG("lr=%p ok=%d", lr, ok);
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok) {
-		cb(&error, -1, cbd->data);
-
-		g_free(cbd);
-		return;
-	}
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "#PORTCFG:"))
-		goto fail;
-
-	if (!g_at_result_iter_next_number(&iter, &requested_portcfg))
-		goto fail;
-
-	if (!g_at_result_iter_next_number(&iter, &current_portcfg))
-		goto fail;
-
-	if (current_portcfg != 8) {
-		ofono_warn("Unable to start GPS, modem configuration invalid");
-		ofono_warn("Refer to doc/telit-modem.txt section HE910/GPS");
-		goto fail;
-	}
-
-	if (g_at_chat_send(gd->chat, "AT$GPSP=1", none_prefix,
-				telit_gps_enable_cb, cbd, NULL) > 0)
-		return;
-
-fail:
-	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-	g_free(cbd);
-}
-
-static void telit_location_reporting_enable(struct ofono_location_reporting *lr,
-					ofono_location_reporting_enable_cb_t cb,
-					void *data)
-{
-	struct gps_data *gd = ofono_location_reporting_get_data(lr);
-	struct cb_data *cbd = cb_data_new(cb, data);
-
-	DBG("lr=%p", lr);
-
-	cbd->user = lr;
-
-	if (g_at_chat_send(gd->chat, "AT#PORTCFG?", portcfg_prefix,
-				telit_portcfg_check_cb, cbd, NULL) > 0)
-		return;
-
-	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-	g_free(cbd);
-}
-
-static void telit_location_reporting_support_cb(gboolean ok, GAtResult *result,
-							gpointer user_data)
-{
-	struct ofono_location_reporting *lr = user_data;
-
-	if (!ok) {
-		ofono_location_reporting_remove(lr);
-
-		return;
-	}
-
-	ofono_location_reporting_register(lr);
-}
-
-static int telit_location_reporting_probe(struct ofono_location_reporting *lr,
-						unsigned int vendor, void *data)
-{
-	GAtChat *chat = data;
-	struct gps_data *gd;
-
-	gd = g_try_new0(struct gps_data, 1);
-	if (gd == NULL)
-		return -ENOMEM;
-
-	gd->chat = g_at_chat_clone(chat);
-
-	ofono_location_reporting_set_data(lr, gd);
-
-	g_at_chat_send(gd->chat, "AT$GPSP=?", gpsctl_prefix,
-					telit_location_reporting_support_cb,
-					lr, NULL);
-
-	return 0;
-}
-
-static void telit_location_reporting_remove(struct ofono_location_reporting *lr)
-{
-	struct gps_data *gd = ofono_location_reporting_get_data(lr);
-
-	ofono_location_reporting_set_data(lr, NULL);
-
-	g_at_chat_unref(gd->chat);
-	g_free(gd);
-}
-
-static struct ofono_location_reporting_driver driver = {
-	.name			= "telitmodem",
-	.type			= OFONO_LOCATION_REPORTING_TYPE_NMEA,
-	.probe			= telit_location_reporting_probe,
-	.remove			= telit_location_reporting_remove,
-	.enable			= telit_location_reporting_enable,
-	.disable		= telit_location_reporting_disable,
-};
-
-void telit_location_reporting_init()
-{
-	ofono_location_reporting_driver_register(&driver);
-}
-
-void telit_location_reporting_exit()
-{
-	ofono_location_reporting_driver_unregister(&driver);
-}
--- a/ofono/drivers/telitmodem/telitmodem.c
+++ b/ofono/drivers/telitmodem/telitmodem.c
@@ -1,49 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2011  Intel Corporation. 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
-
-#include <glib.h>
-#include <gatchat.h>
-
-#define OFONO_API_SUBJECT_TO_CHANGE
-#include <ofono/plugin.h>
-#include <ofono/types.h>
-
-#include "telitmodem.h"
-
-static int telitmodem_init(void)
-{
-	telit_location_reporting_init();
-
-	return 0;
-}
-
-static void telitmodem_exit(void)
-{
-	telit_location_reporting_exit();
-}
-
-OFONO_PLUGIN_DEFINE(telitmodem, "Telit modem driver", VERSION,
-			OFONO_PLUGIN_PRIORITY_DEFAULT,
-			telitmodem_init, telitmodem_exit)
--- a/ofono/drivers/telitmodem/telitmodem.h
+++ b/ofono/drivers/telitmodem/telitmodem.h
@@ -1,25 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2011  Intel Corporation. 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
- *
- */
-
-#include <drivers/atmodem/atutil.h>
-
-extern void telit_location_reporting_init();
-extern void telit_location_reporting_exit();
--- a/ofono/dundee/bluez4.c
+++ b/ofono/dundee/bluez4.c
@@ -128,8 +128,9 @@ static void bt_connect(struct dundee_device *device,
 	if (status == 0)
 		return;

-	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
 	g_free(cbd);
+
+	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
 }

 struct dundee_device_driver bluetooth_driver = {
--- a/ofono/dundee/dundee.service.in
+++ b/ofono/dundee/dundee.service.in
@@ -1,7 +1,6 @@
 [Unit]
 Description=DUN service
-Requires=dbus.service
-After=dbus.service
+After=syslog.target

 [Service]
 Type=dbus
--- a/ofono/gatchat/gatchat.c
+++ b/ofono/gatchat/gatchat.c
@@ -583,7 +583,7 @@ static void have_line(struct at_chat *p, char *str)
 		return;

 	/* Check for echo, this should not happen, but lets be paranoid */
-	if (!strncmp(str, "AT", 2))
+	if (!strncmp(str, "AT", 2) == TRUE)
 		goto done;

 	cmd = g_queue_peek_head(p->command_queue);
@@ -835,9 +835,6 @@ static gboolean can_write_data(gpointer data)
 	gsize len;
 	char *cr;
 	gboolean wakeup_first = FALSE;
-#ifdef WRITE_SCHEDULER_DEBUG
-	int limiter;
-#endif

 	/* Grab the first command off the queue and write as
 	 * much of it as we can
@@ -889,20 +886,13 @@ static gboolean can_write_data(gpointer data)
 		towrite = cr - (cmd->cmd + chat->cmd_bytes_written) + 1;

 #ifdef WRITE_SCHEDULER_DEBUG
-	limiter = towrite;
-
-	if (limiter > 5)
-		limiter = 5;
+	if (towrite > 5)
+		towrite = 5;
 #endif

 	bytes_written = g_at_io_write(chat->io,
 					cmd->cmd + chat->cmd_bytes_written,
-#ifdef WRITE_SCHEDULER_DEBUG
-					limiter
-#else
-					towrite
-#endif
-					);
+					towrite);

 	if (bytes_written == 0)
 		return FALSE;
@@ -1135,29 +1125,6 @@ static gboolean at_chat_cancel_group(struct at_chat *chat, guint group)
 	return TRUE;
 }

-static gpointer at_chat_get_userdata(struct at_chat *chat,
-						guint group, guint id)
-{
-	GList *l;
-	struct at_command *c;
-
-	if (chat->command_queue == NULL)
-		return NULL;
-
-	l = g_queue_find_custom(chat->command_queue, GUINT_TO_POINTER(id),
-				at_command_compare_by_id);
-
-	if (l == NULL)
-		return NULL;
-
-	c = l->data;
-
-	if (c->gid != group)
-		return NULL;
-
-	return c->user_data;
-}
-
 static guint at_chat_register(struct at_chat *chat, guint group,
 				const char *prefix, GAtNotifyFunc func,
 				gboolean expect_pdu, gpointer user_data,
@@ -1563,14 +1530,6 @@ gboolean g_at_chat_cancel_all(GAtChat *chat)
 	return at_chat_cancel_group(chat->parent, chat->group);
 }

-gpointer g_at_chat_get_userdata(GAtChat *chat, guint id)
-{
-	if (chat == NULL)
-		return NULL;
-
-	return at_chat_get_userdata(chat->parent, chat->group, id);
-}
-
 guint g_at_chat_register(GAtChat *chat, const char *prefix,
 				GAtNotifyFunc func, gboolean expect_pdu,
 				gpointer user_data,
--- a/ofono/gatchat/gatchat.h
+++ b/ofono/gatchat/gatchat.h
@@ -150,8 +150,6 @@ guint g_at_chat_send_and_expect_short_prompt(GAtChat *chat, const char *cmd,
 gboolean g_at_chat_cancel(GAtChat *chat, guint id);
 gboolean g_at_chat_cancel_all(GAtChat *chat);

-gpointer g_at_chat_get_userdata(GAtChat *chat, guint id);
-
 guint g_at_chat_register(GAtChat *chat, const char *prefix,
 				GAtNotifyFunc func, gboolean expect_pdu,
 				gpointer user_data, GDestroyNotify notify);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Miia Leinonen	72395683a1	[rilmodem] Fix for Call Barring commit Signed-off-by: Miia Leinonen <miia.leinonen@oss.tieto.com>	2014-01-16 09:52:30 +02:00
Miia Leinonen	f595d0fae0	[rilmodem] Add Call Barring support Signed-off-by: Miia Leinonen <miia.leinonen@oss.tieto.com>	2014-01-16 09:52:30 +02:00
Jarko Poutiainen	a170c3a01e	[rilmodem] add missing brace characters Signed-off-by: Jarko Poutiainen <Jarko.Poutiainen@oss.tieto.com>	2014-01-16 09:52:30 +02:00