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 d8c5d29..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,22 +44,23 @@ 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 != 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)));
+               uint8_t EndpointIndex = (USB_ControlRequest.wIndex & 0xFF);

        
        

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

 
        switch (USB_ControlRequest.bRequest)
        {
 
        switch (USB_ControlRequest.bRequest)
        {


@@ -92,20 +93,40 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
                                uint8_t EndpointProperty = USB_ControlRequest.bRequest;
                                uint8_t EndpointAddress  = (uint8_t)USB_ControlRequest.wIndex;
                                uint8_t EndpointControl  = (USB_ControlRequest.wValue >> 8);
                                uint8_t EndpointProperty = USB_ControlRequest.bRequest;
                                uint8_t EndpointAddress  = (uint8_t)USB_ControlRequest.wIndex;
                                uint8_t EndpointControl  = (USB_ControlRequest.wValue >> 8);

-                       
+

                                if (CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress,
                                                                                 EndpointControl, NULL, NULL))
                                {
                                        uint16_t ValueLength = USB_ControlRequest.wLength;
                                        uint8_t  Value[ValueLength];
                                if (CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress,
                                                                                 EndpointControl, NULL, NULL))
                                {
                                        uint16_t ValueLength = USB_ControlRequest.wLength;
                                        uint8_t  Value[ValueLength];

-                                       
+

                                        Endpoint_ClearSETUP();
                                        Endpoint_Read_Control_Stream_LE(Value, ValueLength);
                                        Endpoint_ClearSETUP();
                                        Endpoint_Read_Control_Stream_LE(Value, ValueLength);

-                                       Endpoint_ClearIN();                                     
+                                       Endpoint_ClearIN();

 
                                        CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress,
                                                                                     EndpointControl, &ValueLength, Value);
 
                                        CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress,
                                                                                     EndpointControl, &ValueLength, Value);

-                               }                               
+                               }
+                       }
+                       else if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
+                       {
+                               uint8_t  Property  = USB_ControlRequest.bRequest;
+                               uint8_t  Entity    = (USB_ControlRequest.wIndex >> 8);
+                               uint16_t Parameter = USB_ControlRequest.wValue;
+
+                               if (CALLBACK_Audio_Device_GetSetInterfaceProperty(AudioInterfaceInfo, Property, Entity,
+                                                                                 Parameter, NULL, NULL))
+                               {
+                                       uint16_t ValueLength = USB_ControlRequest.wLength;
+                                       uint8_t  Value[ValueLength];
+
+                                       Endpoint_ClearSETUP();
+                                       Endpoint_Read_Control_Stream_LE(Value, ValueLength);
+                                       Endpoint_ClearIN();
+
+                                       CALLBACK_Audio_Device_GetSetInterfaceProperty(AudioInterfaceInfo, Property, Entity,
+                                                                                 Parameter, &ValueLength, Value);
+                               }

                        }
 
                        break;
                        }
 
                        break;


@@ -126,7 +147,23 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
                                {
                                        Endpoint_ClearSETUP();
                                        Endpoint_Write_Control_Stream_LE(Value, ValueLength);
                                {
                                        Endpoint_ClearSETUP();
                                        Endpoint_Write_Control_Stream_LE(Value, ValueLength);

-                                       Endpoint_ClearOUT();                                    
+                                       Endpoint_ClearOUT();
+                               }
+                       }
+                       else if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
+                       {
+                               uint8_t  Property    = USB_ControlRequest.bRequest;
+                               uint8_t  Entity      = (USB_ControlRequest.wIndex >> 8);
+                               uint16_t Parameter   = USB_ControlRequest.wValue;
+                               uint16_t ValueLength = USB_ControlRequest.wLength;
+                               uint8_t  Value[ValueLength];
+
+                               if (CALLBACK_Audio_Device_GetSetInterfaceProperty(AudioInterfaceInfo, Property, Entity,
+                                                                                 Parameter, &ValueLength, Value))
+                               {
+                                       Endpoint_ClearSETUP();
+                                       Endpoint_Write_Control_Stream_LE(Value, ValueLength);
+                                       Endpoint_ClearOUT();

                                }
                        }
 
                                }
                        }
 


@@ -174,9 +211,11 @@ bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioIn
        return true;
 }
 
        return true;
 }
 

+// cppcheck-suppress unusedFunction

 void Audio_Device_Event_Stub(void)
 {
 
 }
 
 #endif
 void Audio_Device_Event_Stub(void)
 {
 
 }
 
 #endif

+