From owner-freebsd-acpi@FreeBSD.ORG Mon Jul 5 15:48:20 2004 Return-Path: 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 04DF016A4D0; Mon, 5 Jul 2004 15:48:20 +0000 (GMT) Received: from moutvdomng.kundenserver.de (moutvdom.kundenserver.de [212.227.126.249]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7480643D1D; Mon, 5 Jul 2004 15:48:19 +0000 (GMT) (envelope-from liamfoy@sepulcrum.org) Received: from [212.227.126.224] (helo=mrvdomng.kundenserver.de) by moutvdomng.kundenserver.de with esmtp (Exim 3.35 #1) id 1BhVhU-0002Fd-00; Mon, 05 Jul 2004 17:48:12 +0200 Received: from [217.43.32.4] (helo=liamfoy.ath.cx) by mrvdomng.kundenserver.de with esmtp (Exim 3.35 #1) id 1BhVhU-0003b5-00; Mon, 05 Jul 2004 17:48:12 +0200 Date: Mon, 5 Jul 2004 16:46:32 +0100 From: "Liam J. Foy" To: Niki Denev Message-Id: <20040705164632.2228e12a.liamfoy@sepulcrum.org> In-Reply-To: References: <20040704204353.26b4496b.liamfoy@sepulcrum.org> <20040704.140429.37607877.imp@bsdimp.com> X-Mailer: Sylpheed version 0.9.10 (GTK+ 1.2.10; i386-portbld-freebsd5.2) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit cc: acpi@FreeBSD.ORG cc: hackers@FreeBSD.ORG Subject: Re: APM Patches X-BeenThere: freebsd-acpi@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: ACPI and power management development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jul 2004 15:48:20 -0000 On Mon, 05 Jul 2004 16:45:11 +0300 Niki Denev wrote: > M. Warner Losh writes: > > > In message: <20040704204353.26b4496b.liamfoy@sepulcrum.org> > > "Liam J. Foy" writes: > > : Hey guys, > > : > > : Since it was decided (http://lists.freebsd.org/pipermail/freebsd-acpi/2004-June/000352.html) > > : we are going to stick with apm -l producing -1 and not 255 which is stated in the handbook would one > > : of you guys please commit: > > : > > : --- /usr/src/usr.sbin/apm/apm.8 Thu Jun 24 17:32:55 2004 > > : +++ /liamfoy/apm.8 Thu Jun 24 17:32:27 2004 > > : @@ -106,7 +106,7 @@ > > : state respectively. > > : .It Fl t > > : Display the estimated remaining battery lifetime in seconds. If > > : -it is unknown, 255 is displayed. > > : +it is unknown, -1 is displayed. > > : .It Fl Z > > : Transition the system into standby mode. This mode uses less power than > > : full power mode, but more than suspend mode. Some laptops support > > : > > : ---- > > : > > : Another patch I would like you guys to review is this. Currently apm -t will output > > : 0 when it cannot find a valid rate or the full battery time(as the comment mentions). > > : I think it should return -1 (unknown) to reflect an error, which is stated in the man page. > > : It should not return 0 since we do not have 0 seconds left, we have an unknown value > > : remaining. Either that or the man page it edited. I believe the following patch should > > : be commited really. > > : > > : The patch is: > > : > > : --- /usr/src/sys/dev/acpica/acpi_cmbat.c Sun Jul 4 20:41:43 2004 > > : +++ /home/liamfoy/acpi_cmbat.c Sun Jul 4 20:39:14 2004 > > : @@ -536,7 +536,7 @@ > > : bat[i]->min = (bat[i]->full_charge_time * bat[i]->cap) / 100; > > : } else { > > : /* Couldn't find valid rate and full battery time */ > > : - bat[i]->min = 0; > > : + bat[i]->min = -1; > > : } > > : total_min += bat[i]->min; > > : total_cap += bat[i]->cap; > > > > I don't like this patch, since we use ->min later for math... > > > > Warner > > What about this ? > > --- sys/dev/acpica/acpi_cmbat.c.orig Mon Jul 5 15:15:28 2004 > +++ sys/dev/acpica/acpi_cmbat.c Mon Jul 5 16:37:02 2004 > @@ -655,7 +655,7 @@ > battinfo->state = ACPI_BATT_STAT_NOT_PRESENT; > } else { > battinfo->cap = sc->cap; > - battinfo->min = sc->min; > + battinfo->min = sc->min ? sc->min : -1; > battinfo->state = sc->bst.state; > } > Hmm, yes. Actually looking now, this patch seem alot better. It should not affect the math. I like it. Up to the others. > > > -- > Regards, > Niki > -- -Liam J. Foy http://liamfoy.kerneled.org "Love is like maths -- the idea is simple but can be quite complicated."