Fixed USB_GetHIDReportSize() returning the number of bits in the specified report...

[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 db176e5..b641185 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
@@ -132,15 +132,14 @@ int main(void)
                                        {\r
                                                HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];\r
                                                \r
                                        {\r
                                                HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];\r
                                                \r

+                                               /* Update the report item value if it is contained within the current report */\r
+                                               if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem)))\r
+                                                 continue;\r
+                                               \r
+                                               /* Determine what report item is being tested, process updated value as needed */\r

                                                if ((ReportItem->Attributes.Usage.Page        == USAGE_PAGE_BUTTON) &&\r
                                                        (ReportItem->ItemType                     == REPORT_ITEM_TYPE_In))\r
                                                {\r
                                                if ((ReportItem->Attributes.Usage.Page        == USAGE_PAGE_BUTTON) &&\r
                                                        (ReportItem->ItemType                     == REPORT_ITEM_TYPE_In))\r
                                                {\r

-                                                       /* Get the mouse button value if it is contained within the current report, if not,\r
-                                                        * skip to the next item in the parser list\r
-                                                        */\r
-                                                       if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem)))\r
-                                                         continue;\r
-\r

                                                        if (ReportItem->Value)\r
                                                          LEDMask = LEDS_ALL_LEDS;\r
                                                }\r
                                                        if (ReportItem->Value)\r
                                                          LEDMask = LEDS_ALL_LEDS;\r
                                                }\r


@@ -148,12 +147,6 @@ int main(void)
                                                                 (ReportItem->Attributes.Usage.Usage  == USAGE_SCROLL_WHEEL)       &&\r
                                                                 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))\r
                                                {\r
                                                                 (ReportItem->Attributes.Usage.Usage  == USAGE_SCROLL_WHEEL)       &&\r
                                                                 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))\r
                                                {\r

-                                                       /* Get the mouse wheel value if it is contained within the current \r
-                                                        * report, if not, skip to the next item in the parser list\r
-                                                        */\r
-                                                       if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem)))\r
-                                                         continue;                                                       \r
-\r

                                                        int16_t WheelDelta = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize));\r
                                                        \r
                                                        if (WheelDelta)\r
                                                        int16_t WheelDelta = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize));\r
                                                        \r
                                                        if (WheelDelta)\r


@@ -164,12 +157,6 @@ int main(void)
                                                                  (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&\r
                                                                 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))\r
                                                {\r
                                                                  (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&\r
                                                                 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))\r
                                                {\r

-                                                       /* Get the mouse relative position value if it is contained within the current \r
-                                                        * report, if not, skip to the next item in the parser list\r
-                                                        */\r
-                                                       if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem)))\r
-                                                         continue;                                                       \r
-\r

                                                        int16_t DeltaMovement = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize));\r
                                                        \r
                                                        if (ReportItem->Attributes.Usage.Usage == USAGE_X)\r
                                                        int16_t DeltaMovement = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize));\r
                                                        \r
                                                        if (ReportItem->Attributes.Usage.Usage == USAGE_X)\r