X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/5a4def747897c1c6ffbe465506d846c7c686d3e9..9e8bf8c0cfba6613d10a90b0ce76bdbbc9a72c8b:/Demos/Device/LowLevel/Keyboard/Descriptors.h

diff --git a/Demos/Device/LowLevel/Keyboard/Descriptors.h b/Demos/Device/LowLevel/Keyboard/Descriptors.h
index 0ee13a4e4..37fc7284a 100644
--- a/Demos/Device/LowLevel/Keyboard/Descriptors.h
+++ b/Demos/Device/LowLevel/Keyboard/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
@@ -19,7 +19,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims 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
@@ -43,25 +43,6 @@
 		#include <avr/pgmspace.h>
 
 	/* Type Defines: */
-		/** Type define for the HID class specific HID descriptor, to describe the HID device's specifications. Refer to the HID
-		 *  specification for details on the structure elements.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header;
-
-			uint16_t                HIDSpec;
-			uint8_t                 CountryCode;
-
-			uint8_t                 TotalReportDescriptors;
-
-			uint8_t                 HIDReportType;
-			uint16_t                HIDReportLength;
-		} USB_Descriptor_HID_t;
-
-		/** Type define for the data type used to store HID report descriptor elements. */
-		typedef uint8_t USB_Descriptor_HIDReport_Datatype_t;
-
 		/** Type define for the device configuration descriptor structure. This must be defined in the
 		 *  application code, as the configuration descriptor contains several sub-descriptors which
 		 *  vary between devices, and which describe the device's usage to the host.
@@ -69,28 +50,24 @@
 		typedef struct
 		{
 			USB_Descriptor_Configuration_Header_t Config;
+
+			// Keyboard HID Interface
 			USB_Descriptor_Interface_t            HID_Interface;
-			USB_Descriptor_HID_t                  HID_KeyboardHID;
+			USB_HID_Descriptor_HID_t              HID_KeyboardHID;
 	        USB_Descriptor_Endpoint_t             HID_ReportINEndpoint;
 	        USB_Descriptor_Endpoint_t             HID_ReportOUTEndpoint;
 		} USB_Descriptor_Configuration_t;
 
 	/* Macros: */
-		/** Endpoint number of the Keyboard HID reporting IN endpoint. */
-		#define KEYBOARD_IN_EPNUM         1
+		/** Endpoint address of the Keyboard HID reporting IN endpoint. */
+		#define KEYBOARD_IN_EPADDR        (ENDPOINT_DIR_IN  | 1)
 
-		/** Endpoint number of the Keyboard HID reporting OUT endpoint. */
-		#define KEYBOARD_OUT_EPNUM        2
+		/** Endpoint address of the Keyboard HID reporting OUT endpoint. */
+		#define KEYBOARD_OUT_EPADDR       (ENDPOINT_DIR_OUT | 2)
 
 		/** Size in bytes of the Keyboard HID reporting IN and OUT endpoints. */
 		#define KEYBOARD_EPSIZE           8
 
-		/** Descriptor header type value, to indicate a HID class HID descriptor. */
-		#define DTYPE_HID                 0x21
-
-		/** Descriptor header type value, to indicate a HID class HID report descriptor. */
-		#define DTYPE_Report              0x22
-
 	/* Function Prototypes: */
 		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 		                                    const uint8_t wIndex,