11 files changed, 276 insertions, 276 deletions
diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt
index 1a38bac823..a86b325265 100755
--- a/nuttx/configs/stm3210e-eval/README.txt
+++ b/nuttx/configs/stm3210e-eval/README.txt
@@ -773,11 +773,11 @@ Where <subdir> is one of the following:
     to use the CDC/ACM serial class by making the following changes
     to the configuration file:
 
-    -CONFIG_USBSER=y
-    +CONFIG_USBSER=n
+    -CONFIG_PL2303=y
+    +CONFIG_PL2303=n
 
-    -CONFIG_CDCSER=n
-    +CONFIG_CDCSER=y
+    -CONFIG_CDCACM=n
+    +CONFIG_CDCACM=y
 
     The example can also be converted to use the alternative
     USB serial example at apps/examples/usbterm by changing the 
diff --git a/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig
index 8922e584e1..f91c1c1451 100755
--- a/nuttx/configs/stm3210e-eval/RIDE/defconfig
+++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig
@@ -649,38 +649,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/nuttx/configs/stm3210e-eval/buttons/defconfig b/nuttx/configs/stm3210e-eval/buttons/defconfig
index d311435e31..ed0ffaacd8 100644
--- a/nuttx/configs/stm3210e-eval/buttons/defconfig
+++ b/nuttx/configs/stm3210e-eval/buttons/defconfig
@@ -662,38 +662,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig
index 6b32d2094b..826e2ad52d 100755
--- a/nuttx/configs/stm3210e-eval/nsh/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh/defconfig
@@ -665,38 +665,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig
index 48081b0d30..2a97d499bd 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig
@@ -697,111 +697,111 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB serial device class driver (Standard CDC ACM class)
 #
-# CONFIG_CDCSER
+# CONFIG_CDCACM
 #   Enable compilation of the USB serial driver
-# CONFIG_CDCSER_COMPOSITE
+# CONFIG_CDCACM_COMPOSITE
 #   Configure the CDC serial driver as part of a composite driver
 #   (only if CONFIG_USBDEV_COMPOSITE is also defined)
-# CONFIG_CDCSER_EP0MAXPACKET
+# CONFIG_CDCACM_EP0MAXPACKET
 #   Endpoint 0 max packet size. Default 64
-# CONFIG_CDCSER_EPINTIN
+# CONFIG_CDCACM_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation.  Default 2.
-# CONFIG_CDCSER_EPINTIN_FSSIZE
+# CONFIG_CDCACM_EPINTIN_FSSIZE
 #   Max package size for the interrupt IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPINTIN_HSSIZE
+# CONFIG_CDCACM_EPINTIN_HSSIZE
 #   Max package size for the interrupt IN endpoint if high speed mode.
 #   Default 64
-# CONFIG_CDCSER_EPBULKOUT
+# CONFIG_CDCACM_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_CDCSER_EPBULKOUT_FSSIZE
+# CONFIG_CDCACM_EPBULKOUT_FSSIZE
 #   Max package size for the bulk OUT endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKOUT_HSSIZE
+# CONFIG_CDCACM_EPBULKOUT_HSSIZE
 #   Max package size for the bulk OUT  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_EPBULKIN
+# CONFIG_CDCACM_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_CDCSER_EPBULKIN_FSSIZE
+# CONFIG_CDCACM_EPBULKIN_FSSIZE
 #   Max package size for the bulk IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKIN_HSSIZE
+# CONFIG_CDCACM_EPBULKIN_HSSIZE
 #   Max package size for the bulk IN  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_NWRREQS and CONFIG_CDCSER_NRDREQS
+# CONFIG_CDCACM_NWRREQS and CONFIG_CDCACM_NRDREQS
 #   The number of write/read requests that can be in flight.
 #   Default 256.
-# CONFIG_CDCSER_VENDORID and CONFIG_CDCSER_VENDORSTR
+# CONFIG_CDCACM_VENDORID and CONFIG_CDCACM_VENDORSTR
 #   The vendor ID code/string.  Default 0x0525 and "NuttX"
 #   0x0525 is the Netchip vendor and should not be used in any
 #   products.  This default VID was selected for compatibility with
 #   the Linux CDC ACM default VID.
-# CONFIG_CDCSER_PRODUCTID and CONFIG_CDCSER_PRODUCTSTR
+# CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR
 #   The product ID code/string. Default 0xara7 and "CDC/ACM Serial"
 #   0xa4a7 was selected for compatibility with the Linux CDC ACM
 #   default PID.
