Add new HID_DESCRIPTOR_VENDOR() macro, change over all projects and Device ClassDriver demos to use it.

Fix reversed byte ordering of multi-byte HID data.

Added support to the HID parser for extended USAGE items that contain the usage page as well as the usage index.

Removed the HID_IOF_NON_VOLATILE and HID_IOF_VOLATILE flags from HID INPUT items where the flag is invalid. Changed over HID OUTPUT items to use HID_IOF_NON_VOLATILE.

Change over MagStripe project to use HID_DESCRIPTOR_KEYBOARD() for its HID report. Change over MouseHostDevice demo to use HID_DESCRIPTOR_MOUSE() for its HID report.

7 files changed, 178 insertions, 145 deletions

diff --git a/LUFA/Drivers/USB/Class/Common/HID.h b/LUFA/Drivers/USB/Class/Common/HID.h
index 8cb5f6d46..9f12118cb 100644
--- a/LUFA/Drivers/USB/Class/Common/HID.h
+++ b/LUFA/Drivers/USB/Class/Common/HID.h
@@ -348,28 +348,28 @@
 		 *  \param[in] Buttons     Total number of buttons in the device
 		 */
 		#define HID_DESCRIPTOR_JOYSTICK(MinAxisVal, MaxAxisVal, Buttons) \
-			HID_RI_USAGE_PAGE(8, 0x01),            \
-			HID_RI_USAGE(8, 0x04),                 \
-			HID_RI_COLLECTION(8, 0x01),            \
-				HID_RI_USAGE(8, 0x01),             \
-				HID_RI_COLLECTION(8, 0x00),        \
-					HID_RI_USAGE(8, 0x30),         \
-					HID_RI_USAGE(8, 0x31),         \
+			HID_RI_USAGE_PAGE(8, 0x01),                     \
+			HID_RI_USAGE(8, 0x04),                          \
+			HID_RI_COLLECTION(8, 0x01),                     \
+				HID_RI_USAGE(8, 0x01),                      \
+				HID_RI_COLLECTION(8, 0x00),                 \
+					HID_RI_USAGE(8, 0x30),                  \
+					HID_RI_USAGE(8, 0x31),                  \
 					HID_RI_REPORT_SIZE(8, (((((uint16_t)MinAxisVal > 0xFF) && ((uint16_t)MaxAxisVal < 0xFF)) ? 8 : 16))), \
-					HID_RI_REPORT_COUNT(8, 0x02),  \
-					HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \
-				HID_RI_END_COLLECTION(0),          \
-				HID_RI_USAGE_PAGE(8, 0x09),        \
-				HID_RI_USAGE_MINIMUM(8, 0x01),     \
-				HID_RI_USAGE_MAXIMUM(8, Buttons),  \
-				HID_RI_LOGICAL_MINIMUM(8, 0x00),   \
-				HID_RI_LOGICAL_MAXIMUM(8, 0x01),   \
-				HID_RI_REPORT_SIZE(8, 0x01),       \
-				HID_RI_REPORT_COUNT(8, Buttons),   \
-				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \
+					HID_RI_REPORT_COUNT(8, 0x02),           \
+					HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
+				HID_RI_END_COLLECTION(0),                   \
+				HID_RI_USAGE_PAGE(8, 0x09),                 \
+				HID_RI_USAGE_MINIMUM(8, 0x01),              \
+				HID_RI_USAGE_MAXIMUM(8, Buttons),           \
+				HID_RI_LOGICAL_MINIMUM(8, 0x00),            \
+				HID_RI_LOGICAL_MAXIMUM(8, 0x01),            \
+				HID_RI_REPORT_SIZE(8, 0x01),                \
+				HID_RI_REPORT_COUNT(8, Buttons),            \
+				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
 				HID_RI_REPORT_SIZE(8, (8 - (Buttons % 8))), \
-				HID_RI_REPORT_COUNT(8, 0x01),      \
-				HID_RI_INPUT(8, HID_IOF_CONSTANT), \
+				HID_RI_REPORT_COUNT(8, 0x01),               \
+				HID_RI_INPUT(8, HID_IOF_CONSTANT),          \
 			HID_RI_END_COLLECTION(0)
 
 		/** \hideinitializer
@@ -389,38 +389,38 @@
 		 *  \param[in] MaxKeys  Number of simultaneous keys that can be reported at the one time (a value between 1 and
 		 *                      (ENDPOINT_SIZE - 2) )
 		 */
