Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix warnings in USB MSC when compiled for a high speed device; also fix USB MSC default VID/PID configuration

Browse Source
This commit is contained in:
Gregory Nutt
2013-09-07 10:12:02 -06:00
parent 0585cd5692
commit 9a9de5de81
4 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usbdev/Kconfig
+14 -7
View File
@@ -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"
drivers/usbdev/usbmsc_desc.c
+2 -4
View File
@@ -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);