From 6ddb9e414f46a8b42e9070796b3605a983d278b0 Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Sun, 11 Sep 2016 14:24:24 +0200
Subject: [PATCH] Getting rid of sdMountPoll() on ARM

---
 radio/src/main_arm.cpp             |  1 -
 radio/src/targets/horus/board.h    |  1 -
 radio/src/targets/sky9x/board.h    |  1 -
 radio/src/targets/sky9x/diskio.cpp | 67 ------------------------------
 radio/src/targets/taranis/board.h  |  1 -
 5 files changed, 71 deletions(-)

diff --git a/radio/src/main_arm.cpp b/radio/src/main_arm.cpp
index 5a4708d86..e7a3a48ef 100644
--- a/radio/src/main_arm.cpp
+++ b/radio/src/main_arm.cpp
@@ -391,7 +391,6 @@ void perMain()
 #endif
   checkSpeakerVolume();
   checkEeprom();
-  sdMountPoll();
   writeLogs();
   handleUsbConnection();
   checkTrainerSettings();
diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h
index 5b02664bb..68e50c003 100644
--- a/radio/src/targets/horus/board.h
+++ b/radio/src/targets/horus/board.h
@@ -122,7 +122,6 @@ void sdInit(void);
 void sdMount(void);
 void sdDone(void);
 #define sdPoll10ms()
-#define sdMountPoll()
 uint32_t sdMounted(void);
 #else
 #define SD_IS_HC()                     (0)
diff --git a/radio/src/targets/sky9x/board.h b/radio/src/targets/sky9x/board.h
index d3afa53d8..04df46c7a 100644
--- a/radio/src/targets/sky9x/board.h
+++ b/radio/src/targets/sky9x/board.h
@@ -260,7 +260,6 @@ void disable_dsm2(uint32_t port);
 #define sdDone()
 #else
 #define sdPoll10ms()
-void sdMountPoll();
 #if defined(__cplusplus)
 extern "C" {
 #endif
diff --git a/radio/src/targets/sky9x/diskio.cpp b/radio/src/targets/sky9x/diskio.cpp
index 5694dd338..25dc41ee0 100644
--- a/radio/src/targets/sky9x/diskio.cpp
+++ b/radio/src/targets/sky9x/diskio.cpp
@@ -944,73 +944,6 @@ void sdInit()
 uint8_t sdErrorCount = 0;
 FATFS g_FATFS_Obj = { 0 };
 
-void sdMountPoll()
-{
-#if 0
-  if (!Card_initialized)
-    return;
-
-  if (!SD_CARD_PRESENT()) {
-    Card_state = SD_ST_EMPTY;
-    Sd_rca = 0;
-    sdErrorCount = 0;
-  }
-
-  switch (Card_state) {
-    case SD_ST_EMPTY:
-      if (SD_CARD_PRESENT()) {
-        Card_state = SD_ST_INIT1;
-      }
-      break;
-
-    case SD_ST_INIT1:
-      sdCmd0();
-      Card_state = SD_ST_INIT2;
-      break;
-
-    case SD_ST_INIT2:
-      sdCmd8(1);
-      Card_state = SD_ST_IDLE;
-      break;
-
-    case SD_ST_IDLE:
-      sdMemInit(1, &Cmd_A41_resp);
-      Card_state = SD_ST_READY;
-      break;
-
-    case SD_ST_READY:
-      if (!sdCmd2()) Card_state = SD_ST_IDENT;
-      break;
-
-    case SD_ST_IDENT:
-      if (!sdCmd3()) Card_state = SD_ST_STBY;
-      break;
-
-    case SD_ST_STBY:
-      sdCmd9();
-      sdCmd7(); // Select Card
-      Card_state = SD_ST_TRAN;
-      break;
-
-    case SD_ST_TRAN:
-      sdAcmd51();
-      sdAcmd6(); // Set bus width to 4 bits, and speed to 9 MHz
-      // Should check the card can do this ****
-      Card_state = SD_ST_DATA;
-      break;
-
-    case SD_ST_DATA:
-      if (!usbPlugged() && f_mount(0, &g_FATFS_Obj) == FR_OK) {
-        Card_state = SD_ST_MOUNTED;
-      }
-      break;
-
-    case SD_ST_ERR:
-      break;
-  }
-#endif
-}
-
 void sdInit()
 {
   Sd_rca = 0;
diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
index e8ec5fc8f..f8a7d8d5a 100644
--- a/radio/src/targets/taranis/board.h
+++ b/radio/src/targets/taranis/board.h
@@ -146,7 +146,6 @@ void sdInit(void);
 void sdMount(void);
 void sdDone(void);
 void sdPoll10ms(void);
-#define sdMountPoll()
 uint32_t sdMounted(void);
 #define SD_CARD_PRESENT()              (~SD_GPIO_PRESENT->IDR & SD_GPIO_PIN_PRESENT)
 #endif