Move apps/examples/usbmsc to apps/system/usbmsc

7 files changed, 36 insertions, 27 deletions

diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt
index 8c131b150..7e1814584 100644
--- a/nuttx/configs/sama5d3x-ek/README.txt
+++ b/nuttx/configs/sama5d3x-ek/README.txt
@@ -1141,18 +1141,18 @@ Configurations
          CONFIG_USBMSC_EPBULKOUT=1             : Use EP1 for the BULK OUT endpoint
          CONFIG_USBMSC_EPBULKIN=2              : Use EP2 for the BULK IN endpoint
 
-       The following setting enables an example that can can be used to
+       The following setting enables an add-on that can can be used to
        control the CDC/ACM device.  It will add two new NSH commands:
 
          a. msconn will connect the USB serial device and export the AT25
             to the host, and
          b. msdis which will disconnect the USB serial device.
 
-       Application Configuration -> Examples:
-         CONFIG_EXAMPLES_USBMSC=y              : Enable the USBMSC example
-         CONFIG_EXAMPLES_USBMSC_NLUNS=1        : One LUN
-         CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0    : Minor device zero
-         CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mtdblock0"
+       Application Configuration -> System Add-Ons:
+         CONFIG_SYSTEM_USBMSC=y                : Enable the USBMSC add-on
+         CONFIG_SYSTEM_USBMSC_NLUNS=1          : One LUN
+         CONFIG_SYSTEM_USBMSC_DEVMINOR1=0      : Minor device zero
+         CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mtdblock0"
                                                : Use a single, LUN:  The AT25
                                                : block driver.
 
@@ -1169,7 +1169,7 @@ Configurations
            nsh> msdis
            nsh> mount -t vfat /dev/mtdblock0 /mnt/at25
 
-       b. If you change the value CONFIG_EXAMPLES_USBMSC_DEVPATH1, then you
+       b. If you change the value CONFIG_SYSTEM_USBMSC_DEVPATH1, then you
           can export other file systems:
 
            "/dev/mmcsd1" will export the HSMCI1 microSD
diff --git a/nuttx/configs/sama5d3x-ek/demo/defconfig b/nuttx/configs/sama5d3x-ek/demo/defconfig
index 6e0c3299d..a2273e1ec 100644
--- a/nuttx/configs/sama5d3x-ek/demo/defconfig
+++ b/nuttx/configs/sama5d3x-ek/demo/defconfig
@@ -43,6 +43,7 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 # CONFIG_DEBUG is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
@@ -691,19 +692,6 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-CONFIG_EXAMPLES_USBMSC=y
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mtdblock0"
-CONFIG_EXAMPLES_USBMSC_DEVMINOR2=1
-CONFIG_EXAMPLES_USBMSC_DEVPATH2="/dev/mmcsd1"
-CONFIG_EXAMPLES_USBMSC_DEVMINOR3=2
-CONFIG_EXAMPLES_USBMSC_DEVPATH3="/dev/mmcsd2"
-# CONFIG_EXAMPLES_USBMSC_DEBUGMM is not set
-CONFIG_EXAMPLES_USBMSC_CMD_STACKSIZE=768
-CONFIG_EXAMPLES_USBMSC_CMD_PRIORITY=100
-CONFIG_EXAMPLES_USBMSC_DAEMON_STACKSIZE=2048
-CONFIG_EXAMPLES_USBMSC_DAEMON_PRIORITY=100
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
@@ -877,6 +865,27 @@ CONFIG_READLINE_ECHO=y
 #
 
 #
+# Stack Monitor
+#
+
+#
+# USB Mass Storage Class
+#
+CONFIG_SYSTEM_USBMSC=y
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mtdblock0"
+CONFIG_SYSTEM_USBMSC_DEVMINOR2=1
+CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mmcsd1"
+CONFIG_SYSTEM_USBMSC_DEVMINOR3=2
+CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
+# CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
+CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE=768
+CONFIG_SYSTEM_USBMSC_CMD_PRIORITY=100
+CONFIG_SYSTEM_USBMSC_DAEMON_STACKSIZE=2048
+CONFIG_SYSTEM_USBMSC_DAEMON_PRIORITY=100
+
+#
 # Zmodem Commands
 #
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/nuttx/configs/sama5d3x-ek/hello/defconfig b/nuttx/configs/sama5d3x-ek/hello/defconfig
index a89e0e977..416f6475b 100644
--- a/nuttx/configs/sama5d3x-ek/hello/defconfig
+++ b/nuttx/configs/sama5d3x-ek/hello/defconfig
@@ -510,7 +510,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/nuttx/configs/sama5d3x-ek/norboot/defconfig b/nuttx/configs/sama5d3x-ek/norboot/defconfig
index 8af56b68b..5aea4c9f3 100644
--- a/nuttx/configs/sama5d3x-ek/norboot/defconfig
+++ b/nuttx/configs/sama5d3x-ek/norboot/defconfig
@@ -525,7 +525,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/nuttx/configs/sama5d3x-ek/nsh/defconfig b/nuttx/configs/sama5d3x-ek/nsh/defconfig
index 605ee9cbd..b9f4ec9aa 100644
--- a/nuttx/configs/sama5d3x-ek/nsh/defconfig
+++ b/nuttx/configs/sama5d3x-ek/nsh/defconfig
@@ -551,7 +551,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/nuttx/configs/sama5d3x-ek/ostest/defconfig b/nuttx/configs/sama5d3x-ek/ostest/defconfig
index d4bb4c412..b69ecf836 100644
--- a/nuttx/configs/sama5d3x-ek/ostest/defconfig
+++ b/nuttx/configs/sama5d3x-ek/ostest/defconfig
@@ -534,7 +534,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_usbmsc.c b/nuttx/configs/sama5d3x-ek/src/sam_usbmsc.c
index 844a1602c..b303e6d87 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_usbmsc.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_usbmsc.c
@@ -64,11 +64,11 @@
 #  undef HAVE_AT25
 #endif
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
-#if CONFIG_EXAMPLES_USBMSC_DEVMINOR1 != AT25_MINOR
+#if CONFIG_SYSTEM_USBMSC_DEVMINOR1 != AT25_MINOR
 #  error Confusion in the assignment of minor device numbers
 #  undef HAVE_AT25
 #endif