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

Fixed i2s_loopback test build (and removed some unrequired complexity

Browse Source
This commit is contained in:
xross
2018-03-05 11:48:51 +00:00
parent 16ba8deacf
commit 756a81ad14
1 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/i2s_loopback/main.xc
View File

@@ -77,20 +77,12 @@ buffered out port:32 p_lrclk = PORT_I2S_LRCLK; /* I2S Bit-clock */
buffered out port:32 p_bclk = PORT_I2S_BCLK; /* I2S L/R-clock */ buffered out port:32 p_bclk = PORT_I2S_BCLK; /* I2S L/R-clock */
#endif #endif
/* Note, declared unsafe as sometimes we want to share this port in port p_mclk_in = PORT_MCLK_IN;
e.g. PDM mics and I2S use same master clock IO */
port p_mclk_in_ = PORT_MCLK_IN;
/* Clock-block declarations */ /* Clock-block declarations */
clock clk_audio_bclk = on tile[AUDIO_IO_TILE]: XS1_CLKBLK_1; /* Bit clock */ clock clk_audio_bclk = on tile[AUDIO_IO_TILE]: XS1_CLKBLK_1; /* Bit clock */
clock clk_audio_mclk = on tile[AUDIO_IO_TILE]: XS1_CLKBLK_2; /* Master clock */ clock clk_audio_mclk = on tile[AUDIO_IO_TILE]: XS1_CLKBLK_2; /* Master clock */
unsafe
{
/* TODO simplify this */
unsafe port p_mclk_in; /* Audio master clock input */
}
#ifdef SIMULATION #ifdef SIMULATION
#define INITIAL_SKIP_FRAMES 10 #define INITIAL_SKIP_FRAMES 10
#define TOTAL_TEST_FRAMES 100 #define TOTAL_TEST_FRAMES 100
@@ -211,9 +203,9 @@ void slave_mode_clk_setup(const unsigned samFreq, const unsigned chans_per_frame
#endif #endif
#if I2S_MODE_TDM #if I2S_MODE_TDM
const int i2s_tdm_mode = 1; const int i2s_tdm_mode = 8;
#else #else
const int i2s_tdm_mode = 0; const int i2s_tdm_mode = 2;
#endif #endif
int main(void) int main(void)
@@ -221,13 +213,10 @@ int main(void)
chan c_checker; chan c_checker;
chan c_out; chan c_out;
par { par
{
on tile[AUDIO_IO_TILE]: on tile[AUDIO_IO_TILE]:
{ {
unsafe
{
p_mclk_in = p_mclk_in_;
}
par par
{ {
XUA_AudioHub(c_out); XUA_AudioHub(c_out);
@@ -235,7 +224,7 @@ int main(void)
checker(c_checker, 0); checker(c_checker, 0);
#ifdef SIMULATION #ifdef SIMULATION
#if CODEC_MASTER #if CODEC_MASTER
slave_mode_clk_setup(DEFAULT_FREQ, (i2s_tdm_mode != 0) ? 8 : 2); slave_mode_clk_setup(DEFAULT_FREQ, i2s_tdm_mode);
#else #else
master_mode_clk_setup(); master_mode_clk_setup();
#endif #endif