Merge lp:~rsalveti/ofono/ubuntu-fixes-online-offline-netreg-mute into lp:~phablet-team/ofono/ubuntu

[Ricardo Salveti]

- Ensure that *netreg_data is always set in callback data (LP: #1234491)
- Re-factor rilmodem initialization code to enable set online/offline (LP: #1210502)
- Fixing parcel parsing when probing for mute

[Ricardo Salveti (rsalveti)]

Tested with both mako and maguro, working as expected.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Tony Espy (awe)]

Tesed voice calls ( in/out ), SMS ( in/out ), call mute/volume, and GPRS on both maguro/mako using the pre-built debs installed on freshly flashed r/w system image #78.

A couple of problem observed, but unrelated to the MR:

 - call volume doesn't work on maguro

 - call mute doesn't work on mako ( known bug, in-progress )

Other then these issues, all good!

review: Approve

=== modified file 'drivers/rilmodem/call-volume.c'
--- drivers/rilmodem/call-volume.c	2013-09-09 19:21:32 +0000
+++ drivers/rilmodem/call-volume.c	2013-10-04 03:07:28 +0000
@@ -111,6 +111,9 @@
 	}
 
 	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);

=== modified file 'drivers/rilmodem/network-registration.c'
--- drivers/rilmodem/network-registration.c	2013-09-09 19:21:32 +0000
+++ drivers/rilmodem/network-registration.c	2013-10-04 03:07:28 +0000
@@ -384,6 +384,8 @@
 	struct cb_data *cbd = cb_data_new(cb, data);
 	int request = RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC;
 	int ret;
