Need to select endpoints actually supported by hardware

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

9 files changed, 117 insertions, 34 deletions

diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index c7f557d65..1b81cfb10 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -302,6 +302,25 @@ defconfig -- This is a configuration file similar to the Linux
 		CONFIG_USBDEV_TRACE - Enables USB tracing for debug
 		CONFIG_USBDEV_TRACE_NRECORDS - Number of trace entries to remember
 
+	USB serial device class driver
+		CONFIG_USBSER_EPINTIN
+		  The logical 7-bit address of a hardware endpoint that supports
+		  interrupt IN operation
+		CONFIG_USBSER_EPBULKOUT
+		  The logical 7-bit address of a hardware endpoint that supports
+		  bulk OUT operation
+		CONFIG_USBSER_EPBULKIN
+		  The logical 7-bit address of a hardware endpoint that supports
+		  bulk IN operation
+		CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+		  The number of write/read requests that can be in flight
+		CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+		  The vendor ID code/string
+		CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+		  The product ID code/string
+		CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+		  Size of the serial receive/transmit buffers
+
 	Stack and heap information
 
 		CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
index 266577649..11a9b1acc 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
@@ -384,8 +384,15 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
-#   Logical endoint addresses
+# CONFIG_USBSER_EPINTIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   interrupt IN operation
+# CONFIG_USBSER_EPBULKOUT
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk OUT operation
+# CONFIG_USBSER_EPBULKIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk IN operation
 # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
 #   The number of write/read requests that can be in flight
 # CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
@@ -394,8 +401,9 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #   The product ID code/string
 # CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER_EPOUT=1
-CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_EPINTIN=1
+CONFIG_USBSER_EPBULKOUT=2
+CONFIG_USBSER_EPBULKIN=5
 CONFIG_USBSER_NWRREQS=4
 CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x067b
diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
index f0fe2f49a..3dfac1fb5 100644
--- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
@@ -384,9 +384,16 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
-#   Logical endoint addresses
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_USBSER_EPINTIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   interrupt IN operation
+# CONFIG_USBSER_EPBULKOUT
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk OUT operation
+# CONFIG_USBSER_EPBULKIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk IN operation
+# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
 #   The number of write/read requests that can be in flight
 # CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
 #   The vendor ID code/string
@@ -394,8 +401,9 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #   The product ID code/string
 # CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER_EPOUT=1
-CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_EPINTIN=1
+CONFIG_USBSER_EPBULKOUT=2
+CONFIG_USBSER_EPBULKIN=5
 CONFIG_USBSER_NWRREQS=4
 CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x067b
diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
index df434376b..a93bf6e96 100644
--- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
@@ -385,9 +385,16 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
-#   Logical endoint addresses
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_USBSER_EPINTIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   interrupt IN operation
+# CONFIG_USBSER_EPBULKOUT
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk OUT operation
+# CONFIG_USBSER_EPBULKIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk IN operation
+# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
 #   The number of write/read requests that can be in flight
 # CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
 #   The vendor ID code/string
@@ -395,8 +402,9 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #   The product ID code/string
 # CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER_EPOUT=1
-CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_EPINTIN=1
+CONFIG_USBSER_EPBULKOUT=2
+CONFIG_USBSER_EPBULKIN=5
 CONFIG_USBSER_NWRREQS=4
 CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x067b
diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig
index 934b6d6d8..e94fed2d1 100644
--- a/nuttx/configs/ntosd-dm320/nettest/defconfig
+++ b/nuttx/configs/ntosd-dm320/nettest/defconfig
@@ -361,8 +361,15 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
-#   Logical endoint addresses
+# CONFIG_USBSER_EPINTIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   interrupt IN operation
+# CONFIG_USBSER_EPBULKOUT
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk OUT operation
+# CONFIG_USBSER_EPBULKIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk IN operation
 # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
 #   The number of write/read requests that can be in flight
 # CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
@@ -371,8 +378,9 @@ CONFIG_DM320_USBDEV_DMA=n
 #   The product ID code/string
 # CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER_EPOUT=1
-CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_EPINTIN=3
+CONFIG_USBSER_EPBULKOUT=2
+CONFIG_USBSER_EPBULKIN=1
 CONFIG_USBSER_NWRREQS=4
 CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x067b
diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig
index bfe69b341..f1188ff87 100644
--- a/nuttx/configs/ntosd-dm320/nsh/defconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/defconfig
@@ -369,8 +369,15 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
-#   Logical endoint addresses
+# CONFIG_USBSER_EPINTIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   interrupt IN operation
+# CONFIG_USBSER_EPBULKOUT
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk OUT operation
+# CONFIG_USBSER_EPBULKIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk IN operation
 # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
 #   The number of write/read requests that can be in flight
 # CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
@@ -379,8 +386,9 @@ CONFIG_DM320_USBDEV_DMA=n
 #   The product ID code/string
 # CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER_EPOUT=1
-CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_EPINTIN=3
+CONFIG_USBSER_EPBULKOUT=2
+CONFIG_USBSER_EPBULKIN=1
 CONFIG_USBSER_NWRREQS=4
 CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x067b
diff --git a/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig
index b50367d0d..701a3ae50 100644
--- a/nuttx/configs/ntosd-dm320/ostest/defconfig
+++ b/nuttx/configs/ntosd-dm320/ostest/defconfig
@@ -361,8 +361,15 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
-#   Logical endoint addresses
+# CONFIG_USBSER_EPINTIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   interrupt IN operation
+# CONFIG_USBSER_EPBULKOUT
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk OUT operation
+# CONFIG_USBSER_EPBULKIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk IN operation
 # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
 #   The number of write/read requests that can be in flight
 # CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
@@ -371,8 +378,9 @@ CONFIG_DM320_USBDEV_DMA=n
 #   The product ID code/string
 # CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER_EPOUT=1
-CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_EPINTIN=3
+CONFIG_USBSER_EPBULKOUT=2
+CONFIG_USBSER_EPBULKIN=1
 CONFIG_USBSER_NWRREQS=4
 CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x067b
diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig
index d90659a4d..1e93eda46 100644
--- a/nuttx/configs/ntosd-dm320/udp/defconfig
+++ b/nuttx/configs/ntosd-dm320/udp/defconfig
@@ -361,8 +361,15 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
-#   Logical endoint addresses
+# CONFIG_USBSER_EPINTIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   interrupt IN operation
+# CONFIG_USBSER_EPBULKOUT
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk OUT operation
+# CONFIG_USBSER_EPBULKIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk IN operation
 # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
 #   The number of write/read requests that can be in flight
 # CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
@@ -371,8 +378,9 @@ CONFIG_DM320_USBDEV_DMA=n
 #   The product ID code/string
 # CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER_EPOUT=1
-CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_EPINTIN=3
+CONFIG_USBSER_EPBULKOUT=2
+CONFIG_USBSER_EPBULKIN=1
 CONFIG_USBSER_NWRREQS=4
 CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x067b
diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig
index b69b86749..c3b7fc421 100644
--- a/nuttx/configs/ntosd-dm320/uip/defconfig
+++ b/nuttx/configs/ntosd-dm320/uip/defconfig
@@ -361,8 +361,15 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
-#   Logical endoint addresses
+# CONFIG_USBSER_EPINTIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   interrupt IN operation
+# CONFIG_USBSER_EPBULKOUT
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk OUT operation
+# CONFIG_USBSER_EPBULKIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk IN operation
 # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
 #   The number of write/read requests that can be in flight
 # CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
@@ -371,8 +378,9 @@ CONFIG_DM320_USBDEV_DMA=n
 #   The product ID code/string
 # CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER_EPOUT=1
-CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_EPINTIN=3
+CONFIG_USBSER_EPBULKOUT=2
+CONFIG_USBSER_EPBULKIN=1
 CONFIG_USBSER_NWRREQS=4
 CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x067b