diff options
Diffstat (limited to 'nuttx/configs/stm3210e-eval/src')
-rw-r--r-- | nuttx/configs/stm3210e-eval/src/Makefile | 4 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/src/up_usbmsc.c (renamed from nuttx/configs/stm3210e-eval/src/up_usbstrg.c) | 30 |
2 files changed, 17 insertions, 17 deletions
diff --git a/nuttx/configs/stm3210e-eval/src/Makefile b/nuttx/configs/stm3210e-eval/src/Makefile index e949e7208..7c93a2d32 100644 --- a/nuttx/configs/stm3210e-eval/src/Makefile +++ b/nuttx/configs/stm3210e-eval/src/Makefile @@ -56,8 +56,8 @@ ifeq ($(CONFIG_ADC),y) CSRCS += up_adc.c endif -ifeq ($(CONFIG_USBSTRG),y) -CSRCS += up_usbstrg.c +ifeq ($(CONFIG_USBMSC),y) +CSRCS += up_usbmsc.c endif ifeq ($(CONFIG_I2C_LM75),y) diff --git a/nuttx/configs/stm3210e-eval/src/up_usbstrg.c b/nuttx/configs/stm3210e-eval/src/up_usbmsc.c index f7ba205cc..4f788579c 100644 --- a/nuttx/configs/stm3210e-eval/src/up_usbstrg.c +++ b/nuttx/configs/stm3210e-eval/src/up_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/stm3210e-eval/src/up_usbstrg.c + * configs/stm3210e-eval/src/up_usbmsc.c * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -60,8 +60,8 @@ /* Configuration ************************************************************/ -#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 -# define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0 +#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1 +# define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0 #endif /* SLOT number(s) could depend on the board configuration */ @@ -100,53 +100,53 @@ ****************************************************************************/ /**************************************************************************** - * Name: usbstrg_archinitialize + * Name: usbmsc_archinitialize * * Description: * Perform architecture specific initialization * ****************************************************************************/ -int usbstrg_archinitialize(void) +int usbmsc_archinitialize(void) { - /* If examples/usbstrg is built as an NSH command, then SD slot should + /* If examples/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_EXAMPLES_USBSTRG_BUILTIN +#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN FAR struct sdio_dev_s *sdio; int ret; /* First, get an instance of the SDIO interface */ - message("usbstrg_archinitialize: " + message("usbmsc_archinitialize: " "Initializing SDIO slot %d\n", STM32_MMCSDSLOTNO); sdio = sdio_initialize(STM32_MMCSDSLOTNO); if (!sdio) { - message("usbstrg_archinitialize: Failed to initialize SDIO slot %d\n", + message("usbmsc_archinitialize: Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO); return -ENODEV; } /* Now bind the SDIO interface to the MMC/SD driver */ - message("usbstrg_archinitialize: " + message("usbmsc_archinitialize: " "Bind SDIO to the MMC/SD driver, minor=%d\n", - CONFIG_EXAMPLES_USBSTRG_DEVMINOR1); + CONFIG_EXAMPLES_USBMSC_DEVMINOR1); - ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1, sdio); + ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, sdio); if (ret != OK) { - message("usbstrg_archinitialize: " + message("usbmsc_archinitialize: " "Failed to bind SDIO to the MMC/SD driver: %d\n", ret); return ret; } - message("usbstrg_archinitialize: " + message("usbmsc_archinitialize: " "Successfully bound SDIO to the MMC/SD driver\n"); /* Then let's guess and say that there is a card in the slot. I need to check to @@ -156,7 +156,7 @@ int usbstrg_archinitialize(void) sdio_mediachange(sdio, true); -#endif /* CONFIG_EXAMPLES_USBSTRG_BUILTIN */ +#endif /* CONFIG_EXAMPLES_USBMSC_BUILTIN */ return OK; } |