diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-09 12:30:51 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-09 12:30:51 +0000 |
| commit | 35a0fe93848cc6e1a79d2e606a2e3f6a84ba5755 (patch) | |
| tree | 66d7ecb248071bca4f6159d783ba0970bf37caa1 /Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c | |
| parent | 3ab0b3a027db2549bc024780d7787061705056f6 (diff) | |
| download | lufa-35a0fe93848cc6e1a79d2e606a2e3f6a84ba5755.tar.gz lufa-35a0fe93848cc6e1a79d2e606a2e3f6a84ba5755.tar.bz2 lufa-35a0fe93848cc6e1a79d2e606a2e3f6a84ba5755.zip | |
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.
Diffstat (limited to 'Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c')
| -rw-r--r-- | Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c | 23 |
1 files changed, 5 insertions, 18 deletions
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)
|