aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin Chary <corentincj@iksaif.net>2011-02-06 07:30:47 -0500
committerMatthew Garrett <mjg@redhat.com>2011-03-28 06:05:21 -0400
commite2d3d44b9a6efe4f3968252d4b680397a9640268 (patch)
treea03c34194ba399db4b37be36a23b73b3c557310b
parent43815941efb1374c2f71eb1fb0a2814b049030eb (diff)
eeepc-wmi: add camera keys
These keys are supposed to be handled by any software using the camera (like webKam or cheese...). They can also be used to actually move the camera when possible. Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Matthew Garrett <mjg@redhat.com>
-rw-r--r--drivers/platform/x86/eeepc-wmi.c7
-rw-r--r--include/linux/input.h7
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index eea8c942653b..d3997757e790 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -114,11 +114,18 @@ static const struct key_entry eeepc_wmi_keymap[] = {
114 { KE_KEY, 0x5c, { KEY_F15 } }, /* Power Gear key */ 114 { KE_KEY, 0x5c, { KEY_F15 } }, /* Power Gear key */
115 { KE_KEY, 0x5d, { KEY_WLAN } }, 115 { KE_KEY, 0x5d, { KEY_WLAN } },
116 { KE_KEY, 0x6b, { KEY_F13 } }, /* Disable Touchpad */ 116 { KE_KEY, 0x6b, { KEY_F13 } }, /* Disable Touchpad */
117 { KE_KEY, 0x82, { KEY_CAMERA } },
118 { KE_KEY, 0x83, { KEY_CAMERA_ZOOMIN } },
117 { KE_KEY, 0x88, { KEY_WLAN } }, 119 { KE_KEY, 0x88, { KEY_WLAN } },
118 { KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } }, 120 { KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } },
119 { KE_KEY, 0xe0, { KEY_PROG1 } }, /* Task Manager */ 121 { KE_KEY, 0xe0, { KEY_PROG1 } }, /* Task Manager */
120 { KE_KEY, 0xe1, { KEY_F14 } }, /* Change Resolution */ 122 { KE_KEY, 0xe1, { KEY_F14 } }, /* Change Resolution */
121 { KE_KEY, 0xe9, { KEY_BRIGHTNESS_ZERO } }, 123 { KE_KEY, 0xe9, { KEY_BRIGHTNESS_ZERO } },
124 { KE_KEY, 0xeb, { KEY_CAMERA_ZOOMOUT } },
125 { KE_KEY, 0xec, { KEY_CAMERA_UP } },
126 { KE_KEY, 0xed, { KEY_CAMERA_DOWN } },
127 { KE_KEY, 0xee, { KEY_CAMERA_LEFT } },
128 { KE_KEY, 0xef, { KEY_CAMERA_RIGHT } },
122 { KE_END, 0}, 129 { KE_END, 0},
123}; 130};
124 131
diff --git a/include/linux/input.h b/include/linux/input.h
index 056ae8a5bd9b..f3a7794a18c4 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -664,6 +664,13 @@ struct input_keymap_entry {
664#define KEY_TOUCHPAD_ON 0x213 664#define KEY_TOUCHPAD_ON 0x213
665#define KEY_TOUCHPAD_OFF 0x214 665#define KEY_TOUCHPAD_OFF 0x214
666 666
667#define KEY_CAMERA_ZOOMIN 0x215
668#define KEY_CAMERA_ZOOMOUT 0x216
669#define KEY_CAMERA_UP 0x217
670#define KEY_CAMERA_DOWN 0x218
671#define KEY_CAMERA_LEFT 0x219
672#define KEY_CAMERA_RIGHT 0x21a
673
667#define BTN_TRIGGER_HAPPY 0x2c0 674#define BTN_TRIGGER_HAPPY 0x2c0
668#define BTN_TRIGGER_HAPPY1 0x2c0 675#define BTN_TRIGGER_HAPPY1 0x2c0
669#define BTN_TRIGGER_HAPPY2 0x2c1 676#define BTN_TRIGGER_HAPPY2 0x2c1