1 files changed, 21 insertions, 10 deletions

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 898103b401f1..6e35b92b1d2c 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -29,13 +29,6 @@
  * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
  */
 
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/workqueue.h>
-#include <linux/input.h>
-
 /*
  * USB HID (Human Interface Device) interface class code
  */
@@ -69,6 +62,17 @@
 #define HID_DT_REPORT                   (USB_TYPE_CLASS | 0x02)
 #define HID_DT_PHYSICAL                 (USB_TYPE_CLASS | 0x03)
 
+#define HID_MAX_DESCRIPTOR_SIZE         4096
+
+#ifdef __KERNEL__
+
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
+#include <linux/input.h>
+
 /*
  * We parse each description item into this structure. Short items data
  * values are expanded to 32-bit signed int, long items contain a pointer
@@ -276,6 +280,7 @@ struct hid_item {
 #define HID_QUIRK_HIDINPUT                      0x00200000
 #define HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL 0x00400000
 #define HID_QUIRK_LOGITECH_EXPANDED_KEYMAP      0x00800000
+#define HID_QUIRK_IGNORE_HIDINPUT               0x01000000
 
 /*
  * Separate quirks for runtime report descriptor fixup
@@ -285,6 +290,7 @@ struct hid_item {
 #define HID_QUIRK_RDESC_LOGITECH                0x00000002
 #define HID_QUIRK_RDESC_SWAPPED_MIN_MAX         0x00000004
 #define HID_QUIRK_RDESC_PETALYNX                0x00000008
+#define HID_QUIRK_RDESC_MACBOOK_JIS             0x00000010
 
 /*
  * This is the global environment of the parser. This information is
@@ -309,7 +315,6 @@ struct hid_global {
  * This is the local environment. It is persistent up the next main-item.
  */
 
-#define HID_MAX_DESCRIPTOR_SIZE         4096
 #define HID_MAX_USAGES                  8192
 #define HID_DEFAULT_NUM_COLLECTIONS     16
 
@@ -403,6 +408,7 @@ struct hid_control_fifo {
 
 #define HID_CLAIMED_INPUT       1
 #define HID_CLAIMED_HIDDEV      2
+#define HID_CLAIMED_HIDRAW      4
 
 #define HID_CTRL_RUNNING        1
 #define HID_OUT_RUNNING         2
@@ -438,6 +444,7 @@ struct hid_device {							/* device report descriptor */
 
         struct list_head inputs;                                        /* The list of inputs */
         void *hiddev;                                                   /* The hiddev structure */
+        void *hidraw;
         int minor;                                                      /* Hiddev minor number */
 
         wait_queue_head_t wait;                                         /* For sleeping */
@@ -458,9 +465,12 @@ struct hid_device {							/* device report descriptor */
         void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field,
                                   struct hid_usage *, __s32);
         void (*hiddev_report_event) (struct hid_device *, struct hid_report *);
+
+        /* handler for raw output data, used by hidraw */
+        int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t);
 #ifdef CONFIG_USB_HIDINPUT_POWERBOOK
-        unsigned long pb_pressed_fn[NBITS(KEY_MAX)];
-        unsigned long pb_pressed_numlock[NBITS(KEY_MAX)];
+        unsigned long pb_pressed_fn[BITS_TO_LONGS(KEY_CNT)];
+        unsigned long pb_pressed_numlock[BITS_TO_LONGS(KEY_CNT)];
 #endif
 };
 
@@ -553,4 +563,5 @@ static inline int hid_ff_init(struct hid_device *hid) { return -1; }
 #define err_hid(format, arg...) printk(KERN_ERR "%s: " format "\n" , \
                 __FILE__ , ## arg)
 #endif
+#endif