Removed "Host_" section of the function names in ConfigDescriptor.h, as most of the...

[pub/USBasp.git] / Bootloaders / CDC / BootloaderCDC.c

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index e87d471..cb2672c 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -90,7 +90,7 @@ int main(void)
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r
        /* Wait until any pending transmissions have completed before shutting down */\r
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r
        /* Wait until any pending transmissions have completed before shutting down */\r

-       while (!(Endpoint_ReadWriteAllowed()));\r
+       while (!(Endpoint_IsINReady()));\r

        \r
        /* Shut down the USB subsystem */\r
        USB_ShutDown();\r
        \r
        /* Shut down the USB subsystem */\r
        USB_ShutDown();\r


@@ -160,45 +160,45 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                case REQ_GetLineEncoding:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                case REQ_GetLineEncoding:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

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

 \r
                                for (uint8_t i = 0; i < sizeof(LineCoding); i++)\r
                                  Endpoint_Write_Byte(*(LineCodingData++));     \r
                                \r
 \r
                                for (uint8_t i = 0; i < sizeof(LineCoding); i++)\r
                                  Endpoint_Write_Byte(*(LineCodingData++));     \r
                                \r

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

                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
-                               Endpoint_ClearSetupOUT();\r
+                               while (!(Endpoint_IsOUTReceived()));\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                        \r
                        break;\r
                case REQ_SetLineEncoding:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
                        \r
                        break;\r
                case REQ_SetLineEncoding:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

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

 \r
 \r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                               while (!(Endpoint_IsOUTReceived()));\r

 \r
                                for (uint8_t i = 0; i < sizeof(LineCoding); i++)\r
                                  *(LineCodingData++) = Endpoint_Read_Byte();\r
 \r
 \r
                                for (uint8_t i = 0; i < sizeof(LineCoding); i++)\r
                                  *(LineCodingData++) = Endpoint_Read_Byte();\r
 \r

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

 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
        \r
                        break;\r
                case REQ_SetControlLineState:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
        \r
                        break;\r
                case REQ_SetControlLineState:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

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

                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

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


@@ -332,10 +332,10 @@ static uint8_t FetchNextCommandByte(void)
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
        \r
        /* If OUT endpoint empty, clear it and wait for the next packet from the host */\r
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
        \r
        /* If OUT endpoint empty, clear it and wait for the next packet from the host */\r

-       if (!(Endpoint_ReadWriteAllowed()))\r
+       while (!(Endpoint_IsReadWriteAllowed()))\r

        {\r
        {\r

-               Endpoint_ClearCurrentBank();\r
-               while (!(Endpoint_ReadWriteAllowed()));\r
+               Endpoint_ClearOUT();\r
+               while (!(Endpoint_IsOUTReceived()));\r

        }\r
        \r
        /* Fetch the next byte from the OUT endpoint */\r
        }\r
        \r
        /* Fetch the next byte from the OUT endpoint */\r


@@ -353,10 +353,10 @@ static void WriteNextResponseByte(const uint8_t Response)
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
        \r
        /* If OUT endpoint empty, clear it and wait for the next packet from the host */\r
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
        \r
        /* If OUT endpoint empty, clear it and wait for the next packet from the host */\r

-       if (!(Endpoint_ReadWriteAllowed()))\r
+       if (!(Endpoint_IsReadWriteAllowed()))\r

        {\r
        {\r

-               Endpoint_ClearCurrentBank();\r
-               while (!(Endpoint_ReadWriteAllowed()));\r
+               Endpoint_ClearIN();\r
+               while (!(Endpoint_IsINReady()));\r

        }\r
        \r
        /* Write the next byte to the OUT endpoint */\r
        }\r
        \r
        /* Write the next byte to the OUT endpoint */\r


@@ -372,7 +372,7 @@ TASK(CDC_Task)
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
        \r
        /* Check if endpoint has a command in it sent from the host */\r
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
        \r
        /* Check if endpoint has a command in it sent from the host */\r

-       if (Endpoint_ReadWriteAllowed())\r
+       if (Endpoint_IsOUTReceived())\r

        {\r
                /* Read in the bootloader command (first byte sent from host) */\r
                uint8_t Command = FetchNextCommandByte();\r
        {\r
                /* Read in the bootloader command (first byte sent from host) */\r
                uint8_t Command = FetchNextCommandByte();\r


@@ -557,22 +557,22 @@ TASK(CDC_Task)
                Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r
                /* Remember if the endpoint is completely full before clearing it */\r
                Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r
                /* Remember if the endpoint is completely full before clearing it */\r

-               bool IsEndpointFull = !(Endpoint_ReadWriteAllowed());\r
+               bool IsEndpointFull = !(Endpoint_IsReadWriteAllowed());\r

 \r
                /* Send the endpoint data to the host */\r
 \r
                /* Send the endpoint data to the host */\r

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

                \r
                /* If a full endpoint's worth of data was sent, we need to send an empty packet afterwards to signal end of transfer */\r
                if (IsEndpointFull)\r
                {\r
                \r
                /* If a full endpoint's worth of data was sent, we need to send an empty packet afterwards to signal end of transfer */\r
                if (IsEndpointFull)\r
                {\r

-                       while (!(Endpoint_ReadWriteAllowed()));\r
-                       Endpoint_ClearCurrentBank();\r
+                       while (!(Endpoint_IsINReady()));\r
+                       Endpoint_ClearIN();\r

                }\r
                \r
                /* Select the OUT endpoint */\r
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
 \r
                /* Acknowledge the command from the host */\r
                }\r
                \r
                /* Select the OUT endpoint */\r
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
 \r
                /* Acknowledge the command from the host */\r

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

        }\r
 }\r
        }\r
 }\r