Fixes for class driver i/f

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

5 files changed, 100 insertions, 110 deletions

diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig
index b49c1757f..491e7a8a8 100644
--- a/nuttx/configs/ntosd-dm320/nettest/defconfig
+++ b/nuttx/configs/ntosd-dm320/nettest/defconfig
@@ -356,34 +356,32 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSERIAL_EPOUT
-# CONFIG_USBSERIAL_EPIN
-# CONFIG_USBSERIAL_NWRREQS
-#   The number of write requests that can be in flight
-# CONFIG_USBSERIAL_NRDREQS
-#   The number of read requests that can be in flight
-# CONFIG_USBSERIAL_RXBUFSIZE
-#   Size of the serial receive buffer
-# CONFIG_USBSERIAL_TXBUFSIZE
-#   Size of the serial transmit buffer
-# CONFIG_USBSER_VENDORID
-#   The vendor ID code
-# CONFIG_USBSER_PRODUCTID
-#   The product ID code
-CONFIG_USBSERIAL_EPOUT=1
-CONFIG_USBSERIAL_EPIN=2
-CONFIG_USBSERIAL_NWRREQS=4
-CONFIG_USBSERIAL_NRDREQS=4
+# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
+#   Logical endoint addresses
+# 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
+CONFIG_USBSER_EPOUT=1
+CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_NWRREQS=4
+CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x0525
 CONFIG_USBSER_PRODUCTID=0xa4a6
-CONFIG_USBSERIAL_RXBUFSIZE=512
-CONFIG_USBSERIAL_TXBUFSIZE=512
+CONFIG_USBSER_VENDORSTR="Nuttx"
+CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
+CONFIG_USBSER_RXBUFSIZE=512
+CONFIG_USBSER_TXBUFSIZE=512
 
 #
 # USB Device Zero Configuration
-# CONFIG_USBSER_VENDORID
+# CONFIG_USBZERO_VENDORID
 #   The vendor ID code
-# CONFIG_USBSER_PRODUCTID
+# CONFIG_USBZERO_PRODUCTID
 #   The product ID code
 CONFIG_USBZERO_VENDORID=0x0525
 CONFIG_USBZERO_PRODUCTID=0xa4a0
diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig
index 1b4f0fb19..0b2486383 100644
--- a/nuttx/configs/ntosd-dm320/nsh/defconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/defconfig
@@ -364,34 +364,32 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSERIAL_EPOUT
-# CONFIG_USBSERIAL_EPIN
-# CONFIG_USBSERIAL_NWRREQS
-#   The number of write requests that can be in flight
-# CONFIG_USBSERIAL_NRDREQS
-#   The number of read requests that can be in flight
-# CONFIG_USBSERIAL_RXBUFSIZE
-#   Size of the serial receive buffer
-# CONFIG_USBSERIAL_TXBUFSIZE
-#   Size of the serial transmit buffer
-# CONFIG_USBSER_VENDORID
-#   The vendor ID code
-# CONFIG_USBSER_PRODUCTID
-#   The product ID code
-CONFIG_USBSERIAL_EPOUT=1
-CONFIG_USBSERIAL_EPIN=2
-CONFIG_USBSERIAL_NWRREQS=4
-CONFIG_USBSERIAL_NRDREQS=4
+# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
+#   Logical endoint addresses
+# 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
+CONFIG_USBSER_EPOUT=1
+CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_NWRREQS=4
+CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x0525
 CONFIG_USBSER_PRODUCTID=0xa4a6
-CONFIG_USBSERIAL_RXBUFSIZE=512
-CONFIG_USBSERIAL_TXBUFSIZE=512
+CONFIG_USBSER_VENDORSTR="Nuttx"
+CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
+CONFIG_USBSER_RXBUFSIZE=512
+CONFIG_USBSER_TXBUFSIZE=512
 
 #
 # USB Device Zero Configuration
-# CONFIG_USBSER_VENDORID
+# CONFIG_USBZERO_VENDORID
 #   The vendor ID code
-# CONFIG_USBSER_PRODUCTID
+# CONFIG_USBZERO_PRODUCTID
 #   The product ID code
 CONFIG_USBZERO_VENDORID=0x0525
 CONFIG_USBZERO_PRODUCTID=0xa4a0
diff --git a/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig
index ecb23733f..54d71af12 100644
--- a/nuttx/configs/ntosd-dm320/ostest/defconfig
+++ b/nuttx/configs/ntosd-dm320/ostest/defconfig
@@ -356,34 +356,32 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSERIAL_EPOUT
-# CONFIG_USBSERIAL_EPIN
-# CONFIG_USBSERIAL_NWRREQS
-#   The number of write requests that can be in flight
-# CONFIG_USBSERIAL_NRDREQS
-#   The number of read requests that can be in flight
-# CONFIG_USBSERIAL_RXBUFSIZE
-#   Size of the serial receive buffer
-# CONFIG_USBSERIAL_TXBUFSIZE
-#   Size of the serial transmit buffer
-# CONFIG_USBSER_VENDORID
-#   The vendor ID code
-# CONFIG_USBSER_PRODUCTID
-#   The product ID code
-CONFIG_USBSERIAL_EPOUT=1
-CONFIG_USBSERIAL_EPIN=2
-CONFIG_USBSERIAL_NWRREQS=4
-CONFIG_USBSERIAL_NRDREQS=4
+# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
+#   Logical endoint addresses
+# 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
+CONFIG_USBSER_EPOUT=1
+CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_NWRREQS=4
+CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x0525
 CONFIG_USBSER_PRODUCTID=0xa4a6
