Merge lp:~awe/phablet-extras/ofono-sim-support into lp:phablet-extras/ofono

[Tony Espy]

[RILD] Added basic SIM support.

This MP adds SIM support to rilmodem. Features include:

 * Basic SIM initilization ( no PIN/PUK support yet )

 * SIM filesystem read support ( required by SIM initialization code & GPRS )

 * SIM Subscriber Identity support ( ie. aka IMSI, now exposed as a SimManager property )

This MP also includes a re-working of the ril device plugin ( /plugins/ril.c ) due to the new SIM support. This sets the stage for eventual support of PIN/PUK support, and also allowed us to drop the set_online() function added to the core modem logic.

Tested on a Galaxy Nexus running yesterday's daily Quantal build. Verified the following:

 * oFono starts, and the ril plugin, and associated rilmodem code initialize properly
 * SimManager is now exported in the modem's Interfaces property ( tested with /tests/list-modems )
 * IMSI is exposed as a SimManager SubscriberIdentity property ( tested with /tests/list-modems )
 * Phone calls can be made/received
 * SMS messages can be sent/received
 * No obvious errors logged by oFono

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/8/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/8/rebuild

review: Approve (continuous-integration)

[lp:~awe/phablet-extras/ofono-sim-support]

41. By Tony Espy on 2013-04-12

[rilmodem] Fix problem with modem exit function.

42. By Tony Espy on 2013-04-12

[ril/rilmodem] Created a new changelog entry for SIM support.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/9/rebuild

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Please fix debian/changelog...

At the very least, are you keeping track of the precise patches applied? Is it mostly concentrated into some file additions and few actual code changes?

Since this has been all done flatly into an ofono branch, it's going to be very difficult/painful to get the changes out and into patches unless someone has been keeping track of what aspects have been changed.

[lp:~awe/phablet-extras/ofono-sim-support]

43. By Tony Espy on 2013-04-16

Fixed debian/changelog conflict.

[Tony Espy (awe)]

@Mathieu

I fixed the changelog, thanks for the catch!

As for patches:

1. This work is being done on a fresh, flattened version of the raring ofono branch ( itself based on ofono 1.12 ).

2. As oFono hasn't really been used in a default Ubuntu build to-date, tracking Precise patches has not been a priority.

3. Please review the telephony blueprint, as it has a work item for splitting out the oFono/RILD plugin code into a separate project, which will make it easier to deal with any required patches to the oFono core. For the sake of agility, I purposely chose to use a flattened bzr tree, as trying to do heavy development using patches is royal PITA. bzr tracks the changes made on top of the flattened source tree, so getting changes out into patches shouldn't be a problem if/when done.

4. We also will need a plan to deal with the fact that an oFono install on a desktop/laptop may be subtly different than a build on a phone. Again, this is a post Raring work item.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/10/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/10/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

273 + cb(&error, -1, -1, -1, NULL, EF_STATUS_INVALIDATED, cbd->data);
274 + return;

292 + cb(&error, -1, -1, -1, NULL, EF_STATUS_INVALIDATED, cbd->data);
293 + return;

Would prefer if both could use 'goto error' as well. The extra debug message can be printed right after the response result (and you can handle the free at the goto as well).

299 + if (response[0] == 0x62) {
300 + ok = sim_parse_3g_get_response(response, strlen((gchar *) response), &flen, &rlen,
301 + &str, access, NULL);
302 +
303 + file_status = EF_STATUS_VALID;
304 + } else
305 + ok = sim_parse_2g_get_response(response, strlen((gchar *) response), &flen, &rlen,
306 + &str, access, &file_status);
307 +
308 + g_free(response);
309 + }

Mind breaking this down in less columns? 80 should be a good target.

386 + decode_ril_error(&error, "FAIL");
387 + cb(&error, NULL, 0, cbd->data);

396 + decode_ril_error(&error, "FAIL");
397 + cb(&error, NULL, 0, cbd->data);

Could be handled in a single goto.

537 + DBG("g_ril_send failed...");

Mind removing this entry? Not generally used at the other calls, and the log will already point a failure when sending the command anyway.

When testing I also got quite a few GENERIC_FAILURE, not sure if they are critical though:

root@localhost:~# ofonod -d -n
ofonod[1023]: oFono version 1.12
ofonod[1023]: src/plugin.c:__ofono_plugin_init()
ofonod[1023]: plugins/push-notification.c:push_notification_init()
ofonod[1023]: plugins/smart-messaging.c:smart_messaging_init()
ofonod[1023]: src/cdma-provision.c:ofono_cdma_provision_driver_register() driver: 0xa76b0 name: CDMA provisioning
ofonod[1023]: src/gprs-provision.c:ofono_gprs_provision_driver_register() driver: 0xa7684 name: Provisioning
ofonod[1023]: src/cdma-voicecall.c:ofono_cdma_voicecall_driver_register() driver: 0xa762c, name: cdmamodem
ofonod[1023]: src/modem.c:ofono_devinfo_driver_register() driver: 0xa7654, name: cdmamodem
ofonod[1023]: src/cdma-connman.c:ofono_cdma_connman_driver_register() driver: 0xa7670, name: cdmamodem
ofonod[1023]: src/modem.c:ofono_modem_driver_register() driver: 0xa7594, name: phonesim
ofonod[1023]: src/modem.c:ofono_modem_driver_register() driver: 0xa75c4, name: localhfp
ofonod[1023]: src/gprs.c:ofono_gprs_context_driver_register() driver: 0xa757c, name: phonesim
ofonod[1023]: src/ctm.c:ofono_ctm_driver_register() driver: 0xa7568, name: phonesim
ofonod[1023]: plugins/phonesim.c:parse_config() filename /etc/ofono/phonesim.conf
ofonod[1023]: src/voicecall.c:ofono_voicecall_driver_register() driver: 0xa7484, name: hfpmodem
ofonod[1023]: src/modem.c:ofono_devinfo_driver_register() driver: 0xa7528, name: hfpmodem
ofonod[1023]: src/network.c:ofono_netreg_driver_register() driver: 0xa74dc, name: hfpmodem
ofonod[1023]: src/call-volume.c:ofono_call_volume_driver_register() driver: 0xa7510, name: hfpmodem
ofonod[1023]: src/handsfree.c:ofono_handsfree_driver_register() driver: 0xa7554, name: hfpmodem
ofonod[1023]: src/voicecall.c:ofono_voicecall_driver_register() driver: 0xa72e0, name: atmodem
ofonod[1023]: src/modem.c:ofono_devinfo_driver_register() driver: 0xa7378, name: atmodem
ofonod[1023]: src/call-barring.c:ofono_call_barring_driver_register() driver: 0xa7330, name...

review: Needs Fixing

[Ricardo Salveti (rsalveti)]

Using raring image from http://cdimage.ubuntu.com/ubuntu-touch-preview/daily-preinstalled/20130422/ on Mako. Didn't yet test on maguro.

