update USB configuration settings

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

9 files changed, 111 insertions, 5 deletions

diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index e7a26e450..7a1623378 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -248,6 +248,17 @@ defconfig -- This is a configuration file similar to the Linux
 		CONFIG_DEV_PIPE_SIZE - Size, in bytes, of the buffer to allocated
 		  for pipe and FIFO support
 
+	Filesystem configuration
+		CONFIG_FS_FAT - Enable FAT filesystem support
+		CONFIG_FAT_SECTORSIZE - Max supported sector size
+		CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+
+	SPI-based MMC/SD driver
+		CONFIG_MMCSD_NSLOTS - Number of MMC/SD slots supported by the
+		  driver. Default is one.
+		CONFIG_MMCSD_READONLY -  Provide read-only access.  Default is
+		  Read/Write
+
 	TCP/IP and UDP support via uIP
 		CONFIG_NET - Enable or disable all network features
 		CONFIG_NET_IPv6 - Build in support for IPv6
@@ -303,6 +314,8 @@ defconfig -- This is a configuration file similar to the Linux
 		CONFIG_USBDEV_TRACE_NRECORDS - Number of trace entries to remember
 
 	USB serial device class driver
+		CONFIG_USBSER
+		  Enable compilation of the USB serial driver
 		CONFIG_USBSER_EPINTIN
 		  The logical 7-bit address of a hardware endpoint that supports
 		  interrupt IN operation
@@ -322,7 +335,8 @@ defconfig -- This is a configuration file similar to the Linux
 		  Size of the serial receive/transmit buffers
 
 	USB Storage Device Configuration
-
+		CONFIG_USBSTRG
+		  Enable compilation of the USB storage driver
 		CONFIG_USBSTRG_EP0MAXPACKET
 		  Max packet size for endpoint 0
 		CONFIG_USBSTRGEPBULKOUT and CONFIG_USBSTRG_EPBULKIN
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
index 0a7d22b58..12d3f8fc7 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
@@ -281,7 +281,8 @@ CONFIG_PREALLOC_WDOGS=4
 CONFIG_PREALLOC_TIMERS=4
 
 #
-# FAT filesystem configuration
+# Filesystem configuration
+#
 # CONFIG_FS_FAT - Enable FAT filesystem support
 # CONFIG_FAT_SECTORSIZE - Max supported sector size
 # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
@@ -294,6 +295,16 @@ CONFIG_MMCSD_NSLOTS=1
 CONFIG_MMCSD_READONLY=n
 
 #
+# SPI-based MMC/SD driver
+#
+# CONFIG_MMCSD_NSLOTS
+#   Number of MMC/SD slots supported by the driver
+# CONFIG_MMCSD_READONLY
+#   Provide read-only access (default is read/write)
+CONFIG_MMCSD_NSLOTS=1
+CONFIG_MMCSD_READONLY=n
+
+#
 # TCP/IP and UDP support via uIP
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
@@ -398,6 +409,8 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
+# CONFIG_USBSER
+#   Enable compilation of the USB serial driver
 # CONFIG_USBSER_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
@@ -415,6 +428,7 @@ 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=n
 CONFIG_USBSER_EPINTIN=1
 CONFIG_USBSER_EPBULKOUT=2
 CONFIG_USBSER_EPBULKIN=5
@@ -430,6 +444,8 @@ CONFIG_USBSER_TXBUFSIZE=512
 #
 # USB Storage Device Configuration
 #
+# CONFIG_USBSTRG
+#   Enable compilation of the USB storage driver
 # CONFIG_USBSTRG_EP0MAXPACKET
 #   Max packet size for endpoint 0
 # CONFIG_USBSTRG_EPBULKOUT and CONFIG_USBSTRG_EPBULKIN
@@ -447,6 +463,7 @@ CONFIG_USBSER_TXBUFSIZE=512
 #   The product ID code/string
 # CONFIG_USBSTRG_REMOVABLE
 #   Select if the media is removable
+CONFIG_USBSTRG=n
 CONFIG_USBSTRG_EP0MAXPACKET=64
 CONFIG_USBSTRG_EPBULKOUT=2
 CONFIG_USBSTRG_EPBULKIN=5
diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
index 067680720..00d56de48 100644
--- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
@@ -281,7 +281,8 @@ CONFIG_PREALLOC_WDOGS=4
 CONFIG_PREALLOC_TIMERS=4
 
 #
-# FAT filesystem configuration
+# Filesystem configuration
+#
 # CONFIG_FS_FAT - Enable FAT filesystem support
 # CONFIG_FAT_SECTORSIZE - Max supported sector size
 # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
@@ -289,6 +290,16 @@ CONFIG_FS_FAT=n
 CONFIG_FS_ROMFS=n
 
 #
+# SPI-based MMC/SD driver
+#
+# CONFIG_MMCSD_NSLOTS
+#   Number of MMC/SD slots supported by the driver
+# CONFIG_MMCSD_READONLY
+#   Provide read-only access (default is read/write)
+CONFIG_MMCSD_NSLOTS=1
+CONFIG_MMCSD_READONLY=n
+
+#
 # TCP/IP and UDP support via uIP
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
@@ -393,6 +404,8 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
+# CONFIG_USBSER
+#   Enable compilation of the USB serial driver
 # CONFIG_USBSER_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
@@ -410,6 +423,7 @@ 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=n
 CONFIG_USBSER_EPINTIN=1
 CONFIG_USBSER_EPBULKOUT=2
 CONFIG_USBSER_EPBULKIN=5
@@ -425,6 +439,8 @@ CONFIG_USBSER_TXBUFSIZE=512
 #
 # USB Storage Device Configuration
 #
+# CONFIG_USBSTRG
+#   Enable compilation of the USB storage driver
 # CONFIG_USBSTRG_EP0MAXPACKET
 #   Max packet size for endpoint 0
 # CONFIG_USBSTRG_EPBULKOUT and CONFIG_USBSTRG_EPBULKIN
@@ -442,6 +458,7 @@ CONFIG_USBSER_TXBUFSIZE=512
 #   The product ID code/string
 # CONFIG_USBSTRG_REMOVABLE
 #   Select if the media is removable
+CONFIG_USBSTRG=n
 CONFIG_USBSTRG_EP0MAXPACKET=64
 CONFIG_USBSTRG_EPBULKOUT=2
 CONFIG_USBSTRG_EPBULKIN=5
diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
index 3e7362b62..9c31667b0 100644
--- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
@@ -282,7 +282,8 @@ CONFIG_PREALLOC_WDOGS=4
 CONFIG_PREALLOC_TIMERS=4
 
 #
-# FAT filesystem configuration
+# Filesystem configuration
+#
 # CONFIG_FS_FAT - Enable FAT filesystem support
 # CONFIG_FAT_SECTORSIZE - Max supported sector size
 # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
@@ -290,6 +291,16 @@ CONFIG_FS_FAT=n
 CONFIG_FS_ROMFS=n
 
 #
+# SPI-based MMC/SD driver
+#
+# CONFIG_MMCSD_NSLOTS
+#   Number of MMC/SD slots supported by the driver
+# CONFIG_MMCSD_READONLY
+#   Provide read-only access (default is read/write)
+CONFIG_MMCSD_NSLOTS=1
+CONFIG_MMCSD_READONLY=n
+
+#
 # TCP/IP and UDP support via uIP
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
@@ -394,6 +405,8 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
+# CONFIG_USBSER
+#   Enable compilation of the USB serial driver
 # CONFIG_USBSER_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
@@ -411,6 +424,7 @@ 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=y
 CONFIG_USBSER_EPINTIN=1
 CONFIG_USBSER_EPBULKOUT=2
 CONFIG_USBSER_EPBULKIN=5
@@ -426,6 +440,8 @@ CONFIG_USBSER_TXBUFSIZE=512
 #
 # USB Storage Device Configuration
 #
+# CONFIG_USBSTRG
+#   Enable compilation of the USB storage driver
 # CONFIG_USBSTRG_EP0MAXPACKET
 #   Max packet size for endpoint 0
 # CONFIG_USBSTRG_EPBULKOUT and CONFIG_USBSTRG_EPBULKIN
@@ -443,6 +459,7 @@ CONFIG_USBSER_TXBUFSIZE=512
 #   The product ID code/string
 # CONFIG_USBSTRG_REMOVABLE
 #   Select if the media is removable
