aboutsummaryrefslogtreecommitdiffstats
path: root/Projects/Magstripe/Descriptors.h
diff options
context:
space:
mode:
Diffstat (limited to 'Projects/Magstripe/Descriptors.h')
-rw-r--r--Projects/Magstripe/Descriptors.h36
1 files changed, 4 insertions, 32 deletions
diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h
index 9948085a5..0fff2c2a8 100644
--- a/Projects/Magstripe/Descriptors.h
+++ b/Projects/Magstripe/Descriptors.h
@@ -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/Device/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.
@@ -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 CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
- ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+ ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
#endif