Merge branch 'vendor' into 'master'

MTK support

See merge request !156

ofono/.gitignore

@@ -42,6 +42,36 @@ unit/test-mux
 unit/test-caif
 unit/test-stkutil
 unit/test-cdmasms
+unit/test-ril_util
+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-sms-filter
+unit/test-*.log
+unit/test-*.trs
+
+unit/test-grilreply
+unit/test-grilrequest
+unit/test-grilunsol
+unit/test-provision
+unit/html
+
+plugins/sailfish_manager/*.gcda
+plugins/sailfish_manager/*.gcno
+drivers/*/*.gcda
+drivers/*/*.gcno
+drivers/*/*.gcov
+plugins/*/*.gcda
+plugins/*/*.gcno
+plugins/*/*.gcov
+*/*.gcda
+*/*.gcno
+*/*.gcov
 
 tools/huawei-audio
 tools/auto-enable

ofono/AUTHORS

@@ -96,3 +96,30 @@ Tony Espy <espy@canonical.com>
 Martin Pitt <martin.pitt@ubuntu.com>
 Alfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com>
 Jussi Pakkanen <jussi.pakkanen@canonical.com>
+Sergio Checa Blanco <sergio.checa@bmw-carit.de>
+Philip Paeps <philip@paeps.cx>
+Kuba Pawlak <kubax.t.pawlak@intel.com>
+Tommi Kenakkala <tommi.kenakkala@tieto.com>
+Alex J Lennon <ajlennon@dynamicdevices.co.uk>
+Sergey Alirzaev <zl29ah@gmail.com>
+Marko Sulejic <marko.sulejic@hale.at>
+Johannes 'josch' Schauer <josch@mister-muffin.de>
+Simon Fels <simon.fels@canonical.com>
+John Ernberg <john.ernberg@actia.se>
+Dongsu Park <dongsu@endocode.com>
+Dragos Tatulea <dragos@endocode.com>
+Samrat Guha Niyogi <samrat.guha.niyogi@intel.com>
+Anirudh Gargi <anirudh.gargi@intel.com>
+Nishanth V <nishanth.v@intel.com>
+Antara Borwankar <antara.borwankar@gmail.com>
+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>

ofono/ChangeLog

@@ -1,3 +1,84 @@
+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.
+	Fix issue with handling serving cell info.
+	Fix issue with handling SIM SC facility lock.
+	Fix issue with Android RIL PIN retry logic.
+	Fix issue with Android RIL and RAT handling.
+	Add support for Android RIL cell broadcast.
+	Add support for SoFIA 3GR thermal management.
+
+ver 1.18:
+	Fix issue with cell broadcast and use-after-fee.
+	Fix issue with repeated held call indicator.
+	Fix issue with +CCWA and connection setup.
+	Fix issue with empty operator scan results.
+	Fix issue with persistent RAT mode handling.
+	Fix issue with multiparty call introspection.
+	Fix issue with GRPS context introspection.
+	Fix issue with stale context deactivation.
+	Add support for automatic context activation.
+	Add support for SIM service provider names.
+	Add support for handling allowed APN lists.
+	Add support for network monitoring interface.
+	Add support for U-Blox TOBY-L2 modem series.
+	Add support for Sierra MC73xx QMI modems.
+	Add support for SoFIA 3GR modem series.
+	Add support for upower battery monitoring.
+	Add support for gateway audio card types.
+	Add support for Handsfree audio driver.
+	Add support for Android RIL integration.
+
+ver 1.17:
+	Fix issue with alphanumeric TP-OA handling.
+	Fix issue with push notification origin port.
+	Fix issue with reading of EF_MWIS records.
+	Fix issue with handling AT+CPINR results.
+	Fix issue with SIM state polling for Sierra modems.
+	Fix issue with HFP handling and AT command prefixes.
+	Fix issue with HFP and extra CCWA event handling.
+	Fix issue with HFP call state and +CHUP errors.
+
+ver 1.16:
+	Fix issue with PIN retry handling.
+	Fix issue with HFP and multiple calls.
+	Add support for Distracted Driving Reduction.
+	Add support for available technologies property.
+	Add support for Telit location reporting driver.
+	Add support for u-blox SARA-U270 modems.
+	Add support for Quectel UC15 modems.
+
+ver 1.15:
+	Fix issue with EF_PNN access affecting PLMN display.
+	Fix issue with SIM detection and Telit HE910 modems.
+	Fix issue with Mobile Provider Database provisioning.
+	Fix issue with bit-shifting and ID mapping allocations.
+	Fix issue with Handsfree and unsolicited notifications.
+	Fix issue with Handsfree and three way calling feature.
+	Add support for Handsfree subscriber number feature.
+	Add support for Handsfree multiple DTMF characters.
+	Add support for PAP authentication.
+
 ver 1.14:
 	Add support for Apple Siri specific Handsfree commands.
 	Add support for provisioning of MMSC and Message Proxy.

ofono/HACKING

@@ -113,3 +113,5 @@ doc/coding-style.txt.
 a feature that touches files under 'include/', 'src/' and 'drivers/'
 directories, split in three separated patches, taking care not to
 break compilation.
+
+4) Submit patches using git send-email to ofono@ofono.org

ofono/Makefile.am

@@ -21,11 +21,20 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/cdma-connman.h include/gnss.h \
 			include/private-network.h include/cdma-netreg.h \
 			include/cdma-provision.h include/handsfree.h \
-			include/handsfree-audio.h include/sim-mnclength.h \
-			include/oemraw.h include/siri.h
+			include/sim-mnclength.h \
+			include/handsfree-audio.h include/siri.h \
+			include/sms-filter.h \
+			include/netmon.h include/lte.h \
+			include/storage.h \
+			gdbus/gdbus.h
 
 nodist_pkginclude_HEADERS = include/version.h
 
+if SAILFISH_MANAGER
+nodist_pkginclude_HEADERS += include/sailfish_cell_info.h \
+			include/sailfish_manager.h include/sailfish_watch.h
+endif
+
 local_headers = $(foreach file,$(pkginclude_HEADERS) \
 				$(nodist_pkginclude_HEADERS), \
 					include/ofono/$(notdir $(file)))
@@ -96,20 +105,16 @@ gisi_sources = gisi/client.c gisi/client.h gisi/common.h \
 				gisi/server.c gisi/server.h \
 				gisi/socket.c gisi/socket.h
 
-gril_sources = gril/gril.h gril/gril.c gril/grilio.h \
-				gril/grilio.c gril/grilutil.h \
-				gril/grilutil.c gril/ringbuffer.h \
-				gril/gfunc.h gril/ril.h \
+gril_sources = gril/gril.h gril/gril.c \
+				gril/grilio.h gril/grilio.c \
+				gril/grilutil.h gril/grilutil.c \
+				gril/gfunc.h gril/gril.h \
 				gril/parcel.c gril/parcel.h \
-				gril/grilreply.c gril/grilreply.h \
-				gril/grilrequest.c gril/grilrequest.h \
-				gril/grilunsol.c gril/grilunsol.h
+				gril/ril_constants.h
 
 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@
 
@@ -117,18 +122,84 @@ builtin_modules += udevng
 builtin_sources += plugins/udevng.c
 endif
 
+if SAILFISH_MANAGER
+builtin_modules += sailfish_manager
+builtin_sources += plugins/sailfish_manager/sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_cell_info_dbus.c \
+			plugins/sailfish_manager/sailfish_manager.c \
+			plugins/sailfish_manager/sailfish_manager_dbus.c \
+			plugins/sailfish_manager/sailfish_sim_info.c \
+			plugins/sailfish_manager/sailfish_sim_info_dbus.c \
+			plugins/sailfish_manager/sailfish_watch.c
+endif
+
 if RILMODEM
-builtin_sources += $(gril_sources)
+if SAILFISH_RILMODEM
 
 builtin_modules += ril
-builtin_sources += plugins/ril.c
+builtin_sources +=	drivers/ril/ril_call_barring.c \
+			drivers/ril/ril_call_forward.c \
+			drivers/ril/ril_call_settings.c \
+			drivers/ril/ril_call_volume.c \
+			drivers/ril/ril_cell_info.c \
+			drivers/ril/ril_config.c \
+			drivers/ril/ril_cbs.c \
+			drivers/ril/ril_data.c \
+			drivers/ril/ril_devinfo.c \
+			drivers/ril/ril_ecclist.c \
+			drivers/ril/ril_gprs.c \
+			drivers/ril/ril_gprs_context.c \
+			drivers/ril/ril_modem.c \
+			drivers/ril/ril_netmon.c \
+			drivers/ril/ril_netreg.c \
+			drivers/ril/ril_network.c \
+			drivers/ril/ril_oem_raw.c \
+			drivers/ril/ril_phonebook.c \
+			drivers/ril/ril_plugin.c \
+			drivers/ril/ril_radio.c \
+			drivers/ril/ril_radio_caps.c \
+			drivers/ril/ril_radio_settings.c \
+			drivers/ril/ril_sim.c \
+			drivers/ril/ril_sim_card.c \
+			drivers/ril/ril_sim_settings.c \
+			drivers/ril/ril_sms.c \
+			drivers/ril/ril_stk.c \
+			drivers/ril/ril_ussd.c \
+			drivers/ril/ril_util.c \
+			drivers/ril/ril_vendor.c \
+			drivers/ril/ril_voicecall.c
+
+# Vendor specific extensions
+builtin_sources +=	drivers/ril/ril_vendor_mtk.c
+
+if DATAFILES
+dist_conf_DATA += drivers/ril/ril_subscription.conf
+endif
+
+else
+
+builtin_sources += $(gril_sources)
+
+builtin_modules += rildev
+builtin_sources += plugins/rildev.c
+
+builtin_modules += ril
+builtin_sources += plugins/ril.c plugins/ril.h
+
+builtin_modules += infineon
+builtin_sources += plugins/infineon.c
+
+builtin_modules += ril_intel
+builtin_sources += plugins/ril_intel.c
 
 builtin_modules += rilmodem
 builtin_sources += drivers/rilmodem/rilmodem.h \
+			drivers/rilmodem/vendor.h \
 			drivers/rilmodem/rilmodem.c \
 			drivers/rilmodem/devinfo.c \
 			drivers/rilmodem/network-registration.c \
 			drivers/rilmodem/voicecall.c \
+			drivers/rilmodem/voicecall.h \
 			drivers/rilmodem/call-volume.c \
 			drivers/rilmodem/gprs.c \
 			drivers/rilmodem/gprs-context.c \
@@ -136,16 +207,17 @@ builtin_sources += drivers/rilmodem/rilmodem.h \
 			drivers/rilmodem/sms.c \
 			drivers/rilmodem/rilutil.c \
 			drivers/rilmodem/rilutil.h \
-			drivers/rilmodem/radio-settings.c \
-			drivers/rilmodem/phonebook.c \
 			drivers/rilmodem/ussd.c \
 			drivers/rilmodem/call-settings.c \
 			drivers/rilmodem/call-forwarding.c \
-			drivers/rilmodem/cbs.c \
-			drivers/rilmodem/oemraw-messages.c \
+			drivers/rilmodem/radio-settings.c \
 			drivers/rilmodem/call-barring.c \
-			drivers/rilmodem/stk.c
-
+			drivers/rilmodem/netmon.c \
+			drivers/rilmodem/stk.c \
+			drivers/rilmodem/cbs.c \
+			drivers/infineonmodem/infineon_constants.h \
+			drivers/rilmodem/lte.c
+endif
 endif
 
 if ISIMODEM
@@ -203,11 +275,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) \
@@ -232,8 +306,7 @@ endif
 
 if ATMODEM
 builtin_modules += atmodem
-builtin_sources += $(gatchat_sources) \
-			drivers/atmodem/atmodem.h \
+builtin_sources += 	drivers/atmodem/atmodem.h \
 			drivers/atmodem/atmodem.c \
 			drivers/atmodem/call-settings.c \
 			drivers/atmodem/sms.c \
@@ -309,6 +382,13 @@ builtin_sources += drivers/atmodem/atutil.h \
 			drivers/mbmmodem/stk.c \
 			drivers/mbmmodem/location-reporting.c
 
+builtin_modules += telitmodem
+builtin_sources += drivers/atmodem/atutil.h \
+			drivers/telitmodem/telitmodem.h \
+			drivers/telitmodem/telitmodem.c \
+			drivers/telitmodem/location-reporting.c \
+			drivers/telitmodem/gprs-context-ncm.c
+
 builtin_modules += hsomodem
 builtin_sources += drivers/atmodem/atutil.h \
 			drivers/hsomodem/hsomodem.h \
@@ -365,15 +445,28 @@ builtin_sources += drivers/atmodem/atutil.h \
 			drivers/speedupmodem/speedupmodem.c \
 			drivers/speedupmodem/ussd.c
 
+builtin_modules += ubloxmodem
+builtin_sources += drivers/atmodem/atutil.h \
+			drivers/ubloxmodem/ubloxmodem.h \
+			drivers/ubloxmodem/ubloxmodem.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
+
+
 if PHONESIM
 builtin_modules += phonesim
 builtin_sources += plugins/phonesim.c
 
 if DATAFILES
 dist_conf_DATA += plugins/phonesim.conf
-if RILMODEM
-dist_conf_DATA += gril/ril_subscription.conf
-endif
 endif
 endif
 
@@ -429,8 +522,11 @@ builtin_sources += plugins/stemgr.c
 builtin_modules += caif
 builtin_sources += plugins/caif.c
 
-builtin_modules += tc65
-builtin_sources += plugins/tc65.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
@@ -458,33 +554,56 @@ 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
 endif
 
 builtin_modules += connman
 builtin_sources += plugins/connman.c
 
-builtin_modules += he910
-builtin_sources += plugins/he910.c
+builtin_modules += mnclength
+builtin_sources += plugins/mnclength.c
 
 if BLUETOOTH
 if BLUEZ4
-builtin_modules += bluez4
-builtin_sources += plugins/bluez4.c plugins/bluez4.h
-
-builtin_modules += telit
-builtin_sources += plugins/telit.c plugins/bluez4.h
-
 builtin_modules += sap
 builtin_sources += plugins/sap.c plugins/bluez4.h
 
 builtin_modules += hfp_bluez4
 builtin_sources += plugins/hfp_hf_bluez4.c plugins/bluez4.h
 
-builtin_modules += hfp_ag_bluez4
-builtin_sources += plugins/hfp_ag_bluez4.c plugins/bluez4.h
-
 builtin_modules += dun_gw_bluez4
 builtin_sources += plugins/dun_gw_bluez4.c plugins/bluez4.h
+else
+builtin_modules += hfp_bluez5
+builtin_sources += plugins/hfp_hf_bluez5.c plugins/bluez5.h
+
+builtin_modules += dun_gw_bluez5
+builtin_sources += plugins/dun_gw_bluez5.c plugins/bluez5.h
+endif
+endif
+endif
+
+if BLUETOOTH
+if BLUEZ4
+builtin_modules += bluez4
+builtin_sources += plugins/bluez4.c plugins/bluez4.h
+
+builtin_modules += hfp_ag_bluez4
+builtin_sources += plugins/hfp_ag_bluez4.c plugins/bluez4.h
 
 builtin_sources += $(btio_sources)
 builtin_cflags += @BLUEZ_CFLAGS@
@@ -493,16 +612,19 @@ else
 builtin_modules += bluez5
 builtin_sources += plugins/bluez5.c plugins/bluez5.h
 
-builtin_modules += hfp_bluez5
-builtin_sources += plugins/hfp_hf_bluez5.c plugins/bluez5.h
-
 builtin_modules += hfp_ag_bluez5
 builtin_sources += plugins/hfp_ag_bluez5.c plugins/bluez5.h
 
-builtin_modules += dun_gw_bluez5
-builtin_sources += plugins/dun_gw_bluez5.c plugins/bluez5.h
+if SAILFISH_BT
+builtin_modules += sfos_bt
+builtin_sources += plugins/sailfish_bt.c
 endif
 endif
+
+if UPOWER
+builtin_modules += upower
+builtin_sources += plugins/upower.c
+endif
 endif
 
 if NETTIME
@@ -510,17 +632,32 @@ builtin_modules += nettime
 builtin_sources += plugins/nettime.c
 endif
 
+if SAILFISH_DEBUGLOG
+builtin_modules += debuglog
+builtin_sources += plugins/sailfish_debuglog.c
+endif
+
+if SAILFISH_PROVISION
+builtin_sources += plugins/sailfish_provision.c
+PROVISION = 1
+else
+if PROVISION
+builtin_sources += plugins/provision.c
+endif
+endif
+
 if PROVISION
 builtin_sources += plugins/mbpi.h plugins/mbpi.c
 
 builtin_modules += provision
-builtin_sources += plugins/provision.h plugins/provision.c
+builtin_sources += plugins/provision.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
@@ -541,6 +678,9 @@ builtin_sources += examples/private-network.c
 
 builtin_modules += stktest
 builtin_sources += plugins/stktest.c
+
+builtin_modules += emulator_fuzz
+builtin_sources += plugins/emulator_fuzz.c
 endif
 
 builtin_modules += smart_messaging
@@ -549,19 +689,21 @@ builtin_sources += plugins/smart-messaging.c
 builtin_modules += push_notification
 builtin_sources += plugins/push-notification.c
 
-if PUSHFORWARDER
-builtin_modules += push_forwarder
-builtin_sources += plugins/push-forwarder.c
-builtin_cflags += @WSPCODEC_CFLAGS@
-builtin_libadd += @WSPCODEC_LIBS@
+if SAILFISH_PUSHFORWARDER
+builtin_modules += pushforwarder
+builtin_sources += plugins/sailfish_pushforwarder.c
 endif
 
 builtin_modules += sms_history
 builtin_sources += plugins/smshistory.c
 
+builtin_modules += allowed_apns
+builtin_sources += plugins/allowed-apns.c
+
 sbin_PROGRAMS = src/ofonod
 
-src_ofonod_SOURCES = $(builtin_sources) src/ofono.ver \
+src_ofonod_SOURCES = $(builtin_sources) $(gatchat_sources) src/ofono.ver \
+			src/mtu-watch.c \
 			src/main.c src/ofono.h src/log.c src/plugin.c \
 			src/modem.c src/common.h src/common.c \
 			src/manager.c src/dbus.c src/util.h src/util.c \
@@ -586,8 +728,10 @@ src_ofonod_SOURCES = $(builtin_sources) src/ofono.ver \
 			src/cdma-sms.c src/private-network.c src/cdma-netreg.c \
 			src/cdma-provision.c src/handsfree.c \
 			src/handsfree-audio.c src/bluetooth.h \
-			src/hfp.h src/sim-mnclength.c src/oemraw.c \
-			src/siri.c src/voicecallagent.c
+			src/sim-mnclength.c src/voicecallagent.c \
+			src/sms-filter.c src/dbus-queue.c \
+			src/hfp.h src/siri.c \
+			src/netmon.c src/lte.c
 
 src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
 			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
@@ -630,9 +774,13 @@ doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
 			doc/sim-api.txt doc/stk-api.txt \
 			doc/audio-settings-api.txt doc/text-telephony-api.txt \
 			doc/calypso-modem.txt doc/message-api.txt \
-			doc/location-reporting-api.txt doc/smshistory-api.txt \
-			doc/oemraw-api.txt \
-			doc/certification.txt doc/siri-api.txt
+			doc/location-reporting-api.txt \
+			doc/smshistory-api.txt doc/oemraw-api.txt \
+			doc/certification.txt doc/siri-api.txt \
+			doc/telit-modem.txt \
+			doc/networkmonitor-api.txt \
+			doc/allowed-apns-api.txt \
+			doc/lte-api.txt
 
 
 test_scripts = test/backtrace \
@@ -666,6 +814,7 @@ test_scripts = test/backtrace \
 		test/receive-sms \
 		test/remove-contexts \
 		test/send-sms \
+		test/cancel-sms \
 		test/set-mic-volume \
 		test/set-speaker-volume \
 		test/test-stk-menu \
@@ -729,7 +878,17 @@ test_scripts = test/backtrace \
 		test/display-icon \
 		test/set-msisdn \
 		test/test-voicecallagent \
-		test/get-network-time
+		test/get-network-time \
+		test/set-ddr \
+		test/register-auto \
+		test/register-operator \
+		test/set-sms-smsc \
+		test/set-sms-bearer \
+		test/get-serving-cell-info \
+		test/list-allowed-access-points \
+		test/enable-throttling \
+		test/disable-throttling \
+		test/set-lte-property
 
 if TEST
 testdir = $(pkglibdir)/test
@@ -741,35 +900,105 @@ EXTRA_DIST = src/genbuiltin plugins/ofono.rules plugins/ofono-speedup.rules \
 
 dist_man_MANS = doc/ofonod.8
 
+if TEST_COVERAGE
+COVERAGE_OPT = --coverage
+endif
 
 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-grilrequest \
-				unit/test-grilreply \
-				unit/test-grilunsol \
-				unit/test-sms unit/test-cdmasms \
-				unit/test-provision
+				unit/test-provision unit/test-sms-filter
+
+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_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 \
+			src/storage.c src/watch.c src/log.c
+unit_test_sailfish_sim_info_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
+			-DSTORAGEDIR='"/tmp/ofono"' -Iplugins/sailfish_manager
+unit_test_sailfish_sim_info_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_sim_info_OBJECTS)
+unit_tests += unit/test-sailfish_sim_info
+
+unit_test_sailfish_manager_SOURCES = unit/test-sailfish_manager.c \
+			unit/fake_sailfish_watch.c \
+			plugins/sailfish_manager/sailfish_manager.c \
+			plugins/sailfish_manager/sailfish_cell_info.c \
+			plugins/sailfish_manager/sailfish_sim_info.c \
+			src/storage.c src/log.c
+unit_test_sailfish_manager_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
+			-DSTORAGEDIR='"/tmp/ofono"' -Iplugins/sailfish_manager
+unit_test_sailfish_manager_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sailfish_manager_OBJECTS)
+unit_tests += unit/test-sailfish_manager
+
+endif
+
+if RILMODEM
+if SAILFISH_RILMODEM
+
+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 \
+				unit/test-rilmodem-cb \
+				unit/test-rilmodem-gprs
+
+endif
+endif
 
 noinst_PROGRAMS = $(unit_tests) \
 			unit/test-sms-root unit/test-mux unit/test-caif
 
 unit_test_common_SOURCES = unit/test-common.c src/common.c src/util.c
+unit_test_common_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_common_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_common_OBJECTS)
 
 unit_test_util_SOURCES = unit/test-util.c src/util.c
+unit_test_util_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_util_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_utils_OBJECTS)
 
 unit_test_idmap_SOURCES = unit/test-idmap.c src/idmap.c
+unit_test_idmap_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_idmap_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_idmap_OBJECTS)
 
 unit_test_simutil_SOURCES = unit/test-simutil.c src/util.c \
                                 src/simutil.c src/smsutil.c src/storage.c
+unit_test_simutil_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_simutil_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_simutil_OBJECTS)
 
@@ -777,19 +1006,23 @@ unit_test_stkutil_SOURCES = unit/test-stkutil.c unit/stk-test-data.h \
 				src/util.c \
                                 src/storage.c src/smsutil.c \
                                 src/simutil.c src/stkutil.c
+unit_test_stkutil_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_stkutil_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_stkutil_OBJECTS)
 
 unit_test_sms_SOURCES = unit/test-sms.c src/util.c src/smsutil.c src/storage.c
+unit_test_sms_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_sms_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_sms_OBJECTS)
 
 unit_test_cdmasms_SOURCES = unit/test-cdmasms.c src/cdma-smsutil.c
+unit_test_cdmasms_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_cdmasms_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_cdmasms_OBJECTS)
 
 unit_test_sms_root_SOURCES = unit/test-sms-root.c \
 					src/util.c src/smsutil.c src/storage.c
+unit_test_sms_root_CFLAGS = -DSTORAGEDIR='"/tmp/ofono"' $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_sms_root_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_sms_root_OBJECTS)
 
@@ -800,31 +1033,61 @@ unit_objects += $(unit_test_mux_OBJECTS)
 unit_test_caif_SOURCES = unit/test-caif.c $(gatchat_sources) \
 					drivers/stemodem/caif_socket.h \
 					drivers/stemodem/if_caif.h
+unit_test_caif_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_caif_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_caif_OBJECTS)
 
-unit_test_grilrequest_SOURCES = unit/test-grilrequest.c $(gril_sources) \
-				src/log.c gatchat/ringbuffer.c
-unit_test_grilrequest_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_grilrequest_OBJECTS)
-
-unit_test_grilreply_SOURCES = unit/test-grilreply.c $(gril_sources) \
-				src/log.c gatchat/ringbuffer.c
-unit_test_grilreply_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_grilreply_OBJECTS)
-
-unit_test_grilunsol_SOURCES = unit/test-grilunsol.c $(gril_sources) \
-				src/log.c gatchat/ringbuffer.c
-unit_test_grilunsol_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_grilunsol_OBJECTS)
-
 unit_test_provision_SOURCES = unit/test-provision.c \
-				plugins/provision.h plugins/provision.c \
-				plugins/mbpi.c src/gprs-provision.c \
-				src/log.c
+				plugins/provision.h plugins/mbpi.c \
+				plugins/sailfish_provision.c \
+				src/gprs-provision.c src/log.c
+unit_test_provision_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_provision_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_provision_OBJECTS)
 
+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)
+
+test_rilmodem_sources = $(gril_sources) src/log.c src/common.c src/util.c \
+				gatchat/ringbuffer.h gatchat/ringbuffer.c \
+				unit/rilmodem-test-server.h \
+				unit/rilmodem-test-server.c \
+				unit/rilmodem-test-engine.h \
+				unit/rilmodem-test-engine.c \
+				src/simutil.c \
+				drivers/rilmodem/rilutil.c
+
+unit_test_rilmodem_cs_SOURCES = $(test_rilmodem_sources) \
+					unit/test-rilmodem-cs.c \
+					drivers/rilmodem/call-settings.c
+unit_test_rilmodem_cs_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
+					@GLIB_LIBS@ @DBUS_LIBS@ -ldl
+unit_objects += $(unit_test_rilmodem_cs_OBJECTS)
+
+unit_test_rilmodem_sms_SOURCES = $(test_rilmodem_sources) \
+					unit/test-rilmodem-sms.c \
+					drivers/rilmodem/sms.c
+unit_test_rilmodem_sms_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
+					@GLIB_LIBS@ @DBUS_LIBS@ -ldl
+unit_objects += $(unit_test_rilmodem_sms_OBJECTS)
+
+unit_test_rilmodem_cb_SOURCES = $(test_rilmodem_sources) \
+					unit/test-rilmodem-cb.c \
+					drivers/rilmodem/call-barring.c
+unit_test_rilmodem_cb_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
+					@GLIB_LIBS@ @DBUS_LIBS@ -ldl
+unit_objects += $(unit_test_rilmodem_cb_OBJECTS)
+
+unit_test_rilmodem_gprs_SOURCES = $(test_rilmodem_sources) \
+					unit/test-rilmodem-gprs.c \
+					drivers/rilmodem/gprs.c
+unit_test_rilmodem_gprs_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
+					@GLIB_LIBS@ @DBUS_LIBS@ -ldl
+unit_objects += $(unit_test_rilmodem_gprs_OBJECTS)
+
 TESTS = $(unit_tests)
 
 if TOOLS
@@ -851,13 +1114,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
 
@@ -926,6 +1182,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/TODO

@@ -256,6 +256,16 @@ Voicecall
   Priority: Medium
   Complexity: C1
 
+- DTMF Driver hints
+
+  Currently multiple DTMF tones are sent to the driver in batches of up to 8
+  characters.  For those drivers that can only accept a limited set of DTMF
+  characters at a time (e.g. one), add a setting to the core that will change
+  this batch size limit.
+
+  Priority: Medium
+  Complexity: C1
+
 
 Sim Toolkit
 ===========

ofono/acinclude.m4

@@ -12,7 +12,7 @@ AC_DEFUN([AC_PROG_CC_PIE], [
 
 AC_DEFUN([COMPILER_FLAGS], [
 	if (test "${CFLAGS}" = ""); then
-		CFLAGS="-Wall -O2 -D_FORTIFY_SOURCE=2"
+		CFLAGS="-Wall -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
 	fi
 	if (test "$USE_MAINTAINER_MODE" = "yes"); then
 		CFLAGS="$CFLAGS -Werror -Wextra"

ofono/configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(ofono, 1.14)
+AC_INIT(ofono, 1.20)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AC_CONFIG_HEADERS(config.h)
@@ -42,6 +42,7 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
 	if (test "${enableval}" = "yes" &&
 				test "${ac_cv_prog_cc_g}" = "yes"); then
 		CFLAGS="$CFLAGS -g"
+                CPPFLAGS="$CPPFLAGS -DDEBUG"
 	fi
 ])
 
@@ -63,11 +64,21 @@ AC_CHECK_FUNC(signalfd, dummy=yes,
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
 			AC_MSG_ERROR(dynamic linking loader is required))
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes,
-				AC_MSG_ERROR(GLib >= 2.28 is required))
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32, dummy=yes,
+				AC_MSG_ERROR(GLib >= 2.32 is required))
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+PKG_CHECK_MODULES(GOBJECT, gobject-2.0, dummy=yes,
+				AC_MSG_ERROR(GObject is required))
+GLIB_CFLAGS="$GLIB_CFLAGS $GOBJECT_CFLAGS"
+GLIB_LIBS="$GLIB_LIBS $GOBJECT_LIBS"
+
+PKG_CHECK_MODULES(GIO, gio-2.0, dummy=yes,
+				AC_MSG_ERROR(GIO is required))
+GLIB_CFLAGS="$GLIB_CFLAGS $GIO_CFLAGS"
+GLIB_LIBS="$GLIB_LIBS $GIO_LIBS"
+
 if (test "${enable_threads}" = "yes"); then
 	AC_DEFINE(NEED_THREADS, 1, [Define if threading support is required])
 	PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16, dummy=yes,
@@ -166,6 +177,51 @@ AC_ARG_ENABLE(rilmodem, AC_HELP_STRING([--disable-rilmodem],
                                         [enable_rilmodem=${enableval}])
 AM_CONDITIONAL(RILMODEM, test "${enable_rilmodem}" != "no")
 
+AC_ARG_ENABLE(sailfish-rilmodem, AC_HELP_STRING([--enable-sailfish-rilmodem],
+				[enable Sailfish RIL modem]),
+				[enable_sailfish_rilmodem=${enableval}],
+				[enable_sailfish_rilmodem="no"])
+AM_CONDITIONAL(SAILFISH_RILMODEM, test "${enable_sailfish_rilmodem}" != "no")
+
+if (test "${enable_sailfish_rilmodem}" = "yes"); then
+	PKG_CHECK_MODULES(GRILIO, libgrilio >= 1.0.20, dummy=yes,
+				AC_MSG_ERROR(libgrilio >= 1.0.20 is required))
+	PKG_CHECK_MODULES(GLIBUTIL, libglibutil >= 1.0.23, dummy=yes,
+				AC_MSG_ERROR(libglibutil >= 1.0.23 is required))
+	PKG_CHECK_MODULES(LIBMCE, libmce-glib >= 1.0.5, dummy=yes,
+				AC_MSG_ERROR(libmce-glib >= 1.0.5 is required))
+	CFLAGS="$CFLAGS $GRILIO_CFLAGS $LIBMCE_CFLAGS"
+	LIBS="$LIBS $GRILIO_LIBS $LIBMCE_LIBS"
+	enable_sailfish_manager=yes
+	need_glibutil=yes
+fi
+
+AC_ARG_ENABLE(sailfish-manager,
+		AC_HELP_STRING([--enable-sailfish-manager],
+			[enable Sailfish OS modem manager plugin]),
+					[enable_sailfish_manager=${enableval}])
+AM_CONDITIONAL(SAILFISH_MANAGER, test "${enable_sailfish_manager}" = "yes")
+
+if (test "${enable_sailfish_manager}" = "yes"); then
+	PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1, dummy=yes,
+			AC_MSG_ERROR(dbus-glib is required by unit tests))
+	AC_SUBST(DBUS_GLIB_CFLAGS)
+	AC_SUBST(DBUS_GLIB_LIBS)
+fi
+
+AC_ARG_ENABLE(add-remove-context, AC_HELP_STRING([--disable-add-remove-context],
+		[don't allow to add or remove connection context over D-Bus]), [
+	if (test "${enableval}" = "no"); then
+		CFLAGS="$CFLAGS -DDISABLE_ADD_REMOVE_CONTEXT"
+	fi
+])
+
+AC_ARG_ENABLE(test-coverage,
+	AC_HELP_STRING([--enable-test-coverage], [enable test code coverage]),
+				[enable_test_coverage=${enableval}],
+					[enable_test_coverage="no"])
+AM_CONDITIONAL(TEST_COVERAGE, test "${enable_test_coverage}" != "no")
+
 AC_ARG_ENABLE(qmimodem, AC_HELP_STRING([--disable-qmimodem],
 				[disable Qualcomm QMI modem support]),
 					[enable_qmimodem=${enableval}])
@@ -189,6 +245,16 @@ fi
 AM_CONDITIONAL(BLUEZ4, test "${enable_bluetooth}" != "no" && test "${enable_bluez4}" = "yes")
 AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no")
 
+AC_ARG_ENABLE(sailfish-bt, AC_HELP_STRING([--enable-sailfish-bt],
+			[enable Sailfish OS Bluetooth plugin]),
+					[enable_sailfish_bt=${enableval}])
+AM_CONDITIONAL(SAILFISH_BT, test "${enable_sailfish_bt}" = "yes")
+
+AC_ARG_ENABLE(sailfish-provision, AC_HELP_STRING([--enable-sailfish-provision],
+			[enable Sailfish OS provisioning plugin]),
+				[enable_sailfish_provision=${enableval}])
+AM_CONDITIONAL(SAILFISH_PROVISION, test "${enable_sailfish_provision=$}" = "yes")
+
 AC_ARG_ENABLE(nettime, AC_HELP_STRING([--disable-nettime],
                                 [disable Nettime plugin]),
                                         [enable_nettime=${enableval}])
@@ -201,7 +267,7 @@ AC_ARG_WITH([provisiondb], AC_HELP_STRING([--with-provisiondb=FILE],
 	[location of provision database]), [path_provisiondb=${withval}])
 
 AC_ARG_ENABLE(provision, AC_HELP_STRING([--disable-provision],
-				[disable provisioning suport]),
+				[disable provisioning support]),
 					[enable_provision=${enableval}])
 if (test "${enable_provision}" != "no"); then
 	if (test -n "${path_provisiondb}"); then
@@ -221,20 +287,46 @@ if (test "${enable_provision}" != "no"); then
 fi
 AM_CONDITIONAL(PROVISION, test "${enable_provision}" != "no")
 
+AC_ARG_ENABLE(upower, AC_HELP_STRING([--disable-upower],
+			[disable UPower plugin]),
+					[enable_upower=${enableval}])
+AM_CONDITIONAL(UPOWER, test "${enable_power}" != "no")
+
 AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
 			[do not install configuration and data files]),
 					[enable_datafiles=${enableval}])
 AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
 
-AC_ARG_ENABLE(pushforwarder, AC_HELP_STRING([--disable-pushforwarder],
-                                [disable Push Forwarder plugin]),
-                                        [enable_pushforwarder=${enableval}])
-AM_CONDITIONAL(PUSHFORWARDER, test "${enable_pushforwarder}" != "no")
-if (test "${enable_pushforwarder}" != "no"); then
+AC_ARG_ENABLE(sailfish-pushforwarder, AC_HELP_STRING([--enable-sailfish-pushforwarder],
+			[enable Sailfish OS push forwarder plugin]),
+			[enable_sailfish_pushforwarder=${enableval}],
+			[enable_sailfish_pushforwarder="no"])
+AM_CONDITIONAL(SAILFISH_PUSHFORWARDER, test "${enable_sailfish_pushforwarder}" != "no")
+if (test "${enable_sailfish_pushforwarder}" != "no"); then
+	PKG_CHECK_MODULES(GLIBUTIL, libglibutil >= 1.0.15, dummy=yes,
+			AC_MSG_ERROR(libglibutil >= 1.0.15 is required))
 	PKG_CHECK_MODULES(WSPCODEC, libwspcodec >= 2.0, dummy=yes,
-		AC_MSG_ERROR(WSP decoder is required))
-	AC_SUBST(WSPCODEC_CFLAGS)
-	AC_SUBST(WSPCODEC_LIBS)
+			AC_MSG_ERROR(WSP decoder is required))
+	CFLAGS="$CFLAGS $WSPCODEC_CFLAGS"
+	LIBS="$LIBS $WSPCODEC_LIBS"
+	need_glibutil=yes
+fi
+
+AC_ARG_ENABLE(sailfish-debuglog, AC_HELP_STRING([--enable-sailfish-debuglog],
+			[enable Sailfish OS debug log plugin]),
+			[enable_sailfish_debuglog=${enableval}],
+			[enable_sailfish_debuglog="no"])
+AM_CONDITIONAL(SAILFISH_DEBUGLOG, test "${enable_sailfish_debuglog}" != "no")
+if (test "${enable_sailfish_debuglog}" = "yes"); then
+	PKG_CHECK_MODULES(DBUSLOG, libdbuslogserver-dbus, dummy=yes,
+				AC_MSG_ERROR(libdbuslogserver-dbus is required))
+	CFLAGS="$CFLAGS $DBUSLOG_CFLAGS"
+	LIBS="$LIBS $DBUSLOG_LIBS"
+fi
+
+if (test "${need_glibutil}" = "yes"); then
+	CFLAGS="$CFLAGS $GLIBUTIL_CFLAGS"
+	LIBS="$LIBS $GLIBUTIL_LIBS"
 fi
 
 if (test "${prefix}" = "NONE"); then
@@ -251,7 +343,7 @@ if (test "$localstatedir" = '${prefix}/var'); then
 else
 	storagedir="${localstatedir}/lib/ofono"
 fi
-AC_DEFINE_UNQUOTED(STORAGEDIR, "${storagedir}",
+AC_DEFINE_UNQUOTED(DEFAULT_STORAGEDIR, "${storagedir}",
 			[Directory for the storage files])
 
 if (test "$sysconfdir" = '${prefix}/etc'); then

ofono/doc/allowed-apns-api.txt

@@ -0,0 +1,17 @@
+Allowed APNs hierarchy
+=========================
+
+Service		org.ofono
+Interface	org.ofono.AllowedAccessPoints
+Object path	[variable prefix]/{modem0,modem1,...}
+
+Methods		array{string} GetAllowedAccessPoints()
+
+			Get the list of allowed access points provided
+			in the SIM card.
+
+			This method returns an array of strings which
+			contains a list of Access Point Names supported
+			by network provider. Returns with an error if
+			SIM reading failed or an empty list if there
+			are no access points listed on the SIM.

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.
@@ -306,6 +306,13 @@ Example:
 2)
 0x1 << y	// Wrong
 
+M17: Avoid forward-declaration of static functions
+==================================================
+
+Functions that are static should not be forward-declared.  The only exception
+to this rule is if a circular dependency condition exists, and the forward
+declaration cannot be avoided.
+
 O1: Shorten the name
 ====================
 Better to use abbreviation, rather than full name, to name a variable,

ofono/doc/connman-api.txt

@@ -60,6 +60,16 @@ Methods		dict GetProperties()
 					 [service].Error.NotFound
 					 [service].Error.Failed
 
+		void ResetContexts()
+
+			Removes all contexts and re-provisions from the APN
+			database. Contexts must all be deactivated for this
+			method to work, and the atom must not be powered.
+
+			Possible Errors: [service].Error.InProgress
+					 [service].Error.InvalidArguments
+					 [service].Error.NotAllowed
+
 Signals		PropertyChanged(string property, variant value)
 
 			This signal indicates a changed value of the given
@@ -96,7 +106,7 @@ Properties	boolean Attached [readonly]
 			GPRS service registration (if known).
 
 			Possible values are:
-			"none", "gsm", "edge", "umts", "hsdpa", "hsupa",
+			"none", "gprs", "edge", "umts", "hsdpa", "hsupa",
 			"hspa" (HSDPA and HSUPA at the same time) and
 			"lte"
 
@@ -155,6 +165,15 @@ Methods		dict GetProperties()
 					 [service].Error.AttachInProgress
 					 [service].Error.NotImplemented
 
+Methods		void ProvisionContext()
+			Resets all properties back to default. Fails to make
+			any changes to the context if it is active or in the
+			process of being activated or deactivated.
+
+			Possible Errors: [service].Error.Failed
+					 [service].Error.InProgress
+					 [service].Error.NotAvailable
+
 Signals		PropertyChanged(string property, variant value)
 
 			This signal indicates a changed value of the given
@@ -180,6 +199,10 @@ Properties	boolean Active [readwrite]
 				"wap" - Used by WAP related services
 				"ims" - Used by IMS related services
 
+		string AuthenticationMethod [readwrite]
+			Holds the PPP authentication method to use.  Valid
+			values are "pap" and "chap".  Defaults to "chap".
+
 		string Username [readwrite]
 
 			Holds the username to be used for authentication

ofono/doc/handsfree-api.txt

@@ -19,6 +19,8 @@ Methods		dict GetProperties()
 
 			Possible Errors: [service].Error.InProgress
 					 [service].Error.InvalidArguments
+					 [service].Error.NotImplemented
+					 [service].Error.NotSupported
 
 		string RequestPhoneNumber()
 
@@ -51,6 +53,7 @@ Properties	array{string} Features [readonly]
 				"private-chat"
 				"create-multiparty"
 				"transfer"
+				"hf-indicators"
 
 		boolean InbandRinging [readonly]
 
@@ -63,7 +66,7 @@ Properties	array{string} Features [readonly]
 			to activate or deactivate the function from the HF, or
 			the AG could autonomously initiate it.
 
-		boolean EchoCancelingNoiseReduction [readwrite]
+		boolean EchoCancelingNoiseReduction [readwrite, optional]
 
 			Non-persistent Boolean property representing whether
 			echo canceling and noise reduction is enabled in the
@@ -80,3 +83,10 @@ Properties	array{string} Features [readonly]
 		array{string} SubscriberNumbers [readonly]
 
 			List of subscriber numbers provided by the AG.
+
+		boolean DistractedDrivingReduction [readwrite, optional]
+
+			Non-persistent property representing whether
+			distracted driving reduction mode should be enabled in
+			the AG.  Support for this feature is optional on the
+			AG.

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
@@ -89,6 +105,10 @@ Properties	string RemoteAddress [readonly]
 
 			Bluetooth address of the local adapter.
 
+		string Type [readonly]
+
+			Type of the card. Valid values are "gateway" or
+			"handsfree".
 
 Handsfree Audio Agent hierarchy [experimental]
 ===============================

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/modem-api.txt

@@ -90,6 +90,11 @@ Properties	boolean Powered [readwrite]
 			"hfp") this corresponds to the Bluetooth Device
 			Address of the remote device.
 
+		string SoftwareVersionNumber [readonly, optional]
+
+			String representing the software version number of the
+			modem device.
+
 		array{string} Features [readonly]
 
 			List of currently enabled features. It uses simple

ofono/doc/network-api.txt

@@ -57,6 +57,11 @@ Signals		PropertyChanged(string property, variant value)
 			This signal indicates a changed value of the given
 			property.
 
+		OperatorsChanged(array{object,dict})
+
+			Signal that gets emitted when operator list has
+			changed. It contains the current list of operators.
+
 Properties	string Mode [readonly]
 
 			The current registration mode. The default of this

ofono/doc/networkmonitor-api.txt

@@ -0,0 +1,122 @@
+Network Monitor hierarchy
+=========================
+
+Service		org.ofono
+Interface	org.ofono.NetworkMonitor
+Object path	[variable prefix]/{modem0,modem1,...}
+
+Methods		a{sv} GetServingCellInformation()
+
+			Requests the latest serving cell information and basic
+			measurements from oFono.  The returned value is a
+			dictionary with the possible key / values documented
+			below.  The type of cell is given by the 'Technology'
+			property.
+
+			Based on the type of cell, the dictionary will contain
+			additional key/value pairs.  If a given key/value pair
+			is not present, then it is not known or unsupported
+			by the underlying driver.
+
+			Refer to the sections below for which property types
+			are available, their valid value ranges and
+			applicability to different cell types.
+
+
+Network Monitor Property Types
+==============================
+
+string Technology
+
+	Contains the cell type.  Possible values are:
+			"gsm", "umts", "lte"
+
+uint16 LocationAreaCode [optional, gsm, umts]
+
+	Contains the current location area code.  Valid range of values is
+	0-65535.
+
+uint32 CellId [optional, gsm, umts]
+
+	Contains the current network cell id.  Valid range of values is
+	0-65535 for gsm and 0-268435455 in umts.
+
+string MobileNetworkCode [optional, gsm, umts]
+
+	Contains the MNC of the cell.
+
+string MobileCountryCode [optional, gsm, umts]
+
+	Contains the MCC of the cell.
+
+uint16 ARFCN [optional, gsm]
+
+	Contains the Absolute Radio Frequency Channel Number.  Valid range of
+	values is 0-1023.
+
+byte ReceivedSignalStrength [optional, gsm]
+
+	Contains the received signal strength level in dBm.  Refer to <rxlev>
+	in 27.007, Section 8.69 for more details.  Valid range of values is
+	0-63.
+
+byte BSIC [optional, gsm]
+
+	Contains the Base Station Identity Code. Valid range of values is 0-63.
+
+byte BitErrorRate [optional, gsm]
+
+	Contains the bit error rate.  Refer to <ber> in 27.007, Section 8.69
+	for more details.  Valid range of values is 0-7.
+
+uint16 PrimaryScramblingCode [optional, umts]
+
+	Contains the scrambling code.  Valid range of values is 0-512.
+
+byte TimingAdvance [optional, gsm]
+
+	Contains the Timing Advance.  Valid range of values is 0-219.
+
+byte Strength [optional, gsm, umts]
+
+	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/radio-settings-api.txt

@@ -45,6 +45,11 @@ Properties	string TechnologyPreference [readwrite]
 				"umts"	Only UMTS used for radio access.
 				"lte"	Only LTE used for radio access.
 
+		array{string} AvailableTechnologies [readonly, optional]
+
+			List of values for TechnologyPreference property
+			supported by the modem.
+
 		string GsmBand [readwrite, optional]
 
 			Frequency band in which the modem is allowed to

ofono/doc/sim-api.txt

@@ -93,6 +93,11 @@ Properties	boolean Present [readonly]
 
 			Contains the IMSI of the SIM, if available.
 
+		string ServiceProviderName [readonly, optional]
+
+			Contains the service provider name fetched from the
+			SIM card, if available.
+
 		string MobileCountryCode [readonly, optional]
 
 			Contains the Mobile Country Code (MCC) of the home

ofono/doc/telit-modem.txt

@@ -0,0 +1,46 @@
+oFono - Open Source Telephony
+*****************************
+
+Purpose
+=======
+The purpose of this document is to identify issues and configuration
+requirements with Telit's modems.
+
+HE910
+=====
+
+GPS:
+  To enable location reporting on the Telit HE910 the modem needs to be
+  switched to Port Configuration #8. Please refer to Telit's
+  'HE910 UE910 Family Ports Arrangements' section 4.1.3 for rationale and
+  'AT Commands Reference Guide' section 3.5.7.1.96 for specific AT command.
+  After setting the configuration, a power cycle is required.
+  Port Configiuration #8 is available since firmware 12.00.004. Firmware version
+  can be checked using 'AT+CGMR'.
+
+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/gprs-context.c

@@ -47,6 +47,7 @@
 
 #define STATIC_IP_NETMASK "255.255.255.255"
 
+static const char *cgdata_prefix[] = { "+CGDATA:", NULL };
 static const char *none_prefix[] = { NULL };
 
 enum state {
@@ -59,6 +60,7 @@ enum state {
 struct gprs_context_data {
 	GAtChat *chat;
 	unsigned int active_context;
+	GAtPPPAuthMethod auth_method;
 	char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
 	char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
 	GAtPPP *ppp;
@@ -66,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)
@@ -154,6 +157,7 @@ static gboolean setup_ppp(struct ofono_gprs_context *gc)
 	if (getenv("OFONO_PPP_DEBUG"))
 		g_at_ppp_set_debug(gcd->ppp, ppp_debug, "PPP");
 
+	g_at_ppp_set_auth_method(gcd->ppp, gcd->auth_method);
 	g_at_ppp_set_credentials(gcd->ppp, gcd->username, gcd->password);
 
 	/* set connect and disconnect callbacks */
@@ -208,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);
@@ -243,6 +247,20 @@ static void at_gprs_activate_primary(struct ofono_gprs_context *gc,
 	memcpy(gcd->username, ctx->username, sizeof(ctx->username));
 	memcpy(gcd->password, ctx->password, sizeof(ctx->password));
 
+	/* We only support CHAP and PAP */
+	switch (ctx->auth_method) {
+	case OFONO_GPRS_AUTH_METHOD_ANY:
+	case OFONO_GPRS_AUTH_METHOD_NONE:
+	case OFONO_GPRS_AUTH_METHOD_CHAP:
+		gcd->auth_method = G_AT_PPP_AUTH_METHOD_CHAP;
+		break;
+	case OFONO_GPRS_AUTH_METHOD_PAP:
+		gcd->auth_method = G_AT_PPP_AUTH_METHOD_PAP;
+		break;
+	default:
+		goto error;
+	}
+
 	gcd->state = STATE_ENABLING;
 
 	if (gcd->vendor == OFONO_VENDOR_ZTE) {
@@ -268,9 +286,36 @@ static void at_gprs_activate_primary(struct ofono_gprs_context *gc,
 
 	len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"", ctx->cid);
 
-	if (ctx->apn)
-		snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"",
-				ctx->apn);
+	if (ctx->apn) {
+		switch (gcd->vendor) {
+		case OFONO_VENDOR_UBLOX:
+			/*
+			 * U-blox modems require a magic prefix to the APN to
+			 * specify the authentication method to use in the
+			 * network.  See UBX-13002752 - R21.
+			 *
+			 * As the response of the read command omits this magic
+			 * prefix, this is the least invasive place to set it.
+			 */
+			switch (ctx->auth_method) {
+			case OFONO_GPRS_AUTH_METHOD_ANY:
+			case OFONO_GPRS_AUTH_METHOD_NONE:
+			case OFONO_GPRS_AUTH_METHOD_CHAP:
+				snprintf(buf + len, sizeof(buf) - len - 3,
+						",\"CHAP:%s\"", ctx->apn);
+				break;
+			case OFONO_GPRS_AUTH_METHOD_PAP:
+				snprintf(buf + len, sizeof(buf) - len - 3,
+						",\"PAP:%s\"", ctx->apn);
+				break;
+			}
+			break;
+		default:
+			snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"",
+					ctx->apn);
+			break;
+		}
+	}
 
 	if (g_at_chat_send(gcd->chat, buf, none_prefix,
 				at_cgdcont_cb, gc, NULL) > 0)
@@ -339,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)
 {
@@ -366,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

@@ -49,6 +49,9 @@ static const char *none_prefix[] = { NULL };
 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)
@@ -72,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);
 
@@ -141,6 +146,48 @@ static void at_gprs_registration_status(struct ofono_gprs *gprs,
 	CALLBACK_WITH_FAILURE(cb, -1, data);
 }
 
+static void at_cgdcont_read_cb(gboolean ok, GAtResult *result,
+				gpointer user_data)
+{
+	struct ofono_gprs *gprs = user_data;
+	struct gprs_data *gd = ofono_gprs_get_data(gprs);
+	int activated_cid = gd->last_auto_context_id;
+	const char *apn = NULL;
+	GAtResultIter iter;
+
+	DBG("ok %d", ok);
+
+	if (!ok) {
+		ofono_warn("Can't read CGDCONT contexts.");
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	while (g_at_result_iter_next(&iter, "+CGDCONT:")) {
+		int read_cid;
+
+		if (!g_at_result_iter_next_number(&iter, &read_cid))
+			break;
+
+		if (read_cid != activated_cid)
+			continue;
+
+		/* ignore protocol */
+		g_at_result_iter_skip_next(&iter);
+
+		g_at_result_iter_next_string(&iter, &apn);
+
+		break;
+	}
+
+	if (apn)
+		ofono_gprs_cid_activated(gprs, activated_cid, apn);
+	else
+		ofono_warn("cid %u: Received activated but no apn present",
+				activated_cid);
+}
+
 static void cgreg_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_gprs *gprs = user_data;
@@ -151,12 +198,35 @@ 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);
 }
 
 static void cgev_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_gprs *gprs = user_data;
+	struct gprs_data *gd = ofono_gprs_get_data(gprs);
 	GAtResultIter iter;
 	const char *event;
 
@@ -170,8 +240,18 @@ 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")) {
+		sscanf(event, "%*s %*s %*s %u", &gd->last_auto_context_id);
+
+		g_at_chat_send(gd->chat, "AT+CGDCONT?", cgdcont_prefix,
+				at_cgdcont_read_cb, gprs, NULL);
 	}
 }
 
@@ -274,6 +354,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;
@@ -282,6 +365,40 @@ static void telit_mode_notify(GAtResult *result, gpointer user_data)
 	ofono_gprs_bearer_notify(gprs, bearer);
 }
 
+static void ublox_ureg_notify(GAtResult *result, gpointer user_data)
+{
+	struct ofono_gprs *gprs = user_data;
+	GAtResultIter iter;
+	gint state, bearer;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+UREG:"))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &state))
+		return;
+
+	switch (state) {
+	case 4:
+		bearer = 5;
+		break;
+	case 5:
+		bearer = 4;
+		break;
+	case 8:
+		bearer = 1;
+		break;
+	case 9:
+		bearer = 2;
+		break;
+	default:
+		bearer = state;
+	}
+
+	ofono_gprs_bearer_notify(gprs, bearer);
+}
+
 static void cpsb_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_gprs *gprs = user_data;
@@ -316,6 +433,13 @@ static void gprs_initialized(gboolean ok, GAtResult *result, gpointer user_data)
 		g_at_chat_register(gd->chat, "^MODE:", huawei_mode_notify,
 						FALSE, gprs, NULL);
 		break;
+	case OFONO_VENDOR_UBLOX:
+	case OFONO_VENDOR_UBLOX_TOBY_L2:
+		g_at_chat_register(gd->chat, "+UREG:", ublox_ureg_notify,
+						FALSE, gprs, NULL);
+		g_at_chat_send(gd->chat, "AT+UREG=1", none_prefix,
+						NULL, NULL, NULL);
+		break;
 	case OFONO_VENDOR_TELIT:
 		g_at_chat_register(gd->chat, "#PSNT:", telit_mode_notify,
 						FALSE, gprs, NULL);
@@ -432,7 +556,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/network-registration.c

@@ -838,6 +838,39 @@ static void telit_ciev_notify(GAtResult *result, gpointer user_data)
 	ofono_netreg_strength_notify(netreg, strength);
 }
 
+static void cinterion_ciev_notify(GAtResult *result, gpointer user_data)
+{
+	struct ofono_netreg *netreg = user_data;
+	struct netreg_data *nd = ofono_netreg_get_data(netreg);
+	const char *signal_identifier = "rssi";
+	const char *ind_str;
+	int strength;
+	GAtResultIter iter;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+CIEV:"))
+		return;
+
+	if (!g_at_result_iter_next_unquoted_string(&iter, &ind_str))
+		return;
+
+	if (!g_str_equal(signal_identifier, ind_str))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &strength))
+		return;
+
+	DBG("rssi %d", strength);
+
+	if (strength == nd->signal_invalid)
+		strength = -1;
+	else
+		strength = (strength * 100) / (nd->signal_max - nd->signal_min);
+
+	ofono_netreg_strength_notify(netreg, strength);
+}
+
 static void ctzv_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_netreg *netreg = user_data;
@@ -1547,17 +1580,28 @@ static inline ofono_bool_t append_cmer_element(char *buf, int *len, int cap,
 static ofono_bool_t build_cmer_string(char *buf, int *cmer_opts,
 					struct netreg_data *nd)
 {
-	const char *mode;
+	const char *ind;
 	int len = sprintf(buf, "AT+CMER=");
+	const char *mode;
 
 	DBG("");
 
+	switch (nd->vendor) {
+	case OFONO_VENDOR_UBLOX_TOBY_L2:
+		/* UBX-13002752 R33: TOBY L2 doesn't support mode 2 and 3 */
+		mode = "1";
+		break;
+	default:
+		mode = "3";
+		break;
+	}
+
 	/*
 	 * Forward unsolicited result codes directly to the TE;
 	 * TA‑TE link specific inband technique used to embed result codes and
 	 * data when TA is in on‑line data mode
 	 */
-	if (!append_cmer_element(buf, &len, cmer_opts[0], "3", FALSE))
+	if (!append_cmer_element(buf, &len, cmer_opts[0], mode, FALSE))
 		return FALSE;
 
 	/* No keypad event reporting */
@@ -1574,14 +1618,14 @@ static ofono_bool_t build_cmer_string(char *buf, int *cmer_opts,
 		 * Telit does not support mode 1.
 		 * All indicator events shall be directed from TA to TE.
 		 */
-		mode = "2";
+		ind = "2";
 		break;
 	default:
 		/*
 		 * Only those indicator events, which are not caused by +CIND
 		 * shall be indicated by the TA to the TE.
 		 */
-		mode = "1";
+		ind = "1";
 		break;
 	}
 
@@ -1590,7 +1634,7 @@ static ofono_bool_t build_cmer_string(char *buf, int *cmer_opts,
 	 * <ind> indicates the indicator order number (as specified for +CIND)
 	 * and <value> is the new value of indicator.
 	 */
-	if (!append_cmer_element(buf, &len, cmer_opts[3], mode, TRUE))
+	if (!append_cmer_element(buf, &len, cmer_opts[3], ind, TRUE))
 		return FALSE;
 
 	return TRUE;
@@ -1915,6 +1959,27 @@ static void at_creg_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		g_at_chat_send(nd->chat, "AT*TLTS=1", none_prefix,
 						NULL, NULL, NULL);
 		break;
+	case OFONO_VENDOR_CINTERION:
+		/*
+		 * We can't set rssi bounds from Cinterion responses
+		 * so set them up to specified values here
+		 *
+		 * Cinterion rssi signal strength specified as:
+		 * 0      <= -112dBm
+		 * 1 - 4  signal strengh in 15 dB steps
+		 * 5      >= -51 dBm
+		 * 99     not known or undetectable
+		 */
+		nd->signal_min = 0;
+		nd->signal_max = 5;
+		nd->signal_invalid = 99;
+
+		/* Register for specific signal strength reports */
+		g_at_chat_send(nd->chat, "AT^SIND=\"rssi\",1", none_prefix,
+				NULL, NULL, NULL);
+		g_at_chat_register(nd->chat, "+CIEV:",
+				cinterion_ciev_notify, FALSE, netreg, NULL);
+		break;
 	case OFONO_VENDOR_NOKIA:
 	case OFONO_VENDOR_SAMSUNG:
 		/* Signal strength reporting via CIND is not supported */

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;
 };
 
@@ -67,6 +68,8 @@ static const char *epin_prefix[] = { "*EPIN:", NULL };
 static const char *spic_prefix[] = { "+SPIC:", NULL };
 static const char *pct_prefix[] = { "#PCT:", NULL };
 static const char *pnnm_prefix[] = { "+PNNM:", NULL };
+static const char *qpinc_prefix[] = { "+QPINC:", NULL };
+static const char *upincnt_prefix[] = { "+UPINCNT:", NULL };
 static const char *none_prefix[] = { NULL };
 
 static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -825,7 +828,7 @@ static void at_cpinr_cb(gboolean ok, GAtResult *result, gpointer user_data)
 
 		for (i = 1; i < len; i++) {
 			if (!strcmp(name, at_sim_name[i].name)) {
-				retries[i] = val;
+				retries[at_sim_name[i].type] = val;
 				break;
 			}
 		}
@@ -967,6 +970,90 @@ error:
 	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
 }
 
+static void at_qpinc_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_pin_retries_cb_t cb = cbd->cb;
+	const char *final = g_at_result_final_response(result);
+	GAtResultIter iter;
+	struct ofono_error error;
+	int retries[OFONO_SIM_PASSWORD_INVALID];
+	size_t i;
+
+	decode_at_error(&error, final);
+
+	if (!ok) {
+		cb(&error, NULL, cbd->data);
+		return;
+	}
+
+	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
+		retries[i] = -1;
+
+	g_at_result_iter_init(&iter, result);
+
+	while (g_at_result_iter_next(&iter, "+QPINC:")) {
+		const char *name;
+		int pin, puk;
+
+		if (!g_at_result_iter_next_string(&iter, &name))
+			continue;
+		if (!g_at_result_iter_next_number(&iter, &pin))
+			continue;
+		if (!g_at_result_iter_next_number(&iter, &puk))
+			continue;
+
+		if (!strcmp(name, "SC")) {
+			retries[OFONO_SIM_PASSWORD_SIM_PIN] = pin;
+			retries[OFONO_SIM_PASSWORD_SIM_PUK] = puk;
+		} else if (!strcmp(name, "P2")) {
+			retries[OFONO_SIM_PASSWORD_SIM_PIN2] = pin;
+			retries[OFONO_SIM_PASSWORD_SIM_PUK2] = puk;
+		}
+	}
+
+	cb(&error, retries, cbd->data);
+}
+
+static void upincnt_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_pin_retries_cb_t cb = cbd->cb;
+	const char *final = g_at_result_final_response(result);
+	GAtResultIter iter;
+	struct ofono_error error;
+	int retries[OFONO_SIM_PASSWORD_INVALID];
+	size_t i;
+	static enum ofono_sim_password_type password_types[] = {
+		OFONO_SIM_PASSWORD_SIM_PIN,
+		OFONO_SIM_PASSWORD_SIM_PIN2,
+		OFONO_SIM_PASSWORD_SIM_PUK,
+		OFONO_SIM_PASSWORD_SIM_PUK2,
+	};
+
+	decode_at_error(&error, final);
+
+	if (!ok) {
+		cb(&error, NULL, cbd->data);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+UPINCNT:"))
+		goto error;
+
+	BUILD_PIN_RETRIES_ARRAY(password_types, ARRAY_SIZE(password_types),
+				retries);
+
+	cb(&error, retries, cbd->data);
+
+	return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+}
+
 static void at_pin_retries_query(struct ofono_sim *sim,
 					ofono_sim_pin_retries_cb_t cb,
 					void *data)
@@ -1028,6 +1115,17 @@ static void at_pin_retries_query(struct ofono_sim *sim,
 					at_pnnm_cb, cbd, g_free) > 0)
 			return;
 		break;
+	case OFONO_VENDOR_QUECTEL:
+		if (g_at_chat_send(sd->chat, "AT+QPINC?", qpinc_prefix,
+					at_qpinc_cb, cbd, g_free) > 0)
+			return;
+		break;
+	case OFONO_VENDOR_UBLOX:
+	case OFONO_VENDOR_UBLOX_TOBY_L2:
+		if (g_at_chat_send(sd->chat, "AT+UPINCNT", upincnt_prefix,
+					upincnt_cb, cbd, g_free) > 0)
+			return;
+		break;
 	default:
 		if (g_at_chat_send(sd->chat, "AT+CPINR", cpinr_prefixes,
 					at_cpinr_cb, cbd, g_free) > 0)
@@ -1196,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,
@@ -1254,6 +1353,7 @@ static void at_pin_send_cb(gboolean ok, GAtResult *result,
 	case OFONO_VENDOR_ALCATEL:
 	case OFONO_VENDOR_HUAWEI:
 	case OFONO_VENDOR_SIMCOM:
+	case OFONO_VENDOR_SIERRA:
 		/*
 		 * On ZTE modems, after pin is entered, SIM state is checked
 		 * by polling CPIN as their modem doesn't provide unsolicited
@@ -1360,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\"",
@@ -1391,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\"",
@@ -1419,7 +1516,7 @@ static void at_lock_status_cb(gboolean ok, GAtResult *result,
 {
 	struct cb_data *cbd = user_data;
 	GAtResultIter iter;
-	ofono_sim_locked_cb_t cb = cbd->cb;
+	ofono_query_facility_lock_cb_t cb = cbd->cb;
 	struct ofono_error error;
 	int locked;
 
@@ -1444,16 +1541,15 @@ static void at_lock_status_cb(gboolean ok, GAtResult *result,
 	cb(&error, locked, cbd->data);
 }
 
-static void at_pin_query_enabled(struct ofono_sim *sim,
+static void at_query_clck(struct ofono_sim *sim,
 				enum ofono_sim_password_type passwd_type,
-				ofono_sim_locked_cb_t cb, void *data)
+				ofono_query_facility_lock_cb_t cb, void *data)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
-	unsigned int len = 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",
@@ -1469,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,
@@ -1483,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);
@@ -1492,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)
@@ -1529,7 +1661,7 @@ static struct ofono_sim_driver driver = {
 	.reset_passwd		= at_pin_send_puk,
 	.lock			= at_pin_enable,
 	.change_passwd		= at_change_passwd,
-	.query_locked		= at_pin_query_enabled,
+	.query_facility_lock	= at_query_clck,
 };
 
 static struct ofono_sim_driver driver_noef = {
@@ -1543,7 +1675,7 @@ static struct ofono_sim_driver driver_noef = {
 	.reset_passwd		= at_pin_send_puk,
 	.lock			= at_pin_enable,
 	.change_passwd		= at_change_passwd,
-	.query_locked		= at_pin_query_enabled,
+	.query_facility_lock	= at_query_clck,
 };
 
 void at_sim_init(void)

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

@@ -42,5 +42,9 @@ enum ofono_vendor {
 	OFONO_VENDOR_SIMCOM_SIM900,
 	OFONO_VENDOR_ICERA,
 	OFONO_VENDOR_WAVECOM_Q2XXX,
-	OFONO_VENDOR_ALCATEL
+	OFONO_VENDOR_ALCATEL,
+	OFONO_VENDOR_QUECTEL,
+	OFONO_VENDOR_UBLOX,
+	OFONO_VENDOR_UBLOX_TOBY_L2,
+	OFONO_VENDOR_CINTERION,
 };

ofono/drivers/atmodem/voicecall.c

@@ -253,8 +253,7 @@ static void clcc_poll_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		}
 	}
 
-	g_slist_foreach(vd->calls, (GFunc) g_free, NULL);
-	g_slist_free(vd->calls);
+	g_slist_free_full(vd->calls, g_free);
 
 	vd->calls = calls;
 
@@ -1147,8 +1146,7 @@ static void at_voicecall_remove(struct ofono_voicecall *vc)
 	if (vd->vts_source)
 		g_source_remove(vd->vts_source);
 
-	g_slist_foreach(vd->calls, (GFunc) g_free, NULL);
-	g_slist_free(vd->calls);
+	g_slist_free_full(vd->calls, g_free);
 
 	ofono_voicecall_set_data(vc, NULL);
 

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/hfpmodem/handsfree.c

@@ -45,6 +45,7 @@
 
 static const char *binp_prefix[] = { "+BINP:", NULL };
 static const char *bvra_prefix[] = { "+BVRA:", NULL };
+static const char *none_prefix[] = { NULL };
 
 struct hf_data {
 	GAtChat *chat;
@@ -197,7 +198,7 @@ static void hfp_cnum_query(struct ofono_handsfree *hf,
 	struct hf_data *hd = ofono_handsfree_get_data(hf);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (g_at_chat_send(hd->chat, "AT+CNUM", NULL,
+	if (g_at_chat_send(hd->chat, "AT+CNUM", none_prefix,
 					cnum_query_cb, cbd, g_free) > 0)
 		return;
 
@@ -206,6 +207,27 @@ static void hfp_cnum_query(struct ofono_handsfree *hf,
 	CALLBACK_WITH_FAILURE(cb, -1, NULL, data);
 }
 
+static void bind_notify(GAtResult *result, gpointer user_data)
+{
+	struct ofono_handsfree *hf = user_data;
+	int hf_indicator;
+	int active;
+	GAtResultIter iter;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+BIND:"))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &hf_indicator))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &active))
+		return;
+
+	ofono_handsfree_hf_indicator_active_notify(hf, hf_indicator, active);
+}
+
 static gboolean hfp_handsfree_register(gpointer user_data)
 {
 	struct ofono_handsfree *hf = user_data;
@@ -216,6 +238,7 @@ static gboolean hfp_handsfree_register(gpointer user_data)
 	g_at_chat_register(hd->chat, "+BSIR:", bsir_notify, FALSE, hf, NULL);
 	g_at_chat_register(hd->chat, "+BVRA:", bvra_notify, FALSE, hf, NULL);
 	g_at_chat_register(hd->chat, "+CIEV:", ciev_notify, FALSE, hf, NULL);
+	g_at_chat_register(hd->chat, "+BIND:", bind_notify, FALSE, hf, NULL);
 
 	if (hd->ag_features & HFP_AG_FEATURE_IN_BAND_RING_TONE)
 		ofono_handsfree_set_inband_ringing(hf, TRUE);
@@ -232,6 +255,7 @@ static int hfp_handsfree_probe(struct ofono_handsfree *hf,
 {
 	struct hfp_slc_info *info = data;
 	struct hf_data *hd;
+	unsigned int i;
 
 	DBG("");
 	hd = g_new0(struct hf_data, 1);
@@ -245,6 +269,14 @@ static int hfp_handsfree_probe(struct ofono_handsfree *hf,
 	ofono_handsfree_battchg_notify(hf,
 					info->cind_val[HFP_INDICATOR_BATTCHG]);
 
+	ofono_handsfree_set_hf_indicators(hf, info->hf_indicators,
+						info->num_hf_indicators);
+
+	for (i = 0; i < info->num_hf_indicators; i++)
+		ofono_handsfree_hf_indicator_active_notify(hf,
+			info->hf_indicators[i],
+			info->hf_indicator_active_map & (1 << i));
+
 	hd->register_source = g_idle_add(hfp_handsfree_register, hf);
 
 	return 0;
@@ -351,8 +383,27 @@ static void hfp_disable_nrec(struct ofono_handsfree *hf,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	const char *buf = "AT+NREC=0";
 
-	if (g_at_chat_send(hd->chat, buf, NULL, hf_generic_set_cb,
-							cbd, g_free) > 0)
+	if (g_at_chat_send(hd->chat, buf, none_prefix,
+				hf_generic_set_cb, cbd, g_free) > 0)
+		return;
+
+	g_free(cbd);
+
+	CALLBACK_WITH_FAILURE(cb, data);
+}
+
+static void hfp_hf_indicator(struct ofono_handsfree *hf,
+				unsigned short indicator, unsigned int value,
+				ofono_handsfree_cb_t cb, void *data)
+{
+	struct hf_data *hd = ofono_handsfree_get_data(hf);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	char buf[128];
+
+	snprintf(buf, sizeof(buf), "AT+BIEV=%u,%u", indicator, value);
+
+	if (g_at_chat_send(hd->chat, buf, none_prefix,
+				hf_generic_set_cb, cbd, g_free) > 0)
 		return;
 
 	g_free(cbd);
@@ -368,6 +419,7 @@ static struct ofono_handsfree_driver driver = {
 	.request_phone_number	= hfp_request_phone_number,
 	.voice_recognition	= hfp_voice_recognition,
 	.disable_nrec		= hfp_disable_nrec,
+	.hf_indicator		= hfp_hf_indicator,
 };
 
 void hfp_handsfree_init(void)

ofono/drivers/hfpmodem/network-registration.c

@@ -46,6 +46,7 @@
 
 static const char *cops_prefix[] = { "+COPS:", NULL };
 static const char *cind_prefix[] = { "+CIND:", NULL };
+static const char *none_prefix[] = { NULL };
 
 struct netreg_data {
 	GAtChat *chat;
@@ -263,7 +264,7 @@ static void hfp_current_operator(struct ofono_netreg *netreg,
 
 	cbd->user = netreg;
 
-	ok = g_at_chat_send(nd->chat, "AT+COPS=3,0", NULL,
+	ok = g_at_chat_send(nd->chat, "AT+COPS=3,0", none_prefix,
 			NULL, cbd, NULL);
 
 	if (ok)

ofono/drivers/hfpmodem/slc.c

@@ -41,10 +41,12 @@
 #include "hfp.h"
 #include "slc.h"
 
+static const char *none_prefix[] = { NULL };
 static const char *brsf_prefix[] = { "+BRSF:", NULL };
 static const char *cind_prefix[] = { "+CIND:", NULL };
 static const char *cmer_prefix[] = { "+CMER:", NULL };
 static const char *chld_prefix[] = { "+CHLD:", NULL };
+static const char *bind_prefix[] = { "+BIND:", NULL };
 
 struct slc_establish_data {
 	gint ref_count;
@@ -76,6 +78,14 @@ void hfp_slc_info_init(struct hfp_slc_info *info, guint16 version)
 
 	info->hf_features |= HFP_HF_FEATURE_CODEC_NEGOTIATION;
 
+	if (version < HFP_VERSION_1_7)
+		goto done;
+
+	info->hf_features |= HFP_HF_FEATURE_HF_INDICATORS;
+	memset(info->hf_indicators, 0, sizeof(info->hf_indicators));
+	info->num_hf_indicators = 0;
+	info->hf_indicator_active_map = 0;
+
 done:
 	memset(info->cind_val, 0, sizeof(info->cind_val));
 	memset(info->cind_pos, 0, sizeof(info->cind_pos));
@@ -103,10 +113,109 @@ static void slc_established(struct slc_establish_data *sed)
 {
 	struct hfp_slc_info *info = sed->info;
 
-	g_at_chat_send(info->chat, "AT+CMEE=1", NULL, NULL, NULL, NULL);
+	g_at_chat_send(info->chat, "AT+CMEE=1", none_prefix,
+			NULL, NULL, NULL);
 	sed->connect_cb(sed->userdata);
 }
 
+static void bind_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct slc_establish_data *sed = user_data;
+	struct hfp_slc_info *info = sed->info;
+	GAtResultIter iter;
+	int hf_indicator;
+	int enabled;
+	unsigned int i;
+
+	if (!ok)
+		goto error;
+
+	g_at_result_iter_init(&iter, result);
+
+	while (g_at_result_iter_next(&iter, "+BIND:")) {
+		if (!g_at_result_iter_next_number(&iter, &hf_indicator))
+			goto error;
+
+		if (!g_at_result_iter_next_number(&iter, &enabled))
+			goto error;
+
+		ofono_info("AG wants indicator %d %s",
+				hf_indicator, enabled ? "enabled" : "disabled");
+
+		for (i = 0; i < info->num_hf_indicators; i++) {
+			if (info->hf_indicators[i] != hf_indicator)
+				continue;
+
+			info->hf_indicator_active_map |= enabled << i;
+		}
+
+		ofono_info("Active map: %02x", info->hf_indicator_active_map);
+	}
+
+	slc_established(sed);
+	return;
+
+error:
+	slc_failed(sed);
+}
+
+static void bind_support_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct slc_establish_data *sed = user_data;
+	struct hfp_slc_info *info = sed->info;
+	GAtResultIter iter;
+	int hf_indicator;
+
+	if (!ok)
+		goto error;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+BIND:"))
+		goto error;
+
+	if (!g_at_result_iter_open_list(&iter))
+		goto error;
+
+	while (g_at_result_iter_next_number(&iter, &hf_indicator)) {
+		if (info->num_hf_indicators >= 20)
+			goto error;
+
+		ofono_info("AG supports the following HF indicator: %d",
+				hf_indicator);
+
+		info->hf_indicators[info->num_hf_indicators] = hf_indicator;
+		info->num_hf_indicators += 1;
+	}
+
+	if (!g_at_result_iter_close_list(&iter))
+		goto error;
+
+	slc_establish_data_ref(sed);
+	g_at_chat_send(info->chat, "AT+BIND?", bind_prefix,
+				bind_query_cb, sed, slc_establish_data_unref);
+
+	return;
+
+error:
+	slc_failed(sed);
+}
+
+static void bind_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct slc_establish_data *sed = user_data;
+	struct hfp_slc_info *info = sed->info;
+
+	if (!ok) {
+		slc_failed(sed);
+		return;
+	}
+
+	slc_establish_data_ref(sed);
+	g_at_chat_send(info->chat, "AT+BIND=?", bind_prefix,
+				bind_support_cb, sed, slc_establish_data_unref);
+}
+
 static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct slc_establish_data *sed = user_data;
@@ -148,7 +257,14 @@ static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)
 
 	info->ag_mpty_features = ag_mpty_feature;
 
-	slc_established(sed);
+	if ((info->ag_features & HFP_AG_FEATURE_HF_INDICATORS) &&
+			(info->hf_features & HFP_HF_FEATURE_HF_INDICATORS)) {
+		slc_establish_data_ref(sed);
+		g_at_chat_send(info->chat, "AT+BIND=1", none_prefix,
+				bind_set_cb, sed, slc_establish_data_unref);
+	} else
+		slc_established(sed);
+
 	return;
 
 error:
@@ -319,8 +435,8 @@ static void brsf_cb(gboolean ok, GAtResult *result, gpointer user_data)
 			sprintf(str, "AT+BAC=%d", HFP_CODEC_CVSD);
 
 		slc_establish_data_ref(sed);
-		g_at_chat_send(info->chat, str, NULL, bac_cb, sed,
-						slc_establish_data_unref);
+		g_at_chat_send(info->chat, str, none_prefix, bac_cb,
+				sed, slc_establish_data_unref);
 		return;
 	}
 

ofono/drivers/hfpmodem/slc.h

@@ -39,6 +39,9 @@ struct hfp_slc_info {
 	unsigned int hf_features;
 	unsigned char cind_pos[HFP_INDICATOR_LAST];
 	unsigned int cind_val[HFP_INDICATOR_LAST];
+	unsigned short hf_indicators[20];
+	unsigned char num_hf_indicators;
+	unsigned int hf_indicator_active_map;
 };
 
 void hfp_slc_info_init(struct hfp_slc_info *info, guint16 version);

ofono/drivers/hfpmodem/voicecall.c

@@ -46,6 +46,7 @@
 #define POLL_CLCC_DELAY 50
 #define EXPECT_RELEASE_DELAY 50
 #define CLIP_TIMEOUT 500
+#define EXPECT_RING_DELAY 200
 
 static const char *none_prefix[] = { NULL };
 static const char *clcc_prefix[] = { "+CLCC:", NULL };
@@ -285,8 +286,7 @@ static void clcc_poll_cb(gboolean ok, GAtResult *result, gpointer user_data)
 
 	ofono_voicecall_mpty_hint(vc, mpty_ids);
 
-	g_slist_foreach(vd->calls, (GFunc) g_free, NULL);
-	g_slist_free(vd->calls);
+	g_slist_free_full(vd->calls, g_free);
 
 	vd->calls = calls;
 
@@ -294,7 +294,7 @@ static void clcc_poll_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	 * we won't get indicator update if any of them is released by CHLD=1x.
 	 * So we have to poll it.
 	 */
-	if (num_active > 1 || num_held > 1)
+	if ((num_active > 1 || num_held > 1) && !vd->clcc_source)
 		vd->clcc_source = g_timeout_add(POLL_CLCC_INTERVAL, poll_clcc,
 							vc);
 }
@@ -332,6 +332,10 @@ static void generic_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		}
 	}
 
+	if (!ok && vd->calls)
+		g_at_chat_send(vd->chat, "AT+CLCC", clcc_prefix,
+					clcc_poll_cb, req->vc, NULL);
+
 	req->cb(&error, req->data);
 }
 
@@ -499,6 +503,19 @@ static gboolean expect_release(gpointer user_data)
 	return FALSE;
 }
 
+static gboolean expect_ring(gpointer user_data)
+{
+	struct ofono_voicecall *vc = user_data;
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+
+	g_at_chat_send(vd->chat, "AT+CLCC", clcc_prefix,
+				clcc_poll_cb, vc, NULL);
+
+	vd->clip_source = 0;
+
+	return FALSE;
+}
+
 static void release_all_active_cb(gboolean ok, GAtResult *result,
 							gpointer user_data)
 {
@@ -640,8 +657,10 @@ static void hfp_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	struct change_state_req *req = g_try_new0(struct change_state_req, 1);
+	int len = strlen(dtmf);
 	char *buf;
 	int s;
+	int i;
 
 	if (req == NULL)
 		goto error;
@@ -651,12 +670,15 @@ static void hfp_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
 	req->data = data;
 	req->affected_types = 0;
 
-	/* strlen("AT+VTS=) = 7 + NULL */
-	buf = g_try_new(char, strlen(dtmf) + 8);
+	/* strlen("AT") + (n-1) * strlen("+VTS=T;") + strlen(+VTS=T) + null */
+	buf = g_try_new(char, len * 7 + 2);
 	if (buf == NULL)
 		goto error;
 
-	sprintf(buf, "AT+VTS=%s", dtmf);
+	s = sprintf(buf, "AT+VTS=%c", dtmf[0]);
+
+	for (i = 1; i < len; i++)
+		s += sprintf(buf + s, ";+VTS=%c", dtmf[i]);
 
 	s = g_at_chat_send(vd->chat, buf, none_prefix,
 				generic_cb, req, g_free);
@@ -686,12 +708,31 @@ static void ccwa_notify(GAtResult *result, gpointer user_data)
 	int num_type, validity;
 	struct ofono_call *call;
 
+	/* Waiting call notification makes no sense, when there are
+	 * no calls at all. This can happen when a phone already has
+	 * waiting and active calls and is being connected over HFP
+	 * but it first sends +CCWA before we manage to synchronize
+	 * calls with AT+CLCC.
+	 */
+	if (!vd->calls)
+		return;
+
 	/* CCWA can repeat, ignore if we already have an waiting call */
 	if (g_slist_find_custom(vd->calls,
 				GINT_TO_POINTER(CALL_STATUS_WAITING),
 				at_util_call_compare_by_status))
 		return;
 
+	/* some phones may send extra CCWA after active call is ended
+	 * this would trigger creation of second call in state 'WAITING'
+	 * as our previous WAITING call has been promoted to INCOMING
+	 */
+	if (g_slist_find_custom(vd->calls,
+				GINT_TO_POINTER(CALL_STATUS_INCOMING),
+				at_util_call_compare_by_status))
+		return;
+
+
 	g_at_result_iter_init(&iter, result);
 
 	if (!g_at_result_iter_next(&iter, "+CCWA:"))
@@ -752,6 +793,11 @@ static void ring_notify(GAtResult *result, gpointer user_data)
 	struct ofono_call *call;
 	GSList *waiting;
 
+	if (vd->clip_source) {
+		g_source_remove(vd->clip_source);
+		vd->clip_source = 0;
+	}
+
 	/* RING can repeat, ignore if we already have an incoming call */
 	if (g_slist_find_custom(vd->calls,
 				GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -976,7 +1022,15 @@ static void ciev_callsetup_notify(struct ofono_voicecall *vc,
 		break;
 
 	case 1:
-		/* Handled in RING/CCWA */
+		/*
+		 * Handled in RING/CCWA most of the time, however sometimes
+		 * the call is answered before the RING unsolicited
+		 * notification has a chance to be generated on the device.
+		 * In this case, we use a failsafe CLCC poll in expect_ring
+		 * callback.
+		 * */
+		vd->clip_source = g_timeout_add(EXPECT_RING_DELAY,
+							expect_ring, vc);
 		break;
 
 	case 2:
@@ -1064,6 +1118,17 @@ static void ciev_callheld_notify(struct ofono_voicecall *vc,
 			 */
 			vd->clcc_source = g_timeout_add(POLL_CLCC_DELAY,
 							poll_clcc, vc);
+		} else {
+			if (vd->clcc_source)
+				g_source_remove(vd->clcc_source);
+
+			/*
+			 * We got a notification that there is a held call
+			 * and no active call but we already are in such state.
+			 * Let's schedule a poll to see what happened.
+			 */
+			vd->clcc_source = g_timeout_add(POLL_CLCC_DELAY,
+							poll_clcc, vc);
 		}
 	}
 
@@ -1102,6 +1167,10 @@ static void hfp_clcc_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	struct ofono_voicecall *vc = user_data;
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	unsigned int mpty_ids;
+	GSList *n;
+	struct ofono_call *nc;
+	unsigned int num_active = 0;
+	unsigned int num_held = 0;
 
 	if (!ok)
 		return;
@@ -1110,6 +1179,22 @@ static void hfp_clcc_cb(gboolean ok, GAtResult *result, gpointer user_data)
 
 	g_slist_foreach(vd->calls, voicecall_notify, vc);
 	ofono_voicecall_mpty_hint(vc, mpty_ids);
+
+	n = vd->calls;
+
+	while (n) {
+		nc = n->data;
+
+		if (nc->status == CALL_STATUS_ACTIVE)
+			num_active++;
+		else if (nc->status == CALL_STATUS_HELD)
+			num_held++;
+
+		n = n->next;
+	}
+
+	if ((num_active > 1 || num_held > 1) && !vd->clcc_source)
+		vd->clcc_source = g_timeout_add(POLL_CLCC_INTERVAL, poll_clcc, vc);
 }
 
 static void hfp_voicecall_initialized(gboolean ok, GAtResult *result,
@@ -1151,8 +1236,8 @@ static int hfp_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
 
 	ofono_voicecall_set_data(vc, vd);
 
-	g_at_chat_send(vd->chat, "AT+CLIP=1", NULL, NULL, NULL, NULL);
-	g_at_chat_send(vd->chat, "AT+CCWA=1", NULL,
+	g_at_chat_send(vd->chat, "AT+CLIP=1", none_prefix, NULL, NULL, NULL);
+	g_at_chat_send(vd->chat, "AT+CCWA=1", none_prefix,
 				hfp_voicecall_initialized, vc, NULL);
 	return 0;
 }
@@ -1170,8 +1255,7 @@ static void hfp_voicecall_remove(struct ofono_voicecall *vc)
 	if (vd->expect_release_source)
 		g_source_remove(vd->expect_release_source);
 
-	g_slist_foreach(vd->calls, (GFunc) g_free, NULL);
-	g_slist_free(vd->calls);
+	g_slist_free_full(vd->calls, g_free);
 
 	ofono_voicecall_set_data(vc, NULL);
 

ofono/drivers/huaweimodem/gprs-context.c

@@ -80,7 +80,7 @@ static gboolean get_next_addr(GAtResultIter *iter, char **addr)
 	if (g_at_result_iter_next_unquoted_string(iter, &str) == FALSE)
 		return FALSE;
 
-	val = strtol(str, NULL, 16);
+	val = strtoul(str, NULL, 16);
 
 	if (addr)
 		*addr = g_strdup_printf("%u.%u.%u.%u",

ofono/drivers/ifxmodem/voicecall.c

@@ -1009,8 +1009,7 @@ static void ifx_voicecall_remove(struct ofono_voicecall *vc)
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 
-	g_slist_foreach(vd->calls, (GFunc) g_free, NULL);
-	g_slist_free(vd->calls);
+	g_slist_free_full(vd->calls, g_free);
 
 	g_strfreev(vd->en_list);
 

ofono/drivers/infineonmodem/infineon_constants.h

@@ -0,0 +1,77 @@
+/*
+ *
+ *  RIL constants for infineon modem
+ *
+ *  Copyright (C) 2014 Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef INFINEON_CONSTANTS_H
+#define INFINEON_CONSTANTS_H
+
+/* Messages encapsulated in RIL_REQUEST_OEM_HOOK_RAW requests */
+#define INF_RIL_REQUEST_OEM_QUERY_SELECT_BAND 1
+#define INF_RIL_REQUEST_OEM_SET_SELECT_BAND 2
+#define INF_RIL_REQUEST_OEM_SET_CIRCUIT_SWITCHING_PAGING 3
+#define INF_RIL_REQUEST_OEM_GET_LAST_FAILURE_REPORT_FOR_CS_REGISTRATION 4
+#define INF_RIL_REQUEST_OEM_GET_SELECT_BEARER_SERVICE_TYPE 5
+#define INF_RIL_REQUEST_OEM_GET_XPROGRESS_STATUS 6
+#define INF_RIL_REQUEST_OEM_SET_SS_NOTIFY 7
+#define INF_RIL_REQUEST_OEM_GET_SS_NOTIFY 8
+#define INF_RIL_REQUEST_OEM_SET_AUTHENTICATION_TYPE 9
+#define INF_RIL_REQUEST_OEM_SWITCH_OFF_MS 10
+#define INF_RIL_REQUEST_OEM_SET_AUTO_TIMEZONE_UPDATE 11
+#define INF_RIL_REQUEST_OEM_SET_TIMEZONE_RESPORTING 12
+#define INF_RIL_REQUEST_OEM_SET_DISPLAY_SIM_AND_PB_STATUS 13
+#define INF_RIL_REQUEST_OEM_GET_REMAIN_SIM_PIN_ATTEMPTS 14
+#define INF_RIL_REQUEST_OEM_SET_AUTO_REDIAL 15
+#define INF_RIL_REQUEST_OEM_QUERY_CALL_STATUS_REPORTING 16
+#define INF_RIL_REQUEST_OEM_SET_AUTO_ANSWER 17
+#define INF_RIL_REQUEST_OEM_SET_LINE 18
+#define INF_RIL_REQUEST_OEM_PDP_ACTIVATE_OR_DEACTIVATE 19
+#define INF_RIL_REQUEST_OEM_QUERY_GPRS_MS_CLASS 20
+#define INF_RIL_REQUEST_OEM_SET_TRACE_AND_AT_INTERFACES 21
+#define INF_RIL_REQUEST_OEM_QUERY_TRACE_AND_AT_INTERFACES_CONFIGURE 22
+#define INF_RIL_REQUEST_OEM_SWITCH_TRACE_ON_OR_OFF 23
+#define INF_RIL_REQUEST_OEM_READ_EXCEPTION_LOG 24
+#define INF_RIL_REQUEST_OEM_GET_PHONE_ACTIVITY_STATUS 25
+#define INF_RIL_REQUEST_OEM_INITIATE_RESEND_SMS_IF_GPRS_FAILS 26
+#define INF_RIL_REQUEST_OEM_GET_DEVICE_NUMBER 27
+#define INF_RIL_REQUEST_OEM_ENABLE_STK 28
+#define INF_RIL_REQUEST_OEM_GET_SUBSCRIBER_NUMBER 29
+#define INF_RIL_REQUEST_OEM_SELECT_PHONE_BOOK  30
+#define INF_RIL_REQUEST_OEM_READ_PHONE_BOOK    31
+#define INF_RIL_REQUEST_OEM_INSERT_RECORD_TO_PHONE_BOOK 32
+#define INF_RIL_REQUEST_OEM_DELECT_RECORD_IN_PHONE_BOOK  33
+#define INF_RIL_REQUEST_OEM_GET_RECORD_FIELDS_MAX_LEN   34
+#define INF_RIL_REQUEST_OEM_SET_SERIAL_PORT 35
+#define INF_RIL_REQUEST_OEM_SET_DATA_PREFERED 36
+#define INF_RIL_REQUEST_OEM_SET_MODEM_ROUTING 37
+#define INF_RIL_REQUEST_OEM_CLEAR_MISS_NUMBER 38
+#define INF_RIL_REQUEST_OEM_ATH 39
+#define INF_RIL_REQUEST_OEM_NOSIG_MODE_TEST  40
+#define INF_RIL_REQUEST_OEM_SELECT_3G_BAND   41
+#define INF_RIL_REQUEST_OEM_QUERY_3G_BAND    42
+#define INF_RIL_REQUEST_OEM_HW_RESET_MODEM   43
+#define INF_RIL_REQUEST_OEM_QUERY_DIRECT     44
+#define INF_RIL_REQUEST_OEM_USER_PLMN_QUERY  45
+#define INF_RIL_REQUEST_OEM_USER_PLMN_SET    46
+#define INF_RIL_REQUEST_OEM_USER_PLMN_DELTE  47
+#define INF_RIL_REQUEST_OEM_SET_USB_LOG      48
+#define INF_RIL_REQUEST_OEM_UPDATE_CSQ       49
+#define INF_RIL_REQUEST_OEM_DUMP_CELL_ENV    50
+
+#endif /* INFINEON_CONSTANTS_H */

ofono/drivers/isimodem/cbs.c

@@ -134,7 +134,9 @@ static void routing_resp_cb(const GIsiMessage *msg, void *data)
 	struct cbs_data *cd = ofono_cbs_get_data(cbs);
 
 	if (!check_resp(msg, SMS_GSM_CB_ROUTING_RESP)) {
-		ofono_cbs_remove(cbs);
+		/* on shutdown, cbs is already being removed */
+		if (g_isi_msg_error(msg) != -ESHUTDOWN)
+			ofono_cbs_remove(cbs);
 		return;
 	}
 

ofono/drivers/isimodem/sim.c

@@ -652,7 +652,7 @@ static void sec_code_state_resp_cb(const GIsiMessage *msg, void *opaque)
 
 static void isi_query_locked(struct ofono_sim *sim,
 				enum ofono_sim_password_type passwd_type,
-				ofono_sim_locked_cb_t cb, void *data)
+				ofono_query_facility_lock_cb_t cb, void *data)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct isi_cb_data *cbd = isi_cb_data_new(sim, cb, data);
@@ -963,7 +963,7 @@ static struct ofono_sim_driver driver = {
 	.reset_passwd		= isi_reset_passwd,
 	.lock			= isi_lock,
 	.change_passwd		= isi_change_passwd,
-	.query_locked		= isi_query_locked,
+	.query_facility_lock	= isi_query_locked,
 };
 
 void isi_sim_init(void)

ofono/drivers/isimodem/uicc.c

@@ -1032,14 +1032,6 @@ static void uicc_lock(struct ofono_sim *sim, enum ofono_sim_password_type type,
 	CALLBACK_WITH_FAILURE(cb, data);
 }
 
-static void uicc_query_locked(struct ofono_sim *sim,
-				enum ofono_sim_password_type type,
-				ofono_sim_locked_cb_t cb, void *data)
-{
-	DBG("Not implemented");
-	CALLBACK_WITH_FAILURE(cb, -1, data);
-}
-
 static gboolean decode_fcp_pin_status(const GIsiSubBlockIter *iter, uint8_t read,
 					uint8_t *pin1, uint8_t *pin2)
 {
@@ -1677,7 +1669,6 @@ static struct ofono_sim_driver driver = {
 	.reset_passwd		= uicc_reset_passwd,
 	.change_passwd		= uicc_change_passwd,
 	.lock			= uicc_lock,
-	.query_locked		= uicc_query_locked,
 };
 
 void isi_uicc_init(void)

ofono/drivers/isimodem/voicecall.c

@@ -1715,7 +1715,7 @@ static void isi_release_specific(struct ofono_voicecall *ovc, int id,
 
 		if ((status->mode_info & CALL_MODE_ORIGINATOR))
 			cause = CALL_CAUSE_BUSY_USER_REQUEST;
-			break;
+		break;
 	}
 
 	isi_call_release_req(ovc, id, CALL_CAUSE_TYPE_CLIENT, cause, cb, data);

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 */
@@ -63,7 +65,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 */
@@ -140,9 +142,17 @@ 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
+
+/* 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 +162,5 @@ struct qmi_nas_home_network {
 	uint8_t desc_len;
 	char desc[0];
 } __attribute__((__packed__));
+
+int qmi_nas_rat_to_tech(uint8_t rat);

ofono/drivers/qmimodem/network-registration.c

@@ -43,20 +43,6 @@ struct netreg_data {
 	uint8_t current_rat;
 };
 
-static int 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;
-}
-
 static bool extract_ss_info(struct qmi_result *result, int *status,
 				int *lac, int *cellid, int *tech,
 				struct ofono_network_operator *operator)
@@ -64,7 +50,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 +68,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 +86,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);
 	}
@@ -265,7 +264,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:
@@ -543,7 +542,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,10 @@ 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;
 };
 
 struct qmi_service {
@@ -209,6 +222,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 +334,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 +351,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 +795,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 +875,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 +943,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 +980,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,6 +992,9 @@ 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);
@@ -987,6 +1046,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 +1054,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 +1082,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 +1152,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 +1166,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 +1187,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 +1216,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 +1247,249 @@ 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);
-
-	return FALSE;
+	device->shutdown_source = 0;
 }
 
-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);
+	if (device->shutdown_func)
+		device->shutdown_func(device->shutdown_user_data);
+
+	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;
@@ -1501,6 +1757,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 +1769,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 +1807,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 +1848,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 +1881,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 +1906,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 +1929,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 +1948,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 +1972,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 +2008,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;
 

ofono/drivers/qmimodem/radio-settings.c

@@ -74,7 +74,8 @@ 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_NAS,
+						create_nas_cb, rs, NULL);
 
 	return 0;
 

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,96 @@ 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 get_imsi_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_imsi_cb_t cb = cbd->cb;
+	char *str;
 
-	DBG("passwd state %d", data->passwd_state);
+	DBG("");
 
-	if (data->passwd_state == OFONO_SIM_PASSWORD_INVALID) {
-		CALLBACK_WITH_FAILURE(cb, -1, user_data);
+	if (qmi_result_set_error(result, NULL)) {
+		CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
 		return;
 	}
 
-	CALLBACK_WITH_SUCCESS(cb, data->passwd_state, user_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);
-
-	DBG("passwd state %d", data->passwd_state);
-
-	if (data->passwd_state == OFONO_SIM_PASSWORD_INVALID) {
-		CALLBACK_WITH_FAILURE(cb, NULL, user_data);
+	str = qmi_result_get_string(result, QMI_DMS_RESULT_IMSI);
+	if (!str) {
+		CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
 		return;
 	}
 
-	CALLBACK_WITH_SUCCESS(cb, data->retries, user_data);
+	CALLBACK_WITH_SUCCESS(cb, str, cbd->data);
+
+	qmi_free(str);
 }
 
-static void card_setup(const struct qmi_uim_slot_info *slot,
+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 +439,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 +703,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 +753,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 +777,10 @@ static struct ofono_sim_driver driver = {
 	.read_file_transparent	= qmi_read_transparent,
 	.read_file_linear	= qmi_read_record,
 	.read_file_cyclic	= qmi_read_record,
+	.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/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/ril/ril_call_barring.c

@@ -0,0 +1,283 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include "common.h"
+
+/* See 3GPP 27.007 7.4 for possible values */
+#define RIL_MAX_SERVICE_LENGTH 3
+
+/*
+ * ril.h does not state that string count must be given, but that is
+ * still expected by the modem
+ */
+#define RIL_QUERY_STRING_COUNT 4
+#define RIL_SET_STRING_COUNT 5
+#define RIL_SET_PW_STRING_COUNT 3
+
+struct ril_call_barring {
+	GRilIoQueue *q;
+	guint timer_id;
+};
+
+struct ril_call_barring_cbd {
+	struct ril_call_barring *bd;
+	union _ofono_call_barring_cb {
+		ofono_call_barring_query_cb_t query;
+		ofono_call_barring_set_cb_t set;
+		gpointer ptr;
+	} cb;
+	gpointer data;
+};
+
+#define ril_call_barring_cbd_free g_free
+
+static inline struct ril_call_barring *ril_call_barring_get_data(
+					struct ofono_call_barring *b)
+{
+	return ofono_call_barring_get_data(b);
+}
+
+static struct ril_call_barring_cbd *ril_call_barring_cbd_new(
+			struct ril_call_barring *bd, void *cb, void *data)
+{
+	struct ril_call_barring_cbd *cbd;
+
+	cbd = g_new0(struct ril_call_barring_cbd, 1);
+	cbd->bd = bd;
+	cbd->cb.ptr = cb;
+	cbd->data = data;
+	return cbd;
+}
+
+static inline void ril_call_barring_submit_request(struct ril_call_barring *bd,
+	GRilIoRequest* req, guint code, GRilIoChannelResponseFunc response,
+							void *cb, void *data)
+{
+	grilio_queue_send_request_full(bd->q, req, code, response,
+				ril_call_barring_cbd_free,
+				ril_call_barring_cbd_new(bd, cb, data));
+}
+
+static void ril_call_barring_query_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_call_barring_cbd *cbd = user_data;
+	ofono_call_barring_query_cb_t cb = cbd->cb.query;
+
+	if (status == RIL_E_SUCCESS) {
+		int bearer_class = 0;
+		GRilIoParser rilp;
+
+		/*
+		 * Services for which the specified barring facility is active.
+		 * "0" means "disabled for all, -1 if unknown"
+		 */
+		grilio_parser_init(&rilp, data, len);
+		grilio_parser_get_int32(&rilp, NULL); /* count */
+		grilio_parser_get_int32(&rilp, &bearer_class);
+		DBG("Active services: %d", bearer_class);
+		cb(ril_error_ok(&error), bearer_class, cbd->data);
+	} else {
+		ofono_error("Call Barring query error %d", status);
+		cb(ril_error_failure(&error), 0, cbd->data);
+	}
+}
+
+static void ril_call_barring_query(struct ofono_call_barring *b,
+			const char *lock, int cls,
+			ofono_call_barring_query_cb_t cb, void *data)
+{
+	struct ril_call_barring *bd = ofono_call_barring_get_data(b);
+	char cls_textual[RIL_MAX_SERVICE_LENGTH];
+	GRilIoRequest *req = grilio_request_new();
+
+	DBG("lock: %s, services to query: %d", lock, cls);
+
+	/*
+	 * RIL modems do not support 7 as default bearer class. According to
+	 * the 22.030 Annex C: When service code is not given it corresponds to
+	 * "All tele and bearer services"
+	 */
+	if (cls == BEARER_CLASS_DEFAULT) {
+		cls = SERVICE_CLASS_NONE;
+	}
+
+	sprintf(cls_textual, "%d", cls);
+
+	/*
+	 * See 3GPP 27.007 7.4 for parameter descriptions.
+	 * According to ril.h password should be empty string "" when not
+	 * needed, but in reality we only need to give string length as 0
+	 */
+	grilio_request_append_int32(req, RIL_QUERY_STRING_COUNT);
+	grilio_request_append_utf8(req, lock);    /* Facility code */
+	grilio_request_append_int32(req, 0);      /* Password length */
+	grilio_request_append_utf8(req, cls_textual);
+	grilio_request_append_utf8(req, NULL);    /* AID (not yet supported) */
+
+	ril_call_barring_submit_request(bd, req,
+				RIL_REQUEST_QUERY_FACILITY_LOCK,
+				ril_call_barring_query_cb, cb, data);
+	grilio_request_unref(req);
+}
+
+static void ril_call_barring_set_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_call_barring_cbd *cbd = user_data;
+	ofono_call_barring_set_cb_t cb = cbd->cb.set;
+
+	if (status == RIL_E_SUCCESS) {
+		cb(ril_error_ok(&error), cbd->data);
+	} else {
+		ofono_error("Call Barring Set error %d", status);
+		cb(ril_error_failure(&error), cbd->data);
+	}
+}
+
+static void ril_call_barring_set(struct ofono_call_barring *b,
+		const char *lock, int enable, const char *passwd, int cls,
+		ofono_call_barring_set_cb_t cb, void *data)
+{
+	struct ril_call_barring *bd = ofono_call_barring_get_data(b);
+	char cls_textual[RIL_MAX_SERVICE_LENGTH];
+	GRilIoRequest *req = grilio_request_new();
+
+	DBG("lock: %s, enable: %i, bearer class: %i", lock, enable, cls);
+
+	/*
+	 * RIL modem does not support 7 as default bearer class. According to
+	 * the 22.030 Annex C: When service code is not given it corresponds to
+	 * "All tele and bearer services"
+	 */
+	if (cls == BEARER_CLASS_DEFAULT) {
+		cls = SERVICE_CLASS_NONE;
+	}
+
+	sprintf(cls_textual, "%d", cls);
+
+	/* See 3GPP 27.007 7.4 for parameter descriptions */
+	grilio_request_append_int32(req, RIL_SET_STRING_COUNT);
+	grilio_request_append_utf8(req, lock);  /* Facility code */
+	grilio_request_append_utf8(req, enable ?
+					RIL_FACILITY_LOCK :
+					RIL_FACILITY_UNLOCK);
+	grilio_request_append_utf8(req, passwd);
+	grilio_request_append_utf8(req, cls_textual);
+	grilio_request_append_utf8(req, NULL);  /* AID (not yet supported) */
+
+	ril_call_barring_submit_request(bd, req,
+				RIL_REQUEST_SET_FACILITY_LOCK,
+				ril_call_barring_set_cb, cb, data);
+	grilio_request_unref(req);
+}
+
+static void ril_call_barring_set_passwd_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_call_barring_cbd *cbd = user_data;
+	ofono_call_barring_set_cb_t cb = cbd->cb.set;
+
+	if (status == RIL_E_SUCCESS) {
+		cb(ril_error_ok(&error), cbd->data);
+	} else {
+		ofono_error("Call Barring Set PW error %d", status);
+		cb(ril_error_failure(&error), cbd->data);
+	}
+}
+
+static void ril_call_barring_set_passwd(struct ofono_call_barring *b,
+		const char *lock, const char *old_passwd,
+		const char *new_passwd, ofono_call_barring_set_cb_t cb,
+		void *data)
+{
+	struct ril_call_barring *bd = ofono_call_barring_get_data(b);
+	GRilIoRequest *req = grilio_request_new();
+
+	DBG("");
+	grilio_request_append_int32(req, RIL_SET_PW_STRING_COUNT);
+	grilio_request_append_utf8(req, lock);            /* Facility code */
+	grilio_request_append_utf8(req, old_passwd);
+	grilio_request_append_utf8(req, new_passwd);
+
+	ril_call_barring_submit_request(bd, req,
+			RIL_REQUEST_CHANGE_BARRING_PASSWORD,
+			ril_call_barring_set_passwd_cb, cb, data);
+	grilio_request_unref(req);
+}
+
+static gboolean ril_call_barring_register(gpointer user_data)
+{
+	struct ofono_call_barring *b = user_data;
+	struct ril_call_barring *bd = ril_call_barring_get_data(b);
+
+	GASSERT(bd->timer_id);
+	bd->timer_id = 0;
+	ofono_call_barring_register(b);
+	return FALSE;
+}
+
+static int ril_call_barring_probe(struct ofono_call_barring *b,
+					unsigned int vendor, void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_call_barring *bd = g_new0(struct ril_call_barring, 1);
+
+	DBG("");
+	bd->q = grilio_queue_new(ril_modem_io(modem));
+	bd->timer_id = g_idle_add(ril_call_barring_register, b);
+	ofono_call_barring_set_data(b, bd);
+	return 0;
+}
+
+static void ril_call_barring_remove(struct ofono_call_barring *b)
+{
+	struct ril_call_barring *bd = ril_call_barring_get_data(b);
+
+	DBG("");
+	ofono_call_barring_set_data(b, NULL);
+
+	if (bd->timer_id > 0) {
+		g_source_remove(bd->timer_id);
+	}
+
+	grilio_queue_cancel_all(bd->q, FALSE);
+	grilio_queue_unref(bd->q);
+	g_free(bd);
+}
+
+const struct ofono_call_barring_driver ril_call_barring_driver = {
+	.name           = RILMODEM_DRIVER,
+	.probe          = ril_call_barring_probe,
+	.remove         = ril_call_barring_remove,
+	.query          = ril_call_barring_query,
+	.set            = ril_call_barring_set,
+	.set_passwd	= ril_call_barring_set_passwd
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_call_forward.c

@@ -0,0 +1,274 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include "common.h"
+
+struct ril_call_forward {
+	GRilIoQueue *q;
+	guint timer_id;
+};
+
+enum ril_call_forward_action {
+	CF_ACTION_DISABLE,
+	CF_ACTION_ENABLE,
+	CF_ACTION_INTERROGATE,
+	CF_ACTION_REGISTRATION,
+	CF_ACTION_ERASURE
+};
+
+#define CF_TIME_DEFAULT (0)
+
+struct ril_call_forward_cbd {
+	struct ril_call_forward *fd;
+	union _ofono_call_forward_cb {
+		ofono_call_forwarding_query_cb_t query;
+		ofono_call_forwarding_set_cb_t set;
+		gpointer ptr;
+	} cb;
+	gpointer data;
+};
+
+static inline struct ril_call_forward *ril_call_forward_get_data(
+					struct ofono_call_forwarding *cf)
+{
+	return ofono_call_forwarding_get_data(cf);
+}
+
+static void ril_call_forward_cbd_free(gpointer cbd)
+{
+	g_slice_free(struct ril_call_forward_cbd, cbd);
+}
+
+static struct ril_call_forward_cbd *ril_call_forward_cbd_new(void *cb,
+								void *data)
+{
+	struct ril_call_forward_cbd *cbd;
+
+	cbd = g_slice_new0(struct ril_call_forward_cbd);
+	cbd->cb.ptr = cb;
+	cbd->data = data;
+	return cbd;
+}
+
+static GRilIoRequest *ril_call_forward_req(enum ril_call_forward_action action,
+	int type, int cls, const struct ofono_phone_number *number, int time)
+{
+	GRilIoRequest *req = grilio_request_new();
+
+	/*
+	 * Modem seems to respond with error to all requests
+	 * made with bearer class BEARER_CLASS_DEFAULT.
+	 */
+	if (cls == BEARER_CLASS_DEFAULT) {
+		cls = SERVICE_CLASS_NONE;
+	}
+
+	grilio_request_append_int32(req, action);
+	grilio_request_append_int32(req, type);
+	grilio_request_append_int32(req, cls);          /* Service class */
+	if (number) {
+		grilio_request_append_int32(req, number->type);
+		grilio_request_append_utf8(req, number->number);
+	} else {
+		grilio_request_append_int32(req, 0x81); /* TOA unknown */
+		grilio_request_append_utf8(req, NULL);  /* No number */
+	}
+	grilio_request_append_int32(req, time);
+
+	return req;
+}
+
+static void ril_call_forward_set_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_call_forward_cbd *cbd = user_data;
+	ofono_call_forwarding_set_cb_t cb = cbd->cb.set;
+
+	if (status == RIL_E_SUCCESS) {
+		cb(ril_error_ok(&error), cbd->data);
+	} else {
+		ofono_error("CF setting failed");
+		cb(ril_error_failure(&error), cbd->data);
+	}
+}
+
+static void ril_call_forward_set(struct ofono_call_forwarding *cf,
+		enum ril_call_forward_action cmd, int type, int cls,
+		const struct ofono_phone_number *number, int time,
+		ofono_call_forwarding_set_cb_t cb, void *data)
+{
+	struct ril_call_forward *fd = ril_call_forward_get_data(cf);
+	GRilIoRequest *req = ril_call_forward_req(cmd, type, cls, number, time);
+
+	grilio_queue_send_request_full(fd->q, req, RIL_REQUEST_SET_CALL_FORWARD,
+			ril_call_forward_set_cb, ril_call_forward_cbd_free,
+			ril_call_forward_cbd_new(cb, data));
+	grilio_request_unref(req);
+}
+
+static void ril_call_forward_registration(struct ofono_call_forwarding *cf,
+		int type, int cls, const struct ofono_phone_number *number,
+		int time, ofono_call_forwarding_set_cb_t cb, void *data)
+{
+	ofono_info("cf registration");
+	ril_call_forward_set(cf, CF_ACTION_REGISTRATION, type, cls,
+						number, time, cb, data);
+}
+
+static void ril_call_forward_erasure(struct ofono_call_forwarding *cf,
+	int type, int cls, ofono_call_forwarding_set_cb_t cb, void *data)
+{
+	ofono_info("cf erasure");
+	ril_call_forward_set(cf, CF_ACTION_ERASURE, type, cls,
+					NULL, CF_TIME_DEFAULT, cb, data);
+}
+
+static void ril_call_forward_deactivate(struct ofono_call_forwarding *cf,
+	int type, int cls, ofono_call_forwarding_set_cb_t cb, void *data)
+{
+	ofono_info("cf disable");
+	ril_call_forward_set(cf, CF_ACTION_DISABLE, type, cls,
+					NULL, CF_TIME_DEFAULT, cb, data);
+}
+
+static void ril_call_forward_activate(struct ofono_call_forwarding *cf,
+	int type, int cls, ofono_call_forwarding_set_cb_t cb, void *data)
+{
+	ofono_info("cf enable");
+	ril_call_forward_set(cf, CF_ACTION_ENABLE, type, cls,
+					NULL, CF_TIME_DEFAULT, cb, data);
+}
+
+static void ril_call_forward_query_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_call_forward_cbd *cbd = user_data;
+	ofono_call_forwarding_query_cb_t cb = cbd->cb.query;
+
+	if (status == RIL_E_SUCCESS) {
+		struct ofono_call_forwarding_condition *list = NULL;
+		GRilIoParser rilp;
+		int count = 0;
+		int i;
+
+		grilio_parser_init(&rilp, data, len);
+		grilio_parser_get_int32(&rilp, &count);
+
+		list = g_new0(struct ofono_call_forwarding_condition, count);
+		for (i = 0; i < count; i++) {
+			struct ofono_call_forwarding_condition *fw = list + i;
+			char *str;
+
+			grilio_parser_get_int32(&rilp, &fw->status);
+			grilio_parser_get_int32(&rilp, NULL);
+			grilio_parser_get_int32(&rilp, &fw->cls);
+			grilio_parser_get_int32(&rilp, &fw->phone_number.type);
+			str = grilio_parser_get_utf8(&rilp);
+			if (str) {
+				strncpy(fw->phone_number.number, str,
+					OFONO_MAX_PHONE_NUMBER_LENGTH);
+				fw->phone_number.number[
+					OFONO_MAX_PHONE_NUMBER_LENGTH] = 0;
+				g_free(str);
+			}
+			grilio_parser_get_int32(&rilp, &fw->time);
+		}
+
+		cb(ril_error_ok(&error), count, list, cbd->data);
+		g_free(list);
+	} else {
+		ofono_error("CF query failed");
+		cb(ril_error_failure(&error), 0, NULL, cbd->data);
+	}
+}
+
+static void ril_call_forward_query(struct ofono_call_forwarding *cf, int type,
+		int cls, ofono_call_forwarding_query_cb_t cb, void *data)
+{
+	struct ril_call_forward *fd = ril_call_forward_get_data(cf);
+	GRilIoRequest *req = ril_call_forward_req(CF_ACTION_INTERROGATE,
+					type, cls, NULL, CF_TIME_DEFAULT);
+
+	ofono_info("cf query");
+	grilio_queue_send_request_full(fd->q, req,
+			RIL_REQUEST_QUERY_CALL_FORWARD_STATUS,
+			ril_call_forward_query_cb, ril_call_forward_cbd_free,
+			ril_call_forward_cbd_new(cb, data));
+	grilio_request_unref(req);
+}
+
+static gboolean ril_call_forward_register(gpointer user_data)
+{
+	struct ofono_call_forwarding *cf = user_data;
+	struct ril_call_forward *fd = ril_call_forward_get_data(cf);
+
+	fd->timer_id = 0;
+	ofono_call_forwarding_register(cf);
+	return FALSE;
+}
+
+static int ril_call_forward_probe(struct ofono_call_forwarding *cf,
+					unsigned int vendor, void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_call_forward *fd = g_try_new0(struct ril_call_forward, 1);
+
+	DBG("");
+	fd->q = grilio_queue_new(ril_modem_io(modem));
+	fd->timer_id = g_idle_add(ril_call_forward_register, cf);
+	ofono_call_forwarding_set_data(cf, fd);
+	return 0;
+}
+
+static void ril_call_forward_remove(struct ofono_call_forwarding *cf)
+{
+	struct ril_call_forward *fd = ril_call_forward_get_data(cf);
+
+	DBG("");
+	ofono_call_forwarding_set_data(cf, NULL);
+
+	if (fd->timer_id) {
+		g_source_remove(fd->timer_id);
+	}
+
+	grilio_queue_cancel_all(fd->q, FALSE);
+	grilio_queue_unref(fd->q);
+	g_free(fd);
+}
+
+const struct ofono_call_forwarding_driver ril_call_forwarding_driver = {
+	.name           = RILMODEM_DRIVER,
+	.probe          = ril_call_forward_probe,
+	.remove         = ril_call_forward_remove,
+	.erasure        = ril_call_forward_erasure,
+	.deactivation	= ril_call_forward_deactivate,
+	.query          = ril_call_forward_query,
+	.registration   = ril_call_forward_registration,
+	.activation     = ril_call_forward_activate
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_call_settings.c

@@ -0,0 +1,308 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include "common.h"
+
+struct ril_call_settings {
+	GRilIoQueue *q;
+	guint timer_id;
+};
+
+struct ril_call_settings_cbd {
+	union _ofono_call_settings_cb {
+		ofono_call_settings_status_cb_t status;
+		ofono_call_settings_set_cb_t set;
+		ofono_call_settings_clir_cb_t clir;
+		gpointer ptr;
+	} cb;
+	gpointer data;
+};
+
+#define ril_call_settings_cbd_free g_free
+
+static inline struct ril_call_settings *ril_call_settings_get_data(
+					struct ofono_call_settings *b)
+{
+	return ofono_call_settings_get_data(b);
+}
+
+static struct ril_call_settings_cbd *ril_call_settings_cbd_new(void *cb,
+								void *data)
+{
+	struct ril_call_settings_cbd *cbd;
+
+	cbd = g_new0(struct ril_call_settings_cbd, 1);
+	cbd->cb.ptr = cb;
+	cbd->data = data;
+	return cbd;
+}
+
+static inline void ril_call_settings_submit_req(struct ril_call_settings *sd,
+	GRilIoRequest* req, guint code, GRilIoChannelResponseFunc response,
+							void *cb, void *data)
+{
+	grilio_queue_send_request_full(sd->q, req, code, response,
+				ril_call_settings_cbd_free,
+				ril_call_settings_cbd_new(cb, data));
+}
+
+static void ril_call_settings_clip_query_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_call_settings_cbd *cbd = user_data;
+	ofono_call_settings_status_cb_t cb = cbd->cb.status;
+
+	if (status == RIL_E_SUCCESS) {
+		GRilIoParser rilp;
+		int res = 0;
+
+		/* data length of the response */
+		grilio_parser_init(&rilp, data, len);
+		if (grilio_parser_get_int32(&rilp, &res) && res > 0) {
+			grilio_parser_get_int32(&rilp, &res);
+		}
+
+		cb(ril_error_ok(&error), res, cbd->data);
+	} else {
+		cb(ril_error_failure(&error), -1, cbd->data);
+	}
+}
+
+static void ril_call_settings_set_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_call_settings_cbd *cbd = user_data;
+	ofono_call_settings_set_cb_t cb = cbd->cb.set;
+
+	if (status == RIL_E_SUCCESS) {
+		cb(ril_error_ok(&error), cbd->data);
+	} else {
+		cb(ril_error_failure(&error), cbd->data);
+	}
+}
+
+static void ril_call_settings_cw_set(struct ofono_call_settings *cs, int mode,
+			int cls, ofono_call_settings_set_cb_t cb, void *data)
+{
+	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
+	GRilIoRequest *req = grilio_request_sized_new(12);
+
+	grilio_request_append_int32(req, 2);    /* Number of params */
+	grilio_request_append_int32(req, mode); /* on/off */
+
+	/* Modem seems to respond with error to all queries
+	 * or settings made with bearer class
+	 * BEARER_CLASS_DEFAULT. Design decision: If given
+	 * class is BEARER_CLASS_DEFAULT let's map it to
+	 * SERVICE_CLASS_VOICE effectively making it the
+	 * default bearer. This in line with API which is
+	 * contains only voice anyways.
+	 */
+	if (cls == BEARER_CLASS_DEFAULT) {
+		cls = BEARER_CLASS_VOICE;
+	}
+
+	grilio_request_append_int32(req, cls);  /* Service class */
+
+	ril_call_settings_submit_req(sd, req, RIL_REQUEST_SET_CALL_WAITING,
+					ril_call_settings_set_cb, cb, data);
+	grilio_request_unref(req);
+}
+
+static void ril_call_settings_cw_query_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_call_settings_cbd *cbd = user_data;
+	ofono_call_settings_status_cb_t cb = cbd->cb.status;
+
+	if (status == RIL_E_SUCCESS) {
+		GRilIoParser rilp;
+		int res = 0;
+		int sv = 0;
+
+		grilio_parser_init(&rilp, data, len);
+
+		/* first value in int[] is len so let's skip that */
+		grilio_parser_get_int32(&rilp, NULL);
+
+		/* status of call waiting service, disabled is returned only if
+		 * service is not active for any service class */
+		grilio_parser_get_int32(&rilp, &res);
+		DBG("CW enabled/disabled: %d", res);
+
+		if (res > 0) {
+			/* services for which call waiting is enabled,
+			   27.007 7.12 */
+			grilio_parser_get_int32(&rilp, &sv);
+			DBG("CW enabled for: %d", sv);
+		}
+
+		cb(ril_error_ok(&error), sv, cbd->data);
+	} else {
+		cb(ril_error_failure(&error), -1, cbd->data);
+	}
+}
+
+static void ril_call_settings_cw_query(struct ofono_call_settings *cs, int cls,
+				ofono_call_settings_status_cb_t cb, void *data)
+{
+	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
+	GRilIoRequest *req = grilio_request_sized_new(8);
+
+	grilio_request_append_int32(req, 1);		/* Number of params */
+
+	/*
+	 * RILD expects service class to be 0 as certain carriers can reject
+	 * the query with specific service class
+	 */
+	grilio_request_append_int32(req, 0);
+
+	ril_call_settings_submit_req(sd, req, RIL_REQUEST_QUERY_CALL_WAITING,
+				ril_call_settings_cw_query_cb, cb, data);
+	grilio_request_unref(req);
+}
+
+static void ril_call_settings_clip_query(struct ofono_call_settings *cs,
+			ofono_call_settings_status_cb_t cb, void *data)
+{
+	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
+
+	ril_call_settings_submit_req(sd, NULL, RIL_REQUEST_QUERY_CLIP,
+				ril_call_settings_clip_query_cb, cb, data);
+}
+
+static void ril_call_settings_clir_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_call_settings_cbd *cbd = user_data;
+	ofono_call_settings_clir_cb_t cb = cbd->cb.clir;
+
+	if (status == RIL_E_SUCCESS) {
+		GRilIoParser rilp;
+		int override = -1, network = -1;
+
+		grilio_parser_init(&rilp, data, len);
+		/*first value in int[] is len so let's skip that*/
+		grilio_parser_get_int32(&rilp, NULL);
+		/* Set HideCallerId property from network */
+		grilio_parser_get_int32(&rilp, &override);
+		/* CallingLineRestriction indicates the state of
+		the CLIR supplementary service in the network */
+		grilio_parser_get_int32(&rilp, &network);
+
+		cb(ril_error_ok(&error), override, network, cbd->data);
+	} else {
+		cb(ril_error_failure(&error), -1, -1, cbd->data);
+	}
+}
+
+static void ril_call_settings_clir_query(struct ofono_call_settings *cs,
+			ofono_call_settings_clir_cb_t cb, void *data)
+{
+	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
+
+	ril_call_settings_submit_req(sd, NULL, RIL_REQUEST_GET_CLIR,
+					ril_call_settings_clir_cb, cb, data);
+}
+
+static void ril_call_settings_clir_set(struct ofono_call_settings *cs,
+			int mode, ofono_call_settings_set_cb_t cb, void *data)
+{
+	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
+	GRilIoRequest *req = grilio_request_sized_new(8);
+
+	grilio_request_append_int32(req, 1); /* Number of params */
+	grilio_request_append_int32(req, mode); /* for outgoing calls */
+
+	ril_call_settings_submit_req(sd, req, RIL_REQUEST_SET_CLIR,
+					ril_call_settings_set_cb, cb, data);
+	grilio_request_unref(req);
+}
+
+static gboolean ril_call_settings_register(gpointer user_data)
+{
+	struct ofono_call_settings *cs = user_data;
+	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
+
+	DBG("");
+	GASSERT(sd->timer_id);
+	sd->timer_id = 0;
+	ofono_call_settings_register(cs);
+
+	/* Single-shot */
+	return FALSE;
+}
+
+static int ril_call_settings_probe(struct ofono_call_settings *cs,
+					unsigned int vendor, void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_call_settings *sd = g_try_new0(struct ril_call_settings, 1);
+
+	DBG("");
+	sd->q = grilio_queue_new(ril_modem_io(modem));
+	sd->timer_id = g_idle_add(ril_call_settings_register, cs);
+	ofono_call_settings_set_data(cs, sd);
+	return 0;
+}
+
+static void ril_call_settings_remove(struct ofono_call_settings *cs)
+{
+	struct ril_call_settings *sd = ril_call_settings_get_data(cs);
+
+	DBG("");
+	ofono_call_settings_set_data(cs, NULL);
+
+	if (sd->timer_id > 0) {
+		g_source_remove(sd->timer_id);
+        }
+
+	grilio_queue_cancel_all(sd->q, FALSE);
+	grilio_queue_unref(sd->q);
+	g_free(sd);
+}
+
+const struct ofono_call_settings_driver ril_call_settings_driver = {
+	.name           = RILMODEM_DRIVER,
+	.probe          = ril_call_settings_probe,
+	.remove         = ril_call_settings_remove,
+	.clip_query	= ril_call_settings_clip_query,
+	.cw_query       = ril_call_settings_cw_query,
+	.cw_set         = ril_call_settings_cw_set,
+	.clir_query     = ril_call_settings_clir_query,
+	.clir_set       = ril_call_settings_clir_set
+
+	/*
+	 * Not supported in RIL API
+	 * .colp_query     = ril_call_settings_colp_query,
+	 * .colr_query     = ril_call_settings_colr_query
+	 */
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_call_volume.c

@@ -0,0 +1,150 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+struct ril_call_volume {
+	struct ofono_call_volume *v;
+	GRilIoQueue *q;
+	guint timer_id;
+};
+
+struct ril_call_volume_req {
+	ofono_call_volume_cb_t cb;
+	gpointer data;
+};
+
+static inline struct ril_call_volume *ril_call_volume_get_data(
+					struct ofono_call_volume *v)
+{
+	return ofono_call_volume_get_data(v);
+}
+
+static void ril_call_volume_mute_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_call_volume_req *cbd = user_data;
+	ofono_call_volume_cb_t cb = cbd->cb;
+
+	if (status == RIL_E_SUCCESS) {
+		cb(ril_error_ok(&error), cbd->data);
+	} else {
+		ofono_error("Could not set the ril mute state");
+		cb(ril_error_failure(&error), cbd->data);
+	}
+}
+
+static void ril_call_volume_mute(struct ofono_call_volume *v, int muted,
+				ofono_call_volume_cb_t cb, void *data)
+{
+	struct ril_call_volume *vd = ril_call_volume_get_data(v);
+	struct ril_call_volume_req *cbd;
+	GRilIoRequest *req = grilio_request_sized_new(8);
+
+	cbd = g_new(struct ril_call_volume_req, 1);
+	cbd->cb = cb;
+	cbd->data = data;
+
+	DBG("%d", muted);
+	grilio_request_append_int32(req, 1);
+	grilio_request_append_int32(req, muted);
+	grilio_queue_send_request_full(vd->q, req, RIL_REQUEST_SET_MUTE,
+				 ril_call_volume_mute_cb, g_free, cbd);
+	grilio_request_unref(req);
+}
+
+static void ril_call_volume_query_mute_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_call_volume *vd = user_data;
+
+	if (status == RIL_E_SUCCESS) {
+		int muted = 0;
+		GRilIoParser rilp;
+
+		grilio_parser_init(&rilp, data, len);
+		grilio_parser_get_int32(&rilp, NULL); /* Array length */
+		grilio_parser_get_int32(&rilp, &muted);
+		DBG("{%d}", muted);
+		ofono_call_volume_set_muted(vd->v, muted);
+	} else {
+		ofono_error("Could not retrive the ril mute state");
+	}
+}
+
+static gboolean ril_call_volume_register(gpointer user_data)
+{
+	struct ril_call_volume *vd = user_data;
+
+	DBG("");
+	GASSERT(vd->timer_id);
+	vd->timer_id = 0;
+	ofono_call_volume_register(vd->v);
+
+	/* Probe the mute state */
+	grilio_queue_send_request_full(vd->q, NULL,
+		RIL_REQUEST_GET_MUTE, ril_call_volume_query_mute_cb, NULL, vd);
+
+	/* This makes the timeout a single-shot */
+	return FALSE;
+}
+
+static int ril_call_volume_probe(struct ofono_call_volume *v,
+				unsigned int vendor, void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_call_volume *vd = g_new0(struct ril_call_volume, 1);
+
+	DBG("");
+	vd->v = v;
+	vd->q = grilio_queue_new(ril_modem_io(modem));
+	vd->timer_id = g_idle_add(ril_call_volume_register, vd);
+	ofono_call_volume_set_data(v, vd);
+	return 0;
+}
+
+static void ril_call_volume_remove(struct ofono_call_volume *v)
+{
+	struct ril_call_volume *vd = ril_call_volume_get_data(v);
+
+	DBG("");
+	ofono_call_volume_set_data(v, NULL);
+
+	if (vd->timer_id) {
+		g_source_remove(vd->timer_id);
+	}
+
+	grilio_queue_cancel_all(vd->q, FALSE);
+	grilio_queue_unref(vd->q);
+	g_free(vd);
+}
+
+const struct ofono_call_volume_driver ril_call_volume_driver = {
+	.name       = RILMODEM_DRIVER,
+	.probe      = ril_call_volume_probe,
+	.remove     = ril_call_volume_remove,
+	.mute       = ril_call_volume_mute,
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_cbs.c

@@ -0,0 +1,230 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include <gutil_strv.h>
+
+struct ril_cbs {
+	struct ofono_cbs *cbs;
+	GRilIoChannel *io;
+	GRilIoQueue *q;
+	char *log_prefix;
+	gulong event_id;
+};
+
+struct ril_cbs_cbd {
+	struct ril_cbs *cd;
+	ofono_cbs_set_cb_t cb;
+	gpointer data;
+};
+
+#define RIL_CBS_CHECK_RETRY_MS    1000
+#define RIL_CBS_CHECK_RETRY_COUNT 30
+
+#define DBG_(cd,fmt,args...) DBG("%s" fmt, (cd)->log_prefix, ##args)
+
+#define ril_cbs_cbd_free g_free
+
+static struct ril_cbs_cbd *ril_cbs_cbd_new(struct ril_cbs *cd,
+		ofono_cbs_set_cb_t cb, void *data)
+{
+	struct ril_cbs_cbd *cbd = g_new(struct ril_cbs_cbd, 1);
+
+	cbd->cd = cd;
+	cbd->cb = cb;
+	cbd->data = data;
+	return cbd;
+}
+
+static void ril_cbs_request_activation(struct ril_cbs *cd,
+		gboolean activate, GRilIoChannelResponseFunc response,
+		GDestroyNotify destroy, void* user_data)
+{
+	GRilIoRequest* req = grilio_request_sized_new(8);
+
+	grilio_request_append_int32(req, 1);
+	grilio_request_append_int32(req, activate ? 0 :1);
+
+	DBG_(cd, "%sactivating CB", activate ? "" : "de");
+	grilio_queue_send_request_full(cd->q, req,
+				RIL_REQUEST_GSM_SMS_BROADCAST_ACTIVATION,
+				response, destroy, user_data);
+	grilio_request_unref(req);
+}
+
+static void ril_cbs_set_config(struct ril_cbs *cd, const char *topics,
+			GRilIoChannelResponseFunc response,
+			GDestroyNotify destroy, void* user_data)
+{
+	char **list = topics ? g_strsplit(topics, ",", 0) : NULL;
+	int i, n = gutil_strv_length(list);
+	GRilIoRequest* req = grilio_request_new();
+
+	grilio_request_append_int32(req, n);
+	for (i = 0; i < n; i++) {
+		const char *entry = list[i];
+		const char *delim = strchr(entry, '-');
+		int from, to;
+		if (delim) {
+			char **range = g_strsplit(topics, "-", 0);
+			from = atoi(range[0]);
+			to = atoi(range[1]);
+			g_strfreev(range);
+		} else {
+			from = to = atoi(entry);
+		}
+
+		grilio_request_append_int32(req, from);
+		grilio_request_append_int32(req, to);
+		grilio_request_append_int32(req, 0);
+		grilio_request_append_int32(req, 0xff);
+		grilio_request_append_int32(req, 1);
+	}
+
+	DBG_(cd, "configuring CB");
+	grilio_queue_send_request_full(cd->q, req,
+			RIL_REQUEST_GSM_SET_BROADCAST_SMS_CONFIG,
+			response, destroy, user_data);
+	grilio_request_unref(req);
+	g_strfreev(list);
+}
+
+static void ril_cbs_cb(GRilIoChannel *io, int ril_status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_cbs_cbd *cbd = user_data;
+
+	if (cbd->cb) {
+		struct ofono_error error;
+
+		if (ril_status == RIL_E_SUCCESS) {
+			cbd->cb(ril_error_ok(&error), cbd->data);
+		} else {
+			cbd->cb(ril_error_failure(&error), cbd->data);
+		}
+	}
+}
+
+static void ril_cbs_set_topics(struct ofono_cbs *cbs, const char *topics,
+				ofono_cbs_set_cb_t cb, void *data)
+{
+	struct ril_cbs *cd = ofono_cbs_get_data(cbs);
+
+	DBG_(cd, "%s", topics);
+	ril_cbs_set_config(cd, topics, ril_cbs_cb, ril_cbs_cbd_free,
+					ril_cbs_cbd_new(cd, cb, data));
+}
+
+static void ril_cbs_clear_topics(struct ofono_cbs *cbs,
+				ofono_cbs_set_cb_t cb, void *data)
+{
+	struct ril_cbs *cd = ofono_cbs_get_data(cbs);
+
+	DBG_(cd, "");
+	ril_cbs_request_activation(cd, FALSE, ril_cbs_cb, ril_cbs_cbd_free,
+					ril_cbs_cbd_new(cd, cb, data));
+}
+
+static void ril_cbs_notify(GRilIoChannel *io, guint code,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_cbs *cd = user_data;
+
+	GASSERT(code == RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS);
+	DBG_(cd, "%u bytes", len);
+	ofono_cbs_notify(cd->cbs, data, len);
+}
+
+static void ril_cbs_probe_done_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_cbs *cd = user_data;
+
+	if (status == RIL_E_SUCCESS) {
+		DBG_(cd, "registering for CB");
+		cd->event_id = grilio_channel_add_unsol_event_handler(cd->io,
+			ril_cbs_notify, RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS,
+									cd);
+		ofono_cbs_register(cd->cbs);
+	} else {
+		DBG_(cd, "failed to query CB config");
+		ofono_cbs_remove(cd->cbs);
+	}
+}
+
+static int ril_cbs_probe(struct ofono_cbs *cbs, unsigned int vendor,
+								void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_cbs *cd = g_try_new0(struct ril_cbs, 1);
+	GRilIoRequest* req = grilio_request_new();
+
+	ofono_cbs_set_data(cbs, cd);
+	cd->log_prefix = (modem->log_prefix && modem->log_prefix[0]) ?
+		g_strconcat(modem->log_prefix, " ", NULL) : g_strdup("");
+	cd->cbs = cbs;
+
+	DBG_(cd, "");
+	cd->io = grilio_channel_ref(ril_modem_io(modem));
+	cd->q = grilio_queue_new(cd->io);
+
+	/*
+	 * RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG often fails at startup
+	 * especially if other RIL requests are running in parallel. We may
+	 * have to retry a few times. Also, make it blocking in order to
+	 * improve the chance of success.
+	 */
+	grilio_request_set_retry(req, RIL_CBS_CHECK_RETRY_MS,
+						RIL_CBS_CHECK_RETRY_COUNT);
+	grilio_request_set_blocking(req, TRUE);
+	grilio_queue_send_request_full(cd->q, req,
+				RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG,
+				ril_cbs_probe_done_cb, NULL, cd);
+	grilio_request_unref(req);
+	return 0;
+}
+
+static void ril_cbs_remove(struct ofono_cbs *cbs)
+{
+	struct ril_cbs *cd = ofono_cbs_get_data(cbs);
+
+	DBG_(cd, "");
+	ofono_cbs_set_data(cbs, NULL);
+	grilio_channel_remove_handler(cd->io, cd->event_id);
+	grilio_channel_unref(cd->io);
+	grilio_queue_cancel_all(cd->q, FALSE);
+	grilio_queue_unref(cd->q);
+	g_free(cd->log_prefix);
+	g_free(cd);
+}
+
+const struct ofono_cbs_driver ril_cbs_driver = {
+	.name           = RILMODEM_DRIVER,
+	.probe          = ril_cbs_probe,
+	.remove         = ril_cbs_remove,
+	.set_topics     = ril_cbs_set_topics,
+	.clear_topics   = ril_cbs_clear_topics
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_cell_info.c

@@ -0,0 +1,543 @@
+/*
+ *  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_cell_info.h"
+#include "ril_sim_card.h"
+#include "ril_radio.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include <grilio_channel.h>
+#include <grilio_request.h>
+#include <grilio_parser.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;
+
+struct ril_cell_info {
+	GObject object;
+	struct sailfish_cell_info info;
+	GRilIoChannel *io;
+	MceDisplay *display;
+	struct ril_radio *radio;
+	struct ril_sim_card *sim_card;
+	gulong display_state_event_id;
+	gulong radio_state_event_id;
+	gulong sim_status_event_id;
+	gboolean sim_card_ready;
+	char *log_prefix;
+	gulong event_id;
+	guint query_id;
+	guint set_rate_id;
+};
+
+enum ril_cell_info_signal {
+	SIGNAL_CELLS_CHANGED,
+	SIGNAL_COUNT
+};
+
+#define SIGNAL_CELLS_CHANGED_NAME   "ril-cell-info-cells-changed"
+
+static guint ril_cell_info_signals[SIGNAL_COUNT] = { 0 };
+
+G_DEFINE_TYPE(RilCellInfo, ril_cell_info, G_TYPE_OBJECT)
+#define RIL_CELL_INFO_TYPE (ril_cell_info_get_type())
+#define RIL_CELL_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
+	RIL_CELL_INFO_TYPE, RilCellInfo))
+
+#define DBG_(self,fmt,args...) DBG("%s" fmt, (self)->log_prefix, ##args)
+
+static inline void ril_cell_free(struct sailfish_cell *cell)
+{
+	g_slice_free(struct sailfish_cell, cell);
+}
+
+static void ril_cell_free1(gpointer cell)
+{
+	ril_cell_free(cell);
+}
+
+static gboolean ril_cell_info_list_identical(GSList *l1, GSList *l2)
+{
+	while (l1 && l2) {
+		if (memcmp(l1->data, l2->data, sizeof(struct sailfish_cell))) {
+			return FALSE;
+		}
+		l1 = l1->next;
+		l2 = l2->next;
+	}
+	return !l1 && !l2;
+}
+
+static void ril_cell_info_update_cells(struct ril_cell_info *self, GSList *l)
+{
+	if (!ril_cell_info_list_identical(self->info.cells, l)) {
+		g_slist_free_full(self->info.cells, ril_cell_free1);
+		self->info.cells = l;
+		g_signal_emit(self, ril_cell_info_signals
+			[SIGNAL_CELLS_CHANGED], 0);
+	} else {
+		g_slist_free_full(l, ril_cell_free1);
+	}
+}
+
+static struct sailfish_cell *ril_cell_info_parse_cell_gsm(GRilIoParser *rilp,
+					guint version, gboolean registered)
+{
+	struct sailfish_cell *cell = g_slice_new0(struct sailfish_cell);
+	struct sailfish_cell_info_gsm *gsm = &cell->info.gsm;
+
+	/* Optional RIL_CellIdentityGsm_v12 part */
+	gsm->arfcn = INT_MAX;
+	gsm->bsic = INT_MAX;
+	/* Optional RIL_GSM_SignalStrength_v12 part */
+	gsm->timingAdvance = INT_MAX;
+	/* RIL_CellIdentityGsm */
+	if (grilio_parser_get_int32(rilp, &gsm->mcc) &&
+		grilio_parser_get_int32(rilp, &gsm->mnc) &&
+		grilio_parser_get_int32(rilp, &gsm->lac) &&
+		grilio_parser_get_int32(rilp, &gsm->cid) &&
+		(version < 12 || /* RIL_CellIdentityGsm_v12 part */
+			(grilio_parser_get_int32(rilp, &gsm->arfcn) &&
+			grilio_parser_get_int32(rilp, &gsm->bsic))) &&
+		/* RIL_GW_SignalStrength */
+		grilio_parser_get_int32(rilp, &gsm->signalStrength) &&
+		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);
+		cell->type = SAILFISH_CELL_TYPE_GSM;
+		cell->registered = registered;
+		return cell;
+	}
+
+	ofono_error("failed to parse GSM cell info");
+	ril_cell_free(cell);
+	return NULL;
+}
+
+static struct sailfish_cell *ril_cell_info_parse_cell_wcdma(GRilIoParser *rilp,
+					guint version, gboolean registered)
+{
+	struct sailfish_cell *cell = g_slice_new0(struct sailfish_cell);
+	struct sailfish_cell_info_wcdma *wcdma = &cell->info.wcdma;
+
+	/* Optional RIL_CellIdentityWcdma_v12 part */
+	wcdma->uarfcn = INT_MAX;
+	if (grilio_parser_get_int32(rilp, &wcdma->mcc) &&
+		grilio_parser_get_int32(rilp, &wcdma->mnc) &&
+		grilio_parser_get_int32(rilp, &wcdma->lac) &&
+		grilio_parser_get_int32(rilp, &wcdma->cid) &&
+		grilio_parser_get_int32(rilp, &wcdma->psc) &&
+		(version < 12 || /* RIL_CellIdentityWcdma_v12 part */
+			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);
+		cell->type = SAILFISH_CELL_TYPE_WCDMA;
+		cell->registered = registered;
+		return cell;
+	}
+
+	ofono_error("failed to parse WCDMA cell info");
+	ril_cell_free(cell);
+	return NULL;
+}
+
+static struct sailfish_cell *ril_cell_info_parse_cell_lte(GRilIoParser *rilp,
+					guint version, gboolean registered)
+{
+	struct sailfish_cell *cell = g_slice_new0(struct sailfish_cell);
+	struct sailfish_cell_info_lte *lte = &cell->info.lte;
+
+	/* Optional RIL_CellIdentityLte_v12 part */
+	lte->earfcn = INT_MAX;
+	if (grilio_parser_get_int32(rilp, &lte->mcc) &&
+		grilio_parser_get_int32(rilp, &lte->mnc) &&
+		grilio_parser_get_int32(rilp, &lte->ci) &&
+		grilio_parser_get_int32(rilp, &lte->pci) &&
+		grilio_parser_get_int32(rilp, &lte->tac) &&
+		(version < 12 || /* RIL_CellIdentityLte_v12 part */
+			grilio_parser_get_int32(rilp, &lte->earfcn)) &&
+		grilio_parser_get_int32(rilp, &lte->signalStrength) &&
+		grilio_parser_get_int32(rilp, &lte->rsrp) &&
+		grilio_parser_get_int32(rilp, &lte->rsrq) &&
+		grilio_parser_get_int32(rilp, &lte->rssnr) &&
+		grilio_parser_get_int32(rilp, &lte->cqi) &&
+		grilio_parser_get_int32(rilp, &lte->timingAdvance)) {
+		DBG("[lte] reg=%d,mcc=%d,mnc=%d,ci=%d,pci=%d,tac=%d,"
+			"strength=%d,rsrp=%d,rsrq=%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);
+		cell->type = SAILFISH_CELL_TYPE_LTE;
+		cell->registered = registered;
+		return cell;
+	}
+
+	ofono_error("failed to parse LTE cell info");
+	ril_cell_free(cell);
+	return NULL;
+}
+
+static gboolean ril_cell_info_parse_cell(GRilIoParser *rilp, guint v,
+					struct sailfish_cell **cell_ptr)
+{
+	int type, reg;
+
+	if (grilio_parser_get_int32(rilp, &type) &&
+			grilio_parser_get_int32(rilp, &reg) &&
+			/* Skip timestamp */
+			grilio_parser_get_int32_array(rilp, NULL, 3)) {
+		int skip = 0;
+		struct sailfish_cell *cell = NULL;
+
+		/* Normalize the boolean value */
+		reg = (reg != FALSE);
+
+		switch (type) {
+		case RIL_CELL_INFO_TYPE_GSM:
+			cell = ril_cell_info_parse_cell_gsm(rilp, v, reg);
+			break;
+		case RIL_CELL_INFO_TYPE_WCDMA:
+			cell = ril_cell_info_parse_cell_wcdma(rilp, v, reg);
+			break;
+		case RIL_CELL_INFO_TYPE_LTE:
+			cell = ril_cell_info_parse_cell_lte(rilp, v, reg);
+			break;
+		case RIL_CELL_INFO_TYPE_CDMA:
+			skip = 10;
+			break;
+		case RIL_CELL_INFO_TYPE_TD_SCDMA:
+			skip = 6;
+			break;
+		default:
+			skip = 0;
+			break;
+		}
+
+		if (cell) {
+			*cell_ptr = cell;
+			return TRUE;
+		}
+
+		if (skip && grilio_parser_get_int32_array(rilp, NULL, skip)) {
+			*cell_ptr = NULL;
+			return TRUE;
+		}
+	}
+
+	*cell_ptr = NULL;
+	return FALSE;
+}
+
+static GSList *ril_cell_info_parse_list(guint v, const void *data, guint len)
+{
+	GSList *l = NULL;
+	GRilIoParser rilp;
+	int i, n;
+
+	grilio_parser_init(&rilp, data, len);
+	if (grilio_parser_get_int32(&rilp, &n) && n > 0) {
+		struct sailfish_cell *c;
+
+		DBG("%d cell(s):", n);
+		for (i=0; i<n && ril_cell_info_parse_cell(&rilp, v, &c); i++) {
+			if (c) {
+				l = g_slist_insert_sorted(l, c,
+						sailfish_cell_compare_func);
+			}
+		}
+	}
+
+	GASSERT(grilio_parser_at_end(&rilp));
+	return l;
+}
+
+static void ril_cell_info_list_changed_cb(GRilIoChannel *io, guint code,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_cell_info *self = RIL_CELL_INFO(user_data);
+
+	DBG_(self, "");
+	ril_cell_info_update_cells(self, ril_cell_info_parse_list
+						(io->ril_version, data, len));
+}
+
+static void ril_cell_info_list_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_cell_info *self = RIL_CELL_INFO(user_data);
+
+	DBG_(self, "");
+	GASSERT(self->query_id);
+	self->query_id = 0;
+	ril_cell_info_update_cells(self, (status == RIL_E_SUCCESS) ?
+		ril_cell_info_parse_list(io->ril_version, data, len) : NULL);
+}
+
+static void ril_cell_info_set_rate_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_cell_info *self = RIL_CELL_INFO(user_data);
+
+	DBG_(self, "");
+	GASSERT(self->set_rate_id);
+	self->set_rate_id = 0;
+}
+
+static void ril_cell_info_query(struct ril_cell_info *self)
+{
+	GRilIoRequest *req = grilio_request_new();
+
+	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,
+		NULL, self);
+	grilio_request_unref(req);
+}
+
+static void ril_cell_info_set_rate(struct ril_cell_info *self, int ms)
+{
+	GRilIoRequest *req = grilio_request_sized_new(8);
+
+	grilio_request_append_int32(req, 1);
+	grilio_request_append_int32(req, ms);
+	grilio_request_set_retry(req, RIL_RETRY_MS, 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,
+			ril_cell_info_set_rate_cb, NULL, self);
+	grilio_request_unref(req);
+}
+
+static void ril_cell_info_update_rate(struct ril_cell_info *self)
+{
+	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)
+{
+	ril_cell_info_update_rate(RIL_CELL_INFO(arg));
+}
+
+static void ril_cell_info_refresh(struct ril_cell_info *self)
+{
+	/* RIL_REQUEST_GET_CELL_INFO_LIST fails without SIM card */
+	if (self->radio->state == RADIO_STATE_ON && self->sim_card_ready) {
+		ril_cell_info_query(self);
+	} else {
+		ril_cell_info_update_cells(self, NULL);
+	}
+}
+
+static void ril_cell_info_radio_state_cb(struct ril_radio *radio, void *arg)
+{
+	struct ril_cell_info *self = RIL_CELL_INFO(arg);
+
+	DBG_(self, "%s", ril_radio_state_to_string(radio->state));
+	ril_cell_info_refresh(self);
+}
+
+static void ril_cell_info_sim_status_cb(struct ril_sim_card *sim, void *arg)
+{
+	struct ril_cell_info *self = RIL_CELL_INFO(arg);
+
+	self->sim_card_ready = ril_sim_card_ready(sim);
+	DBG_(self, "%sready", self->sim_card_ready ? "" : "not ");
+	ril_cell_info_refresh(self);
+	ril_cell_info_update_rate(self);
+}
+
+/* sailfish_cell_info interface callbacks */
+
+struct ril_cell_info_signal_data {
+	sailfish_cell_info_cb_t cb;
+	void *arg;
+};
+
+static inline struct ril_cell_info *ril_cell_info_cast
+					(struct sailfish_cell_info *info)
+{
+	return G_CAST(info, struct ril_cell_info, info);
+}
+
+static void ril_cell_info_ref_proc(struct sailfish_cell_info *info)
+{
+	g_object_ref(ril_cell_info_cast(info));
+}
+
+static void ril_cell_info_unref_proc(struct sailfish_cell_info *info)
+{
+	g_object_unref(ril_cell_info_cast(info));
+}
+
+static void ril_cell_info_cells_changed_cb(struct ril_cell_info *self,
+							void *user_data)
+{
+	struct ril_cell_info_signal_data *data = user_data;
+
+	data->cb(&self->info, data->arg);
+}
+
+static void ril_cell_info_cells_disconnect_notify(gpointer  data,
+							GClosure *closure)
+{
+	g_slice_free1(sizeof(struct ril_cell_info_signal_data), data);
+}
+
+static gulong ril_cell_info_add_cells_changed_handler_proc
+				(struct sailfish_cell_info *info,
+					sailfish_cell_info_cb_t cb, void *arg)
+{
+	if (cb) {
+		struct ril_cell_info_signal_data *data =
+			g_slice_new(struct ril_cell_info_signal_data);
+
+		data->cb = cb;
+		data->arg = arg;
+		return g_signal_connect_data(ril_cell_info_cast(info),
+				SIGNAL_CELLS_CHANGED_NAME,
+				G_CALLBACK(ril_cell_info_cells_changed_cb),
+				data, ril_cell_info_cells_disconnect_notify,
+				G_CONNECT_AFTER);
+	} else {
+		return 0;
+	}
+}
+
+static void ril_cell_info_remove_handler_proc(struct sailfish_cell_info *info,
+								gulong id)
+{
+	if (G_LIKELY(id)) {
+		g_signal_handler_disconnect(ril_cell_info_cast(info), id);
+	}
+}
+
+struct sailfish_cell_info *ril_cell_info_new(GRilIoChannel *io,
+		const char *log_prefix, MceDisplay *display,
+		struct ril_radio *radio, struct ril_sim_card *sim_card)
+{
+	static const struct sailfish_cell_info_proc ril_cell_info_proc = {
+		ril_cell_info_ref_proc,
+		ril_cell_info_unref_proc,
+		ril_cell_info_add_cells_changed_handler_proc,
+		ril_cell_info_remove_handler_proc
+	};
+
+	struct ril_cell_info *self = g_object_new(RIL_CELL_INFO_TYPE, 0);
+
+	self->info.proc = &ril_cell_info_proc;
+	self->io = grilio_channel_ref(io);
+	self->display = mce_display_ref(display);
+	self->radio = ril_radio_ref(radio);
+	self->sim_card = ril_sim_card_ref(sim_card);
+	self->log_prefix = (log_prefix && log_prefix[0]) ?
+		g_strconcat(log_prefix, " ", NULL) : g_strdup("");
+	DBG_(self, "");
+	self->event_id = grilio_channel_add_unsol_event_handler(self->io,
+		ril_cell_info_list_changed_cb, RIL_UNSOL_CELL_INFO_LIST, self);
+	self->display_state_event_id =
+		mce_display_add_state_changed_handler(display,
+			ril_cell_info_display_state_cb, self);
+	self->radio_state_event_id =
+		ril_radio_add_state_changed_handler(radio,
+			ril_cell_info_radio_state_cb, self);
+	self->sim_status_event_id =
+		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);
+	ril_cell_info_refresh(self);
+	ril_cell_info_update_rate(self);
+	return &self->info;
+}
+
+static void ril_cell_info_init(struct ril_cell_info *self)
+{
+}
+
+static void ril_cell_info_dispose(GObject *object)
+{
+	struct ril_cell_info *self = RIL_CELL_INFO(object);
+
+	grilio_channel_remove_handlers(self->io, &self->event_id, 1);
+	if (self->query_id) {
+		grilio_channel_cancel_request(self->io, self->query_id, FALSE);
+		self->query_id = 0;
+	}
+	if (self->set_rate_id) {
+		grilio_channel_cancel_request(self->io, self->set_rate_id,
+									FALSE);
+		self->set_rate_id = 0;
+	}
+	gutil_disconnect_handlers(self->display,
+					&self->display_state_event_id, 1);
+	ril_radio_remove_handlers(self->radio, &self->radio_state_event_id, 1);
+	ril_sim_card_remove_handlers(self->sim_card,
+					&self->sim_status_event_id, 1);
+	G_OBJECT_CLASS(ril_cell_info_parent_class)->dispose(object);
+}
+
+static void ril_cell_info_finalize(GObject *object)
+{
+	struct ril_cell_info *self = RIL_CELL_INFO(object);
+
+	DBG_(self, "");
+	g_free(self->log_prefix);
+	grilio_channel_unref(self->io);
+	mce_display_unref(self->display);
+	ril_radio_unref(self->radio);
+	ril_sim_card_unref(self->sim_card);
+	g_slist_free_full(self->info.cells, ril_cell_free1);
+	G_OBJECT_CLASS(ril_cell_info_parent_class)->finalize(object);
+}
+
+static void ril_cell_info_class_init(RilCellInfoClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+	object_class->dispose = ril_cell_info_dispose;
+	object_class->finalize = ril_cell_info_finalize;
+	ril_cell_info_signals[SIGNAL_CELLS_CHANGED] =
+		g_signal_new(SIGNAL_CELLS_CHANGED_NAME,
+			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
+			0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_cell_info.h

@@ -0,0 +1,35 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_CELL_INFO_H
+#define RIL_CELL_INFO_H
+
+#include "ril_types.h"
+#include <mce_display.h>
+#include <sailfish_cell_info.h>
+
+struct sailfish_cell_info *ril_cell_info_new(GRilIoChannel *io,
+		const char *log_prefix, MceDisplay *display,
+		struct ril_radio *radio, struct ril_sim_card *sim_card);
+
+#endif /* RIL_CELL_INFO_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_config.c

@@ -0,0 +1,232 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_config.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include <gutil_intarray.h>
+#include <gutil_ints.h>
+
+/* Utilities for parsing ril_subscription.conf */
+
+char *ril_config_get_string(GKeyFile *file, const char *group, const char *key)
+{
+	char *val = g_key_file_get_string(file, group, key, NULL);
+
+	if (!val && strcmp(group, RILCONF_SETTINGS_GROUP)) {
+		/* Check the common section */
+		val = g_key_file_get_string(file, RILCONF_SETTINGS_GROUP, key,
+									NULL);
+	}
+	return val;
+}
+
+char **ril_config_get_strings(GKeyFile *file, const char *group,
+					const char *key, char delimiter)
+{
+	char *str = ril_config_get_string(file, group, key);
+
+	if (str) {
+		char **strv, **p;
+		char delimiter_str[2];
+
+		delimiter_str[0] = delimiter;
+		delimiter_str[1] = 0;
+		strv = g_strsplit(str, delimiter_str, -1);
+
+		/* Strip whitespaces */
+		for (p = strv; *p; p++) {
+			*p = g_strstrip(*p);
+		}
+
+		g_free(str);
+		return strv;
+	}
+
+	return NULL;
+}
+
+gboolean ril_config_get_integer(GKeyFile *file, const char *group,
+					const char *key, int *out_value)
+{
+	GError *error = NULL;
+	int value = g_key_file_get_integer(file, group, key, &error);
+
+	if (!error) {
+		if (out_value) {
+			*out_value = value;
+		}
+		return TRUE;
+	} else {
+		g_error_free(error);
+		if (strcmp(group, RILCONF_SETTINGS_GROUP)) {
+			/* Check the common section */
+			error = NULL;
+			value = g_key_file_get_integer(file,
+					RILCONF_SETTINGS_GROUP, key, &error);
+			if (!error) {
+				if (out_value) {
+					*out_value = value;
+				}
+				return TRUE;
+			}
+			g_error_free(error);
+		}
+		return FALSE;
+	}
+}
+
+gboolean ril_config_get_boolean(GKeyFile *file, const char *group,
+					const char *key, gboolean *out_value)
+{
+	GError *error = NULL;
+	gboolean value = g_key_file_get_boolean(file, group, key, &error);
+
+	if (!error) {
+		if (out_value) {
+			*out_value = value;
+		}
+		return TRUE;
+	} else {
+		g_error_free(error);
+		if (strcmp(group, RILCONF_SETTINGS_GROUP)) {
+			/* Check the common section */
+			error = NULL;
+			value = g_key_file_get_boolean(file,
+					RILCONF_SETTINGS_GROUP, key, &error);
+			if (!error) {
+				if (out_value) {
+					*out_value = value;
+				}
+				return TRUE;
+			}
+			g_error_free(error);
+		}
+		return FALSE;
+	}
+}
+
+gboolean ril_config_get_flag(GKeyFile *file, const char *group,
+					const char *key, int flag, int *flags)
+{
+	gboolean value;
+
+	if (ril_config_get_boolean(file, group, key, &value)) {
+		if (value) {
+			*flags |= flag;
+		} else {
+			*flags &= ~flag;
+		}
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
+gboolean ril_config_get_enum(GKeyFile *file, const char *group,
+					const char *key, int *result,
+					const char *name, int value, ...)
+{
+	char *str = ril_config_get_string(file, group, key);
+
+	if (str) {
+		/*
+		 * Some people are thinking that # is a comment
+		 * anywhere on the line, not just at the beginning
+		 */
+		char *comment = strchr(str, '#');
+
+		if (comment) *comment = 0;
+		g_strstrip(str);
+		if (strcasecmp(str, name)) {
+			va_list args;
+			va_start(args, value);
+			while ((name = va_arg(args, char*)) != NULL) {
+				value = va_arg(args, int);
+				if (!strcasecmp(str, name)) {
+					break;
+				}
+			}
+			va_end(args);
+		}
+
+		if (!name) {
+			ofono_error("Invalid %s config value (%s)", key, str);
+		}
+
+		g_free(str);
+
+		if (name) {
+			if (result) {
+				*result = value;
+			}
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+GUtilInts *ril_config_get_ints(GKeyFile *file, const char *group,
+					const char *key)
+{
+	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();
+
+		while (*ptr) {
+			int val;
+
+			if (ril_parse_int(*ptr++, 0, &val)) {
+				gutil_int_array_append(array, val);
+			}
+		}
+
+		g_free(value);
+		g_strfreev(values);
+		return gutil_int_array_free_to_ints(array);
+	}
+	return NULL;
+}
+
+char *ril_config_ints_to_string(GUtilInts *ints, char separator)
+{
+	if (ints) {
+		guint i, n;
+		const int *data = gutil_ints_get_data(ints, &n);
+		GString *buf = g_string_new(NULL);
+
+		for (i=0; i<n; i++) {
+			if (buf->len > 0) {
+				g_string_append_c(buf, separator);
+			}
+			g_string_append_printf(buf, "%d", data[i]);
+		}
+		return g_string_free(buf, FALSE);
+	}
+	return NULL;
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_config.h

@@ -0,0 +1,50 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_CONFIG_H
+#define RIL_CONFIG_H
+
+#include "ril_types.h"
+
+/* Utilities for parsing ril_subscription.conf */
+
+#define RILCONF_SETTINGS_GROUP      "Settings"
+
+char *ril_config_get_string(GKeyFile *file, const char *group,
+					const char *key);
+char **ril_config_get_strings(GKeyFile *file, const char *group,
+			      const char *key, char delimiter);
+gboolean ril_config_get_integer(GKeyFile *file, const char *group,
+					const char *key, int *value);
+gboolean ril_config_get_boolean(GKeyFile *file, const char *group,
+					const char *key, gboolean *value);
+gboolean ril_config_get_flag(GKeyFile *file, const char *group,
+					const char *key, int flag, int *flags);
+gboolean ril_config_get_enum(GKeyFile *file, const char *group,
+					const char *key, int *result,
+					const char *name, int value, ...);
+GUtilInts *ril_config_get_ints(GKeyFile *file, const char *group,
+					const char *key);
+char *ril_config_ints_to_string(GUtilInts *ints, char separator);
+
+#endif /* RIL_CONFIG_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_constants.h

@@ -0,0 +1,599 @@
+/*
+ *  RIL constants adopted from AOSP's header:
+ *
+ *  /hardware/ril/reference_ril/ril.h
+ *
+ *  Copyright (C) 2013 Canonical Ltd.
+ *  Copyright (C) 2013-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef __RIL_CONSTANTS_H
+#define __RIL_CONSTANTS_H 1
+
+#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,
+	RADIO_STATE_UNAVAILABLE           = 1,
+	RADIO_STATE_SIM_NOT_READY         = 2,
+	RADIO_STATE_SIM_LOCKED_OR_ABSENT  = 3,
+	RADIO_STATE_SIM_READY             = 4,
+	RADIO_STATE_RUIM_NOT_READY        = 5,
+	RADIO_STATE_RUIM_READY            = 6,
+	RADIO_STATE_RUIM_LOCKED_OR_ABSENT = 7,
+	RADIO_STATE_NV_NOT_READY          = 8,
+	RADIO_STATE_NV_READY              = 9,
+	RADIO_STATE_ON                    = 10
+};
+
+/* Preferred network types */
+enum ril_pref_net_type {
+	PREF_NET_TYPE_GSM_WCDMA                 = 0,
+	PREF_NET_TYPE_GSM_ONLY                  = 1,
+	PREF_NET_TYPE_WCDMA                     = 2,
+	PREF_NET_TYPE_GSM_WCDMA_AUTO            = 3,
+	PREF_NET_TYPE_CDMA_EVDO_AUTO            = 4,
+	PREF_NET_TYPE_CDMA_ONLY                 = 5,
+	PREF_NET_TYPE_EVDO_ONLY                 = 6,
+	PREF_NET_TYPE_GSM_WCDMA_CDMA_EVDO_AUTO  = 7,
+	PREF_NET_TYPE_LTE_CDMA_EVDO             = 8,
+	PREF_NET_TYPE_LTE_GSM_WCDMA             = 9,
+	PREF_NET_TYPE_LTE_CMDA_EVDO_GSM_WCDMA   = 10,
+	PREF_NET_TYPE_LTE_ONLY                  = 11,
+	PREF_NET_TYPE_LTE_WCDMA                 = 12
+};
+
+/* Radio technologies */
+enum ril_radio_tech {
+	RADIO_TECH_UNKNOWN  = 0,
+	RADIO_TECH_GPRS     = 1,
+	RADIO_TECH_EDGE     = 2,
+	RADIO_TECH_UMTS     = 3,
+	RADIO_TECH_IS95A    = 4,
+	RADIO_TECH_IS95B    = 5,
+	RADIO_TECH_1xRTT    = 6,
+	RADIO_TECH_EVDO_0   = 7,
+	RADIO_TECH_EVDO_A   = 8,
+	RADIO_TECH_HSDPA    = 9,
+	RADIO_TECH_HSUPA    = 10,
+	RADIO_TECH_HSPA     = 11,
+	RADIO_TECH_EVDO_B   = 12,
+	RADIO_TECH_EHRPD    = 13,
+	RADIO_TECH_LTE      = 14,
+	RADIO_TECH_HSPAP    = 15,
+	RADIO_TECH_GSM      = 16,
+	RADIO_TECH_TD_SCDMA = 17,
+	RADIO_TECH_IWLAN    = 18,
+	RADIO_TECH_LTE_CA   = 19
+};
+
+/* Radio capabilities */
+enum ril_radio_access_family {
+	RAF_GPRS     = (1 << RADIO_TECH_GPRS),
+	RAF_EDGE     = (1 << RADIO_TECH_EDGE),
+	RAF_UMTS     = (1 << RADIO_TECH_UMTS),
+	RAF_IS95A    = (1 << RADIO_TECH_IS95A),
+	RAF_IS95B    = (1 << RADIO_TECH_IS95B),
+	RAF_1xRTT    = (1 << RADIO_TECH_1xRTT),
+	RAF_EVDO_0   = (1 << RADIO_TECH_EVDO_0),
+	RAF_EVDO_A   = (1 << RADIO_TECH_EVDO_A),
+	RAF_HSDPA    = (1 << RADIO_TECH_HSDPA),
+	RAF_HSUPA    = (1 << RADIO_TECH_HSUPA),
+	RAF_HSPA     = (1 << RADIO_TECH_HSPA),
+	RAF_EVDO_B   = (1 << RADIO_TECH_EVDO_B),
+	RAF_EHRPD    = (1 << RADIO_TECH_EHRPD),
+	RAF_LTE      = (1 << RADIO_TECH_LTE),
+	RAF_HSPAP    = (1 << RADIO_TECH_HSPAP),
+	RAF_GSM      = (1 << RADIO_TECH_GSM),
+	RAF_TD_SCDMA = (1 << RADIO_TECH_TD_SCDMA),
+	RAF_LTE_CA   = (1 << RADIO_TECH_LTE_CA)
+};
+
+enum ril_radio_capability_phase {
+	RC_PHASE_CONFIGURED = 0,
+	RC_PHASE_START      = 1,
+	RC_PHASE_APPLY      = 2,
+	RC_PHASE_UNSOL_RSP  = 3,
+	RC_PHASE_FINISH     = 4
+};
+
+enum ril_radio_capability_status {
+	RC_STATUS_NONE      = 0,
+	RC_STATUS_SUCCESS   = 1,
+	RC_STATUS_FAIL      = 2
+};
+
+#define RIL_RADIO_CAPABILITY_VERSION 1
+
+struct ril_radio_capability {
+	int version;
+	int session;
+	enum ril_radio_capability_phase phase;
+	enum ril_radio_access_family rat;
+	char logicalModemUuid[RIL_MAX_UUID_LENGTH];
+	int status;
+};
+
+enum ril_uicc_subscription_action {
+	RIL_UICC_SUBSCRIPTION_DEACTIVATE = 0,
+	RIL_UICC_SUBSCRIPTION_ACTIVATE = 1
+};
+
+/* See RIL_REQUEST_LAST_CALL_FAIL_CAUSE */
+enum ril_call_fail_cause {
+	CALL_FAIL_UNOBTAINABLE_NUMBER = 1,
+	CALL_FAIL_NO_ROUTE_TO_DESTINATION = 3,
+	CALL_FAIL_CHANNEL_UNACCEPTABLE = 6,
+	CALL_FAIL_OPERATOR_DETERMINED_BARRING = 8,
+	CALL_FAIL_NORMAL = 16,
+	CALL_FAIL_BUSY = 17,
+	CALL_FAIL_NO_USER_RESPONDING = 18,
+	CALL_FAIL_NO_ANSWER_FROM_USER = 19,
+	CALL_FAIL_CALL_REJECTED = 21,
+	CALL_FAIL_NUMBER_CHANGED = 22,
+	CALL_FAIL_DESTINATION_OUT_OF_ORDER = 27,
+	CALL_FAIL_INVALID_NUMBER_FORMAT = 28,
+	CALL_FAIL_FACILITY_REJECTED = 29,
+	CALL_FAIL_RESP_TO_STATUS_ENQUIRY = 30,
+	CALL_FAIL_NORMAL_UNSPECIFIED = 31,
+	CALL_FAIL_CONGESTION = 34,
+	CALL_FAIL_NETWORK_OUT_OF_ORDER = 38,
+	CALL_FAIL_TEMPORARY_FAILURE = 41,
+	CALL_FAIL_SWITCHING_EQUIPMENT_CONGESTION = 42,
+	CALL_FAIL_ACCESS_INFORMATION_DISCARDED = 43,
+	CALL_FAIL_REQUESTED_CIRCUIT_OR_CHANNEL_NOT_AVAILABLE = 44,
+	CALL_FAIL_RESOURCES_UNAVAILABLE_OR_UNSPECIFIED = 47,
+	CALL_FAIL_QOS_UNAVAILABLE = 49,
+	CALL_FAIL_REQUESTED_FACILITY_NOT_SUBSCRIBED = 50,
+	CALL_FAIL_INCOMING_CALLS_BARRED_WITHIN_CUG = 55,
+	CALL_FAIL_BEARER_CAPABILITY_NOT_AUTHORIZED = 57,
+	CALL_FAIL_BEARER_CAPABILITY_UNAVAILABLE = 58,
+	CALL_FAIL_SERVICE_OPTION_NOT_AVAILABLE = 63,
+	CALL_FAIL_BEARER_SERVICE_NOT_IMPLEMENTED = 65,
+	CALL_FAIL_ACM_LIMIT_EXCEEDED = 68,
+	CALL_FAIL_REQUESTED_FACILITY_NOT_IMPLEMENTED = 69,
+	CALL_FAIL_ONLY_DIGITAL_INFORMATION_BEARER_AVAILABLE = 70,
+	CALL_FAIL_SERVICE_OR_OPTION_NOT_IMPLEMENTED = 79,
+	CALL_FAIL_INVALID_TRANSACTION_IDENTIFIER = 81,
+	CALL_FAIL_USER_NOT_MEMBER_OF_CUG = 87,
+	CALL_FAIL_INCOMPATIBLE_DESTINATION = 88,
+	CALL_FAIL_INVALID_TRANSIT_NW_SELECTION = 91,
+	CALL_FAIL_SEMANTICALLY_INCORRECT_MESSAGE = 95,
+	CALL_FAIL_INVALID_MANDATORY_INFORMATION = 96,
+	CALL_FAIL_MESSAGE_TYPE_NON_IMPLEMENTED = 97,
+	CALL_FAIL_MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 98,
+	CALL_FAIL_INFORMATION_ELEMENT_NON_EXISTENT = 99,
+	CALL_FAIL_CONDITIONAL_IE_ERROR = 100,
+	CALL_FAIL_MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 101,
+	CALL_FAIL_RECOVERY_ON_TIMER_EXPIRED = 102,
+	CALL_FAIL_PROTOCOL_ERROR_UNSPECIFIED = 111,
+	CALL_FAIL_INTERWORKING_UNSPECIFIED = 127,
+	CALL_FAIL_CALL_BARRED = 240,
+	CALL_FAIL_FDN_BLOCKED = 241,
+	CALL_FAIL_IMSI_UNKNOWN_IN_VLR = 242,
+	CALL_FAIL_IMEI_NOT_ACCEPTED = 243,
+	CALL_FAIL_DIAL_MODIFIED_TO_USSD = 244,
+	CALL_FAIL_DIAL_MODIFIED_TO_SS = 245,
+	CALL_FAIL_DIAL_MODIFIED_TO_DIAL = 246,
+	CALL_FAIL_ERROR_UNSPECIFIED = 0xffff,
+
+/* Not defined in ril.h but valid 3GPP specific cause values
+ * for call control. See 3GPP TS 24.008 Annex H. */
+	CALL_FAIL_ANONYMOUS_CALL_REJECTION = 24,
+	CALL_FAIL_PRE_EMPTION = 25
+};
+
+enum ril_data_call_fail_cause {
+    PDP_FAIL_NONE = 0,
+    PDP_FAIL_OPERATOR_BARRED = 0x08,
+    PDP_FAIL_INSUFFICIENT_RESOURCES = 0x1A,
+    PDP_FAIL_MISSING_UKNOWN_APN = 0x1B,
+    PDP_FAIL_UNKNOWN_PDP_ADDRESS_TYPE = 0x1C,
+    PDP_FAIL_USER_AUTHENTICATION = 0x1D,
+    PDP_FAIL_ACTIVATION_REJECT_GGSN = 0x1E,
+    PDP_FAIL_ACTIVATION_REJECT_UNSPECIFIED = 0x1F,
+    PDP_FAIL_SERVICE_OPTION_NOT_SUPPORTED = 0x20,
+    PDP_FAIL_SERVICE_OPTION_NOT_SUBSCRIBED = 0x21,
+    PDP_FAIL_SERVICE_OPTION_OUT_OF_ORDER = 0x22,
+    PDP_FAIL_NSAPI_IN_USE = 0x23,
+    PDP_FAIL_REGULAR_DEACTIVATION = 0x24,
+    PDP_FAIL_ONLY_IPV4_ALLOWED = 0x32,
+    PDP_FAIL_ONLY_IPV6_ALLOWED = 0x33,
+    PDP_FAIL_ONLY_SINGLE_BEARER_ALLOWED = 0x34,
+    PDP_FAIL_PROTOCOL_ERRORS = 0x6F,
+    PDP_FAIL_VOICE_REGISTRATION_FAIL = -1,
+    PDP_FAIL_DATA_REGISTRATION_FAIL = -2,
+    PDP_FAIL_SIGNAL_LOST = -3,
+    PDP_FAIL_PREF_RADIO_TECH_CHANGED = -4,
+    PDP_FAIL_RADIO_POWER_OFF = -5,
+    PDP_FAIL_TETHERED_CALL_ACTIVE = -6,
+    PDP_FAIL_ERROR_UNSPECIFIED = 0xffff
+};
+
+/* RIL_REQUEST_DEACTIVATE_DATA_CALL parameter */
+#define RIL_DEACTIVATE_DATA_CALL_NO_REASON 0
+#define RIL_DEACTIVATE_DATA_CALL_RADIO_SHUTDOWN 1
+
+/* RIL_REQUEST_SETUP_DATA_CALL */
+enum ril_data_profile {
+	RIL_DATA_PROFILE_DEFAULT = 0,
+	RIL_DATA_PROFILE_TETHERED = 1,
+	RIL_DATA_PROFILE_IMS = 2,
+	RIL_DATA_PROFILE_FOTA = 3,
+	RIL_DATA_PROFILE_CBS = 4,
+	RIL_DATA_PROFILE_OEM_BASE = 1000,
+	RIL_DATA_PROFILE_INVALID = 0xFFFFFFFF
+};
+
+enum ril_auth {
+	RIL_AUTH_NONE = 0,
+	RIL_AUTH_PAP = 1,
+	RIL_AUTH_CHAP = 2,
+	RIL_AUTH_BOTH = 3
+};
+
+#define RIL_CARD_MAX_APPS 8
+
+/* SIM card states */
+enum ril_card_state {
+	RIL_CARDSTATE_UNKNOWN = -1,
+	RIL_CARDSTATE_ABSENT  = 0,
+	RIL_CARDSTATE_PRESENT = 1,
+	RIL_CARDSTATE_ERROR   = 2
+};
+
+/* SIM personalization substates */
+enum ril_perso_substate {
+	RIL_PERSOSUBSTATE_UNKNOWN                   = 0,
+	RIL_PERSOSUBSTATE_IN_PROGRESS               = 1,
+	RIL_PERSOSUBSTATE_READY                     = 2,
+	RIL_PERSOSUBSTATE_SIM_NETWORK               = 3,
+	RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET        = 4,
+	RIL_PERSOSUBSTATE_SIM_CORPORATE             = 5,
+	RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER      = 6,
+	RIL_PERSOSUBSTATE_SIM_SIM                   = 7,
+	RIL_PERSOSUBSTATE_SIM_NETWORK_PUK           = 8,
+	RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK    = 9,
+	RIL_PERSOSUBSTATE_SIM_CORPORATE_PUK         = 10,
+	RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK  = 11,
+	RIL_PERSOSUBSTATE_SIM_SIM_PUK               = 12,
+	RIL_PERSOSUBSTATE_RUIM_NETWORK1             = 13,
+	RIL_PERSOSUBSTATE_RUIM_NETWORK2             = 14,
+	RIL_PERSOSUBSTATE_RUIM_HRPD                 = 15,
+	RIL_PERSOSUBSTATE_RUIM_CORPORATE            = 16,
+	RIL_PERSOSUBSTATE_RUIM_SERVICE_PROVIDER     = 17,
+	RIL_PERSOSUBSTATE_RUIM_RUIM                 = 18,
+	RIL_PERSOSUBSTATE_RUIM_NETWORK1_PUK         = 19,
+	RIL_PERSOSUBSTATE_RUIM_NETWORK2_PUK         = 20,
+	RIL_PERSOSUBSTATE_RUIM_HRPD_PUK             = 21,
+	RIL_PERSOSUBSTATE_RUIM_CORPORATE_PUK        = 22,
+	RIL_PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_PUK = 23,
+	RIL_PERSOSUBSTATE_RUIM_RUIM_PUK             = 24
+};
+
+/* SIM - App states */
+enum ril_app_state {
+	RIL_APPSTATE_ILLEGAL            = -1,
+	RIL_APPSTATE_UNKNOWN            = 0,
+	RIL_APPSTATE_DETECTED           = 1,
+	RIL_APPSTATE_PIN                = 2,
+	RIL_APPSTATE_PUK                = 3,
+	RIL_APPSTATE_SUBSCRIPTION_PERSO = 4,
+	RIL_APPSTATE_READY              = 5
+};
+
+/* SIM - PIN states */
+enum ril_pin_state {
+	RIL_PINSTATE_UNKNOWN              = 0,
+	RIL_PINSTATE_ENABLED_NOT_VERIFIED = 1,
+	RIL_PINSTATE_ENABLED_VERIFIED     = 2,
+	RIL_PINSTATE_DISABLED             = 3,
+	RIL_PINSTATE_ENABLED_BLOCKED      = 4,
+	RIL_PINSTATE_ENABLED_PERM_BLOCKED = 5
+};
+
+/* SIM - App types */
+enum ril_app_type {
+	RIL_APPTYPE_UNKNOWN = 0,
+	RIL_APPTYPE_SIM     = 1,
+	RIL_APPTYPE_USIM    = 2,
+	RIL_APPTYPE_RUIM    = 3,
+	RIL_APPTYPE_CSIM    = 4,
+	RIL_APPTYPE_ISIM    = 5
+};
+
+/* Cell info */
+enum ril_cell_info_type {
+	RIL_CELL_INFO_TYPE_NONE     = 0,
+	RIL_CELL_INFO_TYPE_GSM      = 1,
+	RIL_CELL_INFO_TYPE_CDMA     = 2,
+	RIL_CELL_INFO_TYPE_LTE      = 3,
+	RIL_CELL_INFO_TYPE_WCDMA    = 4,
+	RIL_CELL_INFO_TYPE_TD_SCDMA = 5
+};
+
+/* 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
+
+/* Suplementary services Service class*/
+#define SERVICE_CLASS_NONE 0
+
+/* RIL_FACILITY_LOCK parameters */
+#define RIL_FACILITY_UNLOCK "0"
+#define RIL_FACILITY_LOCK "1"
+
+#endif /*__RIL_CONSTANTS_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_data.h

@@ -0,0 +1,143 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_DATA_H
+#define RIL_DATA_H
+
+#include "ril_types.h"
+#include <ofono/gprs-context.h>
+
+enum ril_data_call_active {
+	RIL_DATA_CALL_INACTIVE = 0,
+	RIL_DATA_CALL_LINK_DOWN = 1,
+	RIL_DATA_CALL_ACTIVE = 2
+};
+
+struct ril_data_call {
+	int cid;
+	enum ril_data_call_fail_cause status;
+	enum ril_data_call_active active;
+	enum ofono_gprs_proto prot;
+	int retry_time;
+	int mtu;
+	char *ifname;
+	char **dnses;
+	char **gateways;
+	char **addresses;
+};
+
+struct ril_data_call_list {
+	guint version;
+	guint num;
+	GSList *calls;
+};
+
+struct ril_data {
+	GObject object;
+	struct ril_data_priv *priv;
+	struct ril_data_call_list *data_calls;
+};
+
+enum ril_data_manager_flags {
+	RIL_DATA_MANAGER_3GLTE_HANDOVER = 0x01
+};
+
+enum ril_data_allow_data_opt {
+	RIL_ALLOW_DATA_AUTO,
+	RIL_ALLOW_DATA_ENABLED,
+	RIL_ALLOW_DATA_DISABLED
+};
+
+enum ril_data_call_format {
+	RIL_DATA_CALL_FORMAT_AUTO,
+	RIL_DATA_CALL_FORMAT_6 = 6,
+	RIL_DATA_CALL_FORMAT_9 = 9,
+	RIL_DATA_CALL_FORMAT_11 = 11
+};
+
+struct ril_data_options {
+	enum ril_data_allow_data_opt allow_data;
+	enum ril_data_call_format data_call_format;
+	unsigned int data_call_retry_limit;
+	unsigned int data_call_retry_delay_ms;
+};
+
+enum ril_data_role {
+	RIL_DATA_ROLE_NONE,    /* Data not allowed */
+	RIL_DATA_ROLE_MMS,     /* Data is allowed at any speed */
+	RIL_DATA_ROLE_INTERNET /* Data is allowed at full speed */
+};
+
+struct ril_data_manager;
+struct ril_data_manager *ril_data_manager_new(enum ril_data_manager_flags flg);
+struct ril_data_manager *ril_data_manager_ref(struct ril_data_manager *dm);
+void ril_data_manager_unref(struct ril_data_manager *dm);
+void ril_data_manager_assert_data_on(struct ril_data_manager *dm);
+
+typedef void (*ril_data_cb_t)(struct ril_data *data, void *arg);
+typedef void (*ril_data_call_setup_cb_t)(struct ril_data *data,
+			int ril_status, const struct ril_data_call *call,
+			void *arg);
+typedef void (*ril_data_call_deactivate_cb_t)(struct ril_data *data,
+			int ril_status, void *arg);
+
+struct ril_data *ril_data_new(struct ril_data_manager *dm, const char *name,
+		struct ril_radio *radio, struct ril_network *network,
+		GRilIoChannel *io, const struct ril_data_options *options,
+		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);
+void ril_data_poll_call_state(struct ril_data *data);
+
+gulong ril_data_add_allow_changed_handler(struct ril_data *data,
+					ril_data_cb_t cb, void *arg);
+gulong ril_data_add_calls_changed_handler(struct ril_data *data,
+					ril_data_cb_t cb, void *arg);
+void ril_data_remove_handler(struct ril_data *data, gulong id);
+
+void ril_data_allow(struct ril_data *data, enum ril_data_role role);
+
+struct ril_data_request;
+struct ril_data_request *ril_data_call_setup(struct ril_data *data,
+				const struct ofono_gprs_primary_context *ctx,
+				ril_data_call_setup_cb_t cb, void *arg);
+struct ril_data_request *ril_data_call_deactivate(struct ril_data *data,
+			int cid, ril_data_call_deactivate_cb_t cb, void *arg);
+void ril_data_request_detach(struct ril_data_request *req);
+void ril_data_request_cancel(struct ril_data_request *req);
+
+void ril_data_call_free(struct ril_data_call *call);
+struct ril_data_call *ril_data_call_dup(const struct ril_data_call *call);
+struct ril_data_call *ril_data_call_find(struct ril_data_call_list *list,
+								int cid);
+
+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);
+
+#endif /* RIL_DATA_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_devinfo.c

@@ -0,0 +1,225 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include <gutil_idlequeue.h>
+
+/*
+ * TODO: No public RIL api to query manufacturer or model.
+ * Check where to get, could /system/build.prop be updated to have good values?
+ */
+
+enum ril_devinfo_cb_tag {
+	DEVINFO_QUERY_SERIAL = 1,
+	DEVINFO_QUERY_SVN
+};
+
+struct ril_devinfo {
+	struct ofono_devinfo *info;
+	GRilIoQueue *q;
+	GUtilIdleQueue *iq;
+	char *log_prefix;
+	char *imeisv;
+	char *imei;
+};
+
+struct ril_devinfo_cbd {
+	struct ril_devinfo *di;
+	ofono_devinfo_query_cb_t cb;
+	gpointer data;
+};
+
+#define DBG_(self,fmt,args...) DBG("%s" fmt, (self)->log_prefix, ##args)
+#define ril_devinfo_cbd_free g_free
+
+static inline struct ril_devinfo *ril_devinfo_get_data(
+					struct ofono_devinfo *info)
+{
+	return ofono_devinfo_get_data(info);
+}
+
+struct ril_devinfo_cbd *ril_devinfo_cbd_new(struct ril_devinfo *di,
+				ofono_devinfo_query_cb_t cb, void *data)
+{
+	struct ril_devinfo_cbd *cbd = g_new0(struct ril_devinfo_cbd, 1);
+
+	cbd->di = di;
+	cbd->cb = cb;
+	cbd->data = data;
+	return cbd;
+}
+
+static void ril_devinfo_query_unsupported(struct ofono_devinfo *info,
+			ofono_devinfo_query_cb_t cb, void *data)
+{
+	struct ofono_error error;
+	cb(ril_error_failure(&error), "", data);
+}
+
+static void ril_devinfo_query_revision_cb(GRilIoChannel *io, int status,
+			const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_devinfo_cbd *cbd = user_data;
+
+	if (status == RIL_E_SUCCESS) {
+		char *res;
+		GRilIoParser rilp;
+		grilio_parser_init(&rilp, data, len);
+		res = grilio_parser_get_utf8(&rilp);
+		DBG_(cbd->di, "%s", res);
+		cbd->cb(ril_error_ok(&error), res ? res : "", cbd->data);
+		g_free(res);
+	} else {
+		cbd->cb(ril_error_failure(&error), NULL, cbd->data);
+	}
+}
+
+static void ril_devinfo_query_revision(struct ofono_devinfo *info,
+				ofono_devinfo_query_cb_t cb, void *data)
+{
+	struct ril_devinfo *di = ril_devinfo_get_data(info);
+
+	DBG_(di, "");
+	grilio_queue_send_request_full(di->q, NULL,
+				RIL_REQUEST_BASEBAND_VERSION,
+				ril_devinfo_query_revision_cb,
+				ril_devinfo_cbd_free,
+				ril_devinfo_cbd_new(di, cb, data));
+}
+
+static void ril_devinfo_query_serial_cb(gpointer user_data)
+{
+	struct ril_devinfo_cbd *cbd = user_data;
+	struct ril_devinfo *di = cbd->di;
+	struct ofono_error error;
+
+	DBG_(di, "%s", di->imei);
+	cbd->cb(ril_error_ok(&error), di->imei, cbd->data);
+}
+
+static void ril_devinfo_query_svn_cb(gpointer user_data)
+{
+	struct ril_devinfo_cbd *cbd = user_data;
+	struct ril_devinfo *di = cbd->di;
+	struct ofono_error error;
+
+	DBG_(di, "%s", di->imeisv);
+	if (di->imeisv && di->imeisv[0]) {
+		cbd->cb(ril_error_ok(&error), di->imeisv, cbd->data);
+	} else {
+		cbd->cb(ril_error_failure(&error), "", cbd->data);
+	}
+}
+
+static void ril_devinfo_query(struct ril_devinfo *di,
+			enum ril_devinfo_cb_tag tag, GUtilIdleFunc fn,
+			ofono_devinfo_query_cb_t cb, void *data)
+{
+	GVERIFY_FALSE(gutil_idle_queue_cancel_tag(di->iq, tag));
+	gutil_idle_queue_add_tag_full(di->iq, tag, fn,
+					ril_devinfo_cbd_new(di, cb, data),
+					ril_devinfo_cbd_free);
+}
+
+static void ril_devinfo_query_serial(struct ofono_devinfo *info,
+				ofono_devinfo_query_cb_t cb,
+				void *data)
+{
+	struct ril_devinfo *di = ril_devinfo_get_data(info);
+
+	DBG_(di, "");
+	ril_devinfo_query(di, DEVINFO_QUERY_SERIAL,
+				ril_devinfo_query_serial_cb, cb, data);
+}
+
+static void ril_devinfo_query_svn(struct ofono_devinfo *info,
+				ofono_devinfo_query_cb_t cb,
+				void *data)
+{
+	struct ril_devinfo *di = ril_devinfo_get_data(info);
+
+	DBG_(di, "");
+	ril_devinfo_query(di, DEVINFO_QUERY_SVN,
+				ril_devinfo_query_svn_cb, cb, data);
+}
+
+static void ril_devinfo_register(gpointer user_data)
+{
+	struct ril_devinfo *di = user_data;
+
+	DBG_(di, "");
+	ofono_devinfo_register(di->info);
+}
+
+static int ril_devinfo_probe(struct ofono_devinfo *info, unsigned int vendor,
+				void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_devinfo *di = g_new0(struct ril_devinfo, 1);
+
+	di->log_prefix = (modem->log_prefix && modem->log_prefix[0]) ?
+		g_strconcat(modem->log_prefix, " ", NULL) : g_strdup("");
+
+	DBG_(di, "%s", modem->imei);
+	GASSERT(modem->imei);
+
+	di->q = grilio_queue_new(ril_modem_io(modem));
+	di->info = info;
+	di->imeisv = g_strdup(modem->imeisv);
+	di->imei = g_strdup(modem->imei);
+	di->iq = gutil_idle_queue_new();
+	gutil_idle_queue_add(di->iq, ril_devinfo_register, di);
+	ofono_devinfo_set_data(info, di);
+	return 0;
+}
+
+static void ril_devinfo_remove(struct ofono_devinfo *info)
+{
+	struct ril_devinfo *di = ril_devinfo_get_data(info);
+
+	DBG_(di, "");
+	ofono_devinfo_set_data(info, NULL);
+	gutil_idle_queue_cancel_all(di->iq);
+	gutil_idle_queue_unref(di->iq);
+	grilio_queue_cancel_all(di->q, FALSE);
+	grilio_queue_unref(di->q);
+	g_free(di->log_prefix);
+	g_free(di->imeisv);
+	g_free(di->imei);
+	g_free(di);
+}
+
+const struct ofono_devinfo_driver ril_devinfo_driver = {
+	.name                   = RILMODEM_DRIVER,
+	.probe                  = ril_devinfo_probe,
+	.remove                 = ril_devinfo_remove,
+	/* query_revision won't be called if query_model is missing */
+	.query_model            = ril_devinfo_query_unsupported,
+	.query_revision         = ril_devinfo_query_revision,
+	.query_serial           = ril_devinfo_query_serial,
+	.query_svn              = ril_devinfo_query_svn
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_ecclist.c

@@ -0,0 +1,258 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_ecclist.h"
+#include "ril_log.h"
+
+#include <gutil_strv.h>
+#include <gutil_inotify.h>
+
+#include <sys/inotify.h>
+
+typedef GObjectClass RilEccListClass;
+typedef struct ril_ecclist RilEccList;
+
+struct ril_ecclist_priv {
+	struct ofono_sim *sim;
+	GUtilInotifyWatchCallback *dir_watch;
+	GUtilInotifyWatchCallback *file_watch;
+	char *dir;
+	char *path;
+	char *name;
+};
+
+enum ril_ecclist_signal {
+	SIGNAL_LIST_CHANGED,
+	SIGNAL_COUNT
+};
+
+#define SIGNAL_LIST_CHANGED_NAME        "ril-ecclist-changed"
+
+static guint ril_ecclist_signals[SIGNAL_COUNT] = { 0 };
+
+G_DEFINE_TYPE(RilEccList, ril_ecclist, G_TYPE_OBJECT)
+#define RIL_ECCLIST_TYPE (ril_ecclist_get_type())
+#define RIL_ECCLIST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
+	RIL_ECCLIST_TYPE, RilEccList))
+
+static char **ril_ecclist_read(struct ril_ecclist *self)
+{
+	struct ril_ecclist_priv *priv = self->priv;
+	char **list = NULL;
+
+	if (g_file_test(priv->path, G_FILE_TEST_EXISTS)) {
+		gsize len = 0;
+		gchar *content = NULL;
+		GError *error = NULL;
+
+		if (g_file_get_contents(priv->path, &content, &len, &error)) {
+			char **ptr;
+
+			DBG("%s = %s", priv->name, content);
+			list = g_strsplit(content, ",", 0);
+			for (ptr = list; *ptr; ptr++) {
+				*ptr = g_strstrip(*ptr);
+			}
+
+			gutil_strv_sort(list, TRUE);
+		} else if (error) {
+			DBG("%s: %s", priv->path, GERRMSG(error));
+			g_error_free(error);
+		}
+
+		g_free (content);
+	} else {
+		DBG("%s doesn't exist", priv->path);
+	}
+
+	return list;
+}
+
+static void ril_ecclist_update(struct ril_ecclist *self)
+{
+	struct ril_ecclist_priv *priv = self->priv;
+	char **list = ril_ecclist_read(self);
+
+	if (!gutil_strv_equal(self->list, list)) {
+		DBG("%s changed", priv->name);
+		g_strfreev(self->list);
+		self->list = list;
+		g_signal_emit(self, ril_ecclist_signals[SIGNAL_LIST_CHANGED], 0);
+	} else {
+		g_strfreev(list);
+	}
+}
+
+static void ril_ecclist_changed(GUtilInotifyWatch *watch, guint mask,
+			guint cookie, const char *name, void *user_data)
+{
+	struct ril_ecclist *self = RIL_ECCLIST(user_data);
+	struct ril_ecclist_priv *priv = self->priv;
+
+	ril_ecclist_update(self);
+
+	if (mask & IN_IGNORED) {
+		DBG("file %s is gone", priv->path);
+		gutil_inotify_watch_callback_free(priv->file_watch);
+		priv->file_watch = NULL;
+	}
+}
+
+static void ril_ecclist_dir_changed(GUtilInotifyWatch *watch, guint mask,
+			guint cookie, const char *name, void *user_data)
+{
+	struct ril_ecclist *self = RIL_ECCLIST(user_data);
+	struct ril_ecclist_priv *priv = self->priv;
+
+	DBG("0x%04x %s", mask, name);
+	if (!priv->file_watch && !g_strcmp0(name, priv->name)) {
+		priv->file_watch = gutil_inotify_watch_callback_new(priv->path,
+					IN_MODIFY | IN_CLOSE_WRITE,
+					ril_ecclist_changed, self);
+		if (priv->file_watch) {
+			DBG("watching %s", priv->path);
+			ril_ecclist_update(self);
+		}
+	}
+
+	if (mask & IN_IGNORED) {
+		DBG("%s is gone", priv->dir);
+		gutil_inotify_watch_callback_free(priv->dir_watch);
+		priv->dir_watch = NULL;
+	}
+}
+
+gulong ril_ecclist_add_list_changed_handler(struct ril_ecclist *self,
+					ril_ecclist_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_LIST_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+void ril_ecclist_remove_handler(struct ril_ecclist *self, gulong id)
+{
+	if (G_LIKELY(self) && G_LIKELY(id)) {
+		g_signal_handler_disconnect(self, id);
+	}
+}
+
+struct ril_ecclist *ril_ecclist_new(const char *path)
+{
+	if (path) {
+		struct ril_ecclist *self = g_object_new(RIL_ECCLIST_TYPE, 0);
+		struct ril_ecclist_priv *priv = self->priv;
+
+		DBG("%s", path);
+		priv->path = g_strdup(path);
+		priv->name = g_path_get_basename(path);
+		priv->dir = g_path_get_dirname(path);
+		priv->dir_watch = gutil_inotify_watch_callback_new(priv->dir,
+				IN_MODIFY|IN_MOVED_FROM|IN_MOVED_TO|IN_DELETE|
+				IN_CREATE|IN_DELETE_SELF|IN_CLOSE_WRITE,
+				ril_ecclist_dir_changed, self);
+		if (priv->dir_watch) {
+			DBG("watching %s", priv->dir);
+		}
+
+		self->list = ril_ecclist_read(self);
+		priv->file_watch = gutil_inotify_watch_callback_new(priv->path,
+				IN_MODIFY | IN_CLOSE_WRITE,
+				ril_ecclist_changed, self);
+		if (priv->file_watch) {
+			DBG("watching %s", priv->path);
+		}
+
+		return self;
+	}
+
+	return NULL;
+}
+
+struct ril_ecclist *ril_ecclist_ref(struct ril_ecclist *self)
+{
+	if (G_LIKELY(self)) {
+		g_object_ref(RIL_ECCLIST(self));
+		return self;
+	} else {
+		return NULL;
+	}
+}
+
+void ril_ecclist_unref(struct ril_ecclist *self)
+{
+	if (G_LIKELY(self)) {
+		g_object_unref(RIL_ECCLIST(self));
+	}
+}
+
+static void ril_ecclist_init(struct ril_ecclist *self)
+{
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, RIL_ECCLIST_TYPE,
+						struct ril_ecclist_priv);
+}
+
+static void ril_ecclist_dispose(GObject *object)
+{
+	struct ril_ecclist *self = RIL_ECCLIST(object);
+	struct ril_ecclist_priv *priv = self->priv;
+
+	if (priv->dir_watch) {
+		gutil_inotify_watch_callback_free(priv->dir_watch);
+		priv->dir_watch = NULL;
+	}
+
+	if (priv->file_watch) {
+		gutil_inotify_watch_callback_free(priv->file_watch);
+		priv->file_watch = NULL;
+	}
+
+	G_OBJECT_CLASS(ril_ecclist_parent_class)->dispose(object);
+}
+
+static void ril_ecclist_finalize(GObject *object)
+{
+	struct ril_ecclist *self = RIL_ECCLIST(object);
+	struct ril_ecclist_priv *priv = self->priv;
+
+	GASSERT(!priv->dir_watch);
+	GASSERT(!priv->file_watch);
+	g_free(priv->dir);
+	g_free(priv->path);
+	g_free(priv->name);
+	g_strfreev(self->list);
+
+	G_OBJECT_CLASS(ril_ecclist_parent_class)->finalize(object);
+}
+
+static void ril_ecclist_class_init(RilEccListClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+	object_class->dispose = ril_ecclist_dispose;
+	object_class->finalize = ril_ecclist_finalize;
+	g_type_class_add_private(klass, sizeof(struct ril_ecclist_priv));
+	ril_ecclist_signals[SIGNAL_LIST_CHANGED] =
+		g_signal_new(SIGNAL_LIST_CHANGED_NAME,
+			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
+			0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_ecclist.h

@@ -0,0 +1,46 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_ECCLIST_H
+#define RIL_ECCLIST_H
+
+#include "ril_types.h"
+
+struct ril_ecclist_priv;
+
+struct ril_ecclist {
+	GObject object;
+	struct ril_ecclist_priv *priv;
+	char **list;
+};
+
+typedef void (*ril_ecclist_cb_t)(struct ril_ecclist *ecc, void *arg);
+
+struct ril_ecclist *ril_ecclist_new(const char *path);
+struct ril_ecclist *ril_ecclist_ref(struct ril_ecclist *ecc);
+void ril_ecclist_unref(struct ril_ecclist *ecc);
+gulong ril_ecclist_add_list_changed_handler(struct ril_ecclist *ecc,
+					ril_ecclist_cb_t cb, void *arg);
+void ril_ecclist_remove_handler(struct ril_ecclist *ecc, gulong id);
+
+#endif /* RIL_ECCLIST_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_gprs.c

@@ -0,0 +1,283 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2016 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_network.h"
+#include "ril_data.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include "common.h"
+
+/*
+ * This module is the ofono_gprs_driver implementation for rilmodem.
+ *
+ * Notes:
+ *
+ * 1. ofono_gprs_suspend/resume() are not used by this module, as
+ *    the concept of suspended GPRS is not exposed by RILD.
+ *
+ * 2. ofono_gprs_bearer_notify() is never called as RILD does not
+ *    expose an unsolicited event equivalent to +CPSB ( see 27.007
+ *    7.29 ), and the tech values returned by REQUEST_DATA/VOICE
+ *    _REGISTRATION requests do not match the values defined for
+ *    <AcT> in the +CPSB definition.  Note, the values returned by
+ *    the *REGISTRATION commands are aligned with those defined by
+ *    +CREG ( see 27.003 7.2 ).
+ */
+
+struct ril_gprs {
+	struct ofono_gprs *gprs;
+	struct ril_modem *md;
+	struct ril_data *data;
+	struct ril_network *network;
+	GRilIoChannel *io;
+	GRilIoQueue *q;
+	gboolean attached;
+	int max_cids;
+	enum network_registration_status registration_status;
+	guint register_id;
+	gulong network_event_id;
+	gulong data_event_id;
+	guint set_attached_id;
+};
+
+struct ril_gprs_cbd {
+	struct ril_gprs *gd;
+	ofono_gprs_cb_t cb;
+	gpointer data;
+};
+
+#define ril_gprs_cbd_free g_free
+
+static struct ril_gprs *ril_gprs_get_data(struct ofono_gprs *ofono)
+{
+	return ofono ? ofono_gprs_get_data(ofono) : NULL;
+}
+
+static struct ril_gprs_cbd *ril_gprs_cbd_new(struct ril_gprs *gd,
+						ofono_gprs_cb_t cb, void *data)
+{
+	struct ril_gprs_cbd *cbd = g_new0(struct ril_gprs_cbd, 1);
+
+	cbd->gd = gd;
+	cbd->cb = cb;
+	cbd->data = data;
+	return cbd;
+}
+
+static enum network_registration_status ril_gprs_fix_registration_status(
+		struct ril_gprs *gd, enum network_registration_status status)
+{
+	if (!ril_data_allowed(gd->data)) {
+		return NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
+	} else {
+		/* TODO: need a way to make sure that SPDI information has
+		 * already been read from the SIM (i.e. sim_spdi_read_cb in
+		 * network.c has been called) */
+		struct ofono_netreg *netreg = ril_modem_ofono_netreg(gd->md);
+		return ril_netreg_check_if_really_roaming(netreg, status);
+	}
+}
+
+static void ril_gprs_data_update_registration_state(struct ril_gprs *gd)
+{
+	const enum network_registration_status status =
+		ril_gprs_fix_registration_status(gd, gd->network->data.status);
+
+	if (gd->registration_status != status) {
+		ofono_info("data reg changed %d -> %d (%s), attached %d",
+				gd->registration_status, status,
+				registration_status_to_string(status),
+				gd->attached);
+		gd->registration_status = status;
+		ofono_gprs_status_notify(gd->gprs, gd->registration_status);
+	}
+}
+
+static void ril_gprs_check_data_allowed(struct ril_gprs *gd)
+{
+	DBG("%s %d %d", ril_modem_get_path(gd->md), ril_data_allowed(gd->data),
+								gd->attached);
+	if (!ril_data_allowed(gd->data) && gd->attached) {
+		gd->attached = FALSE;
+		if (gd->gprs) {
+			ofono_gprs_detached_notify(gd->gprs);
+		}
+	}
+
+	ril_gprs_data_update_registration_state(gd);
+}
+
+static gboolean ril_gprs_set_attached_cb(gpointer user_data)
+{
+	struct ofono_error error;
+	struct ril_gprs_cbd *cbd = user_data;
+	struct ril_gprs *gd = cbd->gd;
+
+	GASSERT(gd->set_attached_id);
+	gd->set_attached_id = 0;
+	ril_gprs_check_data_allowed(gd);
+	cbd->cb(ril_error_ok(&error), cbd->data);
+	return FALSE;
+}
+
+static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,
+					ofono_gprs_cb_t cb, void *data)
+{
+	struct ril_gprs *gd = ril_gprs_get_data(gprs);
+
+	if (ril_data_allowed(gd->data) || !attached) {
+		DBG("%s attached: %d", ril_modem_get_path(gd->md), attached);
+		if (gd->set_attached_id) {
+			g_source_remove(gd->set_attached_id);
+		}
+		gd->attached = attached;
+		gd->set_attached_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
+					ril_gprs_set_attached_cb,
+					ril_gprs_cbd_new(gd, cb, data),
+					ril_gprs_cbd_free);
+	} else {
+		struct ofono_error error;
+		DBG("%s not allowed to attach", ril_modem_get_path(gd->md));
+		cb(ril_error_failure(&error), data);
+	}
+}
+
+static void ril_gprs_allow_data_changed(struct ril_data *data, void *user_data)
+{
+	struct ril_gprs *gd = user_data;
+
+	GASSERT(gd->data == data);
+	DBG("%s %d", ril_modem_get_path(gd->md), ril_data_allowed(data));
+	if (!gd->set_attached_id) {
+		ril_gprs_check_data_allowed(gd);
+	}
+}
+
+static void ril_gprs_data_registration_state_changed(struct ril_network *net,
+							void *user_data)
+{
+	struct ril_gprs *gd = user_data;
+	const struct ril_registration_state *data = &net->data;
+
+	GASSERT(gd->network == net);
+	if (data->max_calls > gd->max_cids) {
+		DBG("Setting max cids to %d", data->max_calls);
+		gd->max_cids = data->max_calls;
+		ofono_gprs_set_cid_range(gd->gprs, 1, gd->max_cids);
+	}
+
+	ril_gprs_data_update_registration_state(gd);
+}
+
+static void ril_gprs_registration_status(struct ofono_gprs *gprs,
+				ofono_gprs_status_cb_t cb, void *data)
+{
+	struct ril_gprs *gd = ril_gprs_get_data(gprs);
+	struct ofono_error error;
+	const enum network_registration_status status = gd->attached ?
+		gd->registration_status :
+		NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
+
+
+	DBG("%d (%s)", status, registration_status_to_string(status));
+	cb(ril_error_ok(&error), status, data);
+}
+
+static gboolean ril_gprs_register(gpointer user_data)
+{
+	struct ril_gprs *gd = user_data;
+
+	gd->register_id = 0;
+	gd->network_event_id = ril_network_add_data_state_changed_handler(
+		gd->network, ril_gprs_data_registration_state_changed, gd);
+	gd->data_event_id = ril_data_add_allow_changed_handler(gd->data,
+		ril_gprs_allow_data_changed, gd);
+	gd->registration_status = ril_gprs_fix_registration_status(gd,
+						gd->network->data.status);
+
+	gd->max_cids = gd->network->data.max_calls;
+	if (gd->max_cids > 0) {
+		DBG("Setting max cids to %d", gd->max_cids);
+		ofono_gprs_set_cid_range(gd->gprs, 1, gd->max_cids);
+	}
+
+	ofono_gprs_register(gd->gprs);
+	return FALSE;
+}
+
+static int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor,
+								void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_gprs *gd = g_new0(struct ril_gprs, 1);
+
+	DBG("%s", ril_modem_get_path(modem));
+	gd->md = modem;
+	gd->io = grilio_channel_ref(ril_modem_io(modem));
+        gd->q = grilio_queue_new(gd->io);
+	gd->data = ril_data_ref(modem->data);
+	gd->network = ril_network_ref(modem->network);
+	gd->gprs = gprs;
+	ofono_gprs_set_data(gprs, gd);
+
+	/* ofono crashes if we register right away */
+	gd->register_id = g_idle_add(ril_gprs_register, gd);
+	return 0;
+}
+
+static void ril_gprs_remove(struct ofono_gprs *gprs)
+{
+	struct ril_gprs *gd = ril_gprs_get_data(gprs);
+
+	DBG("%s", ril_modem_get_path(gd->md));
+	ofono_gprs_set_data(gprs, NULL);
+
+	if (gd->set_attached_id) {
+		g_source_remove(gd->set_attached_id);
+	}
+
+	if (gd->register_id) {
+		g_source_remove(gd->register_id);
+	}
+
+	ril_network_remove_handler(gd->network, gd->network_event_id);
+	ril_network_unref(gd->network);
+
+	ril_data_remove_handler(gd->data, gd->data_event_id);
+	ril_data_unref(gd->data);
+
+	grilio_channel_unref(gd->io);
+	grilio_queue_cancel_all(gd->q, FALSE);
+	grilio_queue_unref(gd->q);
+	g_free(gd);
+}
+
+const struct ofono_gprs_driver ril_gprs_driver = {
+	.name                   = RILMODEM_DRIVER,
+	.probe                  = ril_gprs_probe,
+	.remove                 = ril_gprs_remove,
+	.set_attached           = ril_gprs_set_attached,
+	.attached_status        = ril_gprs_registration_status,
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_gprs_context.c

@@ -0,0 +1,598 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_network.h"
+#include "ril_data.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include <gutil_strv.h>
+
+#include <arpa/inet.h>
+
+#include "ofono.h"
+#include "common.h"
+#include "mtu-watch.h"
+
+#define CTX_ID_NONE ((unsigned int)(-1))
+
+#define MAX_MTU 1280
+
+struct ril_gprs_context_call {
+	struct ril_data_request *req;
+	ofono_gprs_context_cb_t cb;
+	gpointer data;
+};
+
+struct ril_gprs_context {
+	struct ofono_gprs_context *gc;
+	struct ril_modem *modem;
+	struct ril_network *network;
+	struct ril_data *data;
+	guint active_ctx_cid;
+	gulong calls_changed_id;
+	struct mtu_watch *mtu_watch;
+	struct ril_data_call *active_call;
+	struct ril_gprs_context_call activate;
+	struct ril_gprs_context_call deactivate;
+};
+
+static inline struct ril_gprs_context *ril_gprs_context_get_data(
+					struct ofono_gprs_context *gprs)
+{
+	return ofono_gprs_context_get_data(gprs);
+}
+
+static char *ril_gprs_context_netmask(const char *bits)
+{
+	if (bits) {
+		int nbits = atoi(bits);
+		if (nbits > 0 && nbits < 33) {
+			const char* str;
+			struct in_addr in;
+			in.s_addr = htonl((nbits == 32) ? 0xffffffff :
+					((1u << nbits)-1) << (32-nbits));
+			str = inet_ntoa(in);
+			if (str) {
+				return g_strdup(str);
+			}
+		}
+	}
+	return NULL;
+}
+
+static int ril_gprs_context_address_family(const char *addr)
+{
+	if (strchr(addr, ':')) {
+		return AF_INET6;
+	} else if (strchr(addr, '.')) {
+		return AF_INET;
+	} else {
+		return AF_UNSPEC;
+	}
+}
+
+static void ril_gprs_context_free_active_call(struct ril_gprs_context *gcd)
+{
+	if (gcd->active_call) {
+		ril_data_call_free(gcd->active_call);
+		gcd->active_call = NULL;
+	}
+	if (gcd->calls_changed_id) {
+		ril_data_remove_handler(gcd->data, gcd->calls_changed_id);
+		gcd->calls_changed_id = 0;
+	}
+	if (gcd->mtu_watch) {
+		mtu_watch_free(gcd->mtu_watch);
+		gcd->mtu_watch = NULL;
+	}
+}
+
+static void ril_gprs_context_set_active_call(struct ril_gprs_context *gcd,
+					const struct ril_data_call *call)
+{
+	if (call) {
+		ril_data_call_free(gcd->active_call);
+		gcd->active_call = ril_data_call_dup(call);
+		if (!gcd->mtu_watch) {
+			gcd->mtu_watch = mtu_watch_new(MAX_MTU);
+		}
+		mtu_watch_set_ifname(gcd->mtu_watch, call->ifname);
+	} else {
+		ril_gprs_context_free_active_call(gcd);
+	}
+}
+
+static void ril_gprs_context_set_disconnected(struct ril_gprs_context *gcd)
+{
+	if (gcd->active_call) {
+		ril_gprs_context_free_active_call(gcd);
+		if (gcd->deactivate.req) {
+			struct ril_gprs_context_call deact = gcd->deactivate;
+
+			/*
+			 * Complete the deactivate request. We need to
+			 * clear gcd->deactivate first because cancelling
+			 * the deactivation request will probably result
+			 * in ril_gprs_context_deactivate_primary_cb() being
+			 * invoked with GRILIO_CANCELLED status. And we don't
+			 * want to fail the disconnect request because this
+			 * is a success (we wanted to disconnect the data
+			 * call and it's gone).
+			 *
+			 * Additionally, we need to make sure that we don't
+			 * complete the same request twice - that would crash
+			 * the core.
+			 */
+			memset(&gcd->deactivate, 0, sizeof(gcd->deactivate));
+			ril_data_request_cancel(deact.req);
+			if (deact.cb) {
+				struct ofono_error error;
+				ofono_info("Deactivated data call");
+				deact.cb(ril_error_ok(&error), deact.data);
+			}
+		}
+	}
+	if (gcd->active_ctx_cid != CTX_ID_NONE) {
+		guint id = gcd->active_ctx_cid;
+		gcd->active_ctx_cid = CTX_ID_NONE;
+		DBG("ofono context %u deactivated", id);
+		ofono_gprs_context_deactivated(gcd->gc, id);
+	}
+}
+
+static void ril_gprs_context_set_address(struct ofono_gprs_context *gc,
+					const struct ril_data_call *call)
+{
+	const char *ip_addr = NULL;
+	char *ip_mask = NULL;
+	const char *ipv6_addr = NULL;
+	unsigned char ipv6_prefix_length = 0;
+	char *tmp_ip_addr = NULL;
+	char *tmp_ipv6_addr = NULL;
+	char * const *list = call->addresses;
+	const int n = gutil_strv_length(list);
+	int i;
+
+	for (i = 0; i < n && (!ipv6_addr || !ip_addr); i++) {
+		const char *addr = list[i];
+		switch (ril_gprs_context_address_family(addr)) {
+		case AF_INET:
+			if (!ip_addr) {
+				const char* s = strstr(addr, "/");
+				if (s) {
+					const gsize len = s - addr;
+					tmp_ip_addr = g_strndup(addr, len);
+					ip_addr = tmp_ip_addr;
+					ip_mask = ril_gprs_context_netmask(s+1);
+				} else {
+					ip_addr = addr;
+				}
+				if (!ip_mask) {
+					ip_mask = g_strdup("255.255.255.0");
+				}
+			}
+			break;
+		case AF_INET6:
+			if (!ipv6_addr) {
+				const char* s = strstr(addr, "/");
+				if (s) {
+					const gsize len = s - addr;
+					const int prefix = atoi(s + 1);
+					tmp_ipv6_addr = g_strndup(addr, len);
+					ipv6_addr = tmp_ipv6_addr;
+					if (prefix >= 0 && prefix <= 128) {
+						ipv6_prefix_length = prefix;
+					}
+				} else {
+					ipv6_addr = addr;
+				}
+			}
+		}
+	}
+
+	ofono_gprs_context_set_ipv4_address(gc, ip_addr, TRUE);
+	ofono_gprs_context_set_ipv4_netmask(gc, ip_mask);
+	ofono_gprs_context_set_ipv6_address(gc, ipv6_addr);
+	ofono_gprs_context_set_ipv6_prefix_length(gc, ipv6_prefix_length);
+
+	if (!ip_addr && !ipv6_addr) {
+		ofono_error("GPRS context: No IP address");
+	}
+
+	/* Allocate temporary strings */
+	g_free(ip_mask);
+	g_free(tmp_ip_addr);
+	g_free(tmp_ipv6_addr);
+}
+
+static void ril_gprs_context_set_gateway(struct ofono_gprs_context *gc,
+					const struct ril_data_call *call)
+{
+	const char *ip_gw = NULL;
+	const char *ipv6_gw = NULL;
+	char * const *list = call->gateways;
+	const int n = gutil_strv_length(list);
+	int i;
+
+	/* Pick 1 gw for each protocol*/
+	for (i = 0; i < n && (!ipv6_gw || !ip_gw); i++) {
+		const char *addr = list[i];
+		switch (ril_gprs_context_address_family(addr)) {
+		case AF_INET:
+			if (!ip_gw) ip_gw = addr;
+			break;
+		case AF_INET6:
+			if (!ipv6_gw) ipv6_gw = addr;
+			break;
+		}
+	}
+
+	ofono_gprs_context_set_ipv4_gateway(gc, ip_gw);
+	ofono_gprs_context_set_ipv6_gateway(gc, ipv6_gw);
+}
+
+static void ril_gprs_context_set_dns_servers(struct ofono_gprs_context *gc,
+					const struct ril_data_call *call)
+{
+	int i;
+	char * const *list = call->dnses;
+	const int n = gutil_strv_length(list);
+	const char **ip_dns = g_new0(const char *, n+1);
+	const char **ipv6_dns = g_new0(const char *, n+1);
+	const char **ip_ptr = ip_dns;
+	const char **ipv6_ptr = ipv6_dns;
+
+	for (i = 0; i < n; i++) {
+		const char *addr = list[i];
+		switch (ril_gprs_context_address_family(addr)) {
+		case AF_INET:
+			*ip_ptr++ = addr;
+			break;
+		case AF_INET6:
+			*ipv6_ptr++ = addr;
+			break;
+		}
+	}
+
+	ofono_gprs_context_set_ipv4_dns_servers(gc, ip_dns);
+	ofono_gprs_context_set_ipv6_dns_servers(gc, ipv6_dns);
+
+	g_free(ip_dns);
+	g_free(ipv6_dns);
+}
+
+/* Only compares the stuff that's important to us */
+#define DATA_CALL_IFNAME_CHANGED    (0x01)
+#define DATA_CALL_ADDRESS_CHANGED   (0x02)
+#define DATA_CALL_GATEWAY_CHANGED   (0x04)
+#define DATA_CALL_DNS_CHANGED       (0x08)
+#define DATA_CALL_ALL_CHANGED       (0x0f)
+static int ril_gprs_context_data_call_change(
+			const struct ril_data_call *c1,
+			const struct ril_data_call *c2)
+{
+	if (!c1 && !c2) {
+		return 0;
+	} else if (c1 && c2) {
+		int changes = 0;
+
+		if (g_strcmp0(c1->ifname, c2->ifname)) {
+			changes |= DATA_CALL_IFNAME_CHANGED;
+		}
+
+		if (!gutil_strv_equal(c1->addresses, c2->addresses)) {
+			changes |= DATA_CALL_ADDRESS_CHANGED;
+		}
+
+		if (!gutil_strv_equal(c1->gateways, c2->gateways)) {
+			changes |= DATA_CALL_GATEWAY_CHANGED;
+		}
+
+		if (!gutil_strv_equal(c1->dnses, c2->dnses)) {
+			changes |= DATA_CALL_DNS_CHANGED;
+		}
+
+		return changes;
+	} else {
+		return DATA_CALL_ALL_CHANGED;
+	}
+}
+
+static void ril_gprs_context_call_list_changed(struct ril_data *data, void *arg)
+{
+	struct ril_gprs_context *gcd = arg;
+	struct ofono_gprs_context *gc = gcd->gc;
+
+	/*
+	 * gcd->active_call can't be NULL here because this callback
+	 * is only registered when we have the active call and released
+	 * when active call is dropped.
+	 */
+	struct ril_data_call *prev_call = gcd->active_call;
+	const struct ril_data_call *call =
+		ril_data_call_find(data->data_calls, prev_call->cid);
+	int change = 0;
+
+	if (call && call->active != RIL_DATA_CALL_INACTIVE) {
+		/* Compare it against the last known state */
+		change = ril_gprs_context_data_call_change(call, prev_call);
+	} else {
+		ofono_error("Clearing active context");
+		ril_gprs_context_set_disconnected(gcd);
+		call = NULL;
+	}
+
+	if (!call) {
+		/* We are not interested */
+		return;
+	} else if (!change) {
+		DBG("call %u didn't change", call->cid);
+		return;
+	} else {
+		DBG("call %u changed", call->cid);
+	}
+
+	/*
+	 * prev_call points to the previous active call, and it will
+	 * be deallocated at the end of the this function. Clear the
+	 * gcd->active_call pointer so that we don't deallocate it twice.
+	 */
+	gcd->active_call = NULL;
+	ril_gprs_context_set_active_call(gcd, call);
+
+	if (call->status != PDP_FAIL_NONE) {
+		ofono_info("data call status: %d", call->status);
+	}
+
+	if (change & DATA_CALL_IFNAME_CHANGED) {
+		DBG("interface changed");
+		ofono_gprs_context_set_interface(gc, call->ifname);
+	}
+
+	if (change & DATA_CALL_ADDRESS_CHANGED) {
+		DBG("address changed");
+		ril_gprs_context_set_address(gc, call);
+	}
+
+	if (change & DATA_CALL_GATEWAY_CHANGED) {
+		DBG("gateway changed");
+		ril_gprs_context_set_gateway(gc, call);
+	}
+
+	if (change & DATA_CALL_DNS_CHANGED) {
+		DBG("name server(s) changed");
+		ril_gprs_context_set_dns_servers(gc, call);
+	}
+
+	ofono_gprs_context_signal_change(gc, call->cid);
+	ril_data_call_free(prev_call);
+}
+
+static void ril_gprs_context_activate_primary_cb(struct ril_data *data,
+			int ril_status, const struct ril_data_call *call,
+			void *user_data)
+{
+	struct ril_gprs_context *gcd = user_data;
+	struct ofono_gprs_context *gc = gcd->gc;
+	struct ofono_error error;
+	ofono_gprs_context_cb_t cb;
+	gpointer cb_data;
+
+	ril_error_init_failure(&error);
+	if (ril_status != RIL_E_SUCCESS) {
+		ofono_error("GPRS context: Reply failure: %s",
+					ril_error_to_string(ril_status));
+	} else if (call->status != PDP_FAIL_NONE) {
+		ofono_error("Unexpected data call status %d", call->status);
+		error.type = OFONO_ERROR_TYPE_CMS;
+		error.error = call->status;
+	} else if (!call->ifname) {
+		/* Must have interface */
+		ofono_error("GPRS context: No interface");
+	} else {
+		ofono_info("setting up data call");
+
+		GASSERT(!gcd->calls_changed_id);
+		ril_data_remove_handler(gcd->data, gcd->calls_changed_id);
+		gcd->calls_changed_id =
+			ril_data_add_calls_changed_handler(gcd->data,
+				ril_gprs_context_call_list_changed, gcd);
+
+		ril_gprs_context_set_active_call(gcd, call);
+		ofono_gprs_context_set_interface(gc, call->ifname);
+		ril_gprs_context_set_address(gc, call);
+		ril_gprs_context_set_gateway(gc, call);
+		ril_gprs_context_set_dns_servers(gc, call);
+		ril_error_init_ok(&error);
+	}
+
+	if (error.type != OFONO_ERROR_TYPE_NO_ERROR) {
+		gcd->active_ctx_cid = CTX_ID_NONE;
+	}
+
+	cb = gcd->activate.cb;
+	cb_data = gcd->activate.data;
+	GASSERT(gcd->activate.req);
+	memset(&gcd->activate, 0, sizeof(gcd->activate));
+
+	if (cb) {
+		cb(&error, cb_data);
+	}
+}
+
+static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
+				const struct ofono_gprs_primary_context *ctx,
+				ofono_gprs_context_cb_t cb, void *data)
+{
+	struct ril_gprs_context *gcd = ril_gprs_context_get_data(gc);
+	struct ofono_netreg *netreg = ril_modem_ofono_netreg(gcd->modem);
+	const int rs = ofono_netreg_get_status(netreg);
+
+	/* Let's make sure that we aren't connecting when roaming not allowed */
+	if (rs == NETWORK_REGISTRATION_STATUS_ROAMING) {
+		struct ofono_gprs *gprs = ril_modem_ofono_gprs(gcd->modem);
+		if (!__ofono_gprs_get_roaming_allowed(gprs) &&
+			ril_netreg_check_if_really_roaming(netreg, rs) ==
+					NETWORK_REGISTRATION_STATUS_ROAMING) {
+			struct ofono_error error;
+			ofono_info("Can't activate context %u (roaming)",
+								ctx->cid);
+			cb(ril_error_failure(&error), data);
+			return;
+		}
+	}
+
+	ofono_info("Activating context: %u", ctx->cid);
+	GASSERT(!gcd->activate.req);
+	GASSERT(ctx->cid != CTX_ID_NONE);
+
+	gcd->active_ctx_cid = ctx->cid;
+	gcd->activate.cb = cb;
+	gcd->activate.data = data;
+	gcd->activate.req = ril_data_call_setup(gcd->data, ctx,
+				ril_gprs_context_activate_primary_cb, gcd);
+}
+
+static void ril_gprs_context_deactivate_primary_cb(struct ril_data *data,
+					int ril_status, void *user_data)
+{
+	struct ril_gprs_context *gcd = user_data;
+
+	/*
+	 * Data call list may change before the completion of the deactivate
+	 * request, in that case ril_gprs_context_set_disconnected will be
+	 * invoked and gcd->deactivate.req will be NULL.
+	 */
+	if (gcd->deactivate.req) {
+		struct ofono_error error;
+		ofono_gprs_context_cb_t cb = gcd->deactivate.cb;
+		gpointer cb_data = gcd->deactivate.data;
+
+		if (ril_status == RIL_E_SUCCESS) {
+			GASSERT(gcd->active_call);
+			ril_error_init_ok(&error);
+			ofono_info("Deactivated data call");
+		} else {
+			ril_error_init_failure(&error);
+			ofono_error("Deactivate failure: %s",
+					ril_error_to_string(ril_status));
+		}
+
+		memset(&gcd->deactivate, 0, sizeof(gcd->deactivate));
+		if (cb) {
+			ril_gprs_context_free_active_call(gcd);
+			cb(&error, cb_data);
+			return;
+		}
+	}
+
+	/* Make sure we are in the disconnected state */
+	ril_gprs_context_set_disconnected(gcd);
+}
+
+static void ril_gprs_context_deactivate_primary(struct ofono_gprs_context *gc,
+		unsigned int id, ofono_gprs_context_cb_t cb, void *data)
+{
+	struct ril_gprs_context *gcd = ril_gprs_context_get_data(gc);
+
+	GASSERT(gcd->active_call && gcd->active_ctx_cid == id);
+	ofono_info("Deactivating context: %u", id);
+
+	if (gcd->active_call && gcd->active_ctx_cid == id) {
+		gcd->deactivate.cb = cb;
+		gcd->deactivate.data = data;
+		gcd->deactivate.req = ril_data_call_deactivate(gcd->data,
+				gcd->active_call->cid,
+				ril_gprs_context_deactivate_primary_cb, gcd);
+	} else if (cb) {
+		struct ofono_error error;
+		cb(ril_error_ok(&error), data);
+	}
+}
+
+static void ril_gprs_context_detach_shutdown(struct ofono_gprs_context *gc,
+						unsigned int id)
+{
+	DBG("%u", id);
+	ril_gprs_context_deactivate_primary(gc, id, NULL, NULL);
+}
+
+static int ril_gprs_context_probe(struct ofono_gprs_context *gc,
+					unsigned int vendor, void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_gprs_context *gcd = g_new0(struct ril_gprs_context, 1);
+
+	DBG("");
+	gcd->gc = gc;
+	gcd->modem = modem;
+	gcd->network = ril_network_ref(modem->network);
+	gcd->data = ril_data_ref(modem->data);
+	gcd->active_ctx_cid = CTX_ID_NONE;
+	ofono_gprs_context_set_data(gc, gcd);
+	return 0;
+}
+
+static void ril_gprs_context_remove(struct ofono_gprs_context *gc)
+{
+	struct ril_gprs_context *gcd = ril_gprs_context_get_data(gc);
+
+	DBG("");
+	ofono_gprs_context_set_data(gc, NULL);
+
+	if (gcd->activate.req) {
+		/*
+		 * The core has already completed its pending D-Bus
+		 * request, invoking the completion callback will
+		 * cause libdbus to panic.
+		 */
+		ril_data_request_detach(gcd->activate.req);
+		ril_data_request_cancel(gcd->activate.req);
+	}
+
+	if (gcd->deactivate.req) {
+		/* Let it complete but we won't be around to be notified. */
+		ril_data_request_detach(gcd->deactivate.req);
+	} else if (gcd->active_call) {
+		ril_data_call_deactivate(gcd->data, gcd->active_call->cid,
+								NULL, NULL);
+	}
+
+	ril_data_remove_handler(gcd->data, gcd->calls_changed_id);
+	ril_data_unref(gcd->data);
+	ril_network_unref(gcd->network);
+	ril_data_call_free(gcd->active_call);
+	mtu_watch_free(gcd->mtu_watch);
+	g_free(gcd);
+}
+
+const struct ofono_gprs_context_driver ril_gprs_context_driver = {
+	.name                   = RILMODEM_DRIVER,
+	.probe                  = ril_gprs_context_probe,
+	.remove                 = ril_gprs_context_remove,
+	.activate_primary       = ril_gprs_context_activate_primary,
+	.deactivate_primary     = ril_gprs_context_deactivate_primary,
+	.detach_shutdown        = ril_gprs_context_detach_shutdown,
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_log.h

@@ -0,0 +1,31 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_LOG_H
+#define RIL_LOG_H
+
+#define GLOG_MODULE_NAME ril_log
+#include <gutil_log.h>
+#include <ofono/log.h>
+
+#endif /* RIL_LOG_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_modem.c

@@ -0,0 +1,513 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_network.h"
+#include "ril_radio.h"
+#include "ril_sim_card.h"
+#include "ril_sim_settings.h"
+#include "ril_cell_info.h"
+#include "ril_data.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include "ofono.h"
+
+#include "sailfish_watch.h"
+
+#define MAX_PDP_CONTEXTS        (2)
+#define ONLINE_TIMEOUT_SECS     (15) /* 20 sec is hardcoded in ofono core */
+
+enum ril_modem_power_state {
+	POWERED_OFF,
+	POWERED_ON,
+	POWERING_OFF
+};
+
+enum ril_modem_online_state {
+	OFFLINE,
+	GOING_ONLINE,
+	ONLINE,
+	GOING_OFFLINE
+};
+
+struct ril_modem_online_request {
+	ofono_modem_online_cb_t cb;
+	struct ril_modem_data *md;
+	void *data;
+	guint timeout_id;
+};
+
+struct ril_modem_data {
+	struct ril_modem modem;
+	struct sailfish_watch *watch;
+	GRilIoQueue *q;
+	char *log_prefix;
+	char *imeisv;
+	char *imei;
+	char *ecclist_file;
+	gulong imsi_event_id;
+
+	guint online_check_id;
+	enum ril_modem_power_state power_state;
+	gulong radio_state_event_id;
+
+	struct ril_modem_online_request set_online;
+	struct ril_modem_online_request set_offline;
+};
+
+#define RADIO_POWER_TAG(md) (md)
+
+#define DBG_(md,fmt,args...) DBG("%s" fmt, (md)->log_prefix, ##args)
+
+static struct ril_modem_data *ril_modem_data_from_ofono(struct ofono_modem *o)
+{
+	struct ril_modem_data *md = ofono_modem_get_data(o);
+	GASSERT(md->modem.ofono == o);
+	return md;
+}
+
+static void *ril_modem_get_atom_data(struct ril_modem *modem,
+						enum ofono_atom_type type)
+{
+	if (modem && modem->ofono) {
+		struct ofono_atom *atom =
+			__ofono_modem_find_atom(modem->ofono, type);
+
+		if (atom) {
+			return __ofono_atom_get_data(atom);
+		}
+	}
+
+	return NULL;
+}
+
+struct ofono_sim *ril_modem_ofono_sim(struct ril_modem *modem)
+{
+	return ril_modem_get_atom_data(modem, OFONO_ATOM_TYPE_SIM);
+}
+
+struct ofono_gprs *ril_modem_ofono_gprs(struct ril_modem *modem)
+{
+	return ril_modem_get_atom_data(modem, OFONO_ATOM_TYPE_GPRS);
+}
+
+struct ofono_netreg *ril_modem_ofono_netreg(struct ril_modem *modem)
+{
+	return ril_modem_get_atom_data(modem, OFONO_ATOM_TYPE_NETREG);
+}
+
+static inline struct ofono_radio_settings *ril_modem_radio_settings(
+						struct ril_modem *modem)
+{
+	return ril_modem_get_atom_data(modem, OFONO_ATOM_TYPE_RADIO_SETTINGS);
+}
+
+void ril_modem_delete(struct ril_modem *md)
+{
+	if (md && md->ofono) {
+		ofono_modem_remove(md->ofono);
+	}
+}
+
+static void ril_modem_online_request_ok(struct ril_modem_online_request *req)
+{
+	if (req->timeout_id) {
+		g_source_remove(req->timeout_id);
+		req->timeout_id = 0;
+	}
+
+	if (req->cb) {
+		struct ofono_error error;
+		ofono_modem_online_cb_t cb = req->cb;
+		void *data = req->data;
+
+		req->cb = NULL;
+		req->data = NULL;
+		cb(ril_error_ok(&error), data);
+	}
+}
+
+static void ril_modem_update_online_state(struct ril_modem_data *md)
+{
+	switch (md->modem.radio->state) {
+	case RADIO_STATE_ON:
+		DBG("online");
+		ril_modem_online_request_ok(&md->set_online);
+		break;
+
+	case RADIO_STATE_OFF:
+	case RADIO_STATE_UNAVAILABLE:
+		DBG("offline");
+		ril_modem_online_request_ok(&md->set_offline);
+		break;
+
+	default:
+		break;
+	}
+
+	if (!md->set_offline.timeout_id && !md->set_online.timeout_id &&
+					md->power_state == POWERING_OFF) {
+		md->power_state = POWERED_OFF;
+		if (md->modem.ofono) {
+			ofono_modem_set_powered(md->modem.ofono, FALSE);
+		}
+	}
+}
+
+static gboolean ril_modem_online_request_timeout(gpointer data)
+{
+	struct ril_modem_online_request *req = data;
+	struct ofono_error error;
+	ofono_modem_online_cb_t cb = req->cb;
+	void *cb_data = req->data;
+
+	GASSERT(req->timeout_id);
+	GASSERT(cb);
+
+	req->timeout_id = 0;
+	req->cb = NULL;
+	req->data = NULL;
+	cb(ril_error_failure(&error), cb_data);
+	ril_modem_update_online_state(req->md);
+
+	return G_SOURCE_REMOVE;
+}
+
+static gboolean ril_modem_online_check(gpointer data)
+{
+	struct ril_modem_data *md = data;
+
+	GASSERT(md->online_check_id);
+	md->online_check_id = 0;
+	ril_modem_update_online_state(md);
+	return FALSE;
+}
+
+static void ril_modem_schedule_online_check(struct ril_modem_data *md)
+{
+	if (!md->online_check_id) {
+		md->online_check_id = g_idle_add(ril_modem_online_check, md);
+	}
+}
+
+static void ril_modem_update_radio_settings(struct ril_modem_data *md)
+{
+	struct ril_modem *m = &md->modem;
+	if (m->radio->state == RADIO_STATE_ON && md->watch->imsi) {
+		/* radio-settings.c assumes that IMSI is available */
+		if (!ril_modem_radio_settings(m)) {
+			DBG_(md, "initializing radio settings interface");
+			ofono_radio_settings_create(m->ofono, 0,
+						RILMODEM_DRIVER, md);
+		}
+	} else {
+		/* ofono core may remove radio settings atom internally */
+		struct ofono_radio_settings *rs = ril_modem_radio_settings(m);
+		if (rs) {
+			DBG_(md, "removing radio settings interface");
+			ofono_radio_settings_remove(rs);
+		} else {
+			DBG_(md, "radio settings interface is already gone");
+		}
+	}
+}
+
+static void ril_modem_radio_state_cb(struct ril_radio *radio, void *data)
+{
+	struct ril_modem_data *md = data;
+
+	GASSERT(md->modem.radio == radio);
+	ril_modem_update_radio_settings(md);
+	ril_modem_update_online_state(md);
+}
+
+static void ril_modem_imsi_cb(struct sailfish_watch *watch, void *data)
+{
+	struct ril_modem_data *md = data;
+
+	GASSERT(md->watch == watch);
+	ril_modem_update_radio_settings(md);
+}
+
+static void ril_modem_pre_sim(struct ofono_modem *modem)
+{
+	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
+
+	DBG("%s", ofono_modem_get_path(modem));
+	ofono_devinfo_create(modem, 0, RILMODEM_DRIVER, md);
+	ofono_sim_create(modem, 0, RILMODEM_DRIVER, md);
+	if (md->modem.config.enable_voicecall) {
+		ofono_voicecall_create(modem, 0, RILMODEM_DRIVER, md);
+	}
+	if (!md->radio_state_event_id) {
+		md->radio_state_event_id =
+			ril_radio_add_state_changed_handler(md->modem.radio,
+					ril_modem_radio_state_cb, md);
+	}
+}
+
+static void ril_modem_post_sim(struct ofono_modem *modem)
+{
+	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
+	struct ofono_gprs *gprs;
+
+	DBG("%s", ofono_modem_get_path(modem));
+	ofono_sms_create(modem, 0, RILMODEM_DRIVER, md);
+	gprs = ofono_gprs_create(modem, 0, RILMODEM_DRIVER, md);
+	if (gprs) {
+		int i;
+
+		for (i = 0; i < MAX_PDP_CONTEXTS; i++) {
+			struct ofono_gprs_context *gc =
+				ofono_gprs_context_create(modem, 0,
+						RILMODEM_DRIVER, md);
+			if (gc == NULL)
+				break;
+
+			ofono_gprs_add_context(gprs, gc);
+		}
+	}
+
+	ofono_phonebook_create(modem, 0, RILMODEM_DRIVER, md);
+	ofono_call_forwarding_create(modem, 0, RILMODEM_DRIVER, md);
+	ofono_call_barring_create(modem, 0, RILMODEM_DRIVER, md);
+	ofono_stk_create(modem, 0, RILMODEM_DRIVER, md);
+	ofono_cbs_create(modem, 0, RILMODEM_DRIVER, md);
+	ofono_message_waiting_register(ofono_message_waiting_create(modem));
+}
+
+static void ril_modem_post_online(struct ofono_modem *modem)
+{
+	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
+
+	DBG("%s", ofono_modem_get_path(modem));
+	ofono_call_volume_create(modem, 0, RILMODEM_DRIVER, md);
+	ofono_netreg_create(modem, 0, RILMODEM_DRIVER, md);
+	ofono_ussd_create(modem, 0, RILMODEM_DRIVER, md);
+	ofono_call_settings_create(modem, 0, RILMODEM_DRIVER, md);
+	ofono_netmon_create(modem, 0, RILMODEM_DRIVER, md);
+}
+
+static void ril_modem_set_online(struct ofono_modem *modem, ofono_bool_t online,
+				ofono_modem_online_cb_t cb, void *data)
+{
+	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
+	struct ril_radio *radio = md->modem.radio;
+	struct ril_modem_online_request *req;
+
+	DBG("%s going %sline", ofono_modem_get_path(modem),
+						online ? "on" : "off");
+
+	ril_radio_set_online(radio, online);
+	if (online) {
+		ril_radio_power_on(radio, RADIO_POWER_TAG(md));
+		req = &md->set_online;
+	} else {
+		ril_radio_power_off(radio, RADIO_POWER_TAG(md));
+		req = &md->set_offline;
+	}
+
+	req->cb = cb;
+	req->data = data;
+	if (req->timeout_id) {
+		g_source_remove(req->timeout_id);
+	}
+	req->timeout_id = g_timeout_add_seconds(ONLINE_TIMEOUT_SECS,
+					ril_modem_online_request_timeout, req);
+	ril_modem_schedule_online_check(md);
+}
+
+static int ril_modem_enable(struct ofono_modem *modem)
+{
+	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
+
+	DBG("%s", ofono_modem_get_path(modem));
+	md->power_state = POWERED_ON;
+	return 0;
+}
+
+static int ril_modem_disable(struct ofono_modem *modem)
+{
+	struct ril_modem_data *md = ril_modem_data_from_ofono(modem);
+
+	DBG("%s", ofono_modem_get_path(modem));
+	if (md->set_online.timeout_id || md->set_offline.timeout_id) {
+		md->power_state = POWERING_OFF;
+		return -EINPROGRESS;
+	} else {
+		md->power_state = POWERED_OFF;
+		return 0;
+	}
+}
+
+static int ril_modem_probe(struct ofono_modem *modem)
+{
+	DBG("%s", ofono_modem_get_path(modem));
+	return 0;
+}
+
+static void ril_modem_remove(struct ofono_modem *ofono)
+{
+	struct ril_modem_data *md = ril_modem_data_from_ofono(ofono);
+	struct ril_modem *modem = &md->modem;
+
+	DBG("%s", ril_modem_get_path(modem));
+	ofono_modem_set_data(ofono, NULL);
+
+	ril_radio_remove_handler(modem->radio, md->radio_state_event_id);
+	ril_radio_power_off(modem->radio, RADIO_POWER_TAG(md));
+	ril_radio_unref(modem->radio);
+	ril_sim_settings_unref(modem->sim_settings);
+
+	sailfish_watch_remove_handler(md->watch, md->imsi_event_id);
+	sailfish_watch_unref(md->watch);
+
+	if (md->online_check_id) {
+		g_source_remove(md->online_check_id);
+	}
+
+	if (md->set_online.timeout_id) {
+		g_source_remove(md->set_online.timeout_id);
+	}
+
+	if (md->set_offline.timeout_id) {
+		g_source_remove(md->set_offline.timeout_id);
+	}
+
+	ril_network_unref(modem->network);
+	ril_sim_card_unref(modem->sim_card);
+	ril_data_unref(modem->data);
+	sailfish_cell_info_unref(modem->cell_info);
+	grilio_channel_unref(modem->io);
+	grilio_queue_cancel_all(md->q, FALSE);
+	grilio_queue_unref(md->q);
+	g_free(md->ecclist_file);
+	g_free(md->log_prefix);
+	g_free(md->imeisv);
+	g_free(md->imei);
+	g_free(md);
+}
+
+struct ril_modem *ril_modem_create(GRilIoChannel *io, const char *log_prefix,
+		const char *path, const char *imei, const char *imeisv,
+		const char *ecclist_file, const struct ril_slot_config *config,
+		struct ril_radio *radio, struct ril_network *network,
+		struct ril_sim_card *card, struct ril_data *data,
+		struct ril_sim_settings *settings,
+		struct sailfish_cell_info *cell_info)
+{
+	/* Skip the slash from the path, it looks like "/ril_0" */
+	struct ofono_modem *ofono = ofono_modem_create(path + 1,
+							RILMODEM_DRIVER);
+	if (ofono) {
+		int err;
+		struct ril_modem_data *md = g_new0(struct ril_modem_data, 1);
+		struct ril_modem *modem = &md->modem;
+
+		/*
+		 * ril_plugin.c must wait until IMEI becomes known before
+		 * creating the modem
+		 */
+		GASSERT(imei);
+
+		/* Copy config */
+		modem->config = *config;
+		modem->imei = md->imei = g_strdup(imei);
+		modem->imeisv = md->imeisv = g_strdup(imeisv);
+		modem->log_prefix = log_prefix;     /* No need to strdup */
+		modem->ecclist_file = ecclist_file; /* No need to strdup */
+		md->log_prefix = (log_prefix && log_prefix[0]) ?
+			g_strconcat(log_prefix, " ", NULL) : g_strdup("");
+
+		modem->ofono = ofono;
+		modem->radio = ril_radio_ref(radio);
+		modem->network = ril_network_ref(network);
+		modem->sim_card = ril_sim_card_ref(card);
+		modem->sim_settings = ril_sim_settings_ref(settings);
+		modem->cell_info = sailfish_cell_info_ref(cell_info);
+		modem->data = ril_data_ref(data);
+		modem->io = grilio_channel_ref(io);
+		md->q = grilio_queue_new(io);
+		md->watch = sailfish_watch_new(path);
+
+		md->imsi_event_id =
+			sailfish_watch_add_imsi_changed_handler(md->watch,
+						ril_modem_imsi_cb, md);
+
+		md->set_online.md = md;
+		md->set_offline.md = md;
+		ofono_modem_set_data(ofono, md);
+		err = ofono_modem_register(ofono);
+		if (!err) {
+			ril_radio_power_cycle(modem->radio);
+			GASSERT(io->connected);
+
+			/*
+			 * ofono_modem_reset sets Powered to TRUE without
+			 * issuing PropertyChange signal.
+			 */
+			ofono_modem_set_powered(modem->ofono, FALSE);
+			ofono_modem_set_powered(modem->ofono, TRUE);
+			md->power_state = POWERED_ON;
+
+			/*
+			 * With some RIL implementations, querying available
+			 * band modes causes some magic Android properties to
+			 * appear. Otherwise this request is pretty harmless
+			 * and useless.
+			 */
+			grilio_queue_send_request(md->q, NULL,
+				RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE);
+
+			ril_modem_update_radio_settings(md);
+			return modem;
+		} else {
+			ofono_error("Error %d registering %s",
+				    err, RILMODEM_DRIVER);
+
+			/*
+			 * If ofono_modem_register() failed, then
+			 * ofono_modem_remove() won't invoke
+			 * ril_modem_remove() callback.
+			 */
+			ril_modem_remove(ofono);
+		}
+
+		ofono_modem_remove(ofono);
+	}
+
+	return NULL;
+}
+
+const struct ofono_modem_driver ril_modem_driver = {
+	.name           = RILMODEM_DRIVER,
+	.probe          = ril_modem_probe,
+	.remove         = ril_modem_remove,
+	.enable         = ril_modem_enable,
+	.disable        = ril_modem_disable,
+	.pre_sim        = ril_modem_pre_sim,
+	.post_sim       = ril_modem_post_sim,
+	.post_online    = ril_modem_post_online,
+	.set_online     = ril_modem_set_online
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_netmon.c

@@ -0,0 +1,203 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include <sailfish_cell_info.h>
+
+#include "ofono.h"
+
+struct ril_netmon {
+	struct ofono_netmon *netmon;
+	struct sailfish_cell_info *cell_info;
+	guint register_id;
+};
+
+static inline struct ril_netmon *ril_netmon_get_data(struct ofono_netmon *ofono)
+{
+	return ofono ? ofono_netmon_get_data(ofono) : NULL;
+}
+
+static void ril_netmon_format_mccmnc(char *s_mcc, char *s_mnc, int mcc, int mnc)
+{
+	s_mcc[0] = 0;
+	s_mnc[0] = 0;
+
+	if (mcc >= 0 && mcc <= 999) {
+		snprintf(s_mcc, OFONO_MAX_MCC_LENGTH + 1, "%03d", mcc);
+		if (mnc >= 0 && mnc <= 999) {
+			const unsigned int mnclen = mnclength(mcc, mnc);
+			const char *format[] = { "%d", "%02d", "%03d" };
+			const char *fmt = (mnclen > 0 &&
+				mnclen <= G_N_ELEMENTS(format)) ? 
+				format[mnclen - 1] : format[0];
+			snprintf(s_mnc, OFONO_MAX_MNC_LENGTH + 1, fmt, mnc);
+		}
+	}
+}
+
+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];
+
+	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);
+}
+
+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];
+
+	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);
+}
+
+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];
+
+	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);
+}
+
+static void ril_netmon_request_update(struct ofono_netmon *netmon,
+		ofono_netmon_cb_t cb, void *data)
+{
+	struct ril_netmon *nm = ril_netmon_get_data(netmon);
+	struct ofono_error error;
+	GSList *l;
+
+	for (l = nm->cell_info->cells; l; l = l->next) {
+		const struct sailfish_cell *cell = l->data;
+
+		if (cell->registered) {
+			switch (cell->type) {
+			case SAILFISH_CELL_TYPE_GSM:
+				ril_netmon_notify_gsm(netmon,
+							&cell->info.gsm);
+				break;
+			case SAILFISH_CELL_TYPE_WCDMA:
+				ril_netmon_notify_wcdma(netmon,
+							&cell->info.wcdma);
+				break;
+			case SAILFISH_CELL_TYPE_LTE:
+				ril_netmon_notify_lte(netmon,
+							&cell->info.lte);
+				break;
+			default:
+				break;
+			}
+		}
+	}
+
+	cb(ril_error_ok(&error), data);
+}
+
+static gboolean ril_netmon_register(gpointer user_data)
+{
+	struct ril_netmon *nm = user_data;
+
+	GASSERT(nm->register_id);
+	nm->register_id = 0;
+	ofono_netmon_register(nm->netmon);
+
+	return G_SOURCE_REMOVE;
+}
+
+static int ril_netmon_probe(struct ofono_netmon *netmon, unsigned int vendor,
+				void *data)
+{
+	struct ril_modem *modem = data;
+	int ret;
+
+	if (modem->cell_info) {
+		struct ril_netmon *nm = g_slice_new0(struct ril_netmon);
+
+		nm->cell_info = sailfish_cell_info_ref(modem->cell_info);
+		nm->netmon = netmon;
+
+		ofono_netmon_set_data(netmon, nm);
+		nm->register_id = g_idle_add(ril_netmon_register, nm);
+		ret = 0;
+	} else {
+		DBG("%s no", modem->log_prefix ? modem->log_prefix : "");
+		ret = -1;
+	}
+
+	DBG("%s %d", modem->log_prefix ? modem->log_prefix : "", ret);
+	return ret;
+}
+
+static void ril_netmon_remove(struct ofono_netmon *netmon)
+{
+	struct ril_netmon *nm = ril_netmon_get_data(netmon);
+
+	DBG("");
+	ofono_netmon_set_data(netmon, NULL);
+
+	if (nm->register_id > 0) {
+		g_source_remove(nm->register_id);
+	}
+
+	sailfish_cell_info_unref(nm->cell_info);
+	g_slice_free(struct ril_netmon, nm);
+}
+
+const struct ofono_netmon_driver ril_netmon_driver = {
+	.name                   = RILMODEM_DRIVER,
+	.probe			= ril_netmon_probe,
+	.remove			= ril_netmon_remove,
+	.request_update		= ril_netmon_request_update,
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_netreg.c

@@ -0,0 +1,552 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2016 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_network.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include "common.h"
+#include "simutil.h"
+
+enum ril_netreg_events {
+	NETREG_RIL_EVENT_NITZ_TIME_RECEIVED,
+	NETREG_RIL_EVENT_SIGNAL_STRENGTH,
+	NETREG_RIL_EVENT_COUNT
+};
+
+enum ril_netreg_network_events {
+	NETREG_NETWORK_EVENT_OPERATOR_CHANGED,
+	NETREG_NETWORK_EVENT_VOICE_STATE_CHANGED,
+	NETREG_NETWORK_EVENT_COUNT
+};
+
+struct ril_netreg {
+	GRilIoChannel *io;
+	GRilIoQueue *q;
+	struct ofono_netreg *netreg;
+	struct ril_network *network;
+	char *log_prefix;
+	guint timer_id;
+	guint notify_id;
+	guint current_operator_id;
+	gulong ril_event_id[NETREG_RIL_EVENT_COUNT];
+	gulong network_event_id[NETREG_NETWORK_EVENT_COUNT];
+};
+
+struct ril_netreg_cbd {
+	struct ril_netreg *nd;
+	union {
+		ofono_netreg_status_cb_t status;
+		ofono_netreg_operator_cb_t operator;
+		ofono_netreg_operator_list_cb_t operator_list;
+		ofono_netreg_register_cb_t reg;
+		ofono_netreg_strength_cb_t strength;
+		gpointer ptr;
+	} cb;
+	gpointer data;
+};
+
+#define ril_netreg_cbd_free g_free
+
+static inline struct ril_netreg *ril_netreg_get_data(struct ofono_netreg *ofono)
+{
+	return ofono ? ofono_netreg_get_data(ofono) : NULL;
+}
+
+static struct ril_netreg_cbd *ril_netreg_cbd_new(struct ril_netreg *nd,
+						void *cb, void *data)
+{
+	struct ril_netreg_cbd *cbd = g_new0(struct ril_netreg_cbd, 1);
+
+	cbd->nd = nd;
+	cbd->cb.ptr = cb;
+	cbd->data = data;
+	return cbd;
+}
+
+int ril_netreg_check_if_really_roaming(struct ofono_netreg *netreg,
+								gint status)
+{
+	if (status == NETWORK_REGISTRATION_STATUS_ROAMING) {
+		/* These functions tolerate NULL argument */
+		const char *net_mcc = ofono_netreg_get_mcc(netreg);
+		const char *net_mnc = ofono_netreg_get_mnc(netreg);
+		struct sim_spdi *spdi = ofono_netreg_get_spdi(netreg);
+
+		if (spdi && net_mcc && net_mnc) {
+			if (sim_spdi_lookup(spdi, net_mcc, net_mnc)) {
+				ofono_info("not roaming based on spdi");
+				return NETWORK_REGISTRATION_STATUS_REGISTERED;
+			}
+		}
+	}
+
+	return status;
+}
+
+static int ril_netreg_check_status(struct ril_netreg *nd, int status)
+{
+	return (nd && nd->netreg) ?
+		ril_netreg_check_if_really_roaming(nd->netreg, status) :
+		status;
+}
+
+static gboolean ril_netreg_status_notify_cb(gpointer user_data)
+{
+	struct ril_netreg *nd = user_data;
+	const struct ril_registration_state *reg = &nd->network->voice;
+
+	DBG("%s", nd->log_prefix);
+	GASSERT(nd->notify_id);
+	nd->notify_id = 0;
+	ofono_netreg_status_notify(nd->netreg,
+			ril_netreg_check_status(nd, reg->status),
+			reg->lac, reg->ci, reg->access_tech);
+	return FALSE;
+}
+
+static void ril_netreg_status_notify(struct ril_network *net, void *user_data)
+{
+	struct ril_netreg *nd = user_data;
+
+	/* Coalesce multiple notifications into one */
+	if (nd->notify_id) {
+		DBG("%snotification aready queued", nd->log_prefix);
+	} else {
+		DBG("%squeuing notification", nd->log_prefix);
+		nd->notify_id = g_idle_add(ril_netreg_status_notify_cb, nd);
+	}
+}
+
+static void ril_netreg_registration_status(struct ofono_netreg *netreg,
+			ofono_netreg_status_cb_t cb, void *data)
+{
+	struct ril_netreg *nd = ril_netreg_get_data(netreg);
+	const struct ril_registration_state *reg = &nd->network->voice;
+	struct ofono_error error;
+
+	DBG("%s", nd->log_prefix);
+	cb(ril_error_ok(&error),
+			ril_netreg_check_status(nd, reg->status),
+			reg->lac, reg->ci, reg->access_tech, data);
+}
+
+static gboolean ril_netreg_current_operator_cb(void *user_data)
+{
+	struct ril_netreg_cbd *cbd = user_data;
+	struct ril_netreg *nd = cbd->nd;
+	ofono_netreg_operator_cb_t cb = cbd->cb.operator;
+	struct ofono_error error;
+
+	DBG("%s", nd->log_prefix);
+	GASSERT(nd->current_operator_id);
+	nd->current_operator_id = 0;
+
+	cb(ril_error_ok(&error), nd->network->operator, cbd->data);
+	return FALSE;
+}
+
+static void ril_netreg_current_operator(struct ofono_netreg *netreg,
+				ofono_netreg_operator_cb_t cb, void *data)
+{
+	struct ril_netreg *nd = ril_netreg_get_data(netreg);
+
+	/*
+	 * Calling ofono_netreg_status_notify() may result in
+	 * ril_netreg_current_operator() being invoked even if one
+	 * is already pending. Since ofono core doesn't associate
+	 * any context with individual calls, we can safely assume
+	 * that such a call essentially cancels the previous one.
+	 */
+	if (nd->current_operator_id) {
+		g_source_remove(nd->current_operator_id);
+	}
+
+	nd->current_operator_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
+					ril_netreg_current_operator_cb,
+					ril_netreg_cbd_new(nd, cb, data),
+					ril_netreg_cbd_free);
+}
+
+static void ril_netreg_list_operators_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_netreg_cbd *cbd = user_data;
+	ofono_netreg_operator_list_cb_t cb = cbd->cb.operator_list;
+	struct ofono_network_operator *list;
+	struct ofono_error error;
+	int noperators = 0, i;
+	GRilIoParser rilp;
+	gboolean ok = TRUE;
+
+	if (status != RIL_E_SUCCESS) {
+		ofono_error("Failed to retrive the list of operators: %s",
+						ril_error_to_string(status));
+		cb(ril_error_failure(&error), 0, NULL, cbd->data);
+		return;
+	}
+
+	grilio_parser_init(&rilp, data, len);
+
+	/* Number of operators at the list (4 strings for every operator) */
+	grilio_parser_get_int32(&rilp, &noperators);
+	GASSERT(!(noperators % 4));
+	noperators /= 4;
+	ofono_info("noperators = %d", noperators);
+
+	list = g_new0(struct ofono_network_operator, noperators);
+	for (i = 0; i < noperators && ok; i++) {
+		struct ofono_network_operator *op = list + i;
+		char *lalpha = grilio_parser_get_utf8(&rilp);
+		char *salpha = grilio_parser_get_utf8(&rilp);
+		char *numeric = grilio_parser_get_utf8(&rilp);
+		char *status = grilio_parser_get_utf8(&rilp);
+
+		/* Try to use long by default */
+		if (lalpha) {
+			strncpy(op->name, lalpha,
+					OFONO_MAX_OPERATOR_NAME_LENGTH);
+		} else if (salpha) {
+			strncpy(op->name, salpha,
+					OFONO_MAX_OPERATOR_NAME_LENGTH);
+		} else {
+			op->name[0] = 0;
+		}
+
+		/* Set the proper status  */
+		if (!strcmp(status, "available")) {
+			list[i].status = OPERATOR_STATUS_AVAILABLE;
+		} else if (!strcmp(status, "current")) {
+			list[i].status = OPERATOR_STATUS_CURRENT;
+		} else if (!strcmp(status, "forbidden")) {
+			list[i].status = OPERATOR_STATUS_FORBIDDEN;
+		} else {
+			list[i].status = OPERATOR_STATUS_UNKNOWN;
+		}
+
+		op->tech = -1;
+		ok = ril_parse_mcc_mnc(numeric, op);
+		if (ok) {
+			if (op->tech < 0) {
+				op->tech = cbd->nd->network->voice.access_tech;
+			}
+			DBG("[operator=%s, %s, %s, status: %s]", op->name,
+						op->mcc, op->mnc, status);
+		} else {
+			DBG("failed to parse operator list");
+		}
+
+		g_free(lalpha);
+		g_free(salpha);
+		g_free(numeric);
+		g_free(status);
+	}
+
+	if (ok) {
+		cb(ril_error_ok(&error), noperators, list, cbd->data);
+	} else {
+		cb(ril_error_failure(&error), 0, NULL, cbd->data);
+	}
+
+	g_free(list);
+}
+
+static void ril_netreg_list_operators(struct ofono_netreg *netreg,
+				ofono_netreg_operator_list_cb_t cb, void *data)
+{
+	struct ril_netreg *nd = ril_netreg_get_data(netreg);
+
+	grilio_queue_send_request_full(nd->q, NULL,
+			RIL_REQUEST_QUERY_AVAILABLE_NETWORKS,
+			ril_netreg_list_operators_cb, ril_netreg_cbd_free,
+			ril_netreg_cbd_new(nd, cb, data));
+}
+
+static void ril_netreg_register_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_netreg_cbd *cbd = user_data;
+	ofono_netreg_register_cb_t cb = cbd->cb.reg;
+	struct ofono_error error;
+
+	if (status == RIL_E_SUCCESS) {
+		cb(ril_error_ok(&error), cbd->data);
+	} else {
+		ofono_error("registration failed, ril result %d", status);
+		cb(ril_error_failure(&error), cbd->data);
+	}
+}
+
+static void ril_netreg_register_auto(struct ofono_netreg *netreg,
+				ofono_netreg_register_cb_t cb, void *data)
+{
+	struct ril_netreg *nd = ril_netreg_get_data(netreg);
+
+	ofono_info("nw select automatic");
+	grilio_queue_send_request_full(nd->q, NULL,
+			RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC,
+			ril_netreg_register_cb, ril_netreg_cbd_free,
+			ril_netreg_cbd_new(nd, cb, data));
+}
+
+static void ril_netreg_register_manual(struct ofono_netreg *netreg,
+				const char *mcc, const char *mnc,
+				ofono_netreg_register_cb_t cb, void *data)
+{
+	struct ril_netreg *nd = ril_netreg_get_data(netreg);
+	GRilIoRequest *req = grilio_request_new();
+
+	ofono_info("nw select manual: %s%s", mcc, mnc);
+	grilio_request_append_format(req, "%s%s+0", mcc, mnc);
+	grilio_queue_send_request_full(nd->q, req,
+			RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL,
+			ril_netreg_register_cb, ril_netreg_cbd_free,
+			ril_netreg_cbd_new(nd, cb, data));
+	grilio_request_unref(req);
+}
+
+static int ril_netreg_get_signal_strength(const void *data, guint len)
+{
+	GRilIoParser rilp;
+	int gw_signal = 0, cdma_dbm = 0, evdo_dbm = 0, lte_signal = 0;
+
+	grilio_parser_init(&rilp, data, len);
+
+	/* RIL_SignalStrength_v6 */
+	/* GW_SignalStrength */
+	grilio_parser_get_int32(&rilp, &gw_signal);
+	grilio_parser_get_int32(&rilp, NULL); /* bitErrorRate */
+
+	/* CDMA_SignalStrength */
+	grilio_parser_get_int32(&rilp, &cdma_dbm);
+	grilio_parser_get_int32(&rilp, NULL); /* ecio */
+
+	/* EVDO_SignalStrength */
+	grilio_parser_get_int32(&rilp, &evdo_dbm);
+	grilio_parser_get_int32(&rilp, NULL); /* ecio */
+	grilio_parser_get_int32(&rilp, NULL); /* signalNoiseRatio */
+
+	/* LTE_SignalStrength */
+	grilio_parser_get_int32(&rilp, &lte_signal);
+	grilio_parser_get_int32(&rilp, NULL); /* rsrp */
+	grilio_parser_get_int32(&rilp, NULL); /* rsrq */
+	grilio_parser_get_int32(&rilp, NULL); /* rssnr */
+	grilio_parser_get_int32(&rilp, NULL); /* cqi */
+
+	DBG("gw: %d, cdma: %d, evdo: %d, lte: %d", gw_signal, cdma_dbm,
+							evdo_dbm, lte_signal);
+
+	/* Return the first valid one */
+	if (gw_signal != 99 && gw_signal != -1) {
+		return (gw_signal * 100) / 31;
+	}
+
+	if (lte_signal != 99 && lte_signal != -1) {
+		return (lte_signal * 100) / 31;
+	}
+
+	/* In case of dbm, return the value directly */
+	if (cdma_dbm != -1) {
+		return MIN(cdma_dbm, 100);
+	}
+
+	if (evdo_dbm != -1) {
+		return MIN(evdo_dbm, 100);
+	}
+
+	return -1;
+}
+
+static void ril_netreg_strength_notify(GRilIoChannel *io, guint ril_event,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_netreg *nd = user_data;
+	int strength;
+
+	GASSERT(ril_event == RIL_UNSOL_SIGNAL_STRENGTH);
+	strength = ril_netreg_get_signal_strength(data, len);
+	DBG("%d", strength);
+	ofono_netreg_strength_notify(nd->netreg, strength);
+}
+
+static void ril_netreg_strength_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_netreg_cbd *cbd = user_data;
+	ofono_netreg_strength_cb_t cb = cbd->cb.strength;
+	struct ofono_error error;
+
+	if (status == RIL_E_SUCCESS) {
+		int strength = ril_netreg_get_signal_strength(data, len);
+		cb(ril_error_ok(&error), strength, cbd->data);
+	} else {
+		ofono_error("Failed to retrive the signal strength: %s",
+						ril_error_to_string(status));
+		cb(ril_error_failure(&error), -1, cbd->data);
+	}
+}
+
+static void ril_netreg_strength(struct ofono_netreg *netreg,
+				ofono_netreg_strength_cb_t cb, void *data)
+{
+	struct ril_netreg *nd = ril_netreg_get_data(netreg);
+	GRilIoRequest* req = grilio_request_new();
+
+	grilio_request_set_retry(req, RIL_RETRY_MS, -1);
+	grilio_queue_send_request_full(nd->q, req,
+			RIL_REQUEST_SIGNAL_STRENGTH, ril_netreg_strength_cb,
+			ril_netreg_cbd_free, ril_netreg_cbd_new(nd, cb, data));
+	grilio_request_unref(req);
+}
+
+static void ril_netreg_nitz_notify(GRilIoChannel *io, guint ril_event,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_netreg *nd = user_data;
+	GRilIoParser rilp;
+	struct ofono_network_time time;
+	int year, mon, mday, hour, min, sec, dst, tzi;
+	char tzs, tz[4];
+	gchar *nitz;
+
+	GASSERT(ril_event == RIL_UNSOL_NITZ_TIME_RECEIVED);
+
+	grilio_parser_init(&rilp, data, len);
+	nitz = grilio_parser_get_utf8(&rilp);
+
+	DBG("%s", nitz);
+	sscanf(nitz, "%u/%u/%u,%u:%u:%u%c%u,%u", &year, &mon, &mday,
+			&hour, &min, &sec, &tzs, &tzi, &dst);
+	snprintf(tz, sizeof(tz), "%c%d", tzs, tzi);
+
+	time.utcoff = atoi(tz) * 15 * 60;
+	time.dst = dst;
+	time.sec = sec;
+	time.min = min;
+	time.hour = hour;
+	time.mday = mday;
+	time.mon = mon;
+	time.year = 2000 + year;
+
+	ofono_netreg_time_notify(nd->netreg, &time);
+	g_free(nitz);
+}
+
+static gboolean ril_netreg_register(gpointer user_data)
+{
+	struct ril_netreg *nd = user_data;
+
+	GASSERT(nd->timer_id);
+	nd->timer_id = 0;
+	ofono_netreg_register(nd->netreg);
+
+	/* Register for network state changes */
+	nd->network_event_id[NETREG_NETWORK_EVENT_OPERATOR_CHANGED] =
+		ril_network_add_operator_changed_handler(nd->network,
+			ril_netreg_status_notify, nd);
+	nd->network_event_id[NETREG_NETWORK_EVENT_VOICE_STATE_CHANGED] =
+		ril_network_add_voice_state_changed_handler(nd->network,
+			ril_netreg_status_notify, nd);
+
+	/* Register for network time updates */
+	nd->ril_event_id[NETREG_RIL_EVENT_NITZ_TIME_RECEIVED] =
+		grilio_channel_add_unsol_event_handler(nd->io,
+			ril_netreg_nitz_notify, 
+			RIL_UNSOL_NITZ_TIME_RECEIVED, nd);
+
+	/* Register for signal strength changes */
+	nd->ril_event_id[NETREG_RIL_EVENT_SIGNAL_STRENGTH] =
+		grilio_channel_add_unsol_event_handler(nd->io,
+			ril_netreg_strength_notify,
+			RIL_UNSOL_SIGNAL_STRENGTH, nd);
+
+	/* This makes the timeout a single-shot */
+	return FALSE;
+}
+
+static int ril_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
+				void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_netreg *nd = g_new0(struct ril_netreg, 1);
+	guint slot = ril_modem_slot(modem);
+
+	DBG("[%u] %p", slot, netreg);
+	nd->log_prefix = g_strdup_printf("%s_%u ", RILMODEM_DRIVER, slot);
+	nd->io = grilio_channel_ref(ril_modem_io(modem));
+	nd->q = grilio_queue_new(nd->io);
+	nd->network = ril_network_ref(modem->network);
+	nd->netreg = netreg;
+
+	ofono_netreg_set_data(netreg, nd);
+	nd->timer_id = g_idle_add(ril_netreg_register, nd);
+	return 0;
+}
+
+static void ril_netreg_remove(struct ofono_netreg *netreg)
+{
+	struct ril_netreg *nd = ril_netreg_get_data(netreg);
+	unsigned int i;
+
+	DBG("%p", netreg);
+	grilio_queue_cancel_all(nd->q, FALSE);
+	ofono_netreg_set_data(netreg, NULL);
+
+	if (nd->timer_id > 0) {
+		g_source_remove(nd->timer_id);
+	}
+
+	if (nd->notify_id) {
+		g_source_remove(nd->notify_id);
+	}
+
+	if (nd->current_operator_id) {
+		g_source_remove(nd->current_operator_id);
+	}
+
+	for (i=0; i<G_N_ELEMENTS(nd->network_event_id); i++) {
+		ril_network_remove_handler(nd->network, nd->network_event_id[i]);
+	}
+	ril_network_unref(nd->network);
+
+	grilio_channel_remove_handlers(nd->io, nd->ril_event_id,
+						G_N_ELEMENTS(nd->ril_event_id));
+
+	grilio_channel_unref(nd->io);
+	grilio_queue_unref(nd->q);
+	g_free(nd->log_prefix);
+	g_free(nd);
+}
+
+const struct ofono_netreg_driver ril_netreg_driver = {
+	.name                   = RILMODEM_DRIVER,
+	.probe                  = ril_netreg_probe,
+	.remove                 = ril_netreg_remove,
+	.registration_status    = ril_netreg_registration_status,
+	.current_operator       = ril_netreg_current_operator,
+	.list_operators         = ril_netreg_list_operators,
+	.register_auto          = ril_netreg_register_auto,
+	.register_manual        = ril_netreg_register_manual,
+	.strength               = ril_netreg_strength
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_network.c

@@ -0,0 +1,940 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_network.h"
+#include "ril_radio.h"
+#include "ril_sim_card.h"
+#include "ril_sim_settings.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include <grilio_queue.h>
+#include <grilio_request.h>
+#include <grilio_parser.h>
+
+#include <gutil_misc.h>
+
+#include <ofono/netreg.h>
+
+#include "common.h"
+
+#define SET_PREF_MODE_HOLDOFF_SEC RIL_RETRY_SECS
+
+typedef GObjectClass RilNetworkClass;
+typedef struct ril_network RilNetwork;
+
+enum ril_network_timer {
+	TIMER_SET_RAT_HOLDOFF,
+	TIMER_FORCE_CHECK_PREF_MODE,
+	TIMER_COUNT
+};
+
+enum ril_network_radio_event {
+	RADIO_EVENT_STATE_CHANGED,
+	RADIO_EVENT_ONLINE_CHANGED,
+	RADIO_EVENT_COUNT
+};
+
+enum ril_network_unsol_event {
+	UNSOL_EVENT_NETWORK_STATE,
+	UNSOL_EVENT_RADIO_CAPABILITY,
+	UNSOL_EVENT_COUNT
+};
+
+struct ril_network_priv {
+	GRilIoChannel *io;
+	GRilIoQueue *q;
+	struct ril_radio *radio;
+	struct ril_sim_card *sim_card;
+	int rat;
+	char *log_prefix;
+	guint operator_poll_id;
+	guint voice_poll_id;
+	guint data_poll_id;
+	guint timer[TIMER_COUNT];
+	gulong query_rat_id;
+	gulong set_rat_id;
+	gulong unsol_event_id[UNSOL_EVENT_COUNT];
+	gulong settings_event_id;
+	gulong sim_status_event_id;
+	gulong radio_event_id[RADIO_EVENT_COUNT];
+	struct ofono_network_operator operator;
+	gboolean assert_rat;
+};
+
+enum ril_network_signal {
+	SIGNAL_OPERATOR_CHANGED,
+	SIGNAL_VOICE_STATE_CHANGED,
+	SIGNAL_DATA_STATE_CHANGED,
+	SIGNAL_PREF_MODE_CHANGED,
+	SIGNAL_MAX_PREF_MODE_CHANGED,
+	SIGNAL_COUNT
+};
+
+#define SIGNAL_OPERATOR_CHANGED_NAME      "ril-network-operator-changed"
+#define SIGNAL_VOICE_STATE_CHANGED_NAME   "ril-network-voice-state-changed"
+#define SIGNAL_DATA_STATE_CHANGED_NAME    "ril-network-data-state-changed"
+#define SIGNAL_PREF_MODE_CHANGED_NAME     "ril-network-pref-mode-changed"
+#define SIGNAL_MAX_PREF_MODE_CHANGED_NAME "ril-network-max-pref-mode-changed"
+
+static guint ril_network_signals[SIGNAL_COUNT] = { 0 };
+
+G_DEFINE_TYPE(RilNetwork, ril_network, G_TYPE_OBJECT)
+#define RIL_NETWORK_TYPE (ril_network_get_type())
+#define RIL_NETWORK(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj,\
+        RIL_NETWORK_TYPE,RilNetwork))
+
+#define RIL_NETWORK_SIGNAL(klass,name) \
+	ril_network_signals[SIGNAL_##name##_CHANGED] = \
+		g_signal_new(SIGNAL_##name##_CHANGED_NAME, \
+			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST, \
+			0, NULL, NULL, NULL, G_TYPE_NONE, 0)
+
+#define DBG_(self,fmt,args...) DBG("%s" fmt, (self)->priv->log_prefix, ##args)
+
+/* Some assumptions: */
+G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_ANY == 0);
+G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_GSM > OFONO_RADIO_ACCESS_MODE_ANY);
+G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_UMTS > OFONO_RADIO_ACCESS_MODE_GSM);
+G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_LTE > OFONO_RADIO_ACCESS_MODE_UMTS);
+
+static void ril_network_query_pref_mode(struct ril_network *self);
+static void ril_network_set_pref_mode(struct ril_network *self, int rat);
+
+static void ril_network_emit(struct ril_network *self,
+						enum ril_network_signal sig)
+{
+	g_signal_emit(self, ril_network_signals[sig], 0);
+}
+
+static void ril_network_stop_timer(struct ril_network *self,
+					enum ril_network_timer tid)
+{
+	struct ril_network_priv *priv = self->priv;
+
+	if (priv->timer[tid]) {
+		g_source_remove(priv->timer[tid]);
+		priv->timer[tid] = 0;
+	}
+}
+
+static void ril_network_reset_state(struct ril_registration_state *reg)
+{
+	memset(reg, 0, sizeof(*reg));
+	reg->status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
+	reg->access_tech = -1;
+	reg->ril_tech = -1;
+	reg->lac = -1;
+	reg->ci = -1;
+}
+
+static gboolean ril_network_parse_response(struct ril_network *self,
+	const void *data, guint len, struct ril_registration_state *reg)
+{
+	int nparams, ril_status;
+	gchar *sstatus = NULL, *slac = NULL, *sci = NULL;
+	gchar *stech = NULL, *sreason = NULL, *smax = NULL;
+	GRilIoParser rilp;
+
+	ril_network_reset_state(reg);
+
+	/* Size of response string array. The minimum seen in the wild is 3 */
+	grilio_parser_init(&rilp, data, len);
+	if (!grilio_parser_get_int32(&rilp, &nparams) || nparams < 3) {
+		DBG_(self, "broken response");
+		return FALSE;
+	}
+
+	sstatus = grilio_parser_get_utf8(&rilp);              /* response[0] */
+	if (!sstatus) {
+		DBG_(self, "No sstatus value returned!");
+		return FALSE;
+	}
+
+	slac = grilio_parser_get_utf8(&rilp);                 /* response[1] */
+	sci = grilio_parser_get_utf8(&rilp);                  /* response[2] */
+
+	if (nparams > 3) {
+		stech = grilio_parser_get_utf8(&rilp);        /* response[3] */
+	}
+
+	ril_status = atoi(sstatus);
+	if (ril_status > 10) {
+		reg->status = ril_status - 10;
+	} else {
+		reg->status = ril_status;
+	}
+
+	/* FIXME: need to review VOICE_REGISTRATION response
+	 * as it returns up to 15 parameters ( vs. 6 for DATA ).
+	 *
+	 * The first four parameters are the same for both
+	 * responses ( although status includes values for
+	 * emergency calls for VOICE response ).
+	 *
+	 * Parameters 5 & 6 have different meanings for
+	 * voice & data response.
+	 */
+	if (nparams > 4) {
+		/* TODO: different use for CDMA */
+		sreason = grilio_parser_get_utf8(&rilp);      /* response[4] */
+		if (nparams > 5) {
+			/* TODO: different use for CDMA */
+			smax = grilio_parser_get_utf8(&rilp); /* response[5] */
+			if (smax) {
+				reg->max_calls = atoi(smax);
+			}
+		}
+	}
+
+	/*
+	 * Some older RILs don't provide max calls, in that case let's
+	 * supply some reasonable default. We don't need more than 2
+	 * simultaneous data calls anyway.
+	 */
+	if (reg->max_calls < 1) {
+		reg->max_calls = 2;
+	}
+
+	if (!ril_parse_int(slac, 16, &reg->lac)) {
+		reg->lac = -1;
+	}
+
+	if (!ril_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",
+				registration_status_to_string(reg->status),
+				slac, sci, reg->ril_tech,
+				registration_tech_to_string(reg->access_tech),
+				sreason, smax);
+
+	g_free(sstatus);
+	g_free(slac);
+	g_free(sci);
+	g_free(stech);
+	g_free(sreason);
+	g_free(smax);
+	return TRUE;
+}
+
+static void ril_network_op_copy(struct ofono_network_operator *dest,
+				const struct ofono_network_operator *src)
+{
+	strncpy(dest->mcc, src->mcc, sizeof(dest->mcc));
+	strncpy(dest->mnc, src->mnc, sizeof(dest->mnc));
+	strncpy(dest->name, src->name, sizeof(dest->name));
+	dest->mcc[sizeof(dest->mcc)-1] = 0;
+	dest->mnc[sizeof(dest->mnc)-1] = 0;
+	dest->name[sizeof(dest->name)-1] = 0;
+	dest->status = src->status;
+	dest->tech = src->tech;
+}
+
+static gboolean ril_network_op_equal(const struct ofono_network_operator *op1,
+				const struct ofono_network_operator *op2)
+{
+	if (op1 == op2) {
+		return TRUE;
+	} else if (!op1 || !op2) {
+		return FALSE;
+	} else {
+		return op1->status == op2->status &&
+			op1->tech == op2->tech &&
+			!strncmp(op1->mcc, op2->mcc, sizeof(op2->mcc)) &&
+			!strncmp(op1->mnc, op2->mnc, sizeof(op2->mnc)) &&
+			!strncmp(op1->name, op2->name, sizeof(op2->name));
+	}
+}
+
+static void ril_network_poll_operator_cb(GRilIoChannel *io, int req_status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+	struct ril_network_priv *priv = self->priv;
+
+	GASSERT(priv->operator_poll_id);
+	priv->operator_poll_id = 0;
+
+	if (req_status == RIL_E_SUCCESS) {
+		struct ofono_network_operator op;
+		gboolean changed = FALSE;
+		gchar *lalpha;
+		char *salpha;
+		char *numeric;
+		GRilIoParser rilp;
+
+		grilio_parser_init(&rilp, data, len);
+		grilio_parser_get_int32(&rilp, NULL);
+		lalpha = grilio_parser_get_utf8(&rilp);
+		salpha = grilio_parser_get_utf8(&rilp);
+		numeric = grilio_parser_get_utf8(&rilp);
+
+		op.tech = -1;
+		if (ril_parse_mcc_mnc(numeric, &op)) {
+			if (op.tech < 0) op.tech = self->voice.access_tech;
+			op.status = OPERATOR_STATUS_CURRENT;
+			op.name[0] = 0;
+			if (lalpha) {
+				strncpy(op.name, lalpha, sizeof(op.name));
+			} else if (salpha) {
+				strncpy(op.name, salpha, sizeof(op.name));
+			} else {
+				strncpy(op.name, numeric, sizeof(op.name));
+			}
+			op.name[sizeof(op.name)-1] = 0;
+			if (!self->operator) {
+				self->operator = &priv->operator;
+				ril_network_op_copy(&priv->operator, &op);
+				changed = TRUE;
+			} else if (!ril_network_op_equal(&op, &priv->operator)) {
+				ril_network_op_copy(&priv->operator, &op);
+				changed = TRUE;
+			}
+		} else if (self->operator) {
+			self->operator = NULL;
+			changed = TRUE;
+		}
+
+		if (changed) {
+			if (self->operator) {
+				DBG_(self, "lalpha=%s, salpha=%s, numeric=%s, "
+					"%s, mcc=%s, mnc=%s, %s",
+					lalpha, salpha, numeric,
+					op.name, op.mcc, op.mnc,
+					registration_tech_to_string(op.tech));
+			} else {
+				DBG_(self, "no operator");
+			}
+			ril_network_emit(self, SIGNAL_OPERATOR_CHANGED);
+		}
+
+		g_free(lalpha);
+		g_free(salpha);
+		g_free(numeric);
+	}
+}
+
+static void ril_network_poll_voice_state_cb(GRilIoChannel *io, int req_status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+	struct ril_network_priv *priv = self->priv;
+
+	GASSERT(priv->voice_poll_id);
+	priv->voice_poll_id = 0;
+
+	if (req_status == RIL_E_SUCCESS) {
+		struct ril_registration_state state;
+
+		ril_network_parse_response(self, data, len, &state);
+		if (memcmp(&state, &self->voice, sizeof(state))) {
+			DBG_(self, "voice registration changed");
+			self->voice = state;
+			ril_network_emit(self, SIGNAL_VOICE_STATE_CHANGED);
+		}
+	}
+}
+
+static void ril_network_poll_data_state_cb(GRilIoChannel *io, int req_status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+	struct ril_network_priv *priv = self->priv;
+
+	GASSERT(priv->data_poll_id);
+	priv->data_poll_id = 0;
+
+	if (req_status == RIL_E_SUCCESS) {
+		struct ril_registration_state state;
+
+		ril_network_parse_response(self, data, len, &state);
+		if (memcmp(&state, &self->data, sizeof(state))) {
+			DBG_(self, "data registration changed");
+			self->data = state;
+			ril_network_emit(self, SIGNAL_DATA_STATE_CHANGED);
+		}
+	}
+}
+
+static guint ril_network_poll_and_retry(struct ril_network *self, guint id,
+					int code, GRilIoChannelResponseFunc fn)
+{
+	struct ril_network_priv *priv = self->priv;
+
+	if (id) {
+		/* Retry right away, don't wait for retry timeout to expire */
+		grilio_channel_retry_request(priv->io, id);
+	} else {
+		GRilIoRequest *req = grilio_request_new();
+
+		grilio_request_set_retry(req, RIL_RETRY_SECS*1000, -1);
+		id = grilio_queue_send_request_full(priv->q, req, code, fn,
+								NULL, self);
+		grilio_request_unref(req);
+	}
+
+	return id;
+}
+
+static void ril_network_poll_state(struct ril_network *self)
+{
+	struct ril_network_priv *priv = self->priv;
+
+	DBG_(self, "");
+	priv->operator_poll_id = ril_network_poll_and_retry(self,
+		priv->operator_poll_id, RIL_REQUEST_OPERATOR,
+		ril_network_poll_operator_cb);
+	priv->voice_poll_id = ril_network_poll_and_retry(self,
+		priv->voice_poll_id, RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		ril_network_poll_voice_state_cb);
+	priv->data_poll_id = ril_network_poll_and_retry(self,
+		priv->data_poll_id, RIL_REQUEST_DATA_REGISTRATION_STATE,
+		ril_network_poll_data_state_cb);
+}
+
+static enum ofono_radio_access_mode ril_network_rat_to_mode(int rat)
+{
+	switch (rat) {
+	case PREF_NET_TYPE_LTE_CDMA_EVDO:
+	case PREF_NET_TYPE_LTE_GSM_WCDMA:
+	case PREF_NET_TYPE_LTE_CMDA_EVDO_GSM_WCDMA:
+	case PREF_NET_TYPE_LTE_ONLY:
+	case PREF_NET_TYPE_LTE_WCDMA:
+		return OFONO_RADIO_ACCESS_MODE_LTE;
+	case PREF_NET_TYPE_GSM_WCDMA_AUTO:
+	case PREF_NET_TYPE_WCDMA:
+	case PREF_NET_TYPE_GSM_WCDMA:
+		return OFONO_RADIO_ACCESS_MODE_UMTS;
+	default:
+		DBG("unexpected rat mode %d", rat);
+	case PREF_NET_TYPE_GSM_ONLY:
+		return OFONO_RADIO_ACCESS_MODE_GSM;
+	}
+}
+
+static int ril_network_mode_to_rat(struct ril_network *self,
+					enum ofono_radio_access_mode mode)
+{
+	switch (mode) {
+	case OFONO_RADIO_ACCESS_MODE_ANY:
+	case OFONO_RADIO_ACCESS_MODE_LTE:
+		if (self->settings->techs & OFONO_RADIO_ACCESS_MODE_LTE) {
+			return PREF_NET_TYPE_LTE_GSM_WCDMA;
+		}
+		/* no break */
+	default:
+	case OFONO_RADIO_ACCESS_MODE_UMTS:
+		if (self->settings->techs & OFONO_RADIO_ACCESS_MODE_UMTS) {
+			return PREF_NET_TYPE_GSM_WCDMA_AUTO;
+		}
+		/* no break */
+	case OFONO_RADIO_ACCESS_MODE_GSM:
+		return PREF_NET_TYPE_GSM_ONLY;
+	}
+}
+
+static int ril_network_pref_mode_expected(struct ril_network *self)
+{
+	struct ril_sim_settings *settings = self->settings;
+	struct ril_network_priv *priv = self->priv;
+
+	/*
+	 * On dual-SIM phones such as Jolla C only one slot at a time
+	 * is allowed to use LTE. Even if the slot which has been using
+	 * LTE gets powered off, we still need to explicitely set its
+	 * preferred mode to GSM, to make LTE machinery available to
+	 * the other slot. This sort of behaviour might not be necessary
+	 * on some hardware and can (should) be made configurable when
+	 * it becomes necessary.
+	 */
+	const enum ofono_radio_access_mode max_pref_mode =
+		(priv->radio->state == RADIO_STATE_ON) ? self->max_pref_mode :
+		OFONO_RADIO_ACCESS_MODE_GSM;
+
+	/*
+	 * OFONO_RADIO_ACCESS_MODE_ANY is zero. If both pref_mode
+	 * and max_pref_mode are not ANY, we pick the smallest value.
+	 * Otherwise we take any non-zero value if there is one.
+	 */
+	const enum ofono_radio_access_mode pref_mode =
+		(settings->pref_mode && max_pref_mode) ?
+		MIN(settings->pref_mode, max_pref_mode) :
+		settings->pref_mode ? settings->pref_mode :
+		max_pref_mode;
+	return ril_network_mode_to_rat(self, pref_mode);
+}
+
+static gboolean ril_network_can_set_pref_mode(struct ril_network *self)
+{
+	struct ril_network_priv *priv = self->priv;
+
+	return priv->radio->online && ril_sim_card_ready(priv->sim_card);
+}
+
+static gboolean ril_network_set_rat_holdoff_cb(gpointer user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+	struct ril_network_priv *priv = self->priv;
+	const int rat = ril_network_pref_mode_expected(self);
+
+	DBG_(self, "rat mode %d, expected %d", priv->rat, rat);
+	GASSERT(priv->timer[TIMER_SET_RAT_HOLDOFF]);
+	priv->timer[TIMER_SET_RAT_HOLDOFF] = 0;
+
+	/*
+	 * Don't retry the request if modem is offline or SIM card isn't
+	 * ready, to avoid spamming system log with error messages. Radio
+	 * and SIM card state change callbacks will schedule a new check
+	 * when it's appropriate.
+	 */
+	if (priv->rat != rat || priv->assert_rat) {
+		if (ril_network_can_set_pref_mode(self)) {
+			ril_network_set_pref_mode(self, rat);
+		} else {
+			DBG_(self, "giving up");
+		}
+	}
+
+	return G_SOURCE_REMOVE;
+}
+
+static void ril_network_set_pref_mode_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+	struct ril_network_priv *priv = self->priv;
+
+	GASSERT(priv->set_rat_id);
+	priv->set_rat_id = 0;
+	if (status != RIL_E_SUCCESS) {
+		ofono_error("failed to set rat mode");
+	}
+
+	ril_network_query_pref_mode(self);
+}
+
+static void ril_network_set_pref_mode(struct ril_network *self, int rat)
+{
+	struct ril_network_priv *priv = self->priv;
+	GRilIoRequest *req = grilio_request_sized_new(8);
+
+	DBG_(self, "setting rat mode %d", rat);
+	grilio_request_append_int32(req, 1);    /* Number of params */
+	grilio_request_append_int32(req, rat);
+
+	grilio_queue_cancel_request(priv->q, priv->set_rat_id, FALSE);
+	priv->set_rat_id = grilio_queue_send_request_full(priv->q, req,
+				RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE,
+				ril_network_set_pref_mode_cb, NULL, self);
+	grilio_request_unref(req);
+
+	/* 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);
+}
+
+static void ril_network_check_pref_mode(struct ril_network *self,
+							gboolean force)
+{
+	struct ril_network_priv *priv = self->priv;
+	const int rat = ril_network_pref_mode_expected(self);
+
+	if (priv->timer[TIMER_FORCE_CHECK_PREF_MODE]) {
+		ril_network_stop_timer(self, TIMER_FORCE_CHECK_PREF_MODE);
+		/*
+		 * TIMER_FORCE_CHECK_PREF_MODE is scheduled by
+		 * ril_network_pref_mode_changed_cb and is meant
+		 * to force radio tech check right now.
+		 */
+		force = TRUE;
+	}
+
+	if (priv->rat == rat || force) {
+		ril_network_stop_timer(self, TIMER_SET_RAT_HOLDOFF);
+	}
+
+	if (priv->rat != rat || priv->assert_rat) {
+		if (!priv->timer[TIMER_SET_RAT_HOLDOFF]) {
+			ril_network_set_pref_mode(self, rat);
+		} else {
+			/* OK, later */
+			DBG_(self, "need to set rat mode %d", rat);
+		}
+	}
+}
+
+static int ril_network_parse_pref_resp(const void *data, guint len)
+{
+	GRilIoParser rilp;
+	int pref = -1;
+
+	grilio_parser_init(&rilp, data, len);
+	grilio_parser_get_int32(&rilp, NULL);
+	grilio_parser_get_int32(&rilp, &pref);
+	return pref;
+}
+
+static void ril_network_startup_query_pref_mode_cb(GRilIoChannel *io,
+		int status, const void *data, guint len, void *user_data)
+{
+	if (status == RIL_E_SUCCESS) {
+		struct ril_network *self = RIL_NETWORK(user_data);
+		struct ril_network_priv *priv = self->priv;
+		const enum ofono_radio_access_mode pref_mode = self->pref_mode;
+
+		priv->rat = ril_network_parse_pref_resp(data, len);
+		self->pref_mode = ril_network_rat_to_mode(priv->rat);
+		DBG_(self, "rat mode %d (%s)", priv->rat,
+			ofono_radio_access_mode_to_string(self->pref_mode));
+
+		if (self->pref_mode != pref_mode) {
+			ril_network_emit(self, SIGNAL_PREF_MODE_CHANGED);
+		}
+
+		/*
+		 * Unlike ril_network_query_pref_mode_cb, this one always
+		 * checks the preferred mode.
+		 */
+		ril_network_check_pref_mode(self, FALSE);
+	}
+}
+
+static void ril_network_query_pref_mode_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+	struct ril_network_priv *priv = self->priv;
+	const enum ofono_radio_access_mode pref_mode = self->pref_mode;
+
+	/* This request never fails because in case of error it gets retried */
+	GASSERT(status == RIL_E_SUCCESS);
+	GASSERT(priv->query_rat_id);
+
+	priv->query_rat_id = 0;
+	priv->rat = ril_network_parse_pref_resp(data, len);
+	self->pref_mode = ril_network_rat_to_mode(priv->rat);
+	DBG_(self, "rat mode %d (%s)", priv->rat,
+			ofono_radio_access_mode_to_string(self->pref_mode));
+
+	if (self->pref_mode != pref_mode) {
+		ril_network_emit(self, SIGNAL_PREF_MODE_CHANGED);
+	}
+
+	if (ril_network_can_set_pref_mode(self)) {
+		ril_network_check_pref_mode(self, FALSE);
+	}
+}
+
+static void ril_network_query_pref_mode(struct ril_network *self)
+{
+	struct ril_network_priv *priv = self->priv;
+	GRilIoRequest *req = grilio_request_new();
+
+	grilio_request_set_retry(req, RIL_RETRY_SECS*1000, -1);
+	grilio_queue_cancel_request(priv->q, priv->query_rat_id, FALSE);
+	priv->query_rat_id = grilio_queue_send_request_full(priv->q, req,
+				RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE,
+				ril_network_query_pref_mode_cb, NULL, self);
+	grilio_request_unref(req);
+}
+
+void ril_network_set_max_pref_mode(struct ril_network *self,
+				enum ofono_radio_access_mode max_mode,
+				gboolean force_check)
+{
+	if (self && (self->max_pref_mode != max_mode || force_check)) {
+		if (self->max_pref_mode != max_mode) {
+			DBG_(self, "rat mode %d (%s)", max_mode,
+				ofono_radio_access_mode_to_string(max_mode));
+			self->max_pref_mode = max_mode;
+			ril_network_emit(self, SIGNAL_MAX_PREF_MODE_CHANGED);
+		}
+		ril_network_check_pref_mode(self, TRUE);
+	}
+}
+
+void ril_network_assert_pref_mode(struct ril_network *self, gboolean immediate)
+{
+	struct ril_network_priv *priv = self->priv;
+
+	priv->assert_rat = TRUE;
+	ril_network_check_pref_mode(self, immediate);
+}
+
+gulong ril_network_add_operator_changed_handler(struct ril_network *self,
+					ril_network_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_OPERATOR_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+gulong ril_network_add_voice_state_changed_handler(struct ril_network *self,
+					ril_network_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_VOICE_STATE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+gulong ril_network_add_data_state_changed_handler(struct ril_network *self,
+					ril_network_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_DATA_STATE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+gulong ril_network_add_pref_mode_changed_handler(struct ril_network *self,
+					ril_network_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_PREF_MODE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+gulong ril_network_add_max_pref_mode_changed_handler(struct ril_network *self,
+					ril_network_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_MAX_PREF_MODE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+void ril_network_remove_handler(struct ril_network *self, gulong id)
+{
+	if (G_LIKELY(self) && G_LIKELY(id)) {
+		g_signal_handler_disconnect(self, id);
+	}
+}
+
+void ril_network_remove_handlers(struct ril_network *self, gulong *ids, int n)
+{
+	gutil_disconnect_handlers(self, ids, n);
+}
+
+static void ril_network_state_changed_cb(GRilIoChannel *io, guint code,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+
+	DBG_(self, "");
+	GASSERT(code == RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED);
+	ril_network_poll_state(self);
+}
+
+static void ril_network_radio_capability_changed_cb(GRilIoChannel *io,
+		guint code, const void *data, guint len, void *user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+
+	DBG_(self, "");
+	GASSERT(code == RIL_UNSOL_RADIO_CAPABILITY);
+	ril_network_assert_pref_mode(self, FALSE);
+}
+
+static void ril_network_radio_state_cb(struct ril_radio *radio, void *data)
+{
+	struct ril_network *self = RIL_NETWORK(data);
+
+	ril_network_check_pref_mode(self, FALSE);
+	if (radio->state == RADIO_STATE_ON) {
+		ril_network_poll_state(self);
+	}
+}
+
+static void ril_network_radio_online_cb(struct ril_radio *radio, void *data)
+{
+	struct ril_network *self = RIL_NETWORK(data);
+
+	if (ril_network_can_set_pref_mode(self)) {
+		ril_network_check_pref_mode(self, TRUE);
+	}
+}
+
+static gboolean ril_network_check_pref_mode_cb(gpointer user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+	struct ril_network_priv *priv = self->priv;
+
+	GASSERT(priv->timer[TIMER_FORCE_CHECK_PREF_MODE]);
+	priv->timer[TIMER_FORCE_CHECK_PREF_MODE] = 0;
+
+	DBG_(self, "checking pref mode");
+	ril_network_check_pref_mode(self, TRUE);
+
+	return G_SOURCE_REMOVE;
+}
+
+static void ril_network_pref_mode_changed_cb(struct ril_sim_settings *settings,
+							void *user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+	struct ril_network_priv *priv = self->priv;
+
+	/*
+	 * Postpone ril_network_check_pref_mode because other pref_mode
+	 * listeners (namely, ril_data) may want to tweak max_pref_mode
+	 */
+	if (!priv->timer[TIMER_FORCE_CHECK_PREF_MODE]) {
+		DBG_(self, "scheduling pref mode check");
+		priv->timer[TIMER_FORCE_CHECK_PREF_MODE] =
+			g_idle_add(ril_network_check_pref_mode_cb, self);
+	} else {
+		DBG_(self, "pref mode check already scheduled");
+	}
+}
+
+static void ril_network_sim_status_changed_cb(struct ril_sim_card *sc,
+							void *user_data)
+{
+	struct ril_network *self = RIL_NETWORK(user_data);
+
+	if (ril_network_can_set_pref_mode(self)) {
+		ril_network_check_pref_mode(self, FALSE);
+	}
+}
+
+struct ril_network *ril_network_new(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_network *self = g_object_new(RIL_NETWORK_TYPE, NULL);
+	struct ril_network_priv *priv = self->priv;
+
+	self->settings = ril_sim_settings_ref(settings);
+	priv->io = grilio_channel_ref(io);
+	priv->q = grilio_queue_new(priv->io);
+	priv->radio = ril_radio_ref(radio);
+	priv->sim_card = ril_sim_card_ref(sim_card);
+	priv->log_prefix = (log_prefix && log_prefix[0]) ?
+		g_strconcat(log_prefix, " ", NULL) : g_strdup("");
+	DBG_(self, "");
+	priv->unsol_event_id[UNSOL_EVENT_NETWORK_STATE] =
+		grilio_channel_add_unsol_event_handler(priv->io,
+			ril_network_state_changed_cb,
+			RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED, self);
+	priv->unsol_event_id[UNSOL_EVENT_RADIO_CAPABILITY] =
+		grilio_channel_add_unsol_event_handler(priv->io,
+			ril_network_radio_capability_changed_cb,
+			RIL_UNSOL_RADIO_CAPABILITY, self);
+	priv->radio_event_id[RADIO_EVENT_STATE_CHANGED] =
+		ril_radio_add_state_changed_handler(priv->radio,
+			ril_network_radio_state_cb, self);
+	priv->radio_event_id[RADIO_EVENT_ONLINE_CHANGED] =
+		ril_radio_add_online_changed_handler(priv->radio,
+			ril_network_radio_online_cb, self);
+	priv->settings_event_id =
+		ril_sim_settings_add_pref_mode_changed_handler(settings,
+			ril_network_pref_mode_changed_cb, self);
+	priv->sim_status_event_id =
+		ril_sim_card_add_status_changed_handler(priv->sim_card,
+			ril_network_sim_status_changed_cb, self);
+
+	/*
+	 * Query the initial state. Querying network state before the radio
+	 * has been turned on makes RIL unhappy.
+	 */
+	grilio_queue_send_request_full(priv->q, NULL,
+			RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE,
+			ril_network_startup_query_pref_mode_cb, NULL, self);
+	if (radio->state == RADIO_STATE_ON) {
+		ril_network_poll_state(self);
+	}
+
+	return self;
+}
+
+struct ril_network *ril_network_ref(struct ril_network *self)
+{
+	if (G_LIKELY(self)) {
+		g_object_ref(RIL_NETWORK(self));
+		return self;
+	} else {
+		return NULL;
+	}
+}
+
+void ril_network_unref(struct ril_network *self)
+{
+	if (G_LIKELY(self)) {
+		g_object_unref(RIL_NETWORK(self));
+	}
+}
+
+static void ril_network_init(struct ril_network *self)
+{
+	struct ril_network_priv *priv = G_TYPE_INSTANCE_GET_PRIVATE(self,
+		RIL_NETWORK_TYPE, struct ril_network_priv);
+
+	self->priv = priv;
+	ril_network_reset_state(&self->voice);
+	ril_network_reset_state(&self->data);
+	priv->rat = -1;
+}
+
+static void ril_network_finalize(GObject *object)
+{
+	struct ril_network *self = RIL_NETWORK(object);
+	struct ril_network_priv *priv = self->priv;
+	enum ril_network_timer tid;
+
+	DBG_(self, "");
+
+	for (tid=0; tid<TIMER_COUNT; tid++) {
+		ril_network_stop_timer(self, tid);
+	}
+
+	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_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_settings_remove_handler(self->settings,
+						priv->settings_event_id);
+	ril_sim_settings_unref(self->settings);
+	g_free(priv->log_prefix);
+	G_OBJECT_CLASS(ril_network_parent_class)->finalize(object);
+}
+
+static void ril_network_class_init(RilNetworkClass *klass)
+{
+	G_OBJECT_CLASS(klass)->finalize = ril_network_finalize;
+	g_type_class_add_private(klass, sizeof(struct ril_network_priv));
+	RIL_NETWORK_SIGNAL(klass, OPERATOR);
+	RIL_NETWORK_SIGNAL(klass, VOICE_STATE);
+	RIL_NETWORK_SIGNAL(klass, DATA_STATE);
+	RIL_NETWORK_SIGNAL(klass, PREF_MODE);
+	RIL_NETWORK_SIGNAL(klass, MAX_PREF_MODE);
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_network.h

@@ -0,0 +1,78 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_NETWORK_H
+#define RIL_NETWORK_H
+
+#include "ril_types.h"
+
+struct ofono_network_operator;
+
+struct ril_registration_state {
+	int status;        /* enum network_registration_status */
+	int access_tech;   /* enum access_technology or -1 if none */
+	int ril_tech;
+	int max_calls;
+	int lac;
+	int ci;
+};
+
+struct ril_network {
+	GObject object;
+	struct ril_network_priv *priv;
+	struct ril_registration_state voice;
+	struct ril_registration_state data;
+	const struct ofono_network_operator *operator;
+	enum ofono_radio_access_mode pref_mode;
+	enum ofono_radio_access_mode max_pref_mode;
+	struct ril_sim_settings *settings;
+};
+
+struct ofono_sim;
+typedef void (*ril_network_cb_t)(struct ril_network *net, void *arg);
+
+struct ril_network *ril_network_new(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_network *ril_network_ref(struct ril_network *net);
+void ril_network_unref(struct ril_network *net);
+
+void ril_network_set_max_pref_mode(struct ril_network *net,
+				enum ofono_radio_access_mode max_pref_mode,
+				gboolean force_check);
+void ril_network_assert_pref_mode(struct ril_network *net, gboolean immediate);
+gulong ril_network_add_operator_changed_handler(struct ril_network *net,
+					ril_network_cb_t cb, void *arg);
+gulong ril_network_add_voice_state_changed_handler(struct ril_network *net,
+					ril_network_cb_t cb, void *arg);
+gulong ril_network_add_data_state_changed_handler(struct ril_network *net,
+					ril_network_cb_t cb, void *arg);
+gulong ril_network_add_pref_mode_changed_handler(struct ril_network *net,
+					ril_network_cb_t cb, void *arg);
+gulong ril_network_add_max_pref_mode_changed_handler(struct ril_network *net,
+					ril_network_cb_t cb, void *arg);
+void ril_network_remove_handler(struct ril_network *net, gulong id);
+void ril_network_remove_handlers(struct ril_network *net, gulong *ids, int n);
+
+#endif /* RIL_NETWORK_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_oem_raw.c

@@ -0,0 +1,162 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include "gdbus.h"
+#include "ofono.h"
+
+#define RIL_OEM_RAW_INTERFACE "org.ofono.OemRaw"
+#define RIL_OEM_RAW_TIMEOUT   (60*1000) /* 60 sec */
+
+struct ril_oem_raw {
+	GRilIoQueue *q;
+	DBusConnection *conn;
+	char *path;
+	char *log_prefix;
+};
+
+#define DBG_(oem,fmt,args...) DBG("%s" fmt, (oem)->log_prefix, ##args)
+
+static void ril_oem_raw_send_cb(GRilIoChannel *io, int ril_status,
+			const void *data, guint len, void *user_data)
+{
+	DBusMessage *msg = user_data;
+	DBusMessage *reply;
+
+	if (ril_status == RIL_E_SUCCESS) {
+		DBusMessageIter it, array;
+		const guchar* bytes = data;
+		guint i;
+
+		reply = dbus_message_new_method_return(msg);
+		dbus_message_iter_init_append(reply, &it);
+		dbus_message_iter_open_container(&it, DBUS_TYPE_ARRAY,
+					DBUS_TYPE_BYTE_AS_STRING, &array);
+
+		for (i = 0; i < len; i++) {
+			guchar byte = bytes[i];
+			dbus_message_iter_append_basic(&array, DBUS_TYPE_BYTE,
+									&byte);
+		}
+
+		dbus_message_iter_close_container(&it, &array);
+	} else if (ril_status == GRILIO_STATUS_TIMEOUT) {
+		DBG("Timed out");
+		reply = __ofono_error_timed_out(msg);
+	} else {
+		DBG("Error %s", ril_error_to_string(ril_status));
+		reply = __ofono_error_failed(msg);
+	}
+
+	__ofono_dbus_pending_reply(&msg, reply);
+}
+
+static DBusMessage *ril_oem_raw_send(DBusConnection *conn, DBusMessage *msg,
+							void *user_data)
+{
+	DBusMessageIter it;
+	struct ril_oem_raw *oem = user_data;
+
+	dbus_message_iter_init(msg, &it);
+	if (dbus_message_iter_get_arg_type(&it) == DBUS_TYPE_ARRAY &&
+		dbus_message_iter_get_element_type(&it) == DBUS_TYPE_BYTE) {
+		char *data;
+		int data_len;
+		DBusMessageIter array;
+		GRilIoRequest *req;
+
+		/* Fetch the data */
+		dbus_message_iter_recurse(&it, &array);
+		dbus_message_iter_get_fixed_array(&array, &data, &data_len);
+		DBG_(oem, "%d bytes", data_len);
+
+		/*
+		 * And forward it to rild. Set a timeout because rild may
+		 * never respond to invalid requests.
+		 */
+		req = grilio_request_sized_new(data_len);
+		grilio_request_set_timeout(req, RIL_OEM_RAW_TIMEOUT);
+		grilio_request_append_bytes(req, data, data_len);
+		grilio_queue_send_request_full(oem->q, req,
+				RIL_REQUEST_OEM_HOOK_RAW, ril_oem_raw_send_cb,
+				NULL, dbus_message_ref(msg));
+		grilio_request_unref(req);
+		return NULL;
+	} else {
+		DBG_(oem, "Unexpected signature");
+		return __ofono_error_invalid_args(msg);
+	}
+}
+
+static const GDBusMethodTable ril_oem_raw_methods[] = {
+	{ GDBUS_ASYNC_METHOD("Send",
+			GDBUS_ARGS({ "request", "ay" }),
+			GDBUS_ARGS({ "response", "ay" }),
+			ril_oem_raw_send) },
+	{ }
+};
+
+struct ril_oem_raw *ril_oem_raw_new(struct ril_modem *modem,
+						const char *log_prefix)
+{
+	struct ril_oem_raw *oem = g_new0(struct ril_oem_raw, 1);
+
+	DBG("%s", ril_modem_get_path(modem));
+	oem->path = g_strdup(ril_modem_get_path(modem));
+	oem->conn = dbus_connection_ref(ofono_dbus_get_connection());
+	oem->q = grilio_queue_new(ril_modem_io(modem));
+	oem->log_prefix = (log_prefix && log_prefix[0]) ?
+			g_strconcat(log_prefix, " ", NULL) : g_strdup("");
+
+	/* Register D-Bus interface */
+	if (g_dbus_register_interface(oem->conn, oem->path,
+			RIL_OEM_RAW_INTERFACE, ril_oem_raw_methods,
+			NULL, NULL, oem, NULL)) {
+		ofono_modem_add_interface(modem->ofono, RIL_OEM_RAW_INTERFACE);
+		return oem;
+	} else {
+		ofono_error("OemRaw D-Bus register failed");
+		ril_oem_raw_free(oem);
+		return NULL;
+	}
+}
+
+void ril_oem_raw_free(struct ril_oem_raw *oem)
+{
+	if (oem) {
+		DBG("%s", oem->path);
+		g_dbus_unregister_interface(oem->conn, oem->path,
+						RIL_OEM_RAW_INTERFACE);
+		dbus_connection_unref(oem->conn);
+
+		grilio_queue_cancel_all(oem->q, TRUE);
+		grilio_queue_unref(oem->q);
+
+		g_free(oem->log_prefix);
+		g_free(oem->path);
+		g_free(oem);
+	}
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_plugin.h

@@ -0,0 +1,115 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_PLUGIN_H
+#define RIL_PLUGIN_H
+
+#include "ril_types.h"
+#include "sailfish_manager.h"
+
+#include <ofono/modem.h>
+#include <ofono/call-barring.h>
+#include <ofono/call-forwarding.h>
+#include <ofono/call-settings.h>
+#include <ofono/call-volume.h>
+#include <ofono/cbs.h>
+#include <ofono/devinfo.h>
+#include <ofono/gprs-context.h>
+#include <ofono/gprs.h>
+#include <ofono/netreg.h>
+#include <ofono/phonebook.h>
+#include <ofono/radio-settings.h>
+#include <ofono/sim.h>
+#include <ofono/sms.h>
+#include <ofono/stk.h>
+#include <ofono/ussd.h>
+#include <ofono/voicecall.h>
+#include <ofono/netmon.h>
+
+#include <grilio_queue.h>
+#include <grilio_request.h>
+#include <grilio_parser.h>
+
+#define RILMODEM_DRIVER         "ril"
+
+struct ril_modem {
+	GRilIoChannel *io;
+	const char *imei;
+	const char *imeisv;
+	const char *log_prefix;
+	const char *ecclist_file;
+	struct ofono_modem *ofono;
+	struct sailfish_cell_info *cell_info;
+	struct ril_radio *radio;
+	struct ril_data *data;
+	struct ril_network *network;
+	struct ril_sim_card *sim_card;
+	struct ril_sim_settings *sim_settings;
+	struct ril_slot_config config;
+};
+
+struct ril_oem_raw;
+struct ril_oem_raw *ril_oem_raw_new(struct ril_modem *modem,
+						const char *log_prefix);
+void ril_oem_raw_free(struct ril_oem_raw *raw);
+
+struct ril_modem *ril_modem_create(GRilIoChannel *io, const char *log_prefix,
+		const char *path, const char *imei, const char *imeisv,
+		const char *ecclist_file, const struct ril_slot_config *config,
+		struct ril_radio *radio, struct ril_network *network,
+		struct ril_sim_card *card, struct ril_data *data,
+		struct ril_sim_settings *settings,
+		struct sailfish_cell_info *cell_info);
+void ril_modem_delete(struct ril_modem *modem);
+struct ofono_sim *ril_modem_ofono_sim(struct ril_modem *modem);
+struct ofono_gprs *ril_modem_ofono_gprs(struct ril_modem *modem);
+struct ofono_netreg *ril_modem_ofono_netreg(struct ril_modem *modem);
+
+#define ril_modem_get_path(modem) ofono_modem_get_path((modem)->ofono)
+#define ril_modem_4g_enabled(modem) ((modem)->config.enable_4g)
+#define ril_modem_slot(modem) ((modem)->config.slot)
+#define ril_modem_io(modem) ((modem)->io)
+
+int ril_sim_app_type(struct ofono_sim *sim);
+int ril_netreg_check_if_really_roaming(struct ofono_netreg *reg, gint status);
+
+extern const struct ofono_call_barring_driver ril_call_barring_driver;
+extern const struct ofono_call_forwarding_driver ril_call_forwarding_driver;
+extern const struct ofono_call_settings_driver ril_call_settings_driver;
+extern const struct ofono_call_volume_driver ril_call_volume_driver;
+extern const struct ofono_cbs_driver ril_cbs_driver;
+extern const struct ofono_devinfo_driver ril_devinfo_driver;
+extern const struct ofono_gprs_context_driver ril_gprs_context_driver;
+extern const struct ofono_gprs_driver ril_gprs_driver;
+extern const struct ofono_modem_driver ril_modem_driver;
+extern const struct ofono_netreg_driver ril_netreg_driver;
+extern const struct ofono_phonebook_driver ril_phonebook_driver;
+extern const struct ofono_radio_settings_driver ril_radio_settings_driver;
+extern const struct ofono_sim_driver ril_sim_driver;
+extern const struct ofono_sms_driver ril_sms_driver;
+extern const struct ofono_stk_driver ril_stk_driver;
+extern const struct ofono_ussd_driver ril_ussd_driver;
+extern const struct ofono_voicecall_driver ril_voicecall_driver;
+extern const struct ofono_netmon_driver ril_netmon_driver;
+
+#endif /* RIL_PLUGIN_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_radio.c

@@ -0,0 +1,459 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_radio.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include <grilio_queue.h>
+#include <grilio_request.h>
+#include <grilio_parser.h>
+
+#include <gutil_misc.h>
+
+typedef GObjectClass RilRadioClass;
+typedef struct ril_radio RilRadio;
+
+/*
+ * Object states:
+ *
+ * 1. Idle (!pending && !retry)
+ * 2. Power on/off request pending (pending)
+ * 3. Power on retry has been scheduled (retry)
+ */
+struct ril_radio_priv {
+	GRilIoChannel *io;
+	GRilIoQueue *q;
+	gulong state_event_id;
+	char *log_prefix;
+	GHashTable *req_table;
+	guint pending_id;
+	guint retry_id;
+	guint state_changed_while_request_pending;
+	enum ril_radio_state last_known_state;
+	gboolean power_cycle;
+	gboolean next_state_valid;
+	gboolean next_state;
+};
+
+enum ril_radio_signal {
+	SIGNAL_STATE_CHANGED,
+	SIGNAL_ONLINE_CHANGED,
+	SIGNAL_COUNT
+};
+
+#define POWER_RETRY_SECS (1)
+
+#define SIGNAL_STATE_CHANGED_NAME       "ril-radio-state-changed"
+#define SIGNAL_ONLINE_CHANGED_NAME      "ril-radio-online-changed"
+
+static guint ril_radio_signals[SIGNAL_COUNT] = { 0 };
+
+#define NEW_SIGNAL(klass,name) \
+	ril_radio_signals[SIGNAL_##name##_CHANGED] = \
+		g_signal_new(SIGNAL_##name##_CHANGED_NAME, \
+			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST, \
+			0, NULL, NULL, NULL, G_TYPE_NONE, 0)
+
+G_DEFINE_TYPE(RilRadio, ril_radio, G_TYPE_OBJECT)
+#define RIL_RADIO_TYPE (ril_radio_get_type())
+#define RIL_RADIO(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj,RIL_RADIO_TYPE,RilRadio))
+
+static void ril_radio_submit_power_request(struct ril_radio *self, gboolean on);
+
+static inline gboolean ril_radio_power_should_be_on(struct ril_radio *self)
+{
+	struct ril_radio_priv *priv = self->priv;
+
+	return self->online && !priv->power_cycle &&
+				g_hash_table_size(priv->req_table) > 0;
+}
+
+static inline gboolean ril_radio_state_off(enum ril_radio_state radio_state)
+{
+	return radio_state == RADIO_STATE_OFF;
+}
+
+static inline gboolean ril_radio_state_on(enum ril_radio_state radio_state)
+{
+	return !ril_radio_state_off(radio_state);
+}
+
+static inline void ril_radio_emit_signal(struct ril_radio *self,
+						enum ril_radio_signal id)
+{
+	g_signal_emit(self, ril_radio_signals[id], 0);
+}
+
+static gboolean ril_radio_power_request_retry_cb(gpointer user_data)
+{
+	struct ril_radio *self = RIL_RADIO(user_data);
+	struct ril_radio_priv *priv = self->priv;
+
+	DBG("%s", priv->log_prefix);
+	GASSERT(priv->retry_id);
+	priv->retry_id = 0;
+	ril_radio_submit_power_request(self,
+				ril_radio_power_should_be_on(self));
+
+	return G_SOURCE_REMOVE;
+}
+
+static void ril_radio_cancel_retry(struct ril_radio *self)
+{
+	struct ril_radio_priv *priv = self->priv;
+
+	if (priv->retry_id) {
+		DBG("%sretry cancelled", priv->log_prefix);
+		g_source_remove(priv->retry_id);
+		priv->retry_id = 0;
+	}
+}
+
+static void ril_radio_check_state(struct ril_radio *self)
+{
+	struct ril_radio_priv *priv = self->priv;
+
+	if (!priv->pending_id) {
+		gboolean should_be_on = ril_radio_power_should_be_on(self);
+
+		if (ril_radio_state_on(self->priv->last_known_state) ==
+								should_be_on) {
+			/* All is good, cancel pending retry if there is one */
+			ril_radio_cancel_retry(self);
+		} else if (priv->state_changed_while_request_pending) {
+			/* Hmm... RIL's reaction was inadequate, repeat */
+			ril_radio_submit_power_request(self, should_be_on);
+		} else if (!priv->retry_id) {
+			/* There has been no reaction so far, wait a bit */
+			DBG("%sretry scheduled", priv->log_prefix);
+			priv->retry_id = g_timeout_add_seconds(POWER_RETRY_SECS,
+					ril_radio_power_request_retry_cb, self);
+		}
+	}
+
+	/* Don't update public state while something is pending */
+	if (!priv->pending_id && !priv->retry_id &&
+				self->state != priv->last_known_state) {
+		DBG("%s%s -> %s", priv->log_prefix,
+			ril_radio_state_to_string(self->state),
+			ril_radio_state_to_string(priv->last_known_state));
+		self->state = priv->last_known_state;
+		ril_radio_emit_signal(self, SIGNAL_STATE_CHANGED);
+	}
+}
+
+static void ril_radio_power_request_cb(GRilIoChannel *channel, int ril_status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_radio *self = 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);
+	}
+}
+
+static void ril_radio_submit_power_request(struct ril_radio *self, gboolean on)
+{
+	/*
+	 * RIL_REQUEST_RADIO_POWER
+	 *
+	 * "data" is int *
+	 * ((int *)data)[0] is > 0 for "Radio On"
+	 * ((int *)data)[0] is == 0 for "Radio Off"
+	 *
+	 * "response" is NULL
+	 **/
+	GRilIoRequest *req = grilio_request_array_int32_new(1, on);
+	struct ril_radio_priv *priv = self->priv;
+
+	priv->next_state_valid = FALSE;
+	priv->next_state = on;
+	priv->state_changed_while_request_pending = 0;
+	ril_radio_cancel_retry(self);
+
+	GASSERT(!priv->pending_id);
+	grilio_request_set_blocking(req, TRUE);
+	priv->pending_id = grilio_queue_send_request_full(priv->q, req,
+			RIL_REQUEST_RADIO_POWER, ril_radio_power_request_cb,
+			NULL, self);
+	grilio_request_unref(req);
+}
+
+static void ril_radio_power_request(struct ril_radio *self, gboolean on,
+							gboolean allow_repeat)
+{
+	struct ril_radio_priv *priv = self->priv;
+	const char *on_off = on ? "on" : "off";
+
+	if (priv->pending_id) {
+		if (allow_repeat || priv->next_state != on) {
+			/* Wait for the pending request to complete */
+			priv->next_state_valid = TRUE;
+			priv->next_state = on;
+			DBG("%s%s (queued)", priv->log_prefix, on_off);
+		} else {
+			DBG("%s%s (ignored)", priv->log_prefix, on_off);
+		}
+	} else {
+		DBG("%s%s", priv->log_prefix, on_off);
+		ril_radio_submit_power_request(self, on);
+	}
+}
+
+void ril_radio_confirm_power_on(struct ril_radio *self)
+{
+	if (G_LIKELY(self) && ril_radio_power_should_be_on(self)) {
+		ril_radio_power_request(self, TRUE, TRUE);
+	}
+}
+
+void ril_radio_power_cycle(struct ril_radio *self)
+{
+	if (G_LIKELY(self)) {
+		struct ril_radio_priv *priv = self->priv;
+
+		if (ril_radio_state_off(priv->last_known_state)) {
+			DBG("%spower is already off", priv->log_prefix);
+			GASSERT(!priv->power_cycle);
+		} else if (priv->power_cycle) {
+			DBG("%salready in progress", priv->log_prefix);
+		} else {
+			DBG("%sinitiated", priv->log_prefix);
+			priv->power_cycle = TRUE;
+			if (!priv->pending_id) {
+				ril_radio_submit_power_request(self, FALSE);
+			}
+		}
+	}
+}
+
+void ril_radio_power_on(struct ril_radio *self, gpointer tag)
+{
+	if (G_LIKELY(self)) {
+		struct ril_radio_priv *priv = self->priv;
+
+		if (!g_hash_table_contains(priv->req_table, tag)) {
+			gboolean was_on = ril_radio_power_should_be_on(self);
+
+			DBG("%s%p", priv->log_prefix, tag);
+			g_hash_table_insert(priv->req_table, tag, tag);
+			if (!was_on && ril_radio_power_should_be_on(self)) {
+				ril_radio_power_request(self, TRUE, FALSE);
+			}
+		}
+	}
+}
+
+void ril_radio_power_off(struct ril_radio *self, gpointer tag)
+{
+	if (G_LIKELY(self)) {
+		struct ril_radio_priv *priv = self->priv;
+
+		if (g_hash_table_remove(priv->req_table, tag)) {
+			DBG("%s%p", priv->log_prefix, tag);
+			if (!ril_radio_power_should_be_on(self)) {
+				/* The last one turns the lights off */
+				ril_radio_power_request(self, FALSE, FALSE);
+			}
+		}
+	}
+}
+
+void ril_radio_set_online(struct ril_radio *self, gboolean online)
+{
+	if (G_LIKELY(self) && self->online != online) {
+		gboolean on, was_on = ril_radio_power_should_be_on(self);
+		self->online = online;
+		on = ril_radio_power_should_be_on(self);
+		if (was_on != on) {
+			ril_radio_power_request(self, on, FALSE);
+		}
+		ril_radio_emit_signal(self, SIGNAL_ONLINE_CHANGED);
+	}
+}
+
+gulong ril_radio_add_state_changed_handler(struct ril_radio *self,
+					ril_radio_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_STATE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+gulong ril_radio_add_online_changed_handler(struct ril_radio *self,
+					ril_radio_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_ONLINE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+void ril_radio_remove_handler(struct ril_radio *self, gulong id)
+{
+	if (G_LIKELY(self) && G_LIKELY(id)) {
+		g_signal_handler_disconnect(self, id);
+	}
+}
+
+void ril_radio_remove_handlers(struct ril_radio *self, gulong *ids, int count)
+{
+	gutil_disconnect_handlers(self, ids, count);
+}
+
+enum ril_radio_state ril_radio_state_parse(const void *data, guint len)
+{
+	GRilIoParser rilp;
+	int radio_state;
+
+	grilio_parser_init(&rilp, data, len);
+	if (grilio_parser_get_int32(&rilp, &radio_state)) {
+		return radio_state;
+	} else {
+		ofono_error("Error parsing radio state");
+		return RADIO_STATE_UNAVAILABLE;
+	}
+}
+
+static void ril_radio_state_changed(GRilIoChannel *io, guint code,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_radio *self = RIL_RADIO(user_data);
+	enum ril_radio_state radio_state = ril_radio_state_parse(data, len);
+
+	GASSERT(code == RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED);
+	if (radio_state != RADIO_STATE_UNAVAILABLE) {
+		struct ril_radio_priv *priv = self->priv;
+
+		DBG("%s%s", priv->log_prefix,
+			ril_radio_state_to_string(radio_state));
+		GASSERT(!priv->pending_id || !priv->retry_id);
+
+		if (priv->power_cycle && ril_radio_state_off(radio_state)) {
+			DBG("%sswitched off for power cycle", priv->log_prefix);
+			priv->power_cycle = FALSE;
+		}
+
+		if (priv->pending_id) {
+			priv->state_changed_while_request_pending++;
+		}
+
+		priv->last_known_state = radio_state;
+		ril_radio_check_state(self);
+	}
+}
+
+struct ril_radio *ril_radio_new(GRilIoChannel *io)
+{
+	struct ril_radio *self = g_object_new(RIL_RADIO_TYPE, NULL);
+	struct ril_radio_priv *priv = self->priv;
+
+	priv->io = grilio_channel_ref(io);
+	priv->q = grilio_queue_new(priv->io);
+	priv->log_prefix =
+		(io && io->name && io->name[0] && strcmp(io->name, "RIL")) ?
+		g_strconcat(io->name, " ", NULL) : g_strdup("");
+	DBG("%s", priv->log_prefix);
+	priv->state_event_id = grilio_channel_add_unsol_event_handler(priv->io,
+				ril_radio_state_changed,
+				RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED, self);
+	return self;
+}
+
+struct ril_radio *ril_radio_ref(struct ril_radio *self)
+{
+	if (G_LIKELY(self)) {
+		g_object_ref(RIL_RADIO(self));
+		return self;
+	} else {
+		return NULL;
+	}
+}
+
+void ril_radio_unref(struct ril_radio *self)
+{
+	if (G_LIKELY(self)) {
+		g_object_unref(RIL_RADIO(self));
+	}
+}
+
+static void ril_radio_init(struct ril_radio *self)
+{
+	struct ril_radio_priv *priv = G_TYPE_INSTANCE_GET_PRIVATE(self,
+					RIL_RADIO_TYPE, struct ril_radio_priv);
+	self->priv = priv;
+	priv->req_table = g_hash_table_new_full(g_direct_hash, g_direct_equal,
+								NULL, NULL);
+}
+
+static void ril_radio_dispose(GObject *object)
+{
+	struct ril_radio *self = RIL_RADIO(object);
+	struct ril_radio_priv *priv = self->priv;
+
+	if (priv->state_event_id) {
+		grilio_channel_remove_handler(priv->io, priv->state_event_id);
+		priv->state_event_id = 0;
+	}
+	if (priv->pending_id) {
+		grilio_queue_cancel_request(priv->q, priv->pending_id, FALSE);
+		priv->pending_id = 0;
+	}
+	priv->next_state_valid = FALSE;
+	ril_radio_cancel_retry(self);
+	grilio_queue_cancel_all(priv->q, FALSE);
+	G_OBJECT_CLASS(ril_radio_parent_class)->dispose(object);
+}
+
+static void ril_radio_finalize(GObject *object)
+{
+	struct ril_radio *self = RIL_RADIO(object);
+	struct ril_radio_priv *priv = self->priv;
+
+	DBG("%s", priv->log_prefix);
+	g_free(priv->log_prefix);
+	grilio_channel_unref(priv->io);
+	grilio_queue_unref(priv->q);
+	g_hash_table_unref(priv->req_table);
+	G_OBJECT_CLASS(ril_radio_parent_class)->finalize(object);
+}
+
+static void ril_radio_class_init(RilRadioClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+	object_class->dispose = ril_radio_dispose;
+	object_class->finalize = ril_radio_finalize;
+	g_type_class_add_private(klass, sizeof(struct ril_radio_priv));
+	NEW_SIGNAL(klass, STATE);
+	NEW_SIGNAL(klass, ONLINE);
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_radio.h

@@ -0,0 +1,58 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_RADIO_H
+#define RIL_RADIO_H
+
+#include "ril_types.h"
+
+struct ril_radio {
+	GObject object;
+	struct ril_radio_priv *priv;
+	enum ril_radio_state state;
+	gboolean online;
+};
+
+typedef void (*ril_radio_cb_t)(struct ril_radio *radio, void *arg);
+
+struct ril_radio *ril_radio_new(GRilIoChannel *io);
+struct ril_radio *ril_radio_ref(struct ril_radio *radio);
+void ril_radio_unref(struct ril_radio *radio);
+
+void ril_radio_power_on(struct ril_radio *radio, gpointer tag);
+void ril_radio_power_off(struct ril_radio *radio, gpointer tag);
+void ril_radio_power_cycle(struct ril_radio *radio);
+void ril_radio_confirm_power_on(struct ril_radio *radio);
+void ril_radio_set_online(struct ril_radio *radio, gboolean online);
+gulong ril_radio_add_state_changed_handler(struct ril_radio *radio,
+					ril_radio_cb_t cb, void *arg);
+gulong ril_radio_add_online_changed_handler(struct ril_radio *radio,
+					ril_radio_cb_t cb, void *arg);
+void ril_radio_remove_handler(struct ril_radio *radio, gulong id);
+void ril_radio_remove_handlers(struct ril_radio *radio, gulong *ids, int n);
+enum ril_radio_state ril_radio_state_parse(const void *data, guint len);
+
+#define ril_radio_remove_all_handlers(r,ids) \
+	ril_radio_remove_handlers(r, ids, G_N_ELEMENTS(ids))
+
+#endif /* RIL_RADIO_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_radio_caps.h

@@ -0,0 +1,66 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_RADIO_CAPS_H
+#define RIL_RADIO_CAPS_H
+
+#include "ril_types.h"
+
+struct ril_data_manager;
+struct ril_radio_caps;
+struct ril_radio_caps_manager;
+struct ril_radio_capability;
+
+typedef void (*ril_radio_caps_manager_cb_t)(struct ril_radio_caps_manager *mgr,
+							void *user_data);
+/* ril_radio_capability pointer is NULL if functionality is unsupported */
+typedef void (*ril_radio_caps_check_cb_t)
+		(const struct ril_radio_capability *cap, void *user_data);
+
+/* The check can be cancelled with grilio_channel_cancel_request */
+guint ril_radio_caps_check(GRilIoChannel *io, ril_radio_caps_check_cb_t cb,
+							void *user_data);
+
+/* There should be a single ril_radio_caps_manager shared by all all modems */
+struct ril_radio_caps_manager *ril_radio_caps_manager_new
+					(struct ril_data_manager *dm);
+struct ril_radio_caps_manager *ril_radio_caps_manager_ref
+					(struct ril_radio_caps_manager *mgr);
+void ril_radio_caps_manager_unref(struct ril_radio_caps_manager *mgr);
+gulong ril_radio_caps_manager_add_aborted_handler
+				(struct ril_radio_caps_manager *mgr,
+				ril_radio_caps_manager_cb_t cb, void *arg);
+void ril_radio_caps_manager_remove_handler(struct ril_radio_caps_manager *mgr,
+								gulong id);
+
+/* And one ril_radio_caps object per modem */
+struct ril_radio_caps *ril_radio_caps_new(struct ril_radio_caps_manager *mgr,
+		const char *log_prefix, GRilIoChannel *io,
+		struct ril_data *data, struct ril_radio *radio,
+		struct ril_sim_card *sim, struct ril_network *net,
+		const struct ril_slot_config *config,
+		const struct ril_radio_capability *cap);
+struct ril_radio_caps *ril_radio_caps_ref(struct ril_radio_caps *caps);
+void ril_radio_caps_unref(struct ril_radio_caps *caps);
+
+#endif /* RIL_RADIO_CAPS_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_radio_settings.c

@@ -0,0 +1,194 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_sim_settings.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+struct ril_radio_settings {
+	struct ofono_radio_settings *rs;
+	struct ril_sim_settings *settings;
+	const char *log_prefix;
+	char *allocated_log_prefix;
+	guint source_id;
+};
+
+struct ril_radio_settings_cbd {
+	struct ril_radio_settings *rsd;
+	union _ofono_radio_settings_cb {
+		ofono_radio_settings_rat_mode_set_cb_t rat_mode_set;
+		ofono_radio_settings_rat_mode_query_cb_t rat_mode_query;
+		ofono_radio_settings_available_rats_query_cb_t available_rats;
+		gpointer ptr;
+	} cb;
+	gpointer data;
+};
+
+#define DBG_(rsd,fmt,args...) DBG("%s" fmt, (rsd)->log_prefix, ##args)
+
+static inline struct ril_radio_settings *ril_radio_settings_get_data(
+					struct ofono_radio_settings *rs)
+{
+	return ofono_radio_settings_get_data(rs);
+}
+
+static void ril_radio_settings_later(struct ril_radio_settings *rsd,
+				GSourceFunc fn, void *cb, void *data)
+{
+	struct ril_radio_settings_cbd *cbd;
+
+	cbd = g_new0(struct ril_radio_settings_cbd, 1);
+	cbd->rsd = rsd;
+	cbd->cb.ptr = cb;
+	cbd->data = data;
+
+	GASSERT(!rsd->source_id);
+	rsd->source_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
+							fn, cbd, g_free);
+}
+
+static gboolean ril_radio_settings_set_rat_mode_cb(gpointer user_data)
+{
+	struct ofono_error error;
+	struct ril_radio_settings_cbd *cbd = user_data;
+	struct ril_radio_settings *rsd = cbd->rsd;
+
+	GASSERT(rsd->source_id);
+	rsd->source_id = 0;
+	cbd->cb.rat_mode_set(ril_error_ok(&error), cbd->data);
+	return G_SOURCE_REMOVE;
+}
+
+static void ril_radio_settings_set_rat_mode(struct ofono_radio_settings *rs,
+		enum ofono_radio_access_mode mode,
+		ofono_radio_settings_rat_mode_set_cb_t cb, void *data)
+{
+	struct ril_radio_settings *rsd = ril_radio_settings_get_data(rs);
+	DBG_(rsd, "%s", ofono_radio_access_mode_to_string(mode));
+	ril_sim_settings_set_pref_mode(rsd->settings, mode);
+	ril_radio_settings_later(rsd, ril_radio_settings_set_rat_mode_cb,
+								cb, data);
+}
+
+static gboolean ril_radio_settings_query_rat_mode_cb(gpointer user_data)
+{
+	struct ril_radio_settings_cbd *cbd = user_data;
+	struct ril_radio_settings *rsd = cbd->rsd;
+	enum ofono_radio_access_mode mode = rsd->settings->pref_mode;
+	struct ofono_error error;
+
+	DBG_(rsd, "rat mode %s", ofono_radio_access_mode_to_string(mode));
+	GASSERT(rsd->source_id);
+	rsd->source_id = 0;
+	cbd->cb.rat_mode_query(ril_error_ok(&error), mode, cbd->data);
+	return G_SOURCE_REMOVE;
+}
+
+static void ril_radio_settings_query_rat_mode(struct ofono_radio_settings *rs,
+		ofono_radio_settings_rat_mode_query_cb_t cb, void *data)
+{
+	struct ril_radio_settings *rsd = ril_radio_settings_get_data(rs);
+
+	DBG_(rsd, "");
+	ril_radio_settings_later(rsd, ril_radio_settings_query_rat_mode_cb,
+								cb, data);
+}
+
+static gboolean ril_radio_settings_query_available_rats_cb(gpointer data)
+{
+	struct ofono_error error;
+	struct ril_radio_settings_cbd *cbd = data;
+	struct ril_radio_settings *rsd = cbd->rsd;
+
+	GASSERT(rsd->source_id);
+	rsd->source_id = 0;
+	cbd->cb.available_rats(ril_error_ok(&error), rsd->settings->techs,
+								cbd->data);
+	return G_SOURCE_REMOVE;
+}
+
+static void ril_radio_settings_query_available_rats(
+		struct ofono_radio_settings *rs,
+		ofono_radio_settings_available_rats_query_cb_t cb, void *data)
+{
+	struct ril_radio_settings *rsd = ril_radio_settings_get_data(rs);
+
+	DBG_(rsd, "");
+	ril_radio_settings_later(rsd,
+			ril_radio_settings_query_available_rats_cb, cb, data);
+}
+
+static gboolean ril_radio_settings_register(gpointer user_data)
+{
+	struct ril_radio_settings *rsd = user_data;
+	GASSERT(rsd->source_id);
+	rsd->source_id = 0;
+	ofono_radio_settings_register(rsd->rs);
+	return G_SOURCE_REMOVE;
+}
+
+static int ril_radio_settings_probe(struct ofono_radio_settings *rs,
+					unsigned int vendor, void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_radio_settings *rsd = g_new0(struct ril_radio_settings, 1);
+
+	DBG("%s", modem->log_prefix);
+	rsd->rs = rs;
+	rsd->settings = ril_sim_settings_ref(modem->sim_settings);
+	rsd->source_id = g_idle_add(ril_radio_settings_register, rsd);
+
+	if (modem->log_prefix && modem->log_prefix[0]) {
+		rsd->log_prefix = rsd->allocated_log_prefix =
+			g_strconcat(modem->log_prefix, " ", NULL);
+	} else {
+		rsd->log_prefix = "";
+	}
+
+	ofono_radio_settings_set_data(rs, rsd);
+	return 0;
+}
+
+static void ril_radio_settings_remove(struct ofono_radio_settings *rs)
+{
+	struct ril_radio_settings *rsd = ril_radio_settings_get_data(rs);
+
+	DBG_(rsd, "");
+	ofono_radio_settings_set_data(rs, NULL);
+	if (rsd->source_id) {
+		g_source_remove(rsd->source_id);
+        }
+	ril_sim_settings_unref(rsd->settings);
+	g_free(rsd->allocated_log_prefix);
+	g_free(rsd);
+}
+
+const struct ofono_radio_settings_driver ril_radio_settings_driver = {
+	.name                 = RILMODEM_DRIVER,
+	.probe                = ril_radio_settings_probe,
+	.remove               = ril_radio_settings_remove,
+	.query_rat_mode       = ril_radio_settings_query_rat_mode,
+	.set_rat_mode         = ril_radio_settings_set_rat_mode,
+	.query_available_rats = ril_radio_settings_query_available_rats
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_sim_card.c

@@ -0,0 +1,694 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_sim_card.h"
+#include "ril_radio.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include <grilio_queue.h>
+#include <grilio_request.h>
+#include <grilio_parser.h>
+
+#include <gutil_misc.h>
+
+#define UICC_SUBSCRIPTION_TIMEOUT_MS (30000)
+
+/* SIM I/O idle timeout is measured in the number of idle loops.
+ * When active SIM I/O is going on, the idle loop count very rarely
+ * exceeds 1 between the requests, so 10 is more than enough. Idle
+ * loop is actually more accurate criteria than a timeout because
+ * it doesn't depend that much on the system load. */
+#define SIM_IO_IDLE_LOOPS (10)
+
+typedef GObjectClass RilSimCardClass;
+typedef struct ril_sim_card RilSimCard;
+
+enum ril_sim_card_event {
+	EVENT_SIM_STATUS_CHANGED,
+	EVENT_UICC_SUBSCRIPTION_STATUS_CHANGED,
+	EVENT_COUNT
+};
+
+struct ril_sim_card_priv {
+	GRilIoChannel *io;
+	GRilIoQueue *q;
+	int flags;
+	guint status_req_id;
+	guint sub_req_id;
+	gulong event_id[EVENT_COUNT];
+	guint sim_io_idle_id;
+	guint sim_io_idle_count;
+	GHashTable* sim_io_pending;
+};
+
+enum ril_sim_card_signal {
+	SIGNAL_STATUS_RECEIVED,
+	SIGNAL_STATUS_CHANGED,
+	SIGNAL_STATE_CHANGED,
+	SIGNAL_APP_CHANGED,
+	SIGNAL_SIM_IO_ACTIVE_CHANGED,
+	SIGNAL_COUNT
+};
+
+#define SIGNAL_STATUS_RECEIVED_NAME         "ril-simcard-status-received"
+#define SIGNAL_STATUS_CHANGED_NAME          "ril-simcard-status-changed"
+#define SIGNAL_STATE_CHANGED_NAME           "ril-simcard-state-changed"
+#define SIGNAL_APP_CHANGED_NAME             "ril-simcard-app-changed"
+#define SIGNAL_SIM_IO_ACTIVE_CHANGED_NAME   "ril-simcard-sim-io-active-changed"
+
+static guint ril_sim_card_signals[SIGNAL_COUNT] = { 0 };
+
+G_DEFINE_TYPE(RilSimCard, ril_sim_card, G_TYPE_OBJECT)
+#define RIL_SIMCARD_TYPE (ril_sim_card_get_type())
+#define RIL_SIMCARD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
+	RIL_SIMCARD_TYPE, RilSimCard))
+
+#define NEW_SIGNAL(klass,name) NEW_SIGNAL_(klass,name##_CHANGED)
+#define NEW_SIGNAL_(klass,name) \
+	ril_sim_card_signals[SIGNAL_##name] = \
+		g_signal_new(SIGNAL_##name##_NAME, \
+			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST, \
+			0, NULL, NULL, NULL, G_TYPE_NONE, 0)
+
+#define RIL_SIMCARD_STATE_CHANGED  (0x01)
+#define RIL_SIMCARD_STATUS_CHANGED (0x02)
+
+static gboolean ril_sim_card_app_equal(const struct ril_sim_card_app *a1,
+					const struct ril_sim_card_app *a2)
+{
+	if (a1 == a2) {
+		return TRUE;
+	} else if (!a1 || !a2) {
+		return FALSE;
+	} else {
+		return a1->app_type == a2->app_type &&
+			a1->app_state == a2->app_state &&
+			a1->perso_substate == a2->perso_substate &&
+			a1->pin_replaced == a2->pin_replaced &&
+			a1->pin1_state == a2->pin1_state &&
+			a1->pin2_state == a2->pin2_state &&
+			!g_strcmp0(a1->aid, a2->aid) &&
+			!g_strcmp0(a1->label, a2->label);
+	}
+}
+
+static int ril_sim_card_status_compare(const struct ril_sim_card_status *s1,
+					const struct ril_sim_card_status *s2)
+{
+	if (s1 == s2) {
+		return 0;
+	} else if (!s1 || !s2) {
+		return RIL_SIMCARD_STATE_CHANGED | RIL_SIMCARD_STATUS_CHANGED;
+	} else {
+		int diff = 0;
+
+		if (s1->card_state != s2->card_state) {
+			diff |= RIL_SIMCARD_STATE_CHANGED;
+		}
+
+		if (s1->pin_state != s2->pin_state ||
+			s1->gsm_umts_index != s2->gsm_umts_index ||
+			s1->cdma_index != s2->cdma_index ||
+			s1->ims_index != s2->ims_index ||
+			s1->num_apps != s2->num_apps) {
+			diff |= RIL_SIMCARD_STATUS_CHANGED;
+		} else {
+			int i;
+
+			for (i = 0; i < s1->num_apps; i++) {
+				if (!ril_sim_card_app_equal(s1->apps + i,
+							     s2->apps + i)) {
+					diff |= RIL_SIMCARD_STATUS_CHANGED;
+					break;
+				}
+			}
+		}
+
+		return diff;
+	}
+}
+
+static void ril_sim_card_status_free(struct ril_sim_card_status *status)
+{
+	if (status) {
+		if (status->apps) {
+			int i;
+
+			for (i = 0; i < status->num_apps; i++) {
+				g_free(status->apps[i].aid);
+				g_free(status->apps[i].label);
+			}
+			g_free(status->apps);
+		}
+		g_free(status);
+	}
+}
+
+static void ril_sim_card_subscription_done(struct ril_sim_card *self)
+{
+	struct ril_sim_card_priv *priv = self->priv;
+
+	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
+		 * removed from the list of pending requests) */
+		grilio_channel_drop_request(priv->io, priv->sub_req_id);
+		priv->sub_req_id = 0;
+	}
+	grilio_queue_transaction_finish(priv->q);
+}
+
+static void ril_sim_card_subscribe_cb(GRilIoChannel* io, int status,
+				const void* data, guint len, void* user_data)
+{
+	struct ril_sim_card *self = RIL_SIMCARD(user_data);
+	struct ril_sim_card_priv *priv = self->priv;
+
+	GASSERT(status == GRILIO_STATUS_OK);
+	GASSERT(priv->sub_req_id);
+	priv->sub_req_id = 0;
+	DBG("UICC subscription OK for slot %u", self->slot);
+	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)
+{
+	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);
+	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_set_retry(req, 0, -1);
+	grilio_request_set_timeout(req, UICC_SUBSCRIPTION_TIMEOUT_MS);
+	code = (priv->io->ril_version <= 9 &&
+		(priv->flags & RIL_SIM_CARD_V9_UICC_SUBSCRIPTION_WORKAROUND)) ?
+			RIL_REQUEST_V9_SET_UICC_SUBSCRIPTION :
+			RIL_REQUEST_SET_UICC_SUBSCRIPTION;
+	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
+		 * removed from the list of pending requests) */
+		grilio_channel_drop_request(priv->io, priv->sub_req_id);
+	}
+
+	/* Don't allow any requests other that GET_SIM_STATUS until
+	 * we are done with the subscription */
+	grilio_queue_transaction_start(priv->q);
+	priv->sub_req_id = grilio_queue_send_request_full(priv->q,
+			req, code, ril_sim_card_subscribe_cb, NULL, self);
+	grilio_request_unref(req);
+}
+
+static int ril_sim_card_select_app(const struct ril_sim_card_status *status)
+{
+	int i, selected_app = -1;
+
+	for (i = 0; i < status->num_apps; i++) {
+		const int type = status->apps[i].app_type;
+		if (type == RIL_APPTYPE_USIM || type == RIL_APPTYPE_RUIM) {
+			selected_app = i;
+			break;
+		} else if (type != RIL_APPTYPE_UNKNOWN && selected_app == -1) {
+			selected_app = i;
+		}
+	}
+
+	DBG("%d", selected_app);
+	return selected_app;
+}
+
+static void ril_sim_card_update_app(struct ril_sim_card *self)
+{
+	const struct ril_sim_card_app *old_app = self->app;
+	const struct ril_sim_card_status *status = self->status;
+	int app_index;
+
+	if (status->card_state == RIL_CARDSTATE_PRESENT) {
+		if (status->gsm_umts_index >= 0 &&
+				status->gsm_umts_index < status->num_apps) {
+			app_index = status->gsm_umts_index;
+			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);
+			}
+		}
+	} else {
+		app_index = -1;
+		ril_sim_card_subscription_done(self);
+	}
+
+	if (app_index >= 0 &&
+		status->apps[app_index].app_type != RIL_APPTYPE_UNKNOWN) {
+		self->app = status->apps + app_index;
+	} else {
+		self->app = NULL;
+	}
+
+	if (!ril_sim_card_app_equal(old_app, self->app)) {
+		g_signal_emit(self, ril_sim_card_signals
+					[SIGNAL_APP_CHANGED], 0);
+	}
+}
+
+static void ril_sim_card_update_status(struct ril_sim_card *self,
+					struct ril_sim_card_status *status)
+{
+	const int diff = ril_sim_card_status_compare(self->status, status);
+
+	if (diff) {
+		struct ril_sim_card_status *old_status = self->status;
+
+		self->status = status;
+		ril_sim_card_update_app(self);
+		g_signal_emit(self, ril_sim_card_signals
+					[SIGNAL_STATUS_RECEIVED], 0);
+		if (diff & RIL_SIMCARD_STATUS_CHANGED) {
+			DBG("status changed");
+			g_signal_emit(self, ril_sim_card_signals
+					[SIGNAL_STATUS_CHANGED], 0);
+		}
+		if (diff & RIL_SIMCARD_STATE_CHANGED) {
+			DBG("state changed");
+			g_signal_emit(self, ril_sim_card_signals
+					[SIGNAL_STATE_CHANGED], 0);
+		}
+		ril_sim_card_status_free(old_status);
+	} else {
+		ril_sim_card_status_free(status);
+		g_signal_emit(self, ril_sim_card_signals
+					[SIGNAL_STATUS_RECEIVED], 0);
+	}
+}
+
+static gboolean ril_sim_card_app_parse(GRilIoParser *rilp,
+						struct ril_sim_card_app *app)
+{
+	gint32 app_type, app_state, perso_substate;
+	gint32 pin_replaced, pin1_state, pin2_state;
+
+	grilio_parser_get_int32(rilp, &app_type);
+	grilio_parser_get_int32(rilp, &app_state);
+
+	/*
+	 * Consider RIL_APPSTATE_ILLEGAL also READY. Even if app state is
+	 * RIL_APPSTATE_ILLEGAL (-1), ICC operations must be permitted.
+	 * Network access requests will anyway be rejected and ME will be
+	 * in limited service.
+	 */
+	if (app_state == RIL_APPSTATE_ILLEGAL) {
+		DBG("RIL_APPSTATE_ILLEGAL => RIL_APPSTATE_READY");
+		app_state = RIL_APPSTATE_READY;
+	}
+
+	grilio_parser_get_int32(rilp, &perso_substate);
+	app->aid = grilio_parser_get_utf8(rilp);
+	app->label = grilio_parser_get_utf8(rilp);
+
+	if (grilio_parser_get_int32(rilp, &pin_replaced) &&
+		grilio_parser_get_int32(rilp, &pin1_state) &&
+		grilio_parser_get_int32(rilp, &pin2_state)) {
+
+		app->app_type = app_type;
+		app->app_state = app_state;
+		app->perso_substate = perso_substate;
+		app->pin_replaced = pin_replaced;
+		app->pin1_state = pin1_state;
+		app->pin2_state = pin2_state;
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static struct ril_sim_card_status *ril_sim_card_status_parse(const void *data,
+								guint len)
+{
+	GRilIoParser rilp;
+	gint32 card_state, pin_state, gsm_umts_index, cdma_index;
+        gint32 ims_index, num_apps;
+
+	grilio_parser_init(&rilp, data, len);
+
+	if (!grilio_parser_get_int32(&rilp, &card_state) ||
+		!grilio_parser_get_int32(&rilp, &pin_state) ||
+		!grilio_parser_get_int32(&rilp, &gsm_umts_index) ||
+		!grilio_parser_get_int32(&rilp, &cdma_index) ||
+		!grilio_parser_get_int32(&rilp, &ims_index) ||
+		!grilio_parser_get_int32(&rilp, &num_apps)) {
+		ofono_error("Failed to parse SIM card status request");
+		return NULL;
+	} else if (num_apps < 0 || num_apps > RIL_CARD_MAX_APPS) {
+		ofono_error("Invalid SIM app count %d", num_apps);
+		return NULL;
+	} else {
+		int i;
+		struct ril_sim_card_status *status =
+			g_new0(struct ril_sim_card_status, 1);
+
+		DBG("card_state=%d, universal_pin_state=%d, gsm_umts_index=%d, "
+			"cdma_index=%d, ims_index=%d, num_apps=%d",
+			card_state, pin_state, gsm_umts_index, cdma_index,
+			ims_index, num_apps);
+
+		status->card_state = card_state;
+		status->pin_state = pin_state;
+		status->gsm_umts_index = gsm_umts_index;
+		status->cdma_index = cdma_index;
+		status->ims_index = ims_index;
+		status->num_apps = num_apps;
+
+		if (num_apps > 0) {
+			status->apps =
+				g_new0(struct ril_sim_card_app, num_apps);
+		}
+
+		for (i = 0; i < num_apps; i++) {
+			struct ril_sim_card_app *app = status->apps + i;
+
+			if (ril_sim_card_app_parse(&rilp, app)) {
+				DBG("app[%d]: type=%d, state=%d, "
+					"perso_substate=%d, aid_ptr=%s, "
+					"label=%s, pin1_replaced=%d, pin1=%d, "
+					"pin2=%d", i, app->app_type,
+					app->app_state, app->perso_substate,
+					app->aid, app->label,
+					app->pin_replaced, app->pin1_state,
+					app->pin2_state);
+			} else {
+				break;
+			}
+		}
+
+		if (i == num_apps) {
+			GASSERT(grilio_parser_at_end(&rilp));
+			return status;
+		} else {
+			ril_sim_card_status_free(status);
+			return NULL;
+		}
+	}
+}
+
+static void ril_sim_card_status_cb(GRilIoChannel *io, int ril_status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_sim_card *self = RIL_SIMCARD(user_data);
+	struct ril_sim_card_priv *priv = self->priv;
+
+	GASSERT(priv->status_req_id);
+	priv->status_req_id = 0;
+
+	if (ril_status == RIL_E_SUCCESS) {
+		struct ril_sim_card_status *status =
+			ril_sim_card_status_parse(data, len);
+
+		if (status) {
+			ril_sim_card_update_status(self, status);
+		}
+	}
+}
+
+void ril_sim_card_request_status(struct ril_sim_card *self)
+{
+	if (G_LIKELY(self)) {
+		struct ril_sim_card_priv *priv = self->priv;
+
+		if (priv->status_req_id) {
+			/* Retry right away, don't wait for retry
+			 * timeout to expire */
+			grilio_channel_retry_request(priv->io,
+						priv->status_req_id);
+		} else {
+			GRilIoRequest* req = grilio_request_new();
+
+			grilio_request_set_retry(req, RIL_RETRY_SECS*1000, -1);
+			priv->status_req_id =
+				grilio_queue_send_request_full(priv->q,
+					req, RIL_REQUEST_GET_SIM_STATUS,
+					ril_sim_card_status_cb, NULL, self);
+			grilio_request_unref(req);
+		}
+	}
+}
+
+static void ril_sim_card_update_sim_io_active(struct ril_sim_card *self)
+{
+	/* SIM I/O is considered active for certain period of time after
+	 * the last request has completed. That's because SIM_IO requests
+	 * are usually submitted in large quantities and quick succession.
+	 * Some RILs don't like being bothered while they are doing SIM I/O
+	 * and some time after that too. That sucks but what else can we
+	 * do about it? */
+	struct ril_sim_card_priv *priv = self->priv;
+	const gboolean active = priv->sim_io_idle_id ||
+		g_hash_table_size(priv->sim_io_pending);
+
+	if (self->sim_io_active != active) {
+		self->sim_io_active = active;
+		DBG("SIM I/O for slot %u is %sactive", self->slot,
+						active ? "" : "in");
+		g_signal_emit(self, ril_sim_card_signals
+					[SIGNAL_SIM_IO_ACTIVE_CHANGED], 0);
+	}
+}
+
+void ril_sim_card_sim_io_started(struct ril_sim_card *self, guint id)
+{
+	if (G_LIKELY(self) && G_LIKELY(id)) {
+		struct ril_sim_card_priv *priv = self->priv;
+		gpointer key = GINT_TO_POINTER(id);
+
+		g_hash_table_insert(priv->sim_io_pending, key, key);
+		if (priv->sim_io_idle_id) {
+			g_source_remove(priv->sim_io_idle_id);
+			priv->sim_io_idle_id = 0;
+			priv->sim_io_idle_count = 0;
+		}
+		ril_sim_card_update_sim_io_active(self);
+	}
+}
+
+static gboolean ril_sim_card_sim_io_idle_cb(gpointer user_data)
+{
+	struct ril_sim_card *self = RIL_SIMCARD(user_data);
+	struct ril_sim_card_priv *priv = self->priv;
+
+	if (++(priv->sim_io_idle_count) >= SIM_IO_IDLE_LOOPS) {
+		priv->sim_io_idle_id = 0;
+		priv->sim_io_idle_count = 0;
+		ril_sim_card_update_sim_io_active(self);
+		return G_SOURCE_REMOVE;
+	} else {
+		return G_SOURCE_CONTINUE;
+	}
+}
+
+void ril_sim_card_sim_io_finished(struct ril_sim_card *self, guint id)
+{
+	if (G_LIKELY(self) && G_LIKELY(id)) {
+		struct ril_sim_card_priv *priv = self->priv;
+		gpointer key = GINT_TO_POINTER(id);
+
+		if (g_hash_table_remove(priv->sim_io_pending, key) &&
+				!g_hash_table_size(priv->sim_io_pending)) {
+			/* Reset the idle loop count */
+			if (priv->sim_io_idle_id) {
+				g_source_remove(priv->sim_io_idle_id);
+				priv->sim_io_idle_count = 0;
+			}
+			priv->sim_io_idle_id =
+				g_idle_add(ril_sim_card_sim_io_idle_cb, self);
+		}
+		ril_sim_card_update_sim_io_active(self);
+	}
+}
+
+static void ril_sim_card_status_changed(GRilIoChannel *io, guint code,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_sim_card *self = RIL_SIMCARD(user_data);
+
+	ril_sim_card_request_status(self);
+}
+
+struct ril_sim_card *ril_sim_card_new(GRilIoChannel *io, guint slot, int flags)
+{
+	struct ril_sim_card *self = g_object_new(RIL_SIMCARD_TYPE, NULL);
+	struct ril_sim_card_priv *priv = self->priv;
+
+	/*
+	 * We need to know the RIL version (for UICC subscription hack),
+	 * so we must be connected. The caller is supposed to make sure
+	 * that we get connected first.
+	 */
+	DBG("%u", slot);
+	GASSERT(io->connected);
+
+	self->slot = slot;
+	priv->io = grilio_channel_ref(io);
+	priv->q = grilio_queue_new(io);
+	priv->flags = flags;
+
+	priv->event_id[EVENT_SIM_STATUS_CHANGED] =
+		grilio_channel_add_unsol_event_handler(priv->io,
+			ril_sim_card_status_changed,
+			RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED, self);
+	priv->event_id[EVENT_UICC_SUBSCRIPTION_STATUS_CHANGED] =
+		grilio_channel_add_unsol_event_handler(priv->io,
+			ril_sim_card_status_changed,
+			RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED, self);
+	ril_sim_card_request_status(self);
+	return self;
+}
+
+struct ril_sim_card *ril_sim_card_ref(struct ril_sim_card *self)
+{
+	if (G_LIKELY(self)) {
+		g_object_ref(RIL_SIMCARD(self));
+		return self;
+	} else {
+		return NULL;
+	}
+}
+
+void ril_sim_card_unref(struct ril_sim_card *self)
+{
+	if (G_LIKELY(self)) {
+		g_object_unref(RIL_SIMCARD(self));
+	}
+}
+
+gboolean ril_sim_card_ready(struct ril_sim_card *self)
+{
+	return self && self->app &&
+		((self->app->app_state == RIL_APPSTATE_READY) ||
+		(self->app->app_state == RIL_APPSTATE_SUBSCRIPTION_PERSO &&
+		self->app->perso_substate == RIL_PERSOSUBSTATE_READY));
+}
+
+gulong ril_sim_card_add_status_received_handler(struct ril_sim_card *self,
+					ril_sim_card_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_STATUS_RECEIVED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+gulong ril_sim_card_add_status_changed_handler(struct ril_sim_card *self,
+					ril_sim_card_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_STATUS_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+gulong ril_sim_card_add_state_changed_handler(struct ril_sim_card *self,
+					ril_sim_card_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_STATE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+gulong ril_sim_card_add_app_changed_handler(struct ril_sim_card *self,
+					ril_sim_card_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_APP_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+gulong ril_sim_card_add_sim_io_active_changed_handler(struct ril_sim_card *self,
+					ril_sim_card_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_SIM_IO_ACTIVE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+void ril_sim_card_remove_handler(struct ril_sim_card *self, gulong id)
+{
+	if (G_LIKELY(self) && G_LIKELY(id)) {
+		g_signal_handler_disconnect(self, id);
+	}
+}
+
+void ril_sim_card_remove_handlers(struct ril_sim_card *self, gulong *ids, int n)
+{
+	gutil_disconnect_handlers(self, ids, n);
+}
+
+static void ril_sim_card_init(struct ril_sim_card *self)
+{
+	struct ril_sim_card_priv *priv = G_TYPE_INSTANCE_GET_PRIVATE(self,
+				RIL_SIMCARD_TYPE, struct ril_sim_card_priv);
+
+	self->priv = priv;
+	priv->sim_io_pending = g_hash_table_new(g_direct_hash, g_direct_equal);
+}
+
+static void ril_sim_card_dispose(GObject *object)
+{
+	struct ril_sim_card *self = RIL_SIMCARD(object);
+	struct ril_sim_card_priv *priv = self->priv;
+
+	grilio_channel_remove_handlers(priv->io, priv->event_id, EVENT_COUNT);
+	grilio_queue_cancel_all(priv->q, TRUE);
+	G_OBJECT_CLASS(ril_sim_card_parent_class)->dispose(object);
+}
+
+static void ril_sim_card_finalize(GObject *object)
+{
+	struct ril_sim_card *self = RIL_SIMCARD(object);
+	struct ril_sim_card_priv *priv = self->priv;
+
+	if (priv->sim_io_idle_id) {
+		g_source_remove(priv->sim_io_idle_id);
+	}
+	g_hash_table_destroy(priv->sim_io_pending);
+	grilio_channel_unref(priv->io);
+	grilio_queue_unref(priv->q);
+	ril_sim_card_status_free(self->status);
+	G_OBJECT_CLASS(ril_sim_card_parent_class)->finalize(object);
+}
+
+static void ril_sim_card_class_init(RilSimCardClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+	object_class->dispose = ril_sim_card_dispose;
+	object_class->finalize = ril_sim_card_finalize;
+	g_type_class_add_private(klass, sizeof(struct ril_sim_card_priv));
+	NEW_SIGNAL_(klass,STATUS_RECEIVED);
+	NEW_SIGNAL(klass,STATUS);
+	NEW_SIGNAL(klass,STATE);
+	NEW_SIGNAL(klass,APP);
+	NEW_SIGNAL(klass,SIM_IO_ACTIVE);
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_sim_card.h

@@ -0,0 +1,89 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_SIM_CARD_H
+#define RIL_SIM_CARD_H
+
+#include "ril_types.h"
+
+struct ril_sim_card_app {
+	enum ril_app_type app_type;
+	enum ril_app_state app_state;
+	enum ril_perso_substate perso_substate;
+	char *aid;
+	char *label;
+	guint pin_replaced;
+	enum ril_pin_state pin1_state;
+	enum ril_pin_state pin2_state;
+};
+
+struct ril_sim_card_status {
+	enum ril_card_state card_state;
+	enum ril_pin_state pin_state;
+	int gsm_umts_index;
+	int cdma_index;
+	int ims_index;
+	int num_apps;
+	struct ril_sim_card_app *apps;
+};
+
+struct ril_sim_card {
+	GObject object;
+	struct ril_sim_card_priv *priv;
+	struct ril_sim_card_status *status;
+	const struct ril_sim_card_app *app;
+	gboolean sim_io_active;
+	guint slot;
+};
+
+typedef void (*ril_sim_card_cb_t)(struct ril_sim_card *sc, void *arg);
+
+/* Flags for ril_sim_card_new */
+#define RIL_SIM_CARD_V9_UICC_SUBSCRIPTION_WORKAROUND    (0x01)
+
+struct ril_sim_card *ril_sim_card_new(GRilIoChannel *io, guint slot, int flags);
+struct ril_sim_card *ril_sim_card_ref(struct ril_sim_card *sc);
+void ril_sim_card_unref(struct ril_sim_card *sc);
+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);
+gboolean ril_sim_card_ready(struct ril_sim_card *sc);
+gulong ril_sim_card_add_status_received_handler(struct ril_sim_card *sc,
+					ril_sim_card_cb_t cb, void *arg);
+gulong ril_sim_card_add_status_changed_handler(struct ril_sim_card *sc,
+					ril_sim_card_cb_t cb, void *arg);
+gulong ril_sim_card_add_state_changed_handler(struct ril_sim_card *sc,
+					ril_sim_card_cb_t cb, void *arg);
+gulong ril_sim_card_add_app_changed_handler(struct ril_sim_card *sc,
+					ril_sim_card_cb_t cb, void *arg);
+gulong ril_sim_card_add_sim_io_active_changed_handler(struct ril_sim_card *sc,
+					ril_sim_card_cb_t cb, void *arg);
+void ril_sim_card_remove_handler(struct ril_sim_card *sc, gulong id);
+void ril_sim_card_remove_handlers(struct ril_sim_card *sc, gulong *ids, int n);
+
+/* Inline wrappers */
+static inline enum ril_app_type
+ril_sim_card_app_type(struct ril_sim_card *sc)
+	{ return (sc && sc->app) ? sc->app->app_type : RIL_APPTYPE_UNKNOWN; }
+
+#endif /* RIL_SIM_CARD_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_sim_settings.c

@@ -0,0 +1,196 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_sim_settings.h"
+#include "ril_log.h"
+
+#include "sailfish_watch.h"
+
+#include <gutil_misc.h>
+
+#define RIL_PREF_MODE_DEFAULT(self)                     (\
+	((self)->techs & OFONO_RADIO_ACCESS_MODE_LTE) ?  \
+	OFONO_RADIO_ACCESS_MODE_LTE :                    \
+	((self)->techs & OFONO_RADIO_ACCESS_MODE_UMTS) ? \
+	OFONO_RADIO_ACCESS_MODE_UMTS :                   \
+	OFONO_RADIO_ACCESS_MODE_GSM)
+
+typedef GObjectClass RilSimSettingsClass;
+typedef struct ril_sim_settings RilSimSettings;
+
+enum sailfish_watch_events {
+	WATCH_EVENT_IMSI,
+	WATCH_EVENT_COUNT
+};
+
+struct ril_sim_settings_priv {
+	gulong watch_event_id[WATCH_EVENT_COUNT];
+	struct sailfish_watch *watch;
+	char *imsi;
+};
+
+enum ril_sim_settings_signal {
+	SIGNAL_IMSI_CHANGED,
+	SIGNAL_PREF_MODE_CHANGED,
+	SIGNAL_COUNT
+};
+
+#define SIGNAL_IMSI_CHANGED_NAME        "ril-sim-settings-imsi-changed"
+#define SIGNAL_PREF_MODE_CHANGED_NAME   "ril-sim-settings-pref-mode-changed"
+
+static guint ril_sim_settings_signals[SIGNAL_COUNT] = { 0 };
+
+G_DEFINE_TYPE(RilSimSettings, ril_sim_settings, G_TYPE_OBJECT)
+#define RIL_SIM_SETTINGS_TYPE (ril_sim_settings_get_type())
+#define RIL_SIM_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
+	RIL_SIM_SETTINGS_TYPE, RilSimSettings))
+
+#define NEW_SIGNAL(klass,name) \
+	ril_sim_settings_signals[SIGNAL_##name##_CHANGED] = \
+		g_signal_new(SIGNAL_##name##_CHANGED_NAME, \
+			G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST, \
+			0, NULL, NULL, NULL, G_TYPE_NONE, 0)
+
+/* Skip the leading slash from the modem path: */
+#define DBG_(obj,fmt,args...) DBG("%s " fmt, (obj)->path+1, ##args)
+
+static void ril_sim_settings_signal_emit(struct ril_sim_settings *self,
+					enum ril_sim_settings_signal id)
+{
+	g_signal_emit(self, ril_sim_settings_signals[id], 0);
+}
+
+void ril_sim_settings_set_pref_mode(struct ril_sim_settings *self,
+					enum ofono_radio_access_mode mode)
+{
+	if (G_LIKELY(self) && self->pref_mode != mode) {
+		self->pref_mode = mode;
+		ril_sim_settings_signal_emit(self, SIGNAL_PREF_MODE_CHANGED);
+	}
+}
+
+static void ril_sim_settings_imsi_changed(struct sailfish_watch *watch,
+							void *user_data)
+{
+	struct ril_sim_settings *self = RIL_SIM_SETTINGS(user_data);
+	struct ril_sim_settings_priv *priv = self->priv;
+
+	if (g_strcmp0(priv->imsi, watch->imsi)) {
+		g_free(priv->imsi);
+		self->imsi = priv->imsi = g_strdup(watch->imsi);
+		ril_sim_settings_signal_emit(self, SIGNAL_IMSI_CHANGED);
+	}
+}
+
+struct ril_sim_settings *ril_sim_settings_new(const char *path,
+					enum ofono_radio_access_mode techs)
+{
+	struct ril_sim_settings *self = NULL;
+
+	if (G_LIKELY(path)) {
+		struct ril_sim_settings_priv *priv;
+
+		self = g_object_new(RIL_SIM_SETTINGS_TYPE, NULL);
+		priv = self->priv;
+		self->techs = techs;
+		self->pref_mode = RIL_PREF_MODE_DEFAULT(self);
+		priv->watch = sailfish_watch_new(path);
+		priv->watch_event_id[WATCH_EVENT_IMSI] =
+			sailfish_watch_add_imsi_changed_handler(priv->watch,
+				ril_sim_settings_imsi_changed, self);
+		self->imsi = priv->imsi = g_strdup(priv->watch->imsi);
+	}
+
+	return self;
+}
+
+struct ril_sim_settings *ril_sim_settings_ref(struct ril_sim_settings *self)
+{
+	if (G_LIKELY(self)) {
+		g_object_ref(RIL_SIM_SETTINGS(self));
+		return self;
+	} else {
+		return NULL;
+	}
+}
+
+void ril_sim_settings_unref(struct ril_sim_settings *self)
+{
+	if (G_LIKELY(self)) {
+		g_object_unref(RIL_SIM_SETTINGS(self));
+	}
+}
+
+
+gulong ril_sim_settings_add_imsi_changed_handler(struct ril_sim_settings *self,
+					ril_sim_settings_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_IMSI_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+gulong ril_sim_settings_add_pref_mode_changed_handler(
+					struct ril_sim_settings *self,
+					ril_sim_settings_cb_t cb, void *arg)
+{
+	return (G_LIKELY(self) && G_LIKELY(cb)) ? g_signal_connect(self,
+		SIGNAL_PREF_MODE_CHANGED_NAME, G_CALLBACK(cb), arg) : 0;
+}
+
+void ril_sim_settings_remove_handler(struct ril_sim_settings *self, gulong id)
+{
+	if (G_LIKELY(self) && G_LIKELY(id)) {
+		g_signal_handler_disconnect(self, id);
+	}
+}
+
+void ril_sim_settings_remove_handlers(struct ril_sim_settings *self,
+						gulong *ids, int count)
+{
+	gutil_disconnect_handlers(self, ids, count);
+}
+
+static void ril_sim_settings_init(struct ril_sim_settings *self)
+{
+	self->priv =  G_TYPE_INSTANCE_GET_PRIVATE(self, RIL_SIM_SETTINGS_TYPE,
+						struct ril_sim_settings_priv);
+}
+
+static void ril_sim_settings_finalize(GObject *object)
+{
+	struct ril_sim_settings *self = RIL_SIM_SETTINGS(object);
+	struct ril_sim_settings_priv *priv = self->priv;
+
+	sailfish_watch_remove_all_handlers(priv->watch, priv->watch_event_id);
+	sailfish_watch_unref(priv->watch);
+	g_free(priv->imsi);
+	G_OBJECT_CLASS(ril_sim_settings_parent_class)->finalize(object);
+}
+
+static void ril_sim_settings_class_init(RilSimSettingsClass *klass)
+{
+	G_OBJECT_CLASS(klass)->finalize = ril_sim_settings_finalize;
+	g_type_class_add_private(klass, sizeof(struct ril_sim_settings_priv));
+	NEW_SIGNAL(klass, IMSI);
+	NEW_SIGNAL(klass, PREF_MODE);
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_sim_settings.h

@@ -0,0 +1,55 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_SIM_SETTINGS_H
+#define RIL_SIM_SETTINGS_H
+
+#include "ril_types.h"
+
+struct ril_sim_settings_priv;
+
+struct ril_sim_settings {
+	GObject object;
+	struct ril_sim_settings_priv *priv;
+	const char *imsi;
+	enum ofono_radio_access_mode techs;
+	enum ofono_radio_access_mode pref_mode;
+};
+
+typedef void (*ril_sim_settings_cb_t)(struct ril_sim_settings *s, void *arg);
+
+struct ril_sim_settings *ril_sim_settings_new(const 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_pref_mode(struct ril_sim_settings *s,
+					enum ofono_radio_access_mode mode);
+gulong ril_sim_settings_add_imsi_changed_handler(struct ril_sim_settings *s,
+					ril_sim_settings_cb_t cb, void *arg);
+gulong ril_sim_settings_add_pref_mode_changed_handler(struct ril_sim_settings *s,
+					ril_sim_settings_cb_t cb, void *arg);
+void ril_sim_settings_remove_handler(struct ril_sim_settings *s, gulong id);
+void ril_sim_settings_remove_handlers(struct ril_sim_settings *s, gulong *ids,
+								int count);
+
+#endif /* RIL_SIM_SETTINGS_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_sms.c

@@ -0,0 +1,516 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include "smsutil.h"
+#include "util.h"
+#include "simutil.h"
+
+#define RIL_SMS_ACK_RETRY_MS    1000
+#define RIL_SMS_ACK_RETRY_COUNT 10
+
+#define SIM_EFSMS_FILEID        0x6F3C
+#define EFSMS_LENGTH            176
+
+#define TYPE_LOCAL              129
+#define TYPE_INTERNATIONAL      145
+
+static unsigned char sim_path[4] = {0x3F, 0x00, 0x7F, 0x10};
+
+enum ril_sms_events {
+	SMS_EVENT_NEW_SMS,
+	SMS_EVENT_NEW_STATUS_REPORT,
+	SMS_EVENT_NEW_SMS_ON_SIM,
+	SMS_EVENT_COUNT
+};
+
+struct ril_sms {
+	GRilIoChannel *io;
+	GRilIoQueue *q;
+	struct ril_modem *modem;
+	struct ofono_sms *sms;
+	struct ofono_sim_context *sim_context;
+	gulong event_id[SMS_EVENT_COUNT];
+	guint timer_id;
+};
+
+struct ril_sms_cbd {
+	union _ofono_sms_cb {
+		ofono_sms_sca_set_cb_t sca_set;
+		ofono_sms_sca_query_cb_t sca_query;
+		ofono_sms_submit_cb_t submit;
+		gpointer ptr;
+	} cb;
+	gpointer data;
+};
+
+struct ril_sms_on_sim_req {
+	struct ril_sms *sd;
+	int record;
+};
+
+#define ril_sms_cbd_free g_free
+#define ril_sms_on_sim_req_free g_free
+
+static inline struct ril_sms *ril_sms_get_data(struct ofono_sms *sms)
+{
+	return ofono_sms_get_data(sms);
+}
+
+struct ril_sms_cbd *ril_sms_cbd_new(struct ril_sms *sd, void *cb, void *data)
+{
+	struct ril_sms_cbd *cbd = g_new0(struct ril_sms_cbd, 1);
+
+	cbd->cb.ptr = cb;
+	cbd->data = data;
+	return cbd;
+}
+
+struct ril_sms_on_sim_req *ril_sms_on_sim_req_new(struct ril_sms *sd, int rec)
+{
+	struct ril_sms_on_sim_req *cbd = g_new0(struct ril_sms_on_sim_req, 1);
+
+	cbd->sd = sd;
+	cbd->record = rec;
+	return cbd;
+}
+
+static void ril_sms_sca_set_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_sms_cbd *cbd = user_data;
+	ofono_sms_sca_set_cb_t cb = cbd->cb.sca_set;
+
+	if (status == RIL_E_SUCCESS) {
+		cb(ril_error_ok(&error), cbd->data);
+	} else {
+		ofono_error("csca setting failed");
+		cb(ril_error_failure(&error), cbd->data);
+	}
+}
+
+static void ril_sms_sca_set(struct ofono_sms *sms,
+			const struct ofono_phone_number *sca,
+			ofono_sms_sca_set_cb_t cb, void *data)
+{
+	struct ril_sms *sd = ril_sms_get_data(sms);
+	GRilIoRequest *req = grilio_request_new();
+	char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 4];
+
+	if (sca->type == TYPE_LOCAL) {
+		snprintf(number, sizeof(number), "\"%s\"", sca->number);
+	} else {
+		snprintf(number, sizeof(number), "\"+%s\"", sca->number);
+	}
+
+	DBG("Setting sca: %s", number);
+	grilio_request_append_utf8(req, number);
+	grilio_queue_send_request_full(sd->q, req,
+			RIL_REQUEST_SET_SMSC_ADDRESS, ril_sms_sca_set_cb,
+			ril_sms_cbd_free, ril_sms_cbd_new(sd, cb, data));
+	grilio_request_unref(req);
+}
+
+static void ril_sms_sca_query_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_sms_cbd *cbd = user_data;
+	ofono_sms_sca_query_cb_t cb = cbd->cb.sca_query;
+	struct ofono_error error;
+	GRilIoParser rilp;
+	gchar *temp_buf;
+
+	if (status != RIL_E_SUCCESS) {
+		ofono_error("csca query failed");
+		cb(ril_error_failure(&error), NULL, cbd->data);
+		return;
+	}
+
+	grilio_parser_init(&rilp, data, len);
+	temp_buf = grilio_parser_get_utf8(&rilp);
+
+	if (temp_buf) {
+		/* RIL gives address in quotes */
+		gchar *number = strtok(temp_buf, "\"");
+		struct ofono_phone_number sca;
+
+		strncpy(sca.number, number, OFONO_MAX_PHONE_NUMBER_LENGTH);
+		sca.number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
+		if (sca.number[0] == '+') {
+			number = number + 1;
+			sca.type = TYPE_INTERNATIONAL;
+		} else {
+			sca.type = TYPE_LOCAL;
+		}
+
+		DBG("csca_query_cb: %s, %d", sca.number, sca.type);
+		cb(ril_error_ok(&error), &sca, cbd->data);
+		g_free(temp_buf);
+	} else {
+		ofono_error("return value invalid");
+		cb(ril_error_failure(&error), NULL, cbd->data);
+	}
+}
+
+static void ril_sms_sca_query(struct ofono_sms *sms,
+			ofono_sms_sca_query_cb_t cb, void *data)
+{
+	struct ril_sms *sd = ril_sms_get_data(sms);
+
+	DBG("Sending csca_query");
+	grilio_queue_send_request_full(sd->q, NULL,
+			RIL_REQUEST_GET_SMSC_ADDRESS, ril_sms_sca_query_cb,
+			ril_sms_cbd_free, ril_sms_cbd_new(sd, cb, data));
+}
+
+static void ril_sms_submit_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_sms_cbd *cbd = user_data;
+	ofono_sms_submit_cb_t cb = cbd->cb.submit;
+	struct ofono_error error;
+	int mr = 0;
+
+	if (status == RIL_E_SUCCESS) {
+		GRilIoParser rilp;
+		int err = -1;
+
+		grilio_parser_init(&rilp, data, len);
+
+		/* TP-Message-Reference for GSM/
+		 * BearerData MessageId for CDMA
+		 */
+		grilio_parser_get_int32(&rilp, &mr);
+		grilio_parser_skip_string(&rilp);
+
+		/* error: 3GPP 27.005, 3.2.5, -1 if unknown or not applicable */
+		grilio_parser_get_int32(&rilp, &err);
+		DBG("sms msg ref: %d, error: %d", mr, err);
+		ril_error_init_ok(&error);
+	} else if (status == RIL_E_GENERIC_FAILURE) {
+		ofono_info("not allowed by MO SMS control, do not retry");
+		error.type = OFONO_ERROR_TYPE_CMS;
+		error.error = 500;
+	} else {
+		ofono_error("sms sending failed, retry");
+		ril_error_init_failure(&error);
+	}
+
+	cb(&error, mr, cbd->data);
+}
+
+static void ril_sms_submit(struct ofono_sms *sms, const unsigned char *pdu,
+			int pdu_len, int tpdu_len, int mms,
+			ofono_sms_submit_cb_t cb, void *data)
+{
+	struct ril_sms *sd = ril_sms_get_data(sms);
+	GRilIoRequest *req = grilio_request_new();
+	int smsc_len;
+	char *tpdu;
+
+	DBG("pdu_len: %d, tpdu_len: %d mms: %d", pdu_len, tpdu_len, mms);
+
+	grilio_request_append_int32(req, 2);     /* Number of strings */
+
+	/* SMSC address:
+	 *
+	 * smsc_len == 1, then zero-length SMSC was spec'd
+	 * RILD expects a NULL string in this case instead
+	 * of a zero-length string.
+	 */
+	smsc_len = pdu_len - tpdu_len;
+	if (smsc_len > 1) {
+		/* TODO: encode SMSC & write to parcel */
+		DBG("SMSC address specified (smsc_len %d); NOT-IMPLEMENTED",
+								smsc_len);
+	}
+
+	grilio_request_append_utf8(req, NULL); /* default SMSC address */
+
+	/* TPDU:
+	 *
+	 * 'pdu' is a raw hexadecimal string
+	 *  encode_hex() turns it into an ASCII/hex UTF8 buffer
+	 *  grilio_request_append_utf8() encodes utf8 -> utf16
+	 */
+	tpdu = encode_hex(pdu + smsc_len, tpdu_len, 0);
+	grilio_request_append_utf8(req, tpdu);
+
+	DBG("%s", tpdu);
+	grilio_queue_send_request_full(sd->q, req,
+		mms ? RIL_REQUEST_SEND_SMS_EXPECT_MORE : RIL_REQUEST_SEND_SMS,
+		ril_sms_submit_cb, ril_sms_cbd_free,
+		ril_sms_cbd_new(sd, cb, data));
+	grilio_request_unref(req);
+	g_free(tpdu);
+}
+
+static void ril_ack_delivery_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	if (status != RIL_E_SUCCESS) {
+		ofono_error("SMS acknowledgement failed: "
+				"Further SMS reception is not guaranteed");
+	}
+}
+
+static void ril_ack_delivery(struct ril_sms *sd, gboolean error)
+{
+	GRilIoRequest *req = grilio_request_sized_new(12);
+	const int code = (error ? 0 : 0xff);
+
+	DBG("(%d,%d)", error, code);
+	grilio_request_append_int32(req, 2);     /* Array size*/
+	grilio_request_append_int32(req, error); /* Success (1)/Failure (0) */
+	grilio_request_append_int32(req, code);  /* error code */
+
+	/* ACK the incoming NEW_SMS */
+	grilio_request_set_retry(req, RIL_SMS_ACK_RETRY_MS,
+						RIL_SMS_ACK_RETRY_COUNT);
+	grilio_queue_send_request_full(sd->q, req,
+		RIL_REQUEST_SMS_ACKNOWLEDGE, ril_ack_delivery_cb, NULL, NULL);
+	grilio_request_unref(req);
+}
+
+static void ril_sms_notify(GRilIoChannel *io, guint ril_event,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_sms *sd = user_data;
+	GRilIoParser rilp;
+	char *ril_pdu;
+	int ril_pdu_len;
+	unsigned int smsc_len;
+	long ril_buf_len;
+	guchar *ril_data;
+
+	ril_pdu = NULL;
+	ril_data = NULL;
+
+	DBG("event: %d; data_len: %d", ril_event, len);
+
+	grilio_parser_init(&rilp, data, len);
+	ril_pdu = grilio_parser_get_utf8(&rilp);
+	if (ril_pdu == NULL)
+		goto error;
+
+	ril_pdu_len = strlen(ril_pdu);
+
+	DBG("ril_pdu_len is %d", ril_pdu_len);
+	ril_data = decode_hex(ril_pdu, ril_pdu_len, &ril_buf_len, -1);
+	if (ril_data == NULL)
+		goto error;
+
+	/* The first octect in the pdu contains the SMSC address length
+	 * which is the X following octects it reads. We add 1 octet to
+	 * the read length to take into account this read octet in order
+	 * to calculate the proper tpdu length.
+	 */
+	smsc_len = ril_data[0] + 1;
+	ofono_info("sms received, smsc_len is %d", smsc_len);
+	DBG("(%s)", ril_pdu);
+
+	if (ril_event == RIL_UNSOL_RESPONSE_NEW_SMS) {
+		/* Last parameter is 'tpdu_len' ( substract SMSC length ) */
+		ofono_sms_deliver_notify(sd->sms, ril_data, ril_buf_len,
+						ril_buf_len - smsc_len);
+	} else {
+		GASSERT(ril_event == RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT);
+		ofono_sms_status_notify(sd->sms, ril_data, ril_buf_len,
+						ril_buf_len - smsc_len);
+	}
+
+	g_free(ril_pdu);
+	g_free(ril_data);
+	ril_ack_delivery(sd, TRUE);
+	return;
+
+error:
+	g_free(ril_pdu);
+	g_free(ril_data);
+	ril_ack_delivery(sd, FALSE);
+	ofono_error("Unable to parse NEW_SMS notification");
+}
+
+static void ril_new_sms_on_sim_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	DBG("%d", status);
+	if (status == RIL_E_SUCCESS) {
+		ofono_info("sms deleted from sim");
+	} else {
+		ofono_error("deleting sms from sim failed");
+	}
+}
+
+static void ril_request_delete_sms_om_sim(struct ril_sms *sd, int record)
+{
+	GRilIoRequest *req = grilio_request_sized_new(8);
+
+	DBG("Deleting record: %d", record);
+
+	grilio_request_append_int32(req, 1);        /* Array length */
+	grilio_request_append_int32(req, record);
+	grilio_queue_send_request_full(sd->q, req,
+			RIL_REQUEST_DELETE_SMS_ON_SIM,
+			ril_new_sms_on_sim_cb, NULL, NULL);
+	grilio_request_unref(req);
+}
+
+static void ril_sms_on_sim_cb(int ok, int total_length, int record,
+		const unsigned char *sdata, int length, void *userdata)
+{
+	struct ril_sms_on_sim_req *cbd = userdata;
+	struct ril_sms *sd = cbd->sd;
+
+	/*
+	 * It seems when reading EFsms RIL returns the whole record including
+	 * the first status byte therefore we ignore that as we are only
+	 * interested of the following pdu
+	 */
+	/* The first octect in the pdu contains the SMSC address length
+	 * which is the X following octects it reads. We add 1 octet to
+	 * the read length to take into account this read octet in order
+	 * to calculate the proper tpdu length.
+	 */
+	if (ok) {
+		unsigned int smsc_len = sdata[1] + 1;
+		ofono_sms_deliver_notify(sd->sms, sdata + 1, length - 1,
+						length - smsc_len - 1);
+		ril_request_delete_sms_om_sim(sd, cbd->record);
+	} else {
+		ofono_error("cannot read sms from sim");
+	}
+
+	ril_sms_on_sim_req_free(cbd);
+}
+
+static void ril_sms_on_sim(GRilIoChannel *io, guint ril_event,
+			const void *data, guint len, void *user_data)
+{
+	struct ril_sms *sd = user_data;
+	struct ofono_sim *sim = ril_modem_ofono_sim(sd->modem);
+	int data_len = 0, rec = 0;
+	GRilIoParser rilp;
+
+	ofono_info("new sms on sim");
+	grilio_parser_init(&rilp, data, len);
+	if (sim &&
+		grilio_parser_get_int32(&rilp, &data_len) && data_len > 0 &&
+		grilio_parser_get_int32(&rilp, &rec)) {
+		DBG("rec %d", rec);
+		if (sd->sim_context) {
+			ofono_sim_read_record(sd->sim_context,
+					SIM_EFSMS_FILEID,
+					OFONO_SIM_FILE_STRUCTURE_FIXED,
+					rec, EFSMS_LENGTH,
+					sim_path, sizeof(sim_path),
+					ril_sms_on_sim_cb,
+					ril_sms_on_sim_req_new(sd,rec));
+		}
+	}
+}
+
+static gboolean ril_sms_register(gpointer user_data)
+{
+	struct ril_sms *sd = user_data;
+
+	DBG("");
+	GASSERT(sd->timer_id);
+	sd->timer_id = 0;
+	ofono_sms_register(sd->sms);
+
+	/* Register event handlers */
+	sd->event_id[SMS_EVENT_NEW_SMS] =
+		grilio_channel_add_unsol_event_handler(sd->io, ril_sms_notify,
+			RIL_UNSOL_RESPONSE_NEW_SMS, sd);
+	sd->event_id[SMS_EVENT_NEW_STATUS_REPORT] =
+		grilio_channel_add_unsol_event_handler(sd->io, ril_sms_notify,
+			RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT, sd);
+	sd->event_id[SMS_EVENT_NEW_SMS_ON_SIM] =
+		grilio_channel_add_unsol_event_handler(sd->io, ril_sms_on_sim,
+			RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM, sd);
+
+	/* Single-shot */
+	return FALSE;
+}
+
+static int ril_sms_probe(struct ofono_sms *sms, unsigned int vendor,
+								void *data)
+{
+	struct ril_modem *modem = data;
+	struct ofono_sim *sim = ril_modem_ofono_sim(modem);
+	struct ril_sms *sd = g_new0(struct ril_sms, 1);
+
+	sd->modem = modem;
+	sd->sms = sms;
+	sd->io = grilio_channel_ref(ril_modem_io(modem));
+	sd->sim_context = ofono_sim_context_create(sim);
+	sd->q = grilio_queue_new(sd->io);
+	sd->timer_id = g_idle_add(ril_sms_register, sd);
+	ofono_sms_set_data(sms, sd);
+
+	GASSERT(sd->sim_context);
+	return 0;
+}
+
+static void ril_sms_remove(struct ofono_sms *sms)
+{
+	unsigned int i;
+	struct ril_sms *sd = ril_sms_get_data(sms);
+
+	DBG("");
+	ofono_sms_set_data(sms, NULL);
+
+	if (sd->sim_context) {
+		ofono_sim_context_free(sd->sim_context);
+	}
+
+	for (i=0; i<G_N_ELEMENTS(sd->event_id); i++) {
+		grilio_channel_remove_handler(sd->io, sd->event_id[i]);
+
+	}
+
+	if (sd->timer_id > 0) {
+		g_source_remove(sd->timer_id);
+	}
+
+	grilio_channel_unref(sd->io);
+	grilio_queue_cancel_all(sd->q, FALSE);
+	grilio_queue_unref(sd->q);
+	g_free(sd);
+}
+
+const struct ofono_sms_driver ril_sms_driver = {
+	.name           = RILMODEM_DRIVER,
+	.probe          = ril_sms_probe,
+	.remove         = ril_sms_remove,
+	.sca_query      = ril_sms_sca_query,
+	.sca_set        = ril_sms_sca_set,
+	.submit         = ril_sms_submit,
+	.bearer_query   = NULL,          /* FIXME: needs investigation. */
+	.bearer_set     = NULL
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_stk.c

@@ -0,0 +1,302 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include "util.h"
+
+#ifndef UI_LANG
+#  define UI_LANG "/var/lib/environment/nemo/locale.conf"
+#endif
+
+enum ril_stk_events {
+	STK_EVENT_PROACTIVE_COMMAND,
+	STK_EVENT_SESSION_END,
+	STK_EVENT_NOTIFY,
+	STK_EVENT_COUNT
+};
+
+struct ril_stk {
+	struct ofono_stk *stk;
+	GRilIoChannel *io;
+	GRilIoQueue *q;
+	gulong event_id[STK_EVENT_COUNT];
+};
+
+struct ril_stk_cbd {
+	union _ofono_stk_cb {
+		ofono_stk_envelope_cb_t envelope;
+		ofono_stk_generic_cb_t generic;
+		gpointer ptr;
+	} cb;
+	gpointer data;
+};
+
+#define ril_stk_cbd_free g_free
+
+static inline struct ril_stk *ril_stk_get_data(struct ofono_stk *stk)
+{
+	return ofono_stk_get_data(stk);
+}
+
+struct ril_stk_cbd *ril_stk_cbd_new(void *cb, void *data)
+{
+	struct ril_stk_cbd *cbd = g_new0(struct ril_stk_cbd, 1);
+
+	cbd->cb.ptr = cb;
+	cbd->data = data;
+	return cbd;
+}
+
+static void ril_stk_envelope_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_stk_cbd *cbd = user_data;
+	ofono_stk_envelope_cb_t cb = cbd->cb.envelope;
+
+	if (status == RIL_E_SUCCESS) {
+		DBG("%u bytes(s)", len);
+		cb(ril_error_ok(&error), NULL, 0, cbd->data);
+	} else {
+		DBG("Envelope reply failure: %s", ril_error_to_string(status));
+		cb(ril_error_failure(&error), NULL, 0, cbd->data);
+	}
+}
+
+static void ril_stk_envelope(struct ofono_stk *stk, int length,
+	const unsigned char *cmd, ofono_stk_envelope_cb_t cb, void *data)
+{
+	struct ril_stk *sd = ril_stk_get_data(stk);
+	GRilIoRequest *req = grilio_request_new();
+	char *hex_envelope = encode_hex(cmd, length, 0);
+
+	DBG("%s", hex_envelope);
+	grilio_request_append_utf8(req, hex_envelope);
+	g_free(hex_envelope);
+	grilio_queue_send_request_full(sd->q, req,
+			RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND,
+			ril_stk_envelope_cb, ril_stk_cbd_free,
+			ril_stk_cbd_new(cb, data));
+	grilio_request_unref(req);
+}
+
+static void ril_stk_terminal_response_cb(GRilIoChannel *io, int status,
+				const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_stk_cbd *cbd = user_data;
+	ofono_stk_generic_cb_t cb = cbd->cb.generic;
+
+	DBG("");
+	if (status == RIL_E_SUCCESS) {
+		cb(ril_error_ok(&error), cbd->data);
+	} else {
+		ofono_error("Error in sending terminal response");
+		cb(ril_error_failure(&error), cbd->data);
+	}
+}
+
+static void ril_stk_terminal_response(struct ofono_stk *stk, int length,
+					const unsigned char *resp,
+					ofono_stk_generic_cb_t cb, void *data)
+{
+	struct ril_stk *sd = ril_stk_get_data(stk);
+	GRilIoRequest *req = grilio_request_new();
+	char *hex_tr = encode_hex(resp, length, 0);
+
+	DBG("rilmodem terminal response: %s", hex_tr);
+	grilio_request_append_utf8(req, hex_tr);
+	g_free(hex_tr);
+	grilio_queue_send_request_full(sd->q, req,
+				RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE,
+				ril_stk_terminal_response_cb,
+				ril_stk_cbd_free, ril_stk_cbd_new(cb, data));
+	grilio_request_unref(req);
+}
+
+static void ril_stk_user_confirmation(struct ofono_stk *stk,
+					ofono_bool_t confirm)
+{
+	struct ril_stk *sd = ril_stk_get_data(stk);
+	GRilIoRequest *req = grilio_request_sized_new(8);
+
+	DBG("%d", confirm);
+	grilio_request_append_int32(req, 1);            /* size of array */
+	grilio_request_append_int32(req, confirm);      /* yes/no */
+
+	grilio_queue_send_request(sd->q, req,
+		RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM);
+	grilio_request_unref(req);
+}
+
+static void ril_stk_pcmd_notify(GRilIoChannel *io, guint code,
+			const void *data, guint data_len, void *user_data)
+{
+	struct ril_stk *sd = user_data;
+	GRilIoParser rilp;
+	char *pcmd;
+	guchar *pdu;
+	long len = 0;
+
+	GASSERT(code == RIL_UNSOL_STK_PROACTIVE_COMMAND);
+	grilio_parser_init(&rilp, data, data_len);
+	pcmd = grilio_parser_get_utf8(&rilp);
+	DBG("pcmd: %s", pcmd);
+
+	pdu = decode_hex(pcmd, strlen(pcmd), &len, -1);
+	g_free(pcmd);
+
+	ofono_stk_proactive_command_notify(sd->stk, len, pdu);
+	g_free(pdu);
+}
+
+static void ril_stk_event_notify(GRilIoChannel *io, guint code,
+			const void *data, guint data_len, void *user_data)
+{
+	struct ril_stk *sd = user_data;
+	GRilIoParser rilp;
+	char *pcmd = NULL;
+	guchar *pdu = NULL;
+	long len;
+
+	/* Proactive command has been handled by the modem. */
+	GASSERT(code == RIL_UNSOL_STK_EVENT_NOTIFY);
+	grilio_parser_init(&rilp, data, data_len);
+	pcmd = grilio_parser_get_utf8(&rilp);
+	DBG("pcmd: %s", pcmd);
+	pdu = decode_hex(pcmd, strlen(pcmd), &len, -1);
+	g_free(pcmd);
+
+	ofono_stk_proactive_command_handled_notify(sd->stk, len, pdu);
+	g_free(pdu);
+}
+
+static void ril_stk_session_end_notify(GRilIoChannel *io, guint code,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_stk *sd = user_data;
+
+	DBG("");
+	GASSERT(code == RIL_UNSOL_STK_SESSION_END);
+	ofono_stk_proactive_session_end_notify(sd->stk);
+}
+
+static void ril_stk_agent_ready(struct ofono_stk *stk)
+{
+	struct ril_stk *sd = ril_stk_get_data(stk);
+
+	DBG("");
+	if (!sd->event_id[STK_EVENT_PROACTIVE_COMMAND]) {
+		DBG("Subscribing notifications");
+		sd->event_id[STK_EVENT_PROACTIVE_COMMAND] =
+			grilio_channel_add_unsol_event_handler(sd->io,
+				ril_stk_pcmd_notify,
+				RIL_UNSOL_STK_PROACTIVE_COMMAND, sd);
+
+		GASSERT(!sd->event_id[STK_EVENT_SESSION_END]);
+		sd->event_id[STK_EVENT_SESSION_END] =
+			grilio_channel_add_unsol_event_handler(sd->io,
+				ril_stk_session_end_notify,
+				RIL_UNSOL_STK_SESSION_END, sd);
+
+		GASSERT(!sd->event_id[STK_EVENT_NOTIFY]);
+		sd->event_id[STK_EVENT_NOTIFY] =
+			grilio_channel_add_unsol_event_handler(sd->io,
+				ril_stk_event_notify, 
+				RIL_UNSOL_STK_EVENT_NOTIFY, sd);
+
+		grilio_queue_send_request(sd->q, NULL,
+				RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING);
+	}
+}
+
+static void ril_stk_set_lang()
+{
+	GError *error = NULL;
+	GIOChannel* chan = g_io_channel_new_file(UI_LANG, "r", &error);
+	if (chan) {
+		GString* buf = g_string_new(NULL);
+		gsize term;
+		while (g_io_channel_read_line_string(chan, buf, &term, NULL) ==
+							G_IO_STATUS_NORMAL) {
+			char* lang;
+			g_string_set_size(buf, term);
+			lang = strstr(buf->str, "LANG=");
+			if (lang) {
+				setenv("LANG", lang + 5, TRUE);
+			}
+		}
+		g_string_free(buf, TRUE);
+		g_io_channel_unref(chan);
+	} else {
+		DBG("%s: %s", UI_LANG, error->message);
+		g_error_free(error);
+	}
+}
+
+static int ril_stk_probe(struct ofono_stk *stk, unsigned int vendor, void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_stk *sd = g_new0(struct ril_stk, 1);
+
+	DBG("");
+	sd->stk = stk;
+	sd->io = grilio_channel_ref(ril_modem_io(modem));
+	sd->q = grilio_queue_new(sd->io);
+
+	ofono_stk_set_data(stk, sd);
+	ofono_stk_register(stk);
+	ril_stk_set_lang();
+	return 0;
+}
+
+static void ril_stk_remove(struct ofono_stk *stk)
+{
+	struct ril_stk *sd = ril_stk_get_data(stk);
+	unsigned int i;
+
+	DBG("");
+	ofono_stk_set_data(stk, NULL);
+
+	for (i=0; i<G_N_ELEMENTS(sd->event_id); i++) {
+		grilio_channel_remove_handler(sd->io, sd->event_id[i]);
+	}
+
+	grilio_channel_unref(sd->io);
+	grilio_queue_cancel_all(sd->q, FALSE);
+	grilio_queue_unref(sd->q);
+	g_free(sd);
+}
+
+const struct ofono_stk_driver ril_stk_driver = {
+	.name                   = RILMODEM_DRIVER,
+	.probe                  = ril_stk_probe,
+	.remove                 = ril_stk_remove,
+	.envelope               = ril_stk_envelope,
+	.terminal_response      = ril_stk_terminal_response,
+	.user_confirmation      = ril_stk_user_confirmation,
+	.ready                  = ril_stk_agent_ready
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_subscription.conf

@@ -0,0 +1,204 @@
+# This is a sample configuration file for Jolla ril driver
+#
+# This file is expected to be installed in /etc/ofono
+#
+# Configuration for each modem is defined in its own [ril_x] section,
+# common settings are in the [Settings] section, all other sections
+# are ignored.
+#
+# If any value from [ril_x] section (except "socket") is defined
+# in the [Settings] section, it becomes the default for all modems.
+# Default values can still be redefined at [ril_x] level.
+#
+
+[Settings]
+
+# This option stops RIL plugin from creating any RIL modems.
+# If it's set to true, all [ril_x] sections are ignored even
+# if they are present, and no default configurtation is created.
+#
+# Default is false
+#
+#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
+# currently using 3G/LTE has to drop to GSM, release 3G/LTE module
+# and only then 3G/LTE can be used by the other modem. This setting
+# allows to disable this behaviour (say, if your phone has independent
+# 3G/LTE modules for each slot or you don't need 4G for both slots).
+# Obviously, it only has any effect if you have more than one SIM.
+#
+# Default is true (switch the current data modem to 2G when changing
+# the data modems)
+#
+#3GLTEHandover=true
+
+# RIL_REQUEST_SET_RADIO_CAPABILITY may or may not be supported by your RIL.
+# This option allows you to forcibly enable or disable use of this request.
+# It's involved in 3G/LTE handover between the modems, meaning that it only
+# makes sense if you have more than one slot.
+#
+# Possible values are auto, on and off
+#
+# Default is auto (enable for RIL version >= 11)
+#
+#SetRadioCapability=auto
+
+[ril_0]
+
+# Required entry, defines the RIL socket path
+socket=/dev/socket/rild
+
+# Subscription string. Some (mostly, older) RILs require that 4 bytes
+# (usually SUB1 or SUB2) are written to the socket before rild starts
+# talking to us.
+#
+# Not sent by default.
+#
+#sub=SUB1
+
+# RIL logging prefix, to tell one socket from another in the log.
+# Makes sense if you have more than one modem configured.
+#
+# No prefix by default.
+#
+#name=RIL1
+
+# Slot id for SET_UICC_SUBSCRIPTION request.
+#
+# By default the first modem becomes slot 0, the next one slot 1 and so on.
+#
+#slot=0
+
+# RIL request timeout, in milliseconds.
+#
+# The default is zero (no timeout)
+#
+#timeout=0
+
+# Comma-separated list of radio technologies supported by the modem.
+# Valid technologies are "gsm", "umts" and "lte". The special value
+# "all" means that all technologies are supported.
+#
+# The default is all
+#
+#technologies=all
+
+# This one is deprecated, use the technologies entry instead (above).
+#
+#enable4G=true
+
+# RIL_REQUEST_SET_UICC_SUBSCRIPTION is 115 in RIL version 9 (or earlier)
+# and 122 in RIL version 10 and later. Since ofono doesn't know in advance
+# which RIL version it's dealing with, it makes the decision at runtime.
+# Settings it to false disables the workaround and always sends 122.
+#
+# Default is true (select SET_UICC_SUBSCRIPTION based on the RIL version)
+#
+#uiccWorkaround=true
+
+# Points to the file containing comma-separated ECC (Emergency List Codes)
+# list, e.g. 911,112,*911,#911. The file is tracked by ofono and when its
+# contents changes, it's reflected in the EmergencyNumbers property of
+# org.ofono.VoiceCallManager.
+#
+# If necessary, the contents of the file can be synchronized with the
+# Android system property by adding something like this to /init.rc:
+#
+# on property:ril.ecclist=*
+#     write /var/lib/ofono/ril.ecclist ${ril.ecclist}
+#     chmod 0644 /var/lib/ofono/ril.ecclist
+#
+#ecclistFile=/var/lib/ofono/ril.ecclist
+
+# RIL_REQUEST_ALLOW_DATA may or may not be supported by your RIL.
+# This option allows you to forcibly enable or disable use of this request.
+# Possible values are auto, on and off
+#
+# Default is auto (enable for RIL version >= 11)
+#
+#allowDataReq=auto
+
+# Since RIL interface doesn't provide the standard way of querying the
+# number of pin retries left, some RIL implementation (namely Qualcomm)
+# allow to query the retry count by sending the empty pin. If your RIL
+# actually does check the empty pin (and decrements the retry count)
+# then you should turn this feature off.
+#
+# Default is true
+#
+#emptyPinQuery=true
+
+# Different RILs use different data call structures which don't necessarily
+# match the format specified in the data list header. The header may have
+# version 9 but the list may contain RIL_Data_Call_Response_v6 structures,
+# list version 10 may contain RIL_Data_Call_Response_v11 and so on. By default
+# ofono assumes that the version from the list header matches the contents
+# but sometimes you have to explicitly tell ofono which one to use.
+# Possible values are 6, 9, 11 and auto.
+#
+# Default is auto
+#
+#dataCallFormat=auto
+
+# Data call may fail with status 65535 which according to ril.h means that
+# we need to retry silently. The maximum number of retries is limited by
+# this parameter. Usually, one retry is enough. The first retry occurs
+# immediately, the subsequent ones after dataCallRetryDelay (see below)
+#
+# Default is 4
+#
+#dataCallRetryLimit=4
+
+# Delay between data call retries, in milliseconds. Note that the first
+# retry occurs immediately after the first failure, the delays are only
+# applied if the first retry fails too.
+#
+# Default is 200 ms
+#
+#dataCallRetryDelay=200
+
+# Additional local and remote hangup reasons. Remote reasons are checked
+# first. Normally, RIL plugin figures it out automatically. You would only
+# need to define these if your RIL does something unusual.
+#
+# No default
+#
+#remoteHangupReasons=20
+#localHangupReasons=23
+
+# Voice call support. Some devices like USB modems and tablets don't support
+# voice calls. By default, voice calls are enabled and this option allows you
+# to disable voice call handling.
+#
+# Default true
+#
+#enableVoicecall=true
+
+# Timeout for the modem to show up, in milliseconds. Those that don't
+# show up before this timeout expires, will be dropped (ignored).
+#
+# In some fairly rare cases it makes sense to shorten this timeout for
+# optional modems (which may or may not be available), to speed up the
+# boot up process.
+#
+# 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

ofono/drivers/ril/ril_types.h

@@ -0,0 +1,68 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_TYPES_H
+#define RIL_TYPES_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <grilio_types.h>
+#include <gutil_macros.h>
+
+struct ofono_modem;
+struct ofono_sim;
+
+#include <ofono/types.h>
+#include <ofono/radio-settings.h>
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "ril_constants.h"
+
+#define RIL_RETRY_SECS (2)
+#define RIL_RETRY_MS   (RIL_RETRY_SECS*1000)
+
+struct ril_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;
+	gboolean empty_pin_query;
+	gboolean enable_voicecall;
+	GUtilInts *local_hangup_reasons;
+	GUtilInts *remote_hangup_reasons;
+};
+
+#endif /* RIL_TYPES_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_ussd.c

@@ -0,0 +1,221 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_plugin.h"
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include "smsutil.h"
+#include "util.h"
+
+struct ril_ussd {
+	struct ofono_ussd *ussd;
+	GRilIoChannel *io;
+	GRilIoQueue *q;
+	guint timer_id;
+	gulong event_id;
+};
+
+struct ril_ussd_cbd {
+	ofono_ussd_cb_t cb;
+	gpointer data;
+};
+
+#define ril_ussd_cbd_free g_free
+
+static inline struct ril_ussd *ril_ussd_get_data(struct ofono_ussd *ussd)
+{
+	return ofono_ussd_get_data(ussd);
+}
+
+static struct ril_ussd_cbd *ril_ussd_cbd_new(ofono_ussd_cb_t cb, void *data)
+{
+	struct ril_ussd_cbd *cbd = g_new0(struct ril_ussd_cbd, 1);
+
+	cbd->cb = cb;
+	cbd->data = data;
+	return cbd;
+}
+
+static void ril_ussd_cancel_cb(GRilIoChannel *io, int status,
+			const void *data, guint len, void *user_data)
+{
+	struct ofono_error error;
+	struct ril_ussd_cbd *cbd = user_data;
+
+	/* Always report sucessful completion, otherwise ofono may get
+	 * stuck in the USSD_STATE_ACTIVE state */
+	cbd->cb(ril_error_ok(&error), cbd->data);
+}
+
+static void ril_ussd_request(struct ofono_ussd *ussd, int dcs,
+	const unsigned char *pdu, int len, ofono_ussd_cb_t cb, void *data)
+{
+	struct ofono_error error;
+	enum sms_charset charset;
+	struct ril_ussd *ud = ril_ussd_get_data(ussd);
+
+	ofono_info("send ussd, len:%d", len);
+	if (cbs_dcs_decode(dcs, NULL, NULL, &charset, NULL, NULL, NULL)) {
+		if (charset == SMS_CHARSET_7BIT) {
+			unsigned char unpacked_buf[182];
+			long written = 0;
+
+			unpack_7bit_own_buf(pdu, len, 0, TRUE,
+					sizeof(unpacked_buf)-1, &written, 0,
+					unpacked_buf);
+
+			unpacked_buf[written] = 0;
+			if (written >= 1) {
+				/*
+				 * When USSD was packed, additional CR
+				 * might have been added (according to
+				 * 23.038 6.1.2.3.1). So if the last
+				 * character is CR, it should be removed
+				 * here.
+				 *
+				 * Over 2 characters long USSD string must
+				 * end with # (checked in valid_ussd_string),
+				 * so it should be safe to remove extra CR.
+				 */
+				GRilIoRequest *req = grilio_request_new();
+				int length = strlen((char *)unpacked_buf);
+				while (length > 2 &&
+					unpacked_buf[length-1] == '\r') {
+					unpacked_buf[--length] = 0;
+				}
+				grilio_request_append_utf8_chars(req, (char*)
+						unpacked_buf, length);
+				grilio_queue_send_request(ud->q, req,
+					RIL_REQUEST_SEND_USSD);
+				grilio_request_unref(req);
+				cb(ril_error_ok(&error), data);
+				return;
+			}
+		}
+	}
+
+	cb(ril_error_failure(&error), data);
+}
+
+static void ril_ussd_cancel(struct ofono_ussd *ussd,
+				ofono_ussd_cb_t cb, void *data)
+{
+	struct ril_ussd *ud = ril_ussd_get_data(ussd);
+
+	ofono_info("send ussd cancel");
+	grilio_queue_send_request_full(ud->q, NULL, RIL_REQUEST_CANCEL_USSD,
+				ril_ussd_cancel_cb, ril_ussd_cbd_free,
+				ril_ussd_cbd_new(cb, data));
+}
+
+static void ril_ussd_notify(GRilIoChannel *io, guint code,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_ussd *ud = user_data;
+	GRilIoParser rilp;
+	char *type;
+	guint32 n = 0;
+
+	ofono_info("ussd received");
+
+	GASSERT(code == RIL_UNSOL_ON_USSD);
+	grilio_parser_init(&rilp, data, len);
+	grilio_parser_get_uint32(&rilp, &n);
+	type = grilio_parser_get_utf8(&rilp);
+
+	if (type) {
+		int ussdtype = g_ascii_xdigit_value(*type);
+		char *msg = (n > 1) ? grilio_parser_get_utf8(&rilp) : NULL;
+
+		if (msg) {
+			const int msglen = strlen(msg);
+			DBG("ussd length %d", msglen);
+			ofono_ussd_notify(ud->ussd, ussdtype, 0xFF,
+					  (const unsigned char *)msg, msglen);
+			/* msg is freed by core if dcs is 0xFF */
+		} else {
+			ofono_ussd_notify(ud->ussd, ussdtype, 0, NULL, 0);
+		}
+
+		g_free(type);
+	}
+}
+
+static gboolean ril_ussd_register(gpointer user_data)
+{
+	struct ril_ussd *ud = user_data;
+
+	DBG("");
+	GASSERT(ud->timer_id);
+	ud->timer_id = 0;
+	ofono_ussd_register(ud->ussd);
+
+	/* Register for USSD events */
+	ud->event_id = grilio_channel_add_unsol_event_handler(ud->io,
+				ril_ussd_notify, RIL_UNSOL_ON_USSD, ud);
+
+	/* Single-shot */
+	return G_SOURCE_REMOVE;
+}
+
+static int ril_ussd_probe(struct ofono_ussd *ussd, unsigned int vendor,
+								void *data)
+{
+	struct ril_modem *modem = data;
+	struct ril_ussd *ud = g_try_new0(struct ril_ussd, 1);
+
+	DBG("");
+	ud->ussd = ussd;
+	ud->io = grilio_channel_ref(ril_modem_io(modem));
+	ud->q = grilio_queue_new(ud->io);
+	ud->timer_id = g_idle_add(ril_ussd_register, ud);
+	ofono_ussd_set_data(ussd, ud);
+	return 0;
+}
+
+static void ril_ussd_remove(struct ofono_ussd *ussd)
+{
+	struct ril_ussd *ud = ril_ussd_get_data(ussd);
+
+	DBG("");
+	ofono_ussd_set_data(ussd, NULL);
+
+	if (ud->timer_id > 0) {
+		g_source_remove(ud->timer_id);
+	}
+
+	grilio_channel_remove_handler(ud->io, ud->event_id);
+	grilio_channel_unref(ud->io);
+	grilio_queue_cancel_all(ud->q, FALSE);
+	grilio_queue_unref(ud->q);
+	g_free(ud);
+}
+
+const struct ofono_ussd_driver ril_ussd_driver = {
+	.name           = RILMODEM_DRIVER,
+	.probe          = ril_ussd_probe,
+	.remove         = ril_ussd_remove,
+	.request        = ril_ussd_request,
+	.cancel         = ril_ussd_cancel
+};
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_util.c

@@ -0,0 +1,440 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "ril_util.h"
+#include "ril_log.h"
+
+#include <grilio_channel.h>
+
+#include <sys/socket.h>
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+
+#include "common.h"
+#include "netreg.h"
+
+const char *ril_error_to_string(int error)
+{
+#define RIL_E_(name) case RIL_E_##name: return #name
+#define GRILIO_E_(name) case GRILIO_STATUS_##name: return "GRILIO_" #name
+	static char unknown[12];
+	switch (error) {
+	case RIL_E_SUCCESS: return "OK";
+	GRILIO_E_(TIMEOUT);
+	GRILIO_E_(CANCELLED);
+	RIL_E_(RADIO_NOT_AVAILABLE);
+	RIL_E_(GENERIC_FAILURE);
+	RIL_E_(PASSWORD_INCORRECT);
+	RIL_E_(SIM_PIN2);
+	RIL_E_(SIM_PUK2);
+	RIL_E_(REQUEST_NOT_SUPPORTED);
+	RIL_E_(CANCELLED);
+	RIL_E_(OP_NOT_ALLOWED_DURING_VOICE_CALL);
+	RIL_E_(OP_NOT_ALLOWED_BEFORE_REG_TO_NW);
+	RIL_E_(SMS_SEND_FAIL_RETRY);
+	RIL_E_(SIM_ABSENT);
+	RIL_E_(SUBSCRIPTION_NOT_AVAILABLE);
+	RIL_E_(MODE_NOT_SUPPORTED);
+	RIL_E_(FDN_CHECK_FAILURE);
+	RIL_E_(ILLEGAL_SIM_OR_ME);
+	RIL_E_(MISSING_RESOURCE);
+	RIL_E_(NO_SUCH_ELEMENT);
+	RIL_E_(DIAL_MODIFIED_TO_USSD);
+	RIL_E_(DIAL_MODIFIED_TO_SS);
+	RIL_E_(DIAL_MODIFIED_TO_DIAL);
+	RIL_E_(USSD_MODIFIED_TO_DIAL);
+	RIL_E_(USSD_MODIFIED_TO_SS);
+	RIL_E_(USSD_MODIFIED_TO_USSD);
+	RIL_E_(SS_MODIFIED_TO_DIAL);
+	RIL_E_(SS_MODIFIED_TO_USSD);
+	RIL_E_(SUBSCRIPTION_NOT_SUPPORTED);
+	RIL_E_(SS_MODIFIED_TO_SS);
+	RIL_E_(LCE_NOT_SUPPORTED);
+	RIL_E_(NO_MEMORY);
+	RIL_E_(INTERNAL_ERR);
+	RIL_E_(SYSTEM_ERR);
+	RIL_E_(MODEM_ERR);
+	RIL_E_(INVALID_STATE);
+	RIL_E_(NO_RESOURCES);
+	RIL_E_(SIM_ERR);
+	RIL_E_(INVALID_ARGUMENTS);
+	RIL_E_(INVALID_SIM_STATE);
+	RIL_E_(INVALID_MODEM_STATE);
+	RIL_E_(INVALID_CALL_ID);
+	RIL_E_(NO_SMS_TO_ACK);
+	RIL_E_(NETWORK_ERR);
+	RIL_E_(REQUEST_RATE_LIMITED);
+	RIL_E_(SIM_BUSY);
+	RIL_E_(SIM_FULL);
+	RIL_E_(NETWORK_REJECT);
+	RIL_E_(OPERATION_NOT_ALLOWED);
+	RIL_E_(EMPTY_RECORD);
+	RIL_E_(INVALID_SMS_FORMAT);
+	RIL_E_(ENCODING_ERR);
+	RIL_E_(INVALID_SMSC_ADDRESS);
+	RIL_E_(NO_SUCH_ENTRY);
+	RIL_E_(NETWORK_NOT_READY);
+	RIL_E_(NOT_PROVISIONED);
+	RIL_E_(NO_SUBSCRIPTION);
+	RIL_E_(NO_NETWORK_FOUND);
+	RIL_E_(DEVICE_IN_USE);
+	RIL_E_(ABORTED);
+	RIL_E_(INVALID_RESPONSE);
+	default:
+		snprintf(unknown, sizeof(unknown), "%d", error);
+		return unknown;
+	}
+}
+
+const char *ril_request_to_string(guint request)
+{
+#define RIL_REQUEST_(name) case RIL_REQUEST_##name: return #name
+	static char unknown[24];
+	switch (request) {
+	RIL_REQUEST_(GET_SIM_STATUS);
+	RIL_REQUEST_(ENTER_SIM_PIN);
+	RIL_REQUEST_(ENTER_SIM_PUK);
+	RIL_REQUEST_(ENTER_SIM_PIN2);
+	RIL_REQUEST_(ENTER_SIM_PUK2);
+	RIL_REQUEST_(CHANGE_SIM_PIN);
+	RIL_REQUEST_(CHANGE_SIM_PIN2);
+	RIL_REQUEST_(ENTER_NETWORK_DEPERSONALIZATION);
+	RIL_REQUEST_(GET_CURRENT_CALLS);
+	RIL_REQUEST_(DIAL);
+	RIL_REQUEST_(GET_IMSI);
+	RIL_REQUEST_(HANGUP);
+	RIL_REQUEST_(HANGUP_WAITING_OR_BACKGROUND);
+	RIL_REQUEST_(HANGUP_FOREGROUND_RESUME_BACKGROUND);
+	RIL_REQUEST_(SWITCH_HOLDING_AND_ACTIVE);
+	RIL_REQUEST_(CONFERENCE);
+	RIL_REQUEST_(UDUB);
+	RIL_REQUEST_(LAST_CALL_FAIL_CAUSE);
+	RIL_REQUEST_(SIGNAL_STRENGTH);
+	RIL_REQUEST_(VOICE_REGISTRATION_STATE);
+	RIL_REQUEST_(DATA_REGISTRATION_STATE);
+	RIL_REQUEST_(OPERATOR);
+	RIL_REQUEST_(RADIO_POWER);
+	RIL_REQUEST_(DTMF);
+	RIL_REQUEST_(SEND_SMS);
+	RIL_REQUEST_(SEND_SMS_EXPECT_MORE);
+	RIL_REQUEST_(SETUP_DATA_CALL);
+	RIL_REQUEST_(SIM_IO);
+	RIL_REQUEST_(SEND_USSD);
+	RIL_REQUEST_(CANCEL_USSD);
+	RIL_REQUEST_(GET_CLIR);
+	RIL_REQUEST_(SET_CLIR);
+	RIL_REQUEST_(QUERY_CALL_FORWARD_STATUS);
+	RIL_REQUEST_(SET_CALL_FORWARD);
+	RIL_REQUEST_(QUERY_CALL_WAITING);
+	RIL_REQUEST_(SET_CALL_WAITING);
+	RIL_REQUEST_(SMS_ACKNOWLEDGE);
+	RIL_REQUEST_(GET_IMEI);
+	RIL_REQUEST_(GET_IMEISV);
+	RIL_REQUEST_(ANSWER);
+	RIL_REQUEST_(DEACTIVATE_DATA_CALL);
+	RIL_REQUEST_(QUERY_FACILITY_LOCK);
+	RIL_REQUEST_(SET_FACILITY_LOCK);
+	RIL_REQUEST_(CHANGE_BARRING_PASSWORD);
+	RIL_REQUEST_(QUERY_NETWORK_SELECTION_MODE);
+	RIL_REQUEST_(SET_NETWORK_SELECTION_AUTOMATIC);
+	RIL_REQUEST_(SET_NETWORK_SELECTION_MANUAL);
+	RIL_REQUEST_(QUERY_AVAILABLE_NETWORKS);
+	RIL_REQUEST_(DTMF_START);
+	RIL_REQUEST_(DTMF_STOP);
+	RIL_REQUEST_(BASEBAND_VERSION);
+	RIL_REQUEST_(SEPARATE_CONNECTION);
+	RIL_REQUEST_(SET_MUTE);
+	RIL_REQUEST_(GET_MUTE);
+	RIL_REQUEST_(QUERY_CLIP);
+	RIL_REQUEST_(LAST_DATA_CALL_FAIL_CAUSE);
+	RIL_REQUEST_(DATA_CALL_LIST);
+	RIL_REQUEST_(RESET_RADIO);
+	RIL_REQUEST_(OEM_HOOK_RAW);
+	RIL_REQUEST_(OEM_HOOK_STRINGS);
+	RIL_REQUEST_(SCREEN_STATE);
+	RIL_REQUEST_(SET_SUPP_SVC_NOTIFICATION);
+	RIL_REQUEST_(WRITE_SMS_TO_SIM);
+	RIL_REQUEST_(DELETE_SMS_ON_SIM);
+	RIL_REQUEST_(SET_BAND_MODE);
+	RIL_REQUEST_(QUERY_AVAILABLE_BAND_MODE);
+	RIL_REQUEST_(STK_GET_PROFILE);
+	RIL_REQUEST_(STK_SET_PROFILE);
+	RIL_REQUEST_(STK_SEND_ENVELOPE_COMMAND);
+	RIL_REQUEST_(STK_SEND_TERMINAL_RESPONSE);
+	RIL_REQUEST_(STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM);
+	RIL_REQUEST_(EXPLICIT_CALL_TRANSFER);
+	RIL_REQUEST_(SET_PREFERRED_NETWORK_TYPE);
+	RIL_REQUEST_(GET_PREFERRED_NETWORK_TYPE);
+	RIL_REQUEST_(GET_NEIGHBORING_CELL_IDS);
+	RIL_REQUEST_(SET_LOCATION_UPDATES);
+	RIL_REQUEST_(CDMA_SET_SUBSCRIPTION_SOURCE);
+	RIL_REQUEST_(CDMA_SET_ROAMING_PREFERENCE);
+	RIL_REQUEST_(CDMA_QUERY_ROAMING_PREFERENCE);
+	RIL_REQUEST_(SET_TTY_MODE);
+	RIL_REQUEST_(QUERY_TTY_MODE);
+	RIL_REQUEST_(CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE);
+	RIL_REQUEST_(CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE);
+	RIL_REQUEST_(CDMA_FLASH);
+	RIL_REQUEST_(CDMA_BURST_DTMF);
+	RIL_REQUEST_(CDMA_VALIDATE_AND_WRITE_AKEY);
+	RIL_REQUEST_(CDMA_SEND_SMS);
+	RIL_REQUEST_(CDMA_SMS_ACKNOWLEDGE);
+	RIL_REQUEST_(GSM_GET_BROADCAST_SMS_CONFIG);
+	RIL_REQUEST_(GSM_SET_BROADCAST_SMS_CONFIG);
+	RIL_REQUEST_(GSM_SMS_BROADCAST_ACTIVATION);
+	RIL_REQUEST_(CDMA_GET_BROADCAST_SMS_CONFIG);
+	RIL_REQUEST_(CDMA_SET_BROADCAST_SMS_CONFIG);
+	RIL_REQUEST_(CDMA_SMS_BROADCAST_ACTIVATION);
+	RIL_REQUEST_(CDMA_SUBSCRIPTION);
+	RIL_REQUEST_(CDMA_WRITE_SMS_TO_RUIM);
+	RIL_REQUEST_(CDMA_DELETE_SMS_ON_RUIM);
+	RIL_REQUEST_(DEVICE_IDENTITY);
+	RIL_REQUEST_(EXIT_EMERGENCY_CALLBACK_MODE);
+	RIL_REQUEST_(GET_SMSC_ADDRESS);
+	RIL_REQUEST_(SET_SMSC_ADDRESS);
+	RIL_REQUEST_(REPORT_SMS_MEMORY_STATUS);
+	RIL_REQUEST_(REPORT_STK_SERVICE_IS_RUNNING);
+	RIL_REQUEST_(CDMA_GET_SUBSCRIPTION_SOURCE);
+	RIL_REQUEST_(ISIM_AUTHENTICATION);
+	RIL_REQUEST_(ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU);
+	RIL_REQUEST_(STK_SEND_ENVELOPE_WITH_STATUS);
+	RIL_REQUEST_(VOICE_RADIO_TECH);
+	RIL_REQUEST_(GET_CELL_INFO_LIST);
+	RIL_REQUEST_(SET_UNSOL_CELL_INFO_LIST_RATE);
+	RIL_REQUEST_(SET_INITIAL_ATTACH_APN);
+	RIL_REQUEST_(IMS_REGISTRATION_STATE);
+	RIL_REQUEST_(IMS_SEND_SMS);
+	RIL_REQUEST_(SIM_TRANSMIT_APDU_BASIC);
+	RIL_REQUEST_(SIM_OPEN_CHANNEL);
+	RIL_REQUEST_(SIM_CLOSE_CHANNEL);
+	RIL_REQUEST_(SIM_TRANSMIT_APDU_CHANNEL);
+	RIL_REQUEST_(NV_READ_ITEM);
+	RIL_REQUEST_(NV_WRITE_ITEM);
+	RIL_REQUEST_(NV_WRITE_CDMA_PRL);
+	RIL_REQUEST_(NV_RESET_CONFIG);
+	RIL_REQUEST_(SET_UICC_SUBSCRIPTION);
+	RIL_REQUEST_(ALLOW_DATA);
+	RIL_REQUEST_(GET_HARDWARE_CONFIG);
+	RIL_REQUEST_(SIM_AUTHENTICATION);
+	RIL_REQUEST_(GET_DC_RT_INFO);
+	RIL_REQUEST_(SET_DC_RT_INFO_RATE);
+	RIL_REQUEST_(SET_DATA_PROFILE);
+	RIL_REQUEST_(SHUTDOWN);
+	RIL_REQUEST_(GET_RADIO_CAPABILITY);
+	RIL_REQUEST_(SET_RADIO_CAPABILITY);
+	case RIL_RESPONSE_ACKNOWLEDGEMENT:
+		return "RESPONSE_ACK";
+	default:
+		snprintf(unknown, sizeof(unknown), "RIL_REQUEST_%d", request);
+		return unknown;
+	}
+}
+
+const char *ril_unsol_event_to_string(guint event)
+{
+#define RIL_UNSOL_(name) case RIL_UNSOL_##name: return #name
+	static char unknown[24];
+	switch (event) {
+	RIL_UNSOL_(RESPONSE_RADIO_STATE_CHANGED);
+	RIL_UNSOL_(RESPONSE_CALL_STATE_CHANGED);
+	RIL_UNSOL_(RESPONSE_VOICE_NETWORK_STATE_CHANGED);
+	RIL_UNSOL_(RESPONSE_NEW_SMS);
+	RIL_UNSOL_(RESPONSE_NEW_SMS_STATUS_REPORT);
+	RIL_UNSOL_(RESPONSE_NEW_SMS_ON_SIM);
+	RIL_UNSOL_(ON_USSD);
+	RIL_UNSOL_(ON_USSD_REQUEST);
+	RIL_UNSOL_(NITZ_TIME_RECEIVED);
+	RIL_UNSOL_(SIGNAL_STRENGTH);
+	RIL_UNSOL_(DATA_CALL_LIST_CHANGED);
+	RIL_UNSOL_(SUPP_SVC_NOTIFICATION);
+	RIL_UNSOL_(STK_SESSION_END);
+	RIL_UNSOL_(STK_PROACTIVE_COMMAND);
+	RIL_UNSOL_(STK_EVENT_NOTIFY);
+	RIL_UNSOL_(STK_CALL_SETUP);
+	RIL_UNSOL_(SIM_SMS_STORAGE_FULL);
+	RIL_UNSOL_(SIM_REFRESH);
+	RIL_UNSOL_(CALL_RING);
+	RIL_UNSOL_(RESPONSE_SIM_STATUS_CHANGED);
+	RIL_UNSOL_(RESPONSE_CDMA_NEW_SMS);
+	RIL_UNSOL_(RESPONSE_NEW_BROADCAST_SMS);
+	RIL_UNSOL_(CDMA_RUIM_SMS_STORAGE_FULL);
+	RIL_UNSOL_(RESTRICTED_STATE_CHANGED);
+	RIL_UNSOL_(ENTER_EMERGENCY_CALLBACK_MODE);
+	RIL_UNSOL_(CDMA_CALL_WAITING);
+	RIL_UNSOL_(CDMA_OTA_PROVISION_STATUS);
+	RIL_UNSOL_(CDMA_INFO_REC);
+	RIL_UNSOL_(OEM_HOOK_RAW);
+	RIL_UNSOL_(RINGBACK_TONE);
+	RIL_UNSOL_(RESEND_INCALL_MUTE);
+	RIL_UNSOL_(CDMA_SUBSCRIPTION_SOURCE_CHANGED);
+	RIL_UNSOL_(CDMA_PRL_CHANGED);
+	RIL_UNSOL_(EXIT_EMERGENCY_CALLBACK_MODE);
+	RIL_UNSOL_(RIL_CONNECTED);
+	RIL_UNSOL_(VOICE_RADIO_TECH_CHANGED);
+	RIL_UNSOL_(CELL_INFO_LIST);
+	RIL_UNSOL_(RESPONSE_IMS_NETWORK_STATE_CHANGED);
+	RIL_UNSOL_(UICC_SUBSCRIPTION_STATUS_CHANGED);
+	RIL_UNSOL_(SRVCC_STATE_NOTIFY);
+	RIL_UNSOL_(HARDWARE_CONFIG_CHANGED);
+	RIL_UNSOL_(DC_RT_INFO_CHANGED);
+	RIL_UNSOL_(RADIO_CAPABILITY);
+	RIL_UNSOL_(ON_SS);
+	RIL_UNSOL_(STK_CC_ALPHA_NOTIFY);
+	default:
+		snprintf(unknown, sizeof(unknown), "RIL_UNSOL_%d", event);
+		return unknown;
+	}
+}
+
+const char *ril_radio_state_to_string(int radio_state)
+{
+#define RADIO_STATE_(name) case RADIO_STATE_##name: return #name
+	static char unknown[16];
+	switch (radio_state) {
+	RADIO_STATE_(OFF);
+	RADIO_STATE_(UNAVAILABLE);
+	RADIO_STATE_(SIM_NOT_READY);
+	RADIO_STATE_(SIM_LOCKED_OR_ABSENT);
+	RADIO_STATE_(SIM_READY);
+	RADIO_STATE_(RUIM_NOT_READY);
+	RADIO_STATE_(RUIM_READY);
+	RADIO_STATE_(RUIM_LOCKED_OR_ABSENT);
+	RADIO_STATE_(NV_NOT_READY);
+	RADIO_STATE_(NV_READY);
+	RADIO_STATE_(ON);
+	default:
+		snprintf(unknown, sizeof(unknown), "%d (?)", radio_state);
+		return unknown;
+	}
+}
+
+/* Returns enum access_technology or -1 on failure. */
+int ril_parse_tech(const char *stech, int *ril_tech)
+{
+	int access_tech = -1;
+	int tech = -1;
+	if (ril_parse_int(stech, 0, &tech)) {
+		switch (tech) {
+		case RADIO_TECH_GPRS:
+		case RADIO_TECH_GSM:
+			access_tech = ACCESS_TECHNOLOGY_GSM;
+			break;
+		case RADIO_TECH_EDGE:
+			access_tech = ACCESS_TECHNOLOGY_GSM_EGPRS;
+			break;
+		case RADIO_TECH_UMTS:
+			access_tech = ACCESS_TECHNOLOGY_UTRAN;
+			break;
+		case RADIO_TECH_HSDPA:
+			access_tech = ACCESS_TECHNOLOGY_UTRAN_HSDPA;
+			break;
+		case RADIO_TECH_HSUPA:
+			access_tech = ACCESS_TECHNOLOGY_UTRAN_HSUPA;
+			break;
+		case RADIO_TECH_HSPA:
+		case RADIO_TECH_HSPAP:
+			access_tech = ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA;
+			break;
+		case RADIO_TECH_LTE:
+			access_tech = ACCESS_TECHNOLOGY_EUTRAN;
+			break;
+		default:
+			DBG("Unknown RIL tech %s", stech);
+			/* no break */
+		case RADIO_TECH_IWLAN:
+		case RADIO_TECH_UNKNOWN:
+			tech = -1;
+			break;
+		}
+
+	}
+	if (ril_tech) {
+		*ril_tech = tech;
+	}
+	return access_tech;
+}
+
+gboolean ril_parse_mcc_mnc(const char *str, struct ofono_network_operator *op)
+{
+	if (str) {
+		int i;
+		const char *ptr = str;
+
+		/* Three digit country code */
+		for (i = 0;
+		     i < OFONO_MAX_MCC_LENGTH && *ptr && isdigit(*ptr);
+		     i++) {
+			op->mcc[i] = *ptr++;
+		}
+		op->mcc[i] = 0;
+
+		if (i == OFONO_MAX_MCC_LENGTH) {
+			/* Usually 2 but sometimes 3 digit network code */
+			for (i = 0;
+			     i < OFONO_MAX_MNC_LENGTH && *ptr && isdigit(*ptr);
+			     i++) {
+				op->mnc[i] = *ptr++;
+			}
+			op->mnc[i] = 0;
+
+			if (i > 0) {
+
+				/*
+				 * Sometimes MCC/MNC are followed by + and
+				 * what looks like the technology code. This
+				 * is of course completely undocumented.
+				 */
+				if (*ptr == '+') {
+					int tech = ril_parse_tech(ptr+1, NULL);
+					if (tech >= 0) {
+						op->tech = tech;
+					}
+				}
+
+				return TRUE;
+			}
+		}
+	}
+	return FALSE;
+}
+
+gboolean ril_parse_int(const char *str, int base, int *value)
+{
+	gboolean ok = FALSE;
+
+	if (str && str[0]) {
+		char *str2 = g_strstrip(g_strdup(str));
+		char *end = str2;
+		long l;
+
+		errno = 0;
+		l = strtol(str2, &end, base);
+		ok = !*end && errno != ERANGE && l >= INT_MIN && l <= INT_MAX;
+		if (ok && value) {
+			*value = (int)l;
+		}
+		g_free(str2);
+	}
+	return ok;
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_util.h

@@ -0,0 +1,50 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2015-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef RIL_UTIL_H
+#define RIL_UTIL_H
+
+#include "ril_types.h"
+
+struct ofono_network_operator;
+
+const char *ril_error_to_string(int error);
+const char *ril_request_to_string(guint request);
+const char *ril_unsol_event_to_string(guint event);
+const char *ril_radio_state_to_string(int radio_state);
+int ril_parse_tech(const char *stech, int *ril_tech);
+gboolean ril_parse_mcc_mnc(const char *str, struct ofono_network_operator *op);
+gboolean ril_parse_int(const char *str, int base, int *value);
+
+#define ril_error_init_ok(err) \
+	((err)->error = 0, (err)->type = OFONO_ERROR_TYPE_NO_ERROR)
+#define ril_error_init_failure(err) \
+	((err)->error = 0, (err)->type = OFONO_ERROR_TYPE_FAILURE)
+#define ril_error_init_sim_error(err,sw1,sw2) \
+	((err)->error = ((sw1) << 8)|(sw2), (err)->type = OFONO_ERROR_TYPE_SIM)
+
+#define ril_error_ok(err) (ril_error_init_ok(err), err)
+#define ril_error_failure(err) (ril_error_init_failure(err), err)
+#define ril_error_sim(err,sw1,sw2) (ril_error_init_sim_error(err,sw1,sw2), err)
+
+#endif /* RIL_UTIL_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */

ofono/drivers/ril/ril_vendor.c

@@ -0,0 +1,165 @@
+/*
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016-2017 Jolla Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  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)
+{
+	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);
+		}
+	}
+	return NULL;
+}
+
+struct ril_vendor_hook *ril_vendor_hook_init(struct ril_vendor_hook *self,
+			const struct ril_vendor_hook_proc *proc)
+{
+	self->proc = proc;
+	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)
+{
+	const struct ril_vendor_hook_proc *proc = self->proc;
+
+	while (!proc->free && proc->base) {
+		proc = proc->base;
+	}
+	if (proc->free) {
+		proc->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:
+ */