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

43
module_usb_audio/endpoint0/audiorequests.xc
View File

@@ -36,12 +36,8 @@ extern unsigned char mixer1Crossbar[];
extern short mixer1Weights[];
/* Device channel mapping */
#if NUM_USB_CHAN_OUT > 0
extern unsigned char channelMapAud[NUM_USB_CHAN_OUT];
#endif
#if NUM_USB_CHAN_IN > 0
extern unsigned char channelMapUsb[NUM_USB_CHAN_IN];
#endif
/* Mixer input mapping */
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;
int c = sp.wValue & 0xff;
loop = XUD_GetBuffer(ep0_out, buffer);
if(loop < 0)
return loop;
if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
{
return result;
}
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;
int c = sp.wValue & 0xff;
loop = XUD_GetBuffer(ep0_out, buffer);
if(loop < 0)
return loop;
if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
{
return result;
}
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 */
/* 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 */
datalength = XUD_GetBuffer(ep0_out, buffer);
/* Check for reset */
if(datalength < 0)
return datalength;
if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
{
return result;
}
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:
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;
/* Expect OUT here with mute */
loop = XUD_GetBuffer(ep0_out, buffer);
if(loop < 0)
return loop;
/* Expect OUT here with mute */
if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
{
return result;
}
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:
if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_IN)
if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_D2H)
{
int length = 0;

4
module_usb_audio/endpoint0/endpoint0.c
View File

@@ -76,12 +76,8 @@ unsigned char mixer1Crossbar[18];
short mixer1Weights[18*8];
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];
#endif
#if (NUM_USB_CHAN_IN > 0)
unsigned char channelMapUsb[NUM_USB_CHAN_IN];
#endif
unsigned char mixSel[MIX_INPUTS];
#endif