diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2020-06-24 19:51:03 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2020-06-24 19:51:03 +0000 |
| commit | ddf1843203f268ef18568eb88e725dd9e5ffd26e (patch) | |
| tree | 9ce1626f5832579d9e7601c629bfe60b87579be6 /sys/dev/acpi_support | |
| parent | d6701b6c8ccf35c66d357fe02494d0f60ee62f4e (diff) | |
Notes
Diffstat (limited to 'sys/dev/acpi_support')
| -rw-r--r-- | sys/dev/acpi_support/acpi_ibm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index 256940e094a8..99df9efd2522 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -106,7 +106,7 @@ ACPI_MODULE_NAME("IBM") #define IBM_EC_MASK_MUTE (1 << 6) #define IBM_EC_FANSTATUS 0x2F #define IBM_EC_MASK_FANLEVEL 0x3f -#define IBM_EC_MASK_FANDISENGAGED (1 << 6) +#define IBM_EC_MASK_FANUNTHROTTLED (1 << 6) #define IBM_EC_MASK_FANSTATUS (1 << 7) #define IBM_EC_FANSPEED 0x84 @@ -265,7 +265,7 @@ static struct { .name = "fan_level", .method = ACPI_IBM_METHOD_FANLEVEL, .description = "Fan level, 0-7 (recommended max), " - "8 (disengaged, full-speed)", + "8 (unthrottled, full-speed)", }, { .name = "fan", @@ -831,7 +831,7 @@ acpi_ibm_sysctl_get(struct acpi_ibm_softc *sc, int method) */ if (!sc->fan_handle) { ACPI_EC_READ(sc->ec_dev, IBM_EC_FANSTATUS, &val_ec, 1); - if (val_ec & IBM_EC_MASK_FANDISENGAGED) + if (val_ec & IBM_EC_MASK_FANUNTHROTTLED) val = 8; else val = val_ec & IBM_EC_MASK_FANLEVEL; @@ -924,11 +924,11 @@ acpi_ibm_sysctl_set(struct acpi_ibm_softc *sc, int method, int arg) /* Read the current fan status. */ ACPI_EC_READ(sc->ec_dev, IBM_EC_FANSTATUS, &val_ec, 1); val = val_ec & ~(IBM_EC_MASK_FANLEVEL | - IBM_EC_MASK_FANDISENGAGED); + IBM_EC_MASK_FANUNTHROTTLED); if (arg == 8) - /* Full speed, set the disengaged bit. */ - val |= 7 | IBM_EC_MASK_FANDISENGAGED; + /* Full speed, set the unthrottled bit. */ + val |= 7 | IBM_EC_MASK_FANUNTHROTTLED; else val |= arg; |
