Merge lp:~phablet-team/ofono/refactor-update-from-rilmodem into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

 [ Alfonso Sanchez-Beato ]
  * gril, include, rilmodem/sms, unit: SMS re-factoring
    - merge applicable nemomobile code
    - re-factor parcel code
    - add sms parcel unit tests
  * build, doc, plugins, test: Add SMS history plugin
    - adds support for SMS delivery reports (LP: #1223314)
  * gril, src, unit: Fix build warning

  [ Tony Espy ]
  * gril, unit: fix const casts in gril and unit tests
  * rilmodem/gprs: set default max_cids to 1 (LP: 1254746)

  [ Alfonso Sanchez-Beato ]
  * gril, rilmodem/voicecall, unit: Voicecall re-factoring
    - merge applicable nemomobile code, including support
      for multi-party calling and call hold
    - re-factor parcel code
    - add voicecall parcel unit tests
  * rilmodem: fix memory leaks reported by valgrind
  * gril, rilmodem/sim: Remove SIM file-not-found error logging
    - includes low-level gril fix to handle ril messages
      that include a failure code, but also include event
      data (LP: #1254219)
  * gril, rilmodem/call-volume, unit: Call-volume re-factoring
    - merge applicable nemomobile code
    - re-factor parcel code
    - add call-volume parcel unit tests
  * gril, rilmodem/devinfo, unit: Devinfo re-factoring
    - re-factor parcel code
    - add devinfo parcel unit tests

  [ Tony Espy ]
  * unit: Add rilmodem gprs/netreg parcel unit tests
  * debian/rules: Add CFLAGS to enable strict warnings checking

This merge proposal includes all of the latest upstream changes from our github ofono/rilmodem repository. It was created by merging our auto-import bzr branch ( lp:~phablet-team/ofono/rilmodem ). It also includes a manual patch to debian/rules to enable strict warnings during build-time ( this mimics those enabled by upstreams maintainer mode ).

This code has been tested on the latest trusty touch images ( r31 ) on both maguro and mako.

As this merge includes code merged from the nemomobile version of rilmodem, several new features are included:

 - voicecall hold & multi-party support
 - SMS history report ( used for SMS delivery reports )

Note, in order to test these features some supplementary services may need to be enabled on the SIM/Subscriber account used to test, please refer to the Telephony Test Plan document for more details.

Finally, multi-party calling currently doesn't work on maguro. As it's a deprecated device, we've reported a bug ( lp: #1257206 ), but decided that it was more important to release the feature as is.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6845
http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-i386-ci/8

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Tested on both mako and maguro for regressions, everything seems to be working as before. Was able to test voicecall hold and swap calls, but couldn't test multi-party but probably because of my carrier (also unable to test it with Android).

review: Approve

=== modified file '.gitignore'
--- .gitignore	2012-11-28 09:21:51 +0000
+++ .gitignore	2013-12-04 21:58:23 +0000
@@ -32,6 +32,7 @@
 dundee/dundee
 dundee/dundee.service
 
+test-driver
 unit/test-common
 unit/test-util
 unit/test-idmap
@@ -42,6 +43,9 @@
 unit/test-caif
 unit/test-stkutil
 unit/test-cdmasms
+unit/test-grilreply
+unit/test-grilrequest
+unit/test-grilunsol
 
 tools/huawei-audio
 tools/auto-enable

=== modified file 'Makefile.am'
--- Makefile.am	2013-11-25 20:24:09 +0000
+++ Makefile.am	2013-12-04 21:58:23 +0000
@@ -515,6 +515,9 @@
 builtin_modules += push_notification
 builtin_sources += plugins/push-notification.c
 
+builtin_modules += smshistory
+builtin_sources += plugins/smshistory.c
+
 sbin_PROGRAMS = src/ofonod
 
 src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) src/ofono.ver \

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-03 02:17:22 +0000
+++ debian/changelog	2013-12-04 21:58:23 +0000
@@ -1,3 +1,43 @@
+ofono (1.12+bzr6845-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Alfonso Sanchez-Beato ]
+  * gril, include, rilmodem/sms, unit: SMS re-factoring
+    - merge applicable nemomobile code
+    - re-factor parcel code
+    - add sms parcel unit tests
+  * build, doc, plugins, test: Add SMS history plugin
+    - adds support for SMS delivery reports (LP: #1223314)
+  * gril, src, unit: Fix build warning
+
+  [ Tony Espy ]
+  * gril, unit: fix const casts in gril and unit tests
+  * rilmodem/gprs: set default max_cids to 1 (LP: 1254746)
+
+  [ Alfonso Sanchez-Beato ]
+  * gril, rilmodem/voicecall, unit: Voicecall re-factoring
+    - merge applicable nemomobile code, including support
+      for multi-party calling and call hold
+    - re-factor parcel code
+    - add voicecall parcel unit tests
+  * rilmodem: fix memory leaks reported by valgrind
+  * gril, rilmodem/sim: Remove SIM file-not-found error logging
+    - includes low-level gril fix to handle ril messages
+      that include a failure code, but also include event
+      data (LP: #1254219)
+  * gril, rilmodem/call-volume, unit: Call-volume re-factoring
+    - merge applicable nemomobile code
+    - re-factor parcel code
+    - add call-volume parcel unit tests
+  * gril, rilmodem/devinfo, unit: Devinfo re-factoring
+    - re-factor parcel code
+    - add devinfo parcel unit tests
+
+  [ Tony Espy ]
+  * unit: Add rilmodem gprs/netreg parcel unit tests
+  * debian/rules: Add CFLAGS to enable strict warnings checking
+
+ -- Tony Espy <[e-mail]>  Wed, 04 Dec 2013 14:10:32 -0500
+
 ofono (1.12+bzr6844-0ubuntu1) trusty; urgency=low
 
   [ Alfonso Sanchez-Beato ]

=== modified file 'debian/rules'
--- debian/rules	2013-10-02 15:34:41 +0000
+++ debian/rules	2013-12-04 21:58:23 +0000
@@ -1,5 +1,14 @@
 #!/usr/bin/make -f
 
+CFLAGS += -Werror -Wextra \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-Wdeclaration-after-statement \
+	-Wmissing-declarations \
+	-Wredundant-decls \
+	-Wcast-align \
+	-DG_DISABLE_DEPRECATED
+
 %:
 	dh $@ --parallel --with=autoreconf
 

=== modified file 'doc/messagemanager-api.txt'
--- doc/messagemanager-api.txt	2011-02-11 16:29:43 +0000
+++ doc/messagemanager-api.txt	2013-12-04 21:58:23 +0000
@@ -73,6 +73,16 @@
 			This signal is emitted whenever a Message object
 			has been removed, e.g. when it reaches a final state.
 
+		StatusReport(object path, boolean delivered)
+
+			This signal is emitted whenever a SMS Status Report is
+			received for a previously sent message (note that the
+			Message object already has been removed at this point).
+
+			Possible 'delivered' values are:
+				true  - successfully delivered
+				false - delivery failed
+
 Properties	string ServiceCenterAddress
 
 			Contains the number of the SMS service center.

=== modified file 'drivers/rilmodem/call-volume.c'
--- drivers/rilmodem/call-volume.c	2013-11-06 03:59:35 +0000
+++ drivers/rilmodem/call-volume.c	2013-12-04 21:58:23 +0000
@@ -3,7 +3,7 @@
  *  oFono - Open Source Telephony
  *
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2012 Canonical Ltd.
+ *  Copyright (C) 2012-2013 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
@@ -42,6 +42,8 @@
 
 #include "rilmodem.h"
 #include "parcel.h"
+#include "grilrequest.h"
+#include "grilreply.h"
 
 struct cv_data {
 	GRil *ril;
@@ -69,7 +71,7 @@
 }
 
 static void ril_call_volume_mute(struct ofono_call_volume *cv, int muted,
-				ofono_call_volume_cb_t cb, void *data)
+					ofono_call_volume_cb_t cb, void *data)
 {
 	struct cv_data *cvd = ofono_call_volume_get_data(cv);
 	struct cb_data *cbd = cb_data_new(cb, data, cvd);
@@ -77,19 +79,16 @@
 	int request = RIL_REQUEST_SET_MUTE;
 	int ret;
 
-	DBG("");
-
-	parcel_init(&rilp);
-	parcel_w_int32(&rilp, 1);
-	parcel_w_int32(&rilp, muted);
 	DBG("Initial ril muted state: %d", muted);
-	ret = g_ril_send(cvd->ril, request, rilp.data,
-			rilp.size, volume_mute_cb, cbd, g_free);
+
+	g_ril_request_set_mute(cvd->ril, muted, &rilp);
+
+	ret = g_ril_send(cvd->ril, request, rilp.data, rilp.size,
+				volume_mute_cb, cbd, g_free);
+
+	g_ril_print_request(cvd->ril, ret, request);
 	parcel_free(&rilp);
 
-	g_ril_append_print_buf(cvd->ril, "(%d)", muted);
-	g_ril_print_request(cvd->ril, ret, request);
-
 	if (ret <= 0) {
 		ofono_error("Send RIL_REQUEST_SET_MUTE failed.");
 		g_free(cbd);
@@ -101,22 +100,14 @@
 {
 	struct ofono_call_volume *cv = user_data;
 	struct cv_data *cvd = ofono_call_volume_get_data(cv);
-	struct parcel rilp;
 	int muted;
 
 	if (message->error != RIL_E_SUCCESS) {
-		ofono_error("Could not retrive the ril mute state");
+		ofono_error("Could not retrieve the ril mute state");
 		return;
 	}
 
-	ril_util_init_parcel(message, &rilp);
-
-	/* skip length of int[] */
-	parcel_r_int32(&rilp);
-	muted = parcel_r_int32(&rilp);
-
-	g_ril_append_print_buf(cvd->ril, "{%d}", muted);
-	g_ril_print_response(cvd->ril, message);
+	muted = g_ril_reply_parse_get_mute(cvd->ril, message);
 
 	ofono_call_volume_set_muted(cv, muted);
 }
@@ -148,7 +139,7 @@
 }
 
 static int ril_call_volume_probe(struct ofono_call_volume *cv,
-				unsigned int vendor, void *data)
+					unsigned int vendor, void *data)
 {
 	GRil *ril = data;
 	struct cv_data *cvd;
@@ -162,17 +153,14 @@
 
 	ofono_call_volume_set_data(cv, cvd);
 
-        /*
-	 * TODO: analyze if capability check is needed
-	 * and/or timer should be adjusted.
-	 *
+	/*
 	 * ofono_call_volume_register() needs to be called after
 	 * the driver has been set in ofono_call_volume_create(),
 	 * which calls this function.  Most other drivers make
-         * some kind of capabilities query to the modem, and then
-	 * call register in the callback; we use a timer instead.
+	 * some kind of capabilities query to the modem, and then
+	 * call register in the callback; we use an idle event instead.
 	 */
-	g_timeout_add_seconds(2, ril_delayed_register, cv);
+	g_idle_add(ril_delayed_register, cv);
 
 	return 0;
 }

=== modified file 'drivers/rilmodem/devinfo.c'
--- drivers/rilmodem/devinfo.c	2013-11-06 03:59:35 +0000
+++ drivers/rilmodem/devinfo.c	2013-12-04 21:58:23 +0000
@@ -3,7 +3,7 @@
  *  oFono - Open Source Telephony - RIL Modem Support
  *
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2012 Canonical Ltd.
+ *  Copyright (C) 2012-2013 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
@@ -39,6 +39,7 @@
 #include "gril.h"
 
 #include "rilmodem.h"
+#include "grilreply.h"
 
 /*
  * TODO: The functions in this file are stubbed out, and
@@ -80,9 +81,9 @@
 {
 	struct cb_data *cbd = user_data;
 	ofono_devinfo_query_cb_t cb = cbd->cb;
+	GRil *ril = cbd->user;
 	struct ofono_error error;
-	struct parcel rilp;
-	gchar *revision;
+	char *revision;
 
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
@@ -92,8 +93,7 @@
 		return;
 	}
 
-	ril_util_init_parcel(message, &rilp);
-	revision = parcel_r_string(&rilp);
+	revision = g_ril_reply_parse_baseband_version(ril, message);
 
 	cb(&error, revision, cbd->data);
 
@@ -104,13 +104,13 @@
 				ofono_devinfo_query_cb_t cb,
 				void *data)
 {
-	struct cb_data *cbd = cb_data_new(cb, data, NULL);
 	GRil *ril = ofono_devinfo_get_data(info);
+	struct cb_data *cbd = cb_data_new(cb, data, ril);
 	int request = RIL_REQUEST_BASEBAND_VERSION;
 	int ret;
 
 	ret = g_ril_send(ril, request, NULL, 0,
-					query_revision_cb, cbd, g_free);
+				query_revision_cb, cbd, g_free);
 
 	g_ril_print_request_no_args(ril, ret, request);
 
@@ -124,8 +124,8 @@
 {
 	struct cb_data *cbd = user_data;
 	ofono_devinfo_query_cb_t cb = cbd->cb;
+	GRil *ril = cbd->user;
 	struct ofono_error error;
-	struct parcel rilp;
 	gchar *imei;
 
 	if (message->error == RIL_E_SUCCESS) {
@@ -136,9 +136,7 @@
 		return;
 	}
 
-	ril_util_init_parcel(message, &rilp);
-
-	imei = parcel_r_string(&rilp);
+	imei = g_ril_reply_parse_baseband_version(ril, message);
 
 	cb(&error, imei, cbd->data);
 
@@ -149,8 +147,8 @@
 				ofono_devinfo_query_cb_t cb,
 				void *data)
 {
-	struct cb_data *cbd = cb_data_new(cb, data, NULL);
 	GRil *ril = ofono_devinfo_get_data(info);
+	struct cb_data *cbd = cb_data_new(cb, data, ril);
 	/* TODO: make it support both RIL_REQUEST_GET_IMEI (deprecated) and
 	 * RIL_REQUEST_DEVICE_IDENTITY depending on the rild version used */
 	int request = RIL_REQUEST_GET_IMEI;
@@ -188,16 +186,13 @@
 	ofono_devinfo_set_data(info, ril);
 
 	/*
-	 * TODO: analyze if capability check is needed
-	 * and/or timer should be adjusted.
-	 *
 	 * ofono_devinfo_register() needs to be called after
 	 * the driver has been set in ofono_devinfo_create(),
 	 * which calls this function.  Most other drivers make
 	 * some kind of capabilities query to the modem, and then
-	 * call register in the callback; we use a timer instead.
+	 * call register in the callback; we use an idle event instead.
 	 */
-	g_timeout_add_seconds(1, ril_delayed_register, info);
+	g_idle_add(ril_delayed_register, info);
 
 	return 0;
 }

=== modified file 'drivers/rilmodem/gprs.c'
--- drivers/rilmodem/gprs.c	2013-11-25 22:34:47 +0000
+++ drivers/rilmodem/gprs.c	2013-12-04 21:58:23 +0000
@@ -137,8 +137,6 @@
 	gboolean notify_status = FALSE;
 	int old_status;
 
-	DBG("");
-
 	if (message->error != RIL_E_SUCCESS) {
 		ofono_error("%s: DATA_REGISTRATION_STATE reply failure: %s",
 				__func__,
@@ -217,6 +215,8 @@
 		 * This callback is a result of the inital call
 		 * to probe(), so should return after registration.
 		 */
+		g_free(reply);
+
 		return;
 	}
 

=== modified file 'drivers/rilmodem/rilutil.c'
--- drivers/rilmodem/rilutil.c	2013-11-15 23:18:12 +0000
+++ drivers/rilmodem/rilutil.c	2013-12-04 21:58:23 +0000
@@ -204,99 +204,6 @@
 	g_free(req);
 }
 
-GSList *ril_util_parse_clcc(GRil *gril, struct ril_msg *message)
-{
-	struct ofono_call *call;
-	struct parcel rilp;
-	GSList *l = NULL;
-	int num, i;
-	gchar *number, *name;
-
-	ril_util_init_parcel(message, &rilp);
-
-	g_ril_append_print_buf(gril, "{");
-
-	/* Number of RIL_Call structs */
-	num = parcel_r_int32(&rilp);
-	for (i = 0; i < num; i++) {
-		call = g_try_new(struct ofono_call, 1);
-		if (call == NULL)
-			break;
-
-		ofono_call_init(call);
-		call->status = parcel_r_int32(&rilp);
-		call->id = parcel_r_int32(&rilp);
-		call->phone_number.type = parcel_r_int32(&rilp);
-		parcel_r_int32(&rilp); /* isMpty */
-		parcel_r_int32(&rilp); /* isMT */
-		parcel_r_int32(&rilp); /* als */
-		call->type = parcel_r_int32(&rilp); /* isVoice */
-		parcel_r_int32(&rilp); /* isVoicePrivacy */
-		number = parcel_r_string(&rilp);
-		if (number) {
-			strncpy(call->phone_number.number, number,
-				OFONO_MAX_PHONE_NUMBER_LENGTH);
-			g_free(number);
-		}
-		parcel_r_int32(&rilp); /* numberPresentation */
-		name = parcel_r_string(&rilp);
-		if (name) {
-			strncpy(call->name, name,
-				OFONO_MAX_CALLER_NAME_LENGTH);
-			g_free(name);
-		}
-		parcel_r_int32(&rilp); /* namePresentation */
-		parcel_r_int32(&rilp); /* uusInfo */
-
-		if (strlen(call->phone_number.number) > 0)
-			call->clip_validity = 0;
-		else
-			call->clip_validity = 2;
-
-		/* TODO: figure out how to line-wrap properly
-		 * without introducing spaces in string.
-		 */
-		g_ril_append_print_buf(gril,
-					"%s [id=%d,status=%d,type=%d,number=%s,name=%s]",
-					print_buf,
-					call->id, call->status, call->type,
-					call->phone_number.number, call->name);
-
-		l = g_slist_insert_sorted(l, call, ril_util_call_compare);
-	}
-
-	g_ril_append_print_buf(gril, "%s}", print_buf);
-	g_ril_print_response(gril, message);
-
-	return l;
-}
-
-gint ril_util_parse_sms_response(GRil *gril, struct ril_msg *message)
-{
-	struct parcel rilp;
-	int error, mr;
-	char *ack_pdu;
-
-	/* Set up Parcel struct for proper parsing */
-	ril_util_init_parcel(message, &rilp);
-
-	/* TP-Message-Reference for GSM/
-	 * BearerData MessageId for CDMA
-	 */
-	mr = parcel_r_int32(&rilp);
-	ack_pdu = parcel_r_string(&rilp);
-	error = parcel_r_int32(&rilp);
-
-
-	g_ril_append_print_buf(gril, "{%d,%s,%d}",
-				mr, ack_pdu, error);
-	g_ril_print_response(gril, message);
-
-	g_free(ack_pdu);
-
-	return mr;
-}
-
 gint ril_util_get_signal(GRil *gril, struct ril_msg *message)
 {
 	struct parcel rilp;

=== modified file 'drivers/rilmodem/rilutil.h'
--- drivers/rilmodem/rilutil.h	2013-11-15 23:18:12 +0000
+++ drivers/rilmodem/rilutil.h	2013-12-04 21:58:23 +0000
@@ -104,10 +104,6 @@
 						GDestroyNotify destroy);
 void ril_util_sim_state_query_free(struct ril_util_sim_state_query *req);
 
-GSList *ril_util_parse_clcc(GRil *gril, struct ril_msg *message);
-
-gint ril_util_parse_sms_response(GRil *gril, struct ril_msg *message);
-
 gint ril_util_get_signal(GRil *gril, struct ril_msg *message);
 
 struct cb_data {

=== modified file 'drivers/rilmodem/sim.c'
--- drivers/rilmodem/sim.c	2013-11-06 03:59:35 +0000
+++ drivers/rilmodem/sim.c	2013-12-04 21:58:23 +0000
@@ -93,26 +93,51 @@
 	int flen = 0, rlen = 0, str = 0;
 	guchar access[3] = { 0x00, 0x00, 0x00 };
 	guchar file_status = EF_STATUS_VALID;
-	struct reply_sim_io *reply;
+	struct reply_sim_io *reply = NULL;
 
-	if (message->error == RIL_E_SUCCESS) {
-		decode_ril_error(&error, "OK");
-	} else {
-		ofono_error("Reply failure: %s",
+	/* Error, and no data */
+	if (message->error != RIL_E_SUCCESS && message->buf_len == 0) {
+		ofono_error("%s: Reply failure: %s", __func__,
 				ril_error_to_string(message->error));
 		decode_ril_error(&error, "FAIL");
 		goto error;
 	}
 
-	if ((reply = g_ril_reply_parse_sim_io(sd->ril, message))
-			== NULL) {
-		ofono_error("Can't parse SIM IO response from RILD");
+	/*
+	 * The reply can have event data even when message->error is not zero
+	 * in mako.
+	 */
+	reply = g_ril_reply_parse_sim_io(sd->ril, message);
+	if (reply == NULL) {
 		decode_ril_error(&error, "FAIL");
 		goto error;
 	}
 
 	sw1 = reply->sw1;
 	sw2 = reply->sw2;
+
+	/*
+	 * SIM app file not found || USIM app file not found
+	 * See 3gpp TS 51.011, 9.4.4, and ETSI TS 102 221, 10.2.1.5.3
+	 * This can happen with result SUCCESS (maguro) or GENERIC_FAILURE
+	 * (mako)
+	 */
+	if ((sw1 == 0x94 && sw2 == 0x04) || (sw1 == 0x6A && sw2 == 0x82)) {
+		DBG("File not found. Error %s",
+			ril_error_to_string(message->error));
+		decode_ril_error(&error, "FAIL");
+		goto error;
+	}
+
+	if (message->error == RIL_E_SUCCESS) {
+		decode_ril_error(&error, "OK");
+	} else {
+		ofono_error("%s: Reply failure: %s, %02x, %02x", __func__,
+				ril_error_to_string(message->error), sw1, sw2);
+		decode_ril_error(&error, "FAIL");
+		goto error;
+	}
+
 	if ((sw1 != 0x90 && sw1 != 0x91 && sw1 != 0x92 && sw1 != 0x9f) ||
 		(sw1 == 0x90 && sw2 != 0x00)) {
 		ofono_error("Error reply, invalid values: sw1: %02x sw2: %02x",
@@ -124,7 +149,7 @@
 		error.type = OFONO_ERROR_TYPE_SIM;
 		error.error = (sw1 << 8) | sw2;
 
-		goto err_aft_reply;
+		goto error;
 	}
 
 	if (reply->hex_len) {
@@ -142,9 +167,9 @@
 	}
 
 	if (!ok) {
-		ofono_error("parse response failed");
+		ofono_error("%s: parse response failed", __func__);
 		decode_ril_error(&error, "FAIL");
-		goto err_aft_reply;
+		goto error;
 	}
 
 	cb(&error, flen, str, rlen, access, file_status, cbd->data);
@@ -153,9 +178,9 @@
 
 	return;
 
-err_aft_reply:
-	g_ril_reply_free_sim_io(reply);
 error:
+	g_ril_reply_free_sim_io(reply);
+
 	cb(&error, -1, -1, -1, NULL, EF_STATUS_INVALIDATED, cbd->data);
 }
 
@@ -171,6 +196,8 @@
 	int request = RIL_REQUEST_SIM_IO;
 	guint ret = 0;
 
+	DBG("file %04x", fileid);
+
 	req.app_type = sd->app_type;
 	req.aid_str = sd->aid_str;
 	req.fileid = fileid;
@@ -252,6 +279,8 @@
 	int request = RIL_REQUEST_SIM_IO;
 	guint ret = 0;
 
+	DBG("file %04x", fileid);
+
 	req.app_type = sd->app_type;
 	req.aid_str = sd->aid_str;
 	req.fileid = fileid;
@@ -303,6 +332,8 @@
 	int request = RIL_REQUEST_SIM_IO;
 	guint ret = 0;
 
+	DBG("file %04x", fileid);
+
 	req.app_type = sd->app_type;
 	req.aid_str = sd->aid_str;
 	req.fileid = fileid;
@@ -405,6 +436,8 @@
 					struct reply_sim_app *app,
 					guint index)
 {
+	g_free(sd->aid_str);
+	g_free(sd->app_str);
 	sd->app_type = app->app_type;
 	sd->aid_str = g_strdup(app->aid_str);
 	sd->app_str = g_strdup(app->app_str);
@@ -803,6 +836,8 @@
 	ofono_sim_set_data(sim, NULL);
 
 	g_ril_unref(sd->ril);
+	g_free(sd->aid_str);
+	g_free(sd->app_str);
 	g_free(sd);
 }
 

=== modified file 'drivers/rilmodem/sms.c'
--- drivers/rilmodem/sms.c	2013-11-06 03:59:35 +0000
+++ drivers/rilmodem/sms.c	2013-12-04 21:58:23 +0000
@@ -3,7 +3,8 @@
  *  oFono - Open Source Telephony - RIL Modem Support
  *
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2012 Canonical Ltd.
+ *  Copyright (C) 2012-2013 Canonical Ltd.
+ *  Copyright (C) 2013 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -41,13 +42,103 @@
 #include "util.h"
 
 #include "rilmodem.h"
+#include "grilrequest.h"
+#include "grilreply.h"
+#include "grilunsol.h"
 
 struct sms_data {
-        GRil *ril;
+	GRil *ril;
 	unsigned int vendor;
 };
 
-static void submit_sms_cb(struct ril_msg *message, gpointer user_data)
+static void ril_csca_set_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sms_sca_set_cb_t cb = cbd->cb;
+
+	if (message->error == RIL_E_SUCCESS) {
+		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+	} else {
+		ofono_error("%s RILD reply failure: %s",
+			ril_request_id_to_string(message->req),
+			ril_error_to_string(message->error));
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	}
+}
+
+static void ril_csca_set(struct ofono_sms *sms,
+			const struct ofono_phone_number *sca,
+			ofono_sms_sca_set_cb_t cb, void *user_data)
+{
+	struct sms_data *sd = ofono_sms_get_data(sms);
+	struct cb_data *cbd = cb_data_new(cb, user_data, sd);
+	struct parcel rilp;
+	gint ret;
+	int request = RIL_REQUEST_SET_SMSC_ADDRESS;
+
+	g_ril_request_set_smsc_address(sd->ril, sca, &rilp);
+
+	/* Send request to RIL */
+	ret = g_ril_send(sd->ril, request, rilp.data,
+				rilp.size, ril_csca_set_cb, cbd, g_free);
+
+	g_ril_print_request(sd->ril, ret, request);
+
+	parcel_free(&rilp);
+
+	/* In case of error free cbd and return the cb with failure */
+	if (ret == 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, user_data);
+	}
+}
+
+static void ril_csca_query_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sms_sca_query_cb_t cb = cbd->cb;
+	struct sms_data *sd = cbd->user;
+	struct ofono_phone_number *sca;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s RILD reply failure: %s",
+				ril_request_id_to_string(message->req),
+				ril_error_to_string(message->error));
+		CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+		return;
+	}
+
+	sca = g_ril_reply_parse_get_smsc_address(sd->ril, message);
+	if (sca == NULL) {
+		CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+	} else {
+		CALLBACK_WITH_SUCCESS(cb, sca, cbd->data);
+		g_free(sca);
+	}
+}
+
+static void ril_csca_query(struct ofono_sms *sms, ofono_sms_sca_query_cb_t cb,
+					void *user_data)
+{
+	struct sms_data *sd = ofono_sms_get_data(sms);
+	struct cb_data *cbd = cb_data_new(cb, user_data, sd);
+	int request = RIL_REQUEST_GET_SMSC_ADDRESS;
+	int ret;
+
+	DBG("Sending csca_query");
+
+	ret = g_ril_send(sd->ril, request, NULL, 0,
+				ril_csca_query_cb, cbd, g_free);
+
+	g_ril_print_request(sd->ril, ret, request);
+
+	if (ret == 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, NULL, user_data);
+	}
+}
+
+static void ril_submit_sms_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
 	struct ofono_error error;
