Fixed Mouse and Keyboard device demos not acting in accordance with the HID specifica...

[pub/USBasp.git] / Demos / Host / KeyboardHost / KeyboardHost.c

diff --git a/Demos/Host/KeyboardHost/KeyboardHost.c b/Demos/Host/KeyboardHost/KeyboardHost.c
index f17f950..628a273 100644 (file)
--- a/Demos/Host/KeyboardHost/KeyboardHost.c
+++ b/Demos/Host/KeyboardHost/KeyboardHost.c
@@ -180,18 +180,14 @@ void ReadNextReport(void)
        /* Select keyboard data pipe */\r
        Pipe_SelectPipe(KEYBOARD_DATAPIPE);     \r
 \r
        /* Select keyboard data pipe */\r
        Pipe_SelectPipe(KEYBOARD_DATAPIPE);     \r
 \r

-       #if !defined(INTERRUPT_DATA_PIPE)\r

        /* Unfreeze keyboard data pipe */\r
        Pipe_Unfreeze();\r
        /* Unfreeze keyboard data pipe */\r
        Pipe_Unfreeze();\r

-       #endif\r

 \r
        /* Check to see if a packet has been received */\r
        if (!(Pipe_IsINReceived()))\r
        {\r
 \r
        /* Check to see if a packet has been received */\r
        if (!(Pipe_IsINReceived()))\r
        {\r

-               #if !defined(INTERRUPT_DATA_PIPE)\r

                /* Refreeze HID data IN pipe */\r
                Pipe_Freeze();\r
                /* Refreeze HID data IN pipe */\r
                Pipe_Freeze();\r

-               #endif\r

                        \r
                return;\r
        }\r
                        \r
                return;\r
        }\r


@@ -231,15 +227,12 @@ void ReadNextReport(void)
                          putchar(PressedKey);\r
                }\r
        }\r
                          putchar(PressedKey);\r
                }\r
        }\r

-       \r
-                                               \r
+               \r

        /* Clear the IN endpoint, ready for next data packet */\r
        Pipe_ClearIN();\r
 \r
        /* Clear the IN endpoint, ready for next data packet */\r
        Pipe_ClearIN();\r
 \r

-       #if !defined(INTERRUPT_DATA_PIPE)\r

        /* Refreeze keyboard data pipe */\r
        Pipe_Freeze();\r
        /* Refreeze keyboard data pipe */\r
        Pipe_Freeze();\r

-       #endif\r

 }\r
 \r
 /** Task to set the configuration of the attached device after it has been enumerated, and to read and process\r
 }\r
 \r
 /** Task to set the configuration of the attached device after it has been enumerated, and to read and process\r


@@ -329,53 +322,14 @@ TASK(USB_Keyboard_Host)
                                break;\r
                        }\r
 \r
                                break;\r
                        }\r
 \r

-                       #if defined(INTERRUPT_DATA_PIPE)                        \r
-                       /* Select and unfreeze keyboard data pipe */\r
-                       Pipe_SelectPipe(KEYBOARD_DATAPIPE);     \r
-                       Pipe_Unfreeze();\r
-                       #endif\r
-\r

                        puts_P(PSTR("Keyboard Enumerated.\r\n"));\r
 \r
                        USB_HostState = HOST_STATE_Ready;\r
                        break;\r
                        puts_P(PSTR("Keyboard Enumerated.\r\n"));\r
 \r
                        USB_HostState = HOST_STATE_Ready;\r
                        break;\r

-               #if !defined(INTERRUPT_DATA_PIPE)\r

                case HOST_STATE_Ready:\r
                        /* If a report has been received, read and process it */\r
                        ReadNextReport();\r
 \r
                        break;\r
                case HOST_STATE_Ready:\r
                        /* If a report has been received, read and process it */\r
                        ReadNextReport();\r
 \r
                        break;\r

-               #endif\r

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

-\r
-#if defined(INTERRUPT_DATA_PIPE)\r
-/** Interrupt handler for the Endpoint/Pipe interrupt vector. This interrupt fires each time an enabled\r
- *  pipe interrupt occurs on a pipe which has had that interrupt enabled.\r
- */\r
-ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)\r
-{\r
-       /* Save previously selected pipe before selecting a new pipe */\r
-       uint8_t PrevSelectedPipe = Pipe_GetCurrentPipe();\r
-\r
-       /* Check to see if the keyboard data pipe has caused the interrupt */\r
-       if (Pipe_HasPipeInterrupted(KEYBOARD_DATAPIPE))\r
-       {\r
-               /* Clear the pipe interrupt, and select the keyboard pipe */\r
-               Pipe_ClearPipeInterrupt(KEYBOARD_DATAPIPE);\r
-               Pipe_SelectPipe(KEYBOARD_DATAPIPE);     \r
-\r
-               /* Check to see if the pipe IN interrupt has fired */\r
-               if (USB_INT_HasOccurred(PIPE_INT_IN) && USB_INT_IsEnabled(PIPE_INT_IN))\r
-               {\r
-                       /* Clear interrupt flag */\r
-                       USB_INT_Clear(PIPE_INT_IN);             \r
-\r
-                       /* Read and process the next report from the device */\r
-                       ReadNextReport();\r
-       }\r
-       \r
-       /* Restore previously selected pipe */\r
-       Pipe_SelectPipe(PrevSelectedPipe);\r
-}\r
-#endif\r