lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: aiptek - use array to list all buttons

Browse Source 
When setting up input device use an array to list all the buttons
instead of setting every bit separately.

Signed-off-by: Rene van Paassen <rene.vanpaassen@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov
2007-05-21 00:18:15 -04:00
parent 37767b66ed
commit 33936fa603
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/input/tablet/aiptek.c
View File

@@ -329,6 +329,13 @@ struct aiptek {
unsigned char *data; /* incoming packet data */ unsigned char *data; /* incoming packet data */
}; };
static const int buttonEvents[] = {
BTN_LEFT, BTN_RIGHT, BTN_MIDDLE,
BTN_TOOL_PEN, BTN_TOOL_RUBBER, BTN_TOOL_PENCIL, BTN_TOOL_AIRBRUSH,
BTN_TOOL_BRUSH, BTN_TOOL_MOUSE, BTN_TOOL_LENS, BTN_TOUCH,
BTN_STYLUS, BTN_STYLUS2,
};
/* /*
* Permit easy lookup of keyboard events to send, versus * Permit easy lookup of keyboard events to send, versus
* the bitmap which comes from the tablet. This hides the * the bitmap which comes from the tablet. This hides the
@@ -1728,26 +1735,14 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
inputdev->relbit[0] |= inputdev->relbit[0] |=
(BIT(REL_X) | BIT(REL_Y) | BIT(REL_WHEEL) | BIT(REL_MISC)); (BIT(REL_X) | BIT(REL_Y) | BIT(REL_WHEEL) | BIT(REL_MISC));
inputdev->keybit[LONG(BTN_LEFT)] |=
(BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE));
inputdev->keybit[LONG(BTN_DIGI)] |=
(BIT(BTN_TOOL_PEN) |
BIT(BTN_TOOL_RUBBER) |
BIT(BTN_TOOL_PENCIL) |
BIT(BTN_TOOL_AIRBRUSH) |
BIT(BTN_TOOL_BRUSH) |
BIT(BTN_TOOL_MOUSE) |
BIT(BTN_TOOL_LENS) |
BIT(BTN_TOUCH) | BIT(BTN_STYLUS) | BIT(BTN_STYLUS2));
inputdev->mscbit[0] = BIT(MSC_SERIAL); inputdev->mscbit[0] = BIT(MSC_SERIAL);
/* Programming the tablet macro keys needs to be done with a for loop /* Set up key and button codes */
* as the keycodes are discontiguous. for (i = 0; i < ARRAY_SIZE(buttonEvents); ++i)
*/ __set_bit(buttonEvents[i], inputdev->keybit);
for (i = 0; i < ARRAY_SIZE(macroKeyEvents); ++i) for (i = 0; i < ARRAY_SIZE(macroKeyEvents); ++i)
set_bit(macroKeyEvents[i], inputdev->keybit); __set_bit(macroKeyEvents[i], inputdev->keybit);
/* /*
* Program the input device coordinate capacities. We do not yet * Program the input device coordinate capacities. We do not yet