Commit 1a54f49e authored by Rene van Paassen's avatar Rene van Paassen Committed by Dmitry Torokhov

Input: aiptek - use set_bit instead of bitwise or

Have to use set_bit since some bit values are over 32, and bitwise or
won't work on these. To be safe for the future too, use set_bit for all
input dev capabilities
Signed-off-by: default avatarRene van Paassen <rene.vanpaassen@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 0038cae0
...@@ -329,6 +329,19 @@ struct aiptek { ...@@ -329,6 +329,19 @@ struct aiptek {
unsigned char *data; /* incoming packet data */ unsigned char *data; /* incoming packet data */
}; };
static const int eventTypes[] = {
EV_KEY, EV_ABS, EV_REL, EV_MSC,
};
static const int absEvents[] = {
ABS_X, ABS_Y, ABS_PRESSURE, ABS_TILT_X, ABS_TILT_Y,
ABS_WHEEL, ABS_MISC,
};
static const int relEvents[] = {
REL_X, REL_Y, REL_WHEEL,
};
static const int buttonEvents[] = { static const int buttonEvents[] = {
BTN_LEFT, BTN_RIGHT, BTN_MIDDLE, BTN_LEFT, BTN_RIGHT, BTN_MIDDLE,
BTN_TOOL_PEN, BTN_TOOL_RUBBER, BTN_TOOL_PENCIL, BTN_TOOL_AIRBRUSH, BTN_TOOL_PEN, BTN_TOOL_RUBBER, BTN_TOOL_PENCIL, BTN_TOOL_AIRBRUSH,
...@@ -1727,17 +1740,16 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) ...@@ -1727,17 +1740,16 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
/* Now program the capacities of the tablet, in terms of being /* Now program the capacities of the tablet, in terms of being
* an input device. * an input device.
*/ */
inputdev->evbit[0] |= BIT(EV_KEY) for (i = 0; i < ARRAY_SIZE(eventTypes); ++i)
| BIT(EV_ABS) __set_bit(eventTypes[i], inputdev->evbit);
| BIT(EV_REL)
| BIT(EV_MSC);
inputdev->absbit[0] |= BIT(ABS_MISC); for (i = 0; i < ARRAY_SIZE(absEvents); ++i)
__set_bit(absEvents[i], inputdev->absbit);
inputdev->relbit[0] |= for (i = 0; i < ARRAY_SIZE(relEvents); ++i)
(BIT(REL_X) | BIT(REL_Y) | BIT(REL_WHEEL) | BIT(REL_MISC)); __set_bit(relEvents[i], inputdev->relbit);
inputdev->mscbit[0] = BIT(MSC_SERIAL); __set_bit(MSC_SERIAL, inputdev->mscbit);
/* Set up key and button codes */ /* Set up key and button codes */
for (i = 0; i < ARRAY_SIZE(buttonEvents); ++i) for (i = 0; i < ARRAY_SIZE(buttonEvents); ++i)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment