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

Merge branch '6V3_DEV' of git://git/apps/sc_usb_audio into 6V3_DEV

Browse Source
This commit is contained in:
Ross Owen
2013-12-09 15:49:58 +00:00
parent 1ce3c74ebc 9c531dbafe
commit ea6c2f1784
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module_usb_midi/src/usb_midi.xc
View File

@@ -331,11 +331,11 @@ void usb_midi(port ?p_midi_in, port ?p_midi_out,
/* Check for special case where MIDI ports are shared with i2c ports */ /* Check for special case where MIDI ports are shared with i2c ports */
if(isnull(c_i2c) && isnull(p_scl) && isnull(p_sda)) if(isnull(c_i2c) && isnull(p_scl) && isnull(p_sda))
{ {
handle_iap_case(is_ack, is_reset, datum, c_iap, c_i2c, p_midi_out, p_midi_in); iap_handle_ack_or_reset_or_data(is_ack, is_reset, datum, c_iap, c_i2c, p_midi_out, p_midi_in);
} }
else else
{ {
handle_iap_case(is_ack, is_reset, datum, c_iap, c_i2c, p_scl, p_sda); iap_handle_ack_or_reset_or_data(is_ack, is_reset, datum, c_iap, c_i2c, p_scl, p_sda);
} }
if (!authenticating) if (!authenticating)
{ {
@@ -347,7 +347,7 @@ void usb_midi(port ?p_midi_in, port ?p_midi_out,
/* Slow timer looking for IDevice plug/unplug event */ /* Slow timer looking for IDevice plug/unplug event */
case iAPTimer when timerafter(polltime) :> void: case iAPTimer when timerafter(polltime) :> void:
printintln(polltime); printintln(polltime);
handle_poll_dev_det(iAPTimer); iap_handle_poll_dev_det(iAPTimer);
break; break;
#endif #endif
} }