Merge pull request hd-zero#306 from antony-weber/format_sd_fix

Enable formatting not mounted sdcards
Nikolas-S · Aug 3, 2023 · 909e54b · 909e54b
2 parents ab9d7c1 + 1f7ca5d
commit 909e54b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/ui/page_storage.c b/src/ui/page_storage.c
@@ -104,7 +104,7 @@ static void page_storage_close_status_box() {
  * The formatting routine.
  */
 static format_codes_t page_storage_format_sd() {
-    if (!sdcard_mounted()) {
+    if (!sdcard_inserted()) {
         return FMC_ERR_SDCARD_NOT_INSERTED;
     }
 

diff --git a/src/util/sdcard.c b/src/util/sdcard.c
@@ -1,6 +1,7 @@
 #include "sdcard.h"
 
 #include <sys/stat.h>
+#include <unistd.h>
 
 bool sdcard_mounted() {
     struct stat mountpoint;
@@ -15,3 +16,7 @@ bool sdcard_mounted() {
 
     return false;
 }
+
+bool sdcard_inserted() {
+    return access(SD_BLOCK_DEVICE, F_OK) == 0;
+}
diff --git a/src/util/sdcard.h b/src/util/sdcard.h
@@ -2,4 +2,8 @@
 
 #include <stdbool.h>
 
+#define SD_BLOCK_DEVICE "/dev/mmcblk0"
+
 bool sdcard_mounted();
+
+bool sdcard_inserted();