---
include/cdma-netreg.h | 11 +++++++++
src/cdma-netreg.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/include/cdma-netreg.h b/include/cdma-netreg.h
index 0da7cbb..b18d500 100644
--- a/include/cdma-netreg.h
+++ b/include/cdma-netreg.h
@@ -28,6 +28,12 @@ extern "C" {
#include <ofono/types.h>
+enum cdma_network_registration_status {
+ CDMA_NETWORK_REGISTRATION_STATUS_NOT_REGISTERED = 0,
+ CDMA_NETWORK_REGISTRATION_STATUS_REGISTERED = 1,
+ CDMA_NETWORK_REGISTRATION_STATUS_UNKNOWN = 2,
+};
+
struct ofono_cdma_netreg;
struct ofono_cdma_netreg_driver {
@@ -37,6 +43,9 @@ struct ofono_cdma_netreg_driver {
void (*remove)(struct ofono_cdma_netreg *cdma_netreg);
};
+void ofono_cdma_netreg_status_notify(struct ofono_cdma_netreg *netreg,
+ int status);
+
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);
@@ -51,6 +60,8 @@ 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);
+int ofono_cdma_netreg_get_status(struct ofono_cdma_netreg *cdma_netreg);
+
#ifdef __cplusplus
}
#endif
diff --git a/src/cdma-netreg.c b/src/cdma-netreg.c
index b1cbd53..0d7dc03 100644
--- a/src/cdma-netreg.c
+++ b/src/cdma-netreg.c
@@ -32,18 +32,36 @@
static GSList *g_drivers;
struct ofono_cdma_netreg {
+ int status;
const struct ofono_cdma_netreg_driver *driver;
void *driver_data;
struct ofono_atom *atom;
};
+static const char *cdma_registration_status_to_string(int status)
+{
+ switch (status) {
+ case CDMA_NETWORK_REGISTRATION_STATUS_NOT_REGISTERED:
+ return "unregistered";
+ case CDMA_NETWORK_REGISTRATION_STATUS_REGISTERED:
+ return "registered";
+ case CDMA_NETWORK_REGISTRATION_STATUS_UNKNOWN:
+ return "unknown";
+ }
+
+ return "";
+}
+
static DBusMessage *network_get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
+ struct ofono_cdma_netreg *cdma_netreg = data;
DBusMessage *reply;
DBusMessageIter iter;
DBusMessageIter dict;
+ const char *status =
cdma_registration_status_to_string(cdma_netreg->status);
+
reply = dbus_message_new_method_return(msg);
if (reply == NULL)
return NULL;
@@ -54,6 +72,8 @@ static DBusMessage *network_get_properties(DBusConnection
*conn,
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
+ ofono_dbus_dict_append(&dict, "Status", DBUS_TYPE_STRING, &status);
+
dbus_message_iter_close_container(&iter, &dict);
return reply;
@@ -68,6 +88,40 @@ static GDBusSignalTable cdma_netreg_manager_signals[] = {
{ }
};
+
+static void set_registration_status(struct ofono_cdma_netreg *cdma_netreg,
+ int status)
+{
+ const char *str_status = cdma_registration_status_to_string(status);
+ const char *path = __ofono_atom_get_path(cdma_netreg->atom);
+ DBusConnection *conn = ofono_dbus_get_connection();
+
+ cdma_netreg->status = status;
+
+ ofono_dbus_signal_property_changed(conn, path,
+ OFONO_CDMA_NETWORK_REGISTRATION_INTERFACE,
+ "Status", DBUS_TYPE_STRING,
+ &str_status);
+}
+
+void ofono_cdma_netreg_status_notify(struct ofono_cdma_netreg *cdma_netreg,
+ int status)
+{
+ if (cdma_netreg == NULL)
+ return;
+
+ if (cdma_netreg->status != status)
+ set_registration_status(cdma_netreg, status);
+}
+
+int ofono_cdma_netreg_get_status(struct ofono_cdma_netreg *cdma_netreg)
+{
+ if (cdma_netreg == NULL)
+ return -1;
+
+ return cdma_netreg->status;
+}
+
int ofono_cdma_netreg_driver_register(const struct ofono_cdma_netreg_driver *d)
{
DBG("driver: %p, name: %s", d, d->name);
@@ -130,6 +184,8 @@ struct ofono_cdma_netreg *ofono_cdma_netreg_create(struct
ofono_modem *modem,
if (cdma_netreg == NULL)
return NULL;
+ cdma_netreg->status = CDMA_NETWORK_REGISTRATION_STATUS_UNKNOWN;
+
cdma_netreg->atom = __ofono_modem_add_atom(modem,
OFONO_ATOM_TYPE_CDMA_NETREG,
cdma_netreg_remove, cdma_netreg);
--
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.
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
