diff options
author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2007-08-29 19:13:07 +0000 |
---|---|---|
committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2007-08-29 19:13:07 +0000 |
commit | e3bef6728fd29098c2045011e1dc7de75e69fe0b (patch) | |
tree | e7671d0eacf9c8238b6d9532a2ef927cc47754f1 /firmware/usbstack/drivers | |
parent | 6b467e435867f3d515caf7f54c9c2cd4dceda852 (diff) | |
download | rockbox-e3bef6728fd29098c2045011e1dc7de75e69fe0b.tar.gz rockbox-e3bef6728fd29098c2045011e1dc7de75e69fe0b.zip |
make USB Command Verifier happy
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14526 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/usbstack/drivers')
-rw-r--r-- | firmware/usbstack/drivers/device/usb_serial.c | 2 | ||||
-rw-r--r-- | firmware/usbstack/drivers/device/usb_storage.c | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/firmware/usbstack/drivers/device/usb_serial.c b/firmware/usbstack/drivers/device/usb_serial.c index c243821a4b..a37813b01c 100644 --- a/firmware/usbstack/drivers/device/usb_serial.c +++ b/firmware/usbstack/drivers/device/usb_serial.c | |||
@@ -242,7 +242,9 @@ int usb_serial_driver_request(struct usb_ctrlrequest* request) | |||
242 | logf("usb serial: sending qualifier dec"); | 242 | logf("usb serial: sending qualifier dec"); |
243 | ret = MIN(sizeof(struct usb_qualifier_descriptor), request->wLength); | 243 | ret = MIN(sizeof(struct usb_qualifier_descriptor), request->wLength); |
244 | res.buf = &serial_qualifier_desc; | 244 | res.buf = &serial_qualifier_desc; |
245 | break; | ||
245 | 246 | ||
247 | case USB_DT_OTHER_SPEED_CONFIG: | ||
246 | case USB_DT_CONFIG: | 248 | case USB_DT_CONFIG: |
247 | logf("usb serial: sending config desc"); | 249 | logf("usb serial: sending config desc"); |
248 | 250 | ||
diff --git a/firmware/usbstack/drivers/device/usb_storage.c b/firmware/usbstack/drivers/device/usb_storage.c index 9133c85293..8c96914270 100644 --- a/firmware/usbstack/drivers/device/usb_storage.c +++ b/firmware/usbstack/drivers/device/usb_storage.c | |||
@@ -99,6 +99,14 @@ static struct usb_endpoint_descriptor storage_fs_bulk_out_desc = { | |||
99 | .wMaxPacketSize = 64, | 99 | .wMaxPacketSize = 64, |
100 | }; | 100 | }; |
101 | 101 | ||
102 | static struct usb_qualifier_descriptor storage_qualifier_desc = { | ||
103 | .bLength = sizeof(struct usb_qualifier_descriptor), | ||
104 | .bDescriptorType = USB_DT_DEVICE_QUALIFIER, | ||
105 | .bcdUSB = 0x0200, | ||
106 | .bDeviceClass = 0, | ||
107 | .bNumConfigurations = 1, | ||
108 | }; | ||
109 | |||
102 | struct usb_descriptor_header *storage_fs_function[] = { | 110 | struct usb_descriptor_header *storage_fs_function[] = { |
103 | (struct usb_descriptor_header *) &storage_interface_desc, | 111 | (struct usb_descriptor_header *) &storage_interface_desc, |
104 | (struct usb_descriptor_header *) &storage_fs_bulk_in_desc, | 112 | (struct usb_descriptor_header *) &storage_fs_bulk_in_desc, |
@@ -220,6 +228,13 @@ int usb_storage_driver_request(struct usb_ctrlrequest* request) | |||
220 | res.buf = &storage_device_desc; | 228 | res.buf = &storage_device_desc; |
221 | break; | 229 | break; |
222 | 230 | ||
231 | case USB_DT_DEVICE_QUALIFIER: | ||
232 | logf("usb storage: sending qualifier dec"); | ||
233 | ret = MIN(sizeof(struct usb_qualifier_descriptor), request->wLength); | ||
234 | res.buf = &storage_qualifier_desc; | ||
235 | break; | ||
236 | |||
237 | case USB_DT_OTHER_SPEED_CONFIG: | ||
223 | case USB_DT_CONFIG: | 238 | case USB_DT_CONFIG: |
224 | logf("usb storage: sending config desc"); | 239 | logf("usb storage: sending config desc"); |
225 | 240 | ||