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

Add test for zero packet on egress to avoid invalid FIFO pop

Browse Source
This commit is contained in:
Ed
2024-04-29 12:16:25 +01:00
parent 28a530685f
commit ebf4d0e387
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib_xua/src/midi/usb_midi.xc
View File

@@ -13,7 +13,7 @@
#include "iap_user.h" #include "iap_user.h"
#include "coprocessor_user.h" #include "coprocessor_user.h"
#endif #endif
//#define MIDI_LOOPBACK 1
int icount = 0; int icount = 0;
static unsigned makeSymbol(unsigned data) static unsigned makeSymbol(unsigned data)
{ {
@@ -89,7 +89,7 @@ void usb_midi(
struct midi_in_parse_state mips; struct midi_in_parse_state mips;
// the symbol fifo (to go out of uart) // the symbol fifo (to go out of uart).
queue_t symbol_fifo; queue_t symbol_fifo;
unsigned symbol_fifo_arr[USB_MIDI_DEVICE_OUT_FIFO_SIZE]; // Used for 32bit USB MIDI events unsigned symbol_fifo_arr[USB_MIDI_DEVICE_OUT_FIFO_SIZE]; // Used for 32bit USB MIDI events
@@ -264,7 +264,7 @@ void usb_midi(
} }
break; break;
#endif #endif
// Received as packet from USB
case !authenticating => midi_get_ack_or_data(c_midi, is_ack, datum): case !authenticating => midi_get_ack_or_data(c_midi, is_ack, datum):
if (is_ack) if (is_ack)
@@ -281,6 +281,7 @@ void usb_midi(
} }
} }
else else
// A midi packet from the host
{ {
unsigned midi[3]; unsigned midi[3];
unsigned size; unsigned size;
@@ -327,7 +328,7 @@ void usb_midi(
midi_from_host_overflow = 1; midi_from_host_overflow = 1;
} }
// Drop through to the isTX guarded case // Drop through to the isTX guarded case
if (!isTX) if (!isTX && size > 0) // do not start tx'ing if this packet has no size
{ {
t :> txT; // Should be enough to trigger the other case t :> txT; // Should be enough to trigger the other case
isTX = 1; isTX = 1;