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]>: > +#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); > > - 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. -- Pekka.Pessi mail at nokia.com _______________________________________________ ofono mailing list [email protected] http://lists.ofono.org/listinfo/ofono
