diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 5a8e15cc4..540d8134e 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -963,8 +963,8 @@ * fs/fs_mount.c -- Correct error handling logic. If the bind() method fails, then a reserved node is left in the tree. This causes subsequent attempts to mount at the location to fail (reporting that the node - already exists). This is a probably for block drivers for removable - media: The bind method could fail repeatedly until media is asserted. + already exists). This is a problem for block drivers for removable + media: The bind method could fail repeatedly until media is inserted. * arch/arm/src/stm32/chip.h & stm32_dma.c -- Fixed several definitions that can cause compilation errors when DMA2 is enabled. * arch/arm/src/stm32/stm32_dma.c - Integrated and debugged STM32 DMA @@ -972,6 +972,7 @@ * configs/stm3210e-eval/usbstorage - Add a configuration to exercise the STM32 with the USB mass storage device class example (examples/usbstorage). - - - + * configs/mcu123-lpc214x/up_usbstrg - Move LPC-specific code from + examples/usbstorage to configs/mcu123-lpc214x. + * configs/stm321e-eval/up_usbstrg - Add STM32-specific logic for the + examples/usbstorage test. diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 241233f3f..7fe9ef3dc 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -1611,8 +1611,8 @@ nuttx-4.14 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * fs/fs_mount.c -- Correct error handling logic. If the bind() method fails, then a reserved node is left in the tree. This causes subsequent attempts to mount at the location to fail (reporting that the node - already exists). This is a probably for block drivers for removable - media: The bind method could fail repeatedly until media is asserted. + already exists). This is a problem for block drivers for removable + media: The bind method could fail repeatedly until media is inserted. * arch/arm/src/stm32/chip.h & stm32_dma.c -- Fixed several definitions that can cause compilation errors when DMA2 is enabled. * arch/arm/src/stm32/stm32_dma.c - Integrated and debugged STM32 DMA @@ -1620,6 +1620,10 @@ nuttx-4.14 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * configs/stm3210e-eval/usbstorage - Add a configuration to exercise the STM32 with the USB mass storage device class example (examples/usbstorage). + * configs/mcu123-lpc214x/up_usbstrg - Move LPC-specific code from + examples/usbstorage to configs/mcu123-lpc214x. + * configs/stm321e-eval/up_usbstrg - Add STM32-specific logic for the + examples/usbstorage test. pascal-0.1.3 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/configs/stm3210e-eval/src/Makefile b/nuttx/configs/stm3210e-eval/src/Makefile index b3e82e7af..03d565a56 100755 --- a/nuttx/configs/stm3210e-eval/src/Makefile +++ b/nuttx/configs/stm3210e-eval/src/Makefile @@ -39,12 +39,16 @@ CFLAGS += -I$(TOPDIR)/sched ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) + CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c \ - up_extcontext.c up_selectnor.c up_deselectnor.c \ - up_selectsram.c up_deselectsram.c + up_extcontext.c up_selectnor.c up_deselectnor.c \ + up_selectsram.c up_deselectsram.c ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y) CSRCS += up_nsh.c endif +ifeq ($(CONFIG_EXAMPLE),usbstorage) +CSRCS += up_usbstrg.c +endif COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) diff --git a/nuttx/configs/stm3210e-eval/src/up_usbstrg.c b/nuttx/configs/stm3210e-eval/src/up_usbstrg.c new file mode 100755 index 000000000..72805b8d8 --- /dev/null +++ b/nuttx/configs/stm3210e-eval/src/up_usbstrg.c @@ -0,0 +1,154 @@ +/**************************************************************************** + * configs/stm3210e-eval/src/up_usbstrg.c + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Configure and register the STM32 MMC/SD SDIO block driver. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include + +#include +#include +#include + +#include +#include + +#include "stm32_internal.h" + +#ifdef CONFIG_STM32_SDIO + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/* Configuration ************************************************************/ + +#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 +# define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0 +#endif + +/* SLOT number(s) could depend on the board configuration */ + +#ifdef CONFIG_ARCH_BOARD_STM3210E_EVAL +# undef STM32_MMCSDSLOTNO +# define STM32_MMCSDSLOTNO 0 +#else + /* Add configuration for new STM32 boards here */ +# error "Unrecognized STM32 board" +#endif + +/* Debug ********************************************************************/ + +#ifdef CONFIG_CPP_HAVE_VARARGS +# ifdef CONFIG_DEBUG +# define message(...) lib_lowprintf(__VA_ARGS__) +# define msgflush() +# else +# define message(...) printf(__VA_ARGS__) +# define msgflush() fflush(stdout) +# endif +#else +# ifdef CONFIG_DEBUG +# define message lib_lowprintf +# define msgflush() +# else +# define message printf +# define msgflush() fflush(stdout) +# endif +#endif + + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: usbstrg_archinitialize + * + * Description: + * Perform architecture specific initialization + * + ****************************************************************************/ + +int usbstrg_archinitialize(void) +{ + FAR struct sdio_dev_s *sdio; + int ret; + + /* First, get an instance of the SDIO interface */ + + message("usbstrg_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", + STM32_MMCSDSLOTNO); + return -ENODEV; + } + + /* Now bind the SPI interface to the MMC/SD driver */ + + message("usbstrg_archinitialize: " + "Bind SDIO to the MMC/SD driver, minor=%d\n", + CONFIG_EXAMPLES_USBSTRG_DEVMINOR1); + + ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1, sdio); + if (ret != OK) + { + message("usbstrg_archinitialize: " + "Failed to bind SDIO to the MMC/SD driver: %d\n", + ret); + return ret; + } + message("usbstrg_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 + * see if the STM3210E-EVAL board supports a GPIO to detect if there is a card in + * the slot. + */ + + sdio_mediachange(sdio, TRUE); + return OK; +} + +#endif /* CONFIG_STM32_SDIO */