lkml.org 
[lkml]   [2016]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] dell-wmi: Sort WMI event codes and update comments
    Date
    Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
    ---
    drivers/platform/x86/dell-wmi.c | 31 ++++++++++++++++++-------------
    1 file changed, 18 insertions(+), 13 deletions(-)

    diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
    index 4d23c91..363d927 100644
    --- a/drivers/platform/x86/dell-wmi.c
    +++ b/drivers/platform/x86/dell-wmi.c
    @@ -86,31 +86,32 @@ 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 } },
    + { KE_IGNORE, 0x003a, { KEY_CAPSLOCK } },

    - /* These also contain the brightness level at offset 6 */
    - { KE_KEY, 0xe006, { KEY_BRIGHTNESSUP } },
    - { KE_KEY, 0xe005, { KEY_BRIGHTNESSDOWN } },
    + /* These also contain the brightness level after key code */
    + { KE_KEY, 0xe006, { KEY_BRIGHTNESSUP } },
    + { KE_KEY, 0xe005, { KEY_BRIGHTNESSDOWN } },

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

    - /* Radio devices state change */
    + /* Radio devices state change, also contains additional information */
    { 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 } },

    + /* After key code is: next device, active devices, attached devices */
    + { KE_KEY, 0xe00b, { KEY_SWITCHVIDEOMODE } },
    +
    + /* Also contains keyboard illumination level after key code */
    { 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 } },
    @@ -118,12 +119,14 @@ static const struct key_entry dell_wmi_legacy_keymap[] __initconst = {
    { 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 } },
    @@ -146,7 +149,9 @@ 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 }
    +
    };

    static bool dell_new_hk_type;
    --
    1.7.9.5
    \
     
     \ /
      Last update: 2016-05-22 14:01    [W:4.313 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site