@@ -61,7 +152,7 @@
 		decode_ril_error(&error, "FAIL");
 	}
 
-	mr = ril_util_parse_sms_response(sd->ril, message);
+	mr = g_ril_reply_parse_sms_response(sd->ril, message);
 
 	cb(&error, mr, cbd->data);
 }
@@ -73,127 +164,105 @@
 	struct sms_data *sd = ofono_sms_get_data(sms);
 	struct cb_data *cbd = cb_data_new(cb, user_data, sd);
 	struct parcel rilp;
-	char *tpdu;
 	int request = RIL_REQUEST_SEND_SMS;
-	int ret, smsc_len;
+	int ret;
+	struct req_sms_cmgs req;
 
-        DBG("pdu_len: %d, tpdu_len: %d mms: %d", pdu_len, tpdu_len, mms);
+	DBG("pdu_len: %d, tpdu_len: %d mms: %d", pdu_len, tpdu_len, mms);
 
 	/* TODO: if (mms) { ... } */
 
-	parcel_init(&rilp);
-	parcel_w_int32(&rilp, 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);
-	}
-
-	parcel_w_string(&rilp, NULL); /* SMSC address; NULL == default */
-
-	/* TPDU:
-	 *
-	 * 'pdu' is a raw hexadecimal string
-	 *  encode_hex() turns it into an ASCII/hex UTF8 buffer
-	 *  parcel_w_string() encodes utf8 -> utf16
-	 */
-	tpdu = encode_hex(pdu + smsc_len, tpdu_len, 0);
-	parcel_w_string(&rilp, tpdu);
+	req.pdu = pdu;
+	req.pdu_len = pdu_len;
+	req.tpdu_len = tpdu_len;
+
+	g_ril_request_sms_cmgs(sd->ril, &req, &rilp);
 
 	ret = g_ril_send(sd->ril,
 				request,
 				rilp.data,
 				rilp.size,
-				submit_sms_cb, cbd, g_free);
+				ril_submit_sms_cb, cbd, g_free);
 
-	g_ril_append_print_buf(sd->ril, "(%s)", tpdu);
 	g_ril_print_request(sd->ril, ret, request);
 
 	parcel_free(&rilp);
 
-	if (ret <= 0) {
+	if (ret == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, -1, user_data);
 	}
 }
 
+static void ril_ack_delivery_cb(struct ril_msg *message, gpointer user_data)
+{
+	if (message->error != RIL_E_SUCCESS)
+		ofono_error("SMS acknowledgement failed: "
+				"Further SMS reception is not guaranteed");
+}
+
+static void ril_ack_delivery(struct ofono_sms *sms)
+{
+	struct sms_data *sd = ofono_sms_get_data(sms);
+	struct parcel rilp;
+	int ret;
+	int request = RIL_REQUEST_SMS_ACKNOWLEDGE;
+
+	g_ril_request_sms_acknowledge(sd->ril, &rilp);
+
+	/* TODO: should ACK be sent for either of the error cases? */
+
+	/* ACK the incoming NEW_SMS */
+	ret = g_ril_send(sd->ril, request,
+				rilp.data,
+				rilp.size,
+				ril_ack_delivery_cb, NULL, NULL);
+
+	g_ril_print_request(sd->ril, ret, request);
+
+	parcel_free(&rilp);
+}
+
 static void ril_sms_notify(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_sms *sms = user_data;
 	struct sms_data *sd = ofono_sms_get_data(sms);
-	struct parcel rilp;
-	char *ril_pdu;
-	int ril_pdu_len;
 	unsigned int smsc_len;
 	long ril_buf_len;
-	guchar *ril_data;
-	int request = RIL_REQUEST_SMS_ACKNOWLEDGE;
-	int ret;
+	struct unsol_sms_data *pdu_data;
 
 	DBG("req: %d; data_len: %d", message->req, (int) message->buf_len);
 
-	if (message->req != RIL_UNSOL_RESPONSE_NEW_SMS)
-		goto error;
-
-
-	ril_util_init_parcel(message, &rilp);
-
-	ril_pdu = parcel_r_string(&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
+	pdu_data = g_ril_unsol_parse_new_sms(sd->ril, message);
+	if (pdu_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;
+	smsc_len = pdu_data->data[0] + 1;
+	ril_buf_len = pdu_data->length;
 	DBG("smsc_len is %d", smsc_len);
 
-	g_ril_append_print_buf(sd->ril, "(%s)", ril_pdu);
-	g_ril_print_unsol(sd->ril, message);
-
-	/* Last parameter is 'tpdu_len' ( substract SMSC length ) */
-	ofono_sms_deliver_notify(sms, ril_data,
-			ril_buf_len,
-			ril_buf_len - smsc_len);
-
-	/* Re-use rilp, so initilize */
-	parcel_init(&rilp);
-	parcel_w_int32(&rilp, 2); /* Number of int32 values in array */
-	parcel_w_int32(&rilp, 1); /* Successful receipt */
-	parcel_w_int32(&rilp, 0); /* error code */
-
-	/* TODO: should ACK be sent for either of the error cases? */
-
-	/* ACK the incoming NEW_SMS; ignore response so no cb needed */
-	ret = g_ril_send(sd->ril, request,
-			rilp.data,
-			rilp.size,
-			NULL, NULL, NULL);
-
-	g_ril_append_print_buf(sd->ril, "(1,0)");
-	g_ril_print_request(sd->ril, ret, request);
-
-	parcel_free(&rilp);
-	return;
+	if (message->req == RIL_UNSOL_RESPONSE_NEW_SMS)
+		/* Last parameter is 'tpdu_len' ( substract SMSC length ) */
+		ofono_sms_deliver_notify(sms, pdu_data->data,
+						ril_buf_len,
+						ril_buf_len - smsc_len);
+	else if (message->req == RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT)
+		ofono_sms_status_notify(sms, pdu_data->data, ril_buf_len,
+						ril_buf_len - smsc_len);
+
+	/* ACK the incoming NEW_SMS */
+	ril_ack_delivery(sms);
+
+	g_ril_unsol_free_sms_data(pdu_data);
 
 error:
-	ofono_error("Unable to parse NEW_SMS notification");
+	;
 }
 
 static gboolean ril_delayed_register(gpointer user_data)
@@ -204,12 +273,14 @@
 	DBG("");
 	ofono_sms_register(sms);
 
-	/* register to receive INCOMING_SMS */
+	/* register to receive INCOMING_SMS and SMS status reports */
 	g_ril_register(data->ril, RIL_UNSOL_RESPONSE_NEW_SMS,
 			ril_sms_notify,	sms);
+	g_ril_register(data->ril, RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT,
+			ril_sms_notify, sms);
 
-        /* This makes the timeout a single-shot */
-        return FALSE;
+	/* This makes the delayed call a single-shot */
+	return FALSE;
 }
 
 static int ril_sms_probe(struct ofono_sms *sms, unsigned int vendor,
@@ -224,17 +295,14 @@
 
 	ofono_sms_set_data(sms, data);
 
-        /*
-	 * TODO: analyze if capability check is needed
-	 * and/or timer should be adjusted.
-	 *
+	/*
 	 * ofono_sms_register() needs to be called after
 	 * the driver has been set in ofono_sms_create(), which
 	 * calls this function.  Most other drivers make some
 	 * kind of capabilities query to the modem, and then
-	 * call register in the callback; we use a timer instead.
+	 * call register in the callback; we use an idle add instead.
 	 */
-        g_timeout_add_seconds(2, ril_delayed_register, sms);
+	g_idle_add(ril_delayed_register, sms);
 
 	return 0;
 }
@@ -243,7 +311,7 @@
 {
 	struct sms_data *data = ofono_sms_get_data(sms);
 
-        DBG("");
+	DBG("");
 
 	g_ril_unref(data->ril);
 	g_free(data);
@@ -254,13 +322,13 @@
 static struct ofono_sms_driver driver = {
 	.name		= RILMODEM,
 	.probe		= ril_sms_probe,
+	.sca_query	= ril_csca_query,
+	.sca_set	= ril_csca_set,
 	.remove		= ril_sms_remove,
 	.submit		= ril_cmgs,
 
 	/*
 	 * TODO: investigate/implement:
-	 * .sca_query	  = NULL,
-	 * .sca_set	  = NULL,
 	 * .bearer_query  = NULL,
 	 * .bearer_set	  = NULL,
 	 */

=== modified file 'drivers/rilmodem/voicecall.c'
--- drivers/rilmodem/voicecall.c	2013-11-06 03:59:35 +0000
+++ drivers/rilmodem/voicecall.c	2013-12-04 21:58:23 +0000
@@ -3,7 +3,8 @@
  *  oFono - Open Source Telephony
  *
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2012 Canonical Ltd.
+ *  Copyright (C) 2012-2013 Canonical Ltd.
+ *  Copyright (C) 2013 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -38,6 +39,9 @@
 
 #include "gril.h"
 #include "grilutil.h"
+#include "grilrequest.h"
+#include "grilreply.h"
+#include "grilunsol.h"
 
 #include "common.h"
 #include "rilmodem.h"
@@ -45,21 +49,25 @@
 /* Amount of ms we wait between CLCC calls */
 #define POLL_CLCC_INTERVAL 300
 
-/* When +VTD returns 0, an unspecified manufacturer-specific delay is used */
-#define TONE_DURATION 1000
-
 #define FLAG_NEED_CLIP 1
 
+#define MAX_DTMF_BUFFER 32
+
+/* To use with change_state_req::affected_types */
+#define AFFECTED_STATES_ALL 0x3F
+
 struct voicecall_data {
 	GSList *calls;
+	/* Call local hangup indicator, one bit per call (1 << call_id) */
 	unsigned int local_release;
 	unsigned int clcc_source;
 	GRil *ril;
 	unsigned int vendor;
-	unsigned int tone_duration;
-	guint vts_source;
-	unsigned int vts_delay;
 	unsigned char flags;
+	ofono_voicecall_cb_t cb;
+	void *data;
+	gchar *tone_queue;
+	gboolean tone_pending;
 };
 
 struct release_id_req {
@@ -73,9 +81,32 @@
 	struct ofono_voicecall *vc;
 	ofono_voicecall_cb_t cb;
 	void *data;
+	/* Call states affected by a local release (1 << enum call_status) */
 	int affected_types;
 };
 
+struct lastcause_req {
+	struct ofono_voicecall *vc;
+	int id;
+};
+
+static void send_one_dtmf(struct voicecall_data *vd);
+static void clear_dtmf_queue(struct voicecall_data *vd);
+
+static void lastcause_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct lastcause_req *reqdata = user_data;
+	struct ofono_voicecall *vc = reqdata->vc;
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	enum ofono_disconnect_reason reason;
+
+	reason = g_ril_reply_parse_call_fail_cause(vd->ril, message);
+
+	DBG("Call %d ended with reason %d", reqdata->id, reason);
+
+	ofono_voicecall_disconnected(vc, reqdata->id, reason, NULL);
+}
+
 static void clcc_poll_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_voicecall *vc = user_data;
@@ -90,7 +121,7 @@
 		return;
 	}
 
-	calls = ril_util_parse_clcc(vd->ril, message);
+	calls = g_ril_reply_parse_get_calls(vd->ril, message);
 
 	n = calls;
 	o = vd->calls;
@@ -99,23 +130,44 @@
 		nc = n ? n->data : NULL;
 		oc = o ? o->data : NULL;
 
+		/* TODO: Add comments explaining call id handling */
 		if (oc && (nc == NULL || (nc->id > oc->id))) {
-			enum ofono_disconnect_reason reason;
-
-			if (vd->local_release & (1 << oc->id))
-				reason = OFONO_DISCONNECT_REASON_LOCAL_HANGUP;
-			else
-				reason = OFONO_DISCONNECT_REASON_REMOTE_HANGUP;
-
-			if (oc->type)
+			if (vd->local_release & (1 << oc->id)) {
 				ofono_voicecall_disconnected(vc, oc->id,
-								reason, NULL);
+					OFONO_DISCONNECT_REASON_LOCAL_HANGUP,
+					NULL);
+			} else {
+				/* Get disconnect cause before calling core */
+				struct lastcause_req *reqdata =
+					g_try_new0(struct lastcause_req, 1);
+				if (reqdata) {
+					int req;
+					req = RIL_REQUEST_LAST_CALL_FAIL_CAUSE;
+					reqdata->vc = user_data;
+					reqdata->id = oc->id;
+					g_ril_send(vd->ril, req,
+							NULL, 0, lastcause_cb,
+							reqdata, g_free);
+				}
+			}
+
+			clear_dtmf_queue(vd);
 
 			o = o->next;
 		} else if (nc && (oc == NULL || (nc->id < oc->id))) {
 			/* new call, signal it */
-			if (nc->type)
+			if (nc->type) {
 				ofono_voicecall_notify(vc, nc);
+				if (vd->cb) {
+					struct ofono_error error;
+					ofono_voicecall_cb_t cb = vd->cb;
+					decode_ril_error(&error, "OK");
+					cb(&error, vd->data);
+					vd->cb = NULL;
+					vd->data = NULL;
+				}
+
+			}
 
 			n = n->next;
 		} else {
@@ -213,7 +265,7 @@
 
 out:
 	ret = g_ril_send(vd->ril, request, NULL,
-			0, clcc_poll_cb, req->vc, NULL);
+				0, clcc_poll_cb, req->vc, NULL);
 
 	g_ril_print_request_no_args(vd->ril, ret, request);
 