[lp:~awe/phablet-extras/ofono-sim-support]

44. By Tony Espy on 2013-04-26

[rilmodem] Fix SIM IO response parsing.

[Tony Espy (awe)]

Cleaned up error handling/extraneous comments per review.

Also, turns out the SIM IO response is returned from RILD as a Parcel-based ASCII hexadecimal string which needs to be converted to a byte string ( eg. "00AF" --> 0x00AF ).

Re-tested on latest Raring build on maguro. Incoming/Outgoing phone calls and SMS messages worked as expected.

No testing on mako, due to that fact that I don't have a valid microSIM. I'm going to get my ATT SIM cutdown this afternoon.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/11/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/11/rebuild

review: Approve (continuous-integration)

[Tony Espy (awe)]

Looks like we have our first instance of device-specific RIL behavior. After testing the latest Raring build on my Nexus4, I'm seeing failures reading the IMSI ( Subscriber Identity ) and SIM IO calls.

Turns out the CM 10.1 source tree includes a QualcommSharedRIL.java class which looks like it overrides the IMSI and SIM IO logic. We'll need to discuss how we implement a similar mechanism.

I would hold off on further review until we can discuss further.

[lp:~awe/phablet-extras/ofono-sim-support]

45. By Tony Espy on 2013-05-15

[rilmodem] Re-factored SIM IO to use AID string (if present), and correctly set SIM file paths.

[Tony Espy (awe)]

Turns out that the mako RILD is Qualcomm-based, whereas maguro is Samsung-based.

The Qualcomm RIL code is sensitive to file paths ( ie. directory specifier ) that need to be specified in addition to the file ID. The Samsung RIL code doesn't really care and treats file paths as optional.

When the Raring oFono merge was done, I removed code that I'd written to handle paths and had made an incorrect assumption that since file path was added as a parameter to all of the file IO operations in the sim_driver, that the oFono core would correctly specify paths for each of it's file operations. This wasn't the case.

So, the latest code now uses the oFono ef_db to look up file paths ( which then have to be converted to ASCII hex ).

I also added support to grab the UMTS/GSM application ID (AID) and app type ( should always be USIM ) from the the SIM status reply. AID is another optional parameter for SIM file IO, so if correctly read from the SIM, it will be passed to all file IO calls.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/12/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/12/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Just some minor comments.

170 + /* Minimum length of SIM_IO_v6 is 12:

Here the struct parsed is actually RIL_SIM_IO_Response instead of SIM_IO_v6.

269 + if (aid_str && strlen(aid_str)) {

Why the extra check with strlen here? Parcel will return null in case it's invalid.

770 + if (app.app_id && strlen(app.app_id))
771 + sd->app_id = app.app_id;

Same here.

+ } else if (fileid == 0x2FE2 || fileid == 0x2FE0) {

Shouldn't 0x2FE2 be SIM_EF_ICCID_FILEID? It'd also be good to have a const for 0x2FE0.

474 + guchar file_status = 0x01;

If initialized with EF_STATUS_VALID (would be nice to replace it with the defined const), you don't need to set it to valid later (line 517).

Rest of the code looks good, we just need to improve the parcel handling and the power-on conditions (for emergency call, as you added as TODO).

Tested with mako an maguro using latest raring-based build. Old functionality still working as expected.

review: Needs Fixing

[lp:~awe/phablet-extras/ofono-sim-support]

46. By Tony Espy on 2013-05-20

[rildmodem] Minor changes from MP comments.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:46
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/13/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/13/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2013-04-09 18:34:11 +0000
+++ Makefile.am	2013-05-20 19:19:27 +0000
@@ -120,6 +120,7 @@
 			drivers/rilmodem/network-registration.c \
 			drivers/rilmodem/voicecall.c \
 			drivers/rilmodem/call-volume.c \
+			drivers/rilmodem/sim.c \
 			drivers/rilmodem/sms.c \
 			drivers/rilmodem/rilutil.c \
 			drivers/rilmodem/rilutil.h

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-11 01:25:19 +0000
+++ debian/changelog	2013-05-20 19:19:27 +0000
@@ -1,3 +1,11 @@
+ofono (1.12phablet2) UNRELEASED; urgency=low
+
+  * [ril/rilmodem] Initial SIM support, includes:
+   - read filesystem support
+   - proper modem initialization
+
+ -- Tony Espy <[e-mail]>  Fri, 12 Apr 2013 14:56:01 -0400
+
 ofono (1.12phablet1) raring; urgency=low
 
   [ Ricardo Salveti de Araujo ]

=== modified file 'drivers/rilmodem/call-volume.c'
--- drivers/rilmodem/call-volume.c	2013-03-28 12:50:26 +0000
+++ drivers/rilmodem/call-volume.c	2013-05-20 19:19:27 +0000
@@ -153,6 +153,16 @@
 
 	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.
+	 */
 	g_timeout_add_seconds(2, ril_delayed_register, cv);
 
 	return 0;

=== modified file 'drivers/rilmodem/devinfo.c'
--- drivers/rilmodem/devinfo.c	2013-03-28 12:50:26 +0000
+++ drivers/rilmodem/devinfo.c	2013-05-20 19:19:27 +0000
@@ -128,13 +128,15 @@
 
 	DBG("");
 
-        /* Nothing to send...
+        /*
+	 * 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 devinfo_create() which
-	 * calls this function.  Most other drivers use a 
-	 * callback after getting some return from the modem
-	 * itself...
+	 * 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.
 	 */
         g_timeout_add_seconds(1, ril_delayed_register, info);
 

=== modified file 'drivers/rilmodem/network-registration.c'
--- drivers/rilmodem/network-registration.c	2013-03-28 12:50:26 +0000
+++ drivers/rilmodem/network-registration.c	2013-05-20 19:19:27 +0000
@@ -548,11 +548,15 @@
 	nd->time.utcoff = 0;
 	ofono_netreg_set_data(netreg, nd);
 
-        /* ofono_netreg_register() needs to be called after
-	 * the driver has been set in devinfo_create() which
-	 * calls this function.  Most other drivers use a 
-	 * callback after getting some return from the modem
-	 * itself...
+        /*
+	 * TODO: analyze if capability check is needed
+	 * and/or timer should be adjusted.
+	 *
+	 * ofono_netreg_register() needs to be called after
+	 * the driver has been set in ofono_netreg_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.
 	 */
         g_timeout_add_seconds(1, ril_delayed_register, netreg);
 

=== modified file 'drivers/rilmodem/rilmodem.c'
--- drivers/rilmodem/rilmodem.c	2013-03-28 12:50:26 +0000
+++ drivers/rilmodem/rilmodem.c	2013-05-20 19:19:27 +0000
@@ -38,6 +38,7 @@
 	DBG("");
 
 	ril_devinfo_init();
+	ril_sim_init();
 	ril_voicecall_init();
 	ril_sms_init();
 	ril_netreg_init();
