diff options
| author | plunky <plunky@NetBSD.org> | 2007-10-27 19:51:29 +0000 |
|---|---|---|
| committer | plunky <plunky@NetBSD.org> | 2007-10-27 19:51:29 +0000 |
| commit | 60822ed9d3edc08ea9c992a1caa5691eb906bcf5 (patch) | |
| tree | e483dd163f50a0eacd8b25787543100f0be08313 | |
| parent | eff8fdc9d11b0f86e4273893c02b6cb463329bd4 (diff) | |
When no estimate of battery minutes_left can be made, apm should
return a value of 0.
| -rw-r--r-- | sys/dev/acpi/acpi_apm.c | 6 | ||||
| -rw-r--r-- | usr.sbin/apm/apm.c | 13 |
2 files changed, 8 insertions, 11 deletions
diff --git a/sys/dev/acpi/acpi_apm.c b/sys/dev/acpi/acpi_apm.c index bdf7ac018b6..64ece3a11ed 100644 --- a/sys/dev/acpi/acpi_apm.c +++ b/sys/dev/acpi/acpi_apm.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_apm.c,v 1.10 2007/07/05 13:53:21 xtraeme Exp $ */ +/* $NetBSD: acpi_apm.c,v 1.11 2007/10/27 19:51:29 plunky Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.10 2007/07/05 13:53:21 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.11 2007/10/27 19:51:29 plunky Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -289,7 +289,7 @@ acpiapm_get_powstat(void *opaque, u_int batteryid, (void)memset(pinfo, 0, sizeof(*pinfo)); pinfo->ac_state = APM_AC_UNKNOWN; pinfo->minutes_valid = 0; - pinfo->minutes_left = 0xffff; /* unknown */ + pinfo->minutes_left = 0; pinfo->batteryid = 0; pinfo->nbattery = 0; /* to be incremented as batteries are found */ pinfo->battery_flags = 0; diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c index ad16f199a21..1bfd67d39d0 100644 --- a/usr.sbin/apm/apm.c +++ b/usr.sbin/apm/apm.c @@ -1,4 +1,4 @@ -/* $NetBSD: apm.c,v 1.17 2006/09/23 22:06:42 elad Exp $ */ +/* $NetBSD: apm.c,v 1.18 2007/10/27 19:51:30 plunky Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -279,17 +279,14 @@ main(int argc, char *argv[]) switch (action) { case GETSTATUS: printval: - /* - * default unknown value for minutes_left, from - * sys/dev/acpi/acpi_apm.c - */ - if (api->minutes_left == 0xffff) - domin = FALSE; - if (verbose) { if (dobstate) printf("Battery charge state: %s\n", battstate(api->battery_state)); + + if (dopct && domin && api->minutes_left == 0) + domin = FALSE; + if (dopct || domin) { printf("Battery remaining: "); if (dopct) |
