Module Name: src
Committed By: jruoho
Date: Mon Mar 22 09:31:24 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_bat.c
Log Message:
Set the capacity flags already in the acpibat_get_info(),
instead of acpibat_get_status().
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 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.92 src/sys/dev/acpi/acpi_bat.c:1.93
--- src/sys/dev/acpi/acpi_bat.c:1.92 Sun Mar 21 07:09:56 2010
+++ src/sys/dev/acpi/acpi_bat.c Mon Mar 22 09:31:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.92 2010/03/21 07:09:56 pooka Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.93 2010/03/22 09:31:24 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.92 2010/03/21 07:09:56 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.93 2010/03/22 09:31:24 jruoho Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -418,6 +418,8 @@
*/
val = sc->sc_sensor[ACPIBAT_LFCCAPACITY].value_cur;
sc->sc_sensor[ACPIBAT_CAPACITY].value_max = val;
+ sc->sc_sensor[ACPIBAT_CAPACITY].flags |=
+ ENVSYS_FPERCENT | ENVSYS_FVALID_MAX;
acpibat_print_info(dv, elm);
@@ -542,8 +544,6 @@
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;
