diff options
| author | Bastien Nocera <hadess@hadess.net> | 2008-10-13 23:24:10 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-10-14 09:32:07 +0300 |
| commit | 2e8e3f8cd8b288f3679dae3bc7d948d112e64f9f (patch) | |
| tree | 71c46e44a26657b9c54ad982f42a9a89f234eea2 /input | |
| parent | ecfcd2f2992c946ff3ce7dd2db0a343d704e853f (diff) | |
Fix PS3 BD remote input event generation
- Fix byte-reading in the decode function by using a guint8, instead
of an int, we were overreading and were getting keycodes of
0xffffff44 when we wanted a single byte of 0x44.
- Remove use of KEY_REMOTE_X, those keys never got upstream, and the
values they were defined at are now used for completely different
keys
- Update uinput.h with the latest keycodes from 2.6.27
Diffstat (limited to 'input')
| -rw-r--r-- | input/fakehid.c | 54 |
1 files changed, 12 insertions, 42 deletions
diff --git a/input/fakehid.c b/input/fakehid.c index d752d85a..ead67bd8 100644 --- a/input/fakehid.c +++ b/input/fakehid.c @@ -44,37 +44,6 @@ #include "fakehid.h" #include "uinput.h" -#ifndef KEY_REMOTE_1 -#define KEY_REMOTE_1 0x1b6 -#endif -#ifndef KEY_REMOTE_2 -#define KEY_REMOTE_2 0x1b7 -#endif -#ifndef KEY_REMOTE_3 -#define KEY_REMOTE_3 0x1b8 -#endif -#ifndef KEY_REMOTE_4 -#define KEY_REMOTE_4 0x1b9 -#endif -#ifndef KEY_REMOTE_5 -#define KEY_REMOTE_5 0x1ba -#endif -#ifndef KEY_REMOTE_6 -#define KEY_REMOTE_6 0x1bb -#endif -#ifndef KEY_REMOTE_7 -#define KEY_REMOTE_7 0x1bc -#endif -#ifndef KEY_REMOTE_8 -#define KEY_REMOTE_8 0x1bd -#endif -#ifndef KEY_REMOTE_9 -#define KEY_REMOTE_9 0x1be -#endif -#ifndef KEY_REMOTE_0 -#define KEY_REMOTE_0 0x1bf -#endif - #define PS3_FLAGS_MASK 0xFFFFFF00 enum ps3remote_special_keys { @@ -126,16 +95,16 @@ static unsigned int ps3remote_keymap[] = { [0x63] = KEY_SUBTITLE, [0x0f] = KEY_CLEAR, [0x28] = KEY_TIME, - [0x00] = KEY_REMOTE_1, - [0x01] = KEY_REMOTE_2, - [0x02] = KEY_REMOTE_3, - [0x03] = KEY_REMOTE_4, - [0x04] = KEY_REMOTE_5, - [0x05] = KEY_REMOTE_6, - [0x06] = KEY_REMOTE_7, - [0x07] = KEY_REMOTE_8, - [0x08] = KEY_REMOTE_9, - [0x09] = KEY_REMOTE_0, + [0x00] = KEY_1, + [0x01] = KEY_2, + [0x02] = KEY_3, + [0x03] = KEY_4, + [0x04] = KEY_5, + [0x05] = KEY_6, + [0x06] = KEY_7, + [0x07] = KEY_8, + [0x08] = KEY_9, + [0x09] = KEY_0, [0x81] = KEY_RED, [0x82] = KEY_GREEN, [0x80] = KEY_BLUE, @@ -178,7 +147,8 @@ static int ps3remote_decode(char *buff, int size, unsigned int *value) { static unsigned int lastkey = 0; static unsigned int lastmask = 0; - int retval, mask, key, i; + int retval, mask, i; + guint8 key; if (size < 12) { error("Got a shorter packet! (size %i)\n", size); |