Removed specialized Endpoint_ClearControl* and Pipe_ClearControl* macros in favour...

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

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 00c1ea5..289b4eb 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -163,7 +163,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
        switch (bRequest)\r
        {\r
                case DFU_DNLOAD:\r
        switch (bRequest)\r
        {\r
                case DFU_DNLOAD:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

                        \r
                        /* Check if bootloader is waiting to terminate */\r
                        if (WaitForExit)\r
                        \r
                        /* Check if bootloader is waiting to terminate */\r
                        if (WaitForExit)\r


@@ -235,7 +235,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r

-                                                               Endpoint_ClearControlOUT();\r
+                                                               Endpoint_ClearOUT();\r

                                                                while (!(Endpoint_IsOUTReceived()));\r
                                                        }\r
 \r
                                                                while (!(Endpoint_IsOUTReceived()));\r
                                                        }\r
 \r


@@ -279,7 +279,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r

-                                                               Endpoint_ClearControlOUT();\r
+                                                               Endpoint_ClearOUT();\r

                                                                while (!(Endpoint_IsOUTReceived()));\r
                                                        }\r
 \r
                                                                while (!(Endpoint_IsOUTReceived()));\r
                                                        }\r
 \r


@@ -296,15 +296,15 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                }\r
                        }\r
 \r
                                }\r
                        }\r
 \r

-                       Endpoint_ClearControlOUT();\r
+                       Endpoint_ClearOUT();\r

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

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

                                \r
                        break;\r
                case DFU_UPLOAD:\r
                                \r
                        break;\r
                case DFU_UPLOAD:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

 \r
                        while (!(Endpoint_IsINReady()));\r
 \r
 \r
                        while (!(Endpoint_IsINReady()));\r
 \r


@@ -343,7 +343,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r

-                                                       Endpoint_ClearControlIN();\r
+                                                       Endpoint_ClearIN();\r

                                                        while (!(Endpoint_IsINReady()));\r
                                                }\r
 \r
                                                        while (!(Endpoint_IsINReady()));\r
                                                }\r
 \r


@@ -368,7 +368,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r

-                                                       Endpoint_ClearControlIN();\r
+                                                       Endpoint_ClearIN();\r

                                                        while (!(Endpoint_IsINReady()));\r
                                                }\r
 \r
                                                        while (!(Endpoint_IsINReady()));\r
                                                }\r
 \r


@@ -384,15 +384,15 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                DFU_State = dfuIDLE;\r
                        }\r
 \r
                                DFU_State = dfuIDLE;\r
                        }\r
 \r

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

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

-                       Endpoint_ClearControlOUT();\r
+                       Endpoint_ClearOUT();\r

 \r
                        break;\r
                case DFU_GETSTATUS:\r
 \r
                        break;\r
                case DFU_GETSTATUS:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

                        \r
                        /* Write 8-bit status value */\r
                        Endpoint_Write_Byte(DFU_Status);\r
                        \r
                        /* Write 8-bit status value */\r
                        Endpoint_Write_Byte(DFU_Status);\r


@@ -407,46 +407,46 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        /* Write 8-bit state string ID number */\r
                        Endpoint_Write_Byte(0);\r
 \r
                        /* Write 8-bit state string ID number */\r
                        Endpoint_Write_Byte(0);\r
 \r

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

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

-                       Endpoint_ClearControlOUT();\r
+                       Endpoint_ClearOUT();\r

        \r
                        break;          \r
                case DFU_CLRSTATUS:\r
        \r
                        break;          \r
                case DFU_CLRSTATUS:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

                        \r
                        /* Reset the status value variable to the default OK status */\r
                        DFU_Status = OK;\r
 \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsINReady()));\r
                        \r
                        /* Reset the status value variable to the default OK status */\r
                        DFU_Status = OK;\r
 \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsINReady()));\r

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

                        \r
                        break;\r
                case DFU_GETSTATE:\r
                        \r
                        break;\r
                case DFU_GETSTATE:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

                        \r
                        /* Write the current device state to the endpoint */\r
                        Endpoint_Write_Byte(DFU_State);\r
                \r
                        \r
                        /* Write the current device state to the endpoint */\r
                        Endpoint_Write_Byte(DFU_State);\r
                \r

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

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

-                       Endpoint_ClearControlOUT();\r
+                       Endpoint_ClearOUT();\r

 \r
                        break;\r
                case DFU_ABORT:\r
 \r
                        break;\r
                case DFU_ABORT:\r

-                       Endpoint_ClearControlSETUP();\r
+                       Endpoint_ClearSETUP();\r

                        \r
                        /* Reset the current state variable to the default idle state */\r
                        DFU_State = dfuIDLE;\r
                        \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsINReady()));\r
                        \r
                        /* Reset the current state variable to the default idle state */\r
                        DFU_State = dfuIDLE;\r
                        \r
                        /* Acknowledge status stage */\r
                        while (!(Endpoint_IsINReady()));\r

-                       Endpoint_ClearControlIN();\r
+                       Endpoint_ClearIN();\r

 \r
                        break;\r
        }\r
 \r
                        break;\r
        }\r


@@ -463,7 +463,7 @@ static void DiscardFillerBytes(uint8_t NumberOfBytes)
        {\r
                if (!(Endpoint_BytesInEndpoint()))\r
                {\r
        {\r
                if (!(Endpoint_BytesInEndpoint()))\r
                {\r

-                       Endpoint_ClearControlOUT();\r
+                       Endpoint_ClearOUT();\r

 \r
                        /* Wait until next data packet received */\r
                        while (!(Endpoint_IsOUTReceived()));\r
 \r
                        /* Wait until next data packet received */\r
                        while (!(Endpoint_IsOUTReceived()));\r