Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 17:48:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

rndis: interface association descriptor should depend on CONFIG_COMPOSITE_IAD

Browse Source
This commit is contained in:
raiden00pl
2023-03-21 21:18:35 +01:00
committed by Alan Carvalho de Assis
parent 10f1d3e76e
commit cb05700acf
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usbdev/rndis.c
+9 -3
View File
@@ -192,8 +192,9 @@ struct rndis_cfgdesc_s
{ {
#ifndef CONFIG_RNDIS_COMPOSITE #ifndef CONFIG_RNDIS_COMPOSITE
struct usb_cfgdesc_s cfgdesc; /* Configuration descriptor */ struct usb_cfgdesc_s cfgdesc; /* Configuration descriptor */
#endif #elif defined(CONFIG_COMPOSITE_IAD)
struct usb_iaddesc_s assoc_desc; /* Interface association descriptor */ struct usb_iaddesc_s assoc_desc; /* Interface association descriptor */
#endif
struct usb_ifdesc_s comm_ifdesc; /* Communication interface descriptor */ struct usb_ifdesc_s comm_ifdesc; /* Communication interface descriptor */
struct usb_epdesc_s epintindesc; /* Interrupt endpoint descriptor */ struct usb_epdesc_s epintindesc; /* Interrupt endpoint descriptor */
struct usb_ifdesc_s data_ifdesc; /* Data interface descriptor */ struct usb_ifdesc_s data_ifdesc; /* Data interface descriptor */
@@ -299,7 +300,7 @@ const static struct rndis_cfgdesc_s g_rndis_cfgdesc =
.attr = USB_CONFIG_ATTR_ONE | USB_CONFIG_ATTR_SELFPOWER, .attr = USB_CONFIG_ATTR_ONE | USB_CONFIG_ATTR_SELFPOWER,
.mxpower = (CONFIG_USBDEV_MAXPOWER + 1) / 2 .mxpower = (CONFIG_USBDEV_MAXPOWER + 1) / 2
}, },
#endif #elif defined(CONFIG_COMPOSITE_IAD)
{ {
.len = USB_SIZEOF_IADDESC, .len = USB_SIZEOF_IADDESC,
.type = USB_DESC_TYPE_INTERFACEASSOCIATION, .type = USB_DESC_TYPE_INTERFACEASSOCIATION,
@@ -310,6 +311,7 @@ const static struct rndis_cfgdesc_s g_rndis_cfgdesc =
.protocol = 0x01, .protocol = 0x01,
.ifunction = 0 .ifunction = 0
}, },
#endif
{ {
.len = USB_SIZEOF_IFDESC, .len = USB_SIZEOF_IFDESC,
.type = USB_DESC_TYPE_INTERFACE, .type = USB_DESC_TYPE_INTERFACE,
@@ -2075,9 +2077,13 @@ static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
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
*/
# ifdef CONFIG_COMPOSITE_IAD
dest->assoc_desc.firstif += devinfo->ifnobase; dest->assoc_desc.firstif += devinfo->ifnobase;
# endif
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