diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-23 09:36:09 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-23 09:36:09 +0200 |
commit | 59d12ee77fa72951004609409aa86210b8873005 (patch) | |
tree | c2c23ccd1bb0f2626cbba9fe04cc1f0cd7174f5b /src/drivers/boards | |
parent | 17e01eb9cbb0cbb904331dadd8525fbe81e8abc7 (diff) | |
parent | 8fcbb4f669d8c9003f778f35a94278383e0360ac (diff) | |
download | px4-firmware-59d12ee77fa72951004609409aa86210b8873005.tar.gz px4-firmware-59d12ee77fa72951004609409aa86210b8873005.tar.bz2 px4-firmware-59d12ee77fa72951004609409aa86210b8873005.zip |
Merge branch 'fmuv2_bringup' of github.com:cvg/Firmware_Private into fmuv2_bringup
Diffstat (limited to 'src/drivers/boards')
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_init.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/drivers/boards/px4fmuv2/px4fmu_init.c b/src/drivers/boards/px4fmuv2/px4fmu_init.c index 2fd3a2c1b..03ec5a255 100644 --- a/src/drivers/boards/px4fmuv2/px4fmu_init.c +++ b/src/drivers/boards/px4fmuv2/px4fmu_init.c @@ -55,6 +55,7 @@ #include <nuttx/arch.h> #include <nuttx/spi.h> #include <nuttx/i2c.h> +#include <nuttx/sdio.h> #include <nuttx/mmcsd.h> #include <nuttx/analog/adc.h> @@ -128,6 +129,7 @@ __EXPORT void stm32_boardinitialize(void) static struct spi_dev_s *spi1; static struct spi_dev_s *spi2; +static struct sdio_dev_s *sdio; #include <math.h> @@ -226,5 +228,28 @@ __EXPORT int nsh_archinitialize(void) message("[boot] Successfully initialized SPI port 2\n"); + #ifdef CONFIG_MMCSD + /* First, get an instance of the SDIO interface */ + + sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO); + if (!sdio) { + message("nsh_archinitialize: Failed to initialize SDIO slot %d\n", + CONFIG_NSH_MMCSDSLOTNO); + return -ENODEV; + } + + /* Now bind the SDIO interface to the MMC/SD driver */ + int ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio); + if (ret != OK) { + message("nsh_archinitialize: Failed to bind SDIO to the MMC/SD driver: %d\n", ret); + return ret; + } + + /* Then let's guess and say that there is a card in the slot. There is no card detect GPIO. */ + sdio_mediachange(sdio, true); + + message("[boot] Initialized SDIO\n"); + #endif + return OK; } |