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

Move defines and checks to expected places

Browse Source
This commit is contained in:
Sam Chesney
2016-12-07 11:41:05 +00:00
parent 5e09197c15
commit 4b9e323593
3 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
module_usb_audio/audio_io/audio_io.xc
View File

@@ -32,32 +32,6 @@
#include "commands.h" #include "commands.h"
#include "xc_ptr.h" #include "xc_ptr.h"
#ifndef I2S_DOWNSAMPLE_FACTOR
#define I2S_DOWNSAMPLE_FACTOR (1)
#endif
#ifndef I2S_DOWNSAMPLE_MONO
#define I2S_DOWNSAMPLE_MONO (0)
#endif
#if (I2S_DOWNSAMPLE_MONO == 1)
#define I2S_DOWNSAMPLE_CHANS (I2S_CHANS_DAC/2)
#else
#define I2S_DOWNSAMPLE_CHANS I2S_CHANS_DAC
#endif
#if (I2S_DOWNSAMPLE_FACTOR != 1) && (I2S_DOWNSAMPLE_FACTOR != 3)
#error "Unsupported I2S downsampling configuration"
#endif
#if (NUM_USB_CHAN_IN && (NUM_USB_CHAN_IN < (I2S_CHANS_ADC + NUM_PDM_MICS)))
#error "Not enough USB input channels to support number of I2S and PDM inputs"
#endif
#if (NUM_USB_CHAN_IN && (NUM_USB_CHAN_IN < (NUM_PDM_MICS + PDM_MIC_INDEX)))
#error "PDM mic inputs mapping exceeds bounds of USB input channel"
#endif
/* TODO 32 is max expected channels */ /* TODO 32 is max expected channels */
static unsigned samplesOut[32]; static unsigned samplesOut[32];

35
module_usb_audio/devicedefines.h
View File

@@ -121,6 +121,41 @@
#define I2S_WIRES_ADC (I2S_CHANS_ADC / I2S_CHANS_PER_FRAME) #define I2S_WIRES_ADC (I2S_CHANS_ADC / I2S_CHANS_PER_FRAME)
#endif #endif
/**
* @brief Incoming I2S (device to host) channels can be downsampled by a factor of 3.
*
* Default: 1 i.e. downsampling is disabled.
*/
#ifndef I2S_DOWNSAMPLE_FACTOR
#define I2S_DOWNSAMPLE_FACTOR (1)
#else
#if (I2S_DOWNSAMPLE_FACTOR != 3)
#error Unsupported I2S downsampling configuration
#endif
#endif
/**
* @brief Only downsample one channel per I2S frame.
*
* Default: 0 i.e. mono mode is disabled, all channels will be downsampled.
*/
#ifndef I2S_DOWNSAMPLE_MONO
#define I2S_DOWNSAMPLE_MONO (0)
#endif
/**
* @brief Number of incoming (device to host) I2S channels to downsample.
*
* Default: The number of I2S incoming channels, or half this if mono downsampling is enabled.
*/
#if (I2S_DOWNSAMPLE_MONO == 1)
#define I2S_DOWNSAMPLE_CHANS (I2S_CHANS_ADC / 2)
#if ((I2S_DOWNSAMPLE_FACTOR > 1) && (I2S_MODE_TDM == 1))
#error Mono I2S downsampling is not avaliable in TDM mode
#endif
#else
#define I2S_DOWNSAMPLE_CHANS I2S_CHANS_ADC
#endif
/** /**
* @brief Max supported sample frequency for device (Hz). Default: 192000 * @brief Max supported sample frequency for device (Hz). Default: 192000

6
module_usb_audio/warnings.xc
View File

@@ -72,4 +72,10 @@ Warnings relating to configuration defines located in this XC source file rather
#error NUM_USB_CHAN_IN_FS expected to be less than or equal to NUM_USB_CHAN_IN #error NUM_USB_CHAN_IN_FS expected to be less than or equal to NUM_USB_CHAN_IN
#endif #endif
#if (NUM_USB_CHAN_IN && (NUM_USB_CHAN_IN < (I2S_CHANS_ADC + NUM_PDM_MICS)))
#error Not enough USB input channels to support number of I2S and PDM inputs
#endif
#if (NUM_USB_CHAN_IN && (NUM_USB_CHAN_IN < (NUM_PDM_MICS + PDM_MIC_INDEX)))
#error PDM mic inputs mapping exceeds bounds of USB input channel
#endif