Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-07 21:47:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Composite: More compile-related fixes

Browse source
This commit is contained in:
Gregory Nutt 2017-06-01 17:02:43 -06:00
parent fc1438c95d
commit 9dd41bdd2f
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/usbdev/cdcacm.c
View file

@ -2602,20 +2602,20 @@ void cdcacm_get_composite_devdesc(struct composite_devdesc_s *dev)
{
/* The callback functions for the CDC/ACM class */
dev->mkconfdesc = cdcacm_mkcfgdesc;
dev->mkstrdesc = cdcacm_mkstrdesc;
dev->board_classobject = 0;
dev->board_uninitialize = 0;
dev->mkconfdesc = cdcacm_mkcfgdesc;
dev->mkstrdesc = cdcacm_mkstrdesc;
dev->classobject = 0;
dev->uninitialize = 0;
dev->nconfigs = CDCACM_NCONFIGS; /* Number of configurations supported */
dev->configid = CDCACM_CONFIGID; /* The only supported configuration ID */
dev->nconfigs = CDCACM_NCONFIGS; /* Number of configurations supported */
dev->configid = CDCACM_CONFIGID; /* The only supported configuration ID */
/* Let the construction function calculate the size of the config descriptor */
#ifdef CONFIG_USBDEV_DUALSPEED
dev->cfgdescsize = cdcacm_mkcfgdesc(NULL, NULL, USB_SPEED_UNKNOWN, 0);
dev->cfgdescsize = cdcacm_mkcfgdesc(NULL, NULL, USB_SPEED_UNKNOWN, 0);
#else
dev->cfgdescsize = cdcacm_mkcfgdesc(NULL, NULL);
dev->cfgdescsize = cdcacm_mkcfgdesc(NULL, NULL);
#endif
dev->minor = 0; /* The minor interface number */

10
drivers/usbdev/composite.c
View file

@ -838,9 +838,9 @@ FAR void *composite_initialize(uint8_t ndevices,
memcpy(&priv->device[i].compdesc, &pdevices[i],
sizeof(struct composite_devdesc_s));
ret = priv->device[i].compdesc.board_classobject(priv->device[i].compdesc.minor,
&priv->device[i].compdesc.devdesc,
&priv->device[i].dev);
ret = priv->device[i].compdesc.classobject(priv->device[i].compdesc.minor,
&priv->device[i].compdesc.devdesc,
&priv->device[i].dev);
if (ret < 0)
{
usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_CLASSOBJECT),
@ -912,7 +912,7 @@ void composite_uninitialize(FAR void *handle)
for (i = 0; i < priv->ndevices; i++)
{
priv->device[i].compdesc.board_uninitialize(priv->device[i].dev);
priv->device[i].compdesc.uninitialize(priv->device[i].dev);
}
/* Then unregister and destroy the composite class */
@ -926,7 +926,7 @@ void composite_uninitialize(FAR void *handle)
for (i = 0; i < priv->ndevices; i++)
{
priv->device[i].compdesc.board_uninitialize(priv->device[i].dev);
priv->device[i].compdesc.uninitialize(priv->device[i].dev);
}
/* Then free the composite driver state structure itself */

2
drivers/usbdev/composite_desc.c
View file

@ -252,7 +252,7 @@ int16_t composite_mkcfgdesc(FAR struct composite_dev_s *priv, FAR uint8_t *buf)
/* Copy all contained interface descriptors into the buffer too */
for (i = 0; i < priv->numDevices; i++)
for (i = 0; i < priv->ndevices; i++)
{
#ifdef CONFIG_USBDEV_DUALSPEED
len = priv->device[i].compdesc.mkconfdesc(buf,

16
drivers/usbdev/usbmsc.c
View file

@ -1881,15 +1881,15 @@ void usbmsc_get_composite_devdesc(FAR struct composite_devdesc_s *dev)
{
/* The callback functions for the CDC/ACM class */
dev->mkconfdesc = usbmsc_mkcfgdesc;
dev->mkstrdesc = usbmsc_mkstrdesc;
dev->board_classobject = 0;
dev->board_uninitialize = 0;
dev->mkconfdesc = usbmsc_mkcfgdesc;
dev->mkstrdesc = usbmsc_mkstrdesc;
dev->classobject = 0;
dev->uninitialize = 0;
dev->nconfigs = USBMSC_NCONFIGS; /* Number of configurations supported */
dev->configid = USBMSC_CONFIGID; /* The only supported configuration ID */
dev->cfgdescsize = SIZEOF_USBMSC_CFGDESC; /* The size of the config descriptor */
dev->minor = 0; /* The minor interface number */
dev->nconfigs = USBMSC_NCONFIGS; /* Number of configurations supported */
dev->configid = USBMSC_CONFIGID; /* The only supported configuration ID */
dev->cfgdescsize = SIZEOF_USBMSC_CFGDESC; /* The size of the config descriptor */
dev->minor = 0; /* The minor interface number */
/* Interfaces */