LPCXpresso USB device works

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

10 files changed, 51 insertions, 15 deletions

diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c
index dd5e465da..4055a6fc9 100755
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c
@@ -3176,9 +3176,13 @@ void up_usbinitialize(void)
   /* Step 3: Configure I/O pins */
 
   usbdev_dumpgpio();
+#ifndef CONFIG_LPC17_USBDEV_NOVBUS
   lpc17_configgpio(GPIO_USB_VBUS);    /* VBUS status input */
+#endif
   lpc17_configgpio(GPIO_USB_CONNECT); /* SoftConnect control signal */
+#ifndef CONFIG_LPC17_USBDEV_NOLED
   lpc17_configgpio(GPIO_USB_UPLED);   /* GoodLink LED control signal */
+#endif
   lpc17_configgpio(GPIO_USB_DP);      /* Positive differential data */
   lpc17_configgpio(GPIO_USB_DM);      /* Negative differential data */
   usbdev_dumpgpio();
diff --git a/nuttx/configs/detron/README.txt b/nuttx/configs/detron/README.txt
index 7f542bdea..1130e2377 100755
--- a/nuttx/configs/detron/README.txt
+++ b/nuttx/configs/detron/README.txt
@@ -356,6 +356,10 @@ Detron Configuration Options
 	  Number of DMA descriptors to allocate in SRAM.

 	CONFIG_LPC17_USBDEV_DMA

 	  Enable lpc17xx-specific DMA support

+    CONFIG_LPC17_USBDEV_NOVBUS

+      Define if the hardware implementation does not support the VBUS signal

+    CONFIG_LPC17_USBDEV_NOLED

+      Define if the hardware  implementation does not support the LED output

 

   LPC17xx USB Host Configuration

 

diff --git a/nuttx/configs/lpcxpresso-lpc1768/README.txt b/nuttx/configs/lpcxpresso-lpc1768/README.txt
index 9c5bb4e77..fcfbf0014 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/README.txt
+++ b/nuttx/configs/lpcxpresso-lpc1768/README.txt
@@ -615,7 +615,11 @@ LPCXpresso Configuration Options
       Number of DMA descriptors to allocate in SRAM.
     CONFIG_LPC17_USBDEV_DMA
       Enable lpc17xx-specific DMA support
-
+    CONFIG_LPC17_USBDEV_NOVBUS
+      Define if the hardware implementation does not support the VBUS signal
+    CONFIG_LPC17_USBDEV_NOLED
+      Define if the hardware  implementation does not support the LED output
+ 
   LPC17xx USB Host Configuration (the LPCXpresso does not support USB Host)
 
     CONFIG_USBHOST_OHCIRAM_SIZE
@@ -653,7 +657,7 @@ Where <subdir> is one of the following:
     (but not passing tests as of this writing).
 
 	NOTE: At present, the value for the SD SPI frequency is too
-	high and the SD will failing.  Setting that frequency to 400000
+	high and the SD will fail.  Setting that frequency to 400000
 	removes the problem. TODO:  Tune this frequency to some optimal
 	value.
 
@@ -661,18 +665,6 @@ Where <subdir> is one of the following:
     This configuration directory, performs a simple OS test using
     apps/examples/ostest.
 
