Removed all user pipe/endpoint interrupt APIs, added internal library support for...

[pub/USBasp.git] / Demos / Device / Keyboard / Keyboard.c

diff --git a/Demos/Device/Keyboard/Keyboard.c b/Demos/Device/Keyboard/Keyboard.c
index 928d95b..fe041ef 100644 (file)
--- a/Demos/Device/Keyboard/Keyboard.c
+++ b/Demos/Device/Keyboard/Keyboard.c
@@ -40,10 +40,7 @@
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r

-       #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r
-       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
-       #endif\r
-       \r
+       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },     \r

        { .Task = USB_Keyboard_Report  , .TaskStatus = TASK_STOP },\r
 };\r
 \r
        { .Task = USB_Keyboard_Report  , .TaskStatus = TASK_STOP },\r
 };\r
 \r


@@ -105,10 +102,8 @@ int main(void)
  */\r
 EVENT_HANDLER(USB_Connect)\r
 {\r
  */\r
 EVENT_HANDLER(USB_Connect)\r
 {\r

-       #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r

        /* Start USB management task */\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
        /* Start USB management task */\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r

-       #endif\r

 \r
        /* Indicate USB enumerating */\r
        UpdateStatus(Status_USBEnumerating);\r
 \r
        /* Indicate USB enumerating */\r
        UpdateStatus(Status_USBEnumerating);\r


@@ -117,21 +112,6 @@ EVENT_HANDLER(USB_Connect)
        UsingReportProtocol = true;\r
 }\r
 \r
        UsingReportProtocol = true;\r
 }\r
 \r

-/** Event handler for the USB_Reset event. This fires when the USB interface is reset by the USB host, before the\r
- *  enumeration process begins, and enables the control endpoint interrupt so that control requests can be handled\r
- *  asynchronously when they arrive rather than when the control endpoint is polled manually.\r
- */\r
-EVENT_HANDLER(USB_Reset)\r
-{\r
-       #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
-       /* Select the control endpoint */\r
-       Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
-\r
-       /* Enable the endpoint SETUP interrupt ISR for the control endpoint */\r
-       USB_INT_Enable(ENDPOINT_INT_SETUP);\r
-       #endif\r
-}\r
-\r

 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs.\r
  */\r
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs.\r
  */\r


@@ -139,10 +119,7 @@ EVENT_HANDLER(USB_Disconnect)
 {\r
        /* Stop running keyboard reporting and USB management tasks */\r
        Scheduler_SetTaskMode(USB_Keyboard_Report, TASK_STOP);\r
 {\r
        /* Stop running keyboard reporting and USB management tasks */\r
        Scheduler_SetTaskMode(USB_Keyboard_Report, TASK_STOP);\r

-\r
-       #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r

        Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r

-       #endif\r

        \r
        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r
        \r
        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r


@@ -445,30 +422,3 @@ TASK(USB_Keyboard_Report)
                ReceiveNextReport();\r
        }\r
 }\r
                ReceiveNextReport();\r
        }\r
 }\r

-\r
-#if defined(INTERRUPT_CONTROL_ENDPOINT)\r
-/** ISR for the general Pipe/Endpoint interrupt vector. This ISR fires when an endpoint's status changes (such as\r
- *  a packet has been received) on an endpoint with its corresponding ISR enabling bits set. This is used to send\r
- *  HID packets to the host each time the HID interrupt endpoints polling period elapses, as managed by the USB\r
- *  controller. It is also used to respond to standard and class specific requests send to the device on the control\r
- *  endpoint, by handing them off to the LUFA library when they are received.\r
- */\r
-ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)\r
-{\r
-       /* Save previously selected endpoint before selecting a new endpoint */\r
-       uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();\r
-\r
-       /* Check if the control endpoint has received a request */\r
-       if (Endpoint_HasEndpointInterrupted(ENDPOINT_CONTROLEP))\r
-       {\r
-               /* Process the control request */\r
-               USB_USBTask();\r
-\r
-               /* Handshake the endpoint setup interrupt - must be after the call to USB_USBTask() */\r
-               USB_INT_Clear(ENDPOINT_INT_SETUP);\r
-       }\r
-       \r
-       /* Restore previously selected endpoint */\r
-       Endpoint_SelectEndpoint(PrevSelectedEndpoint);  \r
-}\r
-#endif\r