@@ -285,6 +337,13 @@
 	if (!vd->clcc_source)
 		vd->clcc_source = g_timeout_add(POLL_CLCC_INTERVAL,
 						poll_clcc, vc);
+
+	/* we cannot answer just yet since we don't know the call id */
+	vd->cb = cb;
+	vd->data = cbd->data;
+
+	return;
+
 out:
 	cb(&error, cbd->data);
 }
@@ -300,25 +359,12 @@
 	int request = RIL_REQUEST_DIAL;
 	int ret;
 
-	parcel_init(&rilp);
-
-	/* Number to dial */
-        parcel_w_string(&rilp, phone_number_to_string(ph));
-	/* CLIR mode */
-	parcel_w_int32(&rilp, clir);
-	/* USS, need it twice for absent */
-	/* TODO: Deal with USS properly */
-	parcel_w_int32(&rilp, 0);
-	parcel_w_int32(&rilp, 0);
+	g_ril_request_dial(vd->ril, ph, clir, &rilp);
 
 	/* Send request to RIL */
 	ret = g_ril_send(vd->ril, request, rilp.data,
 				rilp.size, rild_cb, cbd, g_free);
 
-	g_ril_append_print_buf(vd->ril, "(%s,%d,0,0)",
-				phone_number_to_string(ph),
-				clir);
-
 	g_ril_print_request(vd->ril, ret, request);
 
 	parcel_free(&rilp);
@@ -331,7 +377,7 @@
 }
 
 static void ril_hangup_all(struct ofono_voicecall *vc,
-			ofono_voicecall_cb_t cb, void *data)
+				ofono_voicecall_cb_t cb, void *data)
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	struct parcel rilp;
@@ -345,15 +391,12 @@
 		call = l->data;
 		/* TODO: Hangup just the active ones once we have call
 		 * state tracking (otherwise it can't handle ringing) */
-		parcel_init(&rilp);
-		parcel_w_int32(&rilp, 1); /* Always 1 - AT+CHLD=1x */
-		parcel_w_int32(&rilp, call->id);
+		g_ril_request_hangup(vd->ril, call->id, &rilp);
 
 		/* Send request to RIL */
-		ret = ril_template(request, vc, generic_cb, 0x3f,
+		ret = ril_template(request, vc, generic_cb, AFFECTED_STATES_ALL,
 					rilp.data, rilp.size, NULL, NULL);
 
-		g_ril_append_print_buf(vd->ril, "(%d)", call->id);
 		g_ril_print_request(vd->ril, ret, request);
 
 		parcel_free(&rilp);
@@ -364,6 +407,27 @@
 	cb(&error, data);
 }
 
+static void ril_hangup_specific(struct ofono_voicecall *vc,
+		int id, ofono_voicecall_cb_t cb, void *data)
+{
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	struct parcel rilp;
+	int request = RIL_REQUEST_HANGUP;
+	int ret;
+
+	DBG("Hanging up call with id %d", id);
+
+	g_ril_request_hangup(vd->ril, id, &rilp);
+
+	/* Send request to RIL */
+	ret = ril_template(request, vc, generic_cb, AFFECTED_STATES_ALL,
+				rilp.data, rilp.size, cb, data);
+
+	g_ril_print_request(vd->ril, ret, request);
+
+	parcel_free(&rilp);
+}
+
 static void ril_call_state_notify(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_voicecall *vc = user_data;
@@ -380,6 +444,32 @@
 	ofono_error("Unable to notify about call state changes");
 }
 
+static void ril_ss_notify(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_voicecall *vc = user_data;
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	struct unsol_supp_svc_notif *unsol;
+
+	unsol = g_ril_unsol_parse_supp_svc_notif(vd->ril,  message);
+	if (unsol == NULL) {
+		ofono_error("%s: Parsing error", __func__);
+		return;
+	}
+
+	DBG("RIL data: MT/MO: %i, code: %i, index: %i",
+		unsol->notif_type, unsol->code, unsol->index);
+
+	/* 0 stands for MO intermediate, 1 for MT unsolicited */
+	/* TODO How do we know the affected call? Refresh call list? */
+	if (unsol->notif_type == 1)
+		ofono_voicecall_ssn_mt_notify(
+			vc, 0, unsol->code, unsol->index, &unsol->number);
+	else
+		ofono_voicecall_ssn_mo_notify(vc, 0, unsol->code, unsol->index);
+
+	g_ril_unsol_free_supp_svc_notif(unsol);
+}
+
 static void ril_answer(struct ofono_voicecall *vc,
 			ofono_voicecall_cb_t cb, void *data)
 {
@@ -396,46 +486,192 @@
 	g_ril_print_request_no_args(vd->ril, ret, request);
 }
 
+static void ril_send_dtmf_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct voicecall_data *vd = user_data;
+
+	if (message->error == RIL_E_SUCCESS) {
+		/* Remove sent DTMF character from queue */
+		gchar *tmp_tone_queue = g_strdup(vd->tone_queue + 1);
+		int remaining = strlen(tmp_tone_queue);
+
+		memcpy(vd->tone_queue, tmp_tone_queue, remaining);
+		vd->tone_queue[remaining] = '\0';
+		g_free(tmp_tone_queue);
+
+		vd->tone_pending = FALSE;
+
+		if (remaining > 0)
+			send_one_dtmf(vd);
+	} else {
+		DBG("error=%d", message->error);
+		clear_dtmf_queue(vd);
+	}
+}
+
+static void send_one_dtmf(struct voicecall_data *vd)
+{
+	struct parcel rilp;
+	int request = RIL_REQUEST_DTMF;
+	int ret;
+
+	if (vd->tone_pending == TRUE)
+		return; /* RIL request pending */
+
+	if (strlen(vd->tone_queue) == 0)
+		return; /* nothing to send */
+
+	g_ril_request_dtmf(vd->ril, vd->tone_queue[0], &rilp);
+
+	ret = g_ril_send(vd->ril, request, rilp.data,
+				rilp.size, ril_send_dtmf_cb, vd, NULL);
+
+	g_ril_print_request(vd->ril, ret, request);
+	parcel_free(&rilp);
+
+	vd->tone_pending = TRUE;
+}
+
 static void ril_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
 		ofono_voicecall_cb_t cb, void *data)
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	int len = strlen(dtmf);
-	struct parcel rilp;
 	struct ofono_error error;
-	char *ril_dtmf = g_try_malloc(sizeof(char) * 2);
-	int request = RIL_REQUEST_DTMF;
-	int i, ret;
-
-	DBG("");
-
-	/* Ril wants just one character, but we need to send as string */
-	ril_dtmf[1] = '\0';
-
-	for (i = 0; i < len; i++) {
-		parcel_init(&rilp);
-		ril_dtmf[0] = dtmf[i];
-		parcel_w_string(&rilp, ril_dtmf);
-
-		ret = g_ril_send(vd->ril, request, rilp.data,
-				rilp.size, NULL, NULL, NULL);
-
-		g_ril_append_print_buf(vd->ril, "(%s)", ril_dtmf);
-		g_ril_print_request(vd->ril, ret, request);
-		parcel_free(&rilp);
-
-		/* TODO: should we break out of look on failure? */
-		if (ret <= 0)
-			ofono_error("send REQUEST_DTMF failed");
-	}
-
-	free(ril_dtmf);
+
+	DBG("Queue '%s'", dtmf);
+
+	/*
+	 * Queue any incoming DTMF (up to MAX_DTMF_BUFFER characters),
+	 * send them to RIL one-by-one, immediately call back
+	 * core with no error
+	 */
+	g_strlcat(vd->tone_queue, dtmf, MAX_DTMF_BUFFER);
+	send_one_dtmf(vd);
 
 	/* We don't really care about errors here */
 	decode_ril_error(&error, "OK");
 	cb(&error, data);
 }
 
+static void clear_dtmf_queue(struct voicecall_data *vd)
+{
+	g_free(vd->tone_queue);
+	vd->tone_queue = g_strnfill(MAX_DTMF_BUFFER + 1, '\0');
+	vd->tone_pending = FALSE;
+}
+
+static void ril_create_multiparty(struct ofono_voicecall *vc,
+			ofono_voicecall_cb_t cb, void *data)
+{
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	int request = RIL_REQUEST_CONFERENCE;
+	int ret;
+
+	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
+
+	g_ril_print_request_no_args(vd->ril, ret, request);
+}
+
+static void ril_private_chat(struct ofono_voicecall *vc, int id,
+			ofono_voicecall_cb_t cb, void *data)
+{
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	struct parcel rilp;
+	int request = RIL_REQUEST_SEPARATE_CONNECTION;
+	int ret;
+
+	g_ril_request_separate_conn(vd->ril, id, &rilp);
+
+	/* Send request to RIL */
+	ret = ril_template(request, vc, generic_cb, 0, rilp.data, rilp.size,
+				cb, data);
+
+	g_ril_print_request(vd->ril, ret, request);
+
+	parcel_free(&rilp);
+}
+
+static void ril_swap_without_accept(struct ofono_voicecall *vc,
+			ofono_voicecall_cb_t cb, void *data)
+{
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	int request = RIL_REQUEST_SWITCH_HOLDING_AND_ACTIVE;
+	int ret;
+
+	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
+
+	g_ril_print_request_no_args(vd->ril, ret, request);
+}
+
+static void ril_hold_all_active(struct ofono_voicecall *vc,
+			ofono_voicecall_cb_t cb, void *data)
+{
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	int request = RIL_REQUEST_SWITCH_HOLDING_AND_ACTIVE;
+	int ret;
+
+	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
+
+	g_ril_print_request_no_args(vd->ril, ret, request);
+}
+
+static void ril_release_all_held(struct ofono_voicecall *vc,
+					ofono_voicecall_cb_t cb, void *data)
+{
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	int request = RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND;
+	int ret;
+
+	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
+
+	g_ril_print_request_no_args(vd->ril, ret, request);
+}
+
+static void ril_release_all_active(struct ofono_voicecall *vc,
+					ofono_voicecall_cb_t cb, void *data)
+{
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	int request = RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND;
+	int ret;
+
+	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
+
+	g_ril_print_request_no_args(vd->ril, ret, request);
+}
+
+static void ril_set_udub(struct ofono_voicecall *vc,
+					ofono_voicecall_cb_t cb, void *data)
+{
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	int request = RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND;
+	int ret;
+
+	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
+
+	g_ril_print_request_no_args(vd->ril, ret, request);
+}
+
+static gboolean enable_supp_svc(gpointer user_data)
+{
+	struct ofono_voicecall *vc = user_data;
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	int request = RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION;
+	int ret;
+	struct parcel rilp;
+
+	g_ril_request_set_supp_svc_notif(vd->ril, &rilp);
+
+	ret = g_ril_send(vd->ril, request, rilp.data,
+				rilp.size, NULL, vc, NULL);
+
+	g_ril_print_request(vd->ril, ret, request);
+
+	parcel_free(&rilp);
+
+	/* Makes this a single shot */
+	return FALSE;
+}
+
 static gboolean ril_delayed_register(gpointer user_data)
 {
 	struct ofono_voicecall *vc = user_data;
@@ -449,6 +685,13 @@
 	g_ril_register(vd->ril, RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED,
 			ril_call_state_notify, vc);
 
+	/* Unsol when call set on hold */
+	g_ril_register(vd->ril, RIL_UNSOL_SUPP_SVC_NOTIFICATION,
+			ril_ss_notify, vc);
+
+	/* request supplementary service notifications*/
+	enable_supp_svc(vc);
+
 	/* This makes the timeout a single-shot */
 	return FALSE;
 }
@@ -465,18 +708,21 @@
 
 	vd->ril = g_ril_clone(ril);
 	vd->vendor = vendor;
-	vd->tone_duration = TONE_DURATION;
+	vd->cb = NULL;
+	vd->data = NULL;
+
+	clear_dtmf_queue(vd);
 
 	ofono_voicecall_set_data(vc, vd);
 
-        /*
+	/*
 	 * ofono_voicecall_register() needs to be called after
 	 * the driver has been set in ofono_voicecall_create(),
 	 * which calls this function.  Most other drivers make
-         * some kind of capabilities query to the modem, and then
+	 * some kind of capabilities query to the modem, and then
 	 * call register in the callback; we use an idle event instead.
 	 */
-        g_idle_add(ril_delayed_register, vc);
+	g_idle_add(ril_delayed_register, vc);
 
 	return 0;
 }
@@ -488,15 +734,13 @@
 	if (vd->clcc_source)
 		g_source_remove(vd->clcc_source);
 
-	if (vd->vts_source)
-		g_source_remove(vd->vts_source);
-
 	g_slist_foreach(vd->calls, (GFunc) g_free, NULL);
 	g_slist_free(vd->calls);
 
 	ofono_voicecall_set_data(vc, NULL);
 
 	g_ril_unref(vd->ril);
+	g_free(vd->tone_queue);
 	g_free(vd);
 }
 
@@ -507,7 +751,15 @@
 	.dial			= ril_dial,
 	.answer			= ril_answer,
 	.hangup_all		= ril_hangup_all,
-	.send_tones		= ril_send_dtmf
+	.release_specific	= ril_hangup_specific,
+	.send_tones		= ril_send_dtmf,
+	.create_multiparty	= ril_create_multiparty,
+	.private_chat		= ril_private_chat,
+	.swap_without_accept	= ril_swap_without_accept,
+	.hold_all_active	= ril_hold_all_active,
+	.release_all_held	= ril_release_all_held,
+	.set_udub		= ril_set_udub,
+	.release_all_active	= ril_release_all_active,
 };
 
 void ril_voicecall_init(void)

=== modified file 'gril/gril.c'
--- gril/gril.c	2013-11-12 16:59:43 +0000
+++ gril/gril.c	2013-12-04 21:58:23 +0000
@@ -111,6 +111,13 @@
 	guint group;
 };
 
+struct req_hdr {
+	/* Warning: length is stored in network order */
+	uint32_t length;
+	uint32_t reqid;
+	uint32_t serial;
+};
+
 #define RIL_PRINT_BUF_SIZE 8096
 char print_buf[RIL_PRINT_BUF_SIZE] __attribute__((used));
 
