From: Andras Domokos <andras.domo...@nokia.com>
Modem state notifiers get called after modem state has been changed
and atoms have been added or flushed.
The modem state watch benefit the atoms that are active in several
states, such as voicecall, sms, or gprs.
---
src/modem.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++-----------
src/ofono.h | 15 +++++++++++++
2 files changed, 67 insertions(+), 12 deletions(-)
diff --git a/src/modem.c b/src/modem.c
index 7a29edf..dc7c1b2 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -51,16 +51,9 @@ enum property_type {
PROPERTY_TYPE_BOOLEAN,
};
-enum modem_state {
- MODEM_STATE_POWER_OFF,
- MODEM_STATE_PRE_SIM,
- MODEM_STATE_OFFLINE,
- MODEM_STATE_ONLINE,
-};
-
struct ofono_modem {
char *path;
- enum modem_state modem_state;
+ enum ofono_modem_state modem_state;
GSList *atoms;
struct ofono_watchlist *atom_watches;
GSList *interface_list;
@@ -72,6 +65,7 @@ struct ofono_modem {
ofono_bool_t powered_pending;
guint timeout;
ofono_bool_t online;
+ struct ofono_watchlist *state_watches;
GHashTable *properties;
struct ofono_sim *sim;
unsigned int sim_watch;
@@ -94,7 +88,7 @@ struct ofono_devinfo {
struct ofono_atom {
enum ofono_atom_type type;
- enum modem_state modem_state;
+ enum ofono_modem_state modem_state;
void (*destruct)(struct ofono_atom *atom);
void (*unregister)(struct ofono_atom *atom);
void *data;
@@ -324,7 +318,8 @@ void __ofono_atom_free(struct ofono_atom *atom)
g_free(atom);
}
-static void flush_atoms(struct ofono_modem *modem, enum modem_state new_state)
+static void flush_atoms(struct ofono_modem *modem,
+ enum ofono_modem_state new_state)
{
GSList *cur;
GSList *prev;
@@ -360,11 +355,50 @@ static void flush_atoms(struct ofono_modem *modem, enum
modem_state new_state)
}
}
+static void notify_state_watches(struct ofono_modem *modem)
+{
+ struct ofono_watchlist_item *item;
+ GSList *l;
+ ofono_modem_state_notify_func notify;
+
+ if (modem->state_watches == NULL)
+ return;
+
+ for (l = modem->state_watches->items; l; l = l->next) {
+ item = l->data;
+ notify = item->notify;
+ notify(modem->modem_state, item->notify_data);
+ }
+}
+
+unsigned __ofono_modem_add_state_watch(struct ofono_modem *modem,
+ ofono_modem_state_notify_func notify,
+ void *data, ofono_destroy_func destroy)
+{
+ struct ofono_watchlist_item *item;
+
+ if (modem == NULL || notify == NULL)
+ return 0;
+
+ item = g_new0(struct ofono_watchlist_item, 1);
+
+ item->notify = notify;
+ item->destroy = destroy;
+ item->notify_data = data;
+
+ return __ofono_watchlist_add_item(modem->state_watches, item);
+}
+
+void __ofono_modem_remove_state_watch(struct ofono_modem *modem, unsigned id)
+{
+ __ofono_watchlist_remove_item(modem->state_watches, id);
+}
+
static void modem_change_state(struct ofono_modem *modem,
- enum modem_state new_state)
+ enum ofono_modem_state new_state)
{
struct ofono_modem_driver const *driver = modem->driver;
- enum modem_state old_state = modem->modem_state;
+ enum ofono_modem_state old_state = modem->modem_state;
ofono_bool_t new_online = new_state == MODEM_STATE_ONLINE;
if (old_state == new_state)
@@ -407,6 +441,8 @@ static void modem_change_state(struct ofono_modem *modem,
driver->post_online(modem);
break;
}
+
+ notify_state_watches(modem);
}
static void sim_state_watch(enum ofono_sim_state new_state, void *user)
@@ -1457,6 +1493,7 @@ int ofono_modem_register(struct ofono_modem *modem)
modem->driver_type = NULL;
modem->atom_watches = __ofono_watchlist_new(g_free);
+ modem->state_watches = __ofono_watchlist_new(g_free);
emit_modem_added(modem);
call_modemwatches(modem, TRUE);
@@ -1488,6 +1525,9 @@ static void modem_unregister(struct ofono_modem *modem)
__ofono_watchlist_free(modem->atom_watches);
modem->atom_watches = NULL;
+ __ofono_watchlist_free(modem->state_watches);
+ modem->state_watches = NULL;
+
modem->sim_watch = 0;
modem->sim_ready_watch = 0;
diff --git a/src/ofono.h b/src/ofono.h
index 6c7f649..9021f51 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -177,6 +177,21 @@ unsigned int __ofono_modemwatch_add(ofono_modemwatch_cb_t
cb, void *user,
ofono_destroy_func destroy);
gboolean __ofono_modemwatch_remove(unsigned int id);
+enum ofono_modem_state {
+ MODEM_STATE_POWER_OFF,
+ MODEM_STATE_PRE_SIM,
+ MODEM_STATE_OFFLINE,
+ MODEM_STATE_ONLINE,
+};
+
+typedef void (*ofono_modem_state_notify_func)(enum ofono_modem_state state,
+ void *data);
+unsigned int __ofono_modem_add_state_watch(struct ofono_modem *modem,
+ ofono_modem_state_notify_func notify,
+ void *data, ofono_destroy_func destroy);
+void __ofono_modem_remove_state_watch(struct ofono_modem *modem,
+ unsigned int id);
+
#include <ofono/call-barring.h>
gboolean __ofono_call_barring_is_busy(struct ofono_call_barring *cb);
--
1.7.0.4
_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono
