Rename the AT90USBXXX67 internal driver directory to AVRU4U6U7.

8 files changed, 67 insertions, 17 deletions

diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
index c00946247..bccfb8ca9 100644
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -251,15 +251,15 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8
  *  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/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.h b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.h
index 3841a4a57..46d73af15 100644
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.h
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.h
@@ -75,4 +75,6 @@
 		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);

 		void EVENT_USB_Host_DeviceEnumerationComplete(void);

 		

+		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem);

+		

 #endif

diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
index 6218f4cfb..b9edee1e1 100644
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
@@ -250,16 +250,36 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8
  *  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)

 {

+	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 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/ClassDriver/MouseHostWithParser/MouseHostWithParser.h b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h
index 038e69182..85f05d183 100644
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h
@@ -69,6 +69,9 @@
 		/** HID Report Descriptor Usage Page value for a Generic Desktop Control */

 		#define USAGE_PAGE_GENERIC_DCTRL    0x01

 

+		/** HID Report Descriptor Usage for a Mouse */

+		#define USAGE_MOUSE                 0x02

+

 		/** HID Report Descriptor Usage value for a X axis movement */

 		#define USAGE_X                     0x30

 

@@ -84,4 +87,6 @@
 		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);

 		void EVENT_USB_Host_DeviceEnumerationComplete(void);

 		

+		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem);

+		

 #endif

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