Rename examples/usbstorage to examples/usbmsc. From CCTSAO

configs/amber/hello/defconfig

@@ -398,7 +398,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/ea3131/README.txt

@@ -646,8 +646,8 @@ Where <subdir> is one of the following:
     driver at examples/usbserial.  See examples/README.txt for
     more information.
 
-  usbstorage:
+  usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at examples/usbstorage.  See examples/README.txt for
+    class driver at examples/usbmsc.  See examples/README.txt for
     more information.
 

configs/ea3131/usbmsc/Make.defs

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/ea3131/usbstorage/Make.defs
+# configs/ea3131/usbmsc/Make.defs
 #
 #   Copyright (C) 2010,2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

configs/ea3131/usbmsc/appconfig

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/teensy/usbstorage/appconfig
+# configs/ea3131/usbmsc/appconfig
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbstorage
+CONFIGURED_APPS += examples/usbmsc
 

configs/ea3131/usbmsc/defconfig

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/ea3131/usbstorage/defconfig
+# configs/ea3131/usbmsc/defconfig
 #
 #   Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -397,7 +397,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/ea3131/usbmsc/setenv.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/ea3131/usbstorage/setenv.sh
+# configs/ea3131/usbmsc/setenv.sh
 #
 #   Copyright (C) 2010 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

configs/ea3131/usbserial/defconfig

@@ -396,7 +396,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/hymini-stm32v/README.txt

@@ -610,7 +610,7 @@ Where <subdir> is one of the following:
     ----------- ----------------------- --------------------------------
     Built-in    None                    apps/examples/nx
     Apps                                apps/examples/nxhello
-                                        apps/examples/usbstorage (4)
+                                        apps/examples/usbmsc (4)
                                         apps/examples/buttons
                                         apps/examples/nximage
     =========== ======================= ================================

configs/hymini-stm32v/usbmsc/Make.defs

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/hymini-stm32v/usbstorage/Make.defs
+# configs/hymini-stm32v/usbmsc/Make.defs
 #
 #   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

configs/hymini-stm32v/usbmsc/appconfig

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/ea3131/usbstorage/appconfig
+# configs/hymini-stm32v/usbmsc/appconfig
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbstorage
+CONFIGURED_APPS += examples/usbmsc
 

configs/hymini-stm32v/usbmsc/defconfig

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/hymini-stm32v/usbstorage/defconfig
+# configs/hymini-stm32v/usbmsc/defconfig
 #
 #   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -462,7 +462,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/hymini-stm32v/usbstorage/appconfig

@@ -1,39 +0,0 @@
-############################################################################
-# configs/hymini-stm32v/usbstorage/appconfig
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/usbstorage
-

configs/lincoln60/ostest/defconfig

@@ -464,7 +464,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/lpcxpresso-lpc1768/README.txt

@@ -800,9 +800,9 @@ Where <subdir> is one of the following:
     Jumpers: Nothing special.  Use the default base board jumper
     settings.
 
-  usbstorage:
+  usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at apps/examples/usbstorage.  See apps/examples/README.txt
+    class driver at apps/examples/usbmsc.  See apps/examples/README.txt
     for more information.
 
     NOTE: At present, the value for the SD SPI frequency is too

configs/lpcxpresso-lpc1768/dhcpd/defconfig

@@ -462,7 +462,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/lpcxpresso-lpc1768/nsh/defconfig

@@ -472,7 +472,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/lpcxpresso-lpc1768/nx/defconfig

@@ -505,7 +505,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/lpcxpresso-lpc1768/ostest/defconfig

@@ -450,7 +450,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/lpcxpresso-lpc1768/thttpd/defconfig

@@ -489,7 +489,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/lpcxpresso-lpc1768/usbstorage/Make.defs

