Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 20:35:33 +03:00
Code Issues Wiki Activity

Merge pull request #10696 from hydra/bf-config-id-sd-card-fix

Browse source 
Fix infinite loop in SD card initialisation failure when CONFIG_IN_SDCARD is used.
This commit is contained in:
Michael Keller 2021-04-26 13:43:29 +12:00 • committed by GitHub
commit 72d9868f8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/pg/sdcard.c
View file

@ -45,7 +45,17 @@ void pgResetFn_sdcardConfig(sdcardConfig_t *config)
// On generic targets, SPI has precedence over SDIO; SDIO must be post-flash configured. // On generic targets, SPI has precedence over SDIO; SDIO must be post-flash configured.
config->useDma = false; config->useDma = false;
config->device = SPI_DEV_TO_CFG(SPIINVALID); config->device = SPI_DEV_TO_CFG(SPIINVALID);
#ifdef CONFIG_IN_SDCARD
// CONFIG_ID_SDDCARD requires a default mode.
#if defined(USE_SDCARD_SDIO)
config->mode = SDCARD_MODE_SDIO;
#elif defined(USE_SDCARD_SPI)
config->mode = SDCARD_MODE_SPI;
#endif
#else
config->mode = SDCARD_MODE_NONE; config->mode = SDCARD_MODE_NONE;
#endif
#ifdef USE_SDCARD_SPI #ifdef USE_SDCARD_SPI
// These settings do not work for Unified Targets // These settings do not work for Unified Targets