X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/9fdc53d76541856c38d7ef940988955f84084898..afe6ae14023c7040befe73e49d00077d3425c564:/LUFA/Drivers/USB/Class/Device/HID.h

diff --git a/LUFA/Drivers/USB/Class/Device/HID.h b/LUFA/Drivers/USB/Class/Device/HID.h
index 1269a52b3..a4317d719 100644
--- a/LUFA/Drivers/USB/Class/Device/HID.h
+++ b/LUFA/Drivers/USB/Class/Device/HID.h
@@ -28,25 +28,21 @@
   this software.
 */
 
-/** \ingroup Group_USBDeviceClassDrivers
- *  @defgroup Group_USBClassHIDDevice HID Device Class Driver - LUFA/Drivers/Class/Device/HID.h
- *
- *  \section Sec_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/HID.c
+/** \ingroup Group_USBClassHID
+ *  @defgroup Group_USBClassHIDDevice HID Class Device Mode Driver
  *
  *  \section Module Description
- *  Functions, macros, variables, enums and types related to the management of USB HID Class interfaces
- *  within a USB device.
+ *  Device Mode USB Class driver framework interface, for the HID USB Class driver.
  *
  *  @{
  */
  
-#ifndef _HID_CLASS_H_
-#define _HID_CLASS_H_
+#ifndef _HID_CLASS_DEVICE_H_
+#define _HID_CLASS_DEVICE_H_
 
 	/* Includes: */
 		#include "../../USB.h"
+		#include "../Common/HID.h"
 
 		#include <string.h>
 
@@ -55,73 +51,6 @@
 			extern "C" {
 		#endif
 
-	/* Macros: */
-		/** HID Class Specific Request to get the current HID report from the device. */
-		#define REQ_GetReport      0x01
-
-		/** HID Class Specific Request to get the current device idle count. */
-		#define REQ_GetIdle        0x02
-
-		/** HID Class Specific Request to set the current HID report to the device. */
-		#define REQ_SetReport      0x09
-
-		/** HID Class Specific Request to set the device's idle count. */
-		#define REQ_SetIdle        0x0A
-
-		/** HID Class Specific Request to get the current HID report protocol mode. */
-		#define REQ_GetProtocol    0x03
-
-		/** HID Class Specific Request to set the current HID report protocol mode. */
-		#define REQ_SetProtocol    0x0B
-
-		/** 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
-
-	/* 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;
-
-		/** Class state structure. An instance of this structure should be made for each HID interface
-		 *  within the user application, and passed to each of the HID class driver functions as the
-		 *  HIDInterfaceInfo parameter. The contents of this structure should be set to their correct
-		 *  values when used, or ommitted to force the library to use default values.
-		 *
-		 *  Note that for the HID class driver, host-to-device reports are received via HID class requests
-		 *  rather than a dedicated endpoint to simplify the driver and its interface.
-		 */
-		typedef struct
-		{
-			uint8_t  InterfaceNumber; /**< Interface number of the HID interface within the device */
-
-			uint8_t  ReportINEndpointNumber; /**< Endpoint number of the HID interface's IN report endpoint */
-			uint16_t ReportINEndpointSize; /**< Size in bytes of the HID interface's IN report endpoint */
-			
-			uint8_t  ReportINBufferSize; /**< Size of the largest possible report to send to the host, for buffer allocation purposes */
-
-			bool     UsingReportProtocol; /**< Indicates if the HID interface is set to Boot or Report protocol mode */
-			uint16_t IdleCount; /**< Report idle period, in ms, set by the host */
-			uint16_t IdleMSRemaining; /**< Total number of ms remaining before the idle period elapses */
-		} USB_ClassInfo_HID_t;
-
 	/* Function Prototypes: */
 		/** Configures the endpoints of a given HID interface, ready for use. This should be linked to the library
 		 *  \ref EVENT_USB_ConfigurationChanged() event so that the endpoints are configured when the configuration