--- include/dbus.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/dbus.h b/include/dbus.h index 4dd9db5..65bda72 100644 --- a/include/dbus.h +++ b/include/dbus.h @@ -63,6 +63,8 @@ extern "C" { #define OFONO_CDMA_VOICECALL_MANAGER_INTERFACE "org.ofono.cdma.VoiceCallManager" #define OFONO_CDMA_MESSAGE_MANAGER_INTERFACE "org.ofono.cdma.MessageManager" #define OFONO_CDMA_CONNECTION_MANAGER_INTERFACE "org.ofono.cdma.ConnectionManager" +#define OFONO_CDMA_NETWORK_REGISTRATION_INTERFACE \ + "org.ofono.cdma.NetworkRegistration" /* Essentially a{sv} */ #define OFONO_PROPERTIES_ARRAY_SIGNATURE DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING \ -- 1.7.4.1 --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

--- Makefile.am | 6 +- include/cdma-netreg.h | 58 +++++++++++++++ src/cdma-netreg.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++++ src/ofono.h | 2 + 4 files changed, 251 insertions(+), 3 deletions(-) create mode 100644 include/cdma-netreg.h create mode 100644 src/cdma-netreg.c diff --git a/Makefile.am b/Makefile.am index cef9892..4a4b1d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,8 +16,8 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \ include/cdma-sms.h include/sim-auth.h \ include/gprs-provision.h include/emulator.h \ include/location-reporting.h \ - include/cdma-connman.h include/gnss.h \ - include/private-network.h + include/cdma-connman.h include/cdma-netreg.h \ + include/gnss.h include/private-network.h nodist_pkginclude_HEADERS = include/version.h @@ -416,7 +416,7 @@ src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) src/ofono.ver \ src/cdma-connman.c src/gnss.c \ src/gnssagent.c src/gnssagent.h \ src/cdma-smsutil.h src/cdma-smsutil.c \ - src/cdma-sms.c src/private-network.c + src/cdma-sms.c src/cdma-netreg.c src/private-network.c src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl diff --git a/include/cdma-netreg.h b/include/cdma-netreg.h new file mode 100644 index 0000000..0da7cbb --- /dev/null +++ b/include/cdma-netreg.h @@ -0,0 +1,58 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2011 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_CDMA_NETREG_H +#define __OFONO_CDMA_NETREG_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include <ofono/types.h> + +struct ofono_cdma_netreg; + +struct ofono_cdma_netreg_driver { + const char *name; + int (*probe)(struct ofono_cdma_netreg *cdma_netreg, unsigned int vendor, + void *data); + void (*remove)(struct ofono_cdma_netreg *cdma_netreg); +}; + +int ofono_cdma_netreg_driver_register(const struct ofono_cdma_netreg_driver *d); +void ofono_cdma_netreg_driver_unregister(const struct ofono_cdma_netreg_driver *d); + +struct ofono_cdma_netreg *ofono_cdma_netreg_create(struct ofono_modem *modem, + unsigned int vendor, + const char *driver, + void *data); + +void ofono_cdma_netreg_register(struct ofono_cdma_netreg *cdma_netreg); +void ofono_cdma_netreg_remove(struct ofono_cdma_netreg *cdma_netreg); + +void ofono_cdma_netreg_set_data(struct ofono_cdma_netreg *cdma_netreg, void *data); +void *ofono_cdma_netreg_get_data(struct ofono_cdma_netreg *cdma_netreg); + +#ifdef __cplusplus +} +#endif + +#endif /* __OFONO_CDMA_NETREG_H */ diff --git a/src/cdma-netreg.c b/src/cdma-netreg.c new file mode 100644 index 0000000..b1cbd53 --- /dev/null +++ b/src/cdma-netreg.c @@ -0,0 +1,188 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2011 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 + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <errno.h> + +#include <gdbus.h> + +#include "ofono.h" + +static GSList *g_drivers; + +struct ofono_cdma_netreg { + const struct ofono_cdma_netreg_driver *driver; + void *driver_data; + struct ofono_atom *atom; +}; + +static DBusMessage *network_get_properties(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + DBusMessage *reply; + DBusMessageIter iter; + DBusMessageIter dict; + + reply = dbus_message_new_method_return(msg); + if (reply == NULL) + return NULL; + + dbus_message_iter_init_append(reply, &iter); + + dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, + OFONO_PROPERTIES_ARRAY_SIGNATURE, + &dict); + + dbus_message_iter_close_container(&iter, &dict); + + return reply; +} + +static GDBusMethodTable cdma_netreg_manager_methods[] = { + { "GetProperties", "", "a{sv}", network_get_properties }, + { } +}; + +static GDBusSignalTable cdma_netreg_manager_signals[] = { + { } +}; + +int ofono_cdma_netreg_driver_register(const struct ofono_cdma_netreg_driver *d) +{ + DBG("driver: %p, name: %s", d, d->name); + + if (d->probe == NULL) + return -EINVAL; + + g_drivers = g_slist_prepend(g_drivers, (void *)d); + + return 0; +} + +void ofono_cdma_netreg_driver_unregister(const struct ofono_cdma_netreg_driver *d) +{ + DBG("driver: %p, name: %s", d, d->name); + + g_drivers = g_slist_remove(g_drivers, (void *)d); +} + +static void cdma_netreg_unregister(struct ofono_atom *atom) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + struct ofono_modem *modem = __ofono_atom_get_modem(atom); + const char *path = __ofono_atom_get_path(atom); + + g_dbus_unregister_interface(conn, path, + OFONO_CDMA_NETWORK_REGISTRATION_INTERFACE); + + ofono_modem_remove_interface(modem, + OFONO_CDMA_NETWORK_REGISTRATION_INTERFACE); +} + +static void cdma_netreg_remove(struct ofono_atom *atom) +{ + struct ofono_cdma_netreg *cdma_netreg = __ofono_atom_get_data(atom); + + DBG("atom: %p", atom); + + if (cdma_netreg == NULL) + return; + + if (cdma_netreg->driver && cdma_netreg->driver->remove) + cdma_netreg->driver->remove(cdma_netreg); + + g_free(cdma_netreg); +} + +struct ofono_cdma_netreg *ofono_cdma_netreg_create(struct ofono_modem *modem, + unsigned int vendor, + const char *driver, + void *data) +{ + struct ofono_cdma_netreg *cdma_netreg; + GSList *l; + + if (driver == NULL) + return NULL; + + cdma_netreg = g_try_new0(struct ofono_cdma_netreg, 1); + if (cdma_netreg == NULL) + return NULL; + + cdma_netreg->atom = __ofono_modem_add_atom(modem, + OFONO_ATOM_TYPE_CDMA_NETREG, + cdma_netreg_remove, cdma_netreg); + + for (l = g_drivers; l; l = l->next) { + const struct ofono_cdma_netreg_driver *drv = l->data; + + if (g_strcmp0(drv->name, driver)) + continue; + + if (drv->probe(cdma_netreg, vendor, data) < 0) + continue; + + cdma_netreg->driver = drv; + break; + } + + return cdma_netreg; +} + +void ofono_cdma_netreg_register(struct ofono_cdma_netreg *cdma_netreg) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + struct ofono_modem *modem = __ofono_atom_get_modem(cdma_netreg->atom); + const char *path = __ofono_atom_get_path(cdma_netreg->atom); + + if (!g_dbus_register_interface(conn, path, + OFONO_CDMA_NETWORK_REGISTRATION_INTERFACE, + cdma_netreg_manager_methods, + cdma_netreg_manager_signals, + NULL, cdma_netreg, NULL)) { + ofono_error("Could not create %s interface", + OFONO_CDMA_NETWORK_REGISTRATION_INTERFACE); + return; + } + + ofono_modem_add_interface(modem, + OFONO_CDMA_NETWORK_REGISTRATION_INTERFACE); + + __ofono_atom_register(cdma_netreg->atom, cdma_netreg_unregister); +} + +void ofono_cdma_netreg_remove(struct ofono_cdma_netreg *cdma_netreg) +{ + __ofono_atom_free(cdma_netreg->atom); +} + +void ofono_cdma_netreg_set_data(struct ofono_cdma_netreg *cdma_netreg, void *data) +{ + cdma_netreg->driver_data = data; +} + +void *ofono_cdma_netreg_get_data(struct ofono_cdma_netreg *cdma_netreg) +{ + return cdma_netreg->driver_data; +} diff --git a/src/ofono.h b/src/ofono.h index 808a8f1..5e3a6b5 100644 --- a/src/ofono.h +++ b/src/ofono.h @@ -135,6 +135,7 @@ enum ofono_atom_type { OFONO_ATOM_TYPE_LOCATION_REPORTING, OFONO_ATOM_TYPE_GNSS, OFONO_ATOM_TYPE_CDMA_SMS, + OFONO_ATOM_TYPE_CDMA_NETREG, }; enum ofono_atom_watch_condition { @@ -480,6 +481,7 @@ void __ofono_gprs_provision_free_settings( #include <ofono/emulator.h> #include <ofono/gnss.h> #include <ofono/cdma-sms.h> +#include <ofono/cdma-netreg.h> #include <ofono/private-network.h> void __ofono_private_network_release(int id); -- 1.7.4.1 --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