+CONFIG_USBSTRG=n
 CONFIG_USBSTRG_EP0MAXPACKET=64
 CONFIG_USBSTRG_EPBULKOUT=2
 CONFIG_USBSTRG_EPBULKIN=5
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
index 0e7ce5a37..b7408c7ed 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -282,7 +282,8 @@ CONFIG_PREALLOC_WDOGS=4
 CONFIG_PREALLOC_TIMERS=4
 
 #
-# FAT filesystem configuration
+# Filesystem configuration
+#
 # CONFIG_FS_FAT - Enable FAT filesystem support
 # CONFIG_FAT_SECTORSIZE - Max supported sector size
 # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
@@ -290,6 +291,16 @@ CONFIG_FS_FAT=n
 CONFIG_FS_ROMFS=n
 
 #
+# SPI-based MMC/SD driver
+#
+# CONFIG_MMCSD_NSLOTS
+#   Number of MMC/SD slots supported by the driver
+# CONFIG_MMCSD_READONLY
+#   Provide read-only access (default is read/write)
+CONFIG_MMCSD_NSLOTS=1
+CONFIG_MMCSD_READONLY=n
+
+#
 # TCP/IP and UDP support via uIP
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
@@ -394,6 +405,8 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
+# CONFIG_USBSER
+#   Enable compilation of the USB serial driver
 # CONFIG_USBSER_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
@@ -411,6 +424,7 @@ 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=n
 CONFIG_USBSER_EPINTIN=1
 CONFIG_USBSER_EPBULKOUT=2
 CONFIG_USBSER_EPBULKIN=5
@@ -426,6 +440,8 @@ CONFIG_USBSER_TXBUFSIZE=512
 #
 # USB Storage Device Configuration
 #
+# CONFIG_USBSTRG
+#   Enable compilation of the USB storage driver
 # CONFIG_USBSTRG_EP0MAXPACKET
 #   Max packet size for endpoint 0
 # CONFIG_USBSER_EPBULKOUT and CONFIG_USBSER_EPBULKIN
@@ -443,6 +459,7 @@ CONFIG_USBSER_TXBUFSIZE=512
 #   The product ID code/string
 # CONFIG_USBSTRG_REMOVABLE
 #   Select if the media is removable
+CONFIG_USBSTRG=y
 CONFIG_USBSTRG_EP0MAXPACKET=64
 CONFIG_USBSTRG_EPBULKOUT=2
 CONFIG_USBSTRG_EPBULKIN=5
diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig
index 3fc2e0e69..3ea1441f3 100644
--- a/nuttx/configs/ntosd-dm320/nettest/defconfig
+++ b/nuttx/configs/ntosd-dm320/nettest/defconfig
@@ -361,6 +361,8 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
+# CONFIG_USBSER
+#   Enable compilation of the USB serial driver
 # CONFIG_USBSER_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
@@ -378,6 +380,7 @@ 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=n
 CONFIG_USBSER_EPINTIN=3
 CONFIG_USBSER_EPBULKOUT=2
 CONFIG_USBSER_EPBULKIN=1
@@ -393,6 +396,8 @@ CONFIG_USBSER_TXBUFSIZE=512
 #
 # USB Storage Device Configuration
 #
+# CONFIG_USBSTRG
+#   Enable compilation of the USB storage driver
 # CONFIG_USBSTRG_EP0MAXPACKET
 #   Max packet size for endpoint 0
 # CONFIG_USBSTRG_EPBULKOUT and CONFIG_USBSTRG_EPBULKIN
@@ -410,6 +415,7 @@ CONFIG_USBSER_TXBUFSIZE=512
 #   The product ID code/string
 # CONFIG_USBSTRG_REMOVABLE
 #   Select if the media is removable
+CONFIG_USBSTRG=n
 CONFIG_USBSTRG_EP0MAXPACKET=64
 CONFIG_USBSTRG_EPBULKOUT=2
 CONFIG_USBSTRG_EPBULKIN=1
diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig
index 30dfa4a28..bf927317c 100644
--- a/nuttx/configs/ntosd-dm320/nsh/defconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/defconfig
@@ -369,6 +369,8 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
+# CONFIG_USBSER
+#   Enable compilation of the USB serial driver
 # CONFIG_USBSER_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
