diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-11-03 11:11:51 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-11-03 11:11:51 +0000 |
| commit | 5832bab02f9dedee5fae540f0e38b7417cddfb9d (patch) | |
| tree | 9baef6533db5d90b0d2425719cd6d6229631ec1d /Demos/Host/LowLevel | |
| parent | 870591983c80053d05175cfe54bab603a8a945d9 (diff) | |
| download | lufa-5832bab02f9dedee5fae540f0e38b7417cddfb9d.tar.gz lufa-5832bab02f9dedee5fae540f0e38b7417cddfb9d.tar.bz2 lufa-5832bab02f9dedee5fae540f0e38b7417cddfb9d.zip | |
Rename the AT90USBXXX67 internal driver directory to AVRU4U6U7.
Diffstat (limited to 'Demos/Host/LowLevel')
4 files changed, 33 insertions, 10 deletions
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.c b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.c index 523765b11..0ad7d4b92 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.c +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.c @@ -75,15 +75,15 @@ uint8_t GetHIDReportData(void) * we aren't interested in (preventing us from being able to extract them later on, but saving on the RAM they would
* have occupied).
*
- * \param[in] CurrentItemAttributes Pointer to the attrbutes of the item the HID report parser is currently working with
+ * \param[in] CurrentItem Pointer to the item the HID report parser is currently working with
*
* \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded
*/
-bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_Attributes_t* CurrentItemAttributes)
+bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem)
{
/* Check the attributes of the current item - see if we are interested in it or not;
* only store KEYBOARD usage page items into the Processed HID Report structure to
* save RAM and ignore the rest
*/
- return (CurrentItemAttributes->Usage.Page == USAGE_PAGE_KEYBOARD);
+ return (CurrentItem->Attributes.Usage.Page == USAGE_PAGE_KEYBOARD);
}
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h index 974cf72c7..11f4e595c 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h @@ -77,6 +77,6 @@ /* Function Prototypes: */
uint8_t GetHIDReportData(void);
- bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_Attributes_t* CurrentItemAttributes);
+ bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItemAttributes);
#endif
diff --git a/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.c b/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.c index 4d13ce519..595b586a9 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.c +++ b/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.c @@ -75,16 +75,36 @@ uint8_t GetHIDReportData(void) * we aren't interested in (preventing us from being able to extract them later on, but saving on the RAM they would
* have occupied).
*
- * \param[in] CurrentItemAttributes Pointer to the attrbutes of the item the HID report parser is currently working with
+ * \param[in] CurrentItem Pointer to the item the HID report parser is currently working with
*
* \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded
*/
-bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_Attributes_t* CurrentItemAttributes)
+bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem)
{
- /* Check the attributes of the current item - see if we are interested in it or not;
+ bool IsMouse = false;
+
+ /* Iterate through the item's collection path, until either the root collection node or a collection with the
+ * Mouse Usage is found - this prevents Joysticks, which use identical descriptors except for the Joystick usage
+ * parent node, from being erronously treated as a mouse
+ */
+ for (HID_CollectionPath_t* CurrPath = CurrentItem->CollectionPath; CurrPath != NULL; CurrPath = CurrPath->Parent)
+ {
+ if ((CurrPath->Usage.Page == USAGE_PAGE_GENERIC_DCTRL) &&
+ (CurrPath->Usage.Usage == USAGE_MOUSE))
+ {
+ IsMouse = true;
+ break;
+ }
+ }
+
+ /* If a collection with the mouse usage was not found, indicate that we are not interested in this item */
+ if (!IsMouse)
+ return false;
+
+ /* Check the attributes of the current mouse item - see if we are interested in it or not;
* only store BUTTON and GENERIC_DESKTOP_CONTROL items into the Processed HID Report
* structure to save RAM and ignore the rest
*/
- return ((CurrentItemAttributes->Usage.Page == USAGE_PAGE_BUTTON) ||
- (CurrentItemAttributes->Usage.Page == USAGE_PAGE_GENERIC_DCTRL));
+ return ((CurrentItem->Attributes.Usage.Page == USAGE_PAGE_BUTTON) ||
+ (CurrentItem->Attributes.Usage.Page == USAGE_PAGE_GENERIC_DCTRL));
}
diff --git a/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h b/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h index ae6871c57..41966da17 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h +++ b/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h @@ -43,6 +43,9 @@ #include "MouseHostWithParser.h"
/* Macros: */
+ /** HID Report Descriptor Usage for a Mouse */
+ #define USAGE_MOUSE 0x02
+
/** HID Report Descriptor Usage Page value for a toggle button */
#define USAGE_PAGE_BUTTON 0x09
@@ -86,6 +89,6 @@ /* Function Prototypes: */
uint8_t GetHIDReportData(void);
- bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_Attributes_t* CurrentItemAttributes);
+ bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem);
#endif
|