X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/1f83abe6f42c302cf3af7e16e5bb02d886a2c82a..a7aaa45ec4c3f415bf6073a5cc016635d5ecf77d:/Projects/Magstripe/Descriptors.h

diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h
index 16299bbfd..6dbdd2584 100644
--- a/Projects/Magstripe/Descriptors.h
+++ b/Projects/Magstripe/Descriptors.h
@@ -1,22 +1,22 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Denver Gingerich (denver [at] ossguy [dot] com)
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, 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
+  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
@@ -38,34 +38,12 @@
 #define _DESCRIPTORS_H_
 
 	/* Includes: */
-		#include <LUFA/Drivers/USB/USB.h>
-
 		#include <avr/pgmspace.h>
 
-	/* Type Defines: */
-		/** Type define for the HID class specific HID descriptor. A HID descriptor is used in HID class devices
-		 *  to give information about the HID device, including the HID specification used, and the report descriptors
-		 *  the device contains to describe how the HID device should be controlled.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Standard USB descriptor header */
-				
-			uint16_t                HIDSpec; /**< HID specification implemented by the device, in BCD form */
-			uint8_t                 CountryCode; /**< Country code for the country the HID device is localised for */
-		
-			uint8_t                 TotalHIDDescriptors; /**< Total number of HID reports linked to this HID interface */
-
-			uint8_t                 HIDReportType; /**< Type of the first HID report descriptor */
-			uint16_t                HIDReportLength; /**< Length of the first HID report descriptor */
-		} USB_Descriptor_HID_t;
-
-		/** Type define for the data type used for the HID Report descriptor data elements. A HID report
-		 *  descriptor contains an array of this data type, indicating how the reports from and to the
-		 *  device are formatted and how the report data is to be used by the host.
-		 */
-		typedef uint8_t USB_Descriptor_HIDReport_Datatype_t;
+		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/USB/Class/HID.h>
 
+	/* Type Defines: */
 		/** 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.
@@ -74,7 +52,7 @@
 		{
 			USB_Descriptor_Configuration_Header_t Config; /**< Configuration descriptor header structure */
 			USB_Descriptor_Interface_t            Interface; /**< Keyboard interface descriptor */
-			USB_Descriptor_HID_t                  KeyboardHID; /**< Keyboard HID descriptor */
+			USB_HID_Descriptor_t                  KeyboardHID; /**< Keyboard HID descriptor */
 	        USB_Descriptor_Endpoint_t             KeyboardEndpoint; /**< Keyboard key report endpoint descriptor */
 		} USB_Descriptor_Configuration_t;
 					
@@ -85,14 +63,8 @@
 		/** Size of the keyboard report endpoints, in bytes. */
 		#define KEYBOARD_EPSIZE              8
 
-		/** Descriptor type value for a HID descriptor. */
-		#define DTYPE_HID                    0x21
-
-		/** Descriptor type value for a HID report. */
-		#define DTYPE_Report                 0x22
-
 	/* Function Prototypes: */
-		uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
-		                           ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
+		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif