handle boards that support sdcardio but don't support settings.toml

dhalbert · dhalbert · commit b085a9727ea5 · 2026-05-11T17:53:40.000-04:00
diff --git a/supervisor/shared/usb/usb_msc_flash.c b/supervisor/shared/usb/usb_msc_flash.c
@@ -367,6 +367,7 @@ void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8], uint8_t product_id[16
 }
 
 #ifdef SDCARD_LUN
+#if CIRCUITPY_SETTINGS_TOML
 typedef enum {
     SDCARD_USB_SETTING_NOT_YET_READ = 0,
     SDCARD_USB_SETTING_TRUE,
@@ -384,6 +385,11 @@ static bool sdcard_usb_enabled(void) {
     }
     return _sdcard_usb_setting_state == SDCARD_USB_SETTING_TRUE;
 }
+#else
+static bool sdcard_usb_enabled(void) {
+    return CIRCUITPY_SDCARD_USB;
+}
+#endif
 #endif
 
 // Invoked when received Test Unit Ready command.

Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,7 @@ void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8], uint8_t product_id[16`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`#ifdef SDCARD_LUN`
	`370`	`+#if CIRCUITPY_SETTINGS_TOML`
`370`	`371`	`typedef enum {`
`371`	`372`	`SDCARD_USB_SETTING_NOT_YET_READ = 0,`
`372`	`373`	`SDCARD_USB_SETTING_TRUE,`
`@@ -384,6 +385,11 @@ static bool sdcard_usb_enabled(void) {`
`384`	`385`	`}`
`385`	`386`	`return _sdcard_usb_setting_state == SDCARD_USB_SETTING_TRUE;`
`386`	`387`	`}`
	`388`	`+#else`
	`389`	`+static bool sdcard_usb_enabled(void) {`
	`390`	`+ return CIRCUITPY_SDCARD_USB;`
	`391`	`+}`
	`392`	`+#endif`
`387`	`393`	`#endif`
`388`	`394`
`389`	`395`	`// Invoked when received Test Unit Ready command.`