Skip to content

Commit 2fc00c1

Browse files
Chris Chiubentiss
authored andcommitted
HID: use macros in IS_INPUT_APPLICATION
Add missing definition for HID_DG_WHITEBOARD then replace the hid usage hex with macros for better readibility. Signed-off-by: Chris Chiu <chiu@endlessm.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
1 parent e195ca6 commit 2fc00c1

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

include/linux/hid.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ struct hid_item {
238238
#define HID_DG_LIGHTPEN 0x000d0003
239239
#define HID_DG_TOUCHSCREEN 0x000d0004
240240
#define HID_DG_TOUCHPAD 0x000d0005
241+
#define HID_DG_WHITEBOARD 0x000d0006
241242
#define HID_DG_STYLUS 0x000d0020
242243
#define HID_DG_PUCK 0x000d0021
243244
#define HID_DG_FINGER 0x000d0022
@@ -836,7 +837,10 @@ static inline bool hid_is_using_ll_driver(struct hid_device *hdev,
836837

837838
/* Applications from HID Usage Tables 4/8/99 Version 1.1 */
838839
/* We ignore a few input applications that are not widely used */
839-
#define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001) || ((a >= 0x000d0002) && (a <= 0x000d0006)))
840+
#define IS_INPUT_APPLICATION(a) \
841+
(((a >= HID_UP_GENDESK) && (a <= HID_GD_MULTIAXIS)) \
842+
|| ((a >= HID_DG_PEN) && (a <= HID_DG_WHITEBOARD)) \
843+
|| (a == HID_GD_SYSTEM_CONTROL) || (a == HID_CP_CONSUMER_CONTROL))
840844

841845
/* HID core API */
842846

0 commit comments

Comments
 (0)