[ril] Handle NITZ string without DST part. Fixes JB#41890

[ril] Don't wait for SIM state change after enabling/disabling pin. JB#41508
There's no real need for that, but most importantly no SIM state change event is generated by MTK RIL in such cases.
2025-11-23 10:59:46 +08:00 · 2018-05-16 16:16:31 +03:00 · 2018-05-14 18:51:31 +03:00 · 2018-04-25 11:07:35 +03:00
413 changed files with 30448 additions and 35733 deletions
--- a/ofono/.gitignore
+++ b/ofono/.gitignore
@@ -9,7 +9,7 @@ Makefile.in
 aclocal.m4
 config.guess
 config.h
-config.h.in*
+config.h.in
 config.log
 config.status
 config.sub
@@ -32,8 +32,6 @@ src/ofono.service
 dundee/dundee
 dundee/dundee.service

-test-driver
-test-suite.log
 unit/test-common
 unit/test-util
 unit/test-idmap
@@ -42,35 +40,25 @@ unit/test-sms-root
 unit/test-simutil
 unit/test-mux
 unit/test-caif
-unit/test-cell-info
-unit/test-cell-info-control
-unit/test-cell-info-dbus
 unit/test-stkutil
 unit/test-cdmasms
-unit/test-conf
-unit/test-dbus-access
-unit/test-dbus-clients
 unit/test-dbus-queue
 unit/test-gprs-filter
 unit/test-ril_config
-unit/test-ril_ecclist
 unit/test-ril_util
-unit/test-ril_vendor
-unit/test-ril-transport
 unit/test-rilmodem-cb
 unit/test-rilmodem-cs
 unit/test-rilmodem-gprs
 unit/test-rilmodem-sms
-unit/test-sailfish_access
-unit/test-slot-manager
-unit/test-watch
-unit/test-sim-info
-unit/test-sim-info-dbus
+unit/test-sailfish_cell_info
+unit/test-sailfish_cell_info_dbus
+unit/test-sailfish_manager
+unit/test-sailfish_sim_info
+unit/test-sailfish_sim_info_dbus
+unit/test-sailfish_watch
 unit/test-sms-filter
-unit/test-voicecall-filter
 unit/test-*.log
 unit/test-*.trs
-unit/test-mbim

 unit/test-grilreply
 unit/test-grilrequest
--- a/ofono/AUTHORS
+++ b/ofono/AUTHORS
@@ -115,7 +115,6 @@ Antara Borwankar <antara.borwankar@gmail.com>
 Martin Chaplet <m.chaplet@kerlink.fr>
 Suman Mallela <suman.m@intel.com>
 Rajagopal Aravindan <rajagopalx.aravindan@intel.com>
-Ankit Navik <ankit.p.navik@intel.com>
 Antoine Aubert <a.aubert@overkiz.com>
 Djalal Harouni <djalal@endocode.com>
 Christophe Ronco <c.ronco@kerlink.fr>
@@ -127,15 +126,3 @@ Jonas Bonn <jonas@southpole.se>
 Matthijs Kooijman <matthijs@stdin.nl>
 Clayton Craft <clayton@craftyguy.net>
 Joey Hewitt <joey@joeyhewitt.com>
-Richard Röjfors <richard.rojfors@gmail.com>
-Philippe De Swert <philippe.deswert@nomovok.com>
-Gabriel Lucas <gabriel.lucas@smile.fr>
-Mariem Cherif <mariem.cherif@ardia.com.tn>
-Bassem Boubaker <bassem.boubaker@actia.fr>
-Bob Ham <bob.ham@puri.sm>
-Varun Gargi <varun.gargi@intel.com>
-Florent Beillonnet <florent.beillonnet@gmail.com>
-Martin Hundebøll <martin@geanix.com>
-Julien Tournier <tournier.julien@gmail.com>
-Nandini Rebello <nandini.rebello@intel.com>
-Giacinto Cifelli <gciofono@gmail.com>
--- a/ofono/ChangeLog
+++ b/ofono/ChangeLog
@@ -1,54 +1,3 @@
-ver 1.26:
-	Fix issue with AT callback handler and GPRS.
-	Fix issue with handling EUTRAN SMS only states.
-	Fix issue with handling MBIM strings on big endian.
-	Fix issue with missing char and SMS national language.
-	Fix issue with unsolicited notifications of +CGAUTH/+CGDCONT.
-	Add support for setting "none" authentication method.
-	Add support for SMS and phonebook with xmm7xxx modems.
-	Add support for voice features and Gemalto modems.
-	Add support for Bengali and Gujrati SMS alphabets.
-	Add support for 8 additional languages for GSM 7 bit
-	Add support for using internal Embedded Linux library.
-
-ver 1.25:
-	Fix issue with handling GPRS context release.
-	Fix issue with GPRS context shutdown and Huawei modems.
-	Fix issue with roaming status report and QMI devices.
-	Add support for voice call handling of U-Blox modems
-	Add support for EUTRAN technology reporting.
-
-ver 1.24:
-	Fix issue with property changed signals and CDMA networks.
-	Fix issue with handling SIM filesystem and SIM removal.
-	Fix issue with handling PIN state and incorrect codes.
-	Fix issue with handling of parsing AID type.
-	Fix issue with SIM detection and QMI devices.
-	Fix issue with PIN handling and QMI devices.
-	Fix issue with USSD handling and QMI devices.
-	Fix issue with handling USSD TERMINATED response.
-	Fix issue with handling USSD reset and STK REFRESH.
-	Add support for detecting Gemalto ALS3 modems.
-	Add support for SIMCom based SIM7100E modems.
-
-ver 1.23:
-	Fix issue with handling SIM AID sessions.
-	Add support for QMI LTE bearer handling.
-	Add support for memory location dialing.
-
-ver 1.22:
-	Fix issue with GPIO handling and Nokia modems.
-	Fix issue with SIM state callback and AT modems.
-	Fix issue with data mode and DCD for U-Blox modems.
-	Fix issue with SMS receive on QMI based Quectel EC21.
-	Fix issue with HFP support and last call dialed request.
-	Fix issue with PIM retires handling and Gemalto modems.
-	Fix issue with atom registration and SIM state handling.
-	Add support for handling SIM card AID session management.
-	Add support for handling GSM/UMTS and IMS authentication.
-	Add support for IP Multimedia Subsystem (IMS) atom.
-	Add support for MBIM based modems.
-
 ver 1.21:
 	Fix issue with USSD notification received handling.
 	Fix issue with crashing SIM filesystem notifications.
--- a/ofono/Makefile.am
+++ b/ofono/Makefile.am
@@ -24,16 +24,17 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/sim-mnclength.h \
 			include/handsfree-audio.h include/siri.h \
 			include/sms-filter.h include/gprs-filter.h \
-			include/voicecall-filter.h include/dbus-access.h \
-			include/ril-constants.h include/ril-transport.h \
-			include/watch.h gdbus/gdbus.h include/dbus-clients.h \
-			include/netmon.h include/lte.h include/ims.h \
-			include/slot.h include/cell-info.h \
-			include/storage.h include/conf.h include/misc.h \
-			include/mtu-limit.h
+			include/netmon.h include/lte.h \
+			include/storage.h \
+			gdbus/gdbus.h

 nodist_pkginclude_HEADERS = include/version.h

+if SAILFISH_MANAGER
+nodist_pkginclude_HEADERS += include/sailfish_cell_info.h \
+			include/sailfish_manager.h include/sailfish_watch.h
+endif
+
 local_headers = $(foreach file,$(pkginclude_HEADERS) \
 				$(nodist_pkginclude_HEADERS), \
 					include/ofono/$(notdir $(file)))
@@ -65,7 +66,7 @@ endif
 builtin_modules =
 builtin_sources =
 builtin_libadd =
-builtin_cflags = -DSAILFISH_OS
+builtin_cflags =

 noinst_LTLIBRARIES += gdbus/libgdbus-internal.la

@@ -113,9 +114,6 @@ gril_sources = gril/gril.h gril/gril.c \

 btio_sources = btio/btio.h btio/btio.c

-builtin_modules += cellinfo_netmon generic_phonebook
-builtin_sources += plugins/cellinfo-netmon.c plugins/generic-phonebook.c
-
 if UDEV
 builtin_cflags += @UDEV_CFLAGS@
 builtin_libadd += @UDEV_LIBS@
@@ -124,12 +122,62 @@ builtin_modules += udevng
 builtin_sources += plugins/udevng.c
 endif

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

 if RILMODEM
+if SAILFISH_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_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_modem.c \
+			drivers/ril/ril_netmon.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_radio.c \
+			drivers/ril/ril_radio_caps.c \
+			drivers/ril/ril_radio_settings.c \
+			drivers/ril/ril_sim.c \
+			drivers/ril/ril_sim_card.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_vendor.c \
+			drivers/ril/ril_voicecall.c
+
+# Vendor specific extensions
+builtin_sources +=	drivers/ril/ril_vendor_mtk.c
+
+if DATAFILES
+dist_conf_DATA += drivers/ril/ril_subscription.conf
+endif
+
+else
+
 builtin_sources += $(gril_sources)

 builtin_modules += rildev
@@ -170,6 +218,7 @@ builtin_sources += drivers/rilmodem/rilmodem.h \
 			drivers/infineonmodem/infineon_constants.h \
 			drivers/rilmodem/lte.c
 endif
+endif

 if ISIMODEM
 builtin_modules += isimodem
@@ -232,8 +281,7 @@ qmi_sources = drivers/qmimodem/qmi.h drivers/qmimodem/qmi.c \
 					drivers/qmimodem/wds.h \
 					drivers/qmimodem/pds.h \
 					drivers/qmimodem/common.h \
-					drivers/qmimodem/wda.h \
-					drivers/qmimodem/voice.h
+					drivers/qmimodem/wda.h

 builtin_modules += qmimodem
 builtin_sources += $(qmi_sources) \
@@ -249,7 +297,6 @@ builtin_sources += $(qmi_sources) \
 			drivers/qmimodem/ussd.c \
 			drivers/qmimodem/gprs.c \
 			drivers/qmimodem/gprs-context.c \
-			drivers/qmimodem/lte.c \
 			drivers/qmimodem/radio-settings.c \
 			drivers/qmimodem/location-reporting.c \
 			drivers/qmimodem/netmon.c
@@ -282,6 +329,7 @@ builtin_sources += 	drivers/atmodem/atmodem.h \
 			drivers/atmodem/atutil.c \
 			drivers/atmodem/gprs.c \
 			drivers/atmodem/gprs-context.c \
+			drivers/atmodem/sim-auth.c \
 			drivers/atmodem/gnss.c \
 			drivers/atmodem/lte.c

@@ -412,16 +460,13 @@ builtin_modules += gemaltomodem
 builtin_sources += drivers/atmodem/atutil.h \
 			drivers/gemaltomodem/gemaltomodem.h \
 			drivers/gemaltomodem/gemaltomodem.c \
-			drivers/gemaltomodem/location-reporting.c \
-			drivers/gemaltomodem/voicecall.c
+			drivers/gemaltomodem/location-reporting.c

 builtin_modules += xmm7modem
 builtin_sources += drivers/atmodem/atutil.h \
 			drivers/xmm7modem/xmm7modem.h \
 			drivers/xmm7modem/xmm7modem.c \
-			drivers/xmm7modem/radio-settings.c \
-			drivers/xmm7modem/ims.c \
-			drivers/xmm7modem/netmon.c
+			drivers/xmm7modem/radio-settings.c

 if PHONESIM
 builtin_modules += phonesim
@@ -441,7 +486,7 @@ builtin_sources += drivers/cdmamodem/cdmamodem.h \
 			drivers/cdmamodem/connman.c
 endif

-if EXTRA_MODEMS
+if !RILMODEM
 builtin_modules += g1
 builtin_sources += plugins/g1.c

@@ -517,8 +562,8 @@ builtin_sources += plugins/samsung.c
 builtin_modules += sim900
 builtin_sources += plugins/sim900.c

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

 builtin_modules += telit
 builtin_sources += plugins/telit.c
@@ -662,40 +707,10 @@ builtin_sources += plugins/smshistory.c
 builtin_modules += allowed_apns
 builtin_sources += plugins/allowed-apns.c

-if ELL
-builtin_cflags += @ELL_CFLAGS@
-builtin_libadd += @ELL_LIBS@
-
-if MBIMMODEM
-mbim_sources =	drivers/mbimmodem/mbim.h \
-		drivers/mbimmodem/mbim.c \
-		drivers/mbimmodem/mbim-private.h \
-		drivers/mbimmodem/mbim-desc.h \
-		drivers/mbimmodem/mbim-desc.c \
-		drivers/mbimmodem/mbim-message.h \
-		drivers/mbimmodem/mbim-message.c
-
-builtin_modules += mbimmodem
-builtin_sources += $(mbim_sources) \
-			drivers/mbimmodem/util.h \
-			drivers/mbimmodem/util.c \
-			drivers/mbimmodem/mbimmodem.h \
-			drivers/mbimmodem/mbimmodem.c \
-			drivers/mbimmodem/devinfo.c \
-			drivers/mbimmodem/sim.c \
-			drivers/mbimmodem/network-registration.c \
-			drivers/mbimmodem/sms.c \
-			drivers/mbimmodem/gprs.c \
-			drivers/mbimmodem/gprs-context.c
-
-builtin_modules += mbim
-builtin_sources += plugins/mbim.c
-endif
-endif
-
 sbin_PROGRAMS = src/ofonod

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

 src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
 			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
@@ -741,8 +749,7 @@ src_ofonod_LDFLAGS = -Wl,--export-dynamic \

 BUILT_SOURCES = $(local_headers) src/builtin.h

-CLEANFILES = $(BUILT_SOURCES) $(rules_DATA) \
-	$(shell find . -name "*.gcda") $(shell find . -name "*.gcno")
+CLEANFILES = $(BUILT_SOURCES) $(rules_DATA)

 plugindir = $(pkglibdir)/plugins

@@ -782,8 +789,7 @@ doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
 			doc/networkmonitor-api.txt \
 			doc/allowed-apns-api.txt \
 			doc/lte-api.txt \
-			doc/cinterion-hardware-monitor-api.txt \
-			doc/ims-api.txt
+			doc/cinterion-hardware-monitor-api.txt


 test_scripts = test/backtrace \
@@ -892,11 +898,7 @@ test_scripts = test/backtrace \
 		test/enable-throttling \
 		test/disable-throttling \
 		test/set-lte-property \
-		test/test-serving-cell-info \
-		test/ims-register \
-		test/ims-unregister \
-		test/list-applications \
-		test/set-sms-alphabet
+		test/test-serving-cell-info


 if TEST
@@ -919,92 +921,93 @@ unit_tests = unit/test-common unit/test-util unit/test-idmap \
 				unit/test-simutil unit/test-stkutil \
 				unit/test-sms unit/test-cdmasms

-unit_test_conf_SOURCES = unit/test-conf.c src/conf.c src/log.c
-unit_test_conf_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
-unit_test_conf_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_conf_OBJECTS)
-unit_tests += unit/test-conf
+if SAILFISH_MANAGER

-unit_test_cell_info_SOURCES = unit/test-cell-info.c src/cell-info.c src/log.c
-unit_test_cell_info_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
-unit_test_cell_info_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_cell_info_OBJECTS)
-unit_tests += unit/test-cell-info
+unit_test_sailfish_cell_info_SOURCES = unit/test-sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_cell_info.c
+unit_test_sailfish_cell_info_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
+			-Iplugins/sailfish_manager
+unit_test_sailfish_cell_info_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_cell_info_OBJECTS)
+unit_tests += unit/test-sailfish_cell_info

-unit_test_cell_info_control_SOURCES = unit/test-cell-info-control.c \
-			unit/fake_cell_info.c src/cell-info.c \
-			src/cell-info-control.c src/log.c
-unit_test_cell_info_control_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
-unit_test_cell_info_control_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_cell_info_control_OBJECTS)
-unit_tests += unit/test-cell-info-control
-
-unit_test_cell_info_dbus_SOURCES = unit/test-dbus.c \
-			unit/test-cell-info-dbus.c unit/fake_cell_info.c \
-			src/cell-info.c src/cell-info-dbus.c \
-			src/cell-info-control.c gdbus/object.c \
-			src/dbus-clients.c src/dbus.c src/log.c
-unit_test_cell_info_dbus_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
-			@DBUS_GLIB_CFLAGS@
-unit_test_cell_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_cell_info_dbus_OBJECTS)
-unit_tests += unit/test-cell-info-dbus
-
-unit_test_sim_info_SOURCES = unit/test-sim-info.c unit/fake_watch.c \
-			src/sim-info.c src/storage.c src/watchlist.c src/log.c
-unit_test_sim_info_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
-			-DSTORAGEDIR='"/tmp/ofono"'
-unit_test_sim_info_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_sim_info_OBJECTS)
-unit_tests += unit/test-sim-info
-
-unit_test_sim_info_dbus_SOURCES = unit/test-sim-info-dbus.c \
-			unit/test-dbus.c unit/fake_watch.c \
-			src/sim-info.c src/sim-info-dbus.c \
+unit_test_sailfish_cell_info_dbus_SOURCES = unit/test-dbus.c \
+			unit/test-sailfish_cell_info_dbus.c \
+			unit/fake_sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_cell_info_dbus.c \
 			gdbus/object.c \
-			src/dbus.c src/storage.c src/watchlist.c src/log.c
-unit_test_sim_info_dbus_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
-			@DBUS_GLIB_CFLAGS@ -DSTORAGEDIR='"/tmp/ofono"'
-unit_test_sim_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_sim_info_dbus_OBJECTS)
-unit_tests += unit/test-sim-info-dbus
+			src/dbus.c src/log.c
+unit_test_sailfish_cell_info_dbus_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
+			@DBUS_GLIB_CFLAGS@ -Iplugins/sailfish_manager
+unit_test_sailfish_cell_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_cell_info_dbus_OBJECTS)
+unit_tests += unit/test-sailfish_cell_info_dbus

-unit_test_slot_manager_SOURCES = unit/test-slot-manager.c unit/fake_watch.c \
-			unit/fake_cell_info.c src/slot-manager.c \
-			src/cell-info.c src/cell-info-control.c \
-			src/sim-info.c src/storage.c src/log.c
-unit_test_slot_manager_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
-			-DSTORAGEDIR='"/tmp/ofono"'
-unit_test_slot_manager_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_slot_manager_OBJECTS)
-unit_tests += unit/test-slot-manager
+unit_test_sailfish_sim_info_SOURCES = unit/test-sailfish_sim_info.c \
+			unit/fake_sailfish_watch.c \
+			plugins/sailfish_manager/sailfish_sim_info.c \
+			src/storage.c src/watch.c src/log.c
+unit_test_sailfish_sim_info_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
+			-DSTORAGEDIR='"/tmp/ofono"' -Iplugins/sailfish_manager
+unit_test_sailfish_sim_info_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_sim_info_OBJECTS)
+unit_tests += unit/test-sailfish_sim_info

-unit_test_watch_SOURCES = unit/test-watch.c src/watch.c \
-			src/cell-info.c src/cell-info-control.c \
-			src/log.c src/watchlist.c
-unit_test_watch_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
-			-DSTORAGEDIR='"/tmp/ofono"'
-unit_test_watch_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_watch_OBJECTS)
-unit_tests += unit/test-watch
+unit_test_sailfish_sim_info_dbus_SOURCES = unit/test-sailfish_sim_info_dbus.c \
+			unit/test-dbus.c unit/fake_sailfish_watch.c \
+			plugins/sailfish_manager/sailfish_sim_info.c \
+			plugins/sailfish_manager/sailfish_sim_info_dbus.c \
+			gdbus/object.c \
+			src/dbus.c src/storage.c src/watch.c src/log.c
+unit_test_sailfish_sim_info_dbus_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
+			@DBUS_GLIB_CFLAGS@ -DSTORAGEDIR='"/tmp/ofono"' \
+			-Iplugins/sailfish_manager
+unit_test_sailfish_sim_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_sim_info_dbus_OBJECTS)
+unit_tests += unit/test-sailfish_sim_info_dbus
+
+unit_test_sailfish_manager_SOURCES = unit/test-sailfish_manager.c \
+			unit/fake_sailfish_watch.c \
+			plugins/sailfish_manager/sailfish_manager.c \
+			plugins/sailfish_manager/sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_sim_info.c \
+			src/storage.c src/log.c
+unit_test_sailfish_manager_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
+			-DSTORAGEDIR='"/tmp/ofono"' -Iplugins/sailfish_manager
+unit_test_sailfish_manager_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_manager_OBJECTS)
+unit_tests += unit/test-sailfish_manager
+
+unit_test_sailfish_watch_SOURCES = unit/test-sailfish_watch.c \
+			plugins/sailfish_manager/sailfish_watch.c \
+			src/log.c src/watch.c
+unit_test_sailfish_watch_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
+			-DSTORAGEDIR='"/tmp/ofono"' -Iplugins/sailfish_manager
+unit_test_sailfish_watch_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_watch_OBJECTS)
+unit_tests += unit/test-sailfish_watch

-if SAILFISH_ACCESS
-unit_test_sailfish_access_SOURCES = unit/test-sailfish_access.c \
-			plugins/sailfish_access.c src/dbus-access.c src/log.c
-unit_test_sailfish_access_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
-unit_test_sailfish_access_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_sailfish_access_OBJECTS)
-unit_tests += unit/test-sailfish_access
 endif

-unit_test_dbus_access_SOURCES = unit/test-dbus-access.c src/dbus-access.c \
-			src/log.c
-unit_test_dbus_access_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
-unit_test_dbus_access_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_dbus_access_OBJECTS)
-unit_tests += unit/test-dbus-access
-
 if RILMODEM
+if SAILFISH_RILMODEM
+
+unit_test_ril_config_SOURCES = unit/test-ril_config.c drivers/ril/ril_util.c \
+				drivers/ril/ril_config.c src/log.c
+unit_test_ril_config_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
+unit_test_ril_config_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_ril_config_OBJECTS)
+unit_tests += unit/test-ril_config
+
+unit_test_ril_util_SOURCES = unit/test-ril_util.c drivers/ril/ril_util.c \
+				src/log.c
+unit_test_ril_util_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
+unit_test_ril_util_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_ril_util_OBJECTS)
+unit_tests += unit/test-ril_util
+
+else
 unit_tests += unit/test-rilmodem-cs \
 				unit/test-rilmodem-cs \
 				unit/test-rilmodem-sms \
