Skip to content

Commit af7ad49

Browse files
committed
add desc_audio_control to midi descriptor callback
1 parent 8c70475 commit af7ad49

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/class/midi/midi_host.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,10 @@ bool midih_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *d
227227
p_desc = tu_desc_next(p_desc);
228228
TU_VERIFY(tu_desc_type(p_desc) == TUSB_DESC_CS_INTERFACE &&
229229
tu_desc_subtype(p_desc) == AUDIO_CS_AC_INTERFACE_HEADER);
230+
desc_cb.desc_audio_control = desc_itf;
230231

231232
p_desc = tu_desc_next(p_desc);
232-
desc_itf = (tusb_desc_interface_t const *)p_desc;
233+
desc_itf = (const tusb_desc_interface_t *)p_desc;
233234
TU_VERIFY(TUSB_CLASS_AUDIO == desc_itf->bInterfaceClass);
234235
p_midi->itf_count = 1;
235236
}
@@ -238,7 +239,7 @@ bool midih_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *d
238239
TU_LOG_DRV("MIDI opening Interface %u (addr = %u)\r\n", desc_itf->bInterfaceNumber, dev_addr);
239240
p_midi->bInterfaceNumber = desc_itf->bInterfaceNumber;
240241
p_midi->itf_count++;
241-
desc_cb.desc_interface = desc_itf;
242+
desc_cb.desc_midi = desc_itf;
242243

243244
p_desc = tu_desc_next(p_desc); // next to CS Header
244245

@@ -305,7 +306,7 @@ bool midih_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *d
305306
}
306307
p_desc = tu_desc_next(p_desc);
307308
}
308-
desc_cb.desc_interface_len = (uint16_t) ((uintptr_t)p_desc - (uintptr_t) desc_itf);
309+
desc_cb.desc_midi_total_len = (uint16_t) ((uintptr_t)p_desc - (uintptr_t) desc_itf);
309310

310311
p_midi->daddr = dev_addr;
311312

src/class/midi/midi_host.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@
6363
// Application API
6464
//--------------------------------------------------------------------+
6565
typedef struct {
66-
const tusb_desc_interface_t* desc_interface; // start of whole midi interface descriptor
67-
uint16_t desc_interface_len;
66+
const tusb_desc_interface_t* desc_audio_control;
67+
const tusb_desc_interface_t* desc_midi; // start of whole midi interface descriptor
68+
uint16_t desc_midi_total_len;
6869

6970
const uint8_t* desc_header;
7071
const uint8_t* desc_element;

0 commit comments

Comments
 (0)