From fce09ccb2453443e0083fa9a230d67727d139d8b Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 27 Jan 2012 18:33:41 +0000 Subject: 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 --- nuttx/drivers/usbdev/usbmsc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'nuttx/drivers/usbdev/usbmsc.c') 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. -- cgit v1.2.3