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

c_iap now passed to usb_midi when IAP and MIDI defined

Browse Source
This commit is contained in:
Ross Owen
2014-01-24 13:27:30 +00:00
parent 104c70b402
commit 4aaa62c8b8
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module_usb_audio/main.xc
View File

@@ -352,13 +352,15 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc
#endif #endif
} }
#if defined(MIDI) || defined(IAP)
/* MIDI/iAP Core */ /* MIDI/iAP Core */
#if defined (MIDI) || defined IAP
{ {
thread_speed(); thread_speed();
#ifdef MIDI #if defined(MIDI) && defined (IAP)
usb_midi(p_midi_rx, p_midi_tx, clk_midi, c_midi, 0, c_iap, null, null, null);
#elif defined(MIDI)
usb_midi(p_midi_rx, p_midi_tx, clk_midi, c_midi, 0, null, null, null, null); usb_midi(p_midi_rx, p_midi_tx, clk_midi, c_midi, 0, null, null, null, null);
#else #elif defines(IAP)
iAP(c_iap, null, null, null); iAP(c_iap, null, null, null);
#endif #endif
} }
@@ -381,13 +383,10 @@ int main()
chan c_mix_out; chan c_mix_out;
#ifdef MIDI #ifdef MIDI
chan c_midi; chan c_midi;
#else
#define c_midi null
#endif #endif
#ifdef IAP #ifdef IAP
chan c_iap; chan c_iap;
#endif #endif
#ifdef SU1_ADC_ENABLE #ifdef SU1_ADC_ENABLE
chan c_adc; chan c_adc;
#else #else