Speed up bit-banged USART code in the AVRISP project.

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

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/Audio.c
index 116921e..8f59980 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/Audio.c
+++ b/LUFA/Drivers/USB/Class/Device/Audio.c
@@ -33,7 +33,7 @@
 \r
 #include "Audio.h"\r
 \r
 \r
 #include "Audio.h"\r
 \r

-void Audio_Device_ProcessControlPacket(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r
+void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r

 {\r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r
 {\r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r


@@ -48,7 +48,7 @@ void Audio_Device_ProcessControlPacket(USB_ClassInfo_Audio_Device_t* const Audio
                        {\r
                                Endpoint_ClearSETUP();\r
                                \r
                        {\r
                                Endpoint_ClearSETUP();\r
                                \r

-                               AudioInterfaceInfo->State.InterfaceEnabled = (USB_ControlRequest.wValue != 0);\r
+                               AudioInterfaceInfo->State.InterfaceEnabled = ((USB_ControlRequest.wValue & 0xFF) != 0);\r

                                  \r
                                Endpoint_ClearStatusStage();\r
                        }\r
                                  \r
                                Endpoint_ClearStatusStage();\r
                        }\r


@@ -59,6 +59,8 @@ void Audio_Device_ProcessControlPacket(USB_ClassInfo_Audio_Device_t* const Audio
 \r
 bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* AudioInterfaceInfo)\r
 {\r
 \r
 bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* AudioInterfaceInfo)\r
 {\r

+       memset(&AudioInterfaceInfo->State, 0x00, sizeof(AudioInterfaceInfo->State));\r
+\r

        if (AudioInterfaceInfo->Config.DataINEndpointNumber)\r
        {\r
                if (!(Endpoint_ConfigureEndpoint(AudioInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_ISOCHRONOUS,\r
        if (AudioInterfaceInfo->Config.DataINEndpointNumber)\r
        {\r
                if (!(Endpoint_ConfigureEndpoint(AudioInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_ISOCHRONOUS,\r


@@ -78,84 +80,29 @@ bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* AudioInterfac
                        return false;\r
                }\r
        }\r
                        return false;\r
                }\r
        }\r

-\r
+       \r

        return true;\r
 }\r
 \r
 void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r
 {\r
        return true;\r
 }\r
 \r
 void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r
 {\r

-\r
-}\r
-\r
-int8_t Audio_Device_ReadSample8(void)\r
-{\r
-       int8_t Sample;\r
-\r
-       Sample = Endpoint_Read_Byte();\r
-\r
-       if (!(Endpoint_IsReadWriteAllowed()))\r
-         Endpoint_ClearOUT();\r
-       \r
-       return Sample;\r
-}\r
-\r
-int16_t Audio_Device_ReadSample16(void)\r
-{\r
-       int16_t Sample;\r
-\r
-       Sample = (int16_t)Endpoint_Read_Word_LE();\r
-                 \r
-       if (!(Endpoint_IsReadWriteAllowed()))\r
-         Endpoint_ClearOUT();\r
-\r
-       return Sample;\r
-}\r
-\r
-int32_t Audio_Device_ReadSample24(void)\r
-{\r
-       int32_t Sample;\r
-\r
-       Sample = (((uint32_t)Endpoint_Read_Byte() << 16) | Endpoint_Read_Word_LE());\r
-                 \r
-       if (!(Endpoint_IsReadWriteAllowed()))\r
-         Endpoint_ClearOUT();\r
-\r
-       return Sample;\r
-}\r
-\r
-void Audio_Device_WriteSample8(const int8_t Sample)\r
-{\r
-       Endpoint_Write_Byte(Sample);\r
-\r
-       if (!(Endpoint_IsReadWriteAllowed()))\r
-         Endpoint_ClearIN();\r
-}\r
-\r
-void Audio_Device_WriteSample16(const int16_t Sample)\r
-{\r
-       Endpoint_Write_Word_LE(Sample);\r
-\r
-       if (!(Endpoint_IsReadWriteAllowed()))\r
-         Endpoint_ClearIN();\r
-}\r
-\r
-void Audio_Device_WriteSample24(const int32_t Sample)\r
-{\r
-       Endpoint_Write_Byte(Sample >> 16);\r
-       Endpoint_Write_Word_LE(Sample);\r
-\r
-       if (!(Endpoint_IsReadWriteAllowed()))\r
-         Endpoint_ClearIN();\r
+       (void)AudioInterfaceInfo;\r

 }\r
 \r
 bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r
 {\r
 }\r
 \r
 bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r
 {\r

-       Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataOUTEndpointNumber);\r
+       if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))\r
+         return false;\r
+       \r
+       Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataOUTEndpointNumber);      \r

        return Endpoint_IsOUTReceived();\r
 }\r
 \r
 bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r
 {\r
        return Endpoint_IsOUTReceived();\r
 }\r
 \r
 bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r
 {\r

+       if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))\r
+         return false;\r
+       \r

        Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataINEndpointNumber);\r
        return Endpoint_IsINReady();\r
 }\r
        Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataINEndpointNumber);\r
        return Endpoint_IsINReady();\r
 }\r