Skip to content

Commit

Permalink
dell-wmi: Sort WMI event codes and update comments
Browse files Browse the repository at this point in the history
For better readability of keymap table, sort events by codes and also
update comments for events to be more informative.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Tested-by: Michał Kępień <kernel@kempniu.pl>
Reviewed-by: Michał Kępień <kernel@kempniu.pl>
Tested-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
  • Loading branch information
Pali Rohár authored and Darren Hart committed Jun 17, 2016
1 parent 3de59bc commit 6a4d260
Showing 1 changed file with 16 additions and 13 deletions.
29 changes: 16 additions & 13 deletions drivers/platform/x86/dell-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,42 +88,44 @@ static const struct dmi_system_id dell_wmi_smbios_list[] __initconst = {
static const struct key_entry dell_wmi_legacy_keymap[] __initconst = {
{ KE_IGNORE, 0x003a, { KEY_CAPSLOCK } },

{ KE_KEY, 0xe009, { KEY_EJECTCD } },

/* These also contain the brightness level at offset 6 */
{ KE_KEY, 0xe006, { KEY_BRIGHTNESSUP } },
{ KE_KEY, 0xe005, { KEY_BRIGHTNESSDOWN } },
/* Key code is followed by brightness level */
{ KE_KEY, 0xe005, { KEY_BRIGHTNESSDOWN } },
{ KE_KEY, 0xe006, { KEY_BRIGHTNESSUP } },

/* Battery health status button */
{ KE_KEY, 0xe007, { KEY_BATTERY } },
{ KE_KEY, 0xe007, { KEY_BATTERY } },

/* Radio devices state change */
/* Radio devices state change, key code is followed by other values */
{ KE_IGNORE, 0xe008, { KEY_RFKILL } },

/* The next device is at offset 6, the active devices are at
offset 8 and the attached devices at offset 10 */
{ KE_KEY, 0xe00b, { KEY_SWITCHVIDEOMODE } },
{ KE_KEY, 0xe009, { KEY_EJECTCD } },

/* Key code is followed by: next, active and attached devices */
{ KE_KEY, 0xe00b, { KEY_SWITCHVIDEOMODE } },

/* Key code is followed by keyboard illumination level */
{ KE_IGNORE, 0xe00c, { KEY_KBDILLUMTOGGLE } },

/* BIOS error detected */
{ KE_IGNORE, 0xe00d, { KEY_RESERVED } },

/* Wifi Catcher */
{ KE_KEY, 0xe011, {KEY_PROG2 } },
{ KE_KEY, 0xe011, { KEY_PROG2 } },

/* Ambient light sensor toggle */
{ KE_IGNORE, 0xe013, { KEY_RESERVED } },

{ KE_IGNORE, 0xe020, { KEY_MUTE } },

/* Dell Instant Launch key */
{ KE_KEY, 0xe025, { KEY_PROG4 } },
{ KE_KEY, 0xe029, { KEY_PROG4 } },
{ KE_KEY, 0xe025, { KEY_PROG4 } },

/* Audio panel key */
{ KE_IGNORE, 0xe026, { KEY_RESERVED } },

/* Dell Instant Launch key */
{ KE_KEY, 0xe029, { KEY_PROG4 } },

{ KE_IGNORE, 0xe02e, { KEY_VOLUMEDOWN } },
{ KE_IGNORE, 0xe030, { KEY_VOLUMEUP } },
{ KE_IGNORE, 0xe033, { KEY_KBDILLUMUP } },
Expand All @@ -146,6 +148,7 @@ static const struct key_entry dell_wmi_legacy_keymap[] __initconst = {
{ KE_IGNORE, 0xe0f7, { KEY_MUTE } },
{ KE_IGNORE, 0xe0f8, { KEY_VOLUMEDOWN } },
{ KE_IGNORE, 0xe0f9, { KEY_VOLUMEUP } },

{ KE_END, 0 }
};

Expand Down

0 comments on commit 6a4d260

Please sign in to comment.