diff options
author | RĂ©mi Denis-Courmont <remi.denis-courmont@nokia.com> | 2011-01-13 16:18:01 +0200 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2011-01-13 10:31:54 -0600 |
commit | bcfd049853cff1ebe4ca8b6c465ca00b91f10272 (patch) | |
tree | 0c464d4db35e9e930983f1666c468cb0d80bfc52 /drivers | |
parent | 07acb249dcc43ca2d162f290427e122b4805a397 (diff) | |
download | ofono-bcfd049853cff1ebe4ca8b6c465ca00b91f10272.tar.bz2 |
atmodem: fix +COLR parsing
AT+COLR does not have a local presentation mode and thus it cannot be
factored with the other commands.
This partially reverts commit f2baa88d7577649358f1f8587e5a9b6aa730ca41.
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/atmodem/call-settings.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c index 7b00357f..eaab89e9 100644 --- a/drivers/atmodem/call-settings.c +++ b/drivers/atmodem/call-settings.c @@ -331,7 +331,34 @@ error: static void colr_query_cb(gboolean ok, GAtResult *result, gpointer user_data) { - query_template("+COLR:", ok, result, user_data); + struct cb_data *cbd = user_data; + ofono_call_settings_status_cb_t cb = cbd->cb; + struct ofono_error error; + GAtResultIter iter; + int status; + + decode_at_error(&error, g_at_result_final_response(result)); + + if (!ok) { + cb(&error, -1, cbd->data); + return; + } + + g_at_result_iter_init(&iter, result); + + if (g_at_result_iter_next(&iter, "+COLR:") == FALSE) + goto error; + + if (g_at_result_iter_next_number(&iter, &status) == FALSE) + goto error; + + DBG("network: %d", status); + + cb(&error, status, cbd->data); + return; + +error: + CALLBACK_WITH_FAILURE(cb, -1, cbd->data); } static void at_colr_query(struct ofono_call_settings *cs, |