mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-03-31 16:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix midi stream write return value (off by 1)

Browse Source
This commit is contained in:
hathach 2021-07-13 21:09:23 +07:00
parent 137dff620b
commit ebd98e1a18
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/class/midi/midi_device.c
View File

@ -240,15 +240,15 @@ uint32_t tud_midi_n_stream_write(uint8_t itf, uint8_t cable_num, uint8_t const*
midid_stream_t* stream = &midi->stream_write; midid_stream_t* stream = &midi->stream_write;
uint32_t total_written = 0;
uint32_t i = 0; uint32_t i = 0;
while ( i < bufsize ) while ( (i < bufsize) && (tu_fifo_remaining(&midi->tx_ff) >= 4) )
{ {
uint8_t const data = buffer[i]; uint8_t const data = buffer[i];
i++;
if ( stream->index == 0 ) if ( stream->index == 0 )
{ {
// new event packet //------------- New event packet -------------//
uint8_t const msg = data >> 4; uint8_t const msg = data >> 4;
@ -310,9 +310,9 @@ uint32_t tud_midi_n_stream_write(uint8_t itf, uint8_t cable_num, uint8_t const*
} }
else else
{ {
// On-going (buffering) packet //------------- On-going (buffering) packet -------------//
TU_ASSERT(stream->index < 4, total_written); TU_ASSERT(stream->index < 4, i);
stream->buffer[stream->index] = data; stream->buffer[stream->index] = data;
stream->index++; stream->index++;
@ -335,19 +335,14 @@ uint32_t tud_midi_n_stream_write(uint8_t itf, uint8_t cable_num, uint8_t const*
// complete current event packet, reset stream // complete current event packet, reset stream
stream->index = stream->total = 0; stream->index = stream->total = 0;
// fifo overflow, here we assume FIFO is multiple of 4 and didn't check remaining before writing // FIFO overflown, since we already check fifo remaining. It is probably race condition
if ( count != 4 ) break; TU_ASSERT(count == 4, i);
// updated written if succeeded
total_written = i;
} }
i++;
} }
write_flush(midi); write_flush(midi);
return total_written; return i;
} }
bool tud_midi_n_packet_write (uint8_t itf, uint8_t const packet[4]) bool tud_midi_n_packet_write (uint8_t itf, uint8_t const packet[4])