@@ -51,6 +52,7 @@
 	DBG("");
 
 	ril_devinfo_exit();
+	ril_sim_exit();
 	ril_voicecall_exit();
 	ril_sms_exit();
 	ril_netreg_exit();

=== modified file 'drivers/rilmodem/rilmodem.h'
--- drivers/rilmodem/rilmodem.h	2013-03-28 12:50:26 +0000
+++ drivers/rilmodem/rilmodem.h	2013-05-20 19:19:27 +0000
@@ -22,6 +22,10 @@
 
 #include "rilutil.h"
 
+/* Shared constants */
+#define EF_STATUS_INVALIDATED 0
+#define EF_STATUS_VALID 1
+
 extern void ril_devinfo_init(void);
 extern void ril_devinfo_exit(void);
 
@@ -31,6 +35,9 @@
 extern void ril_voicecall_init(void);
 extern void ril_voicecall_exit(void);
 
+extern void ril_sim_init(void);
+extern void ril_sim_exit(void);
+
 extern void ril_sms_init(void);
 extern void ril_sms_exit(void);
 

=== modified file 'drivers/rilmodem/rilutil.c'
--- drivers/rilmodem/rilutil.c	2013-03-28 12:50:26 +0000
+++ drivers/rilmodem/rilutil.c	2013-05-20 19:19:27 +0000
@@ -36,6 +36,9 @@
 #include "common.h"
 #include "rilutil.h"
 #include "parcel.h"
+#include "simutil.h"
+#include "util.h"
+#include "ril_constants.h"
 
 struct ril_util_sim_state_query {
 	GRil *ril;
@@ -215,6 +218,141 @@
 	return l;
 }
 
+char *ril_util_parse_sim_io_rsp(struct ril_msg *message,
+				int *sw1, int *sw2,
+				int *hex_len)
+{
+	struct parcel rilp;
+	char *response = NULL;
+	char *hex_response = NULL;
+
+	/* Minimum length of SIM_IO_Response is 12:
+	 * sw1 (int32)
+	 * sw2 (int32)
+	 * simResponse (string)
+	 */
+	if (message->buf_len < 12) {
+		DBG("message->buf_len < 12");
+		return FALSE;
+	}
+
+	/* Set up Parcel struct for proper parsing */
+	rilp.data = message->buf;
+	rilp.size = message->buf_len;
+	rilp.capacity = message->buf_len;
+	rilp.offset = 0;
+
+	*sw1 = parcel_r_int32(&rilp);
+	*sw2 = parcel_r_int32(&rilp);
+
+	response = parcel_r_string(&rilp);
+	if (response) {
+		hex_response = (char *) decode_hex((const char *) response, strlen(response),
+							(long *) hex_len, -1);
+		g_free(response);
+	}
+
+	return hex_response;
+}
+
+gboolean ril_util_parse_sim_status(struct ril_msg *message, struct sim_app *app)
+{
+	struct parcel rilp;
+	gboolean result = FALSE;
+	char *aid_str = NULL;
+	char *app_str = NULL;
+	int i, card_state, num_apps, pin_state, gsm_umts_index, ims_index;
+	int app_state, app_type, pin_replaced, pin1_state, pin2_state;
+
+	DBG("");
+
+	if (app) {
+		app->app_type = RIL_APPTYPE_UNKNOWN;
+		app->app_id = NULL;
+	}
+
+	/* Set up Parcel struct for proper parsing */
+	rilp.data = message->buf;
+	rilp.size = message->buf_len;
+	rilp.capacity = message->buf_len;
+	rilp.offset = 0;
+
+	/*
+	 * FIXME: Need to come up with a common scheme for verifying the
+	 * size of RIL message and properly reacting to bad messages.
+	 * This could be a runtime assertion, disconnect, drop/ignore
+	 * the message, ...
+	 *
+	 * Currently if the message is smaller than expected, our parcel
+	 * code happily walks off the end of the buffer and segfaults.
+	 *
+	 * 20 is the min length of RIL_CardStatus_v6 as the AppState
+	 * array can be 0-length.
+	 */
+	if (message->buf_len < 20)
+		goto done;
+
+	card_state = parcel_r_int32(&rilp);
+	pin_state = parcel_r_int32(&rilp);
+	gsm_umts_index = parcel_r_int32(&rilp);
+	parcel_r_int32(&rilp); /* ignore: cdma_subscription_app_index */
+	ims_index = parcel_r_int32(&rilp);
+	num_apps = parcel_r_int32(&rilp);
+
+	for (i = 0; i < num_apps; i++) {
+		app_type = parcel_r_int32(&rilp);
+		app_state = parcel_r_int32(&rilp);
+		parcel_r_int32(&rilp);        /* Ignore perso_substate for now */
+
+		/* TODO: we need a way to instruct parcel to skip
+		 * a string, without allocating memory...
+		 */
+		aid_str = parcel_r_string(&rilp); /* application ID (AID) */
+		app_str = parcel_r_string(&rilp); /* application label */
+
+		pin_replaced = parcel_r_int32(&rilp);
+		pin1_state = parcel_r_int32(&rilp);
+		pin2_state = parcel_r_int32(&rilp);
+
+		DBG("SIM app type: %s state: %s",
+			ril_apptype_to_string(app_type),
+			ril_appstate_to_string(app_state));
+
+		DBG("pin_replaced: %d pin1_state: %s pin2_state: %s",
+			pin_replaced,
+			ril_pinstate_to_string(pin1_state),
+			ril_pinstate_to_string(pin2_state));
+
+		/* FIXME: CDMA/IMS -- see comment @ top-of-source. */
+		if (i == gsm_umts_index && app) {
+			if (aid_str) {
+				app->app_id = aid_str;
+				DBG("setting app_id (AID) to: %s", aid_str);
+			}
+
+			app->app_type = app_type;
+		} else
+			g_free(aid_str);
+
+		g_free(app_str);
+	}
+
+	DBG("card_state: %s (%d) pin_state: %s (%d) num_apps: %d",
+		ril_cardstate_to_string(card_state),
+		card_state,
+		ril_pinstate_to_string(pin_state),
+		pin_state,
+		num_apps);
+
+	DBG("gsm_umts_index: %d; ims_index: %d",
+		gsm_umts_index, ims_index);
+
+	if (card_state == RIL_CARDSTATE_PRESENT)
+		result = TRUE;
+done:
+	return result;
+}
+
 gboolean ril_util_parse_reg(struct ril_msg *message, int *status,
 				int *lac, int *ci, int *tech)
 {

=== modified file 'drivers/rilmodem/rilutil.h'
--- drivers/rilmodem/rilutil.h	2013-03-28 12:50:26 +0000
+++ drivers/rilmodem/rilutil.h	2013-05-20 19:19:27 +0000
@@ -49,6 +49,11 @@
 	RIL_UTIL_CHARSET_8859_H =	0x10000,
 };
 
