From c152871efe5f3ce97f2d0e60cf763a3f2c56bcc8 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Fri, 7 Mar 2014 12:06:45 +0000 Subject: [PATCH] Fixed audio class 1 SetCur(Sampling Freq) request. Broken in XUD API change. --- module_usb_audio/endpoint0/audiorequests.xc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/module_usb_audio/endpoint0/audiorequests.xc b/module_usb_audio/endpoint0/audiorequests.xc index 65e15db9..76cfa5d0 100644 --- a/module_usb_audio/endpoint0/audiorequests.xc +++ b/module_usb_audio/endpoint0/audiorequests.xc @@ -998,7 +998,7 @@ int AudioEndpointRequests_1(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp * endpoint (wIndex & 0xff) is 0x01 or 0x82 */ - int retVal = 1; + XUD_Result_t result; unsigned char buffer[1024]; unsigned length; @@ -1013,18 +1013,16 @@ int AudioEndpointRequests_1(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp /* Check Control Selector */ unsigned short controlSelector = sp.wValue>>8; - retVal = XUD_GetBuffer(ep0_out, buffer, length); - - /* Inspect for reset */ - if(retVal < 0) - return retVal; + if((result != XUD_GetBuffer(ep0_out, buffer, length)) != XUD_RES_OKAY) + { + return result; + } if(controlSelector == SAMPLING_FREQ_CONTROL) { /* Expect length 3 for sample rate */ - if((sp.wLength == 3)&&(retVal == 3)) + if((sp.wLength == 3) && (length == 3)) { - /* Recontruct sample-freq */ int i_tmp = buffer[0] | (buffer [1] << 8) | (buffer[2] << 16);