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
+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