diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2015-11-20 22:54:27 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2015-11-20 22:54:27 -0600 |
| commit | 43208828ab792295d2d9396babbb00d8a1f58fd3 (patch) | |
| tree | 17bb23bf5f4f1df6ed86b1394d84815ec4eb09e2 | |
| parent | 322c41c4273483a4da742e30e2c9f453249f986c (diff) | |
| download | ofono-43208828ab792295d2d9396babbb00d8a1f58fd3.tar.bz2 | |
rilmodem: Implement ril_register_manual inline
| -rw-r--r-- | drivers/rilmodem/network-registration.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/rilmodem/network-registration.c b/drivers/rilmodem/network-registration.c index 1a033e23..abe627ec 100644 --- a/drivers/rilmodem/network-registration.c +++ b/drivers/rilmodem/network-registration.c @@ -595,17 +595,23 @@ static void ril_register_manual(struct ofono_netreg *netreg, char buf[OFONO_MAX_MCC_LENGTH + OFONO_MAX_MNC_LENGTH + 1]; struct parcel rilp; + DBG(""); + /* RIL expects a char * specifying MCCMNC of network to select */ snprintf(buf, sizeof(buf), "%s%s", mcc, mnc); - g_ril_request_set_net_select_manual(nd->ril, buf, &rilp); + parcel_init(&rilp); + parcel_w_string(&rilp, buf); + + g_ril_append_print_buf(nd->ril, "(%s)", buf); /* In case of error free cbd and return the cb with failure */ if (g_ril_send(nd->ril, RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, &rilp, - ril_register_cb, cbd, g_free) == 0) { - g_free(cbd); - CALLBACK_WITH_FAILURE(cb, data); - } + ril_register_cb, cbd, g_free) > 0) + return; + + g_free(cbd); + CALLBACK_WITH_FAILURE(cb, data); } static void ril_strength_notify(struct ril_msg *message, gpointer user_data) |