Ensure that the Keyboard and Mouse demos adhere to the boot protocol specification...

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

diff --git a/Demos/AudioOutput/AudioOutput.c b/Demos/AudioOutput/AudioOutput.c
index 184910e..0f390f0 100644 (file)
--- a/Demos/AudioOutput/AudioOutput.c
+++ b/Demos/AudioOutput/AudioOutput.c
@@ -34,13 +34,6 @@
  *  is responsible for the initial application hardware configuration.\r
  */\r
  \r
  *  is responsible for the initial application hardware configuration.\r
  */\r
  \r

-/* ---   Project Configuration (Choose ONE)   --- */\r
-//#define AUDIO_OUT_MONO\r
-#define AUDIO_OUT_STEREO\r
-//#define AUDIO_OUT_LEDS\r
-//#define AUDIO_OUT_PORTC\r
-/* --- --- --- --- --- --- --- ---  ---  ---  --- */\r
-\r

 #include "AudioOutput.h"\r
 \r
 /* Project Tags, for reading out using the ButtLoad project */\r
 #include "AudioOutput.h"\r
 \r
 /* Project Tags, for reading out using the ButtLoad project */\r


@@ -66,8 +59,8 @@ int main(void)
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
 \r

-       /* Disable Clock Division */\r
-       SetSystemClockPrescaler(0);\r
+       /* Disable clock division */\r
+       clock_prescale_set(clock_div_1);\r

 \r
        /* Hardware Initialization */\r
        LEDs_Init();\r
 \r
        /* Hardware Initialization */\r
        LEDs_Init();\r


@@ -193,7 +186,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                        Scheduler_SetTaskMode(USB_Audio_Task, TASK_STOP);                               \r
                                }\r
                                \r
                                        Scheduler_SetTaskMode(USB_Audio_Task, TASK_STOP);                               \r
                                }\r
                                \r

-                               /* Handshake the request */\r
+                               /* Acknowledge status stage */\r
+                               while (!(Endpoint_IsSetupINReady()));\r

                                Endpoint_ClearSetupIN();\r
                        }\r
 \r
                                Endpoint_ClearSetupIN();\r
                        }\r
 \r


@@ -249,7 +243,7 @@ TASK(USB_Audio_Task)
                /* Check to see if the bank is now empty */\r
                if (!(Endpoint_ReadWriteAllowed()))\r
                {\r
                /* Check to see if the bank is now empty */\r
                if (!(Endpoint_ReadWriteAllowed()))\r
                {\r

-                       /* Acknowedge the packet, clear the bank ready for the next packet */\r
+                       /* Acknowledge the packet, clear the bank ready for the next packet */\r

                        Endpoint_ClearCurrentBank();\r
                }\r
 \r
                        Endpoint_ClearCurrentBank();\r
                }\r
 \r