-    NOTE: The OSTest runs on the LPCXpresso if it is not installed
-    on the base board (using an add-on MAX232 RS232 driver connected
-    to:
-
-      P0[0]/RD1/TXD3/SDA1  J6-9
-      P0[1]/TD1/RXD3/SCL   J6-10
-
-    I suspect that this test does not run on with the base board
-    attached because OSTest blasts out a lot of serial data and
-    overruns the FTDI chip before it has a chance to establish the
-    connection with the host.
-
   thttpd:
     This builds the THTTPD web server example using the THTTPD and
     the apps/examples/thttpd application.
@@ -686,6 +678,6 @@ Where <subdir> is one of the following:
     for more information.
 
 	NOTE: At present, the value for the SD SPI frequency is too
-	high and the SD will failing.  Setting that frequency to 400000
+	high and the SD will fail.  Setting that frequency to 400000
 	removes the problem. TODO:  Tune this frequency to some optimal
 	value.
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
index fee06bd08..76ca6d88b 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -632,12 +632,18 @@ CONFIG_USBHOST_ISOC_DISABLE=y
 #   Number of DMA descriptors to allocate in SRAM.
 # CONFIG_LPC17_USBDEV_DMA
 #   Enable lpc17xx-specific DMA support
+# CONFIG_LPC17_USBDEV_NOVBUS
+#   Define if the hardware implementation does not support the VBUS signal
+# CONFIG_LPC17_USBDEV_NOLED
+#   Define if the hardware  implementation does not support the LED output
 #
 CONFIG_LPC17_USBDEV_FRAME_INTERRUPT=n
 CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT=n
 CONFIG_LPC17_USBDEV_DMA=n
 CONFIG_LPC17_USBDEV_NDMADESCRIPTORS=0
 CONFIG_LPC17_USBDEV_DMAINTMASK=0
+CONFIG_LPC17_USBDEV_NOVBUS=y
+CONFIG_LPC17_USBDEV_NOLED=y
 
 #
 # LPC17xx USB Host Configuration
diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
index b2b144df3..c4d4f5c96 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
@@ -600,12 +600,18 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #   Number of DMA descriptors to allocate in SRAM.
 # CONFIG_LPC17_USBDEV_DMA
 #   Enable lpc17xx-specific DMA support
+# CONFIG_LPC17_USBDEV_NOVBUS
+#   Define if the hardware implementation does not support the VBUS signal
+# CONFIG_LPC17_USBDEV_NOLED
+#   Define if the hardware  implementation does not support the LED output
 #
 CONFIG_LPC17_USBDEV_FRAME_INTERRUPT=n
 CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT=n
 CONFIG_LPC17_USBDEV_DMA=n
 CONFIG_LPC17_USBDEV_NDMADESCRIPTORS=0
 CONFIG_LPC17_USBDEV_DMAINTMASK=0
+CONFIG_LPC17_USBDEV_NOVBUS=y
+CONFIG_LPC17_USBDEV_NOLED=y
 
 #
 # USB Serial Device Configuration
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
index e1dd801d6..dc7dba937 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -621,12 +621,18 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #   Number of DMA descriptors to allocate in SRAM.
 # CONFIG_LPC17_USBDEV_DMA
 #   Enable lpc17xx-specific DMA support
+# CONFIG_LPC17_USBDEV_NOVBUS
+#   Define if the hardware implementation does not support the VBUS signal
+# CONFIG_LPC17_USBDEV_NOLED
+#   Define if the hardware  implementation does not support the LED output
 #
 CONFIG_LPC17_USBDEV_FRAME_INTERRUPT=n
 CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT=n
 CONFIG_LPC17_USBDEV_DMA=n
 CONFIG_LPC17_USBDEV_NDMADESCRIPTORS=0
 CONFIG_LPC17_USBDEV_DMAINTMASK=0
+CONFIG_LPC17_USBDEV_NOVBUS=y
+CONFIG_LPC17_USBDEV_NOLED=y
 
 #
 # USB Serial Device Configuration
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
index d646de60e..e8f9d6286 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
@@ -601,12 +601,18 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #   Number of DMA descriptors to allocate in SRAM.
 # CONFIG_LPC17_USBDEV_DMA
 #   Enable lpc17xx-specific DMA support
+# CONFIG_LPC17_USBDEV_NOVBUS
+#   Define if the hardware implementation does not support the VBUS signal
+# CONFIG_LPC17_USBDEV_NOLED
+#   Define if the hardware  implementation does not support the LED output
 #
 CONFIG_LPC17_USBDEV_FRAME_INTERRUPT=n
 CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT=n
 CONFIG_LPC17_USBDEV_DMA=n
 CONFIG_LPC17_USBDEV_NDMADESCRIPTORS=0
 CONFIG_LPC17_USBDEV_DMAINTMASK=0
+CONFIG_LPC17_USBDEV_NOVBUS=y
+CONFIG_LPC17_USBDEV_NOLED=y
 
 #
 # USB Serial Device Configuration
diff --git a/nuttx/configs/mbed/README.txt b/nuttx/configs/mbed/README.txt
index 58211152f..6d031b82e 100755
--- a/nuttx/configs/mbed/README.txt
+++ b/nuttx/configs/mbed/README.txt
@@ -320,6 +320,10 @@ mbed Configuration Options
 	  Number of DMA descriptors to allocate in SRAM.

 	CONFIG_LPC17_USBDEV_DMA

 	  Enable lpc17xx-specific DMA support

+    CONFIG_LPC17_USBDEV_NOVBUS

+      Define if the hardware implementation does not support the VBUS signal

+    CONFIG_LPC17_USBDEV_NOLED

+      Define if the hardware  implementation does not support the LED output

 

   LPC17xx USB Host Configuration

 

diff --git a/nuttx/configs/nucleus2g/README.txt b/nuttx/configs/nucleus2g/README.txt
index d57980b0c..1a3b8d659 100755
--- a/nuttx/configs/nucleus2g/README.txt
+++ b/nuttx/configs/nucleus2g/README.txt
@@ -432,6 +432,10 @@ Nucleus 2G Configuration Options
 	  Number of DMA descriptors to allocate in SRAM.

 	CONFIG_LPC17_USBDEV_DMA

 	  Enable lpc17xx-specific DMA support

+    CONFIG_LPC17_USBDEV_NOVBUS

+      Define if the hardware implementation does not support the VBUS signal

+    CONFIG_LPC17_USBDEV_NOLED

+      Define if the hardware  implementation does not support the LED output

 

   LPC17xx USB Host Configuration (the Nucleus2G does not support USB Host)

 

diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index b138d6604..056b5aa36 100755
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -715,6 +715,10 @@ Olimex LPC1766-STK Configuration Options
 	  Number of DMA descriptors to allocate in SRAM.

 	CONFIG_LPC17_USBDEV_DMA

 	  Enable lpc17xx-specific DMA support

+    CONFIG_LPC17_USBDEV_NOVBUS

+      Define if the hardware implementation does not support the VBUS signal

+    CONFIG_LPC17_USBDEV_NOLED

+      Define if the hardware  implementation does not support the LED output

 

   LPC17xx USB Host Configuration

     CONFIG_USBHOST_OHCIRAM_SIZE