-# CONFIG_CDCSER_RXBUFSIZE and CONFIG_CDCSER_TXBUFSIZE
+# CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE
 #   Size of the serial receive/transmit buffers. Default 256.
 #
-CONFIG_CDCSER=n
-CONFIG_CDCSER_COMPOSITE=y
-#CONFIG_CDCSER_EP0MAXPACKET
-#CONFIG_CDCSER_EPINTIN
-#CONFIG_CDCSER_EPINTIN_FSSIZE
-#CONFIG_CDCSER_EPINTIN_HSSIZE
-#CONFIG_CDCSER_EPBULKOUT
-#CONFIG_CDCSER_EPBULKOUT_FSSIZE
-#CONFIG_CDCSER_EPBULKOUT_HSSIZE
-#CONFIG_CDCSER_EPBULKIN
-#CONFIG_CDCSER_EPBULKIN_FSSIZE
-#CONFIG_CDCSER_EPBULKIN_HSSIZE
-#CONFIG_CDCSER_NWRREQS
-#CONFIG_CDCSER_NRDREQS
-#CONFIG_CDCSER_VENDORID
-#CONFIG_CDCSER_VENDORSTR
-#CONFIG_CDCSER_PRODUCTID
-#CONFIG_CDCSER_PRODUCTSTR
-#CONFIG_CDCSER_RXBUFSIZE
-#CONFIG_CDCSER_TXBUFSIZE
+CONFIG_CDCACM=n
+CONFIG_CDCACM_COMPOSITE=y
+#CONFIG_CDCACM_EP0MAXPACKET
+#CONFIG_CDCACM_EPINTIN
+#CONFIG_CDCACM_EPINTIN_FSSIZE
+#CONFIG_CDCACM_EPINTIN_HSSIZE
+#CONFIG_CDCACM_EPBULKOUT
+#CONFIG_CDCACM_EPBULKOUT_FSSIZE
+#CONFIG_CDCACM_EPBULKOUT_HSSIZE
+#CONFIG_CDCACM_EPBULKIN
+#CONFIG_CDCACM_EPBULKIN_FSSIZE
+#CONFIG_CDCACM_EPBULKIN_HSSIZE
+#CONFIG_CDCACM_NWRREQS
+#CONFIG_CDCACM_NRDREQS
+#CONFIG_CDCACM_VENDORID
+#CONFIG_CDCACM_VENDORSTR
+#CONFIG_CDCACM_PRODUCTID
+#CONFIG_CDCACM_PRODUCTSTR
+#CONFIG_CDCACM_RXBUFSIZE
+#CONFIG_CDCACM_TXBUFSIZE
 #
 # USB Storage Device Configuration
 #
diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig
index 9970b27a59..3378a4a24b 100644
--- a/nuttx/configs/stm3210e-eval/nx/defconfig
+++ b/nuttx/configs/stm3210e-eval/nx/defconfig
@@ -681,38 +681,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig
index f21b4fbefc..e15782a914 100644
--- a/nuttx/configs/stm3210e-eval/nxlines/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig
@@ -681,38 +681,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig
index 036c73ac3f..9484f3773c 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig
@@ -681,38 +681,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig
index ca1ea021a4..a8d3bcb82d 100755
--- a/nuttx/configs/stm3210e-eval/ostest/defconfig
+++ b/nuttx/configs/stm3210e-eval/ostest/defconfig
@@ -685,38 +685,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig
index a6ebfe7568..aa8f76adfd 100755
--- a/nuttx/configs/stm3210e-eval/usbserial/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig
@@ -663,111 +663,111 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration (Prolific PL2303 Emulation)
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=y
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=y
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB serial device class driver (Standard CDC ACM class)
 #
-# CONFIG_CDCSER
+# CONFIG_CDCACM
 #   Enable compilation of the USB serial driver
-# CONFIG_CDCSER_COMPOSITE
+# CONFIG_CDCACM_COMPOSITE
 #   Configure the CDC serial driver as part of a composite driver
 #   (only if CONFIG_USBDEV_COMPOSITE is also defined)
-# CONFIG_CDCSER_EP0MAXPACKET
+# CONFIG_CDCACM_EP0MAXPACKET
 #   Endpoint 0 max packet size. Default 64
-# CONFIG_CDCSER_EPINTIN
+# CONFIG_CDCACM_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation.  Default 2.
-# CONFIG_CDCSER_EPINTIN_FSSIZE
+# CONFIG_CDCACM_EPINTIN_FSSIZE
 #   Max package size for the interrupt IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPINTIN_HSSIZE
+# CONFIG_CDCACM_EPINTIN_HSSIZE
 #   Max package size for the interrupt IN endpoint if high speed mode.
 #   Default 64
