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

Fix to not use 255, but instead use APM_UNKNOWN.

Browse Source 
Compare things correctly against -1 or 0
Don't print any capabilities if unknown is returned from the kernel.

Reviewed/Submitted by: njl, Liam Foy
This commit is contained in:
imp 2004-06-30 21:00:07 +00:00
parent be82e61ec0
commit a8d39b6fa7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.sbin/apm/apm.c
View File

@ -34,6 +34,8 @@ __FBSDID("$FreeBSD$");
#define APMDEV "/dev/apm"
#define APM_UNKNOWN 255
#define xh(a) (((a) & 0xff00) >> 8)
#define xl(a) ((a) & 0xff)
#define APMERR(a) xh(a)
@ -168,7 +170,7 @@ static void
print_batt_life(u_int batt_life)
{
printf("Remaining battery life: ");
if (batt_life >= 255)
if (batt_life == APM_UNKNOWN)
printf("unknown\n");
else if (batt_life <= 100)
printf("%d%%\n", batt_life);
@ -182,7 +184,7 @@ print_batt_stat(u_int batt_stat)
const char *batt_msg[] = { "high", "low", "critical", "charging" };
printf("Battery Status: ");
if (batt_stat >= 255)
if (batt_stat == APM_UNKNOWN)
printf("unknown\n");
else if (batt_stat > 3)
printf("invalid value (0x%x)\n", batt_stat);
@ -200,7 +202,7 @@ print_all_info(int fd, apm_info_t aip, int bioscall_available)
printf("APM version: %d.%d\n", aip->ai_major, aip->ai_minor);
printf("APM Management: %s\n", aip->ai_status ? "Enabled" : "Disabled");
printf("AC Line status: ");
if (aip->ai_acline >= 255)
if (aip->ai_acline == APM_UNKNOWN)
printf("unknown\n");
else if (aip->ai_acline > 1)
printf("invalid value (0x%x)\n", aip->ai_acline);
@ -213,7 +215,7 @@ print_all_info(int fd, apm_info_t aip, int bioscall_available)
if (aip->ai_infoversion >= 1) {
printf("Number of batteries: ");
if (aip->ai_batteries >= 255)
if (aip->ai_batteries == ~0U)
printf("unknown\n");
else {
u_int i;
@ -226,12 +228,10 @@ print_all_info(int fd, apm_info_t aip, int bioscall_available)
if (ioctl(fd, APMIO_GETPWSTATUS, &aps) == -1)
continue;
printf("Battery %d:\n", i);
if (aps.ap_batt_flag <= 255 &&
(aps.ap_batt_flag & APM_BATT_NOT_PRESENT)) {
if (aps.ap_batt_flag & APM_BATT_NOT_PRESENT) {
printf("not present\n");
continue;
}
printf("\t");
print_batt_stat(aps.ap_batt_stat);
printf("\t");
@ -306,9 +306,9 @@ print_all_info(int fd, apm_info_t aip, int bioscall_available)
}
if (aip->ai_infoversion >= 1) {
printf("APM Capabilities:\n");
if (aip->ai_capabilities == 0xff00)
printf("\tunknown\n");
return;
printf("APM Capabilities:\n");
if (aip->ai_capabilities & 0x01)
printf("\tglobal standby state\n");
if (aip->ai_capabilities & 0x02)