Browse Source

Merge pull request #29 from essej/txfix

fixed race condition in midi transmit
main
Paul Stoffregen 4 years ago
parent
commit
ce04fdd5ec
No account linked to committer's email address
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      midi.cpp

+ 4
- 0
midi.cpp View File

// use tx_buffer1 // use tx_buffer1
tx_buffer1[tx1++] = data; tx_buffer1[tx1++] = data;
tx1_count = tx1; tx1_count = tx1;
__disable_irq();
if (tx1 >= tx_max) { if (tx1 >= tx_max) {
queue_Data_Transfer(txpipe, tx_buffer1, tx_max*4, this); queue_Data_Transfer(txpipe, tx_buffer1, tx_max*4, this);
} else { } else {
tx1_count = tx_max; tx1_count = tx_max;
queue_Data_Transfer(txpipe, tx_buffer1, tx_max*4, this); queue_Data_Transfer(txpipe, tx_buffer1, tx_max*4, this);
} }
__enable_irq();
return; return;
} }
if (tx2 < tx_max) { if (tx2 < tx_max) {
// use tx_buffer2 // use tx_buffer2
tx_buffer2[tx2++] = data; tx_buffer2[tx2++] = data;
tx2_count = tx2; tx2_count = tx2;
__disable_irq();
if (tx2 >= tx_max) { if (tx2 >= tx_max) {
queue_Data_Transfer(txpipe, tx_buffer2, tx_max*4, this); queue_Data_Transfer(txpipe, tx_buffer2, tx_max*4, this);
} else { } else {
tx2_count = tx_max; tx2_count = tx_max;
queue_Data_Transfer(txpipe, tx_buffer2, tx_max*4, this); queue_Data_Transfer(txpipe, tx_buffer2, tx_max*4, this);
} }
__enable_irq();
return; return;
} }
} }

Loading…
Cancel
Save