+struct sim_app {
+	char *app_id;
+	guint app_type;
+};
+
 typedef void (*ril_util_sim_inserted_cb_t)(gboolean present, void *userdata);
 
 void decode_ril_error(struct ofono_error *error, const char *final);
@@ -65,7 +70,10 @@
 void ril_util_sim_state_query_free(struct ril_util_sim_state_query *req);
 
 GSList *ril_util_parse_clcc(struct ril_msg *message);
-
+char *ril_util_parse_sim_io_rsp(struct ril_msg *message,
+				int *sw1, int *sw2,
+				int *hex_len);
+gboolean ril_util_parse_sim_status(struct ril_msg *message, struct sim_app *app);
 gboolean ril_util_parse_reg(struct ril_msg *message, int *status,
 				int *lac, int *ci, int *tech);
 

=== added file 'drivers/rilmodem/sim.c'
--- drivers/rilmodem/sim.c	1970-01-01 00:00:00 +0000
+++ drivers/rilmodem/sim.c	2013-05-20 19:19:27 +0000
@@ -0,0 +1,552 @@
+/*
+ *
+ *  oFono - Open Source Telephony - RIL Modem Support
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2013 Canonical, Ltd. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/sim.h>
+#include "simutil.h"
+#include "util.h"
+
+#include "gril.h"
+#include "grilutil.h"
+#include "parcel.h"
+#include "ril_constants.h"
+#include "rilmodem.h"
+
+/* Based on ../drivers/atmodem/sim.c.
+ *
+ * TODO:
+ * 1. Defines constants for hex literals
+ * 2. Document P1-P3 usage (+CSRM)
+ */
+
+/* Commands defined for TS 27.007 +CRSM */
+#define CMD_READ_BINARY   176 /* 0xB0   */
+#define CMD_READ_RECORD   178 /* 0xB2   */
+#define CMD_GET_RESPONSE  192 /* 0xC0   */
+#define CMD_UPDATE_BINARY 214 /* 0xD6   */
+#define CMD_UPDATE_RECORD 220 /* 0xDC   */
+#define CMD_STATUS        242 /* 0xF2   */
+#define CMD_RETRIEVE_DATA 203 /* 0xCB   */
+#define CMD_SET_DATA      219 /* 0xDB   */
+
+/* FID/path of SIM/USIM root directory */
+#define ROOTMF "3F00"
+
+/*
+ * TODO: CDMA/IMS
+ *
+ * This code currently only grabs the AID/application ID from
+ * the gsm_umts application on the SIM card.  This code will
+ * need to be modified for CDMA support, and possibly IMS-based
+ * applications.  In this case, app_id should be changed to an
+ * array or HashTable of app_status structures.
+ *
+ * The same applies to the app_type.
+ */
+struct sim_data {
+	GRil *ril;
+	char *app_id;
+	guint app_type;
+};
+
+static void sim_debug(const gchar *str, gpointer user_data)
+{
+	const char *prefix = user_data;
+
+	ofono_info("%s%s", prefix, str);
+}
+
+static void set_path(struct sim_data *sd, struct parcel *rilp,
+			const int fileid, const guchar *path,
+			const guint path_len)
+{
+	guchar db_path[6] = { 0x00 };
+	char *hex_path = NULL;
+	int len = 0;
+
+	if (path_len > 0 && path_len < 7) {
+		memcpy(db_path, path, path_len);
+		len = path_len;
+	} else if (sd->app_type == RIL_APPTYPE_USIM) {
+		len = sim_ef_db_get_path_3g(fileid, db_path);
+	} else if (sd->app_type == RIL_APPTYPE_SIM) {
+		len = sim_ef_db_get_path_2g(fileid, db_path);
+	} else {
+		DBG("Unsupported app_type: 0%x", sd->app_type);
+	}
+
+	if (len > 0) {
+		hex_path = encode_hex(db_path, len, 0);
+		parcel_w_string(rilp, (char *) hex_path);
+		DBG("encoded path is: %s", hex_path);
+		g_free(hex_path);
+	} else if (fileid == SIM_EF_ICCID_FILEID || fileid == SIM_EFPL_FILEID) {
+		/*
+		 * Special catch-all for EF_ICCID (unique card ID)
+		 * and EF_PL files which exist in the root directory.
+		 * As the sim_info_cb function may not have yet
+		 * recorded the app_type for the SIM, and the path
+		 * for both files is the same for 2g|3g, just hard-code.
+		 *
+		 * See 'struct ef_db' in:
+		 * ../../src/simutil.c for more details.
+		 */
+		parcel_w_string(rilp, (char *) ROOTMF);
+		DBG("encoded path is: %s", ROOTMF);
+	}
+}
+
+static void ril_file_info_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_file_info_cb_t cb = cbd->cb;
+	struct ofono_error error;
+	gboolean ok = FALSE;
+	int sw1 = 0, sw2 = 0, response_len = 0;
+	int flen = 0, rlen = 0, str = 0;
+	guchar *response = NULL;
+	guchar access[3] = { 0x00, 0x00, 0x00 };
+	guchar file_status = EF_STATUS_VALID;
+
+	DBG("");
+
+	if (message->error == RIL_E_SUCCESS) {
+		decode_ril_error(&error, "OK");
+	} else {
+		DBG("Reply failure: %s", ril_error_to_string(message->error));
+		decode_ril_error(&error, "FAIL");
+		goto error;
+	}
+
+	if ((response = (guchar *)
+		ril_util_parse_sim_io_rsp(message,
+						&sw1,
+						&sw2,
+						&response_len)) == NULL) {
+		DBG("Can't parse SIM IO response from RILD");
+		decode_ril_error(&error, "FAIL");
+		goto error;
+	}
+
+	if ((sw1 != 0x90 && sw1 != 0x91 && sw1 != 0x92 && sw1 != 0x9f) ||
+		(sw1 == 0x90 && sw2 != 0x00)) {
+		DBG("Error reply, invalid values: sw1: %02x sw2: %02x", sw1, sw2);
+		memset(&error, 0, sizeof(error));
+
+		/* TODO: fix decode_ril_error to take type & error */
+
+		error.type = OFONO_ERROR_TYPE_SIM;
+		error.error = (sw1 << 8) | sw2;
+
+		goto error;
+	}
+
+	if (response_len) {
+		g_ril_util_debug_hexdump(FALSE, response, response_len,
+						sim_debug, "sim response: ");
+
+		if (response[0] == 0x62) {
+			ok = sim_parse_3g_get_response(response, response_len,
+							&flen, &rlen, &str, access, NULL);
+		} else
+			ok = sim_parse_2g_get_response(response, response_len,
+							&flen, &rlen, &str, access, &file_status);
+	}
+
+	if (!ok) {
+		DBG("parse response failed");
+		decode_ril_error(&error, "FAIL");
+		goto error;
+	}
+
+	cb(&error, flen, str, rlen, access, file_status, cbd->data);
+	g_free(response);
+	return;
+
+error:
+	cb(&error, -1, -1, -1, NULL, EF_STATUS_INVALIDATED, cbd->data);
+	g_free(response);
+}
+
+static void ril_sim_read_info(struct ofono_sim *sim, int fileid,
+				const unsigned char *path, unsigned int path_len,
+				ofono_sim_file_info_cb_t cb,
+				void *data)
+{
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	int ret;
+
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, CMD_GET_RESPONSE);
+	parcel_w_int32(&rilp, fileid);
+
+	set_path(sd, &rilp, fileid, path, path_len);
+
+	DBG("fileid: %s (%x)", sim_fileid_to_string(fileid), fileid);
+
+	parcel_w_int32(&rilp, 0);           /* P1 */
+	parcel_w_int32(&rilp, 0);           /* P2 */
+
+	/*
+	 * TODO: review parameters values used by Android.
+	 * The values of P1-P3 in this code were based on
+	 * values used by the atmodem driver impl.
+	 *
+	 * NOTE:
+	 * GET_RESPONSE_EF_SIZE_BYTES == 15; !255
+	 */
+	parcel_w_int32(&rilp, 15);         /* P3 - max length */
+	parcel_w_string(&rilp, NULL);       /* data; only req'd for writes */
+	parcel_w_string(&rilp, NULL);       /* pin2; only req'd for writes */
+	parcel_w_string(&rilp, sd->app_id); /* AID (Application ID) */
+
+	ret = g_ril_send(sd->ril,
+				RIL_REQUEST_SIM_IO,
+				rilp.data,
+				rilp.size,
+				ril_file_info_cb, cbd, g_free);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, -1, -1, -1, NULL,
+				EF_STATUS_INVALIDATED, data);
+	}
+}
+
+static void ril_file_io_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_read_cb_t cb = cbd->cb;
+	struct ofono_error error;
+	int sw1 = 0, sw2 = 0, response_len = 0;
+	guchar *response = NULL;
+
+	DBG("");
+
+	if (message->error == RIL_E_SUCCESS) {
+		decode_ril_error(&error, "OK");
+	} else {
+		DBG("RILD reply failure: %s", ril_error_to_string(message->error));
+		goto error;
+	}
+
+	if ((response = (guchar *)
+		ril_util_parse_sim_io_rsp(message,
+						&sw1,
+						&sw2,
+						&response_len)) == NULL) {
+		DBG("Error parsing IO response");
+		goto error;
+	}
+
+	cb(&error, response, response_len, cbd->data);
+	g_free(response);
+	return;
+
+error:
+	decode_ril_error(&error, "FAIL");
+	cb(&error, NULL, 0, cbd->data);
+}
+
+static void ril_sim_read_binary(struct ofono_sim *sim, int fileid,
+				int start, int length,
+				const unsigned char *path, unsigned int path_len,
+				ofono_sim_read_cb_t cb, void *data)
+{
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	int ret;
+
+	DBG("fileid: %s (%x) path: %s", sim_fileid_to_string(fileid),
+		fileid, path);
+
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, CMD_READ_BINARY);
+	parcel_w_int32(&rilp, fileid);
+
+	set_path(sd, &rilp, fileid, path, path_len);
+
+	parcel_w_int32(&rilp, (start >> 8));   /* P1 */
+	parcel_w_int32(&rilp, (start & 0xff)); /* P2 */
+	parcel_w_int32(&rilp, length);         /* P3 */
+	parcel_w_string(&rilp, NULL);          /* data; only req'd for writes */
+	parcel_w_string(&rilp, NULL);          /* pin2; only req'd for writes */
+	parcel_w_string(&rilp, sd->app_id);    /* AID (Application ID) */
+
+	ret = g_ril_send(sd->ril,
+				RIL_REQUEST_SIM_IO,
+				rilp.data,
+				rilp.size,
+				ril_file_io_cb, cbd, g_free);
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, NULL, 0, data);
+	}
+}
+
+static void ril_sim_read_record(struct ofono_sim *sim, int fileid,
+				int record, int length,
+				const unsigned char *path, unsigned int path_len,
+				ofono_sim_read_cb_t cb, void *data)
+{
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	int ret;
+
+	DBG("fileid: %s (%x) path: %s", sim_fileid_to_string(fileid),
+		fileid, path);
+
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, CMD_READ_RECORD);
+	parcel_w_int32(&rilp, fileid);
+
+	set_path(sd, &rilp, fileid, path, path_len);
+
+	parcel_w_int32(&rilp, record);      /* P1 */
+	parcel_w_int32(&rilp, 4);           /* P2 */
+	parcel_w_int32(&rilp, length);      /* P3 */
+	parcel_w_string(&rilp, NULL);       /* data; only req'd for writes */
+	parcel_w_string(&rilp, NULL);       /* pin2; only req'd for writes */
+	parcel_w_string(&rilp, sd->app_id); /* AID (Application ID) */
+
+	ret = g_ril_send(sd->ril,
+				RIL_REQUEST_SIM_IO,
+				rilp.data,
+				rilp.size,
+				ril_file_io_cb, cbd, g_free);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, NULL, 0, data);
+	}
+}
+
+static void ril_imsi_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_imsi_cb_t cb = cbd->cb;
+	struct ofono_error error;
+	struct parcel rilp;
+	gchar *imsi;
+
+	if (message->error == RIL_E_SUCCESS) {
+		DBG("GET IMSI reply - OK");
+		decode_ril_error(&error, "OK");
+	} else {
+		DBG("Reply failure: %s", ril_error_to_string(message->error));
+		decode_ril_error(&error, "FAIL");
+		cb(&error, NULL, cbd->data);
+		return;
+	}
+
+	/* Set up Parcel struct for proper parsing */
+	rilp.data = message->buf;
+	rilp.size = message->buf_len;
+	rilp.capacity = message->buf_len;
+	rilp.offset = 0;
+
+        /* 15 is the max length of IMSI
+	 * add 4 bytes for string length */
+        /* FIXME: g_assert(message->buf_len <= 19); */
+
+	imsi = parcel_r_string(&rilp);
+
+	DBG("ril_imsi_cb: IMSI: %s", imsi);
+
+	cb(&error, imsi, cbd->data);
+	g_free(imsi);
+}
+
+static void ril_read_imsi(struct ofono_sim *sim, ofono_sim_imsi_cb_t cb,
+				void *data)
+{
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	int ret;
+
+	DBG("");
+
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, 1);            /* Number of params */
+	parcel_w_string(&rilp, sd->app_id);  /* AID (Application ID) */
+
+	ret = g_ril_send(sd->ril, RIL_REQUEST_GET_IMSI,
+				rilp.data, rilp.size, ril_imsi_cb, cbd, g_free);
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, NULL, data);
+	}
+}
+
+static void sim_status_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_sim *sim = user_data;
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct sim_app app;
+
+	DBG("");
+
+	if (ril_util_parse_sim_status(message, &app)) {
+		if (app.app_id)
+			sd->app_id = app.app_id;
+
+		if (app.app_type != RIL_APPTYPE_UNKNOWN)
+			sd->app_type = app.app_type;
+	}
+}
+
+static int send_get_sim_status(struct ofono_sim *sim)
+{
+	struct sim_data *sd = ofono_sim_get_data(sim);
+
+	return g_ril_send(sd->ril, RIL_REQUEST_GET_SIM_STATUS,
+				NULL, 0, sim_status_cb, sim, NULL);
+}
+
+static gboolean ril_sim_register(gpointer user)
+{
+	struct ofono_sim *sim = user;
+
+	DBG("");
+
+	send_get_sim_status(sim);
+
+	/* TODO: consider replacing idle call of register
+	 * with call in sim_status_cb().
+	 */
+	ofono_sim_register(sim);
+
+	return FALSE;
+}
+
+static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,
+				void *data)
+{
+	GRil *ril = data;
+	struct sim_data *sd;
+
+	DBG("");
+
+	sd = g_new0(struct sim_data, 1);
+	sd->ril = g_ril_clone(ril);
+	sd->app_id = NULL;
+	sd->app_type = RIL_APPTYPE_UNKNOWN;
+
+	ofono_sim_set_data(sim, sd);
+
+        /*
+	 * TODO: analyze if capability check is needed
+	 * and/or timer should be adjusted.
+	 *
+	 * ofono_sim_register() needs to be called after the
+	 * driver has been set in ofono_sim_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 an idle event
+	 * instead.
+	 */
+	g_idle_add(ril_sim_register, sim);
+
+	return 0;
+}
+
+static void ril_sim_remove(struct ofono_sim *sim)
+{
+	struct sim_data *sd = ofono_sim_get_data(sim);
+
+	ofono_sim_set_data(sim, NULL);
+
+	g_ril_unref(sd->ril);
+	g_free(sd);
+}
+
+static struct ofono_sim_driver driver = {
+	.name			= "rilmodem",
+	.probe                  = ril_sim_probe,
+	.remove                 = ril_sim_remove,
+	.read_file_info		= ril_sim_read_info,
+	.read_file_transparent	= ril_sim_read_binary,
+	.read_file_linear	= ril_sim_read_record,
+	.read_file_cyclic	= ril_sim_read_record,
+ 	.read_imsi		= ril_read_imsi,
+/*
+ * TODO: Implmenting PIN/PUK support requires defining
+ * the following driver methods.
+ *
+ * In the meanwhile, as long as the SIM card is present,
+ * and unlocked, the core SIM code will check for the
+ * presence of query_passwd_state, and if null, then the
+ * function sim_initialize_after_pin() is called.
+ *
+ *	.query_passwd_state	= ril_pin_query,
+ *	.query_pin_retries	= ril_pin_retries_query,
+ *	.send_passwd		= ril_pin_send,
+ *	.reset_passwd		= ril_pin_send_puk,
+ *	.lock			= ril_pin_enable,
+ *	.change_passwd		= ril_change_passwd,
+ *	.query_locked		= ril_pin_query_enabled,
+ *
+ * TODO: Implementing SIM write file IO support requires
+ * the following functions to be defined.
+ *
+ *	.write_file_transparent	= ril_sim_update_binary,
+ *	.write_file_linear	= ril_sim_update_record,
+ *	.write_file_cyclic	= ril_sim_update_cyclic,
+ */
+};
+
+void ril_sim_init(void)
+{
+	DBG("");
+	ofono_sim_driver_register(&driver);
+}
+
+void ril_sim_exit(void)
+{
+	ofono_sim_driver_unregister(&driver);
+}

=== modified file 'drivers/rilmodem/sms.c'
--- drivers/rilmodem/sms.c	2013-03-28 12:50:26 +0000
+++ drivers/rilmodem/sms.c	2013-05-20 19:19:27 +0000
@@ -309,11 +309,15 @@
 
 	ofono_sms_set_data(sms, data);
 
-	/* ofono_devinfo_register() needs to be called after
-	 * the driver has been set in devinfo_create() which
-	 * calls this function.  Most other drivers use a
-	 * callback after getting some return from the modem
-	 * itself...
+        /*
+	 * 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.
 	 */
         g_timeout_add_seconds(2, ril_delayed_register, sms);
 

=== modified file 'drivers/rilmodem/voicecall.c'
--- drivers/rilmodem/voicecall.c	2013-03-28 12:50:26 +0000
+++ drivers/rilmodem/voicecall.c	2013-05-20 19:19:27 +0000
@@ -486,11 +486,15 @@
 
 	ofono_voicecall_set_data(vc, vd);
 
-	/* ofono_devinfo_register() needs to be called after
-	 * the driver has been set in devinfo_create() which
-	 * calls this function.  Most other drivers use a
-	 * callback after getting some return from the modem
-	 * itself...
+        /*
+	 * TODO: analyze if capability check is needed
+	 * and/or timer should be adjusted.
+	 *
+	 * 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
+	 * call register in the callback; we use a timer instead.
 	 */
         g_timeout_add_seconds(2, ril_delayed_register, vc);
 

