diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2015-11-05 10:40:11 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2015-11-05 10:40:11 -0600 |
| commit | b539ac47d9be576820308fb06ab754e79ae15fbe (patch) | |
| tree | b596dd3a3145a8a278d779dc47f0d3ed50d7656b /drivers | |
| parent | 5ac7755f2752cf8b5c6165180e920aa4e33e5690 (diff) | |
| download | ofono-b539ac47d9be576820308fb06ab754e79ae15fbe.tar.bz2 | |
rilmodem: Make ril_call_barring_set_passwd inline
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rilmodem/call-barring.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/rilmodem/call-barring.c b/drivers/rilmodem/call-barring.c index 90ddda98..69f2f483 100644 --- a/drivers/rilmodem/call-barring.c +++ b/drivers/rilmodem/call-barring.c @@ -28,7 +28,6 @@ #include <ofono/modem.h> #include "common.h" -#include "grilrequest.h" #include "grilreply.h" #include "call-barring.h" #include "rilmodem.h" @@ -197,15 +196,22 @@ static void ril_call_barring_set_passwd(struct ofono_call_barring *barr, DBG("lock %s old %s new %s", lock, old_passwd, new_passwd); - g_ril_request_change_barring_password(bd->ril, lock, old_passwd, - new_passwd, &rilp); + parcel_init(&rilp); + + parcel_w_int32(&rilp, 3); /* # of strings */ + parcel_w_string(&rilp, lock); + parcel_w_string(&rilp, old_passwd); + parcel_w_string(&rilp, new_passwd); + + g_ril_append_print_buf(bd->ril, "(%s,%s,%s)", + lock, old_passwd, new_passwd); if (g_ril_send(bd->ril, RIL_REQUEST_CHANGE_BARRING_PASSWORD, &rilp, - ril_call_barring_set_passwd_cb, cbd, g_free) <= 0) { - ofono_error("%s: sending failed", __func__); - g_free(cbd); - CALLBACK_WITH_FAILURE(cb, data); - } + ril_call_barring_set_passwd_cb, cbd, g_free) > 0) + return; + + g_free(cbd); + CALLBACK_WITH_FAILURE(cb, data); } static gboolean ril_delayed_register(gpointer user_data) |