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

- Removed dead XTA pragmas and code from mixer

Browse Source 
- Added some more asserts to mixer
This commit is contained in:
Ross Owen
2023-02-03 10:59:20 +00:00
parent ce8e5a6dbb
commit 3d50c96595
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib_xua/src/core/mixer/mixer.xc
View File

@@ -37,6 +37,8 @@ static unsigned abs(int x)
} }
#endif #endif
static const int SOURCE_COUNT = NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT + 1;
static int samples_array[NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT + 1]; /* One larger for an "off" channel for mixer sources" */ static int samples_array[NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT + 1]; /* One larger for an "off" channel for mixer sources" */
unsafe unsafe
@@ -253,7 +255,6 @@ static inline void GiveSamplesToDevice(chanend c, xc_ptr ptr, xc_ptr multOut)
read_via_xc_ptr_indexed(index, ptr, i); read_via_xc_ptr_indexed(index, ptr, i);
/* Read the actual sample value */ /* Read the actual sample value */
//read_via_xc_ptr_indexed(sample, samples, index);
unsafe unsafe
{ {
/* Read the actual sample value */ /* Read the actual sample value */
@@ -347,7 +348,6 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
while (1) while (1)
{ {
#pragma xta endpoint "mixer1_req"
/* Request from audio()/mixer2() */ /* Request from audio()/mixer2() */
request = inuint(c_mixer2); request = inuint(c_mixer2);
@@ -383,7 +383,6 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
break; break;
case SET_MIX_MULT: case SET_MIX_MULT:
mix = inuint(c_mix_ctl); mix = inuint(c_mix_ctl);
index = inuint(c_mix_ctl); index = inuint(c_mix_ctl);
val = inuint(c_mix_ctl); val = inuint(c_mix_ctl);
@@ -394,22 +393,34 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
write_word_to_mix_mult(mix, index, val); write_word_to_mix_mult(mix, index, val);
} }
assert((index < MIX_INPUTS) && (mix < MAX_MIX_COUNT) && msg("Mix mult index out of range")); assert((mix < MAX_MIX_COUNT) && msg("Mix mult mix out of range"));
assert((index < MIX_INPUTS) && msg("Mix mult index out of range"));
break; break;
case SET_MIX_MAP: case SET_MIX_MAP:
mix = inuint(c_mix_ctl); {
index = inuint(c_mix_ctl); /* mixer input */ unsigned mix = inuint(c_mix_ctl);
val = inuint(c_mix_ctl); /* source */ unsigned input = inuint(c_mix_ctl); /* mixer input */
inct(c_mix_ctl); unsigned source = inuint(c_mix_ctl); /* source */
inct(c_mix_ctl);
assert((mix < MAX_MIX_COUNT) && msg("Mix map mix out of range"));
assert((input < MIX_INPUTS) && msg("Mix map index out of range"));
assert((source < SOURCE_COUNT) && msg("Mix map source out of range"));
if((input << MIX_INPUTS) && (mix < MAX_MIX_COUNT) && (source < SOURCE_COUNT))
{
#ifdef FAST_MIXER #ifdef FAST_MIXER
setPtr(index, val, mix); setPtr(index, val, mix);
#else #else
write_word_to_mix_map(mix, index, val); write_word_to_mix_map(mix, input, source);
#endif #endif
}
}
break; break;
#endif /* if MAX_MIX_COUNT > 0 */ #endif /* if MAX_MIX_COUNT > 0 */
#ifdef IN_VOLUME_IN_MIXER #ifdef IN_VOLUME_IN_MIXER
case SET_MIX_IN_VOL: case SET_MIX_IN_VOL:
index = inuint(c_mix_ctl); index = inuint(c_mix_ctl);
@@ -487,7 +498,6 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
if(testct(c_host)) if(testct(c_host))
{ {
int sampFreq; int sampFreq;
#pragma xta endpoint "mixer1_rate_change"
unsigned command = inct(c_host); unsigned command = inct(c_host);
switch(command) switch(command)
@@ -624,7 +634,6 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
while (1) while (1)
{ {
#pragma xta endpoint "mixer2_req"
request = inuint(c_audio); request = inuint(c_audio);
/* Forward the request on */ /* Forward the request on */
@@ -636,7 +645,6 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
if(testct(c_mixer1)) if(testct(c_mixer1))
{ {
int sampFreq; int sampFreq;
#pragma xta endpoint "mixer2_rate_change"
unsigned command = inct(c_mixer1); unsigned command = inct(c_mixer1);
switch(command) switch(command)