Hi,
These two patchs are separated from the other batch because they
may be delayed or re-worked.
The first patch add some camera specific keys, we can probably
use arrows and +/- to do the same thing, but then we loose some
keyboard information (eg: no distinction between Fn+E and Arrow Up).
The other patch only add some comments to some ambiguously mapped
keys. We may want to define to new key codes for these...
Corentin Chary (2):
eeepc-wmi: add camera keys
eeepc-wmi: comments keymap to clarify the meaning of some keys
drivers/platform/x86/eeepc-wmi.c | 13 ++++++++++---
include/linux/input.h | 7 +++++++
2 files changed, 17 insertions(+), 3 deletions(-)
--
1.7.4.rc3
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 <[email protected]>
---
drivers/platform/x86/eeepc-wmi.c | 7 +++++++
include/linux/input.h | 7 +++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index b0b5a8f..bbcbd0f 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[] = {
{ KE_KEY, 0x5c, { KEY_F15 } },
{ KE_KEY, 0x5d, { KEY_WLAN } },
{ KE_KEY, 0x6b, { KEY_F13 } }, /* Disable Touchpad */
+ { KE_KEY, 0x82, { KEY_CAMERA } },
+ { KE_KEY, 0x83, { KEY_CAMERA_ZOOMIN } },
{ KE_KEY, 0x88, { KEY_WLAN } },
{ KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } },
{ KE_KEY, 0xe0, { KEY_PROG1 } },
{ KE_KEY, 0xe1, { KEY_F14 } },
{ KE_KEY, 0xe9, { KEY_BRIGHTNESS_ZERO } },
+ { KE_KEY, 0xeb, { KEY_CAMERA_ZOOMOUT } },
+ { KE_KEY, 0xec, { KEY_CAMERA_UP } },
+ { KE_KEY, 0xed, { KEY_CAMERA_DOWN } },
+ { KE_KEY, 0xee, { KEY_CAMERA_LEFT } },
+ { KE_KEY, 0xef, { KEY_CAMERA_RIGHT } },
{ KE_END, 0},
};
diff --git a/include/linux/input.h b/include/linux/input.h
index f7a6e19..4ca126f 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -651,6 +651,13 @@ struct input_keymap_entry {
#define KEY_TOUCHPAD_ON 0x213
#define KEY_TOUCHPAD_OFF 0x214
+#define KEY_CAMERA_ZOOMIN 0x215
+#define KEY_CAMERA_ZOOMOUT 0x216
+#define KEY_CAMERA_UP 0x217
+#define KEY_CAMERA_DOWN 0x218
+#define KEY_CAMERA_LEFT 0x219
+#define KEY_CAMERA_RIGHT 0x21a
+
#define BTN_TRIGGER_HAPPY 0x2c0
#define BTN_TRIGGER_HAPPY1 0x2c0
#define BTN_TRIGGER_HAPPY2 0x2c1
--
1.7.4.rc3
Found while checking PDF manuals...
Signed-off-by: Corentin Chary <[email protected]>
---
drivers/platform/x86/eeepc-wmi.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index bbcbd0f..9445ec0 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -111,15 +111,15 @@ static const struct key_entry eeepc_wmi_keymap[] = {
{ KE_KEY, 0x30, { KEY_VOLUMEUP } },
{ KE_KEY, 0x31, { KEY_VOLUMEDOWN } },
{ KE_KEY, 0x32, { KEY_MUTE } },
- { KE_KEY, 0x5c, { KEY_F15 } },
+ { KE_KEY, 0x5c, { KEY_F15 } }, /* Power Gear key */
{ KE_KEY, 0x5d, { KEY_WLAN } },
{ KE_KEY, 0x6b, { KEY_F13 } }, /* Disable Touchpad */
{ KE_KEY, 0x82, { KEY_CAMERA } },
{ KE_KEY, 0x83, { KEY_CAMERA_ZOOMIN } },
{ KE_KEY, 0x88, { KEY_WLAN } },
{ KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } },
- { KE_KEY, 0xe0, { KEY_PROG1 } },
- { KE_KEY, 0xe1, { KEY_F14 } },
+ { KE_KEY, 0xe0, { KEY_PROG1 } }, /* Task Manager */
+ { KE_KEY, 0xe1, { KEY_F14 } }, /* Change Resolution */
{ KE_KEY, 0xe9, { KEY_BRIGHTNESS_ZERO } },
{ KE_KEY, 0xeb, { KEY_CAMERA_ZOOMOUT } },
{ KE_KEY, 0xec, { KEY_CAMERA_UP } },
--
1.7.4.rc3
Dmitry, any feedback on these?
--
Matthew Garrett | [email protected]
On Sun, Feb 06, 2011 at 01:30:47PM +0100, Corentin Chary wrote:
> 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 <[email protected]>
Acked-by: Dmitry Torokhov <[email protected]>
Not sure if anyone is going to use these until X learns to handle > 255
keycodes. Oh well...
I also wonder if somethig like KEY_CAMERA_ZOOMRESET will be needed too.
Thanks.
--
Dmitry