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

Refactor: First round of renaming

This commit is contained in:
Denis Kenzior 2009-10-20 13:09:54 -05:00
parent b2fd75014a
commit 88c0f77a58
7 changed files with 394 additions and 394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/atmodem/atmodem.c
View File

@ -48,7 +48,7 @@ static int atmodem_init(void)
at_netreg_init(); at_netreg_init();
at_cbs_init(); at_cbs_init();
at_call_volume_init(); at_call_volume_init();
at_data_connection_init(); at_gprs_init();
return 0; return 0;
} }
@ -69,7 +69,7 @@ static void atmodem_exit(void)
at_voicecall_exit(); at_voicecall_exit();
at_cbs_exit(); at_cbs_exit();
at_call_volume_exit(); at_call_volume_exit();
at_data_connection_exit(); at_gprs_exit();
} }
OFONO_PLUGIN_DEFINE(atmodem, "AT modem driver", VERSION, OFONO_PLUGIN_DEFINE(atmodem, "AT modem driver", VERSION,

4
drivers/atmodem/atmodem.h
View File

@ -63,5 +63,5 @@ extern void at_cbs_exit();
extern void at_call_volume_init(); extern void at_call_volume_init();
extern void at_call_volume_exit(); extern void at_call_volume_exit();
extern void at_data_connection_init(); extern void at_gprs_init();
extern void at_data_connection_exit(); extern void at_gprs_exit();

212
drivers/atmodem/gprs.c
View File

@ -43,7 +43,7 @@ static const char *cgdcont_prefix[] = { "+CGDCONT:", NULL };
static const char *cgact_prefix[] = { "+CGACT:", NULL }; static const char *cgact_prefix[] = { "+CGACT:", NULL };
static const char *none_prefix[] = { NULL }; static const char *none_prefix[] = { NULL };
struct data_connection_data { struct gprs_data {
GSList *primary_id_range; GSList *primary_id_range;
GSList *contexts; GSList *contexts;
GSList *new_contexts; /* Not yet defined contexts */ GSList *new_contexts; /* Not yet defined contexts */
@ -51,23 +51,23 @@ struct data_connection_data {
}; };
struct set_attached_req { struct set_attached_req {
struct ofono_data_connection *dc; struct ofono_gprs *gprs;
int attached; int attached;
ofono_data_connection_cb_t cb; ofono_gprs_cb_t cb;
void *data; void *data;
}; };
struct set_active_req { struct set_active_req {
struct ofono_data_connection *dc; struct ofono_gprs *gprs;
struct ofono_data_context *ctx; struct ofono_gprs_primary_context *ctx;
int active; int active;
ofono_data_connection_cb_t cb; ofono_gprs_cb_t cb;
void *data; void *data;
}; };
static gint context_id_compare(gconstpointer a, gconstpointer b) static gint context_id_compare(gconstpointer a, gconstpointer b)
{ {
const struct ofono_data_context *ctxa = a; const struct ofono_gprs_primary_context *ctxa = a;
const gint *id = b; const gint *id = b;
return ctxa->id - *id; return ctxa->id - *id;
@ -75,13 +75,13 @@ static gint context_id_compare(gconstpointer a, gconstpointer b)
static gint context_compare(gconstpointer a, gconstpointer b) static gint context_compare(gconstpointer a, gconstpointer b)
{ {
const struct ofono_data_context *ctxa = a; const struct ofono_gprs_primary_context *ctxa = a;
const struct ofono_data_context *ctxb = a; const struct ofono_gprs_primary_context *ctxb = a;
return ctxa->id - ctxb->id; return ctxa->id - ctxb->id;
} }
static void context_free(struct ofono_data_context *ctx) static void context_free(struct ofono_gprs_primary_context *ctx)
{ {
if (ctx->apn) if (ctx->apn)
g_free(ctx->apn); g_free(ctx->apn);
@ -99,7 +99,7 @@ static void context_free(struct ofono_data_context *ctx)
g_free(ctx); g_free(ctx);
} }
static unsigned int find_next_primary_id(struct data_connection_data *d) static unsigned int find_next_primary_id(struct gprs_data *d)
{ {
GSList *l; GSList *l;
gint i, *range; gint i, *range;
@ -113,18 +113,18 @@ static unsigned int find_next_primary_id(struct data_connection_data *d)
return 0; return 0;
} }
static void detached(struct ofono_data_connection *dc) static void detached(struct ofono_gprs *gprs)
{ {
struct data_connection_data *dcd = ofono_data_connection_get_data(dc); struct gprs_data *gd = ofono_gprs_get_data(gprs);
GSList *l; GSList *l;
struct ofono_data_context *ctx; struct ofono_gprs_primary_context *ctx;
for (l = dcd->contexts; l; l = l->next) { for (l = gd->contexts; l; l = l->next) {
ctx = l->data; ctx = l->data;
if (ctx->active) { if (ctx->active) {
ctx->active = 0; ctx->active = 0;
ofono_data_connection_deactivated(dc, ctx->id); ofono_gprs_deactivated(gprs, ctx->id);
} }
} }
} }
@ -138,16 +138,16 @@ static void at_cgatt_cb(gboolean ok, GAtResult *result, gpointer user_data)
decode_at_error(&error, g_at_result_final_response(result)); decode_at_error(&error, g_at_result_final_response(result));
if (ok && !req->attached) if (ok && !req->attached)
detached(req->dc); detached(req->gprs);
req->cb(&error, req->data); req->cb(&error, req->data);
} }
static void at_ps_set_attached(struct ofono_data_connection *dc, static void at_ps_set_attached(struct ofono_gprs *gprs,
int attached, ofono_data_connection_cb_t cb, int attached, ofono_gprs_cb_t cb,
void *data) void *data)
{ {
struct data_connection_data *dcd = ofono_data_connection_get_data(dc); struct gprs_data *gd = ofono_gprs_get_data(gprs);
struct set_attached_req *req; struct set_attached_req *req;
char buf[64]; char buf[64];
@ -155,14 +155,14 @@ static void at_ps_set_attached(struct ofono_data_connection *dc,
if (!req) if (!req)
goto error; goto error;
req->dc = dc; req->gprs = gprs;
req->attached = attached; req->attached = attached;
req->cb = cb; req->cb = cb;
req->data = data; req->data = data;
sprintf(buf, "AT+CGATT=%i", attached ? 1 : 0); sprintf(buf, "AT+CGATT=%i", attached ? 1 : 0);
if (g_at_chat_send(dcd->chat, buf, none_prefix, if (g_at_chat_send(gd->chat, buf, none_prefix,
at_cgatt_cb, req, g_free) > 0) at_cgatt_cb, req, g_free) > 0)
return; return;
@ -176,11 +176,11 @@ error:
static void at_cgact_cb(gboolean ok, GAtResult *result, gpointer user_data) static void at_cgact_cb(gboolean ok, GAtResult *result, gpointer user_data)
{ {
struct set_active_req *req = user_data; struct set_active_req *req = user_data;
struct data_connection_data *dcd = struct gprs_data *gd =
ofono_data_connection_get_data(req->dc); ofono_gprs_get_data(req->gprs);
struct ofono_error error; struct ofono_error error;
GSList *l; GSList *l;
struct ofono_data_context *ctx; struct ofono_gprs_primary_context *ctx;
dump_response("cgact_cb", ok, result); dump_response("cgact_cb", ok, result);
decode_at_error(&error, g_at_result_final_response(result)); decode_at_error(&error, g_at_result_final_response(result));
@ -190,20 +190,20 @@ static void at_cgact_cb(gboolean ok, GAtResult *result, gpointer user_data)
req->ctx->active = req->active; req->ctx->active = req->active;
if (!req->active) if (!req->active)
ofono_data_connection_deactivated(req->dc, ofono_gprs_deactivated(req->gprs,
req->ctx->id); req->ctx->id);
} else } else
for (l = dcd->contexts; l; l = l->next) { for (l = gd->contexts; l; l = l->next) {
ctx = l->data; ctx = l->data;
if (g_slist_find(dcd->new_contexts, ctx)) if (g_slist_find(gd->new_contexts, ctx))
continue; continue;
ctx->active = req->active; ctx->active = req->active;
if (!req->active) if (!req->active)
ofono_data_connection_deactivated( ofono_gprs_deactivated(
req->dc, ctx->id); req->gprs, ctx->id);
} }
} }
@ -213,8 +213,8 @@ static void at_cgact_cb(gboolean ok, GAtResult *result, gpointer user_data)
static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data) static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
{ {
struct set_active_req *req = user_data; struct set_active_req *req = user_data;
struct data_connection_data *dcd = struct gprs_data *gd =
ofono_data_connection_get_data(req->dc); ofono_gprs_get_data(req->gprs);
struct ofono_error error; struct ofono_error error;
char buf[64]; char buf[64];
@ -229,11 +229,11 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
} }
/* Context is no longer undefined */ /* Context is no longer undefined */
dcd->new_contexts = g_slist_remove(dcd->new_contexts, req->ctx); gd->new_contexts = g_slist_remove(gd->new_contexts, req->ctx);
sprintf(buf, "AT+CGACT=1,%u", req->ctx->id); sprintf(buf, "AT+CGACT=1,%u", req->ctx->id);
if (g_at_chat_send(dcd->chat, buf, none_prefix, if (g_at_chat_send(gd->chat, buf, none_prefix,
at_cgact_cb, req, g_free) > 0) at_cgact_cb, req, g_free) > 0)
return; return;
@ -242,19 +242,19 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
g_free(req); g_free(req);
} }
static void at_pdp_set_active(struct ofono_data_connection *dc, unsigned id, static void at_pdp_set_active(struct ofono_gprs *gprs, unsigned id,
int active, ofono_data_connection_cb_t cb, int active, ofono_gprs_cb_t cb,
void *data) void *data)
{ {
struct data_connection_data *dcd = ofono_data_connection_get_data(dc); struct gprs_data *gd = ofono_gprs_get_data(gprs);
struct set_active_req *req = NULL; struct set_active_req *req = NULL;
char buf[64]; char buf[64];
struct ofono_data_context *ctx; struct ofono_gprs_primary_context *ctx;
gint cid = id; gint cid = id;
int len; int len;
GSList *l; GSList *l;
l = g_slist_find_custom(dcd->contexts, &cid, context_id_compare); l = g_slist_find_custom(gd->contexts, &cid, context_id_compare);
if (!l) if (!l)
goto error; goto error;
@ -264,7 +264,7 @@ static void at_pdp_set_active(struct ofono_data_connection *dc, unsigned id,
if (!req) if (!req)
goto error; goto error;
req->dc = dc; req->gprs = gprs;
req->ctx = ctx; req->ctx = ctx;
req->active = active; req->active = active;
req->cb = cb; req->cb = cb;
@ -276,13 +276,13 @@ static void at_pdp_set_active(struct ofono_data_connection *dc, unsigned id,
snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"", snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"",
ctx->apn); ctx->apn);
if (g_at_chat_send(dcd->chat, buf, none_prefix, if (g_at_chat_send(gd->chat, buf, none_prefix,
at_cgdcont_cb, req, NULL) > 0) at_cgdcont_cb, req, NULL) > 0)
return; return;
} else { } else {
sprintf(buf, "AT+CGACT=0,%u", id); sprintf(buf, "AT+CGACT=0,%u", id);
if (g_at_chat_send(dcd->chat, buf, none_prefix, if (g_at_chat_send(gd->chat, buf, none_prefix,
at_cgact_cb, req, g_free) > 0) at_cgact_cb, req, g_free) > 0)
return; return;
} }
@ -294,11 +294,11 @@ error:
CALLBACK_WITH_FAILURE(cb, data); CALLBACK_WITH_FAILURE(cb, data);
} }
static void at_pdp_set_active_all(struct ofono_data_connection *dc, static void at_pdp_set_active_all(struct ofono_gprs *gprs,
int active, ofono_data_connection_cb_t cb, int active, ofono_gprs_cb_t cb,
void *data) void *data)
{ {
struct data_connection_data *dcd = ofono_data_connection_get_data(dc); struct gprs_data *gd = ofono_gprs_get_data(gprs);
struct set_active_req *req; struct set_active_req *req;
char buf[64]; char buf[64];
@ -306,14 +306,14 @@ static void at_pdp_set_active_all(struct ofono_data_connection *dc,
if (!req) if (!req)
goto error; goto error;
req->dc = dc; req->gprs = gprs;
req->active = active; req->active = active;
req->cb = cb; req->cb = cb;
req->data = data; req->data = data;
sprintf(buf, "AT+CGACT=%i", active ? 1 : 0); sprintf(buf, "AT+CGACT=%i", active ? 1 : 0);
if (g_at_chat_send(dcd->chat, buf, none_prefix, if (g_at_chat_send(gd->chat, buf, none_prefix,
at_cgact_cb, req, g_free) > 0) at_cgact_cb, req, g_free) > 0)
return; return;
@ -324,14 +324,14 @@ error:
CALLBACK_WITH_FAILURE(cb, data); CALLBACK_WITH_FAILURE(cb, data);
} }
static void at_pdp_alloc(struct ofono_data_connection *dc, static void at_pdp_alloc(struct ofono_gprs *gprs,
ofono_data_connection_alloc_cb_t cb, ofono_gprs_alloc_cb_t cb,
void *data) void *data)
{ {
struct data_connection_data *dcd = ofono_data_connection_get_data(dc); struct gprs_data *gd = ofono_gprs_get_data(gprs);
struct ofono_data_context *ctx; struct ofono_gprs_primary_context *ctx;
struct ofono_error e; struct ofono_error e;
unsigned id = find_next_primary_id(dcd); unsigned id = find_next_primary_id(gd);
if (!id) { if (!id) {
CALLBACK_WITH_FAILURE(cb, NULL, data); CALLBACK_WITH_FAILURE(cb, NULL, data);
@ -339,7 +339,7 @@ static void at_pdp_alloc(struct ofono_data_connection *dc,
return; return;
} }
ctx = g_try_new0(struct ofono_data_context, 1); ctx = g_try_new0(struct ofono_gprs_primary_context, 1);
if (!ctx) { if (!ctx) {
CALLBACK_WITH_FAILURE(cb, NULL, data); CALLBACK_WITH_FAILURE(cb, NULL, data);
@ -351,9 +351,9 @@ static void at_pdp_alloc(struct ofono_data_connection *dc,
ctx->username = g_strdup(""); ctx->username = g_strdup("");
ctx->password = g_strdup(""); ctx->password = g_strdup("");
dcd->new_contexts = g_slist_insert_sorted(dcd->new_contexts, gd->new_contexts = g_slist_insert_sorted(gd->new_contexts,
ctx, context_compare); ctx, context_compare);
dcd->contexts = g_slist_insert_sorted(dcd->contexts, gd->contexts = g_slist_insert_sorted(gd->contexts,
ctx, context_compare); ctx, context_compare);
/* The context will be defined (+CGDCONT) lazily, once it's needed /* The context will be defined (+CGDCONT) lazily, once it's needed
@ -363,7 +363,7 @@ static void at_pdp_alloc(struct ofono_data_connection *dc,
e.error = 0; e.error = 0;
cb(&e, ctx, data); cb(&e, ctx, data);
ofono_data_connection_notify(dc, ctx); ofono_gprs_notify(gprs, ctx);
} }
static void at_pdp_undefine_cb(gboolean ok, GAtResult *result, static void at_pdp_undefine_cb(gboolean ok, GAtResult *result,
@ -375,17 +375,17 @@ static void at_pdp_undefine_cb(gboolean ok, GAtResult *result,
ofono_error("Undefining primary context failed"); ofono_error("Undefining primary context failed");
} }
static void at_pdp_free(struct ofono_data_connection *dc, unsigned id, static void at_pdp_free(struct ofono_gprs *gprs, unsigned id,
ofono_data_connection_cb_t cb, void *data) ofono_gprs_cb_t cb, void *data)
{ {
struct data_connection_data *dcd = ofono_data_connection_get_data(dc); struct gprs_data *gd = ofono_gprs_get_data(gprs);
struct ofono_error e; struct ofono_error e;
char buf[64]; char buf[64];
struct ofono_data_context *ctx; struct ofono_gprs_primary_context *ctx;
GSList *l; GSList *l;
gint cid = id; gint cid = id;
l = g_slist_find_custom(dcd->contexts, &cid, context_id_compare); l = g_slist_find_custom(gd->contexts, &cid, context_id_compare);
if (!l) { if (!l) {
CALLBACK_WITH_FAILURE(cb, data); CALLBACK_WITH_FAILURE(cb, data);
@ -406,27 +406,27 @@ static void at_pdp_free(struct ofono_data_connection *dc, unsigned id,
cb(&e, data); cb(&e, data);
context_free(ctx); context_free(ctx);
dcd->contexts = g_slist_remove(dcd->contexts, ctx); gd->contexts = g_slist_remove(gd->contexts, ctx);
if (g_slist_find(dcd->new_contexts, ctx)) { if (g_slist_find(gd->new_contexts, ctx)) {
dcd->new_contexts = g_slist_remove(dcd->new_contexts, ctx); gd->new_contexts = g_slist_remove(gd->new_contexts, ctx);
return; return;
} }
sprintf(buf, "AT+CGDCONT=%u", id); sprintf(buf, "AT+CGDCONT=%u", id);
g_at_chat_send(dcd->chat, buf, none_prefix, g_at_chat_send(gd->chat, buf, none_prefix,
at_pdp_undefine_cb, NULL, NULL); at_pdp_undefine_cb, NULL, NULL);
} }
static void at_cgact_read_cb(gboolean ok, GAtResult *result, static void at_cgact_read_cb(gboolean ok, GAtResult *result,
gpointer user_data) gpointer user_data)
{ {
struct ofono_data_connection *dc = user_data; struct ofono_gprs *gprs = user_data;
struct data_connection_data *dcd = ofono_data_connection_get_data(dc); struct gprs_data *gd = ofono_gprs_get_data(gprs);
gint cid, state; gint cid, state;
GAtResultIter iter; GAtResultIter iter;
struct ofono_data_context *ctx; struct ofono_gprs_primary_context *ctx;
GSList *l; GSList *l;
dump_response("cgact_read_cb", ok, result); dump_response("cgact_read_cb", ok, result);
@ -441,7 +441,7 @@ static void at_cgact_read_cb(gboolean ok, GAtResult *result,
if (!g_at_result_iter_next_number(&iter, &state)) if (!g_at_result_iter_next_number(&iter, &state))
continue; continue;
l = g_slist_find_custom(dcd->contexts, &cid, l = g_slist_find_custom(gd->contexts, &cid,
context_id_compare); context_id_compare);
if (!l) if (!l)
continue; continue;
@ -453,15 +453,15 @@ static void at_cgact_read_cb(gboolean ok, GAtResult *result,
if (state) if (state)
continue; continue;
ofono_data_connection_deactivated(dc, ctx->id); ofono_gprs_deactivated(gprs, ctx->id);
} }
} }
} }
static void cgev_notify(GAtResult *result, gpointer user_data) static void cgev_notify(GAtResult *result, gpointer user_data)
{ {
struct ofono_data_connection *dc = user_data; struct ofono_gprs *gprs = user_data;
struct data_connection_data *dcd = ofono_data_connection_get_data(dc); struct gprs_data *gd = ofono_gprs_get_data(gprs);
GAtResultIter iter; GAtResultIter iter;
const char *event; const char *event;
@ -478,17 +478,17 @@ static void cgev_notify(GAtResult *result, gpointer user_data)
g_str_has_prefix(event, "NW DEACT ") || g_str_has_prefix(event, "NW DEACT ") ||
g_str_has_prefix(event, "ME DEACT ")) { g_str_has_prefix(event, "ME DEACT ")) {
/* Ask what primary contexts are active now */ /* Ask what primary contexts are active now */
g_at_chat_send(dcd->chat, "AT+CGACT?", cgact_prefix, g_at_chat_send(gd->chat, "AT+CGACT?", cgact_prefix,
at_cgact_read_cb, dc, NULL); at_cgact_read_cb, gprs, NULL);
return; return;
} }
if (g_str_has_prefix(event, "NW DETACH ") || if (g_str_has_prefix(event, "NW DETACH ") ||
g_str_has_prefix(event, "ME DETACH ")) { g_str_has_prefix(event, "ME DETACH ")) {
detached(dc); detached(gprs);
ofono_data_connection_detached(dc); ofono_gprs_detached(gprs);
return; return;
} }
@ -500,7 +500,7 @@ static void cgev_notify(GAtResult *result, gpointer user_data)
static void cgreg_notify(GAtResult *result, gpointer user_data) static void cgreg_notify(GAtResult *result, gpointer user_data)
{ {
struct ofono_data_connection *dc = user_data; struct ofono_gprs *gprs = user_data;
GAtResultIter iter; GAtResultIter iter;
gint status, tech = -1; gint status, tech = -1;
int lac = -1, ci = -1; int lac = -1, ci = -1;
@ -531,16 +531,16 @@ out:
ofono_debug("cgreg_notify: %d, %d, %d, %d", status, lac, ci, tech); ofono_debug("cgreg_notify: %d, %d, %d, %d", status, lac, ci, tech);
if (status != 1 && status != 5) if (status != 1 && status != 5)
detached(dc); detached(gprs);
ofono_data_netreg_status_notify(dc, status, lac, ci, tech); ofono_gprs_status_notify(gprs, status, lac, ci, tech);
} }
static void at_cgdcont_test_cb(gboolean ok, GAtResult *result, static void at_cgdcont_test_cb(gboolean ok, GAtResult *result,
gpointer user_data) gpointer user_data)
{ {
struct ofono_data_connection *dc = user_data; struct ofono_gprs *gprs = user_data;
struct data_connection_data *dcd = ofono_data_connection_get_data(dc); struct gprs_data *gd = ofono_gprs_get_data(gprs);
GAtResultIter iter; GAtResultIter iter;
gint range[2]; gint range[2];
GSList *ranges = NULL; GSList *ranges = NULL;
@ -583,54 +583,54 @@ next:
if (!ranges) if (!ranges)
goto error; goto error;
dcd->primary_id_range = g_slist_reverse(ranges); gd->primary_id_range = g_slist_reverse(ranges);
ofono_debug("data_connection_init: registering to notifications"); ofono_debug("gprs_init: registering to notifications");
g_at_chat_register(dcd->chat, "+CGEV:", cgev_notify, FALSE, dc, NULL); g_at_chat_register(gd->chat, "+CGEV:", cgev_notify, FALSE, gprs, NULL);
g_at_chat_register(dcd->chat, "+CGREG:", cgreg_notify, FALSE, dc, NULL); g_at_chat_register(gd->chat, "+CGREG:", cgreg_notify, FALSE, gprs, NULL);
ofono_data_connection_register(dc); ofono_gprs_register(gprs);
return; return;
error: error:
ofono_data_connection_remove(dc); ofono_gprs_remove(gprs);
} }
static int at_data_connection_probe(struct ofono_data_connection *dc, static int at_gprs_probe(struct ofono_gprs *gprs,
unsigned int vendor, void *data) unsigned int vendor, void *data)
{ {
GAtChat *chat = data; GAtChat *chat = data;
struct data_connection_data *dcd; struct gprs_data *gd;
dcd = g_new0(struct data_connection_data, 1); gd = g_new0(struct gprs_data, 1);
dcd->chat = chat; gd->chat = chat;
ofono_data_connection_set_data(dc, dcd); ofono_gprs_set_data(gprs, gd);
g_at_chat_send(chat, "AT+CGREG=2", NULL, NULL, NULL, NULL); g_at_chat_send(chat, "AT+CGREG=2", NULL, NULL, NULL, NULL);
g_at_chat_send(chat, "AT+CGAUTO=0", NULL, NULL, NULL, NULL); g_at_chat_send(chat, "AT+CGAUTO=0", NULL, NULL, NULL, NULL);
g_at_chat_send(chat, "AT+CGEREP=2,1", NULL, NULL, NULL, NULL); g_at_chat_send(chat, "AT+CGEREP=2,1", NULL, NULL, NULL, NULL);
g_at_chat_send(chat, "AT+CGDCONT=?", cgdcont_prefix, g_at_chat_send(chat, "AT+CGDCONT=?", cgdcont_prefix,
at_cgdcont_test_cb, dc, NULL); at_cgdcont_test_cb, gprs, NULL);
return 0; return 0;
} }
static void at_data_connection_remove(struct ofono_data_connection *dc) static void at_gprs_remove(struct ofono_gprs *gprs)
{ {
struct data_connection_data *dcd = ofono_data_connection_get_data(dc); struct gprs_data *gd = ofono_gprs_get_data(gprs);
g_slist_foreach(dcd->contexts, (GFunc) context_free, NULL); g_slist_foreach(gd->contexts, (GFunc) context_free, NULL);
g_slist_free(dcd->contexts); g_slist_free(gd->contexts);
g_slist_free(dcd->new_contexts); g_slist_free(gd->new_contexts);
g_free(dcd); g_free(gd);
} }
static struct ofono_data_connection_driver driver = { static struct ofono_gprs_driver driver = {
.name = "atmodem", .name = "atmodem",
.probe = at_data_connection_probe, .probe = at_gprs_probe,
.remove = at_data_connection_remove, .remove = at_gprs_remove,
.set_attached = at_ps_set_attached, .set_attached = at_ps_set_attached,
.set_active = at_pdp_set_active, .set_active = at_pdp_set_active,
.set_active_all = at_pdp_set_active_all, .set_active_all = at_pdp_set_active_all,
@ -638,12 +638,12 @@ static struct ofono_data_connection_driver driver = {
.remove_context = at_pdp_free, .remove_context = at_pdp_free,
}; };
void at_data_connection_init() void at_gprs_init()
{ {
ofono_data_connection_driver_register(&driver); ofono_gprs_driver_register(&driver);
} }
void at_data_connection_exit() void at_gprs_exit()
{ {
ofono_data_connection_driver_unregister(&driver); ofono_gprs_driver_unregister(&driver);
} }

111
include/gprs.h
View File

@ -19,8 +19,8 @@
* *
*/ */
#ifndef __OFONO_DATA_CONNECTION_H #ifndef __OFONO_GPRS_H
#define __OFONO_DATA_CONNECTION_H #define __OFONO_GPRS_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -28,62 +28,73 @@ extern "C" {
#include <ofono/types.h> #include <ofono/types.h>
struct ofono_data_connection; struct ofono_gprs;
typedef void (*ofono_data_connection_cb_t)(const struct ofono_error *error, struct ofono_gprs_primary_context {
void *data); unsigned id;
int type;
typedef void (*ofono_data_connection_alloc_cb_t)( int direction;
const struct ofono_error *error, int active;
struct ofono_data_context *ctx, char *apn;
void *data); char *username;
char *password;
struct ofono_data_connection_driver {
const char *name;
int (*probe)(struct ofono_data_connection *dc, unsigned int vendor,
void *data);
void (*remove)(struct ofono_data_connection *dc);
void (*set_attached)(struct ofono_data_connection *dc,
int attached, ofono_data_connection_cb_t cb,
void *data);
void (*set_active)(struct ofono_data_connection *dc, unsigned id,
int active, ofono_data_connection_cb_t cb,
void *data);
void (*set_active_all)(struct ofono_data_connection *dc,
int active, ofono_data_connection_cb_t cb,
void *data);
void (*create_context)(struct ofono_data_connection *dc,
ofono_data_connection_alloc_cb_t cb,
void *data);
void (*remove_context)(struct ofono_data_connection *dc, unsigned id,
ofono_data_connection_cb_t cb, void *data);
}; };
void ofono_data_connection_notify(struct ofono_data_connection *dc, typedef void (*ofono_gprs_status_cb_t)(const struct ofono_error *error,
struct ofono_data_context *ctx); int status, int lac, int ci,
void ofono_data_connection_deactivated(struct ofono_data_connection *dc, int tech, void *data);
unsigned id);
void ofono_data_connection_detached(struct ofono_data_connection *dc);
void ofono_data_netreg_status_notify(struct ofono_data_connection *dc,
int status, int lac, int ci, int tech);
int ofono_data_connection_driver_register( typedef void (*ofono_gprs_cb_t)(const struct ofono_error *error, void *data);
const struct ofono_data_connection_driver *d);
void ofono_data_connection_driver_unregister(
const struct ofono_data_connection_driver *d);
struct ofono_data_connection *ofono_data_connection_create( typedef void (*ofono_gprs_alloc_cb_t)(const struct ofono_error *error,
struct ofono_modem *modem, unsigned int vendor, struct ofono_gprs_primary_context *ctx,
const char *driver, void *data);
void ofono_data_connection_register(struct ofono_data_connection *dc);
void ofono_data_connection_remove(struct ofono_data_connection *dc);
void ofono_data_connection_set_data(struct ofono_data_connection *dc,
void *data); void *data);
void *ofono_data_connection_get_data(struct ofono_data_connection *dc);
struct ofono_gprs_driver {
const char *name;
int (*probe)(struct ofono_gprs *gprs, unsigned int vendor,
void *data);
void (*remove)(struct ofono_gprs *gprs);
void (*set_attached)(struct ofono_gprs *gprs, int attached,
ofono_gprs_cb_t cb, void *data);
void (*set_active)(struct ofono_gprs *gprs, unsigned id,
int active, ofono_gprs_cb_t cb,
void *data);
void (*set_active_all)(struct ofono_gprs *gprs,
int active, ofono_gprs_cb_t cb,
void *data);
void (*create_context)(struct ofono_gprs *gprs,
ofono_gprs_alloc_cb_t cb,
void *data);
void (*remove_context)(struct ofono_gprs *gprs, unsigned id,
ofono_gprs_cb_t cb, void *data);
void (*registration_status)(struct ofono_gprs *gprs,
ofono_gprs_status_cb_t cb, void *data);
};
void ofono_gprs_status_notify(struct ofono_gprs *gprs,
int status, int lac, int ci, int tech);
void ofono_gprs_notify(struct ofono_gprs *gprs,
struct ofono_gprs_primary_context *ctx);
void ofono_gprs_deactivated(struct ofono_gprs *gprs,
unsigned id);
void ofono_gprs_detached(struct ofono_gprs *gprs);
int ofono_gprs_driver_register(const struct ofono_gprs_driver *d);
void ofono_gprs_driver_unregister(const struct ofono_gprs_driver *d);
struct ofono_gprs *ofono_gprs_create(struct ofono_modem *modem,
unsigned int vendor, const char *driver,
void *data);
void ofono_gprs_register(struct ofono_gprs *gprs);
void ofono_gprs_remove(struct ofono_gprs *gprs);
void ofono_gprs_set_data(struct ofono_gprs *gprs, void *data);
void *ofono_gprs_get_data(struct ofono_gprs *gprs);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __OFONO_DATA_CONNECTION_H */ #endif /* __OFONO_GPRS_H */

10
include/types.h
View File

@ -91,16 +91,6 @@ struct ofono_call {
int clip_validity; int clip_validity;
}; };
struct ofono_data_context {
unsigned id;
int type;
int direction;
int active;
char *apn;
char *username;
char *password;
};
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
plugins/phonesim.c
View File

@ -313,7 +313,7 @@ static void phonesim_post_sim(struct ofono_modem *modem)
ofono_cbs_create(modem, 0, "atmodem", data->chat); ofono_cbs_create(modem, 0, "atmodem", data->chat);
} }
ofono_data_connection_create(modem, 0, "atmodem", data->chat); ofono_gprs_create(modem, 0, "atmodem", data->chat);
mw = ofono_message_waiting_create(modem); mw = ofono_message_waiting_create(modem);
if (mw) if (mw)

445
src/gprs.c
View File

File diff suppressed because it is too large Load Diff