Minor updates to the Benito programmer - remove redundant PORT register manipulations.

[pub/USBasp.git] / Demos / Device / LowLevel / AudioOutput / AudioOutput.c

diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
index 07418d5..89c4446 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
@@ -97,7 +97,7 @@ void EVENT_USB_Connect(void)
 #if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))\r
        /* PWM speaker timer initialization */\r
        TCCRxA  = ((1 << WGMx0) | (1 << COMxA1) | (1 << COMxA0)\r
-                                                       | (1 << COMxB1) | (1 << COMxB0)); // Set on match, clear on TOP\r
+                               | (1 << COMxB1) | (1 << COMxB0)); // Set on match, clear on TOP\r
        TCCRxB  = ((1 << WGMx2) | (1 << CSx0));  // Fast 8-Bit PWM, Fcpu speed\r
 #endif \r
 }\r
@@ -166,9 +166,7 @@ void EVENT_USB_UnhandledControlPacket(void)
                                /* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */\r
                                StreamingAudioInterfaceSelected = ((USB_ControlRequest.wValue) != 0);\r
                                \r
-                               /* Acknowledge status stage */\r
-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                               Endpoint_ClearStatusStage();\r
                        }\r
 \r
                        break;\r
@@ -180,6 +178,10 @@ void EVENT_USB_UnhandledControlPacket(void)
  */\r
 void USB_Audio_Task(void)\r
 {\r
+       /* Device must be connected and configured for the task to run */\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+         return;\r
+\r
        /* Check to see if the streaming interface is selected, if not the host is not receiving audio */\r
        if (!(StreamingAudioInterfaceSelected))\r
          return;       \r