Hi tech@, Use the same values hardcoded in sys/dev/acpi/acpi.c where possible.
Comments? OK? Index: sys/arch/loongson/dev/kb3310.c =================================================================== RCS file: /cvs/src/sys/arch/loongson/dev/kb3310.c,v retrieving revision 1.21 diff -u -p -r1.21 kb3310.c --- sys/arch/loongson/dev/kb3310.c 15 Nov 2016 13:53:35 -0000 1.21 +++ sys/arch/loongson/dev/kb3310.c 27 Nov 2016 22:22:31 -0000 @@ -408,8 +408,7 @@ ykbec_refresh(void *arg) ykbec_apmdata.battery_state = APM_BATT_CHARGING; else if (ISSET(bat_status, BAT_STATUS_BAT_LOW)) ykbec_apmdata.battery_state = APM_BATT_CRITICAL; - /* XXX arbitrary */ - else if (cap_pct > 60) + else if (cap_pct > 50) ykbec_apmdata.battery_state = APM_BATT_HIGH; else ykbec_apmdata.battery_state = APM_BATT_LOW; Index: sys/arch/loongson/dev/stsec.c =================================================================== RCS file: /cvs/src/sys/arch/loongson/dev/stsec.c,v retrieving revision 1.4 diff -u -p -r1.4 stsec.c --- sys/arch/loongson/dev/stsec.c 8 Mar 2010 20:56:20 -0000 1.4 +++ sys/arch/loongson/dev/stsec.c 27 Nov 2016 22:22:31 -0000 @@ -323,13 +323,12 @@ stsec_sensors_update(void *vsc) } else { if (ISSET(control, STC_CHARGE_ENABLE)) stsec_apmdata.battery_state = APM_BATT_CHARGING; - /* XXX arbitrary */ - else if (cap_pct < 10) - stsec_apmdata.battery_state = APM_BATT_CRITICAL; - else if (cap_pct > 60) + else if (cap_pct > 50) stsec_apmdata.battery_state = APM_BATT_HIGH; - else + else if (cap_pct > 25) stsec_apmdata.battery_state = APM_BATT_LOW; + else + stsec_apmdata.battery_state = APM_BATT_CRITICAL; stsec_apmdata.minutes_left = -1; /* unknown */ } Index: sys/arch/macppc/dev/apm.c =================================================================== RCS file: /cvs/src/sys/arch/macppc/dev/apm.c,v retrieving revision 1.18 diff -u -p -r1.18 apm.c --- sys/arch/macppc/dev/apm.c 8 Oct 2016 05:49:08 -0000 1.18 +++ sys/arch/macppc/dev/apm.c 27 Nov 2016 22:22:31 -0000 @@ -273,13 +273,12 @@ apmioctl(dev_t dev, u_long cmd, caddr_t power->minutes_left = ((batt.cur_charge * 3600) / (-batt.draw)) / 60; - /* XXX - Arbitrary */ - if (power->battery_life > 60) + if (power->battery_life > 50) power->battery_state = APM_BATT_HIGH; - else if (power->battery_life < 10) - power->battery_state = APM_BATT_CRITICAL; - else + else if (power->battery_life > 25) power->battery_state = APM_BATT_LOW; + else + power->battery_state = APM_BATT_CRITICAL; } break; case APM_IOC_STANDBY_REQ: