diff options
author | Guillaume Zajac <guillaume.zajac@linux.intel.com> | 2012-04-18 14:39:48 +0200 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2012-04-18 04:22:19 -0500 |
commit | d0232dee065d407b63c6730f3e6d0a56129ccfe2 (patch) | |
tree | 7c9dc690d49d2b5ad240a8967489b43fad6030de /drivers/atmodem | |
parent | a3fc044be4154b9c9c30cf13bf1e2be28205508b (diff) | |
download | ofono-d0232dee065d407b63c6730f3e6d0a56129ccfe2.tar.bz2 |
atmodem: Poll SIM state after having entered PIN
We encountered the problem of CME ERROR 14: SIM busy on ZTE modems.
ZTE modems don't use SIM notification to check SIM state.
We poll SIM ready state before confirming PIN is entered.
Diffstat (limited to 'drivers/atmodem')
-rw-r--r-- | drivers/atmodem/sim.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c index c51b1d49..dd86980d 100644 --- a/drivers/atmodem/sim.c +++ b/drivers/atmodem/sim.c @@ -51,6 +51,7 @@ struct sim_data { GAtChat *chat; unsigned int vendor; guint ready_id; + struct at_util_sim_state_query *sim_state_query; }; static const char *crsm_prefix[] = { "+CRSM:", NULL }; @@ -972,6 +973,21 @@ static void at_epev_notify(GAtResult *result, gpointer user_data) sd->ready_id = 0; } +static void sim_state_cb(gboolean present, gpointer user_data) +{ + struct cb_data *cbd = user_data; + struct sim_data *sd = cbd->user; + ofono_sim_lock_unlock_cb_t cb = cbd->cb; + + at_util_sim_state_query_free(sd->sim_state_query); + sd->sim_state_query = NULL; + + if (present == 1) + CALLBACK_WITH_SUCCESS(cb, cbd->data); + else + CALLBACK_WITH_FAILURE(cb, cbd->data); +} + static void at_pin_send_cb(gboolean ok, GAtResult *result, gpointer user_data) { @@ -1006,6 +1022,16 @@ static void at_pin_send_cb(gboolean ok, GAtResult *result, at_epev_notify, FALSE, cbd, g_free); return; + case OFONO_VENDOR_ZTE: + /* + * On ZTE modems, after pin is entered, SIM state is checked + * by polling CPIN as their modem doesn't provide unsolicited + * notification of SIM readiness. + */ + sd->sim_state_query = at_util_sim_state_query_new(sd->chat, + 2, 20, sim_state_cb, cbd, + g_free); + return; } done: @@ -1246,6 +1272,9 @@ static void at_sim_remove(struct ofono_sim *sim) { struct sim_data *sd = ofono_sim_get_data(sim); + /* Cleanup potential SIM state polling */ + at_util_sim_state_query_free(sd->sim_state_query); + ofono_sim_set_data(sim, NULL); g_at_chat_unref(sd->chat); |