diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | include/gprs-context.h | 78 | ||||
| -rw-r--r-- | include/gprs.h | 31 | ||||
| -rw-r--r-- | src/ofono.h | 1 |
4 files changed, 81 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am index b4546cf6..bed363ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ include_HEADERS = include/log.h include/plugin.h include/history.h \ include/sms.h include/sim.h include/message-waiting.h \ include/netreg.h include/voicecall.h include/devinfo.h \ include/cbs.h include/call-volume.h \ - include/gprs.h + include/gprs.h include/gprs-context.h nodist_include_HEADERS = include/version.h diff --git a/include/gprs-context.h b/include/gprs-context.h new file mode 100644 index 00000000..f1f5cea4 --- /dev/null +++ b/include/gprs-context.h @@ -0,0 +1,78 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2009 Intel Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __OFONO_GPRS_CONTEXT_H +#define __OFONO_GPRS_CONTEXT_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include <ofono/types.h> + +struct ofono_gprs_context; + +#define OFONO_GPRS_MAX_APN_LENGTH 127 +#define OFONO_GPRS_MAX_USERNAME_LENGTH 63 +#define OFONO_GPRS_MAX_PASSWORD_LENGTH 255 + +struct ofono_gprs_primary_context { + unsigned int cid; + int direction; + char apn[OFONO_GPRS_MAX_APN_LENGTH + 1]; + char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1]; + char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1]; +}; + +typedef void (*ofono_gprs_context_cb_t)(const struct ofono_error *error, + void *data); + +struct ofono_gprs_context_driver { + const char *name; + int (*probe)(struct ofono_gprs_context *gc, unsigned int vendor, + void *data); + void (*remove)(struct ofono_gprs_context *gc); + void (*activate_primary)(struct ofono_gprs_context *gc, + const struct ofono_gprs_primary_context *ctx, + ofono_gprs_context_cb_t cb, void *data); + void (*deactivate_primary)(struct ofono_gprs_context *gc, + unsigned int id); +}; + +void ofono_gprs_context_deactivated(struct ofono_gprs_context *gc, unsigned id); + +int ofono_gprs_context_driver_register(const struct ofono_gprs_driver *d); +void ofono_gprs_context_driver_unregister(const struct ofono_gprs_driver *d); + +struct ofono_gprs *ofono_gprs_context_create(struct ofono_modem *modem, + unsigned int vendor, + const char *driver, void *data); +void ofono_gprs_context_register(struct ofono_gprs *gprs); +void ofono_gprs_context_remove(struct ofono_gprs *gprs); + +void ofono_gprs_context_set_data(struct ofono_gprs_context *gc, void *data); +void *ofono_gprs_context_get_data(struct ofono_gprs_context *gc); + +#ifdef __cplusplus +} +#endif + +#endif /* __OFONO_GPRS_CONTEXT_H */ diff --git a/include/gprs.h b/include/gprs.h index 9bbf51f1..2d40ef82 100644 --- a/include/gprs.h +++ b/include/gprs.h @@ -30,26 +30,12 @@ extern "C" { struct ofono_gprs; -struct ofono_gprs_primary_context { - unsigned id; - int type; - int direction; - int active; - char *apn; - char *username; - char *password; -}; - typedef void (*ofono_gprs_status_cb_t)(const struct ofono_error *error, int status, int lac, int ci, int tech, void *data); typedef void (*ofono_gprs_cb_t)(const struct ofono_error *error, void *data); -typedef void (*ofono_gprs_alloc_cb_t)(const struct ofono_error *error, - struct ofono_gprs_primary_context *ctx, - void *data); - struct ofono_gprs_driver { const char *name; int (*probe)(struct ofono_gprs *gprs, unsigned int vendor, @@ -57,17 +43,6 @@ struct ofono_gprs_driver { 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); }; @@ -75,11 +50,7 @@ struct ofono_gprs_driver { 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); +void ofono_gprs_attach_notify(struct ofono_gprs *gprs, int attached); int ofono_gprs_driver_register(const struct ofono_gprs_driver *d); void ofono_gprs_driver_unregister(const struct ofono_gprs_driver *d); diff --git a/src/ofono.h b/src/ofono.h index 7f694d7f..aa58a2b1 100644 --- a/src/ofono.h +++ b/src/ofono.h @@ -163,6 +163,7 @@ void __ofono_atom_free(struct ofono_atom *atom); #include <ofono/sim.h> #include <ofono/voicecall.h> #include <ofono/gprs.h> +#include <ofono/gprs-context.h> #include <ofono/ssn.h> |