From 740bac35847856618ffbe58c39c88b19042bcf9a Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 12 Nov 2015 11:00:40 -0600 Subject: rilmodem: Implement ril_pin_send inline --- drivers/rilmodem/sim.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/rilmodem/sim.c b/drivers/rilmodem/sim.c index f71bd0ad..6f717c5b 100644 --- a/drivers/rilmodem/sim.c +++ b/drivers/rilmodem/sim.c @@ -930,16 +930,20 @@ static void ril_pin_send(struct ofono_sim *sim, const char *passwd, sd->passwd_type = OFONO_SIM_PASSWORD_SIM_PIN; - g_ril_request_pin_send(sd->ril, - passwd, - sd->aid_str, - &rilp); + parcel_init(&rilp); + + parcel_w_int32(&rilp, 2); + parcel_w_string(&rilp, passwd); + parcel_w_string(&rilp, sd->aid_str); + + g_ril_append_print_buf(sd->ril, "(%s,aid=%s)", passwd, sd->aid_str); if (g_ril_send(sd->ril, RIL_REQUEST_ENTER_SIM_PIN, &rilp, - ril_pin_change_state_cb, cbd, g_free) == 0) { - g_free(cbd); - CALLBACK_WITH_FAILURE(cb, data); - } + ril_pin_change_state_cb, cbd, g_free) > 0) + return; + + g_free(cbd); + CALLBACK_WITH_FAILURE(cb, data); } static void enter_pin_done(const struct ofono_error *error, void *data) -- cgit v1.2.3