This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit d9acaeaccf81572caf4970e7394b8f001098d6c3 Author: sunkun3 <[email protected]> AuthorDate: Mon Sep 19 16:28:50 2022 +0800 usbdev:resolve ADB compilation errors Signed-off-by: sunkun3 <[email protected]> --- drivers/usbdev/adb.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/usbdev/adb.c b/drivers/usbdev/adb.c old mode 100644 new mode 100755 index dd16564067..39fa624319 --- a/drivers/usbdev/adb.c +++ b/drivers/usbdev/adb.c @@ -528,7 +528,7 @@ static void usb_adb_wrcomplete(FAR struct usbdev_ep_s *ep, { 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 */ @@ -549,7 +549,7 @@ static void usb_adb_wrcomplete(FAR struct usbdev_ep_s *ep, case -ESHUTDOWN: /* Disconnection */ { - usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_WRSHUTDOWN), priv->nwrq); + usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_WRSHUTDOWN), sq_count(&priv->txfree)); } break; @@ -600,7 +600,7 @@ static void usb_adb_rdcomplete(FAR struct usbdev_ep_s *ep, { case 0: /* Normal completion */ - usbtrace(TRACE_CLASSRDCOMPLETE, priv->nrdq); + usbtrace(TRACE_CLASSRDCOMPLETE, sq_count(&priv->rxpending)); /* Restart request due to either no reader or * empty frame received. @@ -816,7 +816,7 @@ static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep, #ifdef CONFIG_USBDEV_DUALSPEED static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf, FAR struct usbdev_devinfo_s *devinfo, - uint8_t speed, uint8_t type); + uint8_t speed, uint8_t type) #else static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf, 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: { +#ifndef CONFIG_USBDEV_DUALSPEED ret = usbclass_mkcfgdesc(ctrlreq->buf, NULL); +#else + ret = usbclass_mkcfgdesc(ctrlreq->buf, NULL, + dev->speed, ctrl->req); +#endif } break;