@@ -1012,13 +1015,7 @@ unit_tests += unit/test-rilmodem-cs \
 				unit/test-rilmodem-gprs

 endif
-
-if ELL
-if MBIMMODEM
-unit_tests += unit/test-mbim
 endif
-endif
-

 noinst_PROGRAMS = $(unit_tests) \
 			unit/test-sms-root unit/test-mux unit/test-caif
@@ -1079,14 +1076,6 @@ unit_test_caif_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_caif_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_caif_OBJECTS)

-unit_test_dbus_clients_SOURCES = unit/test-dbus-clients.c unit/test-dbus.c \
-				src/dbus-clients.c gdbus/object.c \
-				src/dbus.c src/log.c
-unit_test_dbus_clients_CFLAGS =  @DBUS_GLIB_CFLAGS@ $(COVERAGE_OPT) $(AM_CFLAGS)
-unit_test_dbus_clients_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_dbus_clients_OBJECTS)
-unit_tests += unit/test-dbus-clients
-
 unit_test_dbus_queue_SOURCES = unit/test-dbus-queue.c unit/test-dbus.c \
 				src/dbus-queue.c gdbus/object.c \
 				src/dbus.c src/log.c
@@ -1104,13 +1093,6 @@ unit_test_provision_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_provision_OBJECTS)
 unit_tests += unit/test-provision

-unit_test_ril_transport_SOURCES = unit/test-ril-transport.c \
-				src/ril-transport.c src/log.c
-unit_test_ril_transport_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
-unit_test_ril_transport_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_ril_transport_OBJECTS)
-unit_tests += unit/test-ril-transport
-
 unit_test_sms_filter_SOURCES = unit/test-sms-filter.c \
 				src/sms-filter.c src/log.c
 unit_test_sms_filter_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
@@ -1125,14 +1107,6 @@ unit_test_gprs_filter_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_gprs_filter_OBJECTS)
 unit_tests += unit/test-gprs-filter

-unit_test_voicecall_filter_SOURCES = unit/test-voicecall-filter.c \
-				src/voicecall-filter.c src/log.c \
-				src/common.c src/util.c
-unit_test_voicecall_filter_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
-unit_test_voicecall_filter_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_voicecall_filter_OBJECTS)
-unit_tests += unit/test-voicecall-filter
-
 test_rilmodem_sources = $(gril_sources) src/log.c src/common.c src/util.c \
 				gatchat/ringbuffer.h gatchat/ringbuffer.c \
 				unit/rilmodem-test-server.h \
@@ -1170,12 +1144,6 @@ unit_test_rilmodem_gprs_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
 					@GLIB_LIBS@ @DBUS_LIBS@ -ldl
 unit_objects += $(unit_test_rilmodem_gprs_OBJECTS)

-unit_test_mbim_SOURCES = unit/test-mbim.c \
-			 drivers/mbimmodem/mbim-message.c \
-			 drivers/mbimmodem/mbim.c
-unit_test_mbim_LDADD = @ELL_LIBS@
-unit_objects += $(unit_test_mbim_OBJECTS)
-
 TESTS = $(unit_tests)

 if TOOLS
--- a/ofono/configure.ac
+++ b/ofono/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(ofono, 1.26)
+AC_INIT(ofono, 1.21)

 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AC_CONFIG_HEADERS(config.h)
@@ -33,7 +33,7 @@ AC_PROG_LIBTOOL
 AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
 			[disable code optimization through compiler]), [
 	if (test "${enableval}" = "no"); then
-		CFLAGS="$CFLAGS -O0 -U_FORTIFY_SOURCE"
+		CFLAGS="$CFLAGS -O0"
 	fi
 ])

@@ -55,6 +55,9 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
 	fi
 ])

+AC_ARG_ENABLE(threads, AC_HELP_STRING([--enable-threads],
+		[enable threading support]), [enable_threads=${enableval}])
+
 AC_CHECK_FUNC(signalfd, dummy=yes,
 			AC_MSG_ERROR(signalfd support is required))

@@ -76,6 +79,14 @@ PKG_CHECK_MODULES(GIO, gio-2.0, dummy=yes,
 GLIB_CFLAGS="$GLIB_CFLAGS $GIO_CFLAGS"
 GLIB_LIBS="$GLIB_LIBS $GIO_LIBS"

+if (test "${enable_threads}" = "yes"); then
+	AC_DEFINE(NEED_THREADS, 1, [Define if threading support is required])
+	PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16, dummy=yes,
+				AC_MSG_ERROR(GThread >= 2.16 is required))
+	GLIB_CFLAGS="$GLIB_CFLAGS $GTHREAD_CFLAGS"
+	GLIB_LIBS="$GLIB_LIBS $GTHREAD_LIBS"
+fi
+
 PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.4, dummy=yes,
 				AC_MSG_ERROR(D-Bus >= 1.4 is required))
 AC_SUBST(DBUS_CFLAGS)
