diff options
Diffstat (limited to 'drivers/usb/core/hub.h')
-rw-r--r-- | drivers/usb/core/hub.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h index cf9559c6c9..1551aed65e 100644 --- a/drivers/usb/core/hub.h +++ b/drivers/usb/core/hub.h | |||
@@ -55,16 +55,16 @@ | |||
55 | #define USB_PORT_FEAT_TEST 21 | 55 | #define USB_PORT_FEAT_TEST 21 |
56 | #define USB_PORT_FEAT_INDICATOR 22 | 56 | #define USB_PORT_FEAT_INDICATOR 22 |
57 | 57 | ||
58 | /* | 58 | /* |
59 | * Hub Status and Hub Change results | 59 | * Hub Status and Hub Change results |
60 | * See USB 2.0 spec Table 11-19 and Table 11-20 | 60 | * See USB 2.0 spec Table 11-19 and Table 11-20 |
61 | */ | 61 | */ |
62 | struct usb_port_status { | 62 | struct usb_port_status { |
63 | __le16 wPortStatus; | 63 | __le16 wPortStatus; |
64 | __le16 wPortChange; | 64 | __le16 wPortChange; |
65 | } __attribute__ ((packed)); | 65 | } __attribute__ ((packed)); |
66 | 66 | ||
67 | /* | 67 | /* |
68 | * wPortStatus bit field | 68 | * wPortStatus bit field |
69 | * See USB 2.0 spec Table 11-21 | 69 | * See USB 2.0 spec Table 11-21 |
70 | */ | 70 | */ |
@@ -81,7 +81,7 @@ struct usb_port_status { | |||
81 | #define USB_PORT_STAT_INDICATOR 0x1000 | 81 | #define USB_PORT_STAT_INDICATOR 0x1000 |
82 | /* bits 13 to 15 are reserved */ | 82 | /* bits 13 to 15 are reserved */ |
83 | 83 | ||
84 | /* | 84 | /* |
85 | * wPortChange bit field | 85 | * wPortChange bit field |
86 | * See USB 2.0 spec Table 11-22 | 86 | * See USB 2.0 spec Table 11-22 |
87 | * Bits 0 to 4 shown, bits 5 to 15 are reserved | 87 | * Bits 0 to 4 shown, bits 5 to 15 are reserved |
@@ -93,7 +93,7 @@ struct usb_port_status { | |||
93 | #define USB_PORT_STAT_C_RESET 0x0010 | 93 | #define USB_PORT_STAT_C_RESET 0x0010 |
94 | 94 | ||
95 | /* | 95 | /* |
96 | * wHubCharacteristics (masks) | 96 | * wHubCharacteristics (masks) |
97 | * See USB 2.0 spec Table 11-13, offset 3 | 97 | * See USB 2.0 spec Table 11-13, offset 3 |
98 | */ | 98 | */ |
99 | #define HUB_CHAR_LPSM 0x0003 /* D1 .. D0 */ | 99 | #define HUB_CHAR_LPSM 0x0003 /* D1 .. D0 */ |
@@ -119,8 +119,8 @@ struct usb_hub_status { | |||
119 | #define HUB_CHANGE_OVERCURRENT 0x0002 | 119 | #define HUB_CHANGE_OVERCURRENT 0x0002 |
120 | 120 | ||
121 | 121 | ||
122 | /* | 122 | /* |
123 | * Hub descriptor | 123 | * Hub descriptor |
124 | * See USB 2.0 spec Table 11-13 | 124 | * See USB 2.0 spec Table 11-13 |
125 | */ | 125 | */ |
126 | 126 | ||
@@ -134,7 +134,7 @@ struct usb_hub_descriptor { | |||
134 | __le16 wHubCharacteristics; | 134 | __le16 wHubCharacteristics; |
135 | __u8 bPwrOn2PwrGood; | 135 | __u8 bPwrOn2PwrGood; |
136 | __u8 bHubContrCurrent; | 136 | __u8 bHubContrCurrent; |
137 | /* add 1 bit for hub status change; round to bytes */ | 137 | /* add 1 bit for hub status change; round to bytes */ |
138 | __u8 DeviceRemovable[(USB_MAXCHILDREN + 1 + 7) / 8]; | 138 | __u8 DeviceRemovable[(USB_MAXCHILDREN + 1 + 7) / 8]; |
139 | __u8 PortPwrCtrlMask[(USB_MAXCHILDREN + 1 + 7) / 8]; | 139 | __u8 PortPwrCtrlMask[(USB_MAXCHILDREN + 1 + 7) / 8]; |
140 | } __attribute__ ((packed)); | 140 | } __attribute__ ((packed)); |
@@ -190,6 +190,6 @@ struct usb_tt_clear { | |||
190 | u16 devinfo; | 190 | u16 devinfo; |
191 | }; | 191 | }; |
192 | 192 | ||
193 | extern void usb_hub_tt_clear_buffer (struct usb_device *dev, int pipe); | 193 | extern void usb_hub_tt_clear_buffer(struct usb_device *dev, int pipe); |
194 | 194 | ||
195 | #endif /* __LINUX_HUB_H */ | 195 | #endif /* __LINUX_HUB_H */ |