Rework Multi Volume support

Author: thinkyhead

Marlin/Configuration.h

@@ -2575,22 +2575,14 @@
 #define LCD_INFO_SCREEN_STYLE 0
 
 /**
- * SD CARD
- *
- * SD Card support is disabled by default. If your controller has an SD slot,
- * you must uncomment the following option or it won't work.
- */
-//#define SDSUPPORT
-#if ENABLED(SDSUPPORT)                // SDSUPPORT enables SPI Storage by default
-  //#define SDIO_SUPPORT              // Enable SDIO storage
-  #if ENABLED(SDIO_SUPPORT)
-    //#define SDIO_IS_ONBOARD         // Use friendly label for SDIO on UI menu
-    #if ENABLED(SDIO_IS_ONBOARD)
-      //#define SPI_IS_EXTERNAL       // Use friendly label to specify that the SPI SD card is external if SDIO is onboard
-    #endif
-  #endif
-  //#define USB_FLASH_DRIVE_SUPPORT   // Enable USD Flash drive storage
-#endif
+ * Media Drives
+ *
+ * If your controller has any SD Card readers or
+ * USB Flash Drives set the following options:
+ */
+//#define VOLUME0 ONBOARD
+//#define VOLUME1 LCD
+//#define VOLUME2 USBFD
 
 /**
  * SD CARD: ENABLE CRC

Marlin/Configuration_adv.h

@@ -1782,8 +1782,7 @@
    *
    * [1] On AVR an interrupt-capable pin is best for UHS3 compatibility.
    */
-  //#define USB_FLASH_DRIVE_SUPPORT
-  #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
+  #if HAS_USB_FLASH_DRIVE
     /**
      * USB Host Shield Library
      *
@@ -1842,33 +1841,21 @@
     //#define CUSTOM_FIRMWARE_UPLOAD
   #endif
 
-  /**
-   * Set this option to one of the following (or the board's defaults apply):
-   *
-   *           LCD - Use the SD drive in the external LCD controller.
-   *       ONBOARD - Use the SD drive on the control board.
-   *  CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
-   *
-   * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
-   */
-  //#define SDCARD_CONNECTION LCD
-
   // Enable if SD detect is rendered useless (e.g., by using an SD extender)
   //#define NO_SD_DETECT
 
   /**
    * Multiple volume support - EXPERIMENTAL.
    * Adds 'M21 Pm' / 'M21 S' / 'M21 U' / 'M21 O' to mount SD Card / USB Drive / SDIO Card.
    */
-  //#define MULTI_VOLUME
-  #if ENABLED(MULTI_VOLUME)
-    #define VOLUME_SD_ONBOARD
-    #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
+  #if HAS_MULTI_VOLUME
+    #define VOLUME_SD_ONBOARD 0
+    #if HAS_USB_FLASH_DRIVE
       #define VOLUME_USB_FLASH_DRIVE
       #if ENABLED(VOLUME_USB_FLASH_DRIVE)
         #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
       #endif
-    #elif ENABLED(VOLUME_SD_ONBOARD)
+    #elif defined(VOLUME_SD_ONBOARD)
       #define DEFAULT_SHARED_VOLUME SV_SD_ONBOARD
     #else
       #define DEFAULT_SHARED_VOLUME SV_SDIO_ONBOARD

Marlin/src/HAL/SAMD21/HAL.cpp

