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

DFU flash code run on tile[0] even if XUD_TILE and AUDIO_IO_TILE are not 0

Browse Source
This commit is contained in:
Ross Owen
2017-05-24 10:45:56 +01:00
parent b227ee5c90
commit 8e861e0a5e
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@@ -5,6 +5,7 @@ sc_usb_audio Change Log
----- -----
- ADDED: DFU to UAC1 descriptors (guarded by DFU and FORCE_UAC1_DFU) - ADDED: DFU to UAC1 descriptors (guarded by DFU and FORCE_UAC1_DFU)
- RESOLVED: Removed 'reinterpretation to type of larger alignment' warnings - RESOLVED: Removed 'reinterpretation to type of larger alignment' warnings
- RESOLVED: DFU flash code run on tile[0] even if XUD_TILE and AUDIO_IO_TILE are not 0
7.1.0 7.1.0
----- -----

4
module_usb_audio/audio_io/audio_io.xc
View File

@@ -1113,7 +1113,7 @@ chanend c_spdif_out,
chanend c_dig_rx, chanend c_dig_rx,
#endif #endif
chanend ?c_config, chanend ?c chanend ?c_config, chanend ?c
#if XUD_TILE != 0 #if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0)
, server interface i_dfu ?dfuInterface , server interface i_dfu ?dfuInterface
#endif #endif
#if (NUM_PDM_MICS > 0) #if (NUM_PDM_MICS > 0)
@@ -1392,7 +1392,7 @@ chanend ?c_config, chanend ?c
while (1) while (1)
{ {
#if XUD_TILE != 0 #if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0)
[[combine]] [[combine]]
par par
{ {

2
module_usb_audio/audio_io/xua_audio.h
View File

@@ -37,7 +37,7 @@ void audio(chanend c_in,
chanend c_dig, chanend c_dig,
#endif #endif
chanend ?c_config, chanend ?c_adc chanend ?c_config, chanend ?c_adc
#if (XUD_TILE != 0) #if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0)
, server interface i_dfu ?dfuInterface , server interface i_dfu ?dfuInterface
#endif #endif
#if (NUM_PDM_MICS > 0) #if (NUM_PDM_MICS > 0)

13
module_usb_audio/main.xc
View File

@@ -415,7 +415,7 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc,
chanend ?c_adat_rx, chanend ?c_adat_rx,
chanend ?c_clk_ctl, chanend ?c_clk_ctl,
chanend ?c_clk_int chanend ?c_clk_int
#if (XUD_TILE != 0) #if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0)
, server interface i_dfu ?dfuInterface , server interface i_dfu ?dfuInterface
#endif #endif
#if (NUM_PDM_MICS > 0) #if (NUM_PDM_MICS > 0)
@@ -459,7 +459,7 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc,
c_dig_rx, c_dig_rx,
#endif #endif
c_aud_cfg, c_adc c_aud_cfg, c_adc
#if XUD_TILE != 0 #if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0)
, dfuInterface , dfuInterface
#endif #endif
#if (NUM_PDM_MICS > 0) #if (NUM_PDM_MICS > 0)
@@ -606,7 +606,7 @@ int main()
, c_mix_ctl , c_mix_ctl
#endif #endif
,c_aud_cfg, c_spdif_rx, c_adat_rx, c_clk_ctl, c_clk_int ,c_aud_cfg, c_spdif_rx, c_adat_rx, c_clk_ctl, c_clk_int
#if XUD_TILE != 0 #if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0)
, dfuInterface , dfuInterface
#endif #endif
#if (NUM_PDM_MICS > 0) #if (NUM_PDM_MICS > 0)
@@ -674,6 +674,13 @@ int main()
} }
#endif #endif
#if (XUD_TILE != 0 ) && (AUDIO_IO_TILE != 0)
/* Run flash code on its own - hope it gets combined */
#warning Running DFU flash code on its own
on stdcore[0]: DFUHandler(dfuInterface, null);
#endif
#if (NUM_PDM_MICS > 0) #if (NUM_PDM_MICS > 0)
on stdcore[PDM_TILE]: pdm_mic(c_ds_output); on stdcore[PDM_TILE]: pdm_mic(c_ds_output);
#ifdef MIC_PROCESSING_USE_INTERFACE #ifdef MIC_PROCESSING_USE_INTERFACE