Fixed broken Magstripe project and TeensyHID bootloader.

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

diff --git a/Demos/MouseViaInt/MouseViaInt.c b/Demos/MouseViaInt/MouseViaInt.c
index 77e4c56..465459a 100644 (file)
--- a/Demos/MouseViaInt/MouseViaInt.c
+++ b/Demos/MouseViaInt/MouseViaInt.c
@@ -74,8 +74,8 @@ int main(void)
        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
        Joystick_Init();\r
@@ -198,6 +198,10 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                \r
                                /* Send the flag to the host */\r
                                Endpoint_ClearSetupIN();\r
+\r
+                               /* Acknowledge status stage */\r
+                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                               Endpoint_ClearSetupOUT();\r
                        }\r
                        \r
                        break;\r
@@ -212,7 +216,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                /* Set or clear the flag depending on what the host indicates that the current Protocol should be */\r
                                UsingReportProtocol = (wValue != 0x0000);\r
                                \r
-                               /* Send an empty packet to acknowedge the command */\r
+                               /* Acknowledge status stage */\r
+                               while (!(Endpoint_IsSetupINReady()));\r
                                Endpoint_ClearSetupIN();\r
                        }\r
                        \r
@@ -228,7 +233,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                /* Get idle period in MSB */\r
                                IdleCount = (wValue >> 8);\r
                                \r
-                               /* Send an empty packet to acknowedge the command */\r
+                               /* Acknowledge status stage */\r
+                               while (!(Endpoint_IsSetupINReady()));\r
                                Endpoint_ClearSetupIN();\r
                        }\r
                        \r
@@ -243,6 +249,10 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                \r
                                /* Send the flag to the host */\r
                                Endpoint_ClearSetupIN();\r
+\r
+                               /* Acknowledge status stage */\r
+                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                               Endpoint_ClearSetupOUT();\r
                        }\r
 \r
                        break;\r
@@ -345,6 +355,15 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
                USB_MouseReport_Data_t MouseReportData;\r
                bool                   SendReport = true;\r
                \r
+               /* Select the Mouse Report Endpoint */\r
+               Endpoint_SelectEndpoint(MOUSE_EPNUM);\r
+\r
+               /* Clear the endpoint IN interrupt flag */\r
+               USB_INT_Clear(ENDPOINT_INT_IN);\r
+\r
+               /* Clear the Mouse Report endpoint interrupt and select the endpoint */\r
+               Endpoint_ClearEndpointInterrupt(MOUSE_EPNUM);\r
+\r
                /* Create the next mouse report for transmission to the host */\r
                GetNextReport(&MouseReportData);\r
                \r
@@ -367,15 +386,6 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
                /* Check to see if a report should be issued */\r
                if (SendReport)\r
                {\r
-                       /* Select the Mouse Report Endpoint */\r
-                       Endpoint_SelectEndpoint(MOUSE_EPNUM);\r
-\r
-                       /* Clear the endpoint IN interrupt flag */\r
-                       USB_INT_Clear(ENDPOINT_INT_IN);\r
-\r
-                       /* Clear the Mouse Report endpoint interrupt and select the endpoint */\r
-                       Endpoint_ClearEndpointInterrupt(MOUSE_EPNUM);\r
-\r
                        /* Write Mouse Report Data */\r
                        Endpoint_Write_Stream_LE(&MouseReportData, sizeof(MouseReportData));\r
                }\r