sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usbdev: adb: fix missing break

Browse Source
This commit is contained in:
Simon Piriou 2020-10-28 02:28:33 +01:00 committed by Brennan Ashton
parent 5892927aea
commit da70eb5c56
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/usbdev/adb.c
View File

@ -1157,6 +1157,7 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
{ {
#ifndef CONFIG_USBADB_COMPOSITE #ifndef CONFIG_USBADB_COMPOSITE
case USB_REQ_GETDESCRIPTOR: case USB_REQ_GETDESCRIPTOR:
{
/* The value field specifies the descriptor type in the /* The value field specifies the descriptor type in the
* MS byte and the descriptor index in the LS byte * MS byte and the descriptor index in the LS byte
* (order is little endian) * (order is little endian)
@ -1216,6 +1217,8 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
} }
break; break;
} }
}
break;
/* If the serial device is used in as part of a composite device, /* If the serial device is used in as part of a composite device,
* then the overall composite class configuration is managed by * then the overall composite class configuration is managed by
@ -1267,13 +1270,6 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
} }
#ifndef CONFIG_USBADB_COMPOSITE #ifndef CONFIG_USBADB_COMPOSITE
/* Composite should send only one resquest for USB_REQ_SETCONFIGURATION.
* Hence ADB driver cannot submit to ep0; composite has to handle it.
*/
#warning composite_ep0submit() seems broken so skip it in case of composite
/* Respond to the setup command if data was returned. On an error return /* Respond to the setup command if data was returned. On an error return
* value (ret < 0), the USB driver will stall. * value (ret < 0), the USB driver will stall.
*/ */
@ -1297,6 +1293,12 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
usbclass_ep0incomplete(dev->ep0, ctrlreq); usbclass_ep0incomplete(dev->ep0, ctrlreq);
} }
} }
#else
/* Composite should send only one resquest for USB_REQ_SETCONFIGURATION.
* Hence ADB driver cannot submit to ep0; composite has to handle it.
*/
#warning composite_ep0submit() seems broken so skip it in case of composite
#endif /* !CONFIG_USBADB_COMPOSITE */ #endif /* !CONFIG_USBADB_COMPOSITE */
/* Returning a negative value will cause a STALL */ /* Returning a negative value will cause a STALL */