Merge pull request #10730 from hydra/bf-sdcard-fixes-1

src/main/drivers/sdio_h7xx.c

@@ -168,8 +168,14 @@ void HAL_SD_MspInit(SD_HandleTypeDef* hsd)
     }
 
     if (sdioHardware->instance == SDMMC1) {
+        __HAL_RCC_SDMMC1_CLK_DISABLE();
+        __HAL_RCC_SDMMC1_FORCE_RESET();
+        __HAL_RCC_SDMMC1_RELEASE_RESET();
         __HAL_RCC_SDMMC1_CLK_ENABLE();
     } else if (sdioHardware->instance == SDMMC2) {
+        __HAL_RCC_SDMMC2_CLK_DISABLE();
+        __HAL_RCC_SDMMC2_FORCE_RESET();
+        __HAL_RCC_SDMMC2_RELEASE_RESET();
         __HAL_RCC_SDMMC2_CLK_ENABLE();
     }
 

src/main/drivers/system.h

@@ -42,6 +42,7 @@ typedef enum {
     FAILURE_SDCARD_READ_FAILED,
     FAILURE_SDCARD_WRITE_FAILED,
     FAILURE_SDCARD_INITIALISATION_FAILED,
+    FAILURE_SDCARD_REQUIRED,
 } failureMode_e;
 
 #define WARNING_FLASH_DURATION_MS 50

src/main/fc/init.c

@@ -374,6 +374,10 @@ void init(void)
     sdCardAndFSInit();
     initFlags |= SD_INIT_ATTEMPTED;
 
+    if (!sdcard_isInserted()) {
+        failureMode(FAILURE_SDCARD_REQUIRED);
+    }
+
     while (afatfs_getFilesystemState() != AFATFS_FILESYSTEM_STATE_READY) {
         afatfs_poll();