From 3085821527a3ea8fd089d2ea5ee24053303b800b Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 27 Jan 2012 16:25:57 +0000 Subject: [PATCH] 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 --- ChangeLog.txt | 1 + examples/README.txt | 22 ++++++++++++++++------ examples/composite/composite_main.c | 4 ++-- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 486639fb8..77b92d12c 100755 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -163,3 +163,4 @@ * apps/nshlib/nsh_serial.c and nsh_usbdev.c: If NuttX is configured to use a USB serial console, then NSH needs to wait until the USB console is connected and available. + * apps/examples/composite: Add a test of the USB composite device. diff --git a/examples/README.txt b/examples/README.txt index 136e0b57d..d9f30f191 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -118,12 +118,22 @@ examples/composite Required overall configuration: - CONFIG_USBDEV - USB device support - CONFIG_USBDEV_COMPOSITE - USB composite device support - CONFIG_CDCACM - USB CDC/ACM serial device support - CONFIG_CDCACM_COMPOSITE - USB CDC/ACM serial composite device support - CONFIG_USBMSC - USB mass storage device support - CONFIG_USBMSC_COMPOSITE - USB mass storage composite device support + CONFIG_USBDEV=y - USB device support + CONFIG_USBDEV_COMPOSITE=y - USB composite device support + CONFIG_COMPOSITE_IAD=y - Interface associate descriptor needed + + CONFIG_CDCACM=y - USB CDC/ACM serial device support + CONFIG_CDCACM_COMPOSITE=y - USB CDC/ACM serial composite device support + CONFIG_CDCACM_IFNOBASE=0 - CDC/ACM interfaces start with number 0 + CONFIG_CDCACM_EPINTIN=1 - Endpoint numbers must be unique + CONFIG_CDCACM_EPBULKIN=2 + CONFIG_CDCACM_EPBULKOUT=3 + + CONFIG_USBMSC - USB mass storage device support + CONFIG_USBMSC_COMPOSITE - USB mass storage composite device support + CONFIG_USBMSC_IFNOBASE=2 - USB mass storage interfaces start with number 2 + CONFIG_USBMSC_EPBULKOUT=4 - Endpoint numbers must be unique + CONFIG_USBMSC_EPBULKIN=5 CONFIG_NSH_BUILTIN_APPS This example can be built as two NSH "built-in" commands if this option diff --git a/examples/composite/composite_main.c b/examples/composite/composite_main.c index b6e9bec9d..961716116 100644 --- a/examples/composite/composite_main.c +++ b/examples/composite/composite_main.c @@ -503,7 +503,7 @@ int board_mscclassobject(FAR struct usbdevclass_driver_s **classdev) { int ret; - DEBUGASSERT(g_composite.mschandle != NULL); + DEBUGASSERT(g_composite.mschandle == NULL); /* Initialize USB trace output IDs */ @@ -657,7 +657,7 @@ void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev) } /**************************************************************************** - * user_start/msconn_main + * user_start/conn_main * * Description: * This is the main program that configures the USB mass storage device