diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-09-07 10:12:02 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-09-07 10:12:02 -0600 |
commit | 41f052cc7b494d198e5bcb662790c1c1102c5dfb (patch) | |
tree | 34e36a41bb604d7869c5b97b2693528875dec51e /nuttx/drivers/usbdev | |
parent | a565e702360db5afd59864a83f6f922b7e8817de (diff) | |
download | px4-nuttx-41f052cc7b494d198e5bcb662790c1c1102c5dfb.tar.gz px4-nuttx-41f052cc7b494d198e5bcb662790c1c1102c5dfb.tar.bz2 px4-nuttx-41f052cc7b494d198e5bcb662790c1c1102c5dfb.zip |
Fix warnings in USB MSC when compiled for a high speed device; also fix USB MSC default VID/PID configuration
Diffstat (limited to 'nuttx/drivers/usbdev')
-rw-r--r-- | nuttx/drivers/usbdev/Kconfig | 21 | ||||
-rw-r--r-- | nuttx/drivers/usbdev/usbmsc_desc.c | 6 |
2 files changed, 16 insertions, 11 deletions
diff --git a/nuttx/drivers/usbdev/Kconfig b/nuttx/drivers/usbdev/Kconfig index f95ca0fa1..2adc79fe7 100644 --- a/nuttx/drivers/usbdev/Kconfig +++ b/nuttx/drivers/usbdev/Kconfig @@ -127,8 +127,8 @@ config COMPOSITE_EP0MAXPACKET config COMPOSITE_VENDORID hex "Composite vendor ID" - default 0 - + default 0x0000 + config COMPOSITE_VENDORSTR string "Composite vendor ID" default "Nuttx" @@ -137,8 +137,8 @@ config COMPOSITE_VENDORSTR config COMPOSITE_PRODUCTID hex "Composite product id" - default 0 - + default 0x0000 + config COMPOSITE_PRODUCTSTR string "Composite product string" default "Composite device" @@ -523,8 +523,13 @@ config USBMSC_BULKOUTREQLEN config USBMSC_VENDORID hex "Mass storage Vendor ID" - default 0x00 - + default 0x584e + ---help--- + The vendor ID (VID). The value here is bogus. You should not use + it in any commercial products! You must go through the proper + channels to request a vendor ID for your company if you do not + already have one! + config USBMSC_VENDORSTR string "Mass storage vendor string" default "Nuttx" @@ -533,7 +538,9 @@ config USBMSC_VENDORSTR config USBMSC_PRODUCTID hex "Mass storage Product ID" - default 0x00 + default 0x5342 + ---help--- + The product ID (PID). config USBMSC_PRODUCTSTR string "Mass storage product string" diff --git a/nuttx/drivers/usbdev/usbmsc_desc.c b/nuttx/drivers/usbdev/usbmsc_desc.c index 6d7561b3f..90e9decda 100644 --- a/nuttx/drivers/usbdev/usbmsc_desc.c +++ b/nuttx/drivers/usbdev/usbmsc_desc.c @@ -359,7 +359,6 @@ int16_t usbmsc_mkcfgdesc(uint8_t *buf) #ifdef CONFIG_USBDEV_DUALSPEED FAR const struct usb_epdesc_s *epdesc; bool hispeed = (speed == USB_SPEED_HIGH); - uint16_t bulkmxpacket; #endif /* Configuration descriptor. If the USB mass storage device is @@ -388,12 +387,11 @@ int16_t usbmsc_mkcfgdesc(uint8_t *buf) hispeed = !hispeed; } - bulkmxpacket = USBMSC_BULKMAXPACKET(hispeed); - epdesc = USBMSC_EPBULKINDESC(hispeed); + epdesc = USBMSC_EPBULKINDESC(hispeed); memcpy(buf, epdesc, USB_SIZEOF_EPDESC); buf += USB_SIZEOF_EPDESC; - epdesc = USBMSC_EPBULKOUTDESC(hispeed); + epdesc = USBMSC_EPBULKOUTDESC(hispeed); memcpy(buf, epdesc, USB_SIZEOF_EPDESC); #else memcpy(buf, &g_fsepbulkoutdesc, USB_SIZEOF_EPDESC); |