@@ -1,109 +0,0 @@
-############################################################################
-# configs/lpcxpresso-lpc1768/usbstorage/Make.defs
-#
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-  MKDEP = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
-  MAXOPTIMIZATION = -O2
-else
-  # Linux/Cygwin-native toolchain 
-  MKDEP = $(TOPDIR)/tools/mkdeps.sh
-  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
-endif
-
-CC = $(CROSSDEV)gcc
-CXX = $(CROSSDEV)g++
-CPP = $(CROSSDEV)gcc -E
-LD = $(CROSSDEV)ld
-AR = $(CROSSDEV)ar rcs
-NM = $(CROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
-ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -g
-else
-  ARCHOPTIMIZATION = $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
-endif
-
-ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
-ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
-ARCHWARNINGSXX = -Wall -Wshadow
-ARCHDEFINES =
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
-
-OBJEXT = .o
-LIBEXT = .a
-EXEEXT =
-
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS += -g
-endif
-
-
-HOSTCC = gcc
-HOSTINCLUDES = -I.
-HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS =
-

configs/lpcxpresso-lpc1768/usbstorage/appconfig

@@ -1,39 +0,0 @@
-############################################################################
-# configs/lpcxpresso-lpc1768/usbstorage/appconfig
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/usbstorage
-

configs/lpcxpresso-lpc1768/usbstorage/defconfig

@@ -1,469 +0,0 @@
-############################################################################
-# configs/lpcxpresso-lpc1768/usbstorage/defconfig
-#
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-#
-# Architecture Selection
-#
-CONFIG_ARCH="arm"
-CONFIG_ARCH_ARM=y
-CONFIG_ARCH_CORTEXM3=y
-CONFIG_ARCH_CHIP="lpc17xx"
-CONFIG_ARCH_CHIP_LPC17XX=y
-CONFIG_ARCH_CHIP_LPC1768=y
-CONFIG_ARCH_BOARD="lpcxpresso-lpc1768"
-CONFIG_ARCH_BOARD_LPCXPRESSO=y
-CONFIG_BOARD_LOOPSPERMSEC=8079
-CONFIG_RAM_SIZE=32768
-CONFIG_RAM_START=0x10000000
-CONFIG_ARCH_IRQPRIO=y
-CONFIG_ARCH_INTERRUPTSTACK=0
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
-CONFIG_ARCH_LEDS=y
-CONFIG_ARCH_BUTTONS=n
-CONFIG_ARCH_CALIBRATION=n
-CONFIG_ARCH_DMA=n
-
-#
-# Identify toolchain and linker options
-#
-CONFIG_LPC17_CODESOURCERYW=n
-CONFIG_LPC17_CODESOURCERYL=n
-CONFIG_LPC17_DEVKITARM=n
-CONFIG_LPC17_BUILDROOT=n
-CONFIG_LPC17_CODEREDW=n
-CONFIG_LPC17_CODEREDL=y
-
-#
-# Individual subsystems can be enabled:
-#
-CONFIG_LPC17_ETHERNET=n
-CONFIG_LPC17_USBHOST=n
-CONFIG_LPC17_USBOTG=n
-CONFIG_LPC17_USBDEV=y
-CONFIG_LPC17_UART0=n
-CONFIG_LPC17_UART1=n
-CONFIG_LPC17_UART2=n
-CONFIG_LPC17_UART3=y
-CONFIG_LPC17_CAN1=n
-CONFIG_LPC17_CAN2=n
-CONFIG_LPC17_SPI=n
-CONFIG_LPC17_SSP0=n
-CONFIG_LPC17_SSP1=y
-CONFIG_LPC17_I2C0=n
-CONFIG_LPC17_I2C1=n
-CONFIG_LPC17_I2S=n
-CONFIG_LPC17_TMR0=n
-CONFIG_LPC17_TMR1=n
-CONFIG_LPC17_TMR2=n
-CONFIG_LPC17_TMR3=n
-CONFIG_LPC17_RIT=n
-CONFIG_LPC17_PWM0=n
-CONFIG_LPC17_MCPWM=n
-CONFIG_LPC17_QEI=n
-CONFIG_LPC17_RTC=n
-CONFIG_LPC17_WDT=n
-CONFIG_LPC17_ADC=n
-CONFIG_LPC17_DAC=n
-CONFIG_LPC17_GPDMA=n
-
-#
-# LPC17xx specific serial device driver settings
-#
-CONFIG_UART0_SERIAL_CONSOLE=n
-CONFIG_UART1_SERIAL_CONSOLE=n
-CONFIG_UART2_SERIAL_CONSOLE=n
-CONFIG_UART3_SERIAL_CONSOLE=y
-
-CONFIG_UART0_TXBUFSIZE=256
-CONFIG_UART1_TXBUFSIZE=256
-CONFIG_UART2_TXBUFSIZE=256
-CONFIG_UART3_TXBUFSIZE=256
-
-CONFIG_UART0_RXBUFSIZE=256
-CONFIG_UART1_RXBUFSIZE=256
-CONFIG_UART2_RXBUFSIZE=256
-CONFIG_UART3_RXBUFSIZE=256
-
-CONFIG_UART0_BAUD=115200
-CONFIG_UART2_BAUD=115200
-CONFIG_UART3_BAUD=115200
-CONFIG_UART1_BAUD=115200
-
-CONFIG_UART0_BITS=8
-CONFIG_UART1_BITS=8
-CONFIG_UART2_BITS=8
-CONFIG_UART3_BITS=8
-
-CONFIG_UART0_PARITY=0
-CONFIG_UART1_PARITY=0
-CONFIG_UART2_PARITY=0
-CONFIG_UART3_PARITY=0
-
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
-
-#
-# LPC17xx specific PHY/Ethernet device driver settings
-#
-CONFIG_PHY_KS8721=n
-CONFIG_PHY_DP83848C=n
-CONFIG_PHY_LAN8720=y
-CONFIG_PHY_AUTONEG=y
-CONFIG_PHY_SPEED100=n
-CONFIG_PHY_FDUPLEX=y
-
-#
-# General build options
-#
-CONFIG_RRLOAD_BINARY=n
-CONFIG_INTELHEX_BINARY=y
-CONFIG_MOTOROLA_SREC=n
-CONFIG_RAW_BINARY=n
-
-#
-# General OS setup
-#
-CONFIG_USER_ENTRYPOINT="msconn_main"
-#CONFIG_USER_ENTRYPOINT="msdis_main"
-CONFIG_DEBUG=n
-CONFIG_DEBUG_VERBOSE=n
-CONFIG_DEBUG_SYMBOLS=n
-CONFIG_DEBUG_USB=n
-CONFIG_MM_REGIONS=2
-CONFIG_ARCH_LOWPUTC=y
-CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_INSTRUMENTATION=n
-CONFIG_TASK_NAME_SIZE=0
-CONFIG_START_YEAR=2011
-CONFIG_START_MONTH=4
-CONFIG_START_DAY=15
-CONFIG_GREGORIAN_TIME=n
-CONFIG_JULIAN_TIME=n
-CONFIG_DEV_CONSOLE=y
-CONFIG_DEV_LOWCONSOLE=n
-CONFIG_MUTEX_TYPES=n
-CONFIG_PRIORITY_INHERITANCE=n
-CONFIG_SEM_PREALLOCHOLDERS=0
-CONFIG_SEM_NNESTPRIO=0
-CONFIG_FDCLONE_DISABLE=n
-CONFIG_FDCLONE_STDIO=n
-CONFIG_SDCLONE_DISABLE=y
-CONFIG_NXFLAT=n
-CONFIG_SCHED_WORKQUEUE=n
-CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=50000
-CONFIG_SCHED_WORKSTACKSIZE=1024
-CONFIG_SIG_SIGWORK=17
-
-#
-# The following can be used to disable categories of
-# APIs supported by the OS.  If the compiler supports
-# weak functions, then it should not be necessary to
-# disable functions unless you want to restrict usage
-# of those APIs.
-#
-# There are certain dependency relationships in these
-# features.
-#
-# o mq_notify logic depends on signals to awaken tasks
-#   waiting for queues to become full or empty.
-# o pthread_condtimedwait() depends on signals to wake
-#   up waiting tasks.
-#
-CONFIG_DISABLE_CLOCK=n
-CONFIG_DISABLE_POSIX_TIMERS=n
-CONFIG_DISABLE_PTHREAD=n
-CONFIG_DISABLE_SIGNALS=n
-CONFIG_DISABLE_MQUEUE=n
-CONFIG_DISABLE_MOUNTPOINT=y
-CONFIG_DISABLE_ENVIRON=n
-CONFIG_DISABLE_POLL=y
-
-#
-# Misc libc settings
-#
-CONFIG_NOPRINTF_FIELDWIDTH=n
-
-#
-# Allow for architecture optimized implementations
-#
-# The architecture can provide optimized versions of the
-# following to improve system performance
-#
-CONFIG_ARCH_MEMCPY=n
-CONFIG_ARCH_MEMCMP=n
-CONFIG_ARCH_MEMMOVE=n
-CONFIG_ARCH_MEMSET=n
-CONFIG_ARCH_STRCMP=n
-CONFIG_ARCH_STRCPY=n
-CONFIG_ARCH_STRNCPY=n
-CONFIG_ARCH_STRLEN=n
-CONFIG_ARCH_STRNLEN=n
-CONFIG_ARCH_BZERO=n
-
-#
-# Sizes of configurable things (0 disables)
-#
-CONFIG_MAX_TASKS=16
-CONFIG_MAX_TASK_ARGS=4
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
-CONFIG_STDIO_BUFFER_SIZE=64
-CONFIG_NUNGET_CHARS=2
-CONFIG_PREALLOC_MQ_MSGS=4
-CONFIG_MQ_MAXMSGSIZE=32
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_PREALLOC_TIMERS=4
-
-#
-# Filesystem configuration
-#
-CONFIG_FS_FAT=n
-CONFIG_FS_ROMFS=n
-
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MTD=y
-
-#
-# SPI-based MMC/SD driver
-#
-CONFIG_MMCSD_NSLOTS=1
-CONFIG_MMCSD_READONLY=n
-CONFIG_MMCSD_SPICLOCK=12500000
-
-#
-# Block driver buffering
-#
-CONFIG_FS_READAHEAD=n
-CONFIG_FS_WRITEBUFFER=n
-
-#
-# SDIO-based MMC/SD driver
-#
-CONFIG_SDIO_DMA=n
-CONFIG_MMCSD_MMCSUPPORT=n
-CONFIG_MMCSD_HAVECARDDETECT=n
-
-#
-# TCP/IP and UDP support via uIP
-#
-CONFIG_NET=n
-CONFIG_NET_IPv6=n
-CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=420
-CONFIG_NET_TCP=n
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_UDP=n
-CONFIG_NET_UDP_CHECKSUMS=y
-#CONFIG_NET_UDP_CONNS=10
-CONFIG_NET_ICMP=n
-CONFIG_NET_ICMP_PING=n
-#CONFIG_NET_PINGADDRCONF=0
-CONFIG_NET_STATISTICS=y
-#CONFIG_NET_RECEIVE_WINDOW=
-#CONFIG_NET_ARPTAB_SIZE=8
-CONFIG_NET_BROADCAST=n
-
-#
-# UIP Network Utilities
-#
-CONFIG_NET_DHCP_LIGHT=n
-CONFIG_NET_RESOLV_ENTRIES=4
-
-#
-# USB Device Configuration
-#
-CONFIG_USBDEV=y
-CONFIG_USBDEV_ISOCHRONOUS=n
-CONFIG_USBDEV_DUALSPEED=n
-CONFIG_USBDEV_SELFPOWERED=y
-CONFIG_USBDEV_REMOTEWAKEUP=n
-CONFIG_USBDEV_MAXPOWER=100
-CONFIG_USBDEV_TRACE=n
-CONFIG_USBDEV_TRACE_NRECORDS=128
-
-#
-# LPC17xx USB Configuration
-#
-CONFIG_LPC17_USBDEV_FRAME_INTERRUPT=n
-CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT=n
-CONFIG_LPC17_USBDEV_DMA=n
-CONFIG_LPC17_USBDEV_NDMADESCRIPTORS=0
-CONFIG_LPC17_USBDEV_NOVBUS=y
-CONFIG_LPC17_USBDEV_NOLED=y
-
-#
-# USB Serial Device Configuration
-#
-CONFIG_PL2303=n
-CONFIG_PL2303_EPINTIN=1
-CONFIG_PL2303_EPBULKOUT=2
-CONFIG_PL2303_EPBULKIN=5
-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
-#
-CONFIG_USBMSC=y
-CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBMSC_REMOVABLE=y
-
-#
-# Settings for examples/uip
-#
-CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLES_UIP_DHCPC=n
-
-#
-# Settings for examples/nettest
-#
-CONFIG_EXAMPLES_NETTEST_SERVER=n
-CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLES_NETTEST_NOMAC=y
-CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
-
-#
-# Settings for examples/ostest
-#
-CONFIG_EXAMPLES_OSTEST_LOOPS=1
-CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
-CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
-
-#
-# Settings for apps/nshlib
-#
-CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_STRERROR=n
-CONFIG_NSH_LINELEN=64
-CONFIG_NSH_NESTDEPTH=3
-CONFIG_NSH_DISABLESCRIPT=n
-CONFIG_NSH_DISABLEBG=n
-CONFIG_NSH_ROMFSETC=n
-CONFIG_NSH_CONSOLE=y
-CONFIG_NSH_TELNET=n
-CONFIG_NSH_ARCHINIT=n
-CONFIG_NSH_IOBUFFER_SIZE=512
-CONFIG_NSH_DHCPC=n
-CONFIG_NSH_NOMAC=n
-CONFIG_NSH_IPADDR=0x0a000002
-CONFIG_NSH_DRIPADDR=0x0a000001
-CONFIG_NSH_NETMASK=0xffffff00
-CONFIG_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_NSH_ROMFSDEVNO=0
-CONFIG_NSH_ROMFSSECTSIZE=64
-CONFIG_NSH_FATDEVNO=1
-CONFIG_NSH_FATSECTSIZE=512
-CONFIG_NSH_FATNSECTORS=1024
-CONFIG_NSH_FATMOUNTPT="/tmp"
-
-#
-# Architecture-specific NSH options
-#
-CONFIG_NSH_MMCSDSPIPORTNO=1
-CONFIG_NSH_MMCSDSLOTNO=0
-CONFIG_NSH_MMCSDMINOR=0
-
-#
-# Settings for examples/usbserial
-#
-CONFIG_EXAMPLES_USBSERIAL_INONLY=n
-CONFIG_EXAMPLES_USBSERIAL_OUTONLY=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
-
-CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECLASS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
-
-#
-# Settings for examples/usbstorage
-#
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
-
-#
-# Stack and heap information
-#
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048

configs/lpcxpresso-lpc1768/usbstorage/setenv.sh

@@ -1,59 +0,0 @@
-#!/bin/bash
-# configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-if [ "$(basename $0)" = "setenv.sh" ] ; then
-  echo "You must source this script, not run it!" 1>&2
-  exit 1
-fi
-
-if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
-
-WD=`pwd`
-
-# This is where the buildroot might reside on a Linux or Cygwin system
-# export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-
-# This is the default install location for Code Red on Linux
-export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
-
-# This is the Cygwin path to the LPCXpresso 3.6 install location under Windows
-#export TOOLCHAIN_BIN="/cygdrive/c/nxp/lpcxpresso_3.6/Tools/bin"
-
-# This is the path to the LPCXpression tool subdirectory
-export LPCTOOL_DIR="${WD}/configs/lpcxpresso-lpc1768/tools"
-
-# Add the path to the toolchain to the PATH varialble
-export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
-
-echo "PATH : ${PATH}"

configs/mcu123-lpc214x/README.txt

@@ -388,11 +388,11 @@ usbserial:
   NOTE:  If you have problems with this configurationt, perhaps it is a
   consequence of the last USB driver checking (r4359)
 
-usbstorage:
+usbmsc:
------------
+-------
 
   This configuration directory exercises the USB mass storage
-  class driver at examples/usbstorage.  See examples/README.txt for
+  class driver at examples/usbmsc.  See examples/README.txt for
   more information.
 
   Default toolchain:  Buildroot

configs/mcu123-lpc214x/composite/defconfig

@@ -383,7 +383,7 @@ CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
 CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/mcu123-lpc214x/usbmsc/Make.defs

@@ -1,5 +1,5 @@
 ##############################################################################
-# configs/mcu123-lpc214x/usbstorage/Make.defs
+# configs/mcu123-lpc214x/usbmsc/Make.defs
 #
 #   Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

configs/mcu123-lpc214x/usbmsc/appconfig

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/nucleus2g/usbstorage/appconfig
+# configs/mcu123-lpc214x/usbmsc/appconfig
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbstorage
+CONFIGURED_APPS += examples/usbmsc
 

configs/mcu123-lpc214x/usbmsc/defconfig

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/mcu123-lpc214x/usbstorage/defconfig
+# configs/mcu123-lpc214x/usbmsc/defconfig
 #
 #   Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -340,7 +340,7 @@ CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
 CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/mcu123-lpc214x/usbmsc/setenv.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/mcu123-lpc2148/usbstorage/setenv.sh
+# configs/mcu123-lpc214x/usbmsc/setenv.sh
 #
 #   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

configs/mcu123-lpc214x/usbstorage/appconfig

@@ -1,39 +0,0 @@
-############################################################################
-# configs/mcu123-lpc214x/usbstorage/appconfig
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/usbstorage
-

configs/micropendous3/hello/defconfig

@@ -393,7 +393,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/mirtoo/nsh/defconfig

@@ -473,7 +473,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/mirtoo/nxffs/defconfig

@@ -516,7 +516,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/mirtoo/ostest/defconfig

@@ -449,7 +449,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/nucleus2g/README.txt

@@ -543,8 +543,8 @@ Where <subdir> is one of the following:
     driver at examples/usbserial.  See examples/README.txt for
     more information.
 
-  usbstorage:
+  usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at examples/usbstorage.  See examples/README.txt for
+    class driver at examples/usbmsc.  See examples/README.txt for
     more information.
 

configs/nucleus2g/usbmsc/Make.defs

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/nucleus2g/usbstorage/Make.defs
+# configs/nucleus2g/usbmsc/Make.defs
 #
 #   Copyright (C) 2010 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

configs/nucleus2g/usbmsc/appconfig

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/stm3210e-eval/usbstorage/appconfig
+# configs/nucleus2g/usbmsc/appconfig
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbstorage
+CONFIGURED_APPS += examples/usbmsc
 

configs/nucleus2g/usbmsc/defconfig

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/nucleus2g/usbstorage/defconfig
+# configs/nucleus2g/usbmsc/defconfig
 #
 #   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -439,7 +439,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/nucleus2g/usbmsc/setenv.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/nucleus2g/usbstorage/setenv.sh
+# configs/nucleus2g/usbmsc/setenv.sh
 #
 #   Copyright (C) 2010 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

configs/olimex-lpc1766stk/README.txt

@@ -1056,9 +1056,9 @@ Where <subdir> is one of the following:
     driver at apps/examples/usbserial.  See apps/examples/README.txt for
     more information.
 
-  usbstorage:
+  usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at apps/examples/usbstorage.  See apps/examples/README.txt
+    class driver at apps/examples/usbmsc.  See apps/examples/README.txt
     for more information.
 
   zmodem:

configs/olimex-lpc1766stk/nx/defconfig

@@ -536,7 +536,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/olimex-lpc1766stk/ostest/defconfig

@@ -464,7 +464,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/olimex-lpc1766stk/usbmsc/Make.defs

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/olimex-lpc1766stk/usbstorage/Make.defs
+# configs/olimex-lpc1766stk/usbmsc/Make.defs
 #
 #   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

configs/olimex-lpc1766stk/usbmsc/appconfig

@@ -0,0 +1,39 @@
+############################################################################
+# configs/olimex-lpc1766stk/usbmsc/appconfig
+#
+#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+# Path to example in apps/examples containing the user_start entry point
+
+CONFIGURED_APPS += examples/usbmsc
+

configs/olimex-lpc1766stk/usbmsc/defconfig

@@ -1,5 +1,5 @@
 ############################################################################
-# configs/olimex-lpc1766stk/usbstorage/defconfig
+# configs/olimex-lpc1766stk/usbmsc/defconfig
 #
 #   Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -466,7 +466,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0

configs/olimex-lpc1766stk/usbmsc/setenv.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/olimex-lpc1766stk/usbstorage/setenv.sh
+# configs/olimex-lpc1766stk/usbmsc/setenv.sh
 #
 #   Copyright (C) 2010 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>

configs/olimex-lpc1766stk/usbstorage/appconfig

@@ -1,39 +0,0 @@
-############################################################################
-# configs/olimex-lpc1766stk/usbstorage/appconfig
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/usbstorage
-

configs/pic32-starterkit/README.txt

@@ -1095,7 +1095,7 @@ Where <subdir> is one of the following:
 
       CONFIG_CDCACM=y         : Enable the CDCACM device
 
-    examples/usbstorage - There are some hooks in the appconfig file
+    examples/usbmsc - There are some hooks in the appconfig file
     to enable the USB mass storage device.  However, this device cannot
     work until support for the SD card is also incorporated.
 
@@ -1208,10 +1208,10 @@ Where <subdir> is one of the following:
 
   2. Changes to apps/.config.
 
-    a) Enable building of the examples/usbstorage:
+    a) Enable building of the examples/usbmsc:
 
-      -# CONFIGURED_APPS += examples/usbstorage
+      -# CONFIGURED_APPS += examples/usbmsc
-      +  CONFIGURED_APPS += examples/usbstorage
+      +  CONFIGURED_APPS += examples/usbmsc
 
   3. When NSH first comes up, you must manually create the RAM disk
      before exporting it:

configs/pic32-starterkit/nsh/appconfig

@@ -55,8 +55,8 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y)
 # USB Mass Storage Class device configurations
 
 ifeq ($(CONFIG_USBMSC),y)
-#  Uncomment to enable the examples/usbstorage built-in
+#  Uncomment to enable the examples/usbmsc built-in
-#  CONFIGURED_APPS += examples/usbstorage
+#  CONFIGURED_APPS += examples/usbmsc
 endif
 
 # USB CDC/ACM serial device configurations