+
+	/* add *netreg_data to callback */
 	cbd->user = nd;
 
 	ret = g_ril_send(nd->ril, request,
@@ -408,6 +410,9 @@
 	int request = RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL;
 	int ret;
 
+	/* add *netreg_data to callback */
+	cbd->user = nd;
+
 	parcel_init(&rilp);
 
 	/* RIL expects a char * specifying MCCMNC of network to select */

=== modified file 'gril/gril.c'
--- gril/gril.c	2013-09-09 19:21:32 +0000
+++ gril/gril.c	2013-10-04 03:07:28 +0000
@@ -3,7 +3,8 @@
  *  RIL library with GLib integration
  *
  *  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
@@ -43,8 +44,8 @@
 #include "grilutil.h"
 
 #define RIL_TRACE(ril, fmt, arg...) do {	\
-	if (ril->trace == TRUE)		        \
-		ofono_debug(fmt, ## arg); 	\
+	if (ril->trace == TRUE)			\
+		ofono_debug(fmt, ## arg);	\
 } while (0)
 
 #define COMMAND_FLAG_EXPECT_PDU			0x1
@@ -97,7 +98,6 @@
 	gpointer debug_data;			/* Data to pass to debug func */
 	gboolean debug;
 	gboolean trace;
-	GSList *response_lines;			/* char * lines of the response */
 	gint timeout_source;
 	gboolean destroyed;			/* Re-entrancy guard */
 	gboolean in_read_handler;		/* Re-entrancy guard */
@@ -246,11 +246,11 @@
 	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;
+	/* 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;
+	/* Add 4 bytes to buffer length to include length prefix */
+	r->data_len = len + 4;
 
 	r->data = g_try_new(char, r->data_len);
 	if (r->data == NULL) {
@@ -259,12 +259,12 @@
 		return 0;
 	}
 
-        /* convert length to network byte order (Big Endian) */
-        net_length = (guint32 *) r->data;
-        *net_length = htonl(len);
+	/* 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;
+	cur_bufp = r->data + 4;
 
 	/* write request code */
 	request = (guint32 *) cur_bufp;
@@ -303,12 +303,7 @@
 	/* Cleanup pending commands */
 
 	g_queue_free(p->command_queue);
-        p->command_queue = NULL;
-
-	/* Cleanup any response lines we have pending */
-	g_slist_foreach(p->response_lines, (GFunc)g_free, NULL);
-	g_slist_free(p->response_lines);
-	p->response_lines = NULL;
+	p->command_queue = NULL;
 
 	p->connected = FALSE;
 
@@ -357,9 +352,9 @@
 
 			if (message->error != RIL_E_SUCCESS)
 				RIL_TRACE(p, "[%04d]< %s failed %s",
-						message->serial_no,
-						ril_request_id_to_string(message->req),
-						ril_error_to_string(message->error));
+					message->serial_no,
+					ril_request_id_to_string(message->req),
+					ril_error_to_string(message->error));
 
 			req = g_queue_pop_nth(p->command_queue, i);
 			if (req->callback)
@@ -411,9 +406,8 @@
 
 	g_hash_table_iter_init(&iter, p->notify_list);
 
-	if (message->req == RIL_UNSOL_RIL_CONNECTED) {
+	if (message->req == RIL_UNSOL_RIL_CONNECTED)
 		p->connected = TRUE;
-	}
 
 	while (g_hash_table_iter_next(&iter, &key, &value)) {
 		req_key = *((int *)key);
@@ -462,9 +456,9 @@
 		message->req = (int) *id_num_field;
 
 		/*
-		 * A RIL Unsolicited Event is two UINT32 fields ( unsolicited, and req/ev ),
-		 * so subtract the length of the header from the overall length to calculate
-		 * the length of the Event Data.
+		 * A RIL Unsolicited Event is two UINT32 fields ( unsolicited,
+		 * and req/ev ), so subtract the length of the header from the
+		 * overall length to calculate the length of the Event Data.
 		 */
 		data_len = message->buf_len - 8;
 	} else {
@@ -474,14 +468,15 @@
 		message->error = *((guint32 *) bufp);
 
 		/*
-		 * A RIL Solicited Response is three UINT32 fields ( unsolicied, serial_no
-		 * and error ), so subtract the length of the header from the overall length
-		 * to calculate the length of the Event Data.
+		 * A RIL Solicited Response is three UINT32 fields ( unsolicied,
+		 * serial_no and error ), so subtract the length of the header
+		 * from the overall length to calculate the length of the Event
+		 * Data.
 		 */
 		data_len = message->buf_len - 12;
 	}
 
-        /* advance to start of data.. */
+	/* advance to start of data.. */
 	bufp += 4;
 
 	/* Now, allocate new buffer for data only, copy from
@@ -503,11 +498,11 @@
 		message->buf_len = data_len;
 	}
 
-	if (message->unsolicited == TRUE) {
+	if (message->unsolicited == TRUE)
 		handle_unsol_req(p, message);
-	} else {
+	else
 		handle_response(p, message);
-	}
+
 error:
 	g_free(message->buf);
 	g_free(message);
@@ -539,22 +534,21 @@
 	*/
 
 	message_len = *len - 4;
-	if (message_len < plen) {
+	if (message_len < plen)
 		return NULL;
-	}
 
 	/* FIXME: add check for message_len = 0? */
 
-        message = g_try_malloc(sizeof(struct ril_msg));
-        g_assert(message != NULL);
-
-        /* allocate ril_msg->buffer */
-        message->buf_len = plen;
-        message->buf = g_try_malloc(plen);
-        g_assert(message->buf != NULL);
-
-        /* Copy bytes into message buffer */
-        memmove(message->buf, (const void *) bytes, plen);
+	message = g_try_malloc(sizeof(struct ril_msg));
+	g_assert(message != NULL);
+
+	/* allocate ril_msg->buffer */
+	message->buf_len = plen;
+	message->buf = g_try_malloc(plen);
+	g_assert(message->buf != NULL);
+
+	/* Copy bytes into message buffer */
+	memmove(message->buf, (const void *) bytes, plen);
 
 	/* Indicate to caller size of record we extracted */
 	*len = plen + 4;
@@ -649,7 +643,7 @@
 	if (ril->req_bytes_written >= len)
 		return FALSE;
 
-        /*
+	/*
 	 * AT modems need to be woken up via a command set by the
 	 * upper layers.  RIL has no such concept, hence wakeup needed
 	 * NOTE - I'm keeping the if statement here commented out, just
@@ -657,7 +651,8 @@
 	 *
 	 * if (ril->req_bytes_written == 0 && wakeup_first == TRUE) {
 	 *		cmd = at_command_create(0, chat->wakeup, none_prefix, 0,
-	 *					NULL, wakeup_cb, chat, NULL, TRUE);
+	 *					NULL, wakeup_cb, chat, NULL,
+	 *					TRUE);
 	 *		g_queue_push_head(chat->command_queue, cmd);
 	 *	len = strlen(chat->wakeup);
 	 *	chat->timeout_source = g_timeout_add(chat->wakeup_timeout,
@@ -697,7 +692,7 @@
 
 	g_ril_io_set_write_handler(ril->io, NULL, NULL);
 	g_ril_io_set_read_handler(ril->io, NULL, NULL);
-        g_ril_io_set_debug(ril->io, NULL, NULL);
+	g_ril_io_set_debug(ril->io, NULL, NULL);
 }
 
 /*
@@ -711,9 +706,9 @@
 	ril->suspended = FALSE;
 
 	if (g_ril_io_get_channel(ril->io) == NULL) {
-        	io_disconnect(ril);
-        	return;
-        }
+		io_disconnect(ril);
+		return;
+	}
 
 	g_ril_io_set_disconnect_function(ril->io, io_disconnect, ril);
 
@@ -722,7 +717,7 @@
 	g_ril_io_set_read_handler(ril->io, new_bytes, ril);
 
 	if (g_queue_get_length(ril->command_queue) > 0)
-	        ril_wakeup_writer(ril);
+		ril_wakeup_writer(ril);
 }
 
 static gboolean ril_set_debug(struct ril_s *ril,
@@ -747,12 +742,12 @@
 	if (is_zero == FALSE)
 		return;
 
-        if (ril->io) {
-        	ril_suspend(ril);
+	if (ril->io) {
+		ril_suspend(ril);
 		g_ril_io_unref(ril->io);
-        	ril->io = NULL;
-        	ril_cleanup(ril);
-        }
+		ril->io = NULL;
+		ril_cleanup(ril);
+	}
 
 	if (ril->in_read_handler)
 		ril->destroyed = TRUE;
@@ -809,20 +804,20 @@
 		goto error;
 	}
 
-        io = g_io_channel_unix_new(sk);
-        if (io == NULL) {
+	io = g_io_channel_unix_new(sk);
+	if (io == NULL) {
 		ofono_error("create_ril: can't connect to RILD: %s (%d)\n",
 				strerror(errno), errno);
 		return NULL;
-        }
+	}
 
 	g_io_channel_set_close_on_unref(io, TRUE);
 	g_io_channel_set_flags(io, G_IO_FLAG_NONBLOCK, NULL);
 
-        ril->io = g_ril_io_new(io);
-        if (ril->io == NULL) {
+	ril->io = g_ril_io_new(io);
+	if (ril->io == NULL) {
 		ofono_error("create_ril: can't create ril->io");
-        	goto error;
+		goto error;
 	}
 
 	g_ril_io_set_disconnect_function(ril->io, io_disconnect, ril);
@@ -834,7 +829,8 @@
 	}
 
 	ril->notify_list = g_hash_table_new_full(g_int_hash, g_int_equal,
-							g_free, ril_notify_destroy);
+							g_free,
+							ril_notify_destroy);
 
         g_ril_io_set_read_handler(ril->io, new_bytes, ril);
 
@@ -866,6 +862,31 @@
 	return notify;
 }
 
+static void ril_cancel_group(struct ril_s *ril, guint group)
+{
+	int n = 0;
+	struct ril_request *req;
+
+	if (ril->command_queue == NULL)
+		return;
+
+	while ((req = g_queue_peek_nth(ril->command_queue, n)) != NULL) {
+		if (req->gid != group) {
+			n += 1;
+			continue;
+		}
+
+		if (n == 0 && ril->req_bytes_written > 0) {
+			req->callback = NULL;
+			n += 1;
+			continue;
+		}
+
+		g_queue_remove(ril->command_queue, req);
+		ril_request_destroy(req);
+	}
+}
+
 static guint ril_register(struct ril_s *ril, guint group,
 				const int req, GRilNotifyFunc func,
 				gpointer user_data)
@@ -1011,7 +1032,7 @@
 GIOChannel *g_ril_get_channel(GRil *ril)
 {
 	if (ril == NULL || ril->parent->io == NULL)
- 		return NULL;
+		return NULL;
 
 	return g_ril_io_get_channel(ril->parent->io);
 
@@ -1042,10 +1063,12 @@
 	struct ril_request *r;
 	struct ril_s *p;
 
-	if (ril == NULL || ril->parent == NULL || ril->parent->command_queue == NULL)
-		return 0;
+	if (ril == NULL
+		|| ril->parent == NULL
+		|| ril->parent->command_queue == NULL)
+			return 0;
 
-        p = ril->parent;
+	p = ril->parent;
 
 	r = ril_request_create(p, ril->group, reqid, p->next_cmd_id,
 				data, data_len, func,
@@ -1058,7 +1081,8 @@
 	g_queue_push_tail(p->command_queue, r);
 
 	if (g_queue_get_length(p->command_queue) == 1) {
-		DBG("calling wakeup_writer: qlen: %d", g_queue_get_length(p->command_queue));
+		DBG("calling wakeup_writer: qlen: %d",
+			g_queue_get_length(p->command_queue));
 		ril_wakeup_writer(p);
 	}
 
@@ -1093,6 +1117,8 @@
 	if (is_zero == FALSE)
 		return;
 
+ 	ril_cancel_group(ril->parent, ril->group);
+ 	g_ril_unregister_all(ril);
 	ril_unref(ril->parent);
 
 	g_free(ril);
@@ -1113,7 +1139,7 @@
 	if (ril == NULL || ril->parent == NULL)
 		return FALSE;
 
-	return (ril->parent->trace = trace);
+	return ril->parent->trace = trace;
 }
 
 gboolean g_ril_set_debugf(GRil *ril,

=== modified file 'gril/grilrequest.c'
--- gril/grilrequest.c	2013-09-09 19:21:32 +0000
+++ gril/grilrequest.c	2013-10-04 03:07:28 +0000
@@ -40,6 +40,9 @@
 /* DEACTIVATE_DATA_CALL request parameters */
 #define DEACTIVATE_DATA_CALL_NUM_PARAMS 2
 
+/* POWER request parameters */
+#define POWER_PARAMS 1
+
 /* SETUP_DATA_CALL_PARAMS request parameters */
 #define SETUP_DATA_CALL_PARAMS 7
 #define DATA_PROFILE_DEFAULT_STR "0"
@@ -104,6 +107,19 @@
 	return FALSE;
 }
 