@@ -166,21 +177,37 @@ AC_ARG_ENABLE(rilmodem, AC_HELP_STRING([--disable-rilmodem],
                                        [enable_rilmodem=${enableval}])
 AM_CONDITIONAL(RILMODEM, test "${enable_rilmodem}" != "no")

-AC_ARG_ENABLE(extra-modems,
-		AC_HELP_STRING([--enable-extra-modems],
-			[enable modems not used by Sailfish OS]),
-					[enable_extra_modems=${enableval}])
-AM_CONDITIONAL(EXTRA_MODEMS, test "${enable_extra_modems}" = "yes")
+AC_ARG_ENABLE(sailfish-rilmodem, AC_HELP_STRING([--enable-sailfish-rilmodem],
+				[enable Sailfish RIL modem]),
+				[enable_sailfish_rilmodem=${enableval}],
+				[enable_sailfish_rilmodem="no"])
+AM_CONDITIONAL(SAILFISH_RILMODEM, test "${enable_sailfish_rilmodem}" != "no")

-PKG_CHECK_MODULES(GLIBUTIL, libglibutil >= 1.0.51, dummy=yes,
-			AC_MSG_ERROR(libglibutil >= 1.0.51 is required))
-CFLAGS="$CFLAGS $GLIBUTIL_CFLAGS"
-LIBS="$LIBS $GLIBUTIL_LIBS"
+if (test "${enable_sailfish_rilmodem}" = "yes"); then
+	PKG_CHECK_MODULES(GRILIO, libgrilio >= 1.0.21, dummy=yes,
+				AC_MSG_ERROR(libgrilio >= 1.0.21 is required))
+	PKG_CHECK_MODULES(GLIBUTIL, libglibutil >= 1.0.23, dummy=yes,
+				AC_MSG_ERROR(libglibutil >= 1.0.23 is required))
+	PKG_CHECK_MODULES(LIBMCE, libmce-glib >= 1.0.5, dummy=yes,
+				AC_MSG_ERROR(libmce-glib >= 1.0.5 is required))
+	CFLAGS="$CFLAGS $GRILIO_CFLAGS $LIBMCE_CFLAGS"
+	LIBS="$LIBS $GRILIO_LIBS $LIBMCE_LIBS"
+	enable_sailfish_manager=yes
+	need_glibutil=yes
+fi

-PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1, dummy=yes,
-		AC_MSG_ERROR(dbus-glib is required by unit tests))
-		AC_SUBST(DBUS_GLIB_CFLAGS)
-		AC_SUBST(DBUS_GLIB_LIBS)
+AC_ARG_ENABLE(sailfish-manager,
+		AC_HELP_STRING([--enable-sailfish-manager],
+			[enable Sailfish OS modem manager plugin]),
+					[enable_sailfish_manager=${enableval}])
+AM_CONDITIONAL(SAILFISH_MANAGER, test "${enable_sailfish_manager}" = "yes")
+
+if (test "${enable_sailfish_manager}" = "yes"); then
+	PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1, dummy=yes,
+			AC_MSG_ERROR(dbus-glib is required by unit tests))
+	AC_SUBST(DBUS_GLIB_CFLAGS)
+	AC_SUBST(DBUS_GLIB_LIBS)
+fi

 AC_ARG_ENABLE(add-remove-context, AC_HELP_STRING([--disable-add-remove-context],
 		[don't allow to add or remove connection context over D-Bus]), [
@@ -265,25 +292,6 @@ AC_ARG_ENABLE(upower, AC_HELP_STRING([--disable-upower],
 					[enable_upower=${enableval}])
 AM_CONDITIONAL(UPOWER, test "${enable_power}" != "no")

-AC_ARG_ENABLE(mbimmodem, AC_HELP_STRING([--enable-mbimmodem],
-				[enable MBIM based modem support]),
-					[enable_mbimmodem=${enableval}])
-
-AC_ARG_ENABLE(ell, AC_HELP_STRING([--enable-ell],
-				[enable support for ell]),
-					[enable_ell=${enableval}])
-
-if (test "${enable_ell}" = "yes"); then
-	AC_DEFINE(HAVE_ELL, 1, [Defined if Ell is enabled])
-	PKG_CHECK_MODULES(ELL, ell >= 0.2, dummy=yes,
-			  AC_MSG_ERROR(ell library >= 0.2 is required))
-	AC_SUBST(ELL_CFLAGS)
-	AC_SUBST(ELL_LIBS)
-fi
-
-AM_CONDITIONAL(MBIMMODEM, test "${enable_ell}" != "no" && test "${enable_mbimmodem}" = "yes")
-AM_CONDITIONAL(ELL, test "${enable_ell}" != "no")
-
 AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
 			[do not install configuration and data files]),
 					[enable_datafiles=${enableval}])
@@ -295,23 +303,13 @@ AC_ARG_ENABLE(sailfish-pushforwarder, AC_HELP_STRING([--enable-sailfish-pushforw
 			[enable_sailfish_pushforwarder="no"])
 AM_CONDITIONAL(SAILFISH_PUSHFORWARDER, test "${enable_sailfish_pushforwarder}" != "no")
 if (test "${enable_sailfish_pushforwarder}" != "no"); then
+	PKG_CHECK_MODULES(GLIBUTIL, libglibutil >= 1.0.15, dummy=yes,
+			AC_MSG_ERROR(libglibutil >= 1.0.15 is required))
 	PKG_CHECK_MODULES(WSPCODEC, libwspcodec >= 2.0, dummy=yes,
 			AC_MSG_ERROR(WSP decoder is required))
 	CFLAGS="$CFLAGS $WSPCODEC_CFLAGS"
 	LIBS="$LIBS $WSPCODEC_LIBS"
-fi
-
-AC_ARG_ENABLE(sailfish-access, AC_HELP_STRING([--enable-sailfish-access],
-			[enable Sailfish OS access plugin]),
-			[enable_sailfish_access=${enableval}],
-			[enable_sailfish_access="no"])
-
-AM_CONDITIONAL(SAILFISH_ACCESS, test "${enable_sailfish_access}" != "no")
-if (test "${enable_sailfish_access}" == "yes"); then
-	PKG_CHECK_MODULES(DBUSACCESS, libdbusaccess, dummy=yes,
-				AC_MSG_ERROR(libdbusaccess is required))
-	CFLAGS="$CFLAGS $DBUSACCESS_CFLAGS"
-	LIBS="$LIBS $DBUSACCESS_LIBS"
+	need_glibutil=yes
 fi

 AC_ARG_ENABLE(sailfish-debuglog, AC_HELP_STRING([--enable-sailfish-debuglog],
@@ -326,6 +324,11 @@ if (test "${enable_sailfish_debuglog}" = "yes"); then
 	LIBS="$LIBS $DBUSLOG_LIBS"
 fi

+if (test "${need_glibutil}" = "yes"); then
+	CFLAGS="$CFLAGS $GLIBUTIL_CFLAGS"
+	LIBS="$LIBS $GLIBUTIL_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/common-patterns.txt
+++ b/ofono/doc/common-patterns.txt
@@ -1,164 +0,0 @@
-Every project has its own recursive patterns, and oFono is not an exception.
-This document describes the most common ones found in the code.
-
-Typical flow for atom <-> atom driver operations
-================================================
-Most of the time, the core atom for a given request calls a function in
-the atom driver, which generally executes some commands against the modem,
-and can then return the results to the core.
-
-For example:
-
-dbus call: lte/SetProperty(DefaultAPN)
-    |
-    v
-core: check APN validity, call the modem atom for execution in the modem
-        |
-        v
-atom driver: schedules 'AT+CGDCONT=0,"IP","MyNiceAPN"' for execution
-            |
-[ break in the flow: the functions return back to the core, the dbus request ]
-[                       is not answered at this time                         ]
-                ...
-[GLibMain event loop schedules the command, it is sent to the modem and the  ]
-[                       modem's reply is obtained                            ]
-            |
-            v
-atom driver: a callback function, optionally provided when AT command was
-scheduled is now called
-        |
-        v
-core: atom driver core callback function is now called. This was passed from
-the core as an argument, earlier, when the atom driver operation was invoked,
-along with some context data (opaque info for the atom driver containing core
-atom owned data)
-    |
-    v
-the core can now answer the dbus message
-
-
-In the code, it looks like this:
-
-//core call:
-static DBusMessage *lte_set_property(DBusConnection *conn,
-					DBusMessage *msg, void *data)
-{
-	struct ofono_lte *lte = data;
-
-	/*
-	 * a block of code here processes the msg and fills the
-	 * lte->pending_info structure
-	 */
-
-	lte->driver->set_default_attach_info(lte, &lte->pending_info,
-					lte_set_default_attach_info_cb, lte);
-
-	return NULL;
-}
-// lte_set_default_attach_info_cb is the core callback function,
-// the lte structure is the parameter that it takes
-
-//atom:
-static void at_lte_set_default_attach_info(const struct ofono_lte *lte,
-			const struct ofono_lte_default_attach_info *info,
-			ofono_lte_cb_t cb, void *data)
-{
-	struct lte_driver_data *ldd = ofono_lte_get_data(lte);
-
-	// next line creates a structure for the in-atom callback
-	struct cb_data *cbd = cb_data_new(cb, data);
-
-	if (g_at_chat_send(ldd->chat, "AT", NULL,
-					at_lte_set_default_attach_info_cb,
-					cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-	CALLBACK_WITH_FAILURE(cb, data);
-}
-// here the structure is allocate dynamically, and since it is quite common,
-// the function g_at_chat_send accepts the last 3 parameters:
-// - in-atom callback function
-// - in-atom callback data
-// - destroy function for dynamically-allocated callback data
-// NOTE: if g_at_chat_send fails, it does not free the memory, so it must be
-// done after the call.
-// Note also the callback to the core directly here if the g_at_chat_send fails.
-
-//atom callback:
-
-static void at_lte_set_default_attach_info_cb(gboolean ok, GAtResult *result,
-							gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-
-	if (result == NULL) {
-		CALLBACK_WITH_FAILURE(cbd->cb, cbd->data);
-		return;
-	}
-
-	decode_at_error(&error, g_at_result_final_response(result));
-	cbd->cb(&error, cbd->data);
-}
-// note that here cbd must not be released, it will be done by the GAtChat
-// after invoking the callback (at_lte_set_default_attach_info_cb)
-// note also that the core function will be executed before cbd is released,
-// so the last line of the code is ok.
-
-
-Use of the cb_data in AT command based atom drivers
-===================================================
-
-the cb_data can be used by creating the structure with cb_data_new,
-and then there are two possibilities:
- use it in a single callback function, and destroy it with a call to
-  g_free.
-  Example:
-  - calling function:
-    struct cb_data *cbd = cb_data_new(cb, data);
-    if (g_at_chat_send(chat, buf, NULL, at_cgatt_cb, cbd, g_free) > 0)
-	return;
-    g_free(cbd);
-  - called function (here at_cgatt_cb):
-	static void at_cgatt_cb(gboolean ok, GAtResult *result,
-						gpointer user_data)
-	{
-		struct cb_data *cbd = user_data;
-		ofono_gprs_cb_t cb = cbd->cb;
-		struct ofono_error error;
-
-		decode_at_error(&error,
-				g_at_result_final_response(result));
-
-		cb(&error, cbd->data);
-	}
-    note the absence of explicit g_free(cbd);
-
- pass it through a train of callback functions, adding a reference at
-  each pass cb_data_ref, and removing it with cb_data_unref.
-  the use of cb_data_ref would replace a new object creation, while the
-  use of cb_data_unref the use of g_free.
-  Example:
-  - calling function:
-	struct cb_data *cbd = cb_data_new(cb, data);
-	// no cb_ref at the creation
-	if (g_at_chat_send(chat, buf, NULL,
-				at_lte_set_default_attach_info_cb,
-				cbd, cb_data_unref) > 0)
-		goto end;
-	cb_data_unref(cbd);
-  - called function 1 (at_lte_set_default_attach_info_cb):
-	static void at_lte_set_default_attach_info_cb(gboolean ok,
-				GAtResult *result, gpointer user_data)
-	{
-		struct cb_data *cbd = user_data;
-
-		cbd = cb_data_ref(cbd);
-		if (g_at_chat_send(chat, buf, NULL,
-				at_cgatt_cb, cbd, cb_data_unref) > 0)
-			return;
-		cb_data_unref(cbd);
-	}
-  - called function 2 (at_cgatt_cb):
-    like above. no call to g_free or cb_data_unref. The terminal function
-    doesn't need to know about the reference scheme.
--- a/ofono/doc/connman-api.txt
+++ b/ofono/doc/connman-api.txt
@@ -201,8 +201,7 @@ Properties	boolean Active [readwrite]

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

 		string Username [readwrite]

@@ -279,13 +278,6 @@ Properties	boolean Active [readwrite]
 				via this proxy.  All other values are left
 				out in this case.

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

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

 				Holds the gateway IP for this connection.

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

 			Holds the MMS Proxy setting.
--- a/ofono/doc/emergency-call-handling.txt
+++ b/ofono/doc/emergency-call-handling.txt
@@ -14,7 +14,7 @@ What oFono will do:
 	- Post online atoms will be created.
 	- Upon reception of Dial request, Emergency mode is activated.
 	- Once the call is ended, Emergency mode is deactivated.
-	- Modem remains in online mode with full functionality.
+	- Modem remains in online mode with full funcationality.

 Case 2: Call in SIM Present and PIN required state

--- a/ofono/doc/ims-api.txt
+++ b/ofono/doc/ims-api.txt
@@ -1,59 +0,0 @@
-IpMultimediaSystem Hierarchy
-============================
-
-Service		org.ofono
-Interface	org.ofono.IpMultimediaSystem
-Object path	[variable prefix]/{modem0,modem1,...}
-
-Methods		dict GetProperties()
-
-			Returns all IpMultimediaSystem configuration properties.
-
-		void SetProperty(string property, variant value)
-
-			Changes the value of the specified property. Only
-			properties that are listed as readwrite are
-			changeable. On success a PropertyChanged signal
-			will be emitted.
-
-			Possible Errors: [service].Error.InProgress
-					 [service].Error.InvalidArguments
-					 [service].Error.Failed
-
-		void Register()
-
-			Attempts to register to IMS. A successful method return
-			indicates that the registration process could be
-			initiated successfully. The actual registration state
-			will be reflected by the 'Registered' property.
-
-			Possible Errors: [service].Error.InProgress
-					 [service].Error.NotImplemented
-
-		void Unregister()
-
-			Attempts to unregister from IMS. A successful method
-			return indicates that the unregistration process could
-			be initiated successfully. The actual unregistration
-			state will be reflected by the 'Registered' property.
-
-			Possible Errors: [service].Error.InProgress
-					 [service].Error.NotImplemented
-
-Signals		PropertyChanged(string property, variant value)
-
-			This signal indicates a changed value of the given
-			property.
-
-Properties	boolean Registered [readonly]
-
-			Contains the current IMS registration state.
-
-		boolean VoiceCapable [readonly, optional]
-
-			Boolean representing whether voice call transfer over
-			RTP (IMS) is available.
-
-		boolean SmsCapable [readonly, optional]
-
-			Boolean representing whether SMS-over-IMS is available.
--- a/ofono/doc/location-reporting-api.txt
+++ b/ofono/doc/location-reporting-api.txt
@@ -13,7 +13,7 @@ Methods		dict GetProperties()
 		filedescriptor Request()

 			Asks to turn ON the NMEA stream and supplies the
-			gps device file descriptor. The external client should
+			gps device file descriptor. The external cliend should
 			use the file descriptor to receive the NMEA data.

 			Possible Errors: [service].Error.InProgress
--- a/ofono/doc/lte-api.txt
+++ b/ofono/doc/lte-api.txt
@@ -33,39 +33,3 @@ Properties	string DefaultAccessPointName [readwrite]

 			Setting this property to an empty string clears the
 			default APN from the modem.
-
-		string Protocol [readwrite, experimental]
-
-			Holds the protocol for this context.  Valid values
-			are: "ip", "ipv6" and "dual". Default value is "ip".
-
-		string AuthenticationMethod [readwrite, experimental]
-
-			Sets the Method used for the authentication
-			for the default APN.
-
-			Available values are "none", "pap" and "chap".
-			Default is "none".
-
-			If the AuthenticationMethod is set to 'none',
-			no authentication is performed for the default attach
-			APN.  Username and Password properties are ignored,
-			even if containing a valid value.  If Username or
-			Password are empty, AuthenticationMethod is implicitly
-			assumed to be set to 'none'.
-
-			If the default APN supports authentication and it
-			fails, then it is up to the network how to proceed.
-			In general LTE access is denied and the modem can
-			fallback to a legacy technology if capable and another
-			radio technology is available.
-
-		string Username [readwrite, experimental]
-
-			Holds the username to be used for authentication
-			purposes.
-
-		string Password [readwrite, experimental]
-
-			Holds the password to be used for authentication
-			purposes.
--- a/ofono/doc/messagemanager-api.txt
+++ b/ofono/doc/messagemanager-api.txt
@@ -104,16 +104,6 @@ Properties	string ServiceCenterAddress
 				"turkish" - Turkish alphabet
 				"spanish" - Spanish alphabet
 				"portuguese" - Portuguese alphabet
-				"bengali" - Bengali alphabet
-				"gujarati" - Gujarati alphabet
-				"hindi" - Hindi alphabet
-				"kannada" - Kannada alphabet
-				"malayalam" - Malayalam alphabet
-				"oriya" - Oriya alphabet
-				"punjabi"- Punjabi alphabet
-				"tamil" - Tamil alphabet
-				"telugu" - Telugu alphabet
-				"urdu" - Urdu alphabet

 			The standard, language-specific alphabets are defined
 			in 3GPP TS23.038, Annex A.  By default, oFono uses
--- a/ofono/doc/modem-api.txt
+++ b/ofono/doc/modem-api.txt
@@ -95,13 +95,6 @@ Properties	boolean Powered [readwrite]
 			String representing the software version number of the
 			modem device.

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

 			List of currently enabled features. It uses simple
@@ -134,8 +127,6 @@ Properties	boolean Powered [readwrite]
 				org.ofono.CallVolume
 				org.ofono.CellBroadcast
 				org.ofono.Handsfree
-				org.ofono.IpMultimediaSystem
-				org.ofono.LongTermEvolution
 				org.ofono.LocationReporting
 				org.ofono.MessageManager
 				org.ofono.MessageWaiting
--- a/ofono/doc/network-api.txt
+++ b/ofono/doc/network-api.txt
@@ -82,9 +82,7 @@ Properties	string Mode [readonly]

 		string Status [readonly]

-			The current registration status of a modem. In case
-			technology is 'lte', 'registered' and 'roaming' may
-			not necessarily mean voice calling available.
+			The current registration status of a modem.

 			The possible values are:
 				"unregistered"  Not registered to any network
--- a/ofono/doc/sim-api.txt
+++ b/ofono/doc/sim-api.txt
@@ -200,8 +200,3 @@ Properties	boolean Present [readonly]
 			might have changed the retry counters, i.e. calls to
 			ChangePin(), EnterPin(), ResetPin() LockPin(),
 			UnlockPin().
-
-		string ImsPrivateIdentity [readonly, optional]
-
-			Contains the SIM's ImsPrivateIdentity, read from the
-			ISIM.
--- a/ofono/doc/sim-auth-api.txt
+++ b/ofono/doc/sim-auth-api.txt
@@ -1,104 +0,0 @@
-SimAuthentication heiarchy [experimental]
-===========================================
-
-Service		org.ofono
-Interface	org.ofono.SimAuthentication
-Object path	[variable prefix]/{modem0,modem1,...}
-
-Methods		array{object,dict} GetApplications()
-
-			Get an array of all SIM applications found during
-			discovery. In the format "a{oa{sv}}" where 'o' is
-			the object path for the application e.g.
-
-			o = "/modem1/A0000000871004FFFFFFFF8906190000"
-
-			Each dictionary will contain 'Type' e.g. 'Ims' and
-			'Name' e.g. 'ISim'
-
-			For each application there will be a corresponding
-			object that matches the path (o). The type will
-			signify which interfaces are under that object (below).
-
-			type = Umts --> org.ofono.USimApplication
-			type = Ims  --> org.ofono.ISimApplication
-
-SimAuth USIM application heiarchy [experimental]
-===========================================
-
-Service		org.ofono
-Interface	org.ofono.USimApplication
-Object path	[variable prefix]/{modem0,modem1,...}/{AID name}
-
-Methods		dict GetProperties()
-
-			Returns properties for the USimApplication. See
-			properties section for available properties.
-
-		array{dict{string, array{byte}}}
-			GsmAuthenticate(array{array{byte}} rands)
-
-			Run the USIM application GSM AUTHENTICATE algorithm
-			with N random challenges 'rands'. This should be an
-			array of an array of bytes ("aay"). The number of
-			random challenges is limited to a maximum of 3.
-
-			Returns the derived Kc/SRES values as an array of
-			dictionaries. The index of each dictionary matches
-			the index of the rand value in the method call. The
-			keys for each dictionary are "Kc" and "SRES" and both
-			are arrays of bytes.
-
-			Possible Errors:
-				[service].Error.NotSupported
-				[service].Error.Busy
-
-		dict{string, array{byte}}
-			UmtsAuthenticate(array{byte} rand, array{byte} autn)
-
-			Run the UMTS AUTHENTICATE algorithm in the 3G
-			context with 'rand' and 'autn'. A dictionary will be
-			returned containing 'RES', 'CK', 'IK' and possibly
-			'Kc' if service 27 is available. If there was a
-			sync error 'AUTS' will be returned.
-
-			Possible Errors: [service].Error.NotSupported
-
-Properties	string Type [readonly]
-
-			Type of application: 'Umts'
-
-		string Name [readonly]
-
-			Human readable name: 'USim'
-
-SimAuth ISIM application heiarchy [experimental]
-===========================================
-
-Service		org.ofono
-Interface	org.ofono.ISimApplication
-Object		[variable prefix]/{modem0,modem1,...}/{AID name}
-
-Methods		dict GetProperties()
-
-			Returns properties for the ISimApplication. See
-			the properties section for available properties.
-
-		dict{string, array{byte}
-			ImsAuthenticate(array{byte} rand, array{byte} autn)
-
-			Run the UMTS AUTHENTICATE algorithm in the IMS
-			context with 'rand' and 'autn'. A dictionary will be
-			returned containing 'RES', 'CK', 'IK' and possibly
-			'Kc' if service 27 is available. If there was a
-			sync error 'AUTS' will be returned.
-
-			Possible Errors: [service].Error.NotSupported
-
-Properties	string Type [readonly]
-
-			Type of application: 'Ims'
-
-		string Name [readonly]
-
-			Human readable name: 'ISim'
--- a/ofono/doc/voicecallmanager-api.txt
+++ b/ofono/doc/voicecallmanager-api.txt
@@ -59,27 +59,6 @@ Methods		dict GetProperties()
 					 [service].Error.NotImplemented
 					 [service].Error.Failed

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

 			Joins the currently Active (or Outgoing, depending
--- a/ofono/drivers/atmodem/atmodem.c
+++ b/ofono/drivers/atmodem/atmodem.c
@@ -50,6 +50,7 @@ static int atmodem_init(void)
 	at_call_volume_init();
 	at_gprs_init();
 	at_gprs_context_init();
+	at_sim_auth_init();
 	at_gnss_init();
 	at_lte_init();

@@ -58,6 +59,7 @@ static int atmodem_init(void)

 static void atmodem_exit(void)
 {
+	at_sim_auth_exit();
 	at_stk_exit();
 	at_sim_exit();
 	at_sms_exit();
--- a/ofono/drivers/atmodem/atutil.c
+++ b/ofono/drivers/atmodem/atutil.c
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2018 Gemalto M2M
 *
 *  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
@@ -655,46 +654,3 @@ int at_util_get_ipv4_address_and_netmask(const char *addrnetmask,

 	return ret;
 }
-
-int at_util_gprs_auth_method_to_auth_prot(
-					enum ofono_gprs_auth_method auth_method)
-{
-	switch (auth_method) {
-	case OFONO_GPRS_AUTH_METHOD_ANY:
-	case OFONO_GPRS_AUTH_METHOD_PAP:
-		return 1;
-	case OFONO_GPRS_AUTH_METHOD_CHAP:
-		return 2;
-	case OFONO_GPRS_AUTH_METHOD_NONE:
-		return 0;
-	}
-
-	return 0;
-}
-
-const char *at_util_gprs_proto_to_pdp_type(enum ofono_gprs_proto proto)
-{
-	switch (proto) {
-	case OFONO_GPRS_PROTO_IPV6:
-		return "IPV6";
-	case OFONO_GPRS_PROTO_IPV4V6:
-		return "IPV4V6";
-		break;
-	case OFONO_GPRS_PROTO_IP:
-		return "IP";
-	}
-
-	return NULL;
-}
-
-char *at_util_get_cgdcont_command(guint cid, enum ofono_gprs_proto proto,
-								const char *apn)
-{
-	const char *pdp_type = at_util_gprs_proto_to_pdp_type(proto);
-
-	if (!apn)
-		return g_strdup_printf("AT+CGDCONT=%u", cid);
-
-	return g_strdup_printf("AT+CGDCONT=%u,\"%s\",\"%s\"", cid, pdp_type,
-									apn);
-}
--- a/ofono/drivers/atmodem/atutil.h
+++ b/ofono/drivers/atmodem/atutil.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2018 Gemalto M2M
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -87,24 +86,7 @@ void at_util_sim_state_query_free(struct at_util_sim_state_query *req);
 int at_util_get_ipv4_address_and_netmask(const char *addrnetmask,
 						char *address, char *netmask);

-int at_util_gprs_auth_method_to_auth_prot(
-				enum ofono_gprs_auth_method auth_method);
-
-const char *at_util_gprs_proto_to_pdp_type(enum ofono_gprs_proto proto);
-
-/*
- * at_util_get_cgdcont_command
- * if the apn pointer is NULL, the context will be removed: the resulting
- * string will be like: AT+CGDCONT=7
- * but if apn pointer is not NULL and the string is empty, then
- * this function will create a normal context with empty apn, like:
- * AT+CGDCONT=4,"IPV6",""
- */
-char *at_util_get_cgdcont_command(guint cid, enum ofono_gprs_proto proto,
-							const char *apn);
-
 struct cb_data {
-	gint ref_count;
 	void *cb;
 	void *data;
 	void *user;
@@ -115,29 +97,12 @@ static inline struct cb_data *cb_data_new(void *cb, void *data)
 	struct cb_data *ret;

 	ret = g_new0(struct cb_data, 1);
-	ret->ref_count = 1;
 	ret->cb = cb;
 	ret->data = data;

 	return ret;
 }

-static inline struct cb_data *cb_data_ref(struct cb_data *cbd)
-{
-	cbd->ref_count++;
-	return cbd;
-}
-
-static inline void cb_data_unref(gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-
-	if (--cbd->ref_count)
-		return;
-
-	g_free(cbd);
-}
-
 static inline int at_util_convert_signal_strength(int strength)
 {
 	int result;
--- a/ofono/drivers/atmodem/call-barring.c
+++ b/ofono/drivers/atmodem/call-barring.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -211,7 +212,7 @@ static void at_call_barring_remove(struct ofono_call_barring *cb)
 	ofono_call_barring_set_data(cb, NULL);
 }

-static const struct ofono_call_barring_driver driver = {
+static struct ofono_call_barring_driver driver = {
 	.name		= "atmodem",
 	.probe		= at_call_barring_probe,
 	.remove		= at_call_barring_remove,
--- a/ofono/drivers/atmodem/call-forwarding.c
+++ b/ofono/drivers/atmodem/call-forwarding.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -263,7 +264,7 @@ static void at_ccfc_remove(struct ofono_call_forwarding *cf)
 	ofono_call_forwarding_set_data(cf, NULL);
 }

-static const struct ofono_call_forwarding_driver driver = {
+static struct ofono_call_forwarding_driver driver = {
 	.name		= "atmodem",
 	.probe		= at_ccfc_probe,
 	.remove		= at_ccfc_remove,
--- a/ofono/drivers/atmodem/call-meter.c
+++ b/ofono/drivers/atmodem/call-meter.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -330,7 +331,7 @@ static void at_caoc_remove(struct ofono_call_meter *cm)
 	ofono_call_meter_set_data(cm, NULL);
 }

-static const struct ofono_call_meter_driver driver = {
+static struct ofono_call_meter_driver driver = {
 	.name = "atmodem",
 	.probe = at_caoc_probe,
 	.remove = at_caoc_remove,
--- a/ofono/drivers/atmodem/call-settings.c
+++ b/ofono/drivers/atmodem/call-settings.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -397,7 +398,7 @@ static void at_call_settings_remove(struct ofono_call_settings *cs)
 	ofono_call_settings_set_data(cs, NULL);
 }

-static const struct ofono_call_settings_driver driver = {
+static struct ofono_call_settings_driver driver = {
 	.name = "atmodem",
 	.probe = at_call_settings_probe,
 	.remove = at_call_settings_remove,
--- a/ofono/drivers/atmodem/call-volume.c
+++ b/ofono/drivers/atmodem/call-volume.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdio.h>

@@ -206,7 +207,7 @@ static void at_call_volume_remove(struct ofono_call_volume *cv)
 	g_free(cvd);
 }

-static const struct ofono_call_volume_driver driver = {
+static struct ofono_call_volume_driver driver = {
 	.name = "atmodem",
 	.probe = at_call_volume_probe,
 	.remove = at_call_volume_remove,
--- a/ofono/drivers/atmodem/cbs.c
+++ b/ofono/drivers/atmodem/cbs.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdio.h>

@@ -47,51 +48,6 @@ struct cbs_data {
 	unsigned int vendor;
 };

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

 	DBG("");

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

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

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

 	ofono_cbs_set_data(cbs, data);

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

@@ -303,7 +239,7 @@ static void at_cbs_remove(struct ofono_cbs *cbs)
 	g_free(data);
 }

-static const struct ofono_cbs_driver driver = {
+static struct ofono_cbs_driver driver = {
 	.name = "atmodem",
 	.probe = at_cbs_probe,
 	.remove = at_cbs_remove,
--- a/ofono/drivers/atmodem/devinfo.c
+++ b/ofono/drivers/atmodem/devinfo.c
@@ -153,7 +153,7 @@ static void at_devinfo_remove(struct ofono_devinfo *info)
 	g_at_chat_unref(chat);
 }

-static const struct ofono_devinfo_driver driver = {
+static struct ofono_devinfo_driver driver = {
 	.name			= "atmodem",
 	.probe			= at_devinfo_probe,
 	.remove			= at_devinfo_remove,
--- a/ofono/drivers/atmodem/gnss.c
+++ b/ofono/drivers/atmodem/gnss.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -262,7 +263,7 @@ static void at_gnss_remove(struct ofono_gnss *gnss)
 	g_free(gd);
 }

-static const struct ofono_gnss_driver driver = {
+static struct ofono_gnss_driver driver = {
 	.name			= "atmodem",
 	.probe			= at_gnss_probe,
 	.remove			= at_gnss_remove,
--- a/ofono/drivers/atmodem/gprs-context.c
+++ b/ofono/drivers/atmodem/gprs-context.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -464,19 +465,10 @@ static int at_gprs_context_probe(struct ofono_gprs_context *gc,
 static void at_gprs_context_remove(struct ofono_gprs_context *gc)
 {
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
-	GAtIO *io;

 	DBG("");

 	if (gcd->state != STATE_IDLE && gcd->ppp) {
-		if ((gcd->vendor == OFONO_VENDOR_HUAWEI) && gcd->chat) {
-			/* immediately send escape sequence */
-			io = g_at_chat_get_io(gcd->chat);
-
-			if (io)
-				g_at_io_write(io, "+++", 3);
-		}
-
 		g_at_ppp_unref(gcd->ppp);
 		g_at_chat_resume(gcd->chat);
 	}
@@ -487,7 +479,7 @@ static void at_gprs_context_remove(struct ofono_gprs_context *gc)
 	g_free(gcd);
 }

-static const struct ofono_gprs_context_driver driver = {
+static struct ofono_gprs_context_driver driver = {
 	.name			= "atmodem",
 	.probe			= at_gprs_context_probe,
 	.remove			= at_gprs_context_remove,
--- a/ofono/drivers/atmodem/gprs.c
+++ b/ofono/drivers/atmodem/gprs.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -641,7 +642,7 @@ static void at_gprs_remove(struct ofono_gprs *gprs)
 	g_free(gd);
 }

-static const struct ofono_gprs_driver driver = {
+static struct ofono_gprs_driver driver = {
 	.name			= "atmodem",
 	.probe			= at_gprs_probe,
 	.remove			= at_gprs_remove,
--- a/ofono/drivers/atmodem/lte.c
+++ b/ofono/drivers/atmodem/lte.c
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2017  Intel Corporation. All rights reserved.
- *  Copyright (C) 2018 Gemalto M2M
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -24,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -41,66 +41,21 @@

 #include "atmodem.h"

-static const char *none_prefix[] = { NULL };
-
 struct lte_driver_data {
 	GAtChat *chat;
-	struct ofono_lte_default_attach_info pending_info;
 };

-static void at_lte_set_auth_cb(gboolean ok, GAtResult *result,
-							gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_lte_cb_t cb = cbd->cb;
-	struct ofono_error error;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-	cb(&error, cbd->data);
-}
-
 static void at_lte_set_default_attach_info_cb(gboolean ok, GAtResult *result,
 							gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
 	ofono_lte_cb_t cb = cbd->cb;
-	void *data = cbd->data;
-	struct lte_driver_data *ldd = cbd->user;
 	struct ofono_error error;
-	char buf[32 + OFONO_GPRS_MAX_USERNAME_LENGTH +
-					OFONO_GPRS_MAX_PASSWORD_LENGTH  + 1];
-	size_t buflen = sizeof(buf);
-	size_t len;
-	enum ofono_gprs_auth_method auth_method;

-	if (!ok) {
-		decode_at_error(&error, g_at_result_final_response(result));
-		cb(&error, data);
-		return;
-	}
+	DBG("ok %d", ok);

-	auth_method = ldd->pending_info.auth_method;
-
-	/* change the authentication method if the  parameters are invalid */
-	if (!*ldd->pending_info.username || !*ldd->pending_info.password)
-		auth_method = OFONO_GPRS_AUTH_METHOD_NONE;
-
-	len = snprintf(buf, buflen, "AT+CGAUTH=0,%d",
-			at_util_gprs_auth_method_to_auth_prot(auth_method));
-	buflen -= len;
-
-	if (auth_method != OFONO_GPRS_AUTH_METHOD_NONE)
-		snprintf(buf + len, buflen, ",\"%s\",\"%s\"",
-				ldd->pending_info.username,
-				ldd->pending_info.password);
-
-	cbd = cb_data_ref(cbd);
-	if (g_at_chat_send(ldd->chat, buf, none_prefix,
-			at_lte_set_auth_cb, cbd, cb_data_unref) > 0)
-		return;
-
-	cb_data_unref(cbd);
-	CALLBACK_WITH_FAILURE(cb, data);
+	decode_at_error(&error, g_at_result_final_response(result));
+	cb(&error, cbd->data);
 }

 static void at_lte_set_default_attach_info(const struct ofono_lte *lte,
@@ -108,21 +63,23 @@ static void at_lte_set_default_attach_info(const struct ofono_lte *lte,
 			ofono_lte_cb_t cb, void *data)
 {
 	struct lte_driver_data *ldd = ofono_lte_get_data(lte);
+	char buf[32 + OFONO_GPRS_MAX_APN_LENGTH + 1];
 	struct cb_data *cbd = cb_data_new(cb, data);
-	char *buf = at_util_get_cgdcont_command(0, info->proto, info->apn);

-	cbd->user = ldd;
-	memcpy(&ldd->pending_info, info, sizeof(ldd->pending_info));
+	DBG("LTE config with APN: %s", info->apn);

-	if (g_at_chat_send(ldd->chat, buf, none_prefix,
-					at_lte_set_default_attach_info_cb,
-					cbd, cb_data_unref) > 0)
-		goto end;
+	if (strlen(info->apn) > 0)
+		snprintf(buf, sizeof(buf), "AT+CGDCONT=0,\"IP\",\"%s\"",
+				info->apn);
+	else
+		snprintf(buf, sizeof(buf), "AT+CGDCONT=0,\"IP\"");
+
+	/* We can't do much in case of failure so don't check response. */
+	if (g_at_chat_send(ldd->chat, buf, NULL,
+			at_lte_set_default_attach_info_cb, cbd, g_free) > 0)
+		return;

-	cb_data_unref(cbd);
 	CALLBACK_WITH_FAILURE(cb, data);
-end:
-	g_free(buf);
 }

 static gboolean lte_delayed_register(gpointer user_data)
@@ -134,7 +91,7 @@ static gboolean lte_delayed_register(gpointer user_data)
 	return FALSE;
 }

-static int at_lte_probe(struct ofono_lte *lte, unsigned int vendor, void *data)
+static int at_lte_probe(struct ofono_lte *lte, void *data)
 {
 	GAtChat *chat = data;
 	struct lte_driver_data *ldd;
@@ -167,7 +124,7 @@ static void at_lte_remove(struct ofono_lte *lte)
 	g_free(ldd);
 }

-static const struct ofono_lte_driver driver = {
+static struct ofono_lte_driver driver = {
 	.name				= "atmodem",
 	.probe				= at_lte_probe,
 	.remove				= at_lte_remove,
--- a/ofono/drivers/atmodem/network-registration.c
+++ b/ofono/drivers/atmodem/network-registration.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -47,7 +48,6 @@ static const char *cops_prefix[] = { "+COPS:", NULL };
 static const char *csq_prefix[] = { "+CSQ:", NULL };
 static const char *cind_prefix[] = { "+CIND:", NULL };
 static const char *cmer_prefix[] = { "+CMER:", NULL };
-static const char *smoni_prefix[] = { "^SMONI:", NULL };
 static const char *zpas_prefix[] = { "+ZPAS:", NULL };
 static const char *option_tech_prefix[] = { "_OCTI:", "_OUWCTI:", NULL };

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

-static int gemalto_parse_tech(GAtResult *result)
-{
-	int tech = -1;
-	GAtResultIter iter;
-	const char *technology;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "^SMONI: "))
-		return tech;
-
-	if (!g_at_result_iter_next_unquoted_string(&iter, &technology))
-		return tech;
-
-	if (strcmp(technology, "2G") == 0) {
-		tech = ACCESS_TECHNOLOGY_GSM_EGPRS;
-	} else if (strcmp(technology, "3G") == 0) {
-		tech = ACCESS_TECHNOLOGY_UTRAN;
-	} else if (strcmp(technology, "4G") == 0) {
-		tech = ACCESS_TECHNOLOGY_EUTRAN;
-	}
-
-	return tech;
-}
-
 static void at_creg_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -227,25 +202,9 @@ static void at_creg_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	if ((status == 1 || status == 5) && (tech == -1))
 		tech = nd->tech;

-	/* 6-10 is EUTRAN, with 8 being emergency bearer case */
-	if (status > 5 && tech == -1)
-		tech = ACCESS_TECHNOLOGY_EUTRAN;
-
 	cb(&error, status, lac, ci, tech, cbd->data);
 }

-static void gemalto_query_tech_cb(gboolean ok, GAtResult *result,
-                                              gpointer user_data)
-{
-	struct tech_query *tq = user_data;
-	int tech;
-
-	tech = gemalto_parse_tech(result);
-
-	ofono_netreg_status_notify(tq->netreg,
-			tq->status, tq->lac, tq->ci, tech);
-}
-
 static void zte_tech_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -879,7 +838,7 @@ static void telit_ciev_notify(GAtResult *result, gpointer user_data)
 	ofono_netreg_strength_notify(netreg, strength);
 }

-static void gemalto_ciev_notify(GAtResult *result, gpointer user_data)
+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);
@@ -1559,12 +1518,6 @@ static void creg_notify(GAtResult *result, gpointer user_data)
 					option_query_tech_cb, tq, g_free) > 0)
 			return;
 		break;
-    case OFONO_VENDOR_GEMALTO:
-              if (g_at_chat_send(nd->chat, "AT^SMONI",
-                                      smoni_prefix,
-                                      gemalto_query_tech_cb, tq, g_free) > 0)
-                      return;
-              break;
 	}

 	g_free(tq);
@@ -2031,12 +1984,12 @@ 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_GEMALTO:
+	case OFONO_VENDOR_CINTERION:
 		/*
-		 * We can't set rssi bounds from Gemalto responses
+		 * We can't set rssi bounds from Cinterion responses
 		 * so set them up to specified values here
 		 *
-		 * Gemalto rssi signal strength specified as:
+		 * Cinterion rssi signal strength specified as:
 		 * 0      <= -112dBm
 		 * 1 - 4  signal strengh in 15 dB steps
 		 * 5      >= -51 dBm
@@ -2050,7 +2003,7 @@ static void at_creg_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		g_at_chat_send(nd->chat, "AT^SIND=\"rssi\",1", none_prefix,
 				NULL, NULL, NULL);
 		g_at_chat_register(nd->chat, "+CIEV:",
-				gemalto_ciev_notify, FALSE, netreg, NULL);
+				cinterion_ciev_notify, FALSE, netreg, NULL);
 		break;
 	case OFONO_VENDOR_NOKIA:
 	case OFONO_VENDOR_SAMSUNG:
@@ -2154,7 +2107,7 @@ static void at_netreg_remove(struct ofono_netreg *netreg)
 	g_free(nd);
 }

-static const struct ofono_netreg_driver driver = {
+static struct ofono_netreg_driver driver = {
 	.name				= "atmodem",
 	.probe				= at_netreg_probe,
 	.remove				= at_netreg_remove,
--- a/ofono/drivers/atmodem/phonebook.c
+++ b/ofono/drivers/atmodem/phonebook.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -592,7 +593,7 @@ static void at_phonebook_remove(struct ofono_phonebook *pb)
 	g_free(pbd);
 }

-static const struct ofono_phonebook_driver driver = {
+static struct ofono_phonebook_driver driver = {
 	.name		= "atmodem",
 	.probe		= at_phonebook_probe,
 	.remove		= at_phonebook_remove,
--- a/ofono/drivers/atmodem/sim-auth.c
+++ b/ofono/drivers/atmodem/sim-auth.c
@@ -0,0 +1,164 @@
+/*
+ *
+ *  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
+
+#define _GNU_SOURCE
+#include <string.h>
+
+#include <glib.h>
+
+#include <ofono/modem.h>
+#include <ofono/sim-auth.h>
+
+#include "gatchat.h"
+#include "gatresult.h"
+#include "simutil.h"
+#include "vendor.h"
+
+#include "atmodem.h"
+
+struct sim_auth_data {
+	GAtChat *chat;
+	unsigned int vendor;
+};
+
+static const char *cuad_prefix[] = { "+CUAD:", NULL };
+
+static void at_discover_apps_cb(gboolean ok, GAtResult *result,
+				gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	GAtResultIter iter;
+	ofono_sim_list_apps_cb_t cb = cbd->cb;
+	struct ofono_error error;
+	const unsigned char *dataobj;
+	gint linelen;
+	unsigned char *buffer;
+	int len;
+
+	decode_at_error(&error, g_at_result_final_response(result));
+
+	if (!ok) {
+		cb(&error, NULL, 0, cbd->data);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	len = 0;
+	while (g_at_result_iter_next(&iter, "+CUAD:")) {
+		if (!g_at_result_iter_next_hexstring(&iter, NULL, &linelen))
+			goto error;
+
+		len += linelen;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	buffer = g_malloc(len);
+	len = 0;
+
+	while (g_at_result_iter_next(&iter, "+CUAD:")) {
+		g_at_result_iter_next_hexstring(&iter, &dataobj, &linelen);
+		memcpy(buffer + len, dataobj, linelen);
+		len += linelen;
+	}
+
+	cb(&error, buffer, len, cbd->data);
+
+	g_free(buffer);
+	return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, NULL, 0, cbd->data);
+}
+
+static void at_discover_apps(struct ofono_sim_auth *sa,
+				ofono_sim_list_apps_cb_t cb,
+				void *data)
+{
+	struct sim_auth_data *sad = ofono_sim_auth_get_data(sa);
+	struct cb_data *cbd = cb_data_new(cb, data);
+
+	if (g_at_chat_send(sad->chat, "AT+CUAD", cuad_prefix,
+					at_discover_apps_cb, cbd, g_free) > 0)
+		return;
+
+	g_free(cbd);
+
+	CALLBACK_WITH_FAILURE(cb, NULL, 0, data);
+}
+
+static gboolean at_sim_auth_register(gpointer user)
+{
+	struct ofono_sim_auth *sa = user;
+
+	ofono_sim_auth_register(sa);
+
+	return FALSE;
+}
+
+static int at_sim_auth_probe(struct ofono_sim_auth *sa, unsigned int vendor,
+				void *data)
+{
+	GAtChat *chat = data;
+	struct sim_auth_data *sad;
+
+	sad = g_new0(struct sim_auth_data, 1);
+	sad->chat = g_at_chat_clone(chat);
+	sad->vendor = vendor;
+
+	ofono_sim_auth_set_data(sa, sad);
+	g_idle_add(at_sim_auth_register, sa);
+
+	return 0;
+}
+
+static void at_sim_auth_remove(struct ofono_sim_auth *sa)
+{
+	struct sim_auth_data *sad = ofono_sim_auth_get_data(sa);
+
+	g_idle_remove_by_data(sa);
+	ofono_sim_auth_set_data(sa, NULL);
+
+	g_at_chat_unref(sad->chat);
+	g_free(sad);
+}
+
+static struct ofono_sim_auth_driver driver = {
+	.name		= "atmodem",
+	.probe		= at_sim_auth_probe,
+	.remove		= at_sim_auth_remove,
+	.list_apps	= at_discover_apps,
+};
+
+void at_sim_auth_init(void)
+{
+	ofono_sim_auth_driver_register(&driver);
+}
+
+void at_sim_auth_exit(void)
+{
+	ofono_sim_auth_driver_unregister(&driver);
+}
--- a/ofono/drivers/atmodem/sim.c
+++ b/ofono/drivers/atmodem/sim.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -38,7 +39,6 @@
 #include "gatresult.h"
 #include "simutil.h"
 #include "vendor.h"
-#include "util.h"

 #include "atmodem.h"

@@ -50,6 +50,7 @@
 struct sim_data {
 	GAtChat *chat;
 	unsigned int vendor;
+	guint ready_id;
 	guint passwd_type_mask;
 	struct at_util_sim_state_query *sim_state_query;
 };
@@ -64,37 +65,14 @@ static const char *pinnum_prefix[] = { "%PINNUM:", NULL };
 static const char *oercn_prefix[] = { "_OERCN:", NULL };
 static const char *cpinr_prefixes[] = { "+CPINR:", "+CPINRE:", NULL };
 static const char *epin_prefix[] = { "*EPIN:", NULL };
-static const char *simcom_spic_prefix[] = { "+SPIC:", NULL };
-static const char *gemalto_spic_prefix[] = { "^SPIC:", 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 *qtrpin_prefix[] = { "+QTRPIN:", NULL };
 static const char *upincnt_prefix[] = { "+UPINCNT:", NULL };
-static const char *cuad_prefix[] = { "+CUAD:", NULL };
-static const char *ccho_prefix[] = { "+CCHO:", NULL };
-static const char *crla_prefix[] = { "+CRLA:", NULL };
-static const char *cgla_prefix[] = { "+CGLA:", NULL };
 static const char *none_prefix[] = { NULL };

-static void append_file_path(char *buf, const unsigned char *path,
-		unsigned int path_len)
-{
-	if (path_len > 0) {
-		*buf++ = ',';
-		*buf++ = ',';
-		*buf++ = '\"';
-
-		for (; path_len; path_len--)
-			buf += sprintf(buf, "%02hhX", *path++);
-
-		*buf++ = '\"';
-		*buf = '\0';
-	}
-}
-
-static void get_response_common_cb(gboolean ok, GAtResult *result,
-		gpointer user_data, const char *prefix)
+static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
 	GAtResultIter iter;
@@ -116,7 +94,7 @@ static void get_response_common_cb(gboolean ok, GAtResult *result,

 	g_at_result_iter_init(&iter, result);

-	if (!g_at_result_iter_next(&iter, prefix))
+	if (!g_at_result_iter_next(&iter, "+CRSM:"))
 		goto error;

 	g_at_result_iter_next_number(&iter, &sw1);
@@ -157,11 +135,6 @@ error:
 				EF_STATUS_INVALIDATED, cbd->data);
 }

-static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	get_response_common_cb(ok, result, user_data, "+CRSM:");
-}
-
 static void at_sim_read_info(struct ofono_sim *sim, int fileid,
 				const unsigned char *path,
 				unsigned int path_len,
@@ -203,7 +176,15 @@ static void at_sim_read_info(struct ofono_sim *sim, int fileid,
 		break;
 	}

-	append_file_path(buf + len, path, path_len);
+	if (path_len > 0) {
+		len += sprintf(buf + len, ",,\"");
+
+		for (; path_len; path_len--)
+			len += sprintf(buf + len, "%02hhX", *path++);
+
+		buf[len++] = '\"';
+		buf[len] = '\0';
+	}

 	if (g_at_chat_send(sd->chat, buf, crsm_prefix,
 				at_crsm_info_cb, cbd, g_free) > 0)
@@ -277,7 +258,17 @@ static void at_sim_read_binary(struct ofono_sim *sim, int fileid,
 	len = snprintf(buf, sizeof(buf), "AT+CRSM=176,%i,%i,%i,%i", fileid,
 			start >> 8, start & 0xff, length);

-	append_file_path(buf + len, path, path_len);
+	if (path_len > 0) {
+		buf[len++] = ',';
+		buf[len++] = ',';
+		buf[len++] = '\"';
+
+		for (; path_len; path_len--)
+			len += sprintf(buf + len, "%02hhX", *path++);
+
+		buf[len++] = '\"';
+		buf[len] = '\0';
+	}

 	if (g_at_chat_send(sd->chat, buf, crsm_prefix,
 				at_crsm_read_cb, cbd, g_free) > 0)
@@ -297,13 +288,10 @@ static void at_sim_read_record(struct ofono_sim *sim, int fileid,
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[128];
-	unsigned int len;

-	len = snprintf(buf, sizeof(buf), "AT+CRSM=178,%i,%i,4,%i", fileid,
+	snprintf(buf, sizeof(buf), "AT+CRSM=178,%i,%i,4,%i", fileid,
 			record, length);

-	append_file_path(buf + len, path, path_len);
-
 	if (g_at_chat_send(sd->chat, buf, crsm_prefix,
 				at_crsm_read_cb, cbd, g_free) > 0)
 		return;
@@ -849,7 +837,7 @@ static void at_cpinr_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	cb(&error, retries, cbd->data);
 }

-static void simcom_spic_cb(gboolean ok, GAtResult *result, gpointer user_data)
+static void at_spic_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
 	ofono_sim_pin_retries_cb_t cb = cbd->cb;
@@ -982,49 +970,6 @@ error:
 	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
 }

-static void at_qtrpin_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, "+QTRPIN:")) {
-		int pin, pin2, puk, puk2;
-
-		if (!g_at_result_iter_next_number(&iter, &pin))
-			continue;
-		if (!g_at_result_iter_next_number(&iter, &pin2))
-			continue;
-		if (!g_at_result_iter_next_number(&iter, &puk))
-			continue;
-		if (!g_at_result_iter_next_number(&iter, &puk2))
-			continue;
-
-		retries[OFONO_SIM_PASSWORD_SIM_PIN] = pin;
-		retries[OFONO_SIM_PASSWORD_SIM_PUK] = puk;
-		retries[OFONO_SIM_PASSWORD_SIM_PIN2] = pin2;
-		retries[OFONO_SIM_PASSWORD_SIM_PUK2] = puk2;
-	}
-
-	cb(&error, retries, cbd->data);
-}
-
 static void at_qpinc_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -1109,46 +1054,6 @@ error:
 	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
 }

-static void gemalto_spic_cb(gboolean ok, GAtResult *result,
-							gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	struct ofono_sim *sim = cbd->user;
-	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;
-	int pin_type = ofono_sim_get_password_type(sim);
-
-	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);
-
-	if (!g_at_result_iter_next(&iter, "^SPIC:"))
-		goto error;
-
-	if (!g_at_result_iter_next_number(&iter, &retries[pin_type]))
-		goto error;
-
-	DBG("Retry : %d, type : %d", retries[pin_type], pin_type);
-	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)
@@ -1196,8 +1101,8 @@ static void at_pin_retries_query(struct ofono_sim *sim,
 			return;
 		break;
 	case OFONO_VENDOR_SIMCOM:
-		if (g_at_chat_send(sd->chat, "AT+SPIC", simcom_spic_prefix,
-					simcom_spic_cb, cbd, g_free) > 0)
+		if (g_at_chat_send(sd->chat, "AT+SPIC", spic_prefix,
+					at_spic_cb, cbd, g_free) > 0)
 			return;
 		break;
 	case OFONO_VENDOR_TELIT:
@@ -1215,22 +1120,12 @@ static void at_pin_retries_query(struct ofono_sim *sim,
 					at_qpinc_cb, cbd, g_free) > 0)
 			return;
 		break;
-	case OFONO_VENDOR_QUECTEL_M95:
-		if (g_at_chat_send(sd->chat, "AT+QTRPIN", qtrpin_prefix,
-					at_qtrpin_cb, cbd, g_free) > 0)
-			return;
-		break;
 	case OFONO_VENDOR_UBLOX:
 	case OFONO_VENDOR_UBLOX_TOBY_L2:
 		if (g_at_chat_send(sd->chat, "AT+UPINCNT", upincnt_prefix,
 					upincnt_cb, cbd, g_free) > 0)
 			return;
 		break;
-	case OFONO_VENDOR_GEMALTO:
-		if (g_at_chat_send(sd->chat, "AT^SPIC", gemalto_spic_prefix,
-					gemalto_spic_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)
@@ -1321,24 +1216,100 @@ static void at_pin_query(struct ofono_sim *sim, ofono_sim_passwd_cb_t cb,
 	CALLBACK_WITH_FAILURE(cb, -1, data);
 }

+static void at_xsim_notify(GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct sim_data *sd = cbd->user;
+	ofono_sim_lock_unlock_cb_t cb = cbd->cb;
+	struct ofono_error error = { .type = OFONO_ERROR_TYPE_NO_ERROR };
+	GAtResultIter iter;
+	int state;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+XSIM:"))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &state))
+		return;
+
+	switch (state) {
+	case 3:	/* PIN verified – Ready */
+		break;
+	default:
+		return;
+	}
+
+	cb(&error, cbd->data);
+
+	g_at_chat_unregister(sd->chat, sd->ready_id);
+	sd->ready_id = 0;
+}
+
+static void at_epev_notify(GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct sim_data *sd = cbd->user;
+	ofono_sim_lock_unlock_cb_t cb = cbd->cb;
+	struct ofono_error error = { .type = OFONO_ERROR_TYPE_NO_ERROR };
+
+	cb(&error, cbd->data);
+
+	g_at_chat_unregister(sd->chat, sd->ready_id);
+	sd->ready_id = 0;
+}
+
+static void at_qss_notify(GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct sim_data *sd = cbd->user;
+	ofono_sim_lock_unlock_cb_t cb = cbd->cb;
+	struct ofono_error error = { .type = OFONO_ERROR_TYPE_NO_ERROR };
+	GAtResultIter iter;
+	int state;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "#QSS:"))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &state))
+		return;
+
+	switch (state) {
+	case 3:	/* SIM inserted and READY. */
+		break;
+	default:
+		return;
+	}
+
+	cb(&error, cbd->data);
+
+	g_at_chat_unregister(sd->chat, sd->ready_id);
+	sd->ready_id = 0;
+}
+
 static void sim_state_cb(gboolean present, gpointer user_data)
 {
-	struct ofono_sim *sim = user_data;
-	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct cb_data *cbd = user_data;
+	struct sim_data *sd = cbd->user;
+	ofono_sim_lock_unlock_cb_t cb = cbd->cb;
+	void *data = cbd->data;

 	at_util_sim_state_query_free(sd->sim_state_query);
 	sd->sim_state_query = NULL;

 	if (present == 1)
-		ofono_sim_initialized_notify(sim);
+		CALLBACK_WITH_SUCCESS(cb, data);
+	else
+		CALLBACK_WITH_FAILURE(cb, data);
 }

 static void at_pin_send_cb(gboolean ok, GAtResult *result,
 				gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
-	struct ofono_sim *sim = cbd->user;
-	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct sim_data *sd = cbd->user;
 	ofono_sim_lock_unlock_cb_t cb = cbd->cb;
 	struct ofono_error error;

@@ -1348,12 +1319,41 @@ static void at_pin_send_cb(gboolean ok, GAtResult *result,
 		goto done;

 	switch (sd->vendor) {
+	case OFONO_VENDOR_IFX:
+		/*
+		 * On the IFX modem, AT+CPIN? can return READY too
+		 * early and so use +XSIM notification to detect
+		 * the ready state of the SIM.
+		 */
+		sd->ready_id = g_at_chat_register(sd->chat, "+XSIM",
+							at_xsim_notify,
+							FALSE, cbd, g_free);
+		return;
+	case OFONO_VENDOR_MBM:
+		/*
+		 * On the MBM modem, AT+CPIN? keeps returning SIM PIN
+		 * for a moment after successful AT+CPIN="..", but then
+		 * sends *EPEV when that changes.
+		 */
+		sd->ready_id = g_at_chat_register(sd->chat, "*EPEV",
+							at_epev_notify,
+							FALSE, cbd, g_free);
+		return;
+	case OFONO_VENDOR_TELIT:
+		/*
+		 * On the Telit modem, AT+CPIN? can return READY too
+		 * early and so use #QSS notification to detect
+		 * the ready state of the SIM.
+		 */
+		sd->ready_id = g_at_chat_register(sd->chat, "#QSS",
+							at_qss_notify,
+							FALSE, cbd, g_free);
+		return;
 	case OFONO_VENDOR_ZTE:
 	case OFONO_VENDOR_ALCATEL:
 	case OFONO_VENDOR_HUAWEI:
 	case OFONO_VENDOR_SIMCOM:
 	case OFONO_VENDOR_SIERRA:
-	case OFONO_VENDOR_QUECTEL_M95:
 		/*
 		 * On ZTE modems, after pin is entered, SIM state is checked
 		 * by polling CPIN as their modem doesn't provide unsolicited
@@ -1366,12 +1366,15 @@ static void at_pin_send_cb(gboolean ok, GAtResult *result,
 		 * state.
 		 */
 		sd->sim_state_query = at_util_sim_state_query_new(sd->chat,
-						2, 20, sim_state_cb, sim,
-						NULL);
+						2, 20, sim_state_cb, cbd,
+						g_free);
+		return;
 	}

 done:
 	cb(&error, cbd->data);
+
+	g_free(cbd);
 }

 static void at_pin_send(struct ofono_sim *sim, const char *passwd,
@@ -1382,12 +1385,12 @@ static void at_pin_send(struct ofono_sim *sim, const char *passwd,
 	char buf[64];
 	int ret;

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

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

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

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

@@ -1408,12 +1411,12 @@ static void at_pin_send_puk(struct ofono_sim *sim, const char *puk,
 	char buf[64];
 	int ret;

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

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

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

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

@@ -1600,327 +1603,6 @@ done:
 	ofono_sim_register(sim);
 }

-static void at_discover_apps_cb(gboolean ok, GAtResult *result,
-				gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	GAtResultIter iter;
-	ofono_sim_list_apps_cb_t cb = cbd->cb;
-	struct ofono_error error;
-	const unsigned char *buffer;
-	int len;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok) {
-		cb(&error, NULL, 0, cbd->data);
-		return;
-	}
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+CUAD:"))
-		goto error;
-
-	if (!g_at_result_iter_next_hexstring(&iter, &buffer, &len))
-		goto error;
-
-	cb(&error, buffer, len, cbd->data);
-
-	return;
-
-error:
-	CALLBACK_WITH_FAILURE(cb, NULL, 0, cbd->data);
-}
-
-static void at_discover_apps(struct ofono_sim *sim,
-				ofono_sim_list_apps_cb_t cb,
-				void *data)
-{
-	struct sim_data *sd = ofono_sim_get_data(sim);
-	struct cb_data *cbd = cb_data_new(cb, data);
-
-	if (g_at_chat_send(sd->chat, "AT+CUAD", cuad_prefix,
-			at_discover_apps_cb, cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, NULL, 0, data);
-}
-
-static void at_open_channel_cb(gboolean ok, GAtResult *result,
-		gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	GAtResultIter iter;
-	ofono_sim_open_channel_cb_t cb = cbd->cb;
-	struct ofono_error error;
-	int session_id = -1;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok)
-		goto error;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+CCHO:"))
-		goto error;
-
-	if (!g_at_result_iter_next_number(&iter, &session_id))
-		goto error;
-
-	cb(&error, session_id, cbd->data);
-
-	return;
-
-error:
-	cb(&error, -1, cbd->data);
-}
-
-static void at_open_channel(struct ofono_sim *sim, const unsigned char *aid,
-		ofono_sim_open_channel_cb_t cb, void *data)
-{
-	struct sim_data *sd = ofono_sim_get_data(sim);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	char cmd[43];
-	int ret = 0;
-
-	strcpy(cmd, "AT+CCHO=\"");
-	ret += 9;
-
-	encode_hex_own_buf(aid, 16, 0, cmd + ret);
-	ret += 32;
-
-	strcpy(cmd + ret, "\"");
-
-	if (g_at_chat_send(sd->chat, cmd, ccho_prefix, at_open_channel_cb,
-			cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, -1, data);
-}
-
-static void at_close_channel_cb(gboolean ok, GAtResult *result,
-		gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_sim_close_channel_cb_t cb = cbd->cb;
-	struct ofono_error error;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (cb)
-		cb(&error, cbd->data);
-}
-
-static void at_close_channel(struct ofono_sim *sim, int session_id,
-		ofono_sim_close_channel_cb_t cb, void *data)
-{
-	struct sim_data *sd = ofono_sim_get_data(sim);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	char cmd[15];
-
-	sprintf(cmd, "AT+CCHC=%d", session_id);
-
-	g_at_chat_send(sd->chat, cmd, NULL, at_close_channel_cb, cbd, g_free);
-}
-
-static void at_crla_read_cb(gboolean ok, GAtResult *result,
-				gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	GAtResultIter iter;
-	ofono_sim_read_cb_t cb = cbd->cb;
-	struct ofono_error error;
-	const guint8 *response;
-	gint sw1, sw2, len;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok) {
-		cb(&error, NULL, 0, cbd->data);
-		return;
-	}
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+CRLA:")) {
-		CALLBACK_WITH_FAILURE(cb, NULL, 0, cbd->data);
-		return;
-	}
-
-	g_at_result_iter_next_number(&iter, &sw1);
-	g_at_result_iter_next_number(&iter, &sw2);
-
-	if ((sw1 != 0x90 && sw1 != 0x91 && sw1 != 0x92 && sw1 != 0x9f) ||
-			(sw1 == 0x90 && sw2 != 0x00)) {
-		memset(&error, 0, sizeof(error));
-
-		error.type = OFONO_ERROR_TYPE_SIM;
-		error.error = (sw1 << 8) | sw2;
-
-		cb(&error, NULL, 0, cbd->data);
-		return;
-	}
-
-	if (!g_at_result_iter_next_hexstring(&iter, &response, &len)) {
-		CALLBACK_WITH_FAILURE(cb, NULL, 0, cbd->data);
-		return;
-	}
-
-	DBG("crla_read_cb: %02x, %02x, %d", sw1, sw2, len);
-
-	cb(&error, response, len, cbd->data);
-}
-
-static void at_session_read_binary(struct ofono_sim *sim, int session,
-				int fileid, int start, int length,
-				const unsigned char *path,
-				unsigned int path_len,
-				ofono_sim_read_cb_t cb, void *data)
-{
-	struct sim_data *sd = ofono_sim_get_data(sim);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	char buf[64];
-	unsigned int len;
-
-	len = snprintf(buf, sizeof(buf), "AT+CRLA=%i,176,%i,%i,%i,%i,,",
-			session, fileid, start >> 8, start & 0xff, length);
-
-	append_file_path(buf + len, path, path_len);
-
-	if (g_at_chat_send(sd->chat, buf, crla_prefix,
-			at_crla_read_cb, cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, NULL, 0, data);
-}
-
-static void at_session_read_record(struct ofono_sim *sim, int session_id,
-				int fileid, int record, int length,
-				const unsigned char *path,
-				unsigned int path_len,
-				ofono_sim_read_cb_t cb, void *data)
-{
-	struct sim_data *sd = ofono_sim_get_data(sim);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	char buf[128];
-	unsigned int len;
-
-	len = snprintf(buf, sizeof(buf), "AT+CRLA=%i,178,%i,%i,4,%i",
-			session_id, fileid, record, length);
-
-	append_file_path(buf + len, path, path_len);
-
-	if (g_at_chat_send(sd->chat, buf, crla_prefix,
-			at_crla_read_cb, cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, NULL, 0, data);
-}
-
-static void at_crla_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	get_response_common_cb(ok, result, user_data, "+CRLA:");
-}
-
-static void at_session_read_info(struct ofono_sim *sim, int session_id,
-				int fileid, const unsigned char *path,
-				unsigned int path_len,
-				ofono_sim_file_info_cb_t cb, void *data)
-{
-	struct sim_data *sd = ofono_sim_get_data(sim);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	char buf[128];
-	unsigned int len;
-
-	len = snprintf(buf, sizeof(buf), "AT+CRLA=%i,192,%i", session_id,
-			fileid);
-
-	append_file_path(buf + len, path, path_len);
-
-	if (g_at_chat_send(sd->chat, buf, crla_prefix,
-			at_crla_info_cb, cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, -1, -1, -1, NULL,
-				EF_STATUS_INVALIDATED, data);
-}
-
-static void logical_access_cb(gboolean ok, GAtResult *result,
-		gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	ofono_sim_logical_access_cb_t cb = cbd->cb;
-	struct ofono_error error;
-	const char *str_data;
-	unsigned char *raw;
-	gint len = 0;
-	GAtResultIter iter;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (!ok)
-		goto error;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+CGLA:"))
-		goto error;
-
-	if (!g_at_result_iter_next_number(&iter, &len))
-		goto error;
-
-	if (!g_at_result_iter_next_string(&iter, &str_data))
-		goto error;
-
-	raw = alloca(len / 2);
-
-	decode_hex_own_buf(str_data, len, NULL, 0, raw);
-
-	cb(&error, raw, len / 2, cbd->data);
-
-	return;
-
-error:
-	cb(&error, NULL, 0, cbd->data);
-}
-
-static void at_logical_access(struct ofono_sim *sim, int session_id,
-		const unsigned char *pdu, unsigned int len,
-		ofono_sim_logical_access_cb_t cb, void *data)
-{
-	struct sim_data *sd = ofono_sim_get_data(sim);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	int ret = 0;
-	char cmd[(len * 2) + 19];
-
-	ret = sprintf(cmd, "AT+CGLA=%d,%d,\"", session_id, len * 2);
-
-	encode_hex_own_buf(pdu, len, 0, cmd + ret);
-	ret += len * 2;
-
-	strcpy(cmd + ret, "\"");
-
-	if (g_at_chat_send(sd->chat, cmd, cgla_prefix, logical_access_cb,
-			cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, NULL, 0, data);
-}
-
 static int at_sim_probe(struct ofono_sim *sim, unsigned int vendor,
 				void *data)
 {
@@ -1932,6 +1614,9 @@ static int at_sim_probe(struct ofono_sim *sim, unsigned int vendor,
 	sd->chat = g_at_chat_clone(chat);
 	sd->vendor = vendor;

+	if (sd->vendor == OFONO_VENDOR_MBM)
+		g_at_chat_send(sd->chat, "AT*EPEE=1", NULL, NULL, NULL, NULL);
+
 	ofono_sim_set_data(sim, sd);

 	/* <fac>s supported by default */
@@ -1958,7 +1643,7 @@ static void at_sim_remove(struct ofono_sim *sim)
 	g_free(sd);
 }

-static const struct ofono_sim_driver driver = {
+static struct ofono_sim_driver driver = {
 	.name			= "atmodem",
 	.probe			= at_sim_probe,
 	.remove			= at_sim_remove,
@@ -1977,16 +1662,9 @@ static const struct ofono_sim_driver driver = {
 	.lock			= at_pin_enable,
 	.change_passwd		= at_change_passwd,
 	.query_facility_lock	= at_query_clck,
-	.list_apps		= at_discover_apps,
-	.open_channel		= at_open_channel,
-	.close_channel		= at_close_channel,
-	.session_read_binary	= at_session_read_binary,
-	.session_read_record	= at_session_read_record,
-	.session_read_info	= at_session_read_info,
-	.logical_access		= at_logical_access
 };

-static const struct ofono_sim_driver driver_noef = {
+static struct ofono_sim_driver driver_noef = {
 	.name			= "atmodem-noef",
 	.probe			= at_sim_probe,
 	.remove			= at_sim_remove,
--- a/ofono/drivers/atmodem/sms.c
+++ b/ofono/drivers/atmodem/sms.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -103,7 +104,7 @@ static void at_csca_set(struct ofono_sms *sms,
 {
 	struct sms_data *data = ofono_sms_get_data(sms);
 	struct cb_data *cbd = cb_data_new(cb, user_data);
-	char buf[128];
+	char buf[64];

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

@@ -219,16 +220,9 @@ static void at_cmgs(struct ofono_sms *sms, const unsigned char *pdu,
 	int len;

 	if (mms) {
-		switch (data->vendor) {
-		case OFONO_VENDOR_GEMALTO:
-			/* no mms support */
-			break;
-		default:
-			snprintf(buf, sizeof(buf), "AT+CMMS=%d", mms);
-			g_at_chat_send(data->chat, buf, none_prefix,
-					NULL, NULL, NULL);
-			break;
-		}
+		snprintf(buf, sizeof(buf), "AT+CMMS=%d", mms);
+		g_at_chat_send(data->chat, buf, none_prefix,
+				NULL, NULL, NULL);
 	}

 	len = snprintf(buf, sizeof(buf), "AT+CMGS=%d\r", tpdu_len);
@@ -335,7 +329,7 @@ static inline void at_ack_delivery(struct ofono_sms *sms)
 	/* We must acknowledge the PDU using CNMA */
 	if (data->cnma_ack_pdu) {
 		switch (data->vendor) {
-		case OFONO_VENDOR_GEMALTO:
+		case OFONO_VENDOR_CINTERION:
 			snprintf(buf, sizeof(buf), "AT+CNMA=1");
 			break;
 		default:
@@ -417,25 +411,9 @@ static void at_cmt_notify(GAtResult *result, gpointer user_data)
 		goto err;

 	switch (data->vendor) {
-	case OFONO_VENDOR_GEMALTO:
-		if (!g_at_result_iter_next_number(&iter, &tpdu_len)) {
-			/*
-			 * Some Gemalto modems (ALS3,PLS8...), act in
-			 * accordance with 3GPP 27.005.  So we need to skip
-			 * the first (<alpha>) field
-			 *  \r\n+CMT: ,23\r\nCAFECAFECAFE... ...\r\n
-			 *             ^------- PDU length
-			 */
-			DBG("Retrying to find the PDU length");
-
-			if (!g_at_result_iter_skip_next(&iter))
-				goto err;
-
-			/* Next attempt at finding the PDU length. */
-			if (!g_at_result_iter_next_number(&iter, &tpdu_len))
-				goto err;
-		}
-
+	case OFONO_VENDOR_CINTERION:
+		if (!g_at_result_iter_next_number(&iter, &tpdu_len))
+			goto err;
 		break;
 	default:
 		if (!g_at_result_iter_skip_next(&iter))
@@ -461,7 +439,6 @@ static void at_cmt_notify(GAtResult *result, gpointer user_data)

 	if (data->vendor != OFONO_VENDOR_SIMCOM)
 		at_ack_delivery(sms);
-	return;

 err:
 	ofono_error("Unable to parse CMT notification");
@@ -858,18 +835,8 @@ static gboolean build_cnmi_string(char *buf, int *cnmi_opts,
 					data->cnma_enabled ? "21" : "1", FALSE))
 		return FALSE;

-	switch (data->vendor) {
-	case OFONO_VENDOR_GEMALTO:
-		mode = "0";
-		break;
-	default:
-		/* Sounds like 2 is the sanest mode */
-		mode = "20";
-		break;
-	}
-
 	/* Always deliver CB via +CBM, otherwise don't deliver at all */
-	if (!append_cnmi_element(buf, &len, cnmi_opts[2], mode, FALSE))
+	if (!append_cnmi_element(buf, &len, cnmi_opts[2], "20", FALSE))
 		return FALSE;

 	/*
@@ -1329,7 +1296,7 @@ static void at_sms_remove(struct ofono_sms *sms)
 	ofono_sms_set_data(sms, NULL);
 }

-static const struct ofono_sms_driver driver = {
+static struct ofono_sms_driver driver = {
 	.name		= "atmodem",
 	.probe		= at_sms_probe,
 	.remove		= at_sms_remove,
--- a/ofono/drivers/atmodem/stk.c
+++ b/ofono/drivers/atmodem/stk.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -222,7 +223,7 @@ static void at_stk_remove(struct ofono_stk *stk)
 	g_free(sd);
 }

-static const struct ofono_stk_driver driver = {
+static struct ofono_stk_driver driver = {
 	.name			= "atmodem",
 	.probe			= at_stk_probe,
 	.remove			= at_stk_remove,
--- a/ofono/drivers/atmodem/ussd.c
+++ b/ofono/drivers/atmodem/ussd.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -326,7 +327,7 @@ static void at_ussd_remove(struct ofono_ussd *ussd)
 	g_free(data);
 }

-static const struct ofono_ussd_driver driver = {
+static struct ofono_ussd_driver driver = {
 	.name		= "atmodem",
 	.probe		= at_ussd_probe,
 	.remove		= at_ussd_remove,
--- a/ofono/drivers/atmodem/vendor.h
+++ b/ofono/drivers/atmodem/vendor.h
@@ -44,9 +44,8 @@ enum ofono_vendor {
 	OFONO_VENDOR_WAVECOM_Q2XXX,
 	OFONO_VENDOR_ALCATEL,
 	OFONO_VENDOR_QUECTEL,
-	OFONO_VENDOR_QUECTEL_M95,
 	OFONO_VENDOR_UBLOX,
 	OFONO_VENDOR_UBLOX_TOBY_L2,
+	OFONO_VENDOR_CINTERION,
 	OFONO_VENDOR_XMM,
-	OFONO_VENDOR_GEMALTO,
 };
--- a/ofono/drivers/atmodem/voicecall.c
+++ b/ofono/drivers/atmodem/voicecall.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -1119,7 +1120,6 @@ static int at_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,

 	switch (vd->vendor) {
 	case OFONO_VENDOR_QUALCOMM_MSM:
-	case OFONO_VENDOR_SIMCOM:
 		g_at_chat_send(vd->chat, "AT+COLP=0", NULL, NULL, NULL, NULL);
 		break;
 	default:
@@ -1154,7 +1154,7 @@ static void at_voicecall_remove(struct ofono_voicecall *vc)
 	g_free(vd);
 }

-static const struct ofono_voicecall_driver driver = {
+static struct ofono_voicecall_driver driver = {
 	.name			= "atmodem",
 	.probe			= at_voicecall_probe,
 	.remove			= at_voicecall_remove,
--- a/ofono/drivers/calypsomodem/stk.c
+++ b/ofono/drivers/calypsomodem/stk.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -291,7 +292,7 @@ static void calypso_stk_remove(struct ofono_stk *stk)
 	g_free(sd);
 }

-static const struct ofono_stk_driver driver = {
+static struct ofono_stk_driver driver = {
 	.name			= "calypsomodem",
 	.probe			= calypso_stk_probe,
 	.remove			= calypso_stk_remove,
--- a/ofono/drivers/calypsomodem/voicecall.c
+++ b/ofono/drivers/calypsomodem/voicecall.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -401,7 +402,7 @@ static void calypso_voicecall_remove(struct ofono_voicecall *vc)
 	g_free(vd);
 }

-static const struct ofono_voicecall_driver driver = {
+static struct ofono_voicecall_driver driver = {
 	.name			= "calypsomodem",
 	.probe			= calypso_voicecall_probe,
 	.remove			= calypso_voicecall_remove,
--- a/ofono/drivers/cdmamodem/connman.c
+++ b/ofono/drivers/cdmamodem/connman.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -322,7 +323,7 @@ static void cdma_connman_remove(struct ofono_cdma_connman *cm)
 	g_free(cd);
 }

-static const struct ofono_cdma_connman_driver driver = {
+static struct ofono_cdma_connman_driver driver = {
 	.name			= "cdmamodem",
 	.probe			= cdma_connman_probe,
 	.remove			= cdma_connman_remove,
--- a/ofono/drivers/cdmamodem/devinfo.c
+++ b/ofono/drivers/cdmamodem/devinfo.c
@@ -153,7 +153,7 @@ static void cdma_devinfo_remove(struct ofono_devinfo *info)
 	ofono_devinfo_set_data(info, NULL);
 }

-static const struct ofono_devinfo_driver driver = {
+static struct ofono_devinfo_driver driver = {
 	.name			= "cdmamodem",
 	.probe			= cdma_devinfo_probe,
 	.remove			= cdma_devinfo_remove,
--- a/ofono/drivers/cdmamodem/voicecall.c
+++ b/ofono/drivers/cdmamodem/voicecall.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -142,7 +143,7 @@ static void cdma_voicecall_remove(struct ofono_cdma_voicecall *vc)
 	g_free(vd);
 }

-static const struct ofono_cdma_voicecall_driver driver = {
+static struct ofono_cdma_voicecall_driver driver = {
 	.name			= "cdmamodem",
 	.probe			= cdma_voicecall_probe,
 	.remove			= cdma_voicecall_remove,
--- a/ofono/drivers/dunmodem/gprs.c
+++ b/ofono/drivers/dunmodem/gprs.c
@@ -73,7 +73,7 @@ static void dun_gprs_attached_status(struct ofono_gprs *gprs,
 	CALLBACK_WITH_SUCCESS(cb, 1, data);
 }

-static const struct ofono_gprs_driver driver = {
+static struct ofono_gprs_driver driver = {
 	.name			= "dunmodem",
 	.probe			= dun_gprs_probe,
 	.remove			= dun_gprs_remove,
--- a/ofono/drivers/dunmodem/network-registration.c
+++ b/ofono/drivers/dunmodem/network-registration.c
@@ -107,7 +107,7 @@ static void dun_netreg_remove(struct ofono_netreg *netreg)
 	g_free(nd);
 }

-static const struct ofono_netreg_driver driver = {
+static struct ofono_netreg_driver driver = {
 	.name			= "dunmodem",
 	.probe			= dun_netreg_probe,
 	.remove			= dun_netreg_remove,
--- a/ofono/drivers/gemaltomodem/gemaltomodem.c
+++ b/ofono/drivers/gemaltomodem/gemaltomodem.c
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2017 Vincent Cesson. All rights reserved.
- *  Copyright (C) 2018 Gemalto M2M
 *
 *  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
@@ -36,14 +35,12 @@
 static int gemaltomodem_init(void)
 {
 	gemalto_location_reporting_init();
-	gemalto_voicecall_init();

 	return 0;
 }

 static void gemaltomodem_exit(void)
 {
-	gemalto_voicecall_exit();
 	gemalto_location_reporting_exit();
 }

--- a/ofono/drivers/gemaltomodem/gemaltomodem.h
+++ b/ofono/drivers/gemaltomodem/gemaltomodem.h
@@ -3,7 +3,6 @@
 *  oFono - Open Source Telephony
 *
 *  Copyright (C) 2017 Vincent Cesson. All rights reserved.
- *  Copyright (C) 2018 Gemalto M2M
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License version 2 as
@@ -24,6 +23,3 @@

 extern void gemalto_location_reporting_init();
 extern void gemalto_location_reporting_exit();
-
-extern void gemalto_voicecall_init();
-extern void gemalto_voicecall_exit();
--- a/ofono/drivers/gemaltomodem/location-reporting.c
+++ b/ofono/drivers/gemaltomodem/location-reporting.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -216,7 +217,7 @@ static void gemalto_location_reporting_remove(struct ofono_location_reporting *l
 	g_free(gd);
 }

-static const struct ofono_location_reporting_driver driver = {
+static struct ofono_location_reporting_driver driver = {
 	.name			= "gemaltomodem",
 	.type			= OFONO_LOCATION_REPORTING_TYPE_NMEA,
 	.probe			= gemalto_location_reporting_probe,
--- a/ofono/drivers/gemaltomodem/voicecall.c
+++ b/ofono/drivers/gemaltomodem/voicecall.c
@@ -1,576 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2018 Gemalto M2M
- *
- *  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 <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include <glib.h>
-
-#include <ofono/log.h>
-#include <ofono/modem.h>
-#include <ofono/voicecall.h>
-
-#include "gatchat.h"
-#include "gatresult.h"
-
-#include "common.h"
-
-#include "gemaltomodem.h"
-
-static const char *clcc_prefix[] = { "+CLCC:", NULL };
-static const char *none_prefix[] = { NULL };
-
-struct voicecall_data {
-	GAtChat *chat;
-	GSList *calls;
-	unsigned int local_release;
-	GSList *new_calls;
-};
-
-struct release_id_req {
-	struct ofono_voicecall *vc;
-	ofono_voicecall_cb_t cb;
-	void *data;
-	int id;
-};
-
-struct change_state_req {
-	struct ofono_voicecall *vc;
-	ofono_voicecall_cb_t cb;
-	void *data;
-	int affected_types;
-};
-
-static void generic_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct change_state_req *req = user_data;
-	struct voicecall_data *vd = ofono_voicecall_get_data(req->vc);
-	struct ofono_error error;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (ok && req->affected_types) {
-		GSList *l;
-		struct ofono_call *call;
-
-		for (l = vd->calls; l; l = l->next) {
-			call = l->data;
-
-			if (req->affected_types & (1 << call->status))
-				vd->local_release |= (1 << call->id);
-		}
-	}
-
-	req->cb(&error, req->data);
-}
-
-static void gemalto_call_common(const char *cmd, struct ofono_voicecall *vc,
-				GAtResultFunc result_cb,
-				unsigned int affected_types,
-				ofono_voicecall_cb_t cb, void *data)
-{
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	struct change_state_req *req = g_new0(struct change_state_req, 1);
-
-	req->vc = vc;
-	req->cb = cb;
-	req->data = data;
-	req->affected_types = affected_types;
-
-	if (g_at_chat_send(vd->chat, cmd, none_prefix,
-				result_cb, req, g_free) > 0)
-		return;
-
-	g_free(req);
-	CALLBACK_WITH_FAILURE(cb, data);
-}
-
-static void gemalto_answer(struct ofono_voicecall *vc,
-				ofono_voicecall_cb_t cb, void *data)
-{
-	gemalto_call_common("ATA", vc, generic_cb, 0, cb, data);
-}
-
-static void gemalto_hangup_all(struct ofono_voicecall *vc,
-				ofono_voicecall_cb_t cb, void *data)
-{
-	unsigned int affected = (1 << CALL_STATUS_INCOMING) |
-				(1 << CALL_STATUS_DIALING) |
-				(1 << CALL_STATUS_ALERTING) |
-				(1 << CALL_STATUS_WAITING) |
-				(1 << CALL_STATUS_HELD) |
-				(1 << CALL_STATUS_ACTIVE);
-
-	/* Hangup all calls */
-	gemalto_call_common("AT+CHUP", vc, generic_cb, affected, cb, data);
-}
-
-static void gemalto_hangup(struct ofono_voicecall *vc,
-				ofono_voicecall_cb_t cb, void *data)
-{
-	unsigned int affected = (1 << CALL_STATUS_ACTIVE);
-
-	/* Hangup current active call */
-	gemalto_call_common("AT+CHLD=1", vc, generic_cb, affected, cb, data);
-}
-
-static void gemalto_hold_all_active(struct ofono_voicecall *vc,
-					ofono_voicecall_cb_t cb, void *data)
-{
-	unsigned int affected = (1 << CALL_STATUS_ACTIVE);
-	gemalto_call_common("AT+CHLD=2", vc, generic_cb, affected, cb, data);
-}
-
-static void gemalto_release_all_held(struct ofono_voicecall *vc,
-					ofono_voicecall_cb_t cb, void *data)
-{
-	unsigned int affected = (1 << CALL_STATUS_INCOMING) |
-				(1 << CALL_STATUS_WAITING);
-
-	gemalto_call_common("AT+CHLD=0", vc, generic_cb, affected, cb, data);
-}
-
-static void gemalto_set_udub(struct ofono_voicecall *vc,
-				ofono_voicecall_cb_t cb, void *data)
-{
-	unsigned int affected = (1 << CALL_STATUS_INCOMING) |
-				(1 << CALL_STATUS_WAITING);
-
-	gemalto_call_common("AT+CHLD=0", vc, generic_cb, affected, cb, data);
-}
-
-static void gemalto_release_all_active(struct ofono_voicecall *vc,
-					ofono_voicecall_cb_t cb, void *data)
-{
-	unsigned int affected = (1 << CALL_STATUS_ACTIVE);
-
-	gemalto_call_common("AT+CHLD=1", vc, generic_cb, affected, cb, data);
-}
-
-static void release_id_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct release_id_req *req = user_data;
-	struct voicecall_data *vd = ofono_voicecall_get_data(req->vc);
-	struct ofono_error error;
-
-	decode_at_error(&error, g_at_result_final_response(result));
-
-	if (ok)
-		vd->local_release = 1 << req->id;
-
-	req->cb(&error, req->data);
-}
-
-static void gemalto_release_specific(struct ofono_voicecall *vc, int id,
-					ofono_voicecall_cb_t cb, void *data)
-{
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	struct release_id_req *req = g_new0(struct release_id_req, 1);
-	char buf[32];
-
-	req->vc = vc;
-	req->cb = cb;
-	req->data = data;
-	req->id = id;
-
-	snprintf(buf, sizeof(buf), "AT+CHLD=1%d", id);
-
-	if (g_at_chat_send(vd->chat, buf, none_prefix,
-				release_id_cb, req, g_free) > 0)
-		return;
-
-	g_free(req);
-	CALLBACK_WITH_FAILURE(cb, data);
-}
-
-static void gemalto_private_chat(struct ofono_voicecall *vc, int id,
-					ofono_voicecall_cb_t cb, void *data)
-{
-	char buf[32];
-
-	snprintf(buf, sizeof(buf), "AT+CHLD=2%d", id);
-	gemalto_call_common(buf, vc, generic_cb, 0, cb, data);
-}
-
-static void gemalto_create_multiparty(struct ofono_voicecall *vc,
-					ofono_voicecall_cb_t cb, void *data)
-{
-	gemalto_call_common("AT+CHLD=3", vc, generic_cb, 0, cb, data);
-}
-
-static void gemalto_transfer(struct ofono_voicecall *vc,
-				ofono_voicecall_cb_t cb, void *data)
-{
-	/* Held & Active */
-	unsigned int affected = (1 << CALL_STATUS_ACTIVE) |
-				(1 << CALL_STATUS_HELD);
-
-	/* Transfer can puts held & active calls together and disconnects
-	 * from both.  However, some networks support transferring of
-	 * dialing/ringing calls as well.
-	 */
-	affected |= (1 << CALL_STATUS_DIALING) |
-				(1 << CALL_STATUS_ALERTING);
-
-	gemalto_call_common("AT+CHLD=4", vc, generic_cb, affected, cb, data);
-}
-
-static void gemalto_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
-				ofono_voicecall_cb_t cb, void *data)
-{
-	struct ofono_modem *modem = ofono_voicecall_get_modem(vc);
-	int use_quotes = ofono_modem_get_integer(modem, "GemaltoVtsQuotes");
-	int len = strlen(dtmf);
-	int s;
-	int i;
-	char *buf;
-
-	/* strlen("+VTS=\"T\";") = 9 + initial AT + null */
-	buf = (char *)alloca(len * 9 + 3);
-
-	if (use_quotes)
-		s = sprintf(buf, "AT+VTS=\"%c\"", dtmf[0]);
-	else
-		s = sprintf(buf, "AT+VTS=%c", dtmf[0]);
-
-	for (i = 1; i < len; i++) {
-		if (use_quotes)
-			s += sprintf(buf + s, ";+VTS=\"%c\"", dtmf[i]);
-		else
-			s += sprintf(buf + s, ";+VTS=%c", dtmf[i]);
-	}
-
-	gemalto_call_common(buf, vc, generic_cb, 0, cb, data);
-}
-
-static void gemalto_dial(struct ofono_voicecall *vc,
-				const struct ofono_phone_number *ph,
-				enum ofono_clir_option clir,
-				ofono_voicecall_cb_t cb, void *data)
-{
-	struct cb_data *cbd = cb_data_new(cb, data);
-	char buf[256];
-	size_t len;
-
-	cbd->user = vc;
-
-	if (ph->type == 145)
-		len = snprintf(buf, sizeof(buf), "ATD+%s", ph->number);
-	else
-		len = snprintf(buf, sizeof(buf), "ATD%s", ph->number);
-
-	switch (clir) {
-	case OFONO_CLIR_OPTION_INVOCATION:
-		len += snprintf(buf+len, sizeof(buf)-len, "I");
-		break;
-	case OFONO_CLIR_OPTION_SUPPRESSION:
-		len += snprintf(buf+len, sizeof(buf)-len, "i");
-		break;
-	default:
-		break;
-	}
-
-	snprintf(buf + len, sizeof(buf) - len, ";");
-
-	gemalto_call_common(buf, vc, generic_cb, 0, cb, data);
-}
-
-static void gemalto_parse_slcc(GAtResult *result, GSList **l,
-				ofono_bool_t *ret_mpty, gboolean *last)
-{
-	GAtResultIter iter;
-	int id, dir, status, type;
-	ofono_bool_t mpty;
-	struct ofono_call *call;
-	const char *str = "";
-	int number_type = 129;
-
-	if (last)
-		*last = TRUE;
-
-	g_at_result_iter_init(&iter, result);
-
-	g_at_result_iter_next(&iter, "^SLCC:");
-
-	if (!g_at_result_iter_next_number(&iter, &id))
-		return;
-
-	if (last)
-		*last = FALSE;
-
-	if (id == 0)
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &dir))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &status))
-		return;
-
-	if (status > 5)
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &type))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &mpty))
-		return;
-
-	/* skip 'Reserved=0' parameter, only difference from CLCC */
-	if (!g_at_result_iter_skip_next(&iter))
-		return;
-
-	if (g_at_result_iter_next_string(&iter, &str))
-		g_at_result_iter_next_number(&iter, &number_type);
-
-	call = g_new0(struct ofono_call, 1);
-	ofono_call_init(call);
-	call->id = id;
-	call->direction = dir;
-	call->status = status;
-	call->type = type;
-	strncpy(call->phone_number.number, str,
-			OFONO_MAX_PHONE_NUMBER_LENGTH);
-	call->phone_number.type = number_type;
-
-	if (strlen(str) > 0)
-		call->clip_validity = 2;
-	else
-		call->clip_validity = 0;
-
-	*l = g_slist_insert_sorted(*l, call, at_util_call_compare);
-
-	if (ret_mpty)
-		*ret_mpty = mpty;
-}
-
-static void clcc_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-	struct ofono_voicecall *vc = user_data;
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	GSList *l;
-
-	if (!ok)
-		return;
-
-	vd->calls = at_util_parse_clcc(result, NULL);
-
-	for (l = vd->calls; l; l = l->next)
-		ofono_voicecall_notify(vc, l->data);
-}
-
-/*
- * ^SLCC, except for one RFU parameter (see above in the parsing), is identical
- * to +CLCC, but as URC it is parsed line by line, and the last line is
- * indicated by an empty "^SLCC:" (equivalent to the "OK" for CLCC).
- */
-static void slcc_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_voicecall *vc = user_data;
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	GSList *n, *o;
-	struct ofono_call *nc, *oc;
-	gboolean last;
-
-	gemalto_parse_slcc(result, &vd->new_calls, NULL, &last);
-
-	if (!last)
-		return;
-
-	n = vd->new_calls;
-	o = vd->calls;
-
-	while (n || o) {
-		nc = n ? n->data : NULL;
-		oc = o ? o->data : NULL;
-
-		if (oc && (nc == NULL || (nc->id > oc->id))) {
-			enum ofono_disconnect_reason reason;
-
-			if (vd->local_release & (1 << oc->id))
-				reason = OFONO_DISCONNECT_REASON_LOCAL_HANGUP;
-			else
-				reason = OFONO_DISCONNECT_REASON_REMOTE_HANGUP;
-
-			if (!oc->type)
-				ofono_voicecall_disconnected(vc, oc->id,
-								reason, NULL);
-
-			o = o->next;
-		} else if (nc && (oc == NULL || (nc->id < oc->id))) {
-
-			if (nc->type == 0) /* new call, signal it */
-				ofono_voicecall_notify(vc, nc);
-
-			n = n->next;
-		} else {
-
-			DBG("modify call part");
-
-			/* notify in case of changes */
-			if (memcmp(nc, oc, sizeof(*nc)))
-				ofono_voicecall_notify(vc, nc);
-
-			n = n->next;
-			o = o->next;
-		}
-	}
-
-	g_slist_free_full(vd->calls, g_free);
-	vd->calls = vd->new_calls;
-	vd->new_calls = NULL;
-	vd->local_release = 0;
-}
-
-static void cssi_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_voicecall *vc = user_data;
-	GAtResultIter iter;
-	int code, index;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+CSSI:"))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &code))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &index))
-		index = 0;
-
-	ofono_voicecall_ssn_mo_notify(vc, 0, code, index);
-}
-
-static void cssu_notify(GAtResult *result, gpointer user_data)
-{
-	struct ofono_voicecall *vc = user_data;
-	GAtResultIter iter;
-	int code;
-	int index;
-	const char *num;
-	struct ofono_phone_number ph;
-
-	ph.number[0] = '\0';
-	ph.type = 129;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+CSSU:"))
-		return;
-
-	if (!g_at_result_iter_next_number(&iter, &code))
-		return;
-
-	if (!g_at_result_iter_next_number_default(&iter, -1, &index))
-		goto out;
-
-	if (!g_at_result_iter_next_string(&iter, &num))
-		goto out;
-
-	strncpy(ph.number, num, OFONO_MAX_PHONE_NUMBER_LENGTH);
-
-	if (!g_at_result_iter_next_number(&iter, &ph.type))
-		return;
-
-out:
-	ofono_voicecall_ssn_mt_notify(vc, 0, code, index, &ph);
-}
-
-static void gemalto_voicecall_initialized(gboolean ok, GAtResult *result,
-					gpointer user_data)
-{
-	struct ofono_voicecall *vc = user_data;
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-
-	DBG("voicecall_init: registering to notifications");
-
-	/* NO CARRIER, NO ANSWER, BUSY, NO DIALTONE are handled through SLCC */
-	g_at_chat_register(vd->chat, "^SLCC:", slcc_notify, FALSE, vc, NULL);
-	g_at_chat_register(vd->chat, "+CSSI:", cssi_notify, FALSE, vc, NULL);
-	g_at_chat_register(vd->chat, "+CSSU:", cssu_notify, FALSE, vc, NULL);
-
-	ofono_voicecall_register(vc);
-
-	/* Populate the call list */
-	g_at_chat_send(vd->chat, "AT+CLCC", clcc_prefix, clcc_cb, vc, NULL);
-}
-
-static int gemalto_voicecall_probe(struct ofono_voicecall *vc,
-					unsigned int vendor, void *data)
-{
-	GAtChat *chat = data;
-	struct voicecall_data *vd;
-
-	vd = g_new0(struct voicecall_data, 1);
-	vd->chat = g_at_chat_clone(chat);
-	ofono_voicecall_set_data(vc, vd);
-	g_at_chat_send(vd->chat, "AT+CSSN=1,1", NULL, NULL, NULL, NULL);
-	g_at_chat_send(vd->chat, "AT^SLCC=1", NULL,
-			gemalto_voicecall_initialized, vc, NULL);
-	return 0;
-}
-
-static void gemalto_voicecall_remove(struct ofono_voicecall *vc)
-{
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-
-	ofono_voicecall_set_data(vc, NULL);
-
-	g_at_chat_unref(vd->chat);
-	g_free(vd);
-}
-
-static const struct ofono_voicecall_driver driver = {
-	.name			= "gemaltomodem",
-	.probe			= gemalto_voicecall_probe,
-	.remove			= gemalto_voicecall_remove,
-	.dial			= gemalto_dial,
-	.answer			= gemalto_answer,
-	.hangup_all		= gemalto_hangup_all,
-	.hangup_active		= gemalto_hangup,
-	.hold_all_active	= gemalto_hold_all_active,
-	.release_all_held	= gemalto_release_all_held,
-	.set_udub		= gemalto_set_udub,
-	.release_all_active	= gemalto_release_all_active,
-	.release_specific	= gemalto_release_specific,
-	.private_chat		= gemalto_private_chat,
-	.create_multiparty	= gemalto_create_multiparty,
-	.transfer		= gemalto_transfer,
-	.send_tones		= gemalto_send_dtmf
-};
-
-void gemalto_voicecall_init(void)
-{
-	ofono_voicecall_driver_register(&driver);
-}
-
-void gemalto_voicecall_exit(void)
-{
-	ofono_voicecall_driver_unregister(&driver);
-}
--- a/ofono/drivers/hfpmodem/call-volume.c
+++ b/ofono/drivers/hfpmodem/call-volume.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -217,7 +218,7 @@ static void hfp_call_volume_remove(struct ofono_call_volume *cv)
 	g_free(vd);
 }

-static const struct ofono_call_volume_driver driver = {
+static struct ofono_call_volume_driver driver = {
 	.name			= "hfpmodem",
 	.probe			= hfp_call_volume_probe,
 	.remove			= hfp_call_volume_remove,
--- a/ofono/drivers/hfpmodem/devinfo.c
+++ b/ofono/drivers/hfpmodem/devinfo.c
@@ -91,7 +91,7 @@ static void hfp_devinfo_remove(struct ofono_devinfo *info)
 	g_free(dd);
 }

-static const struct ofono_devinfo_driver driver = {
+static struct ofono_devinfo_driver driver = {
 	.name			= "hfpmodem",
 	.probe			= hfp_devinfo_probe,
 	.remove			= hfp_devinfo_remove,
--- a/ofono/drivers/hfpmodem/handsfree.c
+++ b/ofono/drivers/hfpmodem/handsfree.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -410,7 +411,7 @@ static void hfp_hf_indicator(struct ofono_handsfree *hf,
 	CALLBACK_WITH_FAILURE(cb, data);
 }

-static const struct ofono_handsfree_driver driver = {
+static struct ofono_handsfree_driver driver = {
 	.name			= "hfpmodem",
 	.probe			= hfp_handsfree_probe,
 	.remove			= hfp_handsfree_remove,
--- a/ofono/drivers/hfpmodem/network-registration.c
+++ b/ofono/drivers/hfpmodem/network-registration.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -342,7 +343,7 @@ static void hfp_netreg_remove(struct ofono_netreg *netreg)
 	g_free(nd);
 }

-static const struct ofono_netreg_driver driver = {
+static struct ofono_netreg_driver driver = {
 	.name				= "hfpmodem",
 	.probe				= hfp_netreg_probe,
 	.remove				= hfp_netreg_remove,
--- a/ofono/drivers/hfpmodem/siri.c
+++ b/ofono/drivers/hfpmodem/siri.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -195,7 +196,7 @@ static void hfp_siri_set_eyes_free_mode(struct ofono_siri *siri,
 	CALLBACK_WITH_FAILURE(cb, NULL);
 }

-static const struct ofono_siri_driver driver = {
+static struct ofono_siri_driver driver = {
 	.name = "hfpmodem",
 	.probe = hfp_siri_probe,
 	.remove = hfp_siri_remove,
--- a/ofono/drivers/hfpmodem/slc.c
+++ b/ofono/drivers/hfpmodem/slc.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
--- a/ofono/drivers/hfpmodem/voicecall.c
+++ b/ofono/drivers/hfpmodem/voicecall.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -124,7 +125,6 @@ static struct ofono_call *create_call(struct ofono_voicecall *vc, int type,
 	if (clip != 2) {
 		strncpy(call->phone_number.number, num,
 			OFONO_MAX_PHONE_NUMBER_LENGTH);
-		call->phone_number.number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
 		call->phone_number.type = num_type;
 	}

@@ -404,45 +404,6 @@ static void hfp_dial(struct ofono_voicecall *vc,
 	CALLBACK_WITH_FAILURE(cb, data);
 }

-static void hfp_dial_last(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb,
-			void *data)
-{
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	struct cb_data *cbd = cb_data_new(cb, data);
-
-	cbd->user = vc;
-
-	if (g_at_chat_send(vd->chat, "AT+BLDN", none_prefix,
-				atd_cb, cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, data);
-
-}
-
-static void hfp_dial_memory(struct ofono_voicecall *vc,
-				unsigned int memory_location,
-				ofono_voicecall_cb_t cb, void *data)
-{
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	char buf[256];
-
-	cbd->user = vc;
-	DBG("Calling memory location %d\n", memory_location);
-	snprintf(buf, sizeof(buf), "ATD>%d;", memory_location);
-
-	if (g_at_chat_send(vd->chat, buf, none_prefix,
-				atd_cb, cbd, g_free) > 0)
-		return;
-
-	g_free(cbd);
-	DBG("at_chat_failed");
-	CALLBACK_WITH_FAILURE(cb, data);
-}
-
 static void hfp_template(const char *cmd, struct ofono_voicecall *vc,
 			GAtResultFunc result_cb, unsigned int affected_types,
 			ofono_voicecall_cb_t cb, void *data)
@@ -1302,13 +1263,11 @@ static void hfp_voicecall_remove(struct ofono_voicecall *vc)
 	g_free(vd);
 }

-static const struct ofono_voicecall_driver driver = {
+static struct ofono_voicecall_driver driver = {
 	.name			= "hfpmodem",
 	.probe			= hfp_voicecall_probe,
 	.remove			= hfp_voicecall_remove,
 	.dial			= hfp_dial,
-	.dial_last		= hfp_dial_last,
-	.dial_memory		= hfp_dial_memory,
 	.answer			= hfp_answer,
 	.hangup_active		= hfp_hangup,
 	.hold_all_active	= hfp_hold_all_active,
--- a/ofono/drivers/hsomodem/gprs-context.c
+++ b/ofono/drivers/hsomodem/gprs-context.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -378,7 +379,7 @@ static void hso_gprs_context_remove(struct ofono_gprs_context *gc)
 	g_free(gcd);
 }

-static const struct ofono_gprs_context_driver driver = {
+static struct ofono_gprs_context_driver driver = {
 	.name			= "hsomodem",
 	.probe			= hso_gprs_context_probe,
 	.remove			= hso_gprs_context_remove,
--- a/ofono/drivers/hsomodem/radio-settings.c
+++ b/ofono/drivers/hsomodem/radio-settings.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -198,7 +199,7 @@ static void hso_radio_settings_remove(struct ofono_radio_settings *rs)
 	g_free(rsd);
 }

-static const struct ofono_radio_settings_driver driver = {
+static struct ofono_radio_settings_driver driver = {
 	.name			= "hsomodem",
 	.probe			= hso_radio_settings_probe,
 	.remove			= hso_radio_settings_remove,
--- a/ofono/drivers/huaweimodem/audio-settings.c
+++ b/ofono/drivers/huaweimodem/audio-settings.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -112,7 +113,7 @@ static void huawei_audio_settings_remove(struct ofono_audio_settings *as)
 	g_free(asd);
 }

-static const struct ofono_audio_settings_driver driver = {
+static struct ofono_audio_settings_driver driver = {
 	.name		= "huaweimodem",
 	.probe		= huawei_audio_settings_probe,
 	.remove		= huawei_audio_settings_remove,
--- a/ofono/drivers/huaweimodem/cdma-netreg.c
+++ b/ofono/drivers/huaweimodem/cdma-netreg.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <glib.h>
 #include <errno.h>

@@ -209,7 +210,7 @@ static void huawei_cdma_netreg_remove(struct ofono_cdma_netreg *netreg)
 	g_at_chat_unref(chat);
 }

-static const struct ofono_cdma_netreg_driver driver = {
+static struct ofono_cdma_netreg_driver driver = {
 	.name	= "huaweimodem",
 	.probe	= huawei_cdma_netreg_probe,
 	.remove	= huawei_cdma_netreg_remove,
--- a/ofono/drivers/huaweimodem/gprs-context.c
+++ b/ofono/drivers/huaweimodem/gprs-context.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -338,7 +339,7 @@ static void huawei_gprs_context_remove(struct ofono_gprs_context *gc)
 	g_free(gcd);
 }

-static const struct ofono_gprs_context_driver driver = {
+static struct ofono_gprs_context_driver driver = {
 	.name			= "huaweimodem",
 	.probe			= huawei_gprs_context_probe,
 	.remove			= huawei_gprs_context_remove,
--- a/ofono/drivers/huaweimodem/radio-settings.c
+++ b/ofono/drivers/huaweimodem/radio-settings.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -568,7 +569,7 @@ static void huawei_radio_settings_remove(struct ofono_radio_settings *rs)
 	g_free(rsd);
 }

-static const struct ofono_radio_settings_driver driver = {
+static struct ofono_radio_settings_driver driver = {
 	.name			= "huaweimodem",
 	.probe			= huawei_radio_settings_probe,
 	.remove			= huawei_radio_settings_remove,
--- a/ofono/drivers/huaweimodem/ussd.c
+++ b/ofono/drivers/huaweimodem/ussd.c
@@ -204,7 +204,7 @@ static void huawei_ussd_remove(struct ofono_ussd *ussd)
 	g_free(data);
 }

-static const struct ofono_ussd_driver driver = {
+static struct ofono_ussd_driver driver = {
 	.name		= "huaweimodem",
 	.probe		= huawei_ussd_probe,
 	.remove		= huawei_ussd_remove,
--- a/ofono/drivers/huaweimodem/voicecall.c
+++ b/ofono/drivers/huaweimodem/voicecall.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -496,7 +497,7 @@ static void huawei_voicecall_remove(struct ofono_voicecall *vc)
 	g_free(vd);
 }

-static const struct ofono_voicecall_driver driver = {
+static struct ofono_voicecall_driver driver = {
 	.name			= "huaweimodem",
 	.probe			= huawei_voicecall_probe,
 	.remove			= huawei_voicecall_remove,
--- a/ofono/drivers/iceramodem/gprs-context.c
+++ b/ofono/drivers/iceramodem/gprs-context.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -402,7 +403,7 @@ static void icera_gprs_context_remove(struct ofono_gprs_context *gc)
 	g_free(gcd);
 }

-static const struct ofono_gprs_context_driver driver = {
+static struct ofono_gprs_context_driver driver = {
 	.name			= "iceramodem",
 	.probe			= icera_gprs_context_probe,
 	.remove			= icera_gprs_context_remove,
--- a/ofono/drivers/iceramodem/radio-settings.c
+++ b/ofono/drivers/iceramodem/radio-settings.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -211,7 +212,7 @@ static void icera_radio_settings_remove(struct ofono_radio_settings *rs)
 	g_free(rsd);
 }

-static const struct ofono_radio_settings_driver driver = {
+static struct ofono_radio_settings_driver driver = {
 	.name			= "iceramodem",
 	.probe			= icera_radio_settings_probe,
 	.remove			= icera_radio_settings_remove,
--- a/ofono/drivers/ifxmodem/audio-settings.c
+++ b/ofono/drivers/ifxmodem/audio-settings.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -381,7 +382,7 @@ static void ifx_audio_settings_remove(struct ofono_audio_settings *as)
 	g_free(asd);
 }

-static const struct ofono_audio_settings_driver driver = {
+static struct ofono_audio_settings_driver driver = {
 	.name		= "ifxmodem",
 	.probe		= ifx_audio_settings_probe,
 	.remove		= ifx_audio_settings_remove,
--- a/ofono/drivers/ifxmodem/ctm.c
+++ b/ofono/drivers/ifxmodem/ctm.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -166,7 +167,7 @@ static void ifx_ctm_remove(struct ofono_ctm *ctm)
 	g_free(ctmd);
 }

-static const struct ofono_ctm_driver driver = {
+static struct ofono_ctm_driver driver = {
 	.name           = "ifxmodem",
 	.probe          = ifx_ctm_probe,
 	.remove         = ifx_ctm_remove,
--- a/ofono/drivers/ifxmodem/gprs-context.c
+++ b/ofono/drivers/ifxmodem/gprs-context.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -513,9 +514,6 @@ static void deactivate_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	if (gcd->vendor != OFONO_VENDOR_XMM)
 		g_at_chat_resume(gcd->chat);

-	if (!gcd->cb)
-		return;
-
 	CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
 }

@@ -654,7 +652,7 @@ static void ifx_gprs_context_remove(struct ofono_gprs_context *gc)
 	g_free(gcd);
 }

-static const struct ofono_gprs_context_driver driver = {
+static struct ofono_gprs_context_driver driver = {
 	.name			= "ifxmodem",
 	.probe			= ifx_gprs_context_probe,
 	.remove			= ifx_gprs_context_remove,
--- a/ofono/drivers/ifxmodem/radio-settings.c
+++ b/ofono/drivers/ifxmodem/radio-settings.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -200,7 +201,7 @@ static void ifx_radio_settings_remove(struct ofono_radio_settings *rs)
 	g_free(rsd);
 }

-static const struct ofono_radio_settings_driver driver = {
+static struct ofono_radio_settings_driver driver = {
 	.name			= "ifxmodem",
 	.probe			= ifx_radio_settings_probe,
 	.remove			= ifx_radio_settings_remove,
--- a/ofono/drivers/ifxmodem/stk.c
+++ b/ofono/drivers/ifxmodem/stk.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -306,7 +307,7 @@ static void ifx_stk_remove(struct ofono_stk *stk)
 	g_free(sd);
 }

-static const struct ofono_stk_driver driver = {
+static struct ofono_stk_driver driver = {
 	.name			= "ifxmodem",
 	.probe			= ifx_stk_probe,
 	.remove			= ifx_stk_remove,
--- a/ofono/drivers/ifxmodem/voicecall.c
+++ b/ofono/drivers/ifxmodem/voicecall.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -1018,7 +1019,7 @@ static void ifx_voicecall_remove(struct ofono_voicecall *vc)
 	g_free(vd);
 }

-static const struct ofono_voicecall_driver driver = {
+static struct ofono_voicecall_driver driver = {
 	.name			= "ifxmodem",
 	.probe			= ifx_voicecall_probe,
 	.remove			= ifx_voicecall_remove,
--- a/ofono/drivers/isimodem/audio-settings.c
+++ b/ofono/drivers/isimodem/audio-settings.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -116,7 +117,7 @@ static void isi_audio_settings_remove(struct ofono_audio_settings *as)
 	g_free(asd);
 }

-static const struct ofono_audio_settings_driver driver = {
+static struct ofono_audio_settings_driver driver = {
 	.name		= "isimodem",
 	.probe		= isi_audio_settings_probe,
 	.remove		= isi_audio_settings_remove,
--- a/ofono/drivers/isimodem/call-barring.c
+++ b/ofono/drivers/isimodem/call-barring.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -428,7 +429,7 @@ static void isi_call_barring_remove(struct ofono_call_barring *barr)
 	g_free(data);
 }

-static const struct ofono_call_barring_driver driver = {
+static struct ofono_call_barring_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_call_barring_probe,
 	.remove			= isi_call_barring_remove,
--- a/ofono/drivers/isimodem/call-forwarding.c
+++ b/ofono/drivers/isimodem/call-forwarding.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -456,7 +457,7 @@ static void isi_call_forwarding_remove(struct ofono_call_forwarding *cf)
 	g_free(data);
 }

-static const struct ofono_call_forwarding_driver driver = {
+static struct ofono_call_forwarding_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_call_forwarding_probe,
 	.remove			= isi_call_forwarding_remove,
--- a/ofono/drivers/isimodem/call-meter.c
+++ b/ofono/drivers/isimodem/call-meter.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -117,7 +118,7 @@ static void isi_call_meter_remove(struct ofono_call_meter *cm)
 	g_free(data);
 }

-static const struct ofono_call_meter_driver driver = {
+static struct ofono_call_meter_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_call_meter_probe,
 	.remove			= isi_call_meter_remove,
--- a/ofono/drivers/isimodem/call-settings.c
+++ b/ofono/drivers/isimodem/call-settings.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -404,7 +405,7 @@ static void isi_call_settings_remove(struct ofono_call_settings *cs)
 	g_free(data);
 }

-static const struct ofono_call_settings_driver driver = {
+static struct ofono_call_settings_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_call_settings_probe,
 	.remove			= isi_call_settings_remove,
--- a/ofono/drivers/isimodem/cbs.c
+++ b/ofono/drivers/isimodem/cbs.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -228,7 +229,7 @@ static void isi_cbs_remove(struct ofono_cbs *cbs)
 	g_free(cd);
 }

-static const struct ofono_cbs_driver driver = {
+static struct ofono_cbs_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_cbs_probe,
 	.remove			= isi_cbs_remove,
--- a/ofono/drivers/isimodem/debug.c
+++ b/ofono/drivers/isimodem/debug.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
--- a/ofono/drivers/isimodem/devinfo.c
+++ b/ofono/drivers/isimodem/devinfo.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -251,7 +252,7 @@ static void isi_devinfo_remove(struct ofono_devinfo *info)
 	g_free(data);
 }

-static const struct ofono_devinfo_driver driver = {
+static struct ofono_devinfo_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_devinfo_probe,
 	.remove			= isi_devinfo_remove,
--- a/ofono/drivers/isimodem/gprs-context.c
+++ b/ofono/drivers/isimodem/gprs-context.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -658,7 +659,7 @@ static void isi_gprs_context_remove(struct ofono_gprs_context *gc)
 	g_free(cd);
 }

-static const struct ofono_gprs_context_driver driver = {
+static struct ofono_gprs_context_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_gprs_context_probe,
 	.remove			= isi_gprs_context_remove,
--- a/ofono/drivers/isimodem/gprs.c
+++ b/ofono/drivers/isimodem/gprs.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -489,7 +490,7 @@ error:
 	g_free(cbd);
 }

-static const struct ofono_gprs_driver driver = {
+static struct ofono_gprs_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_gprs_probe,
 	.remove			= isi_gprs_remove,
--- a/ofono/drivers/isimodem/network-registration.c
+++ b/ofono/drivers/isimodem/network-registration.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1164,7 +1165,7 @@ static void isi_netreg_remove(struct ofono_netreg *netreg)
 	g_free(data);
 }

-static const struct ofono_netreg_driver isimodem = {
+static struct ofono_netreg_driver isimodem = {
 	.name			= "isimodem",
 	.probe			= isi_netreg_probe,
 	.remove			= isi_netreg_remove,
--- a/ofono/drivers/isimodem/phonebook.c
+++ b/ofono/drivers/isimodem/phonebook.c
@@ -340,7 +340,7 @@ static void isi_phonebook_remove(struct ofono_phonebook *pb)
 	g_free(data);
 }

-static const struct ofono_phonebook_driver driver = {
+static struct ofono_phonebook_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_phonebook_probe,
 	.remove			= isi_phonebook_remove,
--- a/ofono/drivers/isimodem/radio-settings.c
+++ b/ofono/drivers/isimodem/radio-settings.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -364,7 +365,7 @@ static void isi_radio_settings_remove(struct ofono_radio_settings *rs)
 	g_free(rd);
 }

-static const struct ofono_radio_settings_driver driver = {
+static struct ofono_radio_settings_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_radio_settings_probe,
 	.remove			= isi_radio_settings_remove,
--- a/ofono/drivers/isimodem/sim.c
+++ b/ofono/drivers/isimodem/sim.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -968,7 +969,7 @@ static void isi_sim_remove(struct ofono_sim *sim)
 	g_free(data);
 }

-static const struct ofono_sim_driver driver = {
+static struct ofono_sim_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_sim_probe,
 	.remove			= isi_sim_remove,
--- a/ofono/drivers/isimodem/sms.c
+++ b/ofono/drivers/isimodem/sms.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1120,7 +1121,7 @@ static void isi_sms_remove(struct ofono_sms *sms)
 	g_free(sd);
 }

-static const struct ofono_sms_driver driver = {
+static struct ofono_sms_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_sms_probe,
 	.remove			= isi_sms_remove,
--- a/ofono/drivers/isimodem/uicc-util.c
+++ b/ofono/drivers/isimodem/uicc-util.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- a/ofono/drivers/isimodem/uicc.c
+++ b/ofono/drivers/isimodem/uicc.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1650,7 +1651,7 @@ static void uicc_sim_remove(struct ofono_sim *sim)
 	g_free(data);
 }

-static const struct ofono_sim_driver driver = {
+static struct ofono_sim_driver driver = {
 	.name			= "wgmodem2.5",
 	.probe			= uicc_sim_probe,
 	.remove			= uicc_sim_remove,
--- a/ofono/drivers/isimodem/ussd.c
+++ b/ofono/drivers/isimodem/ussd.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -275,7 +276,7 @@ static void isi_ussd_remove(struct ofono_ussd *ussd)
 	g_free(data);
 }

-static const struct ofono_ussd_driver driver = {
+static struct ofono_ussd_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_ussd_probe,
 	.remove			= isi_ussd_remove,
--- a/ofono/drivers/isimodem/voicecall.c
+++ b/ofono/drivers/isimodem/voicecall.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif

+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1934,7 +1935,7 @@ static void isi_remove(struct ofono_voicecall *call)
 	g_free(data);
 }

-static const struct ofono_voicecall_driver driver = {
+static struct ofono_voicecall_driver driver = {
 	.name			= "isimodem",
 	.probe			= isi_probe,
 	.remove			= isi_remove,
--- a/ofono/drivers/mbimmodem/devinfo.c
+++ b/ofono/drivers/mbimmodem/devinfo.c
@@ -1,107 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2017  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 <ofono/log.h>
-#include <ofono/modem.h>
-#include <ofono/devinfo.h>
-
-#include "drivers/mbimmodem/mbimmodem.h"
-
-struct devinfo_data {
-	struct l_idle *delayed_register;
-};
-
-static void mbim_query_revision(struct ofono_devinfo *info,
-				ofono_devinfo_query_cb_t cb, void *data)
-{
-	struct ofono_modem *modem = ofono_devinfo_get_modem(info);
-	const char *revision = ofono_modem_get_string(modem, "FirmwareInfo");
-
-	if (revision)
-		CALLBACK_WITH_SUCCESS(cb, revision, data);
-	else
-		CALLBACK_WITH_FAILURE(cb, NULL, data);
-}
-
-static void mbim_query_serial(struct ofono_devinfo *info,
-				ofono_devinfo_query_cb_t cb, void *data)
-{
-	struct ofono_modem *modem = ofono_devinfo_get_modem(info);
-	const char *serial = ofono_modem_get_string(modem, "DeviceId");
-
-	if (serial)
-		CALLBACK_WITH_SUCCESS(cb, serial, data);
-	else
-		CALLBACK_WITH_FAILURE(cb, NULL, data);
-}
-
-static void delayed_register(struct l_idle *idle, void *user_data)
-{
-	struct ofono_devinfo *info = user_data;
-	struct devinfo_data *dd = ofono_devinfo_get_data(info);
-
-	l_idle_remove(idle);
-	dd->delayed_register = NULL;
-
-	ofono_devinfo_register(info);
-}
-
-static int mbim_devinfo_probe(struct ofono_devinfo *info, unsigned int vendor,
-				void *data)
-{
-	struct devinfo_data *dd = l_new(struct devinfo_data, 1);
-
-	dd->delayed_register = l_idle_create(delayed_register, info, NULL);
-	ofono_devinfo_set_data(info, dd);
-
-	return 0;
-}
-
-static void mbim_devinfo_remove(struct ofono_devinfo *info)
-{
-	struct devinfo_data *dd = ofono_devinfo_get_data(info);
-
-	ofono_devinfo_set_data(info, NULL);
-	l_idle_remove(dd->delayed_register);
-	l_free(dd);
-}
-
-static const struct ofono_devinfo_driver driver = {
-	.name			= "mbim",
-	.probe			= mbim_devinfo_probe,
-	.remove			= mbim_devinfo_remove,
-	.query_revision		= mbim_query_revision,
-	.query_serial		= mbim_query_serial,
-};
-
-void mbim_devinfo_init(void)
-{
-	ofono_devinfo_driver_register(&driver);
-}
-
-void mbim_devinfo_exit(void)
-{
-	ofono_devinfo_driver_unregister(&driver);
-}
--- a/ofono/drivers/mbimmodem/gprs-context.c
+++ b/ofono/drivers/mbimmodem/gprs-context.c
@@ -1,463 +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 <stdint.h>
-#include <stdbool.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <arpa/inet.h>
-
-#include <ofono/log.h>
-#include <ofono/modem.h>
-#include <ofono/gprs-context.h>
-
-#include "drivers/mbimmodem/mbim.h"
-#include "drivers/mbimmodem/mbim-message.h"
-#include "drivers/mbimmodem/mbimmodem.h"
-
-enum state {
-	STATE_IDLE,
-	STATE_ENABLING,
-	STATE_DISABLING,
-	STATE_ACTIVE,
-};
-
-struct gprs_context_data {
-	struct mbim_device *device;
-	unsigned int active_context;
-	enum ofono_gprs_proto proto;
-	enum state state;
-	ofono_gprs_context_cb_t cb;
-	void *cb_data;
-};
-
-static uint32_t proto_to_context_ip_type(enum ofono_gprs_proto proto)
-{
-	switch (proto) {
-	case OFONO_GPRS_PROTO_IP:
-		return 1; /* MBIMContextIPTypeIPv4 */
-	case OFONO_GPRS_PROTO_IPV6:
-		return 2; /* MBIMContextIPTypeIPv6 */
-	case OFONO_GPRS_PROTO_IPV4V6:
-		return 3; /* MBIMContextIPTypeIPv4v6 */
-	}
-
-	return 0;
-}
-
-static uint32_t auth_method_to_auth_protocol(enum ofono_gprs_auth_method method)
-{
-	switch (method) {
-	case OFONO_GPRS_AUTH_METHOD_CHAP:
-		return 2; /* MBIMAuthProtocolChap */
-	case OFONO_GPRS_AUTH_METHOD_PAP:
-		return 1; /* MBIMAuthProtocolPap */
-	}
-
-	return 0;
-}
-
-static void mbim_deactivate_cb(struct mbim_message *message, void *user)
-{
-	struct ofono_gprs_context *gc = user;
-	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
-
-	DBG("");
-
-	gcd->active_context = 0;
-	gcd->state = STATE_IDLE;
-
-	if (!gcd->cb)
-		return;
-
-	if (mbim_message_get_error(message) != 0)
-		CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
-	else
-		CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
-}
-
-static void mbim_gprs_deactivate_primary(struct ofono_gprs_context *gc,
-					unsigned int cid,
-					ofono_gprs_context_cb_t cb, void *data)
-{
-	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
-	struct mbim_message *message;
-
-	DBG("cid %u", cid);
-
-	gcd->state = STATE_DISABLING;
-	gcd->cb = cb;
-	gcd->cb_data = data;
-
-	message = mbim_message_new(mbim_uuid_basic_connect,
-					MBIM_CID_CONNECT,
-					MBIM_COMMAND_TYPE_SET);
-	mbim_message_set_arguments(message, "uusssuuu16y",
-					cid, 0, NULL, NULL, NULL, 0, 0, 0,
-					mbim_context_type_internet);
-
-	if (mbim_device_send(gcd->device, GPRS_CONTEXT_GROUP, message,
-				mbim_deactivate_cb, gc, NULL) > 0)
-		return;
-
-	mbim_message_unref(message);
-
-	if (cb)
-		CALLBACK_WITH_FAILURE(cb, data);
-}
-
-static void mbim_ip_configuration_cb(struct mbim_message *message, void *user)
-{
-	struct ofono_gprs_context *gc = user;
-	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
-	struct ofono_modem *modem = ofono_gprs_context_get_modem(gc);
-	const char *interface;
-	uint32_t session_id;
-	uint32_t ipv4_config_available;
-	uint32_t ipv6_config_available;
-	uint32_t n_ipv4_addr;
-	uint32_t ipv4_addr_offset;
-	uint32_t n_ipv6_addr;
-	uint32_t ipv6_addr_offset;
-	uint32_t ipv4_gw_offset;
-	uint32_t ipv6_gw_offset;
-	uint32_t n_ipv4_dns;
-	uint32_t ipv4_dns_offset;
-	uint32_t n_ipv6_dns;
-	uint32_t ipv6_dns_offset;
-	uint32_t ipv4_mtu;
-	uint32_t ipv6_mtu;
-
-	struct in6_addr ipv6;
-	struct in_addr ipv4;
-	char buf[INET6_ADDRSTRLEN];
-
-	DBG("%u", mbim_message_get_error(message));
-
-	if (mbim_message_get_error(message) != 0)
-		goto error;
-
-	if (!mbim_message_get_arguments(message, "uuuuuuuuuuuuuuu",
-				&session_id,
-				&ipv4_config_available, &ipv6_config_available,
-				&n_ipv4_addr, &ipv4_addr_offset,
-				&n_ipv6_addr, &ipv6_addr_offset,
-				&ipv4_gw_offset, &ipv6_gw_offset,
-				&n_ipv4_dns, &ipv4_dns_offset,
-				&n_ipv6_dns, &ipv6_dns_offset,
-				&ipv4_mtu, &ipv6_mtu))
-		goto error;
-
-	if (gcd->proto == OFONO_GPRS_PROTO_IPV6)
-		goto ipv6;
-
-	if (ipv4_config_available & 0x1) { /* Address Info present */
-		uint32_t prefix;
-
-		if (!mbim_message_get_ipv4_element(message, ipv4_addr_offset,
-							&prefix, &ipv4))
-			goto error;
-
-		inet_ntop(AF_INET, &ipv4, buf, sizeof(buf));
-		ofono_gprs_context_set_ipv4_address(gc, buf, TRUE);
-		ofono_gprs_context_set_ipv4_prefix_length(gc, prefix);
-	} else
-		ofono_gprs_context_set_ipv4_address(gc, NULL, FALSE);
-
-	if (ipv4_config_available & 0x2) { /* IPv4 Gateway info */
-		if (!mbim_message_get_ipv4_address(message,
-							ipv4_gw_offset, &ipv4))
-			goto error;
-
-		inet_ntop(AF_INET, &ipv4, buf, sizeof(buf));
-
-		ofono_gprs_context_set_ipv4_gateway(gc, buf);
-	}
-
-	if (ipv4_config_available & 0x3) { /* IPv4 DNS Info */
-		const char *dns[3];
-		char dns1[INET_ADDRSTRLEN];
-		char dns2[INET_ADDRSTRLEN];
-
-		memset(dns, 0, sizeof(dns));
-
-		if (n_ipv4_dns > 1) { /* Grab second DNS */
-			if (!mbim_message_get_ipv4_address(message,
-							ipv4_dns_offset + 4,
-							&ipv4))
-				goto error;
-
-			inet_ntop(AF_INET, &ipv4, dns2, sizeof(dns2));
-			dns[1] = dns2;
-		}
-
-		if (n_ipv4_dns > 0) { /* Grab first DNS */
-			if (!mbim_message_get_ipv4_address(message,
-							ipv4_dns_offset,
-							&ipv4))
-				goto error;
-
-			inet_ntop(AF_INET, &ipv4, dns1, sizeof(dns1));
-			dns[0] = dns1;
-
-			ofono_gprs_context_set_ipv4_dns_servers(gc, dns);
-		}
-	}
-
-	if (gcd->proto == OFONO_GPRS_PROTO_IP)
-		goto done;
-ipv6:
-	if (ipv6_config_available & 0x1) { /* Address Info present */
-		uint32_t prefix;
-
-		if (!mbim_message_get_ipv6_element(message, ipv6_addr_offset,
-							&prefix, &ipv6))
-			goto error;
-
-		inet_ntop(AF_INET6, &ipv6, buf, sizeof(buf));
-		ofono_gprs_context_set_ipv6_address(gc, buf);
-		ofono_gprs_context_set_ipv6_prefix_length(gc, prefix);
-	}
-
-	if (ipv6_config_available & 0x2) { /* IPv6 Gateway info */
-		if (!mbim_message_get_ipv6_address(message,
-							ipv6_gw_offset, &ipv6))
-			goto error;
-
-		inet_ntop(AF_INET6, &ipv6, buf, sizeof(buf));
-
-		ofono_gprs_context_set_ipv6_gateway(gc, buf);
-	}
-
-	if (ipv6_config_available & 0x3) { /* IPv6 DNS Info */
-		const char *dns[3];
-		char dns1[INET6_ADDRSTRLEN];
-		char dns2[INET6_ADDRSTRLEN];
-
-		memset(dns, 0, sizeof(dns));
-
-		if (n_ipv6_dns > 1) { /* Grab second DNS */
-			if (!mbim_message_get_ipv6_address(message,
-							ipv6_dns_offset + 16,
-							&ipv6))
-				goto error;
-
-			inet_ntop(AF_INET6, &ipv6, dns2, sizeof(dns2));
-			dns[1] = dns2;
-		}
-
-		if (n_ipv6_dns > 0) { /* Grab first DNS */
-			if (!mbim_message_get_ipv6_address(message,
-							ipv6_dns_offset,
-							&ipv6))
-				goto error;
-
-			inet_ntop(AF_INET6, &ipv6, dns1, sizeof(dns1));
-			dns[0] = dns1;
-
-			ofono_gprs_context_set_ipv6_dns_servers(gc, dns);
-		}
-	}
-done:
-
-	gcd->state = STATE_ACTIVE;
-	interface = ofono_modem_get_string(modem, "NetworkInterface");
-	ofono_gprs_context_set_interface(gc, interface);
-
-	CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
-	gcd->cb = NULL;
-	gcd->cb_data = NULL;
-	return;
-
-error:
-	CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
-	gcd->state = STATE_IDLE;
-	gcd->cb = NULL;
-	gcd->cb_data = NULL;
-
-	message = mbim_message_new(mbim_uuid_basic_connect,
-					MBIM_CID_CONNECT,
-					MBIM_COMMAND_TYPE_SET);
-	mbim_message_set_arguments(message, "uusssuuu16y",
-					gcd->active_context, 0,
-					NULL, NULL, NULL, 0, 0, 0,
-					mbim_context_type_internet);
-
-	if (!mbim_device_send(gcd->device, GPRS_CONTEXT_GROUP, message,
-				NULL, NULL, NULL))
-		mbim_message_unref(message);
-}
-
-static void mbim_activate_cb(struct mbim_message *message, void *user)
-{
-	struct ofono_gprs_context *gc = user;
-	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
-
-	DBG("");
-
-	if (mbim_message_get_error(message) != 0)
-		goto error;
-
-	message = mbim_message_new(mbim_uuid_basic_connect,
-					MBIM_CID_IP_CONFIGURATION,
-					MBIM_COMMAND_TYPE_QUERY);
-	mbim_message_set_arguments(message, "uuuuuuuuuuuuuuu",
-				gcd->active_context,
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-	if (mbim_device_send(gcd->device, GPRS_CONTEXT_GROUP, message,
-				mbim_ip_configuration_cb, gc, NULL) > 0)
-		return;
-
-error:
-	CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
-	gcd->state = STATE_IDLE;
-	gcd->cb = NULL;
-	gcd->cb_data = NULL;
-}
-
-static void mbim_gprs_activate_primary(struct ofono_gprs_context *gc,
-				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 mbim_message *message;
-
-	DBG("cid %u", ctx->cid);
-
-	gcd->state = STATE_ENABLING;
-	gcd->cb = cb;
-	gcd->cb_data = data;
-	gcd->active_context = ctx->cid;
-	gcd->proto = ctx->proto;
-
-	message = mbim_message_new(mbim_uuid_basic_connect,
-					MBIM_CID_CONNECT,
-					MBIM_COMMAND_TYPE_SET);
-	mbim_message_set_arguments(message, "uusssuuu16y",
-				ctx->cid,
-				1, /* MBIMActivationCommandActivate */
-				ctx->apn,
-				ctx->username[0] ? ctx->username : NULL,
-				ctx->password[0] ? ctx->password : NULL,
-				0, /*MBIMCompressionNone */
-				auth_method_to_auth_protocol(ctx->auth_method),
-				proto_to_context_ip_type(ctx->proto),
-				mbim_context_type_internet);
-
-	if (mbim_device_send(gcd->device, GPRS_CONTEXT_GROUP, message,
-				mbim_activate_cb, gc, NULL) > 0)
-		return;
-
-	mbim_message_unref(message);
-	CALLBACK_WITH_FAILURE(cb, data);
-}
-
-static void mbim_gprs_detach_shutdown(struct ofono_gprs_context *gc,
-						unsigned int cid)
-{
-	DBG("");
-	mbim_gprs_deactivate_primary(gc, cid, NULL, NULL);
-}
-
-static void mbim_connect_notify(struct mbim_message *message, void *user)
-{
-	uint32_t session_id;
-	uint32_t activation_state;
-	uint32_t voice_call_state;
-	uint32_t ip_type;
-	uint8_t context_type[16];
-	uint32_t nw_error;
-	char uuidstr[37];
-
-	DBG("");
-
-	if (!mbim_message_get_arguments(message, "uuuu16yu",
-					&session_id, &activation_state,
-					&voice_call_state, &ip_type,
-					context_type, &nw_error))
-		return;
-
-	DBG("session_id: %u, activation_state: %u, ip_type: %u",
-			session_id, activation_state, ip_type);
-	l_uuid_to_string(context_type, uuidstr, sizeof(uuidstr));
-	DBG("context_type: %s, nw_error: %u", uuidstr, nw_error);
-}
-
-static int mbim_gprs_context_probe(struct ofono_gprs_context *gc,
-					unsigned int vendor, void *data)
-{
-	struct mbim_device *device = data;
-	struct gprs_context_data *gcd;
-
-	DBG("");
-
-	if (!mbim_device_register(device, GPRS_CONTEXT_GROUP,
-					mbim_uuid_basic_connect,
-					MBIM_CID_CONNECT,
-					mbim_connect_notify, gc, NULL))
-		return -EIO;
-
-	gcd = l_new(struct gprs_context_data, 1);
-	gcd->device = mbim_device_ref(device);
-
-	ofono_gprs_context_set_data(gc, gcd);
-
-	return 0;
-}
-
-static void mbim_gprs_context_remove(struct ofono_gprs_context *gc)
-{
-	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
-
-	DBG("");
-
-	ofono_gprs_context_set_data(gc, NULL);
-
-	mbim_device_cancel_group(gcd->device, GPRS_CONTEXT_GROUP);
-	mbim_device_unregister_group(gcd->device, GPRS_CONTEXT_GROUP);
-	mbim_device_unref(gcd->device);
-	gcd->device = NULL;
-	l_free(gcd);
-}
-
-static const struct ofono_gprs_context_driver driver = {
-	.name			= "mbim",
-	.probe			= mbim_gprs_context_probe,
-	.remove			= mbim_gprs_context_remove,
-	.activate_primary	= mbim_gprs_activate_primary,
-	.deactivate_primary	= mbim_gprs_deactivate_primary,
-	.detach_shutdown	= mbim_gprs_detach_shutdown
-};
-
-void mbim_gprs_context_init(void)
-{
-	ofono_gprs_context_driver_register(&driver);
-}
-
-void mbim_gprs_context_exit(void)
-{
-	ofono_gprs_context_driver_unregister(&driver);
-}
--- a/ofono/drivers/mbimmodem/gprs.c
+++ b/ofono/drivers/mbimmodem/gprs.c
@@ -1,298 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2017  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 <stdint.h>
-#include <stdbool.h>
-#include <inttypes.h>
-
-#include <ofono/log.h>
-#include <ofono/modem.h>
-#include <ofono/gprs.h>
-#include "common.h"
-
-#include "drivers/mbimmodem/mbim.h"
-#include "drivers/mbimmodem/mbim-message.h"
-#include "drivers/mbimmodem/mbimmodem.h"
-
-struct gprs_data {
-	struct mbim_device *device;
-	struct l_idle *delayed_register;
-};
-
-static void mbim_packet_service_set_cb(struct mbim_message *message, void *user)
-{
-	struct cb_data *cbd = user;
-	ofono_gprs_cb_t cb = cbd->cb;
-
-	DBG("");
-
-	if (mbim_message_get_error(message) != 0)
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
-	else
-		CALLBACK_WITH_SUCCESS(cb, cbd->data);
-}
-
-static void mbim_gprs_set_attached(struct ofono_gprs *gprs, int attached,
-					ofono_gprs_cb_t cb, void *data)
-{
-	struct gprs_data *gd = ofono_gprs_get_data(gprs);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	struct mbim_message *message;
-
-	DBG("");
-
-	message = mbim_message_new(mbim_uuid_basic_connect,
-					MBIM_CID_PACKET_SERVICE,
-					MBIM_COMMAND_TYPE_SET);
-	/*
-	 * MBIMPacketServiceActionAttach (0) or
-	 * MBIMPacketServiceActionDetach (1)
-	 */
-	mbim_message_set_arguments(message, "u", attached ? 0 : 1);
-
-	if (mbim_device_send(gd->device, GPRS_GROUP, message,
-				mbim_packet_service_set_cb, cbd, l_free) > 0)
-		return;
-
-	l_free(cbd);
-	mbim_message_unref(message);
-	CALLBACK_WITH_FAILURE(cb, data);
-}
-
-static void mbim_packet_service_query_cb(struct mbim_message *message,
-								void *user)
-{
-	struct cb_data *cbd = user;
-	ofono_gprs_status_cb_t cb = cbd->cb;
-	uint32_t dummy;
-	uint32_t state;
-
-	DBG("%u", mbim_message_get_error(message));
-
-	if (mbim_message_get_error(message) != 0)
-		goto error;
-
-	if (!mbim_message_get_arguments(message, "uu", &dummy, &state))
-		goto error;
-
-	if (state == 2)
-		CALLBACK_WITH_SUCCESS(cb,
-					NETWORK_REGISTRATION_STATUS_REGISTERED,
-					cbd->data);
-	else
-		CALLBACK_WITH_SUCCESS(cb, NETWORK_REGISTRATION_STATUS_UNKNOWN,
-					cbd->data);
-
-	return;
-
-error:
-	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-}
-
-static void mbim_gprs_registration_status(struct ofono_gprs *gprs,
-					ofono_gprs_status_cb_t cb,
-					void *data)
-{
-	struct gprs_data *gd = ofono_gprs_get_data(gprs);
-	struct cb_data *cbd = cb_data_new(cb, data);
-	struct mbim_message *message;
-
-	DBG("");
-
-	message = mbim_message_new(mbim_uuid_basic_connect,
-					MBIM_CID_PACKET_SERVICE,
-					MBIM_COMMAND_TYPE_QUERY);
-	mbim_message_set_arguments(message, "");
-
-	if (mbim_device_send(gd->device, GPRS_GROUP, message,
-				mbim_packet_service_query_cb, cbd, l_free) > 0)
-		return;
-
-	l_free(cbd);
-	mbim_message_unref(message);
-	CALLBACK_WITH_FAILURE(cb, -1, data);
-}
-
-static void mbim_packet_service_changed(struct mbim_message *message,
-								void *user)
-{
-	struct ofono_gprs *gprs = user;
-	uint32_t nw_error;
-	uint32_t packet_service_state;
-	uint32_t highest_avail_data_class;
-	uint64_t uplink_speed;
-	uint64_t downlink_speed;
-
-	DBG("");
-
-	if (!mbim_message_get_arguments(message, "uuutt",
-						&nw_error,
-						&packet_service_state,
-						&highest_avail_data_class,
-						&uplink_speed,
-						&downlink_speed))
-		return;
-
-	DBG("uplink: %"PRIu64", downlink: %"PRIu64,
-					uplink_speed, downlink_speed);
-	DBG("nw_error: %u", nw_error);
-
-	if (packet_service_state == 2) {
-		uint32_t bearer =
-			mbim_data_class_to_tech(highest_avail_data_class);
-
-		ofono_gprs_status_notify(gprs,
-			NETWORK_REGISTRATION_STATUS_REGISTERED);
-		ofono_gprs_bearer_notify(gprs, bearer);
-	} else
-		ofono_gprs_status_notify(gprs,
-				NETWORK_REGISTRATION_STATUS_UNKNOWN);
-}
-
-static void provisioned_contexts_query_cb(struct mbim_message *message,
-								void *user)
-{
-	struct mbim_message_iter contexts;
-	uint32_t n_contexts;
-	uint32_t id;
-	uint8_t type[16];
-	char *apn;
-	char *username;
-	char *password;
-	uint32_t compression;
-	uint32_t auth_protocol;
-
-	DBG("");
-
-	if (mbim_message_get_error(message) != 0)
-		return;
-
-	if (!mbim_message_get_arguments(message, "a(u16ysssuu)",
-						&n_contexts, &contexts))
-		return;
-
-	DBG("n_contexts: %u", n_contexts);
-
-	while (mbim_message_iter_next_entry(&contexts, &id, type, &apn,
-						&username, &password,
-						&compression, &auth_protocol)) {
-		char uuidstr[37];
-
-		l_uuid_to_string(type, uuidstr, sizeof(uuidstr));
-		DBG("id: %u, type: %s", id, uuidstr);
-		DBG("apn: %s, username: %s, password: %s",
-			apn, username, password);
-		DBG("compression: %u, auth_protocol: %u",
-			compression, auth_protocol);
-
-		l_free(apn);
-		l_free(username);
-		l_free(password);
-	}
-}
-
-static void delayed_register(struct l_idle *idle, void *user_data)
-{
-	struct ofono_gprs *gprs = user_data;
-	struct gprs_data *gd = ofono_gprs_get_data(gprs);
-	struct mbim_message *message;
-
-	DBG("");
-
-	l_idle_remove(idle);
-	gd->delayed_register = NULL;
-
-	/* Query provisioned contexts for debugging purposes only */
-	message = mbim_message_new(mbim_uuid_basic_connect,
-					MBIM_CID_PROVISIONED_CONTEXTS,
-					MBIM_COMMAND_TYPE_QUERY);
-	mbim_message_set_arguments(message, "");
-	mbim_device_send(gd->device, 0, message,
-				provisioned_contexts_query_cb, gprs, NULL);
-
-	if (!mbim_device_register(gd->device, GPRS_GROUP,
-					mbim_uuid_basic_connect,
-					MBIM_CID_PACKET_SERVICE,
-					mbim_packet_service_changed,
-					gprs, NULL))
-		goto error;
-
-	ofono_gprs_register(gprs);
-	return;
-
-error:
-	ofono_gprs_remove(gprs);
-}
-
-static int mbim_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor,
-								void *data)
-{
-	struct mbim_device *device = data;
-	struct gprs_data *gd;
-
-	DBG("");
-
-	gd = l_new(struct gprs_data, 1);
-	gd->device = mbim_device_ref(device);
-	gd->delayed_register = l_idle_create(delayed_register, gprs, NULL);
-
-	ofono_gprs_set_data(gprs, gd);
-
-	return 0;
-}
-
-static void mbim_gprs_remove(struct ofono_gprs *gprs)
-{
-	struct gprs_data *gd = ofono_gprs_get_data(gprs);
-
-	DBG("");
-
-	ofono_gprs_set_data(gprs, NULL);
-
-	l_idle_remove(gd->delayed_register);
-	mbim_device_cancel_group(gd->device, GPRS_GROUP);
-	mbim_device_unregister_group(gd->device, GPRS_GROUP);
-	mbim_device_unref(gd->device);
-	gd->device = NULL;
-	l_free(gd);
-}
-
-static const struct ofono_gprs_driver driver = {
-	.name			= "mbim",
-	.probe			= mbim_gprs_probe,
-	.remove			= mbim_gprs_remove,
-	.set_attached		= mbim_gprs_set_attached,
-	.attached_status	= mbim_gprs_registration_status,
-};
-
-void mbim_gprs_init(void)
-{
-	ofono_gprs_driver_register(&driver);
-}
-
-void mbim_gprs_exit(void)
-{
-	ofono_gprs_driver_unregister(&driver);
-}
--- a/ofono/drivers/mbimmodem/mbim-desc.c
+++ b/ofono/drivers/mbimmodem/mbim-desc.c
@@ -1,80 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2017  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 <stdbool.h>
-#include <stdint.h>
-#include <stddef.h>
-
-#include "mbim-desc.h"
-
-/*
- * Attempts to find MBIM specific descriptors.
- *
- * Returns true if the MBIM Function descriptor was found, false otherwise.
- */
-bool mbim_find_descriptors(const uint8_t *data, size_t data_len,
-				const struct mbim_desc **out_desc,
-				const struct mbim_extended_desc **out_ext_desc)
-{
-	bool r = false;
-
-	while (data_len > 3) {
-		uint8_t len = data[0];
-
-		if (data[1] != 0x24)
-			goto next;
-
-		/* MBIM v1.0, Table 4-3 */
-		switch (data[2]) {
-		case 0x1b:
-			if (!out_desc)
-				break;
-
-			if (len != sizeof(struct mbim_desc) || data_len < len)
-				break;
-
-			*out_desc = (const struct mbim_desc *) data;
-			r = true;
-			break;
-		case 0x1c:
-			if (!out_ext_desc)
-				break;
-
-			if (len != sizeof(struct mbim_extended_desc) ||
-					data_len < len)
-				break;
-
-			*out_ext_desc =
-				(const struct mbim_extended_desc *) data;
-			break;
-		}
-
-next:
-		data_len -= len;
-		data += len;
-	}
-
-	return r;
-}
--- a/ofono/drivers/mbimmodem/mbim-desc.h
+++ b/ofono/drivers/mbimmodem/mbim-desc.h
@@ -1,49 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2017  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 <linux/types.h>
-
-/* MBIM v1.0, Section 6.4: MBIM Functional Descriptor */
-struct mbim_desc {
-	uint8_t bFunctionLength;
-	uint8_t bDescriptorType;
-	uint8_t bDescriptorSubtype;
-	__le16 bcdMBIMVersion;
-	__le16 wMaxControlMessage;
-	uint8_t bNumberFilters;
-	uint8_t bMaxFilterSize;
-	__le16 wMaxSegmentSize;
-	uint8_t bmNetworkCapabilities;
-} __attribute__ ((packed));
-
-/* MBIM v1.0, Section 6.5: MBIM Extended Functional Descriptor */
-struct mbim_extended_desc {
-	uint8_t	bFunctionLength;
-	uint8_t	bDescriptorType;
-	uint8_t bDescriptorSubtype;
-	__le16 bcdMBIMExtendedVersion;
-	uint8_t bMaxOutstandingCommandMessages;
-	__le16 wMTU;
-} __attribute__ ((packed));
-
-bool mbim_find_descriptors(const uint8_t *data, size_t data_len,
-				const struct mbim_desc **out_desc,
-				const struct mbim_extended_desc **out_ext_desc);
--- a/ofono/drivers/mbimmodem/mbim-message.c
+++ b/ofono/drivers/mbimmodem/mbim-message.c
--- a/ofono/drivers/mbimmodem/mbim-message.h
+++ b/ofono/drivers/mbimmodem/mbim-message.h
@@ -1,96 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2017  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 <stdint.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-struct mbim_message;
-struct mbim_message_iter;
-
-enum mbim_command_type {
-	MBIM_COMMAND_TYPE_QUERY = 0,
-	MBIM_COMMAND_TYPE_SET = 1,
-};
-
-struct mbim_message_iter {
-	const char *sig_start;
-	uint8_t sig_len;
-	uint8_t sig_pos;
-	const struct iovec *iov;
-	uint32_t n_iov;
-	uint32_t cur_iov;
-	size_t cur_iov_offset;
-	size_t len;
-	size_t pos;
-	size_t base_offset;
-	uint32_t n_elem;
-	char container_type;
-};
-
-struct mbim_message *mbim_message_new(const uint8_t *uuid, uint32_t cid,
-					enum mbim_command_type type);
-struct mbim_message *mbim_message_ref(struct mbim_message *msg);
-void mbim_message_unref(struct mbim_message *msg);
-
-uint32_t mbim_message_get_error(struct mbim_message *message);
-uint32_t mbim_message_get_cid(struct mbim_message *message);
-const uint8_t *mbim_message_get_uuid(struct mbim_message *message);
-bool mbim_message_get_arguments(struct mbim_message *message,
-						const char *signature, ...);
-
-bool mbim_message_get_ipv4_address(struct mbim_message *message,
-					uint32_t offset,
-					struct in_addr *addr);
-bool mbim_message_get_ipv4_element(struct mbim_message *message,
-					uint32_t offset,
-					uint32_t *prefix_len,
-					struct in_addr *addr);
-bool mbim_message_get_ipv6_address(struct mbim_message *essage,
-					uint32_t offset,
-					struct in6_addr *addr);
-bool mbim_message_get_ipv6_element(struct mbim_message *message,
-					uint32_t offset,
-					uint32_t *prefix_len,
-					struct in6_addr *addr);
-
-bool mbim_message_iter_next_entry(struct mbim_message_iter *iter, ...);
-
-struct mbim_message_builder *mbim_message_builder_new(struct mbim_message *msg);
-void mbim_message_builder_free(struct mbim_message_builder *builder);
-bool mbim_message_builder_append_basic(struct mbim_message_builder *builder,
-					char type, const void *value);
-bool mbim_message_builder_append_bytes(struct mbim_message_builder *builder,
-					size_t len, const uint8_t *bytes);
-bool mbim_message_builder_enter_struct(struct mbim_message_builder *builder,
-					const char *signature);
-bool mbim_message_builder_leave_struct(struct mbim_message_builder *builder);
-bool mbim_message_builder_enter_array(struct mbim_message_builder *builder,
-					const char *signature);
-bool mbim_message_builder_leave_array(struct mbim_message_builder *builder);
-bool mbim_message_builder_enter_databuf(struct mbim_message_builder *builder,
-					const char *signature);
-bool mbim_message_builder_leave_databuf(struct mbim_message_builder *builder);
-struct mbim_message *mbim_message_builder_finalize(
-					struct mbim_message_builder *builder);
-
-bool mbim_message_set_arguments(struct mbim_message *message,
-						const char *signature, ...);
--- a/Show More
+++ b/Show More