Add new CDCMouse ClassDriver device demo, combining a CDC Virtual Serial Port and...

[pub/USBasp.git] / Demos / Host / ClassDriver / KeyboardHostWithParser / KeyboardHostWithParser.c

diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
index d87c0e7..bccfb8c 100644 (file)
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -58,7 +58,7 @@ USB_ClassInfo_HID_Host_t Keyboard_HID_Interface =
 \r
        \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
 \r
        \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r

- *  starts the scheduler to run the application tasks.\r
+ *  enters a loop to run the application tasks in sequence.\r

  */\r
 int main(void)\r
 {\r
  */\r
 int main(void)\r
 {\r


@@ -104,9 +104,9 @@ int main(void)
                                        break;\r
                                }\r
 \r
                                        break;\r
                                }\r
 \r

-                               if (USB_HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0)\r
+                               if (HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0)\r

                                {\r
                                {\r

-                                       printf("Could not Set Report Protocol Mode.\r\n");\r
+                                       printf("Error Setting Report Protocol Mode or Not a Valid Keyboard.\r\n");\r

                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r


@@ -114,13 +114,13 @@ int main(void)
                                \r
                                LEDs_SetAllLEDs(LEDS_NO_LEDS);\r
 \r
                                \r
                                LEDs_SetAllLEDs(LEDS_NO_LEDS);\r
 \r

-                               printf("HID Device Enumerated.\r\n");\r
+                               printf("Keyboard Enumerated.\r\n");\r

                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r
                                if (HID_Host_IsReportReceived(&Keyboard_HID_Interface))\r
                                {\r
                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r
                                if (HID_Host_IsReportReceived(&Keyboard_HID_Interface))\r
                                {\r

-                                       uint8_t KeyboardReport[50];\r
+                                       uint8_t KeyboardReport[Keyboard_HID_Interface.State.LargestReportSize];\r

                                        HID_Host_ReceiveReport(&Keyboard_HID_Interface, &KeyboardReport);\r
                                        \r
                                        for (uint8_t ReportNumber = 0; ReportNumber < HIDReportInfo.TotalReportItems; ReportNumber++)\r
                                        HID_Host_ReceiveReport(&Keyboard_HID_Interface, &KeyboardReport);\r
                                        \r
                                        for (uint8_t ReportNumber = 0; ReportNumber < HIDReportInfo.TotalReportItems; ReportNumber++)\r


@@ -251,20 +251,15 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8
  *  we aren't interested in (preventing us from being able to extract them later on, but saving on the RAM they would\r
  *  have occupied).\r
  *\r
  *  we aren't interested in (preventing us from being able to extract them later on, but saving on the RAM they would\r
  *  have occupied).\r
  *\r

- *  \param CurrentItemAttributes  Pointer to the attrbutes of the item the HID report parser is currently working with\r
+ *  \param[in] CurrentItem  Pointer to the item the HID report parser is currently working with\r

  *\r
  *  \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded\r
  */\r
  *\r
  *  \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded\r
  */\r

-bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_Attributes_t* CurrentItemAttributes)\r
+bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem)\r

 {\r
 {\r

-       /* Check the attributes of the current item - see if we are interested in it or not */\r
-       if (CurrentItemAttributes->Usage.Page == USAGE_PAGE_KEYBOARD)\r
-       {\r
-               /* Only store KEYBOARD usage page items into the Processed HID Report structure to save RAM */\r
-               return true;\r
-       }\r
-       else\r
-       {\r
-               return false;\r
-       }\r
+       /* Check the attributes of the current item - see if we are interested in it or not;\r
+        * only store KEYBOARD usage page items into the Processed HID Report structure to\r
+        * save RAM and ignore the rest\r
+        */\r
+       return (CurrentItem->Attributes.Usage.Page == USAGE_PAGE_KEYBOARD);\r

 }\r
 }\r