First round of changes from debug of USB composite device (still has problems)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4342 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 39 insertions, 19 deletions

diff --git a/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig
index 0680b53e3..46fa44814 100755
--- a/nuttx/configs/stm3210e-eval/composite/defconfig
+++ b/nuttx/configs/stm3210e-eval/composite/defconfig
@@ -646,8 +646,6 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # CONFIG_USBDEV
 #   Enables USB device support
-# CONFIG_USBDEV_COMPOSITE
-#   Enables USB composite device support
 # CONFIG_USBDEV_ISOCHRONOUS
 #   Build in extra support for isochronous endpoints
 # CONFIG_USBDEV_DUALSPEED
@@ -663,7 +661,6 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #   Number of trace entries to remember
 #
 CONFIG_USBDEV=y
-CONFIG_USBDEV_COMPOSITE=y
 CONFIG_USBDEV_ISOCHRONOUS=n
 CONFIG_USBDEV_DUALSPEED=n
 CONFIG_USBDEV_SELFPOWERED=y
@@ -744,7 +741,7 @@ CONFIG_USBMSC=y
 CONFIG_USBMSC_COMPOSITE=y
 CONFIG_USBMSC_IFNOBASE=2
 CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBMSC_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=4
 CONFIG_USBMSC_EPBULKIN=5
 CONFIG_USBMSC_NRDREQS=2
 CONFIG_USBMSC_NWRREQS=2
@@ -818,13 +815,13 @@ CONFIG_CDCACM=y
 CONFIG_CDCACM_COMPOSITE=y
 CONFIG_CDCACM_IFNOBASE=0
 #CONFIG_CDCACM_EP0MAXPACKET
-#CONFIG_CDCACM_EPINTIN
+CONFIG_CDCACM_EPINTIN=1
 #CONFIG_CDCACM_EPINTIN_FSSIZE
 #CONFIG_CDCACM_EPINTIN_HSSIZE
-#CONFIG_CDCACM_EPBULKOUT
+CONFIG_CDCACM_EPBULKOUT=3
 #CONFIG_CDCACM_EPBULKOUT_FSSIZE
 #CONFIG_CDCACM_EPBULKOUT_HSSIZE
-#CONFIG_CDCACM_EPBULKIN
+CONFIG_CDCACM_EPBULKIN=2
 #CONFIG_CDCACM_EPBULKIN_FSSIZE
 #CONFIG_CDCACM_EPBULKIN_HSSIZE
 #CONFIG_CDCACM_NWRREQS
@@ -837,6 +834,40 @@ CONFIG_CDCACM_IFNOBASE=0
 #CONFIG_CDCACM_TXBUFSIZE
 
 #
+# USB Composite Device Configuration
+#
+# CONFIG_USBDEV_COMPOSITE
+#   Enables USB composite device support
+# CONFIG_COMPOSITE_IAD
+#   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
+#   Max packet size for endpoint 0
+# CONFIG_COMPOSITE_VENDORID and CONFIG_COMPOSITE_VENDORSTR
+#   The vendor ID code/string
+# CONFIG_COMPOSITE_PRODUCTID and CONFIG_COMPOSITE_PRODUCTSTR
+#   The product ID code/string
+# CONFIG_COMPOSITE_SERIALSTR
+#   Device serial number string
+# CONFIG_COMPOSITE_CONFIGSTR
+#   Configuration string
+# CONFIG_COMPOSITE_VERSIONNO
+#   The device version number
+#
+CONFIG_USBDEV_COMPOSITE=y
+CONFIG_COMPOSITE_IAD=y
+#CONFIG_COMPOSITE_EP0MAXPACKET
+CONFIG_COMPOSITE_VENDORID=0x03eb
+CONFIG_COMPOSITE_PRODUCTID=0x2022
+CONFIG_COMPOSITE_VENDORSTR="NuttX"
+CONFIG_COMPOSITE_PRODUCTSTR="Composite Device"
+CONFIG_COMPOSITE_SERIALSTR="12345"
+CONFIG_COMPOSITE_CONFIGSTR="examples/composite"
+CONFIG_COMPOSITE_VERSIONNO=0x0101
+
+#
 # Settings for examples/uip
 #
 CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2)
@@ -1015,12 +1046,6 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 #
 # CONFIG_EXAMPLES_COMPOSITE_DEBUGMM
 #    Enables some debug tests to check for memory usage and memory leaks.
-# CONFIG_COMPOSITE_VENDORID and CONFIG_COMPOSITE_PRODUCTID
-#   The vendor ID code/string
-# CONFIG_USBMSC_PRODUCTID and CONFIG_USBMSC_PRODUCTSTR
-#   The product ID code/string
-# CONFIG_COMPOSITE_VERSIONNO
-#   The device version number
 #
 # CONFIG_EXAMPLES_COMPOSITE_NLUNS
 #    Defines the number of logical units (LUNs) exported by the USB storage
@@ -1062,16 +1087,11 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 #    Show interrupt-related events.
 #
 CONFIG_EXAMPLES_COMPOSITE_DEBUGMM=n
-CONFIG_COMPOSITE_VENDORID=0x03eb
-CONFIG_COMPOSITE_PRODUCTID=0x2022
-CONFIG_COMPOSITE_VENDORSTR="NuttX"
-CONFIG_COMPOSITE_PRODUCTSTR="Composite Device"
-CONFIG_COMPOSITE_VERSIONNO
 CONFIG_EXAMPLES_COMPOSITE_NLUNS=1
 CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1=0
 CONFIG_EXAMPLES_COMPOSITE_DEVPATH1="/dev/mmcsd0"
 CONFIG_EXAMPLES_COMPOSITE_TTYUSB=0
-CCONFIG_EXAMPLES_COMPOSITE_SERDEV="/dev/ttyUSB0"
+CONFIG_EXAMPLES_COMPOSITE_SERDEV="/dev/ttyUSB0"
 CONFIG_EXAMPLES_COMPOSITE_BUFSIZE=256
 CONFIG_EXAMPLES_COMPOSITE_TRACEINIT=n
 CONFIG_EXAMPLES_COMPOSITE_TRACECLASS=n