Merge lp:~phablet-team/ofono/ofono-bug-updates into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

 * build, doc, gril, mtkmodem, rilmodem, plugins/ril.c,mtk.c: expose
    RadioSettings 'ModemTechnologies' property. This property can be
    used by clients to determine the supported raido technologies supported
    by a specific modem instance (LP: #1346790).
  * gril/gril.c, mtkmodem, plugins/mtk.c, unit: add support for SIM hot insertion/
    removal support. Hot-swap is disabled by default. It can be enabled
    by defining OFONO_RIL_HOT_SIM_SWAP env var.
  * gril, rilmodem, plugins/mtk.c,ril.c: MTK MMS fix. For standalone
    MMS contexts, the cid and a special MMS-specific data profile need
    to included in the SETUP_DATA_CALL request.
  * plugins/ubuntu-apndb.c: fix IMSI provisioning (LP: #1347733)

This merge proposal includes the following changes:

1. Radio technologies ( eg. "umts", "lte", ... ) supported by the modem are now exported in a new RadioSettings "ModemTechnologies" property (LP: #1346790).

2. MTK modems now respond to hot SIM removal

3. Minor fix to priovisioning MVNO/IMSI logic (LP: #1347733)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6872
http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-ofono-ubuntu-ci/56/rebuild

review: Approve (continuous-integration)

[Martti Piirainen (piiramar)]

Sanity checked in mako on top of image 157: All four changes are included, basic voice and messaging functionality is unaffected.

[lp:~phablet-team/ofono/ofono-bug-updates]

6873. By Tony Espy on 2014-07-31

* doc, plugins/nettime.c: multi-modem support for nettime plugin
* gril, mtk, ril, mtkmodem, rilmodem: Fix MTK data attachment (LP: #1349911)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6873
http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-utopic-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-ofono-ubuntu-ci/57/rebuild

review: Approve (continuous-integration)

[Martti Piirainen (piiramar)]

For reference, all six changes have previously been reviewed and approved in GitHub:
 * multi-modem support for nettime plugin: https://github.com/rilmodem/ofono/pull/97
 * expose RadioSettings 'ModemTechnologies' property: https://github.com/rilmodem/ofono/pull/103
 * add support for SIM hot insertion/removal support: https://github.com/rilmodem/ofono/pull/104
 * MTK MMS fix: https://github.com/rilmodem/ofono/pull/106
 * Fix MTK data attachment: https://github.com/rilmodem/ofono/pull/107
 * fix IMSI provisioning: https://github.com/rilmodem/ofono/pull/105

[Martti Piirainen (piiramar)]

Some test results on top image 165 with an MTK-based device.

 * multi-modem support for nettime plugin: As expected, using test scripts:
root@ubuntu-phablet:/# /usr/share/ofono/scripts/get-network-time /ril_0
{ MobileNetworkCode = 91, DST = 1, UTC = 1406870506, Timezone = 10800, MobileCountryCode = 244, Received = 24 }
root@ubuntu-phablet:/# /usr/share/ofono/scripts/get-network-time /ril_1
{ Received = 38, UTC = 1406870521, DST = 1, Timezone = 10800, MobileNetworkCode = 05, MobileCountryCode = 244 }

 * expose RadioSettings 'ModemTechnologies' property: As expected, using test scripts:
root@ubuntu-phablet:/# /usr/share/ofono/scripts/list-modems
[ /ril_1 ]
    [ org.ofono.RadioSettings ]
        TechnologyPreference = gsm
        ModemTechnologies = gsm
        FastDormancy = 1
[ /ril_0 ]
    [ org.ofono.RadioSettings ]
        TechnologyPreference = umts
        ModemTechnologies = gsm umts
        FastDormancy = 1

 * add support for SIM hot insertion/removal support: As expected, using the 'monitor-ofono' test script. When the SIM is removed, the org.ofono.SimManager D-Bus interface (and related interfaces) disappear. When the SIM is inserted, nothing happens by default; if OFONO_RIL_HOT_SIM_SWAP is defined then the org.ofono.SimManager D-Bus interface (and related interfaces) re-appear.

 * MTK MMS fix: Successfully received MMS via modem /ril_0.

 * Fix MTK data attachment: Successfully tested according to the steps from https://bugs.launchpad.net/barajas/+bug/1349911.

 * fix IMSI provisioning: Verified that the code changes are in place (already tested on 2014-07-30).

 * Also tested basic voice and messaging functionality, no regression seen.

Looking good.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Approved

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2014-07-16 22:55:36 +0000
+++ Makefile.am	2014-07-31 23:42:19 +0000
@@ -142,6 +142,8 @@
 			drivers/mtkmodem/mtkrequest.c \
 			drivers/mtkmodem/mtkunsol.h \
 			drivers/mtkmodem/mtkunsol.c \
+			drivers/mtkmodem/mtkreply.h \
+			drivers/mtkmodem/mtkreply.c \
 			drivers/mtkmodem/voicecall.c \
 			drivers/mtkmodem/gprs.c \
 			drivers/mtkmodem/radio-settings.c
@@ -820,6 +822,7 @@
 unit_objects += $(unit_test_mtkrequest_OBJECTS)
 
 unit_test_mtkreply_SOURCES = unit/test-mtkreply.c $(gril_sources) \
+				drivers/mtkmodem/mtkreply.c \
 				src/log.c src/util.c src/simutil.c \
 				src/common.c gatchat/ringbuffer.c
 unit_test_mtkreply_LDADD = @GLIB_LIBS@ -ldl

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-21 18:59:17 +0000
+++ debian/changelog	2014-07-31 23:42:19 +0000
@@ -1,3 +1,24 @@
+ofono (1.12.bzr6872+14.10.20140729-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Alfonso Sanchez-Beato ]
+  * doc, plugins/nettime.c: multi-modem support for nettime plugin
+  * build, doc, gril, mtkmodem, rilmodem, plugins/ril.c,mtk.c: expose
+    RadioSettings 'ModemTechnologies' property.  This property can be
+    used by clients to determine the supported raido technologies supported
+    by a specific modem instance (LP: #1346790).
+  * gril/gril.c, mtkmodem, plugins/mtk.c, unit: add support for SIM hot insertion/
+    removal support.  Hot-swap is disabled by default.  It can be enabled
+    by defining OFONO_RIL_HOT_SIM_SWAP env var.
+  * gril, rilmodem, plugins/mtk.c,ril.c: MTK MMS fix.  For standalone
+    MMS contexts, the cid and a special MMS-specific data profile need
+    to included in the SETUP_DATA_CALL request.
+  * gril, mtk, ril, mtkmodem, rilmodem: Fix MTK data attachment (LP: #1349911)
+
+  [ Martti Piirainen ]
+  * plugins/ubuntu-apndb.c: fix IMSI provisioning (LP: #1347733)
+
+ -- Tony Espy <[e-mail]>  Tue, 29 Jul 2014 16:46:39 -0400
+
 ofono (1.12.bzr6870+14.10.20140721-0ubuntu1) utopic; urgency=medium
 
   [ Martti Piirainen ]

=== added file 'doc/networktime-api.txt'
--- doc/networktime-api.txt	1970-01-01 00:00:00 +0000
+++ doc/networktime-api.txt	2014-07-31 23:42:19 +0000
@@ -0,0 +1,47 @@
+Network time hierarchy
+======================
+
+Service		org.ofono
+Interface	org.ofono.NetworkTime
+Object path	[variable prefix]/{modem0,modem1,...}
+
+Methods		dict GetNetworkTime()
+
+			Returns the current time and date as notified
+			by the cellular network.  The dictionary
+			contains the following possible keys:
+
+			int64 UTC [optional]
+				Network time in seconds from epoch.
+				Receiving entity obtains current real
+				time by adding the value from monotonic
+				clock e.g.
+				clock_gettime(CLOCK_MONOTONIC,...) and
+				substracting "Received" key value.
+
+			int32 Timezone [optional]
+				Current timezone offset in seconds from
+				UTC.
+
+			uint32 DST [optional]
+				Current daylight saving setting in
+				hours.
+
+			int64 Received [optional]
+				Monotonic time as returned by
+				clock_gettime(CLOCK_MONOTONIC,...) when
+				the network time is received.
+
+			string MobileCountryCode
+				The Mobile country code of the
+				current network operator.
+
+			string MobileNetworkCode
+				The Mobile network code of the
+				current network operator.
+
+Signals		NetworkTimeChanged(dict)
+
+			Returns a dictionary with the same keys as
+			GetNetworkTime() when a NITZ event is received.
+

=== modified file 'doc/radio-settings-api.txt'
--- doc/radio-settings-api.txt	2011-03-08 19:28:35 +0000
+++ doc/radio-settings-api.txt	2014-07-31 23:42:19 +0000
@@ -45,6 +45,20 @@
 				"umts"	Only UMTS used for radio access.
 				"lte"	Only LTE used for radio access.
 
+			NOTE: In Ubuntu for Phones branch the description above
+			is no longer valid. Usage of "any" is deprecated and,
+			after setting the property, RAT selection will be done
+			automatically based on reception and availability among
+			the selected technology *and* less advanced
+			technologies. For instance, if preference is "umts",
+			at a given moment we could be registered in a gsm or
+			umts network, but never in an lte one.
+
+		array{string} ModemTechnologies [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

=== modified file 'drivers/mtkmodem/gprs.c'
--- drivers/mtkmodem/gprs.c	2014-03-20 07:46:16 +0000
+++ drivers/mtkmodem/gprs.c	2014-07-31 23:42:19 +0000
@@ -41,6 +41,7 @@
 
 #include "common.h"
 
+#include "mtkutil.h"
 #include "mtkmodem.h"
 #include "mtk_constants.h"
 #include "mtkrequest.h"
@@ -79,6 +80,7 @@
 		g_ril_print_response_no_args(gd->ril, message);
 
 		gd->ofono_attached = attach_data->set_attached;
+		mtk_set_attach_state(gd->modem, gd->ofono_attached);
 
 		CALLBACK_WITH_SUCCESS(cb, cbd->data);
 	} else {
@@ -115,7 +117,7 @@
 
 	g_mtk_request_set_gprs_connect_type(gd->ril, attached, &rilp);
 
-	if (g_ril_send(gd->ril, RIL_REQUEST_SET_GPRS_CONNECT_TYPE, &rilp,
+	if (g_ril_send(gd->ril, MTK_RIL_REQUEST_SET_GPRS_CONNECT_TYPE, &rilp,
 			mtk_gprs_set_connect_type_cb, cbd, g_free) == 0) {
 		ofono_error("%s: send failed", __func__);
 		g_free(cbd);
@@ -123,10 +125,21 @@
 	}
 }
 
+static void detach_event(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_gprs *gprs = user_data;
+	struct ril_gprs_data *gd = ofono_gprs_get_data(gprs);
+
+	g_ril_print_unsol_no_args(gd->ril, message);
+
+	mtk_detach_received(gd->modem);
+}
+
 static int mtk_gprs_probe(struct ofono_gprs *gprs,
 				unsigned int vendor, void *data)
 {
-	GRil *ril = data;
+	struct mtk_gprs_data *gprs_data = data;
+	GRil *ril = gprs_data->gril;
 	struct ril_gprs_data *gd;
 
 	gd = g_try_new0(struct ril_gprs_data, 1);
@@ -135,19 +148,34 @@
 
 	ril_gprs_start(ril, gprs, gd);
 
+	gd->modem = gprs_data->modem;
+
 	/*
 	 * In MTK the event emitted when the gprs state changes is different
 	 * from the one in AOSP ril. Overwrite the one set in parent.
 	 */
-	gd->state_changed_unsol = RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED;
+	gd->state_changed_unsol =
+				MTK_RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED;
+
+	g_ril_register(gd->ril, MTK_RIL_UNSOL_GPRS_DETACH, detach_event, gprs);
 
 	return 0;
 }
 
+static void mtk_gprs_remove(struct ofono_gprs *gprs)
+{
+	struct ril_gprs_data *gd = ofono_gprs_get_data(gprs);
+
+	gd->ofono_attached = FALSE;
+	mtk_set_attach_state(gd->modem, gd->ofono_attached);
+
+	ril_gprs_remove(gprs);
+}
+
 static struct ofono_gprs_driver driver = {
 	.name			= MTKMODEM,
 	.probe			= mtk_gprs_probe,
-	.remove			= ril_gprs_remove,
+	.remove			= mtk_gprs_remove,
 	.set_attached		= mtk_gprs_set_attached,
 	.attached_status	= ril_gprs_registration_status,
 };

=== modified file 'drivers/mtkmodem/mtk_constants.h'
--- drivers/mtkmodem/mtk_constants.h	2014-06-12 10:51:14 +0000
+++ drivers/mtkmodem/mtk_constants.h	2014-07-31 23:42:19 +0000
@@ -23,18 +23,57 @@
 #define MTK_CONSTANTS_H
 
 /* RIL Request Messages */
-#define RIL_REQUEST_RADIO_POWEROFF 2011
-#define RIL_REQUEST_DUAL_SIM_MODE_SWITCH 2012
-#define RIL_REQUEST_SET_GPRS_CONNECT_TYPE 2016
-#define RIL_REQUEST_SET_GPRS_TRANSFER_TYPE 2017
-#define RIL_REQUEST_RADIO_POWERON 2033
-#define RIL_REQUEST_SET_CALL_INDICATION 2036
-#define RIL_REQUEST_SET_FD_MODE 2073
+#define MTK_RIL_REQUEST_RADIO_POWEROFF 2011
+#define MTK_RIL_REQUEST_DUAL_SIM_MODE_SWITCH 2012
+#define MTK_RIL_REQUEST_SET_GPRS_CONNECT_TYPE 2016
+#define MTK_RIL_REQUEST_SET_GPRS_TRANSFER_TYPE 2017
+#define MTK_RIL_REQUEST_RADIO_POWERON 2033
+#define MTK_RIL_REQUEST_SET_CALL_INDICATION 2036
+#define MTK_RIL_REQUEST_GET_3G_CAPABILITY 2038
+#define MTK_RIL_REQUEST_SET_FD_MODE 2073
 
 /* RIL Unsolicited Messages */
-#define RIL_UNSOL_RADIO_TEMPORARILY_UNAVAILABLE 3008
-#define RIL_UNSOL_CALL_PROGRESS_INFO 3004
-#define RIL_UNSOL_INCOMING_CALL_INDICATION 3014
-#define RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED 3022
+#define MTK_RIL_UNSOL_MTK_BASE 3000
+
+#define MTK_RIL_UNSOL_NEIGHBORING_CELL_INFO (MTK_RIL_UNSOL_MTK_BASE + 0)
+#define MTK_RIL_UNSOL_NETWORK_INFO (MTK_RIL_UNSOL_MTK_BASE + 1)
+#define MTK_RIL_UNSOL_CALL_FORWARDING (MTK_RIL_UNSOL_MTK_BASE + 2)
+#define MTK_RIL_UNSOL_CRSS_NOTIFICATION (MTK_RIL_UNSOL_MTK_BASE + 3)
+#define MTK_RIL_UNSOL_CALL_PROGRESS_INFO (MTK_RIL_UNSOL_MTK_BASE + 4)
+#define MTK_RIL_UNSOL_PHB_READY_NOTIFICATION (MTK_RIL_UNSOL_MTK_BASE + 5)
+#define MTK_RIL_UNSOL_SPEECH_INFO (MTK_RIL_UNSOL_MTK_BASE + 6)
+#define MTK_RIL_UNSOL_SIM_INSERTED_STATUS (MTK_RIL_UNSOL_MTK_BASE + 7)
+#define MTK_RIL_UNSOL_RADIO_TEMPORARILY_UNAVAILABLE (MTK_RIL_UNSOL_MTK_BASE + 8)
+#define MTK_RIL_UNSOL_ME_SMS_STORAGE_FULL (MTK_RIL_UNSOL_MTK_BASE + 9)
+#define MTK_RIL_UNSOL_SMS_READY_NOTIFICATION (MTK_RIL_UNSOL_MTK_BASE + 10)
+#define MTK_RIL_UNSOL_SCRI_RESULT (MTK_RIL_UNSOL_MTK_BASE + 11)
+#define MTK_RIL_UNSOL_VT_STATUS_INFO (MTK_RIL_UNSOL_MTK_BASE + 12)
+#define MTK_RIL_UNSOL_VT_RING_INFO (MTK_RIL_UNSOL_MTK_BASE + 13)
+#define MTK_RIL_UNSOL_INCOMING_CALL_INDICATION (MTK_RIL_UNSOL_MTK_BASE + 14)
+#define MTK_RIL_UNSOL_SIM_MISSING (MTK_RIL_UNSOL_MTK_BASE + 15)
+#define MTK_RIL_UNSOL_GPRS_DETACH (MTK_RIL_UNSOL_MTK_BASE + 16)
+#define MTK_RIL_UNSOL_ATCI_RESPONSE (MTK_RIL_UNSOL_MTK_BASE + 17)
+#define MTK_RIL_UNSOL_SIM_RECOVERY (MTK_RIL_UNSOL_MTK_BASE + 18)
+#define MTK_RIL_UNSOL_VIRTUAL_SIM_ON (MTK_RIL_UNSOL_MTK_BASE + 19)
+#define MTK_RIL_UNSOL_VIRTUAL_SIM_OFF (MTK_RIL_UNSOL_MTK_BASE + 20)
+#define MTK_RIL_UNSOL_INVALID_SIM (MTK_RIL_UNSOL_MTK_BASE + 21)
+#define MTK_RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED \
+						(MTK_RIL_UNSOL_MTK_BASE + 22)
+#define MTK_RIL_UNSOL_RESPONSE_ACMT (MTK_RIL_UNSOL_MTK_BASE + 23)
+#define MTK_RIL_UNSOL_EF_CSP_PLMN_MODE_BIT (MTK_RIL_UNSOL_MTK_BASE + 24)
+#define MTK_RIL_UNSOL_IMEI_LOCK (MTK_RIL_UNSOL_MTK_BASE + 25)
+#define MTK_RIL_UNSOL_RESPONSE_MMRR_STATUS_CHANGED (MTK_RIL_UNSOL_MTK_BASE + 26)
+#define MTK_RIL_UNSOL_SIM_PLUG_OUT (MTK_RIL_UNSOL_MTK_BASE + 27)
+#define MTK_RIL_UNSOL_SIM_PLUG_IN (MTK_RIL_UNSOL_MTK_BASE + 28)
+#define MTK_RIL_UNSOL_RESPONSE_ETWS_NOTIFICATION (MTK_RIL_UNSOL_MTK_BASE + 29)
+#define MTK_RIL_UNSOL_RESPONSE_PLMN_CHANGED (MTK_RIL_UNSOL_MTK_BASE + 30)
+#define MTK_RIL_UNSOL_RESPONSE_REGISTRATION_SUSPENDED \
+						(MTK_RIL_UNSOL_MTK_BASE + 31)
+#define MTK_RIL_UNSOL_STK_EVDL_CALL (MTK_RIL_UNSOL_MTK_BASE + 32)
+#define MTK_RIL_UNSOL_DATA_PACKETS_FLUSH (MTK_RIL_UNSOL_MTK_BASE + 33)
+#define MTK_RIL_UNSOL_CIPHER_INDICATION (MTK_RIL_UNSOL_MTK_BASE + 34)
+#define MTK_RIL_UNSOL_FEMTOCELL_INFO (MTK_RIL_UNSOL_MTK_BASE + 35)
+#define MTK_RIL_UNSOL_CNAP (MTK_RIL_UNSOL_MTK_BASE + 36)
+#define MTK_RIL_UNSOL_RAC_UPDATE (MTK_RIL_UNSOL_MTK_BASE + 37)
 
 #endif /* MTK_CONSTANTS_H */

=== added file 'drivers/mtkmodem/mtkreply.c'
--- drivers/mtkmodem/mtkreply.c	1970-01-01 00:00:00 +0000
+++ drivers/mtkmodem/mtkreply.c	2014-07-31 23:42:19 +0000
@@ -0,0 +1,68 @@
+/*
+ *
+ *  MTK driver for ofono/rilmodem
+ *
+ *  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
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+
+#include "mtkreply.h"
+
+int g_mtk_reply_parse_get_3g_capability(GRil *gril,
+					const struct ril_msg *message)
+{
+	struct parcel rilp;
+	int sim_3g, numint, slot;
+
+	g_ril_init_parcel(message, &rilp);
+
+	numint = parcel_r_int32(&rilp);
+	if (numint < 1) {
+		ofono_error("%s: wrong format", __func__);
+		goto error;
+	}
+
+	/*
+	 * Bitmap with 3g capability per slot. Reply is the same regardless of
+	 * the socket used to sent the request.
+	 */
+	sim_3g = parcel_r_int32(&rilp);
+
+	if (rilp.malformed) {
+		ofono_error("%s: malformed parcel", __func__);
+		goto error;
+	}
+
+	g_ril_append_print_buf(gril, "{%d}", sim_3g);
+	g_ril_print_response(gril, message);
+
+	slot = g_ril_get_slot(gril);
+
+	return (sim_3g >> slot) & 0x01;
+
+error:
+	return -1;
+}

=== added file 'drivers/mtkmodem/mtkreply.h'
--- drivers/mtkmodem/mtkreply.h	1970-01-01 00:00:00 +0000
+++ drivers/mtkmodem/mtkreply.h	2014-07-31 23:42:19 +0000
@@ -0,0 +1,40 @@
+/*
+ *
+ *  MTK driver for ofono/rilmodem
+ *
+ *  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 MTKREPLY_H
+#define MTKREPLY_H
+
+#include <ofono/types.h>
+
+#include "gril.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int g_mtk_reply_parse_get_3g_capability(GRil *gril,
+					const struct ril_msg *message);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MTKREPLY_H */

=== modified file 'drivers/mtkmodem/mtkutil.c'
--- drivers/mtkmodem/mtkutil.c	2014-06-12 10:51:14 +0000
+++ drivers/mtkmodem/mtkutil.c	2014-07-31 23:42:19 +0000
@@ -27,20 +27,22 @@
 const char *mtk_request_id_to_string(int req)
 {
 	switch (req) {
-	case RIL_REQUEST_RADIO_POWEROFF:
-		return "RIL_REQUEST_RADIO_POWEROFF";
-	case RIL_REQUEST_DUAL_SIM_MODE_SWITCH:
-		return "RIL_REQUEST_DUAL_SIM_MODE_SWITCH";
-	case RIL_REQUEST_SET_GPRS_CONNECT_TYPE:
-		return "RIL_REQUEST_SET_GPRS_CONNECT_TYPE";
-	case RIL_REQUEST_SET_GPRS_TRANSFER_TYPE:
-		return "RIL_REQUEST_SET_GPRS_TRANSFER_TYPE";
-	case RIL_REQUEST_RADIO_POWERON:
-		return "RIL_REQUEST_RADIO_POWERON";
-	case RIL_REQUEST_SET_CALL_INDICATION:
-		return "RIL_REQUEST_SET_CALL_INDICATION";
-	case RIL_REQUEST_SET_FD_MODE:
-		return "RIL_REQUEST_SET_FD_MODE";
+	case MTK_RIL_REQUEST_RADIO_POWEROFF:
+		return "MTK_RIL_REQUEST_RADIO_POWEROFF";
+	case MTK_RIL_REQUEST_DUAL_SIM_MODE_SWITCH:
+		return "MTK_RIL_REQUEST_DUAL_SIM_MODE_SWITCH";
+	case MTK_RIL_REQUEST_SET_GPRS_CONNECT_TYPE:
+		return "MTK_RIL_REQUEST_SET_GPRS_CONNECT_TYPE";
+	case MTK_RIL_REQUEST_SET_GPRS_TRANSFER_TYPE:
+		return "MTK_RIL_REQUEST_SET_GPRS_TRANSFER_TYPE";
+	case MTK_RIL_REQUEST_RADIO_POWERON:
+		return "MTK_RIL_REQUEST_RADIO_POWERON";
+	case MTK_RIL_REQUEST_SET_CALL_INDICATION:
+		return "MTK_RIL_REQUEST_SET_CALL_INDICATION";
+	case MTK_RIL_REQUEST_GET_3G_CAPABILITY:
+		return "MTK_RIL_REQUEST_GET_3G_CAPABILITY";
+	case MTK_RIL_REQUEST_SET_FD_MODE:
+		return "MTK_RIL_REQUEST_SET_FD_MODE";
 	default:
 		return NULL;
 	}
@@ -49,14 +51,82 @@
 const char *mtk_unsol_request_to_string(int req)
 {
 	switch (req) {
-	case RIL_UNSOL_RADIO_TEMPORARILY_UNAVAILABLE:
-		return "RIL_UNSOL_RADIO_TEMPORARILY_UNAVAILABLE";
-        case RIL_UNSOL_CALL_PROGRESS_INFO:
-        	return "RIL_UNSOL_CALL_PROGRESS_INFO";
-        case RIL_UNSOL_INCOMING_CALL_INDICATION:
-        	return "RIL_UNSOL_INCOMING_CALL_INDICATION";
-	case RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED:
-		return "RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED";
+	case MTK_RIL_UNSOL_NEIGHBORING_CELL_INFO:
+		return "MTK_RIL_UNSOL_NEIGHBORING_CELL_INFO";
+	case MTK_RIL_UNSOL_NETWORK_INFO:
+		return "MTK_RIL_UNSOL_NETWORK_INFO";
+	case MTK_RIL_UNSOL_CALL_FORWARDING:
+		return "MTK_RIL_UNSOL_CALL_FORWARDING";
+	case MTK_RIL_UNSOL_CRSS_NOTIFICATION:
+		return "MTK_RIL_UNSOL_CRSS_NOTIFICATION";
+	case MTK_RIL_UNSOL_CALL_PROGRESS_INFO:
+		return "MTK_RIL_UNSOL_CALL_PROGRESS_INFO";
+	case MTK_RIL_UNSOL_PHB_READY_NOTIFICATION:
+		return "MTK_RIL_UNSOL_PHB_READY_NOTIFICATION";
+	case MTK_RIL_UNSOL_SPEECH_INFO:
+		return "MTK_RIL_UNSOL_SPEECH_INFO";
+	case MTK_RIL_UNSOL_SIM_INSERTED_STATUS:
+		return "MTK_RIL_UNSOL_SIM_INSERTED_STATUS";
+	case MTK_RIL_UNSOL_RADIO_TEMPORARILY_UNAVAILABLE:
+		return "MTK_RIL_UNSOL_RADIO_TEMPORARILY_UNAVAILABLE";
+	case MTK_RIL_UNSOL_ME_SMS_STORAGE_FULL:
+		return "MTK_RIL_UNSOL_ME_SMS_STORAGE_FULL";
+	case MTK_RIL_UNSOL_SMS_READY_NOTIFICATION:
+		return "MTK_RIL_UNSOL_SMS_READY_NOTIFICATION";
+	case MTK_RIL_UNSOL_SCRI_RESULT:
+		return "MTK_RIL_UNSOL_SCRI_RESULT";
+	case MTK_RIL_UNSOL_VT_STATUS_INFO:
+		return "MTK_RIL_UNSOL_VT_STATUS_INFO";
+	case MTK_RIL_UNSOL_VT_RING_INFO:
+		return "MTK_RIL_UNSOL_VT_RING_INFO";
+	case MTK_RIL_UNSOL_INCOMING_CALL_INDICATION:
+		return "MTK_RIL_UNSOL_INCOMING_CALL_INDICATION";
+	case MTK_RIL_UNSOL_SIM_MISSING:
+		return "MTK_RIL_UNSOL_SIM_MISSING";
+	case MTK_RIL_UNSOL_GPRS_DETACH:
+		return "MTK_RIL_UNSOL_GPRS_DETACH";
+	case MTK_RIL_UNSOL_ATCI_RESPONSE:
+		return "MTK_RIL_UNSOL_ATCI_RESPONSE";
+	case MTK_RIL_UNSOL_SIM_RECOVERY:
+		return "MTK_RIL_UNSOL_SIM_RECOVERY";
+	case MTK_RIL_UNSOL_VIRTUAL_SIM_ON:
+		return "MTK_RIL_UNSOL_VIRTUAL_SIM_ON";
+	case MTK_RIL_UNSOL_VIRTUAL_SIM_OFF:
+		return "MTK_RIL_UNSOL_VIRTUAL_SIM_OFF";
+	case MTK_RIL_UNSOL_INVALID_SIM:
+		return "MTK_RIL_UNSOL_INVALID_SIM";
+	case MTK_RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED:
+		return "MTK_RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED";
+	case MTK_RIL_UNSOL_RESPONSE_ACMT:
+		return "MTK_RIL_UNSOL_RESPONSE_ACMT";
+	case MTK_RIL_UNSOL_EF_CSP_PLMN_MODE_BIT:
+		return "MTK_RIL_UNSOL_EF_CSP_PLMN_MODE_BIT";
+	case MTK_RIL_UNSOL_IMEI_LOCK:
+		return "MTK_RIL_UNSOL_IMEI_LOCK";
+	case MTK_RIL_UNSOL_RESPONSE_MMRR_STATUS_CHANGED:
+		return "MTK_RIL_UNSOL_RESPONSE_MMRR_STATUS_CHANGED";
+	case MTK_RIL_UNSOL_SIM_PLUG_OUT:
+		return "MTK_RIL_UNSOL_SIM_PLUG_OUT";
+	case MTK_RIL_UNSOL_SIM_PLUG_IN:
+		return "MTK_RIL_UNSOL_SIM_PLUG_IN";
+	case MTK_RIL_UNSOL_RESPONSE_ETWS_NOTIFICATION:
+		return "MTK_RIL_UNSOL_RESPONSE_ETWS_NOTIFICATION";
+	case MTK_RIL_UNSOL_RESPONSE_PLMN_CHANGED:
+		return "MTK_RIL_UNSOL_RESPONSE_PLMN_CHANGED";
+	case MTK_RIL_UNSOL_RESPONSE_REGISTRATION_SUSPENDED:
+		return "MTK_RIL_UNSOL_RESPONSE_REGISTRATION_SUSPENDED";
+	case MTK_RIL_UNSOL_STK_EVDL_CALL:
+		return "MTK_RIL_UNSOL_STK_EVDL_CALL";
+	case MTK_RIL_UNSOL_DATA_PACKETS_FLUSH:
+		return "MTK_RIL_UNSOL_DATA_PACKETS_FLUSH";
+	case MTK_RIL_UNSOL_CIPHER_INDICATION:
+		return "MTK_RIL_UNSOL_CIPHER_INDICATION";
+	case MTK_RIL_UNSOL_FEMTOCELL_INFO:
+		return "MTK_RIL_UNSOL_FEMTOCELL_INFO";
+	case MTK_RIL_UNSOL_CNAP:
+		return "MTK_RIL_UNSOL_CNAP";
+	case MTK_RIL_UNSOL_RAC_UPDATE:
+		return "MTK_RIL_UNSOL_RAC_UPDATE";
 	default:
 		return NULL;
 	}

=== modified file 'drivers/mtkmodem/mtkutil.h'
--- drivers/mtkmodem/mtkutil.h	2014-03-20 07:46:16 +0000
+++ drivers/mtkmodem/mtkutil.h	2014-07-31 23:42:19 +0000
@@ -22,10 +22,23 @@
 #ifndef MTKUTIL_H
 #define MTKUTIL_H
 
+#include <ofono/types.h>
+#include <gril.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct ofono_modem;
+
+void mtk_set_attach_state(struct ofono_modem *modem, ofono_bool_t attached);
+void mtk_detach_received(struct ofono_modem *modem);
+
+struct mtk_gprs_data {
+	GRil *gril;
+	struct ofono_modem *modem;
+};
+
 const char *mtk_request_id_to_string(int req);
 const char *mtk_unsol_request_to_string(int req);
 

=== modified file 'drivers/mtkmodem/radio-settings.c'
--- drivers/mtkmodem/radio-settings.c	2014-06-12 10:51:14 +0000
+++ drivers/mtkmodem/radio-settings.c	2014-07-31 23:42:19 +0000
@@ -36,6 +36,7 @@
 
 #include "mtk_constants.h"
 #include "mtkunsol.h"
+#include "mtkreply.h"
 #include "mtkrequest.h"
 
 #include "common.h"
@@ -90,7 +91,7 @@
 	g_mtk_request_set_fd_mode(rsd->ril, MTK_FD_MODE_SCREEN_STATUS,
 					enable ? FALSE : TRUE, 0, &rilp);
 
-	if (g_ril_send(rsd->ril, RIL_REQUEST_SET_FD_MODE, &rilp,
+	if (g_ril_send(rsd->ril, MTK_RIL_REQUEST_SET_FD_MODE, &rilp,
 			mtk_set_fd_mode_cb, cbd, g_free) <= 0) {
 		g_free(cbd);
 		g_free(user);
@@ -118,6 +119,55 @@
 	return 0;
 }
 
+static void mtk_query_modem_rats_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_radio_settings *rs = cbd->user;
+	struct radio_data *rd = ofono_radio_settings_get_data(rs);
+	ofono_radio_settings_modem_rats_query_cb_t cb = cbd->cb;
+	ofono_bool_t modem_rats[OFONO_RADIO_ACCESS_MODE_LAST] = { FALSE };
+	int is_3g;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s: error %s", __func__,
+				ril_error_to_string(message->error));
+		CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+		return;
+	}
+
+	is_3g = g_mtk_reply_parse_get_3g_capability(rd->ril, message);
+	if (is_3g < 0) {
+		ofono_error("%s: parse error", __func__);
+		CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+		return;
+	}
+
+	modem_rats[OFONO_RADIO_ACCESS_MODE_GSM] = TRUE;
+
+	if (is_3g) {
+		modem_rats[OFONO_RADIO_ACCESS_MODE_UMTS] = TRUE;
+
+		if (getenv("OFONO_RIL_RAT_LTE"))
+			modem_rats[OFONO_RADIO_ACCESS_MODE_LTE] = TRUE;
+	}
+
+	CALLBACK_WITH_SUCCESS(cb, modem_rats, cbd->data);
+}
+
+static void mtk_query_modem_rats(struct ofono_radio_settings *rs,
+				ofono_radio_settings_modem_rats_query_cb_t cb,
+				void *data)
+{
+	struct radio_data *rd = ofono_radio_settings_get_data(rs);
+	struct cb_data *cbd = cb_data_new(cb, data, rs);
+
+	if (g_ril_send(rd->ril, MTK_RIL_REQUEST_GET_3G_CAPABILITY, NULL,
+			mtk_query_modem_rats_cb, cbd, g_free) <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, NULL, data);
+	}
+}
+
 static struct ofono_radio_settings_driver driver = {
 	.name			= MTKMODEM,
 	.probe			= mtk_radio_settings_probe,
@@ -125,7 +175,8 @@
 	.query_rat_mode		= ril_query_rat_mode,
 	.set_rat_mode		= ril_set_rat_mode,
 	.query_fast_dormancy	= ril_query_fast_dormancy,
-	.set_fast_dormancy	= mtk_set_fast_dormancy
+	.set_fast_dormancy	= mtk_set_fast_dormancy,
+	.query_modem_rats	= mtk_query_modem_rats
 };
 
 void mtk_radio_settings_init(void)

=== modified file 'drivers/mtkmodem/voicecall.c'
--- drivers/mtkmodem/voicecall.c	2014-05-07 14:20:19 +0000
+++ drivers/mtkmodem/voicecall.c	2014-07-31 23:42:19 +0000
@@ -84,7 +84,7 @@
 						call_ind->call_id,
 						call_ind->seq_number, &rilp);
 
-	if (g_ril_send(vd->ril, RIL_REQUEST_SET_CALL_INDICATION,
+	if (g_ril_send(vd->ril, MTK_RIL_REQUEST_SET_CALL_INDICATION,
 			&rilp, mtk_set_indication_cb, vc, NULL) == 0)
 		ofono_error("%s: cannot send indication", __func__);
 
@@ -97,11 +97,11 @@
 	struct ril_voicecall_data *vd = ofono_voicecall_get_data(vc);
 
 	/* MTK generates this event instead of CALL_STATE_CHANGED */
-	g_ril_register(vd->ril, RIL_UNSOL_CALL_PROGRESS_INFO,
+	g_ril_register(vd->ril, MTK_RIL_UNSOL_CALL_PROGRESS_INFO,
 			ril_call_state_notify, vc);
 
 	/* Indicates incoming call, before telling the network our state */
-	g_ril_register(vd->ril, RIL_UNSOL_INCOMING_CALL_INDICATION,
+	g_ril_register(vd->ril, MTK_RIL_UNSOL_INCOMING_CALL_INDICATION,
 			mtk_incoming_notify, vc);
 
 	/* This makes the timeout a single-shot */

=== modified file 'drivers/rilmodem/gprs-context.c'
--- drivers/rilmodem/gprs-context.c	2014-04-29 15:50:23 +0000
+++ drivers/rilmodem/gprs-context.c	2014-07-31 23:42:19 +0000
@@ -61,6 +61,7 @@
 	enum state state;
 	guint call_list_id;
 	char *apn;
+	enum ofono_gprs_context_type type;
 };
 
 static void ril_gprs_context_deactivate_primary(struct ofono_gprs_context *gc,
@@ -247,10 +248,16 @@
 		request.tech = gd->tech + 2;
 	}
 
-	/* TODO: add comments about tethering, other non-public
+	/*
+	 * TODO: add comments about tethering, other non-public
 	 * profiles...
 	 */
-	request.data_profile = RIL_DATA_PROFILE_DEFAULT;
+	if (g_ril_vendor(gcd->ril) == OFONO_RIL_VENDOR_MTK &&
+			gcd->type == OFONO_GPRS_CONTEXT_TYPE_MMS)
+		request.data_profile = RIL_DATA_PROFILE_MTK_MMS;
+	else
+		request.data_profile = RIL_DATA_PROFILE_DEFAULT;
+
 	request.apn = g_strdup(ctx->apn);
 	request.username = g_strdup(ctx->username);
 	request.password = g_strdup(ctx->password);
@@ -261,6 +268,7 @@
 		request.auth_type = RIL_AUTH_BOTH;
 
 	request.protocol = ctx->proto;
+	request.req_cid = ctx->cid;
 
 	if (g_ril_request_setup_data_call(gcd->ril,
 						&request,
@@ -405,7 +413,7 @@
 static int ril_gprs_context_probe(struct ofono_gprs_context *gc,
 					unsigned int vendor, void *data)
 {
-	GRil *ril = data;
+	struct ril_gprs_context_data *ril_data = data;
 	struct gprs_context_data *gcd;
 
 	DBG("*gc: %p", gc);
@@ -414,9 +422,10 @@
 	if (gcd == NULL)
 		return -ENOMEM;
 
-	gcd->ril = g_ril_clone(ril);
+	gcd->ril = g_ril_clone(ril_data->gril);
 	set_context_disconnected(gcd);
 	gcd->call_list_id = -1;
+	gcd->type = ril_data->type;
 
 	ofono_gprs_context_set_data(gc, gcd);
 

=== modified file 'drivers/rilmodem/gprs.h'
--- drivers/rilmodem/gprs.h	2014-04-21 09:02:55 +0000
+++ drivers/rilmodem/gprs.h	2014-07-31 23:42:19 +0000
@@ -21,6 +21,7 @@
 
 struct ril_gprs_data {
 	GRil *ril;
+	struct ofono_modem *modem;
 	gboolean ofono_attached;
 	unsigned int max_cids;
 	int rild_status;

=== modified file 'drivers/rilmodem/radio-settings.c'
--- drivers/rilmodem/radio-settings.c	2014-06-12 10:47:10 +0000
+++ drivers/rilmodem/radio-settings.c	2014-07-31 23:42:19 +0000
@@ -200,6 +200,34 @@
 	}
 }
 
+static ofono_bool_t query_modem_rats_cb(gpointer user_data)
+{
+	ofono_bool_t modem_rats[OFONO_RADIO_ACCESS_MODE_LAST] = { FALSE };
+	struct cb_data *cbd = user_data;
+	ofono_radio_settings_modem_rats_query_cb_t cb = cbd->cb;
+
+	modem_rats[OFONO_RADIO_ACCESS_MODE_GSM] = TRUE;
+	modem_rats[OFONO_RADIO_ACCESS_MODE_UMTS] = TRUE;
+
+	if (getenv("OFONO_RIL_RAT_LTE"))
+		modem_rats[OFONO_RADIO_ACCESS_MODE_LTE] = TRUE;
+
+	CALLBACK_WITH_SUCCESS(cb, modem_rats, cbd->data);
+
+	g_free(cbd);
+
+	return FALSE;
+}
+
+static void ril_query_modem_rats(struct ofono_radio_settings *rs,
+				ofono_radio_settings_modem_rats_query_cb_t cb,
+				void *data)
+{
+	struct cb_data *cbd = cb_data_new(cb, data, rs);
+
+	g_idle_add(query_modem_rats_cb, cbd);
+}
+
 void ril_delayed_register(const struct ofono_error *error, void *user_data)
 {
 	struct ofono_radio_settings *rs = user_data;
@@ -246,7 +274,8 @@
 	.query_rat_mode		= ril_query_rat_mode,
 	.set_rat_mode		= ril_set_rat_mode,
 	.query_fast_dormancy	= ril_query_fast_dormancy,
-	.set_fast_dormancy	= ril_set_fast_dormancy
+	.set_fast_dormancy	= ril_set_fast_dormancy,
+	.query_modem_rats	= ril_query_modem_rats
 };
 
 void ril_radio_settings_init(void)

=== modified file 'drivers/rilmodem/rilutil.h'
--- drivers/rilmodem/rilutil.h	2014-03-20 07:46:16 +0000
+++ drivers/rilmodem/rilutil.h	2014-07-31 23:42:19 +0000
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <modem.h>
 #include <sim.h>
+#include <gprs-context.h>
 
 /* TODO: create a table lookup*/
 #define PREFIX_30_NETMASK "255.255.255.252"
@@ -93,6 +94,11 @@
 	ofono_sim_state_event_cb_t ril_state_watch;
 };
 
+struct ril_gprs_context_data {
+	GRil *gril;
+	enum ofono_gprs_context_type type;
+};
+
 typedef void (*ril_util_sim_inserted_cb_t)(gboolean present, void *userdata);
 
 void decode_ril_error(struct ofono_error *error, const char *final);

=== modified file 'gril/gril.c'
--- gril/gril.c	2014-04-25 08:48:44 +0000
+++ gril/gril.c	2014-07-31 23:42:19 +0000
@@ -104,6 +104,7 @@
 	gboolean in_read_handler;		/* Re-entrancy guard */
 	gboolean in_notify;
 	enum ofono_ril_vendor vendor;
+	int slot;
 	GRilMsgIdToStrFunc req_to_string;
 	GRilMsgIdToStrFunc unsol_to_string;
 };
@@ -377,8 +378,8 @@
 			message->req = req->req;
 
 			if (message->error != RIL_E_SUCCESS)
-				RIL_TRACE(p, "[%04d]< %s failed %s",
-					message->serial_no,
+				RIL_TRACE(p, "[%d,%04d]< %s failed %s",
+					p->slot, message->serial_no,
 					request_id_to_string(p, message->req),
 					ril_error_to_string(message->error));
 
@@ -413,6 +414,17 @@
 
 }
 
+static gboolean node_check_destroyed(struct ril_notify_node *node,
+					gpointer userdata)
+{
+	gboolean val = GPOINTER_TO_UINT(userdata);
+
+	if (node->destroyed == val)
+		return TRUE;
+
+	return FALSE;
+}
+
 static void handle_unsol_req(struct ril_s *p, struct ril_msg *message)
 {
 	GHashTableIter iter;
@@ -454,6 +466,11 @@
 			unsol_request_to_string(p, message->req));
 
 	p->in_notify = FALSE;
+
+	/* Now destroy nodes possibly removed by callbacks */
+	if (found)
+		ril_unregister_all(p, FALSE, node_check_destroyed,
+					GUINT_TO_POINTER(TRUE));
 }
 
 static void dispatch(struct ril_s *p, struct ril_msg *message)
@@ -1192,6 +1209,23 @@
 	return ril->parent->trace = trace;
 }
 
+gboolean g_ril_set_slot(GRil *ril, int slot)
+{
+	if (ril == NULL || ril->parent == NULL)
+		return FALSE;
+
+	ril->parent->slot = slot;
+	return TRUE;
+}
+
+int g_ril_get_slot(GRil *ril)
+{
+	if (ril == NULL)
+		return 0;
+
+	return ril->parent->slot;
+}
+
 gboolean g_ril_set_debugf(GRil *ril,
 			GRilDebugFunc func, gpointer user_data)
 {

=== modified file 'gril/gril.h'
--- gril/gril.h	2014-03-18 10:06:57 +0000
+++ gril/gril.h	2014-07-31 23:42:19 +0000
@@ -69,37 +69,43 @@
  */
 #define G_RIL_TRACE(gril, fmt, arg...) do {	\
 	if (gril && g_ril_get_trace(gril))	\
-		ofono_debug(fmt, ## arg); 	\
+		ofono_debug(fmt, ## arg);	\
 } while (0)
 
 extern char print_buf[];
 
 #define g_ril_print_request(gril, token, req)				\
-        G_RIL_TRACE(gril, "[%04d]> %s %s", token, 			\
+	G_RIL_TRACE(gril, "[%d,%04d]> %s %s",				\
+		g_ril_get_slot(gril), token,				\
 		g_ril_request_id_to_string(gril, req), print_buf)
 #define g_ril_print_request_no_args(gril, token, req)			\
-        G_RIL_TRACE(gril, "[%04d]> %s", token,				\
+	G_RIL_TRACE(gril, "[%d,%04d]> %s",				\
+			g_ril_get_slot(gril), token,			\
 			g_ril_request_id_to_string(gril, req))
-#define g_ril_print_response(gril, message)           			\
-        G_RIL_TRACE(gril, "[%04d]< %s %s", message->serial_no,		\
+#define g_ril_print_response(gril, message)				\
+	G_RIL_TRACE(gril, "[%d,%04d]< %s %s",				\
+			g_ril_get_slot(gril),				\
+			message->serial_no,				\
 			g_ril_request_id_to_string(gril, message->req), \
 							print_buf)
 #define g_ril_print_response_no_args(gril, message)			\
-        G_RIL_TRACE(gril, "[%04d]< %s", message->serial_no,		\
+	G_RIL_TRACE(gril, "[%d,%04d]< %s",				\
+		g_ril_get_slot(gril), message->serial_no,		\
 			g_ril_request_id_to_string(gril, message->req))
 
-#define g_ril_append_print_buf(gril, x...)  do {    \
-	if (gril && g_ril_get_trace(gril))          \
-		sprintf(print_buf, x);              \
+#define g_ril_append_print_buf(gril, x...) do {	\
+	if (gril && g_ril_get_trace(gril))	\
+		sprintf(print_buf, x);		\
 } while (0)
 
 #define g_ril_print_unsol(gril, message)				\
-        G_RIL_TRACE(gril, "[UNSOL]< %s %s",				\
+	G_RIL_TRACE(gril, "[%d,UNSOL]< %s %s",				\
+			g_ril_get_slot(gril),				\
 			g_ril_unsol_request_to_string(gril,		\
 							message->req),	\
 			print_buf)
 #define g_ril_print_unsol_no_args(gril, message)			\
-        G_RIL_TRACE(gril, "[UNSOL]< %s",				\
+	G_RIL_TRACE(gril, "[%d,UNSOL]< %s", g_ril_get_slot(gril),	\
 			g_ril_unsol_request_to_string(gril, message->req))
 
 void g_ril_init_parcel(const struct ril_msg *message, struct parcel *rilp);
@@ -120,6 +126,9 @@
 gboolean g_ril_get_trace(GRil *ril);
 gboolean g_ril_set_trace(GRil *ril, gboolean trace);
 
+int g_ril_get_slot(GRil *ril);
+gboolean g_ril_set_slot(GRil *ril, int slot);
+
 /*!
  * If the function is not NULL, then on every read/write from the GIOChannel
  * provided to GRil the logging function will be called with the

=== modified file 'gril/grilreply.c'
--- gril/grilreply.c	2014-07-16 22:55:36 +0000
+++ gril/grilreply.c	2014-07-31 23:42:19 +0000
@@ -515,8 +515,8 @@
 	unsigned int i;
 	struct reply_sim_status *status;
 
-	g_ril_append_print_buf(gril, "[%04d]< %s",
-			message->serial_no,
+	g_ril_append_print_buf(gril, "[%d,%04d]< %s",
+			g_ril_get_slot(gril), message->serial_no,
 			ril_request_id_to_string(message->req));
 
 	g_ril_init_parcel(message, &rilp);

=== modified file 'gril/grilrequest.c'
--- gril/grilrequest.c	2014-07-14 12:47:48 +0000
+++ gril/grilrequest.c	2014-07-31 23:42:19 +0000
@@ -54,6 +54,7 @@
 #define DATA_PROFILE_FOTA_STR "3"
 #define DATA_PROFILE_CBS_STR "4"
 #define DATA_PROFILE_OEM_BASE_STR "1000"
+#define DATA_PROFILE_MTK_MMS_STR "1001"
 
 /* SETUP_DATA_CALL_PARAMS reply parameters */
 #define MIN_DATA_CALL_REPLY_SIZE 36
@@ -83,6 +84,9 @@
 #define RIL_FACILITY_UNLOCK "0"
 #define RIL_FACILITY_LOCK "1"
 
+/* Call ID should not really be a big number */
+#define MAX_CID_DIGITS 3
+
 /*
  * TODO:
  *
@@ -238,7 +242,6 @@
 	gchar *profile_str;
 	size_t apn_len;
 	int num_param = SETUP_DATA_CALL_PARAMS;
-	const char *request_cid_pr = "";
 
 	DBG("");
 
@@ -277,6 +280,11 @@
 	case RIL_DATA_PROFILE_CBS:
 		profile_str = DATA_PROFILE_CBS_STR;
 		break;
+	case RIL_DATA_PROFILE_MTK_MMS:
+		if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
+			profile_str = DATA_PROFILE_MTK_MMS_STR;
+			break;
+		}
 	default:
 		ofono_error("%s, invalid data_profile value: %d",
 				__func__,
@@ -325,22 +333,26 @@
 	parcel_w_string(rilp, auth_str);
 	parcel_w_string(rilp, protocol_str);
 
-	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
-		/* MTK request_cid parameter */
-		parcel_w_string(rilp, "1");
-		request_cid_pr = ",1";
-	}
-
 	g_ril_append_print_buf(gril,
-				"(%s,%s,%s,%s,%s,%s,%s%s)",
+				"(%s,%s,%s,%s,%s,%s,%s",
 				tech_str,
 				profile_str,
 				req->apn,
 				req->username,
 				req->password,
 				auth_str,
-				protocol_str,
-				request_cid_pr);
+				protocol_str);
+
+	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
+		/* MTK request_cid parameter */
+		char cid_str[MAX_CID_DIGITS + 1];
+
+		snprintf(cid_str, sizeof(cid_str), "%u", req->req_cid);
+		parcel_w_string(rilp, cid_str);
+		g_ril_append_print_buf(gril, "%s,%s", print_buf, cid_str);
+	}
+
+	g_ril_append_print_buf(gril, "%s)", print_buf);
 
 	g_free(tech_str);
 	g_free(auth_str);

=== modified file 'gril/grilrequest.h'
--- gril/grilrequest.h	2014-07-14 12:47:48 +0000
+++ gril/grilrequest.h	2014-07-31 23:42:19 +0000
@@ -54,6 +54,7 @@
 	gchar *password;
 	guint auth_type;
 	guint protocol;
+	unsigned req_cid;
 };
 
 struct req_sim_read_info {

=== modified file 'gril/ril_constants.h'
--- gril/ril_constants.h	2014-04-29 15:50:22 +0000
+++ gril/ril_constants.h	2014-07-31 23:42:19 +0000
@@ -169,6 +169,8 @@
 #define RIL_DATA_PROFILE_FOTA 3           /* FOTA = Firmware Over the Air */
 #define RIL_DATA_PROFILE_CBS 4
 #define RIL_DATA_PROFILE_OEM_BASE 1000    /* Start of OEM-specific profiles */
+/* MTK specific profile for MMS */
+#define RIL_DATA_PROFILE_MTK_MMS (RIL_DATA_PROFILE_OEM_BASE + 1)
 
 #define RIL_AUTH_NONE 0
 #define RIL_AUTH_PAP 1

=== modified file 'include/radio-settings.h'
--- include/radio-settings.h	2012-06-16 14:50:05 +0000
+++ include/radio-settings.h	2014-07-31 23:42:19 +0000
@@ -35,6 +35,9 @@
 	OFONO_RADIO_ACCESS_MODE_LTE	= 3,
 };
 
+/* Set this to latest in ofono_radio_access_mode + 1 */
+#define OFONO_RADIO_ACCESS_MODE_LAST (OFONO_RADIO_ACCESS_MODE_LTE + 1)
+
 enum ofono_radio_band_gsm {
 	OFONO_RADIO_BAND_GSM_ANY,
 	OFONO_RADIO_BAND_GSM_850,
@@ -80,6 +83,11 @@
 						ofono_bool_t enable,
 						void *data);
 
+typedef void (*ofono_radio_settings_modem_rats_query_cb_t)(
+						const struct ofono_error *error,
+						const ofono_bool_t rats[],
+						void *data);
+
 struct ofono_radio_settings_driver {
 	const char *name;
 	int (*probe)(struct ofono_radio_settings *rs, unsigned int vendor,
@@ -107,6 +115,9 @@
 				ofono_bool_t enable,
 				ofono_radio_settings_fast_dormancy_set_cb_t,
 				void *data);
+	void (*query_modem_rats)(struct ofono_radio_settings *rs,
+				ofono_radio_settings_modem_rats_query_cb_t cb,
+				void *data);
 };
 
 int ofono_radio_settings_driver_register(

=== modified file 'plugins/mtk.c'
--- plugins/mtk.c	2014-07-09 07:47:20 +0000
+++ plugins/mtk.c	2014-07-31 23:42:19 +0000
@@ -81,7 +81,6 @@
 struct mtk_data {
 	GRil *modem;
 	int sim_status_retries;
-	ofono_bool_t connected;
 	ofono_bool_t have_sim;
 	ofono_bool_t ofono_online;
 	int radio_state;
@@ -94,6 +93,7 @@
 	struct ofono_devinfo *devinfo;
 	struct cb_data *pending_online_cbd;
 	ofono_bool_t pending_online;
+	ofono_bool_t gprs_attach;
 };
 
 /*
@@ -118,6 +118,65 @@
 	ofono_info("%s%s", prefix, str);
 }
 
+static struct mtk_data *ril_complement(struct mtk_data *ril)
+{
+	if (ril->slot == MULTISIM_SLOT_0)
+		return mtk_1;
+	else
+		return mtk_0;
+}
+
+/*
+ * mtk_set_attach_state and mtk_detach_received are called by mtkmodem's gprs
+ * driver. They are needed to solve an issue with data attachment: in case
+ * org.ofono.ConnectionManager Powered property is set for, say, slot 1 while
+ * slot 0 has that property also set, slot 1 will not change the data
+ * registration state even after slot 0 data connection is finally dropped. To
+ * force slot 1 to try to attach we need to send an additional
+ * MTK_RIL_REQUEST_SET_GPRS_CONNECT_TYPE. The way to know when to do this is to
+ * detect when slot 0 has finally detached. This is done listening for
+ * MTK_RIL_UNSOL_GPRS_DETACH events, but unfortunately these events are received
+ * in the modem that does not need to know about them, so we have to pass them
+ * to the mtk plugin (which has knowledge of both modems) that will take proper
+ * action in the other modem.
+ */
+
+void mtk_set_attach_state(struct ofono_modem *modem, ofono_bool_t attached)
+{
+	struct mtk_data *ril = ofono_modem_get_data(modem);
+
+	ril->gprs_attach = attached;
+}
+
+static void detach_received_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct mtk_data *ril = user_data;
+
+	if (message->error == RIL_E_SUCCESS)
+		g_ril_print_response_no_args(ril->modem, message);
+	else
+		ofono_error("%s: RIL error %s", __func__,
+				ril_error_to_string(message->error));
+}
+
+void mtk_detach_received(struct ofono_modem *modem)
+{
+	struct mtk_data *ril = ofono_modem_get_data(modem);
+	struct mtk_data *ril_c = ril_complement(ril);
+
+	if (ril_c != NULL && ril_c->gprs_attach) {
+		struct parcel rilp;
+
+		g_mtk_request_set_gprs_connect_type(ril_c->modem,
+						ril_c->gprs_attach, &rilp);
+
+		if (g_ril_send(ril_c->modem,
+				MTK_RIL_REQUEST_SET_GPRS_CONNECT_TYPE,
+				&rilp, detach_received_cb, ril_c, NULL) == 0)
+			ofono_error("%s: send failed", __func__);
+	}
+}
+
 static gboolean sim_status_retry(gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
@@ -168,6 +227,34 @@
 	}
 }
 
+static void sim_removed(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_modem *modem = (struct ofono_modem *) user_data;
+	struct mtk_data *ril = ofono_modem_get_data(modem);
+
+	DBG("");
+
+	g_ril_print_unsol_no_args(ril->modem, message);
+
+	ofono_modem_set_powered(modem, FALSE);
+	g_idle_add(mtk_connected, modem);
+}
+
+static void sim_inserted(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_modem *modem = (struct ofono_modem *) user_data;
+	struct mtk_data *ril = ofono_modem_get_data(modem);
+
+	DBG("");
+
+	g_ril_print_unsol_no_args(ril->modem, message);
+
+	if (getenv("OFONO_RIL_HOT_SIM_SWAP")) {
+		ofono_modem_set_powered(modem, FALSE);
+		g_idle_add(mtk_connected, modem);
+	}
+}
+
 static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
@@ -191,6 +278,12 @@
 					" exceeded!", ril->slot);
 	} else {
 
+		/* Register for changes in SIM insertion */
+		g_ril_register(ril->modem, MTK_RIL_UNSOL_SIM_PLUG_OUT,
+				sim_removed, modem);
+		g_ril_register(ril->modem, MTK_RIL_UNSOL_SIM_PLUG_IN,
+				sim_inserted, modem);
+
 		if ((status = g_ril_reply_parse_sim_status(ril->modem, message))
 				!= NULL) {
 
@@ -202,7 +295,8 @@
 					DBG("notify SIM inserted");
 					ril->have_sim = TRUE;
 
-					ofono_sim_inserted_notify(ril->sim, TRUE);
+					ofono_sim_inserted_notify(ril->sim,
+									TRUE);
 				}
 
 			} else {
@@ -213,7 +307,8 @@
 					DBG("notify SIM removed");
 					ril->have_sim = FALSE;
 
-					ofono_sim_inserted_notify(ril->sim, FALSE);
+					ofono_sim_inserted_notify(ril->sim,
+									FALSE);
 				}
 			}
 			g_ril_reply_free_sim_status(status);
@@ -300,6 +395,11 @@
 		struct ofono_gprs *gprs;
 		struct ofono_gprs_context *gc;
 		struct ofono_message_waiting *mw;
+		struct mtk_gprs_data gprs_data = { ril->modem, modem };
+		struct ril_gprs_context_data inet_ctx =
+			{ ril->modem, OFONO_GPRS_CONTEXT_TYPE_INTERNET };
+		struct ril_gprs_context_data mms_ctx =
+			{ ril->modem, OFONO_GPRS_CONTEXT_TYPE_MMS };
 
 		DBG("SIM ready, creating more atoms");
 
@@ -321,16 +421,14 @@
 						RILMODEM, ril->modem);
 		ofono_call_forwarding_create(modem, OFONO_RIL_VENDOR_MTK,
 						RILMODEM, ril->modem);
-		ofono_radio_settings_create(modem, OFONO_RIL_VENDOR_MTK,
-						MTKMODEM, ril->modem);
 		ofono_call_barring_create(modem, OFONO_RIL_VENDOR_MTK,
 						RILMODEM, ril->modem);
 
 		gprs = ofono_gprs_create(modem, OFONO_RIL_VENDOR_MTK,
-						MTKMODEM, ril->modem);
+						MTKMODEM, &gprs_data);
 
 		gc = ofono_gprs_context_create(modem, OFONO_RIL_VENDOR_MTK,
-						RILMODEM, ril->modem);
+						RILMODEM, &inet_ctx);
 		if (gc) {
 			ofono_gprs_context_set_type(gc,
 					OFONO_GPRS_CONTEXT_TYPE_INTERNET);
@@ -338,7 +436,7 @@
 		}
 
 		gc = ofono_gprs_context_create(modem, OFONO_RIL_VENDOR_MTK,
-						RILMODEM, ril->modem);
+						RILMODEM, &mms_ctx);
 		if (gc) {
 			ofono_gprs_context_set_type(gc,
 					OFONO_GPRS_CONTEXT_TYPE_MMS);
@@ -371,19 +469,15 @@
 	ofono_call_volume_create(modem, OFONO_RIL_VENDOR_MTK,
 					RILMODEM, ril->modem);
 
+	/* Radio settings does not depend on the SIM */
+	ofono_radio_settings_create(modem, OFONO_RIL_VENDOR_MTK,
+					MTKMODEM, ril->modem);
+
 	/* Ask sim status */
 	ril->sim_status_retries = 0;
 	send_get_sim_status(modem);
 }
 
-static struct mtk_data *ril_complement(struct mtk_data *ril)
-{
-	if (ril->slot == MULTISIM_SLOT_0)
-		return mtk_1;
-	else
-		return mtk_0;
-}
-
 static void mtk_sim_mode_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -450,7 +544,7 @@
 	g_mtk_request_dual_sim_mode_switch(mtk_0->modem, sim_mode, &rilp);
 
 	/* This request is always sent through the main socket */
-	if (g_ril_send(mtk_0->modem, RIL_REQUEST_DUAL_SIM_MODE_SWITCH,
+	if (g_ril_send(mtk_0->modem, MTK_RIL_REQUEST_DUAL_SIM_MODE_SWITCH,
 			&rilp, func, cbd, notify) == 0 && cbd != NULL) {
 		ofono_error("%s: failure sending request", __func__);
 		CALLBACK_WITH_FAILURE(cb, cbd->data);
@@ -555,8 +649,8 @@
 
 	if (current_state == NO_SIM_ACTIVE) {
 		/* Old state was off, need to power on the modem */
-		if (g_ril_send(mtk_0->modem, RIL_REQUEST_RADIO_POWERON, NULL,
-				poweron_cb, cbd, NULL) == 0) {
+		if (g_ril_send(mtk_0->modem, MTK_RIL_REQUEST_RADIO_POWERON,
+				NULL, poweron_cb, cbd, NULL) == 0) {
 			CALLBACK_WITH_FAILURE(cb, cbd->data);
 			g_free(cbd);
 		} else {
@@ -565,8 +659,8 @@
 			mtk_0->pending_cbd = cbd;
 		}
 	} else if (next_state == NO_SIM_ACTIVE) {
-		if (g_ril_send(mtk_0->modem, RIL_REQUEST_RADIO_POWEROFF, NULL,
-				online_off_cb, cbd, g_free) == 0) {
+		if (g_ril_send(mtk_0->modem, MTK_RIL_REQUEST_RADIO_POWEROFF,
+				NULL, online_off_cb, cbd, g_free) == 0) {
 			ofono_error("%s: failure sending request", __func__);
 			CALLBACK_WITH_FAILURE(cb, cbd->data);
 			g_free(cbd);
@@ -581,10 +675,7 @@
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
 	struct mtk_data *ril = ofono_modem_get_data(modem);
 
-        ofono_info("[slot %d] CONNECTED", ril->slot);
-
-	/* TODO: need a disconnect function to restart things! */
-	ril->connected = TRUE;
+	ofono_info("[slot %d] CONNECTED", ril->slot);
 
 	DBG("calling set_powered(TRUE)");
 
@@ -602,7 +693,7 @@
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
 	struct mtk_data *ril = ofono_modem_get_data(modem);
 
-        ofono_info("[slot %d] trying to reconnect", ril->slot);
+	ofono_info("[slot %d] trying to reconnect", ril->slot);
 
 	if (create_gril(modem) < 0)
 		return TRUE;
@@ -649,6 +740,9 @@
 
 	DBG("slot %d", ril->slot);
 
+	if (ril->modem != NULL)
+		return 0;
+
 	if (ril->slot == MULTISIM_SLOT_0) {
 		sock_path = sock_slot_0;
 		hex_prefix = hex_slot_0;
@@ -674,6 +768,8 @@
 		return -EIO;
 	}
 
+	g_ril_set_slot(ril->modem, ril->slot);
+
 	g_ril_set_vendor_print_msg_id_funcs(ril->modem,
 						mtk_request_id_to_string,
 						mtk_unsol_request_to_string);

=== modified file 'plugins/nettime.c'
--- plugins/nettime.c	2014-06-17 00:17:49 +0000
+++ plugins/nettime.c	2014-07-31 23:42:19 +0000
@@ -3,6 +3,7 @@
  *  oFono - Open Source Telephony
  *
  *  Copyright (C) 2012-2013  Jolla Ltd.
+ *  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
@@ -48,26 +49,25 @@
 	int dst;
 	int time_zone;
 
-	const char *mcc;
-	const char *mnc;
+	char mcc[OFONO_MAX_MCC_LENGTH + 1];
+	char mnc[OFONO_MAX_MNC_LENGTH + 1];
 	const char *path;
 };
 
-static struct nt_data *ntd = NULL;
-
-
-static void init_time(void)
+static void init_time(struct ofono_nettime_context *context)
 {
-	ntd = g_new0(struct nt_data, 1);
-
-	ntd->time_available = FALSE;
-	ntd->time_pending = FALSE;
-	ntd->dst = 0;
-	ntd->time_zone = 0;
+	struct nt_data *nt_data = g_new0(struct nt_data, 1);
+
+	nt_data->time_available = FALSE;
+	nt_data->time_pending = FALSE;
+	nt_data->dst = 0;
+	nt_data->time_zone = 0;
+
+	context->data = nt_data;
 }
 
 static gboolean encode_time_format(const struct ofono_network_time *time,
-				 struct tm *tm)
+					struct tm *tm)
 {
 	if (time->year < 0)
 		return FALSE;
@@ -92,8 +92,7 @@
 	return ts.tv_sec;
 }
 
-static int fill_time_notification(DBusMessage *msg,
-					struct nt_data *ntd)
+static int fill_time_notification(DBusMessage *msg, struct nt_data *ntd)
 {
 	DBusMessageIter iter, iter_array;
 	dbus_int64_t utc_long, received;
@@ -102,6 +101,7 @@
 	dbus_message_iter_open_container(&iter,	DBUS_TYPE_ARRAY,
 						"{sv}",
 						&iter_array);
+
 	if (ntd->time_pending) {
 		if (ntd->time_available) {
 			utc_long = (dbus_int64_t) ntd->nw_time_utc;
@@ -114,6 +114,11 @@
 						"DST",
 						DBUS_TYPE_UINT32,
 						&dst);
+			timezone = (dbus_int32_t) ntd->time_zone;
+			ofono_dbus_dict_append(&iter_array,
+						"Timezone",
+						DBUS_TYPE_INT32,
+						&timezone);
 			received = (dbus_int64_t) ntd->received;
 			ofono_dbus_dict_append(&iter_array,
 						"Received",
@@ -121,21 +126,21 @@
 						&received);
 		}
 
-		timezone = (dbus_int32_t) ntd->time_zone;
-		ofono_dbus_dict_append(&iter_array,
-					"Timezone",
-					DBUS_TYPE_INT32,
-					&timezone);
-
-		ofono_dbus_dict_append(&iter_array,
-					"MobileCountryCode",
-					DBUS_TYPE_STRING,
-					&ntd->mcc);
-
-		ofono_dbus_dict_append(&iter_array,
-					"MobileNetworkCode",
-					DBUS_TYPE_STRING,
-					&ntd->mnc);
+		if (ntd->mcc[0] != '\0') {
+			char *mcc = ntd->mcc;
+			ofono_dbus_dict_append(&iter_array,
+						"MobileCountryCode",
+						DBUS_TYPE_STRING,
+						&mcc);
+		}
+
+		if (ntd->mnc[0] != '\0') {
+			char *mnc = ntd->mnc;
+			ofono_dbus_dict_append(&iter_array,
+						"MobileNetworkCode",
+						DBUS_TYPE_STRING,
+						&mnc);
+		}
 	} else {
 		DBG("fill_time_notification: time not available");
 	}
@@ -145,14 +150,17 @@
 }
 
 static DBusMessage *get_network_time(DBusConnection *conn,
-						DBusMessage *msg, void *data)
+					DBusMessage *msg, void *data)
 {
 	DBusMessage *reply;
+	struct ofono_nettime_context *context = data;
+	struct nt_data *nt_data = context->data;
 
 	reply = dbus_message_new_method_return(msg);
 	if (reply == NULL)
 		return NULL;
-	fill_time_notification(reply, ntd);
+
+	fill_time_notification(reply, nt_data);
 	return reply;
 }
 
@@ -173,17 +181,20 @@
 {
 	DBusConnection *conn = ofono_dbus_get_connection();
 	const char *path = ofono_modem_get_path(context->modem);
+
 	DBG("Network time probe for modem: %p (%s)", context->modem, path);
-	init_time();
+
+	init_time(context);
+
 	if (!g_dbus_register_interface(conn, path,
-					OFONO_NETWORK_TIME_INTERFACE, // name
-					nettime_methods, // methods
-					nettime_signals, // signals
-					NULL, // GDBusPropertyTable *properties
-					NULL, // user data
-					NULL)) { // GDBusDestroyFunction destroy
-		ofono_error("Networkt time: Could not register interface %s, path %s",
-				OFONO_NETWORK_TIME_INTERFACE, path);
+					OFONO_NETWORK_TIME_INTERFACE,
+					nettime_methods,
+					nettime_signals,
+					NULL,		/* properties */
+					context,	/* user data */
+					NULL)) {
+		ofono_error("Network time: Could not register interface %s, "
+				"path %s", OFONO_NETWORK_TIME_INTERFACE, path);
 		return 1;
 	} else {
 		ofono_info("Network time: Registered inteface %s, path %s",
@@ -191,6 +202,7 @@
 	}
 
 	ofono_modem_add_interface(context->modem, OFONO_NETWORK_TIME_INTERFACE);
+
 	return 0;
 }
 
@@ -198,22 +210,26 @@
 {
 	DBusConnection *conn = ofono_dbus_get_connection();
 	const char *path = ofono_modem_get_path(context->modem);
+
 	DBG("Network time remove for modem: %p (%s)", context->modem, path);
-	if (!g_dbus_unregister_interface(conn, path, OFONO_NETWORK_TIME_INTERFACE)) {
-		ofono_error("Network time: could not unregister interface %s, path %s",
-				OFONO_NETWORK_TIME_INTERFACE, path);
-	}
-
-	ofono_modem_remove_interface(context->modem, OFONO_NETWORK_TIME_INTERFACE);
-	g_free(ntd);
+
+	if (!g_dbus_unregister_interface(conn, path,
+					OFONO_NETWORK_TIME_INTERFACE))
+		ofono_error("Network time: could not unregister interface %s, "
+				"path %s", OFONO_NETWORK_TIME_INTERFACE, path);
+
+	ofono_modem_remove_interface(context->modem,
+					OFONO_NETWORK_TIME_INTERFACE);
+	g_free(context->data);
 }
 
 static void send_signal(struct nt_data *ntd)
 {
 	DBusConnection *conn = ofono_dbus_get_connection();
-	DBusMessage *signal = dbus_message_new_signal(ntd->path,
-							OFONO_NETWORK_TIME_INTERFACE,
-							"NetworkTimeChanged");
+	DBusMessage *signal =
+		dbus_message_new_signal(ntd->path, OFONO_NETWORK_TIME_INTERFACE,
+					"NetworkTimeChanged");
+
 	fill_time_notification(signal, ntd);
 	g_dbus_send_message(conn, signal);
 }
@@ -223,15 +239,30 @@
 {
 	struct ofono_netreg *netreg;
 	struct tm t;
+	struct nt_data *ntd = context->data;
+	const char *mcc;
+	const char *mnc;
 
 	if (info == NULL)
 		return;
 
 	netreg = __ofono_atom_get_data(__ofono_modem_find_atom(
-						context->modem, OFONO_ATOM_TYPE_NETREG));
+				context->modem, OFONO_ATOM_TYPE_NETREG));
+
 	ntd->path = ofono_modem_get_path(context->modem);
-	ntd->mcc = ofono_netreg_get_mcc(netreg);
-	ntd->mnc = ofono_netreg_get_mnc(netreg);
+	mcc = ofono_netreg_get_mcc(netreg);
+	mnc = ofono_netreg_get_mnc(netreg);
+
+	if (mcc == NULL)
+		ntd->mcc[0] = '\0';
+	else
+		strcpy(ntd->mcc, mcc);
+
+	if (mnc == NULL)
+		ntd->mnc[0] = '\0';
+	else
+		strcpy(ntd->mnc, mnc);
+
 	ntd->received = get_monotonic_time();
 	ntd->time_pending = TRUE;
 	ntd->dst = info->dst;
@@ -242,7 +273,9 @@
 		ntd->nw_time_utc = timegm(&t);
 
 	send_signal(ntd);
-	DBG("modem: %p (%s)", context->modem, ofono_modem_get_path(context->modem));
+
+	DBG("modem: %p (%s)",
+		context->modem, ofono_modem_get_path(context->modem));
 	DBG("time: %04d-%02d-%02d %02d:%02d:%02d%c%02d:%02d (DST=%d)",
 		info->year, info->mon, info->mday, info->hour,
 		info->min, info->sec, info->utcoff > 0 ? '+' : '-',

=== modified file 'plugins/ril.c'
--- plugins/ril.c	2014-07-16 22:55:36 +0000
+++ plugins/ril.c	2014-07-31 23:42:19 +0000
@@ -117,12 +117,17 @@
 		switch (radio_state) {
 		case RADIO_STATE_ON:
 
-			if (ril->voice == NULL)
+			if (ril->voice == NULL) {
 				ril->voice =
 					ofono_voicecall_create(modem,
 								ril->vendor,
 								RILMODEM,
 								ril->modem);
+				ofono_call_volume_create(modem, ril->vendor,
+							RILMODEM, ril->modem);
+				ofono_radio_settings_create(modem, ril->vendor,
+							RILMODEM, ril->modem);
+			}
 
 			send_get_sim_status(modem);
 			break;
@@ -274,6 +279,10 @@
 	struct ofono_gprs *gprs;
 	struct ofono_gprs_context *gc;
 	struct ofono_message_waiting *mw;
+	struct ril_gprs_context_data inet_ctx =
+			{ ril->modem, OFONO_GPRS_CONTEXT_TYPE_INTERNET };
+	struct ril_gprs_context_data mms_ctx =
+			{ ril->modem, OFONO_GPRS_CONTEXT_TYPE_MMS };
 
 	/* TODO: this function should setup:
 	 *  - phonebook
@@ -283,8 +292,7 @@
 	ofono_sms_create(modem, ril->vendor, RILMODEM, ril->modem);
 
 	gprs = ofono_gprs_create(modem, ril->vendor, RILMODEM, ril->modem);
-	gc = ofono_gprs_context_create(modem, ril->vendor,
-					RILMODEM, ril->modem);
+	gc = ofono_gprs_context_create(modem, ril->vendor, RILMODEM, &inet_ctx);
 
 	if (gc) {
 		ofono_gprs_context_set_type(gc,
@@ -292,8 +300,7 @@
 		ofono_gprs_add_context(gprs, gc);
 	}
 
-	gc = ofono_gprs_context_create(modem, ril->vendor,
-					RILMODEM, ril->modem);
+	gc = ofono_gprs_context_create(modem, ril->vendor, RILMODEM, &mms_ctx);
 
 	if (gc) {
 		ofono_gprs_context_set_type(gc,
@@ -312,11 +319,9 @@
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
-	ofono_call_volume_create(modem, ril->vendor, RILMODEM, ril->modem);
 	ofono_netreg_create(modem, ril->vendor, RILMODEM, ril->modem);
 	ofono_ussd_create(modem, ril->vendor, RILMODEM, ril->modem);
 	ofono_call_settings_create(modem, ril->vendor, RILMODEM, ril->modem);
-	ofono_radio_settings_create(modem, ril->vendor, RILMODEM, ril->modem);
 	ofono_call_barring_create(modem, ril->vendor, RILMODEM, ril->modem);
 }
 
@@ -381,8 +386,8 @@
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
-        ofono_info("[UNSOL]< %s", g_ril_unsol_request_to_string(ril->modem,
-								message->req));
+	ofono_info("[%d,UNSOL]< %s", g_ril_get_slot(ril->modem),
+		g_ril_unsol_request_to_string(ril->modem, message->req));
 
 	/* TODO: need a disconnect function to restart things! */
 	ril->connected = TRUE;

=== modified file 'plugins/ubuntu-apndb.c'
--- plugins/ubuntu-apndb.c	2014-07-16 15:15:04 +0000
+++ plugins/ubuntu-apndb.c	2014-07-31 23:42:19 +0000
@@ -82,14 +82,16 @@
 
 	DBG("imsi %s match %s", imsi, match);
 
-	if (imsi_len != match_len)
+	if (match_len == 0 || imsi_len < match_len)
 		goto done;
 
-	for (i = 0; i < imsi_len; i++) {
+	for (i = 0; i < match_len; i++) {
 		if (*(imsi + i) == *(match + i))
 			continue;
 		else if (*(match + i) == 'x')
 			continue;
+		else if (*(match + i) == 'X')
+			continue;
 		else
 			goto done;
 	}

=== modified file 'src/radio-settings.c'
--- src/radio-settings.c	2012-05-20 09:47:57 +0000
+++ src/radio-settings.c	2014-07-31 23:42:19 +0000
@@ -48,6 +48,8 @@
 	enum ofono_radio_band_gsm pending_band_gsm;
 	enum ofono_radio_band_umts pending_band_umts;
 	ofono_bool_t fast_dormancy_pending;
+	ofono_bool_t modem_rats[OFONO_RADIO_ACCESS_MODE_LAST];
+	ofono_bool_t modem_rats_filled;
 	const struct ofono_radio_settings_driver *driver;
 	void *driver_data;
 	struct ofono_atom *atom;
@@ -222,6 +224,21 @@
 					DBUS_TYPE_BOOLEAN, &value);
 	}
 
+	if (rs->driver->query_modem_rats) {
+		const char *rats_strs[OFONO_RADIO_ACCESS_MODE_LAST + 1];
+		const char *(*strs)[] = &rats_strs;
+		int i, str_i;
+
+		for (i = 0, str_i = 0; i < OFONO_RADIO_ACCESS_MODE_LAST; ++i)
+			if (rs->modem_rats[i])
+				rats_strs[str_i++] =
+						radio_access_mode_to_string(i);
+		rats_strs[str_i] = NULL;
+
+		ofono_dbus_dict_append_array(&dict, "ModemTechnologies",
+						DBUS_TYPE_STRING, &strs);
+	}
+
 	dbus_message_iter_close_container(&iter, &dict);
 
 	return reply;
@@ -374,6 +391,43 @@
 	__ofono_dbus_pending_reply(&rs->pending, reply);
 }
 
+static void radio_set_modem_rats(struct ofono_radio_settings *rs,
+					const ofono_bool_t rats[])
+{
+	memcpy(rs->modem_rats, rats, sizeof(rs->modem_rats));
+	rs->modem_rats_filled = TRUE;
+}
+
+static void radio_modem_rats_query_callback(const struct ofono_error *error,
+						const ofono_bool_t rats[],
+						void *data)
+{
+	struct ofono_radio_settings *rs = data;
+	DBusMessage *reply;
+
+	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+		DBG("Error during modem rats query");
+
+		reply = __ofono_error_failed(rs->pending);
+		__ofono_dbus_pending_reply(&rs->pending, reply);
+
+		return;
+	}
+
+	radio_set_modem_rats(rs, rats);
+	radio_send_properties_reply(rs);
+}
+
+static void radio_query_modem_rats(struct ofono_radio_settings *rs)
+{
+	if (rs->driver->query_modem_rats == NULL) {
+		radio_send_properties_reply(rs);
+		return;
+	}
+
+	rs->driver->query_modem_rats(rs, radio_modem_rats_query_callback, rs);
+}
+
 static void radio_fast_dormancy_query_callback(const struct ofono_error *error,
 						ofono_bool_t enable, void *data)
 {
@@ -390,7 +444,12 @@
 	}
 
 	radio_set_fast_dormancy(rs, enable);
-	radio_send_properties_reply(rs);
+
+	/* Modem technology is not supposed to change, so one query is enough */
+	if (rs->modem_rats_filled)
+		radio_send_properties_reply(rs);
+	else
+		radio_query_modem_rats(rs);
 }
 
 static void radio_query_fast_dormancy(struct ofono_radio_settings *rs)

=== modified file 'test/list-modems'
--- test/list-modems	2014-04-02 20:11:54 +0000
+++ test/list-modems	2014-07-31 23:42:19 +0000
@@ -44,7 +44,8 @@
 					"PreferredLanguages",
 					"PrimaryContexts",
 					"LockedPins",
-					"Features"]:
+					"Features",
+					"ModemTechnologies"]:
 				val = ""
 				for i in properties[key]:
 					val += i + " "

=== modified file 'unit/test-mtkreply.c'
--- unit/test-mtkreply.c	2014-04-29 09:01:49 +0000
+++ unit/test-mtkreply.c	2014-07-31 23:42:19 +0000
@@ -35,6 +35,8 @@
 
 #include "common.h"
 #include "grilreply.h"
+#include "drivers/mtkmodem/mtk_constants.h"
+#include "drivers/mtkmodem/mtkreply.h"
 
 /*
  * As all our architectures are little-endian except for
@@ -50,6 +52,11 @@
 	const struct ril_msg msg;
 };
 
+struct rep_3g_capability_test {
+	int is_3g;
+	const struct ril_msg msg;
+};
+
 /*
  * The following hexadecimal data contains the event data of a valid
  * MTK-specific RIL_REQUEST_AVAILABLE_NETWORKS with the following parameters:
@@ -97,6 +104,26 @@
 	}
 };
 
+/*
+ * The following hexadecimal data contains the reply to a
+ * MTK_RIL_REQUEST_GET_3G_CAPABILITY request with parameter {1}
+ */
+static const guchar mtk_reply_3g_capability_valid_parcel1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+};
+
+static const struct rep_3g_capability_test mtk_reply_3g_capability_valid_1 = {
+	.is_3g = 1,
+	.msg = {
+		.buf = (char *) &mtk_reply_3g_capability_valid_parcel1,
+		.buf_len = sizeof(mtk_reply_3g_capability_valid_parcel1),
+		.unsolicited = FALSE,
+		.req = MTK_RIL_REQUEST_GET_3G_CAPABILITY,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
 static void test_mtk_reply_avail_ops_valid(gconstpointer data)
 {
 	struct reply_avail_ops *reply;
@@ -122,6 +149,17 @@
 	g_ril_unref(gril);
 }
 
+static void test_mtk_reply_3g_capability_valid(gconstpointer data)
+{
+	GRil *gril = g_ril_new(NULL, OFONO_RIL_VENDOR_MTK);
+	const struct rep_3g_capability_test *test = data;
+	int is_3g = g_mtk_reply_parse_get_3g_capability(gril, &test->msg);
+
+	g_assert(is_3g == test->is_3g);
+
+	g_ril_unref(gril);
+}
+
 #endif	/* LITTLE_ENDIAN */
 
 int main(int argc, char **argv)
@@ -146,6 +184,11 @@
 				&mtk_reply_enter_sim_pin_valid_1,
 				test_mtk_reply_enter_sim_pin_valid);
 
+	g_test_add_data_func("/testmtkreply/radio-settings: "
+				"valid GET_3G_CAPABILITY Test 1",
+				&mtk_reply_3g_capability_valid_1,
+				test_mtk_reply_3g_capability_valid);
+
 #endif	/* LITTLE_ENDIAN */
 
 	return g_test_run();

=== modified file 'unit/test-mtkunsol.c'
--- unit/test-mtkunsol.c	2014-04-21 10:27:24 +0000
+++ unit/test-mtkunsol.c	2014-07-31 23:42:19 +0000
@@ -49,7 +49,7 @@
 
 /*
  * The following hexadecimal data represents a serialized Binder parcel instance
- * containing a valid RIL_UNSOL_INCOMING_CALL_INDICATION message with the
+ * containing a valid MTK_RIL_UNSOL_INCOMING_CALL_INDICATION message with the
  * following parameters:
  *
  * {1,677777777,161,0,1}
@@ -67,7 +67,7 @@
 	.buf = (gchar *) &unsol_incoming_call_indication_parcel1,
 	.buf_len = sizeof(unsol_incoming_call_indication_parcel1),
 	.unsolicited = TRUE,
-	.req = RIL_UNSOL_INCOMING_CALL_INDICATION,
+	.req = MTK_RIL_UNSOL_INCOMING_CALL_INDICATION,
 	.serial_no = 0,
 	.error = 0,
 };