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

Merge pull request #14 from mbruno-xmos/master

Browse Source 
Changes for vocalsorcery
This commit is contained in:
Ross Owen
2018-01-11 07:01:32 -05:00
committed by GitHub
parent d1d00522b3 43c7d53ee1
commit 15b2ebeb3d
3 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib_xua/src/core/audiohub/xua_audiohub.xc
View File

@@ -761,7 +761,7 @@ unsigned static deliver(chanend ?c_out, chanend ?c_spd_out
#pragma xta endpoint "i2s_output_l" #pragma xta endpoint "i2s_output_l"
#if (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0) #if (I2S_CHANS_DAC != 0)
index = 0; index = 0;
#pragma loop unroll #pragma loop unroll
/* Output "even" channel to DAC (i.e. left) */ /* Output "even" channel to DAC (i.e. left) */
@@ -782,7 +782,7 @@ unsigned static deliver(chanend ?c_out, chanend ?c_spd_out
#endif /* (AUD_TO_USB_RATIO > 1) */ #endif /* (AUD_TO_USB_RATIO > 1) */
p_i2s_dac[index++] <: bitrev(samplesOut[frameCount +i]); p_i2s_dac[index++] <: bitrev(samplesOut[frameCount +i]);
} }
#endif // (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0) #endif // (I2S_CHANS_DAC != 0)
#ifndef CODEC_MASTER #ifndef CODEC_MASTER
/* Clock out the LR Clock, the DAC data and Clock in the next sample into ADC */ /* Clock out the LR Clock, the DAC data and Clock in the next sample into ADC */
@@ -915,7 +915,7 @@ unsigned static deliver(chanend ?c_out, chanend ?c_spd_out
index = 0; index = 0;
#pragma xta endpoint "i2s_output_r" #pragma xta endpoint "i2s_output_r"
#if (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0) #if (I2S_CHANS_DAC != 0)
/* Output "odd" channel to DAC (i.e. right) */ /* Output "odd" channel to DAC (i.e. right) */
#pragma loop unroll #pragma loop unroll
for(int i = 1; i < I2S_CHANS_DAC; i+=I2S_CHANS_PER_FRAME) for(int i = 1; i < I2S_CHANS_DAC; i+=I2S_CHANS_PER_FRAME)
@@ -935,7 +935,7 @@ unsigned static deliver(chanend ?c_out, chanend ?c_spd_out
#endif /* (AUD_TO_USB_RATIO > 1) */ #endif /* (AUD_TO_USB_RATIO > 1) */
p_i2s_dac[index++] <: bitrev(samplesOut[frameCount + i]); p_i2s_dac[index++] <: bitrev(samplesOut[frameCount + i]);
} }
#endif // (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0) #endif // (I2S_CHANS_DAC != 0)
#ifndef CODEC_MASTER #ifndef CODEC_MASTER
doI2SClocks(divide); doI2SClocks(divide);

5
lib_xua/src/core/pdm_mics/mic_array_conf.h
View File

@@ -3,7 +3,12 @@
#include "xua_conf_full.h" #include "xua_conf_full.h"
#ifndef MIC_ARRAY_MAX_FRAME_SIZE_LOG2
#define MIC_ARRAY_MAX_FRAME_SIZE_LOG2 0 #define MIC_ARRAY_MAX_FRAME_SIZE_LOG2 0
#endif
#ifndef MIC_ARRAY_NUM_MICS
#define MIC_ARRAY_NUM_MICS (NUM_PDM_MICS) #define MIC_ARRAY_NUM_MICS (NUM_PDM_MICS)
#endif
#endif /* MIC_ARRAY_CONF_H_ */ #endif /* MIC_ARRAY_CONF_H_ */

35
lib_xua/wscript Normal file
View File

@@ -0,0 +1,35 @@
def use_module(bld):
bld.env.XCC_FLAGS = bld.env.XCC_FLAGS + [
'-O3', '-DREF_CLK_FREQ=100', '-fasm-linenum', '-fcomment-asm',
'-fsubword-select', '-DXUD_FULL_PIDTABLE=1'
]
source = bld.path.ant_glob(
[
'src/**/*.xc', 'src/**/*.c', 'src/**/*.S'
],
excl=[
'**/descriptors_2.rst'
])
depends_on = [
'lib_logging(>=2.0.0)', 'lib_xassert(>=2.0.0)', 'lib_xud(>=1.0.0)'
]
bld.env['XCC_FLAGS_endpoint0.c'] = bld.env.XCC_FLAGS + ['-Os', '-mno-dual-issue']
bld.env['XCC_FLAGS_dbcalc.xc'] = bld.env.XCC_FLAGS + ['-Os', '-mno-dual-issue']
bld.env['XCC_FLAGS_audiorequests.xc'] = bld.env.XCC_FLAGS + ['-Os', '-mno-dual-issue']
bld.env['XCC_FLAGS_flashlib_user.c'] = bld.env.XCC_FLAGS + ['-Os', '-mno-dual-issue']
bld.env['XCC_FLAGS_audioports.c'] = bld.env.XCC_FLAGS + ['-Os', '-mno-dual-issue']
bld.env['XCC_FLAGS_audioports.xc'] = bld.env.XCC_FLAGS + ['-Os', '-mno-dual-issue']
bld.env['XCC_FLAGS_dfu.xc'] = bld.env.XCC_FLAGS + ['-Os', '-mno-dual-issue']
bld.env['XCC_FLAGS_flash_interface.c'] = bld.env.XCC_FLAGS + ['-Os', '-mno-dual-issue']
bld.module(
source=source,
depends_on=depends_on,
includes=['api'],
optional_headers='xua_conf.h',
version='1.0.0')