Add architecture guards to all architecture-specific files, so that they can be bulk...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Device / AudioClassDevice.c

diff --git a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
index 0e423bf..15fcd58 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
+++ b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -44,21 +44,22 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
 
        if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_INTERFACE)
        {
 
        if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_INTERFACE)
        {

-               if ((USB_ControlRequest.wIndex & 0xFF) != AudioInterfaceInfo->Config.StreamingInterfaceNumber)
+               uint8_t InterfaceIndex = (USB_ControlRequest.wIndex & 0xFF);
+       
+               if ((InterfaceIndex != AudioInterfaceInfo->Config.ControlInterfaceNumber) &&
+                   (InterfaceIndex != AudioInterfaceInfo->Config.StreamingInterfaceNumber))
+               

                  return;
        }
        else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT)
        {
                  return;
        }
        else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT)
        {

-               bool EndpointFilterMatch = false;
-
-               EndpointFilterMatch |= (AudioInterfaceInfo->Config.DataINEndpointNumber &&
-                                       ((uint8_t)USB_ControlRequest.wIndex == (ENDPOINT_DIR_IN  | AudioInterfaceInfo->Config.DataINEndpointNumber)));
-
-               EndpointFilterMatch |= (AudioInterfaceInfo->Config.DataOUTEndpointNumber &&
-                                       ((uint8_t)USB_ControlRequest.wIndex == (ENDPOINT_DIR_OUT | AudioInterfaceInfo->Config.DataOUTEndpointNumber)));
-
-               if (!(EndpointFilterMatch))
-                 return;
+               uint8_t EndpointIndex = (USB_ControlRequest.wIndex & 0xFF);
+       
+               if ((EndpointIndex != (ENDPOINT_DIR_IN  | AudioInterfaceInfo->Config.DataINEndpointNumber)) &&
+                   (EndpointIndex != (ENDPOINT_DIR_OUT | AudioInterfaceInfo->Config.DataOUTEndpointNumber)))
+               {
+                       return;
+               }

        }
 
        switch (USB_ControlRequest.bRequest)
        }
 
        switch (USB_ControlRequest.bRequest)


@@ -124,7 +125,7 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
                                        Endpoint_ClearIN();
 
                                        CALLBACK_Audio_Device_GetSetInterfaceProperty(AudioInterfaceInfo, Property, Entity,
                                        Endpoint_ClearIN();
 
                                        CALLBACK_Audio_Device_GetSetInterfaceProperty(AudioInterfaceInfo, Property, Entity,

-                                                                                 Parameter, NULL, NULL);
+                                                                                 Parameter, &ValueLength, Value);

                                }
                        }
 
                                }
                        }
 


@@ -210,6 +211,7 @@ bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioIn
        return true;
 }
 
        return true;
 }
 

+// cppcheck-suppress unusedFunction

 void Audio_Device_Event_Stub(void)
 {
 
 void Audio_Device_Event_Stub(void)
 {