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

rndis: refactor usbdev_rndis_get_composite_devdesc to make it more like in other composite drivers

Browse Source
This commit is contained in:
raiden00pl 2023-03-21 10:16:59 +01:00 committed by Alan Carvalho de Assis
parent da47c468b8
commit 9b70e010dc
1 changed files with 55 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
drivers/usbdev/rndis.c
View File

@ -2056,27 +2056,31 @@ static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
*/ */
totallen = sizeof(g_rndis_cfgdesc); totallen = sizeof(g_rndis_cfgdesc);
memcpy(dest, &g_rndis_cfgdesc, totallen);
usbclass_copy_epdesc(RNDIS_EP_INTIN_IDX, &dest->epintindesc, if (dest != NULL)
devinfo, hispeed); {
usbclass_copy_epdesc(RNDIS_EP_BULKIN_IDX, &dest->epbulkindesc, memcpy(dest, &g_rndis_cfgdesc, totallen);
devinfo, hispeed);
usbclass_copy_epdesc(RNDIS_EP_BULKOUT_IDX, &dest->epbulkoutdesc, usbclass_copy_epdesc(RNDIS_EP_INTIN_IDX, &dest->epintindesc,
devinfo, hispeed); devinfo, hispeed);
usbclass_copy_epdesc(RNDIS_EP_BULKIN_IDX, &dest->epbulkindesc,
devinfo, hispeed);
usbclass_copy_epdesc(RNDIS_EP_BULKOUT_IDX, &dest->epbulkoutdesc,
devinfo, hispeed);
#ifndef CONFIG_RNDIS_COMPOSITE #ifndef CONFIG_RNDIS_COMPOSITE
/* For a stand-alone device, just fill in the total length */ /* For a stand-alone device, just fill in the total length */
dest->cfgdesc.totallen[0] = LSBYTE(totallen); dest->cfgdesc.totallen[0] = LSBYTE(totallen);
dest->cfgdesc.totallen[1] = MSBYTE(totallen); dest->cfgdesc.totallen[1] = MSBYTE(totallen);
#else #else
/* For composite device, apply possible offset to the interface numbers */ /* For composite device, apply possible offset to the interface numbers */
dest->assoc_desc.firstif += devinfo->ifnobase; dest->assoc_desc.firstif += devinfo->ifnobase;
dest->comm_ifdesc.ifno += devinfo->ifnobase; dest->comm_ifdesc.ifno += devinfo->ifnobase;
dest->data_ifdesc.ifno += devinfo->ifnobase; dest->data_ifdesc.ifno += devinfo->ifnobase;
#endif #endif
}
return totallen; return totallen;
} }
@ -3016,21 +3020,49 @@ void usbdev_rndis_get_composite_devdesc(struct composite_devdesc_s *dev)
{ {
memset(dev, 0, sizeof(struct composite_devdesc_s)); memset(dev, 0, sizeof(struct composite_devdesc_s));
/* The callback functions for the RNDIS class.
*
* classobject() and uninitialize() must be provided by board-specific
* logic
*/
dev->mkconfdesc = usbclass_mkcfgdesc; dev->mkconfdesc = usbclass_mkcfgdesc;
dev->mkstrdesc = usbclass_mkstrdesc; dev->mkstrdesc = usbclass_mkstrdesc;
dev->classobject = usbclass_classobject; dev->classobject = usbclass_classobject;
dev->uninitialize = usbclass_uninitialize; dev->uninitialize = usbclass_uninitialize;
dev->nconfigs = RNDIS_NCONFIGS;
dev->configid = RNDIS_CONFIGID; dev->nconfigs = RNDIS_NCONFIGS; /* Number of configurations supported */
dev->cfgdescsize = sizeof(g_rndis_cfgdesc); dev->configid = RNDIS_CONFIGID; /* The only supported configuration ID */
/* Let the construction function calculate the size of config descriptor */
#ifdef CONFIG_USBDEV_DUALSPEED
dev->cfgdescsize = usbclass_mkcfgdesc(NULL, NULL, USB_SPEED_UNKNOWN, 0);
#else
dev->cfgdescsize = usbclass_mkcfgdesc(NULL, NULL);
#endif
/* Board-specific logic must provide the device minor */
/* Interfaces.
*
* ifnobase must be provided by board-specific logic
*/
dev->devinfo.ninterfaces = RNDIS_NINTERFACES; dev->devinfo.ninterfaces = RNDIS_NINTERFACES;
/* Strings.
*
* strbase must be provided by board-specific logic
*/
dev->devinfo.nstrings = 0; dev->devinfo.nstrings = 0;
/* Endpoints.
*
* Endpoint numbers must be provided by board-specific logic.
*/
dev->devinfo.nendpoints = RNDIS_NUM_EPS; dev->devinfo.nendpoints = RNDIS_NUM_EPS;
/* Default endpoint indexes, board-specific logic can override these */
dev->devinfo.epno[RNDIS_EP_INTIN_IDX] = USB_EPNO(RNDIS_EPINTIN_ADDR);
dev->devinfo.epno[RNDIS_EP_BULKIN_IDX] = USB_EPNO(RNDIS_EPBULKIN_ADDR);
dev->devinfo.epno[RNDIS_EP_BULKOUT_IDX] = USB_EPNO(RNDIS_EPBULKOUT_ADDR);
} }
#endif #endif