sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename examples/usbstorage to examples/usbmsc. From CCTSAO

Browse Source
This commit is contained in:
Gregory Nutt 2013-09-05 08:07:03 -06:00
parent b4134efe66
commit fd039c0559
10 changed files with 140 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog.txt
View File

@ -620,4 +620,10 @@
* apps/examples/composite/: SourceForge bug #19: Fix a typo that can
cause a configuration error. From CCTSAO (2013-9-4).
* apps/examples/cc3000. Initial support for the TI CC3000 network module
on the Freescale Freedom-KL25Z board from Alan Carvalho de Assis.
Includes the test to verify the CC3000 (2013-9-3).
* apps/examples/usbmsc: apps/examples/usbstorage renamed usbmsc.
Change submitted by CCTSAO (2013-6-5).

2
examples/Kconfig
View File

@ -62,7 +62,7 @@ source "$APPSDIR/examples/udp/Kconfig"
source "$APPSDIR/examples/discover/Kconfig"
source "$APPSDIR/examples/uip/Kconfig"
source "$APPSDIR/examples/usbserial/Kconfig"
source "$APPSDIR/examples/usbstorage/Kconfig"
source "$APPSDIR/examples/usbmsc/Kconfig"
source "$APPSDIR/examples/usbterm/Kconfig"
source "$APPSDIR/examples/watchdog/Kconfig"
source "$APPSDIR/examples/wget/Kconfig"

4
examples/Makefile
View File

@ -43,7 +43,7 @@ SUBDIRS += lcdrw mm modbus mount mtdpart nettest nrf24l01_term nsh null
SUBDIRS += nx nxconsole nxffs nxflat nxhello nximage nxlines nxtext ostest
SUBDIRS += pashello pipe poll posix_spawn pwm qencoder relays rgmp romfs
SUBDIRS += sendmail serloop slcd smart smart_test tcpecho telnetd thttpd tiff
SUBDIRS += touchscreen udp uip usbserial usbstorage usbterm watchdog
SUBDIRS += touchscreen udp uip usbserial usbmsc usbterm watchdog
SUBDIRS += wget wgetjson xmlrpc
# Sub-directories that might need context setup. Directories may need
@ -57,7 +57,7 @@ CNTXTDIRS += adc can cc3000 cdcacm composite cxxtest dhcpd discover flash_test
CNTXTDIRS += ftpd hello helloxx json keypadtestmodbus lcdrw mtdpart nettest
CNTXTDIRS += nx nxhello nximage nxlines nxtext nrf24l01_term ostest relays
CNTXTDIRS += qencoder slcd smart_test tcpecho telnetd tiff touchscreen
CNTXTDIRS += usbstorage usbterm watchdog wgetjson
CNTXTDIRS += usbmsc usbterm watchdog wgetjson
endif
all: nothing

6
examples/README.txt
View File

@ -1825,8 +1825,8 @@ examples/usbserial
The host and target will exchange are variety of very small and very large
serial messages.
examples/usbstorage
^^^^^^^^^^^^^^^^^^^
examples/usbmsc
^^^^^^^^^^^^^^^
This example registers a block device driver, then exports the block
the device using the USB storage class driver. In order to use this
@ -1834,7 +1834,7 @@ examples/usbstorage
void usbmsc_archinitialize(void);
This function will be called by the example/usbstorage in order to
This function will be called by the example/usbmsc in order to
do the actual registration of the block device drivers. For examples
of the implementation of usbmsc_archinitialize() see
configs/mcu123-lpc124x/src/up_usbmsc.c or

2
examples/composite/composite_main.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* examples/usbstorage/composite_main.c
* examples/composite/composite_main.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

0
examples/usbstorage/.gitignore → examples/usbmsc/.gitignore vendored
View File

124
examples/usbmsc/Kconfig Normal file
View File

