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

7 files changed, 41 insertions, 41 deletions

diff --git a/nuttx/configs/pic32-starterkit/README.txt b/nuttx/configs/pic32-starterkit/README.txt
index 0dd49c444..af194171b 100644
--- a/nuttx/configs/pic32-starterkit/README.txt
+++ b/nuttx/configs/pic32-starterkit/README.txt
@@ -1095,7 +1095,7 @@ Where <subdir> is one of the following:
 
       CONFIG_CDCACM=y         : Enable the CDCACM device
 
-    examples/usbmsc - There are some hooks in the appconfig file
+    system/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.
 
@@ -1203,15 +1203,15 @@ Where <subdir> is one of the following:
 
     d) Use a RAM disk (instead of an SD card) as the USB MSC logical unit:
 
-      -CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-      +CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/ram0"
+      -CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+      +CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0"
 
   2. Changes to apps/.config.
 
-    a) Enable building of the examples/usbmsc:
+    a) Enable building of the system/usbmsc:
 
-      -# CONFIGURED_APPS += examples/usbmsc
-      +  CONFIGURED_APPS += examples/usbmsc
+      -# CONFIGURED_APPS += system/usbmsc
+      +  CONFIGURED_APPS += system/usbmsc
 
   3. When NSH first comes up, you must manually create the RAM disk
      before exporting it:
diff --git a/nuttx/configs/pic32-starterkit/nsh/appconfig b/nuttx/configs/pic32-starterkit/nsh/appconfig
index 6f6b4d561..98c52a98e 100644
--- a/nuttx/configs/pic32-starterkit/nsh/appconfig
+++ b/nuttx/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/usbmsc built-in
-#  CONFIGURED_APPS += examples/usbmsc
+#  Uncomment to enable the system/usbmsc built-in
+#  CONFIGURED_APPS += system/usbmsc
 endif
 
 # USB CDC/ACM serial device configurations
diff --git a/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig
index f57c3c787..3388dec0a 100644
--- a/nuttx/configs/pic32-starterkit/nsh/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh/defconfig
@@ -626,16 +626,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
-#
-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
+# Settings for system/usbmsc
+#
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/usbterm
diff --git a/nuttx/configs/pic32-starterkit/nsh2/appconfig b/nuttx/configs/pic32-starterkit/nsh2/appconfig
index 95712d484..73cfdb455 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/appconfig
+++ b/nuttx/configs/pic32-starterkit/nsh2/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/usbmsc built-in
-#  CONFIGURED_APPS += examples/usbmsc
+#  Uncomment to enable the system/usbmsc built-in
+#  CONFIGURED_APPS += system/usbmsc
 endif
 
 # USB CDC/ACM serial device configurations
diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig
index 1a791c4f5..0cb70d5ac 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig
@@ -625,16 +625,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
-#
-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
+# Settings for system/usbmsc
+#
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/usbterm
diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig
index ce2b3fa23..0e55d4a51 100644
--- a/nuttx/configs/pic32-starterkit/ostest/defconfig
+++ b/nuttx/configs/pic32-starterkit/ostest/defconfig
@@ -622,16 +622,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
-#
-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
+# Settings for system/usbmsc
+#
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/usbterm
diff --git a/nuttx/configs/pic32-starterkit/src/up_usbmsc.c b/nuttx/configs/pic32-starterkit/src/up_usbmsc.c
index 00b374dfd..535754f15 100644
--- a/nuttx/configs/pic32-starterkit/src/up_usbmsc.c
+++ b/nuttx/configs/pic32-starterkit/src/up_usbmsc.c
@@ -82,7 +82,7 @@
 
 int usbmsc_archinitialize(void)
 {
-  /* If examples/usbmsc is built as an NSH command, then SD slot should
+  /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
    * this case, there is nothing further to be done here.
    */