diff options
| author | jmcneill <jmcneill> | 2008-11-27 12:24:02 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill> | 2008-11-27 12:24:02 +0000 |
| commit | 8d4ad48b1eb9ca30b53c5077d9e7e6ba37599255 (patch) | |
| tree | 2065593f637a46ee112ef47ffac161ccebe62c71 /sysutils/hal/files | |
| parent | 81a50aaa504619f6d2a0b5e538593b69240cf381 (diff) | |
| download | pkgsrc-8d4ad48b1eb9ca30b53c5077d9e7e6ba37599255.tar.gz | |
hald-netbsd: clear is_charging/is_discharging before walking through the
sensor properties, and make sure we don't read an invalid sensor in
the process. Bump PKGREVISION.
Diffstat (limited to 'sysutils/hal/files')
| -rw-r--r-- | sysutils/hal/files/hald-netbsd/envsys.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/sysutils/hal/files/hald-netbsd/envsys.c b/sysutils/hal/files/hald-netbsd/envsys.c index 98d4b848aec..d5491224060 100644 --- a/sysutils/hal/files/hald-netbsd/envsys.c +++ b/sysutils/hal/files/hald-netbsd/envsys.c @@ -1,4 +1,4 @@ -/* $NetBSD: envsys.c,v 1.1 2008/11/27 01:45:00 jmcneill Exp $ */ +/* $NetBSD: envsys.c,v 1.2 2008/11/27 12:24:02 jmcneill Exp $ */ /*- * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca> @@ -174,6 +174,8 @@ envsys_battery_handler(HalDevice *d, prop_array_t properties) device_property_atomic_update_begin (); hal_device_property_set_bool (d, "battery.is_rechargeable", TRUE); + hal_device_property_set_bool (d, "battery.rechargeable.is_charging", FALSE); + hal_device_property_set_bool (d, "battery.rechargeable.is_discharging", FALSE); iter = prop_array_iterator (properties); while ((prop = (prop_dictionary_t)prop_object_iterator_next (iter)) != NULL) { @@ -181,10 +183,10 @@ envsys_battery_handler(HalDevice *d, prop_array_t properties) const char *valid; int64_t intval; - if (prop_dictionary_get_cstring_nocopy (prop, "description", &descr) == false) - continue; - - if (prop_dictionary_get_int64 (prop, "cur-value", &intval) == false) + if (prop_dictionary_get_cstring_nocopy (prop, "description", &descr) == false || + prop_dictionary_get_int64 (prop, "cur-value", &intval) == false || + prop_dictionary_get_cstring_nocopy (prop, "state", &valid) == false || + strcmp (valid, "valid") != 0) continue; if (strcmp (descr, "present") == 0) @@ -204,21 +206,13 @@ envsys_battery_handler(HalDevice *d, prop_array_t properties) hal_device_property_set_int (d, "battery.charge_level.percentage", 0); } else if (strcmp (descr, "charge rate") == 0) { - if (prop_dictionary_get_cstring_nocopy (prop, "state", &valid) == false) - continue; - if (strcmp (valid, "valid") == 0) { - hal_device_property_set_bool (d, "battery.rechargeable.is_charging", TRUE); - hal_device_property_set_bool (d, "battery.rechargeable.is_discharging", FALSE); - hal_device_property_set_int (d, "battery.charge_level.rate", intval / 3600); - } + hal_device_property_set_bool (d, "battery.rechargeable.is_charging", TRUE); + hal_device_property_set_bool (d, "battery.rechargeable.is_discharging", FALSE); + hal_device_property_set_int (d, "battery.charge_level.rate", intval / 3600); } else if (strcmp (descr, "discharge rate") == 0) { - if (prop_dictionary_get_cstring_nocopy (prop, "state", &valid) == false) - continue; - if (strcmp (valid, "valid") == 0) { - hal_device_property_set_bool (d, "battery.rechargeable.is_charging", FALSE); - hal_device_property_set_bool (d, "battery.rechargeable.is_discharging", TRUE); - hal_device_property_set_int (d, "battery.charge_level.rate", intval / 3600); - } + hal_device_property_set_bool (d, "battery.rechargeable.is_charging", FALSE); + hal_device_property_set_bool (d, "battery.rechargeable.is_discharging", TRUE); + hal_device_property_set_int (d, "battery.charge_level.rate", intval / 3600); } } |