asus-{nb-wmi|laptop}.c: sync keymaps

Maybe this should be shared in another module...

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>

diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 68257ed75c851c9794d265333124b74c3f27c224..09c477a3166d98f11d3df97b723430843d4acc6b 100644 (file)
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -304,40 +304,40 @@ static const struct key_entry asus_keymap[] = {
        {KE_KEY, 0x30, { KEY_VOLUMEUP } },
        {KE_KEY, 0x31, { KEY_VOLUMEDOWN } },
        {KE_KEY, 0x32, { KEY_MUTE } },
-       {KE_KEY, 0x33, { KEY_SWITCHVIDEOMODE } },
-       {KE_KEY, 0x34, { KEY_SWITCHVIDEOMODE } },
+       {KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */
+       {KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */
        {KE_KEY, 0x40, { KEY_PREVIOUSSONG } },
        {KE_KEY, 0x41, { KEY_NEXTSONG } },
-       {KE_KEY, 0x43, { KEY_STOPCD } },
+       {KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */
        {KE_KEY, 0x45, { KEY_PLAYPAUSE } },
-       {KE_KEY, 0x4c, { KEY_MEDIA } },
+       {KE_KEY, 0x4c, { KEY_MEDIA } }, /* WMP Key */
        {KE_KEY, 0x50, { KEY_EMAIL } },
        {KE_KEY, 0x51, { KEY_WWW } },
        {KE_KEY, 0x55, { KEY_CALC } },
        {KE_IGNORE, 0x57, },  /* Battery mode */
        {KE_IGNORE, 0x58, },  /* AC mode */
        {KE_KEY, 0x5C, { KEY_SCREENLOCK } },  /* Screenlock */
-       {KE_KEY, 0x5D, { KEY_WLAN } },
-       {KE_KEY, 0x5E, { KEY_WLAN } },
-       {KE_KEY, 0x5F, { KEY_WLAN } },
+       {KE_KEY, 0x5D, { KEY_WLAN } }, /* WLAN Toggle */
+       {KE_KEY, 0x5E, { KEY_WLAN } }, /* WLAN Enable */
+       {KE_KEY, 0x5F, { KEY_WLAN } }, /* WLAN Disable */
        {KE_KEY, 0x60, { KEY_SWITCHVIDEOMODE } },
-       {KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } },
-       {KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } },
-       {KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } },
-       {KE_KEY, 0x6B, { KEY_F13 } }, /* Lock Touchpad */
+       {KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } }, /* LCD Only */
+       {KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } }, /* CRT Only */
+       {KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } }, /* LCD + CRT */
+       {KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad */
        {KE_KEY, 0x6C, { KEY_SLEEP } }, /* Suspend */
        {KE_KEY, 0x6D, { KEY_SLEEP } }, /* Hibernate */
        {KE_IGNORE, 0x6E, },  /* Low Battery notification */
-       {KE_KEY, 0x7E, { KEY_BLUETOOTH } },
-       {KE_KEY, 0x7D, { KEY_BLUETOOTH } },
+       {KE_KEY, 0x7D, { KEY_BLUETOOTH } }, /* Bluetooth Enable */
+       {KE_KEY, 0x7E, { KEY_BLUETOOTH } }, /* Bluetooth Disable */
        {KE_KEY, 0x82, { KEY_CAMERA } },
-       {KE_KEY, 0x88, { KEY_WLAN  } },
-       {KE_KEY, 0x8A, { KEY_PROG1 } },
+       {KE_KEY, 0x88, { KEY_RFKILL  } }, /* Radio Toggle Key */
+       {KE_KEY, 0x8A, { KEY_PROG1 } }, /* Color enhancement mode */
        {KE_KEY, 0x95, { KEY_MEDIA } },
        {KE_KEY, 0x99, { KEY_PHONE } },
-       {KE_KEY, 0xc4, { KEY_KBDILLUMUP } },
-       {KE_KEY, 0xc5, { KEY_KBDILLUMDOWN } },
-       {KE_KEY, 0xb5, { KEY_CALC } },
+       {KE_KEY, 0xB5, { KEY_CALC } },
+       {KE_KEY, 0xC4, { KEY_KBDILLUMUP } },
+       {KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } },
        {KE_END, 0},
 };
 

diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index 17d5df9255ceaaebd2fffb3b0fb953c709d3e113..ef3897b5a6114d6297596591eb18f5ced1670b61 100644 (file)
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -168,9 +168,9 @@ static const struct key_entry asus_nb_wmi_keymap[] = {
        { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */
        { KE_KEY, 0x40, { KEY_PREVIOUSSONG } },
        { KE_KEY, 0x41, { KEY_NEXTSONG } },
-       { KE_KEY, 0x43, { KEY_STOPCD } },
+       { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */
        { KE_KEY, 0x45, { KEY_PLAYPAUSE } },
-       { KE_KEY, 0x4c, { KEY_MEDIA } },
+       { KE_KEY, 0x4c, { KEY_MEDIA } }, /* WMP Key */
        { KE_KEY, 0x50, { KEY_EMAIL } },
        { KE_KEY, 0x51, { KEY_WWW } },
        { KE_KEY, 0x55, { KEY_CALC } },
@@ -181,25 +181,25 @@ static const struct key_entry asus_nb_wmi_keymap[] = {
        { KE_KEY, 0x5E, { KEY_WLAN } }, /* Wireless console Enable */
        { KE_KEY, 0x5F, { KEY_WLAN } }, /* Wireless console Disable */
        { KE_KEY, 0x60, { KEY_SWITCHVIDEOMODE } },
-       { KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } },
-       { KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } },
-       { KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } },
+       { KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } }, /* LCD Only */
+       { KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } }, /* CRT Only */
+       { KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } }, /* LCD + CRT */
        { KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } },
        { KE_IGNORE, 0x6E, },  /* Low Battery notification */
-       { KE_KEY, 0x7D, { KEY_BLUETOOTH } },
-       { KE_KEY, 0x7E, { KEY_BLUETOOTH } },
+       { KE_KEY, 0x7D, { KEY_BLUETOOTH } }, /* Bluetooth Enable */
+       { KE_KEY, 0x7E, { KEY_BLUETOOTH } }, /* Bluetooth Disable */
        { KE_KEY, 0x82, { KEY_CAMERA } },
-       { KE_KEY, 0x88, { KEY_RFKILL  } },
-       { KE_KEY, 0x8A, { KEY_PROG1 } },
+       { KE_KEY, 0x88, { KEY_RFKILL  } }, /* Radio Toggle Key */
+       { KE_KEY, 0x8A, { KEY_PROG1 } }, /* Color enhancement mode */
        { KE_KEY, 0x95, { KEY_MEDIA } },
        { KE_KEY, 0x99, { KEY_PHONE } },
        { KE_KEY, 0xA0, { KEY_SWITCHVIDEOMODE } }, /* SDSP HDMI only */
        { KE_KEY, 0xA1, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + HDMI */
        { KE_KEY, 0xA2, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + HDMI */
        { KE_KEY, 0xA3, { KEY_SWITCHVIDEOMODE } }, /* SDSP TV + HDMI */
-       { KE_KEY, 0xb5, { KEY_CALC } },
-       { KE_KEY, 0xc4, { KEY_KBDILLUMUP } },
-       { KE_KEY, 0xc5, { KEY_KBDILLUMDOWN } },
+       { KE_KEY, 0xB5, { KEY_CALC } },
+       { KE_KEY, 0xC4, { KEY_KBDILLUMUP } },
+       { KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } },
        { KE_END, 0},
 };