@@ -225,51 +232,36 @@
 						gboolean wakeup)
 {
 	struct ril_request *r;
-	gsize len;
-	gchar *cur_bufp;
-	guint32 *net_length;
-	gint32 *request, *serial_no;
+	struct req_hdr header;
 
 	r = g_try_new0(struct ril_request, 1);
-	if (r == NULL)
-		return 0;
-
-
-	DBG("req: %s, id: %d, data_len: %d",
-		ril_request_id_to_string(req), id, (int) data_len);
-
-	/* RIL request: 8 byte header + data */
-	len = 8 + data_len;
-
-	/* Add 4 bytes to buffer length to include length prefix */
-	r->data_len = len + 4;
+	if (r == NULL) {
+		ofono_error("%s Out of memory", __func__);
+		return NULL;
+	}
+
+	DBG("req: %s, id: %d, data_len: %zu",
+		ril_request_id_to_string(req), id, data_len);
+
+	/* Full request size: header size plus buffer length */
+	r->data_len = data_len + sizeof(header);
 
 	r->data = g_try_new(char, r->data_len);
 	if (r->data == NULL) {
 		ofono_error("ril_request: can't allocate new request.");
 		g_free(r);
-		return 0;
+		return NULL;
 	}
 
-	/* convert length to network byte order (Big Endian) */
-	net_length = (guint32 *) r->data;
-	*net_length = htonl(len);
-
-	/* advance past initial length */
-	cur_bufp = r->data + 4;
-
-	/* write request code */
-	request = (gint32 *) cur_bufp;
-	*request = req;
-	cur_bufp += 4;
-
-	/* write serial number */
-	serial_no = (gint32 *) cur_bufp;
-	*serial_no = id;
-	cur_bufp += 4;
-
+	/* Length does not include the length field. Network order. */
+	header.length = htonl(r->data_len - sizeof(header.length));
+	header.reqid = req;
+	header.serial = id;
+
+	/* copy header */
+	memcpy(r->data, &header, sizeof(header));
 	/* copy request data */
-	memcpy(cur_bufp, (const void *) data, data_len);
+	memcpy(r->data + sizeof(header), data, data_len);
 
 	r->req = req;
 	r->gid = gid;
@@ -330,8 +322,8 @@
 	gsize count = g_queue_get_length(p->command_queue);
 	struct ril_request *req;
 	gboolean found = FALSE;
-	guint i;
-	guint len, id;
+	guint i, len;
+	gint id;
 
 	g_assert(count > 0);
 
@@ -358,7 +350,8 @@
 			len = g_queue_get_length(p->out_queue);
 			DBG("requests in sent queue before removing:%d", len);
 			for (i = 0; i < len; i++) {
-				id = (guint) g_queue_peek_nth(p->out_queue, i);
+				id = GPOINTER_TO_INT(g_queue_peek_nth(
+							p->out_queue, i));
 				if (id == req->id) {
 					g_queue_pop_nth(p->out_queue, i);
 					break;
@@ -429,13 +422,13 @@
 
 static void dispatch(struct ril_s *p, struct ril_msg *message)
 {
-	gint32 *unsolicited_field, *id_num_field;
+	int32_t *unsolicited_field, *id_num_field;
 	gchar *bufp = message->buf;
 	gchar *datap;
 	gsize data_len;
 
 	/* This could be done with a struct/union... */
-	unsolicited_field = (gint32 *) bufp;
+	unsolicited_field = (int32_t *) (void *) bufp;
 	if (*unsolicited_field)
 		message->unsolicited = TRUE;
 	else
@@ -443,7 +436,7 @@
 
 	bufp += 4;
 
-	id_num_field = (gint32 *) bufp;
+	id_num_field = (int32_t *) (void *) bufp;
 	if (message->unsolicited) {
 		message->req = (int) *id_num_field;
 
@@ -457,7 +450,7 @@
 		message->serial_no = (int) *id_num_field;
 
 		bufp += 4;
-		message->error = *((guint32 *) bufp);
+		message->error = *((int32_t *) (void *) bufp);
 
 		/*
 		 * A RIL Solicited Response is three UINT32 fields ( unsolicied,
@@ -471,23 +464,30 @@
 	/* advance to start of data.. */
 	bufp += 4;
 
-	/* Now, allocate new buffer for data only, copy from
-	 * original, and free the original...
+	/*
+	 * Now, use buffer for event data if present
 	 */
 	if (data_len) {
 		datap = g_try_malloc(data_len);
 		if (datap == NULL)
 			goto error;
 
-		/* Copy bytes into new buffer */
-		memmove(datap, (const void *) bufp, data_len);
+		/* Copy event bytes from message->buf into new buffer */
+		memcpy(datap, bufp, data_len);
 
-		/* Free old buffer */
+		/* Free buffer that includes header */
 		g_free(message->buf);
 
 		/* ...and replace with new buffer */
 		message->buf = datap;
 		message->buf_len = data_len;
+	} else {
+		/* Free buffer that includes header */
+		g_free(message->buf);
+
+		/* To know if there was no data when parsing */
+		message->buf = NULL;
+		message->buf_len = 0;
 	}
 
 	if (message->unsolicited == TRUE)
@@ -504,10 +504,10 @@
 						const guchar *bytes, gsize *len)
 {
 	struct ril_msg *message;
-	int message_len, plen;
+	unsigned message_len, plen;
 
 	/* First four bytes are length in TCP byte order (Big Endian) */
-	plen = ntohl(*((uint32_t *) bytes));
+	plen = ntohl(*((uint32_t *) (void *) bytes));
 	bytes += 4;
 
 	/* TODO: Verify that 4k is the max message size from rild.
@@ -615,9 +615,10 @@
 	struct ril_s *ril = data;
 	struct ril_request *req;
 	gsize bytes_written, towrite, len;
-	guint qlen, oqlen, id;
+	guint qlen, oqlen;
+	gint id;
 	gboolean written = TRUE;
-	int i, j;
+	guint i, j;
 
 	qlen = g_queue_get_length(ril->command_queue);
 	if (qlen < 1)
@@ -629,7 +630,8 @@
 		for (i = 0; i < qlen; i++) {
 			req = g_queue_peek_nth(ril->command_queue, i);
 			if (req) {
-				id = (guint) g_queue_peek_head(ril->out_queue);
+				id = GPOINTER_TO_INT(g_queue_peek_head(
+							ril->out_queue));
 				if (req->id == id)
 					goto out;
 			} else {
@@ -644,7 +646,7 @@
 		if (req == NULL)
 			return FALSE;
 
-		g_queue_push_head(ril->out_queue,(gpointer) req->id);
+		g_queue_push_head(ril->out_queue, GINT_TO_POINTER(req->id));
 
 		goto out;
 	}
@@ -655,7 +657,8 @@
 			return FALSE;
 
 		for (j = 0; j < oqlen; j++) {
-			id = (guint) g_queue_peek_nth(ril->out_queue, j);
+			id = GPOINTER_TO_INT(
+					g_queue_peek_nth(ril->out_queue, j));
 			if (req->id == id) {
 				written = TRUE;
 				break;
@@ -672,13 +675,13 @@
 	if (written == TRUE)
 		return FALSE;
 
-	g_queue_push_head(ril->out_queue,(gpointer) req->id);
+	g_queue_push_head(ril->out_queue, GINT_TO_POINTER(req->id));
 
 out:
 	len = req->data_len;
 
 	towrite = len - ril->req_bytes_written;
-	DBG("req:%d,len:%d,towrite:%d", req->id, len, towrite);
+	DBG("req:%d,len:%zu,towrite:%zu", req->id, len, towrite);
 #ifdef WRITE_SCHEDULER_DEBUG
 	if (towrite > 5)
 		towrite = 5;
@@ -865,8 +868,7 @@
 static void ril_cancel_group(struct ril_s *ril, guint group)
 {
 	int n = 0;
-	int i;
-	guint len;
+	guint len, i;
 	struct ril_request *req;
 
 	if (ril->command_queue == NULL)
@@ -882,7 +884,8 @@
 
 		len = g_queue_get_length(ril->out_queue);
 		for (i = 0; i < len; i++) {
-			if ((guint) g_queue_peek_nth(ril->out_queue, i)
+			if (GPOINTER_TO_INT(
+					g_queue_peek_nth(ril->out_queue, i))
 					== req->id) {
 				g_queue_pop_nth(ril->out_queue, i);
 				break;
@@ -989,7 +992,7 @@
 	return FALSE;
 }
 
-void g_ril_init_parcel(struct ril_msg *message, struct parcel *rilp)
+void g_ril_init_parcel(const struct ril_msg *message, struct parcel *rilp)
 {
 	/* Set up Parcel struct for proper parsing */
 	rilp->data = message->buf;

=== modified file 'gril/gril.h'
--- gril/gril.h	2013-11-12 16:59:43 +0000
+++ gril/gril.h	2013-12-04 21:58:23 +0000
@@ -91,7 +91,7 @@
 #define g_ril_print_unsol_no_args(gril, message)				\
         G_RIL_TRACE(gril, "[UNSOL]< %s", ril_unsol_request_to_string(message->req))
 
-void g_ril_init_parcel(struct ril_msg *message, struct parcel *rilp);
+void g_ril_init_parcel(const struct ril_msg *message, struct parcel *rilp);
 
 GRil *g_ril_new();
 

=== modified file 'gril/grilreply.c'
--- gril/grilreply.c	2013-11-15 23:16:57 +0000
+++ gril/grilreply.c	2013-12-04 21:58:23 +0000
@@ -168,7 +168,8 @@
 }
 
 struct reply_avail_ops *g_ril_reply_parse_avail_ops(GRil *gril,
-						struct ril_msg *message) {
+						const struct ril_msg *message)
+{
 	struct parcel rilp;
 	struct reply_operator *operator;
 	struct reply_avail_ops *reply = NULL;
@@ -281,7 +282,7 @@
 }
 
 struct reply_operator *g_ril_reply_parse_operator(GRil *gril,
-						struct ril_msg *message)
+						const struct ril_msg *message)
 {
 	struct parcel rilp;
 	int num_params;
@@ -359,8 +360,8 @@
 }
 
 struct reply_setup_data_call *g_ril_reply_parse_data_call(GRil *gril,
-							struct ril_msg *message,
-							struct ofono_error *error)
+						const struct ril_msg *message,
+						struct ofono_error *error)
 {
 	struct parcel rilp;
 	int num = 0;
@@ -530,7 +531,7 @@
 }
 
 struct reply_reg_state *g_ril_reply_parse_reg_state(GRil *gril,
-						struct ril_msg *message)
+						const struct ril_msg *message)
 
 {
 	struct parcel rilp;
@@ -658,7 +659,7 @@
 }
 
 struct reply_sim_io *g_ril_reply_parse_sim_io(GRil *gril,
-						struct ril_msg *message)
+						const struct ril_msg *message)
 {
 	struct parcel rilp;
 	char *response = NULL;
@@ -683,14 +684,14 @@
 	reply->sw2 = parcel_r_int32(&rilp);
 
 	response = parcel_r_string(&rilp);
-	if (response == NULL)
-		goto error;
 
-	reply->hex_response =
-		decode_hex((const char *) response, strlen(response),
-				(long *) &reply->hex_len, -1);
-	if (reply->hex_response == NULL)
-		goto error;
+	if (response != NULL) {
+		reply->hex_response =
+			decode_hex(response, strlen(response),
+					(long *) &reply->hex_len, -1);
+		if (reply->hex_response == NULL)
+			goto error;
+	}
 
 	g_ril_append_print_buf(gril,
 				"(sw1=0x%.2X,sw2=0x%.2X,%s)",
@@ -709,7 +710,7 @@
 	return NULL;
 }
 
-gchar *g_ril_reply_parse_imsi(GRil *gril, struct ril_msg *message)
+gchar *g_ril_reply_parse_imsi(GRil *gril, const struct ril_msg *message)
 {
 	struct parcel rilp;
 	gchar *imsi;
@@ -745,7 +746,7 @@
 }
 
 struct reply_sim_status *g_ril_reply_parse_sim_status(GRil *gril,
-						struct ril_msg *message)
+						const struct ril_msg *message)
 {
 	struct parcel rilp;
 	unsigned int i;
@@ -867,3 +868,243 @@
 
 	return NULL;
 }
+
+struct ofono_phone_number *g_ril_reply_parse_get_smsc_address(
+						GRil *gril,
+						const struct ril_msg *message)
+{
+	struct ofono_phone_number *sca;
+	struct parcel rilp;
+	char *number, *temp_buf;
+
+	sca = g_new0(struct ofono_phone_number, 1);
+	if (sca == NULL) {
+		ofono_error("%s Out of memory", __func__);
+		goto err_alloc;
+	}
+
+	g_ril_init_parcel(message, &rilp);
+
+	temp_buf = parcel_r_string(&rilp);
+	if (temp_buf == NULL) {
+		ofono_error("%s Cannot read SMSC address", __func__);
+		goto err_readsca;
+	}
+
+	/* RIL gives address in quotes */
+	number = strtok(temp_buf, "\"");
+	if (number == NULL || *number == '\0') {
+		ofono_error("%s Invalid SMSC address", __func__);
+		goto err_scaformat;
+	}
+
+	if (number[0] == '+') {
+		number = number + 1;
+		sca->type = OFONO_NUMBER_TYPE_INTERNATIONAL;
+	} else {
+		sca->type = OFONO_NUMBER_TYPE_UNKNOWN;
+	}
+
+	strncpy(sca->number, number, OFONO_MAX_PHONE_NUMBER_LENGTH);
+	sca->number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
+
+	g_ril_append_print_buf(gril, "{type=%d,number=%s}",
+				sca->type, sca->number);
+	g_ril_print_response(gril, message);
+
+	g_free(temp_buf);
+
+	return sca;
+
+err_scaformat:
+	g_free(temp_buf);
+err_readsca:
+	g_free(sca);
+err_alloc:
+	return NULL;
+}
+
+int g_ril_reply_parse_sms_response(GRil *gril, const struct ril_msg *message)
+{
+	struct parcel rilp;
+	int error, mr;
+	char *ack_pdu;
+
+	/* Set up Parcel struct for proper parsing */
+	g_ril_init_parcel(message, &rilp);
+
+	/*
+	 * TP-Message-Reference for GSM/
+	 * BearerData MessageId for CDMA
+	 */
+	mr = parcel_r_int32(&rilp);
+	ack_pdu = parcel_r_string(&rilp);
+	error = parcel_r_int32(&rilp);
+
+	g_ril_append_print_buf(gril, "{%d,%s,%d}",
+				mr, ack_pdu, error);
+	g_ril_print_response(gril, message);
+
+	g_free(ack_pdu);
+
+	return mr;
+}
+
+static gint g_ril_call_compare(gconstpointer a, gconstpointer b)
+{
+	const struct ofono_call *ca = a;
+	const struct ofono_call *cb = b;
+
+	if (ca->id < cb->id)
+		return -1;
+
+	if (ca->id > cb->id)
+		return 1;
+
+	return 0;
+}
+
+GSList *g_ril_reply_parse_get_calls(GRil *gril, const struct ril_msg *message)
+{
+	struct ofono_call *call;
+	struct parcel rilp;
+	GSList *l = NULL;
+	int num, i;
+	gchar *number, *name;
+
+	g_ril_init_parcel(message, &rilp);
+
+	g_ril_append_print_buf(gril, "{");
+
+	/* maguro signals no calls with empty event data */
+	if (rilp.size < sizeof(int32_t))
+		goto no_calls;
+
+	/* Number of RIL_Call structs */
+	num = parcel_r_int32(&rilp);
+	for (i = 0; i < num; i++) {
+		call = g_try_new(struct ofono_call, 1);
+		if (call == NULL)
+			break;
+
+		ofono_call_init(call);
+		call->status = parcel_r_int32(&rilp);
+		call->id = parcel_r_int32(&rilp);
+		call->phone_number.type = parcel_r_int32(&rilp);
+		parcel_r_int32(&rilp); /* isMpty */
+		parcel_r_int32(&rilp); /* isMT */
+		parcel_r_int32(&rilp); /* als */
+		call->type = parcel_r_int32(&rilp); /* isVoice */
+		parcel_r_int32(&rilp); /* isVoicePrivacy */
+		number = parcel_r_string(&rilp);
+		if (number) {
+			strncpy(call->phone_number.number, number,
+				OFONO_MAX_PHONE_NUMBER_LENGTH);
+			g_free(number);
+		}
+
+		parcel_r_int32(&rilp); /* numberPresentation */
+		name = parcel_r_string(&rilp);
+		if (name) {
+			strncpy(call->name, name,
+				OFONO_MAX_CALLER_NAME_LENGTH);
+			g_free(name);
+		}
+
+		parcel_r_int32(&rilp); /* namePresentation */
+		parcel_r_int32(&rilp); /* uusInfo */
+
+		if (strlen(call->phone_number.number) > 0)
+			call->clip_validity = 0;
+		else
+			call->clip_validity = 2;
+
+		g_ril_append_print_buf(gril,
+					"%s [id=%d,status=%d,type=%d,"
+					"number=%s,name=%s]",
+					print_buf,
+					call->id, call->status, call->type,
+					call->phone_number.number, call->name);
+
+		l = g_slist_insert_sorted(l, call, g_ril_call_compare);
+	}
+
+no_calls:
+	g_ril_append_print_buf(gril, "%s}", print_buf);
+	g_ril_print_response(gril, message);
+
+	return l;
+}
+
+enum ofono_disconnect_reason g_ril_reply_parse_call_fail_cause(
+				GRil *gril, const struct ril_msg *message)
+{
+	enum ofono_disconnect_reason reason = OFONO_DISCONNECT_REASON_ERROR;
+	int last_cause = CALL_FAIL_ERROR_UNSPECIFIED;
+	struct parcel rilp;
+
+	g_ril_init_parcel(message, &rilp);
+
+	if (rilp.size < sizeof(int32_t))
+		ofono_error("%s: Parcel is too small", __func__);
+	else if (parcel_r_int32(&rilp) > 0)
+		last_cause = parcel_r_int32(&rilp);
+
+	if (last_cause == CALL_FAIL_NORMAL || last_cause == CALL_FAIL_BUSY)
+		reason = OFONO_DISCONNECT_REASON_REMOTE_HANGUP;
+
+	g_ril_append_print_buf(gril, "{%d}", last_cause);
+	g_ril_print_response(gril, message);
+
+	return reason;
+}
+
+int g_ril_reply_parse_get_mute(GRil *gril, const struct ril_msg *message)
+{
+	struct parcel rilp;
+	int muted;
+
+	g_ril_init_parcel(message, &rilp);
+
+	/* skip length of int[] */
+	parcel_r_int32(&rilp);
+	muted = parcel_r_int32(&rilp);
+
+	g_ril_append_print_buf(gril, "{%d}", muted);
+	g_ril_print_response(gril, message);
+
+	return muted;
+
+}
+
+char *g_ril_reply_parse_baseband_version(GRil *gril,
+						const struct ril_msg *message)
+{
+	struct parcel rilp;
+	char *version;
+
+	g_ril_init_parcel(message, &rilp);
+
+	version = parcel_r_string(&rilp);
+
+	g_ril_append_print_buf(gril, "{%s}", version);
+	g_ril_print_response(gril, message);
+
+	return version;
+}
+
+char *g_ril_reply_parse_get_imei(GRil *gril,
+					const struct ril_msg *message)
+{
+	struct parcel rilp;
+	char *imei;
+
+	g_ril_init_parcel(message, &rilp);
+
+	imei = parcel_r_string(&rilp);
+
+	g_ril_append_print_buf(gril, "{%s}", imei);
+	g_ril_print_response(gril, message);
+
+	return imei;
+}

=== modified file 'gril/grilreply.h'
--- gril/grilreply.h	2013-11-15 23:16:57 +0000
+++ gril/grilreply.h	2013-12-04 21:58:23 +0000
@@ -98,33 +98,51 @@
 void g_ril_reply_free_avail_ops(struct reply_avail_ops *reply);
 
 struct reply_avail_ops *g_ril_reply_parse_avail_ops(GRil *gril,
-							struct ril_msg *message);
-
+						const struct ril_msg *message);
 void g_ril_reply_free_operator(struct reply_operator *reply);
 
 struct reply_operator *g_ril_reply_parse_operator(GRil *gril,
-						struct ril_msg *message);
+						const struct ril_msg *message);
 
 void g_ril_reply_free_setup_data_call(struct reply_setup_data_call *reply);
 
 struct reply_setup_data_call *g_ril_reply_parse_data_call(GRil *gril,
-							struct ril_msg *message,
-							struct ofono_error *error);
+						const struct ril_msg *message,
+						struct ofono_error *error);
 
 void g_ril_reply_free_sim_io(struct reply_sim_io *reply);
 
 struct reply_sim_io *g_ril_reply_parse_sim_io(GRil *gril,
-						struct ril_msg *message);
+						const struct ril_msg *message);
 
-gchar *g_ril_reply_parse_imsi(GRil *gril, struct ril_msg *message);
+gchar *g_ril_reply_parse_imsi(GRil *gril, const struct ril_msg *message);
 
 struct reply_reg_state *g_ril_reply_parse_reg_state(GRil *gril,
-						struct ril_msg *message);
+						const struct ril_msg *message);
 
 void g_ril_reply_free_sim_status(struct reply_sim_status *status);
 
 struct reply_sim_status *g_ril_reply_parse_sim_status(GRil *gril,
-							struct ril_msg *message);
+						const struct ril_msg *message);
+
+struct ofono_phone_number *g_ril_reply_parse_get_smsc_address(
+						GRil *gril,
+						const struct ril_msg *message);
+
+int g_ril_reply_parse_sms_response(GRil *gril, const struct ril_msg *message);
+
+GSList *g_ril_reply_parse_get_calls(GRil *gril, const struct ril_msg *message);
+
+enum ofono_disconnect_reason g_ril_reply_parse_call_fail_cause(
+				GRil *gril, const struct ril_msg *message);
+
+int g_ril_reply_parse_get_mute(GRil *gril, const struct ril_msg *message);
+
+char *g_ril_reply_parse_baseband_version(GRil *gril,
+						const struct ril_msg *message);
+
+char *g_ril_reply_parse_get_imei(GRil *gril,
+					const struct ril_msg *message);
 
 #ifdef __cplusplus
 }

=== modified file 'gril/grilrequest.c'
--- gril/grilrequest.c	2013-11-15 23:16:57 +0000
+++ gril/grilrequest.c	2013-12-04 21:58:23 +0000
@@ -38,6 +38,7 @@
 #include "grilrequest.h"
 #include "simutil.h"
 #include "util.h"
+#include "common.h"
 
 /* DEACTIVATE_DATA_CALL request parameters */
 #define DEACTIVATE_DATA_CALL_NUM_PARAMS 2
@@ -568,3 +569,151 @@
 	g_ril_append_print_buf(gril, "(old=%s,new=%s,aid=%s)",
 				old_passwd, new_passwd, aid_str);
 }
