From 38ae7bd9aa62b9dd0d02b47a61ada6e77451d00b Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 17 Nov 2009 18:54:46 -0600 Subject: [PATCH] Update the AT modem driver to the new API --- drivers/atmodem/gprs-context.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c index 2bc3cdf..abc68a4 100644 --- a/drivers/atmodem/gprs-context.c +++ b/drivers/atmodem/gprs-context.c @@ -67,19 +67,19 @@ static void at_cgact_down_cb(gboolean ok, GAtResult *result, gpointer user_data) static void at_cgact_up_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct cb_data *cbd = user_data; - ofono_gprs_context_cb_t cb = cbd->cb; + ofono_gprs_context_up_cb_t cb = cbd->cb; struct ofono_error error; dump_response("cgact_up_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); - cb(&error, cbd->data); + cb(&error, NULL, 0, NULL, NULL, NULL, NULL, cbd->data); } static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct cb_data *cbd = user_data; - ofono_gprs_context_cb_t cb = cbd->cb; + ofono_gprs_context_up_cb_t cb = cbd->cb; struct ofono_gprs_context *gc = cbd->user; struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); struct cb_data *ncbd; @@ -93,7 +93,7 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data) gcd->active_context = 0; decode_at_error(&error, g_at_result_final_response(result)); - cb(&error, cbd->data); + cb(&error, NULL, 0, NULL, NULL, NULL, NULL, cbd->data); return; } @@ -110,12 +110,12 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data) gcd->active_context = 0; - CALLBACK_WITH_FAILURE(cb, cbd->data); + CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, cbd->data); } static void at_gprs_activate_primary(struct ofono_gprs_context *gc, const struct ofono_gprs_primary_context *ctx, - ofono_gprs_context_cb_t cb, void *data) + ofono_gprs_context_up_cb_t cb, void *data) { struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); struct cb_data *cbd = cb_data_new(cb, data); @@ -143,7 +143,7 @@ error: if (cbd) g_free(cbd); - CALLBACK_WITH_FAILURE(cb, data); + CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data); } static void at_gprs_deactivate_primary(struct ofono_gprs_context *gc, -- 2.7.4