Merge pull request #4283 from pewpew-game/usb-msc-disable

dhalbert · web-flow · commit f4886a6f46ba · 2021-02-27T10:19:52.000-05:00
Fix for CIRCUITPY_USB_MSC=0
diff --git a/supervisor/shared/usb/tusb_config.h b/supervisor/shared/usb/tusb_config.h
@@ -70,7 +70,7 @@
 #define CFG_TUD_CDC                 1
 #endif
 
-#define CFG_TUD_MSC                 1
+#define CFG_TUD_MSC                 CIRCUITPY_USB_MSC
 #define CFG_TUD_HID                 CIRCUITPY_USB_HID
 #define CFG_TUD_MIDI                CIRCUITPY_USB_MIDI
 #define CFG_TUD_VENDOR              CIRCUITPY_USB_VENDOR
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
@@ -131,12 +131,16 @@ void usb_irq_handler(void) {
 
 // Invoked when device is mounted
 void tud_mount_cb(void) {
+#if CIRCUITPY_USB_MSC
     usb_msc_mount();
+#endif
 }
 
 // Invoked when device is unmounted
 void tud_umount_cb(void) {
+#if CIRCUITPY_USB_MSC
     usb_msc_umount();
+#endif
 }
 
 // Invoked when usb bus is suspended

Original file line number	Diff line number	Diff line change
`@@ -131,12 +131,16 @@ void usb_irq_handler(void) {`
`131`	`131`
`132`	`132`	`// Invoked when device is mounted`
`133`	`133`	`void tud_mount_cb(void) {`
	`134`	`+#if CIRCUITPY_USB_MSC`
`134`	`135`	`usb_msc_mount();`
	`136`	`+#endif`
`135`	`137`	`}`
`136`	`138`
`137`	`139`	`// Invoked when device is unmounted`
`138`	`140`	`void tud_umount_cb(void) {`
	`141`	`+#if CIRCUITPY_USB_MSC`
`139`	`142`	`usb_msc_umount();`
	`143`	`+#endif`
`140`	`144`	`}`
`141`	`145`
`142`	`146`	`// Invoked when usb bus is suspended`