aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/hid.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/hid.h')
-rw-r--r--include/linux/hid.h36
1 files changed, 1 insertions, 35 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 0473b45b73b8..fc6f74228da3 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -410,41 +410,7 @@ struct hid_device { /* device report descriptor */
410 unsigned country; /* HID country */ 410 unsigned country; /* HID country */
411 struct hid_report_enum report_enum[HID_REPORT_TYPES]; 411 struct hid_report_enum report_enum[HID_REPORT_TYPES];
412 412
413 struct usb_device *dev; /* device */ 413 struct device *dev; /* device */
414
415 /* USB specific fields */
416
417 struct usb_interface *intf; /* USB interface */
418 int ifnum; /* USB interface number */
419
420 unsigned long iofl; /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */
421 struct timer_list io_retry; /* Retry timer */
422 unsigned long stop_retry; /* Time to give up, in jiffies */
423 unsigned int retry_delay; /* Delay length in ms */
424 struct work_struct reset_work; /* Task context for resets */
425
426 unsigned int bufsize; /* URB buffer size */
427
428 struct urb *urbin; /* Input URB */
429 char *inbuf; /* Input buffer */
430 dma_addr_t inbuf_dma; /* Input buffer dma */
431 spinlock_t inlock; /* Input fifo spinlock */
432
433 struct urb *urbctrl; /* Control URB */
434 struct usb_ctrlrequest *cr; /* Control request struct */
435 dma_addr_t cr_dma; /* Control request struct dma */
436 struct hid_control_fifo ctrl[HID_CONTROL_FIFO_SIZE]; /* Control fifo */
437 unsigned char ctrlhead, ctrltail; /* Control fifo head & tail */
438 char *ctrlbuf; /* Control buffer */
439 dma_addr_t ctrlbuf_dma; /* Control buffer dma */
440 spinlock_t ctrllock; /* Control fifo spinlock */
441
442 struct urb *urbout; /* Output URB */
443 struct hid_report *out[HID_CONTROL_FIFO_SIZE]; /* Output pipe fifo */
444 unsigned char outhead, outtail; /* Output pipe fifo head & tail */
445 char *outbuf; /* Output buffer */
446 dma_addr_t outbuf_dma; /* Output buffer dma */
447 spinlock_t outlock; /* Output fifo spinlock */
448 414
449 unsigned claimed; /* Claimed by hidinput, hiddev? */ 415 unsigned claimed; /* Claimed by hidinput, hiddev? */
450 unsigned quirks; /* Various quirks the device can pull on us */ 416 unsigned quirks; /* Various quirks the device can pull on us */