diff options
Diffstat (limited to 'drivers/usb/host/ehci.h')
-rw-r--r-- | drivers/usb/host/ehci.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index bd6ff489baf9..cc7d337ec355 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
@@ -75,6 +75,7 @@ struct ehci_hcd { /* one per controller */ | |||
75 | struct ehci_qh *async; | 75 | struct ehci_qh *async; |
76 | struct ehci_qh *dummy; /* For AMD quirk use */ | 76 | struct ehci_qh *dummy; /* For AMD quirk use */ |
77 | struct ehci_qh *reclaim; | 77 | struct ehci_qh *reclaim; |
78 | struct ehci_qh *qh_scan_next; | ||
78 | unsigned scanning : 1; | 79 | unsigned scanning : 1; |
79 | 80 | ||
80 | /* periodic schedule support */ | 81 | /* periodic schedule support */ |
@@ -87,6 +88,8 @@ struct ehci_hcd { /* one per controller */ | |||
87 | union ehci_shadow *pshadow; /* mirror hw periodic table */ | 88 | union ehci_shadow *pshadow; /* mirror hw periodic table */ |
88 | int next_uframe; /* scan periodic, start here */ | 89 | int next_uframe; /* scan periodic, start here */ |
89 | unsigned periodic_sched; /* periodic activity count */ | 90 | unsigned periodic_sched; /* periodic activity count */ |
91 | unsigned uframe_periodic_max; /* max periodic time per uframe */ | ||
92 | |||
90 | 93 | ||
91 | /* list of itds & sitds completed while clock_frame was still active */ | 94 | /* list of itds & sitds completed while clock_frame was still active */ |
92 | struct list_head cached_itd_list; | 95 | struct list_head cached_itd_list; |
@@ -117,7 +120,6 @@ struct ehci_hcd { /* one per controller */ | |||
117 | struct timer_list iaa_watchdog; | 120 | struct timer_list iaa_watchdog; |
118 | struct timer_list watchdog; | 121 | struct timer_list watchdog; |
119 | unsigned long actions; | 122 | unsigned long actions; |
120 | unsigned stamp; | ||
121 | unsigned periodic_stamp; | 123 | unsigned periodic_stamp; |
122 | unsigned random_frame; | 124 | unsigned random_frame; |
123 | unsigned long next_statechange; | 125 | unsigned long next_statechange; |
@@ -343,6 +345,7 @@ struct ehci_qh { | |||
343 | struct ehci_qh *reclaim; /* next to reclaim */ | 345 | struct ehci_qh *reclaim; /* next to reclaim */ |
344 | 346 | ||
345 | struct ehci_hcd *ehci; | 347 | struct ehci_hcd *ehci; |
348 | unsigned long unlink_time; | ||
346 | 349 | ||
347 | /* | 350 | /* |
348 | * Do NOT use atomic operations for QH refcounting. On some CPUs | 351 | * Do NOT use atomic operations for QH refcounting. On some CPUs |
@@ -374,6 +377,7 @@ struct ehci_qh { | |||
374 | #define NO_FRAME ((unsigned short)~0) /* pick new start */ | 377 | #define NO_FRAME ((unsigned short)~0) /* pick new start */ |
375 | 378 | ||
376 | struct usb_device *dev; /* access to TT */ | 379 | struct usb_device *dev; /* access to TT */ |
380 | unsigned is_out:1; /* bulk or intr OUT */ | ||
377 | unsigned clearing_tt:1; /* Clear-TT-Buf in progress */ | 381 | unsigned clearing_tt:1; /* Clear-TT-Buf in progress */ |
378 | }; | 382 | }; |
379 | 383 | ||