diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-11 00:48:48 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-11 00:48:48 -0400 |
| commit | 72f9df4023f9e44b29a48a5ea4954d89b18363fe (patch) | |
| tree | 3b7c4b55fa47d032ee2957ca0fff40f99db7193c /drivers/input/keyboard | |
| parent | 5637f02a9cf84f2c00fd8a0f6561c375bb19103b (diff) | |
| download | linux-72f9df4023f9e44b29a48a5ea4954d89b18363fe.tar.bz2 | |
Input: jornada720_kbd - send MSC_SCAN events
Send MSC_SCAN events to userspace to ease task of adjusting
keymap.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/jornada720_kbd.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c index dd8a037f7281..e6696b3c9416 100644 --- a/drivers/input/keyboard/jornada720_kbd.c +++ b/drivers/input/keyboard/jornada720_kbd.c @@ -59,7 +59,8 @@ static irqreturn_t jornada720_kbd_interrupt(int irq, void *dev_id) { struct platform_device *pdev = dev_id; struct jornadakbd *jornadakbd = platform_get_drvdata(pdev); - u8 count, kbd_data; + struct input_dev *input = jornadakbd->input; + u8 count, kbd_data, scan_code; /* startup ssp with spinlock */ jornada_ssp_start(); @@ -77,11 +78,12 @@ static irqreturn_t jornada720_kbd_interrupt(int irq, void *dev_id) while (count--) { /* Exchange TxDummy for location (keymap[kbddata]) */ kbd_data = jornada_ssp_byte(TXDUMMY); + scan_code = kbd_data & 0x7f; - input_report_key(jornadakbd->input, - jornadakbd->keymap[kbd_data & 0x7f], + input_event(input, EV_MSC, MSC_SCAN, scan_code); + input_report_key(input, jornadakbd->keymap[scan_code], !(kbd_data & 0x80)); - input_sync(jornadakbd->input); + input_sync(input); } } @@ -123,6 +125,8 @@ static int __devinit jornada720_kbd_probe(struct platform_device *pdev) __set_bit(jornadakbd->keymap[i], input_dev->keybit); __clear_bit(KEY_RESERVED, input_dev->keybit); + input_set_capability(input_dev, EV_MSC, MSC_SCAN); + err = request_irq(IRQ_GPIO0, jornada720_kbd_interrupt, IRQF_DISABLED | IRQF_TRIGGER_FALLING, |