diff options
| author | Dan Halbert <halbert@halwitz.org> | 2019-09-04 21:45:16 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2019-09-04 21:45:16 -0400 |
| commit | 195de97c67c4d1daa6ec8659bbdf30b8e7f4fff6 (patch) | |
| tree | 7391bf0f5f5cdf77910f12ee56ad562ac41ac51a /supervisor | |
| parent | 95a5a57f949c2f00caa144d246ce2a5477fb7c6d (diff) | |
use only one endpoint pair for MSC except on SAMD21
Diffstat (limited to 'supervisor')
| -rw-r--r-- | supervisor/supervisor.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index 016188dfd..e758ea216 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -89,6 +89,11 @@ ifndef USB_HID_DEVICES USB_HID_DEVICES = "KEYBOARD,MOUSE,CONSUMER,GAMEPAD" endif +# SAMD21 needs separate endpoint pairs for MSC BULK IN and BULK OUT, otherwise it's erratic. +ifndef USB_MSC_NUM_ENDPOINT_PAIRS +USB_MSC_NUM_ENDPOINT_PAIRS = 1 +endif + SUPERVISOR_O = $(addprefix $(BUILD)/, $(SRC_SUPERVISOR:.c=.o)) $(BUILD)/autogen_display_resources.o $(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h @@ -106,8 +111,9 @@ autogen_usb_descriptor.intermediate: ../../tools/gen_usb_descriptor.py Makefile --vid $(USB_VID)\ --pid $(USB_PID)\ --serial_number_length $(USB_SERIAL_NUMBER_LENGTH)\ - --devices $(USB_DEVICES) \ - --hid_devices $(USB_HID_DEVICES) \ + --devices $(USB_DEVICES)\ + --hid_devices $(USB_HID_DEVICES)\ + --msc_num_endpoint_pairs $(USB_MSC_NUM_ENDPOINT_PAIRS)\ --output_c_file $(BUILD)/autogen_usb_descriptor.c\ --output_h_file $(BUILD)/genhdr/autogen_usb_descriptor.h |