diff options
Diffstat (limited to 'nuttx/configs/detron/src/up_nsh.c')
| -rwxr-xr-x | nuttx/configs/detron/src/up_nsh.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/nuttx/configs/detron/src/up_nsh.c b/nuttx/configs/detron/src/up_nsh.c index cac549ee7..5a74f8d73 100755 --- a/nuttx/configs/detron/src/up_nsh.c +++ b/nuttx/configs/detron/src/up_nsh.c @@ -59,37 +59,37 @@ /* Configuration ************************************************************/ #ifdef CONFIG_ARCH_BOARD_DETRON -# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD -# define CONFIG_EXAMPLES_NSH_HAVEUSBHOST 1 +# undef CONFIG_NSH_HAVEMMCSD +# define CONFIG_NSH_HAVEUSBHOST 1 #else # error "Unrecognized board" -# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD -# undef CONFIG_EXAMPLES_NSH_HAVEUSBHOST +# undef CONFIG_NSH_HAVEMMCSD +# undef CONFIG_NSH_HAVEUSBHOST #endif /* Can't support MMC/SD features if mountpoints are disabled */ #if defined(CONFIG_DISABLE_MOUNTPOINT) -# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD +# undef CONFIG_NSH_HAVEMMCSD #endif /* MMC/SD PORT and SLOT number probably depend on the board configuration */ -#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD -# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0 +#ifdef CONFIG_NSH_HAVEMMCSD +# if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0 # error "The Detron MMC/SD is on SSP0" -# undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO -# define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0 +# undef CONFIG_NSH_MMCSDSPIPORTNO +# define CONFIG_NSH_MMCSDSPIPORTNO 0 # endif -# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0 +# if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0 # error "The Detron MMC/SD is only one slot (0)" -# undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO -# define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0 +# undef CONFIG_NSH_MMCSDSLOTNO +# define CONFIG_NSH_MMCSDSLOTNO 0 # endif #endif -#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR -# define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0 +#ifndef CONFIG_NSH_MMCSDMINOR +# define CONFIG_NSH_MMCSDMINOR 0 #endif /* USB Host */ @@ -107,10 +107,10 @@ #endif #if !defined(CONFIG_USBHOST) || !defined(CONFIG_LPC17_USBHOST) -# undef CONFIG_EXAMPLES_NSH_HAVEUSBHOST +# undef CONFIG_NSH_HAVEUSBHOST #endif -#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST +#ifdef CONFIG_NSH_HAVEUSBHOST # ifndef CONFIG_USBHOST_DEFPRIO # define CONFIG_USBHOST_DEFPRIO 50 # endif @@ -139,7 +139,7 @@ * Private Data ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST +#ifdef CONFIG_NSH_HAVEUSBHOST static struct usbhost_driver_s *g_drvr; #endif @@ -155,7 +155,7 @@ static struct usbhost_driver_s *g_drvr; * ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST +#ifdef CONFIG_NSH_HAVEUSBHOST static int nsh_waiter(int argc, char *argv[]) { bool connected = false; @@ -196,7 +196,7 @@ static int nsh_waiter(int argc, char *argv[]) * ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST +#ifdef CONFIG_NSH_HAVEUSBHOST static int nsh_usbhostinitialize(void) { int pid; @@ -254,7 +254,7 @@ static int nsh_usbhostinitialize(void) * ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD +#ifdef CONFIG_NSH_HAVEMMCSD int nsh_sdinitialize(void) { FAR struct spi_dev_s *ssp; @@ -262,29 +262,29 @@ int nsh_sdinitialize(void) /* Get the SSP port */ - ssp = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO); + ssp = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO); if (!ssp) { message("nsh_archinitialize: Failed to initialize SSP port %d\n", - CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO); + CONFIG_NSH_MMCSDSPIPORTNO); return -ENODEV; } message("Successfully initialized SSP port %d\n", - CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO); + CONFIG_NSH_MMCSDSPIPORTNO); /* Bind the SSP port to the slot */ - ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ssp); + ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, ssp); if (ret < 0) { message("nsh_archinitialize: Failed to bind SSP port %d to MMC/SD slot %d: %d\n", - CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret); + CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret); return ret; } message("Successfuly bound SSP port %d to MMC/SD slot %d\n", - CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO); return OK; } #else |