-# CONFIG_CDCSER_EPBULKOUT
+# CONFIG_CDCACM_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_CDCSER_EPBULKOUT_FSSIZE
+# CONFIG_CDCACM_EPBULKOUT_FSSIZE
 #   Max package size for the bulk OUT endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKOUT_HSSIZE
+# CONFIG_CDCACM_EPBULKOUT_HSSIZE
 #   Max package size for the bulk OUT  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_EPBULKIN
+# CONFIG_CDCACM_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_CDCSER_EPBULKIN_FSSIZE
+# CONFIG_CDCACM_EPBULKIN_FSSIZE
 #   Max package size for the bulk IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKIN_HSSIZE
+# CONFIG_CDCACM_EPBULKIN_HSSIZE
 #   Max package size for the bulk IN  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_NWRREQS and CONFIG_CDCSER_NRDREQS
+# CONFIG_CDCACM_NWRREQS and CONFIG_CDCACM_NRDREQS
 #   The number of write/read requests that can be in flight.
 #   Default 256.
-# CONFIG_CDCSER_VENDORID and CONFIG_CDCSER_VENDORSTR
+# CONFIG_CDCACM_VENDORID and CONFIG_CDCACM_VENDORSTR
 #   The vendor ID code/string.  Default 0x0525 and "NuttX"
 #   0x0525 is the Netchip vendor and should not be used in any
 #   products.  This default VID was selected for compatibility with
 #   the Linux CDC ACM default VID.
-# CONFIG_CDCSER_PRODUCTID and CONFIG_CDCSER_PRODUCTSTR
+# CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR
 #   The product ID code/string. Default 0xara7 and "CDC/ACM Serial"
 #   0xa4a7 was selected for compatibility with the Linux CDC ACM
 #   default PID.
-# CONFIG_CDCSER_RXBUFSIZE and CONFIG_CDCSER_TXBUFSIZE
+# CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE
 #   Size of the serial receive/transmit buffers. Default 256.
 #
-CONFIG_CDCSER=n
-CONFIG_CDCSER_COMPOSITE=y
-#CONFIG_CDCSER_EP0MAXPACKET
-#CONFIG_CDCSER_EPINTIN
-#CONFIG_CDCSER_EPINTIN_FSSIZE
-#CONFIG_CDCSER_EPINTIN_HSSIZE
-#CONFIG_CDCSER_EPBULKOUT
-#CONFIG_CDCSER_EPBULKOUT_FSSIZE
-#CONFIG_CDCSER_EPBULKOUT_HSSIZE
-#CONFIG_CDCSER_EPBULKIN
-#CONFIG_CDCSER_EPBULKIN_FSSIZE
-#CONFIG_CDCSER_EPBULKIN_HSSIZE
-#CONFIG_CDCSER_NWRREQS
-#CONFIG_CDCSER_NRDREQS
-#CONFIG_CDCSER_VENDORID
-#CONFIG_CDCSER_VENDORSTR
-#CONFIG_CDCSER_PRODUCTID
-#CONFIG_CDCSER_PRODUCTSTR
-#CONFIG_CDCSER_RXBUFSIZE
-#CONFIG_CDCSER_TXBUFSIZE
+CONFIG_CDCACM=n
+CONFIG_CDCACM_COMPOSITE=y
+#CONFIG_CDCACM_EP0MAXPACKET
+#CONFIG_CDCACM_EPINTIN
+#CONFIG_CDCACM_EPINTIN_FSSIZE
+#CONFIG_CDCACM_EPINTIN_HSSIZE
+#CONFIG_CDCACM_EPBULKOUT
+#CONFIG_CDCACM_EPBULKOUT_FSSIZE
+#CONFIG_CDCACM_EPBULKOUT_HSSIZE
+#CONFIG_CDCACM_EPBULKIN
+#CONFIG_CDCACM_EPBULKIN_FSSIZE
+#CONFIG_CDCACM_EPBULKIN_HSSIZE
+#CONFIG_CDCACM_NWRREQS
+#CONFIG_CDCACM_NRDREQS
+#CONFIG_CDCACM_VENDORID
+#CONFIG_CDCACM_VENDORSTR
+#CONFIG_CDCACM_PRODUCTID
+#CONFIG_CDCACM_PRODUCTSTR
+#CONFIG_CDCACM_RXBUFSIZE
+#CONFIG_CDCACM_TXBUFSIZE
 
 # USB Storage Device Configuration
 #
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
index ad082b9d6b..53f09060cd 100755
--- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
@@ -672,38 +672,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration