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.
This commit is contained in:
Guillaume Zajac 2012-04-18 14:39:48 +02:00 committed by Denis Kenzior
parent a3fc044be4
commit d0232dee06
1 changed files with 29 additions and 0 deletions

View File

@ -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);