New HID report item macros (with HID_RI_ prefix) to allow for easy creation and editing of HID report descriptors.

Changed over all project and demo HID report descriptors to use the new HID report item macros.

Moved the HIDParser.c source file to the LUFA/Drivers/USB/Class/Common/ directory from the LUFA/Drivers/USB/Class/Host/.

4 files changed, 1 insertions, 862 deletions

diff --git a/LUFA/Drivers/USB/Class/Host/HID.h b/LUFA/Drivers/USB/Class/Host/HID.h
index 14ba24bce..901832476 100644
--- a/LUFA/Drivers/USB/Class/Host/HID.h
+++ b/LUFA/Drivers/USB/Class/Host/HID.h
@@ -43,7 +43,7 @@
  *  \section Sec_Dependencies Module Source Dependencies
  *  The following files must be built with any user project that uses this module:
  *    - LUFA/Drivers/USB/Class/Host/HID.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *    - LUFA/Drivers/USB/Class/Host/HIDParser.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
+ *    - LUFA/Drivers/USB/Class/Common/HIDParser.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *
  *  \section Sec_ModDescription Module Description
  *  Host Mode USB Class driver framework interface, for the HID USB Class driver.
@@ -57,7 +57,6 @@
 	/* Includes: */
 		#include "../../USB.h"
 		#include "../Common/HID.h"
