From 7231abf1a51e65c9147598b665519d3d822f983f Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 12 Sep 2012 15:18:56 +0000 Subject: Fix MMC/SD support for Wildfire board; Granule allocator can now be used from intrrupt handler git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5134 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/configs/README.txt | 5 +++++ nuttx/configs/fire-stm32v2/src/fire-internal.h | 2 +- nuttx/configs/fire-stm32v2/src/up_mmcsd.c | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'nuttx/configs') diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index b3d0e91f5..1c14e8388 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -299,6 +299,11 @@ defconfig -- This is a configuration file similar to the Linux gran_initialize will be called only once. In this case, (1) there are a few optimizations that can can be done and (2) the GRAN_HANDLE is not needed. + CONFIG_GRAN_INTR - Normally mutual exclusive access to granule allocator + data is assured using a semaphore. If this option is set then, instead, + mutual exclusion logic will disable interrupts. While this options is + more invasive to system performance, it will also support use of the + granule allocator from interrupt level logic. CONFIG_DEBUG_GRAM Just like CONFIG_DEBUG_MM, but only generates ouput from the gran allocation logic. diff --git a/nuttx/configs/fire-stm32v2/src/fire-internal.h b/nuttx/configs/fire-stm32v2/src/fire-internal.h index f51bd0ef9..801fb127e 100644 --- a/nuttx/configs/fire-stm32v2/src/fire-internal.h +++ b/nuttx/configs/fire-stm32v2/src/fire-internal.h @@ -296,7 +296,7 @@ void stm32_selectlcd(void); * * Description: * Initialize the SPI-based SD card. Requires CONFIG_DISABLE_MOUNTPOINT=n - * and CONFIG_STM32_SPI1=y + * and CONFIG_STM32_SDIO=y * ****************************************************************************/ diff --git a/nuttx/configs/fire-stm32v2/src/up_mmcsd.c b/nuttx/configs/fire-stm32v2/src/up_mmcsd.c index d3fa611bd..c0c6693d3 100644 --- a/nuttx/configs/fire-stm32v2/src/up_mmcsd.c +++ b/nuttx/configs/fire-stm32v2/src/up_mmcsd.c @@ -65,7 +65,7 @@ /* Can't support MMC/SD features if mountpoints are disabled */ -#ifndef CONFIG_DISABLE_MOUNTPOINT +#ifdef CONFIG_DISABLE_MOUNTPOINT # undef HAVE_MMCSD #endif @@ -78,7 +78,7 @@ * * Description: * Initialize the SPI-based SD card. Requires CONFIG_DISABLE_MOUNTPOINT=n - * and CONFIG_STM32_SPI1=y + * and CONFIG_STM32_SDIO=y * ****************************************************************************/ @@ -93,7 +93,7 @@ int stm32_sdinitialize(int minor) sdio = sdio_initialize(STM32_MMCSDSLOTNO); if (!sdio) { - message("Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO); + fdbg("Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO); return -ENODEV; } @@ -104,7 +104,7 @@ int stm32_sdinitialize(int minor) ret = mmcsd_slotinitialize(minor, sdio); if (ret != OK) { - message("Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n", + fdbg("Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n", STM32_MMCSDSLOTNO, minor); } -- cgit v1.2.3