Rename the AT90USBXXX67 internal driver directory to AVRU4U6U7.

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

diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
index 6218f4c..b9edee1 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
@@ -250,16 +250,36 @@ 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
- *  \param[in] 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
-bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_Attributes_t* CurrentItemAttributes)\r
+bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem)\r
 {\r
+       bool IsMouse = false;\r
+\r
+       /* Iterate through the item's collection path, until either the root collection node or a collection with the\r
+        * Mouse Usage is found - this prevents Joysticks, which use identical descriptors except for the Joystick usage\r
+        * parent node, from being erronously treated as a mouse\r
+        */\r
+       for (HID_CollectionPath_t* CurrPath = CurrentItem->CollectionPath; CurrPath != NULL; CurrPath = CurrPath->Parent)\r
+       {\r
+               if ((CurrPath->Usage.Page  == USAGE_PAGE_GENERIC_DCTRL) &&\r
+                   (CurrPath->Usage.Usage == USAGE_MOUSE))\r
+               {\r
+                       IsMouse = true;\r
+                       break;\r
+               }\r
+       }\r
+\r
+       /* If a collection with the mouse usage was not found, indicate that we are not interested in this item */\r
+       if (!IsMouse)\r
+         return false;\r
+\r
        /* Check the attributes of the current item - see if we are interested in it or not;\r
         * only store BUTTON and GENERIC_DESKTOP_CONTROL items into the Processed HID Report\r
         * structure to save RAM and ignore the rest\r
         */\r
-       return ((CurrentItemAttributes->Usage.Page == USAGE_PAGE_BUTTON) ||\r
-               (CurrentItemAttributes->Usage.Page == USAGE_PAGE_GENERIC_DCTRL));\r
+       return ((CurrentItem->Attributes.Usage.Page == USAGE_PAGE_BUTTON) ||\r
+               (CurrentItem->Attributes.Usage.Page == USAGE_PAGE_GENERIC_DCTRL));\r
 }\r