UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Input: pxa27x_keypad - miscellaneous fixes 

1. Set input bits for direct keys codes
2. Set input bits for rotary encoder codes only if rotary
   encoder is enabled
3. Enable EV_REL only if rotary encoder is enabled and rel_codes
   are set up

Signed-off-by: Antonio Ospite <ao2@openezx.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Antonio Ospite 2008-05-28 14:35:52 -04:00 committed by Dmitry Torokhov
parent 57f5b1590f
commit 471637a575
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/input/keyboard/pxa27x_keypad.c
View File

@ -136,6 +136,9 @@ static void pxa27x_keypad_build_keycode(struct pxa27x_keypad *keypad)
set_bit(code, input_dev->keybit); set_bit(code, input_dev->keybit);
} }
for (i = 0; i < pdata->direct_key_num; i++)
set_bit(pdata->direct_key_map[i], input_dev->keybit);
keypad->rotary_up_key[0] = pdata->rotary0_up_key; keypad->rotary_up_key[0] = pdata->rotary0_up_key;
keypad->rotary_up_key[1] = pdata->rotary1_up_key; keypad->rotary_up_key[1] = pdata->rotary1_up_key;
keypad->rotary_down_key[0] = pdata->rotary0_down_key; keypad->rotary_down_key[0] = pdata->rotary0_down_key;
@ -143,17 +146,21 @@ static void pxa27x_keypad_build_keycode(struct pxa27x_keypad *keypad)
keypad->rotary_rel_code[0] = pdata->rotary0_rel_code; keypad->rotary_rel_code[0] = pdata->rotary0_rel_code;
keypad->rotary_rel_code[1] = pdata->rotary1_rel_code; keypad->rotary_rel_code[1] = pdata->rotary1_rel_code;
if (pdata->rotary0_up_key && pdata->rotary0_down_key) { if (pdata->enable_rotary0) {
set_bit(pdata->rotary0_up_key, input_dev->keybit); if (pdata->rotary0_up_key && pdata->rotary0_down_key) {
set_bit(pdata->rotary0_down_key, input_dev->keybit); set_bit(pdata->rotary0_up_key, input_dev->keybit);
} else set_bit(pdata->rotary0_down_key, input_dev->keybit);
set_bit(pdata->rotary0_rel_code, input_dev->relbit); } else
set_bit(pdata->rotary0_rel_code, input_dev->relbit);
}
if (pdata->rotary1_up_key && pdata->rotary1_down_key) { if (pdata->enable_rotary1) {
set_bit(pdata->rotary1_up_key, input_dev->keybit); if (pdata->rotary1_up_key && pdata->rotary1_down_key) {
set_bit(pdata->rotary1_down_key, input_dev->keybit); set_bit(pdata->rotary1_up_key, input_dev->keybit);
} else set_bit(pdata->rotary1_down_key, input_dev->keybit);
set_bit(pdata->rotary1_rel_code, input_dev->relbit); } else
set_bit(pdata->rotary1_rel_code, input_dev->relbit);
}
} }
static inline unsigned int lookup_matrix_keycode( static inline unsigned int lookup_matrix_keycode(
@ -484,8 +491,13 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
keypad->input_dev = input_dev; keypad->input_dev = input_dev;
input_set_drvdata(input_dev, keypad); input_set_drvdata(input_dev, keypad);
input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP) | input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
BIT_MASK(EV_REL); if ((keypad->pdata->enable_rotary0 &&
keypad->pdata->rotary0_rel_code) ||
(keypad->pdata->enable_rotary1 &&
keypad->pdata->rotary1_rel_code)) {
input_dev->evbit[0] |= BIT_MASK(EV_REL);
}
pxa27x_keypad_build_keycode(keypad); pxa27x_keypad_build_keycode(keypad);
platform_set_drvdata(pdev, keypad); platform_set_drvdata(pdev, keypad);