+
+void g_ril_request_sms_cmgs(GRil *gril,
+				const struct req_sms_cmgs *req,
+				struct parcel *rilp)
+{
+	int smsc_len;
+	char *tpdu;
+
+	parcel_init(rilp);
+	parcel_w_int32(rilp, 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 = req->pdu_len - req->tpdu_len;
+	/* TODO: encode SMSC & write to parcel */
+	if (smsc_len > 1)
+		ofono_error("SMSC address specified (smsc_len %d); "
+				"NOT-IMPLEMENTED", smsc_len);
+
+	parcel_w_string(rilp, NULL); /* SMSC address; NULL == default */
+
+	/*
+	 * TPDU:
+	 *
+	 * 'pdu' is a raw hexadecimal string
+	 *  encode_hex() turns it into an ASCII/hex UTF8 buffer
+	 *  parcel_w_string() encodes utf8 -> utf16
+	 */
+	tpdu = encode_hex(req->pdu + smsc_len, req->tpdu_len, 0);
+	parcel_w_string(rilp, tpdu);
+
+	g_ril_append_print_buf(gril, "(%s)", tpdu);
+
+	g_free(tpdu);
+}
+
+void g_ril_request_sms_acknowledge(GRil *gril,
+					struct parcel *rilp)
+{
+	parcel_init(rilp);
+	parcel_w_int32(rilp, 2); /* Number of int32 values in array */
+	parcel_w_int32(rilp, 1); /* Successful receipt */
+	parcel_w_int32(rilp, 0); /* error code */
+
+	g_ril_append_print_buf(gril, "(1,0)");
+}
+
+void g_ril_request_set_smsc_address(GRil *gril,
+					const struct ofono_phone_number *sca,
+					struct parcel *rilp)
+{
+	char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 4];
+
+	if (sca->type == OFONO_NUMBER_TYPE_INTERNATIONAL)
+		snprintf(number, sizeof(number), "\"+%s\"", sca->number);
+	else
+		snprintf(number, sizeof(number), "\"%s\"", sca->number);
+
+	parcel_init(rilp);
+	parcel_w_string(rilp, number);
+
+	g_ril_append_print_buf(gril, "(%s)", number);
+}
+
+void g_ril_request_dial(GRil *gril,
+			const struct ofono_phone_number *ph,
+			enum ofono_clir_option clir,
+			struct parcel *rilp)
+{
+	parcel_init(rilp);
+
+	/* Number to dial */
+	parcel_w_string(rilp, phone_number_to_string(ph));
+	/* CLIR mode */
+	parcel_w_int32(rilp, clir);
+	/* USS, empty string */
+	/* TODO: Deal with USS properly */
+	parcel_w_int32(rilp, 0);
+	parcel_w_int32(rilp, 0);
+
+	g_ril_append_print_buf(gril, "(%s,%d,0,0)",
+				phone_number_to_string(ph),
+				clir);
+}
+
+void g_ril_request_hangup(GRil *gril,
+				unsigned call_id,
+				struct parcel *rilp)
+{
+	parcel_init(rilp);
+	parcel_w_int32(rilp, 1); /* Always 1 - AT+CHLD=1x */
+	parcel_w_int32(rilp, call_id);
+
+	g_ril_append_print_buf(gril, "(%u)", call_id);
+}
+
+void g_ril_request_dtmf(GRil *gril,
+			char dtmf_char,
+			struct parcel *rilp)
+{
+	char ril_dtmf[2];
+
+	parcel_init(rilp);
+	/* Ril wants just one character, but we need to send as string */
+	ril_dtmf[0] = dtmf_char;
+	ril_dtmf[1] = '\0';
+	parcel_w_string(rilp, ril_dtmf);
+
+	g_ril_append_print_buf(gril, "(%s)", ril_dtmf);
+}
+
+void g_ril_request_separate_conn(GRil *gril,
+					int call_id,
+					struct parcel *rilp)
+{
+	parcel_init(rilp);
+
+	/* Payload is an array that holds just one element */
+	parcel_w_int32(rilp, 1);
+	parcel_w_int32(rilp, call_id);
+
+	g_ril_append_print_buf(gril, "(%d)", call_id);
+}
+
+void g_ril_request_set_supp_svc_notif(GRil *gril,
+					struct parcel *rilp)
+{
+	parcel_init(rilp);
+	parcel_w_int32(rilp, 1); /* size of array */
+	parcel_w_int32(rilp, 1); /* notifications enabled */
+
+	g_ril_append_print_buf(gril, "(1)");
+}
+
+void g_ril_request_set_mute(GRil *gril, int muted, struct parcel *rilp)
+{
+	parcel_init(rilp);
+
+	parcel_w_int32(rilp, 1);
+	parcel_w_int32(rilp, muted);
+
+	g_ril_append_print_buf(gril, "(%d)", muted);
+}

=== modified file 'gril/grilrequest.h'
--- gril/grilrequest.h	2013-11-15 23:16:57 +0000
+++ gril/grilrequest.h	2013-12-04 21:58:23 +0000
@@ -86,6 +86,12 @@
 	const char *passwd;
 };
 
+struct req_sms_cmgs {
+	const unsigned char *pdu;
+	int pdu_len;
+	int tpdu_len;
+};
+
 gboolean g_ril_request_deactivate_data_call(GRil *gril,
 				const struct req_deactivate_data_call *req,
 				struct parcel *rilp,
@@ -141,6 +147,40 @@
 					const gchar *aid_str,
 					struct parcel *rilp);
 
+void g_ril_request_sms_cmgs(GRil *gril,
+				const struct req_sms_cmgs *req,
+				struct parcel *rilp);
+
+void g_ril_request_sms_acknowledge(GRil *gril, struct parcel *rilp);
+
+void g_ril_request_set_smsc_address(GRil *gril,
+					const struct ofono_phone_number *sca,
+					struct parcel *rilp);
+
+void g_ril_request_dial(GRil *gril,
+			const struct ofono_phone_number *ph,
+			enum ofono_clir_option clir,
+			struct parcel *rilp);
+
+void g_ril_request_hangup(GRil *gril,
+				unsigned call_id,
+				struct parcel *rilp);
+
+void g_ril_request_dtmf(GRil *gril,
+			char dtmf_char,
+			struct parcel *rilp);
+
+void g_ril_request_separate_conn(GRil *gril,
+					int call_id,
+					struct parcel *rilp);
+
+void g_ril_request_set_supp_svc_notif(GRil *gril,
+					struct parcel *rilp);
+
+void g_ril_request_set_mute(GRil *gril,
+				int muted,
+				struct parcel *rilp);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'gril/grilunsol.c'
--- gril/grilunsol.c	2013-11-15 23:16:57 +0000
+++ gril/grilunsol.c	2013-12-04 21:58:23 +0000
@@ -34,7 +34,9 @@
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/gprs-context.h>
+#include "util.h"
 
+#include "common.h"
 #include "grilunsol.h"
 
 /* Minimum size is two int32s version/number of calls */
@@ -44,7 +46,7 @@
  * Minimum NITZ is: 'yy/mm/dd,hh:mm:ss'
  * TZ '(+/-)tz,dt' are optional
  */
-#define MIN_NITZ_SIZE 17 
+#define MIN_NITZ_SIZE 17
 
 static gint data_call_compare(gconstpointer a, gconstpointer b)
 {
@@ -84,7 +86,7 @@
 }
 
 struct unsol_data_call_list *g_ril_unsol_parse_data_call_list(GRil *gril,
-					struct ril_msg *message,
+					const struct ril_msg *message,
 					struct ofono_error *error)
 {
 	struct data_call *call;
@@ -163,7 +165,7 @@
 	return reply;
 }
 
-char *g_ril_unsol_parse_nitz(GRil *gril, struct ril_msg *message)
+char *g_ril_unsol_parse_nitz(GRil *gril, const struct ril_msg *message)
 {
 	struct parcel rilp;
 	gchar *nitz = NULL;
@@ -187,3 +189,93 @@
 error:
 	return nitz;
 }
+
+void g_ril_unsol_free_sms_data(struct unsol_sms_data *unsol)
+{
+	if (unsol != NULL) {
+		g_free(unsol->data);
+		g_free(unsol);
+	}
+}
+
+struct unsol_sms_data *g_ril_unsol_parse_new_sms(GRil *gril,
+						const struct ril_msg *message)
+{
+	struct parcel rilp;
+	char *ril_pdu;
+	size_t ril_pdu_len;
+	struct unsol_sms_data *sms_data;
+
+	sms_data = g_new0(struct unsol_sms_data, 1);
+	if (sms_data == NULL) {
+		ofono_error("%s out of memory", __func__);
+		goto error;
+	}
+
+	g_ril_init_parcel(message, &rilp);
+
+	ril_pdu = parcel_r_string(&rilp);
+	if (ril_pdu == NULL) {
+		ofono_error("%s Unable to parse notification", __func__);
+		goto error;
+	}
+
+	ril_pdu_len = strlen(ril_pdu);
+
+	sms_data->data = decode_hex(ril_pdu, ril_pdu_len,
+					&sms_data->length, -1);
+	if (sms_data->data == NULL) {
+		ofono_error("%s Unable to decode notification", __func__);
+		goto error_dec;
+	}
+
+	g_ril_append_print_buf(gril, "{%s}", ril_pdu);
+	g_ril_print_unsol(gril, message);
+
+	g_free(ril_pdu);
+
+	return sms_data;
+
+error_dec:
+	g_free(ril_pdu);
+error:
+	g_ril_unsol_free_sms_data(sms_data);
+	return NULL;
+}
+
+void g_ril_unsol_free_supp_svc_notif(struct unsol_supp_svc_notif *unsol)
+{
+	g_free(unsol);
+}
+
+struct unsol_supp_svc_notif *g_ril_unsol_parse_supp_svc_notif(GRil *gril,
+						struct ril_msg *message)
+{
+	struct parcel rilp;
+	char *tmp_number;
+	int type;
+	struct unsol_supp_svc_notif *unsol =
+		g_new0(struct unsol_supp_svc_notif, 1);
+
+	g_ril_init_parcel(message, &rilp);
+
+	unsol->notif_type = parcel_r_int32(&rilp);
+	unsol->code = parcel_r_int32(&rilp);
+	unsol->index = parcel_r_int32(&rilp);
+	type = parcel_r_int32(&rilp);
+	tmp_number = parcel_r_string(&rilp);
+
+	if (tmp_number != NULL) {
+		strncpy(unsol->number.number, tmp_number,
+			OFONO_MAX_PHONE_NUMBER_LENGTH);
+		unsol->number.type = type;
+		g_free(tmp_number);
+	}
+
+	g_ril_append_print_buf(gril, "{%d,%d,%d,%d,%s}",
+				unsol->notif_type, unsol->code, unsol->index,
+				type, tmp_number);
+	g_ril_print_unsol(gril, message);
+
+	return unsol;
+}

=== modified file 'gril/grilunsol.h'
--- gril/grilunsol.h	2013-11-15 23:16:57 +0000
+++ gril/grilunsol.h	2013-12-04 21:58:23 +0000
@@ -49,14 +49,35 @@
     char *gateways;
 };
 
+struct unsol_sms_data {
+	long length;
+	unsigned char *data;
+};
+
+struct unsol_supp_svc_notif {
+	int notif_type;
+	int code;
+	int index;
+	struct ofono_phone_number number;
+};
+
 void g_ril_unsol_free_data_call_list(struct unsol_data_call_list *unsol);
 
 struct unsol_data_call_list *g_ril_unsol_parse_data_call_list(GRil *gril,
-					struct ril_msg *message,
+					const struct ril_msg *message,
 					struct ofono_error *error);
 
-char *g_ril_unsol_parse_nitz(GRil *gril, struct ril_msg *message);
-
+char *g_ril_unsol_parse_nitz(GRil *gril, const struct ril_msg *message);
+
+void g_ril_unsol_free_sms_data(struct unsol_sms_data *unsol);
+
+struct unsol_sms_data *g_ril_unsol_parse_new_sms(GRil *gril,
+						const struct ril_msg *message);
+
+void g_ril_unsol_free_supp_svc_notif(struct unsol_supp_svc_notif *unsol);
+
+struct unsol_supp_svc_notif *g_ril_unsol_parse_supp_svc_notif(GRil *gril,
+						struct ril_msg *message);
 
 #ifdef __cplusplus
 }

=== modified file 'gril/grilutil.c'
--- gril/grilutil.c	2013-09-09 19:21:32 +0000
+++ gril/grilutil.c	2013-12-04 21:58:23 +0000
@@ -413,6 +413,7 @@
         case RIL_UNSOL_ON_USSD_REQUEST: return "UNSOL_ON_USSD_REQUEST(obsolete)";
         case RIL_UNSOL_NITZ_TIME_RECEIVED: return "UNSOL_NITZ_TIME_RECEIVED";
         case RIL_UNSOL_SIGNAL_STRENGTH: return "UNSOL_SIGNAL_STRENGTH";
+        case RIL_UNSOL_SUPP_SVC_NOTIFICATION: return "UNSOL_SUPP_SVC_NOTIFICATION";
         case RIL_UNSOL_STK_SESSION_END: return "UNSOL_STK_SESSION_END";
         case RIL_UNSOL_STK_PROACTIVE_COMMAND: return "UNSOL_STK_PROACTIVE_COMMAND";
         case RIL_UNSOL_STK_EVENT_NOTIFY: return "UNSOL_STK_EVENT_NOTIFY";

=== modified file 'gril/parcel.c'
--- gril/parcel.c	2013-11-05 16:26:21 +0000
+++ gril/parcel.c	2013-12-04 21:58:23 +0000
@@ -73,7 +73,7 @@
 int32_t parcel_r_int32(struct parcel *p)
 {
 	int32_t ret;
-	ret = *((int32_t *) (p->data + p->offset));
+	ret = *((int32_t *) (void *) (p->data + p->offset));
 	p->offset += sizeof(int32_t);
 	return ret;
 }