-		#define HID_DESCRIPTOR_KEYBOARD(MaxKeys)   \
-			HID_RI_USAGE_PAGE(8, 0x01),            \
-			HID_RI_USAGE(8, 0x06),                 \
-			HID_RI_COLLECTION(8, 0x01),            \
-				HID_RI_USAGE_PAGE(8, 0x07),        \
-				HID_RI_USAGE_MINIMUM(8, 0xE0),     \
-				HID_RI_USAGE_MAXIMUM(8, 0xE7),     \
-				HID_RI_LOGICAL_MINIMUM(8, 0x00),   \
-				HID_RI_LOGICAL_MAXIMUM(8, 0x01),   \
-				HID_RI_REPORT_SIZE(8, 0x01),       \
-				HID_RI_REPORT_COUNT(8, 0x08),      \
-				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \
-				HID_RI_REPORT_COUNT(8, 0x01),      \
-				HID_RI_REPORT_SIZE(8, 0x08),       \
-				HID_RI_INPUT(8, HID_IOF_CONSTANT), \
-				HID_RI_USAGE_PAGE(8, 0x08),        \
-				HID_RI_USAGE_MINIMUM(8, 0x01),     \
-				HID_RI_USAGE_MAXIMUM(8, 0x05),     \
-				HID_RI_REPORT_COUNT(8, 0x05),      \
-				HID_RI_REPORT_SIZE(8, 0x01),       \
+		#define HID_DESCRIPTOR_KEYBOARD(MaxKeys)            \
+			HID_RI_USAGE_PAGE(8, 0x01),                     \
+			HID_RI_USAGE(8, 0x06),                          \
+			HID_RI_COLLECTION(8, 0x01),                     \
+				HID_RI_USAGE_PAGE(8, 0x07),                 \
+				HID_RI_USAGE_MINIMUM(8, 0xE0),              \
+				HID_RI_USAGE_MAXIMUM(8, 0xE7),              \
+				HID_RI_LOGICAL_MINIMUM(8, 0x00),            \
+				HID_RI_LOGICAL_MAXIMUM(8, 0x01),            \
+				HID_RI_REPORT_SIZE(8, 0x01),                \
+				HID_RI_REPORT_COUNT(8, 0x08),               \
+				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
+				HID_RI_REPORT_COUNT(8, 0x01),               \
+				HID_RI_REPORT_SIZE(8, 0x08),                \
+				HID_RI_INPUT(8, HID_IOF_CONSTANT),          \
+				HID_RI_USAGE_PAGE(8, 0x08),                 \
+				HID_RI_USAGE_MINIMUM(8, 0x01),              \
+				HID_RI_USAGE_MAXIMUM(8, 0x05),              \
+				HID_RI_REPORT_COUNT(8, 0x05),               \
+				HID_RI_REPORT_SIZE(8, 0x01),                \
 				HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \
-				HID_RI_REPORT_COUNT(8, 0x01),      \
-				HID_RI_REPORT_SIZE(8, 0x03),       \
-				HID_RI_OUTPUT(8, HID_IOF_CONSTANT), \
-				HID_RI_LOGICAL_MINIMUM(8, 0x00),   \
-				HID_RI_LOGICAL_MAXIMUM(8, 0x65),   \
-				HID_RI_USAGE_PAGE(8, 0x07),        \
-				HID_RI_USAGE_MINIMUM(8, 0x00),     \
-				HID_RI_USAGE_MAXIMUM(8, 0x65),     \
-				HID_RI_REPORT_COUNT(8, MaxKeys),   \
-				HID_RI_REPORT_SIZE(8, 0x08),       \
-				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \
+				HID_RI_REPORT_COUNT(8, 0x01),               \
+				HID_RI_REPORT_SIZE(8, 0x03),                \
+				HID_RI_OUTPUT(8, HID_IOF_CONSTANT),         \
+				HID_RI_LOGICAL_MINIMUM(8, 0x00),            \
+				HID_RI_LOGICAL_MAXIMUM(8, 0x65),            \
+				HID_RI_USAGE_PAGE(8, 0x07),                 \
+				HID_RI_USAGE_MINIMUM(8, 0x00),              \
+				HID_RI_USAGE_MAXIMUM(8, 0x65),              \
+				HID_RI_REPORT_COUNT(8, MaxKeys),            \
+				HID_RI_REPORT_SIZE(8, 0x08),                \
+				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE), \
 			HID_RI_END_COLLECTION(0)
 
 		/** \hideinitializer
@@ -448,34 +448,63 @@
 		 *  \param[in] AbsoluteCoords  Boolean true to use absolute X/Y coordinates (e.g. touchscreen)
 		 */
 		#define HID_DESCRIPTOR_MOUSE(MinAxisVal, MaxAxisVal, MinPhysicalVal, MaxPhysicalVal, Buttons, AbsoluteCoords) \
