diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2010-03-02 09:58:20 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2010-03-02 09:58:20 +0000 |
| commit | 8add4c28fc3c92fc75b086cfda4f769daf0f5559 (patch) | |
| tree | 5a41742c96052bdda1ace7b72a42c09ff166bcce /sys/arch/loongson | |
| parent | de319ee3d391f5b4a666769a03643019a1573749 (diff) | |
Use the battery controller bit that signals the battery almost empty
condition to determine crtical status for the sensor and apm. This makes
the critical status correspond to the flashing red battery led.
Furthermore, use ISSET macros and friends.
Diffstat (limited to 'sys/arch/loongson')
| -rw-r--r-- | sys/arch/loongson/dev/kb3310.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/sys/arch/loongson/dev/kb3310.c b/sys/arch/loongson/dev/kb3310.c index abb0dda6546..65846d4772c 100644 --- a/sys/arch/loongson/dev/kb3310.c +++ b/sys/arch/loongson/dev/kb3310.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kb3310.c,v 1.7 2010/02/28 17:32:30 miod Exp $ */ +/* $OpenBSD: kb3310.c,v 1.8 2010/03/02 09:58:19 otto Exp $ */ /* * Copyright (c) 2010 Otto Moerbeek <otto@drijf.net> * @@ -283,9 +283,9 @@ ykbec_refresh(void *arg) if (val != 0) { val = KB3310_FAN_SPEED_DIVIDER / val; sc->sc_sensor[YKBEC_FAN].value = val; - sc->sc_sensor[YKBEC_FAN].flags &= ~SENSOR_FINVALID; + CLR(sc->sc_sensor[YKBEC_FAN].flags, SENSOR_FINVALID); } else - sc->sc_sensor[YKBEC_FAN].flags |= SENSOR_FINVALID; + SET(sc->sc_sensor[YKBEC_FAN].flags, SENSOR_FINVALID); val = ykbec_read(sc, ECTEMP_CURRENT_REG); sc->sc_sensor[YKBEC_ITEMP].value = val * 1000000 + 273150000; @@ -317,33 +317,36 @@ ykbec_refresh(void *arg) bat_state = ykbec_read(sc, REG_BAT_STATE); power_flag = ykbec_read(sc, REG_POWER_FLAG); - sc->sc_sensor[YKBEC_CHARGING].value = (bat_state & BAT_STATE_CHARGING) ? - 1 : 0; - sc->sc_sensor[YKBEC_AC].value = (power_flag & POWER_FLAG_ADAPTER_IN) ? - 1 : 0; + sc->sc_sensor[YKBEC_CHARGING].value = !!ISSET(bat_state, + BAT_STATE_CHARGING); + sc->sc_sensor[YKBEC_AC].value = !!ISSET(power_flag, + POWER_FLAG_ADAPTER_IN); + + sc->sc_sensor[YKBEC_CAP].status = ISSET(bat_status, BAT_STATUS_BAT_LOW) ? + SENSOR_S_CRIT : SENSOR_S_OK; #if NAPM > 0 bcopy(&ykbec_apmdata, &old, sizeof(old)); ykbec_apmdata.battery_life = cap_pct; - ykbec_apmdata.ac_state = (power_flag & POWER_FLAG_ADAPTER_IN) ? + ykbec_apmdata.ac_state = ISSET(power_flag, POWER_FLAG_ADAPTER_IN) ? APM_AC_ON : APM_AC_OFF; - if ((bat_status & BAT_STATUS_BAT_EXISTS) == 0) { + if (!ISSET(bat_status, BAT_STATUS_BAT_EXISTS)) { ykbec_apmdata.battery_state = APM_BATTERY_ABSENT; ykbec_apmdata.minutes_left = 0; ykbec_apmdata.battery_life = 0; } else { - if (bat_state & BAT_STATE_CHARGING) + if (ISSET(bat_state, BAT_STATE_CHARGING)) 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) ykbec_apmdata.battery_state = APM_BATT_HIGH; - else if (cap_pct < 10) - ykbec_apmdata.battery_state = APM_BATT_CRITICAL; else ykbec_apmdata.battery_state = APM_BATT_LOW; /* if charging, current is positive */ - if (bat_state & BAT_STATE_CHARGING) + if (ISSET(bat_state, BAT_STATE_CHARGING)) current = 0; else current = -current; |