Be stricter about what filesystems it works with.

Add Metro RP2350 definitions

Author: tannewt

ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.h

@@ -35,3 +35,10 @@
 #define DEFAULT_DVI_BUS_GREEN_DP (&pin_GPIO16)
 #define DEFAULT_DVI_BUS_BLUE_DN (&pin_GPIO13)
 #define DEFAULT_DVI_BUS_BLUE_DP (&pin_GPIO12)
+
+#define DEFAULT_SD_SCK (&pin_GPIO34)
+#define DEFAULT_SD_MOSI (&pin_GPIO35)
+#define DEFAULT_SD_MISO (&pin_GPIO36)
+#define DEFAULT_SD_CS (&pin_GPIO39)
+#define DEFAULT_SD_CARD_DETECT (&pin_GPIO40)
+#define DEFAULT_SD_CARD_INSERTED false

shared-module/sdcardio/__init__.c

@@ -26,6 +26,8 @@ static bool _mounted = false;
 
 #ifdef DEFAULT_SD_MOSI
 static busio_spi_obj_t busio_spi_obj;
+#else
+#include "shared-bindings/board/__init__.h"
 #endif
 #endif
 
@@ -82,7 +84,12 @@ void automount_sd_card(void) {
     mp_rom_error_text_t error = sdcardio_sdcard_construct(&sdcard, spi_obj, DEFAULT_SD_CS, 25000000);
     if (error != NULL) {
         // Failed to communicate with the card.
+        _mounted = false;
         _init_error = true;
+        #ifdef DEFAULT_SD_MOSI
+        common_hal_busio_spi_deinit(spi_obj);
+        #endif
+        return;
     }
     common_hal_digitalio_digitalinout_never_reset(&sdcard.cs);
 

supervisor/shared/usb/usb_msc_flash.c

@@ -12,6 +12,7 @@
 #include "extmod/vfs_fat.h"
 #include "lib/oofatfs/diskio.h"
 #include "lib/oofatfs/ff.h"
+#include "py/gc.h"
 #include "py/mpstate.h"
 
 #include "shared-module/storage/__init__.h"
@@ -125,11 +126,13 @@ static fs_user_mount_t *get_vfs(int lun) {
     if (lun == 0) {
         return root;
     }
+    // Other filesystems must be native because we don't guard against exceptions.
+    // They must also be off the VM heap so they don't disappear on autoreload.
     #ifdef SAVES_LUN
     if (lun == SAVES_LUN) {
         const char *path_under_mount;
         fs_user_mount_t *saves = filesystem_for_path("/saves", &path_under_mount);
-        if (saves != root) {
+        if (saves != root && (saves->blockdev.flags & MP_BLOCKDEV_FLAG_NATIVE) != 0 && gc_nbytes(saves) == 0) {
             return saves;
         }
     }
@@ -138,7 +141,7 @@ static fs_user_mount_t *get_vfs(int lun) {
     if (lun == SDCARD_LUN) {
         const char *path_under_mount;
         fs_user_mount_t *sdcard = filesystem_for_path("/sd", &path_under_mount);
-        if (sdcard != root) {
+        if (sdcard != root && (sdcard->blockdev.flags & MP_BLOCKDEV_FLAG_NATIVE) != 0 && gc_nbytes(sdcard) == 0) {
             return sdcard;
         } else {
             // Clear any ejected state so that a re-insert causes it to reappear.