From 3e69defe861e47464932f148cf0bc27c6d96e9d7 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 9 Feb 2011 23:50:10 -0600 Subject: modem: Tweak online & powered watch APIs --- src/modem.c | 4 ++-- src/ofono.h | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/modem.c b/src/modem.c index 18d9bbe0..3c1bb52e 100644 --- a/src/modem.c +++ b/src/modem.c @@ -380,7 +380,7 @@ static void notify_online_watches(struct ofono_modem *modem) for (l = modem->online_watches->items; l; l = l->next) { item = l->data; notify = item->notify; - notify(modem->online, item->notify_data); + notify(modem, modem->online, item->notify_data); } } @@ -396,7 +396,7 @@ static void notify_powered_watches(struct ofono_modem *modem) for (l = modem->powered_watches->items; l; l = l->next) { item = l->data; notify = item->notify; - notify(modem->powered, item->notify_data); + notify(modem, modem->powered, item->notify_data); } } diff --git a/src/ofono.h b/src/ofono.h index c3f1d519..dbe18624 100644 --- a/src/ofono.h +++ b/src/ofono.h @@ -182,15 +182,18 @@ unsigned int __ofono_modemwatch_add(ofono_modemwatch_cb_t cb, void *user, ofono_destroy_func destroy); gboolean __ofono_modemwatch_remove(unsigned int id); -typedef void (*ofono_modem_online_notify_func)(ofono_bool_t online, void *data); +typedef void (*ofono_modem_online_notify_func)(struct ofono_modem *modem, + ofono_bool_t online, + void *data); unsigned int __ofono_modem_add_online_watch(struct ofono_modem *modem, ofono_modem_online_notify_func notify, void *data, ofono_destroy_func destroy); void __ofono_modem_remove_online_watch(struct ofono_modem *modem, unsigned int id); -typedef void (*ofono_modem_powered_notify_func)(ofono_bool_t powered, - void *data); +typedef void (*ofono_modem_powered_notify_func)(struct ofono_modem *modem, + ofono_bool_t powered, + void *data); unsigned int __ofono_modem_add_powered_watch(struct ofono_modem *modem, ofono_modem_online_notify_func notify, -- cgit v1.2.3