ofono_sim_ready_notify

src/sim.c +3 -0

+#define SIM_STATUS_READY               1
+#define SIM_STATUS_WAITING_FOR_READY   (1 << 1)
+

 struct sim_file_op {
       int id;
       gboolean cache;

src/sim.c +1 -0

@@ -78,6 +81,7 @@ struct ofono_sim {
        GSList *new_numbers;
        GSList *service_numbers;
        gboolean sdn_ready;
+       unsigned int status;
        enum ofono_sim_state state;
        enum ofono_sim_password_type pin_type;

       gboolean locked_pins[OFONO_SIM_PASSWORD_SIM_PUK]; /* Number of PINs */

src/sim.c +2 -1

@@ -686,15 +690,20 @@ static void sim_enter_pin_cb(const struct ofono_error *error, void *data)
  {
        struct ofono_sim *sim = data;
        DBusMessage *reply;
+       gboolean ok = (error->type == OFONO_ERROR_TYPE_NO_ERROR);
 
-       if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
+       if (!ok)
                reply = __ofono_error_failed(sim->pending);

       else
               reply = dbus_message_new_method_return(sim->pending);

       __ofono_dbus_pending_reply(&sim->pending, reply);

-       sim_pin_check(sim);
+       if (ok && (sim->status & SIM_STATUS_READY)) {
+               sim->status &= ~SIM_STATUS_WAITING_FOR_READY;
+               sim_pin_check(sim);
+       } else
+               sim->status |= SIM_STATUS_WAITING_FOR_READY; }

Hi Kristen and all,

I've been toying PUKs and PIN2s and it seems to me that insted of ofono_sim_ready_notify() driver needs a method with which it can announce which PIN code SIM might need. If that is none, then we proceed bit like after ofono_sim_ready_notify() in Kristen's patch. If on the other hand user somehow gets his SIM PUKed, the driver can indicate that to core, and we can change the SIM state back to PRESENT.

More comments to Kristen below:

2010/8/25 Kristen Carlson Accardi <[email protected]>:

Quoted 28 lines

src/sim.c +6 -1

+#define SIM_STATUS_READY               1
+#define SIM_STATUS_WAITING_FOR_READY   (1 << 1)
+
 struct sim_file_op {
       int id;
       gboolean cache;

@@ -78,6 +81,7 @@ struct ofono_sim {
       GSList *new_numbers;
       GSList *service_numbers;
       gboolean sdn_ready;
+       unsigned int status;
       enum ofono_sim_state state;
       enum ofono_sim_password_type pin_type;
       gboolean locked_pins[OFONO_SIM_PASSWORD_SIM_PUK]; /* Number of PINs */

@@ -686,15 +690,20 @@ static void sim_enter_pin_cb(const struct ofono_error *error, void *data)
 {
       struct ofono_sim *sim = data;
       DBusMessage *reply;
+       gboolean ok = (error->type == OFONO_ERROR_TYPE_NO_ERROR);
 
-       if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
+       if (!ok)
               reply = __ofono_error_failed(sim->pending);
       else
               reply = dbus_message_new_method_return(sim->pending);
 
       __ofono_dbus_pending_reply(&sim->pending, reply);
 

src/sim.c static void sim_enter_pin_cb(const struct ofono_error *error, void *data) · line 707

Quoted 7 lines

src/sim.c +5 -1

-       sim_pin_check(sim);
+       if (ok && (sim->status & SIM_STATUS_READY)) {
+               sim->status &= ~SIM_STATUS_WAITING_FOR_READY;
+               sim_pin_check(sim);
+       } else
+               sim->status |= SIM_STATUS_WAITING_FOR_READY;
 }

This does not work if modem 1) does not implement pin check or pin query 2) does not get ready immediately. isimodem comes to mind.

I'd guess you should set the bit sim->status |= SIM_STATUS_WAITING_FOR_READY from sim_efpl_read_cb.

Perhaps renaming the sim_pin_query() as ofono_sim_ready_notify() and check for the WAITING_FOR_READY bit there? You could also set another bit in ofono_sim_ready_notify, just prevent it from running sim_initialize_after_pin() twice.

Hi Kristen and all,

This is what I have in mind:
- no sim_pin_check after return from sim_pin_enter() but driver calls sim_ready_notify()
- if driver has no pin check, retry initialization after sim_ready_notify()
- when SIM requires PUK, change state back to SIM_INSERTED

There is no sim_set_state() yet, it has to be added

PIN2 and PUK2 results from pin query should be ignored, they are transient and do not prevent SIM from being ready.

--Pekka

src/sim.c +9 -0

@@ -80,6 +80,15 @@ struct ofono_sim {
 	gboolean sdn_ready;
 	enum ofono_sim_state state;
 	enum ofono_sim_password_type pin_type;
+	union {
+		struct {
+			unsigned pre_pin_started:1;
+			unsigned pre_pin_done:1;
+			unsigned post_pin_started:1;
+			unsigned ready_notified:1;
+		};
+		unsigned all;
+	} init;
 	gboolean locked_pins[OFONO_SIM_PASSWORD_SIM_PUK]; /* Number of PINs */
 	char **language_prefs;
 	GQueue *simop_q;

src/sim.c +0 -0

 }
 

static DBusMessage *sim_enter_pin(DBusConnection *conn, DBusMessage *msg,

src/sim.c +3 -0

 		return;
 	}

@@ -1130,6 +1143,9 @@ static void sim_efphase_read_cb(int ok, int
 length, int record,
 
 static void sim_initialize_after_pin(struct ofono_sim *sim)
 {
+	sim->init.post_pin_started = 1;
+	sim->init.ready_notified = 0;
+
 	ofono_sim_read(sim, SIM_EFPHASE_FILEID,
 			OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,

src/sim.c +0 -0

 			sim_efphase_read_cb, sim);

src/sim.c +0 -0

 	if (sim->pin_type != pin_type) {
 		sim->pin_type = pin_type;

src/sim.c +3 -1

 		pin_name = sim_passwd_name(pin_type);

@@ -1185,7 +1205,18 @@ static void sim_pin_query_cb(const struct
 ofono_error *error,
 	}
 
 checkdone:
-	if (pin_type == OFONO_SIM_PASSWORD_NONE)
+	if (pin_type != OFONO_SIM_PASSWORD_NONE) {
+		int ready_notified = sim->init.ready_notified;
+

src/sim.c +20 -0

 }

@@ -1199,6 +1230,22 @@ static void sim_pin_check(struct ofono_sim *sim)
 	sim->driver->query_passwd_state(sim, sim_pin_query_cb, sim);
 }
 
+void ofono_sim_ready_notify(struct ofono_sim *sim)
+{
+	if (sim == NULL)
+		return;
+
+	sim->init.ready_notified = 1;
+
+	if (sim->state == OFONO_SIM_STATE_NOT_PRESENT)
+		return;
+
+	if (!sim->init.pre_pin_done)
+		return;
+
+	sim_pin_check(sim);
+}
+
 static void sim_efli_read_cb(int ok, int length, int record,
 				const unsigned char *data,
 				int record_length, void *userdata)

@@ -1379,6 +1426,8 @@ skip_efpl:
 						DBUS_TYPE_STRING,
 						&sim->language_prefs);
 
+	sim->init.pre_pin_done = 1;
+
 	sim_pin_check(sim);
 }
 

@@ -1407,6 +1456,8 @@ static void sim_iccid_read_cb(int ok, int
 length, int record,
 
 static void sim_initialize(struct ofono_sim *sim)
 {
+	sim->init.pre_pin_started = 1;
+
 	/* Perform SIM initialization according to 3GPP 31.102 Section 5.1.1.2
 	 * The assumption here is that if sim manager is being initialized,

src/sim.c +2 -0

 	 * then sim commands are implemented, and the sim manager is then
 static void sim_free_state(struct ofono_sim *sim)

@@ -2007,6 +2060,8 @@ static void sim_free_state(struct ofono_sim *sim)
 		g_free(sim->iccid);
 		sim->iccid = NULL;
 	}
+
+	sim->init.all = 0;
 }
 
 void ofono_sim_inserted_notify(struct ofono_sim *sim, ofono_bool_t inserted)

_______________________________________________
ofono mailing list
ofono(a)ofono.org
http://lists.ofono.org/listinfo/ofono