From owner-freebsd-acpi@FreeBSD.ORG  Wed Jun 23 21:01:04 2004
Return-Path: <owner-freebsd-acpi@FreeBSD.ORG>
Delivered-To: freebsd-acpi@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5232316A4CE
	for <acpi@freebsd.org>; Wed, 23 Jun 2004 21:01:04 +0000 (GMT)
Received: from root.org (root.org [67.118.192.226])
	by mx1.FreeBSD.org (Postfix) with SMTP id E0EF043D4C
	for <acpi@freebsd.org>; Wed, 23 Jun 2004 21:01:03 +0000 (GMT)
	(envelope-from nate@root.org)
Received: (qmail 87308 invoked by uid 1000); 23 Jun 2004 21:00:47 -0000
Date: Wed, 23 Jun 2004 14:00:47 -0700 (PDT)
From: Nate Lawson <nate@root.org>
To: "Liam J. Foy" <liamfoy@sepulcrum.org>
In-Reply-To: <20000623205805.4c299e4e.liamfoy@sepulcrum.org>
Message-ID: <20040623135554.V87272@root.org>
References: <20040616171408.0f88c928.liamfoy@sepulcrum.org>
 <20040616.135044.85075412.imp@bsdimp.com> <20040623123827.O86825@root.org>
 <20000623205805.4c299e4e.liamfoy@sepulcrum.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: acpi@freebsd.org
Subject: Re: apm problem
X-BeenThere: freebsd-acpi@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: ACPI and power management development <freebsd-acpi.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-acpi>,
	<mailto:freebsd-acpi-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-acpi>
List-Post: <mailto:freebsd-acpi@freebsd.org>
List-Help: <mailto:freebsd-acpi-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-acpi>,
	<mailto:freebsd-acpi-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Jun 2004 21:01:04 -0000

On Fri, 23 Jun 2000, Liam J. Foy wrote:
> On Wed, 23 Jun 2004 12:40:40 -0700 (PDT)
> We decided to go with -1. The apm.c patch currently will not apply due to
> the re-structure of apm. The following patch will:
>
> http://liamfoy.kerneled.org/apm.diff

Ok, good.  That should help Warner.

> After more digging, apm -l should return 255(stated in man page and acpi spec).
> The following patch will make it work:
>
> --- /usr/src/sys/dev/acpica/acpi_cmbat.c	Tue Jun 22 16:40:35 2004
> +++ /hd2/acpi_cmbat.c	Tue Jun 22 17:02:18 2004
> @@ -449,7 +449,7 @@
>      static int	bat_units = 0;
>      static struct acpi_cmbat_softc **bat = NULL;
>
> -    cap = min = -1;
> +    cap = min = 255;
>      batt_stat = ACPI_BATT_STAT_NOT_PRESENT;
>      error = 0;
>
> @@ -545,7 +545,7 @@
>
>      /* Battery life */
>      if (valid_units == 0) {
> -	cap = -1;
> +	cap = 255;
>  	batt_stat = ACPI_BATT_STAT_NOT_PRESENT;
>      } else {
>  	cap = total_cap / valid_units;
> @@ -649,7 +649,7 @@
>      }
>
>      if (!sc->present) {
> -	battinfo->cap = -1;
> +	battinfo->cap = 255;
>  	battinfo->min = -1;
>  	battinfo->state = ACPI_BATT_STAT_NOT_PRESENT;
>      } else {

I disagree with this.  Capacity and time remaining are both quantities
represented by ints that we calculate.  The man page should be updated if
it's incorrect.

-Nate