@ -0,0 +1,124 @@
#
# For a description of the syntax of this configuration file,
# see misc/tools/kconfig-language.txt.
#
config EXAMPLES_USBMSC
bool "USB mass storage class example"
default n
---help---
Enable the USB mass storage class example
if EXAMPLES_USBMSC
config EXAMPLES_USBMSC_NLUNS
int "Number of LUNs"
default 1
---help---
Defines the number of logical units (LUNs) exported by the USB
storage driver. Each LUN corresponds to one exported block driver
(or partition of a block driver). May be 1, 2, or 3. Default is 1.
config EXAMPLES_USBMSC_DEVMINOR1
int "LUN1 Minor Device Number"
default 0
---help---
The minor device number of the block driver for the first LUN. For
example, N in /dev/mmcsdN. Used for registering the block driver.
Default is zero.
config EXAMPLES_USBMSC_DEVPATH1
string "LUN1 Device Path"
default "/dev/mmcsd0"
---help---
The full path to the registered block driver. Default is
"/dev/mmcsd0"
config EXAMPLES_USBMSC_DEVMINOR2
int "LUN2 Minor Device Number"
default 1
---help---
The minor device number of the block driver for the second LUN. For
example, N in /dev/mmcsdN. Used for registering the block driver.
Ignored if EXAMPLES_USBMSC_NLUNS < 2. Default is one.
config EXAMPLES_USBMSC_DEVPATH2
string "LUN2 Device Path"
default "/dev/mmcsd1"
---help---
The full path to the registered block driver. Ignored if
EXAMPLES_USBMSC_NLUNS < 2. Default is "/dev/mmcsd1"
config EXAMPLES_USBMSC_DEVMINOR3
int "LUN3 Minor Device Number"
default 2
---help---
The minor device number of the block driver for the third LUN. For
example, N in /dev/mmcsdN. Used for registering the block driver.
Ignored if EXAMPLES_USBMSC_NLUNS < 2. Default is two.
config EXAMPLES_USBMSC_DEVPATH3
string "LUN3 Device Path"
default "/dev/mmcsd2"
---help---
The full path to the registered block driver. Ignored if
EXAMPLES_USBMSC_NLUNS < 2. Default is "/dev/mmcsd2"
config EXAMPLES_USBMSC_DEBUGMM
bool "USB MSC MM Debug"
default n
---help---
Enables some debug tests to check for memory usage and memory leaks.
config EXAMPLES_USBMSC_TRACEINIT
bool "USB Trace Initialization"
default n
depends on USBDEV_TRACE || DEBUG_USB
---help---
If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
then the example code will also manage the USB trace output. The
amount of trace output can be controlled this configuration value:
This setting will show USB initialization events
config EXAMPLES_USBMSC_TRACECLASS
bool "USB Trace Class"
default n
depends on USBDEV_TRACE || DEBUG_USB
---help---
If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
then the example code will also manage the USB trace output. The
amount of trace output can be controlled this configuration value:
This setting will show USB class driver events
config EXAMPLES_USBMSC_TRACETRANSFERS
bool "USB Trace Transfers"
default n
depends on USBDEV_TRACE || DEBUG_USB
---help---
If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
then the example code will also manage the USB trace output. The
amount of trace output can be controlled this configuration value:
This setting will show USB data transfer events
config EXAMPLES_USBMSC_TRACECONTROLLER
bool "USB Trace Device Controller Events"
default n
depends on USBDEV_TRACE || DEBUG_USB
---help---
If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
then the example code will also manage the USB trace output. The
amount of trace output can be controlled this configuration value:
This setting will show USB device controller events
config EXAMPLES_USBMSC_TRACEINTERRUPTS
bool "USB Trace Device Controller Interrupt Events"
default n
depends on USBDEV_TRACE || DEBUG_USB
---help---
If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB),
then the example code will also manage the USB trace output. The
amount of trace output can be controlled this configuration value:
This setting will show USB device controller interrupt-related events.
endif

2
examples/usbstorage/Makefile → examples/usbmsc/Makefile
View File

@ -1,5 +1,5 @@
############################################################################
# apps/examples/usbstorage/Makefile
# apps/examples/usbmsc/Makefile
#
# Copyright (C) 2008, 2010-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>

2
examples/usbstorage/usbmsc.h → examples/usbmsc/usbmsc.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* examples/usbstorage/usbmsc.h
* examples/usbmsc/usbmsc.h
*
* Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
examples/usbstorage/usbmsc_main.c → examples/usbmsc/usbmsc_main.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* examples/usbstorage/usbmsc_main.c
* examples/usbmsc/usbmsc_main.c
*
* Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>