--- Makefile.am | 3 +- drivers/cdmamodem/cdmamodem.c | 2 + drivers/cdmamodem/cdmamodem.h | 2 + drivers/cdmamodem/network-registration.c | 81 ++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 1 deletions(-) create mode 100644 drivers/cdmamodem/network-registration.c diff --git a/Makefile.am b/Makefile.am index 4a4b1d2..7e048f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -275,7 +275,8 @@ builtin_sources += drivers/cdmamodem/cdmamodem.h \ drivers/cdmamodem/cdmamodem.c \ drivers/cdmamodem/voicecall.c \ drivers/cdmamodem/devinfo.c \ - drivers/cdmamodem/connman.c + drivers/cdmamodem/connman.c \ + drivers/cdmamodem/network-registration.c endif builtin_modules += g1 diff --git a/drivers/cdmamodem/cdmamodem.c b/drivers/cdmamodem/cdmamodem.c index 1b19a4a..60d5315 100644 --- a/drivers/cdmamodem/cdmamodem.c +++ b/drivers/cdmamodem/cdmamodem.c @@ -37,6 +37,7 @@ static int cdmamodem_init(void) cdma_voicecall_init(); cdma_devinfo_init(); cdma_connman_init(); + cdma_netreg_init(); return 0; } @@ -46,6 +47,7 @@ static void cdmamodem_exit(void) cdma_voicecall_exit(); cdma_devinfo_exit(); cdma_connman_exit(); + cdma_netreg_exit(); } OFONO_PLUGIN_DEFINE(cdmamodem, "CDMA AT modem driver", VERSION, diff --git a/drivers/cdmamodem/cdmamodem.h b/drivers/cdmamodem/cdmamodem.h index 90e2848..f2d229b 100644 --- a/drivers/cdmamodem/cdmamodem.h +++ b/drivers/cdmamodem/cdmamodem.h @@ -27,3 +27,5 @@ extern void cdma_devinfo_init(void); extern void cdma_devinfo_exit(void); extern void cdma_connman_init(void); extern void cdma_connman_exit(void); +extern void cdma_netreg_init(void); +extern void cdma_netreg_exit(void); diff --git a/drivers/cdmamodem/network-registration.c b/drivers/cdmamodem/network-registration.c new file mode 100644 index 0000000..92dad56 --- /dev/null +++ b/drivers/cdmamodem/network-registration.c @@ -0,0 +1,81 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2011 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 + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#define _GNU_SOURCE +#include <glib.h> + +#include <ofono/log.h> +#include <ofono/modem.h> +#include <ofono/cdma-netreg.h> + +#include "gatchat.h" + +#include "cdmamodem.h" + +struct netreg_data { + GAtChat *chat; +}; + +static int cdma_netreg_probe(struct ofono_cdma_netreg *netreg, + unsigned int vendor, void *data) +{ + GAtChat *chat = data; + struct netreg_data *nd; + + nd = g_try_new0(struct netreg_data, 1); + + nd->chat = g_at_chat_clone(chat); + ofono_cdma_netreg_set_data(netreg, nd); + + ofono_cdma_netreg_register(netreg); + + return 0; +} + +static void cdma_netreg_remove(struct ofono_cdma_netreg *netreg) +{ + struct netreg_data *nd = ofono_cdma_netreg_get_data(netreg); + + ofono_cdma_netreg_set_data(netreg, NULL); + + g_at_chat_unref(nd->chat); + g_free(nd); +} + +static struct ofono_cdma_netreg_driver driver = { + .name = "cdmamodem", + .probe = cdma_netreg_probe, + .remove = cdma_netreg_remove, +}; + +void cdma_netreg_init(void) +{ + ofono_cdma_netreg_driver_register(&driver); +} + +void cdma_netreg_exit(void) +{ + ofono_cdma_netreg_driver_unregister(&driver); +} -- 1.7.4.1 --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

Hi Bertrand, On 08/02/2011 07:45 AM, Bertrand Aygon wrote: Two separate patches please, and the API changes should probably be merged into the earlier include/cdma-netreg patch. Is the unknown status even used by the hardware? In general oFono tries not to introduce such 'unknown' states whenever possible. Regardless, please keep the API definition and API implementation consistent. Right now doc/cdma-network-api.txt does not have a value for 'unknown'. So you must either send an RFC to update the cdma-network-api.txt first, or remove the reference to unknown. Using not registered as the default seems just fine to me right now... Since you went to the trouble of defining an enum for status information, please use that here instead of 'int'. Do you actually have immediate need for this function? If not, then please remove it. It is better to not to define an API than dealing with the repercussions of changing it later on. Again, please use an enum here Regards, -Denis

Hi Bertrand, On 08/02/2011 07:45 AM, Bertrand Aygon wrote: Why the double empty line? I don't see how Huawei specific commands belong inside the cdmamodem driver without at least a vendor quirk. Personally I would put these inside huaweicdmamodem driver. Regards, -Denis