Skip to content

Commit 1dd38fe

Browse files
yangsong8-a1Alan Carvalho de Assis
yangsong8-a1
authored and
Alan Carvalho de Assis
committed
usbdev: unify the parameter of mkconfdesc function
Signed-off-by: yangsong8 <[email protected]>
1 parent 07aa8a5 commit 1dd38fe

File tree

15 files changed

+6
-195
lines changed

15 files changed

+6
-195
lines changed

‎drivers/usbdev/adb.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -285,28 +285,19 @@ static const FAR struct usbdev_epinfo_s *g_adb_epinfos[USBADB_NUM_EPS] =
285285
*
286286
****************************************************************************/
287287

288-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
289288
static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
290289
FAR struct usbdev_devinfo_s *devinfo,
291290
uint8_t speed, uint8_t type)
292-
#else
293-
static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
294-
FAR struct usbdev_devinfo_s *devinfo)
295-
#endif
296291
{
297292
FAR struct usb_epdesc_s *epdesc;
298293
FAR struct usb_ifdesc_s *dest;
299294

300295
/* Check for switches between high and full speed */
301296

302-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
303297
if (type == USB_DESC_TYPE_OTHERSPEEDCONFIG && speed < USB_SPEED_SUPER)
304298
{
305299
speed = speed == USB_SPEED_HIGH ? USB_SPEED_FULL : USB_SPEED_HIGH;
306300
}
307-
#else
308-
uint8_t speed = USB_SPEED_FULL;
309-
#endif
310301

311302
dest = (FAR struct usb_ifdesc_s *)buf;
312303
epdesc = (FAR struct usb_epdesc_s *)(buf + sizeof(g_adb_ifdesc));

‎drivers/usbdev/cdcacm.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,12 +1631,8 @@ static int cdcacm_setup(FAR struct usbdevclass_driver_s *driver,
16311631
#ifndef CONFIG_CDCACM_COMPOSITE
16321632
case USB_DESC_TYPE_CONFIG:
16331633
{
1634-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
16351634
ret = cdcacm_mkcfgdesc(ctrlreq->buf, &priv->devinfo,
16361635
dev->speed, ctrl->value[1]);
1637-
#else
1638-
ret = cdcacm_mkcfgdesc(ctrlreq->buf, &priv->devinfo);
1639-
#endif
16401636
}
16411637
break;
16421638
#endif
@@ -3107,11 +3103,7 @@ void cdcacm_get_composite_devdesc(struct composite_devdesc_s *dev)
31073103

31083104
/* Let the construction function calculate the size of config descriptor */
31093105

3110-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
31113106
dev->cfgdescsize = cdcacm_mkcfgdesc(NULL, NULL, USB_SPEED_UNKNOWN, 0);
3112-
#else
3113-
dev->cfgdescsize = cdcacm_mkcfgdesc(NULL, NULL);
3114-
#endif
31153107

31163108
/* Board-specific logic must provide the device minor */
31173109

‎drivers/usbdev/cdcacm.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,9 @@ int cdcacm_copy_epdesc(enum cdcacm_epdesc_e epid,
246246
*
247247
****************************************************************************/
248248

249-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
250249
int16_t cdcacm_mkcfgdesc(FAR uint8_t *buf,
251250
FAR struct usbdev_devinfo_s *devinfo,
252251
uint8_t speed, uint8_t type);
253-
#else
254-
int16_t cdcacm_mkcfgdesc(FAR uint8_t *buf,
255-
FAR struct usbdev_devinfo_s *devinfo);
256-
#endif
257252

258253
/****************************************************************************
259254
* Name: cdcacm_getqualdesc

‎drivers/usbdev/cdcacm_desc.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -364,25 +364,16 @@ int cdcacm_copy_epdesc(enum cdcacm_epdesc_e epid,
364364
*
365365
****************************************************************************/
366366

367-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
368367
int16_t cdcacm_mkcfgdesc(FAR uint8_t *buf,
369368
FAR struct usbdev_devinfo_s *devinfo,
370369
uint8_t speed, uint8_t type)
371-
#else
372-
int16_t cdcacm_mkcfgdesc(FAR uint8_t *buf,
373-
FAR struct usbdev_devinfo_s *devinfo)
374-
#endif
375370
{
376371
int length = 0;
377372

378-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
379373
if (type == USB_DESC_TYPE_OTHERSPEEDCONFIG && speed < USB_SPEED_SUPER)
380374
{
381375
speed = speed == USB_SPEED_HIGH ? USB_SPEED_FULL : USB_SPEED_HIGH;
382376
}
383-
#else
384-
uint8_t speed = USB_SPEED_FULL;
385-
#endif
386377

387378
/* Fill in all descriptors directly to the buf */
388379

@@ -404,18 +395,10 @@ int16_t cdcacm_mkcfgdesc(FAR uint8_t *buf,
404395

405396
/* Let's calculate the size... */
406397

407-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
408398
int16_t size = cdcacm_mkcfgdesc(NULL, NULL, speed, type);
409-
#else
410-
int16_t size = cdcacm_mkcfgdesc(NULL, NULL);
411-
#endif
412399

413400
dest->len = USB_SIZEOF_CFGDESC; /* Descriptor length */
414-
#ifdef CONFIG_USBDEV_DUALSPEED
415401
dest->type = type; /* Descriptor type */
416-
#else
417-
dest->type = USB_DESC_TYPE_CONFIG; /* Descriptor type */
418-
#endif
419402
dest->totallen[0] = LSBYTE(size); /* LS Total length */
420403
dest->totallen[1] = MSBYTE(size); /* MS Total length */
421404
dest->ninterfaces = CDCACM_NINTERFACES; /* Number of interfaces */

‎drivers/usbdev/cdcecm.c

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,35 +1221,26 @@ static void cdcecm_mkepdesc(int epidx,
12211221
*
12221222
****************************************************************************/
12231223

1224-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
12251224
static int16_t cdcecm_mkcfgdesc(FAR uint8_t *desc,
12261225
FAR struct usbdev_devinfo_s *devinfo,
12271226
uint8_t speed, uint8_t type)
1228-
#else
1229-
static int16_t cdcecm_mkcfgdesc(FAR uint8_t *desc,
1230-
FAR struct usbdev_devinfo_s *devinfo)
1231-
#endif
12321227
{
12331228
FAR struct usb_cfgdesc_s *cfgdesc = NULL;
12341229
int16_t len = 0;
12351230

12361231
/* Check for switches between high and full speed */
12371232

1238-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
12391233
if (type == USB_DESC_TYPE_OTHERSPEEDCONFIG && speed < USB_SPEED_SUPER)
12401234
{
12411235
speed = speed == USB_SPEED_HIGH ? USB_SPEED_FULL : USB_SPEED_HIGH;
12421236
}
1243-
#else
1244-
uint8_t speed = USB_SPEED_FULL;
1245-
#endif
12461237

12471238
#ifndef CONFIG_CDCECM_COMPOSITE
12481239
if (desc)
12491240
{
12501241
cfgdesc = (FAR struct usb_cfgdesc_s *)desc;
12511242
cfgdesc->len = USB_SIZEOF_CFGDESC;
1252-
cfgdesc->type = USB_DESC_TYPE_CONFIG;
1243+
cfgdesc->type = type;
12531244
cfgdesc->ninterfaces = CDCECM_NINTERFACES;
12541245
cfgdesc->cfgvalue = CDCECM_CONFIGID;
12551246
cfgdesc->icfg = devinfo->strbase + CDCECM_CONFIGSTRID;
@@ -1484,12 +1475,8 @@ static int cdcecm_getdescriptor(FAR struct cdcecm_driver_s *self,
14841475
#endif /* CONFIG_USBDEV_DUALSPEED */
14851476
case USB_DESC_TYPE_CONFIG:
14861477
{
1487-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
14881478
return cdcecm_mkcfgdesc((FAR uint8_t *)desc, &self->devinfo,
14891479
self->usbdev.speed, type);
1490-
#else
1491-
return cdcecm_mkcfgdesc((FAR uint8_t *)desc, &self->devinfo);
1492-
#endif
14931480
}
14941481
break;
14951482

@@ -2018,11 +2005,7 @@ void cdcecm_get_composite_devdesc(struct composite_devdesc_s *dev)
20182005

20192006
/* Let the construction function calculate the size of config descriptor */
20202007

2021-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
20222008
dev->cfgdescsize = cdcecm_mkcfgdesc(NULL, NULL, USB_SPEED_UNKNOWN, 0);
2023-
#else
2024-
dev->cfgdescsize = cdcecm_mkcfgdesc(NULL, NULL);
2025-
#endif
20262009

20272010
/* Board-specific logic must provide the device minor */
20282011

‎drivers/usbdev/cdcncm.c

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,36 +1992,26 @@ static void cdcncm_mkepdesc(int epidx, FAR struct usb_epdesc_s *epdesc,
19921992
*
19931993
****************************************************************************/
19941994

1995-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
19961995
static int16_t cdcnm_mkcfgdesc(FAR uint8_t *desc,
19971996
FAR struct usbdev_devinfo_s *devinfo,
19981997
uint8_t speed, uint8_t type, bool isncm)
1999-
#else
2000-
static int16_t cdcnm_mkcfgdesc(FAR uint8_t *desc,
2001-
FAR struct usbdev_devinfo_s *devinfo,
2002-
bool isncm)
2003-
#endif
20041998
{
20051999
FAR struct usb_cfgdesc_s *cfgdesc = NULL;
20062000
int16_t len = 0;
20072001

20082002
/* Check for switches between high and full speed */
20092003

2010-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
20112004
if (type == USB_DESC_TYPE_OTHERSPEEDCONFIG && speed < USB_SPEED_SUPER)
20122005
{
20132006
speed = speed == USB_SPEED_HIGH ? USB_SPEED_FULL : USB_SPEED_HIGH;
20142007
}
2015-
#else
2016-
uint8_t speed = USB_SPEED_FULL;
2017-
#endif
20182008

20192009
#ifndef CONFIG_CDCNCM_COMPOSITE
20202010
if (desc)
20212011
{
20222012
cfgdesc = (FAR struct usb_cfgdesc_s *)desc;
20232013
cfgdesc->len = USB_SIZEOF_CFGDESC;
2024-
cfgdesc->type = USB_DESC_TYPE_CONFIG;
2014+
cfgdesc->type = type;
20252015
cfgdesc->ninterfaces = CDCECM_NINTERFACES;
20262016
cfgdesc->cfgvalue = CDCECM_CONFIGID;
20272017
cfgdesc->icfg = devinfo->strbase + CDCECM_CONFIGSTRID;
@@ -2272,7 +2262,6 @@ static int16_t cdcnm_mkcfgdesc(FAR uint8_t *desc,
22722262
*
22732263
****************************************************************************/
22742264

2275-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
22762265
static int16_t cdcncm_mkcfgdesc(FAR uint8_t *desc,
22772266
FAR struct usbdev_devinfo_s *devinfo,
22782267
uint8_t speed, uint8_t type)
@@ -2288,21 +2277,6 @@ static int16_t cdcmbim_mkcfgdesc(FAR uint8_t *desc,
22882277
return cdcnm_mkcfgdesc(desc, devinfo, speed, type, false);
22892278
}
22902279
# endif
2291-
#else
2292-
static int16_t cdcncm_mkcfgdesc(FAR uint8_t *desc,
2293-
FAR struct usbdev_devinfo_s *devinfo)
2294-
{
2295-
return cdcnm_mkcfgdesc(desc, devinfo, true);
2296-
}
2297-
2298-
# ifdef CONFIG_NET_CDCMBIM
2299-
static int16_t cdcmbim_mkcfgdesc(FAR uint8_t *desc,
2300-
FAR struct usbdev_devinfo_s *devinfo)
2301-
{
2302-
return cdcnm_mkcfgdesc(desc, devinfo, false);
2303-
}
2304-
# endif
2305-
#endif
23062280

23072281
/****************************************************************************
23082282
* Name: cdcncm_getdescriptor
@@ -2351,12 +2325,8 @@ static int cdcncm_getdescriptor(FAR struct cdcncm_driver_s *self,
23512325
case USB_DESC_TYPE_OTHERSPEEDCONFIG:
23522326
#endif /* CONFIG_USBDEV_DUALSPEED */
23532327
case USB_DESC_TYPE_CONFIG:
2354-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
23552328
return cdcncm_mkcfgdesc((FAR uint8_t *)desc, &self->devinfo,
23562329
self->usbdev.speed, type);
2357-
#else
2358-
return cdcncm_mkcfgdesc((FAR uint8_t *)desc, &self->devinfo);
2359-
#endif
23602330

23612331
case USB_DESC_TYPE_STRING:
23622332
return cdcncm_mkstrdesc(index, (FAR struct usb_strdesc_s *)desc);
@@ -3082,14 +3052,9 @@ static void cdcnm_get_composite_devdesc(FAR struct composite_devdesc_s *dev,
30823052

30833053
/* Let the construction function calculate the size of config descriptor */
30843054

3085-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
30863055
dev->cfgdescsize = isncm ?
30873056
cdcncm_mkcfgdesc(NULL, NULL, USB_SPEED_UNKNOWN, 0) :
30883057
cdcmbim_mkcfgdesc(NULL, NULL, USB_SPEED_UNKNOWN, 0);
3089-
#else
3090-
dev->cfgdescsize = isncm ? cdcncm_mkcfgdesc(NULL, NULL) :
3091-
cdcmbim_mkcfgdesc(NULL, NULL);
3092-
#endif
30933058

30943059
/* Board-specific logic must provide the device minor */
30953060

‎drivers/usbdev/composite.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -277,14 +277,9 @@ static int composite_msftdescriptor(FAR struct composite_dev_s *priv,
277277
*
278278
****************************************************************************/
279279

280-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
281280
static int16_t composite_mkcfgdesc(FAR struct usbdevclass_driver_s *driver,
282281
FAR uint8_t *buf,
283282
uint8_t speed, uint8_t type)
284-
#else
285-
static int16_t composite_mkcfgdesc(FAR struct usbdevclass_driver_s *driver,
286-
FAR uint8_t *buf)
287-
#endif
288283
{
289284
FAR struct composite_dev_s *priv =
290285
((FAR struct composite_driver_s *)driver)->dev;
@@ -299,6 +294,7 @@ static int16_t composite_mkcfgdesc(FAR struct usbdevclass_driver_s *driver,
299294

300295
cfgdesc = (FAR struct usb_cfgdesc_s *)buf;
301296
cfgdesc->ninterfaces = priv->ninterfaces;
297+
cfgdesc->type = type;
302298

303299
/* Increment the size and buf to point right behind the information
304300
* filled in
@@ -313,18 +309,11 @@ static int16_t composite_mkcfgdesc(FAR struct usbdevclass_driver_s *driver,
313309
{
314310
FAR struct composite_devobj_s *devobj = &priv->device[i];
315311

316-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
317312
len = devobj->compdesc.mkconfdesc(buf,
318313
&devobj->compdesc.devinfo,
319314
speed, type);
320315
total += len;
321316
buf += len;
322-
#else
323-
len = devobj->compdesc.mkconfdesc(buf,
324-
&devobj->compdesc.devinfo);
325-
total += len;
326-
buf += len;
327-
#endif
328317
}
329318

330319
cfgdesc->totallen[0] = LSBYTE(total);
@@ -677,12 +666,8 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
677666

678667
case USB_DESC_TYPE_CONFIG:
679668
{
680-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
681669
ret = composite_mkcfgdesc(driver, ctrlreq->buf,
682670
dev->speed, ctrl->value[1]);
683-
#else
684-
ret = composite_mkcfgdesc(driver, ctrlreq->buf);
685-
#endif
686671
}
687672
break;
688673

‎drivers/usbdev/dfu.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -181,21 +181,14 @@ static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep,
181181
{
182182
}
183183

184-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
185184
static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
186185
FAR struct usbdev_devinfo_s *devinfo,
187186
uint8_t speed, uint8_t type)
188-
#else
189-
static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
190-
FAR struct usbdev_devinfo_s *devinfo)
191-
#endif
192187
{
193188
FAR struct dfu_cfgdesc_s *dest = (FAR struct dfu_cfgdesc_s *)buf;
194189

195-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
196190
UNUSED(speed);
197191
UNUSED(type);
198-
#endif
199192

200193
*dest = g_dfu_cfgdesc;
201194
dest->ifdesc.ifno += devinfo->ifnobase;
@@ -319,12 +312,8 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
319312
{
320313
if (ctrl->value[1] == USB_DESC_TYPE_CONFIG)
321314
{
322-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
323315
ret = usbclass_mkcfgdesc(ctrlreq->buf, &priv->devinfo,
324316
dev->speed, ctrl->value[1]);
325-
#else
326-
ret = usbclass_mkcfgdesc(ctrlreq->buf, &priv->devinfo);
327-
#endif
328317
}
329318
else if (ctrl->value[1] == USB_DESC_TYPE_STRING)
330319
{

‎drivers/usbdev/mtp.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -296,28 +296,19 @@ static const FAR struct usbdev_epinfo_s *g_mtp_epinfos[USBMTP_NUM_EPS] =
296296
*
297297
****************************************************************************/
298298

299-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
300299
static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
301300
FAR struct usbdev_devinfo_s *devinfo,
302301
uint8_t speed, uint8_t type)
303-
#else
304-
static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
305-
FAR struct usbdev_devinfo_s *devinfo)
306-
#endif
307302
{
308303
FAR struct usb_epdesc_s *epdesc;
309304
FAR struct usb_ifdesc_s *dest;
310305

311306
/* Check for switches between high and full speed */
312307

313-
#if defined(CONFIG_USBDEV_DUALSPEED) || defined(CONFIG_USBDEV_SUPERSPEED)
314308
if (type == USB_DESC_TYPE_OTHERSPEEDCONFIG && speed < USB_SPEED_SUPER)
315309
{
316310
speed = speed == USB_SPEED_HIGH ? USB_SPEED_FULL : USB_SPEED_HIGH;
317311
}
318-
#else
319-
uint8_t speed = USB_SPEED_FULL;
320-
#endif
321312

322313
dest = (FAR struct usb_ifdesc_s *)buf;
323314
epdesc = (FAR struct usb_epdesc_s *)(buf + sizeof(g_mtp_ifdesc));

0 commit comments

Comments
 (0)