Commit 3ba0302b authored by Corentin Chary's avatar Corentin Chary Committed by Matthew Garrett

asus-wmi: always report brightness key events

Signed-off-by: default avatarCorentin Chary <corentin.chary@gmail.com>
Signed-off-by: default avatarMatthew Garrett <matthew.garrett@nebula.com>
parent 7517a17c
...@@ -190,6 +190,8 @@ static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver) ...@@ -190,6 +190,8 @@ static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver)
} }
static const struct key_entry asus_nb_wmi_keymap[] = { static const struct key_entry asus_nb_wmi_keymap[] = {
{ KE_KEY, ASUS_WMI_BRN_DOWN, { KEY_BRIGHTNESSDOWN } },
{ KE_KEY, ASUS_WMI_BRN_UP, { KEY_BRIGHTNESSUP } },
{ KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x30, { KEY_VOLUMEUP } },
{ KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } },
{ KE_KEY, 0x32, { KEY_MUTE } }, { KE_KEY, 0x32, { KEY_MUTE } },
......
...@@ -1391,17 +1391,17 @@ static void asus_wmi_notify(u32 value, void *context) ...@@ -1391,17 +1391,17 @@ static void asus_wmi_notify(u32 value, void *context)
} }
if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX) if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX)
code = NOTIFY_BRNUP_MIN; code = ASUS_WMI_BRN_UP;
else if (code >= NOTIFY_BRNDOWN_MIN && else if (code >= NOTIFY_BRNDOWN_MIN &&
code <= NOTIFY_BRNDOWN_MAX) code <= NOTIFY_BRNDOWN_MAX)
code = NOTIFY_BRNDOWN_MIN; code = ASUS_WMI_BRN_DOWN;
if (code == NOTIFY_BRNUP_MIN || code == NOTIFY_BRNDOWN_MIN) { if (code == ASUS_WMI_BRN_DOWN || code == ASUS_WMI_BRN_UP) {
if (!acpi_video_backlight_support()) { if (!acpi_video_backlight_support()) {
asus_wmi_backlight_notify(asus, orig_code); asus_wmi_backlight_notify(asus, orig_code);
}
goto exit; goto exit;
} }
}
if (is_display_toggle(code) && if (is_display_toggle(code) &&
asus->driver->quirks->no_display_toggle) asus->driver->quirks->no_display_toggle)
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#define ASUS_WMI_KEY_IGNORE (-1) #define ASUS_WMI_KEY_IGNORE (-1)
#define ASUS_WMI_BRN_DOWN 0x20
#define ASUS_WMI_BRN_UP 0x2f
struct module; struct module;
struct key_entry; struct key_entry;
......
...@@ -63,6 +63,8 @@ MODULE_PARM_DESC(hotplug_wireless, ...@@ -63,6 +63,8 @@ MODULE_PARM_DESC(hotplug_wireless,
#define HOME_RELEASE 0xe5 #define HOME_RELEASE 0xe5
static const struct key_entry eeepc_wmi_keymap[] = { static const struct key_entry eeepc_wmi_keymap[] = {
{ KE_KEY, ASUS_WMI_BRN_DOWN, { KEY_BRIGHTNESSDOWN } },
{ KE_KEY, ASUS_WMI_BRN_UP, { KEY_BRIGHTNESSUP } },
/* Sleep already handled via generic ACPI code */ /* Sleep already handled via generic ACPI code */
{ KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x30, { KEY_VOLUMEUP } },
{ KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment