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

iAP input and output buffers now separated, also MIDI ports are no longer passed in to iAP functions when no dedicated i2c ports are present as p_midi_in is now buffered.

Browse Source
This commit is contained in:
Sam Chesney
2014-01-15 18:50:05 +00:00
parent 58f147e1c8
commit 4f501bf7da
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module_usb_midi/src/usb_midi.xc
View File

@@ -38,6 +38,8 @@ int uin_count = 0; // UART bytes in
// state for iAP // state for iAP
#ifdef IAP #ifdef IAP
extern unsigned authenticating; extern unsigned authenticating;
extern struct iap_buf iap_incoming_buffer;
extern struct iap_buf iap_outgoing_buffer;
#else #else
unsigned authenticating = 0; unsigned authenticating = 0;
#endif #endif
@@ -115,11 +117,11 @@ void usb_midi(buffered in port:1 ?p_midi_in, port ?p_midi_out,
/* Check for special case where MIDI and i2c ports are shared... */ /* Check for special case where MIDI and i2c ports are shared... */
if(isnull(c_i2c) && isnull(p_scl) && isnull(p_sda)) if(isnull(c_i2c) && isnull(p_scl) && isnull(p_sda))
{ {
init_iAP(c_i2c, p_midi_out, p_midi_in); // uses timer for i2c initialisation pause.. init_iAP(iap_incoming_buffer, iap_outgoing_buffer, null, null, null); // uses timer for i2c initialisation pause..
} }
else else
{ {
init_iAP(c_i2c, p_scl, p_sda); // uses timer for i2c initialisation pause.. init_iAP(iap_incoming_buffer, iap_outgoing_buffer, c_i2c, p_scl, p_sda); // uses timer for i2c initialisation pause..
} }
#endif #endif
@@ -335,11 +337,11 @@ void usb_midi(buffered in port:1 ?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))
{ {
iap_handle_ack_or_reset_or_data(is_ack, is_reset, datum, c_iap, c_i2c, p_midi_out, p_midi_in); iap_handle_ack_or_reset_or_data(iap_incoming_buffer, iap_outgoing_buffer, is_ack, is_reset, datum, c_iap, null, null, null);
} }
else else
{ {
iap_handle_ack_or_reset_or_data(is_ack, is_reset, datum, c_iap, c_i2c, p_scl, p_sda); iap_handle_ack_or_reset_or_data(iap_incoming_buffer, iap_outgoing_buffer, is_ack, is_reset, datum, c_iap, c_i2c, p_scl, p_sda);
} }
if (!authenticating) if (!authenticating)
{ {