-CONFIG_USBSERIAL_RXBUFSIZE=512
-CONFIG_USBSERIAL_TXBUFSIZE=512
+CONFIG_USBSER_VENDORSTR="Nuttx"
+CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
+CONFIG_USBSER_RXBUFSIZE=512
+CONFIG_USBSER_TXBUFSIZE=512
 
 #
 # USB Device Zero Configuration
-# CONFIG_USBSER_VENDORID
+# CONFIG_USBZERO_VENDORID
 #   The vendor ID code
-# CONFIG_USBSER_PRODUCTID
+# CONFIG_USBZERO_PRODUCTID
 #   The product ID code
 CONFIG_USBZERO_VENDORID=0x0525
 CONFIG_USBZERO_PRODUCTID=0xa4a0
diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig
index bd3da28ef..b3c0633f9 100644
--- a/nuttx/configs/ntosd-dm320/udp/defconfig
+++ b/nuttx/configs/ntosd-dm320/udp/defconfig
@@ -356,34 +356,32 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSERIAL_EPOUT
-# CONFIG_USBSERIAL_EPIN
-# CONFIG_USBSERIAL_NWRREQS
-#   The number of write requests that can be in flight
-# CONFIG_USBSERIAL_NRDREQS
-#   The number of read requests that can be in flight
-# CONFIG_USBSERIAL_RXBUFSIZE
-#   Size of the serial receive buffer
-# CONFIG_USBSERIAL_TXBUFSIZE
-#   Size of the serial transmit buffer
-# CONFIG_USBSER_VENDORID
-#   The vendor ID code
-# CONFIG_USBSER_PRODUCTID
-#   The product ID code
-CONFIG_USBSERIAL_EPOUT=1
-CONFIG_USBSERIAL_EPIN=2
-CONFIG_USBSERIAL_NWRREQS=4
-CONFIG_USBSERIAL_NRDREQS=4
+# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
+#   Logical endoint addresses
+# 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
+CONFIG_USBSER_EPOUT=1
+CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_NWRREQS=4
+CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x0525
 CONFIG_USBSER_PRODUCTID=0xa4a6
-CONFIG_USBSERIAL_RXBUFSIZE=512
-CONFIG_USBSERIAL_TXBUFSIZE=512
+CONFIG_USBSER_VENDORSTR="Nuttx"
+CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
+CONFIG_USBSER_RXBUFSIZE=512
+CONFIG_USBSER_TXBUFSIZE=512
 
 #
 # USB Device Zero Configuration
-# CONFIG_USBSER_VENDORID
+# CONFIG_USBZERO_VENDORID
 #   The vendor ID code
-# CONFIG_USBSER_PRODUCTID
+# CONFIG_USBZERO_PRODUCTID
 #   The product ID code
 CONFIG_USBZERO_VENDORID=0x0525
 CONFIG_USBZERO_PRODUCTID=0xa4a0
diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig
index f0066d33f..ace6d935a 100644
--- a/nuttx/configs/ntosd-dm320/uip/defconfig
+++ b/nuttx/configs/ntosd-dm320/uip/defconfig
@@ -356,34 +356,32 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSERIAL_EPOUT
-# CONFIG_USBSERIAL_EPIN
-# CONFIG_USBSERIAL_NWRREQS
-#   The number of write requests that can be in flight
-# CONFIG_USBSERIAL_NRDREQS
-#   The number of read requests that can be in flight
-# CONFIG_USBSERIAL_RXBUFSIZE
-#   Size of the serial receive buffer
-# CONFIG_USBSERIAL_TXBUFSIZE
-#   Size of the serial transmit buffer
-# CONFIG_USBSER_VENDORID
-#   The vendor ID code
-# CONFIG_USBSER_PRODUCTID
-#   The product ID code
-CONFIG_USBSERIAL_EPOUT=1
-CONFIG_USBSERIAL_EPIN=2
-CONFIG_USBSERIAL_NWRREQS=4
-CONFIG_USBSERIAL_NRDREQS=4
+# CONFIG_USBSER_EPOUT and CONFIG_USBSER_EPIN
+#   Logical endoint addresses
+# 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
+CONFIG_USBSER_EPOUT=1
+CONFIG_USBSER_EPIN=2
+CONFIG_USBSER_NWRREQS=4
+CONFIG_USBSER_NRDREQS=4
 CONFIG_USBSER_VENDORID=0x0525
 CONFIG_USBSER_PRODUCTID=0xa4a6
-CONFIG_USBSERIAL_RXBUFSIZE=512
-CONFIG_USBSERIAL_TXBUFSIZE=512
+CONFIG_USBSER_VENDORSTR="Nuttx"
+CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
+CONFIG_USBSER_RXBUFSIZE=512
+CONFIG_USBSER_TXBUFSIZE=512
 
 #
 # USB Device Zero Configuration
-# CONFIG_USBSER_VENDORID
+# CONFIG_USBZERO_VENDORID
 #   The vendor ID code
-# CONFIG_USBSER_PRODUCTID
+# CONFIG_USBZERO_PRODUCTID
 #   The product ID code
 CONFIG_USBZERO_VENDORID=0x0525
 CONFIG_USBZERO_PRODUCTID=0xa4a0