From b380a343a6dc67b5ed4881a2e19611e05513c17f Mon Sep 17 00:00:00 2001
From: MJ666 <michael.p.jakob@web.de>
Date: Wed, 3 Oct 2018 00:34:15 +0200
Subject: [PATCH] Update SDCARD driver for generic target remove enabled PG
 paramter

---
 src/main/drivers/sdcard_sdio_baremetal.c | 2 +-
 src/main/drivers/sdcard_spi.c            | 2 +-
 src/main/fc/init.c                       | 2 +-
 src/main/pg/sdcard.c                     | 5 +----
 src/main/pg/sdcard.h                     | 1 -
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/drivers/sdcard_sdio_baremetal.c b/src/main/drivers/sdcard_sdio_baremetal.c
index 786b96006a..bf3d50ec5d 100644
--- a/src/main/drivers/sdcard_sdio_baremetal.c
+++ b/src/main/drivers/sdcard_sdio_baremetal.c
@@ -189,7 +189,7 @@ static bool sdcard_checkInitDone(void)
  */
 void sdcard_init(const sdcardConfig_t *config)
 {
-    sdcard.enabled = config->enabled;
+    sdcard.enabled = config->mode;
     if (!sdcard.enabled) {
         sdcard.state = SDCARD_STATE_NOT_PRESENT;
         return;
diff --git a/src/main/drivers/sdcard_spi.c b/src/main/drivers/sdcard_spi.c
index c2a8513376..3e48fd4368 100644
--- a/src/main/drivers/sdcard_spi.c
+++ b/src/main/drivers/sdcard_spi.c
@@ -473,7 +473,7 @@ static bool sdcard_checkInitDone(void)
  */
 void sdcard_init(const sdcardConfig_t *config)
 {
-    sdcard.enabled = config->enabled;
+    sdcard.enabled = config->mode;
     if (!sdcard.enabled) {
         sdcard.state = SDCARD_STATE_NOT_PRESENT;
         return;
diff --git a/src/main/fc/init.c b/src/main/fc/init.c
index c918ebe31d..7bc5ab5f53 100644
--- a/src/main/fc/init.c
+++ b/src/main/fc/init.c
@@ -635,7 +635,7 @@ void init(void)
 
 #ifdef USE_SDCARD
     if (blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD) {
-        if (sdcardConfig()->enabled) {
+        if (sdcardConfig()->mode) {
             sdcardInsertionDetectInit();
             sdcard_init(sdcardConfig());
             afatfs_init();
diff --git a/src/main/pg/sdcard.c b/src/main/pg/sdcard.c
index 74e8022c4d..e46c56bf61 100644
--- a/src/main/pg/sdcard.c
+++ b/src/main/pg/sdcard.c
@@ -33,12 +33,11 @@
 #include "drivers/io.h"
 #include "drivers/dma.h"
 
-PG_REGISTER_WITH_RESET_FN(sdcardConfig_t, sdcardConfig, PG_SDCARD_CONFIG, 0);
+PG_REGISTER_WITH_RESET_FN(sdcardConfig_t, sdcardConfig, PG_SDCARD_CONFIG, 1);
 
 void pgResetFn_sdcardConfig(sdcardConfig_t *config)
 {
     config->useDma = false;
-    config->enabled = 0;
     config->device = SPI_DEV_TO_CFG(SPIINVALID);
     config->mode = SDCARD_MODE_NONE;
 
@@ -47,7 +46,6 @@ void pgResetFn_sdcardConfig(sdcardConfig_t *config)
 
 #ifdef USE_SDCARD_SDIO
     config->mode = SDCARD_MODE_SDIO;
-    config->enabled = 1;
 #endif
 
 #ifdef USE_SDCARD_SPI
@@ -56,7 +54,6 @@ void pgResetFn_sdcardConfig(sdcardConfig_t *config)
     config->chipSelectTag = IO_TAG(SDCARD_SPI_CS_PIN);
 
     if (spidevice != SPIINVALID && config->chipSelectTag) {
-        config->enabled = 1;
         config->mode = SDCARD_MODE_SPI;
     }
 #endif
diff --git a/src/main/pg/sdcard.h b/src/main/pg/sdcard.h
index 042dd5f0bb..bf3b43a5df 100644
--- a/src/main/pg/sdcard.h
+++ b/src/main/pg/sdcard.h
@@ -31,7 +31,6 @@ typedef enum {
 
 typedef struct sdcardConfig_s {
     uint8_t useDma;
-    uint8_t enabled;
     int8_t  device;
     ioTag_t cardDetectTag;
     ioTag_t chipSelectTag;