make mass storage available by default

include/config.h

@@ -22,6 +22,8 @@
 #define MENU_PREFER_VOLCANO
 //#define MENU_PREFER_CRAFTY
 
+#define AUTO_MOUNT_MASS_STORAGE
+
 #define WATCHDOG_PERIOD_MS 1000
 
 // ASCII 0x18 = CAN (cancel)

include/usb_msc.h

@@ -19,7 +19,15 @@
 #ifndef __USB_MSC_H__
 #define __USB_MSC_H__
 
+/*
+ * Available: a disk is present in the drive
+ * Locked: the host wants to prevent disk removal
+ */
+
+bool msc_is_medium_locked(void);
 bool msc_is_medium_available(void);
+
+// should only be set to false when unlocked
 void msc_set_medium_available(bool state);
 
 #endif // __USB_MSC_H__

src/console.c

@@ -136,6 +136,9 @@ static void cnsl_interpret(const char *line) {
         println("Currently %s. %s now.",
                 state ? "mounted" : "unmounted",
                 state ? "Unplugging" : "Plugging in");
+        if (state && msc_is_medium_locked()) {
+            println("Warning: host has locked medium. Unmounting anyway.");
+        }
         msc_set_medium_available(!state);
     } else if (strcmp(line, "power") == 0) {
         float volt = lipo_voltage();

src/debug_disk.c

@@ -100,7 +100,7 @@ void debug_disk_init(void) {
     }
 
     // maximum length: 11 bytes
-    f_setlabel("DEBUG DISK");
+    f_setlabel("Volcano RC");
 
     write_readme();
 

src/main.c

@@ -26,6 +26,7 @@
 #include "console.h"
 #include "log.h"
 #include "usb.h"
+#include "usb_msc.h"
 #include "fat_disk.h"
 #include "debug_disk.h"
 #include "buttons.h"
@@ -88,6 +89,10 @@ int main(void) {
     debug("debug_disk_init");
     debug_disk_init();
 
+#ifdef AUTO_MOUNT_MASS_STORAGE
+    msc_set_medium_available(true);
+#endif // AUTO_MOUNT_MASS_STORAGE
+
     watchdog_enable(WATCHDOG_PERIOD_MS, 1);
 
     debug("init done");

src/usb_msc.c

@@ -33,18 +33,19 @@
 #include "fat_disk.h"
 #include "log.h"
 
-static bool ejected = false;
 static bool medium_available = false;
+static bool medium_locked = false;
 
 bool msc_is_medium_available(void) {
     return medium_available;
 }
 
+bool msc_is_medium_locked(void) {
+    return medium_locked;
+}
+
 void msc_set_medium_available(bool state) {
     medium_available = state;
-    if (state) {
-        ejected = false;
-    }
 }
 
 // Invoked when received SCSI_CMD_INQUIRY
@@ -104,6 +105,7 @@ bool tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition,
         // unload disk storage
         debug("unload disk storage %d", load_eject);
         if (load_eject) {
+            debug("Host ejected medium. Unplugging disk.");
             medium_available = false;
         }
     }
@@ -176,14 +178,15 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16],
                 resplen = -1;
             } else {
                 debug("Host wants to lock medium.");
+                medium_locked = true;
             }
         } else {
             // Allow medium removal
             if (medium_available) {
-                debug("Host ejected medium. Unplugging disk.");
-                medium_available = false;
+                debug("Host unlocked medium.");
+                medium_locked = false;
             } else {
-                debug("host ejected non-existing medium. Not supported.");
+                debug("host unlocked non-existing medium. Not supported.");
                 resplen = -1;
             }
         }