 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_apm.c,v 1.15 2010/03/05 14:00:16 jruoho Exp $	*/
+/*	$NetBSD: acpi_apm.c,v 1.16 2010/03/24 01:45:37 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas and by Jared McNeill.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Autoconfiguration support for the Intel ACPI Component Architecture
  * ACPI reference implementation.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.15 2010/03/05 14:00:16 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.16 2010/03/24 01:45:37 pgoyette Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/apm/apmvar.h>
 static void	acpiapm_disconnect(void *);
 static void	acpiapm_enable(void *, int);
 static int	acpiapm_set_powstate(void *, u_int, u_int);
 static int	acpiapm_get_powstat(void *, u_int, struct apm_power_info *);
 @@ -252,36 +252,36 @@ acpiapm_set_powstate(void *opaque, u_int
 	return 0;
+}
 static int
 /*ARGSUSED*/
 acpiapm_get_powstat(void *opaque, u_int batteryid,
 	struct apm_power_info *pinfo)
+{
 #define APM_BATT_FLAG_WATERMARK_MASK (APM_BATT_FLAG_CRITICAL |		      \
 				      APM_BATT_FLAG_LOW |		      \
 				      APM_BATT_FLAG_HIGH)
 	int i, curcap, lowcap, warncap, cap, descap, lastcap, discharge;
-	int cap_valid, lastcap_valid, discharge_valid;
+	int cap_valid, lastcap_valid, discharge_valid, present;
 	envsys_tre_data_t etds;
 	envsys_basic_info_t ebis;
 	/* Denote most variables as unitialized. */
 	curcap = lowcap = warncap = descap = -1;
 	/* Prepare to aggregate these two variables over all batteries. */
 	cap = lastcap = discharge = 0;
-	cap_valid = lastcap_valid = discharge_valid = 0;
+	cap_valid = lastcap_valid = discharge_valid = present = 0;
 	(void)memset(pinfo, 0, sizeof(*pinfo));
 	pinfo->ac_state = APM_AC_UNKNOWN;
 	pinfo->minutes_valid = 0;
 	pinfo->minutes_left = 0;
 	pinfo->batteryid = 0;
 	pinfo->nbattery = 0;	/* to be incremented as batteries are found */
 	pinfo->battery_flags = 0;
 	pinfo->battery_state = APM_BATT_UNKNOWN; /* ignored */
 	pinfo->battery_life = APM_BATT_LIFE_UNKNOWN;
 	sysmonopen_envsys(0, 0, 0, &lwp0);
 @@ -297,28 +297,28 @@ acpiapm_get_powstat(void *opaque, u_int
 		etds.sensor = i;
 		if (sysmonioctl_envsys(0, ENVSYS_GTREDATA, (void *)&etds, 0,
 		    NULL))
 			continue;
 		desc = ebis.desc;
 		flags = etds.validflags;
 		data = etds.cur.data_s;
 		DPRINTF(("%d %s %d %d\n", i, desc, data, flags));
 		if ((flags & ENVSYS_FCURVALID) == 0)
 			continue;
 		if (strstr(desc, " connected")) {
 			pinfo->ac_state = data ? APM_AC_ON : APM_AC_OFF;
-		} else if (strstr(desc, " present") && data == 0)
+		} else if (strstr(desc, " present") && data != 0)
-			pinfo->battery_flags |= APM_BATT_FLAG_NO_SYSTEM_BATTERY;
+			present++;
 		else if (strstr(desc, " charging") && data)
 			pinfo->battery_flags |= APM_BATT_FLAG_CHARGING;
 		else if (strstr(desc, " charging") && !data)
 			pinfo->battery_flags &= ~APM_BATT_FLAG_CHARGING;
 		else if (strstr(desc, " warn cap"))
 			warncap = data / 1000;
 		else if (strstr(desc, " low cap"))
 			lowcap = data / 1000;
 		else if (strstr(desc, " last full cap")) {
 			lastcap += data / 1000;
 			lastcap_valid = 1;
+		}
 		else if (strstr(desc, " design cap"))
 @@ -327,26 +327,29 @@ acpiapm_get_powstat(void *opaque, u_int
 		    strstr(desc, " charge rate") == NULL &&
 		    strstr(desc, " charge state") == NULL) {
 			cap += data / 1000;
 			cap_valid = 1;
 			pinfo->nbattery++;
+		}
 		else if (strstr(desc, " discharge rate")) {
 			discharge += data / 1000;
 			discharge_valid = 1;
+		}
+	}
 	sysmonclose_envsys(0, 0, 0, &lwp0);
 	if (present == 0)
 		pinfo->battery_flags |= APM_BATT_FLAG_NO_SYSTEM_BATTERY;
 	if (cap_valid > 0)  {
 		if (warncap != -1 && cap < warncap)
 			pinfo->battery_flags |= APM_BATT_FLAG_CRITICAL;
 		else if (lowcap != -1) {
 			if (cap < lowcap)
 				pinfo->battery_flags |= APM_BATT_FLAG_LOW;
 			else
 				pinfo->battery_flags |= APM_BATT_FLAG_HIGH;
+		}
 		if (lastcap_valid > 0 && lastcap != 0)
 			pinfo->battery_life = 100 * cap / lastcap;
 		else if (descap != -1 && descap != 0)
 			pinfo->battery_life = 100 * cap / descap;