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

Use new at_util_parse_reg in gprs driver

This commit is contained in:
Denis Kenzior 2009-12-09 12:50:22 -06:00
parent 66d1e90814
commit fe02d6bc45
1 changed files with 8 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/atmodem/gprs.c
View File

@ -85,13 +85,9 @@ error:
static void at_cgreg_cb(gboolean ok, GAtResult *result, gpointer user_data) static void at_cgreg_cb(gboolean ok, GAtResult *result, gpointer user_data)
{ {
struct cb_data *cbd = user_data; struct cb_data *cbd = user_data;
GAtResultIter iter;
ofono_gprs_status_cb_t cb = cbd->cb; ofono_gprs_status_cb_t cb = cbd->cb;
int status;
const char *str;
int mode;
int lac = -1, ci = -1, tech = -1;
struct ofono_error error; struct ofono_error error;
int status, lac, ci, tech;
dump_response("at_cgreg_cb", ok, result); dump_response("at_cgreg_cb", ok, result);
decode_at_error(&error, g_at_result_final_response(result)); decode_at_error(&error, g_at_result_final_response(result));
@ -101,35 +97,13 @@ static void at_cgreg_cb(gboolean ok, GAtResult *result, gpointer user_data)
return; return;
} }
g_at_result_iter_init(&iter, result); if (at_util_parse_reg(result, "+CGREG:", NULL, &status,
&lac, &ci, &tech) == FALSE) {
while (g_at_result_iter_next(&iter, "+CGREG:")) { CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, cbd->data);
g_at_result_iter_next_number(&iter, &mode);
/* Sometimes we get an unsolicited CGREG here, skip it */
if (g_at_result_iter_next_number(&iter, &status) == FALSE)
continue;
if (g_at_result_iter_next_string(&iter, &str) == TRUE)
lac = strtol(str, NULL, 16);
else
goto out;
if (g_at_result_iter_next_string(&iter, &str) == TRUE)
ci = strtol(str, NULL, 16);
else
goto out;
g_at_result_iter_next_number(&iter, &tech);
out:
ofono_debug("cgreg_cb: %d, %d, %d, %d", status, lac, ci, tech);
cb(&error, status, lac, ci, tech, cbd->data);
return; return;
} }
CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, cbd->data); cb(&error, status, lac, ci, tech, cbd->data);
} }
static void at_gprs_registration_status(struct ofono_gprs *gprs, static void at_gprs_registration_status(struct ofono_gprs *gprs,
@ -156,35 +130,14 @@ error:
static void cgreg_notify(GAtResult *result, gpointer user_data) static void cgreg_notify(GAtResult *result, gpointer user_data)
{ {
struct ofono_gprs *gprs = user_data; struct ofono_gprs *gprs = user_data;
GAtResultIter iter; int status, lac, ci, tech;
gint status, tech = -1;
int lac = -1, ci = -1;
const char *str;
dump_response("cgreg_notify", TRUE, result); dump_response("cgreg_notify", TRUE, result);
g_at_result_iter_init(&iter, result); if (at_util_parse_reg_unsolicited(result, "+CGREG:", &status,
&lac, &ci, &tech) == FALSE)
if (!g_at_result_iter_next(&iter, "+CGREG:"))
return; return;
g_at_result_iter_next_number(&iter, &status);
if (g_at_result_iter_next_string(&iter, &str))
lac = strtol(str, NULL, 16);
else
goto out;
if (g_at_result_iter_next_string(&iter, &str))
ci = strtol(str, NULL, 16);
else
goto out;
g_at_result_iter_next_number(&iter, &tech);
out:
ofono_debug("cgreg_notify: %d, %d, %d, %d", status, lac, ci, tech);
ofono_gprs_status_notify(gprs, status, lac, ci, tech); ofono_gprs_status_notify(gprs, status, lac, ci, tech);
} }