Vergil_Wong/lib_xua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XUD_Result_t usage in audiorequests (fixing audio class 1.0 build issues)

Browse Source
This commit is contained in:
Ross Owen
2014-02-18 16:51:37 +00:00
parent 51bfdc113a
commit 6afd42be8e
1 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
module_usb_audio/endpoint0/audiorequests.xc
View File

@@ -1093,7 +1093,7 @@ int AudioClassRequests_1(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
{ {
unsigned char buffer[1024]; unsigned char buffer[1024];
int unitID; int unitID;
int loop = 1; XUD_Result_t result;
/* Inspect request */ /* Inspect request */
/* Note we could check sp.bmRequestType.Direction if we wanted to be really careful */ /* Note we could check sp.bmRequestType.Direction if we wanted to be really careful */
@@ -1101,43 +1101,47 @@ int AudioClassRequests_1(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
{ {
case UAC_B_REQ_SET_CUR: case UAC_B_REQ_SET_CUR:
{ {
loop = XUD_GetBuffer(ep0_out, buffer); unsigned datalength;
/* Inspect for reset */ if((result = XUD_GetBuffer(ep0_out, buffer, datalength)) != XUD_RES_OKAY)
if(loop < 0)
return loop;
unitID = sp.wIndex >> 8;
if (unitID == FU_USBOUT)
{ {
switch ((sp.wValue>>8) & 0xff) return result;
}
if(datalength == 2)
{
unitID = sp.wIndex >> 8;
if (unitID == FU_USBOUT)
{ {
case FU_VOLUME_CONTROL: switch ((sp.wValue>>8) & 0xff)
volsOut[ sp.wValue & 0xff ] = buffer[0] | (((int) (signed char) buffer[1]) << 8); {
updateVol( unitID, ( sp.wValue & 0xff ), c_mix_ctl ); case FU_VOLUME_CONTROL:
return XUD_DoSetRequestStatus(ep0_in); volsOut[ sp.wValue & 0xff ] = buffer[0] | (((int) (signed char) buffer[1]) << 8);
case FU_MUTE_CONTROL: updateVol( unitID, ( sp.wValue & 0xff ), c_mix_ctl );
mutesOut[ sp.wValue & 0xff ] = buffer[0]; return XUD_DoSetRequestStatus(ep0_in);
updateVol( unitID, ( sp.wValue & 0xff ), c_mix_ctl ); case FU_MUTE_CONTROL:
return XUD_DoSetRequestStatus(ep0_in); mutesOut[ sp.wValue & 0xff ] = buffer[0];
updateVol( unitID, ( sp.wValue & 0xff ), c_mix_ctl );
return XUD_DoSetRequestStatus(ep0_in);
}
}
else if (unitID == FU_USBIN)
{
switch ((sp.wValue>>8) & 0xff)
{
case FU_VOLUME_CONTROL:
volsIn[ sp.wValue & 0xff ] = buffer[0] | (((int) (signed char) buffer[1]) << 8);
updateVol( unitID, ( sp.wValue & 0xff ), c_mix_ctl );
return XUD_DoSetRequestStatus(ep0_in);
case FU_MUTE_CONTROL:
mutesIn[ sp.wValue & 0xff ] = buffer[0];
updateVol( unitID, ( sp.wValue & 0xff ), c_mix_ctl );
return XUD_DoSetRequestStatus(ep0_in);
}
} }
} }
else if (unitID == FU_USBIN) break;
{
switch ((sp.wValue>>8) & 0xff)
{
case FU_VOLUME_CONTROL:
volsIn[ sp.wValue & 0xff ] = buffer[0] | (((int) (signed char) buffer[1]) << 8);
updateVol( unitID, ( sp.wValue & 0xff ), c_mix_ctl );
return XUD_DoSetRequestStatus(ep0_in);
case FU_MUTE_CONTROL:
mutesIn[ sp.wValue & 0xff ] = buffer[0];
updateVol( unitID, ( sp.wValue & 0xff ), c_mix_ctl );
return XUD_DoSetRequestStatus(ep0_in);
}
}
break;
} }
case UAC_B_REQ_GET_CUR: case UAC_B_REQ_GET_CUR:
{ {