diff options
| author | tswan22 <[email protected]> | 2025-11-01 12:51:40 -0400 |
|---|---|---|
| committer | tswan22 <[email protected]> | 2025-11-01 12:51:40 -0400 |
| commit | ca44c772f7ad87a8d12de0b3a57ad8816f2edc10 (patch) | |
| tree | 2ac98dc0c073ca161741751504fdbeb0b710dd11 /src/class/midi | |
| parent | 9d46cca57637cfd086499970a8f5d5669ba9bfa0 (diff) | |
| parent | a6c16d147593732028ed89292805e0e6a972e4b5 (diff) | |
Merge branch 'master' of https://github.com/hathach/tinyusb
Diffstat (limited to 'src/class/midi')
| -rw-r--r-- | src/class/midi/midi_device.h | 6 | ||||
| -rw-r--r-- | src/class/midi/midi_host.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/class/midi/midi_device.h b/src/class/midi/midi_device.h index c2c6e9859..d23516cec 100644 --- a/src/class/midi/midi_device.h +++ b/src/class/midi/midi_device.h @@ -24,8 +24,8 @@ * This file is part of the TinyUSB stack. */ -#ifndef _TUSB_MIDI_DEVICE_H_ -#define _TUSB_MIDI_DEVICE_H_ +#ifndef TUSB_MIDI_DEVICE_H_ +#define TUSB_MIDI_DEVICE_H_ #include "class/audio/audio.h" #include "midi.h" @@ -168,7 +168,7 @@ bool midid_xfer_cb (uint8_t rhport, uint8_t edpt_addr, xfer_result_t } #endif -#endif /* _TUSB_MIDI_DEVICE_H_ */ +#endif /* TUSB_MIDI_DEVICE_H_ */ /** @} */ /** @} */ diff --git a/src/class/midi/midi_host.c b/src/class/midi/midi_host.c index e6ace316c..8b78fe945 100644 --- a/src/class/midi/midi_host.c +++ b/src/class/midi/midi_host.c @@ -220,11 +220,11 @@ bool midih_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *d // driver after parsing the audio control interface and then resume parsing // the streaming audio interface. if (AUDIO_SUBCLASS_CONTROL == desc_itf->bInterfaceSubClass) { - TU_VERIFY(max_len > 2*sizeof(tusb_desc_interface_t) + sizeof(audio_desc_cs_ac_interface_t)); + TU_VERIFY(max_len > 2*sizeof(tusb_desc_interface_t) + sizeof(midi10_desc_cs_ac_interface_t)); p_desc = tu_desc_next(p_desc); TU_VERIFY(tu_desc_type(p_desc) == TUSB_DESC_CS_INTERFACE && - tu_desc_subtype(p_desc) == AUDIO_CS_AC_INTERFACE_HEADER); + tu_desc_subtype(p_desc) == AUDIO10_CS_AC_INTERFACE_HEADER); desc_cb.desc_audio_control = desc_itf; p_desc = tu_desc_next(p_desc); |