From dcb0e50f040c4213a7591253cb3a0bb4ea9a178d Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Tue, 21 Apr 2020 14:15:44 -0700
Subject: [PATCH] Fix USB midi and hid disable.

---
 ports/atmel-samd/Makefile           |  1 -
 supervisor/shared/usb/tusb_config.h |  4 ++--
 supervisor/supervisor.mk            | 32 ++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 5ec91a811f..4e2ad73e66 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -304,7 +304,6 @@ SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE))
 # Doing a $(sort ...) removes duplicates as part of sorting.
 SRC_COMMON_HAL_SHARED_MODULE_EXPANDED = $(sort $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED))
 
-
 SRC_S = supervisor/$(CHIP_FAMILY)_cpu.s
 
 OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
diff --git a/supervisor/shared/usb/tusb_config.h b/supervisor/shared/usb/tusb_config.h
index ad5825b6c9..1b0c834160 100644
--- a/supervisor/shared/usb/tusb_config.h
+++ b/supervisor/shared/usb/tusb_config.h
@@ -74,8 +74,8 @@
 //------------- CLASS -------------//
 #define CFG_TUD_CDC                 1
 #define CFG_TUD_MSC                 1
-#define CFG_TUD_HID                 1
-#define CFG_TUD_MIDI                1
+#define CFG_TUD_HID                 CIRCUITPY_USB_HID
+#define CFG_TUD_MIDI                CIRCUITPY_USB_MIDI
 #define CFG_TUD_CUSTOM_CLASS        0
 
 /*------------------------------------------------------------------*/
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index 52d60b52b3..d6422f074e 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -73,26 +73,34 @@ else
 		lib/tinyusb/src/device/usbd_control.c \
 		lib/tinyusb/src/class/msc/msc_device.c \
 		lib/tinyusb/src/class/cdc/cdc_device.c \
-		lib/tinyusb/src/class/hid/hid_device.c \
-		lib/tinyusb/src/class/midi/midi_device.c \
 		lib/tinyusb/src/tusb.c \
 		supervisor/shared/serial.c \
 		supervisor/usb.c \
 		supervisor/shared/usb/usb_desc.c \
 		supervisor/shared/usb/usb.c \
 		supervisor/shared/usb/usb_msc_flash.c \
-		shared-bindings/usb_hid/__init__.c \
-		shared-bindings/usb_hid/Device.c \
-		shared-bindings/usb_midi/__init__.c \
-		shared-bindings/usb_midi/PortIn.c \
-		shared-bindings/usb_midi/PortOut.c \
-		shared-module/usb_hid/__init__.c \
-		shared-module/usb_hid/Device.c \
-		shared-module/usb_midi/__init__.c \
-		shared-module/usb_midi/PortIn.c \
-		shared-module/usb_midi/PortOut.c \
 		$(BUILD)/autogen_usb_descriptor.c
 
+	ifeq ($(CIRCUITPY_USB_HID), 1)
+		SRC_SUPERVISOR += \
+			lib/tinyusb/src/class/hid/hid_device.c \
+			shared-bindings/usb_hid/__init__.c \
+			shared-bindings/usb_hid/Device.c \
+			shared-module/usb_hid/__init__.c \
+			shared-module/usb_hid/Device.c
+	endif
+
+	ifeq ($(CIRCUITPY_USB_MIDI), 1)
+		SRC_SUPERVISOR += \
+			lib/tinyusb/src/class/midi/midi_device.c \
+			shared-bindings/usb_midi/__init__.c \
+			shared-bindings/usb_midi/PortIn.c \
+			shared-bindings/usb_midi/PortOut.c \
+			shared-module/usb_midi/__init__.c \
+			shared-module/usb_midi/PortIn.c \
+			shared-module/usb_midi/PortOut.c
+	endif
+
 	CFLAGS += -DUSB_AVAILABLE
 endif