Minor documentation corrections.

[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..0e423bf 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
+++ b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
@@ -44,22 +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 != AudioInterfaceInfo->Config.StreamingInterfaceNumber)
+               if ((USB_ControlRequest.wIndex & 0xFF) != AudioInterfaceInfo->Config.StreamingInterfaceNumber)

                  return;
        }
        else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT)
        {
                bool EndpointFilterMatch = false;
                  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.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;
                EndpointFilterMatch |= (AudioInterfaceInfo->Config.DataOUTEndpointNumber &&
                                        ((uint8_t)USB_ControlRequest.wIndex == (ENDPOINT_DIR_OUT | AudioInterfaceInfo->Config.DataOUTEndpointNumber)));
 
                if (!(EndpointFilterMatch))
                  return;

-       }       
+       }

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


@@ -92,20 +92,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, NULL, NULL);
+                               }

                        }
 
                        break;
                        }
 
                        break;


@@ -126,7 +146,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();

                                }
                        }
 
                                }
                        }
 


@@ -180,3 +216,4 @@ void Audio_Device_Event_Stub(void)
 }
 
 #endif
 }
 
 #endif

+