diff options
| author | Landry Breuil <landry@rhaalovely.net> | 2011-03-06 14:38:40 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2011-03-21 18:39:24 +0000 |
| commit | b03290f11d491b6c021c273b3b11d16e68ef6009 (patch) | |
| tree | f722237cf4753c74723dfd7a4ad3445cc81bd0f8 /src | |
| parent | 564d1c47ad50b39970efe4f7c4c72fe43d8ed57d (diff) | |
openbsd: Declare prototypes for get_power_info/get_battery_state_value
Pass struct apm_power_info ptr as argument instead of returning it
Signed-off-by: Richard Hughes <richard@hughsie.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/openbsd/up-backend.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/openbsd/up-backend.c b/src/openbsd/up-backend.c index c98b5ba..5bd6c4d 100644 --- a/src/openbsd/up-backend.c +++ b/src/openbsd/up-backend.c @@ -11,6 +11,9 @@ static void up_backend_class_init (UpBackendClass *klass); static void up_backend_init (UpBackend *backend); static void up_backend_finalize (GObject *object); +static void up_backend_apm_get_power_info(int, struct apm_power_info*); +UpDeviceState up_backend_apm_get_battery_state_value(u_char battery_state); + #define UP_BACKEND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UP_TYPE_BACKEND, UpBackendPrivate)) struct UpBackendPrivate @@ -135,17 +138,15 @@ up_backend_get_used_swap (UpBackend *backend) * OpenBSD specific code **/ -struct apm_power_info -up_backend_apm_get_power_info(int fd) { - struct apm_power_info bstate; - bstate.battery_state = 255; - bstate.ac_state = 255; - bstate.battery_life = 0; - bstate.minutes_left = -1; +static void +up_backend_apm_get_power_info(int fd, struct apm_power_info *bstate) { + bstate->battery_state = 255; + bstate->ac_state = 255; + bstate->battery_life = 0; + bstate->minutes_left = -1; - if (-1 == ioctl(fd, APM_IOC_GETPOWER, &bstate)) + if (-1 == ioctl(fd, APM_IOC_GETPOWER, bstate)) g_warning("ioctl on fd %d failed : %s", fd, g_strerror(errno)); - return bstate; } UpDeviceState up_backend_apm_get_battery_state_value(u_char battery_state) { @@ -227,7 +228,7 @@ up_backend_apm_powerchange_event_cb(gpointer object) g_return_if_fail (UP_IS_BACKEND (object)); backend = UP_BACKEND (object); - a = up_backend_apm_get_power_info(backend->priv->apm_fd); + up_backend_apm_get_power_info(backend->priv->apm_fd, &a); g_debug("Got apm event, in callback, percentage=%d, battstate=%d, acstate=%d, minutes left=%d", a.battery_life, a.battery_state, a.ac_state, a.minutes_left); up_backend_update_ac_state(backend->priv->ac, a); |