From fcfecee43b2d41826418244a5fb23e601e40dafb Mon Sep 17 00:00:00 2001 From: PaulStoffregen Date: Thu, 4 Jan 2018 02:37:48 -0800 Subject: [PATCH] Initial (but inefficient) MIDI transmit support --- USBHost_t36.h | 5 ++++- midi.cpp | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/USBHost_t36.h b/USBHost_t36.h index 351e564..3d39215 100644 --- a/USBHost_t36.h +++ b/USBHost_t36.h @@ -954,13 +954,16 @@ private: enum { MAX_PACKET_SIZE = 64 }; enum { RX_QUEUE_SIZE = 80 }; // must be more than MAX_PACKET_SIZE/4 uint32_t rx_buffer[MAX_PACKET_SIZE/4]; - uint32_t tx_buffer[MAX_PACKET_SIZE/4]; + uint32_t tx_buffer1[MAX_PACKET_SIZE/4]; + uint32_t tx_buffer2[MAX_PACKET_SIZE/4]; uint16_t rx_size; uint16_t tx_size; uint32_t rx_queue[RX_QUEUE_SIZE]; bool rx_packet_queued; uint16_t rx_head; uint16_t rx_tail; + volatile uint8_t tx1_count; + volatile uint8_t tx2_count; uint8_t rx_ep; uint8_t tx_ep; uint8_t msg_channel; diff --git a/midi.cpp b/midi.cpp index fce2162..1173152 100644 --- a/midi.cpp +++ b/midi.cpp @@ -44,6 +44,8 @@ void MIDIDevice::init() handleTimeCodeQuarterFrame = NULL; rx_head = 0; rx_tail = 0; + rxpipe = NULL; + txpipe = NULL; driver_ready_for_device(this); } @@ -166,6 +168,8 @@ bool MIDIDevice::claim(Device_t *dev, int type, const uint8_t *descriptors, uint txpipe = new_Pipe(dev, 2, tx_ep, 0, tx_size); if (txpipe) { txpipe->callback_function = tx_callback; + tx1_count = 0; + tx2_count = 0; } } else { txpipe = NULL; @@ -233,7 +237,11 @@ void MIDIDevice::tx_data(const Transfer_t *transfer) println("MIDIDevice transmit complete"); print(" MIDI Data: "); print_hexbytes(transfer->buffer, tx_size); - // TODO: return the buffer to the pool... + if (transfer->buffer == tx_buffer1) { + tx1_count = 0; + } else if (transfer->buffer == tx_buffer2) { + tx2_count = 0; + } } @@ -247,6 +255,43 @@ void MIDIDevice::disconnect() } +void MIDIDevice::write_packed(uint32_t data) +{ + if (!txpipe) return; + uint32_t tx_max = tx_size / 4; + while (1) { + uint32_t tx1 = tx1_count; + uint32_t tx2 = tx2_count; + if (tx1 < tx_max && (tx2 == 0 || tx2 >= tx_max)) { + // use tx_buffer1 + tx_buffer1[tx1++] = data; + tx1_count = tx1; + if (tx1 >= tx_max) { + queue_Data_Transfer(txpipe, tx_buffer1, tx_max*4, this); + } else { + // TODO: start a timer, rather than sending the buffer + // before it's full, to make best use of bandwidth + tx1_count = tx_max; + queue_Data_Transfer(txpipe, tx_buffer1, tx_max*4, this); + } + return; + } + if (tx2 < tx_max) { + // use tx_buffer2 + tx_buffer2[tx2++] = data; + tx2_count = tx2; + if (tx2 >= tx_max) { + queue_Data_Transfer(txpipe, tx_buffer2, tx_max*4, this); + } else { + // TODO: start a timer, rather than sending the buffer + // before it's full, to make best use of bandwidth + tx2_count = tx_max; + queue_Data_Transfer(txpipe, tx_buffer2, tx_max*4, this); + } + return; + } + } +} bool MIDIDevice::read(uint8_t channel, uint8_t cable)