Merge branch 'stray_call' into 'master'

Fix data connection dying after switching radio tech

See merge request mer-core/ofono!198

.gitignore

@@ -1,61 +0,0 @@
-*.o
-*.lo
-*.la
-.deps
-.libs
-.dirstamp
-Makefile
-Makefile.in
-aclocal.m4
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-compile
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
-autom4te.cache
-test-driver
-test-suite.log
-
-ofono.pc
-include/ofono
-include/version.h
-src/builtin.h
-src/ofonod
-src/ofono.service
-dundee/dundee
-dundee/dundee.service
-
-unit/test-common
-unit/test-util
-unit/test-idmap
-unit/test-sms
-unit/test-sms-root
-unit/test-simutil
-unit/test-mux
-unit/test-caif
-unit/test-stkutil
-unit/test-cdmasms
-unit/test-*.log
-unit/test-*.trs
-
-tools/huawei-audio
-tools/auto-enable
-tools/get-location
-tools/lookup-apn
-tools/lookup-provider-name
-tools/tty-redirector
-tools/qmi
-tools/stktest
-
-gatchat/gsmdial
-gatchat/test-server
-gatchat/test-qcdm

.mailmap

@@ -1,7 +0,0 @@
-Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>	<luiz.dentz-von@nokia.com>
-Zhenhua Zhang <zhenhua.zhang@intel.com>			<zhenhua.zhang@intel.com>
-Pekka Pessi <pekka.pessi@nokia.com>			<Pekka.Pessi@nokia.com>
-Pekka Pessi <pekka.pessi@nokia.com>			<ppessi@hamsa.research.nokia.com>
-Lasse Kunnasluoto <lasse.kunnasluoto@tieto.com>		<Lasse.Kunnasluoto@tieto.com>
-Syam Sidhardhan <s.syam@samsung.com>			<syamsidhardh@gmail.com>
-Michael Dietrich <mdt@emdete.de>			<mdt@emdete.de>

ofono/.gitignore

@@ -32,6 +32,8 @@ src/ofono.service
 dundee/dundee
 dundee/dundee.service
 
+test-driver
+test-suite.log
 unit/test-common
 unit/test-util
 unit/test-idmap
@@ -42,13 +44,23 @@ unit/test-mux
 unit/test-caif
 unit/test-stkutil
 unit/test-cdmasms
+unit/test-dbus-queue
+unit/test-gprs-filter
+unit/test-ril_config
+unit/test-ril_util
+unit/test-ril-transport
 unit/test-rilmodem-cb
 unit/test-rilmodem-cs
 unit/test-rilmodem-gprs
 unit/test-rilmodem-sms
 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
 
@@ -63,6 +75,9 @@ plugins/sailfish_manager/*.gcno
 drivers/*/*.gcda
 drivers/*/*.gcno
 drivers/*/*.gcov
+plugins/*/*.gcda
+plugins/*/*.gcno
+plugins/*/*.gcov
 */*.gcda
 */*.gcno
 */*.gcov

ofono/AUTHORS

@@ -116,3 +116,13 @@ Martin Chaplet <m.chaplet@kerlink.fr>
 Suman Mallela <suman.m@intel.com>
 Rajagopal Aravindan <rajagopalx.aravindan@intel.com>
 Antoine Aubert <a.aubert@overkiz.com>
+Djalal Harouni <djalal@endocode.com>
+Christophe Ronco <c.ronco@kerlink.fr>
+Vincent Cesson <vincent.cesson@smile.fr>
+Piotr Haber <gluedig@gmail.com>
+André Draszik <git@andred.net>
+Lukasz Nowak <lnowak@tycoint.com>
+Jonas Bonn <jonas@southpole.se>
+Matthijs Kooijman <matthijs@stdin.nl>
+Clayton Craft <clayton@craftyguy.net>
+Joey Hewitt <joey@joeyhewitt.com>

ofono/ChangeLog

@@ -1,3 +1,36 @@
+ver 1.21:
+	Fix issue with USSD notification received handling.
+	Fix issue with crashing SIM filesystem notifications.
+	Fix issue with LTE bearer reporting and Huawei modems.
+	Fix issue with invalid memory access and QMI.
+	Add support for QMI SIM writing functionality.
+	Add support for RAT selection for QMI modems.
+	Add support for network monitor agent interface.
+	Add support for Cinterion Hardware Monitor interface.
+	Add support for LTE atom driver for Huawei modems.
+	Add support for LTE atom driver for AT modems.
+	Add support for Intel xmm7xxx series modems.
+
+ver 1.20:
+	Fix issue with context removal before activation.
+	Fix issue with update during GPRS context activation.
+	Fix issue with receiving UTF-16 encoded messages.
+	Fix issue with invalid access in CBS decoding.
+	Fix issue with signal strength on QMI modems.
+	Fix issue with PIN handling with QMI modems.
+	Fix issue with QMI notification message handling.
+	Fix issue with facility lock query on SIM removal.
+	Fix issue with parsing +CLCC and +CCWA fields.
+	Add support for obtaining IMSI via EF reading.
+	Add support for additional netmon info types.
+	Add support for provisioning via configuration files.
+	Add support for Gemalto P-family series of modems.
+	Add support for Telit HE910 and UE910 variants.
+	Add support for Intel SoFIA SIM Toolkit interfaces.
+	Add support for Intel SoFIA LTE features.
+	Add support for U-Blox TOBY-L2 LTE feature.
+	Add support for dedicated LTE atom.
+
 ver 1.19:
 	Fix issue with DHCP parsing and Huawei modems.
 	Fix issue with detecting Huawei E3372 modem.

ofono/Makefile.am

@@ -23,7 +23,12 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/cdma-provision.h include/handsfree.h \
 			include/sim-mnclength.h \
 			include/handsfree-audio.h include/siri.h \
-			include/netmon.h
+			include/sms-filter.h include/gprs-filter.h \
+			include/voicecall-filter.h \
+			include/ril-constants.h include/ril-transport.h \
+			include/netmon.h include/lte.h \
+			include/storage.h \
+			gdbus/gdbus.h
 
 nodist_pkginclude_HEADERS = include/version.h
 
@@ -112,8 +117,6 @@ gril_sources = gril/gril.h gril/gril.c \
 btio_sources = btio/btio.h btio/btio.c
 
 if UDEV
-builtin_modules += udev
-builtin_sources += plugins/udev.c
 builtin_cflags += @UDEV_CFLAGS@
 builtin_libadd += @UDEV_LIBS@
 
@@ -165,8 +168,12 @@ builtin_sources +=	drivers/ril/ril_call_barring.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
@@ -184,8 +191,8 @@ builtin_sources += plugins/ril.c plugins/ril.h
 builtin_modules += infineon
 builtin_sources += plugins/infineon.c
 
-builtin_modules += ril_sofia3gr
-builtin_sources += plugins/ril_sofia3gr.c
+builtin_modules += ril_intel
+builtin_sources += plugins/ril_intel.c
 
 builtin_modules += rilmodem
 builtin_sources += drivers/rilmodem/rilmodem.h \
@@ -210,7 +217,8 @@ builtin_sources += drivers/rilmodem/rilmodem.h \
 			drivers/rilmodem/netmon.c \
 			drivers/rilmodem/stk.c \
 			drivers/rilmodem/cbs.c \
-			drivers/infineonmodem/infineon_constants.h
+			drivers/infineonmodem/infineon_constants.h \
+			drivers/rilmodem/lte.c
 endif
 endif
 
@@ -269,11 +277,13 @@ qmi_sources = drivers/qmimodem/qmi.h drivers/qmimodem/qmi.c \
 					drivers/qmimodem/ctl.h \
 					drivers/qmimodem/dms.h \
 					drivers/qmimodem/nas.h \
+					drivers/qmimodem/nas.c \
 					drivers/qmimodem/uim.h \
 					drivers/qmimodem/wms.h \
 					drivers/qmimodem/wds.h \
 					drivers/qmimodem/pds.h \
-					drivers/qmimodem/common.h
+					drivers/qmimodem/common.h \
+					drivers/qmimodem/wda.h
 
 builtin_modules += qmimodem
 builtin_sources += $(qmi_sources) \
@@ -290,7 +300,8 @@ builtin_sources += $(qmi_sources) \
 			drivers/qmimodem/gprs.c \
 			drivers/qmimodem/gprs-context.c \
 			drivers/qmimodem/radio-settings.c \
-			drivers/qmimodem/location-reporting.c
+			drivers/qmimodem/location-reporting.c \
+			drivers/qmimodem/netmon.c
 
 builtin_modules += gobi
 builtin_sources += plugins/gobi.c
@@ -321,7 +332,8 @@ builtin_sources += 	drivers/atmodem/atmodem.h \
 			drivers/atmodem/gprs.c \
 			drivers/atmodem/gprs-context.c \
 			drivers/atmodem/sim-auth.c \
-			drivers/atmodem/gnss.c
+			drivers/atmodem/gnss.c \
+			drivers/atmodem/lte.c
 
 builtin_modules += nwmodem
 builtin_sources += drivers/atmodem/atutil.h \
@@ -378,7 +390,8 @@ builtin_modules += telitmodem
 builtin_sources += drivers/atmodem/atutil.h \
 			drivers/telitmodem/telitmodem.h \
 			drivers/telitmodem/telitmodem.c \
-			drivers/telitmodem/location-reporting.c
+			drivers/telitmodem/location-reporting.c \
+			drivers/telitmodem/gprs-context-ncm.c
 
 builtin_modules += hsomodem
 builtin_sources += drivers/atmodem/atutil.h \
@@ -440,9 +453,23 @@ builtin_modules += ubloxmodem
 builtin_sources += drivers/atmodem/atutil.h \
 			drivers/ubloxmodem/ubloxmodem.h \
 			drivers/ubloxmodem/ubloxmodem.c \
-			drivers/ubloxmodem/gprs-context.c
+			drivers/ubloxmodem/gprs-context.c \
+			drivers/ubloxmodem/netmon.c \
+			drivers/ubloxmodem/lte.c
 
 
+builtin_modules += gemaltomodem
+builtin_sources += drivers/atmodem/atutil.h \
+			drivers/gemaltomodem/gemaltomodem.h \
+			drivers/gemaltomodem/gemaltomodem.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
+
 if PHONESIM
 builtin_modules += phonesim
 builtin_sources += plugins/phonesim.c
@@ -507,6 +534,9 @@ builtin_sources += plugins/caif.c
 builtin_modules += cinterion
 builtin_sources += plugins/cinterion.c
 
+builtin_modules += gemalto
+builtin_sources += plugins/gemalto.c
+
 builtin_modules += nokia
 builtin_sources += plugins/nokia.c
 
@@ -534,24 +564,30 @@ builtin_sources += plugins/samsung.c
 builtin_modules += sim900
 builtin_sources += plugins/sim900.c
 
+builtin_modules += connman
+builtin_sources += plugins/connman.c
+
+builtin_modules += telit
+builtin_sources += plugins/telit.c
+
 builtin_modules += quectel
 builtin_sources += plugins/quectel.c
 
 builtin_modules += ublox
 builtin_sources += plugins/ublox.c
 
-builtin_modules += he910
-builtin_sources += plugins/he910.c
+builtin_modules += xmm7xxx
+builtin_sources += plugins/xmm7xxx.c
 endif
 
 builtin_modules += connman
 builtin_sources += plugins/connman.c
 
+builtin_modules += mnclength
+builtin_sources += plugins/mnclength.c
+
 if BLUETOOTH
 if BLUEZ4
-builtin_modules += telit
-builtin_sources += plugins/telit.c plugins/bluez4.h
-
 builtin_modules += sap
 builtin_sources += plugins/sap.c plugins/bluez4.h
 
@@ -628,8 +664,9 @@ builtin_sources += plugins/provision.h
 builtin_modules += cdma_provision
 builtin_sources += plugins/cdma-provision.c
 
-builtin_modules += mnclength
-builtin_sources += plugins/mnclength.c
+builtin_modules += file_provision
+builtin_sources += plugins/file-provision.c
+
 endif
 
 if MAINTAINER_MODE
@@ -701,8 +738,11 @@ 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-queue.c \
+			src/voicecall-filter.c src/ril-transport.c \
 			src/hfp.h src/siri.c \
-			src/netmon.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
@@ -712,7 +752,8 @@ src_ofonod_LDFLAGS = -Wl,--export-dynamic \
 
 BUILT_SOURCES = $(local_headers) src/builtin.h
 
-CLEANFILES = $(BUILT_SOURCES) $(rules_DATA)
+CLEANFILES = $(BUILT_SOURCES) $(rules_DATA) \
+	$(shell find . -name "*.gcda") $(shell find . -name "*.gcno")
 
 plugindir = $(pkglibdir)/plugins
 
@@ -750,7 +791,9 @@ doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
 			doc/certification.txt doc/siri-api.txt \
 			doc/telit-modem.txt \
 			doc/networkmonitor-api.txt \
-			doc/allowed-apns-api.txt
+			doc/allowed-apns-api.txt \
+			doc/lte-api.txt \
+			doc/cinterion-hardware-monitor-api.txt
 
 
 test_scripts = test/backtrace \
@@ -857,7 +900,10 @@ test_scripts = test/backtrace \
 		test/get-serving-cell-info \
 		test/list-allowed-access-points \
 		test/enable-throttling \
-		test/disable-throttling
+		test/disable-throttling \
+		test/set-lte-property \
+		test/test-serving-cell-info
+
 
 if TEST
 testdir = $(pkglibdir)/test
@@ -877,19 +923,31 @@ unit_objects =
 
 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-provision
+				unit/test-sms unit/test-cdmasms
 
 if SAILFISH_MANAGER
 
 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_cell_info
+			-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_sailfish_cell_info_dbus_SOURCES = unit/test-dbus.c \
+			unit/test-sailfish_cell_info_dbus.c \
+			unit/fake_sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_cell_info_dbus.c \
+			gdbus/object.c \
+			src/dbus.c src/log.c
+unit_test_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_sailfish_sim_info_SOURCES = unit/test-sailfish_sim_info.c \
 			unit/fake_sailfish_watch.c \
 			plugins/sailfish_manager/sailfish_sim_info.c \
@@ -900,6 +958,19 @@ 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_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 \
@@ -912,11 +983,35 @@ 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
+
 endif
 
 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 \
@@ -985,6 +1080,14 @@ unit_test_caif_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_caif_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_caif_OBJECTS)
 
+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
+unit_test_dbus_queue_CFLAGS =  @DBUS_GLIB_CFLAGS@ $(COVERAGE_OPT) $(AM_CFLAGS)
+unit_test_dbus_queue_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_dbus_queue_OBJECTS)
+unit_tests += unit/test-dbus-queue
+
 unit_test_provision_SOURCES = unit/test-provision.c \
 				plugins/provision.h plugins/mbpi.c \
 				plugins/sailfish_provision.c \
@@ -992,6 +1095,36 @@ unit_test_provision_SOURCES = unit/test-provision.c \
 unit_test_provision_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 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)
+unit_test_sms_filter_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sms_filter_OBJECTS)
+unit_tests += unit/test-sms-filter
+
+unit_test_gprs_filter_SOURCES = unit/test-gprs-filter.c \
+				src/gprs-filter.c src/log.c
+unit_test_gprs_filter_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
+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 \
@@ -1056,13 +1189,6 @@ tools_lookup_provider_name_LDADD = @GLIB_LIBS@
 tools_tty_redirector_SOURCES = tools/tty-redirector.c
 tools_tty_redirector_LDADD = @GLIB_LIBS@
 
-if QMIMODEM
-noinst_PROGRAMS += tools/qmi
-
-tools_qmi_SOURCES = $(qmi_sources) tools/qmi.c
-tools_qmi_LDADD = @GLIB_LIBS@
-endif
-
 if MAINTAINER_MODE
 noinst_PROGRAMS += tools/stktest
 
@@ -1131,6 +1257,10 @@ include/ofono/version.h: include/version.h
 	$(AM_V_at)$(MKDIR_P) include/ofono
 	$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
 
+include/ofono/gdbus.h: $(abs_top_srcdir)/gdbus/gdbus.h
+	$(AM_V_at)$(MKDIR_P) include/ofono
+	$(AM_V_GEN)$(LN_S) $< $@
+
 include/ofono/%.h: $(abs_top_srcdir)/include/%.h
 	$(AM_V_at)$(MKDIR_P) include/ofono
 	$(AM_V_GEN)$(LN_S) $< $@

ofono/acinclude.m4

@@ -22,6 +22,7 @@ AC_DEFUN([COMPILER_FLAGS], [
 		CFLAGS="$CFLAGS -Wmissing-declarations"
 		CFLAGS="$CFLAGS -Wredundant-decls"
 		CFLAGS="$CFLAGS -Wcast-align"
+		CFLAGS="$CFLAGS -Wno-format-truncation"
 		CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
 	fi
 ])

ofono/configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(ofono, 1.19)
+AC_INIT(ofono, 1.21)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AC_CONFIG_HEADERS(config.h)
@@ -184,12 +184,12 @@ AC_ARG_ENABLE(sailfish-rilmodem, AC_HELP_STRING([--enable-sailfish-rilmodem],
 AM_CONDITIONAL(SAILFISH_RILMODEM, test "${enable_sailfish_rilmodem}" != "no")
 
 if (test "${enable_sailfish_rilmodem}" = "yes"); then
-	PKG_CHECK_MODULES(GRILIO, libgrilio >= 1.0.18, dummy=yes,
-				AC_MSG_ERROR(libgrilio >= 1.0.18 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, dummy=yes,
-				AC_MSG_ERROR(libmce-glib is required))
+	PKG_CHECK_MODULES(GRILIO, libgrilio >= 1.0.25, dummy=yes,
+				AC_MSG_ERROR(libgrilio >= 1.0.25 is required))
+	PKG_CHECK_MODULES(GLIBUTIL, libglibutil >= 1.0.30, dummy=yes,
+				AC_MSG_ERROR(libglibutil >= 1.0.30 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
@@ -202,6 +202,13 @@ AC_ARG_ENABLE(sailfish-manager,
 					[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]), [
 	if (test "${enableval}" = "no"); then

ofono/doc/cinterion-hardware-monitor-api.txt

@@ -0,0 +1,16 @@
+
+HardwareMonitor hierarchy
+=========================
+
+Service		org.ofono
+Interface	org.ofono.cinterion.HardwareMonitor
+Object path	/{device0,device1,...}
+
+Methods		array{string,variant} GetStatistics
+
+			Returns an array of dict entries representing the
+			current temperature and supply voltage of the modem.
+
+			Units:
+			Temperature: Celsius
+			Voltage: mV

ofono/doc/coding-style.txt

@@ -19,7 +19,7 @@ Besides the kernel coding style above, oFono has special flavors for its own.
 Some of them are mandatory (marked as 'M'), while some others are optional
 (marked as 'O'), but generally preferred.
 
-M1: Blank line before and after an if/while/do/for statement
+M1: Blank line before and after an if/while/do/for/switch statement
 ============================================================
 There should be a blank line before if statement unless the if is nested and
 not preceded by an expression or variable declaration.

ofono/doc/handsfree-audio-api.txt

@@ -76,6 +76,22 @@ Methods		dict GetProperties()
 					 [service].Error.NotImplemented
 					 [service].Error.NotAllowed
 
+		fd, byte Acquire()
+
+			Attempts to establish the SCO audio connection
+			returning the filedescriptor of the connection and the
+			codec in use.
+
+			Note: Contrary to Connect this does not call
+			NewConnection so it can be called in a blocking
+			manner.
+
+			Possible Errors: [service].Error.InProgress
+					 [service].Error.Failed
+					 [service].Error.NotAvailable
+					 [service].Error.NotImplemented
+					 [service].Error.NotAllowed
+
 Signals		PropertyChanged(string name, variant value)
 
 			This signal indicates a changed value of the given

ofono/doc/lte-api.txt

@@ -0,0 +1,35 @@
+LongTermEvolution Hierarchy
+
+Service		org.ofono
+Interface	org.ofono.LongTermEvolution
+Object path	[variable prefix]/{modem0,modem1,...}
+
+
+Methods		dict GetProperties()
+
+			Returns all LongTermEvolution 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
+
+Signals		PropertyChanged(string property, variant value)
+
+			This signal indicates a changed value of the given
+			property.
+
+Properties	string DefaultAccessPointName [readwrite]
+
+			On LongTermEvolution, contexts activate automatically.
+			This property allows selection of an APN to be used on
+			next automatic activation.
+
+			Setting this property to an empty string clears the
+			default APN from the modem.

ofono/doc/networkmonitor-api.txt

@@ -22,6 +22,34 @@ Methods		a{sv} GetServingCellInformation()
 			are available, their valid value ranges and
 			applicability to different cell types.
 
+		void RegisterAgent(object path)
+
+			Registers an agent which will be called whenever the
+			modem registers to or moves to a new cell.
+
+		void UnregisterAgent(object path)
+
+			Unregisters an agent.
+
+NetworkMonitorAgent Hierarchy [experimental]
+=============================
+
+Service		unique name
+Interface	org.ofono.NetworkMonitorAgent
+Object path	freely definable
+
+Methods		void ServingCellInformationChanged(a{sv}) [noreply]
+
+			This method is called whenever the serving cell
+			information has been updated.
+
+			Possible Errors: None
+
+		void Release() [noreply]
+
+			Agent is being released, possibly because of oFono
+			terminating, NetworkMonitor interface is being torn
+			down or modem off.  No UnregisterAgent call is needed.
 
 Network Monitor Property Types
 ==============================
@@ -77,7 +105,46 @@ byte TimingAdvance [optional, gsm]
 
 	Contains the Timing Advance.  Valid range of values is 0-219.
 
-byte Strength [optional, gsm, umts]
+byte Strength [optional, gsm, umts, lte]
 
 	Contains the signal strength.  Valid values are 0-31.  Refer to <rssi>
 	in 27.007, Section 8.5.
+
+byte ReceivedSignalCodePower [optional, umts]
+
+        Contains the Received Signal Code Power.  Valid range of values
+        is 0-96. Refer to <rscp> in 27.007, Section 8.69 for more details.
+
+byte ReceivedEnergyRatio [optional, umts]
+
+        Contains the Ratio of received energy per PN chip to the total
+        received power spectral density.  Valid range of values is 0-49.
+        Refer to <ecno> in 27.007, Section 8.69 for more details.
+
+byte ReferenceSignalReceivedQuality [optional, lte]
+
+        Contains the Reference Signal Received Quality.  Valid range of
+        values is 0-34. Refer to <rsrq> in 27.007, Section 8.69 for more
+        details.
+
+byte ReferenceSignalReceivedPower [optional, lte]
+
+        Contains the Reference Signal Received Power.  Valid range of values
+        is 0-97. Refer to <rsrp> in 27.007, Section 8.69 for more details.
+
+uint16 EARFCN [optional, lte]
+
+	Contains E-UTRA Absolute Radio Frequency Channel Number.  Valid
+	range of values is 0-65535. Refer to Carrier frequency and
+	EARFCN in 36.101, Section 5.7.3 for more details.
+
+byte EBand [optional, lte]
+
+	Contains E-UTRA operating Band.  Valid range of values is 1-43.
+	Refer to Operating bands in 36.101, Section 5.5 for more
+	details.
+
+byte ChannelQualityIndicator [optional, lte]
+
+	Contains Channel Quality Indicator.  Refer to Channel Quality
+	Indicator definition in 36.213, Section 7.2.3 for more details.

ofono/doc/telit-modem.txt

@@ -17,3 +17,30 @@ GPS:
   After setting the configuration, a power cycle is required.
   Port Configiuration #8 is available since firmware 12.00.004. Firmware version
   can be checked using 'AT+CGMR'.
+
+LE910 V2
+========
+
+Default USB composition of LE910V2 uses PID 0x36 (AT#PORTCFG=0)
+and consists of 6 serial ports (CDC-ACM standard, /dev/ttyACMx)
+and 1 network adapter using CDC-NCM standard (wwanx or usbx).
+
+NCM interface configuration follows Telit documentation
+(both documents available on Telit Download Zone - registration required)
+"GE/HE/UE910, UL865, LE910 V2 Linux USB Driver - User Guide r0"
+(document 1VV0301255 Rev.0 - 2016-01-22)
+and "Telit LE910-V2 NCM SETUP r3"
+(document 1VV0301246 Rev.3 - 2016-11-29).
+
+After context is setup, NCM mode activated and PDP context activated
+connection configuration can be read using
+AT+CGPADDR=context_id and AT+CGCONTRDP=context_id commands.
+This is done automatically and results available via
+org.ofono.ConnectionContext.GetProperties DBus method.
+
+Then Linux network interface needs to be configured:
+    ifconfig <Interface> <Address> netmask <Netmask> up
+    route add default gw <Gateway>
+    arp -s <Gateway> 11:22:33:44:55:66
+
+Only after these steps network interface is usable.

ofono/drivers/atmodem/atmodem.c

@@ -52,6 +52,7 @@ static int atmodem_init(void)
 	at_gprs_context_init();
 	at_sim_auth_init();
 	at_gnss_init();
+	at_lte_init();
 
 	return 0;
 }
@@ -76,6 +77,7 @@ static void atmodem_exit(void)
 	at_gprs_exit();
 	at_gprs_context_exit();
 	at_gnss_exit();
+	at_lte_exit();
 }
 
 OFONO_PLUGIN_DEFINE(atmodem, "AT modem driver", VERSION,

ofono/drivers/atmodem/atmodem.h

@@ -74,3 +74,6 @@ extern void at_sim_auth_exit(void);
 
 extern void at_gnss_init(void);
 extern void at_gnss_exit(void);
+
+extern void at_lte_init(void);
+extern void at_lte_exit(void);

ofono/drivers/atmodem/atutil.c

@@ -27,6 +27,7 @@
 #include <gatchat.h>
 #include <string.h>
 #include <stdlib.h>
+#include <errno.h>
 
 #define OFONO_API_SUBJECT_TO_CHANGE
 #include <ofono/log.h>
@@ -614,3 +615,42 @@ void at_util_sim_state_query_free(struct at_util_sim_state_query *req)
 
 	g_free(req);
 }
+
+/*
+ * CGCONTRDP returns addr + netmask in the same string in the form
+ * of "a.b.c.d.m.m.m.m" for IPv4.
+ * address/netmask must be able to hold
+ * 255.255.255.255 + null = 16 characters
+ */
+int at_util_get_ipv4_address_and_netmask(const char *addrnetmask,
+						char *address, char *netmask)
+{
+	const char *s = addrnetmask;
+	const char *net = NULL;
+
+	int ret = -EINVAL;
+	int i;
+
+	/* Count 7 dots for ipv4, less or more means error. */
+	for (i = 0; i < 9; i++, s++) {
+		s = strchr(s, '.');
+
+		if (!s)
+			break;
+
+		if (i == 3) {
+			/* set netmask ptr and break the string */
+			net = s + 1;
+		}
+	}
+
+	if (i == 7) {
+		memcpy(address, addrnetmask, net - addrnetmask);
+		address[net - addrnetmask - 1] = '\0';
+		strcpy(netmask, net);
+
+		ret = 0;
+	}
+
+	return ret;
+}

ofono/drivers/atmodem/atutil.h

@@ -83,6 +83,9 @@ struct at_util_sim_state_query *at_util_sim_state_query_new(GAtChat *chat,
 						GDestroyNotify destroy);
 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);
+
 struct cb_data {
 	void *cb;
 	void *data;

ofono/drivers/atmodem/gprs-context.c

@@ -43,10 +43,11 @@
 #include "atmodem.h"
 #include "vendor.h"
 
-#define TUN_SYSFS_DIR "/sys/devices/virtual/misc/tun"
+#define TUN_DEV "/dev/net/tun"
 
 #define STATIC_IP_NETMASK "255.255.255.255"
 
+static const char *cgdata_prefix[] = { "+CGDATA:", NULL };
 static const char *none_prefix[] = { NULL };
 
 enum state {
@@ -67,6 +68,7 @@ struct gprs_context_data {
 	ofono_gprs_context_cb_t cb;
 	void *cb_data;                                  /* Callback data */
 	unsigned int vendor;
+	gboolean use_atd99;
 };
 
 static void ppp_debug(const char *str, void *data)
@@ -210,7 +212,7 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		return;
 	}
 
-	if (gcd->vendor == OFONO_VENDOR_SIMCOM_SIM900)
+	if (gcd->use_atd99)
 		sprintf(buf, "ATD*99***%u#", gcd->active_context);
 	else
 		sprintf(buf, "AT+CGDATA=\"PPP\",%u", gcd->active_context);
@@ -382,6 +384,43 @@ static void cgev_notify(GAtResult *result, gpointer user_data)
 		g_at_ppp_shutdown(gcd->ppp);
 }
 
+static void at_cgdata_test_cb(gboolean ok, GAtResult *result,
+				gpointer user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+	GAtResultIter iter;
+	const char *data_type;
+	gboolean found = FALSE;
+
+	gcd->use_atd99 = TRUE;
+
+	if (!ok) {
+		DBG("not ok");
+		goto error;
+	}
+
+	g_at_result_iter_init(&iter, result);
+	if (!g_at_result_iter_next(&iter, "+CGDATA:")) {
+		DBG("no +CGDATA line");
+		goto error;
+	}
+
+	if (!g_at_result_iter_open_list(&iter)) {
+		DBG("no list found");
+		goto error;
+	}
+
+	while (!found && g_at_result_iter_next_string(&iter, &data_type)) {
+		if (g_str_equal(data_type, "PPP")) {
+			found = TRUE;
+			gcd->use_atd99 = FALSE;
+		}
+	}
+error:
+	DBG("use_atd99:%d", gcd->use_atd99);
+}
+
 static int at_gprs_context_probe(struct ofono_gprs_context *gc,
 					unsigned int vendor, void *data)
 {
@@ -391,7 +430,7 @@ static int at_gprs_context_probe(struct ofono_gprs_context *gc,
 
 	DBG("");
 
-	if (stat(TUN_SYSFS_DIR, &st) < 0) {
+	if (stat(TUN_DEV, &st) < 0) {
 		ofono_error("Missing support for TUN/TAP devices");
 		return -ENODEV;
 	}
@@ -409,6 +448,15 @@ static int at_gprs_context_probe(struct ofono_gprs_context *gc,
 	if (chat == NULL)
 		return 0;
 
+	switch (vendor) {
+	case OFONO_VENDOR_SIMCOM_SIM900:
+		gcd->use_atd99 = FALSE;
+		break;
+	default:
+		g_at_chat_send(chat, "AT+CGDATA=?", cgdata_prefix,
+						at_cgdata_test_cb, gc, NULL);
+	}
+
 	g_at_chat_register(chat, "+CGEV:", cgev_notify, FALSE, gc, NULL);
 
 	return 0;

ofono/drivers/atmodem/gprs.c

@@ -50,6 +50,8 @@ struct gprs_data {
 	GAtChat *chat;
 	unsigned int vendor;
 	unsigned int last_auto_context_id;
+	gboolean telit_try_reattach;
+	int attached;
 };
 
 static void at_cgatt_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -73,8 +75,10 @@ static void at_gprs_set_attached(struct ofono_gprs *gprs, int attached,
 	snprintf(buf, sizeof(buf), "AT+CGATT=%i", attached ? 1 : 0);
 
 	if (g_at_chat_send(gd->chat, buf, none_prefix,
-				at_cgatt_cb, cbd, g_free) > 0)
+				at_cgatt_cb, cbd, g_free) > 0) {
+		gd->attached = attached;
 		return;
+	}
 
 	g_free(cbd);
 
@@ -194,6 +198,28 @@ static void cgreg_notify(GAtResult *result, gpointer user_data)
 				NULL, NULL, NULL, gd->vendor) == FALSE)
 		return;
 
+	/*
+	 * Telit AT modem firmware (tested with UE910-EUR) generates
+	 * +CGREG: 0\r\n\r\n+CGEV: NW DETACH
+	 * after a context is de-activated and ppp connection closed.
+	 * Then, after a random amount of time (observed from a few seconds
+	 * to a few hours), an unsolicited +CGREG: 1 arrives.
+	 * Attempt to fix the problem, by sending AT+CGATT=1 once.
+	 * This does not re-activate the context, but if a network connection
+	 * is still correct, will generate an immediate +CGREG: 1.
+	 */
+	if (gd->vendor == OFONO_VENDOR_TELIT) {
+		if (gd->attached && !status && !gd->telit_try_reattach) {
+			DBG("Trying to re-attach gprs network");
+			gd->telit_try_reattach = TRUE;
+			g_at_chat_send(gd->chat, "AT+CGATT=1", none_prefix,
+					NULL, NULL, NULL);
+			return;
+		}
+
+		gd->telit_try_reattach = FALSE;
+	}
+
 	ofono_gprs_status_notify(gprs, status);
 }
 
@@ -214,6 +240,11 @@ static void cgev_notify(GAtResult *result, gpointer user_data)
 
 	if (g_str_equal(event, "NW DETACH") ||
 			g_str_equal(event, "ME DETACH")) {
+		if (gd->vendor == OFONO_VENDOR_TELIT &&
+				gd->telit_try_reattach)
+			return;
+
+		gd->attached = FALSE;
 		ofono_gprs_detached_notify(gprs);
 		return;
 	} else if (g_str_has_prefix(event, "ME PDN ACT")) {
@@ -296,6 +327,26 @@ static void huawei_mode_notify(GAtResult *result, gpointer user_data)
 	ofono_gprs_bearer_notify(gprs, bearer);
 }
 
+static void huawei_hcsq_notify(GAtResult *result, gpointer user_data)
+{
+	struct ofono_gprs *gprs = user_data;
+	GAtResultIter iter;
+	const char *mode;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "^HCSQ:"))
+		return;
+
+	if (!g_at_result_iter_next_string(&iter, &mode))
+		return;
+
+	if (!strcmp("LTE", mode))
+		ofono_gprs_bearer_notify(gprs, 7); /* LTE */
+
+	/* in other modes, notification ^MODE is used */
+}
+
 static void telit_mode_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_gprs *gprs = user_data;
@@ -323,6 +374,9 @@ static void telit_mode_notify(GAtResult *result, gpointer user_data)
 	case 3:
 		bearer = 5;    /* HSDPA */
 		break;
+	case 4:
+		bearer = 7;    /* LTE */
+		break;
 	default:
 		bearer = 0;
 		break;
@@ -398,6 +452,8 @@ static void gprs_initialized(gboolean ok, GAtResult *result, gpointer user_data)
 	case OFONO_VENDOR_HUAWEI:
 		g_at_chat_register(gd->chat, "^MODE:", huawei_mode_notify,
 						FALSE, gprs, NULL);
+		g_at_chat_register(gd->chat, "^HCSQ:", huawei_hcsq_notify,
+						FALSE, gprs, NULL);
 		break;
 	case OFONO_VENDOR_UBLOX:
 	case OFONO_VENDOR_UBLOX_TOBY_L2:
@@ -411,6 +467,7 @@ static void gprs_initialized(gboolean ok, GAtResult *result, gpointer user_data)
 						FALSE, gprs, NULL);
 		g_at_chat_send(gd->chat, "AT#PSNT=1", none_prefix,
 						NULL, NULL, NULL);
+		break;
 	default:
 		g_at_chat_register(gd->chat, "+CPSB:", cpsb_notify,
 						FALSE, gprs, NULL);
@@ -522,7 +579,7 @@ static void at_cgdcont_test_cb(gboolean ok, GAtResult *result,
 		if (g_at_result_iter_next_range(&iter, &min, &max) == FALSE)
 			continue;
 
-		if (!g_at_result_iter_close_list(&iter))
+		if (!g_at_result_iter_skip_next(&iter))
 			continue;
 
 		if (g_at_result_iter_open_list(&iter))

ofono/drivers/atmodem/lte.c

@@ -0,0 +1,142 @@
+/*
+ *
+ *  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
+
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+#include <ofono/log.h>
+#include <ofono/lte.h>
+
+#include "gatchat.h"
+#include "gatresult.h"
+
+#include "atmodem.h"
+
+struct lte_driver_data {
+	GAtChat *chat;
+};
+
+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;
+	struct ofono_error error;
+
+	DBG("ok %d", ok);
+
+	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,
+			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);
+	char buf[32 + OFONO_GPRS_MAX_APN_LENGTH + 1];
+	struct cb_data *cbd = cb_data_new(cb, data);
+
+	DBG("LTE config with APN: %s", info->apn);
+
+	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;
+
+	CALLBACK_WITH_FAILURE(cb, data);
+}
+
+static gboolean lte_delayed_register(gpointer user_data)
+{
+	struct ofono_lte *lte = user_data;
+
+	ofono_lte_register(lte);
+
+	return FALSE;
+}
+
+static int at_lte_probe(struct ofono_lte *lte, void *data)
+{
+	GAtChat *chat = data;
+	struct lte_driver_data *ldd;
+
+	DBG("at lte probe");
+
+	ldd = g_try_new0(struct lte_driver_data, 1);
+	if (!ldd)
+		return -ENOMEM;
+
+	ldd->chat = g_at_chat_clone(chat);
+
+	ofono_lte_set_data(lte, ldd);
+
+	g_idle_add(lte_delayed_register, lte);
+
+	return 0;
+}
+
+static void at_lte_remove(struct ofono_lte *lte)
+{
+	struct lte_driver_data *ldd = ofono_lte_get_data(lte);
+
+	DBG("at lte remove");
+
+	g_at_chat_unref(ldd->chat);
+
+	ofono_lte_set_data(lte, NULL);
+
+	g_free(ldd);
+}
+
+static struct ofono_lte_driver driver = {
+	.name				= "atmodem",
+	.probe				= at_lte_probe,
+	.remove				= at_lte_remove,
+	.set_default_attach_info	= at_lte_set_default_attach_info,
+};
+
+void at_lte_init(void)
+{
+	ofono_lte_driver_register(&driver);
+}
+
+void at_lte_exit(void)
+{
+	ofono_lte_driver_unregister(&driver);
+}

ofono/drivers/atmodem/network-registration.c

@@ -1088,6 +1088,27 @@ static void huawei_mode_notify(GAtResult *result, gpointer user_data)
 	}
 }
 
+static void huawei_hcsq_notify(GAtResult *result, gpointer user_data)
+{
+	struct ofono_netreg *netreg = user_data;
+	struct netreg_data *nd = ofono_netreg_get_data(netreg);
+	GAtResultIter iter;
+	const char *mode;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "^HCSQ:"))
+		return;
+
+	if (!g_at_result_iter_next_string(&iter, &mode))
+		return;
+
+	if (!strcmp("LTE", mode))
+		nd->tech = ACCESS_TECHNOLOGY_EUTRAN;
+
+	/* for other technologies, notification ^MODE is used */
+}
+
 static void huawei_nwtime_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_netreg *netreg = user_data;
@@ -1896,6 +1917,10 @@ static void at_creg_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		g_at_chat_register(nd->chat, "^MODE:", huawei_mode_notify,
 						FALSE, netreg, NULL);
 
+		/* Register for 4G system mode reports */
+		g_at_chat_register(nd->chat, "^HCSQ:", huawei_hcsq_notify,
+						FALSE, netreg, NULL);
+
 		/* Register for network time reports */
 		g_at_chat_register(nd->chat, "^NWTIME:", huawei_nwtime_notify,
 						FALSE, netreg, NULL);

ofono/drivers/atmodem/sim.c

@@ -51,6 +51,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;
 };
 
@@ -1293,14 +1294,15 @@ static void sim_state_cb(gboolean present, gpointer user_data)
 	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)
-		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+		CALLBACK_WITH_SUCCESS(cb, data);
 	else
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
+		CALLBACK_WITH_FAILURE(cb, data);
 }
 
 static void at_pin_send_cb(gboolean ok, GAtResult *result,
@@ -1458,9 +1460,8 @@ static void at_pin_enable(struct ofono_sim *sim,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 	int ret;
-	unsigned int len = sizeof(at_clck_cpwd_fac) / sizeof(*at_clck_cpwd_fac);
 
-	if (passwd_type >= len || at_clck_cpwd_fac[passwd_type] == NULL)
+	if (!(sd->passwd_type_mask & (1 << passwd_type)))
 		goto error;
 
 	snprintf(buf, sizeof(buf), "AT+CLCK=\"%s\",%i,\"%s\"",
@@ -1489,10 +1490,8 @@ static void at_change_passwd(struct ofono_sim *sim,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 	int ret;
-	unsigned int len = sizeof(at_clck_cpwd_fac) / sizeof(*at_clck_cpwd_fac);
 
-	if (passwd_type >= len ||
-			at_clck_cpwd_fac[passwd_type] == NULL)
+	if (!(sd->passwd_type_mask & (1 << passwd_type)))
 		goto error;
 
 	snprintf(buf, sizeof(buf), "AT+CPWD=\"%s\",\"%s\",\"%s\"",
@@ -1549,9 +1548,8 @@ static void at_query_clck(struct ofono_sim *sim,
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
-	unsigned int len = sizeof(at_clck_cpwd_fac) / sizeof(*at_clck_cpwd_fac);
 
-	if (passwd_type >= len || at_clck_cpwd_fac[passwd_type] == NULL)
+	if (!(sd->passwd_type_mask & (1 << passwd_type)))
 		goto error;
 
 	snprintf(buf, sizeof(buf), "AT+CLCK=\"%s\",2",
@@ -1567,13 +1565,42 @@ error:
 	CALLBACK_WITH_FAILURE(cb, -1, data);
 }
 
-static gboolean at_sim_register(gpointer user)
+static void at_clck_query_cb(gboolean ok, GAtResult *result, gpointer user)
 {
 	struct ofono_sim *sim = user;
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	GAtResultIter iter;
+	const char *fac;
 
+	if (!ok)
+		goto done;
+
+	g_at_result_iter_init(&iter, result);
+
+	/* e.g. +CLCK: ("SC","FD","PN","PU","PP","PC","PF") */
+	if (!g_at_result_iter_next(&iter, "+CLCK:") ||
+				!g_at_result_iter_open_list(&iter))
+		goto done;
+
+	/* Clear the default mask */
+	sd->passwd_type_mask = 0;
+
+	/* Set the bits for <fac>s that are actually supported */
+	while (g_at_result_iter_next_string(&iter, &fac)) {
+		unsigned int i;
+
+		/* Find it in the list of known <fac>s */
+		for (i = 0; i < ARRAY_SIZE(at_clck_cpwd_fac); i++) {
+			if (!g_strcmp0(at_clck_cpwd_fac[i], fac)) {
+				sd->passwd_type_mask |= (1 << i);
+				DBG("found %s", fac);
+				break;
+			}
+		}
+	}
+
+done:
 	ofono_sim_register(sim);
-
-	return FALSE;
 }
 
 static int at_sim_probe(struct ofono_sim *sim, unsigned int vendor,
@@ -1581,6 +1608,7 @@ static int at_sim_probe(struct ofono_sim *sim, unsigned int vendor,
 {
 	GAtChat *chat = data;
 	struct sim_data *sd;
+	unsigned int i;
 
 	sd = g_new0(struct sim_data, 1);
 	sd->chat = g_at_chat_clone(chat);
@@ -1590,9 +1618,15 @@ static int at_sim_probe(struct ofono_sim *sim, unsigned int vendor,
 		g_at_chat_send(sd->chat, "AT*EPEE=1", NULL, NULL, NULL, NULL);
 
 	ofono_sim_set_data(sim, sd);
-	g_idle_add(at_sim_register, sim);
 
-	return 0;
+	/* <fac>s supported by default */
+	for (i = 0; i < ARRAY_SIZE(at_clck_cpwd_fac); i++)
+		if (at_clck_cpwd_fac[i])
+			sd->passwd_type_mask |= (1 << i);
+
+	/* Query supported <fac>s */
+	return g_at_chat_send(sd->chat, "AT+CLCK=?", clck_prefix,
+				at_clck_query_cb, sim, NULL) ? 0 : -1;
 }
 
 static void at_sim_remove(struct ofono_sim *sim)

ofono/drivers/atmodem/sms.c

@@ -319,26 +319,6 @@ static void at_cnma_cb(gboolean ok, GAtResult *result, gpointer user_data)
 				"Further SMS reception is not guaranteed");
 }
 
-static gboolean at_parse_cmt(GAtResult *result,	const char **pdu, int *pdulen)
-{
-	GAtResultIter iter;
-
-	g_at_result_iter_init(&iter, result);
-
-	if (!g_at_result_iter_next(&iter, "+CMT:"))
-		return FALSE;
-
-	if (!g_at_result_iter_skip_next(&iter))
-		return FALSE;
-
-	if (!g_at_result_iter_next_number(&iter, pdulen))
-		return FALSE;
-
-	*pdu = g_at_result_pdu(result);
-
-	return TRUE;
-}
-
 static inline void at_ack_delivery(struct ofono_sms *sms)
 {
 	struct sms_data *data = ofono_sms_get_data(sms);
@@ -347,11 +327,21 @@ static inline void at_ack_delivery(struct ofono_sms *sms)
 	DBG("");
 
 	/* We must acknowledge the PDU using CNMA */
-	if (data->cnma_ack_pdu)
-		snprintf(buf, sizeof(buf), "AT+CNMA=1,%d\r%s",
-				data->cnma_ack_pdu_len, data->cnma_ack_pdu);
-	else /* Should be a safe fallback */
+	if (data->cnma_ack_pdu) {
+		switch (data->vendor) {
+		case OFONO_VENDOR_CINTERION:
+			snprintf(buf, sizeof(buf), "AT+CNMA=1");
+			break;
+		default:
+			snprintf(buf, sizeof(buf), "AT+CNMA=1,%d\r%s",
+					data->cnma_ack_pdu_len,
+					data->cnma_ack_pdu);
+			break;
+		}
+	} else {
+		/* Should be a safe fallback */
 		snprintf(buf, sizeof(buf), "AT+CNMA=0");
+	}
 
 	g_at_chat_send(data->chat, buf, none_prefix, at_cnma_cb, NULL, NULL);
 }
@@ -409,16 +399,34 @@ static void at_cmt_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_sms *sms = user_data;
 	struct sms_data *data = ofono_sms_get_data(sms);
+	GAtResultIter iter;
 	const char *hexpdu;
+	unsigned char pdu[176];
 	long pdu_len;
 	int tpdu_len;
-	unsigned char pdu[176];
 
-	if (!at_parse_cmt(result, &hexpdu, &tpdu_len)) {
-		ofono_error("Unable to parse CMT notification");
-		return;
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+CMT:"))
+		goto err;
+
+	switch (data->vendor) {
+	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))
+			goto err;
+
+		if (!g_at_result_iter_next_number(&iter, &tpdu_len))
+			goto err;
+
+		break;
 	}
 
+	hexpdu = g_at_result_pdu(result);
+
 	if (strlen(hexpdu) > sizeof(pdu) * 2) {
 		ofono_error("Bad PDU length in CMT notification");
 		return;
@@ -431,6 +439,9 @@ static void at_cmt_notify(GAtResult *result, gpointer user_data)
 
 	if (data->vendor != OFONO_VENDOR_SIMCOM)
 		at_ack_delivery(sms);
+
+err:
+	ofono_error("Unable to parse CMT notification");
 }
 
 static void at_cmgr_notify(GAtResult *result, gpointer user_data)
@@ -742,7 +753,7 @@ static void at_sms_initialized(struct ofono_sms *sms)
 
 static void at_sms_not_supported(struct ofono_sms *sms)
 {
-	ofono_error("SMS not supported by this modem.  If this is in error"
+	ofono_error("SMS not supported by this modem.  If this is an error"
 			" please submit patches to support this hardware");
 
 	ofono_sms_remove(sms);

ofono/drivers/atmodem/vendor.h

@@ -47,4 +47,5 @@ enum ofono_vendor {
 	OFONO_VENDOR_UBLOX,
 	OFONO_VENDOR_UBLOX_TOBY_L2,
 	OFONO_VENDOR_CINTERION,
+	OFONO_VENDOR_XMM,
 };

ofono/drivers/cdmamodem/connman.c

@@ -43,7 +43,7 @@
 #include "cdmamodem.h"
 #include "drivers/atmodem/vendor.h"
 
-#define TUN_SYSFS_DIR "/sys/devices/virtual/misc/tun"
+#define TUN_DEV "/dev/net/tun"
 
 #define STATIC_IP_NETMASK "255.255.255.255"
 
@@ -285,7 +285,7 @@ static int cdma_connman_probe(struct ofono_cdma_connman *cm,
 
 	DBG("");
 
-	if (stat(TUN_SYSFS_DIR, &st) < 0) {
+	if (stat(TUN_DEV, &st) < 0) {
 		ofono_error("Missing support for TUN/TAP devices");
 		return -ENODEV;
 	}

ofono/drivers/gemaltomodem/gemaltomodem.c

@@ -0,0 +1,49 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2017 Vincent Cesson. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <gatchat.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/types.h>
+
+#include "gemaltomodem.h"
+
+static int gemaltomodem_init(void)
+{
+	gemalto_location_reporting_init();
+
+	return 0;
+}
+
+static void gemaltomodem_exit(void)
+{
+	gemalto_location_reporting_exit();
+}
+
+OFONO_PLUGIN_DEFINE(gemaltomodem, "Gemalto modem driver", VERSION,
+			OFONO_PLUGIN_PRIORITY_DEFAULT,
+			gemaltomodem_init, gemaltomodem_exit)

ofono/drivers/gemaltomodem/gemaltomodem.h

@@ -2,7 +2,7 @@
  *
  *  oFono - Open Source Telephony
  *
- *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2017 Vincent Cesson. 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
@@ -19,11 +19,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <drivers/atmodem/atutil.h>
 
-int main(int argc, char **argv)
-{
-	return 0;
-}
+extern void gemalto_location_reporting_init();
+extern void gemalto_location_reporting_exit();

ofono/drivers/gemaltomodem/location-reporting.c

@@ -0,0 +1,237 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2017 Vincent Cesson. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/location-reporting.h>
+
+#include "gatchat.h"
+#include "gatresult.h"
+#include "gattty.h"
+
+#include "gemaltomodem.h"
+
+static const char *sgpsc_prefix[] = { "^SGPSC:", NULL };
+
+struct gps_data {
+	GAtChat *chat;
+};
+
+static void gemalto_gps_disable_cb(gboolean ok, GAtResult *result,
+							gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_location_reporting *lr = cbd->user;
+	ofono_location_reporting_disable_cb_t cb = cbd->cb;
+
+	DBG("lr=%p, ok=%d", lr, ok);
+
+	if (!ok) {
+		struct ofono_error error;
+
+		decode_at_error(&error, g_at_result_final_response(result));
+		cb(&error, cbd->data);
+
+		return;
+	}
+
+	CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void gemalto_location_reporting_disable(
+				struct ofono_location_reporting *lr,
+				ofono_location_reporting_disable_cb_t cb,
+				void *data)
+{
+	struct gps_data *gd = ofono_location_reporting_get_data(lr);
+	struct cb_data *cbd = cb_data_new(cb, data);
+
+	DBG("lr=%p", lr);
+
+	cbd->user = lr;
+
+	if (g_at_chat_send(gd->chat, "AT^SGPSC=\"Engine\",0", sgpsc_prefix,
+				gemalto_gps_disable_cb, cbd, g_free) > 0)
+		return;
+
+	CALLBACK_WITH_FAILURE(cb, data);
+
+	g_free(cbd);
+}
+
+static int enable_data_stream(struct ofono_location_reporting *lr)
+{
+	struct ofono_modem *modem;
+	const char *gps_dev;
+	GHashTable *options;
+	GIOChannel *channel;
+	int fd;
+
+	modem = ofono_location_reporting_get_modem(lr);
+	gps_dev = ofono_modem_get_string(modem, "GPS");
+
+	options = g_hash_table_new(g_str_hash, g_str_equal);
+	if (options == NULL)
+		return -1;
+
+	g_hash_table_insert(options, "Baud", "115200");
+
+	channel = g_at_tty_open(gps_dev, options);
+
+	g_hash_table_destroy(options);
+
+	if (channel == NULL)
+		return -1;
+
+	fd = g_io_channel_unix_get_fd(channel);
+
+	g_io_channel_set_close_on_unref(channel, FALSE);
+	g_io_channel_unref(channel);
+
+	return fd;
+}
+
+static void gemalto_sgpsc_cb(gboolean ok, GAtResult *result,
+					gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_location_reporting_enable_cb_t cb = cbd->cb;
+	struct ofono_location_reporting *lr = cbd->user;
+	struct ofono_error error;
+	int fd;
+
+	DBG("lr=%p ok=%d", lr, ok);
+
+	decode_at_error(&error, g_at_result_final_response(result));
+
+	if (!ok) {
+		cb(&error, -1, cbd->data);
+
+		return;
+	}
+
+	fd = enable_data_stream(lr);
+
+	if (fd < 0) {
+		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+
+		return;
+	}
+
+	cb(&error, fd, cbd->data);
+	close(fd);
+}
+
+static void gemalto_location_reporting_enable(struct ofono_location_reporting *lr,
+					ofono_location_reporting_enable_cb_t cb,
+					void *data)
+{
+	struct gps_data *gd = ofono_location_reporting_get_data(lr);
+	struct cb_data *cbd = cb_data_new(cb, data);
+
+	DBG("lr=%p", lr);
+
+	cbd->user = lr;
+
+	if (g_at_chat_send(gd->chat, "AT^SGPSC=\"Engine\",2", sgpsc_prefix,
+				gemalto_sgpsc_cb, cbd, NULL) > 0)
+		return;
+
+	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+	g_free(cbd);
+}
+
+static void gemalto_location_reporting_support_cb(gboolean ok, GAtResult *result,
+							gpointer user_data)
+{
+	struct ofono_location_reporting *lr = user_data;
+
+	if (!ok) {
+		ofono_location_reporting_remove(lr);
+
+		return;
+	}
+
+	ofono_location_reporting_register(lr);
+}
+
+static int gemalto_location_reporting_probe(struct ofono_location_reporting *lr,
+						unsigned int vendor, void *data)
+{
+	GAtChat *chat = data;
+	struct gps_data *gd;
+
+	gd = g_try_new0(struct gps_data, 1);
+	if (gd == NULL)
+		return -ENOMEM;
+
+	gd->chat = g_at_chat_clone(chat);
+
+	ofono_location_reporting_set_data(lr, gd);
+
+	g_at_chat_send(gd->chat, "AT^SGPSC=?", sgpsc_prefix,
+					gemalto_location_reporting_support_cb,
+					lr, NULL);
+
+	return 0;
+}
+
+static void gemalto_location_reporting_remove(struct ofono_location_reporting *lr)
+{
+	struct gps_data *gd = ofono_location_reporting_get_data(lr);
+
+	ofono_location_reporting_set_data(lr, NULL);
+
+	g_at_chat_unref(gd->chat);
+	g_free(gd);
+}
+
+static struct ofono_location_reporting_driver driver = {
+	.name			= "gemaltomodem",
+	.type			= OFONO_LOCATION_REPORTING_TYPE_NMEA,
+	.probe			= gemalto_location_reporting_probe,
+	.remove			= gemalto_location_reporting_remove,
+	.enable			= gemalto_location_reporting_enable,
+	.disable		= gemalto_location_reporting_disable,
+};
+
+void gemalto_location_reporting_init()
+{
+	ofono_location_reporting_driver_register(&driver);
+}
+
+void gemalto_location_reporting_exit()
+{
+	ofono_location_reporting_driver_unregister(&driver);
+}

ofono/drivers/huaweimodem/radio-settings.c

@@ -42,11 +42,13 @@
 
 static const char *none_prefix[] = { NULL };
 static const char *syscfg_prefix[] = { "^SYSCFG:", NULL };
+static const char *syscfgex_prefix[] = { "^SYSCFGEX:", NULL };
 
 #define HUAWEI_BAND_ANY 0x3FFFFFFF
 
 struct radio_settings_data {
 	GAtChat *chat;
+	ofono_bool_t syscfgex_cap;
 };
 
 static const struct huawei_band_gsm_table {
@@ -176,20 +178,76 @@ error:
 	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
 }
 
+static void syscfgex_query_mode_cb(gboolean ok, GAtResult *result,
+					gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb;
+	enum ofono_radio_access_mode mode;
+	struct ofono_error error;
+	GAtResultIter iter;
+	const char *acqorder;
+
+	decode_at_error(&error, g_at_result_final_response(result));
+
+	if (!ok) {
+		cb(&error, -1, cbd->data);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	if (g_at_result_iter_next(&iter, "^SYSCFGEX:") == FALSE)
+		goto error;
+
+	if (g_at_result_iter_next_string(&iter, &acqorder) == FALSE)
+		goto error;
+
+	if ((strcmp(acqorder, "00") == 0) ||
+			(strstr(acqorder, "01") &&
+				strstr(acqorder, "02") &&
+				strstr(acqorder, "03")))
+		mode = OFONO_RADIO_ACCESS_MODE_ANY;
+	else if (strstr(acqorder, "03"))
+		mode = OFONO_RADIO_ACCESS_MODE_LTE;
+	else if (strstr(acqorder, "02"))
+		mode = OFONO_RADIO_ACCESS_MODE_UMTS;
+	else if (strstr(acqorder, "01"))
+		mode = OFONO_RADIO_ACCESS_MODE_GSM;
+	else
+		goto error;
+
+	cb(&error, mode, cbd->data);
+
+	return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+}
+
 static void huawei_query_rat_mode(struct ofono_radio_settings *rs,
 			ofono_radio_settings_rat_mode_query_cb_t cb, void *data)
 {
 	struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (g_at_chat_send(rsd->chat, "AT^SYSCFG?", syscfg_prefix,
-				syscfg_query_mode_cb, cbd, g_free) == 0) {
-		CALLBACK_WITH_FAILURE(cb, -1, data);
-		g_free(cbd);
-	}
+	if (rsd->syscfgex_cap && g_at_chat_send(rsd->chat, "AT^SYSCFGEX?",
+					syscfgex_prefix,
+					syscfgex_query_mode_cb,
+					cbd, g_free) > 0)
+		return;
+
+	if (!rsd->syscfgex_cap && g_at_chat_send(rsd->chat, "AT^SYSCFG?",
+					syscfg_prefix,
+					syscfg_query_mode_cb,
+					cbd, g_free) > 0)
+		return;
+
+	CALLBACK_WITH_FAILURE(cb, -1, data);
+	g_free(cbd);
 }
 
-static void syscfg_modify_mode_cb(gboolean ok, GAtResult *result,
+static void syscfgxx_modify_mode_cb(gboolean ok, GAtResult *result,
 							gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -200,12 +258,11 @@ static void syscfg_modify_mode_cb(gboolean ok, GAtResult *result,
 	cb(&error, cbd->data);
 }
 
-static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
+static void syscfg_set_rat_mode(struct radio_settings_data *rsd,
 				enum ofono_radio_access_mode mode,
 				ofono_radio_settings_rat_mode_set_cb_t cb,
 				void *data)
 {
-	struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[40];
 	unsigned int value = 2, acq_order = 0;
@@ -231,7 +288,7 @@ static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
 							value, acq_order);
 
 	if (g_at_chat_send(rsd->chat, buf, none_prefix,
-					syscfg_modify_mode_cb, cbd, g_free) > 0)
+				syscfgxx_modify_mode_cb, cbd, g_free) > 0)
 		return;
 
 error:
@@ -239,7 +296,55 @@ error:
 	g_free(cbd);
 }
 
-static void syscfg_modify_band_cb(gboolean ok, GAtResult *result,
+static void syscfgex_set_rat_mode(struct radio_settings_data *rsd,
+				enum ofono_radio_access_mode mode,
+				ofono_radio_settings_rat_mode_set_cb_t cb,
+				void *data)
+{
+	struct cb_data *cbd = cb_data_new(cb, data);
+	char buf[50];
+	char *atcmd = "AT^SYSCFGEX=\"%s\",40000000,2,4,40000000,,";
+	char *acqorder = "030201";
+
+	switch (mode) {
+	case OFONO_RADIO_ACCESS_MODE_ANY:
+		acqorder = "00";
+		break;
+	case OFONO_RADIO_ACCESS_MODE_GSM:
+		acqorder = "01";
+		break;
+	case OFONO_RADIO_ACCESS_MODE_UMTS:
+		acqorder = "02";
+		break;
+	case OFONO_RADIO_ACCESS_MODE_LTE:
+		acqorder = "03";
+		break;
+	}
+
+	snprintf(buf, sizeof(buf), atcmd, acqorder);
+
+	if (g_at_chat_send(rsd->chat, buf, none_prefix,
+			syscfgxx_modify_mode_cb, cbd, g_free) > 0)
+		return;
+
+	CALLBACK_WITH_FAILURE(cb, data);
+	g_free(cbd);
+}
+
+static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
+				enum ofono_radio_access_mode mode,
+				ofono_radio_settings_rat_mode_set_cb_t cb,
+				void *data)
+{
+	struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+	if (rsd->syscfgex_cap)
+		syscfgex_set_rat_mode(rsd, mode, cb, data);
+	else
+		syscfg_set_rat_mode(rsd, mode, cb, data);
+}
+
+static void syscfgxx_modify_band_cb(gboolean ok, GAtResult *result,
 							gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -250,13 +355,54 @@ static void syscfg_modify_band_cb(gboolean ok, GAtResult *result,
 	cb(&error, cbd->data);
 }
 
-static void huawei_set_band(struct ofono_radio_settings *rs,
+static void syscfgex_set_band(struct radio_settings_data *rsd,
+					enum ofono_radio_band_gsm band_gsm,
+					enum ofono_radio_band_umts band_umts,
+					ofono_radio_settings_band_set_cb_t cb,
+					void *data)
+{
+	struct cb_data *cbd = cb_data_new(cb, data);
+	char buf[50];
+	char *atcmd = "AT^SYSCFGEX=\"99\",%x,2,4,40000000,,";
+	unsigned int huawei_band;
+
+	if (band_gsm == OFONO_RADIO_BAND_GSM_ANY
+			&& band_umts == OFONO_RADIO_BAND_UMTS_ANY) {
+		huawei_band = HUAWEI_BAND_ANY;
+	} else {
+		unsigned int huawei_band_gsm;
+		unsigned int huawei_band_umts;
+
+		huawei_band_gsm = band_gsm_to_huawei(band_gsm);
+
+		if (!huawei_band_gsm)
+			goto error;
+
+		huawei_band_umts = band_umts_to_huawei(band_umts);
+
+		if (!huawei_band_umts)
+			goto error;
+
+		huawei_band = huawei_band_gsm | huawei_band_umts;
+	}
+
+	snprintf(buf, sizeof(buf), atcmd, huawei_band);
+
+	if (g_at_chat_send(rsd->chat, buf, none_prefix,
+			syscfgxx_modify_band_cb, cbd, g_free) > 0)
+		return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, data);
+	g_free(cbd);
+}
+
+static void syscfg_set_band(struct radio_settings_data *rsd,
 					enum ofono_radio_band_gsm band_gsm,
 					enum ofono_radio_band_umts band_umts,
 					ofono_radio_settings_band_set_cb_t cb,
 					void *data)
 {
-	struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[40];
 	unsigned int huawei_band;
@@ -284,7 +430,7 @@ static void huawei_set_band(struct ofono_radio_settings *rs,
 	snprintf(buf, sizeof(buf), "AT^SYSCFG=16,3,%x,2,4", huawei_band);
 
 	if (g_at_chat_send(rsd->chat, buf, none_prefix,
-					syscfg_modify_band_cb, cbd, g_free) > 0)
+				syscfgxx_modify_band_cb, cbd, g_free) > 0)
 		return;
 
 error:
@@ -292,6 +438,20 @@ error:
 	g_free(cbd);
 }
 
+static void huawei_set_band(struct ofono_radio_settings *rs,
+					enum ofono_radio_band_gsm band_gsm,
+					enum ofono_radio_band_umts band_umts,
+					ofono_radio_settings_band_set_cb_t cb,
+					void *data)
+{
+	struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+	if (rsd->syscfgex_cap)
+		syscfgex_set_band(rsd, band_gsm, band_umts, cb, data);
+	else
+		syscfg_set_band(rsd, band_gsm, band_umts, cb, data);
+}
+
 static void syscfg_query_band_cb(gboolean ok, GAtResult *result,
 					gpointer user_data)
 {
@@ -364,6 +524,21 @@ static void syscfg_support_cb(gboolean ok, GAtResult *result,
 	ofono_radio_settings_register(rs);
 }
 
+static void syscfgex_support_cb(gboolean ok, GAtResult *result,
+				gpointer user_data)
+{
+	struct ofono_radio_settings *rs = user_data;
+	struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+	if (!ok) {
+		g_at_chat_send(rsd->chat, "AT^SYSCFG=?", syscfg_prefix,
+					syscfg_support_cb, rs, NULL);
+	}
+
+	rsd->syscfgex_cap = 1;
+	ofono_radio_settings_register(rs);
+}
+
 static int huawei_radio_settings_probe(struct ofono_radio_settings *rs,
 					unsigned int vendor, void *data)
 {
@@ -378,8 +553,8 @@ static int huawei_radio_settings_probe(struct ofono_radio_settings *rs,
 
 	ofono_radio_settings_set_data(rs, rsd);
 
-	g_at_chat_send(rsd->chat, "AT^SYSCFG=?", syscfg_prefix,
-					syscfg_support_cb, rs, NULL);
+	g_at_chat_send(rsd->chat, "AT^SYSCFGEX=?", syscfgex_prefix,
+					syscfgex_support_cb, rs, NULL);
 
 	return 0;
 }
@@ -400,8 +575,8 @@ static struct ofono_radio_settings_driver driver = {
 	.remove			= huawei_radio_settings_remove,
 	.query_rat_mode		= huawei_query_rat_mode,
 	.set_rat_mode		= huawei_set_rat_mode,
-	.query_band             = huawei_query_band,
-	.set_band               = huawei_set_band,
+	.query_band		= huawei_query_band,
+	.set_band		= huawei_set_band,
 };
 
 void huawei_radio_settings_init(void)

ofono/drivers/ifxmodem/gprs-context.c

@@ -42,13 +42,14 @@
 
 #include "ifxmodem.h"
 
-#define TUN_SYSFS_DIR "/sys/devices/virtual/misc/tun"
+#define TUN_DEV "/dev/net/tun"
 
 #define STATIC_IP_NETMASK "255.255.255.255"
 
 static const char *none_prefix[] = { NULL };
 static const char *xdns_prefix[] = { "+XDNS:", NULL };
 static const char *cgpaddr_prefix[] = { "+CGPADDR:", NULL };
+static const char *cgcontrdp_prefix[] = { "+CGCONTRDP:", NULL };
 
 enum state {
 	STATE_IDLE,
@@ -59,17 +60,20 @@ enum state {
 
 struct gprs_context_data {
 	GAtChat *chat;
+	unsigned int vendor;
 	unsigned int active_context;
 	char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
 	char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
 	GAtRawIP *rawip;
 	enum state state;
 	enum ofono_gprs_proto proto;
-	char address[32];
-	char dns1[32];
-	char dns2[32];
+	char address[64];
+	char gateway[64];
+	char netmask[64];
+	char dns1[64];
+	char dns2[64];
 	ofono_gprs_context_cb_t cb;
-	void *cb_data;                                  /* Callback data */
+	void *cb_data;
 };
 
 static void rawip_debug(const char *str, void *data)
@@ -257,11 +261,136 @@ error:
 	failed_setup(gc, NULL, TRUE);
 }
 
+static void cgcontrdp_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct ofono_modem *modem = ofono_gprs_context_get_modem(gc);
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+	GAtResultIter iter;
+
+	const char *laddrnetmask = NULL;
+	const char *gw = NULL;
+	const char *interface;
+	const char *dns[3];
+
+	DBG("ok %d", ok);
+
+	if (!ok) {
+		struct ofono_error error;
+
+		decode_at_error(&error, g_at_result_final_response(result));
+		gcd->cb(&error, gcd->cb_data);
+
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	while (g_at_result_iter_next(&iter, "+CGCONTRDP:")) {
+		/* skip cid, bearer_id, apn */
+		g_at_result_iter_skip_next(&iter);
+		g_at_result_iter_skip_next(&iter);
+		g_at_result_iter_skip_next(&iter);
+
+		if (!g_at_result_iter_next_string(&iter, &laddrnetmask))
+			break;
+
+		if (!g_at_result_iter_next_string(&iter, &gw))
+			break;
+
+		if (!g_at_result_iter_next_string(&iter, &dns[0]))
+			break;
+
+		if (!g_at_result_iter_next_string(&iter, &dns[1]))
+			break;
+	}
+
+	strncpy(gcd->dns1, dns[0], sizeof(gcd->dns1));
+	strncpy(gcd->dns2, dns[1], sizeof(gcd->dns2));
+	dns[2] = 0;
+
+	DBG("DNS: %s, %s\n", gcd->dns1, gcd->dns2);
+
+	if (!laddrnetmask || at_util_get_ipv4_address_and_netmask(laddrnetmask,
+					gcd->address, gcd->netmask) < 0) {
+		failed_setup(gc, NULL, TRUE);
+		return;
+	}
+
+	if (gw)
+		strncpy(gcd->gateway, gw, sizeof(gcd->gateway));
+
+	gcd->state = STATE_ACTIVE;
+
+	DBG("address: %s\n", gcd->address);
+	DBG("netmask: %s\n", gcd->netmask);
+	DBG("DNS1: %s\n", gcd->dns1);
+	DBG("DNS2: %s\n", gcd->dns2);
+	DBG("Gateway: %s\n", gcd->gateway);
+
+	interface = ofono_modem_get_string(modem, "NetworkInterface");
+
+	ofono_gprs_context_set_interface(gc, interface);
+	ofono_gprs_context_set_ipv4_address(gc, gcd->address, TRUE);
+
+	if (gcd->netmask[0])
+		ofono_gprs_context_set_ipv4_netmask(gc, gcd->netmask);
+
+	if (gcd->gateway[0])
+		ofono_gprs_context_set_ipv4_gateway(gc, gcd->gateway);
+
+	ofono_gprs_context_set_ipv4_dns_servers(gc, dns);
+
+	CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
+}
+
+static void ifx_read_settings(struct ofono_gprs_context *gc)
+{
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+	char buf[64];
+
+	gcd->address[0] = '\0';
+	gcd->gateway[0] = '\0';
+	gcd->netmask[0] = '\0';
+	gcd->dns1[0] = '\0';
+	gcd->dns2[0] = '\0';
+
+	/* read IP configuration info */
+	if(gcd->vendor == OFONO_VENDOR_XMM) {
+		snprintf(buf, sizeof(buf), "AT+CGCONTRDP=%u",
+							gcd->active_context);
+
+		if (g_at_chat_send(gcd->chat, buf, cgcontrdp_prefix,
+					cgcontrdp_cb, gc, NULL) > 0)
+			return;
+	} else {
+		sprintf(buf, "AT+CGPADDR=%u", gcd->active_context);
+
+		if (g_at_chat_send(gcd->chat, buf, cgpaddr_prefix,
+						address_cb, gc, NULL) > 0)
+			return;
+	}
+
+	failed_setup(gc, NULL, TRUE);
+}
+
+static void ifx_gprs_read_settings(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);
+	DBG("cid %u", cid);
+
+	gcd->active_context = cid;
+	gcd->cb = cb;
+	gcd->cb_data = data;
+
+	ifx_read_settings(gc);
+}
+
 static void activate_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct ofono_gprs_context *gc = user_data;
-	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
-	char buf[64];
 
 	DBG("ok %d", ok);
 
@@ -271,19 +400,14 @@ static void activate_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		return;
 	}
 
-	sprintf(buf, "AT+CGPADDR=%u", gcd->active_context);
-	if (g_at_chat_send(gcd->chat, buf, cgpaddr_prefix,
-					address_cb, gc, NULL) > 0)
-		return;
-
-	failed_setup(gc, NULL, TRUE);
+	ifx_read_settings(gc);
 }
 
 static void setup_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct ofono_gprs_context *gc = user_data;
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
-	char buf[128];
+	char buf[384];
 
 	DBG("ok %d", ok);
 
@@ -387,7 +511,8 @@ static void deactivate_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	gcd->active_context = 0;
 	gcd->state = STATE_IDLE;
 
-	g_at_chat_resume(gcd->chat);
+	if (gcd->vendor != OFONO_VENDOR_XMM)
+		g_at_chat_resume(gcd->chat);
 
 	CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
 }
@@ -409,11 +534,25 @@ static void ifx_gprs_deactivate_primary(struct ofono_gprs_context *gc,
 	g_at_rawip_shutdown(gcd->rawip);
 
 	sprintf(buf, "AT+CGACT=0,%u", gcd->active_context);
-	if (g_at_chat_send(chat, buf, none_prefix,
-				deactivate_cb, gc, NULL) > 0)
-		return;
 
-	CALLBACK_WITH_SUCCESS(cb, data);
+	if (gcd->vendor == OFONO_VENDOR_XMM) {
+		if (g_at_chat_send(gcd->chat, buf, none_prefix,
+				deactivate_cb, gc, NULL) > 0)
+			return;
+	} else {
+		if (g_at_chat_send(chat, buf, none_prefix,
+				deactivate_cb, gc, NULL) > 0)
+			return;
+	}
+
+	CALLBACK_WITH_FAILURE(cb, data);
+}
+
+static void ifx_gprs_detach_shutdown(struct ofono_gprs_context *gc,
+						unsigned int cid)
+{
+	DBG("");
+	ifx_gprs_deactivate_primary(gc, cid, NULL, NULL);
 }
 
 static void cgev_notify(GAtResult *result, gpointer user_data)
@@ -451,14 +590,13 @@ static void cgev_notify(GAtResult *result, gpointer user_data)
 
 		g_at_rawip_unref(gcd->rawip);
 		gcd->rawip = NULL;
+		g_at_chat_resume(gcd->chat);
 	}
 
 	ofono_gprs_context_deactivated(gc, gcd->active_context);
 
 	gcd->active_context = 0;
 	gcd->state = STATE_IDLE;
-
-	g_at_chat_resume(gcd->chat);
 }
 
 static int ifx_gprs_context_probe(struct ofono_gprs_context *gc,
@@ -470,23 +608,27 @@ static int ifx_gprs_context_probe(struct ofono_gprs_context *gc,
 
 	DBG("");
 
-	if (stat(TUN_SYSFS_DIR, &st) < 0) {
+	if (stat(TUN_DEV, &st) < 0) {
 		ofono_error("Missing support for TUN/TAP devices");
 		return -ENODEV;
 	}
 
-	if (g_at_chat_get_slave(chat) == NULL)
-		return -EINVAL;
+	if (vendor != OFONO_VENDOR_XMM) {
+		if (g_at_chat_get_slave(chat) == NULL)
+			return -EINVAL;
+	}
 
 	gcd = g_try_new0(struct gprs_context_data, 1);
 	if (gcd == NULL)
 		return -ENOMEM;
 
+	gcd->vendor = vendor;
 	gcd->chat = g_at_chat_clone(chat);
 
 	ofono_gprs_context_set_data(gc, gcd);
 
-	chat = g_at_chat_get_slave(gcd->chat);
+	if (vendor != OFONO_VENDOR_XMM)
+		chat = g_at_chat_get_slave(gcd->chat);
 
 	g_at_chat_register(chat, "+CGEV:", cgev_notify, FALSE, gc, NULL);
 
@@ -516,6 +658,8 @@ static struct ofono_gprs_context_driver driver = {
 	.remove			= ifx_gprs_context_remove,
 	.activate_primary	= ifx_gprs_activate_primary,
 	.deactivate_primary	= ifx_gprs_deactivate_primary,
+	.read_settings		= ifx_gprs_read_settings,
+	.detach_shutdown	= ifx_gprs_detach_shutdown
 };
 
 void ifx_gprs_context_init(void)

ofono/drivers/ifxmodem/ifxmodem.h

@@ -20,6 +20,7 @@
  */
 
 #include <drivers/atmodem/atutil.h>
+#include <drivers/atmodem/vendor.h>
 
 extern void ifx_voicecall_init(void);
 extern void ifx_voicecall_exit(void);

ofono/drivers/isimodem/sim.c

@@ -646,8 +646,31 @@ error:
 /* ISI callback: PIN state (enabled/disabled) query */
 static void sec_code_state_resp_cb(const GIsiMessage *msg, void *opaque)
 {
-	check_sec_response(msg, opaque, SEC_CODE_STATE_OK_RESP,
-				SEC_CODE_STATE_FAIL_RESP);
+	struct isi_cb_data *cbd = opaque;
+	ofono_query_facility_lock_cb_t cb = cbd->cb;
+	int locked;
+	uint8_t state;
+	uint8_t status;
+
+	if (!g_isi_msg_data_get_byte(msg, 0, &state) ||
+			!g_isi_msg_data_get_byte(msg, 1, &status))
+		goto error;
+
+	if (state != SEC_CODE_STATE_OK_RESP)
+		goto error;
+
+	if (status == SEC_CODE_ENABLE)
+		locked = 1;
+	else if (status == SEC_CODE_DISABLE)
+		locked = 0;
+	else
+		goto error;
+
+	CALLBACK_WITH_SUCCESS(cb, locked, cbd->data);
+	return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
 }
 
 static void isi_query_locked(struct ofono_sim *sim,

ofono/drivers/qmimodem/devinfo.c

@@ -23,6 +23,8 @@
 #include <config.h>
 #endif
 
+#include <string.h>
+
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/devinfo.h>
@@ -125,7 +127,8 @@ static void get_ids_cb(struct qmi_result *result, void *user_data)
 	}
 
 	str = qmi_result_get_string(result, QMI_DMS_RESULT_ESN);
-	if (!str) {
+	/* Telit qmi modems return a "0" string when ESN is not available. */
+	if (!str || strcmp(str, "0") == 0) {
 		str = qmi_result_get_string(result, QMI_DMS_RESULT_IMEI);
 		if (!str) {
 			CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);

ofono/drivers/qmimodem/gprs-context.c

@@ -24,18 +24,22 @@
 #endif
 
 #include <string.h>
+#include <arpa/inet.h>
 
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/gprs-context.h>
 
 #include "qmi.h"
+#include "wda.h"
 #include "wds.h"
 
 #include "qmimodem.h"
 
 struct gprs_context_data {
 	struct qmi_service *wds;
+	struct qmi_service *wda;
+	struct qmi_device *dev;
 	unsigned int active_context;
 	uint32_t pkt_handle;
 };
@@ -61,8 +65,12 @@ static void pkt_status_notify(struct qmi_result *result, void *user_data)
 
 	switch (status->status) {
 	case QMI_WDS_CONN_STATUS_DISCONNECTED:
-		ofono_gprs_context_deactivated(gc, data->active_context);
-		data->active_context = 0;
+		if (data->pkt_handle) {
+			/* The context has been disconnected by the network */
+			ofono_gprs_context_deactivated(gc, data->active_context);
+			data->pkt_handle = 0;
+			data->active_context = 0;
+		}
 		break;
 	}
 }
@@ -75,18 +83,68 @@ static void get_settings_cb(struct qmi_result *result, void *user_data)
 	struct ofono_modem *modem;
 	const char *interface;
 	uint8_t pdp_type, ip_family;
+	uint32_t ip_addr;
+	struct in_addr addr;
+	char* straddr;
+	char* apn;
+	const char *dns[3] = { NULL, NULL, NULL };
 
 	DBG("");
 
 	if (qmi_result_set_error(result, NULL))
 		goto done;
 
+	apn = qmi_result_get_string(result, QMI_WDS_RESULT_APN);
+	if (apn) {
+		DBG("APN: %s", apn);
+		g_free(apn);
+	}
+
 	if (qmi_result_get_uint8(result, QMI_WDS_RESULT_PDP_TYPE, &pdp_type))
 		DBG("PDP type %d", pdp_type);
 
 	if (qmi_result_get_uint8(result, QMI_WDS_RESULT_IP_FAMILY, &ip_family))
 		DBG("IP family %d", ip_family);
 
+	if (qmi_result_get_uint32(result,QMI_WDS_RESULT_IP_ADDRESS, &ip_addr)) {
+		addr.s_addr = htonl(ip_addr);
+		straddr = inet_ntoa(addr);
+		DBG("IP addr: %s", straddr);
+		ofono_gprs_context_set_ipv4_address(gc, straddr, 1);
+	}
+
+	if (qmi_result_get_uint32(result,QMI_WDS_RESULT_GATEWAY, &ip_addr)) {
+		addr.s_addr = htonl(ip_addr);
+		straddr = inet_ntoa(addr);
+		DBG("Gateway: %s", straddr);
+		ofono_gprs_context_set_ipv4_gateway(gc, straddr);
+	}
+
+	if (qmi_result_get_uint32(result,
+				QMI_WDS_RESULT_GATEWAY_NETMASK, &ip_addr)) {
+		addr.s_addr = htonl(ip_addr);
+		straddr = inet_ntoa(addr);
+		DBG("Gateway netmask: %s", straddr);
+		ofono_gprs_context_set_ipv4_netmask(gc, straddr);
+	}
+
+	if (qmi_result_get_uint32(result,
+				QMI_WDS_RESULT_PRIMARY_DNS, &ip_addr)) {
+		addr.s_addr = htonl(ip_addr);
+		dns[0] = inet_ntoa(addr);
+		DBG("Primary DNS: %s", dns[0]);
+	}
+
+	if (qmi_result_get_uint32(result,
+				QMI_WDS_RESULT_SECONDARY_DNS, &ip_addr)) {
+		addr.s_addr = htonl(ip_addr);
+		dns[1] = inet_ntoa(addr);
+		DBG("Secondary DNS: %s", dns[1]);
+	}
+
+	if (dns[0])
+		ofono_gprs_context_set_ipv4_dns_servers(gc, dns);
+
 done:
 	modem = ofono_gprs_context_get_modem(gc);
 	interface = ofono_modem_get_string(modem, "NetworkInterface");
@@ -94,8 +152,6 @@ done:
 	ofono_gprs_context_set_interface(gc, interface);
 
 	CALLBACK_WITH_SUCCESS(cb, cbd->data);
-
-	g_free(cbd);
 }
 
 static void start_net_cb(struct qmi_result *result, void *user_data)
@@ -120,8 +176,12 @@ static void start_net_cb(struct qmi_result *result, void *user_data)
 
 	data->pkt_handle = handle;
 
+	/* Duplicate cbd, the old one will be freed when this method returns */
+	cbd = cb_data_new(cb, cbd->data);
+	cbd->user = gc;
+
 	if (qmi_service_send(data->wds, QMI_WDS_GET_SETTINGS, NULL,
-					get_settings_cb, cbd, NULL) > 0)
+					get_settings_cb, cbd, g_free) > 0)
 		return;
 
 	modem = ofono_gprs_context_get_modem(gc);
@@ -131,12 +191,39 @@ static void start_net_cb(struct qmi_result *result, void *user_data)
 
 	CALLBACK_WITH_SUCCESS(cb, cbd->data);
 
-	g_free(cbd);
-
 	return;
 
 error:
 	data->active_context = 0;
+	CALLBACK_WITH_FAILURE(cb, cbd->data);
+}
+
+/*
+ * This function gets called for "automatic" contexts, those which are
+ * not activated via activate_primary.  For these, we will still need
+ * to call start_net in order to get the packet handle for the context.
+ * The process for automatic contexts is essentially identical to that
+ * for others.
+ */
+static void qmi_gprs_read_settings(struct ofono_gprs_context* gc,
+					unsigned int cid,
+					ofono_gprs_context_cb_t cb,
+					void *user_data)
+{
+	struct gprs_context_data *data = ofono_gprs_context_get_data(gc);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+
+	DBG("cid %u", cid);
+
+	data->active_context = cid;
+
+	cbd->user = gc;
+
+	if (qmi_service_send(data->wds, QMI_WDS_START_NET, NULL,
+					start_net_cb, cbd, g_free) > 0)
+		return;
+
+	data->active_context = 0;
 
 	CALLBACK_WITH_FAILURE(cb, cbd->data);
 
@@ -151,6 +238,7 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc,
 	struct cb_data *cbd = cb_data_new(cb, user_data);
 	struct qmi_param *param;
 	uint8_t ip_family;
+	uint8_t auth;
 
 	DBG("cid %u", ctx->cid);
 
@@ -178,8 +266,31 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc,
 
 	qmi_param_append_uint8(param, QMI_WDS_PARAM_IP_FAMILY, ip_family);
 
+	switch (ctx->auth_method) {
+	case OFONO_GPRS_AUTH_METHOD_CHAP:
+		auth = QMI_WDS_AUTHENTICATION_CHAP;
+		break;
+	case OFONO_GPRS_AUTH_METHOD_PAP:
+		auth = QMI_WDS_AUTHENTICATION_PAP;
+		break;
+	default:
+		auth = QMI_WDS_AUTHENTICATION_NONE;
+		break;
+	}
+
+	qmi_param_append_uint8(param, QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE,
+					auth);
+
+	if (ctx->username[0] != '\0')
+		qmi_param_append(param, QMI_WDS_PARAM_USERNAME,
+					strlen(ctx->username), ctx->username);
+
+	if (ctx->password[0] != '\0')
+		qmi_param_append(param, QMI_WDS_PARAM_PASSWORD,
+					strlen(ctx->password), ctx->password);
+
 	if (qmi_service_send(data->wds, QMI_WDS_START_NET, param,
-					start_net_cb, cbd, NULL) > 0)
+					start_net_cb, cbd, g_free) > 0)
 		return;
 
 	qmi_param_free(param);
@@ -202,17 +313,19 @@ static void stop_net_cb(struct qmi_result *result, void *user_data)
 	DBG("");
 
 	if (qmi_result_set_error(result, NULL)) {
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
+		if (cb)
+			CALLBACK_WITH_FAILURE(cb, cbd->data);
 		return;
 	}
 
-	data->active_context = 0;
-
 	data->pkt_handle = 0;
 
-	CALLBACK_WITH_SUCCESS(cb, cbd->data);
+	if (cb)
+		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+	else
+		ofono_gprs_context_deactivated(gc, data->active_context);
 
-	g_free(cbd);
+	data->active_context = 0;
 }
 
 static void qmi_deactivate_primary(struct ofono_gprs_context *gc,
@@ -233,17 +346,26 @@ static void qmi_deactivate_primary(struct ofono_gprs_context *gc,
 		goto error;
 
 	if (qmi_service_send(data->wds, QMI_WDS_STOP_NET, param,
-					stop_net_cb, cbd, NULL) > 0)
+					stop_net_cb, cbd, g_free) > 0)
 		return;
 
 	qmi_param_free(param);
 
 error:
-	CALLBACK_WITH_FAILURE(cb, cbd->data);
+	if (cb)
+		CALLBACK_WITH_FAILURE(cb, user_data);
 
 	g_free(cbd);
 }
 
+static void qmi_gprs_context_detach_shutdown(struct ofono_gprs_context *gc,
+						unsigned int cid)
+{
+	DBG("");
+
+	qmi_deactivate_primary(gc, cid, NULL, NULL);
+}
+
 static void create_wds_cb(struct qmi_service *service, void *user_data)
 {
 	struct ofono_gprs_context *gc = user_data;
@@ -263,6 +385,69 @@ static void create_wds_cb(struct qmi_service *service, void *user_data)
 					pkt_status_notify, gc, NULL);
 }
 
+static void get_data_format_cb(struct qmi_result *result, void *user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct gprs_context_data *data = ofono_gprs_context_get_data(gc);
+	uint32_t llproto;
+	enum qmi_device_expected_data_format expected_llproto;
+
+	DBG("");
+
+	if (qmi_result_set_error(result, NULL))
+		goto done;
+
+	if (!qmi_result_get_uint32(result, QMI_WDA_LL_PROTOCOL, &llproto))
+		goto done;
+
+	expected_llproto = qmi_device_get_expected_data_format(data->dev);
+
+	if ((llproto == QMI_WDA_DATA_LINK_PROTOCOL_802_3) &&
+			(expected_llproto ==
+				QMI_DEVICE_EXPECTED_DATA_FORMAT_RAW_IP)) {
+		if (!qmi_device_set_expected_data_format(data->dev,
+					QMI_DEVICE_EXPECTED_DATA_FORMAT_802_3))
+			DBG("Fail to set expected data to 802.3");
+		else
+			DBG("expected data set to 802.3");
+	} else if ((llproto == QMI_WDA_DATA_LINK_PROTOCOL_RAW_IP) &&
+			(expected_llproto ==
+				QMI_DEVICE_EXPECTED_DATA_FORMAT_802_3)) {
+		if (!qmi_device_set_expected_data_format(data->dev,
+					QMI_DEVICE_EXPECTED_DATA_FORMAT_RAW_IP))
+			DBG("Fail to set expected data to raw-ip");
+		else
+			DBG("expected data set to raw-ip");
+	}
+
+done:
+	qmi_service_create_shared(data->dev, QMI_SERVICE_WDS, create_wds_cb, gc,
+									NULL);
+}
+
+static void create_wda_cb(struct qmi_service *service, void *user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct gprs_context_data *data = ofono_gprs_context_get_data(gc);
+
+	DBG("");
+
+	if (!service) {
+		DBG("Failed to request WDA service, continue initialization");
+		goto error;
+	}
+
+	data->wda = qmi_service_ref(service);
+
+	if (qmi_service_send(data->wda, QMI_WDA_GET_DATA_FORMAT, NULL,
+					get_data_format_cb, gc, NULL) > 0)
+		return;
+
+error:
+	qmi_service_create_shared(data->dev, QMI_SERVICE_WDS, create_wds_cb, gc,
+									NULL);
+}
+
 static int qmi_gprs_context_probe(struct ofono_gprs_context *gc,
 					unsigned int vendor, void *user_data)
 {
@@ -274,8 +459,9 @@ static int qmi_gprs_context_probe(struct ofono_gprs_context *gc,
 	data = g_new0(struct gprs_context_data, 1);
 
 	ofono_gprs_context_set_data(gc, data);
+	data->dev = device;
 
-	qmi_service_create(device, QMI_SERVICE_WDS, create_wds_cb, gc, NULL);
+	qmi_service_create(device, QMI_SERVICE_WDA, create_wda_cb, gc, NULL);
 
 	return 0;
 }
@@ -288,9 +474,15 @@ static void qmi_gprs_context_remove(struct ofono_gprs_context *gc)
 
 	ofono_gprs_context_set_data(gc, NULL);
 
-	qmi_service_unregister_all(data->wds);
+	if (data->wds) {
+		qmi_service_unregister_all(data->wds);
+		qmi_service_unref(data->wds);
+	}
 
-	qmi_service_unref(data->wds);
+	if (data->wda) {
+		qmi_service_unregister_all(data->wda);
+		qmi_service_unref(data->wda);
+	}
 
 	g_free(data);
 }
@@ -301,6 +493,8 @@ static struct ofono_gprs_context_driver driver = {
 	.remove			= qmi_gprs_context_remove,
 	.activate_primary	= qmi_activate_primary,
 	.deactivate_primary	= qmi_deactivate_primary,
+	.read_settings		= qmi_gprs_read_settings,
+	.detach_shutdown	= qmi_gprs_context_detach_shutdown,
 };
 
 void qmi_gprs_context_init(void)

ofono/drivers/qmimodem/gprs.c

@@ -30,16 +30,18 @@
 #include "qmi.h"
 #include "nas.h"
 
+#include "src/common.h"
 #include "qmimodem.h"
 
 struct gprs_data {
 	struct qmi_service *nas;
 };
 
-static bool extract_ss_info(struct qmi_result *result, int *status)
+static bool extract_ss_info(struct qmi_result *result, int *status, int *tech)
 {
 	const struct qmi_nas_serving_system *ss;
 	uint16_t len;
+	int i;
 
 	DBG("");
 
@@ -47,14 +49,46 @@ static bool extract_ss_info(struct qmi_result *result, int *status)
 	if (!ss)
 		return false;
 
-	if (ss->ps_state == QMI_NAS_ATTACH_STATUS_ATTACHED)
-		*status = 0x01;
+	if (ss->ps_state == QMI_NAS_ATTACH_STATE_ATTACHED)
+		*status = NETWORK_REGISTRATION_STATUS_REGISTERED;
 	else
-		*status = 0x00;
+		*status = NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
+
+	*tech = -1;
+	for (i = 0; i < ss->radio_if_count; i++) {
+		DBG("radio in use %d", ss->radio_if[i]);
+
+		*tech = qmi_nas_rat_to_tech(ss->radio_if[i]);
+	}
 
 	return true;
 }
 
+static int handle_ss_info(struct qmi_result *result, struct ofono_gprs *gprs)
+{
+	int status;
+	int tech;
+
+	DBG("");
+
+	if (!extract_ss_info(result, &status, &tech))
+		return -1;
+
+	if (status == NETWORK_REGISTRATION_STATUS_REGISTERED)
+		if (tech == ACCESS_TECHNOLOGY_EUTRAN) {
+			/* On LTE we are effectively always attached; and
+			 * the default bearer is established as soon as the
+			 * network is joined.
+			 */
+			/* FIXME: query default profile number and APN
+			 * instead of assuming profile 1 and ""
+			 */
+			ofono_gprs_cid_activated(gprs, 1 , "automatic");
+		}
+
+	return status;
+}
+
 static void ss_info_notify(struct qmi_result *result, void *user_data)
 {
 	struct ofono_gprs *gprs = user_data;
@@ -62,10 +96,10 @@ static void ss_info_notify(struct qmi_result *result, void *user_data)
 
 	DBG("");
 
-	if (!extract_ss_info(result, &status))
-		return;
+	status = handle_ss_info(result, gprs);
 
-	ofono_gprs_status_notify(gprs, status);
+	if (status >= 0)
+		ofono_gprs_status_notify(gprs, status);
 }
 
 static void attach_detach_cb(struct qmi_result *result, void *user_data)
@@ -124,22 +158,26 @@ error:
 static void get_ss_info_cb(struct qmi_result *result, void *user_data)
 {
 	struct cb_data *cbd = user_data;
+	struct ofono_gprs *gprs = cbd->user;
 	ofono_gprs_status_cb_t cb = cbd->cb;
 	int status;
 
 	DBG("");
 
-	if (qmi_result_set_error(result, NULL)) {
-		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-		return;
-	}
+	if (qmi_result_set_error(result, NULL))
+		goto error;
 
-	if (!extract_ss_info(result, &status)) {
-		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
-		return;
-	}
+	status = handle_ss_info(result, gprs);
+
+	if (status < 0)
+		goto error;
 
 	CALLBACK_WITH_SUCCESS(cb, status, cbd->data);
+
+	return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
 }
 
 static void qmi_attached_status(struct ofono_gprs *gprs,
@@ -150,6 +188,7 @@ static void qmi_attached_status(struct ofono_gprs *gprs,
 
 	DBG("");
 
+	cbd->user = gprs;
 	if (qmi_service_send(data->nas, QMI_NAS_GET_SS_INFO, NULL,
 					get_ss_info_cb, cbd, g_free) > 0)
 		return;
@@ -174,6 +213,13 @@ static void create_nas_cb(struct qmi_service *service, void *user_data)
 
 	data->nas = qmi_service_ref(service);
 
+	/*
+	 * First get the SS info - the modem may already be connected,
+	 * and the state-change notification may never arrive
+	 */
+	qmi_service_send(data->nas, QMI_NAS_GET_SS_INFO, NULL,
+					ss_info_notify, gprs, NULL);
+
 	qmi_service_register(data->nas, QMI_NAS_SS_INFO_IND,
 					ss_info_notify, gprs, NULL);
 
@@ -194,7 +240,8 @@ static int qmi_gprs_probe(struct ofono_gprs *gprs,
 
 	ofono_gprs_set_data(gprs, data);
 
-	qmi_service_create(device, QMI_SERVICE_NAS, create_nas_cb, gprs, NULL);
+	qmi_service_create_shared(device, QMI_SERVICE_NAS,
+						create_nas_cb, gprs, NULL);
 
 	return 0;
 }

ofono/drivers/qmimodem/nas.c

@@ -0,0 +1,38 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2017  Jonas Bonn. 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 "nas.h"
+
+#include "src/common.h"
+
+int qmi_nas_rat_to_tech(uint8_t rat)
+{
+	switch (rat) {
+	case QMI_NAS_NETWORK_RAT_GSM:
+		return ACCESS_TECHNOLOGY_GSM;
+	case QMI_NAS_NETWORK_RAT_UMTS:
+		return ACCESS_TECHNOLOGY_UTRAN;
+	case QMI_NAS_NETWORK_RAT_LTE:
+		return ACCESS_TECHNOLOGY_EUTRAN;
+	}
+
+	return -1;
+}

ofono/drivers/qmimodem/nas.h

@@ -19,6 +19,8 @@
  *
  */
 
+#include <stdint.h>
+
 #define QMI_NAS_RESET			0	/* Reset NAS service state variables */
 #define QMI_NAS_ABORT			1	/* Abort previously issued NAS command */
 #define QMI_NAS_EVENT			2	/* Connection state report indication */
@@ -33,6 +35,8 @@
 #define QMI_NAS_SS_INFO_IND		36	/* Current serving system info indication */
 #define QMI_NAS_GET_HOME_INFO		37	/* Get info about home network */
 
+#define QMI_NAS_SET_SYSTEM_SELECTION_PREF 51
+#define QMI_NAS_GET_SYSTEM_SELECTION_PREF 52
 
 /* Set NAS state report conditions */
 #define QMI_NAS_PARAM_REPORT_SIGNAL_STRENGTH	0x10
@@ -63,7 +67,7 @@ struct qmi_nas_rf_info {
 } __attribute__((__packed__));
 
 /* Get the signal strength */
-#define QMI_NAS_RESULT_SIGNAL_STRENGTH		0x10
+#define QMI_NAS_RESULT_SIGNAL_STRENGTH		0x01
 
 /* Scan for visible network */
 #define QMI_NAS_PARAM_NETWORK_MASK		0x10	/* uint8 bitmask */
@@ -95,6 +99,7 @@ struct qmi_nas_network_rat {
 	} __attribute__((__packed__)) info[0];
 } __attribute__((__packed__));
 
+#define QMI_NAS_NETWORK_RAT_NONE		0x00
 #define QMI_NAS_NETWORK_RAT_GSM			0x04
 #define QMI_NAS_NETWORK_RAT_UMTS		0x05
 #define QMI_NAS_NETWORK_RAT_LTE			0x08
@@ -140,9 +145,29 @@ struct qmi_nas_current_plmn {
 #define QMI_NAS_RESULT_LOCATION_AREA_CODE	0x1d	/* uint16 */
 #define QMI_NAS_RESULT_CELL_ID			0x1e	/* uint32 */
 
-#define QMI_NAS_ATTACH_STATUS_INVALID		0x00
-#define QMI_NAS_ATTACH_STATUS_ATTACHED		0x01
-#define QMI_NAS_ATTACH_STATUS_DETACHED		0x02
+/* qmi_nas_serving_system.status */
+#define QMI_NAS_REGISTRATION_STATE_NOT_REGISTERED	0x00
+#define QMI_NAS_REGISTRATION_STATE_REGISTERED		0x01
+#define QMI_NAS_REGISTRATION_STATE_SEARCHING		0x02
+#define QMI_NAS_REGISTRATION_STATE_DENIED		0x03
+#define QMI_NAS_REGISTRATION_STATE_UNKNOWN		0x04
+
+#define QMI_NAS_RESULT_3GGP_DST 0x1b
+#define QMI_NAS_RESULT_3GPP_TIME 0x1c
+struct qmi_nas_3gpp_time {
+	uint16_t year;
+	uint8_t month;
+	uint8_t day;
+	uint8_t hour;
+	uint8_t minute;
+	uint8_t second;
+	uint8_t timezone;
+} __attribute__((__packed__));
+
+/* cs_state/ps_state */
+#define QMI_NAS_ATTACH_STATE_INVALID		0x00
+#define QMI_NAS_ATTACH_STATE_ATTACHED		0x01
+#define QMI_NAS_ATTACH_STATE_DETACHED		0x02
 
 /* Get info about home network */
 #define QMI_NAS_RESULT_HOME_NETWORK		0x01
@@ -152,3 +177,14 @@ struct qmi_nas_home_network {
 	uint8_t desc_len;
 	char desc[0];
 } __attribute__((__packed__));
+
+#define QMI_NAS_RAT_MODE_PREF_ANY		(-1)
+#define QMI_NAS_RAT_MODE_PREF_GSM		(1 << 2)
+#define QMI_NAS_RAT_MODE_PREF_UMTS		(1 << 3)
+#define QMI_NAS_RAT_MODE_PREF_LTE		(1 << 4)
+
+#define QMI_NAS_PARAM_SYSTEM_SELECTION_PREF_MODE	0x11
+
+#define QMI_NAS_RESULT_SYSTEM_SELECTION_PREF_MODE	0x11
+
+int qmi_nas_rat_to_tech(uint8_t rat);

ofono/drivers/qmimodem/netmon.c

@@ -0,0 +1,286 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2017  Jonas Bonn. 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 <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/netmon.h>
+
+#include "qmi.h"
+#include "nas.h"
+
+#include "qmimodem.h"
+#include "src/common.h"
+
+struct netmon_data {
+	struct qmi_service *nas;
+};
+
+static void get_rssi_cb(struct qmi_result *result, void *user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_netmon *netmon = cbd->user;
+	ofono_netmon_cb_t cb = cbd->cb;
+	struct {
+		enum ofono_netmon_cell_type type;
+		int rssi;
+		int ber;
+		int rsrq;
+		int rsrp;
+	} props;
+	uint16_t len;
+	int16_t rsrp;
+	const struct {
+		int8_t value;
+		int8_t rat;
+	} __attribute__((__packed__)) *rsrq;
+	const struct {
+		uint16_t count;
+		struct {
+			uint8_t rssi;
+			int8_t rat;
+		} __attribute__((__packed__)) info[0];
+	} __attribute__((__packed__)) *rssi;
+	const struct {
+		uint16_t count;
+		struct {
+			uint16_t rate;
+			int8_t rat;
+		} __attribute__((__packed__)) info[0];
+	} __attribute__((__packed__)) *ber;
+	int i;
+	uint16_t num;
+
+	DBG("");
+
+	if (qmi_result_set_error(result, NULL)) {
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+		return;
+	}
+
+	/* RSSI */
+	rssi = qmi_result_get(result, 0x11, &len);
+	num = GUINT16_FROM_LE(rssi->count);
+	if (rssi) {
+		for (i = 0; i < num; i++) {
+			DBG("RSSI: %hhu on RAT %hhd",
+				rssi->info[i].rssi,
+				rssi->info[i].rat);
+		}
+
+		/* Get cell type from RSSI info... it will be the same
+		 * for all the other entries
+		 */
+		props.type = qmi_nas_rat_to_tech(rssi->info[0].rat);
+		switch (rssi->info[0].rat) {
+		case QMI_NAS_NETWORK_RAT_GSM:
+			props.type = OFONO_NETMON_CELL_TYPE_GSM;
+			break;
+		case QMI_NAS_NETWORK_RAT_UMTS:
+			props.type = OFONO_NETMON_CELL_TYPE_UMTS;
+			break;
+		case QMI_NAS_NETWORK_RAT_LTE:
+			props.type = OFONO_NETMON_CELL_TYPE_LTE;
+			break;
+		default:
+			props.type = OFONO_NETMON_CELL_TYPE_GSM;
+			break;
+		}
+
+		props.rssi = (rssi->info[0].rssi + 113) / 2;
+		if (props.rssi > 31) props.rssi = 31;
+		if (props.rssi < 0) props.rssi = 0;
+	} else {
+		props.type = QMI_NAS_NETWORK_RAT_GSM;
+		props.rssi = -1;
+	}
+
+	/* Bit error rate */
+	ber = qmi_result_get(result, 0x15, &len);
+	num = GUINT16_FROM_LE(ber->count);
+	if (ber) {
+		for (i = 0; i < ber->count; i++) {
+			DBG("Bit error rate: %hu on RAT %hhd",
+				GUINT16_FROM_LE(ber->info[i].rate),
+				ber->info[i].rat);
+		}
+
+		props.ber = GUINT16_FROM_LE(ber->info[0].rate);
+		if (props.ber > 7)
+			props.ber = -1;
+	} else {
+		props.ber = -1;
+	}
+
+	/* LTE RSRQ */
+	rsrq = qmi_result_get(result, 0x16, &len);
+	if (rsrq) {
+		DBG("RSRQ: %hhd on RAT %hhd",
+			rsrq->value,
+			rsrq->rat);
+
+		if (rsrq->value == 0) {
+			props.rsrq = -1;
+		} else {
+			props.rsrq = (rsrq->value + 19) * 2;
+			if (props.rsrq > 34) props.rsrq = 34;
+			if (props.rsrq < 0) props.rsrq = 0;
+		}
+	} else {
+		props.rsrq = -1;
+	}
+
+	/* LTE RSRP */
+	if (qmi_result_get_int16(result, 0x18, &rsrp)) {
+		DBG("Got LTE RSRP: %hd", rsrp);
+
+		if (rsrp == 0) {
+			props.rsrp = -1;
+		} else {
+			props.rsrp = rsrp + 140;
+			if (props.rsrp > 97) props.rsrp = 97;
+			if (props.rsrp < 0) props.rsrp = 0;
+		}
+	} else {
+		props.rsrp = -1;
+	}
+
+	ofono_netmon_serving_cell_notify(netmon,
+				props.type,
+				OFONO_NETMON_INFO_RSSI, props.rssi,
+				OFONO_NETMON_INFO_BER, props.ber,
+				OFONO_NETMON_INFO_RSRQ, props.rsrq,
+				OFONO_NETMON_INFO_RSRP, props.rsrp,
+				OFONO_NETMON_INFO_INVALID);
+
+	CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void qmi_netmon_request_update(struct ofono_netmon *netmon,
+					ofono_netmon_cb_t cb,
+					void *user_data)
+{
+	struct netmon_data *data = ofono_netmon_get_data(netmon);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+	struct qmi_param *param;
+
+	DBG("");
+
+	cbd->user = netmon;
+
+	param = qmi_param_new();
+	if (!param)
+		goto out;
+
+	/* Request all signal strength items: mask=0xff */
+	qmi_param_append_uint16(param, 0x10, 255);
+
+	if (qmi_service_send(data->nas, QMI_NAS_GET_RSSI, param,
+					get_rssi_cb, cbd, g_free) > 0)
+		return;
+
+	qmi_param_free(param);
+
+out:
+	CALLBACK_WITH_FAILURE(cb, cbd->data);
+
+	g_free(cbd);
+}
+
+static void create_nas_cb(struct qmi_service *service, void *user_data)
+{
+	struct ofono_netmon *netmon = user_data;
+	struct netmon_data *nmd = ofono_netmon_get_data(netmon);
+
+	DBG("");
+
+	if (!service) {
+		ofono_error("Failed to request NAS service");
+		ofono_netmon_remove(netmon);
+		return;
+	}
+
+	nmd->nas = qmi_service_ref(service);
+
+	ofono_netmon_register(netmon);
+}
+
+static int qmi_netmon_probe(struct ofono_netmon *netmon,
+					unsigned int vendor, void *user_data)
+{
+	struct qmi_device *device = user_data;
+	struct netmon_data *nmd;
+
+	DBG("");
+
+	nmd = g_new0(struct netmon_data, 1);
+
+	ofono_netmon_set_data(netmon, nmd);
+
+	qmi_service_create_shared(device, QMI_SERVICE_NAS,
+					create_nas_cb, netmon, NULL);
+
+	return 0;
+}
+
+static void qmi_netmon_remove(struct ofono_netmon *netmon)
+{
+	struct netmon_data *nmd = ofono_netmon_get_data(netmon);
+
+	DBG("");
+
+	ofono_netmon_set_data(netmon, NULL);
+
+	qmi_service_unregister_all(nmd->nas);
+
+	qmi_service_unref(nmd->nas);
+
+	g_free(nmd);
+}
+
+static struct ofono_netmon_driver driver = {
+	.name			= "qmimodem",
+	.probe			= qmi_netmon_probe,
+	.remove			= qmi_netmon_remove,
+	.request_update		= qmi_netmon_request_update,
+};
+
+void qmi_netmon_init(void)
+{
+	ofono_netmon_driver_register(&driver);
+}
+
+void qmi_netmon_exit(void)
+{
+	ofono_netmon_driver_unregister(&driver);
+}

ofono/drivers/qmimodem/network-registration.c

@@ -23,6 +23,7 @@
 #include <config.h>
 #endif
 
+#include <endian.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -43,18 +44,36 @@ struct netreg_data {
 	uint8_t current_rat;
 };
 
-static int rat_to_tech(uint8_t rat)
+static bool extract_ss_info_time(
+		struct qmi_result *result,
+		struct ofono_network_time *time)
 {
-	switch (rat) {
-	case QMI_NAS_NETWORK_RAT_GSM:
-		return ACCESS_TECHNOLOGY_GSM;
-	case QMI_NAS_NETWORK_RAT_UMTS:
-		return ACCESS_TECHNOLOGY_UTRAN;
-	case QMI_NAS_NETWORK_RAT_LTE:
-		return ACCESS_TECHNOLOGY_EUTRAN;
+	const struct qmi_nas_3gpp_time *time_3gpp = NULL;
+	uint8_t dst_3gpp;
+	bool dst_3gpp_valid;
+	uint16_t len;
+
+	/* parse 3gpp time & dst */
+	dst_3gpp_valid = qmi_result_get_uint8(result, QMI_NAS_RESULT_3GGP_DST,
+						&dst_3gpp);
+
+	time_3gpp = qmi_result_get(result, QMI_NAS_RESULT_3GPP_TIME, &len);
+	if (time_3gpp && len == sizeof(struct qmi_nas_3gpp_time) &&
+			dst_3gpp_valid) {
+		time->year = le16toh(time_3gpp->year);
+		time->mon = time_3gpp->month;
+		time->mday = time_3gpp->day;
+		time->hour = time_3gpp->hour;
+		time->min = time_3gpp->minute;
+		time->sec = time_3gpp->second;
+		time->utcoff = time_3gpp->timezone * 15 * 60;
+		time->dst = dst_3gpp;
+		return true;
 	}
 
-	return -1;
+	/* TODO: 3gpp2 */
+
+	return false;
 }
 
 static bool extract_ss_info(struct qmi_result *result, int *status,
@@ -64,7 +83,7 @@ static bool extract_ss_info(struct qmi_result *result, int *status,
 	const struct qmi_nas_serving_system *ss;
 	const struct qmi_nas_current_plmn *plmn;
 	uint8_t i, roaming;
-	uint16_t value16, len;
+	uint16_t value16, len, opname_len;
 	uint32_t value32;
 
 	DBG("");
@@ -82,13 +101,13 @@ static bool extract_ss_info(struct qmi_result *result, int *status,
 	for (i = 0; i < ss->radio_if_count; i++) {
 		DBG("radio in use %d", ss->radio_if[i]);
 
-		*tech = rat_to_tech(ss->radio_if[i]);
+		*tech = qmi_nas_rat_to_tech(ss->radio_if[i]);
 	}
 
 	if (qmi_result_get_uint8(result, QMI_NAS_RESULT_ROAMING_STATUS,
 								&roaming)) {
 		if (ss->status == 1 && roaming == 0)
-			*status = 5;
+			*status = NETWORK_REGISTRATION_STATUS_ROAMING;
 	}
 
 	if (!operator)
@@ -100,8 +119,21 @@ static bool extract_ss_info(struct qmi_result *result, int *status,
 						GUINT16_FROM_LE(plmn->mcc));
 		snprintf(operator->mnc, OFONO_MAX_MNC_LENGTH + 1, "%02d",
 						GUINT16_FROM_LE(plmn->mnc));
-		strncpy(operator->name, plmn->desc, plmn->desc_len);
-		operator->name[plmn->desc_len] = '\0';
+		opname_len = plmn->desc_len;
+		if (opname_len > OFONO_MAX_OPERATOR_NAME_LENGTH)
+			opname_len = OFONO_MAX_OPERATOR_NAME_LENGTH;
+
+		/*
+		 * Telit QMI modems can return non-utf-8 characters in
+		 * plmn-desc. When that happens, libdbus will abort ofono.
+		 * If non-utf-8 characters are detected, use mccmnc string.
+		 */
+		if (g_utf8_validate(plmn->desc, opname_len, NULL)) {
+			strncpy(operator->name, plmn->desc, opname_len);
+			operator->name[opname_len] = '\0';
+		} else
+			snprintf(operator->name, OFONO_MAX_OPERATOR_NAME_LENGTH,
+					"%s%s",	operator->mcc, operator->mnc);
 
 		DBG("%s (%s:%s)", operator->name, operator->mcc, operator->mnc);
 	}
@@ -125,11 +157,15 @@ static bool extract_ss_info(struct qmi_result *result, int *status,
 static void ss_info_notify(struct qmi_result *result, void *user_data)
 {
 	struct ofono_netreg *netreg = user_data;
+	struct ofono_network_time net_time;
 	struct netreg_data *data = ofono_netreg_get_data(netreg);
 	int status, lac, cellid, tech;
 
 	DBG("");
 
+	if (extract_ss_info_time(result, &net_time))
+		ofono_netreg_time_notify(netreg, &net_time);
+
 	if (!extract_ss_info(result, &status, &lac, &cellid, &tech,
 							&data->operator))
 		return;
@@ -265,7 +301,7 @@ static void scan_nets_cb(struct qmi_result *result, void *user_data)
 		DBG("%03d:%02d %d", netrat->info[i].mcc, netrat->info[i].mnc,
 							netrat->info[i].rat);
 
-		list[i].tech = rat_to_tech(netrat->info[i].rat);
+		list[i].tech = qmi_nas_rat_to_tech(netrat->info[i].rat);
 	}
 
 done:
@@ -357,7 +393,7 @@ static void qmi_register_manual(struct ofono_netreg *netreg,
 
 	info.mcc = atoi(mcc);
 	info.mnc = atoi(mnc);
-	info.rat = data->current_rat;
+	info.rat = QMI_NAS_NETWORK_RAT_NO_CHANGE;
 
 	qmi_param_append(param, QMI_NAS_PARAM_REGISTER_MANUAL_INFO,
 						sizeof(info), &info);
@@ -451,10 +487,11 @@ static void event_notify(struct qmi_result *result, void *user_data)
         if (ss) {
 		int strength;
 
-		DBG("signal with %d dBm on %d", ss->dbm, ss->rat);
-
 		strength = dbm_to_strength(ss->dbm);
 
+		DBG("signal with %d%%(%d dBm) on %d",
+				strength, ss->dbm, ss->rat);
+
 		ofono_netreg_strength_notify(netreg, strength);
 	}
 
@@ -474,10 +511,17 @@ static void event_notify(struct qmi_result *result, void *user_data)
 static void set_event_cb(struct qmi_result *result, void *user_data)
 {
 	struct ofono_netreg *netreg = user_data;
+	struct netreg_data *data = ofono_netreg_get_data(netreg);
 
 	DBG("");
 
 	ofono_netreg_register(netreg);
+
+	qmi_service_register(data->nas, QMI_NAS_EVENT,
+					event_notify, netreg, NULL);
+
+	qmi_service_register(data->nas, QMI_NAS_SS_INFO_IND,
+					ss_info_notify, netreg, NULL);
 }
 
 static void create_nas_cb(struct qmi_service *service, void *user_data)
@@ -499,12 +543,6 @@ static void create_nas_cb(struct qmi_service *service, void *user_data)
 
 	data->nas = qmi_service_ref(service);
 
-	qmi_service_register(data->nas, QMI_NAS_EVENT,
-					event_notify, netreg, NULL);
-
-	qmi_service_register(data->nas, QMI_NAS_SS_INFO_IND,
-					ss_info_notify, netreg, NULL);
-
 	param = qmi_param_new();
 	if (!param)
 		goto done;
@@ -543,7 +581,7 @@ static int qmi_netreg_probe(struct ofono_netreg *netreg,
 
 	ofono_netreg_set_data(netreg, data);
 
-	qmi_service_create(device, QMI_SERVICE_NAS,
+	qmi_service_create_shared(device, QMI_SERVICE_NAS,
 					create_nas_cb, netreg, NULL);
 
 	return 0;

ofono/drivers/qmimodem/qmi.c

@@ -26,6 +26,8 @@
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -33,12 +35,18 @@
 
 #include <glib.h>
 
+#include <ofono/log.h>
+
 #include "qmi.h"
 #include "ctl.h"
 
 typedef void (*qmi_message_func_t)(uint16_t message, uint16_t length,
 					const void *buffer, void *user_data);
 
+struct discovery {
+	qmi_destroy_func_t destroy;
+};
+
 struct qmi_device {
 	int ref_count;
 	int fd;
@@ -49,6 +57,7 @@ struct qmi_device {
 	GQueue *req_queue;
 	GQueue *control_queue;
 	GQueue *service_queue;
+	GQueue *discovery_queue;
 	uint8_t next_control_tid;
 	uint16_t next_service_tid;
 	qmi_debug_func_t debug_func;
@@ -60,6 +69,12 @@ struct qmi_device {
 	uint8_t version_count;
 	GHashTable *service_list;
 	unsigned int release_users;
+	qmi_shutdown_func_t shutdown_func;
+	void *shutdown_user_data;
+	qmi_destroy_func_t shutdown_destroy;
+	guint shutdown_source;
+	bool shutting_down : 1;
+	bool destroyed : 1;
 };
 
 struct qmi_service {
@@ -209,6 +224,14 @@ static gint __request_compare(gconstpointer a, gconstpointer b)
 	return req->tid - tid;
 }
 
+static void __discovery_free(gpointer data, gpointer user_data)
+{
+	struct discovery *d = data;
+	qmi_destroy_func_t destroy = d->destroy;
+
+	destroy(d);
+}
+
 static void __notify_free(gpointer data, gpointer user_data)
 {
 	struct qmi_notify *notify = data;
@@ -313,8 +336,12 @@ static const char *__service_type_to_string(uint8_t type)
 		return "UIM";
 	case QMI_SERVICE_PBM:
 		return "PBM";
+	case QMI_SERVICE_QCHAT:
+		return "QCHAT";
 	case QMI_SERVICE_RMTFS:
 		return "RMTFS";
+	case QMI_SERVICE_TEST:
+		return "TEST";
 	case QMI_SERVICE_LOC:
 		return "LOC";
 	case QMI_SERVICE_SAR:
@@ -326,9 +353,21 @@ static const char *__service_type_to_string(uint8_t type)
 	case QMI_SERVICE_TS:
 		return "TS";
 	case QMI_SERVICE_TMD:
-		return "TMS";
+		return "TMD";
+	case QMI_SERVICE_WDA:
+		return "WDA";
+	case QMI_SERVICE_CSVT:
+		return "CSVT";
+	case QMI_SERVICE_COEX:
+		return "COEX";
 	case QMI_SERVICE_PDC:
 		return "PDC";
+	case QMI_SERVICE_RFRPE:
+		return "RFRPE";
+	case QMI_SERVICE_DSD:
+		return "DSD";
+	case QMI_SERVICE_SSCTL:
+		return "SSCTL";
 	case QMI_SERVICE_CAT_OLD:
 		return "CAT";
 	case QMI_SERVICE_RMS:
@@ -758,7 +797,7 @@ static void handle_packet(struct qmi_device *device,
 
 		tid = GUINT16_FROM_LE(service->transaction);
 
-		if (service->type == 0x04 && tid == 0x0000) {
+		if (service->type == 0x04) {
 			handle_indication(device, hdr->service, hdr->client,
 							message, length, data);
 			return;
@@ -838,6 +877,21 @@ static void read_watch_destroy(gpointer user_data)
 	device->read_watch = 0;
 }
 
+static void __qmi_device_discovery_started(struct qmi_device *device,
+						struct discovery *d)
+{
+	g_queue_push_tail(device->discovery_queue, d);
+}
+
+static void __qmi_device_discovery_complete(struct qmi_device *device,
+						struct discovery *d)
+{
+	if (g_queue_remove(device->discovery_queue, d) != TRUE)
+		return;
+
+	__discovery_free(d, NULL);
+}
+
 static void service_destroy(gpointer data)
 {
 	struct qmi_service *service = data;
@@ -891,6 +945,7 @@ struct qmi_device *qmi_device_new(int fd)
 	device->req_queue = g_queue_new();
 	device->control_queue = g_queue_new();
 	device->service_queue = g_queue_new();
+	device->discovery_queue = g_queue_new();
 
 	device->service_list = g_hash_table_new_full(g_direct_hash,
 					g_direct_equal, NULL, service_destroy);
@@ -927,6 +982,9 @@ void qmi_device_unref(struct qmi_device *device)
 	g_queue_foreach(device->req_queue, __request_free, NULL);
 	g_queue_free(device->req_queue);
 
+	g_queue_foreach(device->discovery_queue, __discovery_free, NULL);
+	g_queue_free(device->discovery_queue);
+
 	if (device->write_watch > 0)
 		g_source_remove(device->write_watch);
 
@@ -936,12 +994,18 @@ void qmi_device_unref(struct qmi_device *device)
 	if (device->close_on_unref)
 		close(device->fd);
 
+	if (device->shutdown_source)
+		g_source_remove(device->shutdown_source);
+
 	g_hash_table_destroy(device->service_list);
 
 	g_free(device->version_str);
 	g_free(device->version_list);
 
-	g_free(device);
+	if (device->shutting_down)
+		device->destroyed = true;
+	else
+		g_free(device);
 }
 
 void qmi_device_set_debug(struct qmi_device *device,
@@ -962,6 +1026,23 @@ void qmi_device_set_close_on_unref(struct qmi_device *device, bool do_close)
 	device->close_on_unref = do_close;
 }
 
+void qmi_result_print_tlvs(struct qmi_result *result)
+{
+	const void *ptr = result->data;
+	uint16_t len = result->length;
+
+	while (len > QMI_TLV_HDR_SIZE) {
+		const struct qmi_tlv_hdr *tlv = ptr;
+		uint16_t tlv_length = GUINT16_FROM_LE(tlv->length);
+
+		DBG("tlv: 0x%02x len 0x%04x", tlv->type, tlv->length);
+
+		ptr += QMI_TLV_HDR_SIZE + tlv_length;
+		len -= QMI_TLV_HDR_SIZE + tlv_length;
+	}
+}
+
+
 static const void *tlv_get(const void *data, uint16_t size,
 					uint8_t type, uint16_t *length)
 {
@@ -987,6 +1068,7 @@ static const void *tlv_get(const void *data, uint16_t size,
 }
 
 struct discover_data {
+	struct discovery super;
 	struct qmi_device *device;
 	qmi_discover_func_t func;
 	void *user_data;
@@ -994,6 +1076,21 @@ struct discover_data {
 	guint timeout;
 };
 
+static void discover_data_free(gpointer user_data)
+{
+	struct discover_data *data = user_data;
+
+	if (data->timeout) {
+		g_source_remove(data->timeout);
+		data->timeout = 0;
+	}
+
+	if (data->destroy)
+		data->destroy(data->user_data);
+
+	g_free(data);
+}
+
 static void discover_callback(uint16_t message, uint16_t length,
 					const void *buffer, void *user_data)
 {
@@ -1007,8 +1104,6 @@ static void discover_callback(uint16_t message, uint16_t length,
 	uint8_t count;
 	unsigned int i;
 
-	g_source_remove(data->timeout);
-
 	count = 0;
 	list = NULL;
 
@@ -1079,10 +1174,7 @@ done:
 	if (data->func)
 		data->func(count, list, data->user_data);
 
-	if (data->destroy)
-		data->destroy(data->user_data);
-
-	g_free(data);
+	__qmi_device_discovery_complete(data->device, &data->super);
 }
 
 static gboolean discover_reply(gpointer user_data)
@@ -1096,10 +1188,7 @@ static gboolean discover_reply(gpointer user_data)
 		data->func(device->version_count,
 				device->version_list, data->user_data);
 
-	if (data->destroy)
-		data->destroy(data->user_data);
-
-	g_free(data);
+	__qmi_device_discovery_complete(data->device, &data->super);
 
 	return FALSE;
 }
@@ -1120,13 +1209,15 @@ bool qmi_device_discover(struct qmi_device *device, qmi_discover_func_t func,
 	if (!data)
 		return false;
 
+	data->super.destroy = discover_data_free;
 	data->device = device;
 	data->func = func;
 	data->user_data = user_data;
 	data->destroy = destroy;
 
 	if (device->version_list) {
-		g_timeout_add_seconds(0, discover_reply, data);
+		data->timeout = g_timeout_add_seconds(0, discover_reply, data);
+		__qmi_device_discovery_started(device, &data->super);
 		return true;
 	}
 
@@ -1147,6 +1238,7 @@ bool qmi_device_discover(struct qmi_device *device, qmi_discover_func_t func,
 	__request_submit(device, req, hdr->transaction);
 
 	data->timeout = g_timeout_add_seconds(5, discover_reply, data);
+	__qmi_device_discovery_started(device, &data->super);
 
 	return true;
 }
@@ -1177,63 +1269,256 @@ static void release_client(struct qmi_device *device,
 	__request_submit(device, req, hdr->transaction);
 }
 
-struct shutdown_data {
-	struct qmi_device *device;
-	qmi_shutdown_func_t func;
-	void *user_data;
-	qmi_destroy_func_t destroy;
-};
-
-static gboolean shutdown_reply(gpointer user_data)
+static void shutdown_destroy(gpointer user_data)
 {
-	struct shutdown_data *data = user_data;
+	struct qmi_device *device = user_data;
 
-	if (data->func)
-		data->func(data->user_data);
+	if (device->shutdown_destroy)
+		device->shutdown_destroy(device->shutdown_user_data);
 
-	g_free(data);
+	device->shutdown_source = 0;
 
-	return FALSE;
+	if (device->destroyed)
+		g_free(device);
 }
 
-static gboolean shutdown_timeout(gpointer user_data)
+static gboolean shutdown_callback(gpointer user_data)
 {
-	struct shutdown_data *data = user_data;
-	struct qmi_device *device = data->device;
+	struct qmi_device *device = user_data;
 
 	if (device->release_users > 0)
 		return TRUE;
 
-	return shutdown_reply(data);
+	device->shutting_down = true;
+
+	if (device->shutdown_func)
+		device->shutdown_func(device->shutdown_user_data);
+
+	device->shutting_down = true;
+
+	return FALSE;
 }
 
 bool qmi_device_shutdown(struct qmi_device *device, qmi_shutdown_func_t func,
 				void *user_data, qmi_destroy_func_t destroy)
 {
-	struct shutdown_data *data;
-
 	if (!device)
 		return false;
 
+	if (device->shutdown_source > 0)
+		return false;
+
 	__debug_device(device, "device %p shutdown", device);
 
-	data = g_try_new0(struct shutdown_data, 1);
-	if (!data)
+	device->shutdown_source = g_timeout_add_seconds_full(G_PRIORITY_DEFAULT,
+						0, shutdown_callback, device,
+						shutdown_destroy);
+	if (device->shutdown_source == 0)
 		return false;
 
-	data->device = device;
-	data->func = func;
-	data->user_data = user_data;
-	data->destroy = destroy;
-
-	if (device->release_users > 0)
-		g_timeout_add_seconds(0, shutdown_timeout, data);
-	else
-		g_timeout_add_seconds(0, shutdown_reply, data);
+	device->shutdown_func = func;
+	device->shutdown_user_data = user_data;
+	device->shutdown_destroy = destroy;
 
 	return true;
 }
 
+static bool get_device_file_name(struct qmi_device *device,
+					char *file_name, int size)
+{
+	pid_t pid;
+	char temp[100];
+	ssize_t result;
+
+	if (size <= 0)
+		return false;
+
+	pid = getpid();
+
+	snprintf(temp, 100, "/proc/%d/fd/%d", (int) pid, device->fd);
+	temp[99] = 0;
+
+	result = readlink(temp, file_name, size - 1);
+
+	if (result == -1 || result >= size - 1) {
+		DBG("Error %d in readlink", errno);
+		return false;
+	}
+
+	file_name[result] = 0;
+
+	return true;
+}
+
+static char *get_first_dir_in_directory(char *dir_path)
+{
+	DIR *dir;
+	struct dirent *dir_entry;
+	char *dir_name = NULL;
+
+	dir = opendir(dir_path);
+
+	if (!dir)
+		return NULL;
+
+	dir_entry = readdir(dir);
+
+	while ((dir_entry != NULL)) {
+		if (dir_entry->d_type == DT_DIR &&
+				strcmp(dir_entry->d_name, ".") != 0 &&
+				strcmp(dir_entry->d_name, "..") != 0) {
+			dir_name = g_strdup(dir_entry->d_name);
+			break;
+		}
+
+		dir_entry = readdir(dir);
+	}
+
+	closedir(dir);
+	return dir_name;
+}
+
+static char *get_device_interface(struct qmi_device *device)
+{
+	char * const driver_names[] = { "usbmisc", "usb" };
+	unsigned int i;
+	char file_path[PATH_MAX];
+	char *file_name;
+	char *interface = NULL;
+
+	if (!get_device_file_name(device, file_path, sizeof(file_path)))
+		return NULL;
+
+	file_name = basename(file_path);
+
+	for (i = 0; i < G_N_ELEMENTS(driver_names) && !interface; i++) {
+		gchar *sysfs_path;
+
+		sysfs_path = g_strdup_printf("/sys/class/%s/%s/device/net/",
+						driver_names[i], file_name);
+		interface = get_first_dir_in_directory(sysfs_path);
+		g_free(sysfs_path);
+	}
+
+	return interface;
+}
+
+enum qmi_device_expected_data_format qmi_device_get_expected_data_format(
+						struct qmi_device *device)
+{
+	char *sysfs_path = NULL;
+	char *interface = NULL;
+	int fd = -1;
+	char value;
+	enum qmi_device_expected_data_format expected =
+					QMI_DEVICE_EXPECTED_DATA_FORMAT_UNKNOWN;
+
+	if (!device)
+		goto done;
+
+	interface = get_device_interface(device);
+
+	if (!interface) {
+		DBG("Error while getting interface name");
+		goto done;
+	}
+
+	/* Build sysfs file path and open it */
+	sysfs_path = g_strdup_printf("/sys/class/net/%s/qmi/raw_ip", interface);
+
+	fd = open(sysfs_path, O_RDONLY);
+	if (fd < 0) {
+		/* maybe not supported by kernel */
+		DBG("Error %d in open(%s)", errno, sysfs_path);
+		goto done;
+	}
+
+	if (read(fd, &value, 1) != 1) {
+		DBG("Error %d in read(%s)", errno, sysfs_path);
+		goto done;
+	}
+
+	if (value == 'Y')
+		expected = QMI_DEVICE_EXPECTED_DATA_FORMAT_RAW_IP;
+	else if (value == 'N')
+		expected = QMI_DEVICE_EXPECTED_DATA_FORMAT_802_3;
+	else
+		DBG("Unexpected sysfs file contents");
+
+done:
+	if (fd >= 0)
+		close(fd);
+
+	if (sysfs_path)
+		g_free(sysfs_path);
+
+	if (interface)
+		g_free(interface);
+
+	return expected;
+}
+
+bool qmi_device_set_expected_data_format(struct qmi_device *device,
+			enum qmi_device_expected_data_format format)
+{
+	bool res = false;
+	char *sysfs_path = NULL;
+	char *interface = NULL;
+	int fd = -1;
+	char value;
+
+	if (!device)
+		goto done;
+
+	switch (format) {
+	case QMI_DEVICE_EXPECTED_DATA_FORMAT_802_3:
+		value = 'N';
+		break;
+	case QMI_DEVICE_EXPECTED_DATA_FORMAT_RAW_IP:
+		value = 'Y';
+		break;
+	default:
+		DBG("Unhandled format: %d", (int) format);
+		goto done;
+	}
+
+	interface = get_device_interface(device);
+
+	if (!interface) {
+		DBG("Error while getting interface name");
+		goto done;
+	}
+
+	/* Build sysfs file path and open it */
+	sysfs_path = g_strdup_printf("/sys/class/net/%s/qmi/raw_ip", interface);
+
+	fd = open(sysfs_path, O_WRONLY);
+	if (fd < 0) {
+		/* maybe not supported by kernel */
+		DBG("Error %d in open(%s)", errno, sysfs_path);
+		goto done;
+	}
+
+	if (write(fd, &value, 1) != 1) {
+		DBG("Error %d in write(%s)", errno, sysfs_path);
+		goto done;
+	}
+
+	res = true;
+
+done:
+	if (fd >= 0)
+		close(fd);
+
+	if (sysfs_path)
+		g_free(sysfs_path);
+
+	if (interface)
+		g_free(interface);
+
+	return res;
+}
+
 struct qmi_param *qmi_param_new(void)
 {
 	struct qmi_param *param;
@@ -1435,6 +1720,27 @@ bool qmi_result_get_uint8(struct qmi_result *result, uint8_t type,
 	return true;
 }
 
+bool qmi_result_get_int16(struct qmi_result *result, uint8_t type,
+							int16_t *value)
+{
+	const unsigned char *ptr;
+	uint16_t len, tmp;
+
+	if (!result || !type)
+		return false;
+
+	ptr = tlv_get(result->data, result->length, type, &len);
+	if (!ptr)
+		return false;
+
+	memcpy(&tmp, ptr, 2);
+
+	if (value)
+		*value = GINT16_FROM_LE(tmp);
+
+	return true;
+}
+
 bool qmi_result_get_uint16(struct qmi_result *result, uint8_t type,
 							uint16_t *value)
 {
@@ -1501,6 +1807,7 @@ bool qmi_result_get_uint64(struct qmi_result *result, uint8_t type,
 }
 
 struct service_create_data {
+	struct discovery super;
 	struct qmi_device *device;
 	bool shared;
 	uint8_t type;
@@ -1512,16 +1819,29 @@ struct service_create_data {
 	guint timeout;
 };
 
-static gboolean service_create_reply(gpointer user_data)
+static void service_create_data_free(gpointer user_data)
 {
 	struct service_create_data *data = user_data;
 
-	data->func(NULL, data->user_data);
+	if (data->timeout) {
+		g_source_remove(data->timeout);
+		data->timeout = 0;
+	}
 
 	if (data->destroy)
 		data->destroy(data->user_data);
 
 	g_free(data);
+}
+
+static gboolean service_create_reply(gpointer user_data)
+{
+	struct service_create_data *data = user_data;
+
+	data->timeout = 0;
+	data->func(NULL, data->user_data);
+
+	__qmi_device_discovery_complete(data->device, &data->super);
 
 	return FALSE;
 }
@@ -1537,8 +1857,6 @@ static void service_create_callback(uint16_t message, uint16_t length,
 	uint16_t len;
 	unsigned int hash_id;
 
-	g_source_remove(data->timeout);
-
 	result_code = tlv_get(buffer, length, 0x02, &len);
 	if (!result_code)
 		goto done;
@@ -1580,13 +1898,9 @@ static void service_create_callback(uint16_t message, uint16_t length,
 
 done:
 	data->func(service, data->user_data);
-
 	qmi_service_unref(service);
 
-	if (data->destroy)
-		data->destroy(data->user_data);
-
-	g_free(data);
+	__qmi_device_discovery_complete(data->device, &data->super);
 }
 
 static void service_create_discover(uint8_t count,
@@ -1617,7 +1931,9 @@ static void service_create_discover(uint8_t count,
 		if (data->timeout > 0)
 			g_source_remove(data->timeout);
 
-		g_timeout_add_seconds(0, service_create_reply, data);
+		data->timeout = g_timeout_add_seconds(0,
+						service_create_reply, data);
+		__qmi_device_discovery_started(device, &data->super);
 		return;
 	}
 
@@ -1640,6 +1956,7 @@ static bool service_create(struct qmi_device *device, bool shared,
 	if (!data)
 		return false;
 
+	data->super.destroy = service_create_data_free;
 	data->device = device;
 	data->shared = shared;
 	data->type = type;
@@ -1662,6 +1979,7 @@ static bool service_create(struct qmi_device *device, bool shared,
 
 done:
 	data->timeout = g_timeout_add_seconds(8, service_create_reply, data);
+	__qmi_device_discovery_started(device, &data->super);
 
 	return true;
 }
@@ -1680,17 +1998,23 @@ bool qmi_service_create(struct qmi_device *device,
 }
 
 struct service_create_shared_data {
+	struct discovery super;
 	struct qmi_service *service;
+	struct qmi_device *device;
 	qmi_create_func_t func;
 	void *user_data;
 	qmi_destroy_func_t destroy;
+	guint timeout;
 };
 
-static gboolean service_create_shared_reply(gpointer user_data)
+static void service_create_shared_data_free(gpointer user_data)
 {
 	struct service_create_shared_data *data = user_data;
 
-	data->func(data->service, data->user_data);
+	if (data->timeout) {
+		g_source_remove(data->timeout);
+		data->timeout = 0;
+	}
 
 	qmi_service_unref(data->service);
 
@@ -1698,6 +2022,16 @@ static gboolean service_create_shared_reply(gpointer user_data)
 		data->destroy(data->user_data);
 
 	g_free(data);
+}
+
+static gboolean service_create_shared_reply(gpointer user_data)
+{
+	struct service_create_shared_data *data = user_data;
+
+	data->timeout = 0;
+	data->func(data->service, data->user_data);
+
+	__qmi_device_discovery_complete(data->device, &data->super);
 
 	return FALSE;
 }
@@ -1724,13 +2058,16 @@ bool qmi_service_create_shared(struct qmi_device *device,
 		if (!data)
 			return false;
 
+		data->super.destroy = service_create_shared_data_free;
 		data->service = qmi_service_ref(service);
-
+		data->device = device;
 		data->func = func;
 		data->user_data = user_data;
 		data->destroy = destroy;
 
-		g_timeout_add(0, service_create_shared_reply, data);
+		data->timeout = g_timeout_add(0,
+					service_create_shared_reply, data);
+		__qmi_device_discovery_started(device, &data->super);
 
 		return 0;
 	}

ofono/drivers/qmimodem/qmi.h

@@ -35,18 +35,32 @@
 #define QMI_SERVICE_CAT		10	/* Card application toolkit service */
 #define QMI_SERVICE_UIM		11	/* UIM service */
 #define QMI_SERVICE_PBM		12	/* Phonebook service */
+#define QMI_SERVICE_QCHAT	13
 #define QMI_SERVICE_RMTFS	14	/* Remote file system service */
+#define QMI_SERVICE_TEST	15
 #define QMI_SERVICE_LOC		16	/* Location service */
 #define QMI_SERVICE_SAR		17	/* Specific absorption rate service */
 #define QMI_SERVICE_CSD		20	/* Core sound driver service */
 #define QMI_SERVICE_EFS		21	/* Embedded file system service */
 #define QMI_SERVICE_TS		23	/* Thermal sensors service */
 #define QMI_SERVICE_TMD		24	/* Thermal mitigation device service */
+#define QMI_SERVICE_WDA		26	/* Wireless data administrative service */
+#define QMI_SERVICE_CSVT	29
+#define QMI_SERVICE_COEX	34
 #define QMI_SERVICE_PDC		36	/* Persistent device configuration service */
+#define QMI_SERVICE_RFRPE	41
+#define QMI_SERVICE_DSD		42
+#define QMI_SERVICE_SSCTL	43
 #define QMI_SERVICE_CAT_OLD	224	/* Card application toolkit service */
 #define QMI_SERVICE_RMS		225	/* Remote management service */
 #define QMI_SERVICE_OMA		226	/* OMA device management service */
 
+enum qmi_device_expected_data_format {
+	QMI_DEVICE_EXPECTED_DATA_FORMAT_UNKNOWN,
+	QMI_DEVICE_EXPECTED_DATA_FORMAT_802_3,
+	QMI_DEVICE_EXPECTED_DATA_FORMAT_RAW_IP,
+};
+
 struct qmi_version {
 	uint8_t type;
 	uint16_t major;
@@ -82,6 +96,10 @@ bool qmi_device_discover(struct qmi_device *device, qmi_discover_func_t func,
 bool qmi_device_shutdown(struct qmi_device *device, qmi_shutdown_func_t func,
 				void *user_data, qmi_destroy_func_t destroy);
 
+enum qmi_device_expected_data_format qmi_device_get_expected_data_format(
+						struct qmi_device *device);
+bool qmi_device_set_expected_data_format(struct qmi_device *device,
+			enum qmi_device_expected_data_format format);
 
 struct qmi_param;
 
@@ -112,13 +130,15 @@ const void *qmi_result_get(struct qmi_result *result, uint8_t type,
 char *qmi_result_get_string(struct qmi_result *result, uint8_t type);
 bool qmi_result_get_uint8(struct qmi_result *result, uint8_t type,
 							uint8_t *value);
+bool qmi_result_get_int16(struct qmi_result *result, uint8_t type,
+							int16_t *value);
 bool qmi_result_get_uint16(struct qmi_result *result, uint8_t type,
 							uint16_t *value);
 bool qmi_result_get_uint32(struct qmi_result *result, uint8_t type,
 							uint32_t *value);
 bool qmi_result_get_uint64(struct qmi_result *result, uint8_t type,
 							uint64_t *value);
-
+void qmi_result_print_tlvs(struct qmi_result *result);
 
 struct qmi_service;
 

ofono/drivers/qmimodem/qmimodem.c

@@ -41,12 +41,14 @@ static int qmimodem_init(void)
 	qmi_gprs_context_init();
 	qmi_radio_settings_init();
 	qmi_location_reporting_init();
+	qmi_netmon_init();
 
 	return 0;
 }
 
 static void qmimodem_exit(void)
 {
+	qmi_netmon_exit();
 	qmi_location_reporting_exit();
 	qmi_radio_settings_exit();
 	qmi_gprs_context_exit();

ofono/drivers/qmimodem/qmimodem.h

@@ -53,3 +53,6 @@ extern void qmi_radio_settings_exit(void);
 
 extern void qmi_location_reporting_init(void);
 extern void qmi_location_reporting_exit(void);
+
+extern void qmi_netmon_init(void);
+extern void qmi_netmon_exit(void);

ofono/drivers/qmimodem/radio-settings.c

@@ -29,15 +29,202 @@
 
 #include "qmi.h"
 #include "nas.h"
+#include "dms.h"
 
 #include "qmimodem.h"
 
 struct settings_data {
 	struct qmi_service *nas;
+	struct qmi_service *dms;
 	uint16_t major;
 	uint16_t minor;
 };
 
+static void get_system_selection_pref_cb(struct qmi_result *result,
+							void* user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb;
+	enum ofono_radio_access_mode mode = OFONO_RADIO_ACCESS_MODE_ANY;
+	uint16_t pref;
+
+	DBG("");
+
+	if (qmi_result_set_error(result, NULL)) {
+		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+		return;
+	}
+
+	qmi_result_get_uint16(result,
+			QMI_NAS_RESULT_SYSTEM_SELECTION_PREF_MODE, &pref);
+
+	switch (pref) {
+	case QMI_NAS_RAT_MODE_PREF_GSM:
+		mode = OFONO_RADIO_ACCESS_MODE_GSM;
+		break;
+	case QMI_NAS_RAT_MODE_PREF_UMTS:
+		mode = OFONO_RADIO_ACCESS_MODE_UMTS;
+		break;
+	case QMI_NAS_RAT_MODE_PREF_LTE:
+		mode = OFONO_RADIO_ACCESS_MODE_LTE;
+		break;
+	}
+
+	CALLBACK_WITH_SUCCESS(cb, mode, cbd->data);
+}
+
+static void qmi_query_rat_mode(struct ofono_radio_settings *rs,
+			ofono_radio_settings_rat_mode_query_cb_t cb,
+			void *user_data)
+{
+	struct settings_data *data = ofono_radio_settings_get_data(rs);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+
+	DBG("");
+
+	if (qmi_service_send(data->nas,
+				QMI_NAS_GET_SYSTEM_SELECTION_PREF, NULL,
+				get_system_selection_pref_cb, cbd, g_free) > 0)
+		return;
+
+	CALLBACK_WITH_FAILURE(cb, -1, data);
+}
+
+static void set_system_selection_pref_cb(struct qmi_result *result,
+							void* user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_radio_settings_rat_mode_set_cb_t cb = cbd->cb;
+
+	DBG("");
+
+	if (qmi_result_set_error(result, NULL)) {
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+		return;
+	}
+
+	CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void qmi_set_rat_mode(struct ofono_radio_settings *rs,
+			enum ofono_radio_access_mode mode,
+			ofono_radio_settings_rat_mode_set_cb_t cb,
+			void *user_data)
+{
+	struct settings_data *data = ofono_radio_settings_get_data(rs);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+	uint16_t pref = QMI_NAS_RAT_MODE_PREF_ANY;
+	struct qmi_param *param;
+
+	DBG("");
+
+	switch (mode) {
+	case OFONO_RADIO_ACCESS_MODE_ANY:
+		pref = QMI_NAS_RAT_MODE_PREF_ANY;
+		break;
+	case OFONO_RADIO_ACCESS_MODE_GSM:
+		pref = QMI_NAS_RAT_MODE_PREF_GSM;
+		break;
+	case OFONO_RADIO_ACCESS_MODE_UMTS:
+		pref = QMI_NAS_RAT_MODE_PREF_UMTS;
+		break;
+	case OFONO_RADIO_ACCESS_MODE_LTE:
+		pref = QMI_NAS_RAT_MODE_PREF_LTE;
+		break;
+	}
+
+	param = qmi_param_new();
+	if (!param) {
+		CALLBACK_WITH_FAILURE(cb, user_data);
+		return;
+	}
+
+	qmi_param_append_uint16(param, QMI_NAS_PARAM_SYSTEM_SELECTION_PREF_MODE,
+			pref);
+
+	if (qmi_service_send(data->nas,
+				QMI_NAS_SET_SYSTEM_SELECTION_PREF, param,
+				set_system_selection_pref_cb, cbd, g_free) > 0)
+		return;
+
+	qmi_param_free(param);
+	CALLBACK_WITH_FAILURE(cb, user_data);
+	g_free(cbd);
+}
+
+static void get_caps_cb(struct qmi_result *result, void *user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_radio_settings_available_rats_query_cb_t cb = cbd->cb;
+	const struct qmi_dms_device_caps *caps;
+	unsigned int available_rats;
+	uint16_t len;
+	uint8_t i;
+
+	DBG("");
+
+	if (qmi_result_set_error(result, NULL))
+		goto error;
+
+	caps = qmi_result_get(result, QMI_DMS_RESULT_DEVICE_CAPS, &len);
+	if (!caps)
+		goto error;
+
+	available_rats = 0;
+	for (i = 0; i < caps->radio_if_count; i++) {
+		switch (caps->radio_if[i]) {
+		case QMI_DMS_RADIO_IF_GSM:
+			available_rats |= OFONO_RADIO_ACCESS_MODE_GSM;
+			break;
+		case QMI_DMS_RADIO_IF_UMTS:
+			available_rats |= OFONO_RADIO_ACCESS_MODE_UMTS;
+			break;
+		case QMI_DMS_RADIO_IF_LTE:
+			available_rats |= OFONO_RADIO_ACCESS_MODE_LTE;
+			break;
+		}
+	}
+
+	CALLBACK_WITH_SUCCESS(cb, available_rats, cbd->data);
+
+	return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+}
+
+static void qmi_query_available_rats(struct ofono_radio_settings *rs,
+			ofono_radio_settings_available_rats_query_cb_t cb,
+			void *data)
+{
+	struct settings_data *rsd = ofono_radio_settings_get_data(rs);
+	struct cb_data *cbd = cb_data_new(cb, data);
+
+	if (!rsd->dms)
+		goto error;
+
+	if (qmi_service_send(rsd->dms, QMI_DMS_GET_CAPS, NULL,
+					get_caps_cb, cbd, g_free) > 0)
+		return;
+
+error:
+	g_free(cbd);
+	CALLBACK_WITH_FAILURE(cb, -1, data);
+}
+
+static void create_dms_cb(struct qmi_service *service, void *user_data)
+{
+	struct ofono_radio_settings *rs = user_data;
+	struct settings_data *data = ofono_radio_settings_get_data(rs);
+
+	DBG("");
+
+	if (!service)
+		return;
+
+	data->dms = qmi_service_ref(service);
+}
+
 static void create_nas_cb(struct qmi_service *service, void *user_data)
 {
 	struct ofono_radio_settings *rs = user_data;
@@ -74,10 +261,12 @@ static int qmi_radio_settings_probe(struct ofono_radio_settings *rs,
 
 	ofono_radio_settings_set_data(rs, data);
 
-	qmi_service_create(device, QMI_SERVICE_NAS, create_nas_cb, rs, NULL);
+	qmi_service_create_shared(device, QMI_SERVICE_DMS,
+						create_dms_cb, rs, NULL);
+	qmi_service_create_shared(device, QMI_SERVICE_NAS,
+						create_nas_cb, rs, NULL);
 
 	return 0;
-
 }
 
 static void qmi_radio_settings_remove(struct ofono_radio_settings *rs)
@@ -99,6 +288,9 @@ static struct ofono_radio_settings_driver driver = {
 	.name		= "qmimodem",
 	.probe		= qmi_radio_settings_probe,
 	.remove		= qmi_radio_settings_remove,
+	.set_rat_mode	= qmi_set_rat_mode,
+	.query_rat_mode = qmi_query_rat_mode,
+	.query_available_rats = qmi_query_available_rats,
 };
 
 void qmi_radio_settings_init(void)

ofono/drivers/qmimodem/sim.c

@@ -30,6 +30,7 @@
 #include <ofono/sim.h>
 
 #include "qmi.h"
+#include "dms.h"
 #include "uim.h"
 
 #include "qmimodem.h"
@@ -38,15 +39,36 @@
 #define EF_STATUS_INVALIDATED 0
 #define EF_STATUS_VALID 1
 
-struct sim_data {
-	struct qmi_service *uim;
-	uint32_t event_mask;
+/* max number of retry of commands that can temporary fail */
+#define MAX_RETRY_COUNT 100
+
+enum get_card_status_result {
+	GET_CARD_STATUS_RESULT_OK, /* No error */
+	GET_CARD_STATUS_RESULT_ERROR, /* Definitive error */
+	GET_CARD_STATUS_RESULT_TEMP_ERROR, /* error, a retry could work */
+};
+
+/* information from QMI_UIM_GET_CARD_STATUS command */
+struct sim_status {
 	uint8_t card_state;
 	uint8_t app_type;
 	uint8_t passwd_state;
 	int retries[OFONO_SIM_PASSWORD_INVALID];
 };
 
+struct sim_data {
+	struct qmi_device *qmi_dev;
+	struct qmi_service *dms;
+	struct qmi_service *uim;
+	uint32_t event_mask;
+	uint8_t app_type;
+	uint32_t retry_count;
+	guint poll_source;
+};
+
+static void qmi_query_passwd_state(struct ofono_sim *sim,
+				ofono_sim_passwd_cb_t cb, void *user_data);
+
 static int create_fileid_data(uint8_t app_type, int fileid,
 					const unsigned char *path,
 					unsigned int path_len,
@@ -146,7 +168,7 @@ static void qmi_read_attributes(struct ofono_sim *sim, int fileid,
 {
 	struct sim_data *data = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, user_data);
-	unsigned char aid_data[2] = { 0x06, 0x00 };
+	unsigned char aid_data[2] = { 0x00, 0x00 };
 	unsigned char fileid_data[9];
 	int fileid_len;
 	struct qmi_param *param;
@@ -211,7 +233,7 @@ static void qmi_read_transparent(struct ofono_sim *sim,
 {
 	struct sim_data *data = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, user_data);
-	unsigned char aid_data[2] = { 0x06, 0x00 };
+	unsigned char aid_data[2] = { 0x00, 0x00 };
 	unsigned char read_data[4];
 	unsigned char fileid_data[9];
 	int fileid_len;
@@ -257,7 +279,7 @@ static void qmi_read_record(struct ofono_sim *sim,
 {
 	struct sim_data *data = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, user_data);
-	unsigned char aid_data[2] = { 0x06, 0x00 };
+	unsigned char aid_data[2] = { 0x00, 0x00 };
 	unsigned char read_data[4];
 	unsigned char fileid_data[9];
 	int fileid_len;
@@ -295,76 +317,214 @@ error:
 	g_free(cbd);
 }
 
-static void qmi_query_passwd_state(struct ofono_sim *sim,
-				ofono_sim_passwd_cb_t cb, void *user_data)
+static void write_generic_cb(struct qmi_result *result, void *user_data)
 {
-	struct sim_data *data = ofono_sim_get_data(sim);
+	struct cb_data *cbd = user_data;
+	ofono_sim_write_cb_t cb = cbd->cb;
+	uint16_t len;
+	const uint8_t *card_result;
+	uint8_t sw1, sw2;
 
-	DBG("passwd state %d", data->passwd_state);
-
-	if (data->passwd_state == OFONO_SIM_PASSWORD_INVALID) {
-		CALLBACK_WITH_FAILURE(cb, -1, user_data);
+	card_result = qmi_result_get(result, 0x10, &len);
+	if (card_result == NULL || len != 2) {
+		DBG("card_result: %p, len: %d", card_result, (int) len);
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
 		return;
 	}
 
-	CALLBACK_WITH_SUCCESS(cb, data->passwd_state, user_data);
-}
+	sw1 = card_result[0];
+	sw2 = card_result[1];
 
-static void qmi_query_pin_retries(struct ofono_sim *sim,
-				ofono_sim_pin_retries_cb_t cb, void *user_data)
-{
-	struct sim_data *data = ofono_sim_get_data(sim);
+	DBG("%02x, %02x", sw1, sw2);
 
-	DBG("passwd state %d", data->passwd_state);
+	if ((sw1 != 0x90 && sw1 != 0x91 && sw1 != 0x92 && sw1 != 0x9f) ||
+			(sw1 == 0x90 && sw2 != 0x00)) {
+		struct ofono_error error;
 
-	if (data->passwd_state == OFONO_SIM_PASSWORD_INVALID) {
-		CALLBACK_WITH_FAILURE(cb, NULL, user_data);
+		ofono_error("%s: error sw1 %02x sw2 %02x", __func__, sw1, sw2);
+
+		error.type = OFONO_ERROR_TYPE_SIM;
+		error.error = (sw1 << 8) | sw2;
+
+		cb(&error, cbd->data);
 		return;
 	}
 
-	CALLBACK_WITH_SUCCESS(cb, data->retries, user_data);
+	CALLBACK_WITH_SUCCESS(cb, cbd->data);
 }
 
-static void card_setup(const struct qmi_uim_slot_info *slot,
+static void write_generic(struct ofono_sim *sim,
+			uint16_t qmi_message, int fileid,
+			int start_or_recordnum,
+			int length, const unsigned char *value,
+			const unsigned char *path, unsigned int path_len,
+			ofono_sim_write_cb_t cb, void *user_data)
+{
+	struct sim_data *data = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+	unsigned char aid_data[2] = { 0x00, 0x00 };
+	unsigned char write_data[4 + length];
+	unsigned char fileid_data[9];
+	int fileid_len;
+	struct qmi_param *param;
+
+	DBG("file id 0x%04x path len %d", fileid, path_len);
+
+	fileid_len = create_fileid_data(data->app_type, fileid,
+			path, path_len, fileid_data);
+
+	if (fileid_len < 0)
+		goto error;
+
+	write_data[0] = start_or_recordnum & 0xff;
+	write_data[1] = (start_or_recordnum & 0xff00) >> 8;
+	write_data[2] = length & 0xff;
+	write_data[3] = (length & 0xff00) >> 8;
+	memcpy(&write_data[4], value, length);
+
+	param = qmi_param_new();
+	if (!param)
+		goto error;
+
+	qmi_param_append(param, 0x01, sizeof(aid_data), aid_data);
+	qmi_param_append(param, 0x02, fileid_len, fileid_data);
+	qmi_param_append(param, 0x03, 4 + length, write_data);
+
+	if (qmi_service_send(data->uim, qmi_message, param,
+					write_generic_cb, cbd, g_free) > 0)
+		return;
+
+	qmi_param_free(param);
+
+error:
+	CALLBACK_WITH_FAILURE(cb, user_data);
+
+	g_free(cbd);
+}
+
+static void qmi_write_transparent(struct ofono_sim *sim,
+				int fileid, int start, int length,
+				const unsigned char *value,
+				const unsigned char *path,
+				unsigned int path_len,
+				ofono_sim_write_cb_t cb, void *user_data)
+{
+	write_generic(sim, QMI_UIM_WRITE_TRANSPARENT, fileid, start,
+				length, value, path, path_len, cb, user_data);
+}
+
+static void qmi_write_linear(struct ofono_sim *sim,
+				int fileid, int record, int length,
+				const unsigned char *value,
+				const unsigned char *path,
+				unsigned int path_len,
+				ofono_sim_write_cb_t cb, void *user_data)
+{
+	write_generic(sim, QMI_UIM_WRITE_RECORD, fileid, record,
+				length, value, path, path_len, cb, user_data);
+}
+
+static void qmi_write_cyclic(struct ofono_sim *sim,
+				int fileid, int length,
+				const unsigned char *value,
+				const unsigned char *path,
+				unsigned int path_len,
+				ofono_sim_write_cb_t cb, void *user_data)
+{
+	write_generic(sim, QMI_UIM_WRITE_RECORD, fileid, 0,
+				length, value, path, path_len, cb, user_data);
+}
+
+static void get_imsi_cb(struct qmi_result *result, void *user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_imsi_cb_t cb = cbd->cb;
+	char *str;
+
+	DBG("");
+
+	if (qmi_result_set_error(result, NULL)) {
+		CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+		return;
+	}
+
+	str = qmi_result_get_string(result, QMI_DMS_RESULT_IMSI);
+	if (!str) {
+		CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+		return;
+	}
+
+	CALLBACK_WITH_SUCCESS(cb, str, cbd->data);
+
+	qmi_free(str);
+}
+
+static void qmi_read_imsi(struct ofono_sim *sim,
+				ofono_sim_imsi_cb_t cb, void *user_data)
+{
+	struct sim_data *data = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+
+	DBG("");
+
+	if (qmi_service_send(data->dms, QMI_DMS_GET_IMSI, NULL,
+					get_imsi_cb, cbd, g_free) > 0)
+		return;
+
+	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+
+	g_free(cbd);
+}
+
+/* Return true if a retry could give another (better) result */
+static bool get_card_status(const struct qmi_uim_slot_info *slot,
 					const struct qmi_uim_app_info1 *info1,
 					const struct qmi_uim_app_info2 *info2,
-							struct sim_data *data)
+					struct sim_status *sim_stat)
 {
-	data->card_state = slot->card_state;
-	data->app_type = info1->app_type;
+	bool need_retry = false;
+	sim_stat->card_state = slot->card_state;
+	sim_stat->app_type = info1->app_type;
 
 	switch (info1->app_state) {
 	case 0x02:	/* PIN1 or UPIN is required */
-		data->passwd_state = OFONO_SIM_PASSWORD_SIM_PIN;
+		sim_stat->passwd_state = OFONO_SIM_PASSWORD_SIM_PIN;
 		break;
 	case 0x03:	/* PUK1 or PUK for UPIN is required */
-		data->passwd_state = OFONO_SIM_PASSWORD_SIM_PUK;
+		sim_stat->passwd_state = OFONO_SIM_PASSWORD_SIM_PUK;
+		break;
+	case 0x04:	/* Personalization state must be checked. */
+		/* This is temporary, we could retry and get another result */
+		sim_stat->passwd_state = OFONO_SIM_PASSWORD_INVALID;
+		need_retry = true;
 		break;
 	case 0x07:	/* Ready */
-		data->passwd_state = OFONO_SIM_PASSWORD_NONE;
+		sim_stat->passwd_state = OFONO_SIM_PASSWORD_NONE;
 		break;
 	default:
-		data->passwd_state = OFONO_SIM_PASSWORD_INVALID;
+		DBG("info1->app_state:0x%x: OFONO_SIM_PASSWORD_INVALID",
+			info1->app_state);
+		sim_stat->passwd_state = OFONO_SIM_PASSWORD_INVALID;
 		break;
 	}
 
-	data->retries[OFONO_SIM_PASSWORD_SIM_PIN] = info2->pin1_retries;
-	data->retries[OFONO_SIM_PASSWORD_SIM_PUK] = info2->puk1_retries;
+	sim_stat->retries[OFONO_SIM_PASSWORD_SIM_PIN] = info2->pin1_retries;
+	sim_stat->retries[OFONO_SIM_PASSWORD_SIM_PUK] = info2->puk1_retries;
 
-	data->retries[OFONO_SIM_PASSWORD_SIM_PIN2] = info2->pin2_retries;
-	data->retries[OFONO_SIM_PASSWORD_SIM_PUK2] = info2->puk2_retries;
+	sim_stat->retries[OFONO_SIM_PASSWORD_SIM_PIN2] = info2->pin2_retries;
+	sim_stat->retries[OFONO_SIM_PASSWORD_SIM_PUK2] = info2->puk2_retries;
+
+	return need_retry;
 }
 
-static void get_card_status_cb(struct qmi_result *result, void *user_data)
+static enum get_card_status_result handle_get_card_status_result(
+		struct qmi_result *result, struct sim_status *sim_stat)
 {
-	struct ofono_sim *sim = user_data;
-	struct sim_data *data = ofono_sim_get_data(sim);
 	const void *ptr;
 	const struct qmi_uim_card_status *status;
 	uint16_t len, offset;
 	uint8_t i;
-
-	DBG("");
+	enum get_card_status_result res = GET_CARD_STATUS_RESULT_ERROR;
 
 	if (qmi_result_set_error(result, NULL))
 		goto done;
@@ -397,15 +557,211 @@ static void get_card_status_cb(struct qmi_result *result, void *user_data)
 
 			index = GUINT16_FROM_LE(status->index_gw_pri);
 
-			if ((index & 0xff) == i && (index >> 8) == n)
-				card_setup(slot, info1, info2, data);
+			if ((index & 0xff) == i && (index >> 8) == n) {
+				if (get_card_status(slot, info1, info2,
+								sim_stat))
+					res = GET_CARD_STATUS_RESULT_TEMP_ERROR;
+				else
+					res = GET_CARD_STATUS_RESULT_OK;
+			}
 		}
 	}
 
 done:
+	return res;
+}
+
+static gboolean query_passwd_state_retry(gpointer userdata)
+{
+	struct cb_data *cbd = userdata;
+	ofono_sim_passwd_cb_t cb = cbd->cb;
+	struct ofono_sim *sim = cbd->user;
+	struct sim_data *data = ofono_sim_get_data(sim);
+
+	data->poll_source = 0;
+
+	qmi_query_passwd_state(sim, cb, cbd->data);
+
+	return FALSE;
+}
+
+static void query_passwd_state_cb(struct qmi_result *result,
+					void *user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_passwd_cb_t cb = cbd->cb;
+	struct ofono_sim *sim = cbd->user;
+	struct sim_data *data = ofono_sim_get_data(sim);
+	struct sim_status sim_stat;
+	enum get_card_status_result res;
+	struct cb_data *retry_cbd;
+
+	res = handle_get_card_status_result(result, &sim_stat);
+	switch (res) {
+	case GET_CARD_STATUS_RESULT_OK:
+		DBG("passwd state %d", sim_stat.passwd_state);
+		data->retry_count = 0;
+		CALLBACK_WITH_SUCCESS(cb, sim_stat.passwd_state, cbd->data);
+		break;
+	case GET_CARD_STATUS_RESULT_TEMP_ERROR:
+		data->retry_count++;
+		if (data->retry_count > MAX_RETRY_COUNT) {
+			DBG("Failed after %d attempts", data->retry_count);
+			data->retry_count = 0;
+			CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+		} else {
+			DBG("Retry command");
+			retry_cbd = cb_data_new(cb, cbd->data);
+			retry_cbd->user = sim;
+			data->poll_source = g_timeout_add(20,
+						query_passwd_state_retry,
+						retry_cbd);
+		}
+		break;
+	case GET_CARD_STATUS_RESULT_ERROR:
+		DBG("Command failed");
+		data->retry_count = 0;
+		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+		break;
+	}
+}
+
+static void qmi_query_passwd_state(struct ofono_sim *sim,
+				ofono_sim_passwd_cb_t cb, void *user_data)
+{
+	struct sim_data *data = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+
+	DBG("");
+
+	cbd->user = sim;
+
+	if (qmi_service_send(data->uim, QMI_UIM_GET_CARD_STATUS, NULL,
+					query_passwd_state_cb, cbd, g_free) > 0)
+		return;
+
+	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+
+	g_free(cbd);
+}
+
+static void query_pin_retries_cb(struct qmi_result *result, void *user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_pin_retries_cb_t cb = cbd->cb;
+	struct sim_status sim_stat;
+
+	DBG("");
+
+	if (handle_get_card_status_result(result, &sim_stat) !=
+					GET_CARD_STATUS_RESULT_OK) {
+		CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+		return;
+	}
+
+	CALLBACK_WITH_SUCCESS(cb, sim_stat.retries, cbd->data);
+}
+
+static void qmi_query_pin_retries(struct ofono_sim *sim,
+				ofono_sim_pin_retries_cb_t cb, void *user_data)
+{
+	struct sim_data *data = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+
+	DBG("");
+
+	if (qmi_service_send(data->uim, QMI_UIM_GET_CARD_STATUS, NULL,
+					query_pin_retries_cb, cbd, g_free) > 0)
+		return;
+
+	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+
+	g_free(cbd);
+}
+
+static void pin_send_cb(struct qmi_result *result, void *user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_lock_unlock_cb_t cb = cbd->cb;
+
+	DBG("");
+
+	if (qmi_result_set_error(result, NULL)) {
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+		return;
+	}
+
+	CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void qmi_pin_send(struct ofono_sim *sim, const char *passwd,
+			ofono_sim_lock_unlock_cb_t cb, void *user_data)
+{
+	struct sim_data *data = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+	int passwd_len;
+	struct qmi_param *param;
+	struct qmi_uim_param_message_info *info_data;
+	unsigned char session_info_data[2];
+
+	DBG("");
+
+	if (!passwd)
+		goto error;
+
+	passwd_len = strlen(passwd);
+
+	if (passwd_len <= 0 || passwd_len > 0xFF)
+		goto error;
+
+	param = qmi_param_new();
+	if (!param)
+		goto error;
+
+	/* param info */
+	info_data = alloca(2 + passwd_len);
+	info_data->pin_id = 0x01; /* PIN 1 */
+	info_data->length = (uint8_t) passwd_len;
+	memcpy(info_data->pin_value, passwd, passwd_len);
+	qmi_param_append(param, QMI_UIM_PARAM_MESSAGE_INFO, 2 + passwd_len,
+					info_data);
+	/* param Session Information */
+	session_info_data[0] = 0x6;
+	session_info_data[1] = 0x0;
+	qmi_param_append(param, QMI_UIM_PARAM_MESSAGE_SESSION_INFO, 2,
+					session_info_data);
+
+	if (qmi_service_send(data->uim, QMI_UIM_VERIFY_PIN, param,
+					pin_send_cb, cbd, g_free) > 0)
+		return;
+
+	qmi_param_free(param);
+
+error:
+	CALLBACK_WITH_FAILURE(cb, cbd->data);
+
+	g_free(cbd);
+}
+
+static void get_card_status_cb(struct qmi_result *result, void *user_data)
+{
+	struct ofono_sim *sim = user_data;
+	struct sim_data *data = ofono_sim_get_data(sim);
+	struct sim_status sim_stat;
+
+	DBG("");
+
+	if (handle_get_card_status_result(result, &sim_stat) !=
+					GET_CARD_STATUS_RESULT_OK) {
+		data->app_type = 0;	/* Unknown */
+		sim_stat.card_state = 0x00;	/* Absent */
+	} else {
+		data->app_type = sim_stat.app_type;
+	}
+
 	ofono_sim_register(sim);
 
-	switch (data->card_state) {
+	switch (sim_stat.card_state) {
 	case 0x00:	/* Absent */
 	case 0x02:	/* Error */
 		break;
@@ -465,30 +821,44 @@ static void create_uim_cb(struct qmi_service *service, void *user_data)
 		return;
 
 error:
-	qmi_service_unref(data->uim);
-
 	ofono_sim_remove(sim);
 }
 
+static void create_dms_cb(struct qmi_service *service, void *user_data)
+{
+	struct ofono_sim *sim = user_data;
+	struct sim_data *data = ofono_sim_get_data(sim);
+
+	DBG("");
+
+	if (!service) {
+		ofono_error("Failed to request DMS service");
+		ofono_sim_remove(sim);
+		return;
+	}
+
+	data->dms = qmi_service_ref(service);
+
+	qmi_service_create(data->qmi_dev, QMI_SERVICE_UIM, create_uim_cb, sim,
+					NULL);
+}
+
 static int qmi_sim_probe(struct ofono_sim *sim,
 				unsigned int vendor, void *user_data)
 {
 	struct qmi_device *device = user_data;
 	struct sim_data *data;
-	int i;
 
 	DBG("");
 
 	data = g_new0(struct sim_data, 1);
 
-	data->passwd_state = OFONO_SIM_PASSWORD_INVALID;
-
-	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
-		data->retries[i] = -1;
+	data->qmi_dev = device;
 
 	ofono_sim_set_data(sim, data);
 
-	qmi_service_create(device, QMI_SERVICE_UIM, create_uim_cb, sim, NULL);
+	qmi_service_create_shared(device, QMI_SERVICE_DMS,
+						create_dms_cb, sim, NULL);
 
 	return 0;
 }
@@ -501,9 +871,18 @@ static void qmi_sim_remove(struct ofono_sim *sim)
 
 	ofono_sim_set_data(sim, NULL);
 
-	qmi_service_unregister_all(data->uim);
+	if (data->poll_source > 0)
+		g_source_remove(data->poll_source);
 
-	qmi_service_unref(data->uim);
+	if (data->uim) {
+		qmi_service_unregister_all(data->uim);
+		qmi_service_unref(data->uim);
+		data->uim = NULL;
+	}
+	if (data->dms) {
+		qmi_service_unregister_all(data->dms);
+		qmi_service_unref(data->dms);
+	}
 
 	g_free(data);
 }
@@ -516,8 +895,13 @@ static struct ofono_sim_driver driver = {
 	.read_file_transparent	= qmi_read_transparent,
 	.read_file_linear	= qmi_read_record,
 	.read_file_cyclic	= qmi_read_record,
+	.write_file_transparent = qmi_write_transparent,
+	.write_file_linear	= qmi_write_linear,
+	.write_file_cyclic	= qmi_write_cyclic,
+	.read_imsi		= qmi_read_imsi,
 	.query_passwd_state	= qmi_query_passwd_state,
 	.query_pin_retries	= qmi_query_pin_retries,
+	.send_passwd		= qmi_pin_send,
 };
 
 void qmi_sim_init(void)

ofono/drivers/qmimodem/sms.c

@@ -277,7 +277,7 @@ static void qmi_bearer_query(struct ofono_sms *sms,
 
 	DBG("");
 
-	if (data->major < 1 && data->minor < 2)
+	if (data->major < 1 || (data->major == 1 && data->minor < 2))
 		goto error;
 
 	if (qmi_service_send(data->wms, QMI_WMS_GET_DOMAIN_PREF, NULL,
@@ -315,7 +315,7 @@ static void qmi_bearer_set(struct ofono_sms *sms, int bearer,
 
 	DBG("bearer %d", bearer);
 
-	if (data->major < 1 && data->minor < 2)
+	if (data->major < 1 || (data->major == 1 && data->minor < 2))
 		goto error;
 
 	domain = bearer_to_domain(bearer);
@@ -411,7 +411,7 @@ static void get_routes_cb(struct qmi_result *result, void *user_data)
 	new_list->count = GUINT16_TO_LE(1);
 	new_list->route[0].msg_type = QMI_WMS_MSG_TYPE_P2P;
 	new_list->route[0].msg_class = QMI_WMS_MSG_CLASS_NONE;
-	new_list->route[0].storage_type = QMI_WMS_STORAGE_TYPE_NV;
+	new_list->route[0].storage_type = QMI_WMS_STORAGE_TYPE_NONE;
 	new_list->route[0].action = QMI_WMS_ACTION_TRANSFER_AND_ACK;
 
 	param = qmi_param_new();

ofono/drivers/qmimodem/uim.h

@@ -25,6 +25,8 @@
 #define QMI_UIM_WRITE_RECORD		35	/* Write a record */
 #define QMI_UIM_GET_FILE_ATTRIBUTES	36	/* Get file attributes */
 
+#define QMI_UIM_VERIFY_PIN		38	/* Verify PIN */
+
 #define QMI_UIM_EVENT_REGISTRATION	46	/* Register for indications */
 #define QMI_UIM_GET_CARD_STATUS		47	/* Get card status */
 
@@ -91,3 +93,12 @@ struct qmi_uim_file_attributes {
 	uint16_t raw_len;
 	uint8_t raw_value[0];
 } __attribute__((__packed__));
+
+/* Verify PIN parameter */
+#define QMI_UIM_PARAM_MESSAGE_SESSION_INFO	0x01
+#define QMI_UIM_PARAM_MESSAGE_INFO	0x02
+struct qmi_uim_param_message_info {
+	uint8_t pin_id;
+	uint8_t length;
+	uint8_t pin_value[0];
+} __attribute__((__packed__));

ofono/drivers/qmimodem/wda.h

@@ -0,0 +1,25 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2017  Kerlink SA. 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.
+ *
+ */
+
+#define QMI_WDA_SET_DATA_FORMAT	32	/* Set data format */
+#define QMI_WDA_GET_DATA_FORMAT	33	/* Get data format */
+
+/* Get and set data format interface */
+#define QMI_WDA_LL_PROTOCOL	0x11	/* uint32_t */
+#define QMI_WDA_DATA_LINK_PROTOCOL_UNKNOWN	0
+#define QMI_WDA_DATA_LINK_PROTOCOL_802_3	1
+#define QMI_WDA_DATA_LINK_PROTOCOL_RAW_IP	2

ofono/drivers/qmimodem/wds.h

@@ -30,6 +30,13 @@
 /* Start WDS network interface */
 #define QMI_WDS_PARAM_APN			0x14	/* string */
 #define QMI_WDS_PARAM_IP_FAMILY			0x19	/* uint8 */
+#define QMI_WDS_PARAM_USERNAME			0x17	/* string */
+#define QMI_WDS_PARAM_PASSWORD			0x18	/* string */
+#define QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE	0x16	/* uint8 */
+
+#define QMI_WDS_AUTHENTICATION_NONE		0x0
+#define QMI_WDS_AUTHENTICATION_PAP		0x1
+#define QMI_WDS_AUTHENTICATION_CHAP		0x2
 
 #define QMI_WDS_RESULT_PKT_HANDLE		0x01	/* uint32 */
 
@@ -51,10 +58,12 @@ struct qmi_wds_notify_conn_status {
 
 /* Get the runtime data session settings */
 #define QMI_WDS_RESULT_PDP_TYPE			0x11	/* uint8 */
+#define QMI_WDS_RESULT_APN			0x14	/* string */
 #define QMI_WDS_RESULT_PRIMARY_DNS		0x15	/* uint32 IPv4 */
 #define QMI_WDS_RESULT_SECONDARY_DNS		0x16	/* uint32 IPv4 */
 #define QMI_WDS_RESULT_IP_ADDRESS		0x1e	/* uint32 IPv4 */
 #define QMI_WDS_RESULT_GATEWAY			0x20	/* uint32 IPv4 */
+#define QMI_WDS_RESULT_GATEWAY_NETMASK		0x21	/* uint32 IPv4 */
 #define QMI_WDS_RESULT_IP_FAMILY		0x2b	/* uint8 */
 
 #define QMI_WDS_PDP_TYPE_IPV4			0x00

ofono/drivers/qmimodem/wms.h

@@ -62,6 +62,7 @@ struct qmi_wms_param_message {
 #define QMI_WMS_STORAGE_TYPE_UIM		0
 #define QMI_WMS_STORAGE_TYPE_NV			1
 #define QMI_WMS_STORAGE_TYPE_UNKNOWN		2
+#define QMI_WMS_STORAGE_TYPE_NONE		255
 
 #define QMI_WMS_MESSAGE_MODE_GSMWCDMA		1
 

ofono/drivers/ril/ril_call_barring.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -14,6 +14,7 @@
  */
 
 #include "ril_plugin.h"
+#include "ril_sim_card.h"
 #include "ril_util.h"
 #include "ril_log.h"
 
@@ -26,11 +27,11 @@
  * ril.h does not state that string count must be given, but that is
  * still expected by the modem
  */
-#define RIL_QUERY_STRING_COUNT 4
 #define RIL_SET_STRING_COUNT 5
 #define RIL_SET_PW_STRING_COUNT 3
 
 struct ril_call_barring {
+	struct ril_sim_card *card;
 	GRilIoQueue *q;
 	guint timer_id;
 };
@@ -106,7 +107,7 @@ static void ril_call_barring_query(struct ofono_call_barring *b,
 {
 	struct ril_call_barring *bd = ofono_call_barring_get_data(b);
 	char cls_textual[RIL_MAX_SERVICE_LENGTH];
-	GRilIoRequest *req = grilio_request_new();
+	GRilIoRequest *req;
 
 	DBG("lock: %s, services to query: %d", lock, cls);
 
@@ -123,15 +124,9 @@ static void ril_call_barring_query(struct ofono_call_barring *b,
 
 	/*
 	 * See 3GPP 27.007 7.4 for parameter descriptions.
-	 * According to ril.h password should be empty string "" when not
-	 * needed, but in reality we only need to give string length as 0
 	 */
-	grilio_request_append_int32(req, RIL_QUERY_STRING_COUNT);
-	grilio_request_append_utf8(req, lock);    /* Facility code */
-	grilio_request_append_int32(req, 0);      /* Password length */
-	grilio_request_append_utf8(req, cls_textual);
-	grilio_request_append_utf8(req, NULL);    /* AID (not yet supported) */
-
+	req = grilio_request_array_utf8_new(4, lock, "", cls_textual,
+					ril_sim_card_app_aid(bd->card));
 	ril_call_barring_submit_request(bd, req,
 				RIL_REQUEST_QUERY_FACILITY_LOCK,
 				ril_call_barring_query_cb, cb, data);
@@ -182,7 +177,7 @@ static void ril_call_barring_set(struct ofono_call_barring *b,
 					RIL_FACILITY_UNLOCK);
 	grilio_request_append_utf8(req, passwd);
 	grilio_request_append_utf8(req, cls_textual);
-	grilio_request_append_utf8(req, NULL);  /* AID (not yet supported) */
+	grilio_request_append_utf8(req, ril_sim_card_app_aid(bd->card));
 
 	ril_call_barring_submit_request(bd, req,
 				RIL_REQUEST_SET_FACILITY_LOCK,
@@ -243,6 +238,7 @@ static int ril_call_barring_probe(struct ofono_call_barring *b,
 	struct ril_call_barring *bd = g_new0(struct ril_call_barring, 1);
 
 	DBG("");
+	bd->card = ril_sim_card_ref(modem->sim_card);
 	bd->q = grilio_queue_new(ril_modem_io(modem));
 	bd->timer_id = g_idle_add(ril_call_barring_register, b);
 	ofono_call_barring_set_data(b, bd);
@@ -260,6 +256,7 @@ static void ril_call_barring_remove(struct ofono_call_barring *b)
 		g_source_remove(bd->timer_id);
 	}
 
+	ril_sim_card_unref(bd->card);
 	grilio_queue_cancel_all(bd->q, FALSE);
 	grilio_queue_unref(bd->q);
 	g_free(bd);

ofono/drivers/ril/ril_cell_info.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2016-2017 Jolla Ltd.
+ *  Copyright (C) 2016-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -23,10 +23,12 @@
 #include <grilio_request.h>
 #include <grilio_parser.h>
 
+#include <gutil_idlepool.h>
 #include <gutil_misc.h>
 
 #define DISPLAY_ON_UPDATE_RATE  (1000)  /* 1 sec */
 #define DISPLAY_OFF_UPDATE_RATE (60000) /* 1 min */
+#define MAX_RETRIES             (5)
 
 typedef GObjectClass RilCellInfoClass;
 typedef struct ril_cell_info RilCellInfo;
@@ -74,6 +76,20 @@ static void ril_cell_free1(gpointer cell)
 	ril_cell_free(cell);
 }
 
+static const char *ril_cell_info_int_format(int value, const char *format)
+{
+	if (value == SAILFISH_CELL_INVALID_VALUE) {
+		return "";
+	} else {
+		static GUtilIdlePool *ril_cell_info_pool = NULL;
+		GUtilIdlePool *pool = gutil_idle_pool_get(&ril_cell_info_pool);
+		char *str = g_strdup_printf(format, value);
+
+		gutil_idle_pool_add(pool, str, g_free);
+		return str;
+	}
+}
+
 static gboolean ril_cell_info_list_identical(GSList *l1, GSList *l2)
 {
 	while (l1 && l2) {
@@ -105,10 +121,10 @@ static struct sailfish_cell *ril_cell_info_parse_cell_gsm(GRilIoParser *rilp,
 	struct sailfish_cell_info_gsm *gsm = &cell->info.gsm;
 
 	/* Optional RIL_CellIdentityGsm_v12 part */
-	gsm->arfcn = INT_MAX;
-	gsm->bsic = INT_MAX;
+	gsm->arfcn = SAILFISH_CELL_INVALID_VALUE;
+	gsm->bsic = SAILFISH_CELL_INVALID_VALUE;
 	/* Optional RIL_GSM_SignalStrength_v12 part */
-	gsm->timingAdvance = INT_MAX;
+	gsm->timingAdvance = SAILFISH_CELL_INVALID_VALUE;
 	/* RIL_CellIdentityGsm */
 	if (grilio_parser_get_int32(rilp, &gsm->mcc) &&
 		grilio_parser_get_int32(rilp, &gsm->mnc) &&
@@ -122,11 +138,17 @@ static struct sailfish_cell *ril_cell_info_parse_cell_gsm(GRilIoParser *rilp,
 		grilio_parser_get_int32(rilp, &gsm->bitErrorRate) &&
 		(version < 12 || /* RIL_GSM_SignalStrength_v12 part */
 			grilio_parser_get_int32(rilp, &gsm->timingAdvance))) {
-		DBG("[gsm] reg=%d,mcc=%d,mnc=%d,lac=%d,cid=%d,arfcn=%d,"
-			"bsic=%d,strength=%d,err=%d,t=%d", registered,
-			gsm->mcc, gsm->mnc, gsm->lac, gsm->cid, gsm->arfcn,
-			gsm->bsic, gsm->signalStrength, gsm->bitErrorRate,
-			gsm->timingAdvance);
+		DBG("[gsm] reg=%d%s%s%s%s%s%s%s%s%s", registered,
+			ril_cell_info_int_format(gsm->mcc, ",mcc=%d"),
+			ril_cell_info_int_format(gsm->mnc, ",mnc=%d"),
+			ril_cell_info_int_format(gsm->lac, ",lac=%d"),
+			ril_cell_info_int_format(gsm->cid, ",cid=%d"),
+			ril_cell_info_int_format(gsm->arfcn, ",arfcn=%d"),
+			ril_cell_info_int_format(gsm->bsic, ",bsic=%d"),
+			ril_cell_info_int_format(gsm->signalStrength,
+							",strength=%d"),
+			ril_cell_info_int_format(gsm->bitErrorRate, ",err=%d"),
+			ril_cell_info_int_format(gsm->timingAdvance, ",t=%d"));
 		cell->type = SAILFISH_CELL_TYPE_GSM;
 		cell->registered = registered;
 		return cell;
@@ -144,7 +166,7 @@ static struct sailfish_cell *ril_cell_info_parse_cell_wcdma(GRilIoParser *rilp,
 	struct sailfish_cell_info_wcdma *wcdma = &cell->info.wcdma;
 
 	/* Optional RIL_CellIdentityWcdma_v12 part */
-	wcdma->uarfcn = INT_MAX;
+	wcdma->uarfcn = SAILFISH_CELL_INVALID_VALUE;
 	if (grilio_parser_get_int32(rilp, &wcdma->mcc) &&
 		grilio_parser_get_int32(rilp, &wcdma->mnc) &&
 		grilio_parser_get_int32(rilp, &wcdma->lac) &&
@@ -154,10 +176,16 @@ static struct sailfish_cell *ril_cell_info_parse_cell_wcdma(GRilIoParser *rilp,
 			grilio_parser_get_int32(rilp, &wcdma->uarfcn)) &&
 		grilio_parser_get_int32(rilp, &wcdma->signalStrength) &&
 		grilio_parser_get_int32(rilp, &wcdma->bitErrorRate)) {
-		DBG("[wcdma] reg=%d,mcc=%d,mnc=%d,lac=%d,cid=%d,psc=%d,"
-			"strength=%d,err=%d", registered, wcdma->mcc,
-			wcdma->mnc, wcdma->lac, wcdma->cid, wcdma->psc,
-			wcdma->signalStrength, wcdma->bitErrorRate);
+		DBG("[wcdma] reg=%d%s%s%s%s%s%s%s", registered,
+			ril_cell_info_int_format(wcdma->mcc, ",mcc=%d"),
+			ril_cell_info_int_format(wcdma->mnc, ",mnc=%d"),
+			ril_cell_info_int_format(wcdma->lac, ",lac=%d"),
+			ril_cell_info_int_format(wcdma->cid, ",cid=%d"),
+			ril_cell_info_int_format(wcdma->psc, ",psc=%d"),
+			ril_cell_info_int_format(wcdma->signalStrength,
+							",strength=%d"),
+			ril_cell_info_int_format(wcdma->bitErrorRate,
+							",err=%d"));
 		cell->type = SAILFISH_CELL_TYPE_WCDMA;
 		cell->registered = registered;
 		return cell;
@@ -175,7 +203,7 @@ static struct sailfish_cell *ril_cell_info_parse_cell_lte(GRilIoParser *rilp,
 	struct sailfish_cell_info_lte *lte = &cell->info.lte;
 
 	/* Optional RIL_CellIdentityLte_v12 part */
-	lte->earfcn = INT_MAX;
+	lte->earfcn = SAILFISH_CELL_INVALID_VALUE;
 	if (grilio_parser_get_int32(rilp, &lte->mcc) &&
 		grilio_parser_get_int32(rilp, &lte->mnc) &&
 		grilio_parser_get_int32(rilp, &lte->ci) &&
@@ -189,11 +217,19 @@ static struct sailfish_cell *ril_cell_info_parse_cell_lte(GRilIoParser *rilp,
 		grilio_parser_get_int32(rilp, &lte->rssnr) &&
 		grilio_parser_get_int32(rilp, &lte->cqi) &&
 		grilio_parser_get_int32(rilp, &lte->timingAdvance)) {
-		DBG("[lte] reg=%d,mcc=%d,mnc=%d,ci=%d,pci=%d,tac=%d,"
-			"strength=%d,rsrp=%d,rsrq=%d,rssnr=%d,cqi=%d,"
-			"t=0x%x", registered, lte->mcc, lte->mnc, lte->ci,
-			lte->pci, lte->tac, lte->signalStrength, lte->rsrp,
-			lte->rsrq, lte->rssnr, lte->cqi, lte->timingAdvance);
+		DBG("[lte] reg=%d%s%s%s%s%s%s%s%s%s%s%s", registered,
+			ril_cell_info_int_format(lte->mcc, ",mcc=%d"),
+			ril_cell_info_int_format(lte->mnc, ",mnc=%d"),
+			ril_cell_info_int_format(lte->ci, ",ci=%d"),
+			ril_cell_info_int_format(lte->pci, ",pci=%d"),
+			ril_cell_info_int_format(lte->tac, ",tac=%d"),
+			ril_cell_info_int_format(lte->signalStrength,
+							",strength=%d"),
+			ril_cell_info_int_format(lte->rsrp, ",rsrp=%d"),
+			ril_cell_info_int_format(lte->rsrq, ",rsrq=%d"),
+			ril_cell_info_int_format(lte->rssnr, ",rssnr=%d"),
+			ril_cell_info_int_format(lte->cqi, ",cqi=%d"),
+			ril_cell_info_int_format(lte->timingAdvance, ",t=%d"));
 		cell->type = SAILFISH_CELL_TYPE_LTE;
 		cell->registered = registered;
 		return cell;
@@ -296,8 +332,8 @@ static void ril_cell_info_list_cb(GRilIoChannel *io, int status,
 	DBG_(self, "");
 	GASSERT(self->query_id);
 	self->query_id = 0;
-	ril_cell_info_update_cells(self, ril_cell_info_parse_list
-						(io->ril_version, data, len));
+	ril_cell_info_update_cells(self, (status == RIL_E_SUCCESS) ?
+		ril_cell_info_parse_list(io->ril_version, data, len) : NULL);
 }
 
 static void ril_cell_info_set_rate_cb(GRilIoChannel *io, int status,
@@ -314,7 +350,7 @@ static void ril_cell_info_query(struct ril_cell_info *self)
 {
 	GRilIoRequest *req = grilio_request_new();
 
-	grilio_request_set_retry(req, RIL_RETRY_MS, -1);
+	grilio_request_set_retry(req, RIL_RETRY_MS, MAX_RETRIES);
 	grilio_channel_cancel_request(self->io, self->query_id, FALSE);
 	self->query_id = grilio_channel_send_request_full(self->io, req,
 		RIL_REQUEST_GET_CELL_INFO_LIST, ril_cell_info_list_cb,
@@ -328,7 +364,7 @@ static void ril_cell_info_set_rate(struct ril_cell_info *self, int ms)
 
 	grilio_request_append_int32(req, 1);
 	grilio_request_append_int32(req, ms);
-	grilio_request_set_retry(req, RIL_RETRY_MS, -1);
+	grilio_request_set_retry(req, RIL_RETRY_MS, MAX_RETRIES);
 	grilio_channel_cancel_request(self->io, self->set_rate_id, FALSE);
 	self->set_rate_id = grilio_channel_send_request_full(self->io, req,
 			RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE,
@@ -338,18 +374,16 @@ static void ril_cell_info_set_rate(struct ril_cell_info *self, int ms)
 
 static void ril_cell_info_update_rate(struct ril_cell_info *self)
 {
-	ril_cell_info_set_rate(self,
-		(self->display->state == MCE_DISPLAY_STATE_OFF) ?
-		DISPLAY_OFF_UPDATE_RATE : DISPLAY_ON_UPDATE_RATE);
+	if (self->sim_card_ready) {
+		ril_cell_info_set_rate(self,
+			(self->display->state == MCE_DISPLAY_STATE_OFF) ?
+			DISPLAY_OFF_UPDATE_RATE : DISPLAY_ON_UPDATE_RATE);
+	}
 }
 
 static void ril_cell_info_display_state_cb(MceDisplay *display, void *arg)
 {
-	struct ril_cell_info *self = RIL_CELL_INFO(arg);
-
-	if (self->sim_card_ready) {
-		ril_cell_info_update_rate(self);
-	}
+	ril_cell_info_update_rate(RIL_CELL_INFO(arg));
 }
 
 static void ril_cell_info_refresh(struct ril_cell_info *self)
@@ -373,16 +407,11 @@ static void ril_cell_info_radio_state_cb(struct ril_radio *radio, void *arg)
 static void ril_cell_info_sim_status_cb(struct ril_sim_card *sim, void *arg)
 {
 	struct ril_cell_info *self = RIL_CELL_INFO(arg);
-	const gboolean sim_card_was_ready = self->sim_card_ready;
 
-	DBG_(self, "%sready", ril_sim_card_ready(sim) ? "" : "not ");
 	self->sim_card_ready = ril_sim_card_ready(sim);
-	if (self->sim_card_ready != sim_card_was_ready) {
-		ril_cell_info_refresh(self);
-		if (self->sim_card_ready) {
-			ril_cell_info_update_rate(self);
-		}
-	}
+	DBG_(self, "%sready", self->sim_card_ready ? "" : "not ");
+	ril_cell_info_refresh(self);
+	ril_cell_info_update_rate(self);
 }
 
 /* sailfish_cell_info interface callbacks */
@@ -483,10 +512,8 @@ struct sailfish_cell_info *ril_cell_info_new(GRilIoChannel *io,
 		ril_sim_card_add_status_changed_handler(self->sim_card,
 			ril_cell_info_sim_status_cb, self);
 	self->sim_card_ready = ril_sim_card_ready(sim_card);
-	if (self->sim_card_ready) {
-		ril_cell_info_query(self);
-		ril_cell_info_update_rate(self);
-	}
+	ril_cell_info_refresh(self);
+	ril_cell_info_update_rate(self);
 	return &self->info;
 }
 

ofono/drivers/ril/ril_config.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -14,10 +14,16 @@
  */
 
 #include "ril_config.h"
+#include "ril_util.h"
 #include "ril_log.h"
 
 #include <gutil_intarray.h>
 #include <gutil_ints.h>
+#include <gutil_misc.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 /* Utilities for parsing ril_subscription.conf */
 
@@ -185,17 +191,24 @@ GUtilInts *ril_config_get_ints(GKeyFile *file, const char *group,
 	char *value = ril_config_get_string(file, group, key);
 
 	if (value) {
-		char **values = g_strsplit(value, ",", -1);
-		char **ptr = values;
 		GUtilIntArray *array = gutil_int_array_new();
+		char **values, **ptr;
+
+		/*
+		 * Some people are thinking that # is a comment
+		 * anywhere on the line, not just at the beginning
+		 */
+		char *comment = strchr(value, '#');
+
+		if (comment) *comment = 0;
+		values = g_strsplit(value, ",", -1);
+		ptr = values;
 
 		while (*ptr) {
-			const char *str = *ptr++;
-			char *end = NULL;
-			long ival = strtol(str, &end, 0);
+			int val;
 
-			if (str[0] && !end[0]) {
-				gutil_int_array_append(array, ival);
+			if (gutil_parse_int(*ptr++, 0, &val)) {
+				gutil_int_array_append(array, val);
 			}
 		}
 
@@ -224,6 +237,337 @@ char *ril_config_ints_to_string(GUtilInts *ints, char separator)
 	return NULL;
 }
 
+/**
+ * The ril_config_merge_files() function does the following:
+ *
+ * 1. Loads the specified key file (say, "/etc/foo.conf")
+ * 2. Scans the subdirectory named after the file (e.g. "/etc/foo.d/")
+ *    for the files with the same suffix as the main file (e.g. "*.conf")
+ * 3. Sorts the files from the subdirectory (alphabetically)
+ * 4. Merges the contents of the additional files with the main file
+ *    according to their sort order.
+ *
+ * When the entries are merged, keys and groups overwrite the exising
+ * ones by default. Keys can be suffixed with special characters to
+ * remove or modify the existing entries instead:
+ *
+ * ':' Sets the (default) value if the key is missing
+ * '+' Appends values to the string list
+ * '?' Appends only new (non-existent) values to the string list
+ * '-' Removes the values from the string list
+ *
+ * Both keys and groups can be prefixed with '!' to remove the entire key
+ * or group.
+ *
+ * For example if we merge these two files:
+ *
+ *   /etc/foo.conf:
+ *
+ *   [foo]
+ *   a=1
+ *   b=2,3
+ *   c=4
+ *   d=5
+ *   [bar]
+ *   e=5
+ *
+ *   /etc/foo.d/bar.conf:
+ *
+ *   [foo]
+ *   a+=2
+ *   b-=2
+ *   c=5
+ *   !d
+ *   [!bar]
+ *
+ * we end up with this:
+ *
+ *   [foo]
+ *   a=1
+ *   b=2,3
+ *   c=5
+ *
+ * Not that the list separator is assumed to be ',' (rather than default ';').
+ * The keyfile passed to ril_config_merge_files() should use the same list
+ * separator, because the default values are copied from the config files
+ * as is.
+ */
+
+static gint ril_config_sort_files(gconstpointer a, gconstpointer b)
+{
+	/* The comparison function for g_ptr_array_sort() doesn't take
+	 * the pointers from the array as arguments, it takes pointers
+	 * to the pointers in the array. */
+	return strcmp(*(char**)a, *(char**)b);
+}
+
+static char **ril_config_collect_files(const char *path, const char *suffix)
+{
+	/* Returns sorted list of regular files in the directory,
+	 * optionally having the specified suffix (e.g. ".conf").
+	 * Returns NULL if nothing appropriate has been found. */
+	char **files = NULL;
+	DIR *d = opendir(path);
+
+	if (d) {
+		GPtrArray *list = g_ptr_array_new();
+		const struct dirent *p;
+
+		while ((p = readdir(d)) != NULL) {
+			/* No need to even stat . and .. */
+			if (strcmp(p->d_name, ".") &&
+				strcmp(p->d_name, "..") && (!suffix ||
+					g_str_has_suffix(p->d_name, suffix))) {
+				struct stat st;
+				char *buf = g_strconcat(path, "/", p->d_name,
+									NULL);
+
+				if (!stat(buf, &st) && S_ISREG(st.st_mode)) {
+					g_ptr_array_add(list, buf);
+				} else {
+					g_free(buf);
+				}
+			}
+                }
+
+		if (list->len > 0) {
+			g_ptr_array_sort(list, ril_config_sort_files);
+			g_ptr_array_add(list, NULL);
+			files = (char**)g_ptr_array_free(list, FALSE);
+		} else {
+			g_ptr_array_free(list, TRUE);
+		}
+
+                closedir(d);
+        }
+	return files;
+}
+
+static int ril_config_list_find(char **list, gsize len, const char *value)
+{
+	guint i;
+
+	for (i = 0; i < len; i++) {
+		if (!strcmp(list[i], value)) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+static void ril_config_list_append(GKeyFile *conf, GKeyFile *k,
+				const char *group, const char *key,
+				char **values, gsize n, gboolean unique)
+{
+	/* Note: will steal strings from values */
+	if (n > 0) {
+		int i;
+		gsize len = 0;
+		gchar **list = g_key_file_get_string_list(conf, group, key,
+							&len, NULL);
+		GPtrArray *newlist = g_ptr_array_new_full(0, g_free);
+
+		for (i = 0; i < (int)len; i++) {
+			g_ptr_array_add(newlist, list[i]);
+		}
+
+		for (i = 0; i < (int)n; i++) {
+			char *val = values[i];
+
+			if (!unique || ril_config_list_find((char**)
+				newlist->pdata, newlist->len, val) < 0) {
+				/* Move the string to the new list */
+				g_ptr_array_add(newlist, val);
+				memmove(values + i, values + i + 1,
+						sizeof(char*) * (n - i));
+				i--;
+				n--;
+			}
+		}
+
+		if (newlist->len > len) {
+			g_key_file_set_string_list(conf, group, key,
+				(const gchar * const *) newlist->pdata,
+				newlist->len);
+		}
+
+		/* Strings are deallocated by GPtrArray */
+		g_ptr_array_free(newlist, TRUE);
+		g_free(list);
+	}
+}
+
+static void ril_config_list_remove(GKeyFile *conf, GKeyFile *k,
+		const char *group, const char *key, char **values, gsize n)
+{
+	if (n > 0) {
+		gsize len = 0;
+		gchar **list = g_key_file_get_string_list(conf, group, key,
+								&len, NULL);
+
+		if (len > 0) {
+			gsize i;
+			const gsize oldlen = len;
+
+			for (i = 0; i < n; i++) {
+				int pos;
+
+				/* Remove all matching values */
+				while ((pos = ril_config_list_find(list, len,
+							values[i])) >= 0) {
+					g_free(list[pos]);
+					memmove(list + pos, list + pos + 1,
+						sizeof(char*) * (len - pos));
+					len--;
+				}
+			}
+
+			if (len < oldlen) {
+				g_key_file_set_string_list(conf, group, key,
+					(const gchar * const *) list, len);
+			}
+		}
+
+		g_strfreev(list);
+	}
+}
+
+static void ril_config_merge_group(GKeyFile *conf, GKeyFile *k,
+							const char *group)
+{
+	gsize i, n = 0;
+	char **keys = g_key_file_get_keys(k, group, &n, NULL);
+
+	for (i=0; i<n; i++) {
+		char *key = keys[i];
+
+		if (key[0] == '!') {
+			if (key[1]) {
+				g_key_file_remove_key(conf, group, key+1, NULL);
+			}
+		} else {
+			const gsize len = strlen(key);
+			const char last = (len > 0) ? key[len-1] : 0;
+
+			if (last == '+' || last == '?') {
+				gsize count = 0;
+				gchar **values = g_key_file_get_string_list(k,
+						group, key, &count, NULL);
+
+				key[len-1] = 0;
+				ril_config_list_append(conf, k, group, key,
+						values, count, last == '?');
+				g_strfreev(values);
+			} else if (last == '-') {
+				gsize count = 0;
+				gchar **values = g_key_file_get_string_list(k,
+						group, key, &count, NULL);
+
+				key[len-1] = 0;
+				ril_config_list_remove(conf, k, group, key,
+							values, count);
+				g_strfreev(values);
+			} else {
+				/* Overwrite the value (it must exist in k) */
+				gchar *value = g_key_file_get_value(k, group,
+								key, NULL);
+
+				if (last == ':') {
+					/* Default value */
+					key[len-1] = 0;
+					if (!g_key_file_has_key(conf,
+							group, key, NULL)) {
+						g_key_file_set_value(conf,
+							group, key, value);
+					}
+				} else {
+					g_key_file_set_value(conf, group, key,
+									value);
+				}
+				g_free(value);
+			}
+		}
+	}
+
+	g_strfreev(keys);
+}
+
+static void ril_config_merge_keyfile(GKeyFile *conf, GKeyFile *k)
+{
+	gsize i, n = 0;
+	char **groups = g_key_file_get_groups(k, &n);
+
+	for (i=0; i<n; i++) {
+		const char *group = groups[i];
+
+		if (group[0] == '!') {
+			g_key_file_remove_group(conf, group + 1, NULL);
+		} else {
+			ril_config_merge_group(conf, k, group);
+		}
+	}
+
+	g_strfreev(groups);
+}
+
+static void ril_config_merge_file(GKeyFile *conf, const char *file)
+{
+	GKeyFile *k = g_key_file_new();
+
+	g_key_file_set_list_separator(k, ',');
+
+	if (g_key_file_load_from_file(k, file, 0, NULL)) {
+		ril_config_merge_keyfile(conf, k);
+	}
+
+	g_key_file_unref(k);
+}
+
+void ril_config_merge_files(GKeyFile *conf, const char *file)
+{
+	if (conf && file && file[0]) {
+		char *dot = strrchr(file, '.');
+		const char *suffix;
+		char *dir;
+		char **files;
+
+		if (!dot) {
+			dir = g_strconcat(file, ".d", NULL);
+			suffix = NULL;
+		} else if (!dot[1]) {
+			dir = g_strconcat(file, "d", NULL);
+			suffix = NULL;
+		} else {
+			/* 2 bytes for ".d" and 1 for NULL terminator */
+			dir = g_malloc(dot - file + 3);
+			strncpy(dir, file, dot - file);
+			strcpy(dir + (dot - file), ".d");
+			suffix = dot + 1;
+		}
+
+		files = ril_config_collect_files(dir, suffix);
+		g_free(dir);
+
+		/* Load the main config */
+		if (g_file_test(file, G_FILE_TEST_EXISTS)) {
+			DBG("Loading %s", file);
+			ril_config_merge_file(conf, file);
+		}
+
+		if (files) {
+			char **ptr;
+
+			for (ptr = files; *ptr; ptr++) {
+				DBG("Merging %s", *ptr);
+				ril_config_merge_file(conf, *ptr);
+			}
+
+			g_strfreev(files);
+		}
+	}
+}
+
 /*
  * Local Variables:
  * mode: C

ofono/drivers/ril/ril_config.h

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -22,6 +22,8 @@
 
 #define RILCONF_SETTINGS_GROUP      "Settings"
 
+void ril_config_merge_files(GKeyFile *conf, const char *file);
+
 char *ril_config_get_string(GKeyFile *file, const char *group,
 					const char *key);
 char **ril_config_get_strings(GKeyFile *file, const char *group,

ofono/drivers/ril/ril_constants.h

@@ -1,10 +1,6 @@
 /*
- *  RIL constants adopted from AOSP's header:
- *
- *  /hardware/ril/reference_ril/ril.h
- *
  *  Copyright (C) 2013 Canonical Ltd.
- *  Copyright (C) 2013-2017 Jolla Ltd.
+ *  Copyright (C) 2013-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -19,81 +15,10 @@
 #ifndef __RIL_CONSTANTS_H
 #define __RIL_CONSTANTS_H 1
 
+#include <ofono/ril-constants.h>
+
 #define RIL_MAX_UUID_LENGTH 64
 
-/* Error Codes */
-enum ril_status {
-	RIL_E_SUCCESS = 0,
-	RIL_E_RADIO_NOT_AVAILABLE = 1,
-	RIL_E_GENERIC_FAILURE = 2,
-	RIL_E_PASSWORD_INCORRECT = 3,
-	RIL_E_SIM_PIN2 = 4,
-	RIL_E_SIM_PUK2 = 5,
-	RIL_E_REQUEST_NOT_SUPPORTED = 6,
-	RIL_E_CANCELLED = 7,
-	RIL_E_OP_NOT_ALLOWED_DURING_VOICE_CALL = 8,
-	RIL_E_OP_NOT_ALLOWED_BEFORE_REG_TO_NW = 9,
-	RIL_E_SMS_SEND_FAIL_RETRY = 10,
-	RIL_E_SIM_ABSENT = 11,
-	RIL_E_SUBSCRIPTION_NOT_AVAILABLE = 12,
-	RIL_E_MODE_NOT_SUPPORTED = 13,
-	RIL_E_FDN_CHECK_FAILURE = 14,
-	RIL_E_ILLEGAL_SIM_OR_ME = 15,
-	RIL_E_MISSING_RESOURCE = 16,
-	RIL_E_NO_SUCH_ELEMENT = 17,
-	RIL_E_DIAL_MODIFIED_TO_USSD = 18,
-	RIL_E_DIAL_MODIFIED_TO_SS = 19,
-	RIL_E_DIAL_MODIFIED_TO_DIAL = 20,
-	RIL_E_USSD_MODIFIED_TO_DIAL = 21,
-	RIL_E_USSD_MODIFIED_TO_SS = 22,
-	RIL_E_USSD_MODIFIED_TO_USSD = 23,
-	RIL_E_SS_MODIFIED_TO_DIAL = 24,
-	RIL_E_SS_MODIFIED_TO_USSD = 25,
-	RIL_E_SUBSCRIPTION_NOT_SUPPORTED = 26,
-	RIL_E_SS_MODIFIED_TO_SS = 27,
-	RIL_E_LCE_NOT_SUPPORTED = 36,
-	RIL_E_NO_MEMORY = 37,
-	RIL_E_INTERNAL_ERR = 38,
-	RIL_E_SYSTEM_ERR = 39,
-	RIL_E_MODEM_ERR = 40,
-	RIL_E_INVALID_STATE = 41,
-	RIL_E_NO_RESOURCES = 42,
-	RIL_E_SIM_ERR = 43,
-	RIL_E_INVALID_ARGUMENTS = 44,
-	RIL_E_INVALID_SIM_STATE = 45,
-	RIL_E_INVALID_MODEM_STATE = 46,
-	RIL_E_INVALID_CALL_ID = 47,
-	RIL_E_NO_SMS_TO_ACK = 48,
-	RIL_E_NETWORK_ERR = 49,
-	RIL_E_REQUEST_RATE_LIMITED = 50,
-	RIL_E_SIM_BUSY = 51,
-	RIL_E_SIM_FULL = 52,
-	RIL_E_NETWORK_REJECT = 53,
-	RIL_E_OPERATION_NOT_ALLOWED = 54,
-	RIL_E_EMPTY_RECORD = 55,
-	RIL_E_INVALID_SMS_FORMAT = 56,
-	RIL_E_ENCODING_ERR = 57,
-	RIL_E_INVALID_SMSC_ADDRESS = 58,
-	RIL_E_NO_SUCH_ENTRY = 59,
-	RIL_E_NETWORK_NOT_READY = 60,
-	RIL_E_NOT_PROVISIONED = 61,
-	RIL_E_NO_SUBSCRIPTION = 62,
-	RIL_E_NO_NETWORK_FOUND = 63,
-	RIL_E_DEVICE_IN_USE = 64,
-	RIL_E_ABORTED = 65,
-	RIL_E_INVALID_RESPONSE = 66
-};
-
-/* call states */
-enum ril_call_state {
-	RIL_CALL_ACTIVE   = 0,
-	RIL_CALL_HOLDING  = 1,
-	RIL_CALL_DIALING  = 2,
-	RIL_CALL_ALERTING = 3,
-	RIL_CALL_INCOMING = 4,
-	RIL_CALL_WAITING  = 5
-};
-
 /* Radio state */
 enum ril_radio_state {
 	RADIO_STATE_OFF                   = 0,
@@ -267,30 +192,30 @@ enum ril_call_fail_cause {
 };
 
 enum ril_data_call_fail_cause {
-    PDP_FAIL_NONE = 0,
-    PDP_FAIL_OPERATOR_BARRED = 0x08,
-    PDP_FAIL_INSUFFICIENT_RESOURCES = 0x1A,
-    PDP_FAIL_MISSING_UKNOWN_APN = 0x1B,
-    PDP_FAIL_UNKNOWN_PDP_ADDRESS_TYPE = 0x1C,
-    PDP_FAIL_USER_AUTHENTICATION = 0x1D,
-    PDP_FAIL_ACTIVATION_REJECT_GGSN = 0x1E,
-    PDP_FAIL_ACTIVATION_REJECT_UNSPECIFIED = 0x1F,
-    PDP_FAIL_SERVICE_OPTION_NOT_SUPPORTED = 0x20,
-    PDP_FAIL_SERVICE_OPTION_NOT_SUBSCRIBED = 0x21,
-    PDP_FAIL_SERVICE_OPTION_OUT_OF_ORDER = 0x22,
-    PDP_FAIL_NSAPI_IN_USE = 0x23,
-    PDP_FAIL_REGULAR_DEACTIVATION = 0x24,
-    PDP_FAIL_ONLY_IPV4_ALLOWED = 0x32,
-    PDP_FAIL_ONLY_IPV6_ALLOWED = 0x33,
-    PDP_FAIL_ONLY_SINGLE_BEARER_ALLOWED = 0x34,
-    PDP_FAIL_PROTOCOL_ERRORS = 0x6F,
-    PDP_FAIL_VOICE_REGISTRATION_FAIL = -1,
-    PDP_FAIL_DATA_REGISTRATION_FAIL = -2,
-    PDP_FAIL_SIGNAL_LOST = -3,
-    PDP_FAIL_PREF_RADIO_TECH_CHANGED = -4,
-    PDP_FAIL_RADIO_POWER_OFF = -5,
-    PDP_FAIL_TETHERED_CALL_ACTIVE = -6,
-    PDP_FAIL_ERROR_UNSPECIFIED = 0xffff
+	PDP_FAIL_NONE = 0,
+	PDP_FAIL_OPERATOR_BARRED = 0x08,
+	PDP_FAIL_INSUFFICIENT_RESOURCES = 0x1A,
+	PDP_FAIL_MISSING_UKNOWN_APN = 0x1B,
+	PDP_FAIL_UNKNOWN_PDP_ADDRESS_TYPE = 0x1C,
+	PDP_FAIL_USER_AUTHENTICATION = 0x1D,
+	PDP_FAIL_ACTIVATION_REJECT_GGSN = 0x1E,
+	PDP_FAIL_ACTIVATION_REJECT_UNSPECIFIED = 0x1F,
+	PDP_FAIL_SERVICE_OPTION_NOT_SUPPORTED = 0x20,
+	PDP_FAIL_SERVICE_OPTION_NOT_SUBSCRIBED = 0x21,
+	PDP_FAIL_SERVICE_OPTION_OUT_OF_ORDER = 0x22,
+	PDP_FAIL_NSAPI_IN_USE = 0x23,
+	PDP_FAIL_REGULAR_DEACTIVATION = 0x24,
+	PDP_FAIL_ONLY_IPV4_ALLOWED = 0x32,
+	PDP_FAIL_ONLY_IPV6_ALLOWED = 0x33,
+	PDP_FAIL_ONLY_SINGLE_BEARER_ALLOWED = 0x34,
+	PDP_FAIL_PROTOCOL_ERRORS = 0x6F,
+	PDP_FAIL_VOICE_REGISTRATION_FAIL = -1,
+	PDP_FAIL_DATA_REGISTRATION_FAIL = -2,
+	PDP_FAIL_SIGNAL_LOST = -3,
+	PDP_FAIL_PREF_RADIO_TECH_CHANGED = -4,
+	PDP_FAIL_RADIO_POWER_OFF = -5,
+	PDP_FAIL_TETHERED_CALL_ACTIVE = -6,
+	PDP_FAIL_ERROR_UNSPECIFIED = 0xffff
 };
 
 /* RIL_REQUEST_DEACTIVATE_DATA_CALL parameter */
@@ -395,191 +320,13 @@ enum ril_cell_info_type {
 	RIL_CELL_INFO_TYPE_TD_SCDMA = 5
 };
 
-/* RIL Request Messages, ofono -> rild */
-#define RIL_REQUEST_GET_SIM_STATUS 1
-#define RIL_REQUEST_ENTER_SIM_PIN 2
-#define RIL_REQUEST_ENTER_SIM_PUK 3
-#define RIL_REQUEST_ENTER_SIM_PIN2 4
-#define RIL_REQUEST_ENTER_SIM_PUK2 5
-#define RIL_REQUEST_CHANGE_SIM_PIN 6
-#define RIL_REQUEST_CHANGE_SIM_PIN2 7
-#define RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION 8
-#define RIL_REQUEST_GET_CURRENT_CALLS 9
-#define RIL_REQUEST_DIAL 10
-#define RIL_REQUEST_GET_IMSI 11
-#define RIL_REQUEST_HANGUP 12
-#define RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND 13
-#define RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND 14
-#define RIL_REQUEST_SWITCH_HOLDING_AND_ACTIVE 15
-#define RIL_REQUEST_CONFERENCE 16
-#define RIL_REQUEST_UDUB 17
-#define RIL_REQUEST_LAST_CALL_FAIL_CAUSE 18
-#define RIL_REQUEST_SIGNAL_STRENGTH 19
-#define RIL_REQUEST_VOICE_REGISTRATION_STATE 20
-#define RIL_REQUEST_DATA_REGISTRATION_STATE 21
-#define RIL_REQUEST_OPERATOR 22
-#define RIL_REQUEST_RADIO_POWER 23
-#define RIL_REQUEST_DTMF 24
-#define RIL_REQUEST_SEND_SMS 25
-#define RIL_REQUEST_SEND_SMS_EXPECT_MORE 26
-#define RIL_REQUEST_SETUP_DATA_CALL 27
-#define RIL_REQUEST_SIM_IO 28
-#define RIL_REQUEST_SEND_USSD 29
-#define RIL_REQUEST_CANCEL_USSD 30
-#define RIL_REQUEST_GET_CLIR 31
-#define RIL_REQUEST_SET_CLIR 32
-#define RIL_REQUEST_QUERY_CALL_FORWARD_STATUS 33
-#define RIL_REQUEST_SET_CALL_FORWARD 34
-#define RIL_REQUEST_QUERY_CALL_WAITING 35
-#define RIL_REQUEST_SET_CALL_WAITING 36
-#define RIL_REQUEST_SMS_ACKNOWLEDGE  37
-#define RIL_REQUEST_GET_IMEI 38
-#define RIL_REQUEST_GET_IMEISV 39
-#define RIL_REQUEST_ANSWER 40
-#define RIL_REQUEST_DEACTIVATE_DATA_CALL 41
-#define RIL_REQUEST_QUERY_FACILITY_LOCK 42
-#define RIL_REQUEST_SET_FACILITY_LOCK 43
-#define RIL_REQUEST_CHANGE_BARRING_PASSWORD 44
-#define RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE 45
-#define RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC 46
-#define RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL 47
-#define RIL_REQUEST_QUERY_AVAILABLE_NETWORKS 48
-#define RIL_REQUEST_DTMF_START 49
-#define RIL_REQUEST_DTMF_STOP 50
-#define RIL_REQUEST_BASEBAND_VERSION 51
-#define RIL_REQUEST_SEPARATE_CONNECTION 52
-#define RIL_REQUEST_SET_MUTE 53
-#define RIL_REQUEST_GET_MUTE 54
-#define RIL_REQUEST_QUERY_CLIP 55
-#define RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE 56
-#define RIL_REQUEST_DATA_CALL_LIST 57
-#define RIL_REQUEST_RESET_RADIO 58
-#define RIL_REQUEST_OEM_HOOK_RAW 59
-#define RIL_REQUEST_OEM_HOOK_STRINGS 60
-#define RIL_REQUEST_SCREEN_STATE 61
-#define RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION 62
-#define RIL_REQUEST_WRITE_SMS_TO_SIM 63
-#define RIL_REQUEST_DELETE_SMS_ON_SIM 64
-#define RIL_REQUEST_SET_BAND_MODE 65
-#define RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE 66
-#define RIL_REQUEST_STK_GET_PROFILE 67
-#define RIL_REQUEST_STK_SET_PROFILE 68
-#define RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND 69
-#define RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE 70
-#define RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM 71
-#define RIL_REQUEST_EXPLICIT_CALL_TRANSFER 72
-#define RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE 73
-#define RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE 74
-#define RIL_REQUEST_GET_NEIGHBORING_CELL_IDS 75
-#define RIL_REQUEST_SET_LOCATION_UPDATES 76
-#define RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE 77
-#define RIL_REQUEST_CDMA_SET_ROAMING_PREFERENCE 78
-#define RIL_REQUEST_CDMA_QUERY_ROAMING_PREFERENCE 79
-#define RIL_REQUEST_SET_TTY_MODE 80
-#define RIL_REQUEST_QUERY_TTY_MODE 81
-#define RIL_REQUEST_CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE 82
-#define RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE 83
-#define RIL_REQUEST_CDMA_FLASH 84
-#define RIL_REQUEST_CDMA_BURST_DTMF 85
-#define RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY 86
-#define RIL_REQUEST_CDMA_SEND_SMS 87
-#define RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE 88
-#define RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG 89
-#define RIL_REQUEST_GSM_SET_BROADCAST_SMS_CONFIG 90
-#define RIL_REQUEST_GSM_SMS_BROADCAST_ACTIVATION 91
-#define RIL_REQUEST_CDMA_GET_BROADCAST_SMS_CONFIG 92
-#define RIL_REQUEST_CDMA_SET_BROADCAST_SMS_CONFIG 93
-#define RIL_REQUEST_CDMA_SMS_BROADCAST_ACTIVATION 94
-#define RIL_REQUEST_CDMA_SUBSCRIPTION 95
-#define RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM 96
-#define RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM 97
-#define RIL_REQUEST_DEVICE_IDENTITY 98
-#define RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE 99
-#define RIL_REQUEST_GET_SMSC_ADDRESS 100
-#define RIL_REQUEST_SET_SMSC_ADDRESS 101
-#define RIL_REQUEST_REPORT_SMS_MEMORY_STATUS 102
-#define RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING 103
-#define RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE 104
-#define RIL_REQUEST_ISIM_AUTHENTICATION 105
-#define RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU 106
-#define RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS 107
-#define RIL_REQUEST_VOICE_RADIO_TECH 108
-#define RIL_REQUEST_GET_CELL_INFO_LIST 109
-#define RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE 110
-#define RIL_REQUEST_SET_INITIAL_ATTACH_APN 111
-#define RIL_REQUEST_IMS_REGISTRATION_STATE 112
-#define RIL_REQUEST_IMS_SEND_SMS 113
-#define RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC 114
-#define RIL_REQUEST_SIM_OPEN_CHANNEL 115
-#define RIL_REQUEST_SIM_CLOSE_CHANNEL 116
-#define RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL 117
-#define RIL_REQUEST_NV_READ_ITEM 118
-#define RIL_REQUEST_NV_WRITE_ITEM 119
-#define RIL_REQUEST_NV_WRITE_CDMA_PRL 120
-#define RIL_REQUEST_NV_RESET_CONFIG 121
-/* SET_UICC_SUBSCRIPTION was 115 in v9 and 122 in v10 and later */
-#define RIL_REQUEST_V9_SET_UICC_SUBSCRIPTION  115
-#define RIL_REQUEST_SET_UICC_SUBSCRIPTION  122
-#define RIL_REQUEST_ALLOW_DATA  123
-#define RIL_REQUEST_GET_HARDWARE_CONFIG 124
-#define RIL_REQUEST_SIM_AUTHENTICATION 125
-#define RIL_REQUEST_GET_DC_RT_INFO 126
-#define RIL_REQUEST_SET_DC_RT_INFO_RATE 127
-#define RIL_REQUEST_SET_DATA_PROFILE 128
-#define RIL_REQUEST_SHUTDOWN 129
-#define RIL_REQUEST_GET_RADIO_CAPABILITY 130
-#define RIL_REQUEST_SET_RADIO_CAPABILITY 131
-
-/* RIL Unsolicited Messages, rild -> ofono */
-#define RIL_UNSOL_RESPONSE_BASE 1000
-#define RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED 1000
-#define RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED 1001
-#define RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED 1002
-#define RIL_UNSOL_RESPONSE_NEW_SMS 1003
-#define RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT 1004
-#define RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM 1005
-#define RIL_UNSOL_ON_USSD 1006
-#define RIL_UNSOL_ON_USSD_REQUEST 1007
-#define RIL_UNSOL_NITZ_TIME_RECEIVED  1008
-#define RIL_UNSOL_SIGNAL_STRENGTH  1009
-#define RIL_UNSOL_DATA_CALL_LIST_CHANGED 1010
-#define RIL_UNSOL_SUPP_SVC_NOTIFICATION 1011
-#define RIL_UNSOL_STK_SESSION_END 1012
-#define RIL_UNSOL_STK_PROACTIVE_COMMAND 1013
-#define RIL_UNSOL_STK_EVENT_NOTIFY 1014
-#define RIL_UNSOL_STK_CALL_SETUP 1015
-#define RIL_UNSOL_SIM_SMS_STORAGE_FULL 1016
-#define RIL_UNSOL_SIM_REFRESH 1017
-#define RIL_UNSOL_CALL_RING 1018
-#define RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED 1019
-#define RIL_UNSOL_RESPONSE_CDMA_NEW_SMS 1020
-#define RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS 1021
-#define RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL 1022
-#define RIL_UNSOL_RESTRICTED_STATE_CHANGED 1023
-#define RIL_UNSOL_ENTER_EMERGENCY_CALLBACK_MODE 1024
-#define RIL_UNSOL_CDMA_CALL_WAITING 1025
-#define RIL_UNSOL_CDMA_OTA_PROVISION_STATUS 1026
-#define RIL_UNSOL_CDMA_INFO_REC 1027
-#define RIL_UNSOL_OEM_HOOK_RAW 1028
-#define RIL_UNSOL_RINGBACK_TONE 1029
-#define RIL_UNSOL_RESEND_INCALL_MUTE 1030
-#define RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED 1031
-#define RIL_UNSOL_CDMA_PRL_CHANGED 1032
-#define RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE 1033
-#define RIL_UNSOL_RIL_CONNECTED 1034
-#define RIL_UNSOL_VOICE_RADIO_TECH_CHANGED 1035
-#define RIL_UNSOL_CELL_INFO_LIST 1036
-#define RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED 1037
-#define RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED 1038
-#define RIL_UNSOL_SRVCC_STATE_NOTIFY 1039
-#define RIL_UNSOL_HARDWARE_CONFIG_CHANGED 1040
-#define RIL_UNSOL_DC_RT_INFO_CHANGED 1041
-#define RIL_UNSOL_RADIO_CAPABILITY 1042
-#define RIL_UNSOL_ON_SS 1043
-#define RIL_UNSOL_STK_CC_ALPHA_NOTIFY 1044
-
-/* A special request, ofono -> rild */
-#define RIL_RESPONSE_ACKNOWLEDGEMENT 800
+enum ril_restricted_state {
+	RIL_RESTRICTED_STATE_NONE         = 0x00,
+	RIL_RESTRICTED_STATE_CS_EMERGENCY = 0x01,
+	RIL_RESTRICTED_STATE_CS_NORMAL    = 0x02,
+	RIL_RESTRICTED_STATE_CS_ALL       = 0x04,
+	RIL_RESTRICTED_STATE_PS_ALL       = 0x10
+};
 
 /* Suplementary services Service class*/
 #define SERVICE_CLASS_NONE 0

ofono/drivers/ril/ril_data.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2016-2017 Jolla Ltd.
+ *  Copyright (C) 2016-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -18,6 +18,7 @@
 #include "ril_network.h"
 #include "ril_sim_settings.h"
 #include "ril_util.h"
+#include "ril_vendor.h"
 #include "ril_log.h"
 
 #include <gutil_strv.h>
@@ -75,6 +76,12 @@ enum ril_data_priv_flags {
 typedef GObjectClass RilDataClass;
 typedef struct ril_data RilData;
 
+enum ril_data_io_event_id {
+	IO_EVENT_DATA_CALL_LIST_CHANGED,
+	IO_EVENT_RESTRICTED_STATE_CHANGED,
+	IO_EVENT_COUNT
+};
+
 enum ril_data_settings_event_id {
 	SETTINGS_EVENT_IMSI_CHANGED,
 	SETTINGS_EVENT_PREF_MODE,
@@ -93,7 +100,10 @@ struct ril_data_priv {
 	struct ril_radio *radio;
 	struct ril_network *network;
 	struct ril_data_manager *dm;
+	struct ril_vendor_hook *vendor_hook;
+
 	enum ril_data_priv_flags flags;
+	enum ril_restricted_state restricted_state;
 
 	struct ril_data_request *req_queue;
 	struct ril_data_request *pending_req;
@@ -102,8 +112,9 @@ struct ril_data_priv {
 	guint slot;
 	char *log_prefix;
 	guint query_id;
-	gulong io_event_id;
+	gulong io_event_id[IO_EVENT_COUNT];
 	gulong settings_event_id[SETTINGS_EVENT_COUNT];
+	GHashTable* grab;
 };
 
 enum ril_data_signal {
@@ -175,7 +186,7 @@ struct ril_data_request_allow_data {
 
 static void ril_data_manager_check_data(struct ril_data_manager *dm);
 static void ril_data_manager_check_network_mode(struct ril_data_manager *dm);
-
+static void ril_data_call_deact_cid(struct ril_data *data, int cid);
 static void ril_data_power_update(struct ril_data *self);
 static void ril_data_signal_emit(struct ril_data *self, enum ril_data_signal id)
 {
@@ -206,10 +217,15 @@ GRilIoRequest *ril_request_deactivate_data_call_new(int cid)
  * ril_data_call
  *==========================================================================*/
 
+static struct ril_data_call *ril_data_call_new()
+{
+	return g_new0(struct ril_data_call, 1);
+}
+
 struct ril_data_call *ril_data_call_dup(const struct ril_data_call *call)
 {
 	if (call) {
-		struct ril_data_call *dc = g_new0(struct ril_data_call, 1);
+		struct ril_data_call *dc = ril_data_call_new();
 		dc->cid = call->cid;
 		dc->status = call->status;
 		dc->active = call->active;
@@ -226,13 +242,18 @@ struct ril_data_call *ril_data_call_dup(const struct ril_data_call *call)
 	}
 }
 
+static void ril_data_call_destroy(struct ril_data_call *call)
+{
+	g_free(call->ifname);
+	g_strfreev(call->dnses);
+	g_strfreev(call->addresses);
+	g_strfreev(call->gateways);
+}
+
 void ril_data_call_free(struct ril_data_call *call)
 {
 	if (call) {
-		g_free(call->ifname);
-		g_strfreev(call->dnses);
-		g_strfreev(call->addresses);
-		g_strfreev(call->gateways);
+		ril_data_call_destroy(call);
 		g_free(call);
 	}
 }
@@ -250,7 +271,7 @@ static void ril_data_call_list_free(struct ril_data_call_list *list)
 	}
 }
 
-static gint ril_data_call_parse_compare(gconstpointer a, gconstpointer b)
+static gint ril_data_call_compare(gconstpointer a, gconstpointer b)
 {
 	const struct ril_data_call *ca = a;
 	const struct ril_data_call *cb = b;
@@ -264,7 +285,7 @@ static gint ril_data_call_parse_compare(gconstpointer a, gconstpointer b)
 	}
 }
 
-static const char *ril_data_ofono_protocol_to_ril(enum ofono_gprs_proto proto)
+const char *ril_data_ofono_protocol_to_ril(enum ofono_gprs_proto proto)
 {
 	switch (proto) {
 	case OFONO_GPRS_PROTO_IPV6:
@@ -278,7 +299,7 @@ static const char *ril_data_ofono_protocol_to_ril(enum ofono_gprs_proto proto)
 	}
 }
 
-static int ril_data_protocol_to_ofono(gchar *str)
+int ril_data_protocol_to_ofono(const gchar *str)
 {
 	if (str) {
 		if (!strcmp(str, PROTO_IPV6_STR)) {
@@ -292,14 +313,13 @@ static int ril_data_protocol_to_ofono(gchar *str)
 	return -1;
 }
 
-static struct ril_data_call *ril_data_call_parse(int version,
-							GRilIoParser *rilp)
+static gboolean ril_data_call_parse_default(struct ril_data_call *call,
+					int version, GRilIoParser *rilp)
 {
 	int prot;
 	char *prot_str;
 	guint32 status = PDP_FAIL_ERROR_UNSPECIFIED;
 	guint32 active = RIL_DATA_CALL_INACTIVE;
-	struct ril_data_call *call = g_new0(struct ril_data_call, 1);
 
 	/* RIL_Data_Call_Response_v6 (see ril.h) */
 	grilio_parser_get_uint32(rilp, &status);
@@ -334,13 +354,49 @@ static struct ril_data_call *ril_data_call_parse(int version,
 	}
 
 	g_free(prot_str);
-	return call;
+	return TRUE;
+}
+
+static struct ril_data_call *ril_data_call_parse(struct ril_vendor_hook *hook,
+					int version, GRilIoParser *parser)
+{
+	GRilIoParser copy = *parser;
+	struct ril_data_call *call = ril_data_call_new();
+	gboolean parsed = ril_vendor_hook_data_call_parse(hook, call,
+							version, parser);
+
+	if (!parsed) {
+		/* Try the default parser */
+		ril_data_call_destroy(call);
+		memset(call, 0, sizeof(*call));
+		*parser = copy;
+		parsed = ril_data_call_parse_default(call, version, parser);
+	}
+
+	if (parsed) {
+		DBG("[status=%d,retry=%d,cid=%d,active=%d,type=%s,ifname=%s,"
+			"mtu=%d,address=%s,dns=%s %s,gateways=%s]",
+			call->status, call->retry_time,
+			call->cid, call->active,
+			ril_data_ofono_protocol_to_ril(call->prot),
+			call->ifname, call->mtu,
+			call->addresses ? call->addresses[0] : NULL,
+			call->dnses ? call->dnses[0] : NULL,
+			(call->dnses && call->dnses[0] &&
+			call->dnses[1]) ? call->dnses[1] : "",
+			call->gateways ? call->gateways[0] : NULL);
+		return call;
+	} else {
+		ril_data_call_free(call);
+		return NULL;
+	}
 }
 
 static struct ril_data_call_list *ril_data_call_list_parse(const void *data,
-			guint len, enum ril_data_call_format format)
+				guint len, struct ril_vendor_hook *hook,
+				enum ril_data_call_format format)
 {
-	unsigned int version, n, i;
+	guint32 version, n, i;
 	GRilIoParser rilp;
 
 	grilio_parser_init(&rilp, data, len);
@@ -358,25 +414,14 @@ static struct ril_data_call_list *ril_data_call_list_parse(const void *data,
 		}
 
 		for (i = 0; i < n && !grilio_parser_at_end(&rilp); i++) {
-			struct ril_data_call *call =
-				ril_data_call_parse(list->version, &rilp);
+			struct ril_data_call *call = ril_data_call_parse(hook,
+							list->version, &rilp);
 
-			DBG("[status=%d,retry=%d,cid=%d,"
-				"active=%d,type=%s,ifname=%s,mtu=%d,"
-				"address=%s, dns=%s %s,gateways=%s]",
-				call->status, call->retry_time,
-				call->cid, call->active,
-				ril_data_ofono_protocol_to_ril(call->prot),
-				call->ifname, call->mtu,
-				call->addresses ? call->addresses[0] : NULL,
-				call->dnses ? call->dnses[0] : NULL,
-				(call->dnses && call->dnses[0] &&
-				call->dnses[1]) ? call->dnses[1] : "",
-				call->gateways ? call->gateways[0] : NULL);
-
-			list->num++;
-			list->calls = g_slist_insert_sorted(list->calls, call,
-					ril_data_call_parse_compare);
+			if (call) {
+				list->num++;
+				list->calls = g_slist_insert_sorted(list->calls,
+						call, ril_data_call_compare);
+			}
 		}
 
 		if (list->calls) {
@@ -470,7 +515,7 @@ static int ril_data_call_list_move_calls(struct ril_data_call_list *dest,
 				dest->num++;
 				src->calls = g_slist_delete_link(src->calls, l);
 				dest->calls = g_slist_insert_sorted(dest->calls,
-					call, ril_data_call_parse_compare);
+					call, ril_data_call_compare);
 			}
 
 			l = next;
@@ -501,6 +546,10 @@ struct ril_data_call *ril_data_call_find(struct ril_data_call_list *list,
 static void ril_data_set_calls(struct ril_data *self,
 					struct ril_data_call_list *list)
 {
+	struct ril_data_priv *priv = self->priv;
+	GHashTableIter it;
+	gpointer key;
+
 	if (!ril_data_call_list_equal(self->data_calls, list)) {
 		DBG("data calls changed");
 		ril_data_call_list_free(self->data_calls);
@@ -509,6 +558,63 @@ static void ril_data_set_calls(struct ril_data *self,
 	} else {
 		ril_data_call_list_free(list);
 	}
+
+	/* Clean up the grab table */
+	g_hash_table_iter_init(&it, priv->grab);
+	while (g_hash_table_iter_next(&it, &key, NULL)) {
+		const int cid = GPOINTER_TO_INT(key);
+
+		if (!ril_data_call_find(self->data_calls, cid)) {
+			g_hash_table_iter_remove(&it);
+		}
+	}
+
+	if (self->data_calls) {
+		GSList *l;
+
+		/* Disconnect stray calls (one at a time) */
+		for (l = self->data_calls->calls; l; l = l->next) {
+			struct ril_data_call *dc = l->data;
+
+			key = GINT_TO_POINTER(dc->cid);
+			if (!g_hash_table_contains(priv->grab, key)) {
+				DBG_(self, "stray call %u", dc->cid);
+				ril_data_call_deact_cid(self, dc->cid);
+				break;
+			}
+		}
+	}
+}
+
+static void ril_data_check_allowed(struct ril_data *self, gboolean was_allowed)
+{
+	if (ril_data_allowed(self) != was_allowed) {
+		ril_data_signal_emit(self, SIGNAL_ALLOW_CHANGED);
+	}
+}
+
+static void ril_data_restricted_state_changed_cb(GRilIoChannel *io, guint event,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_data *self = RIL_DATA(user_data);
+	GRilIoParser rilp;
+	guint32 count, state;
+
+	GASSERT(event == RIL_UNSOL_RESTRICTED_STATE_CHANGED);
+	grilio_parser_init(&rilp, data, len);
+	if (grilio_parser_get_uint32(&rilp, &count) && count == 1 &&
+				grilio_parser_get_uint32(&rilp, &state) &&
+				grilio_parser_at_end(&rilp)) {
+		struct ril_data_priv *priv = self->priv;
+
+		if (priv->restricted_state != state) {
+			const gboolean was_allowed = ril_data_allowed(self);
+
+			DBG_(self, "restricted state 0x%02x", state);
+			priv->restricted_state = state;
+			ril_data_check_allowed(self, was_allowed);
+		}
+	}
 }
 
 static void ril_data_call_list_changed_cb(GRilIoChannel *io, guint event,
@@ -526,7 +632,7 @@ static void ril_data_call_list_changed_cb(GRilIoChannel *io, guint event,
 	}
 
 	ril_data_set_calls(self, ril_data_call_list_parse(data, len,
-	       				priv->options.data_call_format));
+			priv->vendor_hook, priv->options.data_call_format));
 }
 
 static void ril_data_query_data_calls_cb(GRilIoChannel *io, int ril_status,
@@ -535,11 +641,18 @@ static void ril_data_query_data_calls_cb(GRilIoChannel *io, int ril_status,
 	struct ril_data *self = RIL_DATA(user_data);
 	struct ril_data_priv *priv = self->priv;
 
+	/*
+	 * Only RIL_E_SUCCESS and RIL_E_RADIO_NOT_AVAILABLE are expected here,
+	 * all other errors are filtered out by ril_voicecall_clcc_retry()
+	 */
 	GASSERT(priv->query_id);
 	priv->query_id = 0;
 	if (ril_status == RIL_E_SUCCESS) {
 		ril_data_set_calls(self, ril_data_call_list_parse(data, len,
-       					priv->options.data_call_format));
+			priv->vendor_hook, priv->options.data_call_format));
+	} else {
+		/* RADIO_NOT_AVAILABLE == no calls */
+		ril_data_set_calls(self, NULL);
 	}
 }
 
@@ -742,7 +855,7 @@ static void ril_data_call_setup_cb(GRilIoChannel *io, int ril_status,
 
 	if (ril_status == RIL_E_SUCCESS) {
 		list = ril_data_call_list_parse(data, len,
-					priv->options.data_call_format);
+			priv->vendor_hook, priv->options.data_call_format);
 	}
 
 	if (list) {
@@ -846,19 +959,23 @@ static gboolean ril_data_call_setup_submit(struct ril_data_request *req)
 		}
 	}
 
-	/*
-	 * TODO: add comments about tethering, other non-public
-	 * profiles...
-	 */
-	ioreq = grilio_request_new();
-	grilio_request_append_int32(ioreq, 7 /* Parameter count */);
-	grilio_request_append_format(ioreq, "%d", tech);
-	grilio_request_append_utf8(ioreq, DATA_PROFILE_DEFAULT_STR);
-	grilio_request_append_utf8(ioreq, setup->apn);
-	grilio_request_append_utf8(ioreq, setup->username);
-	grilio_request_append_utf8(ioreq, setup->password);
-	grilio_request_append_format(ioreq, "%d", auth);
-	grilio_request_append_utf8(ioreq, proto_str);
+	/* Give vendor code a chance to build a vendor specific packet */
+	ioreq = ril_vendor_hook_data_call_req(priv->vendor_hook, tech,
+			DATA_PROFILE_DEFAULT_STR, setup->apn, setup->username,
+			setup->password, auth, proto_str);
+
+	if (!ioreq) {
+		/* The default one */
+		ioreq = grilio_request_new();
+		grilio_request_append_int32(ioreq, 7 /* Parameter count */);
+		grilio_request_append_format(ioreq, "%d", tech);
+		grilio_request_append_utf8(ioreq, DATA_PROFILE_DEFAULT_STR);
+		grilio_request_append_utf8(ioreq, setup->apn);
+		grilio_request_append_utf8(ioreq, setup->username);
+		grilio_request_append_utf8(ioreq, setup->password);
+		grilio_request_append_format(ioreq, "%d", auth);
+		grilio_request_append_utf8(ioreq, proto_str);
+	}
 
 	GASSERT(!req->pending_id);
 	req->pending_id = grilio_queue_send_request_full(priv->q, ioreq,
@@ -997,6 +1114,11 @@ static struct ril_data_request *ril_data_call_deact_new(struct ril_data *data,
 	return req;
 }
 
+static void ril_data_call_deact_cid(struct ril_data *data, int cid)
+{
+	ril_data_request_queue(ril_data_call_deact_new(data, cid, NULL, NULL));
+}
+
 /*==========================================================================*
  * ril_data_allow_request
  *==========================================================================*/
@@ -1023,9 +1145,7 @@ static void ril_data_allow_cb(GRilIoChannel *io, int ril_status,
 			DBG_(data, "data off");
 		}
 
-		if (ril_data_allowed(data) != was_allowed) {
-			ril_data_signal_emit(data, SIGNAL_ALLOW_CHANGED);
-		}
+		ril_data_check_allowed(data, was_allowed);
 	}
 
 	ril_data_request_finish(req);
@@ -1106,7 +1226,8 @@ static gint ril_data_compare_cb(gconstpointer a, gconstpointer b)
 struct ril_data *ril_data_new(struct ril_data_manager *dm, const char *name,
 		struct ril_radio *radio, struct ril_network *network,
 		GRilIoChannel *io, const struct ril_data_options *options,
-		const struct ril_slot_config *config)
+		const struct ril_slot_config *config,
+		struct ril_vendor_hook *vendor_hook)
 {
 	GASSERT(dm);
 	if (G_LIKELY(dm)) {
@@ -1139,9 +1260,16 @@ struct ril_data *ril_data_new(struct ril_data_manager *dm, const char *name,
 		priv->dm = ril_data_manager_ref(dm);
 		priv->radio = ril_radio_ref(radio);
 		priv->network = ril_network_ref(network);
-		priv->io_event_id = grilio_channel_add_unsol_event_handler(io,
+		priv->vendor_hook = ril_vendor_hook_ref(vendor_hook);
+
+		priv->io_event_id[IO_EVENT_DATA_CALL_LIST_CHANGED] =
+			grilio_channel_add_unsol_event_handler(io,
 				ril_data_call_list_changed_cb,
 				RIL_UNSOL_DATA_CALL_LIST_CHANGED, self);
+		priv->io_event_id[IO_EVENT_RESTRICTED_STATE_CHANGED] =
+			grilio_channel_add_unsol_event_handler(io,
+				ril_data_restricted_state_changed_cb,
+				RIL_UNSOL_RESTRICTED_STATE_CHANGED, self);
 
 		priv->settings_event_id[SETTINGS_EVENT_IMSI_CHANGED] =
 			ril_sim_settings_add_imsi_changed_handler(settings,
@@ -1162,6 +1290,18 @@ struct ril_data *ril_data_new(struct ril_data_manager *dm, const char *name,
 	return NULL;
 }
 
+static gboolean ril_data_poll_call_state_retry(GRilIoRequest* req,
+	int ril_status, const void* resp_data, guint resp_len, void* user_data)
+{
+	switch (ril_status) {
+	case RIL_E_SUCCESS:
+	case RIL_E_RADIO_NOT_AVAILABLE:
+		return FALSE;
+	default:
+		return TRUE;
+	}
+}
+
 void ril_data_poll_call_state(struct ril_data *self)
 {
 	if (G_LIKELY(self)) {
@@ -1171,6 +1311,8 @@ void ril_data_poll_call_state(struct ril_data *self)
 			GRilIoRequest *req = grilio_request_new();
 
 			grilio_request_set_retry(req, RIL_RETRY_SECS*1000, -1);
+			grilio_request_set_retry_func(req,
+					ril_data_poll_call_state_retry);
 			priv->query_id =
 				grilio_queue_send_request_full(priv->q, req,
 					RIL_REQUEST_DATA_CALL_LIST,
@@ -1201,6 +1343,8 @@ void ril_data_unref(struct ril_data *self)
 gboolean ril_data_allowed(struct ril_data *self)
 {
 	return G_LIKELY(self) &&
+		(self->priv->restricted_state &
+			RIL_RESTRICTED_STATE_PS_ALL) == 0 &&
 		(self->priv->flags &
 			(RIL_DATA_FLAG_ALLOWED | RIL_DATA_FLAG_ON)) ==
 			(RIL_DATA_FLAG_ALLOWED | RIL_DATA_FLAG_ON);
@@ -1215,9 +1359,7 @@ static void ril_data_deactivate_all(struct ril_data *self)
 			struct ril_data_call *call = l->data;
 			if (call->status == PDP_FAIL_NONE) {
 				DBG_(self, "deactivating call %u", call->cid);
-				ril_data_request_queue(
-					ril_data_call_deact_new(self,
-						call->cid, NULL, NULL));
+				ril_data_call_deact_cid(self, call->cid);
 			}
 		}
 	}
@@ -1285,9 +1427,7 @@ static void ril_data_disallow(struct ril_data *self)
 		ril_data_power_update(self);
 	}
 
-	if (ril_data_allowed(self) != was_allowed) {
-		ril_data_signal_emit(self, SIGNAL_ALLOW_CHANGED);
-	}
+	ril_data_check_allowed(self, was_allowed);
 }
 
 static void ril_data_max_speed_cb(gpointer data, gpointer max_speed)
@@ -1386,12 +1526,39 @@ struct ril_data_request *ril_data_call_deactivate(struct ril_data *self,
 	return req;
 }
 
+gboolean ril_data_call_grab(struct ril_data *self, int cid, void *cookie)
+{
+	if (self && cookie && ril_data_call_find(self->data_calls, cid)) {
+		struct ril_data_priv *priv = self->priv;
+		gpointer key = GINT_TO_POINTER(cid);
+		void *prev = g_hash_table_lookup(priv->grab, key);
+
+		if (!prev) {
+			g_hash_table_insert(priv->grab, key, cookie);
+			return TRUE;
+		} else {
+			return (prev == cookie);
+		}
+	}
+	return FALSE;
+}
+
+void ril_data_call_release(struct ril_data *self, int cid, void *cookie)
+{
+	if (self && cookie) {
+		struct ril_data_priv *priv = self->priv;
+
+		g_hash_table_remove(priv->grab, GUINT_TO_POINTER(cid));
+	}
+}
+
 static void ril_data_init(struct ril_data *self)
 {
 	struct ril_data_priv *priv = G_TYPE_INSTANCE_GET_PRIVATE(self,
 		RIL_DATA_TYPE, struct ril_data_priv);
 
 	self->priv = priv;
+	priv->grab = g_hash_table_new(g_direct_hash, g_direct_equal);
 }
 
 static void ril_data_dispose(GObject *object)
@@ -1405,7 +1572,7 @@ static void ril_data_dispose(GObject *object)
 
 	ril_sim_settings_remove_handlers(settings, priv->settings_event_id,
 					G_N_ELEMENTS(priv->settings_event_id));
-	grilio_channel_remove_handlers(priv->io, &priv->io_event_id, 1);
+	grilio_channel_remove_all_handlers(priv->io, priv->io_event_id);
 	grilio_queue_cancel_all(priv->q, FALSE);
 	priv->query_id = 0;
 
@@ -1419,6 +1586,7 @@ static void ril_data_dispose(GObject *object)
 
 	dm->data_list = g_slist_remove(dm->data_list, self);
 	ril_data_manager_check_data(dm);
+	g_hash_table_destroy(priv->grab);
 	G_OBJECT_CLASS(ril_data_parent_class)->dispose(object);
 }
 
@@ -1435,6 +1603,7 @@ static void ril_data_finalize(GObject *object)
 	ril_network_unref(priv->network);
 	ril_data_manager_unref(priv->dm);
 	ril_data_call_list_free(self->data_calls);
+	ril_vendor_hook_unref(priv->vendor_hook);
 	G_OBJECT_CLASS(ril_data_parent_class)->finalize(object);
 }
 

ofono/drivers/ril/ril_data.h

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2016-2017 Jolla Ltd.
+ *  Copyright (C) 2016-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -17,8 +17,11 @@
 #define RIL_DATA_H
 
 #include "ril_types.h"
+
 #include <ofono/gprs-context.h>
 
+#include <glib-object.h>
+
 enum ril_data_call_active {
 	RIL_DATA_CALL_INACTIVE = 0,
 	RIL_DATA_CALL_LINK_DOWN = 1,
@@ -96,7 +99,8 @@ typedef void (*ril_data_call_deactivate_cb_t)(struct ril_data *data,
 struct ril_data *ril_data_new(struct ril_data_manager *dm, const char *name,
 		struct ril_radio *radio, struct ril_network *network,
 		GRilIoChannel *io, const struct ril_data_options *options,
-		const struct ril_slot_config *config);
+		const struct ril_slot_config *config,
+		struct ril_vendor_hook *vendor_hook);
 struct ril_data *ril_data_ref(struct ril_data *data);
 void ril_data_unref(struct ril_data *data);
 gboolean ril_data_allowed(struct ril_data *data);
@@ -119,11 +123,17 @@ struct ril_data_request *ril_data_call_deactivate(struct ril_data *data,
 void ril_data_request_detach(struct ril_data_request *req);
 void ril_data_request_cancel(struct ril_data_request *req);
 
+gboolean ril_data_call_grab(struct ril_data *data, int cid, void *cookie);
+void ril_data_call_release(struct ril_data *data, int cid, void *cookie);
+
 void ril_data_call_free(struct ril_data_call *call);
 struct ril_data_call *ril_data_call_dup(const struct ril_data_call *call);
 struct ril_data_call *ril_data_call_find(struct ril_data_call_list *list,
 								int cid);
 
+const char *ril_data_ofono_protocol_to_ril(enum ofono_gprs_proto proto);
+int ril_data_protocol_to_ofono(const gchar *str);
+
 /* Constructors of various kinds of RIL requests */
 GRilIoRequest *ril_request_allow_data_new(gboolean allow);
 GRilIoRequest *ril_request_deactivate_data_call_new(int cid);

ofono/drivers/ril/ril_ecclist.h

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2016 Jolla Ltd.
+ *  Copyright (C) 2016-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -18,6 +18,8 @@
 
 #include "ril_types.h"
 
+#include <glib-object.h>
+
 struct ril_ecclist_priv;
 
 struct ril_ecclist {

ofono/drivers/ril/ril_gprs_context.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -23,6 +23,7 @@
 
 #include <arpa/inet.h>
 
+#include "ofono.h"
 #include "common.h"
 #include "mtu-watch.h"
 
@@ -63,7 +64,7 @@ static char *ril_gprs_context_netmask(const char *bits)
 			const char* str;
 			struct in_addr in;
 			in.s_addr = htonl((nbits == 32) ? 0xffffffff :
-					((1 << nbits)-1) << (32-nbits));
+					((1u << nbits)-1) << (32-nbits));
 			str = inet_ntoa(in);
 			if (str) {
 				return g_strdup(str);
@@ -87,6 +88,7 @@ static int ril_gprs_context_address_family(const char *addr)
 static void ril_gprs_context_free_active_call(struct ril_gprs_context *gcd)
 {
 	if (gcd->active_call) {
+		ril_data_call_release(gcd->data, gcd->active_call->cid, gcd);
 		ril_data_call_free(gcd->active_call);
 		gcd->active_call = NULL;
 	}
@@ -110,6 +112,7 @@ static void ril_gprs_context_set_active_call(struct ril_gprs_context *gcd,
 			gcd->mtu_watch = mtu_watch_new(MAX_MTU);
 		}
 		mtu_watch_set_ifname(gcd->mtu_watch, call->ifname);
+		ril_data_call_grab(gcd->data, call->cid, gcd);
 	} else {
 		ril_gprs_context_free_active_call(gcd);
 	}
@@ -377,7 +380,7 @@ static void ril_gprs_context_call_list_changed(struct ril_data *data, void *arg)
 		ril_gprs_context_set_dns_servers(gc, call);
 	}
 
-	ofono_gprs_context_signal_change(gc, call->cid);
+	ofono_gprs_context_signal_change(gc, gcd->active_ctx_cid);
 	ril_data_call_free(prev_call);
 }
 
@@ -395,6 +398,8 @@ static void ril_gprs_context_activate_primary_cb(struct ril_data *data,
 	if (ril_status != RIL_E_SUCCESS) {
 		ofono_error("GPRS context: Reply failure: %s",
 					ril_error_to_string(ril_status));
+	} else if (!call) {
+		ofono_error("Unexpected data call failure");
 	} else if (call->status != PDP_FAIL_NONE) {
 		ofono_error("Unexpected data call status %d", call->status);
 		error.type = OFONO_ERROR_TYPE_CMS;
@@ -444,7 +449,7 @@ static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
 	/* Let's make sure that we aren't connecting when roaming not allowed */
 	if (rs == NETWORK_REGISTRATION_STATUS_ROAMING) {
 		struct ofono_gprs *gprs = ril_modem_ofono_gprs(gcd->modem);
-		if (!ofono_gprs_get_roaming_allowed(gprs) &&
+		if (!__ofono_gprs_get_roaming_allowed(gprs) &&
 			ril_netreg_check_if_really_roaming(netreg, rs) ==
 					NETWORK_REGISTRATION_STATUS_ROAMING) {
 			struct ofono_error error;

ofono/drivers/ril/ril_modem.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -58,8 +58,6 @@ struct ril_modem_data {
 	char *imeisv;
 	char *imei;
 	char *ecclist_file;
-	gboolean pre_sim_done;
-	gboolean allow_data;
 	gulong imsi_event_id;
 
 	guint online_check_id;
@@ -249,7 +247,6 @@ static void ril_modem_pre_sim(struct ofono_modem *modem)
 	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
 
 	DBG("%s", ofono_modem_get_path(modem));
-	md->pre_sim_done = TRUE;
 	ofono_devinfo_create(modem, 0, RILMODEM_DRIVER, md);
 	ofono_sim_create(modem, 0, RILMODEM_DRIVER, md);
 	if (md->modem.config.enable_voicecall) {
@@ -288,8 +285,10 @@ static void ril_modem_post_sim(struct ofono_modem *modem)
 	ofono_call_forwarding_create(modem, 0, RILMODEM_DRIVER, md);
 	ofono_call_barring_create(modem, 0, RILMODEM_DRIVER, md);
 	ofono_stk_create(modem, 0, RILMODEM_DRIVER, md);
-	ofono_cbs_create(modem, 0, RILMODEM_DRIVER, md);
 	ofono_message_waiting_register(ofono_message_waiting_create(modem));
+	if (md->modem.config.enable_cbs) {
+		ofono_cbs_create(modem, 0, RILMODEM_DRIVER, md);
+	}
 }
 
 static void ril_modem_post_online(struct ofono_modem *modem)
@@ -455,8 +454,10 @@ struct ril_modem *ril_modem_create(GRilIoChannel *io, const char *log_prefix,
 		ofono_modem_set_data(ofono, md);
 		err = ofono_modem_register(ofono);
 		if (!err) {
-			ril_radio_power_cycle(modem->radio);
 			GASSERT(io->connected);
+			if (config->radio_power_cycle) {
+				ril_radio_power_cycle(modem->radio);
+			}
 
 			/*
 			 * ofono_modem_reset sets Powered to TRUE without
@@ -469,11 +470,12 @@ struct ril_modem *ril_modem_create(GRilIoChannel *io, const char *log_prefix,
 			/*
 			 * With some RIL implementations, querying available
 			 * band modes causes some magic Android properties to
-			 * appear. Otherwise this request is pretty harmless
-			 * and useless.
+			 * appear.
 			 */
-			grilio_queue_send_request(md->q, NULL,
-				RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE);
+			if (config->query_available_band_mode) {
+				grilio_queue_send_request(md->q, NULL,
+					RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE);
+			}
 
 			ril_modem_update_radio_settings(md);
 			return modem;

ofono/drivers/ril/ril_netmon.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2016-2017 Jolla Ltd.
+ *  Copyright (C) 2016-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -27,6 +27,14 @@ struct ril_netmon {
 	guint register_id;
 };
 
+/* This number must be in sync with ril_netmon_notify_ofono: */
+#define RIL_NETMON_MAX_OFONO_PARAMS (8)
+
+struct ril_netmon_ofono_param {
+	enum ofono_netmon_info type;
+	int value;
+};
+
 static inline struct ril_netmon *ril_netmon_get_data(struct ofono_netmon *ofono)
 {
 	return ofono ? ofono_netmon_get_data(ofono) : NULL;
@@ -40,7 +48,7 @@ static void ril_netmon_format_mccmnc(char *s_mcc, char *s_mnc, int mcc, int mnc)
 	if (mcc >= 0 && mcc <= 999) {
 		snprintf(s_mcc, OFONO_MAX_MCC_LENGTH + 1, "%03d", mcc);
 		if (mnc >= 0 && mnc <= 999) {
-			const int mnclen = mnclength(mcc, mnc);
+			const unsigned int mnclen = mnclength(mcc, mnc);
 			const char *format[] = { "%d", "%02d", "%03d" };
 			const char *fmt = (mnclen > 0 &&
 				mnclen <= G_N_ELEMENTS(format)) ? 
@@ -50,58 +58,171 @@ static void ril_netmon_format_mccmnc(char *s_mcc, char *s_mnc, int mcc, int mnc)
 	}
 }
 
+static void ril_netmon_notify_ofono(struct ofono_netmon *netmon,
+		enum ofono_netmon_cell_type type, int mcc, int mnc,
+		struct ril_netmon_ofono_param *params, int nparams)
+{
+	char s_mcc[OFONO_MAX_MCC_LENGTH + 1];
+	char s_mnc[OFONO_MAX_MNC_LENGTH + 1];
+	int i;
+
+	/* Better not to push uninitialized data to the stack ... */
+	for (i = nparams; i < RIL_NETMON_MAX_OFONO_PARAMS; i++) {
+		params[i].type = OFONO_NETMON_INFO_INVALID;
+		params[i].value = SAILFISH_CELL_INVALID_VALUE;
+	}
+
+	ril_netmon_format_mccmnc(s_mcc, s_mnc, mcc, mnc);
+	ofono_netmon_serving_cell_notify(netmon, type,
+			OFONO_NETMON_INFO_MCC, s_mcc,
+			OFONO_NETMON_INFO_MNC, s_mnc,
+			params[0].type, params[0].value,
+			params[1].type, params[1].value,
+			params[2].type, params[2].value,
+			params[3].type, params[3].value,
+			params[4].type, params[4].value,
+			params[5].type, params[5].value,
+			params[6].type, params[6].value,
+			params[7].type, params[7].value,
+			OFONO_NETMON_INFO_INVALID);
+}
+
 static void ril_netmon_notify_gsm(struct ofono_netmon *netmon,
 				const struct sailfish_cell_info_gsm *gsm)
 {
-	char mcc[OFONO_MAX_MCC_LENGTH + 1];
-	char mnc[OFONO_MAX_MNC_LENGTH + 1];
+	struct ril_netmon_ofono_param params[RIL_NETMON_MAX_OFONO_PARAMS];
+	int n = 0;
 
-	ril_netmon_format_mccmnc(mcc, mnc, gsm->mcc, gsm->mnc);
-	ofono_netmon_serving_cell_notify(netmon,
-			OFONO_NETMON_CELL_TYPE_GSM,
-			OFONO_NETMON_INFO_MCC, mcc,
-			OFONO_NETMON_INFO_MNC, mnc,
-			OFONO_NETMON_INFO_LAC, gsm->lac,
-			OFONO_NETMON_INFO_CI, gsm->cid,
-			OFONO_NETMON_INFO_RSSI, gsm->signalStrength,
-			OFONO_NETMON_INFO_BER, gsm->bitErrorRate,
-			OFONO_NETMON_INFO_INVALID);
+	if (gsm->lac != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_LAC;
+		params[n].value = gsm->lac;
+		n++;
+	}
+
+	if (gsm->cid != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_CI;
+		params[n].value = gsm->cid;
+		n++;
+	}
+
+	if (gsm->arfcn != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_ARFCN;
+		params[n].value = gsm->arfcn;
+		n++;
+	}
+
+	if (gsm->signalStrength != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_RSSI;
+		params[n].value = gsm->signalStrength;
+		n++;
+	}
+
+	if (gsm->bitErrorRate != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_BER;
+		params[n].value = gsm->bitErrorRate;
+		n++;
+	}
+
+	ril_netmon_notify_ofono(netmon, OFONO_NETMON_CELL_TYPE_GSM,
+					gsm->mcc, gsm->mnc, params, n);
 }
 
 static void ril_netmon_notify_wcdma(struct ofono_netmon *netmon,
 				const struct sailfish_cell_info_wcdma *wcdma)
 {
-	char mcc[OFONO_MAX_MCC_LENGTH + 1];
-	char mnc[OFONO_MAX_MNC_LENGTH + 1];
+	struct ril_netmon_ofono_param params[RIL_NETMON_MAX_OFONO_PARAMS];
+	int n = 0;
 
-	ril_netmon_format_mccmnc(mcc, mnc, wcdma->mcc, wcdma->mnc);
-	ofono_netmon_serving_cell_notify(netmon,
-			OFONO_NETMON_CELL_TYPE_UMTS,
-			OFONO_NETMON_INFO_MCC, mcc,
-			OFONO_NETMON_INFO_MNC, mnc,
-			OFONO_NETMON_INFO_LAC, wcdma->lac,
-			OFONO_NETMON_INFO_CI, wcdma->cid,
-			OFONO_NETMON_INFO_PSC, wcdma->psc,
-			OFONO_NETMON_INFO_RSSI, wcdma->signalStrength,
-			OFONO_NETMON_INFO_BER, wcdma->bitErrorRate,
-			OFONO_NETMON_INFO_INVALID);
+	if (wcdma->lac != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_LAC;
+		params[n].value = wcdma->lac;
+		n++;
+	}
+
+	if (wcdma->cid != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_CI;
+		params[n].value = wcdma->cid;
+		n++;
+	}
+
+	if (wcdma->psc != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_PSC;
+		params[n].value = wcdma->psc;
+		n++;
+	}
+
+	if (wcdma->uarfcn != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_ARFCN;
+		params[n].value = wcdma->uarfcn;
+		n++;
+	}
+
+	if (wcdma->signalStrength != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_RSSI;
+		params[n].value = wcdma->signalStrength;
+		n++;
+	}
+
+	if (wcdma->bitErrorRate != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_BER;
+		params[n].value = wcdma->bitErrorRate;
+		n++;
+	}
+
+	ril_netmon_notify_ofono(netmon, OFONO_NETMON_CELL_TYPE_UMTS,
+					wcdma->mcc, wcdma->mnc, params, n);
 }
 
 static void ril_netmon_notify_lte(struct ofono_netmon *netmon,
 				const struct sailfish_cell_info_lte *lte)
 {
-	char mcc[OFONO_MAX_MCC_LENGTH + 1];
-	char mnc[OFONO_MAX_MNC_LENGTH + 1];
+	struct ril_netmon_ofono_param params[RIL_NETMON_MAX_OFONO_PARAMS];
+	int n = 0;
 
-	ril_netmon_format_mccmnc(mcc, mnc, lte->mcc, lte->mnc);
-	ofono_netmon_serving_cell_notify(netmon,
-			OFONO_NETMON_CELL_TYPE_LTE,
-			OFONO_NETMON_INFO_MCC, mcc,
-			OFONO_NETMON_INFO_MNC, mnc,
-			OFONO_NETMON_INFO_CI, lte->ci,
-			OFONO_NETMON_INFO_RSSI, lte->signalStrength,
-			OFONO_NETMON_INFO_TIMING_ADVANCE, lte->timingAdvance,
-			OFONO_NETMON_INFO_INVALID);
+	if (lte->ci != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_CI;
+		params[n].value = lte->ci;
+		n++;
+	}
+
+	if (lte->earfcn != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_EARFCN;
+		params[n].value = lte->earfcn;
+		n++;
+	}
+
+	if (lte->signalStrength != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_RSSI;
+		params[n].value = lte->signalStrength;
+		n++;
+	}
+
+	if (lte->rsrp != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_RSRQ;
+		params[n].value = lte->rsrp;
+		n++;
+	}
+
+	if (lte->rsrq != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_RSRP;
+		params[n].value = lte->rsrq;
+		n++;
+	}
+
+	if (lte->cqi != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_CQI;
+		params[n].value = lte->cqi;
+		n++;
+	}
+
+	if (lte->timingAdvance != SAILFISH_CELL_INVALID_VALUE) {
+		params[n].type = OFONO_NETMON_INFO_TIMING_ADVANCE;
+		params[n].value = lte->timingAdvance;
+		n++;
+	}
+
+	ril_netmon_notify_ofono(netmon, OFONO_NETMON_CELL_TYPE_LTE,
+					lte->mcc, lte->mnc, params, n);
 }
 
 static void ril_netmon_request_update(struct ofono_netmon *netmon,

ofono/drivers/ril/ril_netreg.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2016 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -61,6 +61,8 @@ struct ril_netreg_cbd {
 
 #define ril_netreg_cbd_free g_free
 
+#define DBG_(nd,fmt,args...) DBG("%s" fmt, (nd)->log_prefix, ##args)
+
 static inline struct ril_netreg *ril_netreg_get_data(struct ofono_netreg *ofono)
 {
 	return ofono ? ofono_netreg_get_data(ofono) : NULL;
@@ -109,7 +111,7 @@ static gboolean ril_netreg_status_notify_cb(gpointer user_data)
 	struct ril_netreg *nd = user_data;
 	const struct ril_registration_state *reg = &nd->network->voice;
 
-	DBG("%s", nd->log_prefix);
+	DBG_(nd, "");
 	GASSERT(nd->notify_id);
 	nd->notify_id = 0;
 	ofono_netreg_status_notify(nd->netreg,
@@ -124,9 +126,9 @@ static void ril_netreg_status_notify(struct ril_network *net, void *user_data)
 
 	/* Coalesce multiple notifications into one */
 	if (nd->notify_id) {
-		DBG("%snotification aready queued", nd->log_prefix);
+		DBG_(nd, "notification aready queued");
 	} else {
-		DBG("%squeuing notification", nd->log_prefix);
+		DBG_(nd, "queuing notification");
 		nd->notify_id = g_idle_add(ril_netreg_status_notify_cb, nd);
 	}
 }
@@ -138,7 +140,7 @@ static void ril_netreg_registration_status(struct ofono_netreg *netreg,
 	const struct ril_registration_state *reg = &nd->network->voice;
 	struct ofono_error error;
 
-	DBG("%s", nd->log_prefix);
+	DBG_(nd, "");
 	cb(ril_error_ok(&error),
 			ril_netreg_check_status(nd, reg->status),
 			reg->lac, reg->ci, reg->access_tech, data);
@@ -151,7 +153,7 @@ static gboolean ril_netreg_current_operator_cb(void *user_data)
 	ofono_netreg_operator_cb_t cb = cbd->cb.operator;
 	struct ofono_error error;
 
-	DBG("%s", nd->log_prefix);
+	DBG_(nd, "");
 	GASSERT(nd->current_operator_id);
 	nd->current_operator_id = 0;
 
@@ -322,6 +324,7 @@ static int ril_netreg_get_signal_strength(const void *data, guint len)
 {
 	GRilIoParser rilp;
 	int gw_signal = 0, cdma_dbm = 0, evdo_dbm = 0, lte_signal = 0;
+	int rsrp = 0;
 
 	grilio_parser_init(&rilp, data, len);
 
@@ -341,23 +344,41 @@ static int ril_netreg_get_signal_strength(const void *data, guint len)
 
 	/* LTE_SignalStrength */
 	grilio_parser_get_int32(&rilp, &lte_signal);
-	grilio_parser_get_int32(&rilp, NULL); /* rsrp */
-	grilio_parser_get_int32(&rilp, NULL); /* rsrq */
-	grilio_parser_get_int32(&rilp, NULL); /* rssnr */
-	grilio_parser_get_int32(&rilp, NULL); /* cqi */
+	grilio_parser_get_int32(&rilp, &rsrp);
+	/* The rest is ignored */
 
-	DBG("gw: %d, cdma: %d, evdo: %d, lte: %d", gw_signal, cdma_dbm,
-							evdo_dbm, lte_signal);
+	if (rsrp == INT_MAX) {
+		DBG("gw: %d, cdma: %d, evdo: %d, lte: %d", gw_signal,
+					cdma_dbm, evdo_dbm, lte_signal);
+	}  else {
+		DBG("gw: %d, cdma: %d, evdo: %d, lte: %d rsrp: %d", gw_signal,
+					cdma_dbm, evdo_dbm, lte_signal, rsrp);
+	}
 
 	/* Return the first valid one */
-	if (gw_signal != 99 && gw_signal != -1) {
+
+	/* Some RILs (namely, from MediaTek) report 0 here AND a valid LTE
+	 * RSRP value. If we've got zero, don't report it just yet. */
+	if (gw_signal >= 1 && gw_signal <= 31) {
+		/* Valid values are (0-31, 99) as defined in TS 27.007 */
 		return (gw_signal * 100) / 31;
 	}
 
-	if (lte_signal != 99 && lte_signal != -1) {
+	/* Valid values are (0-31, 99) as defined in TS 27.007 */
+	if (lte_signal >= 0 && lte_signal <= 31) {
 		return (lte_signal * 100) / 31;
 	}
 
+	/* RSRP range: 44 to 140 dBm as defined in 3GPP TS 36.133 */
+	if (lte_signal == 99 && rsrp >= 44 && rsrp <= 140) {
+		return 140 - rsrp;
+	}
+
+	/* If we've got zero strength and no valid RSRP, then so be it */
+	if (gw_signal == 0) {
+		return 0;
+	}
+
 	/* In case of dbm, return the value directly */
 	if (cdma_dbm != -1) {
 		return MIN(cdma_dbm, 100);
@@ -378,7 +399,7 @@ static void ril_netreg_strength_notify(GRilIoChannel *io, guint ril_event,
 
 	GASSERT(ril_event == RIL_UNSOL_SIGNAL_STRENGTH);
 	strength = ril_netreg_get_signal_strength(data, len);
-	DBG("%d", strength);
+	DBG_(nd, "%d", strength);
 	ofono_netreg_strength_notify(nd->netreg, strength);
 }
 
@@ -417,9 +438,8 @@ static void ril_netreg_nitz_notify(GRilIoChannel *io, guint ril_event,
 {
 	struct ril_netreg *nd = user_data;
 	GRilIoParser rilp;
-	struct ofono_network_time time;
-	int year, mon, mday, hour, min, sec, dst, tzi;
-	char tzs, tz[4];
+	int year, mon, mday, hour, min, sec, tzi, dst = 0;
+	char tzs;
 	gchar *nitz;
 
 	GASSERT(ril_event == RIL_UNSOL_NITZ_TIME_RECEIVED);
@@ -427,21 +447,33 @@ static void ril_netreg_nitz_notify(GRilIoChannel *io, guint ril_event,
 	grilio_parser_init(&rilp, data, len);
 	nitz = grilio_parser_get_utf8(&rilp);
 
-	DBG("%s", nitz);
-	sscanf(nitz, "%u/%u/%u,%u:%u:%u%c%u,%u", &year, &mon, &mday,
-			&hour, &min, &sec, &tzs, &tzi, &dst);
-	snprintf(tz, sizeof(tz), "%c%d", tzs, tzi);
+	DBG_(nd, "%s", nitz);
 
-	time.utcoff = atoi(tz) * 15 * 60;
-	time.dst = dst;
-	time.sec = sec;
-	time.min = min;
-	time.hour = hour;
-	time.mday = mday;
-	time.mon = mon;
-	time.year = 2000 + year;
+	/*
+	 * Format: yy/mm/dd,hh:mm:ss(+/-)tz[,ds]
+	 * The ds part is considered optional, initialized to zero.
+	 */
+	if (nitz && sscanf(nitz, "%u/%u/%u,%u:%u:%u%c%u,%u",
+			&year, &mon, &mday, &hour, &min, &sec, &tzs, &tzi,
+			&dst) >= 8 && (tzs == '+' || tzs == '-')) {
+		struct ofono_network_time time;
+		char tz[4];
+
+		snprintf(tz, sizeof(tz), "%c%d", tzs, tzi);
+		time.utcoff = atoi(tz) * 15 * 60;
+		time.dst = dst;
+		time.sec = sec;
+		time.min = min;
+		time.hour = hour;
+		time.mday = mday;
+		time.mon = mon;
+		time.year = 2000 + year;
+
+		ofono_netreg_time_notify(nd->netreg, &time);
+	} else {
+		ofono_warn("Failed to parse NITZ string \"%s\"", nitz);
+	}
 
-	ofono_netreg_time_notify(nd->netreg, &time);
 	g_free(nitz);
 }
 
@@ -482,10 +514,11 @@ static int ril_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
 {
 	struct ril_modem *modem = data;
 	struct ril_netreg *nd = g_new0(struct ril_netreg, 1);
-	guint slot = ril_modem_slot(modem);
 
-	DBG("[%u] %p", slot, netreg);
-	nd->log_prefix = g_strdup_printf("%s_%u ", RILMODEM_DRIVER, slot);
+	nd->log_prefix = (modem->log_prefix && modem->log_prefix[0]) ?
+		g_strconcat(modem->log_prefix, " ", NULL) : g_strdup("");
+
+	DBG_(nd, "%p", netreg);
 	nd->io = grilio_channel_ref(ril_modem_io(modem));
 	nd->q = grilio_queue_new(nd->io);
 	nd->network = ril_network_ref(modem->network);
@@ -499,9 +532,8 @@ static int ril_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
 static void ril_netreg_remove(struct ofono_netreg *netreg)
 {
 	struct ril_netreg *nd = ril_netreg_get_data(netreg);
-	int i;
 
-	DBG("%p", netreg);
+	DBG_(nd, "%p", netreg);
 	grilio_queue_cancel_all(nd->q, FALSE);
 	ofono_netreg_set_data(netreg, NULL);
 
@@ -517,14 +549,10 @@ static void ril_netreg_remove(struct ofono_netreg *netreg)
 		g_source_remove(nd->current_operator_id);
 	}
 
-	for (i=0; i<G_N_ELEMENTS(nd->network_event_id); i++) {
-		ril_network_remove_handler(nd->network, nd->network_event_id[i]);
-	}
+	ril_network_remove_all_handlers(nd->network, nd->network_event_id);
 	ril_network_unref(nd->network);
 
-	grilio_channel_remove_handlers(nd->io, nd->ril_event_id,
-						G_N_ELEMENTS(nd->ril_event_id));
-
+	grilio_channel_remove_all_handlers(nd->io, nd->ril_event_id);
 	grilio_channel_unref(nd->io);
 	grilio_queue_unref(nd->q);
 	g_free(nd->log_prefix);

ofono/drivers/ril/ril_network.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -47,6 +47,12 @@ enum ril_network_radio_event {
 	RADIO_EVENT_COUNT
 };
 
+enum ril_network_sim_events {
+	SIM_EVENT_STATUS_CHANGED,
+	SIM_EVENT_IO_ACTIVE_CHANGED,
+	SIM_EVENT_COUNT
+};
+
 enum ril_network_unsol_event {
 	UNSOL_EVENT_NETWORK_STATE,
 	UNSOL_EVENT_RADIO_CAPABILITY,
@@ -57,8 +63,10 @@ struct ril_network_priv {
 	GRilIoChannel *io;
 	GRilIoQueue *q;
 	struct ril_radio *radio;
-	struct ril_sim_card *sim_card;
+	struct ril_sim_card *simcard;
 	int rat;
+	int lte_network_mode;
+	int network_mode_timeout;
 	char *log_prefix;
 	guint operator_poll_id;
 	guint voice_poll_id;
@@ -68,8 +76,8 @@ struct ril_network_priv {
 	gulong set_rat_id;
 	gulong unsol_event_id[UNSOL_EVENT_COUNT];
 	gulong settings_event_id;
-	gulong sim_status_event_id;
 	gulong radio_event_id[RADIO_EVENT_COUNT];
+	gulong simcard_event_id[SIM_EVENT_COUNT];
 	struct ofono_network_operator operator;
 	gboolean assert_rat;
 };
@@ -111,7 +119,8 @@ G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_UMTS > OFONO_RADIO_ACCESS_MODE_GSM);
 G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_LTE > OFONO_RADIO_ACCESS_MODE_UMTS);
 
 static void ril_network_query_pref_mode(struct ril_network *self);
-static void ril_network_set_pref_mode(struct ril_network *self, int rat);
+static void ril_network_check_pref_mode(struct ril_network *self,
+							gboolean immediate);
 
 static void ril_network_emit(struct ril_network *self,
 						enum ril_network_signal sig)
@@ -208,8 +217,14 @@ static gboolean ril_network_parse_response(struct ril_network *self,
 		reg->max_calls = 2;
 	}
 
-	reg->lac = slac ? strtol(slac, NULL, 16) : -1;
-	reg->ci = sci ? strtol(sci, NULL, 16) : -1;
+	if (!gutil_parse_int(slac, 16, &reg->lac)) {
+		reg->lac = -1;
+	}
+
+	if (!gutil_parse_int(sci, 16, &reg->ci)) {
+		reg->ci = -1;
+	}
+
 	reg->access_tech = ril_parse_tech(stech, &reg->ril_tech);
 
 	DBG_(self, "%s,%s,%s,%d,%s,%s,%s",
@@ -394,12 +409,25 @@ static void ril_network_poll_state(struct ril_network *self)
 	priv->operator_poll_id = ril_network_poll_and_retry(self,
 		priv->operator_poll_id, RIL_REQUEST_OPERATOR,
 		ril_network_poll_operator_cb);
-	priv->voice_poll_id = ril_network_poll_and_retry(self,
-		priv->voice_poll_id, RIL_REQUEST_VOICE_REGISTRATION_STATE,
-		ril_network_poll_voice_state_cb);
-	priv->data_poll_id = ril_network_poll_and_retry(self,
-		priv->data_poll_id, RIL_REQUEST_DATA_REGISTRATION_STATE,
-		ril_network_poll_data_state_cb);
+
+	ril_network_query_registration_state(self);
+}
+
+void ril_network_query_registration_state(struct ril_network *self)
+{
+	if (self) {
+		struct ril_network_priv *priv = self->priv;
+
+		DBG_(self, "");
+		priv->voice_poll_id = ril_network_poll_and_retry(self,
+			priv->voice_poll_id,
+			RIL_REQUEST_VOICE_REGISTRATION_STATE,
+			ril_network_poll_voice_state_cb);
+		priv->data_poll_id = ril_network_poll_and_retry(self,
+			priv->data_poll_id,
+			RIL_REQUEST_DATA_REGISTRATION_STATE,
+			ril_network_poll_data_state_cb);
+	}
 }
 
 static enum ofono_radio_access_mode ril_network_rat_to_mode(int rat)
@@ -429,7 +457,7 @@ static int ril_network_mode_to_rat(struct ril_network *self,
 	case OFONO_RADIO_ACCESS_MODE_ANY:
 	case OFONO_RADIO_ACCESS_MODE_LTE:
 		if (self->settings->techs & OFONO_RADIO_ACCESS_MODE_LTE) {
-			return PREF_NET_TYPE_LTE_GSM_WCDMA;
+			return self->priv->lte_network_mode;
 		}
 		/* no break */
 	default:
@@ -478,37 +506,28 @@ static gboolean ril_network_can_set_pref_mode(struct ril_network *self)
 {
 	struct ril_network_priv *priv = self->priv;
 
-	return priv->radio->online && ril_sim_card_ready(priv->sim_card);
+	/*
+	 * With some modems an attempt to set rat significantly slows
+	 * down SIM I/O, let's avoid that.
+	 */
+	return priv->radio->online && ril_sim_card_ready(priv->simcard) &&
+				!priv->simcard->sim_io_active &&
+				!priv->timer[TIMER_SET_RAT_HOLDOFF] ;
 }
 
 static gboolean ril_network_set_rat_holdoff_cb(gpointer user_data)
 {
 	struct ril_network *self = RIL_NETWORK(user_data);
 	struct ril_network_priv *priv = self->priv;
-	const int rat = ril_network_pref_mode_expected(self);
 
-	DBG_(self, "rat mode %d, expected %d", priv->rat, rat);
 	GASSERT(priv->timer[TIMER_SET_RAT_HOLDOFF]);
 	priv->timer[TIMER_SET_RAT_HOLDOFF] = 0;
 
-	/*
-	 * Don't retry the request if modem is offline or SIM card isn't
-	 * ready, to avoid spamming system log with error messages. Radio
-	 * and SIM card state change callbacks will schedule a new check
-	 * when it's appropriate.
-	 */
-	if (priv->rat != rat || priv->assert_rat) {
-		if (ril_network_can_set_pref_mode(self)) {
-			ril_network_set_pref_mode(self, rat);
-		} else {
-			DBG_(self, "giving up");
-		}
-	}
-
+	ril_network_check_pref_mode(self, FALSE);
 	return G_SOURCE_REMOVE;
 }
 
-static void ril_network_set_pref_mode_cb(GRilIoChannel *io, int status,
+static void ril_network_set_rat_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
 	struct ril_network *self = RIL_NETWORK(user_data);
@@ -523,33 +542,53 @@ static void ril_network_set_pref_mode_cb(GRilIoChannel *io, int status,
 	ril_network_query_pref_mode(self);
 }
 
+static void ril_network_set_rat(struct ril_network *self, int rat)
+{
+	struct ril_network_priv *priv = self->priv;
+
+	if (!priv->set_rat_id && priv->radio->online &&
+		ril_sim_card_ready(priv->simcard) &&
+		/*
+		 * With some modems an attempt to set rat significantly
+		 * slows down SIM I/O, let's avoid that.
+		 */
+		!priv->simcard->sim_io_active &&
+		!priv->timer[TIMER_SET_RAT_HOLDOFF]) {
+		GRilIoRequest *req = grilio_request_sized_new(8);
+
+		DBG_(self, "setting rat mode %d", rat);
+		grilio_request_append_int32(req, 1);   /* count */
+		grilio_request_append_int32(req, rat);
+
+		grilio_request_set_timeout(req, priv->network_mode_timeout);
+		priv->set_rat_id = grilio_queue_send_request_full(priv->q, req,
+					RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE,
+					ril_network_set_rat_cb, NULL, self);
+		grilio_request_unref(req);
+
+		/* We have submitted the request, clear the assertion flag */
+		priv->assert_rat = FALSE;
+
+		/* And don't do it too often */
+		priv->timer[TIMER_SET_RAT_HOLDOFF] =
+			g_timeout_add_seconds(SET_PREF_MODE_HOLDOFF_SEC,
+				ril_network_set_rat_holdoff_cb, self);
+	} else {
+		DBG_(self, "need to set rat mode %d", rat);
+	}
+}
+
 static void ril_network_set_pref_mode(struct ril_network *self, int rat)
 {
 	struct ril_network_priv *priv = self->priv;
-	GRilIoRequest *req = grilio_request_sized_new(8);
 
-	DBG_(self, "setting rat mode %d", rat);
-	grilio_request_append_int32(req, 1);    /* Number of params */
-	grilio_request_append_int32(req, rat);
-
-	grilio_queue_cancel_request(priv->q, priv->set_rat_id, FALSE);
-	priv->set_rat_id = grilio_queue_send_request_full(priv->q, req,
-				RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE,
-				ril_network_set_pref_mode_cb, NULL, self);
-	grilio_request_unref(req);
-
-	/* We have submitted the request, clear the assertion flag */
-	priv->assert_rat = FALSE;
-
-	/* Don't do it too often */
-	GASSERT(!priv->timer[TIMER_SET_RAT_HOLDOFF]);
-	priv->timer[TIMER_SET_RAT_HOLDOFF] =
-		g_timeout_add_seconds(SET_PREF_MODE_HOLDOFF_SEC,
-			ril_network_set_rat_holdoff_cb, self);
+	if (priv->rat != rat || priv->assert_rat) {
+		ril_network_set_rat(self, rat);
+	}
 }
 
 static void ril_network_check_pref_mode(struct ril_network *self,
-							gboolean force)
+							gboolean immediate)
 {
 	struct ril_network_priv *priv = self->priv;
 	const int rat = ril_network_pref_mode_expected(self);
@@ -561,10 +600,14 @@ static void ril_network_check_pref_mode(struct ril_network *self,
 		 * ril_network_pref_mode_changed_cb and is meant
 		 * to force radio tech check right now.
 		 */
-		force = TRUE;
+		immediate = TRUE;
 	}
 
-	if (priv->rat == rat || force) {
+	if (priv->rat != rat) {
+		DBG_(self, "rat mode %d, expected %d", priv->rat, rat);
+	}
+
+	if (immediate) {
 		ril_network_stop_timer(self, TIMER_SET_RAT_HOLDOFF);
 	}
 
@@ -807,8 +850,9 @@ static void ril_network_sim_status_changed_cb(struct ril_sim_card *sc,
 
 struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 			const char *log_prefix, struct ril_radio *radio,
-			struct ril_sim_card *sim_card,
-			struct ril_sim_settings *settings)
+			struct ril_sim_card *simcard,
+			struct ril_sim_settings *settings,
+			const struct ril_slot_config *config)
 {
 	struct ril_network *self = g_object_new(RIL_NETWORK_TYPE, NULL);
 	struct ril_network_priv *priv = self->priv;
@@ -817,10 +861,16 @@ struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 	priv->io = grilio_channel_ref(io);
 	priv->q = grilio_queue_new(priv->io);
 	priv->radio = ril_radio_ref(radio);
-	priv->sim_card = ril_sim_card_ref(sim_card);
+	priv->simcard = ril_sim_card_ref(simcard);
 	priv->log_prefix = (log_prefix && log_prefix[0]) ?
 		g_strconcat(log_prefix, " ", NULL) : g_strdup("");
 	DBG_(self, "");
+
+	/* Copy relevant config values */
+	priv->lte_network_mode = config->lte_network_mode;
+	priv->network_mode_timeout = config->network_mode_timeout;
+
+	/* Register listeners */
 	priv->unsol_event_id[UNSOL_EVENT_NETWORK_STATE] =
 		grilio_channel_add_unsol_event_handler(priv->io,
 			ril_network_state_changed_cb,
@@ -835,12 +885,15 @@ struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 	priv->radio_event_id[RADIO_EVENT_ONLINE_CHANGED] =
 		ril_radio_add_online_changed_handler(priv->radio,
 			ril_network_radio_online_cb, self);
+	priv->simcard_event_id[SIM_EVENT_STATUS_CHANGED] =
+		ril_sim_card_add_status_changed_handler(priv->simcard,
+			ril_network_sim_status_changed_cb, self);
+	priv->simcard_event_id[SIM_EVENT_IO_ACTIVE_CHANGED] =
+		ril_sim_card_add_sim_io_active_changed_handler(priv->simcard,
+			ril_network_sim_status_changed_cb, self);
 	priv->settings_event_id =
 		ril_sim_settings_add_pref_mode_changed_handler(settings,
 			ril_network_pref_mode_changed_cb, self);
-	priv->sim_status_event_id =
-		ril_sim_card_add_status_changed_handler(priv->sim_card,
-			ril_network_sim_status_changed_cb, self);
 
 	/*
 	 * Query the initial state. Querying network state before the radio
@@ -897,16 +950,13 @@ static void ril_network_finalize(GObject *object)
 	}
 
 	grilio_queue_cancel_all(priv->q, FALSE);
-	grilio_channel_remove_handlers(priv->io, priv->unsol_event_id,
-					G_N_ELEMENTS(priv->unsol_event_id));
-
+	grilio_channel_remove_all_handlers(priv->io, priv->unsol_event_id);
 	grilio_channel_unref(priv->io);
 	grilio_queue_unref(priv->q);
 	ril_radio_remove_all_handlers(priv->radio, priv->radio_event_id);
 	ril_radio_unref(priv->radio);
-	ril_sim_card_remove_handler(priv->sim_card,
-						priv->sim_status_event_id);
-	ril_sim_card_unref(priv->sim_card);
+	ril_sim_card_remove_all_handlers(priv->simcard, priv->simcard_event_id);
+	ril_sim_card_unref(priv->simcard);
 	ril_sim_settings_remove_handler(self->settings,
 						priv->settings_event_id);
 	ril_sim_settings_unref(self->settings);

ofono/drivers/ril/ril_network.h

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -18,6 +18,8 @@
 
 #include "ril_types.h"
 
+#include <glib-object.h>
+
 struct ofono_network_operator;
 
 struct ril_registration_state {
@@ -46,7 +48,8 @@ typedef void (*ril_network_cb_t)(struct ril_network *net, void *arg);
 struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 			const char *log_prefix, struct ril_radio *radio,
 			struct ril_sim_card *sim_card,
-			struct ril_sim_settings *settings);
+			struct ril_sim_settings *settings,
+			const struct ril_slot_config *ril_slot_config);
 struct ril_network *ril_network_ref(struct ril_network *net);
 void ril_network_unref(struct ril_network *net);
 
@@ -54,6 +57,7 @@ void ril_network_set_max_pref_mode(struct ril_network *net,
 				enum ofono_radio_access_mode max_pref_mode,
 				gboolean force_check);
 void ril_network_assert_pref_mode(struct ril_network *net, gboolean immediate);
+void ril_network_query_registration_state(struct ril_network *net);
 gulong ril_network_add_operator_changed_handler(struct ril_network *net,
 					ril_network_cb_t cb, void *arg);
 gulong ril_network_add_voice_state_changed_handler(struct ril_network *net,
@@ -67,6 +71,9 @@ gulong ril_network_add_max_pref_mode_changed_handler(struct ril_network *net,
 void ril_network_remove_handler(struct ril_network *net, gulong id);
 void ril_network_remove_handlers(struct ril_network *net, gulong *ids, int n);
 
+#define ril_network_remove_all_handlers(net, ids) \
+	ril_network_remove_handlers(net, ids, G_N_ELEMENTS(ids))
+
 #endif /* RIL_NETWORK_H */
 
 /*

ofono/drivers/ril/ril_radio.c

@@ -71,14 +71,16 @@ G_DEFINE_TYPE(RilRadio, ril_radio, G_TYPE_OBJECT)
 #define RIL_RADIO_TYPE (ril_radio_get_type())
 #define RIL_RADIO(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj,RIL_RADIO_TYPE,RilRadio))
 
+#define DBG_(self,fmt,args...) DBG("%s" fmt, (self)->priv->log_prefix, ##args)
+
 static void ril_radio_submit_power_request(struct ril_radio *self, gboolean on);
 
 static inline gboolean ril_radio_power_should_be_on(struct ril_radio *self)
 {
 	struct ril_radio_priv *priv = self->priv;
 
-	return self->online && !priv->power_cycle &&
-				g_hash_table_size(priv->req_table) > 0;
+	return (self->online || g_hash_table_size(priv->req_table) > 0) &&
+		!priv->power_cycle;
 }
 
 static inline gboolean ril_radio_state_off(enum ril_radio_state radio_state)
@@ -102,7 +104,7 @@ static gboolean ril_radio_power_request_retry_cb(gpointer user_data)
 	struct ril_radio *self = RIL_RADIO(user_data);
 	struct ril_radio_priv *priv = self->priv;
 
-	DBG("%s", priv->log_prefix);
+	DBG_(self, "");
 	GASSERT(priv->retry_id);
 	priv->retry_id = 0;
 	ril_radio_submit_power_request(self,
@@ -116,7 +118,7 @@ static void ril_radio_cancel_retry(struct ril_radio *self)
 	struct ril_radio_priv *priv = self->priv;
 
 	if (priv->retry_id) {
-		DBG("%sretry cancelled", priv->log_prefix);
+		DBG_(self, "retry cancelled");
 		g_source_remove(priv->retry_id);
 		priv->retry_id = 0;
 	}
@@ -129,8 +131,8 @@ static void ril_radio_check_state(struct ril_radio *self)
 	if (!priv->pending_id) {
 		gboolean should_be_on = ril_radio_power_should_be_on(self);
 
-		if (ril_radio_state_on(self->priv->last_known_state) ==
-								should_be_on) {
+		if (ril_radio_state_on(priv->last_known_state) ==
+							should_be_on) {
 			/* All is good, cancel pending retry if there is one */
 			ril_radio_cancel_retry(self);
 		} else if (priv->state_changed_while_request_pending) {
@@ -138,7 +140,7 @@ static void ril_radio_check_state(struct ril_radio *self)
 			ril_radio_submit_power_request(self, should_be_on);
 		} else if (!priv->retry_id) {
 			/* There has been no reaction so far, wait a bit */
-			DBG("%sretry scheduled", priv->log_prefix);
+			DBG_(self, "retry scheduled");
 			priv->retry_id = g_timeout_add_seconds(POWER_RETRY_SECS,
 					ril_radio_power_request_retry_cb, self);
 		}
@@ -147,33 +149,38 @@ static void ril_radio_check_state(struct ril_radio *self)
 	/* Don't update public state while something is pending */
 	if (!priv->pending_id && !priv->retry_id &&
 				self->state != priv->last_known_state) {
-		DBG("%s%s -> %s", priv->log_prefix,
-			ril_radio_state_to_string(self->state),
+		DBG_(self, "%s -> %s", ril_radio_state_to_string(self->state),
 			ril_radio_state_to_string(priv->last_known_state));
 		self->state = priv->last_known_state;
 		ril_radio_emit_signal(self, SIGNAL_STATE_CHANGED);
 	}
 }
 
+static void ril_radio_power_request_done(struct ril_radio *self)
+{
+	struct ril_radio_priv *priv = self->priv;
+
+	GASSERT(priv->pending_id);
+	priv->pending_id = 0;
+
+	if (priv->next_state_valid) {
+		ril_radio_submit_power_request(self, priv->next_state);
+	} else {
+		ril_radio_check_state(self);
+	}
+}
+
 static void ril_radio_power_request_cb(GRilIoChannel *channel, int ril_status,
 				const void *data, guint len, void *user_data)
 {
 	struct ril_radio *self = RIL_RADIO(user_data);
-	struct ril_radio_priv *priv = self->priv;
-
-	GASSERT(priv->pending_id);
-	priv->pending_id = 0;
 
 	if (ril_status != RIL_E_SUCCESS) {
 		ofono_error("Power request failed: %s",
 					ril_error_to_string(ril_status));
 	}
 
-	if (priv->next_state_valid) {
-		ril_radio_submit_power_request(self, priv->next_state);
-	} else {
-		ril_radio_check_state(self);
-	}
+	ril_radio_power_request_done(self);
 }
 
 static void ril_radio_submit_power_request(struct ril_radio *self, gboolean on)
@@ -214,13 +221,18 @@ static void ril_radio_power_request(struct ril_radio *self, gboolean on,
 			/* Wait for the pending request to complete */
 			priv->next_state_valid = TRUE;
 			priv->next_state = on;
-			DBG("%s%s (queued)", priv->log_prefix, on_off);
+			DBG_(self, "%s (queued)", on_off);
 		} else {
-			DBG("%s%s (ignored)", priv->log_prefix, on_off);
+			DBG_(self, "%s (ignored)", on_off);
 		}
 	} else {
-		DBG("%s%s", priv->log_prefix, on_off);
-		ril_radio_submit_power_request(self, on);
+		if (ril_radio_state_on(priv->last_known_state) == on) {
+			DBG_(self, "%s (already)", on_off);
+			ril_radio_check_state(self);
+		} else {
+			DBG_(self, "%s", on_off);
+			ril_radio_submit_power_request(self, on);
+		}
 	}
 }
 
@@ -237,12 +249,12 @@ void ril_radio_power_cycle(struct ril_radio *self)
 		struct ril_radio_priv *priv = self->priv;
 
 		if (ril_radio_state_off(priv->last_known_state)) {
-			DBG("%spower is already off", priv->log_prefix);
+			DBG_(self, "power is already off");
 			GASSERT(!priv->power_cycle);
 		} else if (priv->power_cycle) {
-			DBG("%salready in progress", priv->log_prefix);
+			DBG_(self, "already in progress");
 		} else {
-			DBG("%sinitiated", priv->log_prefix);
+			DBG_(self, "initiated");
 			priv->power_cycle = TRUE;
 			if (!priv->pending_id) {
 				ril_radio_submit_power_request(self, FALSE);
@@ -259,7 +271,7 @@ void ril_radio_power_on(struct ril_radio *self, gpointer tag)
 		if (!g_hash_table_contains(priv->req_table, tag)) {
 			gboolean was_on = ril_radio_power_should_be_on(self);
 
-			DBG("%s%p", priv->log_prefix, tag);
+			DBG_(self, "%p", tag);
 			g_hash_table_insert(priv->req_table, tag, tag);
 			if (!was_on && ril_radio_power_should_be_on(self)) {
 				ril_radio_power_request(self, TRUE, FALSE);
@@ -274,7 +286,7 @@ void ril_radio_power_off(struct ril_radio *self, gpointer tag)
 		struct ril_radio_priv *priv = self->priv;
 
 		if (g_hash_table_remove(priv->req_table, tag)) {
-			DBG("%s%p", priv->log_prefix, tag);
+			DBG_(self, "%p", tag);
 			if (!ril_radio_power_should_be_on(self)) {
 				/* The last one turns the lights off */
 				ril_radio_power_request(self, FALSE, FALSE);
@@ -346,20 +358,41 @@ static void ril_radio_state_changed(GRilIoChannel *io, guint code,
 	if (radio_state != RADIO_STATE_UNAVAILABLE) {
 		struct ril_radio_priv *priv = self->priv;
 
-		DBG("%s%s", priv->log_prefix,
-			ril_radio_state_to_string(radio_state));
+		DBG_(self, "%s", ril_radio_state_to_string(radio_state));
 		GASSERT(!priv->pending_id || !priv->retry_id);
 
 		if (priv->power_cycle && ril_radio_state_off(radio_state)) {
-			DBG("%sswitched off for power cycle", priv->log_prefix);
+			DBG_(self, "switched off for power cycle");
 			priv->power_cycle = FALSE;
 		}
 
+		priv->last_known_state = radio_state;
+
 		if (priv->pending_id) {
-			priv->state_changed_while_request_pending++;
+			if (ril_radio_state_on(radio_state) ==
+					ril_radio_power_should_be_on(self)) {
+				DBG_(self, "dropping pending request");
+				/*
+				 * All right, the modem has switched to the
+				 * desired state, drop the request.
+				 */
+				grilio_queue_cancel_request(priv->q,
+						priv->pending_id, FALSE);
+
+				/*
+				 * This will zero pending_id and call
+				 * ril_radio_check_state() if necesary:
+				 */
+				ril_radio_power_request_done(self);
+
+				/* We are done */
+				return;
+			} else {
+				/* Something weird is going on */
+				priv->state_changed_while_request_pending++;
+			}
 		}
 
-		priv->last_known_state = radio_state;
 		ril_radio_check_state(self);
 	}
 }
@@ -374,7 +407,7 @@ struct ril_radio *ril_radio_new(GRilIoChannel *io)
 	priv->log_prefix =
 		(io && io->name && io->name[0] && strcmp(io->name, "RIL")) ?
 		g_strconcat(io->name, " ", NULL) : g_strdup("");
-	DBG("%s", priv->log_prefix);
+	DBG_(self, "");
 	priv->state_event_id = grilio_channel_add_unsol_event_handler(priv->io,
 				ril_radio_state_changed,
 				RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED, self);
@@ -431,7 +464,7 @@ static void ril_radio_finalize(GObject *object)
 	struct ril_radio *self = RIL_RADIO(object);
 	struct ril_radio_priv *priv = self->priv;
 
-	DBG("%s", priv->log_prefix);
+	DBG_(self, "");
 	g_free(priv->log_prefix);
 	grilio_channel_unref(priv->io);
 	grilio_queue_unref(priv->q);

ofono/drivers/ril/ril_radio.h

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -18,6 +18,8 @@
 
 #include "ril_types.h"
 
+#include <glib-object.h>
+
 struct ril_radio {
 	GObject object;
 	struct ril_radio_priv *priv;

ofono/drivers/ril/ril_radio_caps.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2017 Jolla Ltd.
+ *  Copyright (C) 2017-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -71,6 +71,7 @@ struct ril_radio_caps {
 	gulong max_pref_mode_event_id;
 	gulong radio_event_id;
 	int tx_id;
+	int tx_pending;
 	struct ril_data *data;
 	struct ril_radio *radio;
 	struct ril_network *network;
@@ -85,7 +86,6 @@ typedef struct ril_radio_caps_manager {
 	GObject object;
 	GPtrArray *caps_list;
 	guint check_id;
-	int tx_pending;
 	int tx_id;
 	int tx_phase_index;
 	gboolean tx_failed;
@@ -453,7 +453,7 @@ struct ril_radio_caps *ril_radio_caps_new(struct ril_radio_caps_manager *mgr,
 		struct ril_radio_caps *self =
 			g_slice_new0(struct ril_radio_caps);
 
-		self->ref_count = 1;
+		g_atomic_int_set(&self->ref_count, 1);
 		self->slot = config->slot;
 		self->log_prefix = (log_prefix && log_prefix[0]) ?
 			g_strconcat(log_prefix, " ", NULL) : g_strdup("");
@@ -471,13 +471,16 @@ struct ril_radio_caps *ril_radio_caps_new(struct ril_radio_caps_manager *mgr,
 		self->simcard_event_id[SIM_EVENT_STATE_CHANGED] =
 			ril_sim_card_add_state_changed_handler(sim,
 				ril_radio_caps_simcard_event, self);
+		self->simcard_event_id[SIM_EVENT_IO_ACTIVE_CHANGED] =
+			ril_sim_card_add_sim_io_active_changed_handler(sim,
+				ril_radio_caps_simcard_event, self);
 
 		self->network = ril_network_ref(net);
 		self->settings_event_id[SETTINGS_EVENT_PREF_MODE] =
 			ril_sim_settings_add_pref_mode_changed_handler(
 				settings, ril_radio_caps_settings_event, self);
 		self->settings_event_id[SETTINGS_EVENT_IMSI] =
-			ril_sim_settings_add_pref_mode_changed_handler(
+			ril_sim_settings_add_imsi_changed_handler(
 				settings, ril_radio_caps_settings_event, self);
 
 		self->max_pref_mode_event_id =
@@ -560,6 +563,24 @@ static void ril_radio_caps_manager_foreach_tx
 	}
 }
 
+static gboolean ril_radio_caps_manager_tx_pending
+				(struct ril_radio_caps_manager *self)
+{
+	guint i;
+	const GPtrArray *list = self->caps_list;
+
+	for (i = 0; i < list->len; i++) {
+		const struct ril_radio_caps *caps = list->pdata[i];
+
+		/* Ignore the modems not associated with this transaction */
+		if (caps->tx_id == self->tx_id && caps->tx_pending > 0) {
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
 /**
  * Checks that all radio caps have been initialized (i.e. all the initial
  * GET_RADIO_CAPABILITY requests have completed) and there's no transaction
@@ -568,7 +589,7 @@ static void ril_radio_caps_manager_foreach_tx
 static gboolean ril_radio_caps_manager_can_check
 				(struct ril_radio_caps_manager *self)
 {
-	if (self->caps_list && !self->tx_pending) {
+	if (self->caps_list && !ril_radio_caps_manager_tx_pending(self)) {
 		const GPtrArray *list = self->caps_list;
 		const struct ril_radio_caps *prev_caps = NULL;
 		gboolean all_modes_equal = TRUE;
@@ -753,6 +774,10 @@ static void ril_radio_caps_manager_issue_requests
 				phase->send_new_cap ? &caps->new_cap :
 							&caps->old_cap;
 
+			/* Count it */
+			caps->tx_pending++;
+			DBG_(caps, "tx_pending=%d", caps->tx_pending);
+
 			/* Encode and send the request */
 			grilio_request_append_int32(req,
 					RIL_RADIO_CAPABILITY_VERSION);
@@ -766,9 +791,6 @@ static void ril_radio_caps_manager_issue_requests
 					RIL_REQUEST_SET_RADIO_CAPABILITY,
 					handler, NULL, caps);
 			grilio_request_unref(req);
-
-			/* Count it */
-			self->tx_pending++;
 		}
 	}
 }
@@ -791,7 +813,6 @@ static void ril_radio_caps_manager_next_transaction
 {
 	ril_radio_caps_manager_foreach(self,
 				ril_radio_caps_manager_next_transaction_cb);
-	self->tx_pending = 0;
 	self->tx_failed = FALSE;
 	self->tx_phase_index = -1;
 	self->tx_id++;
@@ -829,8 +850,10 @@ static void ril_radio_caps_manager_abort_cb(GRilIoChannel *io,
 	struct ril_radio_caps *caps = user_data;
 	struct ril_radio_caps_manager *self = caps->mgr;
 
-	GASSERT(self->tx_pending > 0);
-	if (!(--self->tx_pending)) {
+	GASSERT(caps->tx_pending > 0);
+	caps->tx_pending--;
+	DBG_(caps, "tx_pending=%d", caps->tx_pending);
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		DBG("transaction aborted");
 		ril_radio_caps_manager_transaction_done(self);
 	}
@@ -875,7 +898,7 @@ static void ril_radio_caps_manager_next_phase_cb(GRilIoChannel *io,
 	struct ril_radio_caps_manager *self = caps->mgr;
 	gboolean ok = FALSE;
 
-	GASSERT(self->tx_pending > 0);
+	GASSERT(caps->tx_pending > 0);
 	if (ril_status == RIL_E_SUCCESS) {
 		struct ril_radio_capability cap;
 		if (ril_radio_caps_parse(caps->log_prefix, data, len, &cap) &&
@@ -892,7 +915,9 @@ static void ril_radio_caps_manager_next_phase_cb(GRilIoChannel *io,
 		}
 	}
 
-	if (!(--self->tx_pending)) {
+	caps->tx_pending--;
+	DBG_(caps, "tx_pending=%d", caps->tx_pending);
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		if (self->tx_failed) {
 			ril_radio_caps_manager_abort_transaction(self);
 		} else {
@@ -907,7 +932,7 @@ static void ril_radio_caps_manager_next_phase
 	/* Note: -1 > 2 if 2 is unsigned (which turns -1 into 4294967295) */
 	const int max_index = G_N_ELEMENTS(ril_radio_caps_tx_phase) - 1;
 
-	GASSERT(!self->tx_pending);
+	GASSERT(!ril_radio_caps_manager_tx_pending(self));
 	if (self->tx_phase_index >= max_index) {
 		DBG("transaction %d is done", self->tx_id);
 		ril_radio_caps_manager_transaction_done(self);
@@ -924,14 +949,16 @@ static void ril_radio_caps_manager_next_phase
 static void ril_radio_caps_manager_data_off_done(GRilIoChannel *io,
 		int status, const void *req_data, guint len, void *user_data)
 {
-	struct ril_radio_caps_manager *self = RADIO_CAPS_MANAGER(user_data);
+	struct ril_radio_caps *caps = user_data;
+	struct ril_radio_caps_manager *self = caps->mgr;
 
-	DBG("%d", self->tx_pending);
-	GASSERT(self->tx_pending > 0);
+	GASSERT(caps->tx_pending > 0);
 	if (status != GRILIO_STATUS_OK) {
 		self->tx_failed = TRUE;
 	}
-	if (!(--self->tx_pending)) {
+	caps->tx_pending--;
+	DBG_(caps, "tx_pending=%d", caps->tx_pending);
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		if (self->tx_failed) {
 			DBG("failed to start the transaction");
 			ril_data_manager_assert_data_on(self->data_manager);
@@ -951,13 +978,13 @@ static void ril_radio_caps_manager_data_off
 {
 	GRilIoRequest *req = ril_request_allow_data_new(FALSE);
 
-	self->tx_pending++;
-	DBG_(caps, "disallowing data");
+	caps->tx_pending++;
+	DBG_(caps, "tx_pending=%d", caps->tx_pending);
 	grilio_request_set_timeout(req, DATA_OFF_TIMEOUT_MS);
 	grilio_queue_send_request_full(caps->q, req,
 					RIL_REQUEST_ALLOW_DATA,
 					ril_radio_caps_manager_data_off_done,
-					NULL, self);
+					NULL, caps);
 	grilio_request_unref(req);
 }
 
@@ -967,14 +994,16 @@ static void ril_radio_caps_manager_deactivate_data_call_done(GRilIoChannel *io,
 	struct ril_radio_caps *caps = user_data;
 	struct ril_radio_caps_manager *self = caps->mgr;
 
-	GASSERT(self->tx_pending > 0);
+	GASSERT(caps->tx_pending > 0);
 	if (status != GRILIO_STATUS_OK) {
 		self->tx_failed = TRUE;
 		/* Something seems to be slightly broken, try requesting the
 		 * current state (later, after we release the transaction). */
 		ril_data_poll_call_state(caps->data);
 	}
-	if (!(--self->tx_pending)) {
+	caps->tx_pending--;
+	DBG_(caps, "tx_pending=%d", caps->tx_pending);
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		if (self->tx_failed) {
 			DBG("failed to start the transaction");
 			ril_radio_caps_manager_recheck_later(self);
@@ -992,8 +1021,8 @@ static void ril_radio_caps_deactivate_data_call(struct ril_radio_caps *caps,
 {
 	GRilIoRequest *req = ril_request_deactivate_data_call_new(cid);
 
-	caps->mgr->tx_pending++;
-	DBG_(caps, "deactivating call %u", cid);
+	caps->tx_pending++;
+	DBG_(caps, "cid=%u, tx_pending=%d", cid, caps->tx_pending);
 	grilio_request_set_blocking(req, TRUE);
 	grilio_request_set_timeout(req, DEACTIVATE_TIMEOUT_MS);
 	grilio_queue_send_request_full(caps->q, req,
@@ -1028,11 +1057,11 @@ static void ril_radio_caps_manager_deactivate_all
 {
 	ril_radio_caps_manager_foreach_tx(self,
 				ril_radio_caps_manager_deactivate_all_cb);
-	if (!self->tx_pending) {
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		/* No data calls, submit ALLOW_DATA requests right away */
 		ril_radio_caps_manager_foreach_tx(self,
 					ril_radio_caps_manager_data_off);
-		GASSERT(self->tx_pending);
+		GASSERT(ril_radio_caps_manager_tx_pending(self));
 	}
 }
 
@@ -1255,6 +1284,24 @@ static GSList *ril_radio_caps_manager_empty_slots
 	return found;
 }
 
+static guint ril_radio_caps_manager_sim_count
+					(struct ril_radio_caps_manager *self)
+{
+	const GPtrArray *list = self->caps_list;
+	guint i, count = 0;
+
+	for (i = 0; i < list->len; i++) {
+		const struct ril_radio_caps *caps = list->pdata[i];
+
+		if (caps->simcard->status->card_state ==
+						RIL_CARDSTATE_PRESENT) {
+			count++;
+		}
+	}
+
+	return count;
+}
+
 /**
  * There could be no capability mismatch but LTE could be enabled for
  * the slot that has no SIM card in it. That's a waste, fix it.
@@ -1298,7 +1345,7 @@ static void ril_radio_caps_manager_check(struct ril_radio_caps_manager *self)
 	if (ril_radio_caps_manager_can_check(self)) {
 		const int first = ril_radio_caps_manager_first_mismatch(self);
 
-		if (first >= 0) {
+		if (first >= 0 && ril_radio_caps_manager_sim_count(self) > 1) {
 			if (ril_radio_caps_manager_update_caps(self, first)) {
 				ril_radio_caps_manager_start_transaction(self);
 			}
@@ -1321,7 +1368,7 @@ static gboolean ril_radio_caps_manager_check_cb(gpointer data)
 static void ril_radio_caps_manager_recheck_later
 					(struct ril_radio_caps_manager *self)
 {
-	if (!self->tx_pending) {
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		if (self->check_id) {
 			g_source_remove(self->check_id);
 			self->check_id = 0;
@@ -1334,7 +1381,7 @@ static void ril_radio_caps_manager_recheck_later
 static void ril_radio_caps_manager_schedule_check
 					(struct ril_radio_caps_manager *self)
 {
-	if (!self->check_id && !self->tx_pending) {
+	if (!self->check_id && !ril_radio_caps_manager_tx_pending(self)) {
 		self->check_id = g_idle_add(ril_radio_caps_manager_check_cb,
 									self);
 	}

ofono/drivers/ril/ril_sim.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -18,11 +18,15 @@
 #include "ril_util.h"
 #include "ril_log.h"
 
+#include "sailfish_watch.h"
 #include "simutil.h"
 #include "util.h"
 #include "ofono.h"
 
 #define SIM_STATE_CHANGE_TIMEOUT_SECS (5)
+#define FAC_LOCK_QUERY_TIMEOUT_SECS   (10)
+#define FAC_LOCK_QUERY_RETRIES        (1)
+#define SIM_IO_TIMEOUT_SECS           (20)
 
 #define EF_STATUS_INVALIDATED 0
 #define EF_STATUS_VALID 1
@@ -65,6 +69,11 @@ enum ril_sim_card_event {
 	SIM_CARD_EVENT_COUNT
 };
 
+enum ril_sim_io_event {
+	IO_EVENT_SIM_REFRESH,
+	IO_EVENT_COUNT
+};
+
 struct ril_sim {
 	GRilIoChannel *io;
 	GRilIoQueue *q;
@@ -75,13 +84,17 @@ struct ril_sim {
 	int retries[OFONO_SIM_PASSWORD_INVALID];
 	gboolean empty_pin_query_allowed;
 	gboolean inserted;
-	guint idle_id;
+	guint idle_id; /* Used by register and SIM reset callbacks */
 	gulong card_event_id[SIM_CARD_EVENT_COUNT];
+	gulong io_event_id[IO_EVENT_COUNT];
 	guint query_pin_retries_id;
 
 	const char *log_prefix;
 	char *allocated_log_prefix;
 
+	struct sailfish_watch *watch;
+	gulong sim_state_watch_id;
+
 	/* query_passwd_state context */
 	ofono_sim_passwd_cb_t query_passwd_state_cb;
 	void *query_passwd_state_cb_data;
@@ -95,8 +108,9 @@ struct ril_sim_io_response {
 	guint data_len;
 };
 
-struct ril_sim_cbd {
+struct ril_sim_cbd_io {
 	struct ril_sim *sd;
+	struct ril_sim_card *card;
 	union _ofono_sim_cb {
 		ofono_sim_file_info_cb_t file_info;
 		ofono_sim_read_cb_t read;
@@ -166,24 +180,43 @@ static const struct ril_sim_retry_query ril_sim_retry_query_types[] = {
 
 #define DBG_(sd,fmt,args...) DBG("%s" fmt, (sd)->log_prefix, ##args)
 
-#define ril_sim_cbd_free g_free
-
 static inline struct ril_sim *ril_sim_get_data(struct ofono_sim *sim)
 {
 	return ofono_sim_get_data(sim);
 }
 
-static struct ril_sim_cbd *ril_sim_cbd_new(struct ril_sim *sd, void *cb,
+static struct ril_sim_cbd_io *ril_sim_cbd_io_new(struct ril_sim *sd, void *cb,
 								void *data)
 {
-	struct ril_sim_cbd *cbd = g_new0(struct ril_sim_cbd, 1);
+	struct ril_sim_cbd_io *cbd = g_new0(struct ril_sim_cbd_io, 1);
 
 	cbd->sd = sd;
 	cbd->cb.ptr = cb;
 	cbd->data = data;
+	cbd->card = ril_sim_card_ref(sd->card);
 	return cbd;
 }
 
+static void ril_sim_cbd_io_free(void *data)
+{
+
+	struct ril_sim_cbd_io *cbd = data;
+
+	ril_sim_card_sim_io_finished(cbd->card, cbd->req_id);
+	ril_sim_card_unref(cbd->card);
+	g_free(cbd);
+}
+
+static void ril_sim_cbd_io_start(struct ril_sim_cbd_io *cbd, GRilIoRequest* req,
+				guint code, GRilIoChannelResponseFunc cb)
+{
+	struct ril_sim *sd = cbd->sd;
+
+	cbd->req_id = grilio_queue_send_request_full(sd->q, req, code,
+						cb, ril_sim_cbd_io_free, cbd);
+	ril_sim_card_sim_io_started(cbd->card, cbd->req_id);
+}
+
 static void ril_sim_pin_cbd_state_event_count_cb(struct ril_sim_card *sc,
 							void *user_data)
 {
@@ -242,11 +275,6 @@ static void ril_sim_pin_req_done(gpointer ptr)
 	}
 }
 
-static const char *ril_sim_app_id(struct ril_sim *sd)
-{
-	return sd->card->app ? sd->card->app->aid : NULL;
-}
-
 int ril_sim_app_type(struct ofono_sim *sim)
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
@@ -416,14 +444,13 @@ static void ril_sim_io_response_free(struct ril_sim_io_response *res)
 static void ril_sim_file_info_cb(GRilIoChannel *io, int status,
 			const void *data, guint len, void *user_data)
 {
-	struct ril_sim_cbd *cbd = user_data;
+	struct ril_sim_cbd_io *cbd = user_data;
 	ofono_sim_file_info_cb_t cb = cbd->cb.file_info;
 	struct ril_sim *sd = cbd->sd;
 	struct ril_sim_io_response *res = NULL;
 	struct ofono_error error;
 
 	DBG_(sd, "");
-	ril_sim_card_sim_io_finished(sd->card, cbd->req_id);
 
 	ril_error_init_failure(&error);
 	res = ril_sim_parse_io_response(data, len);
@@ -467,12 +494,13 @@ static void ril_sim_file_info_cb(GRilIoChannel *io, int status,
 static void ril_sim_request_io(struct ril_sim *sd, guint cmd, int fileid,
 		guint p1, guint p2, guint p3, const char *hex_data,
 		const guchar *path, guint path_len,
-		GRilIoChannelResponseFunc cb, struct ril_sim_cbd *cbd)
+		GRilIoChannelResponseFunc cb, struct ril_sim_cbd_io *cbd)
 {
 	GRilIoRequest *req = grilio_request_new();
 
 	DBG_(sd, "cmd=0x%.2X,efid=0x%.4X,%d,%d,%d,%s,pin2=(null),aid=%s",
-			cmd, fileid, p1, p2, p3, hex_data, ril_sim_app_id(sd));
+					cmd, fileid, p1, p2, p3, hex_data,
+					ril_sim_card_app_aid(sd->card));
 
 	grilio_request_append_int32(req, cmd);
 	grilio_request_append_int32(req, fileid);
@@ -482,12 +510,11 @@ static void ril_sim_request_io(struct ril_sim *sd, guint cmd, int fileid,
 	grilio_request_append_int32(req, p3);       /* P3 */
 	grilio_request_append_utf8(req, hex_data);  /* data; only for writes */
 	grilio_request_append_utf8(req, NULL);      /* pin2; only for writes */
-	grilio_request_append_utf8(req, ril_sim_app_id(sd));
+	grilio_request_append_utf8(req, ril_sim_card_app_aid(sd->card));
 
 	grilio_request_set_blocking(req, TRUE);
-	cbd->req_id = grilio_queue_send_request_full(sd->q, req,
-				RIL_REQUEST_SIM_IO, cb, ril_sim_cbd_free, cbd);
-	ril_sim_card_sim_io_started(sd->card, cbd->req_id);
+	grilio_request_set_timeout(req, SIM_IO_TIMEOUT_SECS * 1000);
+	ril_sim_cbd_io_start(cbd, req, RIL_REQUEST_SIM_IO, cb);
 	grilio_request_unref(req);
 }
 
@@ -497,19 +524,19 @@ static void ril_sim_ofono_read_file_info(struct ofono_sim *sim, int fileid,
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
 	ril_sim_request_io(sd, CMD_GET_RESPONSE, fileid, 0, 0, 15, NULL,
-		path, len, ril_sim_file_info_cb, ril_sim_cbd_new(sd, cb, data));
+				path, len, ril_sim_file_info_cb,
+				ril_sim_cbd_io_new(sd, cb, data));
 }
 
 static void ril_sim_read_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
-	struct ril_sim_cbd *cbd = user_data;
+	struct ril_sim_cbd_io *cbd = user_data;
 	ofono_sim_read_cb_t cb = cbd->cb.read;
 	struct ril_sim_io_response *res;
 	struct ofono_error err;
 
 	DBG_(cbd->sd, "");
-	ril_sim_card_sim_io_finished(cbd->sd->card, cbd->req_id);
 
 	res = ril_sim_parse_io_response(data, len);
 	if (ril_sim_io_response_ok(res) && status == RIL_E_SUCCESS) {
@@ -528,7 +555,7 @@ static void ril_sim_read(struct ofono_sim *sim, guint cmd, int fileid,
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
 	ril_sim_request_io(sd, cmd, fileid, p1, p2, p3, NULL, path, path_len,
-			ril_sim_read_cb, ril_sim_cbd_new(sd, cb, data));
+			ril_sim_read_cb, ril_sim_cbd_io_new(sd, cb, data));
 }
 
 static void ril_sim_ofono_read_file_transparent(struct ofono_sim *sim,
@@ -558,13 +585,12 @@ static void ril_sim_ofono_read_file_cyclic(struct ofono_sim *sim, int fileid,
 static void ril_sim_write_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
-	struct ril_sim_cbd *cbd = user_data;
+	struct ril_sim_cbd_io *cbd = user_data;
 	ofono_sim_write_cb_t cb = cbd->cb.write;
 	struct ril_sim_io_response *res;
 	struct ofono_error err;
 
 	DBG_(cbd->sd, "");
-	ril_sim_card_sim_io_finished(cbd->sd->card, cbd->req_id);
 
 	res = ril_sim_parse_io_response(data, len);
 	if (ril_sim_io_response_ok(res) && status == RIL_E_SUCCESS) {
@@ -585,7 +611,7 @@ static void ril_sim_write(struct ofono_sim *sim, guint cmd, int fileid,
 	struct ril_sim *sd = ril_sim_get_data(sim);
 	char *hex_data = encode_hex(value, length, 0);
 	ril_sim_request_io(sd, cmd, fileid, p1, p2, length, hex_data, path,
-		path_len, ril_sim_write_cb, ril_sim_cbd_new(sd, cb, data));
+		path_len, ril_sim_write_cb, ril_sim_cbd_io_new(sd, cb, data));
 	g_free(hex_data);
 }
 
@@ -622,12 +648,10 @@ static void ril_sim_write_file_cyclic(struct ofono_sim *sim, int fileid,
 static void ril_sim_get_imsi_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
-	struct ril_sim_cbd *cbd = user_data;
+	struct ril_sim_cbd_io *cbd = user_data;
 	ofono_sim_imsi_cb_t cb = cbd->cb.imsi;
 	struct ofono_error error;
 
-	ril_sim_card_sim_io_finished(cbd->sd->card, cbd->req_id);
-
 	if (status == RIL_E_SUCCESS) {
 		gchar *imsi;
 		GRilIoParser rilp;
@@ -652,8 +676,8 @@ static void ril_sim_read_imsi(struct ofono_sim *sim, ofono_sim_imsi_cb_t cb,
 				void *data)
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
-	const char *app_id = ril_sim_app_id(sd);
-	struct ril_sim_cbd *cbd = ril_sim_cbd_new(sd, cb, data);
+	const char *app_id = ril_sim_card_app_aid(sd->card);
+	struct ril_sim_cbd_io *cbd = ril_sim_cbd_io_new(sd, cb, data);
 	GRilIoRequest *req = grilio_request_array_utf8_new(1, app_id);
 
 	DBG_(sd, "%s", app_id);
@@ -665,10 +689,8 @@ static void ril_sim_read_imsi(struct ofono_sim *sim, ofono_sim_imsi_cb_t cb,
 	 */
 	grilio_request_set_retry(req, RIL_RETRY_MS, -1);
 	grilio_request_set_blocking(req, TRUE);
-	cbd->req_id = grilio_queue_send_request_full(sd->q, req,
-				RIL_REQUEST_GET_IMSI, ril_sim_get_imsi_cb,
-				ril_sim_cbd_free, cbd);
-	ril_sim_card_sim_io_started(sd->card, cbd->req_id);
+	ril_sim_cbd_io_start(cbd, req, RIL_REQUEST_GET_IMSI,
+						ril_sim_get_imsi_cb);
 	grilio_request_unref(req);
 }
 
@@ -850,6 +872,18 @@ static void ril_sim_status_changed_cb(struct ril_sim_card *sc, void *user_data)
 	}
 }
 
+static void ril_sim_state_changed_cb(struct sailfish_watch *watch, void *data)
+{
+	struct ril_sim *sd = data;
+	const enum ofono_sim_state state = ofono_sim_get_state(watch->sim);
+
+	DBG_(sd, "%d %d", state, sd->inserted);
+	if (state == OFONO_SIM_STATE_RESETTING && sd->inserted) {
+		/* That will simulate SIM card removal: */
+		ril_sim_card_reset(sd->card);
+	}
+}
+
 static int ril_sim_parse_retry_count(const void *data, guint len)
 {
 	int retry_count = -1;
@@ -864,21 +898,22 @@ static int ril_sim_parse_retry_count(const void *data, guint len)
 static GRilIoRequest *ril_sim_enter_sim_pin_req(struct ril_sim *sd,
 							const char *pin)
 {
-	const char *app_id = ril_sim_app_id(sd);
-	if (app_id) {
-		GRilIoRequest *req = grilio_request_array_utf8_new(2,
-							pin, app_id);
+	/*
+	 * If there's no AID then so be it... Some
+	 * adaptations (namely, MTK) don't provide it
+	 * but don't seem to require it either.
+	 */
+	GRilIoRequest *req = grilio_request_array_utf8_new(2, pin,
+					ril_sim_card_app_aid(sd->card));
 
-		grilio_request_set_blocking(req, TRUE);
-		return req;
-	}
-	return NULL;
+	grilio_request_set_blocking(req, TRUE);
+	return req;
 }
 
 static GRilIoRequest *ril_sim_enter_sim_puk_req(struct ril_sim *sd,
 					const char *puk, const char *pin)
 {
-	const char *app_id = ril_sim_app_id(sd);
+	const char *app_id = ril_sim_card_app_aid(sd->card);
 	if (app_id) {
 		GRilIoRequest *req = grilio_request_array_utf8_new(3,
 							puk, pin, app_id);
@@ -1180,7 +1215,7 @@ static void ril_sim_pin_send(struct ofono_sim *sim, const char *passwd,
 	GRilIoRequest *req = ril_sim_enter_sim_pin_req(sd, passwd);
 
 	if (req) {
-		DBG_(sd, "%s,aid=%s", passwd, ril_sim_app_id(sd));
+		DBG_(sd, "%s,aid=%s", passwd, ril_sim_card_app_aid(sd->card));
 		grilio_queue_send_request_full(sd->q, req,
 			RIL_REQUEST_ENTER_SIM_PIN, ril_sim_pin_change_state_cb,
 			ril_sim_pin_req_done, ril_sim_pin_cbd_new(sd,
@@ -1207,10 +1242,7 @@ static guint ril_perso_change_state(struct ofono_sim *sim,
 	case OFONO_SIM_PASSWORD_PHNET_PIN:
 		if (!enable) {
 			code = RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION;
-			req = grilio_request_sized_new(12);
-			grilio_request_append_int32(req,
-					RIL_PERSOSUBSTATE_SIM_NETWORK);
-			grilio_request_append_utf8(req, passwd);
+			req = grilio_request_array_utf8_new(1, passwd);
 		} else {
 			DBG_(sd, "Not supported, enable=%d", enable);
 		}
@@ -1223,7 +1255,7 @@ static guint ril_perso_change_state(struct ofono_sim *sim,
 	if (req) {
 		id = grilio_queue_send_request_full(sd->q, req, code,
 			ril_sim_pin_change_state_cb, ril_sim_pin_req_done,
-			ril_sim_pin_cbd_new(sd, passwd_type, TRUE, cb, data));
+			ril_sim_pin_cbd_new(sd, passwd_type, FALSE, cb, data));
 		grilio_request_unref(req);
 	}
 
@@ -1259,7 +1291,7 @@ static void ril_sim_pin_change_state(struct ofono_sim *sim,
 	const char *passwd, ofono_sim_lock_unlock_cb_t cb, void *data)
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
-	const char *app_id = ril_sim_app_id(sd);
+	const char *app_id = ril_sim_card_app_aid(sd->card);
 	const char *type_str = ril_sim_facility_code(passwd_type);
 	struct ofono_error error;
 	guint id = 0;
@@ -1279,7 +1311,7 @@ static void ril_sim_pin_change_state(struct ofono_sim *sim,
 		id = grilio_queue_send_request_full(sd->q, req,
 			RIL_REQUEST_SET_FACILITY_LOCK,
 			ril_sim_pin_change_state_cb, ril_sim_pin_req_done,
-			ril_sim_pin_cbd_new(sd, passwd_type, TRUE, cb, data));
+			ril_sim_pin_cbd_new(sd, passwd_type, FALSE, cb, data));
 		grilio_request_unref(req);
 	}
 
@@ -1297,7 +1329,7 @@ static void ril_sim_pin_send_puk(struct ofono_sim *sim,
 
 	if (req) {
 		DBG_(sd, "puk=%s,pin=%s,aid=%s", puk, passwd,
-							ril_sim_app_id(sd));
+					ril_sim_card_app_aid(sd->card));
 		grilio_queue_send_request_full(sd->q, req,
 			RIL_REQUEST_ENTER_SIM_PUK, ril_sim_pin_change_state_cb,
 			ril_sim_pin_req_done, ril_sim_pin_cbd_new(sd,
@@ -1317,7 +1349,7 @@ static void ril_sim_change_passwd(struct ofono_sim *sim,
 				ofono_sim_lock_unlock_cb_t cb, void *data)
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
-	const char *app_id = ril_sim_app_id(sd);
+	const char *app_id = ril_sim_card_app_aid(sd->card);
 	GRilIoRequest *req = grilio_request_array_utf8_new(3,
 					old_passwd, new_passwd, app_id);
 
@@ -1335,11 +1367,9 @@ static void ril_sim_query_facility_lock_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
 	struct ofono_error error;
-	struct ril_sim_cbd *cbd = user_data;
+	struct ril_sim_cbd_io *cbd = user_data;
 	ofono_query_facility_lock_cb_t cb = cbd->cb.query_facility_lock;
 
-	ril_sim_card_sim_io_finished(cbd->sd->card, cbd->req_id);
-
 	if (status == RIL_E_SUCCESS) {
 		int locked = 0;
 		GRilIoParser rilp;
@@ -1356,24 +1386,47 @@ static void ril_sim_query_facility_lock_cb(GRilIoChannel *io, int status,
 	cb(ril_error_failure(&error), FALSE, cbd->data);
 }
 
+static gboolean ril_sim_query_facility_lock_retry(GRilIoRequest* req,
+				int ril_status, const void* response_data,
+				guint response_len, void* user_data)
+{
+	return (ril_status == GRILIO_STATUS_TIMEOUT);
+}
+
 static void ril_sim_query_facility_lock(struct ofono_sim *sim,
 				enum ofono_sim_password_type type,
 				ofono_query_facility_lock_cb_t cb, void *data)
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
 	const char *type_str = ril_sim_facility_code(type);
-	struct ril_sim_cbd *cbd = ril_sim_cbd_new(sd, cb, data);
+	struct ril_sim_cbd_io *cbd = ril_sim_cbd_io_new(sd, cb, data);
 	GRilIoRequest *req = grilio_request_array_utf8_new(4,
-			type_str, "", "0" /* class */, ril_sim_app_id(sd));
+		type_str, "", "0" /* class */, ril_sim_card_app_aid(sd->card));
+
+	/* Make sure that this request gets completed sooner or later */
+	grilio_request_set_timeout(req, FAC_LOCK_QUERY_TIMEOUT_SECS * 1000);
+	grilio_request_set_retry(req, RIL_RETRY_MS, FAC_LOCK_QUERY_RETRIES);
+	grilio_request_set_retry_func(req, ril_sim_query_facility_lock_retry);
 
 	DBG_(sd, "%s", type_str);
-	cbd->req_id = grilio_queue_send_request_full(sd->q, req,
-		RIL_REQUEST_QUERY_FACILITY_LOCK, ril_sim_query_facility_lock_cb,
-		ril_sim_cbd_free, cbd);
-	ril_sim_card_sim_io_started(sd->card, cbd->req_id);
+	ril_sim_cbd_io_start(cbd, req, RIL_REQUEST_QUERY_FACILITY_LOCK,
+					ril_sim_query_facility_lock_cb);
 	grilio_request_unref(req);
 }
 
+static void ril_sim_refresh_cb(GRilIoChannel *io, guint code,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_sim *sd = user_data;
+
+	/*
+	 * RIL_UNSOL_SIM_REFRESH may contain the EFID of the updated file,
+	 * so we could be more descrete here. However I have't actually
+	 * seen that in real life, let's just refresh everything for now.
+	 */
+	__ofono_sim_refresh(sd->sim, NULL, TRUE, TRUE);
+}
+
 static gboolean ril_sim_register(gpointer user)
 {
 	struct ril_sim *sd = user;
@@ -1391,6 +1444,14 @@ static gboolean ril_sim_register(gpointer user)
 	sd->card_event_id[SIM_CARD_APP_EVENT] =
 		ril_sim_card_add_app_changed_handler(sd->card,
 					ril_sim_app_changed_cb, sd);
+	sd->sim_state_watch_id =
+		sailfish_watch_add_sim_state_changed_handler(sd->watch,
+					ril_sim_state_changed_cb, sd);
+
+	/* And RIL events */
+	sd->io_event_id[IO_EVENT_SIM_REFRESH] =
+		grilio_channel_add_unsol_event_handler(sd->io,
+			ril_sim_refresh_cb, RIL_UNSOL_SIM_REFRESH, sd);
 
 	/* Check the current state */
 	ril_sim_status_changed_cb(sd->card, sd);
@@ -1409,6 +1470,7 @@ static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,
 	sd->io = grilio_channel_ref(ril_modem_io(modem));
 	sd->card = ril_sim_card_ref(modem->sim_card);
 	sd->q = grilio_queue_new(sd->io);
+	sd->watch = sailfish_watch_new(ril_modem_get_path(modem));
 
 	if (modem->log_prefix && modem->log_prefix[0]) {
 		sd->log_prefix = sd->allocated_log_prefix =
@@ -1429,6 +1491,7 @@ static void ril_sim_remove(struct ofono_sim *sim)
 
 	DBG_(sd, "");
 	g_list_free_full(sd->pin_cbd_list, ril_sim_pin_cbd_list_free_cb);
+	grilio_channel_remove_all_handlers(sd->io, sd->io_event_id);
 	grilio_queue_cancel_all(sd->q, FALSE);
 	ofono_sim_set_data(sim, NULL);
 
@@ -1445,6 +1508,9 @@ static void ril_sim_remove(struct ofono_sim *sim)
 			sd->query_passwd_state_sim_status_refresh_id);
 	}
 
+	sailfish_watch_remove_handler(sd->watch, sd->sim_state_watch_id);
+	sailfish_watch_unref(sd->watch);
+
 	ril_sim_card_remove_handlers(sd->card, sd->card_event_id,
 					G_N_ELEMENTS(sd->card_event_id));
 	ril_sim_card_unref(sd->card);

ofono/drivers/ril/ril_sim_card.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -24,6 +24,17 @@
 
 #include <gutil_misc.h>
 
+/*
+ * First we wait for USIM app to get activated by itself. If that
+ * doesn't happen within UICC_SUBSCRIPTION_START_MS we poke the SIM
+ * with SET_UICC_SUBSCRIPTION request, resubmitting it if it times out.
+ * If nothing happens within UICC_SUBSCRIPTION_TIMEOUT_MS we give up.
+ *
+ * Submitting SET_UICC_SUBSCRIPTION request when rild doesn't expect
+ * it sometimes breaks pretty much everything. Unfortunately, there no
+ * reliable way to find out when rild expects it and when it doesn't :/
+ */
+#define UICC_SUBSCRIPTION_START_MS    (5000)
 #define UICC_SUBSCRIPTION_TIMEOUT_MS (30000)
 
 /* SIM I/O idle timeout is measured in the number of idle loops.
@@ -48,6 +59,7 @@ struct ril_sim_card_priv {
 	int flags;
 	guint status_req_id;
 	guint sub_req_id;
+	guint sub_start_timer;
 	gulong event_id[EVENT_COUNT];
 	guint sim_io_idle_id;
 	guint sim_io_idle_count;
@@ -157,10 +169,55 @@ static void ril_sim_card_status_free(struct ril_sim_card_status *status)
 	}
 }
 
+static void ril_sim_card_tx_start(struct ril_sim_card *self)
+{
+	struct ril_sim_card_priv *priv = self->priv;
+	GRILIO_TRANSACTION_STATE tx_state =
+		grilio_queue_transaction_state(priv->q);
+
+	if (tx_state == GRILIO_TRANSACTION_NONE) {
+		tx_state = grilio_queue_transaction_start(priv->q);
+		DBG("status tx for slot %u %s", self->slot,
+			(tx_state == GRILIO_TRANSACTION_STARTED) ?
+						"started" : "starting");
+	}
+}
+
+static void ril_sim_card_tx_check(struct ril_sim_card *self)
+{
+	struct ril_sim_card_priv *priv = self->priv;
+
+	if (grilio_queue_transaction_state(priv->q) !=
+						GRILIO_TRANSACTION_NONE) {
+		const struct ril_sim_card_status *status = self->status;
+
+		if (status && status->card_state == RIL_CARDSTATE_PRESENT) {
+			/* Transaction (if there is any) is finished when
+			 * both GET_SIM_STATUS and SET_UICC_SUBSCRIPTION
+			 * complete or get dropped */
+			if (!priv->status_req_id && !priv->sub_req_id &&
+				status->gsm_umts_index >= 0 &&
+				status->gsm_umts_index < status->num_apps) {
+				DBG("status tx for slot %u finished",
+								self->slot);
+				grilio_queue_transaction_finish(priv->q);
+			}
+		} else {
+			DBG("status tx for slot %u cancelled", self->slot);
+			grilio_queue_transaction_finish(priv->q);
+		}
+	}
+}
+
 static void ril_sim_card_subscription_done(struct ril_sim_card *self)
 {
 	struct ril_sim_card_priv *priv = self->priv;
 
+	if (priv->sub_start_timer) {
+		/* Don't need this timer anymore */
+		g_source_remove(priv->sub_start_timer);
+		priv->sub_start_timer = 0;
+	}
 	if (priv->sub_req_id) {
 		/* Some RILs never reply to SET_UICC_SUBSCRIPTION requst,
 		 * so we better drop rather than cancel it (so that it gets
@@ -168,7 +225,7 @@ static void ril_sim_card_subscription_done(struct ril_sim_card *self)
 		grilio_channel_drop_request(priv->io, priv->sub_req_id);
 		priv->sub_req_id = 0;
 	}
-	grilio_queue_transaction_finish(priv->q);
+	ril_sim_card_tx_check(self);
 }
 
 static void ril_sim_card_subscribe_cb(GRilIoChannel* io, int status,
@@ -184,19 +241,18 @@ static void ril_sim_card_subscribe_cb(GRilIoChannel* io, int status,
 	ril_sim_card_subscription_done(self);
 }
 
-static void ril_sim_card_subscribe(struct ril_sim_card *self, int app_index,
-				enum ril_uicc_subscription_action sub_action)
+static void ril_sim_card_subscribe(struct ril_sim_card *self, int app_index)
 {
 	struct ril_sim_card_priv *priv = self->priv;
 	GRilIoRequest *req = grilio_request_sized_new(16);
 	const guint sub_id = self->slot;
 	guint code;
 
-	DBG("%u,%d,%u,%d", self->slot, app_index, sub_id, sub_action);
+	DBG("%u,%d,%u", self->slot, app_index, sub_id);
 	grilio_request_append_int32(req, self->slot);
 	grilio_request_append_int32(req, app_index);
 	grilio_request_append_int32(req, sub_id);
-	grilio_request_append_int32(req, sub_action);
+	grilio_request_append_int32(req, RIL_UICC_SUBSCRIPTION_ACTIVATE);
 
 	grilio_request_set_retry(req, 0, -1);
 	grilio_request_set_timeout(req, UICC_SUBSCRIPTION_TIMEOUT_MS);
@@ -213,7 +269,7 @@ static void ril_sim_card_subscribe(struct ril_sim_card *self, int app_index,
 
 	/* Don't allow any requests other that GET_SIM_STATUS until
 	 * we are done with the subscription */
-	grilio_queue_transaction_start(priv->q);
+	ril_sim_card_tx_start(self);
 	priv->sub_req_id = grilio_queue_send_request_full(priv->q,
 			req, code, ril_sim_card_subscribe_cb, NULL, self);
 	grilio_request_unref(req);
@@ -221,8 +277,7 @@ static void ril_sim_card_subscribe(struct ril_sim_card *self, int app_index,
 
 static int ril_sim_card_select_app(const struct ril_sim_card_status *status)
 {
-	int selected_app = -1;
-	guint i;
+	int i, selected_app = -1;
 
 	for (i = 0; i < status->num_apps; i++) {
 		const int type = status->apps[i].app_type;
@@ -251,9 +306,8 @@ static void ril_sim_card_update_app(struct ril_sim_card *self)
 			ril_sim_card_subscription_done(self);
 		} else {
 			app_index = ril_sim_card_select_app(status);
-			if (app_index >= 0) {
-				ril_sim_card_subscribe(self, app_index,
-						RIL_UICC_SUBSCRIPTION_ACTIVATE);
+			if (app_index >= 0 && !self->priv->sub_start_timer) {
+				ril_sim_card_subscribe(self, app_index);
 			}
 		}
 	} else {
@@ -274,6 +328,18 @@ static void ril_sim_card_update_app(struct ril_sim_card *self)
 	}
 }
 
+static gboolean ril_sim_card_sub_start_timeout(gpointer user_data)
+{
+	struct ril_sim_card *self = RIL_SIMCARD(user_data);
+	struct ril_sim_card_priv *priv = self->priv;
+
+	DBG("%u", self->slot);
+	GASSERT(priv->sub_start_timer);
+	priv->sub_start_timer = 0;
+	ril_sim_card_update_app(self);
+	return G_SOURCE_REMOVE;
+}
+
 static void ril_sim_card_update_status(struct ril_sim_card *self,
 					struct ril_sim_card_status *status)
 {
@@ -283,6 +349,23 @@ static void ril_sim_card_update_status(struct ril_sim_card *self,
 		struct ril_sim_card_status *old_status = self->status;
 
 		self->status = status;
+		if (diff & RIL_SIMCARD_STATE_CHANGED &&
+				status->card_state == RIL_CARDSTATE_PRESENT) {
+			struct ril_sim_card_priv *priv = self->priv;
+
+			/*
+			 * SIM card has just appeared, give it some time to
+			 * activate the USIM app
+			 */
+			if (priv->sub_start_timer) {
+				g_source_remove(priv->sub_start_timer);
+			}
+			DBG("started subscription timeout for slot %u",
+								self->slot);
+			priv->sub_start_timer =
+				g_timeout_add(UICC_SUBSCRIPTION_START_MS,
+					ril_sim_card_sub_start_timeout, self);
+		}
 		ril_sim_card_update_app(self);
 		g_signal_emit(self, ril_sim_card_signals
 					[SIGNAL_STATUS_RECEIVED], 0);
@@ -298,6 +381,7 @@ static void ril_sim_card_update_status(struct ril_sim_card *self,
 		}
 		ril_sim_card_status_free(old_status);
 	} else {
+		ril_sim_card_update_app(self);
 		ril_sim_card_status_free(status);
 		g_signal_emit(self, ril_sim_card_signals
 					[SIGNAL_STATUS_RECEIVED], 0);
@@ -431,6 +515,24 @@ static void ril_sim_card_status_cb(GRilIoChannel *io, int ril_status,
 			ril_sim_card_update_status(self, status);
 		}
 	}
+
+	ril_sim_card_tx_check(self);
+}
+
+void ril_sim_card_reset(struct ril_sim_card *self)
+{
+	if (G_LIKELY(self)) {
+		struct ril_sim_card_status *status =
+			g_new0(struct ril_sim_card_status, 1);
+
+		/* Simulate removal and re-submit the SIM status query */
+		status->card_state = RIL_CARDSTATE_ABSENT;
+		status->gsm_umts_index = -1;
+		status->cdma_index = -1;
+		status->ims_index = -1;
+		ril_sim_card_update_status(self, status);
+		ril_sim_card_request_status(self);
+	}
 }
 
 void ril_sim_card_request_status(struct ril_sim_card *self)
@@ -446,6 +548,9 @@ void ril_sim_card_request_status(struct ril_sim_card *self)
 		} else {
 			GRilIoRequest* req = grilio_request_new();
 
+			/* Start the transaction to not allow any other
+			 * requests to interfere with SIM status query */
+			ril_sim_card_tx_start(self);
 			grilio_request_set_retry(req, RIL_RETRY_SECS*1000, -1);
 			priv->status_req_id =
 				grilio_queue_send_request_full(priv->q,
@@ -665,6 +770,9 @@ static void ril_sim_card_finalize(GObject *object)
 	if (priv->sim_io_idle_id) {
 		g_source_remove(priv->sim_io_idle_id);
 	}
+	if (priv->sub_start_timer) {
+		g_source_remove(priv->sub_start_timer);
+	}
 	g_hash_table_destroy(priv->sim_io_pending);
 	grilio_channel_unref(priv->io);
 	grilio_queue_unref(priv->q);

ofono/drivers/ril/ril_sim_card.h

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -18,6 +18,8 @@
 
 #include "ril_types.h"
 
+#include <glib-object.h>
+
 struct ril_sim_card_app {
 	enum ril_app_type app_type;
 	enum ril_app_state app_state;
@@ -56,6 +58,7 @@ typedef void (*ril_sim_card_cb_t)(struct ril_sim_card *sc, void *arg);
 struct ril_sim_card *ril_sim_card_new(GRilIoChannel *io, guint slot, int flags);
 struct ril_sim_card *ril_sim_card_ref(struct ril_sim_card *sc);
 void ril_sim_card_unref(struct ril_sim_card *sc);
+void ril_sim_card_reset(struct ril_sim_card *sc);
 void ril_sim_card_request_status(struct ril_sim_card *sc);
 void ril_sim_card_sim_io_started(struct ril_sim_card *sc, guint id);
 void ril_sim_card_sim_io_finished(struct ril_sim_card *sc, guint id);
@@ -74,9 +77,13 @@ void ril_sim_card_remove_handler(struct ril_sim_card *sc, gulong id);
 void ril_sim_card_remove_handlers(struct ril_sim_card *sc, gulong *ids, int n);
 
 /* Inline wrappers */
-static inline enum ril_app_type
-ril_sim_card_app_type(struct ril_sim_card *sc)
+static inline enum ril_app_type ril_sim_card_app_type(struct ril_sim_card *sc)
 	{ return (sc && sc->app) ? sc->app->app_type : RIL_APPTYPE_UNKNOWN; }
+static inline const char *ril_sim_card_app_aid(struct ril_sim_card *sc)
+	{ return (sc && sc->app) ? sc->app->aid : NULL; }
+
+#define ril_sim_card_remove_all_handlers(net, ids) \
+	ril_sim_card_remove_handlers(net, ids, G_N_ELEMENTS(ids))
 
 #endif /* RIL_SIM_CARD_H */
 

ofono/drivers/ril/ril_sim_info.h

@@ -1,53 +0,0 @@
-/*
- *  oFono - Open Source Telephony - RIL-based devices
- *
- *  Copyright (C) 2016 Jolla Ltd.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
-
-#ifndef RIL_SIM_INFO_H
-#define RIL_SIM_INFO_H
-
-#include "ril_types.h"
-
-struct ril_sim_info {
-	GObject object;
-	struct ril_sim_info_priv *priv;
-	const char *iccid;
-	const char *imsi;
-	const char *spn;
-};
-
-struct ofono_sim;
-typedef void (*ril_sim_info_cb_t)(struct ril_sim_info *info, void *arg);
-
-struct ril_sim_info *ril_sim_info_new(const char *log_prefix);
-struct ril_sim_info *ril_sim_info_ref(struct ril_sim_info *info);
-void ril_sim_info_unref(struct ril_sim_info *si);
-void ril_sim_info_set_ofono_sim(struct ril_sim_info *si, struct ofono_sim *sim);
-void ril_sim_info_set_network(struct ril_sim_info *si, struct ril_network *net);
-gulong ril_sim_info_add_iccid_changed_handler(struct ril_sim_info *si,
-					ril_sim_info_cb_t cb, void *arg);
-gulong ril_sim_info_add_imsi_changed_handler(struct ril_sim_info *si,
-					ril_sim_info_cb_t cb, void *arg);
-gulong ril_sim_info_add_spn_changed_handler(struct ril_sim_info *si,
-					ril_sim_info_cb_t cb, void *arg);
-void ril_sim_info_remove_handler(struct ril_sim_info *si, gulong id);
-
-#endif /* RIL_SIM_INFO_H */
-
-/*
- * Local Variables:
- * mode: C
- * c-basic-offset: 8
- * indent-tabs-mode: t
- * End:
- */

ofono/drivers/ril/ril_sim_settings.c

@@ -20,9 +20,6 @@
 
 #include <gutil_misc.h>
 
-#include "ofono.h"
-#include "storage.h"
-
 #define RIL_PREF_MODE_DEFAULT(self)                     (\
 	((self)->techs & OFONO_RADIO_ACCESS_MODE_LTE) ?  \
 	OFONO_RADIO_ACCESS_MODE_LTE :                    \
@@ -41,7 +38,6 @@ enum sailfish_watch_events {
 struct ril_sim_settings_priv {
 	gulong watch_event_id[WATCH_EVENT_COUNT];
 	struct sailfish_watch *watch;
-	GKeyFile *storage;
 	char *imsi;
 };
 

ofono/drivers/ril/ril_sim_settings.h

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2016-2017 Jolla Ltd.
+ *  Copyright (C) 2016-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -18,6 +18,8 @@
 
 #include "ril_types.h"
 
+#include <glib-object.h>
+
 struct ril_sim_settings_priv;
 
 struct ril_sim_settings {
@@ -34,8 +36,6 @@ struct ril_sim_settings *ril_sim_settings_new(const char *path,
 					enum ofono_radio_access_mode techs);
 struct ril_sim_settings *ril_sim_settings_ref(struct ril_sim_settings *s);
 void ril_sim_settings_unref(struct ril_sim_settings *s);
-void ril_sim_settings_set_ofono_sim(struct ril_sim_settings *s,
-					struct ofono_sim *sim);
 void ril_sim_settings_set_pref_mode(struct ril_sim_settings *s,
 					enum ofono_radio_access_mode mode);
 gulong ril_sim_settings_add_imsi_changed_handler(struct ril_sim_settings *s,

ofono/drivers/ril/ril_sms.c

@@ -471,7 +471,7 @@ static int ril_sms_probe(struct ofono_sms *sms, unsigned int vendor,
 
 static void ril_sms_remove(struct ofono_sms *sms)
 {
-	int i;
+	unsigned int i;
 	struct ril_sms *sd = ril_sms_get_data(sms);
 
 	DBG("");

ofono/drivers/ril/ril_stk.c

@@ -268,7 +268,7 @@ static int ril_stk_probe(struct ofono_stk *stk, unsigned int vendor, void *data)
 static void ril_stk_remove(struct ofono_stk *stk)
 {
 	struct ril_stk *sd = ril_stk_get_data(stk);
-	int i;
+	unsigned int i;
 
 	DBG("");
 	ofono_stk_set_data(stk, NULL);

ofono/drivers/ril/ril_subscription.conf

@@ -21,6 +21,13 @@
 #
 #EmptyConfig=false
 
+# User and group for the ofono process. RIL clients are typically
+# expected to run under radio:radio.
+#
+# Default is radio:radio
+#
+#Identity=radio:radio
+
 # If the phone has more than one SIM slot, the 3G/LTE module may be
 # shared by all modems, meaning that only one of the slots can use
 # 3G/LTE. In order to "hand 4G over" to the other slot, the modem
@@ -177,6 +184,13 @@ socket=/dev/socket/rild
 #
 #enableVoicecall=true
 
+# Support for Cell Broadcast System (CBS). By default, its enabled but if
+# your rild and/or modem is not happy about it, you can turn it off.
+#
+# Default true
+#
+#enableCellBroadcast=true
+
 # Timeout for the modem to show up, in milliseconds. Those that don't
 # show up before this timeout expires, will be dropped (ignored).
 #
@@ -187,3 +201,42 @@ socket=/dev/socket/rild
 # The default is 20000 (20 seconds)
 #
 #startTimeout=20000
+
+# This allows to use deprecated RIL_REQUEST_GET_IMEI instead of
+# RIL_REQUEST_DEVICE_IDENTITY to query IMEI from the modem. Some
+# RILs (e.g. MTK) still don't understand RIL_REQUEST_DEVICE_IDENTITY.
+#
+# Default is false (use RIL_REQUEST_DEVICE_IDENTITY)
+#
+#legacyImeiQuery=false
+
+# Some devices don't support LTE RAT mode PREF_NET_TYPE_LTE_GSM_WCDMA.
+# This option allows to set a custom LTE mode.
+#
+# The default is 9 (PREF_NET_TYPE_LTE_GSM_WCDMA)
+#
+#lteNetworkMode=9
+
+# Timeout for RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, in milliseconds.
+#
+# The default is 20000 (20 seconds)
+#
+#networkModeTimeout=20000
+
+# Cycle radio power at startup.
+#
+# The default is true (cycle the power)
+#
+#radioPowerCycle=true
+
+# With some RILs it seems to be necessary to kick (RIL_REQUEST_RADIO_POWER)
+# the modems with power on after one of the modems has been powered off.
+# Otherwise bad things may happen (like the modem never registering
+# on the network).
+#
+# On the other hand, with some RILs it's causing some trouble (like this
+# extra RIL_REQUEST_RADIO_POWER getting stuck indefinitely).
+#
+# The default is true for historical reasons
+#
+#confirmRadioPowerOn=true

ofono/drivers/ril/ril_types.h

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -41,16 +41,24 @@ struct ofono_sim;
 #define RIL_RETRY_MS   (RIL_RETRY_SECS*1000)
 
 struct ril_data;
+struct ril_data_call;
 struct ril_modem;
 struct ril_radio;
 struct ril_network;
 struct ril_sim_card;
+struct ril_vendor_hook;
 
 struct ril_slot_config {
 	guint slot;
 	enum ofono_radio_access_mode techs;
+	int lte_network_mode;
+	int network_mode_timeout;
+	gboolean query_available_band_mode;
 	gboolean empty_pin_query;
+	gboolean radio_power_cycle;
+	gboolean confirm_radio_power_on;
 	gboolean enable_voicecall;
+	gboolean enable_cbs;
 	GUtilInts *local_hangup_reasons;
 	GUtilInts *remote_hangup_reasons;
 };

ofono/drivers/ril/ril_ussd.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -20,6 +20,8 @@
 #include "smsutil.h"
 #include "util.h"
 
+#define USSD_CANCEL_TIMEOUT_SEC (20)
+
 struct ril_ussd {
 	struct ofono_ussd *ussd;
 	GRilIoChannel *io;
@@ -114,11 +116,14 @@ static void ril_ussd_cancel(struct ofono_ussd *ussd,
 				ofono_ussd_cb_t cb, void *data)
 {
 	struct ril_ussd *ud = ril_ussd_get_data(ussd);
+	GRilIoRequest *req = grilio_request_new();
 
 	ofono_info("send ussd cancel");
-	grilio_queue_send_request_full(ud->q, NULL, RIL_REQUEST_CANCEL_USSD,
+	grilio_request_set_timeout(req, USSD_CANCEL_TIMEOUT_SEC * 1000);
+	grilio_queue_send_request_full(ud->q, req, RIL_REQUEST_CANCEL_USSD,
 				ril_ussd_cancel_cb, ril_ussd_cbd_free,
 				ril_ussd_cbd_new(cb, data));
+	grilio_request_unref(req);
 }
 
 static void ril_ussd_notify(GRilIoChannel *io, guint code,

ofono/drivers/ril/ril_util.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -18,6 +18,8 @@
 
 #include <grilio_channel.h>
 
+#include <gutil_misc.h>
+
 #include <sys/socket.h>
 #include <ctype.h>
 
@@ -324,8 +326,7 @@ int ril_parse_tech(const char *stech, int *ril_tech)
 {
 	int access_tech = -1;
 	int tech = -1;
-	if (stech && stech[0]) {
-		tech = atoi(stech);
+	if (gutil_parse_int(stech, 0, &tech)) {
 		switch (tech) {
 		case RADIO_TECH_GPRS:
 		case RADIO_TECH_GSM:
@@ -382,8 +383,8 @@ gboolean ril_parse_mcc_mnc(const char *str, struct ofono_network_operator *op)
 
 		if (i == OFONO_MAX_MCC_LENGTH) {
 			/* Usually 2 but sometimes 3 digit network code */
-			for (i=0;
-			     i<OFONO_MAX_MNC_LENGTH && *ptr && isdigit(*ptr);
+			for (i = 0;
+			     i < OFONO_MAX_MNC_LENGTH && *ptr && isdigit(*ptr);
 			     i++) {
 				op->mnc[i] = *ptr++;
 			}

ofono/drivers/ril/ril_util.h

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2016 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as

ofono/drivers/ril/ril_vendor.c

@@ -0,0 +1,164 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016-2018 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_vendor.h"
+#include "ril_log.h"
+
+struct ril_vendor_hook *ril_vendor_create_hook
+		(const struct ril_vendor_driver *vendor, GRilIoChannel *io,
+			const char *path, const struct ril_slot_config *config,
+			struct ril_network *network)
+{
+	if (vendor) {
+		const void *data = vendor->driver_data;
+
+		/*
+		 * NOTE: we are looking for the callback in the base but
+		 * keeping the original driver data.
+		 */
+		while (!vendor->create_hook && vendor->base) {
+			vendor = vendor->base;
+		}
+		if (vendor->create_hook) {
+			return vendor->create_hook(data, io, path, config,
+								network);
+		}
+	}
+	return NULL;
+}
+
+struct ril_vendor_hook *ril_vendor_hook_init(struct ril_vendor_hook *self,
+				const struct ril_vendor_hook_proc *proc,
+				ril_vendor_hook_free_proc free)
+{
+	self->proc = proc;
+	self->free = free;
+	g_atomic_int_set(&self->ref_count, 1);
+	return self;
+}
+
+struct ril_vendor_hook *ril_vendor_hook_ref(struct ril_vendor_hook *self)
+{
+	if (self) {
+		GASSERT(self->ref_count > 0);
+		g_atomic_int_inc(&self->ref_count);
+	}
+	return self;
+}
+
+static void ril_vendor_hook_free(struct ril_vendor_hook *self)
+{
+	if (self->free) {
+		self->free(self);
+	}
+}
+
+void ril_vendor_hook_unref(struct ril_vendor_hook *self)
+{
+	if (self) {
+		GASSERT(self->ref_count > 0);
+		if (g_atomic_int_dec_and_test(&self->ref_count)) {
+			ril_vendor_hook_free(self);
+		}
+	}
+}
+
+void ril_vendor_get_defaults(const struct ril_vendor_driver *vendor,
+					struct ril_vendor_defaults *defaults)
+{
+	if (vendor) {
+		while (!vendor->get_defaults && vendor->base) {
+			vendor = vendor->base;
+		}
+		if (vendor->get_defaults) {
+			vendor->get_defaults(defaults);
+		}
+	}
+}
+
+const char *ril_vendor_hook_request_to_string(struct ril_vendor_hook *self,
+							guint request)
+{
+	if (self) {
+		const struct ril_vendor_hook_proc *proc = self->proc;
+
+		while (!proc->request_to_string && proc->base) {
+			proc = proc->base;
+		}
+		if (proc->request_to_string) {
+			return proc->request_to_string(self, request);
+		}
+	}
+	return NULL;
+}
+
+const char *ril_vendor_hook_event_to_string(struct ril_vendor_hook *self,
+							guint event)
+{
+	if (self) {
+		const struct ril_vendor_hook_proc *proc = self->proc;
+
+		while (!proc->event_to_string && proc->base) {
+			proc = proc->base;
+		}
+		if (proc->event_to_string) {
+			return proc->event_to_string(self, event);
+		}
+	}
+	return NULL;
+}
+
+GRilIoRequest *ril_vendor_hook_data_call_req(struct ril_vendor_hook *self,
+			int tech, const char *profile, const char *apn,
+			const char *username, const char *password,
+			enum ril_auth auth, const char *proto)
+{
+	if (self) {
+		const struct ril_vendor_hook_proc *proc = self->proc;
+
+		while (!proc->data_call_req && proc->base) {
+			proc = proc->base;
+		}
+		if (proc->data_call_req) {
+			return proc->data_call_req(self, tech, profile, apn,
+					username, password, auth, proto);
+		}
+	}
+	return NULL;
+}
+
+gboolean ril_vendor_hook_data_call_parse(struct ril_vendor_hook *self,
+		struct ril_data_call *call, int ver, GRilIoParser *rilp)
+{
+	if (self) {
+		const struct ril_vendor_hook_proc *proc = self->proc;
+
+		while (!proc->data_call_parse && proc->base) {
+			proc = proc->base;
+		}
+		if (proc->data_call_parse) {
+			return proc->data_call_parse(self, call, ver, rilp);
+		}
+	}
+	return FALSE;
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_vendor.h

@@ -0,0 +1,103 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016-2018 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_VENDOR_H
+#define RIL_VENDOR_H
+
+#include "ril_types.h"
+
+struct ril_vendor_defaults {
+	gboolean empty_pin_query;
+	gboolean legacy_imei_query;
+	gboolean enable_cbs;
+	gboolean query_available_band_mode;
+};
+
+struct ril_vendor_driver {
+	const char *name;
+	const void *driver_data;
+	const struct ril_vendor_driver *base;
+	void (*get_defaults)(struct ril_vendor_defaults *defaults);
+	struct ril_vendor_hook *(*create_hook)(const void *driver_data,
+				GRilIoChannel *io, const char *path,
+				const struct ril_slot_config *cfg,
+				struct ril_network *network);
+};
+
+struct ril_vendor_hook_proc {
+	const struct ril_vendor_hook_proc *base;
+	const char *(*request_to_string)(struct ril_vendor_hook *hook,
+							guint request);
+	const char *(*event_to_string)(struct ril_vendor_hook *hook,
+							guint event);
+	GRilIoRequest *(*data_call_req)(struct ril_vendor_hook *hook,
+			int tech, const char *profile, const char *apn,
+			const char *username, const char *password,
+			enum ril_auth auth, const char *proto);
+	gboolean (*data_call_parse)(struct ril_vendor_hook *hook,
+			struct ril_data_call *call, int version,
+			GRilIoParser *rilp);
+};
+
+typedef void (*ril_vendor_hook_free_proc)(struct ril_vendor_hook *hook);
+struct ril_vendor_hook {
+	const struct ril_vendor_hook_proc *proc;
+	ril_vendor_hook_free_proc free;
+	gint ref_count;
+};
+
+struct ril_vendor_hook *ril_vendor_create_hook
+		(const struct ril_vendor_driver *vendor, GRilIoChannel *io,
+			const char *path, const struct ril_slot_config *cfg,
+			struct ril_network *network);
+void ril_vendor_get_defaults(const struct ril_vendor_driver *vendor,
+					struct ril_vendor_defaults *defaults);
+
+struct ril_vendor_hook *ril_vendor_hook_init(struct ril_vendor_hook *hook,
+				const struct ril_vendor_hook_proc *proc,
+				ril_vendor_hook_free_proc free);
+struct ril_vendor_hook *ril_vendor_hook_ref(struct ril_vendor_hook *hook);
+void ril_vendor_hook_unref(struct ril_vendor_hook *hook);
+
+const char *ril_vendor_hook_request_to_string(struct ril_vendor_hook *hook,
+					guint request);
+const char *ril_vendor_hook_event_to_string(struct ril_vendor_hook *hook,
+					guint event);
+GRilIoRequest *ril_vendor_hook_data_call_req(struct ril_vendor_hook *hook,
+			int tech, const char *profile, const char *apn,
+			const char *username, const char *password,
+			enum ril_auth auth, const char *proto);
+gboolean ril_vendor_hook_data_call_parse(struct ril_vendor_hook *hook,
+			struct ril_data_call *call, int version,
+			GRilIoParser *rilp);
+
+/* Put vendor driver descriptors to the "__vendor" section */
+#define RIL_VENDOR_DRIVER_DEFINE(name) \
+	const struct ril_vendor_driver name \
+	__attribute__((used, section("__vendor"))) =
+#define RIL_VENDOR_DRIVER_FOREACH(var) \
+	for ((var) = __start___vendor; (var) < __stop___vendor; (var)++)
+extern const struct ril_vendor_driver __start___vendor[];
+extern const struct ril_vendor_driver __stop___vendor[];
+
+#endif /* RIL_VENDOR_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_vendor_mtk.c

@@ -0,0 +1,703 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016-2018 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_vendor.h"
+#include "ril_network.h"
+#include "ril_data.h"
+#include "ril_log.h"
+
+#include "sailfish_watch.h"
+
+#include <grilio_channel.h>
+#include <grilio_parser.h>
+#include <grilio_request.h>
+#include <grilio_queue.h>
+
+#include <gutil_macros.h>
+#include <gutil_misc.h>
+
+#include "ofono.h"
+
+#define SET_INITIAL_ATTACH_APN_TIMEOUT (20*1000)
+
+enum ril_mtk_watch_events {
+	WATCH_EVENT_IMSI_CHANGED,
+	WATCH_EVENT_COUNT
+};
+
+enum ril_mtk_network_events {
+	NETWORK_EVENT_PREF_MODE_CHANGED,
+	NETWORK_EVENT_COUNT
+};
+
+enum ril_mtk_events {
+	MTK_EVENT_REGISTRATION_SUSPENDED,
+	MTK_EVENT_SET_ATTACH_APN,
+	MTK_EVENT_PS_NETWORK_STATE_CHANGED,
+	MTK_EVENT_INCOMING_CALL_INDICATION,
+	MTK_EVENT_COUNT
+};
+
+struct ril_vendor_hook_mtk {
+	struct ril_vendor_hook hook;
+	const struct ril_mtk_msg *msg;
+	GRilIoQueue *q;
+	GRilIoChannel *io;
+	struct ril_network *network;
+	struct sailfish_watch *watch;
+	guint set_initial_attach_apn_id;
+	gboolean initial_attach_apn_ok;
+	gulong network_event_id[NETWORK_EVENT_COUNT];
+	gulong watch_event_id[WATCH_EVENT_COUNT];
+	gulong ril_event_id[MTK_EVENT_COUNT];
+	guint slot;
+};
+
+/* driver_data point this this: */
+struct ril_vendor_mtk_driver_data {
+	const char *name;
+	const struct ril_mtk_msg *msg;
+	const struct ril_vendor_hook_proc *proc;
+};
+
+/* Hook with auto-detection */
+struct ril_vendor_hook_mtk_auto {
+	struct ril_vendor_hook_mtk mtk;
+	const struct ril_vendor_mtk_driver_data *type;
+	gulong detect_id;
+};
+
+/* MTK specific RIL messages (actual codes differ from model to model!) */
+struct ril_mtk_msg {
+	gboolean attach_apn_has_roaming_protocol;
+	guint request_resume_registration;
+	guint request_set_call_indication;
+
+	/* See ril_vendor_mtk_auto_detect_event */
+#define unsol_msgs unsol_ps_network_state_changed
+#define MTK_UNSOL_MSGS (4)
+
+	guint unsol_ps_network_state_changed;
+	guint unsol_registration_suspended;
+	guint unsol_incoming_call_indication;
+	guint unsol_set_attach_apn;
+};
+
+static const struct ril_mtk_msg msg_mtk1 = {
+	.attach_apn_has_roaming_protocol = TRUE,
+	.request_resume_registration = 2050,
+	.request_set_call_indication = 2065,
+	.unsol_ps_network_state_changed = 3012,
+	.unsol_registration_suspended = 3021,
+	.unsol_incoming_call_indication = 3037,
+	.unsol_set_attach_apn = 3065
+};
+
+static const struct ril_mtk_msg msg_mtk2 = {
+	.attach_apn_has_roaming_protocol = FALSE,
+	.request_resume_registration = 2065,
+	.request_set_call_indication = 2086,
+	.unsol_ps_network_state_changed = 3015,
+	.unsol_registration_suspended = 3024,
+	.unsol_incoming_call_indication = 3042,
+	.unsol_set_attach_apn = 3073
+};
+
+static inline struct ril_vendor_hook_mtk *ril_vendor_hook_mtk_cast
+						(struct ril_vendor_hook *hook)
+{
+	return G_CAST(hook, struct ril_vendor_hook_mtk, hook);
+}
+
+static inline struct ril_vendor_hook_mtk_auto *ril_vendor_hook_mtk_auto_cast
+						(struct ril_vendor_hook *hook)
+{
+	return G_CAST(hook, struct ril_vendor_hook_mtk_auto, mtk.hook);
+}
+
+static const char *ril_vendor_mtk_request_to_string
+				(struct ril_vendor_hook *hook, guint request)
+{
+	struct ril_vendor_hook_mtk *self = ril_vendor_hook_mtk_cast(hook);
+	const struct ril_mtk_msg *msg = self->msg;
+
+	if (request == msg->request_resume_registration) {
+		return "MTK_RESUME_REGISTRATION";
+	} else if (request == msg->request_set_call_indication) {
+		return "MTK_SET_CALL_INDICATION";
+	} else {
+		return NULL;
+	}
+}
+
+static const char *ril_vendor_mtk_unsol_msg_name(const struct ril_mtk_msg *msg,
+								guint event)
+{
+	if (event == msg->unsol_ps_network_state_changed) {
+		return "MTK_PS_NETWORK_STATE_CHANGED";
+	} else if (event == msg->unsol_registration_suspended) {
+		return "MTK_REGISTRATION_SUSPENDED";
+	} else if (event == msg->unsol_set_attach_apn) {
+		return "MTK_SET_ATTACH_APN";
+	} else if (event == msg->unsol_incoming_call_indication) {
+		return "MTK_INCOMING_CALL_INDICATION";
+	} else {
+		return NULL;
+	}
+}
+
+static const char *ril_vendor_mtk_event_to_string(struct ril_vendor_hook *hook,
+								guint event)
+{
+	struct ril_vendor_hook_mtk *self = ril_vendor_hook_mtk_cast(hook);
+
+	return ril_vendor_mtk_unsol_msg_name(self->msg, event);
+}
+
+static void ril_vendor_mtk_registration_suspended(GRilIoChannel *io, guint id,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_vendor_hook_mtk *self = user_data;
+	const struct ril_mtk_msg *msg = self->msg;
+	GRilIoParser rilp;
+	int session_id;
+
+	GASSERT(id == msg->unsol_registration_suspended);
+	grilio_parser_init(&rilp, data, len);
+	if (grilio_parser_get_int32(&rilp, NULL) &&
+			grilio_parser_get_int32(&rilp, &session_id)) {
+		GRilIoRequest *req = grilio_request_new();
+		DBG("slot=%u,session_id=%d", self->slot, session_id);
+		grilio_request_append_int32(req, 1);
+		grilio_request_append_int32(req, session_id);
+		grilio_queue_send_request(self->q, req,
+					msg->request_resume_registration);
+		grilio_request_unref(req);
+	}
+}
+
+static GRilIoRequest *ril_vendor_mtk_build_set_attach_apn_req
+			(const struct ofono_gprs_primary_context *pc,
+						gboolean roamingProtocol)
+{
+	GRilIoRequest *req = grilio_request_new();
+	const char *proto = ril_data_ofono_protocol_to_ril(pc->proto);
+
+	DBG("%s %d", pc->apn, roamingProtocol);
+	grilio_request_append_utf8(req, pc->apn);       /* apn */
+	grilio_request_append_utf8(req, proto);         /* protocol */
+	if (roamingProtocol) {
+		grilio_request_append_utf8(req, proto); /* roamingProtocol */
+	}
+
+	if (pc->username[0]) {
+		int auth;
+
+		switch (pc->auth_method) {
+		case OFONO_GPRS_AUTH_METHOD_ANY:
+			auth = RIL_AUTH_BOTH;
+			break;
+		case OFONO_GPRS_AUTH_METHOD_NONE:
+			auth = RIL_AUTH_NONE;
+			break;
+		case OFONO_GPRS_AUTH_METHOD_CHAP:
+			auth = RIL_AUTH_CHAP;
+			break;
+		case OFONO_GPRS_AUTH_METHOD_PAP:
+			auth = RIL_AUTH_PAP;
+			break;
+		default:
+			auth = RIL_AUTH_NONE;
+			break;
+		}
+
+		grilio_request_append_int32(req, auth);
+		grilio_request_append_utf8(req, pc->username);
+		grilio_request_append_utf8(req, pc->password);
+	} else {
+		grilio_request_append_int32(req, RIL_AUTH_NONE);
+		grilio_request_append_utf8(req, "");
+		grilio_request_append_utf8(req, "");
+	}
+
+	grilio_request_append_utf8(req, ""); /* operatorNumeric */
+	grilio_request_append_int32(req, FALSE); /* canHandleIms */
+	grilio_request_append_int32(req, -1); /* dualApnPlmnList */
+
+	return req;
+}
+
+static const struct ofono_gprs_primary_context *ril_vendor_mtk_internet_context
+					(struct ril_vendor_hook_mtk *self)
+{
+	struct sailfish_watch *watch = self->watch;
+
+	if (watch->imsi) {
+		struct ofono_atom *atom = __ofono_modem_find_atom(watch->modem,
+							OFONO_ATOM_TYPE_GPRS);
+
+		if (atom) {
+			return __ofono_gprs_context_settings_by_type
+				(__ofono_atom_get_data(atom),
+					OFONO_GPRS_CONTEXT_TYPE_INTERNET);
+		}
+	}
+
+	return NULL;
+}
+
+static void ril_vendor_mtk_initial_attach_apn_resp(GRilIoChannel *io,
+		int ril_status, const void *data, guint len, void *user_data)
+{
+	struct ril_vendor_hook_mtk *self = user_data;
+
+	GASSERT(self->set_initial_attach_apn_id);
+	self->set_initial_attach_apn_id = 0;
+	if (ril_status == RIL_E_SUCCESS) {
+		DBG("ok");
+		self->initial_attach_apn_ok = TRUE;
+	}
+}
+
+static void ril_vendor_mtk_initial_attach_apn_check
+					(struct ril_vendor_hook_mtk *self)
+{
+
+	if (!self->set_initial_attach_apn_id && !self->initial_attach_apn_ok) {
+		const struct ofono_gprs_primary_context *pc =
+			ril_vendor_mtk_internet_context(self);
+
+		if (pc) {
+			GRilIoRequest *req =
+				ril_vendor_mtk_build_set_attach_apn_req(pc,
+				self->msg->attach_apn_has_roaming_protocol);
+
+			grilio_request_set_timeout(req,
+					SET_INITIAL_ATTACH_APN_TIMEOUT);
+			self->set_initial_attach_apn_id =
+				grilio_queue_send_request_full(self->q, req,
+					RIL_REQUEST_SET_INITIAL_ATTACH_APN,
+					ril_vendor_mtk_initial_attach_apn_resp,
+					NULL, self);
+			grilio_request_unref(req);
+		}
+	}
+}
+
+static void ril_vendor_mtk_initial_attach_apn_reset
+					(struct ril_vendor_hook_mtk *self)
+{
+	self->initial_attach_apn_ok = FALSE;
+	if (self->set_initial_attach_apn_id) {
+		grilio_queue_cancel_request(self->q,
+			self->set_initial_attach_apn_id, FALSE);
+		self->set_initial_attach_apn_id = 0;
+	}
+}
+
+static void ril_vendor_mtk_watch_imsi_changed(struct sailfish_watch *watch,
+							void *user_data)
+{
+	struct ril_vendor_hook_mtk *self = user_data;
+
+	if (watch->imsi) {
+		ril_vendor_mtk_initial_attach_apn_check(self);
+	} else {
+		ril_vendor_mtk_initial_attach_apn_reset(self);
+	}
+}
+
+static void ril_vendor_mtk_network_pref_mode_changed(struct ril_network *net,
+							void *user_data)
+{
+	struct ril_vendor_hook_mtk *self = user_data;
+
+	if (net->pref_mode >= OFONO_RADIO_ACCESS_MODE_LTE) {
+		ril_vendor_mtk_initial_attach_apn_check(self);
+	} else {
+		ril_vendor_mtk_initial_attach_apn_reset(self);
+	}
+}
+
+static void ril_vendor_mtk_set_attach_apn(GRilIoChannel *io, guint id,
+				const void *data, guint len, void *self)
+{
+	ril_vendor_mtk_initial_attach_apn_check(self);
+}
+
+static void ril_vendor_mtk_ps_network_state_changed(GRilIoChannel *io,
+		guint id, const void *data, guint len, void *user_data)
+{
+	struct ril_vendor_hook_mtk *self = user_data;
+
+	ril_network_query_registration_state(self->network);
+}
+
+static void ril_vendor_mtk_incoming_call_indication(GRilIoChannel *io, guint id,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_vendor_hook_mtk *self = user_data;
+	const struct ril_mtk_msg *msg = self->msg;
+	GRilIoRequest* req = NULL;
+
+	GASSERT(id == msg->unsol_incoming_call_indication);
+
+	if (msg->request_set_call_indication) {
+		int nparams, cid, seq;
+		gchar *call_id = NULL, *seq_no = NULL;
+		GRilIoParser rilp;
+
+		grilio_parser_init(&rilp, data, len);
+
+		if (grilio_parser_get_int32(&rilp, &nparams) && nparams >= 5 &&
+			(call_id = grilio_parser_get_utf8(&rilp)) != NULL &&
+			grilio_parser_skip_string(&rilp) /* number */ &&
+			grilio_parser_skip_string(&rilp) /* type */ &&
+			grilio_parser_skip_string(&rilp) /* call_mode */ &&
+			(seq_no = grilio_parser_get_utf8(&rilp)) != NULL &&
+				gutil_parse_int(call_id, 10, &cid) &&
+				gutil_parse_int(seq_no, 10, &seq)) {
+
+			DBG("slot=%u,cid=%d,seq=%d", self->slot, cid, seq);
+			req = grilio_request_new();
+			grilio_request_append_int32(req, 3); /* Param count */
+			/* mode - IMS_ALLOW_INCOMING_CALL_INDICATION: */
+			grilio_request_append_int32(req, 0);
+			grilio_request_append_int32(req, cid);
+			grilio_request_append_int32(req, seq);
+		} else {
+			DBG("failed to parse INCOMING_CALL_INDICATION");
+		}
+
+		g_free(call_id);
+		g_free(seq_no);
+	}
+
+	if (req) {
+		grilio_queue_send_request(self->q, req,
+					msg->request_set_call_indication);
+		grilio_request_unref(req);
+	} else {
+		/* Let ril_voicecall.c know that something happened */
+		grilio_channel_inject_unsol_event(io,
+				RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED, NULL, 0);
+	}
+}
+
+static GRilIoRequest *ril_vendor_mtk_data_call_req
+	(struct ril_vendor_hook *hook, int tech, const char *profile,
+		const char *apn, const char *username, const char *password,
+		enum ril_auth auth, const char *proto)
+{
+	struct ril_vendor_hook_mtk *self = ril_vendor_hook_mtk_cast(hook);
+	GRilIoRequest *req = grilio_request_new();
+
+	grilio_request_append_int32(req, 8); /* Number of parameters */
+	grilio_request_append_format(req, "%d", tech);
+	grilio_request_append_utf8(req, profile);
+	grilio_request_append_utf8(req, apn);
+	grilio_request_append_utf8(req, username);
+	grilio_request_append_utf8(req, password);
+	grilio_request_append_format(req, "%d", auth);
+	grilio_request_append_utf8(req, proto);
+	grilio_request_append_format(req, "%d", self->slot+1);
+	return req;
+}
+
+static gboolean ril_vendor_mtk_data_call_parse_v6(struct ril_vendor_hook *hook,
+			struct ril_data_call *call, int version,
+			GRilIoParser *rilp)
+{
+	if (version < 11) {
+		int prot;
+		char *prot_str;
+		guint32 status = PDP_FAIL_ERROR_UNSPECIFIED;
+		guint32 active = RIL_DATA_CALL_INACTIVE;
+
+		/* RIL_Data_Call_Response_v6 with MTK specific additions */
+		grilio_parser_get_uint32(rilp, &status);
+		grilio_parser_get_int32(rilp, &call->retry_time);
+		grilio_parser_get_int32(rilp, &call->cid);
+		grilio_parser_get_uint32(rilp, &active);
+		grilio_parser_get_int32(rilp, &call->mtu); /* MTK specific */
+		prot_str = grilio_parser_get_utf8(rilp);
+		prot = ril_data_protocol_to_ofono(prot_str);
+		g_free(prot_str);
+
+		if (prot >= 0) {
+			call->ifname = grilio_parser_get_utf8(rilp);
+			call->addresses = grilio_parser_split_utf8(rilp, " ");
+			call->dnses = grilio_parser_split_utf8(rilp, " ");
+			call->gateways = grilio_parser_split_utf8(rilp, " ");
+			if (call->ifname && call->addresses) {
+				call->prot = prot;
+				call->status = status;
+				call->active = active;
+				return TRUE;
+			}
+		}
+	}
+	return FALSE;
+}
+
+static void ril_vendor_mtk_get_defaults(struct ril_vendor_defaults *defaults)
+{
+	/*
+	 * With most Qualcomm RIL implementations, querying available band
+	 * modes causes some magic Android properties to appear. Otherwise
+	 * this request is pretty harmless and useless.
+	 *
+	 * Most MediaTek RIL implementations don't support this request and
+	 * don't even bother to reply which slows things down because we wait
+	 * for this request to complete at startup.
+	 */
+	defaults->query_available_band_mode = FALSE;
+	defaults->empty_pin_query = FALSE;
+	defaults->legacy_imei_query = TRUE;
+}
+
+static void ril_vendor_mtk_hook_subscribe(struct ril_vendor_hook_mtk *self)
+{
+	const struct ril_mtk_msg *msg = self->msg;
+
+	self->ril_event_id[MTK_EVENT_REGISTRATION_SUSPENDED] =
+			grilio_channel_add_unsol_event_handler(self->io,
+				ril_vendor_mtk_registration_suspended,
+				msg->unsol_registration_suspended, self);
+	if (msg->unsol_set_attach_apn) {
+		self->ril_event_id[MTK_EVENT_SET_ATTACH_APN] =
+			grilio_channel_add_unsol_event_handler(self->io,
+				ril_vendor_mtk_set_attach_apn,
+				msg->unsol_set_attach_apn, self);
+	}
+	if (msg->unsol_ps_network_state_changed) {
+		self->ril_event_id[MTK_EVENT_PS_NETWORK_STATE_CHANGED] =
+			grilio_channel_add_unsol_event_handler(self->io,
+				ril_vendor_mtk_ps_network_state_changed,
+				msg->unsol_ps_network_state_changed, self);
+	}
+	if (msg->unsol_incoming_call_indication) {
+		self->ril_event_id[MTK_EVENT_INCOMING_CALL_INDICATION] =
+			grilio_channel_add_unsol_event_handler(self->io,
+				ril_vendor_mtk_incoming_call_indication,
+				msg->unsol_incoming_call_indication, self);
+	}
+}
+
+static void ril_vendor_mtk_hook_init(struct ril_vendor_hook_mtk *self,
+	const struct ril_vendor_mtk_driver_data *mtk_driver_data,
+	ril_vendor_hook_free_proc free, GRilIoChannel *io, const char *path,
+	const struct ril_slot_config *config, struct ril_network *network)
+{
+	self->msg = mtk_driver_data->msg;
+	self->q = grilio_queue_new(io);
+	self->io = grilio_channel_ref(io);
+	self->watch = sailfish_watch_new(path);
+	self->slot = config->slot;
+	self->network = ril_network_ref(network);
+	self->watch_event_id[WATCH_EVENT_IMSI_CHANGED] =
+			sailfish_watch_add_imsi_changed_handler(self->watch,
+				ril_vendor_mtk_watch_imsi_changed, self);
+	self->network_event_id[NETWORK_EVENT_PREF_MODE_CHANGED] =
+			ril_network_add_pref_mode_changed_handler(self->network,
+				ril_vendor_mtk_network_pref_mode_changed, self);
+	ril_vendor_mtk_hook_subscribe(self);
+	ril_vendor_hook_init(&self->hook, mtk_driver_data->proc, free);
+}
+
+static void ril_vendor_mtk_destroy(struct ril_vendor_hook_mtk *self)
+{
+	grilio_queue_cancel_all(self->q, FALSE);
+	grilio_channel_remove_all_handlers(self->io, self->ril_event_id);
+	grilio_queue_unref(self->q);
+	grilio_channel_unref(self->io);
+	sailfish_watch_remove_all_handlers(self->watch, self->watch_event_id);
+	sailfish_watch_unref(self->watch);
+	ril_network_remove_all_handlers(self->network, self->network_event_id);
+	ril_network_unref(self->network);
+}
+
+static void ril_vendor_mtk_free(struct ril_vendor_hook *hook)
+{
+	struct ril_vendor_hook_mtk *self = ril_vendor_hook_mtk_cast(hook);
+
+	DBG("slot %u", self->slot);
+	ril_vendor_mtk_destroy(self);
+	g_free(self);
+}
+
+static struct ril_vendor_hook *ril_vendor_mtk_create_hook_from_data
+		(const void *driver_data, GRilIoChannel *io, const char *path,
+					const struct ril_slot_config *config,
+					struct ril_network *network)
+{
+	const struct ril_vendor_mtk_driver_data *mtk_driver_data = driver_data;
+	struct ril_vendor_hook_mtk *self =
+		g_new0(struct ril_vendor_hook_mtk, 1);
+
+	ril_vendor_mtk_hook_init(self, mtk_driver_data, ril_vendor_mtk_free,
+						io, path, config, network);
+	DBG("%s slot %u", mtk_driver_data->name, self->slot);
+	return &self->hook;
+}
+
+static const struct ril_vendor_hook_proc ril_vendor_mtk_hook_base_proc = {
+	.request_to_string  = ril_vendor_mtk_request_to_string,
+	.event_to_string    = ril_vendor_mtk_event_to_string,
+	.data_call_req      = ril_vendor_mtk_data_call_req
+};
+
+static const struct ril_vendor_driver ril_vendor_mtk_base = {
+	.get_defaults       = ril_vendor_mtk_get_defaults,
+	.create_hook        = ril_vendor_mtk_create_hook_from_data
+};
+
+static const struct ril_vendor_mtk_driver_data ril_vendor_mtk1_data = {
+	.name               = "mtk1",
+	.msg                = &msg_mtk1,
+	.proc               = &ril_vendor_mtk_hook_base_proc
+};
+
+static struct ril_vendor_hook_proc ril_vendor_mtk2_proc = {
+	.base               = &ril_vendor_mtk_hook_base_proc,
+	.data_call_parse    = ril_vendor_mtk_data_call_parse_v6
+};
+
+static const struct ril_vendor_mtk_driver_data ril_vendor_mtk2_data = {
+	.name               = "mtk2",
+	.msg                = &msg_mtk2,
+	.proc               = &ril_vendor_mtk2_proc
+};
+
+#define DEFAULT_MTK_TYPE (&ril_vendor_mtk1_data)
+
+static const struct ril_vendor_mtk_driver_data *mtk_types [] = {
+	&ril_vendor_mtk1_data,
+	&ril_vendor_mtk2_data
+};
+
+RIL_VENDOR_DRIVER_DEFINE(ril_vendor_driver_mtk1) {
+	.name               = "mtk1",
+	.driver_data        = &ril_vendor_mtk1_data,
+	.base               = &ril_vendor_mtk_base
+};
+
+RIL_VENDOR_DRIVER_DEFINE(ril_vendor_driver_mtk2) {
+	.name               = "mtk2",
+	.driver_data        = &ril_vendor_mtk2_data,
+	.base               = &ril_vendor_mtk_base
+};
+
+/* Auto-selection */
+
+static gboolean ril_vendor_mtk_auto_set_type
+			(struct ril_vendor_hook_mtk_auto *self,
+				const struct ril_vendor_mtk_driver_data *type)
+{
+	struct ril_vendor_hook_mtk *mtk = &self->mtk;
+	gboolean changed = FALSE;
+
+	if (self->type != type) {
+		DBG("switching type %s -> %s", self->type->name, type->name);
+		self->type = type;
+		mtk->msg = type->msg;
+		mtk->hook.proc = type->proc;
+		grilio_channel_remove_all_handlers(mtk->io, mtk->ril_event_id);
+		ril_vendor_mtk_hook_subscribe(mtk);
+		changed = TRUE;
+	}
+
+	grilio_channel_remove_handler(mtk->io, self->detect_id);
+	self->detect_id = 0;
+	return changed;
+}
+
+static void ril_vendor_mtk_auto_detect_event(GRilIoChannel *io, guint id,
+				const void *data, guint len, void *self)
+{
+	guint i;
+
+	for (i = 0; i < G_N_ELEMENTS(mtk_types); i++) {
+		const struct ril_vendor_mtk_driver_data *type = mtk_types[i];
+		const struct ril_mtk_msg *msg = type->msg;
+		const guint *ids = &msg->unsol_msgs;
+		guint j;
+
+		for (j = 0; j < MTK_UNSOL_MSGS; j++) {
+			if (ids[j] == id) {
+				DBG("event %u is %s %s", id, type->name,
+					ril_vendor_mtk_unsol_msg_name(msg,id));
+				if (ril_vendor_mtk_auto_set_type(self, type)) {
+					/* And repeat the event to invoke
+					 * the handler */
+					grilio_channel_inject_unsol_event(io,
+								id, data, len);
+				}
+				return;
+			}
+		}
+	}
+}
+
+static void ril_vendor_mtk_auto_free(struct ril_vendor_hook *hook)
+{
+	struct ril_vendor_hook_mtk_auto *self =
+		ril_vendor_hook_mtk_auto_cast(hook);
+	struct ril_vendor_hook_mtk *mtk = &self->mtk;
+
+	DBG("slot %u", mtk->slot);
+	grilio_channel_remove_handler(mtk->io, self->detect_id);
+	ril_vendor_mtk_destroy(mtk);
+	g_free(self);
+}
+
+static struct ril_vendor_hook *ril_vendor_mtk_create_hook_auto
+	(const void *driver_data, GRilIoChannel *io, const char *path,
+		const struct ril_slot_config *cfg, struct ril_network *network)
+{
+	struct ril_vendor_hook_mtk_auto *self =
+		g_new0(struct ril_vendor_hook_mtk_auto, 1);
+	struct ril_vendor_hook_mtk *mtk = &self->mtk;
+
+	/* Pick the default */
+	self->type = DEFAULT_MTK_TYPE;
+	ril_vendor_mtk_hook_init(mtk, self->type, ril_vendor_mtk_auto_free,
+						io, path, cfg, network);
+	DBG("%s slot %u", self->type->name, mtk->slot);
+
+	/*
+	 * Subscribe for (all) unsolicited events. Keep on listening until
+	 * we receive an MTK specific event that tells us which particular
+	 * kind of MTK adaptation we are using.
+	 */
+	self->detect_id = grilio_channel_add_unsol_event_handler(mtk->io,
+				ril_vendor_mtk_auto_detect_event, 0, self);
+	return &mtk->hook;
+}
+
+RIL_VENDOR_DRIVER_DEFINE(ril_vendor_driver_mtk) {
+	.name               = "mtk",
+	.get_defaults       = ril_vendor_mtk_get_defaults,
+	.create_hook        = ril_vendor_mtk_create_hook_auto
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_voicecall.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -335,14 +335,18 @@ static void ril_voicecall_clcc_poll_cb(GRilIoChannel *io, int status,
 	GASSERT(vd->clcc_poll_id);
 	vd->clcc_poll_id = 0;
 
-	if (status != RIL_E_SUCCESS) {
-		ofono_error("We are polling CLCC and received an error");
-		ofono_error("All bets are off for call management");
-		return;
+	/*
+	 * Only RIL_E_SUCCESS and RIL_E_RADIO_NOT_AVAILABLE are expected here,
+	 * all other errors are filtered out by ril_voicecall_clcc_retry()
+	 */
+	if (status == RIL_E_SUCCESS) {
+		calls = ril_voicecall_parse_clcc(data, len);
+	} else {
+		/* RADIO_NOT_AVAILABLE == no calls */
+		GASSERT(status == RIL_E_RADIO_NOT_AVAILABLE);
+		calls = NULL;
 	}
 
-	calls = ril_voicecall_parse_clcc(data, len);
-
 	n = calls;
 	o = vd->calls;
 
@@ -436,12 +440,25 @@ static void ril_voicecall_clcc_poll_cb(GRilIoChannel *io, int status,
 	vd->calls = calls;
 }
 
+static gboolean ril_voicecall_clcc_retry(GRilIoRequest* req, int ril_status,
+		const void* response_data, guint response_len, void* user_data)
+{
+	switch (ril_status) {
+	case RIL_E_SUCCESS:
+	case RIL_E_RADIO_NOT_AVAILABLE:
+		return FALSE;
+	default:
+		return TRUE;
+	}
+}
+
 static void ril_voicecall_clcc_poll(struct ril_voicecall *vd)
 {
 	GASSERT(vd);
 	if (!vd->clcc_poll_id) {
 		GRilIoRequest* req = grilio_request_new();
 		grilio_request_set_retry(req, RIL_RETRY_MS, -1);
+		grilio_request_set_retry_func(req, ril_voicecall_clcc_retry);
 		vd->clcc_poll_id = grilio_queue_send_request_full(vd->q,
 					req, RIL_REQUEST_GET_CURRENT_CALLS,
 					ril_voicecall_clcc_poll_cb, NULL, vd);
@@ -570,39 +587,75 @@ static void ril_voicecall_submit_hangup_req(struct ofono_voicecall *vc,
 	grilio_request_unref(ioreq);
 }
 
-static void ril_voicecall_hangup_all(struct ofono_voicecall *vc,
+static void ril_voicecall_hangup(struct ofono_voicecall *vc,
+			gboolean (*filter)(struct ofono_call *call),
 			ofono_voicecall_cb_t cb, void *data)
 {
 	struct ril_voicecall *vd = ril_voicecall_get_data(vc);
+	struct ril_voicecall_request_data *req = NULL;
+	GSList *l;
 
-	if (vd->calls) {
-		GSList *l;
-		struct ril_voicecall_request_data *req =
-			ril_voicecall_request_data_new(vc, cb, data);
+	/*
+	 * Here the idea is that we submit (potentially) multiple
+	 * hangup requests to RIL and invoke the callback after
+	 * the last request has completed (pending call count
+	 * becomes zero).
+	 */
+	for (l = vd->calls; l; l = l->next) {
+		struct ofono_call *call = l->data;
 
-		/*
-		 * Here the idea is that we submit (potentially) multiple
-		 * hangup requests to RIL and invoke the callback after
-		 * the last request has completed (pending call count
-		 * becomes zero).
-		 */
-		for (l = vd->calls; l; l = l->next) {
-			struct ofono_call *call = l->data;
+		if (!filter || filter(call)) {
+			if (!req) {
+				req = ril_voicecall_request_data_new(vc, cb,
+									data);
+			}
 
 			/* Send request to RIL */
 			DBG("Hanging up call with id %d", call->id);
 			ril_voicecall_submit_hangup_req(vc, call->id, req);
+		} else {
+			DBG("Skipping call with id %d", call->id);
 		}
+	}
 
-		/* Release our reference */
+	if (req) {
+		/* Release our reference (if any) */
 		ril_voicecall_request_data_unref(req);
 	} else {
-		/* No calls */
+		/* No requests were submitted */
 		struct ofono_error error;
 		cb(ril_error_ok(&error), data);
 	}
 }
 
+static gboolean ril_voicecall_hangup_active_filter(struct ofono_call *call)
+{
+	switch (call->status) {
+	case CALL_STATUS_ACTIVE:
+	case CALL_STATUS_DIALING:
+	case CALL_STATUS_ALERTING:
+	case CALL_STATUS_INCOMING:
+		return TRUE;
+	case CALL_STATUS_HELD:
+	case CALL_STATUS_WAITING:
+	case CALL_STATUS_DISCONNECTED:
+		break;
+	}
+	return FALSE;
+}
+
+static void ril_voicecall_hangup_active(struct ofono_voicecall *vc,
+			ofono_voicecall_cb_t cb, void *data)
+{
+	ril_voicecall_hangup(vc, ril_voicecall_hangup_active_filter, cb, data);
+}
+
+static void ril_voicecall_hangup_all(struct ofono_voicecall *vc,
+			ofono_voicecall_cb_t cb, void *data)
+{
+	ril_voicecall_hangup(vc, NULL, cb, data);
+}
+
 static void ril_voicecall_release_specific(struct ofono_voicecall *vc,
 		int id, ofono_voicecall_cb_t cb, void *data)
 {
@@ -640,7 +693,7 @@ static void ril_voicecall_supp_svc_notification_event(GRilIoChannel *io,
 	grilio_parser_get_int32(&rilp, &type);
 	grilio_parser_get_int32(&rilp, &code);
 	grilio_parser_get_int32(&rilp, &index);
-	grilio_parser_get_int32(&rilp, NULL);
+	grilio_parser_get_int32(&rilp, &phone.type);
 	tmp = grilio_parser_get_utf8(&rilp);
 
 	if (tmp) {
@@ -794,8 +847,7 @@ static void ril_voicecall_set_udub(struct ofono_voicecall *vc,
 					ofono_voicecall_cb_t cb, void *data)
 {
 	DBG("");
-	ril_voicecall_request(RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND,
-						vc, NULL, cb, data);
+	ril_voicecall_request(RIL_REQUEST_UDUB, vc, NULL, cb, data);
 }
 
 static void ril_voicecall_enable_supp_svc(struct ril_voicecall *vd)
@@ -929,6 +981,7 @@ const struct ofono_voicecall_driver ril_voicecall_driver = {
 	.remove                 = ril_voicecall_remove,
 	.dial                   = ril_voicecall_dial,
 	.answer                 = ril_voicecall_answer,
+	.hangup_active          = ril_voicecall_hangup_active,
 	.hangup_all             = ril_voicecall_hangup_all,
 	.release_specific       = ril_voicecall_release_specific,
 	.send_tones             = ril_voicecall_send_dtmf,

ofono/drivers/rilmodem/lte.c

@@ -0,0 +1,158 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2016  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+#include <ofono/log.h>
+#include <ofono/lte.h>
+
+#include <gril/gril.h>
+#include <gril/grilutil.h>
+
+#include "rilmodem.h"
+
+struct ril_lte_data {
+	GRil *ril;
+};
+
+static void ril_lte_set_default_attach_info_cb(struct ril_msg *message,
+							gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_lte_cb_t cb = cbd->cb;
+	struct ofono_lte *lte = cbd->user;
+	struct ril_lte_data *ld = ofono_lte_get_data(lte);
+	DBG("");
+
+	if (message->error == RIL_E_SUCCESS) {
+		g_ril_print_response_no_args(ld->ril, message);
+		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+	} else {
+		ofono_error("%s: RIL error %s", __func__,
+				ril_error_to_string(message->error));
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	}
+}
+
+static void ril_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 ril_lte_data *ld = ofono_lte_get_data(lte);
+	struct cb_data *cbd = cb_data_new(cb, data, (struct ofono_lte *)lte);
+	struct parcel rilp;
+	char buf[OFONO_GPRS_MAX_APN_LENGTH + 1];
+
+	DBG("%s", info->apn);
+
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, 5);
+
+	if (strlen(info->apn) > 0) {
+		sprintf(buf, "%s", info->apn);
+		parcel_w_string(&rilp, buf);
+	} else
+		parcel_w_string(&rilp, "");	/* apn */
+
+	parcel_w_string(&rilp, "ip");		/* protocol */
+	parcel_w_int32(&rilp, 0);		/* auth type */
+	parcel_w_string(&rilp, "");		/* username */
+	parcel_w_string(&rilp, "");		/* password */
+
+	if (g_ril_send(ld->ril, RIL_REQUEST_SET_INITIAL_ATTACH_APN, &rilp,
+			ril_lte_set_default_attach_info_cb, cbd, g_free) > 0)
+		return;
+
+	g_free(cbd);
+	CALLBACK_WITH_FAILURE(cb, data);
+}
+
+static gboolean lte_delayed_register(gpointer user_data)
+{
+	struct ofono_lte *lte = user_data;
+
+	DBG("");
+
+	ofono_lte_register(lte);
+
+	return FALSE;
+}
+
+static int ril_lte_probe(struct ofono_lte *lte, void *user_data)
+{
+	GRil *ril = user_data;
+	struct ril_lte_data *ld;
+
+	DBG("");
+
+	ld = g_try_new0(struct ril_lte_data, 1);
+	if (ld == NULL)
+		return -ENOMEM;
+
+	ld->ril = g_ril_clone(ril);
+
+	ofono_lte_set_data(lte, ld);
+
+	g_idle_add(lte_delayed_register, lte);
+
+	return 0;
+}
+
+static void ril_lte_remove(struct ofono_lte *lte)
+{
+	struct ril_lte_data *ld = ofono_lte_get_data(lte);
+
+	DBG("");
+
+	ofono_lte_set_data(lte, NULL);
+
+	g_ril_unref(ld->ril);
+	g_free(ld);
+}
+
+static struct ofono_lte_driver driver = {
+	.name				= RILMODEM,
+	.probe				= ril_lte_probe,
+	.remove				= ril_lte_remove,
+	.set_default_attach_info	= ril_lte_set_default_attach_info,
+};
+
+void ril_lte_init(void)
+{
+	ofono_lte_driver_register(&driver);
+}
+
+void ril_lte_exit(void)
+{
+	ofono_lte_driver_unregister(&driver);
+}

ofono/drivers/rilmodem/netmon.c

@@ -61,6 +61,9 @@
 /* size of RIL_CellInfoTdscdma */
 #define NETMON_RIL_CELLINFO_SIZE_TDSCDMA	24
 
+#define MSECS_RATE_INVALID	(0x7fffffff)
+#define SECS_TO_MSECS(x)	((x) * 1000)
+
 struct netmon_data {
 	GRil *ril;
 };
@@ -96,11 +99,9 @@ static int ril_cell_type_to_size(int cell_type)
 	return 0;
 }
 
-static void ril_netmon_update_cb(struct ril_msg *message, gpointer user_data)
+static int process_cellinfo_list(struct ril_msg *message,
+					struct ofono_netmon *netmon)
 {
-	struct cb_data *cbd = user_data;
-	ofono_netmon_cb_t cb = cbd->cb;
-	struct ofono_netmon *netmon = cbd->data;
 	struct parcel rilp;
 	int skip_len;
 	int cell_info_cnt;
@@ -114,7 +115,7 @@ static void ril_netmon_update_cb(struct ril_msg *message, gpointer user_data)
 	int i, j;
 
 	if (message->error != RIL_E_SUCCESS)
-		goto error;
+		return OFONO_ERROR_TYPE_FAILURE;
 
 	g_ril_init_parcel(message, &rilp);
 
@@ -146,7 +147,7 @@ static void ril_netmon_update_cb(struct ril_msg *message, gpointer user_data)
 	}
 
 	if (!registered)
-		goto error;
+		return OFONO_ERROR_TYPE_FAILURE;
 
 	if (cell_type == NETMON_RIL_CELLINFO_TYPE_GSM) {
 		mcc = parcel_r_int32(&rilp);
@@ -216,17 +217,53 @@ static void ril_netmon_update_cb(struct ril_msg *message, gpointer user_data)
 				OFONO_NETMON_INFO_BER, ber,
 				OFONO_NETMON_INFO_INVALID);
 
-	} else {
-		goto error;
 	}
 
-	CALLBACK_WITH_SUCCESS(cb, cbd->data);
-	return;
+	return OFONO_ERROR_TYPE_NO_ERROR;
+}
+
+static void ril_netmon_update_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_netmon_cb_t cb = cbd->cb;
+	struct ofono_netmon *netmon = cbd->data;
+
+	if (process_cellinfo_list(message, netmon) ==
+			OFONO_ERROR_TYPE_NO_ERROR) {
+		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+		return;
+	}
 
-error:
 	CALLBACK_WITH_FAILURE(cb, cbd->data);
 }
 
+static void ril_cellinfo_notify(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_netmon *netmon = user_data;
+
+	process_cellinfo_list(message, netmon);
+}
+
+static void setup_cell_info_notify(struct ofono_netmon *netmon)
+{
+	struct netmon_data *nmd = ofono_netmon_get_data(netmon);
+	struct parcel rilp;
+
+	parcel_init(&rilp);
+
+	parcel_w_int32(&rilp, 1);	/* Number of elements */
+
+	parcel_w_int32(&rilp, MSECS_RATE_INVALID);
+
+	if (g_ril_send(nmd->ril, RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE,
+			&rilp, NULL, NULL, NULL) == 0)
+		ofono_error("%s: setup failed\n", __func__);
+
+	if (g_ril_register(nmd->ril, RIL_UNSOL_CELL_INFO_LIST,
+				ril_cellinfo_notify, netmon) == 0)
+		ofono_error("%s: setup failed\n", __func__);
+}
+
 static int ril_netmon_probe(struct ofono_netmon *netmon,
 		unsigned int vendor, void *user)
 {
@@ -237,6 +274,8 @@ static int ril_netmon_probe(struct ofono_netmon *netmon,
 
 	ofono_netmon_set_data(netmon, ud);
 
+	setup_cell_info_notify(netmon);
+
 	g_idle_add(ril_delayed_register, netmon);
 
 	return 0;
@@ -257,18 +296,55 @@ static void ril_netmon_request_update(struct ofono_netmon *netmon,
 	struct cb_data *cbd = cb_data_new(cb, data, nmd);
 
 	if (g_ril_send(nmd->ril, RIL_REQUEST_GET_CELL_INFO_LIST, NULL,
-			ril_netmon_update_cb, cbd, NULL) > 0)
+			ril_netmon_update_cb, cbd, g_free) > 0)
 		return;
 
 	g_free(cbd);
 	CALLBACK_WITH_FAILURE(cb, data);
 }
 
+static void periodic_update_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_netmon_cb_t cb = cbd->cb;
+
+	if (message->error != RIL_E_SUCCESS)
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+
+	CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void ril_netmon_periodic_update(struct ofono_netmon *netmon,
+			unsigned int enable, unsigned int period,
+			ofono_netmon_cb_t cb, void *data)
+{
+	struct netmon_data *nmd = ofono_netmon_get_data(netmon);
+	struct cb_data *cbd = cb_data_new(cb, data, nmd);
+	struct parcel rilp;
+
+	parcel_init(&rilp);
+
+	parcel_w_int32(&rilp, 1);	/* Number of elements */
+
+	if (enable)
+		parcel_w_int32(&rilp, SECS_TO_MSECS(period));
+	else
+		parcel_w_int32(&rilp, MSECS_RATE_INVALID);
+
+	if (g_ril_send(nmd->ril, RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE,
+			&rilp, periodic_update_cb, cbd, g_free) > 0)
+		return;
+
+	g_free(cbd);
+	CALLBACK_WITH_FAILURE(cb, cbd->data);
+}
+
 static struct ofono_netmon_driver driver = {
 	.name			= RILMODEM,
 	.probe			= ril_netmon_probe,
 	.remove			= ril_netmon_remove,
 	.request_update		= ril_netmon_request_update,
+	.enable_periodic_update	= ril_netmon_periodic_update,
 };
 
 void ril_netmon_init(void)

ofono/drivers/rilmodem/radio-settings.c

@@ -111,7 +111,7 @@ static void ril_set_rat_mode(struct ofono_radio_settings *rs,
 	struct radio_data *rd = ofono_radio_settings_get_data(rs);
 	struct cb_data *cbd = cb_data_new(cb, data, rs);
 	struct parcel rilp;
-	int pref = PREF_NET_TYPE_GSM_WCDMA;
+	int pref = PREF_NET_TYPE_LTE_GSM_WCDMA;
 
 	switch (mode) {
 	case OFONO_RADIO_ACCESS_MODE_ANY:

ofono/drivers/rilmodem/rilmodem.c

@@ -54,6 +54,7 @@ static int rilmodem_init(void)
 	ril_netmon_init();
 	ril_stk_init();
 	ril_cbs_init();
+	ril_lte_init();
 
 	return 0;
 }
@@ -78,6 +79,7 @@ static void rilmodem_exit(void)
 	ril_netmon_exit();
 	ril_stk_exit();
 	ril_cbs_exit();
+	ril_lte_exit();
 }
 
 OFONO_PLUGIN_DEFINE(rilmodem, "RIL modem driver", VERSION,

ofono/drivers/rilmodem/rilmodem.h

@@ -78,3 +78,6 @@ extern void ril_stk_exit(void);
 
 extern void ril_cbs_init(void);
 extern void ril_cbs_exit(void);
+
+extern void ril_lte_init(void);
+extern void ril_lte_exit(void);

ofono/drivers/rilmodem/stk.c

@@ -183,6 +183,24 @@ static void ril_stk_session_end_notify(struct ril_msg *message,
 	ofono_stk_proactive_session_end_notify(stk);
 }
 
+static void ril_stk_initialize_cb(struct ril_msg *message,
+				gpointer user_data)
+{
+	struct ofono_stk *stk = user_data;
+	struct stk_data *sd = ofono_stk_get_data(stk);
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s RILD reply failure: %s",
+			g_ril_request_id_to_string(sd->ril, message->req),
+			ril_error_to_string(message->error));
+		ofono_stk_remove(stk);
+
+		return;
+	}
+
+	ofono_stk_register(stk);
+}
+
 static int ril_stk_probe(struct ofono_stk *stk, unsigned int vendor,
 				void *user)
 {
@@ -204,7 +222,8 @@ static int ril_stk_probe(struct ofono_stk *stk, unsigned int vendor,
 	g_ril_register(ril, RIL_UNSOL_STK_EVENT_NOTIFY,
 					ril_stk_event_notify, stk);
 
-	ofono_stk_register(stk);
+	g_ril_send(data->ril, RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING, NULL,
+					ril_stk_initialize_cb, stk, NULL);
 
 	return 0;
 }

ofono/drivers/telitmodem/gprs-context-ncm.c

@@ -0,0 +1,482 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2017 Piotr Haber. 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.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+
+#include "gatchat.h"
+#include "gatresult.h"
+
+#include "telitmodem.h"
+
+static const char *none_prefix[] = { NULL };
+static const char *cgpaddr_prefix[] = { "+CGPADDR:", NULL };
+static const char *cgcontrdp_prefix[] = { "+CGCONTRDP:", NULL };
+
+enum state {
+	STATE_IDLE,
+	STATE_ENABLING,
+	STATE_DISABLING,
+	STATE_ACTIVE,
+};
+
+enum auth_method {
+	AUTH_METHOD_NONE,
+	AUTH_METHOD_PAP,
+	AUTH_METHOD_CHAP,
+};
+
+struct gprs_context_data {
+	GAtChat *chat;
+	unsigned int active_context;
+	char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
+	char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
+	enum auth_method auth_method;
+	enum state state;
+	enum ofono_gprs_proto proto;
+	char address[64];
+	char netmask[64];
+	char gateway[64];
+	char dns1[64];
+	char dns2[64];
+	ofono_gprs_context_cb_t cb;
+	void *cb_data;
+};
+
+static void failed_setup(struct ofono_gprs_context *gc,
+				GAtResult *result, gboolean deactivate)
+{
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+	struct ofono_error error;
+	char buf[64];
+
+	DBG("deactivate %d", deactivate);
+
+	if (deactivate == TRUE) {
+		sprintf(buf, "AT+CGACT=0,%u", gcd->active_context);
+		g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL);
+	}
+
+	gcd->active_context = 0;
+	gcd->state = STATE_IDLE;
+
+	if (result == NULL) {
+		CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
+		return;
+	}
+
+	decode_at_error(&error, g_at_result_final_response(result));
+	gcd->cb(&error, gcd->cb_data);
+}
+
+static void session_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+	struct ofono_modem *modem;
+	const char *interface;
+	const char *dns[3];
+
+	DBG("ok %d", ok);
+
+	if (!ok) {
+		ofono_error("Failed to establish session");
+		failed_setup(gc, result, TRUE);
+		return;
+	}
+
+	gcd->state = STATE_ACTIVE;
+
+	dns[0] = gcd->dns1;
+	dns[1] = gcd->dns2;
+	dns[2] = 0;
+
+	modem = ofono_gprs_context_get_modem(gc);
+	interface = ofono_modem_get_string(modem, "NetworkInterface");
+
+	ofono_gprs_context_set_interface(gc, interface);
+	ofono_gprs_context_set_ipv4_address(gc, gcd->address, TRUE);
+	ofono_gprs_context_set_ipv4_netmask(gc, gcd->netmask);
+	ofono_gprs_context_set_ipv4_gateway(gc, gcd->gateway);
+	ofono_gprs_context_set_ipv4_dns_servers(gc, dns);
+
+	CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
+}
+
+static void contrdp_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+	char buf[64];
+	int cid, bearer_id;
+	const char *apn, *ip_mask, *gw;
+	const char *dns1, *dns2;
+	GAtResultIter iter;
+	gboolean found = FALSE;
+
+	DBG("ok %d", ok);
+
+	if (!ok) {
+		ofono_error("Unable to get context dynamic paramerers");
+		failed_setup(gc, result, TRUE);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	while (g_at_result_iter_next(&iter, "+CGCONTRDP:")) {
+		if (!g_at_result_iter_next_number(&iter, &cid))
+			goto error;
+		if (!g_at_result_iter_next_number(&iter, &bearer_id))
+			goto error;
+		if (!g_at_result_iter_next_string(&iter, &apn))
+			goto error;
+		if (!g_at_result_iter_next_string(&iter, &ip_mask))
+			goto error;
+		if (!g_at_result_iter_next_string(&iter, &gw))
+			goto error;
+		if (!g_at_result_iter_next_string(&iter, &dns1))
+			goto error;
+		if (!g_at_result_iter_next_string(&iter, &dns2))
+			goto error;
+
+		if ((unsigned int) cid == gcd->active_context) {
+			found = TRUE;
+
+			if (strcmp(gcd->address, "") != 0)
+				strncpy(gcd->netmask,
+					&ip_mask[strlen(gcd->address) + 1],
+					sizeof(gcd->netmask));
+
+			strncpy(gcd->gateway, gw, sizeof(gcd->gateway));
+			strncpy(gcd->dns1, dns1, sizeof(gcd->dns1));
+			strncpy(gcd->dns2, dns2, sizeof(gcd->dns2));
+		}
+	}
+
+	if (found == FALSE)
+		goto error;
+
+	ofono_info("IP: %s", gcd->address);
+	ofono_info("MASK: %s", gcd->netmask);
+	ofono_info("GW: %s", gcd->gateway);
+	ofono_info("DNS: %s, %s", gcd->dns1, gcd->dns2);
+
+	sprintf(buf, "AT+CGDATA=\"M-RAW_IP\",%d", gcd->active_context);
+	if (g_at_chat_send(gcd->chat, buf, none_prefix,
+					session_cb, gc, NULL) > 0)
+		return;
+
+error:
+	failed_setup(gc, NULL, TRUE);
+}
+
+static void address_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+	int cid;
+	const char *address;
+	char buf[64];
+	GAtResultIter iter;
+
+	DBG("ok %d", ok);
+
+	if (!ok) {
+		ofono_error("Unable to get context address");
+		failed_setup(gc, result, TRUE);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+CGPADDR:"))
+		goto error;
+
+	if (!g_at_result_iter_next_number(&iter, &cid))
+		goto error;
+
+	if ((unsigned int) cid != gcd->active_context)
+		goto error;
+
+	if (!g_at_result_iter_next_string(&iter, &address))
+		goto error;
+
+	strncpy(gcd->address, address, sizeof(gcd->address));
+
+	sprintf(buf, "AT+CGCONTRDP=%d", gcd->active_context);
+	if (g_at_chat_send(gcd->chat, buf, cgcontrdp_prefix,
+					contrdp_cb, gc, NULL) > 0)
+		return;
+
+error:
+	failed_setup(gc, NULL, TRUE);
+}
+
+static void activate_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+	char buf[64];
+
+	DBG("ok %d", ok);
+
+	if (!ok) {
+		ofono_error("Unable to activate context");
+		failed_setup(gc, result, FALSE);
+		return;
+	}
+
+	sprintf(buf, "AT+CGPADDR=%u", gcd->active_context);
+	if (g_at_chat_send(gcd->chat, buf, cgpaddr_prefix,
+					address_cb, gc, NULL) > 0)
+		return;
+
+	failed_setup(gc, NULL, TRUE);
+}
+
+static void setup_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+	char buf[384];
+
+	DBG("ok %d", ok);
+
+	if (!ok) {
+		ofono_error("Failed to setup context");
+		failed_setup(gc, result, FALSE);
+		return;
+	}
+
+	if (gcd->username[0] && gcd->password[0])
+		sprintf(buf, "AT#PDPAUTH=%u,%u,\"%s\",\"%s\"",
+			gcd->active_context, gcd->auth_method,
+			gcd->username, gcd->password);
+	else
+		sprintf(buf, "AT#PDPAUTH=%u,0", gcd->active_context);
+
+	if (g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL) == 0)
+		goto error;
+
+	sprintf(buf, "AT#NCM=1,%u", gcd->active_context);
+
+	if (g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL) == 0)
+		goto error;
+
+	sprintf(buf, "AT+CGACT=1,%u", gcd->active_context);
+
+	if (g_at_chat_send(gcd->chat, buf, none_prefix,
+				activate_cb, gc, NULL) > 0)
+		return;
+
+error:
+	failed_setup(gc, NULL, FALSE);
+}
+
+static void telitncm_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);
+	char buf[OFONO_GPRS_MAX_APN_LENGTH + 128];
+	int len = 0;
+
+	DBG("cid %u", ctx->cid);
+
+	gcd->active_context = ctx->cid;
+	gcd->cb = cb;
+	gcd->cb_data = data;
+	memcpy(gcd->username, ctx->username, sizeof(ctx->username));
+	memcpy(gcd->password, ctx->password, sizeof(ctx->password));
+	gcd->state = STATE_ENABLING;
+	gcd->proto = ctx->proto;
+
+	/* We only support CHAP and PAP */
+	switch (ctx->auth_method) {
+	case OFONO_GPRS_AUTH_METHOD_CHAP:
+		gcd->auth_method = AUTH_METHOD_CHAP;
+		break;
+	case OFONO_GPRS_AUTH_METHOD_PAP:
+		gcd->auth_method = AUTH_METHOD_PAP;
+		break;
+	default:
+		goto error;
+	}
+
+	switch (ctx->proto) {
+	case OFONO_GPRS_PROTO_IP:
+		len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"",
+								ctx->cid);
+		break;
+	case OFONO_GPRS_PROTO_IPV6:
+		len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IPV6\"",
+								ctx->cid);
+		break;
+	case OFONO_GPRS_PROTO_IPV4V6:
+		len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IPV4V6\"",
+								ctx->cid);
+		break;
+	}
+
+	if (ctx->apn)
+		snprintf(buf + len, sizeof(buf) - len - 3,
+					",\"%s\"", ctx->apn);
+
+	if (g_at_chat_send(gcd->chat, buf, none_prefix,
+				setup_cb, gc, NULL) > 0)
+		return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, data);
+}
+
+static void deactivate_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+
+	DBG("ok %d", ok);
+
+	gcd->active_context = 0;
+	gcd->state = STATE_IDLE;
+
+	CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
+}
+
+static void telitncm_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);
+	char buf[64];
+
+	DBG("cid %u", cid);
+
+	gcd->state = STATE_DISABLING;
+	gcd->cb = cb;
+	gcd->cb_data = data;
+
+	sprintf(buf, "AT+CGACT=0,%u", gcd->active_context);
+
+	if (g_at_chat_send(gcd->chat, buf, none_prefix,
+				deactivate_cb, gc, NULL) > 0)
+		return;
+
+	CALLBACK_WITH_SUCCESS(cb, data);
+}
+
+static void cgev_notify(GAtResult *result, gpointer user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+	const char *event;
+	int cid;
+	GAtResultIter iter;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+CGEV:"))
+		return;
+
+	if (!g_at_result_iter_next_unquoted_string(&iter, &event))
+		return;
+
+	if (g_str_has_prefix(event, "NW DEACT") == FALSE)
+		return;
+
+	if (!g_at_result_iter_skip_next(&iter))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &cid))
+		return;
+
+	DBG("cid %d", cid);
+
+	if ((unsigned int) cid != gcd->active_context)
+		return;
+
+	ofono_gprs_context_deactivated(gc, gcd->active_context);
+
+	gcd->active_context = 0;
+	gcd->state = STATE_IDLE;
+}
+
+static int telitncm_gprs_context_probe(struct ofono_gprs_context *gc,
+					unsigned int vendor, void *data)
+{
+	GAtChat *chat = data;
+	struct gprs_context_data *gcd;
+
+	DBG("");
+
+	gcd = g_try_new0(struct gprs_context_data, 1);
+	if (gcd == NULL)
+		return -ENOMEM;
+
+	gcd->chat = g_at_chat_clone(chat);
+
+	ofono_gprs_context_set_data(gc, gcd);
+
+	g_at_chat_register(chat, "+CGEV:", cgev_notify, FALSE, gc, NULL);
+
+	return 0;
+}
+
+static void telitncm_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);
+
+	g_at_chat_unref(gcd->chat);
+	g_free(gcd);
+}
+
+static struct ofono_gprs_context_driver driver = {
+	.name			= "telitncmmodem",
+	.probe			= telitncm_gprs_context_probe,
+	.remove			= telitncm_gprs_context_remove,
+	.activate_primary	= telitncm_gprs_activate_primary,
+	.deactivate_primary	= telitncm_gprs_deactivate_primary,
+};
+
+void telitncm_gprs_context_init(void)
+{
+	ofono_gprs_context_driver_register(&driver);
+}
+
+void telitncm_gprs_context_exit(void)
+{
+	ofono_gprs_context_driver_unregister(&driver);
+}

ofono/drivers/telitmodem/telitmodem.c

@@ -35,6 +35,7 @@
 static int telitmodem_init(void)
 {
 	telit_location_reporting_init();
+	telitncm_gprs_context_init();
 
 	return 0;
 }
@@ -42,6 +43,7 @@ static int telitmodem_init(void)
 static void telitmodem_exit(void)
 {
 	telit_location_reporting_exit();
+	telitncm_gprs_context_exit();
 }
 
 OFONO_PLUGIN_DEFINE(telitmodem, "Telit modem driver", VERSION,

ofono/drivers/telitmodem/telitmodem.h

@@ -23,3 +23,5 @@
 
 extern void telit_location_reporting_init();
 extern void telit_location_reporting_exit();
+extern void telitncm_gprs_context_init();
+extern void telitncm_gprs_context_exit();

ofono/drivers/ubloxmodem/gprs-context.c

@@ -43,6 +43,7 @@
 
 static const char *none_prefix[] = { NULL };
 static const char *cgcontrdp_prefix[] = { "+CGCONTRDP:", NULL };
+static const char *uipaddr_prefix[] = { "+UIPADDR:", NULL };
 
 struct gprs_context_data {
 	GAtChat *chat;
@@ -51,6 +52,44 @@ struct gprs_context_data {
 	void *cb_data;
 };
 
+static void uipaddr_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_gprs_context *gc = user_data;
+	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+	GAtResultIter iter;
+
+	const char *gw = NULL;
+	const char *netmask = NULL;
+
+	DBG("ok %d", ok);
+
+	if (!ok) {
+		CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	while (g_at_result_iter_next(&iter, "+UIPADDR:")) {
+		g_at_result_iter_skip_next(&iter);
+		g_at_result_iter_skip_next(&iter);
+
+		if (!g_at_result_iter_next_string(&iter, &gw))
+			break;
+
+		if (!g_at_result_iter_next_string(&iter, &netmask))
+			break;
+	}
+
+	if (gw)
+		ofono_gprs_context_set_ipv4_gateway(gc, gw);
+
+	if (netmask)
+		ofono_gprs_context_set_ipv4_netmask(gc, netmask);
+
+	CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
+}
+
 /*
  * CGCONTRDP returns addr + netmask in the same string in the form
  * of "a.b.c.d.m.m.m.m" for IPv4. IPv6 is not supported so we ignore it.
@@ -113,6 +152,7 @@ static void cgcontrdp_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	const char *laddrnetmask = NULL;
 	const char *gw = NULL;
 	const char *dns[3] = { NULL, NULL, NULL };
+	char buf[64];
 
 	DBG("ok %d", ok);
 
@@ -159,6 +199,17 @@ static void cgcontrdp_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	if (dns[0])
 		ofono_gprs_context_set_ipv4_dns_servers(gc, dns);
 
+	/*
+	 * Some older versions of Toby L2 need to issue AT+UIPADDR to get the
+	 * the correct gateway and netmask. The newer version will return an
+	 * empty ok reply.
+	 */
+	snprintf(buf, sizeof(buf), "AT+UIPADDR=%u", gcd->active_context);
+	if (g_at_chat_send(gcd->chat, buf, uipaddr_prefix,
+				uipaddr_cb, gc, NULL) > 0)
+		return;
+
+	/* Even if UIPADDR failed, we still have enough data. */
 	CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
 }
 
@@ -443,6 +494,7 @@ static void ublox_gprs_context_remove(struct ofono_gprs_context *gc)
 	g_at_chat_unref(gcd->chat);
 
 	memset(gcd, 0, sizeof(*gcd));
+	g_free(gcd);
 }
 
 static struct ofono_gprs_context_driver driver = {

ofono/drivers/ubloxmodem/lte.c

@@ -0,0 +1,142 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2016  Endocode AG. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+#include <ofono/log.h>
+#include <ofono/lte.h>
+
+#include "gatchat.h"
+#include "gatresult.h"
+
+#include "ubloxmodem.h"
+
+static const char *ucgdflt_prefix[] = { "+UCGDFLT:", NULL };
+
+struct lte_driver_data {
+	GAtChat *chat;
+};
+
+static void ucgdflt_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;
+
+	DBG("ok %d", ok);
+
+	decode_at_error(&error, g_at_result_final_response(result));
+	cb(&error, cbd->data);
+}
+
+static void ublox_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);
+	char buf[32 + OFONO_GPRS_MAX_APN_LENGTH + 1];
+	struct cb_data *cbd = cb_data_new(cb, data);
+
+	DBG("LTE config with APN: %s", info->apn);
+
+	if (strlen(info->apn) > 0)
+		snprintf(buf, sizeof(buf), "AT+UCGDFLT=0,\"IP\",\"%s\"",
+				info->apn);
+	else
+		snprintf(buf, sizeof(buf), "AT+UCGDFLT=0");
+
+	/* We can't do much in case of failure so don't check response. */
+	if (g_at_chat_send(ldd->chat, buf, ucgdflt_prefix,
+				ucgdflt_cb, cbd, g_free) > 0)
+		return;
+
+	CALLBACK_WITH_FAILURE(cb, data);
+}
+
+static gboolean lte_delayed_register(gpointer user_data)
+{
+	struct ofono_lte *lte = user_data;
+
+	ofono_lte_register(lte);
+
+	return FALSE;
+}
+
+static int ublox_lte_probe(struct ofono_lte *lte, void *data)
+{
+	GAtChat *chat = data;
+	struct lte_driver_data *ldd;
+
+	DBG("ublox lte probe");
+
+	ldd = g_try_new0(struct lte_driver_data, 1);
+	if (!ldd)
+		return -ENOMEM;
+
+	ldd->chat = g_at_chat_clone(chat);
+
+	ofono_lte_set_data(lte, ldd);
+
+	g_idle_add(lte_delayed_register, lte);
+
+	return 0;
+}
+
+static void ublox_lte_remove(struct ofono_lte *lte)
+{
+	struct lte_driver_data *ldd = ofono_lte_get_data(lte);
+
+	DBG("ublox lte remove");
+
+	g_at_chat_unref(ldd->chat);
+
+	ofono_lte_set_data(lte, NULL);
+
+	g_free(ldd);
+}
+
+static struct ofono_lte_driver driver = {
+	.name				= UBLOXMODEM,
+	.probe				= ublox_lte_probe,
+	.remove				= ublox_lte_remove,
+	.set_default_attach_info	= ublox_lte_set_default_attach_info,
+};
+
+void ublox_lte_init(void)
+{
+	ofono_lte_driver_register(&driver);
+}
+
+void ublox_lte_exit(void)
+{
+	ofono_lte_driver_unregister(&driver);
+}

ofono/drivers/ubloxmodem/netmon.c

@@ -0,0 +1,354 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2016  EndoCode AG. 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 <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/netreg.h>
+#include <ofono/netmon.h>
+
+#include "gatchat.h"
+#include "gatresult.h"
+
+#include "common.h"
+#include "ubloxmodem.h"
+#include "drivers/atmodem/vendor.h"
+
+static const char *cops_prefix[] = { "+COPS:", NULL };
+static const char *cesq_prefix[] = { "+CESQ:", NULL };
+
+struct netmon_driver_data {
+	GAtChat *chat;
+};
+
+struct req_cb_data {
+	gint ref_count; /* Ref count */
+
+	struct ofono_netmon *netmon;
+
+	ofono_netmon_cb_t cb;
+	void *data;
+
+	struct ofono_network_operator op;
+
+	int rxlev;	/* CESQ: Received Signal Strength Indication */
+	int ber;	/* CESQ: Bit Error Rate */
+	int rscp;	/* CESQ: Received Signal Code Powe */
+	int rsrp;	/* CESQ: Reference Signal Received Power */
+	int ecn0;	/* CESQ: Received Energy Ratio */
+	int rsrq;	/* CESQ: Reference Signal Received Quality */
+};
+
+/*
+ * Returns the appropriate radio access technology.
+ *
+ * If we can not resolve to a specific radio access technolgy
+ * we return OFONO_NETMON_CELL_TYPE_GSM by default.
+ */
+static int ublox_map_radio_access_technology(int tech)
+{
+	switch (tech) {
+	case ACCESS_TECHNOLOGY_GSM:
+	case ACCESS_TECHNOLOGY_GSM_COMPACT:
+		return OFONO_NETMON_CELL_TYPE_GSM;
+	case ACCESS_TECHNOLOGY_UTRAN:
+	case ACCESS_TECHNOLOGY_UTRAN_HSDPA:
+	case ACCESS_TECHNOLOGY_UTRAN_HSUPA:
+	case ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA:
+		return OFONO_NETMON_CELL_TYPE_UMTS;
+	case ACCESS_TECHNOLOGY_EUTRAN:
+		return OFONO_NETMON_CELL_TYPE_LTE;
+	}
+
+	return OFONO_NETMON_CELL_TYPE_GSM;
+}
+
+static inline struct req_cb_data *req_cb_data_new0(void *cb, void *data,
+							void *user)
+{
+	struct req_cb_data *ret = g_new0(struct req_cb_data, 1);
+
+	ret->ref_count = 1;
+	ret->cb = cb;
+	ret->data = data;
+	ret->netmon = user;
+	ret->rxlev = -1;
+	ret->ber = -1;
+	ret->rscp = -1;
+	ret->rsrp = -1;
+	ret->ecn0 = -1;
+	ret->rsrq = -1;
+
+	return ret;
+}
+
+static inline struct req_cb_data *req_cb_data_ref(struct req_cb_data *cbd)
+{
+	if (cbd == NULL)
+		return NULL;
+
+	g_atomic_int_inc(&cbd->ref_count);
+
+	return cbd;
+}
+
+static void req_cb_data_unref(gpointer user_data)
+{
+	gboolean is_zero;
+	struct req_cb_data *cbd = user_data;
+
+	if (cbd == NULL)
+		return;
+
+	is_zero = g_atomic_int_dec_and_test(&cbd->ref_count);
+
+	if (is_zero == TRUE)
+		g_free(cbd);
+}
+
+static gboolean ublox_delayed_register(gpointer user_data)
+{
+	struct ofono_netmon *netmon = user_data;
+
+	ofono_netmon_register(netmon);
+
+	return FALSE;
+}
+
+static void ublox_netmon_finish_success(struct req_cb_data *cbd)
+{
+	struct ofono_netmon *nm = cbd->netmon;
+
+	ofono_netmon_serving_cell_notify(nm,
+					cbd->op.tech,
+					OFONO_NETMON_INFO_RXLEV, cbd->rxlev,
+					OFONO_NETMON_INFO_BER, cbd->ber,
+					OFONO_NETMON_INFO_RSCP, cbd->rscp,
+					OFONO_NETMON_INFO_ECN0, cbd->ecn0,
+					OFONO_NETMON_INFO_RSRQ, cbd->rsrq,
+					OFONO_NETMON_INFO_RSRP, cbd->rsrp,
+					OFONO_NETMON_INFO_INVALID);
+
+	CALLBACK_WITH_SUCCESS(cbd->cb, cbd->data);
+}
+
+static void cesq_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	enum cesq_ofono_netmon_info {
+		CESQ_RXLEV,
+		CESQ_BER,
+		CESQ_RSCP,
+		CESQ_ECN0,
+		CESQ_RSRQ,
+		CESQ_RSRP,
+		_MAX,
+	};
+
+	struct req_cb_data *cbd = user_data;
+	struct ofono_error error;
+	GAtResultIter iter;
+	int idx, number;
+
+	DBG("ok %d", ok);
+
+	decode_at_error(&error, g_at_result_final_response(result));
+
+	if (!ok) {
+		CALLBACK_WITH_FAILURE(cbd->cb, cbd->data);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+CESQ:")) {
+		DBG(" CESQ: no result ");
+		goto out;
+	}
+
+	for (idx = 0; idx < _MAX; idx++) {
+		ok = g_at_result_iter_next_number(&iter, &number);
+
+		if (!ok) {
+			/* Ignore and do not fail */
+			DBG(" CESQ: error parsing idx: %d ", idx);
+			goto out;
+		}
+
+		switch (idx) {
+		case CESQ_RXLEV:
+			cbd->rxlev = number != 99 ? number:cbd->rxlev;
+			break;
+		case CESQ_BER:
+			cbd->ber = number != 99 ? number:cbd->ber;
+			break;
+		case CESQ_RSCP:
+			cbd->rscp = number != 255 ? number:cbd->rscp;
+			break;
+		case CESQ_ECN0:
+			cbd->ecn0 = number != 255 ? number:cbd->ecn0;
+			break;
+		case CESQ_RSRQ:
+			cbd->rsrq = number != 255 ? number:cbd->rsrq;
+			break;
+		case CESQ_RSRP:
+			cbd->rsrp = number != 255 ? number:cbd->rsrp;
+			break;
+		}
+	}
+
+	DBG(" RXLEV	%d ", cbd->rxlev);
+	DBG(" BER	%d ", cbd->ber);
+	DBG(" RSCP	%d ", cbd->rscp);
+	DBG(" ECN0	%d ", cbd->ecn0);
+	DBG(" RSRQ	%d ", cbd->rsrq);
+	DBG(" RSRP	%d ", cbd->rsrp);
+
+	/*
+	 * We never fail at this point we always send what we collected so
+	 * far
+	 */
+out:
+	ublox_netmon_finish_success(cbd);
+}
+
+static void cops_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct req_cb_data *cbd = user_data;
+	struct ofono_netmon *nm = cbd->netmon;
+	struct netmon_driver_data *nmd = ofono_netmon_get_data(nm);
+	struct ofono_error error;
+	GAtResultIter iter;
+	int tech;
+
+	DBG("ok %d", ok);
+
+	decode_at_error(&error, g_at_result_final_response(result));
+
+	if (!ok) {
+		CALLBACK_WITH_FAILURE(cbd->cb, cbd->data);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	/* Do not fail */
+	if (!g_at_result_iter_next(&iter, "+COPS:")) {
+		CALLBACK_WITH_SUCCESS(cbd->cb, cbd->data);
+		return;
+	}
+
+	g_at_result_iter_skip_next(&iter);
+	g_at_result_iter_skip_next(&iter);
+	g_at_result_iter_skip_next(&iter);
+
+	/* Default to GSM */
+	if (g_at_result_iter_next_number(&iter, &tech) == FALSE)
+		cbd->op.tech = OFONO_NETMON_CELL_TYPE_GSM;
+	else
+		cbd->op.tech = ublox_map_radio_access_technology(tech);
+
+	cbd = req_cb_data_ref(cbd);
+	if (g_at_chat_send(nmd->chat, "AT+CESQ", cesq_prefix,
+				cesq_cb, cbd, req_cb_data_unref) == 0) {
+		CALLBACK_WITH_FAILURE(cbd->cb, cbd->data);
+		req_cb_data_unref(cbd);
+	}
+}
+
+static void ublox_netmon_request_update(struct ofono_netmon *netmon,
+					ofono_netmon_cb_t cb, void *data)
+{
+	struct netmon_driver_data *nmd = ofono_netmon_get_data(netmon);
+	struct req_cb_data *cbd;
+
+	DBG("ublox netmon request update");
+
+	cbd = req_cb_data_new0(cb, data, netmon);
+
+	if (g_at_chat_send(nmd->chat, "AT+COPS?", cops_prefix,
+				cops_cb, cbd, req_cb_data_unref) == 0) {
+		CALLBACK_WITH_FAILURE(cbd->cb, cbd->data);
+		req_cb_data_unref(cbd);
+	}
+}
+
+static int ublox_netmon_probe(struct ofono_netmon *netmon,
+					unsigned int vendor, void *user)
+{
+	GAtChat *chat = user;
+	struct netmon_driver_data *nmd;
+
+	DBG("ublox netmon probe");
+
+	nmd = g_try_new0(struct netmon_driver_data, 1);
+	if (nmd == NULL)
+		return -ENOMEM;
+
+	nmd->chat = g_at_chat_clone(chat);
+
+	ofono_netmon_set_data(netmon, nmd);
+
+	g_idle_add(ublox_delayed_register, netmon);
+
+	return 0;
+}
+
+static void ublox_netmon_remove(struct ofono_netmon *netmon)
+{
+	struct netmon_driver_data *nmd = ofono_netmon_get_data(netmon);
+
+	DBG("ublox netmon remove");
+
+	g_at_chat_unref(nmd->chat);
+
+	ofono_netmon_set_data(netmon, NULL);
+
+	g_free(nmd);
+}
+
+static struct ofono_netmon_driver driver = {
+	.name			= UBLOXMODEM,
+	.probe			= ublox_netmon_probe,
+	.remove			= ublox_netmon_remove,
+	.request_update		= ublox_netmon_request_update,
+};
+
+void ublox_netmon_init(void)
+{
+	ofono_netmon_driver_register(&driver);
+}
+
+void ublox_netmon_exit(void)
+{
+	ofono_netmon_driver_unregister(&driver);
+}

ofono/drivers/ubloxmodem/ubloxmodem.c

@@ -29,12 +29,15 @@
 #define OFONO_API_SUBJECT_TO_CHANGE
 #include <ofono/plugin.h>
 #include <ofono/types.h>
+#include <ofono/modem.h>
 
 #include "ubloxmodem.h"
 
 static int ubloxmodem_init(void)
 {
 	ublox_gprs_context_init();
+	ublox_netmon_init();
+	ublox_lte_init();
 
 	return 0;
 }
@@ -42,6 +45,8 @@ static int ubloxmodem_init(void)
 static void ubloxmodem_exit(void)
 {
 	ublox_gprs_context_exit();
+	ublox_netmon_exit();
+	ublox_lte_exit();
 }
 
 OFONO_PLUGIN_DEFINE(ubloxmodem, "U-Blox Toby L2 high speed modem driver",

ofono/drivers/ubloxmodem/ubloxmodem.h

@@ -21,5 +21,13 @@
 
 #include <drivers/atmodem/atutil.h>
 
+#define UBLOXMODEM "ubloxmodem"
+
 extern void ublox_gprs_context_init(void);
 extern void ublox_gprs_context_exit(void);
+
+extern void ublox_netmon_init(void);
+extern void ublox_netmon_exit(void);
+
+extern void ublox_lte_init(void);
+extern void ublox_lte_exit(void);