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

This commit is contained in:
Gregory Nutt
2013-09-25 16:54:39 -06:00
parent eee01427e2
commit 0b450bc202
209 changed files with 691 additions and 678 deletions
+2 -1
View File
@@ -5629,4 +5629,5 @@
and STM32 Kconfigs into the common network driver Kconfig (2013-9-25).
* arch/arm/src/sam_emac.c: EMAC driver is basically functional. More
testing is needed (as always) (2013-9-25).
* configs: Changes to many defconfig files resulting from moving
apps/examples/usbmsc to apps/system/usbmsc (2013-9-25).
+1
View File
@@ -265,6 +265,7 @@
| `- system/
| |- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/apps/system/i2c/README.txt"><b><i>i2c/README.txt</i></b></a>
| |- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/apps/system/install/README.txt">install/README.txt</a>
| |- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/apps/system/usbmsc/README.txt">usbmsc/README.txt</a>
| `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/apps/system/zmodem/README.txt">zmodem/README.txt</a>
`- NxWidgets
|- Doxygen
+3 -1
View File
@@ -191,7 +191,7 @@ Notes about Header Files
header file then you should also define CONFIG_ARCH_MATH_H=y in your
NuttX Configuration file. If CONFIG_ARCH_MATH_H is selected, then the
top-level Makefile will copy the stub math.h header file from
include/nuttx/matn.h to include/math.h where it will become the system
include/nuttx/math.h to include/math.h where it will become the system
math.h header file. The stub math.h header file does nothing other
than to include that archicture-specific math.h header file as the
system math.h header file.
@@ -1200,6 +1200,8 @@ apps
| | `- README.txt
| |- install
| | `- README.txt
| |- usbmsc
| | `- README.txt
| `- zmodem
| `- README.txt
`- README.txt
+9 -9
View File
@@ -398,16 +398,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# Settings for examples/usbmsc
# Settings for system/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
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
#
# Stack and heap information
+1 -1
View File
@@ -530,7 +530,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
+1 -1
View File
@@ -521,7 +521,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
+1 -1
View File
@@ -556,7 +556,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_EXAMPLES_DISCOVER 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
# CONFIG_EXAMPLES_WLAN is not set
+4 -4
View File
@@ -53,8 +53,8 @@
****************************************************************************/
/* Configuration ************************************************************/
#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
# define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
# define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
#endif
/* Debug ********************************************************************/
@@ -91,13 +91,13 @@
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.
*/
#ifndef CONFIG_NSH_BUILTIN_APPS
return stm32_sdinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
return stm32_sdinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1);
#else
return OK;
#endif
+1 -1
View File
@@ -648,6 +648,6 @@ Where <subdir> is one of the following:
usbmsc:
This configuration directory exercises the USB mass storage
class driver at examples/usbmsc. See examples/README.txt for
class driver at system/usbmsc. See examples/README.txt for
more information.
+6 -6
View File
@@ -57,15 +57,15 @@
/* Configuration ************************************************************/
#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
# define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
# define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
#endif
#ifndef CONFIG_EXAMPLES_USBMSC_DEVPATH1
# define CONFIG_EXAMPLES_USBMSC_DEVPATH1 "/dev/ram"
#ifndef CONFIG_SYSTEM_USBMSC_DEVPATH1
# define CONFIG_SYSTEM_USBMSC_DEVPATH1 "/dev/ram"
#endif
static const char g_source[] = CONFIG_EXAMPLES_USBMSC_DEVPATH1;
static const char g_source[] = CONFIG_SYSTEM_USBMSC_DEVPATH1;
static struct fat_format_s g_fmt = FAT_FORMAT_INITIALIZER;
#define USBMSC_NSECTORS 64
@@ -99,7 +99,7 @@ int usbmsc_archinitialize(void)
/* Register a RAMDISK device to manage this RAM image */
ret = ramdisk_register(CONFIG_EXAMPLES_USBMSC_DEVMINOR1,
ret = ramdisk_register(CONFIG_SYSTEM_USBMSC_DEVMINOR1,
pbuffer,
USBMSC_NSECTORS,
USBMSC_SECTORSIZE,
+1 -1
View File
@@ -35,5 +35,5 @@
# Path to example in apps/examples containing the user_start entry point
CONFIGURED_APPS += examples/usbmsc
CONFIGURED_APPS += system/usbmsc
+9 -9
View File
@@ -397,16 +397,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# Settings for examples/usbmsc
# Settings for system/usbmsc
#
CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/ram0"
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
CONFIG_SYSTEM_USBMSC_NLUNS=1
CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0"
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
#
# Stack and heap information
+9 -9
View File
@@ -396,16 +396,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# Settings for examples/usbmsc
# Settings for system/usbmsc
#
CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/ram0"
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
CONFIG_SYSTEM_USBMSC_NLUNS=1
CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0"
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
#
# Stack and heap information
+6 -6
View File
@@ -57,15 +57,15 @@
/* Configuration ************************************************************/
#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
# define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
# define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
#endif
#ifndef CONFIG_EXAMPLES_USBMSC_DEVPATH1
# define CONFIG_EXAMPLES_USBMSC_DEVPATH1 "/dev/ram"
#ifndef CONFIG_SYSTEM_USBMSC_DEVPATH1
# define CONFIG_SYSTEM_USBMSC_DEVPATH1 "/dev/ram"
#endif
static const char g_source[] = CONFIG_EXAMPLES_USBMSC_DEVPATH1;
static const char g_source[] = CONFIG_SYSTEM_USBMSC_DEVPATH1;
static struct fat_format_s g_fmt = FAT_FORMAT_INITIALIZER;
#define USBMSC_NSECTORS 64
@@ -99,7 +99,7 @@ int usbmsc_archinitialize(void)
/* Register a RAMDISK device to manage this RAM image */
ret = ramdisk_register(CONFIG_EXAMPLES_USBMSC_DEVMINOR1,
ret = ramdisk_register(CONFIG_SYSTEM_USBMSC_DEVMINOR1,
pbuffer,
USBMSC_NSECTORS,
USBMSC_SECTORSIZE,
+1 -1
View File
@@ -515,7 +515,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_EXAMPLES_DISCOVER 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
# CONFIG_EXAMPLES_WGET is not set
+1 -1
View File
@@ -450,7 +450,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
+1 -1
View File
@@ -388,7 +388,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
# CONFIG_EXAMPLES_WLAN is not set
+1 -1
View File
@@ -396,7 +396,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
# CONFIG_EXAMPLES_WLAN is not set
+14 -14
View File
@@ -772,20 +772,20 @@ CONFIG_EXAMPLES_NSH=y
#
# USB Mass Storage Class Example
#
CONFIG_EXAMPLES_USBMSC=y
CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
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_TRACEINIT is not set
# CONFIG_EXAMPLES_USBMSC_TRACECLASS is not set
# CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS is not set
# CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER is not set
# CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS is not set
CONFIG_SYSTEM_USBMSC=y
CONFIG_SYSTEM_USBMSC_NLUNS=1
CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
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_TRACEINIT is not set
# CONFIG_SYSTEM_USBMSC_TRACECLASS is not set
# CONFIG_SYSTEM_USBMSC_TRACETRANSFERS is not set
# CONFIG_SYSTEM_USBMSC_TRACECONTROLLER is not set
# CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS is not set
#
# USB Serial Terminal Example
+4 -4
View File
@@ -52,8 +52,8 @@
****************************************************************************/
/* Configuration ************************************************************/
#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
# define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
# define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
#endif
/* Debug ********************************************************************/
@@ -90,13 +90,13 @@
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.
*/
#ifndef CONFIG_NSH_BUILTIN_APPS
return stm32_sdinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
return stm32_sdinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1);
#else
return OK;
#endif
+1 -1
View File
@@ -487,7 +487,7 @@ CONFIG_EXAMPLES_NSH=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
+1 -1
View File
@@ -470,7 +470,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=1
# 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
+1 -1
View File
@@ -610,7 +610,7 @@ Where <subdir> is one of the following:
----------- ----------------------- --------------------------------
Built-in None apps/examples/nx
Apps apps/examples/nxhello
apps/examples/usbmsc (4)
apps/system/usbmsc (4)
apps/examples/buttons
apps/examples/nximage
=========== ======================= ================================
+1 -1
View File
@@ -543,7 +543,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
# 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
+1 -1
View File
@@ -553,7 +553,7 @@ CONFIG_EXAMPLES_NSH=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
+14 -14
View File
@@ -723,20 +723,20 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
# 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/mmcsd0"
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_TRACEINIT is not set
# CONFIG_EXAMPLES_USBMSC_TRACECLASS is not set
# CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS is not set
# CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER is not set
# CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS is not set
CONFIG_SYSTEM_USBMSC=y
CONFIG_SYSTEM_USBMSC_NLUNS=1
CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
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_TRACEINIT is not set
# CONFIG_SYSTEM_USBMSC_TRACECLASS is not set
# CONFIG_SYSTEM_USBMSC_TRACETRANSFERS is not set
# CONFIG_SYSTEM_USBMSC_TRACECONTROLLER is not set
# CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS is not set
# CONFIG_EXAMPLES_USBTERM is not set
# CONFIG_EXAMPLES_WATCHDOG is not set
+1 -1
View File
@@ -537,7 +537,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
+5 -5
View File
@@ -60,8 +60,8 @@
/* Configuration ************************************************************/
#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
# define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
# define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
#endif
/* SLOT number(s) could depend on the board configuration */
@@ -109,7 +109,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 initialized in nsh_archinitialize() (see up_nsh.c). In
* this case, there is nothing further to be done here.
*/
@@ -136,9 +136,9 @@ int usbmsc_archinitialize(void)
message("usbmsc_archinitialize: "
"Bind SDIO to the MMC/SD driver, minor=%d\n",
CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
CONFIG_SYSTEM_USBMSC_DEVMINOR1);
ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, sdio);
ret = mmcsd_slotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, sdio);
if (ret != OK)
{
message("usbmsc_archinitialize: "
+1 -1
View File
@@ -35,5 +35,5 @@
# Path to example in apps/examples containing the user_start entry point
CONFIGURED_APPS += examples/usbmsc
CONFIGURED_APPS += system/usbmsc
+10 -10
View File
@@ -462,17 +462,17 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# Settings for examples/usbmsc
# Settings for system/usbmsc
#
CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
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
CONFIG_SYSTEM_USBMSC_NLUNS=1
CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
CONFIG_SYSTEM_USBMSC_DEBUGMM=n
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/watchdog
+1 -1
View File
@@ -586,7 +586,7 @@ CONFIG_EXAMPLES_NSH=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
+1 -1
View File
@@ -484,7 +484,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
+3 -3
View File
@@ -56,8 +56,8 @@
/* Configuration ************************************************************/
#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
# define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
# define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
#endif
/* SLOT number(s) could depend on the board configuration */
@@ -105,7 +105,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.
*/
+9 -9
View File
@@ -465,16 +465,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# Settings for examples/usbmsc
# Settings for system/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
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
#
# Stack and heap information
+1 -1
View File
@@ -490,7 +490,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_EXAMPLES_DISCOVER 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
# CONFIG_EXAMPLES_WGET is not set
+1 -1
View File
@@ -490,7 +490,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_EXAMPLES_DISCOVER 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
# CONFIG_EXAMPLES_WGET is not set
+1 -1
View File
@@ -508,7 +508,7 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=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
+1 -1
View File
@@ -433,7 +433,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
+1 -1
View File
@@ -537,7 +537,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_DISCOVER 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_TCPECHO=y
CONFIG_EXAMPLES_TCPECHO_PORT=80
+1 -1
View File
@@ -456,7 +456,7 @@ CONFIG_EXAMPLES_NSH=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
+1 -1
View File
@@ -453,7 +453,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
+1 -1
View File
@@ -802,7 +802,7 @@ Where <subdir> is one of the following:
usbmsc:
This configuration directory exercises the USB mass storage
class driver at apps/examples/usbmsc. See apps/examples/README.txt
class driver at apps/system/usbmsc. See apps/examples/README.txt
for more information.
NOTE: At present, the value for the SD SPI frequency is too
+9 -9
View File
@@ -463,16 +463,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# Settings for examples/usbmsc
# Settings for system/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
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
#
# Stack and heap information
+9 -9
View File
@@ -473,16 +473,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# Settings for examples/usbmsc
# Settings for system/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
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
#
# Stack and heap information
+9 -9
View File
@@ -506,16 +506,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# Settings for examples/usbmsc
# Settings for system/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
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/nx
+9 -9
View File
@@ -451,16 +451,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# Settings for examples/usbmsc
# Settings for system/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
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
#
# Stack and heap information
+3 -3
View File
@@ -54,8 +54,8 @@
/* Configuration ************************************************************/
#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
# define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
# define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
#endif
/* PORT and SLOT number probably depend on the board configuration */
@@ -129,7 +129,7 @@ int usbmsc_archinitialize(void)
message("usbmsc_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
LPC17XX_MMCSDSPIPORTNO, LPC17XX_MMCSDSLOTNO);
ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
ret = mmcsd_spislotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
if (ret < 0)
{
message("usbmsc_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
+9 -9
View File
@@ -490,16 +490,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# Settings for examples/usbmsc
# Settings for system/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
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
#
# Stack and heap information
+1 -1
View File
@@ -35,5 +35,5 @@
# Path to example in apps/examples containing the user_start entry point
CONFIGURED_APPS += examples/usbmsc
CONFIGURED_APPS += system/usbmsc
+9 -9
View File
@@ -447,16 +447,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
#
# Settings for examples/usbmsc
# Settings for system/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
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
#
# Stack and heap information

Some files were not shown because too many files have changed in this diff Show More