Module Name: src
Committed By: jruoho
Date: Wed Mar 17 07:48:18 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_bat.c
Log Message:
Fix the testing of temporarily unknown values.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/acpi/acpi_bat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.87 src/sys/dev/acpi/acpi_bat.c:1.88
--- src/sys/dev/acpi/acpi_bat.c:1.87 Wed Mar 17 07:40:34 2010
+++ src/sys/dev/acpi/acpi_bat.c Wed Mar 17 07:48:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.87 2010/03/17 07:40:34 jruoho Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.88 2010/03/17 07:48:18 jruoho Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.87 2010/03/17 07:40:34 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.88 2010/03/17 07:48:18 jruoho Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -166,7 +166,7 @@
#define ACPIBAT_ST_CRITICAL 0x00000004 /* battery is critical */
/*
- * A value used when _BST or _BIF is temporarily unknown (see ibid.).
+ * A value used when _BST or _BIF is temporarily unknown.
*/
#define ACPIBAT_VAL_UNKNOWN 0xFFFFFFFF
@@ -415,13 +415,13 @@
sc->sc_sensor[ACPIBAT_CAPACITY].units = capunit;
/* Design capacity. */
- val = elm[ACPIBAT_BIF_DCAPACITY].Integer.Value * 1000;
- sc->sc_sensor[ACPIBAT_DCAPACITY].value_cur = val;
+ val = elm[ACPIBAT_BIF_DCAPACITY].Integer.Value;
+ sc->sc_sensor[ACPIBAT_DCAPACITY].value_cur = val * 1000;
sc->sc_sensor[ACPIBAT_DCAPACITY].state = ACPIBAT_VAL_ISVALID(val);
/* Last full charge capacity. */
- val = elm[ACPIBAT_BIF_LFCCAPACITY].Integer.Value * 1000;
- sc->sc_sensor[ACPIBAT_LFCCAPACITY].value_cur = val;
+ val = elm[ACPIBAT_BIF_LFCCAPACITY].Integer.Value;
+ sc->sc_sensor[ACPIBAT_LFCCAPACITY].value_cur = val * 1000;
sc->sc_sensor[ACPIBAT_LFCCAPACITY].state = ACPIBAT_VAL_ISVALID(val);
/* Battery technology. */
@@ -430,8 +430,8 @@
sc->sc_sensor[ACPIBAT_TECHNOLOGY].state = ACPIBAT_VAL_ISVALID(val);
/* Design voltage. */
- val = elm[ACPIBAT_BIF_DVOLTAGE].Integer.Value * 1000;
- sc->sc_sensor[ACPIBAT_DVOLTAGE].value_cur = val;
+ val = elm[ACPIBAT_BIF_DVOLTAGE].Integer.Value;
+ sc->sc_sensor[ACPIBAT_DVOLTAGE].value_cur = val * 1000;
sc->sc_sensor[ACPIBAT_DVOLTAGE].state = ACPIBAT_VAL_ISVALID(val);
/* Design low and warning capacity. */
@@ -510,15 +510,15 @@
}
/* Remaining capacity. */
- val = elm[ACPIBAT_BST_CAPACITY].Integer.Value * 1000;
- sc->sc_sensor[ACPIBAT_CAPACITY].value_cur = val;
+ val = elm[ACPIBAT_BST_CAPACITY].Integer.Value;
+ sc->sc_sensor[ACPIBAT_CAPACITY].value_cur = val * 1000;
sc->sc_sensor[ACPIBAT_CAPACITY].state = ACPIBAT_VAL_ISVALID(val);
sc->sc_sensor[ACPIBAT_CAPACITY].flags |=
ENVSYS_FPERCENT | ENVSYS_FVALID_MAX;
/* Battery voltage. */
- val = elm[ACPIBAT_BST_VOLTAGE].Integer.Value * 1000;
- sc->sc_sensor[ACPIBAT_VOLTAGE].value_cur = val;
+ val = elm[ACPIBAT_BST_VOLTAGE].Integer.Value;
+ sc->sc_sensor[ACPIBAT_VOLTAGE].value_cur = val * 1000;
sc->sc_sensor[ACPIBAT_VOLTAGE].state = ACPIBAT_VAL_ISVALID(val);
sc->sc_sensor[ACPIBAT_CHARGE_STATE].state = ENVSYS_SVALID;
