From 0b68ad7e32f06d536d839a775a5aa07142409376 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 20 Oct 2009 16:29:10 -0500 Subject: [PATCH] Second round of renaming --- src/gprs.c | 20 +++++++++----------- src/ofono.h | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/gprs.c b/src/gprs.c index 88a6844..9a02a2a 100644 --- a/src/gprs.c +++ b/src/gprs.c @@ -959,15 +959,14 @@ int ofono_gprs_driver_register( return 0; } -void ofono_gprs_driver_unregister( - const struct ofono_gprs_driver *d) +void ofono_gprs_driver_unregister(const struct ofono_gprs_driver *d) { DBG("driver: %p, name: %s", d, d->name); g_drivers = g_slist_remove(g_drivers, (void *)d); } -static void data_connection_unregister(struct ofono_atom *atom) +static void gprs_unregister(struct ofono_atom *atom) { DBusConnection *conn = ofono_dbus_get_connection(); struct ofono_gprs *gprs = __ofono_atom_get_data(atom); @@ -981,7 +980,7 @@ static void data_connection_unregister(struct ofono_atom *atom) DATA_CONNECTION_MANAGER_INTERFACE); } -static void data_connection_remove(struct ofono_atom *atom) +static void gprs_remove(struct ofono_atom *atom) { struct ofono_gprs *gprs = __ofono_atom_get_data(atom); @@ -996,9 +995,9 @@ static void data_connection_remove(struct ofono_atom *atom) g_free(gprs); } -struct ofono_gprs *ofono_gprs_create( - struct ofono_modem *modem, unsigned int vendor, - const char *driver, void *data) +struct ofono_gprs *ofono_gprs_create(struct ofono_modem *modem, + unsigned int vendor, + const char *driver, void *data) { struct ofono_gprs *gprs; GSList *l; @@ -1011,9 +1010,8 @@ struct ofono_gprs *ofono_gprs_create( if (gprs == NULL) return NULL; - gprs->atom = __ofono_modem_add_atom(modem, - OFONO_ATOM_TYPE_DATA_CONNECTION, - data_connection_remove, gprs); + gprs->atom = __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_GPRS, + gprs_remove, gprs); for (l = g_drivers; l; l = l->next) { const struct ofono_gprs_driver *drv = l->data; @@ -1053,7 +1051,7 @@ void ofono_gprs_register(struct ofono_gprs *gprs) ofono_modem_add_interface(modem, DATA_CONNECTION_MANAGER_INTERFACE); - __ofono_atom_register(gprs->atom, data_connection_unregister); + __ofono_atom_register(gprs->atom, gprs_unregister); } void ofono_gprs_remove(struct ofono_gprs *gprs) diff --git a/src/ofono.h b/src/ofono.h index 6e6fa3d..c6d84bd 100644 --- a/src/ofono.h +++ b/src/ofono.h @@ -106,7 +106,7 @@ enum ofono_atom_type { OFONO_ATOM_TYPE_MESSAGE_WAITING = 13, OFONO_ATOM_TYPE_CBS = 14, OFONO_ATOM_TYPES_CALL_VOLUME = 15, - OFONO_ATOM_TYPE_DATA_CONNECTION = 16, + OFONO_ATOM_TYPE_GPRS = 16, }; enum ofono_atom_watch_condition { -- 2.7.4