-		#include "HIDParser.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.c b/LUFA/Drivers/USB/Class/Host/HIDParser.c
deleted file mode 100644
index cd0741d7e..000000000
--- a/LUFA/Drivers/USB/Class/Host/HIDParser.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2011.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../HighLevel/USBMode.h"
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_HID_DRIVER
-#include "HIDParser.h"
-
-uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
-                             uint16_t ReportSize,
-                             HID_ReportInfo_t* const ParserData)
-{
-	HID_StateTable_t      StateTable[HID_STATETABLE_STACK_DEPTH];
-	HID_StateTable_t*     CurrStateTable          = &StateTable[0];
-	HID_CollectionPath_t* CurrCollectionPath      = NULL;
-	HID_ReportSizeInfo_t* CurrReportIDInfo        = &ParserData->ReportIDSizes[0];
-	uint16_t              UsageList[HID_USAGE_STACK_DEPTH];
-	uint8_t               UsageListSize           = 0;
-	HID_MinMax_t          UsageMinMax             = {0, 0};
-
-	memset(ParserData,       0x00, sizeof(HID_ReportInfo_t));
-	memset(CurrStateTable,   0x00, sizeof(HID_StateTable_t));
-	memset(CurrReportIDInfo, 0x00, sizeof(HID_ReportSizeInfo_t));
-
-	ParserData->TotalDeviceReports = 1;
-
-	while (ReportSize)
-	{
-		uint8_t  HIDReportItem  = *ReportData;
-		uint32_t ReportItemData = 0;
-
-		ReportData++;
-		ReportSize--;
-
-		switch (HIDReportItem & DATA_SIZE_MASK)
-		{
-			case DATA_SIZE_4:
-				ReportItemData  = *((uint32_t*)ReportData);
-				ReportSize     -= 4;
-				ReportData     += 4;
-				break;
-			case DATA_SIZE_2:
-				ReportItemData  = *((uint16_t*)ReportData);
-				ReportSize     -= 2;
-				ReportData     += 2;
-				break;
-			case DATA_SIZE_1:
-				ReportItemData  = *((uint8_t*)ReportData);
-				ReportSize     -= 1;
-				ReportData     += 1;
-				break;
-		}
-
-		switch (HIDReportItem & (TYPE_MASK | TAG_MASK))
-		{
-			case (TYPE_GLOBAL | TAG_GLOBAL_PUSH):
-				if (CurrStateTable == &StateTable[HID_STATETABLE_STACK_DEPTH - 1])
-				  return HID_PARSE_HIDStackOverflow;
-
-				memcpy((CurrStateTable + 1),
-				       CurrStateTable,
-				       sizeof(HID_ReportItem_t));
-
-				CurrStateTable++;
-				break;
-			case (TYPE_GLOBAL | TAG_GLOBAL_POP):
-				if (CurrStateTable == &StateTable[0])
-				  return HID_PARSE_HIDStackUnderflow;
-
-				CurrStateTable--;
-				break;
-			case (TYPE_GLOBAL | TAG_GLOBAL_USAGEPAGE):
-				CurrStateTable->Attributes.Usage.Page       = ReportItemData;
-				break;
-			case (TYPE_GLOBAL | TAG_GLOBAL_LOGICALMIN):
-				CurrStateTable->Attributes.Logical.Minimum  = ReportItemData;
-				break;
-			case (TYPE_GLOBAL | TAG_GLOBAL_LOGICALMAX):
-				CurrStateTable->Attributes.Logical.Maximum  = ReportItemData;
-				break;
-			case (TYPE_GLOBAL | TAG_GLOBAL_PHYSMIN):
-				CurrStateTable->Attributes.Physical.Minimum = ReportItemData;
-				break;
-			case (TYPE_GLOBAL | TAG_GLOBAL_PHYSMAX):
-				CurrStateTable->Attributes.Physical.Maximum = ReportItemData;
-				break;
-			case (TYPE_GLOBAL | TAG_GLOBAL_UNITEXP):
-				CurrStateTable->Attributes.Unit.Exponent    = ReportItemData;
-				break;
-			case (TYPE_GLOBAL | TAG_GLOBAL_UNIT):
-				CurrStateTable->Attributes.Unit.Type        = ReportItemData;
-				break;
-			case (TYPE_GLOBAL | TAG_GLOBAL_REPORTSIZE):
-				CurrStateTable->Attributes.BitSize          = ReportItemData;
-				break;
-			case (TYPE_GLOBAL | TAG_GLOBAL_REPORTCOUNT):
-				CurrStateTable->ReportCount                 = ReportItemData;
-				break;
-			case (TYPE_GLOBAL | TAG_GLOBAL_REPORTID):
-				CurrStateTable->ReportID                    = ReportItemData;
-
-				if (ParserData->UsingReportIDs)
-				{
-					CurrReportIDInfo = NULL;
-
-					for (uint8_t i = 0; i < ParserData->TotalDeviceReports; i++)
-					{
-						if (ParserData->ReportIDSizes[i].ReportID == CurrStateTable->ReportID)
-						{
-							CurrReportIDInfo = &ParserData->ReportIDSizes[i];
-							break;
-						}
-					}
-
-					if (CurrReportIDInfo == NULL)
-					{
-						if (ParserData->TotalDeviceReports == HID_MAX_REPORT_IDS)
-						  return HID_PARSE_InsufficientReportIDItems;
-
-						CurrReportIDInfo = &ParserData->ReportIDSizes[ParserData->TotalDeviceReports++];
-						memset(CurrReportIDInfo, 0x00, sizeof(HID_ReportSizeInfo_t));
-					}
-				}
-
-				ParserData->UsingReportIDs = true;
-
-				CurrReportIDInfo->ReportID = CurrStateTable->ReportID;
-				break;
-			case (TYPE_LOCAL | TAG_LOCAL_USAGE):
-				if (UsageListSize == HID_USAGE_STACK_DEPTH)
-				  return HID_PARSE_UsageListOverflow;
-
-				UsageList[UsageListSize++] = ReportItemData;
-				break;
-			case (TYPE_LOCAL | TAG_LOCAL_USAGEMIN):
-				UsageMinMax.Minimum = ReportItemData;
-				break;
-			case (TYPE_LOCAL | TAG_LOCAL_USAGEMAX):
-				UsageMinMax.Maximum = ReportItemData;
-				break;
-			case (TYPE_MAIN | TAG_MAIN_COLLECTION):
-				if (CurrCollectionPath == NULL)
-				{
-					CurrCollectionPath = &ParserData->CollectionPaths[0];
-				}
-				else
-				{
-					HID_CollectionPath_t* ParentCollectionPath = CurrCollectionPath;
-
-					CurrCollectionPath = &ParserData->CollectionPaths[1];
-
-					while (CurrCollectionPath->Parent != NULL)
-					{
-						if (CurrCollectionPath == &ParserData->CollectionPaths[HID_MAX_COLLECTIONS - 1])
-						  return HID_PARSE_InsufficientCollectionPaths;
-
-						CurrCollectionPath++;
-					}
-
-					CurrCollectionPath->Parent = ParentCollectionPath;
-				}
-
-				CurrCollectionPath->Type = ReportItemData;
-				CurrCollectionPath->Usage.Page = CurrStateTable->Attributes.Usage.Page;
-
-				if (UsageListSize)
-				{
-					CurrCollectionPath->Usage.Usage = UsageList[0];
-
-					for (uint8_t i = 0; i < UsageListSize; i++)
-					  UsageList[i] = UsageList[i + 1];
-
-					UsageListSize--;
-				}
-				else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)
-				{
-					CurrCollectionPath->Usage.Usage = UsageMinMax.Minimum++;
-				}
-
-				break;
-			case (TYPE_MAIN | TAG_MAIN_ENDCOLLECTION):
-				if (CurrCollectionPath == NULL)
-				  return HID_PARSE_UnexpectedEndCollection;
-
-				CurrCollectionPath = CurrCollectionPath->Parent;
-				break;
-			case (TYPE_MAIN | TAG_MAIN_INPUT):
-			case (TYPE_MAIN | TAG_MAIN_OUTPUT):
-			case (TYPE_MAIN | TAG_MAIN_FEATURE):
-				for (uint8_t ReportItemNum = 0; ReportItemNum < CurrStateTable->ReportCount; ReportItemNum++)
-				{
-					HID_ReportItem_t NewReportItem;
-
-					memcpy(&NewReportItem.Attributes,
-					       &CurrStateTable->Attributes,
-					       sizeof(HID_ReportItem_Attributes_t));
-
-					NewReportItem.ItemFlags      = ReportItemData;
-					NewReportItem.CollectionPath = CurrCollectionPath;
-					NewReportItem.ReportID       = CurrStateTable->ReportID;
-
-					if (UsageListSize)
-					{
-						NewReportItem.Attributes.Usage.Usage = UsageList[0];
-
-						for (uint8_t i = 0; i < UsageListSize; i++)
-						  UsageList[i] = UsageList[i + 1];
-
-						UsageListSize--;
-					}
-					else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)
-					{
-						NewReportItem.Attributes.Usage.Usage = UsageMinMax.Minimum++;
-					}
-
-					uint8_t ItemTag = (HIDReportItem & TAG_MASK);
-
-					if (ItemTag == TAG_MAIN_INPUT)
-					  NewReportItem.ItemType = HID_REPORT_ITEM_In;
-					else if (ItemTag == TAG_MAIN_OUTPUT)
-					  NewReportItem.ItemType = HID_REPORT_ITEM_Out;
-					else
-					  NewReportItem.ItemType = HID_REPORT_ITEM_Feature;
-
-					NewReportItem.BitOffset = CurrReportIDInfo->ReportSizeBits[NewReportItem.ItemType];
-
-					CurrReportIDInfo->ReportSizeBits[NewReportItem.ItemType] += CurrStateTable->Attributes.BitSize;
-
-					if (ParserData->LargestReportSizeBits < NewReportItem.BitOffset)
-					  ParserData->LargestReportSizeBits = NewReportItem.BitOffset;
-
-					if (!(ReportItemData & IOF_CONSTANT) && CALLBACK_HIDParser_FilterHIDReportItem(&NewReportItem))
-					{
-						if (ParserData->TotalReportItems == HID_MAX_REPORTITEMS)
-						  return HID_PARSE_InsufficientReportItems;
-
-						memcpy(&ParserData->ReportItems[ParserData->TotalReportItems],
-						       &NewReportItem, sizeof(HID_ReportItem_t));
-
-						ParserData->TotalReportItems++;
-					}
-				}
-
-				break;
-		}
-
-		if ((HIDReportItem & TYPE_MASK) == TYPE_MAIN)
-		{
-			UsageMinMax.Minimum = 0;
-			UsageMinMax.Maximum = 0;
-			UsageListSize       = 0;
-		}
-	}
-
-	if (!(ParserData->TotalReportItems))
-	  return HID_PARSE_NoUnfilteredReportItems;
-
-	return HID_PARSE_Successful;
-}
-
-bool USB_GetHIDReportItemInfo(const uint8_t* ReportData,
-                              HID_ReportItem_t* const ReportItem)
-{
-	uint16_t DataBitsRem  = ReportItem->Attributes.BitSize;
-	uint16_t CurrentBit   = ReportItem->BitOffset;
-	uint32_t BitMask      = (1 << 0);
-
-	if (ReportItem->ReportID)
-	{
-		if (ReportItem->ReportID != ReportData[0])
-		  return false;
-
-		ReportData++;
-	}
-
-	ReportItem->PreviousValue = ReportItem->Value;
-	ReportItem->Value = 0;
-
-	while (DataBitsRem--)
-	{
-		if (ReportData[CurrentBit / 8] & (1 << (CurrentBit % 8)))
-		  ReportItem->Value |= BitMask;
-
-		CurrentBit++;
-		BitMask <<= 1;
-	}
-
-	return true;
-}
-
-void USB_SetHIDReportItemInfo(uint8_t* ReportData,
-                              HID_ReportItem_t* const ReportItem)
-{
-	uint16_t DataBitsRem  = ReportItem->Attributes.BitSize;
-	uint16_t CurrentBit   = ReportItem->BitOffset;
-	uint32_t BitMask      = (1 << 0);
-
-	if (ReportItem->ReportID)
-	{
-		ReportData[0] = ReportItem->ReportID;
-		ReportData++;
-	}
-
-	ReportItem->PreviousValue = ReportItem->Value;
-
-	while (DataBitsRem--)
-	{
-		if (ReportItem->Value & (1 << (CurrentBit % 8)))
-		  ReportData[CurrentBit / 8] |= BitMask;
-
-		CurrentBit++;
-		BitMask <<= 1;
-	}
-}
-
-uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData,
-                              const uint8_t ReportID,
-                              const uint8_t ReportType)
-{
-	for (uint8_t i = 0; i < HID_MAX_REPORT_IDS; i++)
-	{
-		uint16_t ReportSizeBits = ParserData->ReportIDSizes[i].ReportSizeBits[ReportType];
-
-		if (ParserData->ReportIDSizes[i].ReportID == ReportID)
-		  return ((ReportSizeBits >> 3) + ((ReportSizeBits & 0x07) ? 1 : 0));
-	}
-
-	return 0;
-}
-
-#endif
-
diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.h b/LUFA/Drivers/USB/Class/Host/HIDParser.h
deleted file mode 100644
index e5b4f9b5f..000000000
--- a/LUFA/Drivers/USB/Class/Host/HIDParser.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2011.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-/** \file
- *  \brief USB Human Interface Device (HID) Class report descriptor parser.
- *
- *  This file allows for the easy parsing of complex HID report descriptors, which describes the data that
- *  a HID device transmits to the host. It also provides an easy API for extracting and processing the data
- *  elements inside a HID report sent from an attached HID device.
- */
-
-/** \ingroup Group_USB
- *  @defgroup Group_HIDParser HID Report Parser
- *
- *  \section Sec_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/HIDParser.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *
- *  \section Sec_ModDescription Module Description
- *  Functions, macros, variables, enums and types related to the parsing of HID class device report descriptors.
- *
- *  The processed HID report is presented back to the user application as a flat structure containing each report
- *  item's IN, OUT and FEATURE items along with each item's attributes.
- *
- *  This library portion also allows for easy setting and retrieval of data from a HID report, including devices
- *  with multiple reports on the one HID interface.
- *
- *  @{
- */
-
-#ifndef __HIDPARSER_H__
-#define __HIDPARSER_H__
-
-	/* Includes: */
-		#include <string.h>
-		#include <stdbool.h>
-
-		#include "HIDReportData.h"
-		#include "../Common/HID.h"
-
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Macros: */
-		#if !defined(HID_STATETABLE_STACK_DEPTH) || defined(__DOXYGEN__)
-			/** Constant indicating the maximum stack depth of the state table. A larger state table
-			 *  allows for more PUSH/POP report items to be nested, but consumes more memory. By default
-			 *  this is set to 2 levels (allowing non-nested PUSH items) but this can be overridden by
-			 *  defining \c HID_STATETABLE_STACK_DEPTH to another value in the user project makefile, passing the
-			 *  define to the compiler using the -D compiler switch.
-			 */
-			#define HID_STATETABLE_STACK_DEPTH    2
-		#endif
-
-		#if !defined(HID_USAGE_STACK_DEPTH) || defined(__DOXYGEN__)
-			/** Constant indicating the maximum stack depth of the usage table. A larger usage table
-			 *  allows for more USAGE items to be indicated sequentially for REPORT COUNT entries of more than
-			 *  one, but requires more stack space. By default this is set to 8 levels (allowing for a report
-			 *  item with a count of 8) but this can be overridden by defining \c HID_USAGE_STACK_DEPTH to another
-			 *  value in the user project makefile, passing the define to the compiler using the -D compiler
-			 *  switch.
-			 */
-			#define HID_USAGE_STACK_DEPTH         8
-		#endif
-
-		#if !defined(HID_MAX_COLLECTIONS) || defined(__DOXYGEN__)
-			/** Constant indicating the maximum number of COLLECTION items (nested or unnested) that can be
-			 *  processed in the report item descriptor. A large value allows for more COLLECTION items to be
-			 *  processed, but consumes more memory. By default this is set to 10 collections, but this can be
-			 *  overridden by defining \c HID_MAX_COLLECTIONS to another value in the user project makefile, passing
-			 *  the define to the compiler using the -D compiler switch.
-			 */
-			#define HID_MAX_COLLECTIONS           10
-		#endif
-
-		#if !defined(HID_MAX_REPORTITEMS) || defined(__DOXYGEN__)
-			/** Constant indicating the maximum number of report items (IN, OUT or FEATURE) that can be processed
-			 *  in the report item descriptor and stored in the user HID Report Info structure. A large value allows
-			 *  for more report items to be stored, but consumes more memory. By default this is set to 20 items,
-			 *  but this can be overridden by defining \c HID_MAX_REPORTITEMS to another value in the user project
-			 *  makefile, and passing the define to the compiler using the -D compiler switch.
-			 */
-			#define HID_MAX_REPORTITEMS           20
-		#endif
-
-		#if !defined(HID_MAX_REPORT_IDS) || defined(__DOXYGEN__)
-			/** Constant indicating the maximum number of unique report IDs that can be processed in the report item
-			 *  descriptor for the report size information array in the user HID Report Info structure. A large value
-			 *  allows for more report ID report sizes to be stored, but consumes more memory. By default this is set
-			 *  to 10 items, but this can be overridden by defining \c HID_MAX_REPORT_IDS to another value in the user project
-			 *  makefile, and passing the define to the compiler using the -D compiler switch. Note that IN, OUT and FEATURE
-			 *  items sharing the same report ID consume only one size item in the array.
-			 */
-			#define HID_MAX_REPORT_IDS            10
-		#endif
-
-		/** Returns the value a given HID report item (once its value has been fetched via \ref USB_GetHIDReportItemInfo())
-		 *  left-aligned to the given data type. This allows for signed data to be interpreted correctly, by shifting the data
-		 *  leftwards until the data's sign bit is in the correct position.
-		 *
-		 *  \param[in] ReportItem  HID Report Item whose retrieved value is to be aligned.
-		 *  \param[in] Type        Data type to align the HID report item's value to.
-		 *
-		 *  \return Left-aligned data of the given report item's pre-retrieved value for the given datatype.
-		 */
-		#define HID_ALIGN_DATA(ReportItem, Type) ((Type)(ReportItem->Value << ((8 * sizeof(Type)) - ReportItem->Attributes.BitSize)))
-
-	/* Public Interface - May be used in end-application: */
-		/* Enums: */
-			/** Enum for the possible error codes in the return value of the \ref USB_ProcessHIDReport() function. */
-			enum HID_Parse_ErrorCodes_t
-			{
-				HID_PARSE_Successful                  = 0, /**< Successful parse of the HID report descriptor, no error. */
-				HID_PARSE_HIDStackOverflow            = 1, /**< More than \ref HID_STATETABLE_STACK_DEPTH nested PUSHes in the report. */
-				HID_PARSE_HIDStackUnderflow           = 2, /**< A POP was found when the state table stack was empty. */
-				HID_PARSE_InsufficientReportItems     = 3, /**< More than \ref HID_MAX_REPORTITEMS report items in the report. */
-				HID_PARSE_UnexpectedEndCollection     = 4, /**< An END COLLECTION item found without matching COLLECTION item. */
-				HID_PARSE_InsufficientCollectionPaths = 5, /**< More than \ref HID_MAX_COLLECTIONS collections in the report. */
-				HID_PARSE_UsageListOverflow           = 6, /**< More than \ref HID_USAGE_STACK_DEPTH usages listed in a row. */
-				HID_PARSE_InsufficientReportIDItems   = 7, /**< More than \ref HID_MAX_REPORT_IDS report IDs in the device. */
-				HID_PARSE_NoUnfilteredReportItems     = 8, /**< All report items from the device were filtered by the filtering callback routine. */
-			};
-
-		/* Type Defines: */
-			/** \brief HID Parser Report Item Min/Max Structure.
-			 *
-			 *  Type define for an attribute with both minimum and maximum values (e.g. Logical Min/Max).
-			 */
-			typedef struct
-			{
-				uint32_t                     Minimum; /**< Minimum value for the attribute. */
-				uint32_t                     Maximum; /**< Maximum value for the attribute. */
-			} HID_MinMax_t;
-
-			/** \brief HID Parser Report Item Unit Structure.
-			 *
-			 *  Type define for the Unit attributes of a report item.
-			 */
-			typedef struct
-			{
-				uint32_t                     Type;     /**< Unit type (refer to HID specifications for details). */
-				uint8_t                      Exponent; /**< Unit exponent (refer to HID specifications for details). */
-			} HID_Unit_t;
-
-			/** \brief HID Parser Report Item Usage Structure.
-			 *
-			 *  Type define for the Usage attributes of a report item.
-			 */
-			typedef struct
-			{
-				uint16_t                     Page;   /**< Usage page of the report item. */
-				uint16_t                     Usage;  /**< Usage of the report item. */
-			} HID_Usage_t;
-
-			/** \brief HID Parser Report Item Collection Path Structure.
-			 *
-			 *  Type define for a COLLECTION object. Contains the collection attributes and a reference to the
-			 *  parent collection if any.
-			 */
-			typedef struct CollectionPath
-			{
-				uint8_t                      Type;   /**< Collection type (e.g. "Generic Desktop"). */
-				HID_Usage_t                  Usage;  /**< Collection usage. */
-				struct CollectionPath*       Parent; /**< Reference to parent collection, or \c NULL if root collection. */
-			} HID_CollectionPath_t;
-
-			/** \brief HID Parser Report Item Attributes Structure.
-			 *
-			 *  Type define for all the data attributes of a report item, except flags.
-			 */
-			typedef struct
-			{
-				uint8_t                      BitSize;  /**< Size in bits of the report item's data. */
-
-				HID_Usage_t                  Usage;    /**< Usage of the report item. */
-				HID_Unit_t                   Unit;     /**< Unit type and exponent of the report item. */
-				HID_MinMax_t                 Logical;  /**< Logical minimum and maximum of the report item. */
-				HID_MinMax_t                 Physical; /**< Physical minimum and maximum of the report item. */
-			} HID_ReportItem_Attributes_t;
-
-			/** \brief HID Parser Report Item Details Structure.
-			 *
-			 *  Type define for a report item (IN, OUT or FEATURE) layout attributes and other details.
-			 */
-			typedef struct
-			{
-				uint16_t                     BitOffset;      /**< Bit offset in the IN, OUT or FEATURE report of the item. */
-				uint8_t                      ItemType;       /**< Report item type, a value in \ref HID_ReportItemTypes_t. */
-				uint16_t                     ItemFlags;      /**< Item data flags, such as constant/variable, etc. */
-				uint8_t                      ReportID;       /**< Report ID this item belongs to, or 0x00 if device has only one report */
-				HID_CollectionPath_t*        CollectionPath; /**< Collection path of the item. */
-
-				HID_ReportItem_Attributes_t  Attributes;     /**< Report item attributes. */
-
-				uint32_t                     Value;          /**< Current value of the report item - use \ref HID_ALIGN_DATA() when processing
-				                                              *   a retrieved value so that it is aligned to a specific type.
-				                                              */
-				uint32_t                     PreviousValue;  /**< Previous value of the report item. */
-			} HID_ReportItem_t;
-
-			/** \brief HID Parser Report Size Structure.
-			 *
-			 *  Type define for a report item size information structure, to retain the size of a device's reports by ID.
-			 */
-			typedef struct
-			{
-				uint8_t                      ReportID; /**< Report ID of the report within the HID interface. */
-				uint16_t                     ReportSizeBits[3]; /**< Total number of bits in each report type for the given Report ID,
-				                                                 *   indexed by the \ref HID_ReportItemTypes_t enum.
-																 */
-			} HID_ReportSizeInfo_t;
-
-			/** \brief HID Parser State Structure.
-			 *
-			 *  Type define for a complete processed HID report, including all report item data and collections.
-			 */
-			typedef struct
-			{
-				uint8_t                      TotalReportItems; /**< Total number of report items stored in the
-				                                                *   \c ReportItems array.
-				                                                */
-				HID_ReportItem_t             ReportItems[HID_MAX_REPORTITEMS]; /**< Report items array, including
-			                                                                    *   all IN, OUT and FEATURE items.
-				                                                                */
-				HID_CollectionPath_t         CollectionPaths[HID_MAX_COLLECTIONS]; /**< All collection items, referenced
-				                                                                    *   by the report items.
-				                                                                    */
-				uint8_t                      TotalDeviceReports; /**< Number of reports within the HID interface */
-				HID_ReportSizeInfo_t         ReportIDSizes[HID_MAX_REPORT_IDS]; /**< Report sizes for each report in the interface */
-				uint16_t                     LargestReportSizeBits; /**< Largest report that the attached device will generate, in bits */
-				bool                         UsingReportIDs; /**< Indicates if the device has at least one REPORT ID
-				                                              *   element in its HID report descriptor.
-				                                              */
-			} HID_ReportInfo_t;
-
-		/* Function Prototypes: */
-			/** Function to process a given HID report returned from an attached device, and store it into a given
-			 *  \ref HID_ReportInfo_t structure.
-			 *
-			 *  \param[in]  ReportData  Buffer containing the device's HID report table.
-			 *  \param[in]  ReportSize  Size in bytes of the HID report table.
-			 *  \param[out] ParserData  Pointer to a \ref HID_ReportInfo_t instance for the parser output.
-			 *
-			 *  \return A value in the \ref HID_Parse_ErrorCodes_t enum.
-			 */
-			uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
-			                             uint16_t ReportSize,
-			                             HID_ReportInfo_t* const ParserData) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Extracts the given report item's value out of the given HID report and places it into the Value
-			 *  member of the report item's \ref HID_ReportItem_t structure.
-			 *
-			 *  When called on a report with an item that exists in that report, this copies the report item's Value
-			 *  to it's PreviousValue element for easy checking to see if an item's value has changed before processing
-			 *  a report. If the given item does not exist in the report, the function does not modify the report item's
-			 *  data.
-			 *
-			 *  \param[in]     ReportData  Buffer containing an IN or FEATURE report from an attached device.
-			 *  \param[in,out] ReportItem  Pointer to the report item of interest in a \ref HID_ReportInfo_t ReportItem array.
-			 *
-			 *  \returns Boolean \c true if the item to retrieve was located in the given report, \c false otherwise.
-			 */
-			bool USB_GetHIDReportItemInfo(const uint8_t* ReportData,
-			                              HID_ReportItem_t* const ReportItem) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Retrieves the given report item's value out of the Value member of the report item's
-			 *  \ref HID_ReportItem_t structure and places it into the correct position in the HID report
-			 *  buffer. The report buffer is assumed to have the appropriate bits cleared before calling
-			 *  this function (i.e., the buffer should be explicitly cleared before report values are added).
-			 *
-			 *  When called, this copies the report item's Value element to it's PreviousValue element for easy
-			 *  checking to see if an item's value has changed before sending a report.
-			 *
-			 *  If the device has multiple HID reports, the first byte in the report is set to the report ID of the given item.
-			 *
-			 *  \param[out] ReportData  Buffer holding the current OUT or FEATURE report data.
-			 *  \param[in]  ReportItem  Pointer to the report item of interest in a \ref HID_ReportInfo_t ReportItem array.
-			 */
-			void USB_SetHIDReportItemInfo(uint8_t* ReportData,
-			                              HID_ReportItem_t* const ReportItem) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Retrieves the size of a given HID report in bytes from it's Report ID.
-			 *
-			 *  \param[in] ParserData  Pointer to a \ref HID_ReportInfo_t instance containing the parser output.
-			 *  \param[in] ReportID    Report ID of the report whose size is to be retrieved.
-			 *  \param[in] ReportType  Type of the report whose size is to be determined, a valued from the
-			 *                         \ref HID_ReportItemTypes_t enum.
-			 *
-			 *  \return Size of the report in bytes, or 0 if the report does not exist.
-			 */
-			uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData,
-			                              const uint8_t ReportID,
-			                              const uint8_t ReportType) ATTR_CONST ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Callback routine for the HID Report Parser. This callback <b>must</b> be implemented by the user code when
-			 *  the parser is used, to determine what report IN, OUT and FEATURE item's information is stored into the user
-			 *  \ref HID_ReportInfo_t structure. This can be used to filter only those items the application will be using, so that
-			 *  no RAM is wasted storing the attributes for report items which will never be referenced by the application.
-			 *
-			 *  \param[in] CurrentItem  Pointer to the current report item for user checking.
-			 *
-			 *  \return Boolean \c true if the item should be stored into the \ref HID_ReportInfo_t structure, \c false if
-			 *          it should be ignored.
-			 */
-			bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem);
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Type Defines: */
-			typedef struct
-			{
-				 HID_ReportItem_Attributes_t Attributes;
-				 uint8_t                     ReportCount;
-				 uint8_t                     ReportID;
-			} HID_StateTable_t;
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/LUFA/Drivers/USB/Class/Host/HIDReportData.h b/LUFA/Drivers/USB/Class/Host/HIDReportData.h
deleted file mode 100644
index 35dd46efa..000000000
--- a/LUFA/Drivers/USB/Class/Host/HIDReportData.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2011.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-/** \file
- *  \brief Constants for HID report item attributes.
- *
- *  HID report item constants for report item attributes. Refer to the HID specification for
- *  details on each flag's meaning when applied to an IN, OUT or FEATURE item.
- */
-
-/** \ingroup Group_HIDParser
- *  @defgroup Group_HIDIOFConst Input/Output/Feature Masks
- *
- *  Masks indicating the type of Input, Output of Feature HID report item.
- *
- *  @{
- */
-
-#ifndef __HIDREPORTDATA_H__
-#define __HIDREPORTDATA_H__
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \ref HID_ReportItem_t.ItemFlags flag for constant data. */
-			#define IOF_CONSTANT             (1 << 0)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for data. */
-			#define IOF_DATA                 (0 << 0)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for variable data. */
-			#define IOF_VARIABLE             (1 << 1)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for array data. */
-			#define IOF_ARRAY                (0 << 1)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for relative data. */
-			#define IOF_RELATIVE             (1 << 2)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for absolute data. */
-			#define IOF_ABSOLUTE             (0 << 2)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for wrapped value data. */
-			#define IOF_WRAP                 (1 << 3)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for non-wrapped value data. */
-			#define IOF_NOWRAP               (0 << 3)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for non linear data. */
-			#define IOF_NONLINEAR            (1 << 4)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for linear data. */
-			#define IOF_LINEAR               (0 << 4)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for no preferred state. */
-			#define IOF_NOPREFERRED          (1 << 5)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for preferred state items. */
-			#define IOF_PREFERREDSTATE       (0 << 5)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for null state items. */
-			#define IOF_NULLSTATE            (1 << 6)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for no null position data. */
-			#define IOF_NONULLPOSITION       (0 << 6)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for buffered bytes. */
-			#define IOF_BUFFEREDBYTES        (1 << 8)
-
-			/** \ref HID_ReportItem_t.ItemFlags flag for bit field data. */
-			#define IOF_BITFIELD             (0 << 8)
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define DATA_SIZE_MASK           0x03
-			#define TYPE_MASK                0x0C
-			#define TAG_MASK                 0xF0
-
-			#define DATA_SIZE_0              0x00
-			#define DATA_SIZE_1              0x01
-			#define DATA_SIZE_2              0x02
-			#define DATA_SIZE_4              0x03
-
-			#define TYPE_MAIN                0x00
-			#define TYPE_GLOBAL              0x04
-			#define TYPE_LOCAL               0x08
-
-			#define TAG_MAIN_INPUT           0x80
-			#define TAG_MAIN_OUTPUT          0x90
-			#define TAG_MAIN_COLLECTION      0xA0
-			#define TAG_MAIN_FEATURE         0xB0
-			#define TAG_MAIN_ENDCOLLECTION   0xC0
-
-			#define TAG_GLOBAL_USAGEPAGE     0x00
-			#define TAG_GLOBAL_LOGICALMIN    0x10
-			#define TAG_GLOBAL_LOGICALMAX    0x20
-			#define TAG_GLOBAL_PHYSMIN       0x30
-			#define TAG_GLOBAL_PHYSMAX       0x40
-			#define TAG_GLOBAL_UNITEXP       0x50
-			#define TAG_GLOBAL_UNIT          0x60
-			#define TAG_GLOBAL_REPORTSIZE    0x70
-			#define TAG_GLOBAL_REPORTID      0x80
-			#define TAG_GLOBAL_REPORTCOUNT   0x90
-			#define TAG_GLOBAL_PUSH          0xA0
-			#define TAG_GLOBAL_POP           0xB0
-
-			#define TAG_LOCAL_USAGE          0x00
-			#define TAG_LOCAL_USAGEMIN       0x10
-			#define TAG_LOCAL_USAGEMAX       0x20
-	#endif
-
-/** @} */
-
-#endif
-