@@ -87,7 +87,7 @@
 
 		if (p->offset + sizeof(int32_t) < p->capacity) {
 			/* There's enough space */
-			*((int32_t *) (p->data + p->offset)) = val;
+			*((int32_t *) (void *) (p->data + p->offset)) = val;
 			p->offset += sizeof(int32_t);
 			p->size += sizeof(int32_t);
 			break;
@@ -127,7 +127,8 @@
 		if (p->offset + len < p->capacity) {
 			/* There's enough space */
 			memcpy(p->data + p->offset, gs16, gs16_size);
-			*((char16_t *) (p->data + p->offset + gs16_size)) = 0;
+			*((char16_t *) (void *)
+				(p->data + p->offset + gs16_size)) = 0;
 			p->offset += padded;
 			p->size += padded;
 			if (padded != len) {
@@ -148,7 +149,8 @@
 				DBG("Writing %d bytes, padded to %d\n",
 				    (int) len, (int) padded);
 
-				*((uint32_t*)(p->data + p->offset - 4)) &=
+				*((uint32_t*) (void *)
+					(p->data + p->offset - 4)) &=
 							mask[padded - len];
 			}
 			break;
@@ -172,7 +174,7 @@
 	if (len16 < 0)
 		return NULL;
 
-	ret = g_utf16_to_utf8((gunichar2 *) (p->data + p->offset),
+	ret = g_utf16_to_utf8((gunichar2 *) (void *) (p->data + p->offset),
 				len16, NULL, NULL, NULL);
 	if (ret == NULL)
 		return NULL;

=== modified file 'gril/ril_constants.h'
--- gril/ril_constants.h	2013-09-09 19:21:32 +0000
+++ gril/ril_constants.h	2013-12-04 21:58:23 +0000
@@ -76,6 +76,31 @@
 #define RADIO_TECH_HSPAP 15
 #define RADIO_TECH_GSM 16
 
+/* See RIL_REQUEST_LAST_CALL_FAIL_CAUSE */
+#define CALL_FAIL_UNOBTAINABLE_NUMBER 1
+#define CALL_FAIL_NORMAL 16
+#define CALL_FAIL_BUSY 17
+#define CALL_FAIL_CONGESTION 34
+#define CALL_FAIL_ACM_LIMIT_EXCEEDED 68
+#define CALL_FAIL_CALL_BARRED 240
+#define CALL_FAIL_FDN_BLOCKED 241
+#define CALL_FAIL_IMSI_UNKNOWN_IN_VLR 242
+#define CALL_FAIL_IMEI_NOT_ACCEPTED 243
+#define CALL_FAIL_DIAL_MODIFIED_TO_USSD 244
+#define CALL_FAIL_DIAL_MODIFIED_TO_SS 245
+#define CALL_FAIL_DIAL_MODIFIED_TO_DIAL 246
+#define CALL_FAIL_CDMA_LOCKED_UNTIL_POWER_CYCLE 1000
+#define CALL_FAIL_CDMA_DROP 1001
+#define CALL_FAIL_CDMA_INTERCEPT 1002
+#define CALL_FAIL_CDMA_REORDER 1003
+#define CALL_FAIL_CDMA_SO_REJECT 1004
+#define CALL_FAIL_CDMA_RETRY_ORDER 1005
+#define CALL_FAIL_CDMA_ACCESS_FAILURE 1006
+#define CALL_FAIL_CDMA_PREEMPTED 1007
+#define CALL_FAIL_CDMA_NOT_EMERGENCY 1008
+#define CALL_FAIL_CDMA_ACCESS_BLOCKED 1009
+#define CALL_FAIL_ERROR_UNSPECIFIED 0xffff
+
 /* see RIL_REQUEST_DEACTIVATE_DATA_CALL parameter*/
 #define RIL_DEACTIVATE_DATA_CALL_NO_REASON 0
 #define RIL_DEACTIVATE_DATA_CALL_RADIO_SHUTDOWN 1

=== modified file 'include/types.h'
--- include/types.h	2013-09-09 19:21:32 +0000
+++ include/types.h	2013-12-04 21:58:23 +0000
@@ -83,6 +83,12 @@
 #define OFONO_MAX_PHONE_NUMBER_LENGTH 80
 #define OFONO_MAX_CALLER_NAME_LENGTH 80
 
+/* Number types, 3GPP TS 24.008 subclause 10.5.4.7, octect 3 */
+/* Unknown, ISDN numbering plan */
+#define OFONO_NUMBER_TYPE_UNKNOWN 129
+/* International, ISDN numbering plan */
+#define OFONO_NUMBER_TYPE_INTERNATIONAL 145
+
 struct ofono_phone_number {
 	char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 1];
 	int type;

=== added file 'plugins/smshistory.c'
--- plugins/smshistory.c	1970-01-01 00:00:00 +0000
+++ plugins/smshistory.c	2013-12-04 21:58:23 +0000
@@ -0,0 +1,151 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2013  Jolla Ltd. All rights reserved.
+ *  Copyright (C) 2013 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 <string.h>
+#include <stdio.h>
+#include <glib.h>
+#include <gdbus.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/history.h>
+#include <ofono/types.h>
+
+#include "ofono.h"
+#include "common.h"
+
+static const char msg_prefix[] = "/message_";
+
+static int sms_history_probe(struct ofono_history_context *context)
+{
+	ofono_debug("SMS History Probe for modem: %p", context->modem);
+	return 0;
+}
+
+static void sms_history_remove(struct ofono_history_context *context)
+{
+	ofono_debug("SMS History Remove for modem: %p", context->modem);
+}
+
+static void sms_history_sms_send_status(
+					struct ofono_history_context *context,
+					const struct ofono_uuid *uuid,
+					time_t when,
+					enum ofono_history_sms_status s)
+{
+	if ((s == OFONO_HISTORY_SMS_STATUS_DELIVERED)
+			|| (s == OFONO_HISTORY_SMS_STATUS_DELIVER_FAILED)) {
+
+		DBusMessage *signal;
+		DBusMessageIter iter;
+		DBusMessageIter dict;
+		const char *uuid_str;
+		char *msg_uuid_str;
+		size_t msg_len;
+		struct ofono_atom *atom;
+		const char *path;
+		DBusConnection *conn;
+		int delivered;
+
+		atom = __ofono_modem_find_atom(context->modem,
+						OFONO_ATOM_TYPE_SMS);
+		if (atom == NULL)
+			return;
+
+		path = __ofono_atom_get_path(atom);
+		if (path == NULL)
+			return;
+
+		conn = ofono_dbus_get_connection();
+		if (conn == NULL)
+			return;
+
+		delivered = (s == OFONO_HISTORY_SMS_STATUS_DELIVERED);
+
+		uuid_str = ofono_uuid_to_str(uuid);
+		/* sizeof adds extra space for one '\0' */
+		msg_len = strlen(path) + sizeof(msg_prefix)
+				+ strlen(uuid_str);
+
+		msg_uuid_str = g_try_malloc(msg_len);
+		if (msg_uuid_str == NULL)
+			return;
+
+		/* modem path + msg_prefix + UUID as string */
+		snprintf(msg_uuid_str, msg_len, "%s%s%s", path,
+				msg_prefix, uuid_str);
+
+		DBG("SMS %s delivery success: %d", msg_uuid_str, delivered);
+
+		signal = dbus_message_new_signal(path,
+					OFONO_MESSAGE_MANAGER_INTERFACE,
+					"StatusReport");
+		if (signal != NULL) {
+			dbus_message_iter_init_append(signal, &iter);
+			dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING,
+							&msg_uuid_str);
+
+			dbus_message_iter_open_container(
+					&iter,
+					DBUS_TYPE_ARRAY,
+					OFONO_PROPERTIES_ARRAY_SIGNATURE,
+					&dict);
+			ofono_dbus_dict_append(&dict, "Delivered",
+						DBUS_TYPE_BOOLEAN,
+						&delivered);
+			dbus_message_iter_close_container(&iter, &dict);
+
+			g_dbus_send_message(conn, signal);
+		}
+
+		g_free(msg_uuid_str);
+	}
+}
+
+static struct ofono_history_driver smshistory_driver = {
+	.name = "SMS History",
+	.probe = sms_history_probe,
+	.remove = sms_history_remove,
+	.sms_send_status = sms_history_sms_send_status,
+};
+
+static int sms_history_init(void)
+{
+	DBG("");
+	return ofono_history_driver_register(&smshistory_driver);
+}
+
+static void sms_history_exit(void)
+{
+	DBG("");
+	ofono_history_driver_unregister(&smshistory_driver);
+}
+
+OFONO_PLUGIN_DEFINE(smshistory, "SMS History Plugin",
+			VERSION, OFONO_PLUGIN_PRIORITY_DEFAULT,
+			sms_history_init, sms_history_exit)

=== modified file 'src/stk.c'
--- src/stk.c	2012-11-28 16:31:15 +0000
+++ src/stk.c	2013-12-04 21:58:23 +0000
@@ -280,7 +280,7 @@
 
 	e.type = STK_ENVELOPE_TYPE_CBS_PP_DOWNLOAD;
 	e.src = STK_DEVICE_IDENTITY_TYPE_NETWORK;
-	memcpy(&e.cbs_pp_download.page, msg, sizeof(msg));
+	memcpy(&e.cbs_pp_download.page, msg, sizeof(*msg));
 
 	err = stk_send_envelope(stk, &e, stk_cbs_download_cb,
 				ENVELOPE_RETRIES_DEFAULT);

=== modified file 'src/storage.h'
--- src/storage.h	2013-10-02 15:37:04 +0000
+++ src/storage.h	2013-12-04 21:58:23 +0000
@@ -25,7 +25,7 @@
 #define TFR
 #endif
 
-#include <sys/types.h>
+#include <stdlib.h>
 #include <fcntl.h>
 
 int create_dirs(const char *filename, const mode_t mode);

=== modified file 'test/monitor-ofono'
--- test/monitor-ofono	2013-10-02 15:37:04 +0000
+++ test/monitor-ofono	2013-12-04 21:58:23 +0000
@@ -138,7 +138,7 @@
 					interface_keyword="interface")
 
 	for member in ["IncomingBroadcast", "EmergencyBroadcast",
-			"IncomingMessage", "ImmediateMessage"]:
+			"IncomingMessage", "ImmediateMessage", "StatusReport"]:
 		bus.add_signal_receiver(message,
 					bus_name="org.ofono",
 					signal_name = member,

=== modified file 'unit/test-caif.c'
--- unit/test-caif.c	2011-10-10 20:40:17 +0000
+++ unit/test-caif.c	2013-12-04 21:58:23 +0000
@@ -140,10 +140,8 @@
 
 static void test_basic(void)
 {
-	if (g_test_trap_fork(60 * 1000 * 1000, 0) == TRUE) {
-		test_connect(TRUE);
-		exit(0);
-	}
+	g_test_trap_subprocess("/testcaif/basic:subprocess",
+				60 * 1000 * 1000, 0);
 
 	g_test_trap_assert_passed();
 	//g_test_trap_assert_stderr("failed");
@@ -151,21 +149,33 @@
 
 static void test_chnlat(void)
 {
-	if (g_test_trap_fork(60 * 1000 * 1000, 0) == TRUE) {
-		test_connect(FALSE);
-		exit(0);
-	}
+	g_test_trap_subprocess("/testcaif/chnlat:subprocess",
+				60 * 1000 * 1000, 0);
 
 	g_test_trap_assert_passed();
 	//g_test_trap_assert_stderr("failed");
 }
 
+static void test_connect_sock(void)
+{
+	test_connect(TRUE);
+}
+
+static void test_connect_no_sock(void)
+{
+	test_connect(FALSE);
+}
+
 int main(int argc, char **argv)
 {
 	g_test_init(&argc, &argv, NULL);
 
 	g_test_add_func("/testcaif/basic", test_basic);
 	g_test_add_func("/testcaif/chnlat", test_chnlat);
+	g_test_add_func("/testcaif/basic:subprocess",
+			test_connect_sock);
+	g_test_add_func("/testcaif/chnlat:subprocess",
+			test_connect_no_sock);
 
 	return g_test_run();
 }

=== modified file 'unit/test-grilreply.c'
--- unit/test-grilreply.c	2013-11-05 16:28:08 +0000
+++ unit/test-grilreply.c	2013-12-04 21:58:23 +0000
@@ -33,6 +33,7 @@
 #include <ofono/gprs-context.h>
 #include <ofono/types.h>
 
+#include "common.h"
 #include "grilreply.h"
 
 /*
@@ -41,6 +42,13 @@
  * once more tests are added.
  */
 
+typedef struct reg_state_test reg_state_test;
+struct reg_state_test {
+	int status;
+	int tech;
+	const struct ril_msg msg;
+};
+
 static const struct ril_msg reply_data_call_invalid_1 = {
 	.buf = "",
 	.buf_len = 0,
@@ -55,8 +63,8 @@
  */
 static const guchar reply_data_call_invalid_parcel2[] = {
 	0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
 static const struct ril_msg reply_data_call_invalid_2 = {
@@ -75,20 +83,20 @@
  */
 static const guchar reply_data_call_invalid_parcel3[] = {
 	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
 	0xff, 0xff, 0xff, 0xff,
 	0x0a, 0x00, 0x00, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x65, 0x00,
 	0x74, 0x00, 0x5f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x62, 0x00, 0x30, 0x00,
-	0x00, 0x00, 0x00, 0x00,	0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
-	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00,	0x2e, 0x00, 0x32, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00,
 	0x33, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x34, 0x00,
 	0x2f, 0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00,
-	0x31, 0x00, 0x37, 0x00,	0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
-	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x31, 0x00, 0x37, 0x00, 0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00,
 	0x30, 0x00, 0x33, 0x00, 0x20, 0x00, 0x31, 0x00, 0x37, 0x00, 0x32, 0x00,
 	0x2e, 0x00, 0x31, 0x00, 0x36, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00,
-	0x35, 0x00, 0x2e, 0x00,	0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
-	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x31, 0x00,
 	0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00, 0x33, 0x00, 0x35, 0x00,
 	0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00
 };
@@ -109,18 +117,18 @@
  */
 static const guchar reply_data_call_invalid_parcel4[] = {
 	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xff, 0xff,	0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
-	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00,	0x2e, 0x00, 0x32, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00,
 	0x33, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x34, 0x00,
 	0x2f, 0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00,
-	0x31, 0x00, 0x37, 0x00,	0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
-	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x31, 0x00, 0x37, 0x00, 0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00,
 	0x30, 0x00, 0x33, 0x00, 0x20, 0x00, 0x31, 0x00, 0x37, 0x00, 0x32, 0x00,
 	0x2e, 0x00, 0x31, 0x00, 0x36, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00,
-	0x35, 0x00, 0x2e, 0x00,	0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
-	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x31, 0x00,
 	0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00, 0x33, 0x00, 0x35, 0x00,
 	0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00
 };
@@ -141,17 +149,17 @@
  */
 static const guchar reply_data_call_invalid_parcel5[] = {
 	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x0a, 0x00, 0x00, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x65, 0x00,
 	0x74, 0x00, 0x5f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x62, 0x00, 0x30, 0x00,
-	0x00, 0x00, 0x00, 0x00,	0xff, 0xff, 0xff, 0xff, 0x1d, 0x00, 0x00, 0x00,
-	0x31, 0x00, 0x37, 0x00,	0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
-	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x1d, 0x00, 0x00, 0x00,
+	0x31, 0x00, 0x37, 0x00, 0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00,
 	0x30, 0x00, 0x33, 0x00, 0x20, 0x00, 0x31, 0x00, 0x37, 0x00, 0x32, 0x00,
 	0x2e, 0x00, 0x31, 0x00, 0x36, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00,
-	0x35, 0x00, 0x2e, 0x00,	0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
-	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x31, 0x00,
 	0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00, 0x33, 0x00, 0x35, 0x00,
 	0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00
 };
@@ -172,19 +180,19 @@
  */
 static const guchar reply_data_call_invalid_parcel6[] = {
 	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x0a, 0x00, 0x00, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x65, 0x00,
 	0x74, 0x00, 0x5f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x62, 0x00, 0x30, 0x00,
-	0x00, 0x00, 0x00, 0x00,	0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
-	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00,	0x2e, 0x00, 0x32, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00,
 	0x33, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x34, 0x00,
 	0x2f, 0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00,
-	0x31, 0x00, 0x37, 0x00,	0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
-	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x31, 0x00, 0x37, 0x00, 0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00,
 	0x30, 0x00, 0x33, 0x00, 0x20, 0x00, 0x31, 0x00, 0x37, 0x00, 0x32, 0x00,
 	0x2e, 0x00, 0x31, 0x00, 0x36, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00,
-	0x35, 0x00, 0x2e, 0x00,	0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
 	0xff, 0xff, 0xff, 0xff
 };
 
@@ -204,15 +212,15 @@
  */
 static const guchar reply_data_call_invalid_parcel7[] = {
 	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x0a, 0x00, 0x00, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x65, 0x00,
 	0x74, 0x00, 0x5f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x62, 0x00, 0x30, 0x00,
-	0x00, 0x00, 0x00, 0x00,	0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
-	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00,	0x2e, 0x00, 0x32, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00,
 	0x33, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x34, 0x00,
 	0x2f, 0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x31, 0x00,
 	0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00, 0x33, 0x00, 0x35, 0x00,
 	0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00
 };
@@ -233,20 +241,20 @@
  */
 static const guchar reply_data_call_valid_parcel1[] = {
 	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x0a, 0x00, 0x00, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x65, 0x00,
 	0x74, 0x00, 0x5f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x62, 0x00, 0x30, 0x00,
-	0x00, 0x00, 0x00, 0x00,	0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
-	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00,	0x2e, 0x00, 0x32, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00,
 	0x33, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x34, 0x00,
 	0x2f, 0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00,
-	0x31, 0x00, 0x37, 0x00,	0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
-	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x31, 0x00, 0x37, 0x00, 0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00,
 	0x30, 0x00, 0x33, 0x00, 0x20, 0x00, 0x31, 0x00, 0x37, 0x00, 0x32, 0x00,
 	0x2e, 0x00, 0x31, 0x00, 0x36, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00,
-	0x35, 0x00, 0x2e, 0x00,	0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
-	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x31, 0x00,
 	0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00, 0x33, 0x00, 0x35, 0x00,
 	0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00
 };
@@ -260,6 +268,831 @@
 	.error = 0,
 };
 
+/* Invalid RIL_REQUEST_DATA_REGISTRATION_STATE: buffer too small */
+static const struct ril_msg reply_data_reg_state_invalid_1 = {
+	.buf = "XYZ",
+	.buf_len = 3,
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hex data represents a RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with an invalid number of parameters ( 0 ).
+ */
+static const guchar reply_data_reg_state_invalid_parcel2[] = {
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_data_reg_state_invalid_2 = {
+	.buf = (gchar *) &reply_data_reg_state_invalid_parcel2,
+	.buf_len = sizeof(reply_data_reg_state_invalid_parcel2),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hex data represents a RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with a null status parameter:
+ *
+ * {(null),1b3f,07eaf3dc,hspa,(null),20}
+ */
+static const guchar reply_data_reg_state_invalid_parcel3[] = {
+	0x06, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00,
+	0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00, 0x65, 0x00, 0x61, 0x00,
+	0x66, 0x00, 0x33, 0x00, 0x64, 0x00, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x32, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_data_reg_state_invalid_3 = {
+	.buf = (gchar *) &reply_data_reg_state_invalid_parcel3,
+	.buf_len = sizeof(reply_data_reg_state_invalid_parcel3),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hex data represents a valid RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with the following parameters:
+ *
+ * RADIO_TECH_UNKNOWN (0) -> none
+ *
+ * {registered,1b3f,07eaf3dc,none,(null),20}
+ */
+static const guchar reply_data_reg_state_valid_parcel1[] = {
+	0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x66, 0x00, 0x33, 0x00, 0x64, 0x00, 0x63, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x32, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test data_reg_valid_1 = {
+	.status = NETWORK_REGISTRATION_STATUS_REGISTERED,
+	.tech = PACKET_BEARER_NONE,
+	.msg = {
+		.buf = (gchar *) &reply_data_reg_state_valid_parcel1,
+		.buf_len = sizeof(reply_data_reg_state_valid_parcel1),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with the following parameters:
+ *
+ * RADIO_TECH_GSM (16) -> none
+ *
+ * {registered,1b3f,07eaf3dc,none,(null),20}
+ */
+static const guchar reply_data_reg_state_valid_parcel2[] = {
+	0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x66, 0x00, 0x33, 0x00, 0x64, 0x00, 0x63, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00,
+	0x32, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test data_reg_valid_2 = {
+	.status = NETWORK_REGISTRATION_STATUS_REGISTERED,
+	.tech = PACKET_BEARER_NONE,
+	.msg = {
+		.buf = (gchar *) &reply_data_reg_state_valid_parcel2,
+		.buf_len = sizeof(reply_data_reg_state_valid_parcel2),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with the following parameters:
+ *
+ * RADIO_TECH_GPRS (1) -> gprs
+ *
+ * {registered,1b3f,07eaf3dc,gprs,(null),20}
+ */
+static const guchar reply_data_reg_state_valid_parcel3[] = {
+	0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x66, 0x00, 0x33, 0x00, 0x64, 0x00, 0x63, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x32, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test data_reg_valid_3 = {
+	.status = NETWORK_REGISTRATION_STATUS_REGISTERED,
+	.tech = PACKET_BEARER_GPRS,
+	.msg = {
+		.buf = (gchar *) &reply_data_reg_state_valid_parcel3,
+		.buf_len = sizeof(reply_data_reg_state_valid_parcel3),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with the following parameters:
+ *
+ * RADIO_TECH_EDGE (2) -> edge
+ *
+ * {registered,1b3f,07eaf3dc,edge,(null),20}
+ */
+static const guchar reply_data_reg_state_valid_parcel4[] = {
+	0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x66, 0x00, 0x33, 0x00, 0x64, 0x00, 0x63, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x32, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test data_reg_valid_4 = {
+	.status = NETWORK_REGISTRATION_STATUS_REGISTERED,
+	.tech = PACKET_BEARER_EGPRS,
+	.msg = {
+		.buf = (gchar *) &reply_data_reg_state_valid_parcel4,
+		.buf_len = sizeof(reply_data_reg_state_valid_parcel4),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with the following parameters:
+ *
+ * RADIO_TECH_UMTS (3) -> umts
+ *
+ * {registered,1b3f,07eaf3dc,umts,(null),20}
+ */
+static const guchar reply_data_reg_state_valid_parcel5[] = {
+	0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x66, 0x00, 0x33, 0x00, 0x64, 0x00, 0x63, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x32, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test data_reg_valid_5 = {
+	.status = NETWORK_REGISTRATION_STATUS_REGISTERED,
+	.tech = PACKET_BEARER_UMTS,
+	.msg = {
+		.buf = (gchar *) &reply_data_reg_state_valid_parcel5,
+		.buf_len = sizeof(reply_data_reg_state_valid_parcel5),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with the following parameters:
+ *
+ * RADIO_TECH_HSDPA (9) -> hsdpa
+ *
+ * {registered,1b3f,07eaf3dc,hsdpa,(null),20}
+ */
+static const guchar reply_data_reg_state_valid_parcel6[] = {
+	0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x66, 0x00, 0x33, 0x00, 0x64, 0x00, 0x63, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x32, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test data_reg_valid_6 = {
+	.status = NETWORK_REGISTRATION_STATUS_REGISTERED,
+	.tech = PACKET_BEARER_HSDPA,
+	.msg = {
+		.buf = (gchar *) &reply_data_reg_state_valid_parcel6,
+		.buf_len = sizeof(reply_data_reg_state_valid_parcel6),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with the following parameters:
+ *
+ * RADIO_TECH_HSUPA (10) -> hsupa
+ *
+ * {registered,1b3f,07eaf3dc,hsupa,(null),20}
+ */
+static const guchar reply_data_reg_state_valid_parcel7[] = {
+	0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x66, 0x00, 0x33, 0x00, 0x64, 0x00, 0x63, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00,
+	0x32, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test data_reg_valid_7 = {
+	.status = NETWORK_REGISTRATION_STATUS_REGISTERED,
+	.tech = PACKET_BEARER_HSUPA,
+	.msg = {
+		.buf = (gchar *) &reply_data_reg_state_valid_parcel7,
+		.buf_len = sizeof(reply_data_reg_state_valid_parcel7),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with the following parameters:
+ *
+ * RADIO_TECH_HSPA (11) -> hspa
+ *
+ * {registered,1b3f,07eaf3dc,hspa,(null),20}
+ */
+static const guchar reply_data_reg_state_valid_parcel8[] = {
+	0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x66, 0x00, 0x33, 0x00, 0x64, 0x00, 0x63, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x31, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00,
+	0x32, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+
+static const reg_state_test data_reg_valid_8 = {
+	.status = NETWORK_REGISTRATION_STATUS_REGISTERED,
+	.tech = PACKET_BEARER_HSUPA_HSDPA,
+	.msg = {
+		.buf = (gchar *) &reply_data_reg_state_valid_parcel8,
+		.buf_len = sizeof(reply_data_reg_state_valid_parcel8),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with the following parameters:
+ *
+ * RADIO_TECH_LTE (14) -> lte
+ *
+ * {registered,1b3f,07eaf3dc,lte,(null),20}
+ */
+static const guchar reply_data_reg_state_valid_parcel9[] = {
+	0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x66, 0x00, 0x33, 0x00, 0x64, 0x00, 0x63, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x34, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00,
+	0x32, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+
+static const reg_state_test data_reg_valid_9 = {
+	.status = NETWORK_REGISTRATION_STATUS_REGISTERED,
+	.tech = PACKET_BEARER_EPS,
+	.msg = {
+		.buf = (gchar *) &reply_data_reg_state_valid_parcel9,
+		.buf_len = sizeof(reply_data_reg_state_valid_parcel9),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid RIL_REQUEST_DATA_REGISTRATION_STATE
+ * reply with the following parameters:
+ *
+ * RADIO_TECH_HSPAP (15) -> hspa
+ *
+ * Note, as ofono currently doesn't define a bearer enum that represents HSPA+,
+ * it's currently mapped to HSPA.
+ *
+ * {registered,1b3f,07eaf3dc,hspa,(null),20}
+ */
+static const guchar reply_data_reg_state_valid_parcel10[] = {
+	0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x66, 0x00, 0x33, 0x00, 0x64, 0x00, 0x63, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x35, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00,
+	0x32, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+
+static const reg_state_test data_reg_valid_10 = {
+	.status = NETWORK_REGISTRATION_STATUS_REGISTERED,
+	.tech = PACKET_BEARER_HSUPA_HSDPA,
+	.msg = {
+		.buf = (gchar *) &reply_data_reg_state_valid_parcel10,
+		.buf_len = sizeof(reply_data_reg_state_valid_parcel10),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_DATA_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * TODO: investigate creation of a base reply, which could
+ * then be modified for each test, as opposed to duplicating
+ * the bulk of the data for each test.
+ */
+
+/*
+ * The following hex data represents a valid
+ * RIL_REQUEST_VOICE_REGISTRATION_STATE reply with the following parameters:
+ *
+ * RADIO_TECH_UMTS (3) -> umts
+ *
+ * {registered,1b3f,07eaf3dc,umts,(null),(null)}
+ */
+static const guchar reply_voice_reg_state_valid_parcel1[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x35, 0x00, 0x31, 0x00, 0x37, 0x00, 0x61, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+	0x03, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00, 0x35, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test voice_reg_valid_1 = {
+	.status = NETWORK_REGISTRATION_STATUS_REGISTERED,
+	.tech = ACCESS_TECHNOLOGY_UTRAN,
+	.msg = {
+		.buf = (gchar *) &reply_voice_reg_state_valid_parcel1,
+		.buf_len = sizeof(reply_voice_reg_state_valid_parcel1),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid
+ * RIL_REQUEST_VOICE_REGISTRATION_STATE reply with the following parameters:
+ *
+ *
+ * RADIO_TECH_GPRS (1) -> gsm
+ *
+ * {unregistered,1b3f,07eaf3dc,gsm,(null),(null)}
+ */
+static const guchar reply_voice_reg_state_valid_parcel2[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x35, 0x00, 0x31, 0x00, 0x37, 0x00, 0x61, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+	0x03, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00, 0x35, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test voice_reg_valid_2 = {
+	.status = (int) NETWORK_REGISTRATION_STATUS_NOT_REGISTERED,
+	.tech = ACCESS_TECHNOLOGY_GSM,
+	.msg = {
+		.buf = (gchar *) &reply_voice_reg_state_valid_parcel2,
+		.buf_len = sizeof(reply_voice_reg_state_valid_parcel2),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid
+ * RIL_REQUEST_VOICE_REGISTRATION_STATE reply with the following parameters:
+ *
+ * RADIO_TECH_GSM (16) -> gsm
+ *
+ * {searching,1b3f,07eaf3dc,gsm,(null),(null)}
+ */
+static const guchar reply_voice_reg_state_valid_parcel3[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x35, 0x00, 0x31, 0x00, 0x30, 0x00, 0x61, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
+	0x30, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
+	0x35, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test voice_reg_valid_3 = {
+	.status = NETWORK_REGISTRATION_STATUS_SEARCHING,
+	.tech = ACCESS_TECHNOLOGY_GSM,
+	.msg = {
+		.buf = (gchar *) &reply_voice_reg_state_valid_parcel3,
+		.buf_len = sizeof(reply_voice_reg_state_valid_parcel3),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid
+ * RIL_REQUEST_VOICE_REGISTRATION_STATE reply with the following parameters:
+ *
+ * RADIO_TECH_EDGE (2) -> edge
+ *
+ * {denied,1b3f,07eaf3dc,edge,(null),(null)}
+ */
+static const guchar reply_voice_reg_state_valid_parcel4[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x35, 0x00, 0x31, 0x00, 0x30, 0x00, 0x61, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+	0x03, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00, 0x35, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test voice_reg_valid_4 = {
+	.status = NETWORK_REGISTRATION_STATUS_DENIED,
+	.tech = ACCESS_TECHNOLOGY_GSM_EGPRS,
+	.msg = {
+		.buf = (gchar *) &reply_voice_reg_state_valid_parcel4,
+		.buf_len = sizeof(reply_voice_reg_state_valid_parcel4),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid
+ * RIL_REQUEST_VOICE_REGISTRATION_STATE reply with the following parameters:
+ *
+ * {unknown,1b3f,07eaf3dc,"",(null),(null)}
+ */
+static const guchar reply_voice_reg_state_valid_parcel5[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x35, 0x00, 0x31, 0x00, 0x30, 0x00, 0x61, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+	0x03, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00, 0x35, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test voice_reg_valid_5 = {
+	.status = NETWORK_REGISTRATION_STATUS_UNKNOWN,
+	.tech = -1,
+	.msg = {
+		.buf = (gchar *) &reply_voice_reg_state_valid_parcel5,
+		.buf_len = sizeof(reply_voice_reg_state_valid_parcel5),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid
+ * RIL_REQUEST_VOICE_REGISTRATION_STATE reply with the following parameters:
+ *
+ * RADIO_TECH_LTE (14) -> lte
+ *
+ * {roaming,1b3f,07eaf3dc,lte,(null),(null)}
+ */
+static const guchar reply_voice_reg_state_valid_parcel6[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x35, 0x00, 0x31, 0x00, 0x30, 0x00, 0x61, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x34, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
+	0x30, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
+	0x35, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test voice_reg_valid_6 = {
+	.status = NETWORK_REGISTRATION_STATUS_ROAMING,
+	.tech = ACCESS_TECHNOLOGY_EUTRAN,
+	.msg = {
+		.buf = (gchar *) &reply_voice_reg_state_valid_parcel6,
+		.buf_len = sizeof(reply_voice_reg_state_valid_parcel6),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid
+ * RIL_REQUEST_VOICE_REGISTRATION_STATE reply with the following parameters:
+ *
+ * RADIO_TECH_HSDPA (9) -> hsdpa
+ *
+ * {roaming,1b3f,07eaf3dc,hsdpa,(null),(null)}
+ */
+static const guchar reply_voice_reg_state_valid_parcel7[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x35, 0x00, 0x31, 0x00, 0x30, 0x00, 0x61, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+	0x03, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00, 0x35, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test voice_reg_valid_7 = {
+	.status = NETWORK_REGISTRATION_STATUS_ROAMING,
+	.tech = ACCESS_TECHNOLOGY_UTRAN_HSDPA,
+	.msg = {
+		.buf = (gchar *) &reply_voice_reg_state_valid_parcel7,
+		.buf_len = sizeof(reply_voice_reg_state_valid_parcel7),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid
+ * RIL_REQUEST_VOICE_REGISTRATION_STATE reply with the following parameters:
+ *
+ * RADIO_TECH_HSUPA (10) -> hsupa
+ *
+ * {roaming,1b3f,07eaf3dc,hsupa,(null),(null)}
+ */
+static const guchar reply_voice_reg_state_valid_parcel8[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x35, 0x00, 0x31, 0x00, 0x30, 0x00, 0x61, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
+	0x30, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
+	0x35, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test voice_reg_valid_8 = {
+	.status = NETWORK_REGISTRATION_STATUS_ROAMING,
+	.tech = ACCESS_TECHNOLOGY_UTRAN_HSUPA,
+	.msg = {
+		.buf = (gchar *) &reply_voice_reg_state_valid_parcel8,
+		.buf_len = sizeof(reply_voice_reg_state_valid_parcel8),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid
+ * RIL_REQUEST_VOICE_REGISTRATION_STATE reply with the following parameters:
+ *
+ * RADIO_TECH_HSPA (11) -> hspa
+ *
+ * {roaming,1b3f,07eaf3dc,hspa,(null),(null)}
+ */
+static const guchar reply_voice_reg_state_valid_parcel9[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x35, 0x00, 0x31, 0x00, 0x30, 0x00, 0x61, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x31, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
+	0x30, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
+	0x35, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test voice_reg_valid_9 = {
+	.status = NETWORK_REGISTRATION_STATUS_ROAMING,
+	.tech = ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA,
+	.msg = {
+		.buf = (gchar *) &reply_voice_reg_state_valid_parcel9,
+		.buf_len = sizeof(reply_voice_reg_state_valid_parcel9),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hex data represents a valid
+ * RIL_REQUEST_VOICE_REGISTRATION_STATE reply with the following parameters:
+ *
+ * RADIO_TECH_HSPAP (15) --> hspa
+ *
+ * Note, as ofono currently doesn't define an access tech enum that represents
+ * HSPA+, it's currently mapped to HSPA.
+ *
+ * {roaming,1b3f,07eaf3dc,hspa,(null),(null)}
+ */
+static const guchar reply_voice_reg_state_valid_parcel10[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x62, 0x00, 0x33, 0x00, 0x66, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x65, 0x00, 0x61, 0x00, 0x35, 0x00, 0x31, 0x00, 0x30, 0x00, 0x61, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x31, 0x00, 0x35, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
+	0x30, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
+	0x35, 0x00, 0x00, 0x00
+};
+
+static const reg_state_test voice_reg_valid_10 = {
+	.status = NETWORK_REGISTRATION_STATUS_ROAMING,
+	.tech = ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA,
+	.msg = {
+		.buf = (gchar *) &reply_voice_reg_state_valid_parcel10,
+		.buf_len = sizeof(reply_voice_reg_state_valid_parcel10),
+		.unsolicited = FALSE,
+		.req = RIL_REQUEST_VOICE_REGISTRATION_STATE,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+static const struct ril_msg reply_operator_invalid_1 = {
+	.buf = "",
+	.buf_len = 0,
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_OPERATOR,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of an
+ * invalid RIL_REQUEST_OPERATOR with an invald number of parameters
+ *
+ * {lalpha=AT&T, salpha=}
+ */
+static const guchar reply_operator_invalid_parcel2[] = {
+	0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x41, 0x00, 0x54, 0x00,
+	0x26, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_operator_invalid_2 = {
+	.buf = (char *) &reply_operator_invalid_parcel2,
+	.buf_len = sizeof(reply_operator_invalid_parcel2),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_OPERATOR,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of a
+ * valid RIL_REQUEST_OPERATOR with the following parameters:
+ *
+ * {lalpha=AT&T, salpha=, numeric=310410}
+ */
+static const guchar reply_operator_valid_parcel1[] = {
+	0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x41, 0x00, 0x54, 0x00,
+	0x26, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x33, 0x00, 0x31, 0x00,
+	0x30, 0x00, 0x34, 0x00, 0x31, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_operator_valid_1 = {
+	.buf = (char *) &reply_operator_valid_parcel1,
+	.buf_len = sizeof(reply_operator_valid_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_OPERATOR,
+	.serial_no = 0,
+	.error = 0,
+};
+
+static const struct ril_msg reply_avail_ops_invalid_1 = {
+	.buf = "",
+	.buf_len = 0,
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_QUERY_AVAILABLE_NETWORKS,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of an
+ * invalid RIL_REQUEST_QUERY_AVAILABLE_NETWORKS with an invald
+ * number of strings ( not evenly divisible by 4, the count of
+ * strings per operator ).
+ */
+static const guchar reply_avail_ops_invalid_parcel2[] = {
+	0x0b, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_avail_ops_invalid_2 = {
+	.buf = (char *) &reply_avail_ops_invalid_parcel2,
+	.buf_len = sizeof(reply_avail_ops_invalid_parcel2),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_QUERY_AVAILABLE_NETWORKS,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of a
+ * valid RIL_REQUEST_AVAILABLE_NETWORKS with the following parameters:
+ *
+ * {lalpha=AT&T, salpha=, numeric=310410, status=available}
+ */
+static const guchar reply_avail_ops_valid_parcel1[] = {
+	0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x41, 0x00, 0x54, 0x00,
+	0x26, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x33, 0x00, 0x31, 0x00,
+	0x30, 0x00, 0x34, 0x00, 0x31, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x09, 0x00, 0x00, 0x00, 0x61, 0x00, 0x76, 0x00, 0x61, 0x00, 0x69, 0x00,
+	0x6c, 0x00, 0x61, 0x00, 0x62, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_avail_ops_valid_1 = {
+	.buf = (char *) &reply_avail_ops_valid_parcel1,
+	.buf_len = sizeof(reply_avail_ops_valid_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_QUERY_AVAILABLE_NETWORKS,
+	.serial_no = 0,
+	.error = 0,
+};
+
 /*
  * The following hexadecimal data contains the event data of a valid
  * RIL_REQUEST_SIM_IO reply with the following parameters:
@@ -332,14 +1165,191 @@
 	.error = 0,
 };
 
+/*
+ * The following hexadecimal data contains the event data of a valid
+ * RIL_REQUEST_GET_SMSC_ADDRESS reply with the following parameters:
+ *
+ * {type=145,number=34607003110}
+ */
+static const guchar reply_get_smsc_address_valid_parcel1[] = {
+	0x12, 0x00, 0x00, 0x00, 0x22, 0x00, 0x2b, 0x00, 0x33, 0x00, 0x34, 0x00,
+	0x36, 0x00, 0x30, 0x00, 0x37, 0x00, 0x30, 0x00, 0x30, 0x00, 0x33, 0x00,
+	0x31, 0x00, 0x31, 0x00, 0x30, 0x00, 0x22, 0x00, 0x2c, 0x00, 0x31, 0x00,
+	0x34, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_get_smsc_address_valid_1 = {
+	.buf = (gchar *) reply_get_smsc_address_valid_parcel1,
+	.buf_len = sizeof(reply_get_smsc_address_valid_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_GET_SMSC_ADDRESS,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of a valid
+ * RIL_REQUEST_GET_CURRENT_CALLS reply with the following parameters:
+ *
+ * {[id=2,status=0,type=1,number=686732222,name=]
+ *  [id=1,status=1,type=1,number=917525555,name=]}
+ */
+static const guchar reply_get_current_calls_valid_parcel1[] = {
+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x09, 0x00, 0x00, 0x00, 0x36, 0x00, 0x38, 0x00, 0x36, 0x00, 0x37, 0x00,
+	0x33, 0x00, 0x32, 0x00, 0x32, 0x00, 0x32, 0x00, 0x32, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+	0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x09, 0x00, 0x00, 0x00, 0x39, 0x00, 0x31, 0x00, 0x37, 0x00, 0x35, 0x00,
+	0x32, 0x00, 0x35, 0x00, 0x35, 0x00, 0x35, 0x00, 0x35, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_get_current_calls_valid_1 = {
+	.buf = (gchar *) reply_get_current_calls_valid_parcel1,
+	.buf_len = sizeof(reply_get_current_calls_valid_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_GET_CURRENT_CALLS,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/* RIL_REQUEST_GET_CURRENT_CALLS NULL reply */
+static const struct ril_msg reply_get_current_calls_invalid_1 = {
+	.buf = NULL,
+	.buf_len = 0,
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_GET_CURRENT_CALLS,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/* RIL_REQUEST_GET_CURRENT_CALLS no calls */
+static const guchar reply_get_current_calls_invalid_parcel2[] = {
+	0x00, 0x00, 0x00, 0x00,
+};
+
+static const struct ril_msg reply_get_current_calls_invalid_2 = {
+	.buf = (gchar *) reply_get_current_calls_invalid_parcel2,
+	.buf_len = sizeof(reply_get_current_calls_invalid_parcel2),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_GET_CURRENT_CALLS,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of a valid
+ * RIL_REQUEST_LAST_CALL_FAIL_CAUSE reply with the following parameters:
+ *
+ * {16}
+ */
+static const guchar reply_call_fail_cause_valid_parcel1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_call_fail_cause_valid_1 = {
+	.buf = (gchar *) reply_call_fail_cause_valid_parcel1,
+	.buf_len = sizeof(reply_call_fail_cause_valid_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_LAST_CALL_FAIL_CAUSE,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of a valid
+ * RIL_REQUEST_GET_MUTE reply with the following parameters:
+ *
+ * {muted=0}
+ */
+static const guchar reply_get_mute_off_parcel1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_get_mute_off_1 = {
+	.buf = (gchar *) reply_get_mute_off_parcel1,
+	.buf_len = sizeof(reply_get_mute_off_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_GET_MUTE,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of a valid
+ * RIL_REQUEST_GET_MUTE reply with the following parameters:
+ *
+ * {muted=1}
+ */
+static const guchar reply_get_mute_on_parcel1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_get_mute_on_1 = {
+	.buf = (gchar *) reply_get_mute_on_parcel1,
+	.buf_len = sizeof(reply_get_mute_on_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_GET_MUTE,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of a valid
+ * RIL_REQUEST_BASEBAND_VERSION reply with the following parameters:
+ *
+ * {M9615A-CEFWMAZM-2.0.1700.48}
+ */
+static const guchar reply_baseband_version_valid_parcel1[] = {
+	0x1b, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x39, 0x00, 0x36, 0x00, 0x31, 0x00,
+	0x35, 0x00, 0x41, 0x00, 0x2d, 0x00, 0x43, 0x00, 0x45, 0x00, 0x46, 0x00,
+	0x57, 0x00, 0x4d, 0x00, 0x41, 0x00, 0x5a, 0x00, 0x4d, 0x00, 0x2d, 0x00,
+	0x32, 0x00, 0x2e, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x37, 0x00,
+	0x30, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x34, 0x00, 0x38, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_baseband_version_valid_1 = {
+	.buf = (gchar *) reply_baseband_version_valid_parcel1,
+	.buf_len = sizeof(reply_baseband_version_valid_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_BASEBAND_VERSION,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of a valid
+ * RIL_REQUEST_GET_IMEI reply with the following parameters:
+ *
+ * {355136050779043}
+ */
+static const guchar reply_get_imei_valid_parcel1[] = {
+	0x0f, 0x00, 0x00, 0x00, 0x33, 0x00, 0x35, 0x00, 0x35, 0x00, 0x31, 0x00,
+	0x33, 0x00, 0x36, 0x00, 0x30, 0x00, 0x35, 0x00, 0x30, 0x00, 0x37, 0x00,
+	0x37, 0x00, 0x39, 0x00, 0x30, 0x00, 0x34, 0x00, 0x33, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_get_imei_valid_1 = {
+	.buf = (gchar *) reply_get_imei_valid_parcel1,
+	.buf_len = sizeof(reply_get_imei_valid_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_GET_IMEI,
+	.serial_no = 0,
+	.error = 0,
+};
+
 static void test_reply_data_call_invalid(gconstpointer data)
 {
-	/* TODO: fix de-const cast... */
-	struct ril_msg *message = (struct ril_msg *) data;
 	struct ofono_error error;
 	struct reply_setup_data_call *reply;
 
-	reply = g_ril_reply_parse_data_call(NULL, message, &error);
+	reply = g_ril_reply_parse_data_call(NULL, data, &error);
 	g_assert(reply != NULL);
 	g_ril_reply_free_setup_data_call(reply);
 
@@ -349,12 +1359,10 @@
 
 static void test_reply_data_call_valid(gconstpointer data)
 {
-	/* TODO: fix de-const cast... */
-	struct ril_msg *message = (struct ril_msg *) data;
 	struct ofono_error error;
-	struct reply_setup_data_call *reply;
+	struct reply_setup_data_call *reply =
+		g_ril_reply_parse_data_call(NULL, data, &error);
 
-	reply = g_ril_reply_parse_data_call(NULL, message, &error);
 	g_assert(reply != NULL);
 	g_ril_reply_free_setup_data_call(reply);
 
@@ -362,39 +1370,152 @@
 			error.error == 0);
 }
 
+static void test_reply_reg_state_invalid(gconstpointer data)
+{
+	struct reply_reg_state *reply =	g_ril_reply_parse_reg_state(NULL, data);
+	g_assert(reply == NULL);
+}
+
+static void test_reply_reg_state_valid(gconstpointer data)
+{
+	const reg_state_test *test = data;
+	struct reply_reg_state *reply =
+		g_ril_reply_parse_reg_state(NULL, &test->msg);
+
+	g_assert(reply != NULL);
+	g_assert(reply->status == test->status);
+
+	g_assert(reply->tech == test->tech);
+	g_free(reply);
+}
+
+static void test_reply_operator_invalid(gconstpointer data)
+{
+	struct reply_operator *reply = g_ril_reply_parse_operator(NULL, data);
+	g_assert(reply == NULL);
+}
+
+static void test_reply_operator_valid(gconstpointer data)
+{
+	struct reply_operator *reply = g_ril_reply_parse_operator(NULL, data);
+	g_assert(reply != NULL);
+}
+
+static void test_reply_avail_ops_invalid(gconstpointer data)
+{
+	struct reply_avail_ops *reply = g_ril_reply_parse_avail_ops(NULL, data);
+	g_assert(reply == NULL);
+}
+
+static void test_reply_avail_ops_valid(gconstpointer data)
+{
+	struct reply_avail_ops *reply = g_ril_reply_parse_avail_ops(NULL, data);
+	g_assert(reply != NULL);
+}
+
 static void test_reply_sim_io_valid(gconstpointer data)
 {
-	/* TODO: fix de-const cast... */
-	struct ril_msg *message = (struct ril_msg *) data;
-	struct reply_sim_io *reply;
-
-	reply = g_ril_reply_parse_sim_io(NULL, message);
+	struct reply_sim_io *reply = g_ril_reply_parse_sim_io(NULL, data);
 	g_assert(reply != NULL);
 	g_ril_reply_free_sim_io(reply);
 }
 
 static void test_reply_imsi_valid(gconstpointer data)
 {
-	/* TODO: fix de-const cast... */
-	struct ril_msg *message = (struct ril_msg *) data;
-	gchar *reply;
-
-	reply = g_ril_reply_parse_imsi(NULL, message);
+	gchar *reply = g_ril_reply_parse_imsi(NULL, data);
 	g_assert(reply != NULL);
 	g_free(reply);
 }
 
 static void test_reply_sim_status_valid(gconstpointer data)
 {
-	/* TODO: fix de-const cast... */
-	struct ril_msg *message = (struct ril_msg *) data;
 	struct reply_sim_status *reply;
 
-	reply = g_ril_reply_parse_sim_status(NULL, message);
+	reply = g_ril_reply_parse_sim_status(NULL, data);
 	g_assert(reply != NULL);
 	g_ril_reply_free_sim_status(reply);
 }
 
+static void test_reply_get_smsc_address_valid(gconstpointer data)
+{
+	struct ofono_phone_number *reply;
+
+	reply = g_ril_reply_parse_get_smsc_address(NULL, data);
+
+	g_assert(reply != NULL);
+	g_free(reply);
+}
+
+static void test_reply_get_current_calls_valid(gconstpointer data)
+{
+	GSList *calls;
+
+	calls = g_ril_reply_parse_get_calls(NULL, data);
+
+	g_assert(calls != NULL);
+
+	g_slist_foreach(calls, (GFunc) g_free, NULL);
+	g_slist_free(calls);
+}
+
+static void test_reply_get_current_calls_invalid(gconstpointer data)
+{
+	GSList *calls;
+
+	calls = g_ril_reply_parse_get_calls(NULL, data);
+
+	g_assert(calls == NULL);
+}
+
+static void test_reply_call_fail_cause_valid(gconstpointer data)
+{
+	enum ofono_disconnect_reason reason;
+
+	reason = g_ril_reply_parse_call_fail_cause(NULL, data);
+
+	g_assert(reason >= 0);
+}
+
+static void test_reply_get_mute_off(gconstpointer data)
+{
+	int muted;
+
+	muted = g_ril_reply_parse_get_mute(NULL, data);
+
+	g_assert(muted == 0);
+}
+
+static void test_reply_get_mute_on(gconstpointer data)
+{
+	int muted;
+
+	muted = g_ril_reply_parse_get_mute(NULL, data);
+
+	g_assert(muted == 1);
+}
+
+static void test_reply_baseband_version_valid(gconstpointer data)
+{
+	char *version;
+
+	version = g_ril_reply_parse_baseband_version(NULL, data);
+
+	g_assert(version != NULL);
+
+	g_free(version);
+}
+
+static void test_reply_get_imei_valid(gconstpointer data)
+{
+	char *imei;
+
+	imei = g_ril_reply_parse_get_imei(NULL, data);
+
+	g_assert(imei != NULL);
+
+	g_free(imei);
+}
+
 int main(int argc, char **argv)
 {
 	g_test_init(&argc, &argv, NULL);
@@ -447,6 +1568,126 @@
 				&reply_data_call_valid_1,
 				test_reply_data_call_valid);
 
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"invalid DATA_REG_STATE Test 1",
+				&reply_data_reg_state_invalid_1,
+				test_reply_reg_state_invalid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"invalid DATA_REG_STATE Test 2",
+				&reply_data_reg_state_invalid_2,
+				test_reply_reg_state_invalid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"invalid DATA_REG_STATE Test 3",
+				&reply_data_reg_state_invalid_3,
+				test_reply_reg_state_invalid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"valid DATA_REG_STATE Test 1",
+				&data_reg_valid_1,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"valid DATA_REG_STATE Test 2",
+				&data_reg_valid_2,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"valid DATA_REG_STATE Test 3",
+				&data_reg_valid_3,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"valid DATA_REG_STATE Test 4",
+				&data_reg_valid_4,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"valid DATA_REG_STATE Test 5",
+				&data_reg_valid_5,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"valid DATA_REG_STATE Test 6",
+				&data_reg_valid_6,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"valid DATA_REG_STATE Test 7",
+				&data_reg_valid_7,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"valid DATA_REG_STATE Test 8",
+				&data_reg_valid_8,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"valid DATA_REG_STATE Test 9",
+				&data_reg_valid_9,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/gprs: "
+				"valid DATA_REG_STATE Test 10",
+				&data_reg_valid_10,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
+				"valid VOICE_REG_STATE Test 1",
+				&voice_reg_valid_1,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
+				"valid VOICE_REG_STATE Test 2",
+				&voice_reg_valid_2,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
+				"valid VOICE_REG_STATE Test 3",
+				&voice_reg_valid_3,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
+				"valid VOICE_REG_STATE Test 4",
+				&voice_reg_valid_4,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
+				"valid VOICE_REG_STATE Test 5",
+				&voice_reg_valid_5,
+				test_reply_reg_state_valid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
+				"invalid GET_OPERATOR Test 1",
+				&reply_operator_invalid_1,
+				test_reply_operator_invalid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
+				"invalid GET_OPERATOR Test 2",
+				&reply_operator_invalid_2,
+				test_reply_operator_invalid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
+				"valid GET_OPERATOR Test 1",
+				&reply_operator_valid_1,
+				test_reply_operator_valid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
+				"invalid QUERY_AVAIL_OPS Test 1",
+				&reply_avail_ops_invalid_1,
+				test_reply_avail_ops_invalid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
+				"invalid QUERY_AVAIL_OPS Test 2",
+				&reply_avail_ops_invalid_2,
+				test_reply_avail_ops_invalid);
+
+	g_test_add_data_func("/testgrilreply/netreg: "
+				"valid QUERY_AVAIL_OPS Test 1",
+				&reply_avail_ops_valid_1,
+				test_reply_avail_ops_valid);
+
 	g_test_add_data_func("/testgrilreply/sim: "
 				"valid SIM_IO Test 1",
 				&reply_sim_io_valid_1,
@@ -462,6 +1703,51 @@
 				&reply_sim_status_valid_1,
 				test_reply_sim_status_valid);
 
+	g_test_add_data_func("/testgrilreply/sim: "
+				"valid GET_SMSC_ADDRESS Test 1",
+				&reply_get_smsc_address_valid_1,
+				test_reply_get_smsc_address_valid);
+
+	g_test_add_data_func("/testgrilreply/voicecall: "
+				"valid GET_CURRENT_CALLS Test 1",
+				&reply_get_current_calls_valid_1,
+				test_reply_get_current_calls_valid);
+
+	g_test_add_data_func("/testgrilreply/voicecall: "
+				"invalid GET_CURRENT_CALLS Test 1",
+				&reply_get_current_calls_invalid_1,
+				test_reply_get_current_calls_invalid);
+
+	g_test_add_data_func("/testgrilreply/voicecall: "
+				"invalid GET_CURRENT_CALLS Test 2",
+				&reply_get_current_calls_invalid_2,
+				test_reply_get_current_calls_invalid);
+
+	g_test_add_data_func("/testgrilreply/voicecall: "
+				"valid CALL_FAIL_CAUSE Test 1",
+				&reply_call_fail_cause_valid_1,
+				test_reply_call_fail_cause_valid);
+
+	g_test_add_data_func("/testgrilreply/call-volume: "
+				"off GET_MUTE Test 1",
+				&reply_get_mute_off_1,
+				test_reply_get_mute_off);
+
+	g_test_add_data_func("/testgrilreply/call-volume: "
+				"on GET_MUTE Test 1",
+				&reply_get_mute_on_1,
+				test_reply_get_mute_on);
+
+	g_test_add_data_func("/testgrilreply/devinfo: "
+				"valid BASEBAND_VERSION Test 1",
+				&reply_baseband_version_valid_1,
+				test_reply_baseband_version_valid);
+
+	g_test_add_data_func("/testgrilreply/devinfo: "
+				"valid GET_IMEI Test 1",
+				&reply_get_imei_valid_1,
+				test_reply_get_imei_valid);
+
 #endif
 
 	return g_test_run();

=== modified file 'unit/test-grilrequest.c'
--- unit/test-grilrequest.c	2013-11-05 16:28:08 +0000
+++ unit/test-grilrequest.c	2013-12-04 21:58:23 +0000
@@ -38,7 +38,7 @@
 
 struct request_test_data {
 	gconstpointer request;
-	guchar *parcel_data;
+	const guchar *parcel_data;
 	gsize parcel_size;
 };
 
@@ -189,11 +189,11 @@
 /* sim_read_binary tests */
 
 static const guchar req_sim_read_binary_parcel_valid_1[] = {
-0xb0, 0x00, 0x00, 0x00, 0xe2, 0x2f, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-0x33, 0x00, 0x46, 0x00, 0x30, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00,
+	0xb0, 0x00, 0x00, 0x00, 0xe2, 0x2f, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+	0x33, 0x00, 0x46, 0x00, 0x30, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00,
 };
 
 static const unsigned char sim_read_binary_path_valid_1[] = {0x3F, 0x00};
@@ -217,11 +217,11 @@
 /* sim_read_record tests */
 
 static const guchar req_sim_read_record_parcel_valid_1[] = {
-0xb2, 0x00, 0x00, 0x00, 0xe2, 0x2f, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-0x33, 0x00, 0x46, 0x00, 0x30, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00,
+	0xb2, 0x00, 0x00, 0x00, 0xe2, 0x2f, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+	0x33, 0x00, 0x46, 0x00, 0x30, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00,
 };
 
 static const unsigned char sim_read_record_path_valid_1[] = {0x3F, 0x00};
@@ -245,7 +245,7 @@
 /* read_imsi tests */
 
 static const guchar req_read_imsi_parcel_valid_1[] = {
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 static const char read_imsi_aid_str_1[] = "";
@@ -266,9 +266,9 @@
 };
 
 static const guchar req_pin_send_parcel_valid_1[] = {
-0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
-0x33, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
+	0x33, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00,
 };
 
 static const struct request_test_pin_send_data pin_send_record_valid_test_1 = {
@@ -281,11 +281,11 @@
 /* pin_change_state tests */
 
 static const guchar req_pin_change_state_valid_1[] = {
-0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x50, 0x00, 0x53, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
-0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF,
+	0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x50, 0x00, 0x53, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+	0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+	0xFF, 0xFF, 0xFF, 0xFF,
 };
 
 static const struct req_pin_change_state req_pin_change_state_valid1 = {
@@ -312,11 +312,11 @@
 };
 
 static const guchar req_pin_send_puk_parcel_valid_1[] = {
-0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
-0x33, 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 0x00, 0x38, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
-0x33, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00,
+	0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
+	0x33, 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 0x00, 0x38, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
+	0x33, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00,
 };
 
 static const struct request_test_pin_send_puk_data pin_send_puk_valid_test_1 = {
@@ -338,10 +338,10 @@
 };
 
 static const guchar req_change_passwd_parcel_valid_1[] = {
-0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
-0x33, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-0x35, 0x00, 0x36, 0x00, 0x37, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x31, 0x00, 0x32, 0x00,
+	0x33, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+	0x35, 0x00, 0x36, 0x00, 0x37, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 static const struct request_test_change_passwd_data change_passwd_valid_test_1 = {
@@ -352,12 +352,174 @@
 	.parcel_size = sizeof(req_change_passwd_parcel_valid_1),
 };
 
+/* sms_cmgs tests */
+
+static const unsigned char req_sms_cmgs_pdu_valid_1[] = {
+	0x00, 0x11, 0x00, 0x09, 0x81, 0x36, 0x54, 0x39, 0x80, 0xf5, 0x00, 0x00,
+	0xa7, 0x0a, 0xc8, 0x37, 0x3b, 0x0c, 0x6a, 0xd7, 0xdd, 0xe4, 0x37
+};
+
+static const guchar req_sms_cmgs_parcel_valid_1[] = {
+	0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x2c, 0x00, 0x00, 0x00,
+	0x31, 0x00, 0x31, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x39, 0x00,
+	0x38, 0x00, 0x31, 0x00, 0x33, 0x00, 0x36, 0x00, 0x35, 0x00, 0x34, 0x00,
+	0x33, 0x00, 0x39, 0x00, 0x38, 0x00, 0x30, 0x00, 0x46, 0x00, 0x35, 0x00,
+	0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x41, 0x00, 0x37, 0x00,
+	0x30, 0x00, 0x41, 0x00, 0x43, 0x00, 0x38, 0x00, 0x33, 0x00, 0x37, 0x00,
+	0x33, 0x00, 0x42, 0x00, 0x30, 0x00, 0x43, 0x00, 0x36, 0x00, 0x41, 0x00,
+	0x44, 0x00, 0x37, 0x00, 0x44, 0x00, 0x44, 0x00, 0x45, 0x00, 0x34, 0x00,
+	0x33, 0x00, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct req_sms_cmgs req_sms_cmgs_valid1 = {
+	.pdu = req_sms_cmgs_pdu_valid_1,
+	.pdu_len = sizeof(req_sms_cmgs_pdu_valid_1),
+	.tpdu_len = sizeof(req_sms_cmgs_pdu_valid_1) - 1,
+};
+
+static const struct request_test_data sms_cmgs_valid_test_1 = {
+	.request = &req_sms_cmgs_valid1,
+	.parcel_data = (guchar *) &req_sms_cmgs_parcel_valid_1,
+	.parcel_size = sizeof(req_sms_cmgs_parcel_valid_1),
+};
+
+/* sms_acknowledge tests */
+
+static const guchar req_sms_acknowledge_parcel_valid_1[] = {
+	0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct request_test_data sms_acknowledge_valid_test_1 = {
+	.request = NULL,
+	.parcel_data = (guchar *) &req_sms_acknowledge_parcel_valid_1,
+	.parcel_size = sizeof(req_sms_acknowledge_parcel_valid_1),
+};
+
+/* set_smsc_address tests */
+
+static const guchar req_set_smsc_address_valid_parcel1[] = {
+	0x0e, 0x00, 0x00, 0x00, 0x22, 0x00, 0x2b, 0x00, 0x33, 0x00, 0x34, 0x00,
+	0x36, 0x00, 0x30, 0x00, 0x37, 0x00, 0x30, 0x00, 0x30, 0x00, 0x33, 0x00,
+	0x31, 0x00, 0x31, 0x00, 0x30, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ofono_phone_number smsc_address_valid1 = {
+	.type = 145,
+	.number = "34607003110"
+};
+
+static const struct request_test_data smsc_address_valid_test_1 = {
+	.request = &smsc_address_valid1,
+	.parcel_data = (guchar *) &req_set_smsc_address_valid_parcel1,
+	.parcel_size = sizeof(req_set_smsc_address_valid_parcel1),
+};
+
+/* dial tests */
+
+struct request_test_dial_data {
+	const struct ofono_phone_number ph;
+	enum ofono_clir_option clir;
+	const guchar *parcel_data;
+	size_t parcel_size;
+};
+
+static const guchar req_dial_parcel_valid_1[] = {
+	0x09, 0x00, 0x00, 0x00, 0x39, 0x00, 0x31, 0x00, 0x37, 0x00, 0x35, 0x00,
+	0x32, 0x00, 0x35, 0x00, 0x35, 0x00, 0x35, 0x00, 0x35, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const struct request_test_dial_data dial_valid_test_1 = {
+	.ph = { .number = "917525555", .type = 129 },
+	.clir = OFONO_CLIR_OPTION_DEFAULT,
+	.parcel_data = req_dial_parcel_valid_1,
+	.parcel_size = sizeof(req_dial_parcel_valid_1),
+};
+
+/* hangup tests */
+
+static const guchar req_hangup_parcel_valid_1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+};
+
+static unsigned hangup_call_id_valid_1 = 1;
+
+static const struct request_test_data set_hangup_valid_test_1 = {
+	.request = &hangup_call_id_valid_1,
+	.parcel_data = req_hangup_parcel_valid_1,
+	.parcel_size = sizeof(req_hangup_parcel_valid_1),
+};
+
+/* dtmf tests */
+
+static const guchar req_dtmf_parcel_valid_1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00
+};
+
+static char dtmf_char_valid_1 = '4';
+
+static const struct request_test_data dtmf_valid_test_1 = {
+	.request = &dtmf_char_valid_1,
+	.parcel_data = req_dtmf_parcel_valid_1,
+	.parcel_size = sizeof(req_dtmf_parcel_valid_1),
+};
+
+/* separate_conn tests */
+
+static const guchar req_separate_conn_parcel_valid_1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+};
+
+static unsigned separate_conn_call_id_valid_1 = 1;
+
+static const struct request_test_data separate_conn_valid_test_1 = {
+	.request = &separate_conn_call_id_valid_1,
+	.parcel_data = req_separate_conn_parcel_valid_1,
+	.parcel_size = sizeof(req_separate_conn_parcel_valid_1),
+};
+
+/* set_supp_svc_notif tests */
+
+static const guchar req_set_supp_svc_notif_parcel_valid_1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+};
+
+static const struct request_test_data set_supp_svc_notif_valid_test_1 = {
+	.request = NULL,
+	.parcel_data = req_set_supp_svc_notif_parcel_valid_1,
+	.parcel_size = sizeof(req_set_supp_svc_notif_parcel_valid_1),
+};
+
+/* set_mute tests */
+
+static const int mute_off = 0;
+static const int mute_on = 1;
+
+static const guchar req_set_mute_valid_parcel1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct request_test_data set_mute_valid_test_1 = {
+	.request = &mute_off,
+	.parcel_data = (guchar *) &req_set_mute_valid_parcel1,
+	.parcel_size = sizeof(req_set_mute_valid_parcel1),
+};
+
+static const guchar req_set_mute_valid_parcel2[] = {
+	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+};
+
+static const struct request_test_data set_mute_valid_test_2 = {
+	.request = &mute_on,
+	.parcel_data = (guchar *) &req_set_mute_valid_parcel2,
+	.parcel_size = sizeof(req_set_mute_valid_parcel2),
+};
 
 /*
  * The following hexadecimal data represents a serialized Binder parcel
  * instance containing a valid RIL_REQUEST_RADIO_POWER 'OFF' message.
  */
-static const guchar req_power_off_valid_parcel1[8] = {
+static const guchar req_power_off_valid_parcel1[] = {
 	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
@@ -365,7 +527,7 @@
  * The following hexadecimal data represents a serialized Binder parcel
  * instance containing a valid RIL_REQUEST_RADIO_POWER 'ON' message.
  */
-static const guchar req_power_on_valid_parcel2[8] = {
+static const guchar req_power_on_valid_parcel2[] = {
 	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
 };
 
@@ -375,13 +537,13 @@
 static const struct request_test_data power_valid_test_1 = {
 	.request = &power_off,
 	.parcel_data = (guchar *) &req_power_off_valid_parcel1,
-	.parcel_size = 8,
+	.parcel_size = sizeof(req_power_off_valid_parcel1),
 };
 
 static const struct request_test_data power_valid_test_2 = {
 	.request = &power_on,
 	.parcel_data = (guchar *) &req_power_on_valid_parcel2,
-	.parcel_size = 8,
+	.parcel_size = sizeof(req_power_on_valid_parcel2),
 };
 
 static void test_deactivate_data_call_invalid(gconstpointer data)
@@ -600,6 +762,131 @@
 	parcel_free(&rilp);
 }
 
+static void test_request_sms_cmgs(gconstpointer data)
+{
+	const struct request_test_data *test_data = data;
+	const struct req_sms_cmgs *req = test_data->request;
+	struct parcel rilp;
+
+	g_ril_request_sms_cmgs(NULL, req, &rilp);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data,
+			test_data->parcel_size));
+
+	parcel_free(&rilp);
+}
+
+static void test_request_sms_acknowledge(gconstpointer data)
+{
+	const struct request_test_data *test_data = data;
+	struct parcel rilp;
+
+	g_ril_request_sms_acknowledge(NULL, &rilp);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data,
+			test_data->parcel_size));
+
+	parcel_free(&rilp);
+}
+
+static void test_request_set_smsc_address(gconstpointer data)
+{
+	const struct request_test_data *test_data = data;
+	const struct ofono_phone_number *number = test_data->request;
+	struct parcel rilp;
+
+	g_ril_request_set_smsc_address(NULL, number, &rilp);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data,