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

Fixed mixer build and run-time issues

Browse Source
This commit is contained in:
Ross Owen
2014-07-15 12:05:29 +01:00
parent 735f3b18f2
commit 5f9c699be4
3 changed files with 82 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
module_usb_audio/endpoint0/audiorequests.xc
View File

@@ -36,12 +36,8 @@ extern unsigned char mixer1Crossbar[];
extern short mixer1Weights[]; extern short mixer1Weights[];
/* Device channel mapping */ /* Device channel mapping */
#if NUM_USB_CHAN_OUT > 0
extern unsigned char channelMapAud[NUM_USB_CHAN_OUT]; extern unsigned char channelMapAud[NUM_USB_CHAN_OUT];
#endif
#if NUM_USB_CHAN_IN > 0
extern unsigned char channelMapUsb[NUM_USB_CHAN_IN]; extern unsigned char channelMapUsb[NUM_USB_CHAN_IN];
#endif
/* Mixer input mapping */ /* Mixer input mapping */
extern unsigned char mixSel[MIX_INPUTS]; extern unsigned char mixSel[MIX_INPUTS];
@@ -605,10 +601,11 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
unsigned volume = 0; unsigned volume = 0;
int c = sp.wValue & 0xff; int c = sp.wValue & 0xff;
loop = XUD_GetBuffer(ep0_out, buffer);
if(loop < 0) if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
return loop; {
return result;
}
channelMapAud[c] = buffer[0] | buffer[1] << 8; channelMapAud[c] = buffer[0] | buffer[1] << 8;
@@ -643,10 +640,10 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
unsigned volume = 0; unsigned volume = 0;
int c = sp.wValue & 0xff; int c = sp.wValue & 0xff;
loop = XUD_GetBuffer(ep0_out, buffer); if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
{
if(loop < 0) return result;
return loop; }
channelMapUsb[c] = buffer[0] | buffer[1] << 8; channelMapUsb[c] = buffer[0] | buffer[1] << 8;
@@ -677,14 +674,13 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
int cn = sp.wValue & 0xff; /* Channel number */ int cn = sp.wValue & 0xff; /* Channel number */
/* Check for Get or Set */ /* Check for Get or Set */
if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_OUT) if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D)
{ {
/* Direction: Host-to-device */ /* Host-to-device */ /* Direction: Host-to-device */ /* Host-to-device */
datalength = XUD_GetBuffer(ep0_out, buffer); if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
{
/* Check for reset */ return result;
if(datalength < 0) }
return datalength;
if(datalength > 0) if(datalength > 0)
{ {
@@ -734,14 +730,15 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
case ID_MIXER_1: case ID_MIXER_1:
if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_OUT) /* Direction: Host-to-device */ if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D) /* Direction: Host-to-device */
{ {
unsigned volume = 0; unsigned volume = 0;
/* Expect OUT here with mute */ /* Expect OUT here with mute */
loop = XUD_GetBuffer(ep0_out, buffer); if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
if(loop < 0) {
return loop; return result;
}
mixer1Weights[sp.wValue & 0xff] = buffer[0] | buffer[1] << 8; mixer1Weights[sp.wValue & 0xff] = buffer[0] | buffer[1] << 8;
@@ -906,7 +903,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
{ {
case ID_MIXER_1: case ID_MIXER_1:
if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_IN) if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_D2H)
{ {
int length = 0; int length = 0;

4
module_usb_audio/endpoint0/endpoint0.c
View File

@@ -76,12 +76,8 @@ unsigned char mixer1Crossbar[18];
short mixer1Weights[18*8]; short mixer1Weights[18*8];
unsigned char channelMap[NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT]; unsigned char channelMap[NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT];
#if (NUM_USB_CHAN_OUT > 0)
unsigned char channelMapAud[NUM_USB_CHAN_OUT]; unsigned char channelMapAud[NUM_USB_CHAN_OUT];
#endif
#if (NUM_USB_CHAN_IN > 0)
unsigned char channelMapUsb[NUM_USB_CHAN_IN]; unsigned char channelMapUsb[NUM_USB_CHAN_IN];
#endif
unsigned char mixSel[MIX_INPUTS]; unsigned char mixSel[MIX_INPUTS];
#endif #endif

103
module_usb_audio/mixer/mixer.xc
View File

@@ -117,7 +117,7 @@ int doMix8(xc_ptr samples, xc_ptr mult);
/* DO NOT inline, causes 10.4.2 tools to add extra loads in loop */ /* DO NOT inline, causes 10.4.2 tools to add extra loads in loop */
/* At 18 x 12dB we could get 64 x bigger */ /* At 18 x 12dB we could get 64 x bigger */
#pragma unsafe arrays #pragma unsafe arrays
static int doMix(xc_ptr samples, xc_ptr ptr, xc_ptr mult) static inline int doMix(xc_ptr samples, xc_ptr ptr, xc_ptr mult)
{ {
int h=0; int h=0;
int l=0; int l=0;
@@ -153,7 +153,7 @@ static int doMix(xc_ptr samples, xc_ptr ptr, xc_ptr mult)
#endif #endif
#pragma unsafe arrays #pragma unsafe arrays
static void giveSamplesToHost(chanend c, xc_ptr samples, xc_ptr ptr, xc_ptr multIn) static inline void giveSamplesToHost(chanend c, xc_ptr samples, xc_ptr ptr, xc_ptr multIn)
{ {
#if defined(IN_VOLUME_IN_MIXER) && defined(IN_VOLUME_AFTER_MIX) #if defined(IN_VOLUME_IN_MIXER) && defined(IN_VOLUME_AFTER_MIX)
int mult; int mult;
@@ -186,7 +186,7 @@ static void giveSamplesToHost(chanend c, xc_ptr samples, xc_ptr ptr, xc_ptr mult
} }
#pragma unsafe arrays #pragma unsafe arrays
static void getSamplesFromHost(chanend c, xc_ptr samples, int base, unsigned underflow) static inline void getSamplesFromHost(chanend c, xc_ptr samples, int base, unsigned underflow)
{ {
if(!underflow) if(!underflow)
{ {
@@ -227,7 +227,7 @@ static void getSamplesFromHost(chanend c, xc_ptr samples, int base, unsigned und
} }
#pragma unsafe arrays #pragma unsafe arrays
static void giveSamplesToDevice(chanend c, xc_ptr samples, xc_ptr ptr, xc_ptr multOut, unsigned underflow) static inline void giveSamplesToDevice(chanend c, xc_ptr samples, xc_ptr ptr, xc_ptr multOut, unsigned underflow)
{ {
outuint(c, underflow); outuint(c, underflow);
@@ -265,7 +265,7 @@ static void giveSamplesToDevice(chanend c, xc_ptr samples, xc_ptr ptr, xc_ptr mu
} }
#pragma unsafe arrays #pragma unsafe arrays
static void getSamplesFromDevice(chanend c, xc_ptr samples, int base) static inline void getSamplesFromDevice(chanend c, xc_ptr samples, int base)
{ {
#if defined(IN_VOLUME_IN_MIXER) && !defined(IN_VOLUME_AFTER_MIX) #if defined(IN_VOLUME_IN_MIXER) && !defined(IN_VOLUME_AFTER_MIX)
int mult; int mult;
@@ -475,12 +475,12 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
{ {
unsigned underflow = inuint(c_host); unsigned underflow = inuint(c_host);
#if MAX_MIX_COUNT > 0 #if MAX_MIX_COUNT > 0
outuint(c_mixer2, 0); outuint(c_mixer2, underflow);
giveSamplesToHost(c_host, samples, samples_to_host_map, multIn); giveSamplesToHost(c_host, samples, samples_to_host_map, multIn);
outuint(c_mixer2, 0); outuint(c_mixer2, 0);
inuint(c_mixer2); inuint(c_mixer2);
getSamplesFromHost(c_host, samples, 0); getSamplesFromHost(c_host, samples, 0, underflow);
outuint(c_mixer2, 0); outuint(c_mixer2, 0);
inuint(c_mixer2); inuint(c_mixer2);
#ifdef FAST_MIXER #ifdef FAST_MIXER
@@ -555,44 +555,65 @@ static int mixer2_mix2_flag = (DEFAULT_FREQ > 96000);
#pragma unsafe arrays #pragma unsafe arrays
static void mixer2(chanend c_mixer1, chanend c_audio) static void mixer2(chanend c_mixer1, chanend c_audio)
{ {
int mixed; int mixed;
unsigned underflow = 0;
while (1) { while (1)
outuint(c_mixer1, 0);
#pragma xta endpoint "mixer2_req"
inuint(c_audio);
if(testct(c_mixer1))
{ {
int sampFreq; outuint(c_mixer1, 0);
#pragma xta endpoint "mixer2_rate_change" #pragma xta endpoint "mixer2_req"
inct(c_mixer1); inuint(c_audio);
sampFreq = inuint(c_mixer1); if(testct(c_mixer1))
mixer2_mix2_flag = sampFreq > 96000;
for (int i=0;i<MAX_MIX_COUNT;i++)
{ {
write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + i), 0); int sampFreq;
#pragma xta endpoint "mixer2_rate_change"
unsigned command = inct(c_mixer1);
switch(command)
{
case SET_SAMPLE_FREQ:
sampFreq = inuint(c_mixer1);
mixer2_mix2_flag = sampFreq > 96000;
/* Inform mixer2 (or audio()) about freq change */
outct(c_audio, command);
outuint(c_audio, sampFreq);
break;
case SET_STREAM_FORMAT_OUT:
case SET_STREAM_FORMAT_IN:
/* Inform mixer2 (or audio()) about format change */
outct(c_audio, command);
outuint(c_audio, inuint(c_mixer1));
outuint(c_audio, inuint(c_mixer1));
break;
default:
break;
}
for (int i=0;i<MAX_MIX_COUNT;i++)
{
write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + i), 0);
}
/* Inform audio thread about freq change */
//outct(c_audio, XS1_CT_END);
//outuint(c_audio, sampFreq);
/* Wait for handshake and pass on */
chkct(c_audio, XS1_CT_END);
outct(c_mixer1, XS1_CT_END);
} }
else
/* Inform audio thread about freq change */ {
outct(c_audio, XS1_CT_END); underflow = inuint(c_mixer1);
outuint(c_audio, sampFreq); giveSamplesToDevice(c_audio, samples, samples_to_device_map, multOut, underflow);
inuint(c_mixer1);
/* Wait for handshake and pass on */ outuint(c_mixer1, 0);
chkct(c_audio, XS1_CT_END); getSamplesFromDevice(c_audio, samples, NUM_USB_CHAN_OUT);
outct(c_mixer1, XS1_CT_END); inuint(c_mixer1);
} outuint(c_mixer1, 0);
else {
(void) inuint(c_mixer1);
giveSamplesToDevice(c_audio, samples, samples_to_device_map, multOut);
inuint(c_mixer1);
outuint(c_mixer1, 0);
getSamplesFromDevice(c_audio, samples, NUM_USB_CHAN_OUT);
inuint(c_mixer1);
outuint(c_mixer1, 0);
#if MAX_MIX_COUNT > 1 #if MAX_MIX_COUNT > 1
#ifdef FAST_MIXER #ifdef FAST_MIXER
mixed = doMix1(samples, mix_mult_slice(1)); mixed = doMix1(samples, mix_mult_slice(1));