Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/macppc/dev/apm.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/macppc/dev/apm.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -p -r1.8.2.4 -r1.8.2.5
--- src/sys/arch/macppc/dev/apm.c	2004/11/18 21:20:22	1.8.2.4
+++ src/sys/arch/macppc/dev/apm.c	2005/02/04 11:44:33	1.8.2.5
@@ -1,4 +1,4 @@
-/*	$NetBSD: apm.c,v 1.8.2.4 2004/11/18 21:20:22 skrll Exp $	*/
+/*	$NetBSD: apm.c,v 1.8.2.5 2005/02/04 11:44:33 skrll Exp $	*/
 /*	$OpenBSD: apm.c,v 1.5 2002/06/07 07:13:59 miod Exp $	*/
 
 /*-
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.8.2.4 2004/11/18 21:20:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.8.2.5 2005/02/04 11:44:33 skrll Exp $");
 
 #include "apm.h"
 
@@ -68,7 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.8.
 #include <machine/apmvar.h>
 
 #include <macppc/dev/adbvar.h>
-#include <macppc/dev/adb_direct.h>
 #include <macppc/dev/pm_direct.h>
 
 #if defined(APMDEBUG)
@@ -177,7 +176,7 @@ apmmatch(parent, match, aux)
 	    aa->adbaddr != ADBADDR_APM)
 		return 0;
 
-	if (adbHardware != ADB_HW_PB)
+	if (adbHardware != ADB_HW_PMU)
 		return 0;
 
 	return 1;
@@ -352,13 +351,10 @@ apmioctl(dev, cmd, data, flag, l)
 			power->battery_life = 0;
 		} else if ((power->ac_state == APM_AC_ON) &&
 			   (batt.draw > 0)) {
-			power->minutes_left =
-			    (((batt.max_charge - batt.cur_charge) * 3600) /
-			    batt.draw) / 60;
+			power->minutes_left = batt.secs_remaining / 60;
 			power->battery_state = APM_BATT_CHARGING;
 		} else {
-			power->minutes_left = 
-			    ((batt.cur_charge * 3600) / (-batt.draw)) / 60;
+			power->minutes_left = batt.secs_remaining / 60;
 
 			/* XXX - Arbitrary */
 			if (power->battery_life > 60) {