From 9d1e4db800b926a8eb458851a75ad353c88cd85a Mon Sep 17 00:00:00 2001
From: jflyper <shinoda@jaist.ac.jp>
Date: Mon, 2 Jul 2018 09:46:54 +0900
Subject: [PATCH] Call flashfsIsSupported instead of flashfsIsReady to check
 flash chip existence

---
 src/main/blackbox/blackbox_io.c  | 2 +-
 src/main/cms/cms_menu_blackbox.c | 6 +++++-
 src/main/interface/cli.c         | 4 ++++
 src/main/io/osd.c                | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/blackbox/blackbox_io.c b/src/main/blackbox/blackbox_io.c
index f6ebe68ae..d863089a5 100644
--- a/src/main/blackbox/blackbox_io.c
+++ b/src/main/blackbox/blackbox_io.c
@@ -259,7 +259,7 @@ bool blackboxDeviceOpen(void)
         break;
 #ifdef USE_FLASHFS
     case BLACKBOX_DEVICE_FLASH:
-        if (flashfsGetSize() == 0 || isBlackboxDeviceFull()) {
+        if (!flashfsIsSupported() || isBlackboxDeviceFull()) {
             return false;
         }
 
diff --git a/src/main/cms/cms_menu_blackbox.c b/src/main/cms/cms_menu_blackbox.c
index 0e2e78c84..f0e99df03 100644
--- a/src/main/cms/cms_menu_blackbox.c
+++ b/src/main/cms/cms_menu_blackbox.c
@@ -122,7 +122,7 @@ static void cmsx_Blackbox_GetDeviceStatus(void)
     case BLACKBOX_DEVICE_FLASH:
         unit = "KB";
 
-        storageDeviceIsWorking = flashfsIsReady();
+        storageDeviceIsWorking = flashfsIsSupported();
         if (storageDeviceIsWorking) {
             tfp_sprintf(cmsx_BlackboxStatus, "READY");
 
@@ -150,6 +150,10 @@ static long cmsx_EraseFlash(displayPort_t *pDisplay, const void *ptr)
 {
     UNUSED(ptr);
 
+    if (!flashfsIsSupported()) {
+        return 0;
+    }
+
     displayClearScreen(pDisplay);
     displayWrite(pDisplay, 5, 3, "ERASING FLASH...");
     displayResync(pDisplay); // Was max7456RefreshAll(); Why at this timing?
diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c
index 968b58342..8bdc5bb9e 100644
--- a/src/main/interface/cli.c
+++ b/src/main/interface/cli.c
@@ -2057,6 +2057,10 @@ static void cliFlashErase(char *cmdline)
 {
     UNUSED(cmdline);
 
+    if (!flashfsIsSupported()) {
+        return;
+    }
+
 #ifndef MINIMAL_CLI
     uint32_t i = 0;
     cliPrintLine("Erasing, please wait ... ");
diff --git a/src/main/io/osd.c b/src/main/io/osd.c
index 0f3ef95e4..18cd1908a 100644
--- a/src/main/io/osd.c
+++ b/src/main/io/osd.c
@@ -1275,7 +1275,7 @@ static void osdGetBlackboxStatusString(char * buff)
 
 #ifdef USE_FLASHFS
     case BLACKBOX_DEVICE_FLASH:
-        storageDeviceIsWorking = flashfsIsReady();
+        storageDeviceIsWorking = flashfsIsSupported();
         if (storageDeviceIsWorking) {
             const flashGeometry_t *geometry = flashfsGetGeometry();
             storageTotal = geometry->totalSize / 1024;