=== modified file 'gril/grilutil.c'
--- gril/grilutil.c	2013-03-28 12:50:26 +0000
+++ gril/grilutil.c	2013-05-20 19:19:27 +0000
@@ -88,6 +88,47 @@
 	}
 }
 
+const char *ril_error_to_string(int error)
+{
+
+	switch (error) {
+	case RIL_E_SUCCESS:
+		return "SUCCESS";
+	case RIL_E_RADIO_NOT_AVAILABLE:
+		return "RADIO_NOT_AVAILABLE";
+	case RIL_E_GENERIC_FAILURE:
+		return "GENERIC_FAILURE";
+	case  RIL_E_PASSWORD_INCORRECT:
+		return "PASSWORD_INCORRECT";
+	case  RIL_E_SIM_PIN2:
+		return "SIM_PIN2";
+	case  RIL_E_SIM_PUK2:
+		return "SIM_PUK2";
+	case  RIL_E_REQUEST_NOT_SUPPORTED:
+		return "REQUEST_NOT_SUPPORTED";
+	case  RIL_E_CANCELLED:
+		return "CANCELLED";
+	case  RIL_E_OP_NOT_ALLOWED_DURING_VOICE_CALL:
+		return "OP_NOT_ALLOWED_DURING_VOICE_CALL";
+	case  RIL_E_OP_NOT_ALLOWED_BEFORE_REG_TO_NW:
+		return "OP_NOT_ALLOWED_BEFORE_REG_TO_NW";
+	case  RIL_E_SMS_SEND_FAIL_RETRY:
+		return "SMS_SEND_FAIL_RETRY";
+	case  RIL_E_SIM_ABSENT:
+		return "SIM_ABSENT";
+	case  RIL_E_SUBSCRIPTION_NOT_AVAILABLE:
+		return "SUBSCRIPTION_NOT_AVAILABLE";
+	case  RIL_E_MODE_NOT_SUPPORTED:
+		return "MODE_NOT_SUPPORTED";
+	case  RIL_E_FDN_CHECK_FAILURE:
+		return "FDN_CHECK_FAILURE";
+	case  RIL_E_ILLEGAL_SIM_OR_ME:
+		return "ILLEGAL_SIM_OR_ME";
+	default:
+		return "<Unknown Error>";
+	}
+}
+
 const char *ril_pinstate_to_string(int pin_state)
 {
 	switch (pin_state) {

=== modified file 'gril/grilutil.h'
--- gril/grilutil.h	2013-03-28 12:50:26 +0000
+++ gril/grilutil.h	2013-05-20 19:19:27 +0000
@@ -32,6 +32,7 @@
 const char *ril_appstate_to_string(int app_state);
 const char *ril_apptype_to_string(int app_type);
 const char *ril_cardstate_to_string(int card_state);
+const char *ril_error_to_string(int error);
 const char *ril_pinstate_to_string(int pin_state);
 const char *ril_request_id_to_string(int req);
 

=== modified file 'plugins/ril.c'
--- plugins/ril.c	2013-03-28 12:50:26 +0000
+++ plugins/ril.c	2013-05-20 19:19:27 +0000
@@ -58,23 +58,12 @@
 
 #define MAX_POWER_ON_RETRIES 5
 
-enum {
-	SIM_STATE_INVALID_OR_LOCKED =	0,
-	SIM_STATE_VALID =		1,
-	SIM_STATE_INVALID_CS =		2,
-	SIM_STATE_INVALID_PS =		3,
-	SIM_STATE_INVALID_PS_AND_CS =	4,
-	SIM_STATE_ROMSIM =		240,
-	SIM_STATE_NOT_EXISTENT =	255,
-};
-
 struct ril_data {
 	const char *ifname;
 	GRil *modem;
-	int sim_state;
 	int power_on_retries;
 
-	ofono_bool_t enabled;
+	ofono_bool_t have_sim;
 	ofono_bool_t online;
 	ofono_bool_t reported;
 };
@@ -88,23 +77,6 @@
 	ofono_info("%s%s", prefix, str);
 }
 
-static void report_powered(struct ofono_modem *modem, struct ril_data *ril,
-				ofono_bool_t powered)
-{
-	if (powered == ril->reported) {
-		DBG("powered == reported; returning");
-		return;
-	}
-
-	DBG("%s", powered ? "Powered on"
-		: ril->enabled ? "Reset"
-		: "Powered off");
-
-	ril->reported = powered;
-	ofono_modem_set_powered(modem, powered);
-
-}
-
 static void power_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
@@ -120,9 +92,8 @@
 		else
 			ofono_error("Max retries for radio power on exceeded!");
 	} else {
-		DBG("Radio POWER-ON OK, setting modem online.");
-
-		ofono_modem_set_online(modem, TRUE);
+		DBG("Radio POWER-ON OK, calling set_powered(TRUE).");
+		ofono_modem_set_powered(modem, TRUE);
 	}
 }
 
