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

I2_CHANS_PER_FRAME default define moved from audio.xc to devicedefines.xc

Browse Source
This commit is contained in:
Ross Owen
2014-12-02 14:22:11 +00:00
parent 7ac0e87e0b
commit 4ab8cff9a4
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module_usb_audio/audio.xc
View File

@@ -29,12 +29,6 @@ static unsigned samplesOut[NUM_USB_CHAN_OUT];
static unsigned samplesIn_0[NUM_USB_CHAN_IN]; static unsigned samplesIn_0[NUM_USB_CHAN_IN];
static unsigned samplesIn_1[I2S_CHANS_ADC]; static unsigned samplesIn_1[I2S_CHANS_ADC];
#ifdef I2S_MODE_TDM
#define I2S_CHANS_PER_FRAME 8
#else
#define I2S_CHANS_PER_FRAME 2
#endif
#if (DSD_CHANS_DAC != 0) #if (DSD_CHANS_DAC != 0)
extern buffered out port:32 p_dsd_dac[DSD_CHANS_DAC]; extern buffered out port:32 p_dsd_dac[DSD_CHANS_DAC];
extern buffered out port:32 p_dsd_clk; extern buffered out port:32 p_dsd_clk;
@@ -42,7 +36,6 @@ extern buffered out port:32 p_dsd_clk;
unsigned g_adcVal = 0; unsigned g_adcVal = 0;
#ifdef XTA_TIMING_AUDIO #ifdef XTA_TIMING_AUDIO
#pragma xta command "add exclusion received_command" #pragma xta command "add exclusion received_command"
#pragma xta command "analyse path i2s_output_l i2s_output_r" #pragma xta command "analyse path i2s_output_l i2s_output_r"

14
module_usb_audio/devicedefines.h
View File

@@ -101,6 +101,20 @@
#endif #endif
#endif #endif
/**
* @brief Channels per I2S frame. *
*
* Default: 2 i.e standard stereo I2S (8 if using TDM i.e. I2S_MODE_TDM).
*
**/
#ifndef I2S_CHANS_PER_FRAME
#ifdef I2S_MODE_TDM
#define I2S_CHANS_PER_FRAME 8
#else
#define I2S_CHANS_PER_FRAME 2
#endif
#endif
/** /**
* @brief Max supported sample frequency for device (Hz). Default: 192000 * @brief Max supported sample frequency for device (Hz). Default: 192000
*/ */