Fix USB_STRING_DESCRIPTOR_ARRAY() not accepting more than two byte long arrays.

[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 49a71b0..e33ca07 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, 2013.
+     Copyright (C) Dean Camera, 2018.

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

-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2018  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


@@ -45,7 +45,7 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
        if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_INTERFACE)
        {
                uint8_t InterfaceIndex = (USB_ControlRequest.wIndex & 0xFF);
        if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_INTERFACE)
        {
                uint8_t InterfaceIndex = (USB_ControlRequest.wIndex & 0xFF);

-       
+

                if ((InterfaceIndex != AudioInterfaceInfo->Config.ControlInterfaceNumber) &&
                    (InterfaceIndex != AudioInterfaceInfo->Config.StreamingInterfaceNumber))
                {
                if ((InterfaceIndex != AudioInterfaceInfo->Config.ControlInterfaceNumber) &&
                    (InterfaceIndex != AudioInterfaceInfo->Config.StreamingInterfaceNumber))
                {


@@ -55,7 +55,7 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
        else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT)
        {
                uint8_t EndpointAddress = (USB_ControlRequest.wIndex & 0xFF);
        else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT)
        {
                uint8_t EndpointAddress = (USB_ControlRequest.wIndex & 0xFF);

-       
+

                if ((EndpointAddress != AudioInterfaceInfo->Config.DataINEndpoint.Address) &&
                    (EndpointAddress != AudioInterfaceInfo->Config.DataOUTEndpoint.Address))
                {
                if ((EndpointAddress != AudioInterfaceInfo->Config.DataINEndpoint.Address) &&
                    (EndpointAddress != AudioInterfaceInfo->Config.DataOUTEndpoint.Address))
                {


@@ -175,7 +175,7 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
 bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
        memset(&AudioInterfaceInfo->State, 0x00, sizeof(AudioInterfaceInfo->State));
 bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
        memset(&AudioInterfaceInfo->State, 0x00, sizeof(AudioInterfaceInfo->State));

-       
+

        AudioInterfaceInfo->Config.DataINEndpoint.Type  = EP_TYPE_ISOCHRONOUS;
        AudioInterfaceInfo->Config.DataOUTEndpoint.Type = EP_TYPE_ISOCHRONOUS;
 
        AudioInterfaceInfo->Config.DataINEndpoint.Type  = EP_TYPE_ISOCHRONOUS;
        AudioInterfaceInfo->Config.DataOUTEndpoint.Type = EP_TYPE_ISOCHRONOUS;