moparisthebest/USBHost_t36
1
0
Fork 0
mirror of https://github.com/gdsports/USBHost_t36 synced 2024-11-21 08:35:03 -05:00
Code Issues Releases Wiki Activity

Support for USB MIDI devices using interrupt (not bulk) endpoints

Browse Source
This commit is contained in:
PaulStoffregen 2018-01-09 03:31:43 -08:00
parent 9488eb7280
commit d2f7e28378
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
USBHost_t36.h
View File

@ -1134,6 +1134,8 @@ private:
volatile uint8_t tx2_count; volatile uint8_t tx2_count;
uint8_t rx_ep; uint8_t rx_ep;
uint8_t tx_ep; uint8_t tx_ep;
uint8_t rx_ep_type;
uint8_t tx_ep_type;
uint8_t msg_cable; uint8_t msg_cable;
uint8_t msg_channel; uint8_t msg_channel;
uint8_t msg_type; uint8_t msg_type;

11
midi.cpp
View File

@ -108,7 +108,8 @@ bool MIDIDevice::claim(Device_t *dev, int type, const uint8_t *descriptors, uint
if (len < 4) return false; // all audio desc are at least 4 bytes if (len < 4) return false; // all audio desc are at least 4 bytes
if (p + len > end) return false; // reject if beyond end of data if (p + len > end) return false; // reject if beyond end of data
uint32_t type = p[1]; uint32_t type = p[1];
//println("type: ", type); print("type: ", type);
println(", len: ", len);
if (type == 4 || type == 11) break; // interface or IAD, not for us if (type == 4 || type == 11) break; // interface or IAD, not for us
if (type == 0x24) { // 0x24 = Audio CS_INTERFACE, audio 1.0, page 99 if (type == 0x24) { // 0x24 = Audio CS_INTERFACE, audio 1.0, page 99
uint32_t subtype = p[2]; uint32_t subtype = p[2];
@ -131,13 +132,14 @@ bool MIDIDevice::claim(Device_t *dev, int type, const uint8_t *descriptors, uint
} else if (type == 5) { } else if (type == 5) {
// endpoint descriptor // endpoint descriptor
if (p[0] < 7) return false; // at least 7 bytes if (p[0] < 7) return false; // at least 7 bytes
if (p[3] != 2) return false; // must be bulk type if (p[3] != 2 && p[3] != 3) return false; // must be bulk or interrupt type
println(" MIDI Endpoint: ", p[2], HEX); println(" MIDI Endpoint: ", p[2], HEX);
switch (p[2] & 0xF0) { switch (p[2] & 0xF0) {
case 0x80: case 0x80:
// IN endpoint // IN endpoint
if (rx_ep == 0) { if (rx_ep == 0) {
rx_ep = p[2] & 0x0F; rx_ep = p[2] & 0x0F;
rx_ep_type = p[3];
rx_size = p[4] | (p[5] << 8); rx_size = p[4] | (p[5] << 8);
println(" rx_size = ", rx_size); println(" rx_size = ", rx_size);
} }
@ -146,6 +148,7 @@ bool MIDIDevice::claim(Device_t *dev, int type, const uint8_t *descriptors, uint
// OUT endpoint // OUT endpoint
if (tx_ep == 0) { if (tx_ep == 0) {
tx_ep = p[2]; tx_ep = p[2];
tx_ep_type = p[3];
tx_size = p[4] | (p[5] << 8); tx_size = p[4] | (p[5] << 8);
println(" tx_size = ", tx_size); println(" tx_size = ", tx_size);
} }
@ -163,7 +166,7 @@ bool MIDIDevice::claim(Device_t *dev, int type, const uint8_t *descriptors, uint
} }
// if an IN endpoint was found, create its pipe // if an IN endpoint was found, create its pipe
if (rx_ep && rx_size <= MAX_PACKET_SIZE) { if (rx_ep && rx_size <= MAX_PACKET_SIZE) {
rxpipe = new_Pipe(dev, 2, rx_ep, 1, rx_size); rxpipe = new_Pipe(dev, rx_ep_type, rx_ep, 1, rx_size);
if (rxpipe) { if (rxpipe) {
rxpipe->callback_function = rx_callback; rxpipe->callback_function = rx_callback;
queue_Data_Transfer(rxpipe, rx_buffer, rx_size, this); queue_Data_Transfer(rxpipe, rx_buffer, rx_size, this);
@ -174,7 +177,7 @@ bool MIDIDevice::claim(Device_t *dev, int type, const uint8_t *descriptors, uint
} }
// if an OUT endpoint was found, create its pipe // if an OUT endpoint was found, create its pipe
if (tx_ep && tx_size <= MAX_PACKET_SIZE) { if (tx_ep && tx_size <= MAX_PACKET_SIZE) {
txpipe = new_Pipe(dev, 2, tx_ep, 0, tx_size); txpipe = new_Pipe(dev, tx_ep_type, tx_ep, 0, tx_size);
if (txpipe) { if (txpipe) {
txpipe->callback_function = tx_callback; txpipe->callback_function = tx_callback;
tx1_count = 0; tx1_count = 0;