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

huaweimodem: update to new gprs context interface

This commit is contained in:
Mika Liljeberg 2011-03-07 16:02:34 +02:00 committed by Denis Kenzior
parent a8731aabb0
commit e9b04829e1
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/huaweimodem/gprs-context.c
View File

@ -53,10 +53,7 @@ struct gprs_context_data {
unsigned int dhcp_source;
unsigned int dhcp_count;
guint ndis_watch;
union {
ofono_gprs_context_cb_t down_cb; /* Down callback */
ofono_gprs_context_up_cb_t up_cb; /* Up callback */
};
ofono_gprs_context_cb_t cb;
void *cb_data; /* Callback data */
};
@ -68,8 +65,7 @@ static gboolean dhcp_poll(gpointer user_data)
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
if (gcd->dhcp_count > 20)
CALLBACK_WITH_FAILURE(gcd->up_cb, NULL, 0, NULL, NULL,
NULL, NULL, gcd->cb_data);
CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
else
check_dhcp(gc);
@ -192,9 +188,14 @@ static void dhcp_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
interface = "invalid";
CALLBACK_WITH_SUCCESS(gcd->up_cb, interface, TRUE, ip,
netmask, gateway, dns, gcd->cb_data);
gcd->up_cb = NULL;
ofono_gprs_context_set_interface(gc, interface);
ofono_gprs_context_set_ipv4_address(gc, ip, TRUE);
ofono_gprs_context_set_ipv4_netmask(gc, netmask);
ofono_gprs_context_set_ipv4_gateway(gc, gateway);
ofono_gprs_context_set_ipv4_dns_servers(gc, dns);
CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
gcd->cb = NULL;
gcd->cb_data = NULL;
g_free(ip);
@ -224,7 +225,7 @@ static void at_ndisdup_down_cb(gboolean ok, GAtResult *result,
DBG("ok %d", ok);
if (ok) {
gcd->down_cb = cb;
gcd->cb = cb;
gcd->cb_data = cbd->data;
if (gcd->ndis_watch > 0) {
@ -241,7 +242,7 @@ static void at_ndisdup_up_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
struct cb_data *cbd = user_data;
ofono_gprs_context_up_cb_t cb = cbd->cb;
ofono_gprs_context_cb_t cb = cbd->cb;
struct ofono_gprs_context *gc = cbd->user;
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
struct ofono_error error;
@ -249,7 +250,7 @@ static void at_ndisdup_up_cb(gboolean ok, GAtResult *result,
DBG("ok %d", ok);
if (ok) {
gcd->up_cb = cb;
gcd->cb = cb;
gcd->cb_data = cbd->data;
gcd->dhcp_count = 0;
@ -261,13 +262,13 @@ static void at_ndisdup_up_cb(gboolean ok, GAtResult *result,
gcd->active_context = 0;
decode_at_error(&error, g_at_result_final_response(result));
cb(&error, NULL, FALSE, NULL, NULL, NULL, NULL, cbd->data);
cb(&error, cbd->data);
}
static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
{
struct cb_data *cbd = user_data;
ofono_gprs_context_up_cb_t cb = cbd->cb;
ofono_gprs_context_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;
@ -281,7 +282,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, NULL, 0, NULL, NULL, NULL, NULL, cbd->data);
cb(&error, cbd->data);
return;
}
@ -297,18 +298,22 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
gcd->active_context = 0;
CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, cbd->data);
CALLBACK_WITH_FAILURE(cb, cbd->data);
}
static void huawei_gprs_activate_primary(struct ofono_gprs_context *gc,
const struct ofono_gprs_primary_context *ctx,
ofono_gprs_context_up_cb_t cb, void *data)
ofono_gprs_context_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);
char buf[64];
int len;
/* IPv6 support not implemented */
if (ctx->proto != OFONO_GPRS_PROTO_IP)
goto error;
DBG("cid %u", ctx->cid);
gcd->active_context = ctx->cid;
@ -325,9 +330,10 @@ static void huawei_gprs_activate_primary(struct ofono_gprs_context *gc,
at_cgdcont_cb, cbd, g_free) > 0)
return;
error:
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data);
CALLBACK_WITH_FAILURE(cb, data);
}
static void huawei_gprs_deactivate_primary(struct ofono_gprs_context *gc,