@@ -106,7 +106,7 @@ void MarlinHAL::dma_init() {}
 void MarlinHAL::init() {
   TERN_(DMA_IS_REQUIRED, dma_init());
   #if HAS_MEDIA
-    #if HAS_SD_DETECT && SD_CONNECTION_IS(ONBOARD)
+    #if HAS_SD_DETECT && ANY_VOLUME_IS(ONBOARD)
       SET_INPUT_PULLUP(SD_DETECT_PIN);
     #endif
     OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up

Marlin/src/HAL/SAMD51/HAL.cpp

@@ -603,7 +603,7 @@ void MarlinHAL::dma_init() {
 void MarlinHAL::init() {
   TERN_(DMA_IS_REQUIRED, dma_init());
   #if HAS_MEDIA
-    #if HAS_SD_DETECT && SD_CONNECTION_IS(ONBOARD)
+    #if HAS_SD_DETECT && ANY_VOLUME_IS(ONBOARD)
       SET_INPUT_PULLUP(SD_DETECT_PIN);
     #endif
     OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up

Marlin/src/HAL/SAMD51/HAL_SPI.cpp

@@ -54,7 +54,7 @@
 #else // !SOFTWARE_SPI
 
   #ifdef ADAFRUIT_GRAND_CENTRAL_M4
-    #if SD_CONNECTION_IS(ONBOARD)
+    #if ANY_VOLUME_IS(ONBOARD)
       #define sdSPI SDCARD_SPI
     #else
       #define sdSPI SPI

Marlin/src/HAL/SAMD51/inc/SanityCheck.h

@@ -37,8 +37,8 @@
   #warning "Did you activate the SmartEEPROM? See https://github.com/GMagician/SAMD51-SmartEEprom-Manager/releases"
 #endif
 
-#if defined(ADAFRUIT_GRAND_CENTRAL_M4) && SD_CONNECTION_IS(CUSTOM_CABLE)
-  #error "No custom SD drive cable defined for this board."
+#if defined(ADAFRUIT_GRAND_CENTRAL_M4) && ANY_VOLUME_IS(CUSTOM)
+  #error "No custom SD pins defined for this board."
 #endif
 
 #if (defined(TEMP_0_SCK_PIN) && defined(TEMP_0_MISO_PIN) && (TEMP_0_SCK_PIN == SCK1 || TEMP_0_MISO_PIN == MISO1)) || \

Marlin/src/HAL/STM32/msc_sd.cpp

@@ -36,7 +36,7 @@
 class Sd2CardUSBMscHandler : public USBMscHandler {
 public:
   DiskIODriver* diskIODriver() {
-    #if ENABLED(MULTI_VOLUME)
+    #if HAS_MULTI_VOLUME
       #if SHARED_VOLUME_IS(SD_ONBOARD)
         return &card.media_driver_sdcard;
       #elif SHARED_VOLUME_IS(USB_FLASH_DRIVE)

Marlin/src/HAL/STM32F1/msc_sd.cpp

@@ -30,7 +30,7 @@ Serial1Class<USBCompositeSerial> MarlinCompositeSerial(true);
 
 #include "../../inc/MarlinConfig.h"
 
-#if SD_CONNECTION_IS(ONBOARD)
+#if ANY_VOLUME_IS(ONBOARD)
 
   #include "onboard_sd.h"
 
@@ -77,7 +77,7 @@ void MSC_SD_init() {
   USBComposite.end();
   USBComposite.clear();
   // Set api and register mass storage
-  #if SD_CONNECTION_IS(ONBOARD)
+  #if ANY_VOLUME_IS(ONBOARD)
     uint32_t cardSize;
     if (disk_initialize(0) == RES_OK) {
       if (disk_ioctl(0, GET_SECTOR_COUNT, (void *)(&cardSize)) == RES_OK) {

Marlin/src/HAL/STM32F1/onboard_sd.cpp

@@ -15,7 +15,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if SD_CONNECTION_IS(ONBOARD)
+#if ANY_VOLUME_IS(ONBOARD)
 
 #include "onboard_sd.h"
 #include "SPI.h"
@@ -567,5 +567,5 @@ DRESULT disk_read (
 
 #endif // _DISKIO_IOCTL
 
-#endif // SD_CONNECTION_IS(ONBOARD)
+#endif // ANY_VOLUME_IS(ONBOARD)
 #endif // __STM32F1__

Marlin/src/MarlinCore.cpp

@@ -837,7 +837,7 @@ void idle(const bool no_stepper_sleep/*=false*/) {
   TERN_(HAS_MEDIA, card.manage_media());
 
   // Handle USB Flash Drive insert / remove
-  TERN_(USB_FLASH_DRIVE_SUPPORT, card.diskIODriver()->idle());
+  TERN_(HAS_USB_FLASH_DRIVE, card.diskIODriver()->idle());
 
   // Announce Host Keepalive state (if any)
   TERN_(HOST_KEEPALIVE_FEATURE, gcode.host_keepalive());