8000 Merge pull request #4245 from kamtom480/spresense_usb_speed · russbot/circuitpython@bbe0602 · GitHub
[go: up one dir, main page]
Skip to content

Commit bbe0602

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#4245 from kamtom480/spresense_usb_speed
spresense: Pass the correct USB bus speed after restart
2 parents a7120bf + fb32e0a commit bbe0602

File tree

5 files changed

+9
-16
lines changed

5 files changed

+9
-16
lines changed

‎lib/tinyusb

Submodule tinyusb updated 183 files

‎ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,4 @@ CIRCUITPY_I2CPERIPHERAL = 0
2020
CIRCUITPY_MSGPACK = 0
2121

2222
SUPEROPT_GC = 0
23-
24-
CFLAGS_BOARD = --param max-inline-insns-auto=15
25-
ifeq ($(TRANSLATION), zh_Latn_pinyin)
26-
RELEASE_NEEDS_CLEAN_BUILD = 1
27-
CFLAGS_INLINE_LIMIT = 35
28-
endif
29-
ifeq ($(TRANSLATION), de_DE)
30-
RELEASE_NEEDS_CLEAN_BUILD = 1
31-
CFLAGS_INLINE_LIMIT = 35
3223
SUPEROPT_VM = 0
33-
endif

‎ports/cxd56/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ LDFLAGS = \
151151
--end-group \
152152
-L$(BUILD) \
153153

154-
CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_CXD56 -DCFG_TUD_MIDI_RX_BUFSIZE=512 -DCFG_TUD_CDC_RX_BUFSIZE=512 -DCFG_TUD_MIDI_TX_BUFSIZE=512 -DCFG_TUD_CDC_TX_BUFSIZE=512 -DCFG_TUD_MSC_BUFSIZE=512 $(CFLAGS_MOD)
154+
CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_CXD56 -DCFG_TUD_MIDI_RX_BUFSIZE=512 -DCFG_TUD_CDC_RX_BUFSIZE=1024 -DCFG_TUD_MIDI_TX_BUFSIZE=512 -DCFG_TUD_CDC_TX_BUFSIZE=1024 -DCFG_TUD_MSC_BUFSIZE=512 $(CFLAGS_MOD)
155155

156156
SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
157157
$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \

‎shared-module/usb_hid/Device.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ static usb_hid_device_obj_t* get_hid_device(uint8_t report_id) {
7373
}
7474

7575
// Callbacks invoked when receive Get_Report request through control endpoint
76-
uint16_t tud_hid_get_report_cb(uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen) {
76+
uint16_t tud_hid_get_report_cb(uint8_t itf, uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen) {
77+
(void) itf;
7778
// only support Input Report
7879
if ( report_type != HID_REPORT_TYPE_INPUT ) return 0;
7980

@@ -83,7 +84,8 @@ uint16_t tud_hid_get_report_cb(uint8_t report_id, hid_report_type_t report_type,
8384
}
8485

8586
// Callbacks invoked when receive Set_Report request through control endpoint
86-
void tud_hid_set_report_cb(uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize) {
87+
void tud_hid_set_report_cb(uint8_t itf, uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize) {
88+
(void) itf;
8789
if (report_type == HID_REPORT_TYPE_INVALID) {
8890
report_id = buffer[0];
8991
buffer++;

‎supervisor/shared/usb/usb_desc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index) {
4747
// Invoked when received GET HID REPORT DESCRIPTOR
4848
// Application return pointer to descriptor
4949
// Descriptor contents must exist long enough for transfer to complete
50-
uint8_t const * tud_hid_descriptor_report_cb(void) {
51-
return hid_report_descriptor;
50+
uint8_t const * tud_hid_descriptor_report_cb(uint8_t itf) {
51+
(void) itf;
52+
return hid_report_descriptor;
5253
}
5354
#endif
5455

0 commit comments

Comments
 (0)
0