lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

thinkpad-acpi: fix brightness hotkey poll handling

Browse Source 
Handle multiple brightness hotkey presses between two polling cycles.

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
This commit is contained in:
Henrique de Moraes Holschuh
2010-05-16 19:45:36 -03:00
parent 77775838bb
commit 2899902281
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/platform/x86/thinkpad_acpi.c
View File

@@ -2340,6 +2340,21 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
} }
} }
void issue_brightnesschange(const unsigned int oldbrt,
const unsigned int newbrt)
{
unsigned int i = oldbrt;
while (i > newbrt) {
TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
i--;
}
while (i < newbrt) {
TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
i++;
}
}
TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle); TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle); TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle); TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
@@ -2394,19 +2409,16 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
} }
/* handle brightness */ /* handle brightness */
if (oldn->brightness_toggle != newn->brightness_toggle) { if (oldn->brightness_level != newn->brightness_level) {
if (oldn->brightness_level < newn->brightness_level) { issue_brightnesschange(oldn->brightness_level,
TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME); newn->brightness_level);
} else if (oldn->brightness_level > newn->brightness_level) { } else if (oldn->brightness_toggle != newn->brightness_toggle) {
/* repeated key presses that didn't change state */
if (newn->brightness_level == 0)
TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND); TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
} else { else if (newn->brightness_level >= bright_maxlvl
/* repeated key presses that didn't change state */ && !tp_features.bright_unkfw)
if (newn->brightness_level != 0) { TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
} else {
TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
}
}
} }
#undef TPACPI_COMPARE_KEY #undef TPACPI_COMPARE_KEY