summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpica
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2003-09-13 20:13:01 +0000
committernjl <njl@FreeBSD.org>2003-09-13 20:13:01 +0000
commit31d2c70e5eccca6481c953a49858a632a10d7ee0 (patch)
tree348ee2e81978b81e73d170abeabcaaa99a2d993b /sys/dev/acpica
parentb182e8a6eb2eeed761202acafe91126d5d875c95 (diff)
downloadFreeBSD-src-31d2c70e5eccca6481c953a49858a632a10d7ee0.zip
FreeBSD-src-31d2c70e5eccca6481c953a49858a632a10d7ee0.tar.gz
Add the -i flag to acpiconf(8) to retrieve battery information.
Rename a few structure elements.
Diffstat (limited to 'sys/dev/acpica')
-rw-r--r--sys/dev/acpica/acpi_cmbat.c4
-rw-r--r--sys/dev/acpica/acpiio.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c
index 9ca5989..a5a9a09 100644
--- a/sys/dev/acpica/acpi_cmbat.c
+++ b/sys/dev/acpica/acpi_cmbat.c
@@ -264,7 +264,7 @@ acpi_cmbat_get_bif(void *context)
goto end;
}
- PKG_GETINT(res, tmp, 0, sc->bif.unit, end);
+ PKG_GETINT(res, tmp, 0, sc->bif.units, end);
PKG_GETINT(res, tmp, 1, sc->bif.dcap, end);
PKG_GETINT(res, tmp, 2, sc->bif.lfcap, end);
PKG_GETINT(res, tmp, 3, sc->bif.btech, end);
@@ -404,7 +404,7 @@ acpi_cmbat_ioctl(u_long cmd, caddr_t addr, void *arg)
case ACPIIO_CMBAT_GET_BIF:
acpi_cmbat_get_bif(dev);
bifp = &ioctl_arg->bif;
- bifp->unit = sc->bif.unit;
+ bifp->units = sc->bif.units;
bifp->dcap = sc->bif.dcap;
bifp->lfcap = sc->bif.lfcap;
bifp->btech = sc->bif.btech;
diff --git a/sys/dev/acpica/acpiio.h b/sys/dev/acpica/acpiio.h
index a34002d..5642492 100644
--- a/sys/dev/acpica/acpiio.h
+++ b/sys/dev/acpica/acpiio.h
@@ -50,10 +50,10 @@ struct acpi_battinfo {
#define ACPI_CMBAT_MAXSTRLEN 32
struct acpi_bif {
- u_int32_t unit; /* 0 for mWh, 1 for mAh */
+ u_int32_t units; /* 0 for mWh, 1 for mAh */
u_int32_t dcap; /* Design Capacity */
u_int32_t lfcap; /* Last Full capacity */
- u_int32_t btech; /* Battery Technorogy */
+ u_int32_t btech; /* Battery Technology */
u_int32_t dvol; /* Design voltage (mV) */
u_int32_t wcap; /* WARN capacity */
u_int32_t lcap; /* Low capacity */
OpenPOWER on IntegriCloud