laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Rename to_host_fifo to midi_to_host_fifo to make room in namespace for iap buffer.

Browse Source
This commit is contained in:
Russell Gallop
2011-08-25 18:02:27 +01:00
parent 25e2b5c1ed
commit adc3d6bb4b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
module_usb_midi/src/usb_midi.xc
View File

@@ -72,8 +72,8 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
timer t2; timer t2;
// One place buffer for data going out to host // One place buffer for data going out to host
queue to_host_fifo; queue midi_to_host_fifo;
unsigned to_host_fifo_arr[1]; unsigned midi_to_host_fifo_arr[1];
unsigned outputting_symbol, outputted_symbol; unsigned outputting_symbol, outputted_symbol;
@@ -88,7 +88,7 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
//configure_clock_rate(clk_midi, 100, 1); //configure_clock_rate(clk_midi, 100, 1);
init_queue(symbol_fifo, symbol_fifo_arr, USB_MIDI_DEVICE_OUT_FIFO_SIZE); init_queue(symbol_fifo, symbol_fifo_arr, USB_MIDI_DEVICE_OUT_FIFO_SIZE);
init_queue(to_host_fifo, to_host_fifo_arr, 1); init_queue(midi_to_host_fifo, midi_to_host_fifo_arr, 1);
configure_out_port_no_ready(p_midi_out, clk_midi, 1); configure_out_port_no_ready(p_midi_out, clk_midi, 1);
configure_in_port(p_midi_in, clk_midi); configure_in_port(p_midi_in, clk_midi);
@@ -151,7 +151,7 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
// } // }
{valid, event} = midi_in_parse(mips, cable_number, rxByte); {valid, event} = midi_in_parse(mips, cable_number, rxByte);
if (valid && isempty(to_host_fifo)) { if (valid && isempty(midi_to_host_fifo)) {
event = byterev(event); event = byterev(event);
// data to send to host - add to fifo // data to send to host - add to fifo
if (!waiting_for_ack) { if (!waiting_for_ack) {
@@ -161,7 +161,7 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
waiting_for_ack = 1; waiting_for_ack = 1;
th_count++; th_count++;
} else { } else {
enqueue(to_host_fifo, event); enqueue(midi_to_host_fifo, event);
} }
} else if (valid) { } else if (valid) {
// printstr("g"); // printstr("g");
@@ -221,9 +221,9 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
if (is_ack) { if (is_ack) {
// have we got more data to send // have we got more data to send
//printstr("ack\n"); //printstr("ack\n");
if (!isempty(to_host_fifo)) { if (!isempty(midi_to_host_fifo)) {
//printstr("uart->decouple\n"); //printstr("uart->decouple\n");
outuint(c_midi, dequeue(to_host_fifo)); outuint(c_midi, dequeue(midi_to_host_fifo));
th_count++; th_count++;
} else { } else {
waiting_for_ack = 0; waiting_for_ack = 0;
@@ -235,7 +235,7 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
int event = byterev(datum); int event = byterev(datum);
mr_count++; mr_count++;
#ifdef MIDI_LOOPBACK #ifdef MIDI_LOOPBACK
if (isempty(to_host_fifo)) { if (isempty(midi_to_host_fifo)) {
// data to send to host // data to send to host
if (!waiting_for_ack) { if (!waiting_for_ack) {
// send data // send data
@@ -245,7 +245,7 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
waiting_for_ack = 1; waiting_for_ack = 1;
} else { } else {
event = byterev(event); event = byterev(event);
enqueue(to_host_fifo, event); enqueue(midi_to_host_fifo, event);
} }
} }
#else #else