Fixed incorrect/missing control status stage transfers on demos, bootloaders and...

[pub/USBasp.git] / Bootloaders / DFU / BootloaderDFU.c

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 8cc5fd4..9fff20c 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -57,7 +57,7 @@ bool RunBootloader = true;
 \r
 /** Flag to indicate if the bootloader is waiting to exit. When the host requests the bootloader to exit and\r
  *  jump to the application address it specifies, it sends two sequential commands which must be properly\r
 \r
 /** Flag to indicate if the bootloader is waiting to exit. When the host requests the bootloader to exit and\r
  *  jump to the application address it specifies, it sends two sequential commands which must be properly\r

- *  acknowedged. Upon reception of the first the RunBootloader flag is cleared and the WaitForExit flag is set,\r
+ *  acknowledged. Upon reception of the first the RunBootloader flag is cleared and the WaitForExit flag is set,\r

  *  causing the bootloader to wait for the final exit command before shutting down.\r
  */\r
 bool WaitForExit = false;\r
  *  causing the bootloader to wait for the final exit command before shutting down.\r
  */\r
 bool WaitForExit = false;\r


@@ -305,7 +305,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 \r
                        Endpoint_ClearSetupOUT();\r
 \r
 \r
                        Endpoint_ClearSetupOUT();\r
 \r

-                       /* Send ZLP to the host to acknowedge the request */\r
+                       /* Acknowledge status stage */\r
+                       while (!(Endpoint_IsSetupINReady()));\r

                        Endpoint_ClearSetupIN();\r
                                \r
                        break;\r
                        Endpoint_ClearSetupIN();\r
                                \r
                        break;\r


@@ -392,7 +393,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 \r
                        Endpoint_ClearSetupIN();\r
 \r
 \r
                        Endpoint_ClearSetupIN();\r
 \r

-                       /* Send ZLP to the host to acknowedge the request */\r
+                       /* Acknowledge status stage */\r

                        while (!(Endpoint_IsSetupOUTReceived()));\r
                        Endpoint_ClearSetupOUT();\r
 \r
                        while (!(Endpoint_IsSetupOUTReceived()));\r
                        Endpoint_ClearSetupOUT();\r
 \r


@@ -415,6 +416,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 \r
                        Endpoint_ClearSetupIN();\r
                        \r
 \r
                        Endpoint_ClearSetupIN();\r
                        \r

+                       /* Acknowledge status stage */\r

                        while (!(Endpoint_IsSetupOUTReceived()));\r
                        Endpoint_ClearSetupOUT();\r
        \r
                        while (!(Endpoint_IsSetupOUTReceived()));\r
                        Endpoint_ClearSetupOUT();\r
        \r


@@ -424,9 +426,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        \r
                        /* Reset the status value variable to the default OK status */\r
                        DFU_Status = OK;\r
                        \r
                        /* Reset the status value variable to the default OK status */\r
                        DFU_Status = OK;\r

-                       \r
-                       Endpoint_ClearSetupIN();\r

 \r
 \r

+                       /* Acknowledge status stage */\r
+                       while (!(Endpoint_IsSetupINReady()));\r
+                       Endpoint_ClearSetupIN();\r
+                       \r

                        break;\r
                case DFU_GETSTATE:\r
                        Endpoint_ClearSetupReceived();\r
                        break;\r
                case DFU_GETSTATE:\r
                        Endpoint_ClearSetupReceived();\r


@@ -436,6 +440,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                \r
                        Endpoint_ClearSetupIN();\r
                        \r
                \r
                        Endpoint_ClearSetupIN();\r
                        \r

+                       /* Acknowledge status stage */\r

                        while (!(Endpoint_IsSetupOUTReceived()));\r
                        Endpoint_ClearSetupOUT();\r
 \r
                        while (!(Endpoint_IsSetupOUTReceived()));\r
                        Endpoint_ClearSetupOUT();\r
 \r


@@ -446,6 +451,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        /* Reset the current state variable to the default idle state */\r
                        DFU_State = dfuIDLE;\r
                        \r
                        /* Reset the current state variable to the default idle state */\r
                        DFU_State = dfuIDLE;\r
                        \r

+                       /* Acknowledge status stage */\r
+                       while (!(Endpoint_IsSetupINReady()));\r

                        Endpoint_ClearSetupIN();\r
 \r
                        break;\r
                        Endpoint_ClearSetupIN();\r
 \r
                        break;\r