Fixed GenericHIDHost demo report write routine incorrect for control type requests...

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

diff --git a/Demos/Host/KeyboardHost/KeyboardHost.c b/Demos/Host/KeyboardHost/KeyboardHost.c
index 947f232..35055ca 100644 (file)
--- a/Demos/Host/KeyboardHost/KeyboardHost.c
+++ b/Demos/Host/KeyboardHost/KeyboardHost.c
@@ -36,12 +36,6 @@
  \r
 #include "KeyboardHost.h"\r
 \r
-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA KBD Host App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
@@ -191,52 +185,57 @@ void ReadNextReport(void)
        Pipe_Unfreeze();\r
        #endif\r
 \r
-       /* Ensure pipe contains data and is ready to be read before continuing */\r
-       if (!(Pipe_ReadWriteAllowed()))\r
+       /* Check to see if a packet has been received */\r
+       if (!(Pipe_IsINReceived()))\r
        {\r
                #if !defined(INTERRUPT_DATA_PIPE)\r
-               /* Refreeze keyboard data pipe */\r
+               /* Refreeze HID data IN pipe */\r
                Pipe_Freeze();\r
                #endif\r
-\r
+                       \r
                return;\r
        }\r
        \r
-       /* Read in keyboard report data */\r
-       Pipe_Read_Stream_LE(&KeyboardReport, sizeof(KeyboardReport));\r
-                                       \r
-       /* Clear the IN endpoint, ready for next data packet */\r
-       Pipe_ClearCurrentBank();\r
-\r
-       /* Indicate if the modifier byte is non-zero (special key such as shift is being pressed) */\r
-       LEDs_ChangeLEDs(LEDS_LED1, (KeyboardReport.Modifier) ? LEDS_LED1 : 0);\r
-       \r
-       /* Check if a key has been pressed */\r
-       if (KeyboardReport.KeyCode)\r
+       /* Ensure pipe contains data before trying to read from it */\r
+       if (Pipe_IsReadWriteAllowed())\r
        {\r
-               /* Toggle status LED to indicate keypress */\r
-               if (LEDs_GetLEDs() & LEDS_LED2)\r
-                 LEDs_TurnOffLEDs(LEDS_LED2);\r
-               else\r
-                 LEDs_TurnOnLEDs(LEDS_LED2);\r
-                         \r
-               char PressedKey = 0;\r
-\r
-               /* Retrieve pressed key character if alphanumeric */\r
-               if ((KeyboardReport.KeyCode >= 0x04) && (KeyboardReport.KeyCode <= 0x1D))\r
-                 PressedKey = (KeyboardReport.KeyCode - 0x04) + 'A';\r
-               else if ((KeyboardReport.KeyCode >= 0x1E) && (KeyboardReport.KeyCode <= 0x27))\r
-                 PressedKey = (KeyboardReport.KeyCode - 0x1E) + '0';\r
-               else if (KeyboardReport.KeyCode == 0x2C)\r
-                 PressedKey = ' ';                                             \r
-               else if (KeyboardReport.KeyCode == 0x28)\r
-                 PressedKey = '\n';\r
-                        \r
-               /* Print the pressed key character out through the serial port if valid */\r
-               if (PressedKey)\r
-                 putchar(PressedKey);\r
+               /* Read in keyboard report data */\r
+               Pipe_Read_Stream_LE(&KeyboardReport, sizeof(KeyboardReport));\r
+\r
+               /* Indicate if the modifier byte is non-zero (special key such as shift is being pressed) */\r
+               LEDs_ChangeLEDs(LEDS_LED1, (KeyboardReport.Modifier) ? LEDS_LED1 : 0);\r
+               \r
+               /* Check if a key has been pressed */\r
+               if (KeyboardReport.KeyCode)\r
+               {\r
+                       /* Toggle status LED to indicate keypress */\r
+                       if (LEDs_GetLEDs() & LEDS_LED2)\r
+                         LEDs_TurnOffLEDs(LEDS_LED2);\r
+                       else\r
+                         LEDs_TurnOnLEDs(LEDS_LED2);\r
+                                 \r
+                       char PressedKey = 0;\r
+\r
+                       /* Retrieve pressed key character if alphanumeric */\r
+                       if ((KeyboardReport.KeyCode >= 0x04) && (KeyboardReport.KeyCode <= 0x1D))\r
+                         PressedKey = (KeyboardReport.KeyCode - 0x04) + 'A';\r
+                       else if ((KeyboardReport.KeyCode >= 0x1E) && (KeyboardReport.KeyCode <= 0x27))\r
+                         PressedKey = (KeyboardReport.KeyCode - 0x1E) + '0';\r
+                       else if (KeyboardReport.KeyCode == 0x2C)\r
+                         PressedKey = ' ';                                             \r
+                       else if (KeyboardReport.KeyCode == 0x28)\r
+                         PressedKey = '\n';\r
+                                \r
+                       /* Print the pressed key character out through the serial port if valid */\r
+                       if (PressedKey)\r
+                         putchar(PressedKey);\r
+               }\r
        }\r
        \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