All USB class drivers are now automatically included when LUFA/Drivers/USB.h is included, and no longer need to be seperately included.

All LowLevel demos changed to use the constants and types defined in the USB class drivers.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1537 d5102386-fcda-11dd-9fdb-3debd5008f28

3 files changed, 1 insertions, 27 deletions

diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c b/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c
index fe35d95b..dc2daf9e 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c
@@ -178,7 +178,7 @@ uint8_t DComp_NextKeyboardInterfaceDataEndpoint(void* CurrentDescriptor)
  */
 uint8_t DComp_NextHID(void* CurrentDescriptor)
 {
-	if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_HID)
+	if (DESCRIPTOR_TYPE(CurrentDescriptor) == HID_DTYPE_HID)
 	  return DESCRIPTOR_SEARCH_Found;
 	else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
 	  return DESCRIPTOR_SEARCH_Fail;
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.h b/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.h
index d23c89dd..ab04b310 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.h
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.h
@@ -48,12 +48,6 @@
 		/** Interface Protocol value for a Boot Protocol Keyboard compliant device. */
 		#define KEYBOARD_PROTOCOL              0x01
 
-		/** Descriptor header type constant for a HID descriptor. */
-		#define DTYPE_HID                      0x21
-
-		/** Descriptor header type constant for a HID report descriptor. */
-		#define DTYPE_Report                   0x22
-
 		/** Pipe number for the keyboard report data pipe. */
 		#define KEYBOARD_DATA_IN_PIPE          1
 
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h
index e18ad3aa..cf409caf 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h
@@ -38,14 +38,9 @@
 
 	/* Includes: */
 		#include <LUFA/Drivers/USB/USB.h>
-		#include <LUFA/Drivers/USB/Class/Host/HIDParser.h>
 
 		#include "KeyboardHostWithParser.h"
 
-	/* Macros: */
-		/** HID Report Descriptor Usage Page value for a desktop keyboard. */
-		#define USAGE_PAGE_KEYBOARD             0x07
-
 	/* Enums: */
 		/** Enum for the possible return codes of the \ref GetHIDReportData() function. */
 		enum KeyboardHostWithParser_GetHIDReportDataCodes_t
@@ -55,21 +50,6 @@
 			ParseControlError       = 2, /**< Control error occurred while trying to read the device HID descriptor */
 		};
 
-	/* Type Defines: */
-		/** Type define for a HID descriptor. */
-		typedef struct
-		{
-			USB_Descriptor_Header_t  Header; /**< Regular descriptor header containing the descriptor's type and length */
-
-			uint16_t                 HIDSpec; /**< Implemented HID class specification, in BCD encoded format */
-			uint8_t                  CountryCode; /**< Country code value for localized hardware */
-
-			uint8_t                  TotalHIDDescriptors; /**< Total number of HID report descriptors in the current interface */
-
-			uint8_t                  HIDReportType; /**< HID report type of the first HID report descriptor */
-			uint16_t                 HIDReportLength; /**< Total size in bytes of the first HID report descriptor */
-		} USB_Descriptor_HID_t;
-
 	/* External Variables: */
 		extern uint16_t         HIDReportSize;
 		extern HID_ReportInfo_t HIDReportInfo;