Remove CONFIG_XYZ_BUILTIN configurations, replace with the single CONFIG_NSH_BUILTIN_APPS. Add SAM3/4 sam_periphclks.h which is just a header file that includes the right header file. Misc SAM3U-EK cleanup
This commit is contained in:
Gregory Nutt
parent
60e6546ffb
commit
459d89d9db
@ -574,3 +574,7 @@
|
||||
nRF24L01 driver. From Laurent Latil (2013-6-1).
|
||||
* apps/nshlib/Kconfig: Add some missing NSH configuration values.
|
||||
From Lorenz Meier (2013-6-2).
|
||||
* Standardize on CONFIG_NSH_BUILTIN_APPS. Remove all other variants
|
||||
of the build-as-an-NSH-application configuration settings
|
||||
(2013-6-12).
|
||||
|
||||
|
||||
@ -49,45 +49,15 @@ SUBDIRS += wget wgetjson xmlrpc
|
||||
# Sub-directories that might need context setup. Directories may need
|
||||
# context setup for a variety of reasons, but the most common is because
|
||||
# the example may be built as an NSH built-in function.
|
||||
#
|
||||
# Directories that may be built as NSH built-in functions may have their
|
||||
# own configuration setting (like CONFIG_EXAMPLES_HELLOXX_BUILTIN), but
|
||||
# many only depend on the generic CONFIG_NSH_BUILTIN_APPS setting. And
|
||||
# there a few which an ONLY be built as NSH built-in applications; these
|
||||
# are included in the list unconditionally.
|
||||
|
||||
CNTXTDIRS = pwm
|
||||
|
||||
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
|
||||
CNTXTDIRS += adc can cdcacm composite cxxtest dhcpd discover flash_test ftpd
|
||||
CNTXTDIRS += hello helloxx json keypadtestmodbus mtdpart nettest nxhello
|
||||
CNTXTDIRS += nxlines nrf24l01_term relays qencoder slcd smart_test tcpecho
|
||||
CNTXTDIRS += telnetd touchscreen watchdog wgetjson
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_LCDRW_BUILTIN),y)
|
||||
CNTXTDIRS += lcdrw
|
||||
endif
|
||||
ifeq ($(CONFIG_EXAMPLES_NX_BUILTIN),y)
|
||||
CNTXTDIRS += nx
|
||||
endif
|
||||
ifeq ($(CONFIG_EXAMPLES_NXIMAGE_BUILTIN),y)
|
||||
CNTXTDIRS += nximage
|
||||
endif
|
||||
ifeq ($(CONFIG_EXAMPLES_NXTEXT_BUILTIN),y)
|
||||
CNTXTDIRS += nxtext
|
||||
endif
|
||||
ifeq ($(CONFIG_EXAMPLES_OSTEST_BUILTIN),y)
|
||||
CNTXTDIRS += ostest
|
||||
endif
|
||||
ifeq ($(CONFIG_EXAMPLES_TIFF_BUILTIN),y)
|
||||
CNTXTDIRS += tiff
|
||||
endif
|
||||
ifeq ($(CONFIG_EXAMPLES_USBMSC_BUILTIN),y)
|
||||
CNTXTDIRS += usbstorage
|
||||
endif
|
||||
ifeq ($(CONFIG_EXAMPLES_USBTERM_BUILTIN),y)
|
||||
CNTXTDIRS += usbterm
|
||||
CNTXTDIRS += hello helloxx json keypadtestmodbus lcdrw mtdpart nettest nx
|
||||
CNTXTDIRS += nxhello nximage nxlines nxtext nrf24l01_term ostest relays
|
||||
CNTXTDIRS += qencoder slcd smart_test tcpecho telnetd tiff touchscreen
|
||||
CNTXTDIRS += usbstorage usbterm watchdog wgetjson
|
||||
endif
|
||||
|
||||
all: nothing
|
||||
|
||||
@ -23,14 +23,6 @@ examples
|
||||
- CONFIG_NSH_BUILTIN_APPS - Enable support for external registered,
|
||||
"named" applications that can be executed from the NSH
|
||||
command line (see apps/README.txt for more information).
|
||||
- CONFIG_EXAMPLES_XYZ_BUILTIN -- Build the XYZ example as a "built-in"
|
||||
that can be executed from the NSH command line (where XYZ is
|
||||
the specific example. See the following for examples that
|
||||
support this option).
|
||||
|
||||
NOTE: The use of CONFIG_EXAMPLES_XYZ_BUILTIN is being phased
|
||||
out. For many example, the definition of CONFIG_NSH_BUILTIN_APPS
|
||||
is sufficient built the example as an NSH built-in application.
|
||||
|
||||
Older configurations.
|
||||
|
||||
@ -543,7 +535,7 @@ examples/helloxx
|
||||
|
||||
NuttX configuration settings specific to this examp;le:
|
||||
|
||||
CONFIG_EXAMPLES_HELLOXX_BUILTIN -- Build the helloxx example as a
|
||||
CONFIG_NSH_BUILTIN_APPS -- Build the helloxx example as a
|
||||
"built-in" that can be executed from the NSH command line.
|
||||
CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST - Set if the system does not
|
||||
support construction of objects on the stack.
|
||||
@ -794,7 +786,7 @@ examples/nx
|
||||
defined in include/nuttx/nx/nx.h. The following configuration options
|
||||
can be selected:
|
||||
|
||||
CONFIG_EXAMPLES_NX_BUILTIN -- Build the NX example as a "built-in"
|
||||
CONFIG_NSH_BUILTIN_APPS -- Build the NX example as a "built-in"
|
||||
that can be executed from the NSH command line
|
||||
CONFIG_EXAMPLES_NX_VPLANE -- The plane to select from the frame-
|
||||
buffer driver for use in the test. Default: 0
|
||||
@ -947,7 +939,7 @@ examplex/nxhello
|
||||
|
||||
The following configuration options can be selected:
|
||||
|
||||
CONFIG_EXAMPLES_NXHELLO_BUILTIN -- Build the NXHELLO example as a "built-in"
|
||||
CONFIG_NSH_BUILTIN_APPS -- Build the NXHELLO example as a "built-in"
|
||||
that can be executed from the NSH command line
|
||||
CONFIG_EXAMPLES_NXHELLO_VPLANE -- The plane to select from the frame-
|
||||
buffer driver for use in the test. Default: 0
|
||||
@ -980,7 +972,7 @@ examples/nximage
|
||||
of the display. This only works for RGB23 (888), RGB16 (656), RGB8 (332),
|
||||
and 8-bit greyscale for now.
|
||||
|
||||
CONFIG_EXAMPLES_NXIMAGE_BUILTIN -- Build the NXIMAGE example as a "built-in"
|
||||
CONFIG_NSH_BUILTIN_APPS -- Build the NXIMAGE example as a "built-in"
|
||||
that can be executed from the NSH command line
|
||||
CONFIG_EXAMPLES_NXIMAGE_VPLANE -- The plane to select from the frame-
|
||||
buffer driver for use in the test. Default: 0
|
||||
@ -1087,7 +1079,7 @@ examples/nxtext
|
||||
|
||||
The following configuration options can be selected:
|
||||
|
||||
CONFIG_EXAMPLES_NXTEXT_BUILTIN -- Build the NXTEXT example as a "built-in"
|
||||
CONFIG_NSH_BUILTIN_APPS -- Build the NXTEXT example as a "built-in"
|
||||
that can be executed from the NSH command line
|
||||
CONFIG_EXAMPLES_NXTEXT_VPLANE -- The plane to select from the frame-
|
||||
buffer driver for use in the test. Default: 0
|
||||
@ -1165,7 +1157,7 @@ examples/ostest
|
||||
The behavior of the ostest can be modified with the following
|
||||
settings in the configs/<board-name>/defconfig file:
|
||||
|
||||
* CONFIG_EXAMPLES_OSTEST_BUILTIN
|
||||
* CONFIG_NSH_BUILTIN_APPS
|
||||
Build the OS test example as an NSH built-in application.
|
||||
* CONFIG_EXAMPLES_OSTEST_LOOPS
|
||||
Used to control the number of executions of the test. If
|
||||
@ -1611,7 +1603,6 @@ examples/tiff
|
||||
built-on, i.e., if the following is defined:
|
||||
|
||||
CONFIG_NSH_BUILTIN_APPS=y
|
||||
CONFIG_EXAMPLES_TIFF_BUILTIN=y
|
||||
|
||||
At a miniumum, to run in an embedded environment, you will probably have to
|
||||
change the configured paths to the TIFF files defined in the example.
|
||||
@ -1635,7 +1626,7 @@ examples/touchscreen
|
||||
and will print the touchscreen output as it is received from the
|
||||
simulated touchscreen driver.
|
||||
|
||||
CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN - Build the touchscreen test as
|
||||
CONFIG_NSH_BUILTIN_APPS - Build the touchscreen test as
|
||||
an NSH built-in function. Default: Built as a standalone problem
|
||||
CONFIG_EXAMPLES_TOUCHSCREEN_MINOR - The minor device number. Minor=N
|
||||
corresponds to touchscreen device /dev/inputN. Note this value must
|
||||
@ -1643,7 +1634,7 @@ examples/touchscreen
|
||||
CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH - The path to the touchscreen
|
||||
device. This must be consistent with CONFIG_EXAMPLES_TOUCHSCREEN_MINOR.
|
||||
Default: "/dev/input0"
|
||||
CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES - If CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN
|
||||
CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES - If CONFIG_NSH_BUILTIN_APPS
|
||||
is defined, then the number of samples is provided on the command line
|
||||
and this value is ignored. Otherwise, this number of samples is
|
||||
collected and the program terminates. Default: Samples are collected
|
||||
@ -1814,7 +1805,7 @@ examples/usbstorage
|
||||
|
||||
Configuration options:
|
||||
|
||||
CONFIG_EXAMPLES_USBMSC_BUILTIN
|
||||
CONFIG_NSH_BUILTIN_APPS
|
||||
This example can be built as two NSH "built-in" commands if this option
|
||||
is selected: 'msconn' will connect the USB mass storage device; 'msdis'
|
||||
will disconnect the USB storage device.
|
||||
@ -1854,7 +1845,7 @@ examples/usbstorage
|
||||
|
||||
Error results are always shown in the trace output
|
||||
|
||||
NOTE 1: When built as an NSH add-on command (CONFIG_EXAMPLES_USBMSC_BUILTIN=y),
|
||||
NOTE 1: When built as an NSH add-on command (CONFIG_NSH_BUILTIN_APPS=y),
|
||||
Caution should be used to assure that the SD drive (or other storage device) is
|
||||
not in use when the USB storage device is configured. Specifically, the SD
|
||||
driver should be unmounted like:
|
||||
@ -1901,7 +1892,7 @@ examples/usbterm
|
||||
|
||||
Configuration options:
|
||||
|
||||
CONFIG_EXAMPLES_USBTERM_BUILTIN - Build the usbterm example as an NSH
|
||||
CONFIG_NSH_BUILTIN_APPS - Build the usbterm example as an NSH
|
||||
built-in command. NOTE: This is not fully functional as of this
|
||||
writing.. It should work, but there is no mechanism in place yet
|
||||
to exit the USB terminal program and return to NSH.
|
||||
|
||||
@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
|
||||
$(call ARCHIVE, $(BIN), $(OBJS))
|
||||
@touch .built
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_LCDRW_BUILTIN),y)
|
||||
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
|
||||
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
|
||||
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
|
||||
|
||||
|
||||
@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
|
||||
$(call ARCHIVE, $(BIN), $(OBJS))
|
||||
@touch .built
|
||||
|
||||
#ifeq ($(CONFIG_EXAMPLES_NXHELLO_BUILTIN),y)
|
||||
#ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
|
||||
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
|
||||
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
|
||||
|
||||
|
||||
@ -11,13 +11,6 @@ config EXAMPLES_NX
|
||||
|
||||
if EXAMPLES_NX
|
||||
|
||||
config EXAMPLES_NX_BUILTIN
|
||||
bool "NSH Built-IN"
|
||||
depends on NSH_BUILTIN_APPS
|
||||
---help---
|
||||
Build the NX example as a "built-in" that can be executed from the
|
||||
NSH command line
|
||||
|
||||
config EXAMPLES_NX_VPLANE
|
||||
int "Video Plane"
|
||||
default 0
|
||||
|
||||
@ -86,7 +86,7 @@ $(COBJS): %$(OBJEXT): %.c
|
||||
$(call ARCHIVE, $(BIN), $(OBJS))
|
||||
@touch .built
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_NX_BUILTIN),y)
|
||||
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
|
||||
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
|
||||
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
|
||||
|
||||
|
||||
@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
|
||||
$(call ARCHIVE, $(BIN), $(OBJS))
|
||||
@touch .built
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_NXIMAGE_BUILTIN),y)
|
||||
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
|
||||
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
|
||||
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
|
||||
|
||||
|
||||
@ -13,13 +13,6 @@ if EXAMPLES_NXTEXT
|
||||
|
||||
comment "Basic Configuration of the example"
|
||||
|
||||
config EXAMPLES_NXTEXT_BUILTIN
|
||||
bool "NSH Built-IN"
|
||||
depends on NSH_BUILTIN_APPS
|
||||
---help---
|
||||
Build the NX Text example as a "built-in" that can be executed from the
|
||||
NSH command line.
|
||||
|
||||
config EXAMPLES_NXTEXT_VPLANE
|
||||
int "Video Plane"
|
||||
default 0
|
||||
|
||||
@ -87,7 +87,7 @@ $(COBJS): %$(OBJEXT): %.c
|
||||
$(call ARCHIVE, $(BIN), $(OBJS))
|
||||
@touch .built
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_NXTEXT_BUILTIN),y)
|
||||
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
|
||||
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
|
||||
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
|
||||
|
||||
|
||||
@ -11,13 +11,6 @@ config EXAMPLES_OSTEST
|
||||
|
||||
if EXAMPLES_OSTEST
|
||||
|
||||
config EXAMPLES_OSTEST_BUILTIN
|
||||
bool "NSH built-in application"
|
||||
default y if NSH_LIBRARY
|
||||
default n if !NSH_LIBRARY
|
||||
---help---
|
||||
Build the OS test example as an NSH built-in application.
|
||||
|
||||
config EXAMPLES_OSTEST_LOOPS
|
||||
int "OS test loop"
|
||||
default 1
|
||||
|
||||
@ -137,7 +137,7 @@ $(COBJS): %$(OBJEXT): %.c
|
||||
$(call ARCHIVE, $(BIN), $(OBJS))
|
||||
@touch .built
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_OSTEST_BUILTIN),y)
|
||||
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
|
||||
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
|
||||
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
|
||||
|
||||
|
||||
@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
|
||||
$(call ARCHIVE, $(BIN), $(OBJS))
|
||||
@touch .built
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_TIFF_BUILTIN),y)
|
||||
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
|
||||
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
|
||||
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/tiff/tiff_main.c
|
||||
*
|
||||
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
|
||||
* Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -56,7 +56,6 @@
|
||||
* built-on, i.e., if the following is defined:
|
||||
*
|
||||
* CONFIG_NSH_BUILTIN_APPS=y
|
||||
* CONFIG_EXAMPLES_TIFF_BUILTIN=y
|
||||
*
|
||||
* Other configuration options:
|
||||
*
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
* Definitions
|
||||
****************************************************************************/
|
||||
/* Configuration ************************************************************/
|
||||
/* CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN - Build the touchscreen test as
|
||||
/* CONFIG_NSH_BUILTIN_APPS - Build the touchscreen test as
|
||||
* an NSH built-in function. Default: Built as a standalone problem
|
||||
* CONFIG_EXAMPLES_TOUCHSCREEN_MINOR - The minor device number. Minor=N
|
||||
* corresponds to touchscreen device /dev/input0. Note this value must
|
||||
@ -54,7 +54,7 @@
|
||||
* CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH - The path to the touchscreen
|
||||
* device. This must be consistent with CONFIG_EXAMPLES_TOUCHSCREEN_MINOR.
|
||||
* Default: "/dev/input0"
|
||||
* CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES - If CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN
|
||||
* CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES - If CONFIG_NSH_BUILTIN_APPS
|
||||
* is defined, then the number of samples is provided on the command line
|
||||
* and this value is ignored. Otherwise, this number of samples is
|
||||
* collected and the program terminates. Default: Zero (Samples are collected
|
||||
|
||||
@ -88,7 +88,7 @@ int tc_main(int argc, char *argv[])
|
||||
{
|
||||
struct touch_sample_s sample;
|
||||
ssize_t nbytes;
|
||||
#if defined(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN) || CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES > 0
|
||||
#if defined(CONFIG_NSH_BUILTIN_APPS) || CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES > 0
|
||||
long nsamples;
|
||||
#endif
|
||||
int fd;
|
||||
@ -99,7 +99,7 @@ int tc_main(int argc, char *argv[])
|
||||
* samples that we collect before returning. Otherwise, we never return
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN)
|
||||
#if defined(CONFIG_NSH_BUILTIN_APPS)
|
||||
nsamples = 1;
|
||||
if (argc > 1)
|
||||
{
|
||||
@ -139,7 +139,7 @@ int tc_main(int argc, char *argv[])
|
||||
* touchscreen samples.
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN)
|
||||
#if defined(CONFIG_NSH_BUILTIN_APPS)
|
||||
for (; nsamples > 0; nsamples--)
|
||||
#elif CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES > 0
|
||||
for (nsamples = 0; nsamples < CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES; nsamples++)
|
||||
|
||||
@ -9,14 +9,7 @@ config EXAMPLES_USBMSC
|
||||
---help---
|
||||
Enable the USB mass storage class example
|
||||
|
||||
config EXAMPLES_USBMSC_BUILTIN
|
||||
bool "NSH built-in command"
|
||||
default y
|
||||
depends on EXAMPLES_USBMSC && NSH_BUILTIN_APPS
|
||||
---help---
|
||||
This example can be built as two NSH "built-in" commands if this
|
||||
option is selected: 'msconn' will connect the USB mass storage
|
||||
device; 'msdis' will disconnect the USB storage device.
|
||||
if EXAMPLES_USBMSC
|
||||
|
||||
config EXAMPLES_USBMSC_NLUNS
|
||||
int "Number of LUNs"
|
||||
@ -134,3 +127,6 @@ config EXAMPLES_USBMSC_TRACEINTERRUPTS
|
||||
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
|
||||
|
||||
|
||||
@ -87,7 +87,7 @@ $(COBJS): %$(OBJEXT): %.c
|
||||
$(call ARCHIVE, $(BIN), $(OBJS))
|
||||
@touch .built
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_USBMSC_BUILTIN),y)
|
||||
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
|
||||
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
|
||||
$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main)
|
||||
|
||||
|
||||
@ -109,17 +109,17 @@
|
||||
* order to avoid name collisions.
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_EXAMPLES_USBMSC_BUILTIN) || defined(CONFIG_EXAMPLES_USBMSC_DEBUGMM)
|
||||
#if defined(CONFIG_NSH_BUILTIN_APPS) || defined(CONFIG_EXAMPLES_USBMSC_DEBUGMM)
|
||||
struct usbmsc_state_s
|
||||
{
|
||||
/* This is the handle that references to this particular USB storage driver
|
||||
* instance. It is only needed if the USB mass storage device example is
|
||||
* built using CONFIG_EXAMPLES_USBMSC_BUILTIN. In this case, the value
|
||||
* built using CONFIG_NSH_BUILTIN_APPS. In this case, the value
|
||||
* of the driver handle must be remembered between the 'msconn' and 'msdis'
|
||||
* commands.
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_EXAMPLES_USBMSC_BUILTIN
|
||||
#ifdef CONFIG_NSH_BUILTIN_APPS
|
||||
FAR void *mshandle;
|
||||
#endif
|
||||
|
||||
@ -143,7 +143,7 @@ struct usbmsc_state_s
|
||||
* order to avoid name collisions.
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_EXAMPLES_USBMSC_BUILTIN) || defined(CONFIG_EXAMPLES_USBMSC_DEBUGMM)
|
||||
#if defined(CONFIG_NSH_BUILTIN_APPS) || defined(CONFIG_EXAMPLES_USBMSC_DEBUGMM)
|
||||
extern struct usbmsc_state_s g_usbmsc;
|
||||
#endif
|
||||
|
||||
|
||||
@ -98,7 +98,7 @@
|
||||
* order to avoid name collisions.
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_EXAMPLES_USBMSC_BUILTIN) || defined(CONFIG_EXAMPLES_USBMSC_DEBUGMM)
|
||||
#if defined(CONFIG_NSH_BUILTIN_APPS) || defined(CONFIG_EXAMPLES_USBMSC_DEBUGMM)
|
||||
struct usbmsc_state_s g_usbmsc;
|
||||
#endif
|
||||
|
||||
@ -383,7 +383,7 @@ static int usbmsc_enumerate(struct usbtrace_s *trace, void *arg)
|
||||
*
|
||||
* Description:
|
||||
* This is the main program that configures the USB mass storage device
|
||||
* and exports the LUN(s). If CONFIG_EXAMPLES_USBMSC_BUILTIN is defined
|
||||
* and exports the LUN(s). If CONFIG_NSH_BUILTIN_APPS is defined
|
||||
* in the NuttX configuration, then this program can be executed by
|
||||
* entering the "msconn" command at the NSH console.
|
||||
*
|
||||
@ -398,7 +398,7 @@ int msconn_main(int argc, char *argv[])
|
||||
* do a little error checking to assure that we are not being called re-entrantly.
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_EXAMPLES_USBMSC_BUILTIN
|
||||
#ifdef CONFIG_NSH_BUILTIN_APPS
|
||||
|
||||
/* Check if there is a non-NULL USB mass storage device handle (meaning that the
|
||||
* USB mass storage device is already configured).
|
||||
@ -504,7 +504,7 @@ int msconn_main(int argc, char *argv[])
|
||||
* then we have not real option but to exit now.
|
||||
*/
|
||||
|
||||
#if !defined(CONFIG_EXAMPLES_USBMSC_BUILTIN) && !defined(CONFIG_DISABLE_SIGNALS)
|
||||
#if !defined(CONFIG_NSH_BUILTIN_APPS) && !defined(CONFIG_DISABLE_SIGNALS)
|
||||
|
||||
/* Otherwise, this thread will hang around and monitor the USB storage activity */
|
||||
|
||||
@ -527,7 +527,7 @@ int msconn_main(int argc, char *argv[])
|
||||
message("msconn_main: Still alive\n");
|
||||
# endif
|
||||
}
|
||||
#elif defined(CONFIG_EXAMPLES_USBMSC_BUILTIN)
|
||||
#elif defined(CONFIG_NSH_BUILTIN_APPS)
|
||||
|
||||
/* Return the USB mass storage device handle so it can be used by the 'misconn'
|
||||
* command.
|
||||
@ -555,13 +555,13 @@ int msconn_main(int argc, char *argv[])
|
||||
*
|
||||
* Description:
|
||||
* This is a program entry point that will disconnet the USB mass storage
|
||||
* device. This program is only available if CONFIG_EXAMPLES_USBMSC_BUILTIN
|
||||
* device. This program is only available if CONFIG_NSH_BUILTIN_APPS
|
||||
* is defined in the NuttX configuration. In that case, this program can
|
||||
* be executed by entering the "msdis" command at the NSH console.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef CONFIG_EXAMPLES_USBMSC_BUILTIN
|
||||
#ifdef CONFIG_NSH_BUILTIN_APPS
|
||||
int msdis_main(int argc, char *argv[])
|
||||
{
|
||||
/* First check if the USB mass storage device is already connected */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
############################################################################
|
||||
# apps/examples/usbterm/Makefile
|
||||
#
|
||||
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
|
||||
# Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
|
||||
$(call ARCHIVE, $(BIN), $(OBJS))
|
||||
@touch .built
|
||||
|
||||
ifeq ($(CONFIG_EXAMPLES_USBTERM_BUILTIN),y)
|
||||
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
|
||||
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
|
||||
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
|
||||
|
||||
|
||||
@ -11,12 +11,7 @@ config SYSTEM_I2CTOOL
|
||||
---help---
|
||||
Enable support for the I2C tool.
|
||||
|
||||
config I2CTOOL_BUILTIN
|
||||
bool "NSH built-in command"
|
||||
default y
|
||||
depends on SYSTEM_I2CTOOL && NSH_BUILTIN_APPS
|
||||
---help---
|
||||
Build the tools as an NSH built-in command
|
||||
if SYSTEM_I2CTOOL
|
||||
|
||||
config I2CTOOL_MINBUS
|
||||
int "Minimum bus number"
|
||||
@ -59,3 +54,5 @@ config I2CTOOL_DEFFREQ
|
||||
depends on SYSTEM_I2CTOOL
|
||||
---help---
|
||||
Default I2C frequency (default: 4000000)
|
||||
|
||||
endif
|
||||
|
||||
@ -46,7 +46,7 @@ the apps/nshlib/README.txt file for information about add-ons.
|
||||
|
||||
Configuration Options
|
||||
---------------------
|
||||
CONFIG_I2CTOOL_BUILTIN - Build the tools as an NSH built-in command
|
||||
CONFIG_NSH_BUILTIN_APPS - Build the tools as an NSH built-in command
|
||||
CONFIG_I2CTOOL_MINBUS - Smallest bus index supported by the hardware (default 0).
|
||||
CONFIG_I2CTOOL_MAXBUS - Largest bus index supported by the hardware (default 3)
|
||||
CONFIG_I2CTOOL_MINADDR - Minium device address (default: 0x03)
|
||||
@ -391,7 +391,7 @@ options in the NuttX configuration. This configuration is the defconfig
|
||||
file in your configuration directory that is copied to the NuttX top-level
|
||||
directory as .config when NuttX is configured.
|
||||
|
||||
CONFIG_I2CTOOL_BUILTIN: Build the tools as an NSH built-in command
|
||||
CONFIG_NSH_BUILTIN_APPS: Build the tools as an NSH built-in command
|
||||
CONFIG_I2CTOOL_MINBUS: Smallest bus index supported by the hardware (default 0).
|
||||
CONFIG_I2CTOOL_MAXBUS: Largest bus index supported by the hardware (default 3)
|
||||
CONFIG_I2CTOOL_MINADDR: Minium device address (default: 0x03)
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
* Definitions
|
||||
****************************************************************************/
|
||||
/* Configuration ************************************************************/
|
||||
/* CONFIG_I2CTOOL_BUILTIN - Build the tools as an NSH built-in command
|
||||
/* CONFIG_NSH_BUILTIN_APPS - Build the tools as an NSH built-in command
|
||||
* CONFIG_I2CTOOL_MINBUS - Smallest bus index supported by the hardware (default 0).
|
||||
* CONFIG_I2CTOOL_MAXBUS - Largest bus index supported by the hardware (default 3)
|
||||
* CONFIG_I2CTOOL_MINADDR - Minium device address (default: 0x03)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user