@@ -151,45 +122,20 @@
 {
 	struct ofono_modem *modem = user_data;
 	struct ril_data *ril = ofono_modem_get_data(modem);
-	struct parcel rilp;
-	int card_state, num_apps, pin_state;
 
 	DBG("");
 
-	/* Set up Parcel struct for proper parsing */
-	rilp.data = message->buf;
-	rilp.size = message->buf_len;
-	rilp.capacity = message->buf_len;
-	rilp.offset = 0;
-
-        /* 20 is the min length of RIL_CardStatus_v6
-	 * as the AppState array can be 0-len */
-	g_assert(message->buf_len >= 20);
-
-	card_state = parcel_r_int32(&rilp);
-	pin_state = parcel_r_int32(&rilp);
-	parcel_r_int32(&rilp); /* ignore: gsm_umts_subscription_app_index */
-	parcel_r_int32(&rilp); /* ignore: cdma_subscription_app_index */
-	parcel_r_int32(&rilp); /* ignore: ims_subscription_app_index */
-	num_apps = parcel_r_int32(&rilp);
-
-        /* skip AppState array */
-
-	if (card_state == RIL_CARDSTATE_PRESENT) {
+	/* Returns TRUE if cardstate == PRESENT */
+	if (ril_util_parse_sim_status(message, NULL)) {
+		DBG("have_sim = TRUE; powering on modem.");
 
 		/* TODO: check PinState=DISABLED, for now just
 		 * set state to valid... */
-		ril->sim_state = SIM_STATE_VALID;
-
+		ril->have_sim = TRUE;
 		power_on(modem);
 	}
 
-	DBG("card_state: %s (%d) pin_state: %s (%d) num_apps: %d",
-		ril_cardstate_to_string(card_state),
-		card_state,
-		ril_pinstate_to_string(pin_state),
-		pin_state,
-		num_apps);
+	/* TODO: handle emergency calls if SIM !present or locked */
 }
 
 static int send_get_sim_status(struct ofono_modem *modem)
@@ -251,13 +197,16 @@
 static void ril_pre_sim(struct ofono_modem *modem)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
+	struct ofono_sim *sim;
 
 	DBG("(%p) with %s", modem, ril->ifname);
 
+	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);
 
-	send_get_sim_status(modem);
+	if (sim && ril->have_sim)
+		ofono_sim_inserted_notify(sim, TRUE);
 }
 
 static void ril_post_sim(struct ofono_modem *modem)
@@ -265,6 +214,14 @@
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
 	DBG("(%p) with %s", modem, ril->ifname);
+
+	/* TODO: this function should setup:
+	 *  - phonebook
+	 *  - stk ( SIM toolkit )
+	 *  - radio_settings (why?)
+	 *  - sms ( this could go to post_online ); ask ofono upstream...
+	 */
+	ofono_sms_create(modem, 0, "rilmodem", ril->modem);
 }
 
 static void ril_post_online(struct ofono_modem *modem)
@@ -275,7 +232,6 @@
 
 	ofono_call_volume_create(modem, 0, "rilmodem", ril->modem);
 	ofono_netreg_create(modem, 0, "rilmodem", ril->modem);
-	ofono_sms_create(modem, 0, "rilmodem", ril->modem);
 }
 
 static int ril_enable(struct ofono_modem *modem)
@@ -284,8 +240,7 @@
 
 	DBG("modem=%p with %s", modem, ril ? ril->ifname : NULL);
 
-	ril->enabled = TRUE;
-	ril->sim_state = SIM_STATE_NOT_EXISTENT;
+	ril->have_sim = FALSE;
 
         ril->modem = g_ril_new();
 
@@ -307,7 +262,9 @@
 		g_ril_set_debug(ril->modem, ril_debug, "Device: ");
 	}
 
-        return 0;
+	send_get_sim_status(modem);
+
+        return -EINPROGRESS;
 }
 
 static int ril_disable(struct ofono_modem *modem)
