diff options
| author | Marvin Raaijmakers <marvin_raaijmakers@linux-box.nl> | 2007-03-15 03:50:42 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-03-15 03:50:42 +0100 |
| commit | c8e4c77277ca5db0c4ddbfb4bc628b8abad585b0 (patch) | |
| tree | 07bebb34767c8c3bd0902d6c2be3f4819b30a7bf /drivers/input/evdev.c | |
| parent | Input: psmouse - allow disabing certain protocol extensions (diff) | |
| download | linux-c8e4c77277ca5db0c4ddbfb4bc628b8abad585b0.tar.xz linux-c8e4c77277ca5db0c4ddbfb4bc628b8abad585b0.zip | |
Input: add getkeycode and setkeycode methods
Allow drivers to implement their own get and set keycode methods. This
will allow drivers to change their keymaps without allocating huge
tables covering entire range of possible scancodes.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 6439f378f6cc..64b47de052bb 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -434,32 +434,21 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, case EVIOCGKEYCODE: if (get_user(t, ip)) return -EFAULT; - if (t < 0 || t >= dev->keycodemax || !dev->keycodesize) - return -EINVAL; - if (put_user(INPUT_KEYCODE(dev, t), ip + 1)) + + error = dev->getkeycode(dev, t, &v); + if (error) + return error; + + if (put_user(v, ip + 1)) return -EFAULT; + return 0; case EVIOCSKEYCODE: - if (get_user(t, ip)) - return -EFAULT; - if (t < 0 || t >= dev->keycodemax || !dev->keycodesize) - return -EINVAL; - if (get_user(v, ip + 1)) + if (get_user(t, ip) || get_user(v, ip + 1)) return -EFAULT; - if (v < 0 || v > KEY_MAX) - return -EINVAL; - if (dev->keycodesize < sizeof(v) && (v >> (dev->keycodesize * 8))) - return -EINVAL; - - u = SET_INPUT_KEYCODE(dev, t, v); - clear_bit(u, dev->keybit); - set_bit(v, dev->keybit); - for (i = 0; i < dev->keycodemax; i++) - if (INPUT_KEYCODE(dev, i) == u) - set_bit(u, dev->keybit); - return 0; + return dev->setkeycode(dev, t, v); case EVIOCSFF: if (copy_from_user(&effect, p, sizeof(effect))) |