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

Initial (but inefficient) MIDI transmit support

Browse Source
This commit is contained in:
PaulStoffregen 2018-01-04 02:37:48 -08:00
parent 133d082760
commit fcfecee43b
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
USBHost_t36.h
View File

@ -954,13 +954,16 @@ private:
enum { MAX_PACKET_SIZE = 64 }; enum { MAX_PACKET_SIZE = 64 };
enum { RX_QUEUE_SIZE = 80 }; // must be more than MAX_PACKET_SIZE/4 enum { RX_QUEUE_SIZE = 80 }; // must be more than MAX_PACKET_SIZE/4
uint32_t rx_buffer[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 rx_size;
uint16_t tx_size; uint16_t tx_size;
uint32_t rx_queue[RX_QUEUE_SIZE]; uint32_t rx_queue[RX_QUEUE_SIZE];
bool rx_packet_queued; bool rx_packet_queued;
uint16_t rx_head; uint16_t rx_head;
uint16_t rx_tail; uint16_t rx_tail;
volatile uint8_t tx1_count;
volatile uint8_t tx2_count;
uint8_t rx_ep; uint8_t rx_ep;
uint8_t tx_ep; uint8_t tx_ep;
uint8_t msg_channel; uint8_t msg_channel;

47
midi.cpp
View File

@ -44,6 +44,8 @@ void MIDIDevice::init()
handleTimeCodeQuarterFrame = NULL; handleTimeCodeQuarterFrame = NULL;
rx_head = 0; rx_head = 0;
rx_tail = 0; rx_tail = 0;
rxpipe = NULL;
txpipe = NULL;
driver_ready_for_device(this); 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); txpipe = new_Pipe(dev, 2, tx_ep, 0, tx_size);
if (txpipe) { if (txpipe) {
txpipe->callback_function = tx_callback; txpipe->callback_function = tx_callback;
tx1_count = 0;
tx2_count = 0;
} }
} else { } else {
txpipe = NULL; txpipe = NULL;
@ -233,7 +237,11 @@ void MIDIDevice::tx_data(const Transfer_t *transfer)
println("MIDIDevice transmit complete"); println("MIDIDevice transmit complete");
print(" MIDI Data: "); print(" MIDI Data: ");
print_hexbytes(transfer->buffer, tx_size); 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) bool MIDIDevice::read(uint8_t channel, uint8_t cable)