aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorCorentin Chary <corentin.chary@gmail.com>2012-10-03 05:26:26 -0400
committerMatthew Garrett <matthew.garrett@nebula.com>2013-02-24 17:49:55 -0500
commita935eaecef2b209ad661dadabb4e32b7c9a9b924 (patch)
tree4d46978cb734bf053aaaa2c758ef1e43a1f7a141 /drivers/platform
parent982d385ad1e8a485cfd54b30469b3710935990ba (diff)
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>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/asus-laptop.c36
-rw-r--r--drivers/platform/x86/asus-nb-wmi.c24
2 files changed, 30 insertions, 30 deletions
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 062ddd7791cc..7ed1e9983d3e 100644
--- 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[] = {
304 {KE_KEY, 0x30, { KEY_VOLUMEUP } }, 304 {KE_KEY, 0x30, { KEY_VOLUMEUP } },
305 {KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, 305 {KE_KEY, 0x31, { KEY_VOLUMEDOWN } },
306 {KE_KEY, 0x32, { KEY_MUTE } }, 306 {KE_KEY, 0x32, { KEY_MUTE } },
307 {KE_KEY, 0x33, { KEY_SWITCHVIDEOMODE } }, 307 {KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */
308 {KE_KEY, 0x34, { KEY_SWITCHVIDEOMODE } }, 308 {KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */
309 {KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, 309 {KE_KEY, 0x40, { KEY_PREVIOUSSONG } },
310 {KE_KEY, 0x41, { KEY_NEXTSONG } }, 310 {KE_KEY, 0x41, { KEY_NEXTSONG } },
311 {KE_KEY, 0x43, { KEY_STOPCD } }, 311 {KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */
312 {KE_KEY, 0x45, { KEY_PLAYPAUSE } }, 312 {KE_KEY, 0x45, { KEY_PLAYPAUSE } },
313 {KE_KEY, 0x4c, { KEY_MEDIA } }, 313 {KE_KEY, 0x4c, { KEY_MEDIA } }, /* WMP Key */
314 {KE_KEY, 0x50, { KEY_EMAIL } }, 314 {KE_KEY, 0x50, { KEY_EMAIL } },
315 {KE_KEY, 0x51, { KEY_WWW } }, 315 {KE_KEY, 0x51, { KEY_WWW } },
316 {KE_KEY, 0x55, { KEY_CALC } }, 316 {KE_KEY, 0x55, { KEY_CALC } },
317 {KE_IGNORE, 0x57, }, /* Battery mode */ 317 {KE_IGNORE, 0x57, }, /* Battery mode */
318 {KE_IGNORE, 0x58, }, /* AC mode */ 318 {KE_IGNORE, 0x58, }, /* AC mode */
319 {KE_KEY, 0x5C, { KEY_SCREENLOCK } }, /* Screenlock */ 319 {KE_KEY, 0x5C, { KEY_SCREENLOCK } }, /* Screenlock */
320 {KE_KEY, 0x5D, { KEY_WLAN } }, 320 {KE_KEY, 0x5D, { KEY_WLAN } }, /* WLAN Toggle */
321 {KE_KEY, 0x5E, { KEY_WLAN } }, 321 {KE_KEY, 0x5E, { KEY_WLAN } }, /* WLAN Enable */
322 {KE_KEY, 0x5F, { KEY_WLAN } }, 322 {KE_KEY, 0x5F, { KEY_WLAN } }, /* WLAN Disable */
323 {KE_KEY, 0x60, { KEY_SWITCHVIDEOMODE } }, 323 {KE_KEY, 0x60, { KEY_SWITCHVIDEOMODE } },
324 {KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } }, 324 {KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } }, /* LCD Only */
325 {KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } }, 325 {KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } }, /* CRT Only */
326 {KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } }, 326 {KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } }, /* LCD + CRT */
327 {KE_KEY, 0x6B, { KEY_F13 } }, /* Lock Touchpad */ 327 {KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad */
328 {KE_KEY, 0x6C, { KEY_SLEEP } }, /* Suspend */ 328 {KE_KEY, 0x6C, { KEY_SLEEP } }, /* Suspend */
329 {KE_KEY, 0x6D, { KEY_SLEEP } }, /* Hibernate */ 329 {KE_KEY, 0x6D, { KEY_SLEEP } }, /* Hibernate */
330 {KE_IGNORE, 0x6E, }, /* Low Battery notification */ 330 {KE_IGNORE, 0x6E, }, /* Low Battery notification */
331 {KE_KEY, 0x7E, { KEY_BLUETOOTH } }, 331 {KE_KEY, 0x7D, { KEY_BLUETOOTH } }, /* Bluetooth Enable */
332 {KE_KEY, 0x7D, { KEY_BLUETOOTH } }, 332 {KE_KEY, 0x7E, { KEY_BLUETOOTH } }, /* Bluetooth Disable */
333 {KE_KEY, 0x82, { KEY_CAMERA } }, 333 {KE_KEY, 0x82, { KEY_CAMERA } },
334 {KE_KEY, 0x88, { KEY_WLAN } }, 334 {KE_KEY, 0x88, { KEY_RFKILL } }, /* Radio Toggle Key */
335 {KE_KEY, 0x8A, { KEY_PROG1 } }, 335 {KE_KEY, 0x8A, { KEY_PROG1 } }, /* Color enhancement mode */
336 {KE_KEY, 0x95, { KEY_MEDIA } }, 336 {KE_KEY, 0x95, { KEY_MEDIA } },
337 {KE_KEY, 0x99, { KEY_PHONE } }, 337 {KE_KEY, 0x99, { KEY_PHONE } },
338 {KE_KEY, 0xc4, { KEY_KBDILLUMUP } }, 338 {KE_KEY, 0xB5, { KEY_CALC } },
339 {KE_KEY, 0xc5, { KEY_KBDILLUMDOWN } }, 339 {KE_KEY, 0xC4, { KEY_KBDILLUMUP } },
340 {KE_KEY, 0xb5, { KEY_CALC } }, 340 {KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } },
341 {KE_END, 0}, 341 {KE_END, 0},
342}; 342};
343 343
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index b70425c58638..9f1caa72b307 100644
--- 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[] = {
168 { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ 168 { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */
169 { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, 169 { KE_KEY, 0x40, { KEY_PREVIOUSSONG } },
170 { KE_KEY, 0x41, { KEY_NEXTSONG } }, 170 { KE_KEY, 0x41, { KEY_NEXTSONG } },
171 { KE_KEY, 0x43, { KEY_STOPCD } }, 171 { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */
172 { KE_KEY, 0x45, { KEY_PLAYPAUSE } }, 172 { KE_KEY, 0x45, { KEY_PLAYPAUSE } },
173 { KE_KEY, 0x4c, { KEY_MEDIA } }, 173 { KE_KEY, 0x4c, { KEY_MEDIA } }, /* WMP Key */
174 { KE_KEY, 0x50, { KEY_EMAIL } }, 174 { KE_KEY, 0x50, { KEY_EMAIL } },
175 { KE_KEY, 0x51, { KEY_WWW } }, 175 { KE_KEY, 0x51, { KEY_WWW } },
176 { KE_KEY, 0x55, { KEY_CALC } }, 176 { KE_KEY, 0x55, { KEY_CALC } },
@@ -181,25 +181,25 @@ static const struct key_entry asus_nb_wmi_keymap[] = {
181 { KE_KEY, 0x5E, { KEY_WLAN } }, /* Wireless console Enable */ 181 { KE_KEY, 0x5E, { KEY_WLAN } }, /* Wireless console Enable */
182 { KE_KEY, 0x5F, { KEY_WLAN } }, /* Wireless console Disable */ 182 { KE_KEY, 0x5F, { KEY_WLAN } }, /* Wireless console Disable */
183 { KE_KEY, 0x60, { KEY_SWITCHVIDEOMODE } }, 183 { KE_KEY, 0x60, { KEY_SWITCHVIDEOMODE } },
184 { KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } }, 184 { KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } }, /* LCD Only */
185 { KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } }, 185 { KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } }, /* CRT Only */
186 { KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } }, 186 { KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } }, /* LCD + CRT */
187 { KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } }, 187 { KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } },
188 { KE_IGNORE, 0x6E, }, /* Low Battery notification */ 188 { KE_IGNORE, 0x6E, }, /* Low Battery notification */
189 { KE_KEY, 0x7D, { KEY_BLUETOOTH } }, 189 { KE_KEY, 0x7D, { KEY_BLUETOOTH } }, /* Bluetooth Enable */
190 { KE_KEY, 0x7E, { KEY_BLUETOOTH } }, 190 { KE_KEY, 0x7E, { KEY_BLUETOOTH } }, /* Bluetooth Disable */
191 { KE_KEY, 0x82, { KEY_CAMERA } }, 191 { KE_KEY, 0x82, { KEY_CAMERA } },
192 { KE_KEY, 0x88, { KEY_RFKILL } }, 192 { KE_KEY, 0x88, { KEY_RFKILL } }, /* Radio Toggle Key */
193 { KE_KEY, 0x8A, { KEY_PROG1 } }, 193 { KE_KEY, 0x8A, { KEY_PROG1 } }, /* Color enhancement mode */
194 { KE_KEY, 0x95, { KEY_MEDIA } }, 194 { KE_KEY, 0x95, { KEY_MEDIA } },
195 { KE_KEY, 0x99, { KEY_PHONE } }, 195 { KE_KEY, 0x99, { KEY_PHONE } },
196 { KE_KEY, 0xA0, { KEY_SWITCHVIDEOMODE } }, /* SDSP HDMI only */ 196 { KE_KEY, 0xA0, { KEY_SWITCHVIDEOMODE } }, /* SDSP HDMI only */
197 { KE_KEY, 0xA1, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + HDMI */ 197 { KE_KEY, 0xA1, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + HDMI */
198 { KE_KEY, 0xA2, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + HDMI */ 198 { KE_KEY, 0xA2, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + HDMI */
199 { KE_KEY, 0xA3, { KEY_SWITCHVIDEOMODE } }, /* SDSP TV + HDMI */ 199 { KE_KEY, 0xA3, { KEY_SWITCHVIDEOMODE } }, /* SDSP TV + HDMI */
200 { KE_KEY, 0xb5, { KEY_CALC } }, 200 { KE_KEY, 0xB5, { KEY_CALC } },
201 { KE_KEY, 0xc4, { KEY_KBDILLUMUP } }, 201 { KE_KEY, 0xC4, { KEY_KBDILLUMUP } },
202 { KE_KEY, 0xc5, { KEY_KBDILLUMDOWN } }, 202 { KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } },
203 { KE_END, 0}, 203 { KE_END, 0},
204}; 204};
205 205