+void g_ril_request_power(GRil *gril,
+				const gboolean power,
+				struct parcel *rilp)
+{
+	DBG("");
+
+	parcel_init(rilp);
+	parcel_w_int32(rilp, POWER_PARAMS);
+	parcel_w_int32(rilp, (int32_t) power);
+
+	g_ril_append_print_buf(gril, "(%d)", power);
+}
+
 gboolean g_ril_request_setup_data_call(GRil *gril,
 					const struct req_setup_data_call *req,
 					struct parcel *rilp,

=== modified file 'gril/grilrequest.h'
--- gril/grilrequest.h	2013-09-09 19:21:32 +0000
+++ gril/grilrequest.h	2013-10-04 03:07:28 +0000
@@ -51,6 +51,10 @@
 				struct parcel *rilp,
 				struct ofono_error *error);
 
+void g_ril_request_power(GRil *gril,
+				gboolean power,
+				struct parcel *rilp);
+
 gboolean g_ril_request_setup_data_call(GRil *gril,
 					const struct req_setup_data_call *req,
 					struct parcel *rilp,

=== modified file 'plugins/ril.c'
--- plugins/ril.c	2013-09-09 19:21:32 +0000
+++ plugins/ril.c	2013-10-04 03:07:28 +0000
@@ -3,7 +3,8 @@
  *  oFono - Open Source Telephony - RIL-based devices
  *
  *  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
@@ -57,20 +58,16 @@
 
 #include "drivers/rilmodem/rilmodem.h"
 
-#define MAX_POWER_ON_RETRIES 5
 #define MAX_SIM_STATUS_RETRIES 15
 
 struct ril_data {
 	GRil *modem;
-	int power_on_retries;
 	int sim_status_retries;
 	ofono_bool_t connected;
 	ofono_bool_t have_sim;
-	ofono_bool_t online;
-	ofono_bool_t reported;
 };
 
-static int send_get_sim_status(struct ofono_modem *modem);
+static void send_get_sim_status(struct ofono_modem *modem);
 static gboolean power_on(gpointer user_data);
 
 static void ril_debug(const char *str, void *user_data)
@@ -80,48 +77,10 @@
 	ofono_info("%s%s", prefix, str);
 }
 
