Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

back-out previous; it was wrong.

This commit is contained in:
christos 2003-02-24 20:03:02 +00:00
parent 29cd3b6180
commit 580397c542
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/acpi/acpi_bat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_bat.c,v 1.17 2003/02/24 19:58:09 christos Exp $ */
/* $NetBSD: acpi_bat.c,v 1.18 2003/02/24 20:03:02 christos Exp $ */
/*
* Copyright 2001 Bill Sommerfeld.
@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.17 2003/02/24 19:58:09 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.18 2003/02/24 20:03:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -337,12 +337,12 @@ acpibat_battery_present(struct acpibat_softc *sc)
if (p1->Type != ACPI_TYPE_INTEGER) {
printf("%s: expected INTEGER, got %d\n", sc->sc_dev.dv_xname,
p1->Type);
goto out;
return (-1);
}
if (p1->Package.Count < 1) {
printf("%s: expected 1 elts, got %d\n",
sc->sc_dev.dv_xname, p1->Package.Count);
goto out;
return (-1);
}
sta = p1->Integer.Value;
@ -355,11 +355,7 @@ acpibat_battery_present(struct acpibat_softc *sc)
sc->sc_data[ACPIBAT_PRESENT].cur.data_s = 0;
ABAT_UNLOCK(sc, s);
AcpiOsFree(buf.Pointer);
return ((sta & ACPIBAT_STA_PRESENT)?1:0);
out:
AcpiOsFree(buf.Pointer);
return -1;
}
/*
@ -479,11 +475,11 @@ acpibat_get_status(struct acpibat_softc *sc)
if (p1->Type != ACPI_TYPE_PACKAGE) {
printf("bat: expected PACKAGE, got %d\n", p1->Type);
goto out;
return (AE_ERROR);
}
if (p1->Package.Count < 4) {
printf("bat: expected 4 elts, got %d\n", p1->Package.Count);
goto out;
return (AE_ERROR);
}
p2 = p1->Package.Elements;
@ -507,11 +503,7 @@ acpibat_get_status(struct acpibat_softc *sc)
sc->sc_available = ABAT_ALV_STAT;
ABAT_UNLOCK(sc, s);
AcpiOsFree(buf.Pointer);
return (AE_OK);
out:
AcpiOsFree(buf.Pointer);
return (AE_ERROR);
}
#define SCALE(x) ((x)/1000000), (((x)%1000000)/1000)