@@ -316,8 +273,6 @@
 
 	DBG("modem=%p with %p", modem, ril ? ril->ifname : NULL);
 
-	ril->enabled = FALSE;
-
         return 0;
 }
 
@@ -365,7 +320,7 @@
 	 * non-standard ( see udev comment above ).
 	 * usually called by undevng::create_modem
 	 *
-	 * args are name (optional) & type 
+	 * args are name (optional) & type
 	 */
 	modem = ofono_modem_create(NULL, "ril");
 	if (modem == NULL) {
@@ -373,13 +328,29 @@
 		return -ENODEV;
 	}
 
+	/* TODO: these are both placeholders; we should
+	 * determine if they can be removed.
+	 */
 	ofono_modem_set_string(modem, "Interface", "ttys");
 	ofono_modem_set_integer(modem, "Address", 0);
 
+	/* This causes driver->probe() to be called... */
 	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()
+	 *
+	 * - driver->pre_sim()
+	 *
+	 * Could also be done via:
+	 *
+	 * - a DBus call to SetProperties w/"Powered=TRUE" *1
+	 * - sim_state_watch ( handles SIM removal? LOCKED states? **2
+	 * - ofono_modem_set_powered()
+	 */
         ofono_modem_reset(modem);
 
 	return retval;
@@ -393,3 +364,4 @@
 
 OFONO_PLUGIN_DEFINE(ril, "RIL modem driver", VERSION,
 			OFONO_PLUGIN_PRIORITY_DEFAULT, ril_init, ril_exit)
+ 

=== modified file 'src/simutil.c'
--- src/simutil.c	2013-01-28 16:25:32 +0000
+++ src/simutil.c	2013-05-20 19:19:27 +0000
@@ -1084,6 +1084,93 @@
 	g_free(eons);
 }
 
+const char *sim_fileid_to_string(int fileid)
+{
+	switch (fileid) {
+	case SIM_EFPL_FILEID:
+		return "SIM_EFPL_FILEID";
+	case SIM_EF_ICCID_FILEID:
+		return "SIM_EF_ICCID";
+	case SIM_MF_FILEID:
+		return "SIM_MF_FILEID";
+	case SIM_EFIMG_FILEID:
+		return "SIM_EFIMG_FILEID";
+	case SIM_DFPHONEBOOK_FILEID:
+		return "SIM_DFPHONEBOOK_FILEID";
+	case SIM_EFLI_FILEID:
+		return "SIM_EFLI_FILEID";
+	case SIM_EFARR_FILEID:
+		return "SIM_EFARR_FILEID";
+	case SIM_EFIMSI_FILEID:
+		return "SIM_EFIMSI_FILEID";
+	case SIM_EF_CPHS_MWIS_FILEID:
+		return "SIM_EF_CPHS_MWIS_FILEID";
+	case SIM_EF_CPHS_CFF_FILEID:
+		return "SIM_EF_CPHS_CFF_FILEID";
+	case SIM_EF_CPHS_SPN_FILEID:
+		return "SIM_EF_CPHS_SPN_FILEID";
+	case SIM_EF_CPHS_CSP_FILEID:
+		return "SIM_EF_CPHS_CSP_FILEID";
+	case SIM_EF_CPHS_INFORMATION_FILEID:
+		return "SIM_EF_CPHS_INFORMATION_FILEID";
+	case SIM_EF_CPHS_MBDN_FILEID:
+		return "SIM_EF_CPHS_MBDN_FILEID";
+	case SIM_EF_CPHS_SPN_SHORT_FILEID:
+		return "SIM_EF_CPHS_SPN_SHORT_FILEID";
+	case SIM_EFSST_FILEID:
+		return "SIM_EFSST/EFUST_FILEID";
+	case SIM_EFADN_FILEID:
+		return "SIM_EFADN_FILEID";
+	case SIM_EFMSISDN_FILEID:
+		return "SIM_EFMSISDN_FILEID";
+	case SIM_EFSMSP_FILEID:
+		return "SIM_EFSMSP_FILEID";
+	case SIM_EFCBMI_FILEID:
+		return "SIM_EFCBMI_FILEID";
+	case SIM_EFSPN_FILEID:
+		return "SIM_EFSPN_FILEID";
+	case SIM_EFCBMID_FILEID:
+		return "SIM_EFCBMID_FILEID";
+	case SIM_EFSDN_FILEID:
+		return "SIM_EFSDN_FILEID";
+	case SIM_EFEXT1_FILEID:
+		return "SIM_EFEXT1_FILEID";
+	case SIM_EFBDN_FILEID:
+		return "SIM_EFBDN_FILEID";
+	case SIM_EFCBMIR_FILEID:
+		return "SIM_EFCBMIR_FILEID";
+	case SIM_EFEST_FILEID:
+		return "SIM_EFEST_FILEID";
+	case SIM_EFAD_FILEID:
+		return "SIM_EFAD_FILEID";
+	case SIM_EFPHASE_FILEID:
+		return "SIM_EFPHASE_FILEID";
+	case SIM_EFECC_FILEID:
+		return "SIM_EFECC_FILEID";
+	case SIM_EFPNN_FILEID:
+		return "SIM_EFPNN_FILEID";
+	case SIM_EFOPL_FILEID:
+		return "SIM_EFOPL_FILEID";
+	case SIM_EFMBDN_FILEID:
+		return "SIM_EFMBDN_FILEID";
+	case SIM_EFMBI_FILEID:
+		return "SIM_EFMBI_FILEID";
+	case SIM_EFMWIS_FILEID:
+		return "SIM_EFMWIS_FILEID";
+	case SIM_EFCFIS_FILEID:
+		return "SIM_EFCFIS_FILEID";
+	case SIM_EFSPDI_FILEID:
+		return "SIM_EFSPDI_FILEID";
+	case SIM_DFTELECOM_FILEID:
+		return "SIM_DFTELECOM_FILEID";
+	case SIM_DFGSM_FILEID:
+		return "SIM_DFGSM_FILEID";
+	default:
+		return "<INVALID_FILEID>";
+	}
+
+}
+
 static const struct sim_eons_operator_info *
 	sim_eons_lookup_common(struct sim_eons *eons,
 				const char *mcc, const char *mnc,

=== modified file 'src/simutil.h'
--- src/simutil.h	2013-01-28 16:25:32 +0000
+++ src/simutil.h	2013-05-20 19:19:27 +0000
@@ -446,6 +446,7 @@
 						const char *mnc);
 void sim_eons_free(struct sim_eons *eons);
 
+const char *sim_fileid_to_string(int fileid);
 void sim_parse_mcc_mnc(const guint8 *bcd, char *mcc, char *mnc);
 void sim_encode_mcc_mnc(guint8 *out, const char *mcc, const char *mnc);
 struct sim_spdi *sim_spdi_new(const guint8 *tlv, int length);