-static void power_cb(struct ril_msg *message, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct ril_data *ril = ofono_modem_get_data(modem);
-
-	if (message->error != RIL_E_SUCCESS) {
-		ril->power_on_retries++;
-		ofono_warn("Radio Power On request failed: %s; retries: %d",
-				ril_error_to_string(message->error),
-				ril->power_on_retries);
-
-		if (ril->power_on_retries < MAX_POWER_ON_RETRIES)
-			g_timeout_add_seconds(1, power_on, modem);
-		else
-			ofono_error("Max retries for radio power on exceeded!");
-	} else {
-
-		g_ril_print_response_no_args(ril->modem, message);
-		DBG("Radio POWER-ON OK, calling set_powered(TRUE).");
-		ofono_modem_set_powered(modem, TRUE);
-	}
-}
-
-static gboolean power_on(gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct parcel rilp;
-	struct ril_data *ril = ofono_modem_get_data(modem);
-	int request = RIL_REQUEST_RADIO_POWER;
-	guint ret;
-
-	parcel_init(&rilp);
-	parcel_w_int32(&rilp, 1); /* size of array */
-	parcel_w_int32(&rilp, 1); /* POWER=ON */
-
-	ret = g_ril_send(ril->modem, request,
-				rilp.data, rilp.size, power_cb, modem, NULL);
-
-	g_ril_append_print_buf(ril->modem, "(1)");
-	g_ril_print_request(ril->modem, ret, request);
-
-	parcel_free(&rilp);
+static gboolean sim_status_retry(gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	send_get_sim_status(modem);
 
 	/* Makes this a single shot */
 	return FALSE;
@@ -151,7 +110,7 @@
 				message->error, ril->sim_status_retries);
 
 		if (ril->sim_status_retries < MAX_SIM_STATUS_RETRIES)
-			g_timeout_add_seconds(2, (GSourceFunc) send_get_sim_status, (gpointer) modem);
+			g_timeout_add_seconds(2, sim_status_retry, modem);
 		else
 			ofono_error("Max retries for GET_SIM_STATUS exceeded!");
 	} else {
@@ -166,14 +125,16 @@
 				ril_util_free_sim_apps(apps, status.num_apps);
 
 			ril->have_sim = TRUE;
-			power_on(modem);
 		} else
 			ofono_warn("No SIM card present.");