-				HID_RI_USAGE_PAGE(8, 0x01),              \
-				HID_RI_USAGE(8, 0x02),                   \
-				HID_RI_COLLECTION(8, 0x01),              \
-					HID_RI_USAGE(8, 0x01),               \
-					HID_RI_COLLECTION(8, 0x00),          \
-						HID_RI_USAGE_PAGE(8, 0x09),      \
-						HID_RI_USAGE_MINIMUM(8, 0x01),   \
-						HID_RI_USAGE_MAXIMUM(8, Buttons), \
-						HID_RI_LOGICAL_MINIMUM(8, 0x00), \
-						HID_RI_LOGICAL_MAXIMUM(8, 0x01), \
-						HID_RI_REPORT_COUNT(8, Buttons), \
-						HID_RI_REPORT_SIZE(8, 0x01),     \
-						HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE), \
-						HID_RI_REPORT_COUNT(8, 0x01),    \
-						HID_RI_REPORT_SIZE(8, (8 - (Buttons % 8))), \
-						HID_RI_INPUT(8, HID_IOF_CONSTANT), \
-						HID_RI_USAGE_PAGE(8, 0x01),      \
-						HID_RI_USAGE(8, 0x30),           \
-						HID_RI_USAGE(8, 0x31),           \
-						HID_RI_LOGICAL_MINIMUM(16, MinAxisVal), \
-						HID_RI_LOGICAL_MAXIMUM(16, MaxAxisVal), \
-						HID_RI_PHYSICAL_MINIMUM(16, MinPhysicalVal), \
-						HID_RI_PHYSICAL_MAXIMUM(16, MaxPhysicalVal), \
-						HID_RI_REPORT_COUNT(8, 0x02),    \
-						HID_RI_REPORT_SIZE(8, (((((uint16_t)MinAxisVal > 0xFF) && ((uint16_t)MaxAxisVal < 0xFF)) ? 8 : 16))), \
-						HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | (AbsoluteCoords ? HID_IOF_ABSOLUTE : HID_IOF_RELATIVE) | HID_IOF_NON_VOLATILE), \
-					HID_RI_END_COLLECTION(0),            \
-				HID_RI_END_COLLECTION(0)
+			HID_RI_USAGE_PAGE(8, 0x01),                     \
+			HID_RI_USAGE(8, 0x02),                          \
+			HID_RI_COLLECTION(8, 0x01),                     \
+				HID_RI_USAGE(8, 0x01),                      \
+				HID_RI_COLLECTION(8, 0x00),                 \
+					HID_RI_USAGE_PAGE(8, 0x09),             \
+					HID_RI_USAGE_MINIMUM(8, 0x01),          \
+					HID_RI_USAGE_MAXIMUM(8, Buttons),       \
+					HID_RI_LOGICAL_MINIMUM(8, 0x00),        \
+					HID_RI_LOGICAL_MAXIMUM(8, 0x01),        \
+					HID_RI_REPORT_COUNT(8, Buttons),        \
+					HID_RI_REPORT_SIZE(8, 0x01),            \
+					HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
+					HID_RI_REPORT_COUNT(8, 0x01),           \
+					HID_RI_REPORT_SIZE(8, (8 - (Buttons % 8))), \
+					HID_RI_INPUT(8, HID_IOF_CONSTANT),      \
+					HID_RI_USAGE_PAGE(8, 0x01),             \
+					HID_RI_USAGE(8, 0x30),                  \
+					HID_RI_USAGE(8, 0x31),                  \
+					HID_RI_LOGICAL_MINIMUM(16, MinAxisVal), \
+					HID_RI_LOGICAL_MAXIMUM(16, MaxAxisVal), \
+					HID_RI_PHYSICAL_MINIMUM(16, MinPhysicalVal), \
+					HID_RI_PHYSICAL_MAXIMUM(16, MaxPhysicalVal), \
+					HID_RI_REPORT_COUNT(8, 0x02),           \
+					HID_RI_REPORT_SIZE(8, (((((uint16_t)MinAxisVal > 0xFF) && ((uint16_t)MaxAxisVal < 0xFF)) ? 8 : 16))), \
+					HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | (AbsoluteCoords ? HID_IOF_ABSOLUTE : HID_IOF_RELATIVE)), \
+				HID_RI_END_COLLECTION(0),                   \
+			HID_RI_END_COLLECTION(0)
+
+		/** \hideinitializer
+		 *  A list of HID report item array elements that describe a typical Vendor Defined byte array HID report descriptor,
+		 *  used for transporting abitrary data between the USB host and device via HID reports. The resulting report should be
+		 *  a uint8_t byte array of the specified length in both Device to Host (IN) and Host to Device (OUT) directions.
+		 *
+		 *  \param[in] VendorPageNum    Vendor Defined HID Usage Page index, ranging from 0x00 to 0xFF
+		 *  \param[in] CollectionUsage  Vendor Usage for the encompasing report IN and OUT collection, ranging from 0x00 to 0xFF
+		 *  \param[in] DataINUsage      Vendor Usage for the IN report data, ranging from 0x00 to 0xFF
+		 *  \param[in] DataOUTUsage     Vendor Usage for the OUT report data, ranging from 0x00 to 0xFF   
+		 *  \param[in] NumBytes         Length of the data IN and OUT reports
+		 */
+		#define HID_DESCRIPTOR_VENDOR(VendorPageNum, CollectionUsage, DataINUsage, DataOUTUsage, NumBytes) \
+			HID_RI_USAGE_PAGE(16, (0xFF00 | VendorPageNum)), \
+			HID_RI_USAGE(8, CollectionUsage),           \
+			HID_RI_COLLECTION(8, 0x01),                 \
+				HID_RI_USAGE(8, DataINUsage),           \
+				HID_RI_LOGICAL_MINIMUM(8, 0x00),        \
+				HID_RI_LOGICAL_MAXIMUM(8, 0xFF),        \
+				HID_RI_REPORT_SIZE(8, 0x08),            \
+				HID_RI_REPORT_COUNT(8, NumBytes),       \
+				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
+				HID_RI_USAGE(8, DataOUTUsage),          \
+				HID_RI_LOGICAL_MINIMUM(8, 0x00),        \
+				HID_RI_LOGICAL_MAXIMUM(8, 0xFF),        \
+				HID_RI_REPORT_SIZE(8, 0x08),            \
+				HID_RI_REPORT_COUNT(8, NumBytes),       \
+				HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \
+			HID_RI_END_COLLECTION(0)
 		//@}
 		
 	/* Type Defines: */
