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

IAP_TILE defined. IAP_TILE can now != AUDIO_IO_TILE.

Browse Source
This commit is contained in:
Ross Owen
2014-02-04 15:18:41 +00:00
parent 4d61917717
commit 9422376a5a
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
module_usb_audio/main.xc
View File

@@ -25,6 +25,7 @@
#include "audio.h" #include "audio.h"
#ifdef IAP #ifdef IAP
#include "i2c_shared.h"
#include "iap.h" #include "iap.h"
#endif #endif
@@ -40,6 +41,10 @@
#define XUD_TILE 0 #define XUD_TILE 0
#endif #endif
#ifndef IAP_TILE
#define IAP_TILE AUDIO_IO_TILE
#endif
/* Audio I/O - Port declarations */ /* Audio I/O - Port declarations */
#if I2S_WIRES_DAC > 0 #if I2S_WIRES_DAC > 0
on tile[AUDIO_IO_TILE] : buffered out port:32 p_i2s_dac[I2S_WIRES_DAC] = on tile[AUDIO_IO_TILE] : buffered out port:32 p_i2s_dac[I2S_WIRES_DAC] =
@@ -322,9 +327,6 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc
#ifdef MIDI #ifdef MIDI
, chanend c_midi , chanend c_midi
#endif #endif
#ifdef IAP
, chanend c_iap
#endif
#ifdef MIXER #ifdef MIXER
, chanend c_mix_ctl , chanend c_mix_ctl
#endif #endif
@@ -352,21 +354,6 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc
audio(c_aud_in, null, null, c_adc); audio(c_aud_in, null, null, c_adc);
#endif #endif
} }
#if defined(MIDI) || defined(IAP)
/* MIDI/iAP Core */
{
thread_speed();
#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);
#elif defined(IAP)
iAP(c_iap, null, null, null);
#endif
}
#endif
} }
} }
@@ -418,15 +405,26 @@ int main()
#ifdef MIDI #ifdef MIDI
, c_midi , c_midi
#endif #endif
#ifdef IAP
, c_iap
#endif
#ifdef MIXER #ifdef MIXER
, c_mix_ctl , c_mix_ctl
#endif #endif
); );
#if defined(MIDI) || defined(IAP)
on tile[IAP_TILE]:
/* MIDI/iAP Core */
{
thread_speed();
#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);
#elif defined(IAP)
iAP(c_iap, null, null, null);
#endif
}
#endif
USER_MAIN_CORES USER_MAIN_CORES
} }