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

Merge pull request #12 from ed-xmos/fix_null_chanend_i2s_builds

Browse Source 
fix exception - ensure chan param nullable in audio_io
This commit is contained in:
Ross Owen
2017-08-07 16:13:37 +01:00
committed by GitHub
parent ffb8baba20 9886ee6362
commit f771acfcb7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module_usb_audio/audio_io/audio_io.xc
View File

@@ -305,7 +305,7 @@ static inline unsigned DoSampleTransfer(chanend c_out, const int readBuffNo, con
#else /* NO_USB */ #else /* NO_USB */
#pragma unsafe arrays #pragma unsafe arrays
static inline unsigned DoSampleTransfer(chanend c_out, const int readBuffNo, const unsigned underflowWord, client audManage_if i_audMan) static inline unsigned DoSampleTransfer(chanend ?c_out, const int readBuffNo, const unsigned underflowWord, client audManage_if i_audMan)
{ {
UserBufferManagement(samplesOut, samplesIn[readBuffNo], i_audMan); UserBufferManagement(samplesOut, samplesIn[readBuffNo], i_audMan);
return 0; return 0;
@@ -447,7 +447,7 @@ static inline void InitPorts(unsigned divide)
/* I2S delivery thread */ /* I2S delivery thread */
#pragma unsafe arrays #pragma unsafe arrays
unsigned static deliver(chanend c_out, chanend ?c_spd_out, unsigned static deliver(chanend ?c_out, chanend ?c_spd_out,
#ifdef ADAT_TX #ifdef ADAT_TX
chanend c_adat_out, chanend c_adat_out,
unsigned adatSmuxMode, unsigned adatSmuxMode,
@@ -1062,7 +1062,7 @@ void testct_byref(chanend c, int &returnVal)
} }
[[combinable]] [[combinable]]
static void dummy_deliver(chanend c_out, unsigned &command) static void dummy_deliver(chanend ?c_out, unsigned &command)
{ {
int ct; int ct;
@@ -1107,7 +1107,7 @@ static void dummy_deliver(chanend c_out, unsigned &command)
} }
} }
void audio(chanend c_mix_out, void audio(chanend ?c_mix_out,
#if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE) #if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
chanend c_spdif_out, chanend c_spdif_out,
#endif #endif

2
module_usb_audio/audio_io/xua_audio.h
View File

@@ -31,7 +31,7 @@ typedef interface audManage_if
* \param c_config An optional channel that will be passed on to the * \param c_config An optional channel that will be passed on to the
* CODEC configuration functions. * CODEC configuration functions.
*/ */
void audio(chanend c_in, void audio(chanend ?c_in,
#if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE) #if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
chanend c_spdif_tx, chanend c_spdif_tx,
#endif #endif