@@ -386,6 +388,7 @@ 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=n
 CONFIG_USBSER_EPINTIN=3
 CONFIG_USBSER_EPBULKOUT=2
 CONFIG_USBSER_EPBULKIN=1
@@ -401,6 +404,8 @@ CONFIG_USBSER_TXBUFSIZE=512
 #
 # USB Storage Device Configuration
 #
+# CONFIG_USBSTRG
+#   Enable compilation of the USB storage driver
 # CONFIG_USBSTRG_EP0MAXPACKET
 #   Max packet size for endpoint 0
 # CONFIG_USBSTRG_EPBULKOUT and CONFIG_USBSTRG_EPBULKIN
@@ -418,6 +423,7 @@ CONFIG_USBSER_TXBUFSIZE=512
 #   The product ID code/string
 # CONFIG_USBSTRG_REMOVABLE
 #   Select if the media is removable
+CONFIG_USBSTRG=n
 CONFIG_USBSTRG_EP0MAXPACKET=64
 CONFIG_USBSTRG_EPBULKOUT=2
 CONFIG_USBSTRG_EPBULKIN=1
diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig
index 4ee6d1b00..2d6ac291d 100644
--- a/nuttx/configs/ntosd-dm320/udp/defconfig
+++ b/nuttx/configs/ntosd-dm320/udp/defconfig
@@ -361,6 +361,8 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
+# CONFIG_USBSER
+#   Enable compilation of the USB serial driver
 # CONFIG_USBSER_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
@@ -378,6 +380,7 @@ 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=n
 CONFIG_USBSER_EPINTIN=3
 CONFIG_USBSER_EPBULKOUT=2
 CONFIG_USBSER_EPBULKIN=1
@@ -393,6 +396,8 @@ CONFIG_USBSER_TXBUFSIZE=512
 #
 # USB Storage Device Configuration
 #
+# CONFIG_USBSTRG
+#   Enable compilation of the USB storage driver
 # CONFIG_USBSTRG_EP0MAXPACKET
 #   Max packet size for endpoint 0
 # CONFIG_USBSTRG_EPBULKOUT and CONFIG_USBSTRG_EPBULKIN
@@ -410,6 +415,7 @@ CONFIG_USBSER_TXBUFSIZE=512
 #   The product ID code/string
 # CONFIG_USBSTRG_REMOVABLE
 #   Select if the media is removable
+CONFIG_USBSTRG=n
 CONFIG_USBSTRG_EP0MAXPACKET=64
 CONFIG_USBSTRG_EPBULKOUT=2
 CONFIG_USBSTRG_EPBULKIN=1
diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig
index f00afbf27..017c7e366 100644
--- a/nuttx/configs/ntosd-dm320/uip/defconfig
+++ b/nuttx/configs/ntosd-dm320/uip/defconfig
@@ -361,6 +361,8 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
+# CONFIG_USBSER
+#   Enable compilation of the USB serial driver
 # CONFIG_USBSER_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
@@ -378,6 +380,7 @@ 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=n
 CONFIG_USBSER_EPINTIN=3
 CONFIG_USBSER_EPBULKOUT=2
 CONFIG_USBSER_EPBULKIN=1
@@ -393,6 +396,8 @@ CONFIG_USBSER_TXBUFSIZE=512
 #
 # USB Storage Device Configuration
 #
+# CONFIG_USBSTRG
+#   Enable compilation of the USB storage driver
 # CONFIG_USBSTRG_EP0MAXPACKET
 #   Max packet size for endpoint 0
 # CONFIG_USBSTRG_EPBULKOUT and CONFIG_USBSTRG_EPBULKIN
@@ -410,6 +415,7 @@ CONFIG_USBSER_TXBUFSIZE=512
 #   The product ID code/string
 # CONFIG_USBSTRG_REMOVABLE
 #   Select if the media is removable
+CONFIG_USBSTRG=n
 CONFIG_USBSTRG_EP0MAXPACKET=64
 CONFIG_USBSTRG_EPBULKOUT=2
 CONFIG_USBSTRG_EPBULKIN=1