diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2008-06-18 17:36:49 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-10-14 17:50:49 -0400 |
commit | 8c19a51591d06f5226499972567f528cf6066bb7 (patch) | |
tree | acfa47c0cb371c8b87f7282d19c627e44032dbe2 /include/linux/hid.h | |
parent | d458a9dfc4de24870b8c747484b1988726534bee (diff) |
HID: move apple quirks
Move them from the core code to a separate driver.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include/linux/hid.h')
-rw-r--r-- | include/linux/hid.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 0644fd33b983..75cc1531dd84 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
@@ -264,13 +264,7 @@ struct hid_item { | |||
264 | #define HID_QUIRK_2WHEEL_MOUSE_HACK_7 0x00000080 | 264 | #define HID_QUIRK_2WHEEL_MOUSE_HACK_7 0x00000080 |
265 | #define HID_QUIRK_2WHEEL_MOUSE_HACK_5 0x00000100 | 265 | #define HID_QUIRK_2WHEEL_MOUSE_HACK_5 0x00000100 |
266 | #define HID_QUIRK_2WHEEL_MOUSE_HACK_ON 0x00000200 | 266 | #define HID_QUIRK_2WHEEL_MOUSE_HACK_ON 0x00000200 |
267 | #define HID_QUIRK_MIGHTYMOUSE 0x00000400 | ||
268 | #define HID_QUIRK_APPLE_HAS_FN 0x00000800 | ||
269 | #define HID_QUIRK_APPLE_FN_ON 0x00001000 | ||
270 | #define HID_QUIRK_INVERT_HWHEEL 0x00002000 | ||
271 | #define HID_QUIRK_APPLE_ISO_KEYBOARD 0x00004000 | ||
272 | #define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000 | 267 | #define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000 |
273 | #define HID_QUIRK_IGNORE_MOUSE 0x00020000 | ||
274 | #define HID_QUIRK_SONY_PS3_CONTROLLER 0x00040000 | 268 | #define HID_QUIRK_SONY_PS3_CONTROLLER 0x00040000 |
275 | #define HID_QUIRK_RESET_LEDS 0x00100000 | 269 | #define HID_QUIRK_RESET_LEDS 0x00100000 |
276 | #define HID_QUIRK_HIDINPUT 0x00200000 | 270 | #define HID_QUIRK_HIDINPUT 0x00200000 |
@@ -279,7 +273,6 @@ struct hid_item { | |||
279 | #define HID_QUIRK_HWHEEL_WHEEL_INVERT 0x04000000 | 273 | #define HID_QUIRK_HWHEEL_WHEEL_INVERT 0x04000000 |
280 | #define HID_QUIRK_MICROSOFT_KEYS 0x08000000 | 274 | #define HID_QUIRK_MICROSOFT_KEYS 0x08000000 |
281 | #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000 | 275 | #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000 |
282 | #define HID_QUIRK_APPLE_NUMLOCK_EMULATION 0x20000000 | ||
283 | 276 | ||
284 | /* | 277 | /* |
285 | * Separate quirks for runtime report descriptor fixup | 278 | * Separate quirks for runtime report descriptor fixup |
@@ -288,7 +281,6 @@ struct hid_item { | |||
288 | #define HID_QUIRK_RDESC_CYMOTION 0x00000001 | 281 | #define HID_QUIRK_RDESC_CYMOTION 0x00000001 |
289 | #define HID_QUIRK_RDESC_SWAPPED_MIN_MAX 0x00000004 | 282 | #define HID_QUIRK_RDESC_SWAPPED_MIN_MAX 0x00000004 |
290 | #define HID_QUIRK_RDESC_PETALYNX 0x00000008 | 283 | #define HID_QUIRK_RDESC_PETALYNX 0x00000008 |
291 | #define HID_QUIRK_RDESC_MACBOOK_JIS 0x00000010 | ||
292 | #define HID_QUIRK_RDESC_BUTTON_CONSUMER 0x00000020 | 284 | #define HID_QUIRK_RDESC_BUTTON_CONSUMER 0x00000020 |
293 | #define HID_QUIRK_RDESC_SAMSUNG_REMOTE 0x00000040 | 285 | #define HID_QUIRK_RDESC_SAMSUNG_REMOTE 0x00000040 |
294 | #define HID_QUIRK_RDESC_MICROSOFT_RECV_1028 0x00000080 | 286 | #define HID_QUIRK_RDESC_MICROSOFT_RECV_1028 0x00000080 |
@@ -475,10 +467,6 @@ struct hid_device { /* device report descriptor */ | |||
475 | 467 | ||
476 | /* handler for raw output data, used by hidraw */ | 468 | /* handler for raw output data, used by hidraw */ |
477 | int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t); | 469 | int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t); |
478 | #ifdef CONFIG_USB_HIDINPUT_POWERBOOK | ||
479 | unsigned long apple_pressed_fn[BITS_TO_LONGS(KEY_CNT)]; | ||
480 | unsigned long pb_pressed_numlock[BITS_TO_LONGS(KEY_CNT)]; | ||
481 | #endif | ||
482 | }; | 470 | }; |
483 | 471 | ||
484 | static inline void *hid_get_drvdata(struct hid_device *hdev) | 472 | static inline void *hid_get_drvdata(struct hid_device *hdev) |
@@ -652,7 +640,6 @@ int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int | |||
652 | int hidinput_mapping_quirks(struct hid_usage *, struct hid_input *, | 640 | int hidinput_mapping_quirks(struct hid_usage *, struct hid_input *, |
653 | unsigned long **, int *); | 641 | unsigned long **, int *); |
654 | int hidinput_event_quirks(struct hid_device *, struct hid_field *, struct hid_usage *, __s32); | 642 | int hidinput_event_quirks(struct hid_device *, struct hid_field *, struct hid_usage *, __s32); |
655 | int hidinput_apple_event(struct hid_device *, struct input_dev *, struct hid_usage *, __s32); | ||
656 | void hid_output_report(struct hid_report *report, __u8 *data); | 643 | void hid_output_report(struct hid_report *report, __u8 *data); |
657 | struct hid_device *hid_allocate_device(void); | 644 | struct hid_device *hid_allocate_device(void); |
658 | int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size); | 645 | int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size); |