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

xc_ptr fixes to mixer, tidying up

Browse Source
This commit is contained in:
Dave Lacey
2012-05-03 14:14:25 +01:00
parent b93aedf75f
commit 2f1bbb4a98
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module_usb_aud_shared/clocking/clockgen.xc
View File

@@ -8,10 +8,7 @@
#include "SpdifReceive.h" #include "SpdifReceive.h"
#ifdef SPDIF_RX
#pragma xta command "analyse path digital_out digital_out"
#pragma xta command "set required - 5200 ns" /* 192kHz */
#endif
#define LOCAL_CLOCK_INCREMENT 166667 #define LOCAL_CLOCK_INCREMENT 166667
#define LOCAL_CLOCK_MARGIN 1666 #define LOCAL_CLOCK_MARGIN 1666
@@ -697,7 +694,7 @@ void clockGen (streaming chanend c_spdif_rx, chanend c_adat_rx, out port p, chan
spdifRd += 2; spdifRd += 2;
spdifRd &= (MAX_SPDIF_SAMPLES - 1); spdifRd &= (MAX_SPDIF_SAMPLES - 1);
#pragma xta endpoint "digital_out"
g_digData[0] = tmp; g_digData[0] = tmp;
g_digData[1] = tmp2; g_digData[1] = tmp2;

17
module_usb_aud_shared/mixer/mixer.xc
View File

@@ -48,13 +48,13 @@ xc_ptr samples_to_device_map;
#if MAX_MIX_COUNT > 0 #if MAX_MIX_COUNT > 0
int mix_mult_array[MAX_MIX_COUNT][MIX_INPUTS]; int mix_mult_array[MAX_MIX_COUNT][MIX_INPUTS];
xc_ptr mix_mult; xc_ptr mix_mult;
#define write_word_to_mix_mult(x,y,val) write_via_xc_ptr_indexed(mix_mult,((x)*MAX_MIX_COUNT)+(y), val) #define write_word_to_mix_mult(x,y,val) write_via_xc_ptr_indexed(mix_mult,((x)*MIX_INPUTS)+(y), val)
#define mix_mult_slice(x) (mix_mult + x * MAX_MIX_COUNT * sizeof(int)) #define mix_mult_slice(x) (mix_mult + x * MIX_INPUTS * sizeof(int))
#ifndef FAST_MIXER #ifndef FAST_MIXER
int mix_map_array[MAX_MIX_COUNT][MIX_INPUTS]; int mix_map_array[MAX_MIX_COUNT][MIX_INPUTS];
xc_ptr mix_map; xc_ptr mix_map;
#define write_word_to_mix_map(x,y,val) write_via_xc_ptr_indexed(mix_map,((x)*MAX_MIX_COUNT)+(y), val) #define write_word_to_mix_map(x,y,val) write_via_xc_ptr_indexed(mix_map,((x)*MIX_INPUTS)+(y), val)
#define mix_map_slice(x) (mix_map + x * MAX_MIX_COUNT * sizeof(int)) #define mix_map_slice(x) (mix_map + x * MIX_INPUTS * sizeof(int))
#endif #endif
#endif #endif
@@ -636,9 +636,9 @@ void mixer(chanend c_mix_in, chanend c_mix_out, chanend c_mix_ctl)
array_to_xc_ptr((samples_to_device_map_array,unsigned[])); array_to_xc_ptr((samples_to_device_map_array,unsigned[]));
#if MAX_MIX_COUNT >0 #if MAX_MIX_COUNT >0
mix_mult = array_to_xc_ptr((mix_mult,unsigned[])); mix_mult = array_to_xc_ptr((mix_mult_array,unsigned[]));
#ifndef FAST_MIXER #ifndef FAST_MIXER
mix_map = array_to_xc_ptr((mix_map,unsigned[])); mix_map = array_to_xc_ptr((mix_map_array,unsigned[]));
#endif #endif
#endif #endif
@@ -683,12 +683,13 @@ void mixer(chanend c_mix_in, chanend c_mix_out, chanend c_mix_ctl)
for (int j=0;j<MIX_INPUTS;j++) for (int j=0;j<MIX_INPUTS;j++)
{ {
#ifndef FAST_MIXER #ifndef FAST_MIXER
write_word_to_mix_map(i,j, j < 16 ? j : j + 2); write_word_to_mix_map(i,j, j < 16 ? j : j + 2);
#endif #endif
write_word_to_mix_mult(i,j, i==j ? MAX_VOL >> 3 : 0); write_word_to_mix_mult(i,j, i==j ? MAX_VOL >> 3 : 0);
} }
#endif #endif
par par
{ {
#if (MAX_MIX_COUNT > 0) #if (MAX_MIX_COUNT > 0)