Add David Hewson's corrections to the LPC214x USB device driver; Add LPC214x configuration to test the USB composite device

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4359 7fd9a85b-ad96-42d3-883c-3090e2eb8679

2 files changed, 12 insertions, 7 deletions

diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 500405893..fa14d57dc 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -139,8 +139,8 @@ examples/composite
 
   CONFIG_NSH_BUILTIN_APPS
     This example can be built as two NSH "built-in" commands if this option
-    is selected: 'msconn' will connect the USB mass storage device; 'msdis'
-    will disconnect the USB storage device.
+    is selected: 'conn' will connect the USB composite device; 'msdis'
+    will disconnect the USB composite device.
 
   Configuration options unique to this example:
 
@@ -970,11 +970,11 @@ examples/thttpd
     CONFIG_EXAMPLE_THTTPD_NETMASK  - Network mask
 
   Applications using this example will need to provide an appconfig
-  file in the configuration driver with instruction to build applications
+  file in the configuration directory with instruction to build applications
   like:
 
-  CONFIGURED_APPS += uiplib
-  CONFIGURED_APPS += thttpd
+    CONFIGURED_APPS += uiplib
+    CONFIGURED_APPS += thttpd
 
 examples/tiff
 ^^^^^^^^^^^^^
diff --git a/apps/examples/composite/composite_main.c b/apps/examples/composite/composite_main.c
index 0166b7fa1..6c2a86287 100644
--- a/apps/examples/composite/composite_main.c
+++ b/apps/examples/composite/composite_main.c
@@ -373,6 +373,9 @@ static int dumptrace(void)
 static int open_serial(void)
 {
   int errcode;
+#ifdef CONFIG_USBDEV_TRACE
+  int ret;
+#endif
 
   /* Open the USB serial device for writing (blocking) */
 
@@ -402,13 +405,15 @@ static int open_serial(void)
             }
         }
 
-      /* If USB tracing is enabled, then dump all collected trace data to stdout */
+      /* If USB tracing is enabled, then dump all collected trace data to
+       * stdout.
+       */
 
 #ifdef CONFIG_USBDEV_TRACE
       ret = dumptrace();
       if (ret < 0)
         {
-          goto errout;
+          return ret;
         }
 #endif
     }