Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Demos / Device / LowLevel / GenericHID / Descriptors.h

diff --git a/Demos/Device/LowLevel/GenericHID/Descriptors.h b/Demos/Device/LowLevel/GenericHID/Descriptors.h
index a6a5e35..3ba9f10 100644 (file)
--- a/Demos/Device/LowLevel/GenericHID/Descriptors.h
+++ b/Demos/Device/LowLevel/GenericHID/Descriptors.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  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 
+  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 
+  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
@@ -32,7 +32,7 @@
  *
  *  Header file for Descriptors.c.
  */
- 
+
 #ifndef _DESCRIPTORS_H_
 #define _DESCRIPTORS_H_
 
@@ -42,25 +42,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.
@@ -68,12 +49,14 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t Config;
+
+                       // Generic HID Interface
                        USB_Descriptor_Interface_t            HID_Interface;
-                       USB_Descriptor_HID_t                  HID_GenericHID;
+                       USB_HID_Descriptor_HID_t              HID_GenericHID;
                USB_Descriptor_Endpoint_t             HID_ReportINEndpoint;
                USB_Descriptor_Endpoint_t             HID_ReportOUTEndpoint;
                } USB_Descriptor_Configuration_t;
-                                       
+
        /* Macros: */
                /** Endpoint number of the Generic HID reporting IN endpoint. */
                #define GENERIC_IN_EPNUM          1
@@ -83,16 +66,10 @@
 
                /** Size in bytes of the Generic HID reporting endpoint. */
                #define GENERIC_EPSIZE            8
-               
+
                /** Size in bytes of the Generic HID reports (including report ID byte). */
                #define GENERIC_REPORT_SIZE       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,
@@ -100,3 +77,4 @@
                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif
+