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

Removed PDM_PCM_IN define (replaced with check for NUM_PDM_MICS > 0). Also use of PDM_TILE on pcm_pdm_mic() task call.

Browse Source
This commit is contained in:
Ross Owen
2015-10-29 20:45:07 +00:00
parent 2d81bdc7c1
commit 11c43920ee
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module_usb_audio/audio.h
View File

@@ -26,7 +26,7 @@ void audio(chanend c_in,
#if (XUD_TILE != 0) #if (XUD_TILE != 0)
, server interface i_dfu dfuInterface , server interface i_dfu dfuInterface
#endif #endif
#ifdef PDM_PCM_IN #if (NUM_PDM_MICS > 0)
, chanend c_pdm_in , chanend c_pdm_in
#endif #endif
); );

6
module_usb_audio/audio.xc
View File

@@ -434,7 +434,7 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
#if(defined(SPDIF_RX) || defined(ADAT_RX)) #if(defined(SPDIF_RX) || defined(ADAT_RX))
chanend c_dig_rx, chanend c_dig_rx,
#endif #endif
#ifdef PDM_PCM_IN #if (NUM_PDM_MICS > 0)
chanend c_pdm_pcm, chanend c_pdm_pcm,
#endif #endif
@@ -940,7 +940,7 @@ chanend ?c_config, chanend ?c
#if XUD_TILE != 0 #if XUD_TILE != 0
, server interface i_dfu dfuInterface , server interface i_dfu dfuInterface
#endif #endif
#ifdef PDM_PCM_IN #if (NUM_PDM_MICS > 0)
, chanend c_pdm_in , chanend c_pdm_in
#endif #endif
) )
@@ -1211,7 +1211,7 @@ chanend ?c_config, chanend ?c
#if defined (ADAT_RX) || defined (SPDIF_RX) #if defined (ADAT_RX) || defined (SPDIF_RX)
c_dig_rx, c_dig_rx,
#endif #endif
#ifdef PDM_PCM_IN #if (NUM_PDM_MICS > 0)
c_pdm_in, c_pdm_in,
#endif #endif
c); c);

17
module_usb_audio/main.xc
View File

@@ -43,8 +43,8 @@
#include "clocking.h" #include "clocking.h"
#ifdef PDM_PCM_IN #if (NUM_PDM_MICS > 0)
void pcm_pdm_mic(chanend c_pcm_out); #include "pcm_pdm_mic.h"
#endif #endif
void genclock(); void genclock();
@@ -413,7 +413,7 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc,
#if (XUD_TILE != 0) #if (XUD_TILE != 0)
, server interface i_dfu dfuInterface , server interface i_dfu dfuInterface
#endif #endif
#ifdef PDM_PCM_IN #if (NUM_PDM_MICS > 0)
, chanend c_pdm_pcm , chanend c_pdm_pcm
#endif #endif
) )
@@ -456,7 +456,7 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc,
#if XUD_TILE != 0 #if XUD_TILE != 0
, dfuInterface , dfuInterface
#endif #endif
#ifdef PDM_PCM_IN #if (NUM_PDM_MICS > 0)
, c_pdm_pcm , c_pdm_pcm
#endif #endif
); );
@@ -543,7 +543,7 @@ int main()
#define dfuInterface null #define dfuInterface null
#endif #endif
#ifdef PDM_PCM_IN #if (NUM_PDM_MICS > 0)
chan c_pdm_pcm; chan c_pdm_pcm;
#endif #endif
@@ -590,7 +590,7 @@ int main()
#if XUD_TILE != 0 #if XUD_TILE != 0
, dfuInterface , dfuInterface
#endif #endif
#ifdef PDM_PCM_IN #if (NUM_PDM_MICS > 0)
, c_pdm_pcm , c_pdm_pcm
#endif #endif
@@ -655,9 +655,8 @@ int main()
} }
#endif #endif
#ifdef PDM_PCM_IN #if (NUM_PDM_MICS > 0)
// TODO tile on stdcore[PDM_TILE]: pcm_pdm_mic(c_pdm_pcm);
on stdcore[0]: pcm_pdm_mic(c_pdm_pcm);
#endif #endif
USER_MAIN_CORES USER_MAIN_CORES
} }