From c1b8e3521a0255bb4b2fa57dc9e974b0c6efb5ff Mon Sep 17 00:00:00 2001 From: aymeric Date: Thu, 23 Oct 2008 07:35:46 +0000 Subject: [PATCH] pass the right sensor types so that the kernel doesn't panic() on my iBook G3 --- sys/arch/macppc/dev/battery.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arch/macppc/dev/battery.c b/sys/arch/macppc/dev/battery.c index ca206e38d043..48573385b4a3 100644 --- a/sys/arch/macppc/dev/battery.c +++ b/sys/arch/macppc/dev/battery.c @@ -1,4 +1,4 @@ -/* $NetBSD: battery.c,v 1.10 2008/04/29 06:53:02 martin Exp $ */ +/* $NetBSD: battery.c,v 1.11 2008/10/23 07:35:46 aymeric Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: battery.c,v 1.10 2008/04/29 06:53:02 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: battery.c,v 1.11 2008/10/23 07:35:46 aymeric Exp $"); #include #include @@ -244,11 +244,11 @@ battery_setup_envsys(struct battery_softc *sc) INITDATA(BAT_AC_PRESENT, ENVSYS_INDICATOR, "AC present"); INITDATA(BAT_PRESENT, ENVSYS_INDICATOR, "Battery present"); INITDATA(BAT_VOLTAGE, ENVSYS_SVOLTS_DC, "Battery voltage"); - INITDATA(BAT_CHARGE, ENVSYS_INTEGER, "Battery charge"); - INITDATA(BAT_MAX_CHARGE, ENVSYS_INTEGER, "Battery design cap"); + INITDATA(BAT_CHARGE, ENVSYS_SAMPHOUR, "Battery charge"); + INITDATA(BAT_MAX_CHARGE, ENVSYS_SAMPHOUR, "Battery design cap"); INITDATA(BAT_CURRENT, ENVSYS_SAMPS, "Battery current"); INITDATA(BAT_TEMPERATURE, ENVSYS_STEMP, "Battery temperature"); - INITDATA(BAT_CHARGING, ENVSYS_INDICATOR, "Battery charging"); + INITDATA(BAT_CHARGING, ENVSYS_BATTERY_CHARGE, "Battery charging"); INITDATA(BAT_FULL, ENVSYS_INDICATOR, "Battery full"); #undef INITDATA