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

[pub/lufa.git] / LUFA / Drivers / USB / LowLevel / Endpoint.c

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c
index b885471..e196b6a 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c
@@ -59,7 +59,7 @@ bool Endpoint_ConfigureEndpointStatic(const uint8_t Number, const uint8_t UECFG0
        Endpoint_SelectEndpoint(Number);\r
        Endpoint_EnableEndpoint();\r
 \r
        Endpoint_SelectEndpoint(Number);\r
        Endpoint_EnableEndpoint();\r
 \r

-       UECFG1X = 0;    \r
+       UECFG1X = 0;\r

 \r
        UECFG0X = UECFG0XData;\r
        UECFG1X = UECFG1XData;\r
 \r
        UECFG0X = UECFG0XData;\r
        UECFG1X = UECFG1XData;\r


@@ -307,7 +307,7 @@ uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
                }\r
                \r
                SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
                }\r
                \r
                SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r

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

        }\r
        \r
        if (Endpoint_IsOUTReceived())\r
        }\r
        \r
        if (Endpoint_IsOUTReceived())\r


@@ -316,7 +316,7 @@ uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
        if (SendZLP)\r
        {\r
                while (!(Endpoint_IsINReady()));\r
        if (SendZLP)\r
        {\r
                while (!(Endpoint_IsINReady()));\r

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

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


@@ -341,7 +341,7 @@ uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
                }\r
                \r
                SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
                }\r
                \r
                SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r

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

        }\r
        \r
        if (Endpoint_IsOUTReceived())\r
        }\r
        \r
        if (Endpoint_IsOUTReceived())\r


@@ -350,7 +350,7 @@ uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
        if (SendZLP)\r
        {\r
                while (!(Endpoint_IsINReady()));\r
        if (SendZLP)\r
        {\r
                while (!(Endpoint_IsINReady()));\r

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

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


@@ -373,7 +373,7 @@ uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)
                        Length--;\r
                }\r
                \r
                        Length--;\r
                }\r
                \r

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

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


@@ -396,7 +396,7 @@ uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)
                        Length--;\r
                }\r
                \r
                        Length--;\r
                }\r
                \r

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

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