+
+		DBG("calling set_powered(TRUE)");
+		ofono_modem_set_powered(modem, TRUE);
 	}
 	/* TODO: handle emergency calls if SIM !present or locked */
 }
 
-static int send_get_sim_status(struct ofono_modem *modem)
+static void send_get_sim_status(struct ofono_modem *modem)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
 	int request = RIL_REQUEST_GET_SIM_STATUS;
@@ -182,9 +143,8 @@
 	ret = g_ril_send(ril->modem, request,
 				NULL, 0, sim_status_cb, modem, NULL);
 
-	g_ril_print_request_no_args(ril->modem, ret, request);
-
-	return ret;
+	if (ret > 0)
+		g_ril_print_request_no_args(ril->modem, ret, request);
 }
 
 static int ril_probe(struct ofono_modem *modem)
@@ -197,7 +157,7 @@
 		goto error;
 	}
 
-        ril->modem = NULL;
+	ril->modem = NULL;
 
 	ofono_modem_set_data(modem, ril);
 
@@ -229,9 +189,8 @@
 	struct ril_data *ril = ofono_modem_get_data(modem);
 	struct ofono_sim *sim;
 
-	sim = ofono_sim_create(modem, 0, "rilmodem", ril->modem);
-	ofono_devinfo_create(modem, 0, "rilmodem", ril->modem);
-	ofono_voicecall_create(modem, 0, "rilmodem", ril->modem);
+	sim = ofono_sim_create(modem, 0, RILMODEM, ril->modem);
+	ofono_voicecall_create(modem, 0, RILMODEM, ril->modem);
 
 	if (sim && ril->have_sim)
 		ofono_sim_inserted_notify(sim, TRUE);