diff --git a/LUFA/Drivers/USB/Class/Common/HIDParser.c b/LUFA/Drivers/USB/Class/Common/HIDParser.c
index 7b13f1a75..f6c48fdad 100644
--- a/LUFA/Drivers/USB/Class/Common/HIDParser.c
+++ b/LUFA/Drivers/USB/Class/Common/HIDParser.c
@@ -96,6 +96,9 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
 				CurrStateTable--;
 				break;
 			case HID_RI_USAGE_PAGE(0):
+				if ((HIDReportItem & HID_RI_DATA_SIZE_MASK) == HID_RI_DATA_BITS_32)
+				  CurrStateTable->Attributes.Usage.Page = (ReportItemData >> 16);
+				
 				CurrStateTable->Attributes.Usage.Page       = ReportItemData;
 				break;
 			case HID_RI_LOGICAL_MINIMUM(0):
diff --git a/LUFA/Drivers/USB/Class/Common/HIDParser.h b/LUFA/Drivers/USB/Class/Common/HIDParser.h
index e5b4f9b5f..8347f1dcf 100644
--- a/LUFA/Drivers/USB/Class/Common/HIDParser.h
+++ b/LUFA/Drivers/USB/Class/Common/HIDParser.h
@@ -217,7 +217,7 @@
 			{
 				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. */
+				uint16_t                     ItemFlags;      /**< Item data flags, a mask of HID_IOF_* constants. */
 				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. */
 
diff --git a/LUFA/Drivers/USB/Class/Common/HIDReportData.h b/LUFA/Drivers/USB/Class/Common/HIDReportData.h
index 24401b68c..d9de5df62 100644
--- a/LUFA/Drivers/USB/Class/Common/HIDReportData.h
+++ b/LUFA/Drivers/USB/Class/Common/HIDReportData.h
@@ -49,76 +49,76 @@
 	/* Private Interface - For use in library only: */
 	#if !defined(__DOXYGEN__)
 		/* Macros: */
-			#define HID_RI_DATA_SIZE_MASK          0x03
-			#define HID_RI_TYPE_MASK               0x0C
-			#define HID_RI_TAG_MASK                0xF0
+			#define HID_RI_DATA_SIZE_MASK                   0x03
+			#define HID_RI_TYPE_MASK                        0x0C
+			#define HID_RI_TAG_MASK                         0xF0
 
-			#define HID_RI_TYPE_MAIN               0x00
-			#define HID_RI_TYPE_GLOBAL             0x04
-			#define HID_RI_TYPE_LOCAL              0x08
+			#define HID_RI_TYPE_MAIN                        0x00
+			#define HID_RI_TYPE_GLOBAL                      0x04
+			#define HID_RI_TYPE_LOCAL                       0x08
 
-			#define HID_RI_DATA_BITS_0             0x00
-			#define HID_RI_DATA_BITS_8             0x01
-			#define HID_RI_DATA_BITS_16            0x02
-			#define HID_RI_DATA_BITS_32            0x03
-			#define HID_RI_DATA_BITS(DataBits)     HID_RI_DATA_BITS_ ## DataBits
+			#define HID_RI_DATA_BITS_0                      0x00
+			#define HID_RI_DATA_BITS_8                      0x01
+			#define HID_RI_DATA_BITS_16                     0x02
+			#define HID_RI_DATA_BITS_32                     0x03
+			#define HID_RI_DATA_BITS(DataBits)              HID_RI_DATA_BITS_ ## DataBits
 
-			#define _HID_RI_ENCODE_0(Data)         /* No Data */
-			#define _HID_RI_ENCODE_8(Data)         , (Data & 0xFF)
-			#define _HID_RI_ENCODE_16(Data)        _HID_RI_ENCODE_8(Data >> 8)   _HID_RI_ENCODE_8(Data)
-			#define _HID_RI_ENCODE_32(Data)        _HID_RI_ENCODE_16(Data >> 16) _HID_RI_ENCODE_16(Data)
-			#define _HID_RI_ENCODE(DataBits, ...)  _HID_RI_ENCODE_ ## DataBits(__VA_ARGS__)
+			#define _HID_RI_ENCODE_0(Data)                  
+			#define _HID_RI_ENCODE_8(Data)                  , (Data & 0xFF)
+			#define _HID_RI_ENCODE_16(Data)                 _HID_RI_ENCODE_8(Data)  _HID_RI_ENCODE_8(Data >> 8)
+			#define _HID_RI_ENCODE_32(Data)                 _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_16(Data >> 16)
+			#define _HID_RI_ENCODE(DataBits, ...)           _HID_RI_ENCODE_ ## DataBits(__VA_ARGS__)
 			
 			#define _HID_RI_ENTRY(Type, Tag, DataBits, ...) \
-			                                       (Type | Tag | HID_RI_DATA_BITS(DataBits)) _HID_RI_ENCODE(DataBits, (__VA_ARGS__))
+			                                                (Type | Tag | HID_RI_DATA_BITS(DataBits)) _HID_RI_ENCODE(DataBits, (__VA_ARGS__))
 	#endif
 	
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 		/** \name HID Input, Output and Feature Report Descriptor Item Flags */
 		//@{
-			#define HID_IOF_CONSTANT                   (1 << 0)
-			#define HID_IOF_DATA                       (0 << 0)
-			#define HID_IOF_VARIABLE                   (1 << 1)
-			#define HID_IOF_ARRAY                      (0 << 1)
-			#define HID_IOF_RELATIVE                   (1 << 2)
-			#define HID_IOF_ABSOLUTE                   (0 << 2)
-			#define HID_IOF_WRAP                       (1 << 3)
-			#define HID_IOF_NO_WRAP                    (0 << 3)
-			#define HID_IOF_NON_LINEAR                 (1 << 4)
-			#define HID_IOF_LINEAR                     (0 << 4)
-			#define HID_IOF_NO_PREFERRED_STATE         (1 << 5)
-			#define HID_IOF_PREFERRED_STATE            (0 << 5)
-			#define HID_IOF_NULLSTATE                  (1 << 6)
-			#define HID_IOF_NO_NULL_POSITION           (0 << 6)
-			#define HID_IOF_VOLATILE                   (1 << 7)
-			#define HID_IOF_NON_VOLATILE               (0 << 7)
-			#define HID_IOF_BUFFERED_BYTES             (1 << 8)
-			#define HID_IOF_BITFIELD                   (0 << 8)
+			#define HID_IOF_CONSTANT                        (1 << 0)
+			#define HID_IOF_DATA                            (0 << 0)
+			#define HID_IOF_VARIABLE                        (1 << 1)
+			#define HID_IOF_ARRAY                           (0 << 1)
+			#define HID_IOF_RELATIVE                        (1 << 2)
+			#define HID_IOF_ABSOLUTE                        (0 << 2)
+			#define HID_IOF_WRAP                            (1 << 3)
+			#define HID_IOF_NO_WRAP                         (0 << 3)
+			#define HID_IOF_NON_LINEAR                      (1 << 4)
+			#define HID_IOF_LINEAR                          (0 << 4)
+			#define HID_IOF_NO_PREFERRED_STATE              (1 << 5)
+			#define HID_IOF_PREFERRED_STATE                 (0 << 5)
+			#define HID_IOF_NULLSTATE                       (1 << 6)
+			#define HID_IOF_NO_NULL_POSITION                (0 << 6)
+			#define HID_IOF_VOLATILE                        (1 << 7)
+			#define HID_IOF_NON_VOLATILE                    (0 << 7)
+			#define HID_IOF_BUFFERED_BYTES                  (1 << 8)
+			#define HID_IOF_BITFIELD                        (0 << 8)
 		//@}
 		
 		/** \name HID Report Descriptor Item Macros */
 		//@{
-			#define HID_RI_INPUT(DataBits, ...)              _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0x80, DataBits, __VA_ARGS__)
-			#define HID_RI_OUTPUT(DataBits, ...)             _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0x90, DataBits, __VA_ARGS__)
-			#define HID_RI_COLLECTION(DataBits, ...)         _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0xA0, DataBits, __VA_ARGS__)
-			#define HID_RI_FEATURE(DataBits, ...)            _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0xB0, DataBits, __VA_ARGS__)
-			#define HID_RI_END_COLLECTION(DataBits, ...)     _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0xC0, DataBits, __VA_ARGS__)
-			#define HID_RI_USAGE_PAGE(DataBits, ...)         _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x00, DataBits, __VA_ARGS__)
-			#define HID_RI_LOGICAL_MINIMUM(DataBits, ...)    _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x10, DataBits, __VA_ARGS__)
-			#define HID_RI_LOGICAL_MAXIMUM(DataBits, ...)    _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x20, DataBits, __VA_ARGS__)
-			#define HID_RI_PHYSICAL_MINIMUM(DataBits, ...)   _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x30, DataBits, __VA_ARGS__)
-			#define HID_RI_PHYSICAL_MAXIMUM(DataBits, ...)   _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x40, DataBits, __VA_ARGS__)
-			#define HID_RI_UNIT_EXPONENT(DataBits, ...)      _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x50, DataBits, __VA_ARGS__)
-			#define HID_RI_UNIT(DataBits, ...)               _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x60, DataBits, __VA_ARGS__)
-			#define HID_RI_REPORT_SIZE(DataBits, ...)        _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x70, DataBits, __VA_ARGS__)
-			#define HID_RI_REPORT_ID(DataBits, ...)          _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x80, DataBits, __VA_ARGS__)
-			#define HID_RI_REPORT_COUNT(DataBits, ...)       _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x90, DataBits, __VA_ARGS__)
-			#define HID_RI_PUSH(DataBits, ...)               _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0xA0, DataBits, __VA_ARGS__)
-			#define HID_RI_POP(DataBits, ...)                _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0xB0, DataBits, __VA_ARGS__)
-			#define HID_RI_USAGE(DataBits, ...)              _HID_RI_ENTRY(HID_RI_TYPE_LOCAL , 0x00, DataBits, __VA_ARGS__)
-			#define HID_RI_USAGE_MINIMUM(DataBits, ...)      _HID_RI_ENTRY(HID_RI_TYPE_LOCAL , 0x10, DataBits, __VA_ARGS__)
-			#define HID_RI_USAGE_MAXIMUM(DataBits, ...)      _HID_RI_ENTRY(HID_RI_TYPE_LOCAL , 0x20, DataBits, __VA_ARGS__)
+			#define HID_RI_INPUT(DataBits, ...)             _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0x80, DataBits, __VA_ARGS__)
+			#define HID_RI_OUTPUT(DataBits, ...)            _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0x90, DataBits, __VA_ARGS__)
+			#define HID_RI_COLLECTION(DataBits, ...)        _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0xA0, DataBits, __VA_ARGS__)
+			#define HID_RI_FEATURE(DataBits, ...)           _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0xB0, DataBits, __VA_ARGS__)
+			#define HID_RI_END_COLLECTION(DataBits, ...)    _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0xC0, DataBits, __VA_ARGS__)
+			#define HID_RI_USAGE_PAGE(DataBits, ...)        _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x00, DataBits, __VA_ARGS__)
+			#define HID_RI_LOGICAL_MINIMUM(DataBits, ...)   _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x10, DataBits, __VA_ARGS__)
+			#define HID_RI_LOGICAL_MAXIMUM(DataBits, ...)   _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x20, DataBits, __VA_ARGS__)
+			#define HID_RI_PHYSICAL_MINIMUM(DataBits, ...)  _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x30, DataBits, __VA_ARGS__)
+			#define HID_RI_PHYSICAL_MAXIMUM(DataBits, ...)  _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x40, DataBits, __VA_ARGS__)
+			#define HID_RI_UNIT_EXPONENT(DataBits, ...)     _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x50, DataBits, __VA_ARGS__)
+			#define HID_RI_UNIT(DataBits, ...)              _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x60, DataBits, __VA_ARGS__)
+			#define HID_RI_REPORT_SIZE(DataBits, ...)       _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x70, DataBits, __VA_ARGS__)
+			#define HID_RI_REPORT_ID(DataBits, ...)         _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x80, DataBits, __VA_ARGS__)
+			#define HID_RI_REPORT_COUNT(DataBits, ...)      _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x90, DataBits, __VA_ARGS__)
+			#define HID_RI_PUSH(DataBits, ...)              _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0xA0, DataBits, __VA_ARGS__)
+			#define HID_RI_POP(DataBits, ...)               _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0xB0, DataBits, __VA_ARGS__)
+			#define HID_RI_USAGE(DataBits, ...)             _HID_RI_ENTRY(HID_RI_TYPE_LOCAL , 0x00, DataBits, __VA_ARGS__)
+			#define HID_RI_USAGE_MINIMUM(DataBits, ...)     _HID_RI_ENTRY(HID_RI_TYPE_LOCAL , 0x10, DataBits, __VA_ARGS__)
+			#define HID_RI_USAGE_MAXIMUM(DataBits, ...)     _HID_RI_ENTRY(HID_RI_TYPE_LOCAL , 0x20, DataBits, __VA_ARGS__)
 		//@}
 
 /** @} */
diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h
index 3be69a2ef..53e31f6c1 100644
--- a/LUFA/Drivers/USB/HighLevel/Events.h
+++ b/LUFA/Drivers/USB/HighLevel/Events.h
@@ -320,9 +320,9 @@
 			 *  This event is time-critical; it is run once per millisecond and thus long handlers will significantly
 			 *  degrade device performance. This event should only be enabled when needed to reduce device wake-ups.
 			 *
-			 *  \note This event is not normally active - it must be manually enabled and disabled via the
-			 *        \ref USB_Device_EnableSOFEvents() and \ref USB_Device_DisableSOFEvents() commands after enumeration.
-			 *        \n\n
+			 *  \pre This event is not normally active - it must be manually enabled and disabled via the
+			 *       \ref USB_Device_EnableSOFEvents() and \ref USB_Device_DisableSOFEvents() commands after enumeration.
+			 *       \n\n
 			 *
 			 *  \note This event does not exist if the \c USB_HOST_ONLY token is supplied to the compiler (see
 			 *        \ref Group_USBManagement documentation).
diff --git a/LUFA/Drivers/USB/LowLevel/USBInterrupt.h b/LUFA/Drivers/USB/LowLevel/USBInterrupt.h
index da516b45f..29ad93388 100644
--- a/LUFA/Drivers/USB/LowLevel/USBInterrupt.h
+++ b/LUFA/Drivers/USB/LowLevel/USBInterrupt.h
@@ -60,11 +60,11 @@
 	/* Private Interface - For use in library only: */
 	#if !defined(__DOXYGEN__)
 		/* Macros: */
-			#define USB_INT_Enable(int)                do { USB_INT_GET_EN_REG(int)   |=   USB_INT_GET_EN_MASK(int);   } while(0)
-			#define USB_INT_Disable(int)               do { USB_INT_GET_EN_REG(int)   &= ~(USB_INT_GET_EN_MASK(int));  } while(0)
-			#define USB_INT_Clear(int)                 do { USB_INT_GET_INT_REG(int)  &= ~(USB_INT_GET_INT_MASK(int)); } while(0)
-			#define USB_INT_IsEnabled(int)                 ((USB_INT_GET_EN_REG(int)  &    USB_INT_GET_EN_MASK(int)) ? true : false)
-			#define USB_INT_HasOccurred(int)               ((USB_INT_GET_INT_REG(int) &    USB_INT_GET_INT_MASK(int)) ? true : false)
+			#define USB_INT_Enable(int)              MACROS{ USB_INT_GET_EN_REG(int)   |=   USB_INT_GET_EN_MASK(int);   }MACROE
+			#define USB_INT_Disable(int)             MACROS{ USB_INT_GET_EN_REG(int)   &= ~(USB_INT_GET_EN_MASK(int));  }MACROE
+			#define USB_INT_Clear(int)               MACROS{ USB_INT_GET_INT_REG(int)  &= ~(USB_INT_GET_INT_MASK(int)); }MACROE
+			#define USB_INT_IsEnabled(int)                 ((USB_INT_GET_EN_REG(int)   &    USB_INT_GET_EN_MASK(int)) ? true : false)
+			#define USB_INT_HasOccurred(int)               ((USB_INT_GET_INT_REG(int)  &    USB_INT_GET_INT_MASK(int)) ? true : false)
 
 			#define USB_INT_GET_EN_REG(a, b, c, d)           a
 			#define USB_INT_GET_EN_MASK(a, b, c, d)          b
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index a6cd5838a..03d8125f3 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -18,8 +18,8 @@
   *   - Added new Endpoint_Null_Stream() and Pipe_Null_stream() functions
   *   - Added new ADC_GET_CHANNEL_MASK() convenience macro
   *   - Added new HID report item macros (with HID_RI_ prefix) to allow for easy creation and editing of HID report descriptors
-  *   - Added new HID_DESCRIPTOR_MOUSE, HID_DESCRIPTOR_KEYBOARD and HID_DESCRIPTOR_JOYSTICK macros for easy automatic creation of
-  *     basic USB HID device reports
+  *   - Added new HID_DESCRIPTOR_MOUSE, HID_DESCRIPTOR_KEYBOARD, HID_DESCRIPTOR_JOYSTICK and HID_DESCRIPTOR_VENDOR macros
+  *     for easy automatic creation of basic USB HID device reports
   *   - Added new MAX() and MIN() convenience macros
   *  - Library Applications:
   *   - Added ability to write protect Mass Storage disk write operations from the host OS
@@ -39,6 +39,7 @@
   *   - The NO_STREAM_CALLBACKS compile time option has now been removed due to the new partial stream transfer feature
   *   - 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/
+  *   - Added support to the HID parser for extended USAGE items that contain the usage page as well as the usage index
   *  - Library Applications:
   *   - Changed the XPLAINBridge software UART to use the regular timer CTC mode instead of the alternative CTC mode
   *     via the Input Capture register, to reduce user confusion