sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

modem: Fix up previous commit

This commit is contained in:
Denis Kenzior 2011-02-09 23:15:52 -06:00
parent 2b50146a21
commit 458fe585a0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modem.c
View File

@ -759,13 +759,12 @@ static int set_powered(struct ofono_modem *modem, ofono_bool_t powered)
err = driver->disable(modem);
}
if (err == 0)
if (err == 0) {
modem->powered = powered;
else if (err != -EINPROGRESS)
notify_powered_watches(modem);
} else if (err != -EINPROGRESS)
modem->powered_pending = modem->powered;
notify_powered_watches(modem);
return err;
}
@ -797,6 +796,8 @@ static gboolean set_powered_timeout(gpointer user)
dbus_bool_t powered = FALSE;
modem->powered = FALSE;
notify_powered_watches(modem);
ofono_dbus_signal_property_changed(conn, modem->path,
OFONO_MODEM_INTERFACE,
"Powered", DBUS_TYPE_BOOLEAN,
@ -1034,6 +1035,7 @@ void ofono_modem_set_powered(struct ofono_modem *modem, ofono_bool_t powered)
goto out;
modem->powered = powered;
notify_powered_watches(modem);
if (modem->lockdown)
ofono_dbus_signal_property_changed(conn, modem->path,

4
src/ofono.h
View File

@ -188,7 +188,9 @@ unsigned int __ofono_modem_add_online_watch(struct ofono_modem *modem,
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)(ofono_bool_t powered,
void *data);
unsigned int __ofono_modem_add_powered_watch(struct ofono_modem *modem,
ofono_modem_online_notify_func notify,
void *data, ofono_destroy_func destroy);