ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed incorrect HID interface class and subclass values in the Mouse and KeyboardMouse demos (thanks to Brian Dickman).

Browse source 
Capitolised the "Descriptor_Search" and "Descriptor_Search_Comp" prefixes of the values in the DSearch_Return_ErrorCodes_t and DSearch_Comp_Return_ErrorCodes_t enums.

Minor documentation improvements.
This commit is contained in:
Dean Camera 2009-04-19 11:43:21 +00:00
parent 32e735b2b2
commit 663f449c10
33 changed files with 142 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Demos/Host/MouseHostWithParser/ConfigDescriptor.c
View file

@ -123,11 +123,11 @@ DESCRIPTOR_COMPARATOR(NextMouseInterface)
if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class == MOUSE_CLASS) &&
(DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == MOUSE_PROTOCOL))
{
return Descriptor_Search_Found;
return DESCRIPTOR_SEARCH_Found;
}
}
return Descriptor_Search_NotFound;
return DESCRIPTOR_SEARCH_NotFound;
}
/** Descriptor comparator function. This comparator function is can be called while processing an attached USB device's
@ -144,14 +144,14 @@ DESCRIPTOR_COMPARATOR(NextInterfaceMouseDataEndpoint)
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)
{
if (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Endpoint_t).EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)
return Descriptor_Search_Found;
return DESCRIPTOR_SEARCH_Found;
}
else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
{
return Descriptor_Search_Fail;
return DESCRIPTOR_SEARCH_Fail;
}
return Descriptor_Search_NotFound;
return DESCRIPTOR_SEARCH_NotFound;
}
/** Descriptor comparator function. This comparator function is can be called while processing an attached USB device's
@ -165,7 +165,7 @@ DESCRIPTOR_COMPARATOR(NextInterfaceMouseDataEndpoint)
DESCRIPTOR_COMPARATOR(NextHID)
{
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_HID)
return Descriptor_Search_Found;
return DESCRIPTOR_SEARCH_Found;
else
return Descriptor_Search_NotFound;
return DESCRIPTOR_SEARCH_NotFound;
}

2
Demos/Host/MouseHostWithParser/HIDReport.c
View file

@ -64,7 +64,7 @@ uint8_t GetHIDReportData(void)
return ParseControlError;
/* Send the HID report to the parser for processing */
if (ProcessHIDReport(HIDReportData, HIDReportSize, &HIDReportInfo) != HID_PARSE_Successful)
if (USB_ProcessHIDReport(HIDReportData, HIDReportSize, &HIDReportInfo) != HID_PARSE_Successful)
return ParseError;
return ParseSuccessful;

2
Demos/Host/MouseHostWithParser/HIDReport.h
View file

@ -37,7 +37,7 @@
#define _HID_REPORT_H_
/* Includes: */
#include <LUFA/Drivers/USB/USB.h> // HID Class Report Parser
#include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include "MouseHostWithParser.h"

4
Demos/Host/MouseHostWithParser/MouseHostWithParser.c
View file

@ -312,7 +312,7 @@ void ProcessMouseReport(uint8_t* MouseReport)
(ReportItem->ItemType == REPORT_ITEM_TYPE_In))
{
/* Get the mouse button value */
FoundData = GetReportItemInfo(MouseReport, ReportItem);
FoundData = USB_GetHIDReportItemInfo(MouseReport, ReportItem);
/* For multi-report devices - if the requested data was not in the issued report, continue */
if (!(FoundData))
@ -328,7 +328,7 @@ void ProcessMouseReport(uint8_t* MouseReport)
(ReportItem->ItemType == REPORT_ITEM_TYPE_In))
{
/* Get the mouse relative position value */
FoundData = GetReportItemInfo(MouseReport, ReportItem);
FoundData = USB_GetHIDReportItemInfo(MouseReport, ReportItem);
/* For multi-report devices - if the requested data was not in the issued report, continue */
if (!(FoundData))