diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-03-30 17:14:53 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-03-30 17:14:53 +0400 |
| commit | 621de593081524da2f0f7b060f5951b4155eb4a2 (patch) | |
| tree | dcb1777094498496a3036b0e49546887e72d6a06 /include/linux/hid.h | |
| parent | afa5eb7c68689ced4284f01c96feed44a2d0a127 (diff) | |
| parent | 6d77976800c3f29a0337fadcc9ddd79050fa5620 (diff) | |
| download | linux-621de593081524da2f0f7b060f5951b4155eb4a2.tar.xz | |
Merge branch 'autosuspend' into for-next
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index a46cbea71d65..a72876e43589 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -604,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)) @@ -642,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); /** |