Date: Thu, 24 Jun 2004 11:22:01 +0200 From: <liamfoy@sepulcrum.org> To: =?iso-8859-1?Q?Nate_Lawson?= <nate@root.org> Cc: acpi@FreeBSD.ORG Subject: Re: Re: apm problem Message-ID: <27418837$108806874740da9c8b50d419.89444399@config8.schlund.de>
next in thread | raw e-mail | index | archive | help
Nate Lawson <nate@root.org> wrote on 24.06.2004, 00:47:17: > On Wed, 23 Jun 2004, M. Warner Losh wrote: > > In message: > > Nate Lawson writes: > > : 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. > > > > That's why I've been reluctant to make these changes... > > Let's just update the man page. The use of -1 is the actual behavior and > programs have been written that count on this. Right ok. I just gathered that's what needed returning. Anyway I will patch it when I get home and mail the acpi@ list the patch for one of you guys to commit. > > -Nate -- Best Regards, Liam Foy <liamfoy(@)sepulcrum(.)org> "FreeBSD, the power to serve!"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?27418837$108806874740da9c8b50d419.89444399>