d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Report charge/discharge rate and remaining capacity in the proper

Browse Source 
units (as specified in _BIF). (noted by Bruno Ducrot)
o In looking in the standard, if the cap numbers are 0xffffffff, then acpi
  is reporting unknown for that field.  Report unknown numbers properly.
o Update the state to reflect charging, discharging and critical.
This commit is contained in:
Warner Losh 2004-11-24 16:02:20 +00:00
parent 4e38f13b5b
commit bfccea1e5d
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
usr.sbin/acpi/acpiconf/acpiconf.c
View File

@ -83,6 +83,9 @@ acpi_sleep(int sleep_type)
return (0);
}
/* should be a acpi define, but doesn't appear to be */
#define UNKNOWN_CAP 0xffffffff
static int
acpi_battinfo(int num)
{
@ -101,11 +104,21 @@ acpi_battinfo(int num)
else
pwr_units = "mAh";
printf("Design capacity:\t%d %s\n", battio.bif.dcap, pwr_units);
printf("Last full capacity:\t%d %s\n", battio.bif.lfcap, pwr_units);
if (battio.bif.dcap == UNKNOWN_CAP)
printf("Design capacity:\tUnknown\n");
else
printf("Design capacity:\t%d %s\n", battio.bif.dcap, pwr_units);
if (battio.bif.lfcap == UNKNOWN_CAP)
printf("Last full capacity:\tUnknown\n");
else
printf("Last full capacity:\t%d %s\n", battio.bif.lfcap,
pwr_units);
printf("Technology:\t\t%s\n", battio.bif.btech == 0 ?
"primary (non-rechargeable)" : "secondary (rechargeable)");
printf("Design voltage:\t\t%d mV\n", battio.bif.dvol);
if (battio.bif.dvol == UNKNOWN_CAP)
printf("Design voltage:\t\tUnknown\n");
else
printf("Design voltage:\t\t%d mV\n", battio.bif.dvol);
printf("Capacity (warn):\t%d %s\n", battio.bif.wcap, pwr_units);
printf("Capacity (low):\t\t%d %s\n", battio.bif.lcap, pwr_units);
printf("Low/warn granularity:\t%d %s\n", battio.bif.gra1, pwr_units);
@ -120,10 +133,28 @@ acpi_battinfo(int num)
err(EX_IOERR, "get battery info (%d) failed", num);
if (battio.bst.state != ACPI_BATT_STAT_NOT_PRESENT) {
printf("State:\t\t\tPresent\n");
printf("Present Rate:\t\t%d mWh\n", battio.bst.rate);
printf("Remaining Capacity:\t%d mWh\n", battio.bst.cap);
printf("Volt:\t\t\t%d mV\n", battio.bst.volt);
printf("State:\t\t\t");
if (battio.bst.state & ACPI_BATT_STAT_CRITICAL)
printf("CRITICAL ");
if (battio.bst.state & ACPI_BATT_STAT_DISCHARG)
printf("Discharging ");
if (battio.bst.state & ACPI_BATT_STAT_CHARGING)
printf("Charging");
printf("\n");
if (battio.bst.rate == UNKNOWN_CAP)
printf("Present Rate:\t\tUnknown\n");
else
printf("Present Rate:\t\t%d %s\n", battio.bst.rate,
pwr_units);
if (battio.bst.cap == UNKNOWN_CAP)
printf("Remaining Capacity:\tUnknown\n");
else
printf("Remaining Capacity:\t%d %s\n", battio.bst.cap,
pwr_units);
if (battio.bst.volt == UNKNOWN_CAP)
printf("Volt:\t\t\tUnknown\n");
else
printf("Volt:\t\t\t%d mV\n", battio.bst.volt);
} else {
printf("State:\t\t\tNot Present\n");
}