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

[pub/lufa.git] / Demos / Device / KeyboardMouse / KeyboardMouse.c

diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.c b/Demos/Device/KeyboardMouse/KeyboardMouse.c
index 957b9b3..9cae69a 100644 (file)
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.c
@@ -167,7 +167,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                if (wLength > ReportSize)\r
                                  wLength = ReportSize;\r
 \r
                                if (wLength > ReportSize)\r
                                  wLength = ReportSize;\r
 \r

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

        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(ReportData, wLength);\r
        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(ReportData, wLength);\r


@@ -176,14 +176,14 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                memset(ReportData, 0, ReportSize);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                memset(ReportData, 0, ReportSize);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

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

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

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

                                \r
                                /* Wait until the LED report has been sent by the host */\r
                                while (!(Endpoint_IsOUTReceived()));\r
                                \r
                                /* Wait until the LED report has been sent by the host */\r
                                while (!(Endpoint_IsOUTReceived()));\r


@@ -205,11 +205,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                LEDs_SetAllLEDs(LEDMask);\r
 \r
                                /* Clear the endpoint data */\r
                                LEDs_SetAllLEDs(LEDMask);\r
 \r
                                /* Clear the endpoint data */\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
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r