diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 11:55:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 11:55:27 +1100 |
| commit | a133f56a4dac0bdceace9e6120f7faf933f8194d (patch) | |
| tree | 3e1c95649cd279eb8acef0af151d9824829374ca /include/linux | |
| parent | cd96517b0ec1804d0ec97e1b250198d539f6d46d (diff) | |
| parent | 8942f9cbafea31015e12c1a5cde451b4a4a16930 (diff) | |
Merge commit 'hid/for-next'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hid.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index fa8ee9cef7be..faa5ab053ad2 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -270,6 +270,7 @@ struct hid_item { #define HID_QUIRK_INVERT 0x00000001 #define HID_QUIRK_NOTOUCH 0x00000002 +#define HID_QUIRK_IGNORE 0x00000004 #define HID_QUIRK_NOGET 0x00000008 #define HID_QUIRK_BADPAD 0x00000020 #define HID_QUIRK_MULTI_INPUT 0x00000040 @@ -603,12 +604,17 @@ struct hid_ll_driver { int (*open)(struct hid_device *hdev); void (*close)(struct hid_device *hdev); + int (*power)(struct hid_device *hdev, int level); + int (*hidinput_input_event) (struct input_dev *idev, unsigned int type, unsigned int code, int value); int (*parse)(struct hid_device *hdev); }; +#define PM_HINT_FULLON 1<<5 +#define PM_HINT_NORMAL 1<<1 + /* Applications from HID Usage Tables 4/8/99 Version 1.1 */ /* We ignore a few input applications that are not widely used */ #define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001) || (a == 0x000d0002)) @@ -641,6 +647,7 @@ int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int void hid_output_report(struct hid_report *report, __u8 *data); struct hid_device *hid_allocate_device(void); int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size); +int hid_check_keys_pressed(struct hid_device *hid); int hid_connect(struct hid_device *hid, unsigned int connect_mask); /** |