Updates for stm32f4discovery/usbnsh configuration

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

6 files changed, 70 insertions, 41 deletions

diff --git a/nuttx/README.txt b/nuttx/README.txt
index 2ff473fa0..c597091dc 100644
--- a/nuttx/README.txt
+++ b/nuttx/README.txt
@@ -280,8 +280,14 @@ NuttX Configuration Tool
 
     make menuconfig
 
-  This make target will bring up NuttX configuration menus.  The
-  'menuconfig' target depends on two things:
+  This make target will bring up NuttX configuration menus.
+
+  WARNING:  Never do 'make menuconfig' on a configuration that has
+  not been converted to use the kconfig-frontends tools!  This will
+  damage your configuration (see 
+  http://www.nuttx.org/doku.php?id=wiki:howtos:convertconfig).
+
+  The 'menuconfig' make target depends on two things:
 
   1. The Kconfig configuration data files that appear in almost all
      NuttX directories.  These data files are the part that is still
@@ -319,6 +325,22 @@ NuttX Configuration Tool
   This is pretty straight forward for creating new configurations
   but may be less intuitive for modifying existing configurations.
 
+Refreshing Configurations with 'make oldconfig'
+-----------------------------------------------
+
+  Whenever you use a configuration, you really should always do
+  the following *before* you make NuttX:
+
+    make oldconfig
+
+  This will make sure that the configuration is up-to-date in
+  the event that it has lapsed behind the current NuttX development.
+
+  WARNING:  Never do 'make oldconfig' (OR 'make menuconfig') on a
+  configuration that has not been converted to use the kconfig-frontends
+  tools!  This will damage your configuration (see
+  http://www.nuttx.org/doku.php?id=wiki:howtos:convertconfig).
+
 Incompatibilities with Older Configurations
 -------------------------------------------
 
diff --git a/nuttx/configs/sim/nsh/defconfig b/nuttx/configs/sim/nsh/defconfig
index 7b72ac303..6b0b8400a 100644
--- a/nuttx/configs/sim/nsh/defconfig
+++ b/nuttx/configs/sim/nsh/defconfig
@@ -56,7 +56,7 @@ CONFIG_ARCH_SIM=y
 # CONFIG_ARCH_Z16 is not set
 # CONFIG_ARCH_Z80 is not set
 CONFIG_ARCH="sim"
-CONFIG_BOARD_LOOPSPERMSEC=
+CONFIG_BOARD_LOOPSPERMSEC=0
 
 #
 # Simulation Configuration Options
@@ -65,6 +65,10 @@ CONFIG_BOARD_LOOPSPERMSEC=
 # CONFIG_SIM_WALLTIME is not set
 
 #
+# External Memory Configuration
+#
+
+#
 # Architecture Options
 #
 # CONFIG_ARCH_NOINTC is not set
@@ -81,8 +85,8 @@ CONFIG_BOARD_LOOPSPERMSEC=
 #
 # Board Settings
 #
-CONFIG_DRAM_START=
-CONFIG_DRAM_SIZE=
+CONFIG_DRAM_START=0x0
+CONFIG_DRAM_SIZE=0
 
 #
 # Boot options
@@ -117,6 +121,7 @@ CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=32
 CONFIG_SCHED_HAVE_PARENT=y
+# CONFIG_SCHED_CHILD_STATUS is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2008
 CONFIG_START_MONTH=6
@@ -129,6 +134,7 @@ CONFIG_DEV_CONSOLE=y
 CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_WORKQUEUE is not set
 CONFIG_SCHED_WAITPID=y
+# CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
@@ -139,9 +145,7 @@ CONFIG_DISABLE_OS_API=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
 # CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_MOUNTPOINT is not set
 # CONFIG_DISABLE_ENVIRON is not set
-CONFIG_DISABLE_POLL=y
 
 #
 # Signal Numbers
@@ -178,6 +182,7 @@ CONFIG_PTHREAD_STACK_DEFAULT=8192
 #
 # Device Drivers
 #
+CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_LOOP is not set
@@ -228,6 +233,7 @@ CONFIG_SERIAL=y
 #
 # File system configuration
 #
+# CONFIG_DISABLE_MOUNTPOINT is not set
 # CONFIG_FS_RAMMAP is not set
 CONFIG_FS_FAT=y
 CONFIG_FAT_LCNAMES=y
@@ -338,7 +344,6 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MOUNT is not set
 # CONFIG_EXAMPLES_MODBUS is not set
-# CONFIG_EXAMPLES_NETTEST is not set
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
@@ -352,7 +357,6 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PASHELLO is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
 # CONFIG_EXAMPLES_QENCODER is not set
 # CONFIG_EXAMPLES_RGMP is not set
diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt
index 207ee6cde..e34168224 100644
--- a/nuttx/configs/stm32f4discovery/README.txt
+++ b/nuttx/configs/stm32f4discovery/README.txt
@@ -1235,10 +1235,11 @@ Where <subdir> is one of the following:
 
      7. USB Support (CDC/ACM device)
 
-        CONFIG_STM32_OTGFS=y      : STM32 OTG FS support
-        CONFIG_USBDEV=y           : USB device support must be enabled
-        CONFIG_CDCACM=y           : The CDC/ACM driver must be built
-        CONFIG_NSH_BUILTIN_APPS=y : NSH built-in application support must be enabled
+        CONFIG_STM32_OTGFS=y          : STM32 OTG FS support
+        CONFIG_USBDEV=y               : USB device support must be enabled
+        CONFIG_CDCACM=y               : The CDC/ACM driver must be built
+        CONFIG_NSH_BUILTIN_APPS=y     : NSH built-in application support must be enabled
+        CONFIG_NSH_ARCHINIT=y         : To perform USB initialization
 
      8. Using the USB console.
 
@@ -1246,11 +1247,12 @@ Where <subdir> is one of the following:
         (or PL2303) USB console.  The normal way that you would configure the
         the USB console would be to change the .config file like this:
 
-        CONFIG_STM32_OTGFS=y      : STM32 OTG FS support
-        CONFIG_DEV_CONSOLE=n      : Inhibit use of /dev/console by other logic
-        CONFIG_USBDEV=y           : USB device support must be enabled
-        CONFIG_CDCACM=y           : The CDC/ACM driver must be built
-        CONFIG_CDCACM_CONSOLE=y   : Enable the CDC/ACM USB console.
+        CONFIG_STM32_OTGFS=y           : STM32 OTG FS support
+        CONFIG_USART2_SERIAL_CONSOLE=n : Disable the USART2 console
+        CONFIG_DEV_CONSOLE=n           : Inhibit use of /dev/console by other logic
+        CONFIG_USBDEV=y                : USB device support must be enabled
+        CONFIG_CDCACM=y                : The CDC/ACM driver must be built
+        CONFIG_CDCACM_CONSOLE=y        : Enable the CDC/ACM USB console.
 
         However, that configuration does not work.  It fails early probably because
         of some dependency on /dev/console before the USB connection is established.
@@ -1260,11 +1262,12 @@ Where <subdir> is one of the following:
         but this version will will use /dev/console.  Instead, it will use the
         normal /dev/ttyACM0 USB serial device for the console:
 
-        CONFIG_STM32_OTGFS=y      : STM32 OTG FS support
-        CONFIG_USBDEV=y           : USB device support must be enabled
-        CONFIG_CDCACM=y           : The CDC/ACM driver must be built
-        CONFIG_CDCACM_CONSOLE=n   : Done use the CDC/ACM USB console.
-        CONFIG_NSH_USBCONSOLE=y   : Instead use some other USB device for the console
+        CONFIG_STM32_OTGFS=y           : STM32 OTG FS support
+        CONFIG_USART2_SERIAL_CONSOLE=n : Disable the USART2 console
+        CONFIG_USBDEV=y                : USB device support must be enabled
+        CONFIG_CDCACM=y                : The CDC/ACM driver must be built
+        CONFIG_CDCACM_CONSOLE=n        : Don't use the CDC/ACM USB console.
+        CONFIG_NSH_USBCONSOLE=y        : Instead use some other USB device for the console
 
         The particular USB device that is used is:
 
diff --git a/nuttx/configs/stm32f4discovery/usbnsh/defconfig b/nuttx/configs/stm32f4discovery/usbnsh/defconfig
index 3ddcab424..534445f01 100644
--- a/nuttx/configs/stm32f4discovery/usbnsh/defconfig
+++ b/nuttx/configs/stm32f4discovery/usbnsh/defconfig
@@ -292,7 +292,7 @@ CONFIG_TASK_NAME_SIZE=0
 CONFIG_START_YEAR=2013
 CONFIG_START_MONTH=1
 CONFIG_START_DAY=27
-CONFIG_DEV_CONSOLE=y
+# CONFIG_DEV_CONSOLE is not set
 # CONFIG_MUTEX_TYPES is not set
 # CONFIG_PRIORITY_INHERITANCE is not set
 # CONFIG_FDCLONE_DISABLE is not set
@@ -406,19 +406,19 @@ CONFIG_USBDEV_SELFPOWERED=y
 CONFIG_CDCACM=y
 CONFIG_CDCACM_CONSOLE=y
 CONFIG_CDCACM_EP0MAXPACKET=64
-CONFIG_CDCACM_EPINTIN=2
+CONFIG_CDCACM_EPINTIN=1
 CONFIG_CDCACM_EPINTIN_FSSIZE=64
 CONFIG_CDCACM_EPINTIN_HSSIZE=64
-CONFIG_CDCACM_EPBULKOUT=0
+CONFIG_CDCACM_EPBULKOUT=3
 CONFIG_CDCACM_EPBULKOUT_FSSIZE=64
 CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
-CONFIG_CDCACM_EPBULKIN=0
+CONFIG_CDCACM_EPBULKIN=2
 CONFIG_CDCACM_EPBULKIN_FSSIZE=64
 CONFIG_CDCACM_EPBULKIN_HSSIZE=512
 CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_NRDREQS=4
 CONFIG_CDCACM_RXBUFSIZE=256
-# CONFIG_CDCACM_TXBUFSIZE is not set
+CONFIG_CDCACM_TXBUFSIZE=256
 CONFIG_CDCACM_VENDORID=0x0525
 CONFIG_CDCACM_PRODUCTID=0xa4a7
 CONFIG_CDCACM_VENDORSTR="NuttX"
diff --git a/nuttx/drivers/usbdev/Kconfig b/nuttx/drivers/usbdev/Kconfig
index 6fa4124be..5ab6bb8fa 100644
--- a/nuttx/drivers/usbdev/Kconfig
+++ b/nuttx/drivers/usbdev/Kconfig
@@ -272,10 +272,10 @@ config CDCACM_EP0MAXPACKET
 
 config CDCACM_EPINTIN
 	int "Hardware endpoint that supports interrupt IN operation"
-	default 2
+	default 1
 	---help---
 		The logical 7-bit address of a hardware endpoint that supports
-		interrupt IN operation.  Default 2.
+		interrupt IN operation.  Default 1.
 
 config CDCACM_EPINTIN_FSSIZE
 	int "Endpoint in full speed size"
@@ -293,10 +293,10 @@ config CDCACM_EPINTIN_HSSIZE
 
 config CDCACM_EPBULKOUT
 	int "Endpoint bulk out"
-	default 0
+	default 3
 	---help---
 		The logical 7-bit address of a hardware endpoint that supports
-		bulk OUT operation
+		bulk OUT operation.  Default: 3
 
 config CDCACM_EPBULKOUT_FSSIZE
 	int "Endpoint bulk out full speed size"
@@ -314,10 +314,10 @@ config CDCACM_EPBULKOUT_HSSIZE
 
 config CDCACM_EPBULKIN
 	int "Endpoint bulk in"
-	default 0
+	default 2
 	---help---
 		The logical 7-bit address of a hardware endpoint that supports
-		bulk IN operation
+		bulk IN operation.  Default: 2
 
 config CDCACM_EPBULKIN_FSSIZE
 	int "Endpoint bulk in full speed size"
@@ -352,7 +352,7 @@ config CDCACM_RXBUFSIZE
 		Size of the serial receive/transmit buffers
 
 config CDCACM_TXBUFSIZE
-	bool "Transmit buffer size"
+	int "Transmit buffer size"
 	default 256
 	---help---
 		Size of the serial receive/transmit buffers
diff --git a/nuttx/include/nuttx/usb/cdcacm.h b/nuttx/include/nuttx/usb/cdcacm.h
index 1dca050c4..49dc4ee12 100644
--- a/nuttx/include/nuttx/usb/cdcacm.h
+++ b/nuttx/include/nuttx/usb/cdcacm.h
@@ -54,7 +54,7 @@
  *   Endpoint 0 max packet size. Default 64.
  * CONFIG_CDCACM_EPINTIN
  *   The logical 7-bit address of a hardware endpoint that supports
- *   interrupt IN operation.  Default 2.
+ *   interrupt IN operation.  Default 1.
  * CONFIG_CDCACM_EPINTIN_FSSIZE
  *   Max package size for the interrupt IN endpoint if full speed mode.
  *   Default 64.
@@ -63,7 +63,7 @@
  *   Default 64.
  * CONFIG_CDCACM_EPBULKOUT
  *   The logical 7-bit address of a hardware endpoint that supports
- *   bulk OUT operation
+ *   bulk OUT operation.  Default: 3
  * CONFIG_CDCACM_EPBULKOUT_FSSIZE
  *   Max package size for the bulk OUT endpoint if full speed mode.
  *   Default 64.
@@ -72,7 +72,7 @@
  *   Default 512.
  * CONFIG_CDCACM_EPBULKIN
  *   The logical 7-bit address of a hardware endpoint that supports
- *   bulk IN operation
+ *   bulk IN operation.  Default: 2
  * CONFIG_CDCACM_EPBULKIN_FSSIZE
  *   Max package size for the bulk IN endpoint if full speed mode.
  *   Default 64.
@@ -107,7 +107,7 @@
  */
 
 #ifndef CONFIG_CDCACM_EPINTIN
-#  define CONFIG_CDCACM_EPINTIN 2
+#  define CONFIG_CDCACM_EPINTIN 1
 #endif
 
 #ifndef CONFIG_CDCACM_EPINTIN_FSSIZE
@@ -124,7 +124,7 @@
  */
 
 #ifndef CONFIG_CDCACM_EPBULKIN
-#  define CONFIG_CDCACM_EPBULKIN 3
+#  define CONFIG_CDCACM_EPBULKIN 2
 #endif
 
 #ifndef CONFIG_CDCACM_EPBULKIN_FSSIZE
@@ -141,7 +141,7 @@
  */
 
 #ifndef CONFIG_CDCACM_EPBULKOUT
-#  define CONFIG_CDCACM_EPBULKOUT 4
+#  define CONFIG_CDCACM_EPBULKOUT 3
 #endif
 
 #ifndef CONFIG_CDCACM_EPBULKOUT_FSSIZE