From 546b37ccfff8ac87e5d188a2aa557278dc2dc7a0 Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 22 Oct 2019 15:47:36 +0200 Subject: [PATCH] Prevent uneeded unmount!:mount f already mounted of sdcard (#6986) Prevent double SD mount on Horus --- radio/src/main.cpp | 4 +--- radio/src/opentx.cpp | 2 -- radio/src/opentx.h | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/radio/src/main.cpp b/radio/src/main.cpp index 9237ace55..785c5e423 100644 --- a/radio/src/main.cpp +++ b/radio/src/main.cpp @@ -502,11 +502,9 @@ void perMain() #endif #if defined(STM32) - bool sdcardPresent = SD_CARD_PRESENT(); - if (sdcardPresent && !globalData.sdcardPresent) { + if (SD_CARD_PRESENT() && !sdMounted()) { sdMount(); } - globalData.sdcardPresent = sdcardPresent; #endif #if !defined(EEPROM) diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 7e3bc3edf..d4697e51a 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1859,8 +1859,6 @@ void opentxInit() } #if defined(SDCARD) - globalData.sdcardPresent = SD_CARD_PRESENT(); - // SDCARD related stuff, only done if not unexpectedShutdown if (!globalData.unexpectedShutdown) { sdInit(); diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 34931dd44..c448edae0 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -569,9 +569,8 @@ void flightReset(uint8_t check=true); PACK(struct GlobalData { uint8_t unexpectedShutdown:1; - uint8_t sdcardPresent:1; uint8_t externalAntennaEnabled: 1; - uint8_t spare:5; + uint8_t spare:6; }); extern GlobalData globalData;