@@ -248,10 +207,10 @@
 	 *  - stk ( SIM toolkit )
 	 *  - radio_settings
 	 */
-	ofono_sms_create(modem, 0, "rilmodem", ril->modem);
+	ofono_sms_create(modem, 0, RILMODEM, ril->modem);
 
-	gprs = ofono_gprs_create(modem, 0, "rilmodem", ril->modem);
- 	gc = ofono_gprs_context_create(modem, 0, "rilmodem", ril->modem);
+	gprs = ofono_gprs_create(modem, 0, RILMODEM, ril->modem);
+	gc = ofono_gprs_context_create(modem, 0, RILMODEM, ril->modem);
 
 	if (gprs && gc) {
 		DBG("calling gprs_add_context");
@@ -263,8 +222,64 @@
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
-	ofono_call_volume_create(modem, 0, "rilmodem", ril->modem);
-	ofono_netreg_create(modem, 0, "rilmodem", ril->modem);
+	ofono_call_volume_create(modem, 0, RILMODEM, ril->modem);
+	ofono_netreg_create(modem, 0, RILMODEM, ril->modem);
+}
+
+static void ril_set_online_cb(struct ril_msg *message, gpointer user_data)
+{
+	ofono_bool_t online_state;
+	struct cb_data *cbd = user_data;
+	ofono_modem_online_cb_t cb = cbd->cb;
+
+	if (message->error == RIL_E_SUCCESS)
+		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+	else
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+}
+
+static void ril_send_power(struct ril_data *ril, ofono_bool_t online,
+				GRilResponseFunc func,
+				ofono_modem_online_cb_t callback,
+				void *data)
+{
+	struct cb_data *cbd;
+	GDestroyNotify notify;
+	int request = RIL_REQUEST_RADIO_POWER;
+	struct parcel rilp;
+	int ret;
+
+	if (callback) {
+		cbd = cb_data_new(callback, data);
+		notify = g_free;
+		g_assert(func);
+	} else {
+		cbd = NULL;
+		notify = NULL;
+	}
+
+	DBG("(online = 1, offline = 0)): %i", online);
+
+	g_ril_request_power(ril->modem, (const gboolean) online, &rilp);
+
+	ret = g_ril_send(ril->modem, request, rilp.data,
+				rilp.size, func, cbd, notify);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(callback, data);
+	} else
+		g_ril_print_request(ril->modem, ret, request);
+
+}
+
+static void ril_set_online(struct ofono_modem *modem, ofono_bool_t online,
+				ofono_modem_online_cb_t callback, void *data)
+{
+	struct ril_data *ril = ofono_modem_get_data(modem);
+	ril_send_power(ril, online, ril_set_online_cb, callback, data);
 }
 
 static void ril_connected(struct ril_msg *message, gpointer user_data)
@@ -272,9 +287,7 @@
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
-	/* TODO: make conditional */
-        ofono_debug("[UNSOL]< %s", ril_unsol_request_to_string(message->req));
-	/* TODO: make conditional */
+        ofono_info("[UNSOL]< %s", ril_unsol_request_to_string(message->req));
 
 	/* TODO: need a disconnect function to restart things! */
 	ril->connected = TRUE;
@@ -288,9 +301,9 @@
 
 	ril->have_sim = FALSE;
 
-        ril->modem = g_ril_new();
+	ril->modem = g_ril_new();
 
-        /* NOTE: Since AT modems open a tty, and then call
+	/* NOTE: Since AT modems open a tty, and then call
 	 * g_at_chat_new(), they're able to return -EIO if
 	 * the first fails, and -ENOMEM if the second fails.
 	 * in our case, we already return -EIO if the ril_new
@@ -298,28 +311,34 @@
 	 * abstraction... ( probaby not a bad idea ).
 	 */
 
