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

Refactor, remove duplicated starting to output case.

Browse Source
This commit is contained in:
Russell Gallop
2011-08-12 14:17:50 +01:00
parent f9308d97c7
commit 49563dda0c
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
module_usb_midi/src/usb_midi.xc
View File

@@ -146,6 +146,7 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
uin_count++; uin_count++;
rxByte >>= 24; rxByte >>= 24;
// if (rxByte != outputted_symbol) { // if (rxByte != outputted_symbol) {
// // Loopback check
// printhexln(rxByte); // printhexln(rxByte);
// printhexln(outputted_symbol); // printhexln(outputted_symbol);
// } // }
@@ -177,8 +178,10 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
// This code will leave the output high afterwards due to the stop bit added with makeSymbol // This code will leave the output high afterwards due to the stop bit added with makeSymbol
case outputting => t when timerafter(txT) :> int _: case outputting => t when timerafter(txT) :> int _:
if (symbol == 0) { if (symbol == 0) {
uout_count++; // Start sending symbol.
outputted_symbol = outputting_symbol; // This case is reached when a symbol has been received from the host but not started AND
// When it has just finished sending a symbol
// have we got another symbol to send to uart? // have we got another symbol to send to uart?
if (!isempty(symbol_fifo)) { // FIFO not empty if (!isempty(symbol_fifo)) { // FIFO not empty
// Take from FIFO // Take from FIFO
@@ -195,6 +198,7 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
t :> txT; t :> txT;
txT += bit_time; txT += bit_time;
txPT += bit_time; txPT += bit_time;
// leave outputting set
} else } else
outputting = 0; outputting = 0;
} else { } else {
@@ -203,6 +207,11 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
p_midi_out @ txPT <: (symbol & 1); p_midi_out @ txPT <: (symbol & 1);
// printstr("mout2\n"); // printstr("mout2\n");
symbol >>= 1; symbol >>= 1;
if (symbol == 0) {
// Finished sending
uout_count++;
outputted_symbol = outputting_symbol;
}
} }
break; break;
#endif #endif
@@ -251,27 +260,10 @@ void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
} else { } else {
midi_from_host_overflow = 1; midi_from_host_overflow = 1;
} }
// Could this drop through to the outputting case instead......
// Start sending from FIFO if (!outputting) {
if (!isempty(symbol_fifo) && !outputting) { t :> txT; // Should be enough to trigger the other case
outputting_symbol = dequeue(symbol_fifo);
symbol = makeSymbol(outputting_symbol);
if (space(symbol_fifo) > 3 && midi_from_host_overflow) {
midi_from_host_overflow = 0;
midi_send_ack(c_midi);
}
#ifdef MIDI_LOOPBACK
handle_byte_from_uart(c_midi, mips, cable_number, got_next_event, next_event, waiting_for_ack, symbol);
#else
// Start sending byte (to be continued by outputting case)
p_midi_out <: 1 @ txPT;
t :> txT;
txT += bit_time;
txPT += bit_time;
outputting = 1; outputting = 1;
#endif
} }
#endif #endif
} }