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

usbdev:resolve ADB compilation errors

Browse Source 
Signed-off-by: sunkun3 <sunkun3@xiaomi.com>
This commit is contained in:
sunkun3 2022-09-19 16:28:50 +08:00 committed by Xiang Xiao
parent 9150ea0e95
commit d9acaeaccf
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usbdev/adb.c Normal file → Executable file
View File

@ -528,7 +528,7 @@ static void usb_adb_wrcomplete(FAR struct usbdev_ep_s *ep,
{ {
case OK: /* Normal completion */ case OK: /* Normal completion */
{ {
usbtrace(TRACE_CLASSWRCOMPLETE, priv->nwrq); usbtrace(TRACE_CLASSWRCOMPLETE, sq_count(&priv->txfree));
/* Notify all waiting writers that write req is available */ /* Notify all waiting writers that write req is available */
@ -549,7 +549,7 @@ static void usb_adb_wrcomplete(FAR struct usbdev_ep_s *ep,
case -ESHUTDOWN: /* Disconnection */ case -ESHUTDOWN: /* Disconnection */
{ {
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_WRSHUTDOWN), priv->nwrq); usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_WRSHUTDOWN), sq_count(&priv->txfree));
} }
break; break;
@ -600,7 +600,7 @@ static void usb_adb_rdcomplete(FAR struct usbdev_ep_s *ep,
{ {
case 0: /* Normal completion */ case 0: /* Normal completion */
usbtrace(TRACE_CLASSRDCOMPLETE, priv->nrdq); usbtrace(TRACE_CLASSRDCOMPLETE, sq_count(&priv->rxpending));
/* Restart request due to either no reader or /* Restart request due to either no reader or
* empty frame received. * empty frame received.
@ -816,7 +816,7 @@ static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep,
#ifdef CONFIG_USBDEV_DUALSPEED #ifdef CONFIG_USBDEV_DUALSPEED
static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf, static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
FAR struct usbdev_devinfo_s *devinfo, FAR struct usbdev_devinfo_s *devinfo,
uint8_t speed, uint8_t type); uint8_t speed, uint8_t type)
#else #else
static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf, static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
FAR struct usbdev_devinfo_s *devinfo) FAR struct usbdev_devinfo_s *devinfo)
@ -1198,7 +1198,12 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
case USB_DESC_TYPE_CONFIG: case USB_DESC_TYPE_CONFIG:
{ {
#ifndef CONFIG_USBDEV_DUALSPEED
ret = usbclass_mkcfgdesc(ctrlreq->buf, NULL); ret = usbclass_mkcfgdesc(ctrlreq->buf, NULL);
#else
ret = usbclass_mkcfgdesc(ctrlreq->buf, NULL,
dev->speed, ctrl->req);
#endif
} }
break; break;