Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 16:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

usbdev: Use composite devices as universal devices

Browse Source 
The enumeration process for composite and non-composite devices
has a lot of duplicate code. Treating the code for composite
devices as universal enumeration code can reduce redundant code.

Signed-off-by: zhangyuan21 <zhangyuan21@xiaomi.com>
This commit is contained in:
zhangyuan21
2023-07-05 09:23:26 +08:00
committed by archer
parent d55e0cce9c
commit fe6b0619f9
6 changed files with 103 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usbdev/composite.c
+8 -18
View File
@@ -40,8 +40,6 @@
#include "composite.h"
#ifdef CONFIG_USBDEV_COMPOSITE
/****************************************************************************
* Private Types
****************************************************************************/
@@ -108,16 +106,6 @@ static const struct usbdevclass_driverops_s g_driverops =
composite_resume, /* resume */
};
/****************************************************************************
* Public Data
****************************************************************************/
const char g_compvendorstr[] = CONFIG_COMPOSITE_VENDORSTR;
const char g_compproductstr[] = CONFIG_COMPOSITE_PRODUCTSTR;
#ifndef CONFIG_COMPOSITE_BOARD_SERIALSTR
const char g_compserialstr[] = CONFIG_COMPOSITE_SERIALSTR;
#endif
/****************************************************************************
* Private Functions
****************************************************************************/
@@ -512,7 +500,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
{
#ifdef CONFIG_USBDEV_DUALSPEED
ret = composite_mkcfgdesc(priv, ctrlreq->buf, dev->speed,
ctrl->value[1]);
ctrl->value[1]);
#else
ret = composite_mkcfgdesc(priv, ctrlreq->buf);
#endif
@@ -527,6 +515,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
FAR struct usb_strdesc_s *buf =
(FAR struct usb_strdesc_s *)ctrlreq->buf;
#ifdef CONFIG_USBDEV_COMPOSITE
if (strid < COMPOSITE_NSTRIDS)
{
ret = composite_mkstrdesc(strid, buf);
@@ -571,6 +560,9 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
}
}
}
#else
ret = composite_mkstrdesc(strid, buf);
#endif
}
break;
@@ -587,7 +579,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
case USB_REQ_SETCONFIGURATION:
{
if (ctrl->type == 0)
if (ctrl->type == 0 && value != priv->config)
{
int i;
@@ -622,7 +614,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
case USB_REQ_SETINTERFACE:
{
if (ctrl->type == USB_REQ_RECIPIENT_INTERFACE &&
priv->config == COMPOSITE_CONFIGID)
priv->config != COMPOSITE_CONFIGIDNONE)
{
ret = composite_classsetup(priv, dev, ctrl, dataout, outlen);
dispatched = true;
@@ -957,7 +949,7 @@ FAR void *composite_initialize(uint8_t ndevices,
if (ret < 0)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_DEVREGISTER),
(uint16_t)-ret);
(uint16_t)-ret);
goto errout_with_alloc;
}
@@ -1061,5 +1053,3 @@ int composite_ep0submit(FAR struct usbdevclass_driver_s *driver,
return 0;
}
}
#endif /* CONFIG_USBDEV_COMPOSITE */