-        if (ril->modem == NULL) {
+	if (ril->modem == NULL) {
 		DBG("g_ril_new() failed to create modem!");
 		return -EIO;
 	}
 
-	if (getenv("OFONO_RIL_TRACE")) {
+	if (getenv("OFONO_RIL_TRACE"))
 		g_ril_set_trace(ril->modem, TRUE);
-	}
 
-	if (getenv("OFONO_RIL_HEX_TRACE")) {
+	if (getenv("OFONO_RIL_HEX_TRACE"))
 		g_ril_set_debugf(ril->modem, ril_debug, "Device: ");
-	}
 
 	g_ril_register(ril->modem, RIL_UNSOL_RIL_CONNECTED,
 			ril_connected, modem);
 
-        return -EINPROGRESS;
+	ofono_devinfo_create(modem, 0, RILMODEM, ril->modem);
+
+	return -EINPROGRESS;
 }
 
 static int ril_disable(struct ofono_modem *modem)
 {
-        return 0;
+	struct ril_data *ril = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	ril_send_power(ril, FALSE, NULL, NULL, NULL);
+
+	return 0;
 }
 
 static struct ofono_modem_driver ril_driver = {
@@ -331,6 +350,7 @@
 	.pre_sim = ril_pre_sim,
 	.post_sim = ril_post_sim,
 	.post_online = ril_post_online,
+	.set_online = ril_set_online,
 };
 
 /*
@@ -357,10 +377,10 @@
 
 	if ((retval = ofono_modem_driver_register(&ril_driver))) {
 		DBG("ofono_modem_driver_register returned: %d", retval);
-                return retval;
-        }
+		return retval;
+	}
 
-        /* everything after _modem_driver_register, is
+	/* everything after _modem_driver_register, is
 	 * non-standard ( see udev comment above ).
 	 * usually called by undevng::create_modem
 	 *
@@ -376,7 +396,7 @@
 	retval = ofono_modem_register(modem);
 	DBG("ofono_modem_register returned: %d", retval);
 
-        /* kickstart the modem:
+	/* kickstart the modem:
 	 * causes core modem code to call
 	 * - set_powered(TRUE) - which in turn
 	 *   calls driver->enable()

=== modified file 'unit/test-grilrequest.c'
--- unit/test-grilrequest.c	2013-09-09 19:21:32 +0000
+++ unit/test-grilrequest.c	2013-10-04 03:07:28 +0000
@@ -165,6 +165,37 @@
 	.protocol = OFONO_GPRS_PROTO_IPV6,
 };
 
+/*
+ * 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] = {
+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+/*
+ * 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] = {
+	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+};
+
+static const gboolean power_off = FALSE;
+static const gboolean power_on = TRUE;
+
+static const struct request_test_data power_valid_test_1 = {
+	.request = &power_off,
+	.parcel_data = (guchar *) &req_power_off_valid_parcel1,
+	.parcel_size = 8,
+};
+
+static const struct request_test_data power_valid_test_2 = {
+	.request = &power_on,
+	.parcel_data = (guchar *) &req_power_on_valid_parcel2,
+	.parcel_size = 8,
+};
+
 static void test_deactivate_data_call_invalid(gconstpointer data)
 {
 	const struct req_deactivate_data_call *request = data;
@@ -234,6 +265,19 @@
 	/* TODO: add unit 3 tests to validate binary parcel result */
 }
 
+static void test_request_power_valid(gconstpointer data)
+{
+	const struct request_test_data *test_data = data;
+	const gboolean *online = test_data->request;
+	struct parcel rilp;
+
+	g_ril_request_power(NULL, *online, &rilp);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data, test_data->parcel_size));
+
+	parcel_free(&rilp);
+}
+
 int main(int argc, char **argv)
 {
 	g_test_init(&argc, &argv, NULL);
@@ -316,6 +360,16 @@
 				&req_setup_data_call_valid_4,
 				test_request_setup_data_call_valid);
 
+	g_test_add_data_func("/testgrilrequest/power: "
+				"valid POWER Test 1",
+				&power_valid_test_1,
+				test_request_power_valid);
+
+	g_test_add_data_func("/testgrilrequest/power: "
+				"valid POWER Test 1",
+				&power_valid_test_2,
+				test_request_power_valid);
+
 #endif
 	return g_test_run();
 }