Fix some incomplete name changes
This commit is contained in:
Gregory Nutt
parent
0bb7af549a
commit
89f77cd91a
|
|
@ -188,7 +188,7 @@ static inline int boardctl_usbdevctrl(FAR struct boardioc_usbdev_ctrl_s *ctrl)
|
|||
|
||||
struct composite_devdesc_s dev[2];
|
||||
int ifnobase = 0;
|
||||
int strbase = COMPOSITE_NSTRIDS;
|
||||
int strbase = COMPOSITE_NSTRIDS;
|
||||
|
||||
DEBUGASSERT(ctrl->handle != NULL);
|
||||
|
||||
|
|
@ -208,23 +208,23 @@ static inline int boardctl_usbdevctrl(FAR struct boardioc_usbdev_ctrl_s *ctrl)
|
|||
|
||||
/* Interfaces */
|
||||
|
||||
dev[0].usb_dev_desc.ifnobase = ifnobase; /* Offset to Interface-IDs */
|
||||
dev[0].devdesc.ifnobase = ifnobase; /* Offset to Interface-IDs */
|
||||
dev[0].minor = CONFIG_SYSTEM_COMPOSITE_TTYUSB; /* The minor interface number */
|
||||
|
||||
/* Strings */
|
||||
|
||||
dev[0].usb_dev_desc.strbase = strbase; /* Offset to String Numbers */
|
||||
dev[0].devdesc.strbase = strbase; /* Offset to String Numbers */
|
||||
|
||||
/* Endpoints */
|
||||
|
||||
dev[0].usb_dev_desc.epno[CDCACM_EP_INTIN_IDX] = 3;
|
||||
dev[0].usb_dev_desc.epno[CDCACM_EP_BULKIN_IDX] = 4;
|
||||
dev[0].usb_dev_desc.epno[CDCACM_EP_BULKOUT_IDX] = 5;
|
||||
dev[0].devdesc.epno[CDCACM_EP_INTIN_IDX] = 3;
|
||||
dev[0].devdesc.epno[CDCACM_EP_BULKIN_IDX] = 4;
|
||||
dev[0].devdesc.epno[CDCACM_EP_BULKOUT_IDX] = 5;
|
||||
|
||||
/* Count up the base numbers */
|
||||
|
||||
ifnobase += dev[0].usb_dev_desc.ninterfaces;
|
||||
strbase += dev[0].usb_dev_desc.nstrings;
|
||||
ifnobase += dev[0].devdesc.ninterfaces;
|
||||
strbase += dev[0].devdesc.nstrings;
|
||||
|
||||
/* Configure the mass storage device device */
|
||||
/* Ask the usbmsc driver to fill in the constants we didn't
|
||||
|
|
@ -241,22 +241,22 @@ static inline int boardctl_usbdevctrl(FAR struct boardioc_usbdev_ctrl_s *ctrl)
|
|||
|
||||
/* Interfaces */
|
||||
|
||||
dev[1].usb_dev_desc.ifnobase = ifnobase; /* Offset to Interface-IDs */
|
||||
dev[1].devdesc.ifnobase = ifnobase; /* Offset to Interface-IDs */
|
||||
dev[1].minor = CONFIG_SYSTEM_COMPOSITE_DEVMINOR1; /* The minor interface number */
|
||||
|
||||
/* Strings */
|
||||
|
||||
dev[1].usb_dev_desc.strbase = strbase; /* Offset to String Numbers */
|
||||
dev[1].devdesc.strbase = strbase; /* Offset to String Numbers */
|
||||
|
||||
/* Endpoints */
|
||||
|
||||
dev[1].usb_dev_desc.epno[USBMSC_EP_BULKIN_IDX] = 1;
|
||||
dev[1].usb_dev_desc.epno[USBMSC_EP_BULKOUT_IDX] = 2;
|
||||
dev[1].devdesc.epno[USBMSC_EP_BULKIN_IDX] = 1;
|
||||
dev[1].devdesc.epno[USBMSC_EP_BULKOUT_IDX] = 2;
|
||||
|
||||
/* Count up the base numbers */
|
||||
|
||||
ifnobase += dev[1].usb_dev_desc.ninterfaces;
|
||||
strbase += dev[1].usb_dev_desc.nstrings;
|
||||
ifnobase += dev[1].devdesc.ninterfaces;
|
||||
strbase += dev[1].devdesc.nstrings;
|
||||
|
||||
*ctrl->handle = composite_initialize(2, dev);
|
||||
if (*ctrl->handle == NULL)
|
||||
|
|
|
|||
|
|
@ -255,11 +255,14 @@ int16_t composite_mkcfgdesc(FAR struct composite_dev_s *priv, FAR uint8_t *buf)
|
|||
for (i = 0; i < priv->numDevices; i++)
|
||||
{
|
||||
#ifdef CONFIG_USBDEV_DUALSPEED
|
||||
len = priv->device[i].comp_devdesc.mkconfdesc(buf, &priv->device[i].comp_devdesc.usb_dev_desc, speed, type);
|
||||
len = priv->device[i].compdesc.mkconfdesc(buf,
|
||||
&priv->device[i].compdesc.devdesc,
|
||||
speed, type);
|
||||
total += len;
|
||||
buf += len;
|
||||
#else
|
||||
len = priv->device[i].comp_devdesc.mkconfdesc(buf, &priv->device[i].comp_devdesc.usb_dev_desc);
|
||||
len = priv->device[i].compdesc.mkconfdesc(buf,
|
||||
&priv->device[i].compdesc.devdesc);
|
||||
total += len;
|
||||
buf += len;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ static int usbmsc_bind(FAR struct usbdevclass_driver_s *driver,
|
|||
|
||||
/* Pre-allocate the IN bulk endpoint */
|
||||
|
||||
priv->epbulkin = DEV_ALLOCEP(dev, USBMSC_MKEPBULKIN(&priv->usb_dev_desc),
|
||||
priv->epbulkin = DEV_ALLOCEP(dev, USBMSC_MKEPBULKIN(&priv->devdesc),
|
||||
true, USB_EP_ATTR_XFER_BULK);
|
||||
if (!priv->epbulkin)
|
||||
{
|
||||
|
|
@ -320,7 +320,7 @@ static int usbmsc_bind(FAR struct usbdevclass_driver_s *driver,
|
|||
|
||||
/* Pre-allocate the OUT bulk endpoint */
|
||||
|
||||
priv->epbulkout = DEV_ALLOCEP(dev, USBMSC_MKEPBULKOUT(&priv->usb_dev_desc),
|
||||
priv->epbulkout = DEV_ALLOCEP(dev, USBMSC_MKEPBULKOUT(&priv->devdesc),
|
||||
false, USB_EP_ATTR_XFER_BULK);
|
||||
if (!priv->epbulkout)
|
||||
{
|
||||
|
|
@ -981,7 +981,7 @@ int usbmsc_setconfig(FAR struct usbmsc_dev_s *priv, uint8_t config)
|
|||
|
||||
/* Configure the IN bulk endpoint */
|
||||
|
||||
usbmsc_copy_epdesc(USBMSC_EPBULKIN, &epdesc, &priv->usb_dev_desc,
|
||||
usbmsc_copy_epdesc(USBMSC_EPBULKIN, &epdesc, &priv->devdesc,
|
||||
hispeed);
|
||||
ret = EP_CONFIGURE(priv->epbulkin, &epdesc, false);
|
||||
if (ret < 0)
|
||||
|
|
@ -994,7 +994,7 @@ int usbmsc_setconfig(FAR struct usbmsc_dev_s *priv, uint8_t config)
|
|||
|
||||
/* Configure the OUT bulk endpoint */
|
||||
|
||||
usbmsc_copy_epdesc(USBMSC_EPBULKOUT, &epdesc, &priv->usb_dev_desc,
|
||||
usbmsc_copy_epdesc(USBMSC_EPBULKOUT, &epdesc, &priv->devdesc,
|
||||
hispeed);
|
||||
ret = EP_CONFIGURE(priv->epbulkout, &epdesc, true);
|
||||
if (ret < 0)
|
||||
|
|
@ -1719,7 +1719,7 @@ errout_with_lock:
|
|||
****************************************************************************/
|
||||
|
||||
#ifdef CONFIG_USBMSC_COMPOSITE
|
||||
int usbmsc_classobject(FAR void *handle, FAR struct usbdev_description_s *usb_dev_desc,
|
||||
int usbmsc_classobject(FAR void *handle, FAR struct usbdev_description_s *devdesc,
|
||||
FAR struct usbdevclass_driver_s **classdev)
|
||||
{
|
||||
FAR struct usbmsc_alloc_s *alloc = (FAR struct usbmsc_alloc_s *)handle;
|
||||
|
|
@ -1893,18 +1893,18 @@ void usbmsc_get_composite_devdesc(FAR struct composite_devdesc_s *dev)
|
|||
|
||||
/* Interfaces */
|
||||
|
||||
dev->usb_dev_desc.ninterfaces = USBMSC_NINTERFACES; /* Number of interfaces in the configuration */
|
||||
dev->usb_dev_desc.ifnobase = 0; /* Offset to Interface-IDs */
|
||||
dev->devdesc.ninterfaces = USBMSC_NINTERFACES; /* Number of interfaces in the configuration */
|
||||
dev->devdesc.ifnobase = 0; /* Offset to Interface-IDs */
|
||||
|
||||
/* Strings */
|
||||
|
||||
dev->usb_dev_desc.nstrings = USBMSC_NSTRIDS; /* Number of Strings */
|
||||
dev->usb_dev_desc.strbase = 0; /* Offset to String Numbers */
|
||||
dev->devdesc.nstrings = USBMSC_NSTRIDS; /* Number of Strings */
|
||||
dev->devdesc.strbase = 0; /* Offset to String Numbers */
|
||||
|
||||
/* Endpoints */
|
||||
|
||||
dev->usb_dev_desc.nendpoints = USBMSC_NENDPOINTS;
|
||||
dev->usb_dev_desc.epno[USBMSC_EP_BULKIN_IDX] = 0;
|
||||
dev->usb_dev_desc.epno[USBMSC_EP_BULKOUT_IDX] = 0;
|
||||
dev->devdesc.nendpoints = USBMSC_NENDPOINTS;
|
||||
dev->devdesc.epno[USBMSC_EP_BULKIN_IDX] = 0;
|
||||
dev->devdesc.epno[USBMSC_EP_BULKOUT_IDX] = 0;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -113,7 +113,7 @@ extern "C"
|
|||
|
||||
#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
|
||||
struct usbdevclass_driver_s;
|
||||
int board_mscclassobject(int minor, FAR struct usbdev_description_s *usb_dev_desc,
|
||||
int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc,
|
||||
FAR struct usbdevclass_driver_s **classdev);
|
||||
#endif
|
||||
|
||||
|
|
@ -239,7 +239,7 @@ int usbmsc_exportluns(FAR void *handle);
|
|||
|
||||
#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
|
||||
struct usbdevclass_driver_s;
|
||||
int usbmsc_classobject(FAR void *handle, FAR struct usbdev_description_s *usb_dev_desc,
|
||||
int usbmsc_classobject(FAR void *handle, FAR struct usbdev_description_s *devdesc,
|
||||
FAR struct usbdevclass_driver_s **classdev);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue