From 35a0fe93848cc6e1a79d2e606a2e3f6a84ba5755 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 9 Feb 2010 12:30:51 +0000 Subject: Fixed USB_GetHIDReportSize() returning the number of bits in the specified report instead of bytes. Moved the USB_GetHIDReportItemInfo() calls into the main report item passing loop in the *HostWithParser demos - it is fast enough not to effect performance, and avoids duplicate code. Make Webserver project report the LUFA version as part of the HTTP header. --- .../MouseHostWithParser/MouseHostWithParser.c | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c') diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c index db176e580..b6411858a 100644 --- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c +++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c @@ -132,15 +132,14 @@ int main(void) { HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber]; + /* Update the report item value if it is contained within the current report */ + if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem))) + continue; + + /* Determine what report item is being tested, process updated value as needed */ if ((ReportItem->Attributes.Usage.Page == USAGE_PAGE_BUTTON) && (ReportItem->ItemType == REPORT_ITEM_TYPE_In)) { - /* Get the mouse button value if it is contained within the current report, if not, - * skip to the next item in the parser list - */ - if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem))) - continue; - if (ReportItem->Value) LEDMask = LEDS_ALL_LEDS; } @@ -148,12 +147,6 @@ int main(void) (ReportItem->Attributes.Usage.Usage == USAGE_SCROLL_WHEEL) && (ReportItem->ItemType == REPORT_ITEM_TYPE_In)) { - /* Get the mouse wheel value if it is contained within the current - * report, if not, skip to the next item in the parser list - */ - if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem))) - continue; - int16_t WheelDelta = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize)); if (WheelDelta) @@ -164,12 +157,6 @@ int main(void) (ReportItem->Attributes.Usage.Usage == USAGE_Y)) && (ReportItem->ItemType == REPORT_ITEM_TYPE_In)) { - /* Get the mouse relative position value if it is contained within the current - * report, if not, skip to the next item in the parser list - */ - if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem))) - continue; - int16_t DeltaMovement = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize)); if (ReportItem->Attributes.Usage.Usage == USAGE_X) -- cgit v1.2.3