diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-27 18:33:41 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-27 18:33:41 +0000 |
| commit | fce09ccb2453443e0083fa9a230d67727d139d8b (patch) | |
| tree | 4f448f88d65057fe68436b89cfbeb74f2273f370 /nuttx/drivers/usbdev/usbmsc.c | |
| parent | 7a0c66e591a0f4023fb44878f76f567448b8a3eb (diff) | |
| download | px4-nuttx-fce09ccb2453443e0083fa9a230d67727d139d8b.tar.gz px4-nuttx-fce09ccb2453443e0083fa9a230d67727d139d8b.tar.bz2 px4-nuttx-fce09ccb2453443e0083fa9a230d67727d139d8b.zip | |
The composite USB device is basically functional (more testing needed)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4343 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/usbdev/usbmsc.c')
| -rw-r--r-- | nuttx/drivers/usbdev/usbmsc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nuttx/drivers/usbdev/usbmsc.c b/nuttx/drivers/usbdev/usbmsc.c index f521c0a2d..948b72fe6 100644 --- a/nuttx/drivers/usbdev/usbmsc.c +++ b/nuttx/drivers/usbdev/usbmsc.c @@ -710,7 +710,7 @@ static int usbmsc_setup(FAR struct usbdevclass_driver_s *driver, break; } } - else + else if ((ctrl->type & USB_REQ_TYPE_MASK) == USB_REQ_TYPE_CLASS) { /********************************************************************** * Bulk-Only Mass Storage Class Requests @@ -775,10 +775,14 @@ static int usbmsc_setup(FAR struct usbdevclass_driver_s *driver, break; default: - usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_BADREQUEST), index); + usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_BADREQUEST), ctrl->req); break; } } + else + { + usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_UNSUPPORTEDTYPE), ctrl->type); + } /* Respond to the setup command if data was returned. On an error return * value (ret < 0), the USB driver will stall EP0. |