sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

rilmodem: Implement ril_pin_change_state_cb inline

This commit is contained in:
Denis Kenzior 2015-12-03 11:22:02 -06:00
parent 414ec4a2b9
commit f1a79f56b3
1 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/rilmodem/sim.c
View File

@ -1080,34 +1080,59 @@ static void ril_pin_change_state_cb(struct ril_msg *message, gpointer user_data)
ofono_sim_lock_unlock_cb_t cb = cbd->cb; ofono_sim_lock_unlock_cb_t cb = cbd->cb;
struct ofono_sim *sim = cbd->user; struct ofono_sim *sim = cbd->user;
struct sim_data *sd = ofono_sim_get_data(sim); struct sim_data *sd = ofono_sim_get_data(sim);
int *retries; struct parcel rilp;
/* /*
* There is no reason to ask SIM status until * There is no reason to ask SIM status until
* unsolicited sim status change indication * unsolicited sim status change indication
* Looks like state does not change before that. * Looks like state does not change before that.
*/ */
DBG("Enter password: type %d, result %d", DBG("Enter password: type %d, result %d",
sd->passwd_type, message->error); sd->passwd_type, message->error);
retries = g_ril_reply_parse_retries(sd->ril, message, sd->passwd_type); g_ril_init_parcel(message, &rilp);
if (retries != NULL) {
memcpy(sd->retries, retries, sizeof(sd->retries)); /* maguro/infineon: no data is returned */
g_free(retries); if (parcel_data_avail(&rilp) == 0)
goto done;
parcel_r_int32(&rilp);
switch (g_ril_vendor(sd->ril)) {
case OFONO_RIL_VENDOR_AOSP:
case OFONO_RIL_VENDOR_QCOM_MSIM:
/*
* The number of retries is valid only when a wrong password has
* been introduced in Nexus 4. TODO: check Nexus 5 behaviour.
*/
if (message->error == RIL_E_PASSWORD_INCORRECT)
sd->retries[sd->passwd_type] = parcel_r_int32(&rilp);
g_ril_append_print_buf(sd->ril, "{%d}",
sd->retries[sd->passwd_type]);
g_ril_print_response(sd->ril, message);
break;
/* Taken care of elsewhere */
case OFONO_RIL_VENDOR_INFINEON:
case OFONO_RIL_VENDOR_MTK:
break;
default:
break;
} }
/* TODO: re-factor to not use macro for FAILURE; done:
doesn't return error! */
if (message->error == RIL_E_SUCCESS) { if (message->error == RIL_E_SUCCESS) {
CALLBACK_WITH_SUCCESS(cb, cbd->data); CALLBACK_WITH_SUCCESS(cb, cbd->data);
} else { return;
CALLBACK_WITH_FAILURE(cb, cbd->data);
/*
* Refresh passwd_state (not needed if the unlock is
* successful, as an event will refresh the state in that case)
*/
send_get_sim_status(sim);
} }
CALLBACK_WITH_FAILURE(cb, cbd->data);
/*
* Refresh passwd_state (not needed if the unlock is
* successful, as an event will refresh the state in that case)
*/
send_get_sim_status(sim);
} }
static void ril_pin_send(struct ofono_sim *sim, const char *passwd, static void ril_pin_send(struct ofono_sim *sim, const char *passwd,