Add tag for the 120219 release.

[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 3ac47d5..1e91a61 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,18 @@ 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)
+               if ((USB_ControlRequest.wIndex & 0xFF) != 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)


@@ -107,6 +104,26 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
                                                                                     EndpointControl, &ValueLength, Value);
                                }
                        }
                                                                                     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, NULL, NULL);
+                               }
+                       }

 
                        break;
                case AUDIO_REQ_GetCurrent:
 
                        break;
                case AUDIO_REQ_GetCurrent:


@@ -129,6 +146,22 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
                                        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();
+                               }
+                       }

 
                        break;
        }
 
                        break;
        }