sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix MMC/SD support for Wildfire board; Granule allocator can now be used from intrrupt handler

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5134 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-09-12 15:18:56 +00:00
parent 4aed6a9bd1
commit 7ed15a4afe
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configs/README.txt
View File

@ -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 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 are a few optimizations that can can be done and (2) the GRAN_HANDLE
is not needed. 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 CONFIG_DEBUG_GRAM
Just like CONFIG_DEBUG_MM, but only generates ouput from the gran Just like CONFIG_DEBUG_MM, but only generates ouput from the gran
allocation logic. allocation logic.

2
configs/fire-stm32v2/src/fire-internal.h
View File

@ -296,7 +296,7 @@ void stm32_selectlcd(void);
* *
* Description: * Description:
* Initialize the SPI-based SD card. Requires CONFIG_DISABLE_MOUNTPOINT=n * Initialize the SPI-based SD card. Requires CONFIG_DISABLE_MOUNTPOINT=n
* and CONFIG_STM32_SPI1=y * and CONFIG_STM32_SDIO=y
* *
****************************************************************************/ ****************************************************************************/

8
configs/fire-stm32v2/src/up_mmcsd.c
View File

@ -65,7 +65,7 @@
/* Can't support MMC/SD features if mountpoints are disabled */ /* Can't support MMC/SD features if mountpoints are disabled */
#ifndef CONFIG_DISABLE_MOUNTPOINT #ifdef CONFIG_DISABLE_MOUNTPOINT
# undef HAVE_MMCSD # undef HAVE_MMCSD
#endif #endif
@ -78,7 +78,7 @@
* *
* Description: * Description:
* Initialize the SPI-based SD card. Requires CONFIG_DISABLE_MOUNTPOINT=n * 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); sdio = sdio_initialize(STM32_MMCSDSLOTNO);
if (!sdio) if (!sdio)
{ {
message("Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO); fdbg("Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO);
return -ENODEV; return -ENODEV;
} }
@ -104,7 +104,7 @@ int stm32_sdinitialize(int minor)
ret = mmcsd_slotinitialize(minor, sdio); ret = mmcsd_slotinitialize(minor, sdio);
if (ret != OK) 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); STM32_MMCSDSLOTNO, minor);
} }