diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-18 20:35:31 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-18 20:35:31 +0000 |
commit | dacf833f9af5137dcad044152b8c75e56ddd0e79 (patch) | |
tree | 77d8c645bbcbc5843d09373dd67bf01207b5739e /nuttx/configs/vsn/src | |
parent | 058e81edfdee203f2143b3f0910aa957a7f8da48 (diff) | |
download | px4-nuttx-dacf833f9af5137dcad044152b8c75e56ddd0e79.tar.gz px4-nuttx-dacf833f9af5137dcad044152b8c75e56ddd0e79.tar.bz2 px4-nuttx-dacf833f9af5137dcad044152b8c75e56ddd0e79.zip |
Update documentation, change CONFIG_EXAMPLES_NSH to CONFIG_NSH
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3394 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/vsn/src')
-rw-r--r-- | nuttx/configs/vsn/src/Makefile | 2 | ||||
-rw-r--r-- | nuttx/configs/vsn/src/nsh.c | 4 | ||||
-rw-r--r-- | nuttx/configs/vsn/src/sdcard.c | 26 |
3 files changed, 16 insertions, 16 deletions
diff --git a/nuttx/configs/vsn/src/Makefile b/nuttx/configs/vsn/src/Makefile index f12a8bcef..6e55c30ca 100644 --- a/nuttx/configs/vsn/src/Makefile +++ b/nuttx/configs/vsn/src/Makefile @@ -46,7 +46,7 @@ AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = sysclock.c boot.c leds.c buttons.c spi.c \ usbdev.c power.c -ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y) +ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += nsh.c endif ifeq ($(CONFIG_APP_DIR),examples/usbstorage) diff --git a/nuttx/configs/vsn/src/nsh.c b/nuttx/configs/vsn/src/nsh.c index d29368833..c4e691ba9 100644 --- a/nuttx/configs/vsn/src/nsh.c +++ b/nuttx/configs/vsn/src/nsh.c @@ -58,12 +58,12 @@ /* PORT and SLOT number probably depend on the board configuration */ -#define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1 +#define CONFIG_NSH_HAVEUSBDEV 1 /* Can't support USB features if USB is not enabled */ #ifndef CONFIG_USBDEV -# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV +# undef CONFIG_NSH_HAVEUSBDEV #endif diff --git a/nuttx/configs/vsn/src/sdcard.c b/nuttx/configs/vsn/src/sdcard.c index 367e4150b..af36062dd 100644 --- a/nuttx/configs/vsn/src/sdcard.c +++ b/nuttx/configs/vsn/src/sdcard.c @@ -52,13 +52,13 @@ #include "vsn.h" -#define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1 -#if defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) && CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0 +#define CONFIG_NSH_HAVEMMCSD 1 +#if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 # error "Only one MMC/SD slot" -# undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO +# undef CONFIG_NSH_MMCSDSLOTNO #endif -#ifndef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO -# define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0 +#ifndef CONFIG_NSH_MMCSDSLOTNO +# define CONFIG_NSH_MMCSDSLOTNO 0 #endif /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support @@ -66,11 +66,11 @@ */ #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_STM32_SDIO) -# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD +# undef CONFIG_NSH_HAVEMMCSD #endif -#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR -# define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0 +#ifndef CONFIG_NSH_MMCSDMINOR +# define CONFIG_NSH_MMCSDMINOR 0 #endif @@ -79,24 +79,24 @@ int up_sdcard(void) { /* Mount the SDIO-based MMC/SD block driver */ -#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD +#ifdef CONFIG_NSH_HAVEMMCSD FAR struct sdio_dev_s *sdio; int ret; /* First, get an instance of the SDIO interface */ - sdio = sdio_initialize(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO); if (!sdio) { - message("SDIO: Failed to initialize slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + message("SDIO: Failed to initialize slot %d\n", CONFIG_NSH_MMCSDSLOTNO); return -ENODEV; } - message("SDIO: Initialized slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + message("SDIO: Initialized slot %d\n", CONFIG_NSH_MMCSDSLOTNO); /* Now bind the SPI interface to the MMC/SD driver */ - ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, sdio); + ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio); if (ret != OK) { message("SDIO: Failed to bind to the MMC/SD driver: %d\n", ret); |