summaryrefslogtreecommitdiff
path: root/nuttx/drivers
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-09-25 18:50:14 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-09-25 18:50:14 -0600
commit97ef769f2d180b5809c2f9513cf4bb66de1f2595 (patch)
treeae801e098a52399edee7d6a322c486a92b5fd499 /nuttx/drivers
parent54cd9689cccad1949c067f40d500491851799221 (diff)
downloadpx4-nuttx-97ef769f2d180b5809c2f9513cf4bb66de1f2595.tar.gz
px4-nuttx-97ef769f2d180b5809c2f9513cf4bb66de1f2595.tar.bz2
px4-nuttx-97ef769f2d180b5809c2f9513cf4bb66de1f2595.zip
Mov apps/examples/composite to apps/system/composite; convert configs/stm3210e-eval/composite to use kconfig-frontend tools -- untested
Diffstat (limited to 'nuttx/drivers')
-rw-r--r--nuttx/drivers/usbdev/Kconfig20
1 files changed, 10 insertions, 10 deletions
diff --git a/nuttx/drivers/usbdev/Kconfig b/nuttx/drivers/usbdev/Kconfig
index 53fc10a49..c3b1b0a6e 100644
--- a/nuttx/drivers/usbdev/Kconfig
+++ b/nuttx/drivers/usbdev/Kconfig
@@ -110,14 +110,14 @@ config USBDEV_COMPOSITE
if USBDEV_COMPOSITE
-#config COMPOSITE_IAD
-# bool ""
-# default n
-# ---help---
-# If one of the members of the composite has multiple interfaces
-# (such as CDC/ACM), then an Interface Association Descriptor (IAD)
-# will be necessary. Default: IAD will be used automatically if
-# needed. It should not be necessary to set this.
+config COMPOSITE_IAD
+ bool "Use Interface Associate Descriptor (IAD)"
+ default n
+ ---help---
+ If one of the members of the composite has multiple interfaces
+ (such as CDC/ACM), then an Interface Association Descriptor (IAD)
+ will be necessary. Default: IAD will be used automatically if
+ needed. It should not be necessary to set this.
config COMPOSITE_EP0MAXPACKET
int "Max packet size for endpoint 0"
@@ -158,8 +158,8 @@ config COMPOSITE_CONFIGSTR
Configuration string
config COMPOSITE_VERSIONNO
- string "Composite version number"
- default ""
+ hex "Composite version number"
+ default 0x1010
---help---
Interface version number.
endif