All USB class drivers are now automatically included when LUFA/Drivers/USB.h is included, and no longer need to be seperately included.

All LowLevel demos changed to use the constants and types defined in the USB class drivers.

4 files changed, 16 insertions, 110 deletions

diff --git a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
index b04dccdf8..39d6c73e8 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
@@ -180,12 +180,12 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
 	.HID1_KeyboardHID =
 		{
-			.Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
+			.Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
 
 			.HIDSpec                = VERSION_BCD(01.11),
 			.CountryCode            = 0x00,
 			.TotalReportDescriptors = 1,
-			.HIDReportType          = DTYPE_Report,
+			.HIDReportType          = HID_DTYPE_Report,
 			.HIDReportLength        = sizeof(KeyboardReport)
 		},
 
@@ -227,12 +227,12 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
 	.HID2_MouseHID =
 		{
-			.Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
+			.Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
 
 			.HIDSpec                = VERSION_BCD(01.11),
 			.CountryCode            = 0x00,
 			.TotalReportDescriptors = 1,
-			.HIDReportType          = DTYPE_Report,
+			.HIDReportType          = HID_DTYPE_Report,
 			.HIDReportLength        = sizeof(MouseReport)
 		},
 
@@ -324,19 +324,19 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 			}
 
 			break;
-		case DTYPE_HID:
+		case HID_DTYPE_HID:
 			if (!(wIndex))
 			{
 				Address = &ConfigurationDescriptor.HID1_KeyboardHID;
-				Size    = sizeof(USB_Descriptor_HID_t);
+				Size    = sizeof(USB_HID_Descriptor_HID_t);
 			}
 			else
 			{
 				Address = &ConfigurationDescriptor.HID2_MouseHID;
-				Size    = sizeof(USB_Descriptor_HID_t);
+				Size    = sizeof(USB_HID_Descriptor_HID_t);
 			}
 			break;
-		case DTYPE_Report:
+		case HID_DTYPE_Report:
 			if (!(wIndex))
 			{
 				Address = &KeyboardReport;
diff --git a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h
index 908591c26..11eadc771 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h
@@ -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.
@@ -70,11 +51,11 @@
 		{
 			USB_Descriptor_Configuration_Header_t Config;
 			USB_Descriptor_Interface_t            HID1_KeyboardInterface;
-			USB_Descriptor_HID_t                  HID1_KeyboardHID;
+			USB_HID_Descriptor_HID_t              HID1_KeyboardHID;
 	        USB_Descriptor_Endpoint_t             HID1_ReportINEndpoint;
 	        USB_Descriptor_Endpoint_t             HID1_ReportOUTEndpoint;
 			USB_Descriptor_Interface_t            HID2_MouseInterface;
-			USB_Descriptor_HID_t                  HID2_MouseHID;
+			USB_HID_Descriptor_HID_t              HID2_MouseHID;
 	        USB_Descriptor_Endpoint_t             HID2_ReportINEndpoint;
 		} USB_Descriptor_Configuration_t;
 
@@ -91,12 +72,6 @@
 		/** Size in bytes of each of the HID reporting IN and OUT endpoints. */
 		#define HID_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,
diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
index 678957378..fc81445c1 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
@@ -129,7 +129,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 	/* Handle HID Class specific requests */
 	switch (USB_ControlRequest.bRequest)
 	{
-		case REQ_GetReport:
+		case HID_REQ_GetReport:
 			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
 			{
 				Endpoint_ClearSETUP();
@@ -155,7 +155,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 			}
 
 			break;
-		case REQ_SetReport:
+		case HID_REQ_SetReport:
 			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
 			{
 				Endpoint_ClearSETUP();
@@ -190,13 +190,13 @@ void Keyboard_ProcessLEDReport(const uint8_t LEDStatus)
 {
 	uint8_t LEDMask = LEDS_LED2;
 
-	if (LEDStatus & KEYBOARD_LED_NUMLOCK)
+	if (LEDStatus & HID_KEYBOARD_LED_NUMLOCK)
 	  LEDMask |= LEDS_LED1;
 
-	if (LEDStatus & KEYBOARD_LED_CAPSLOCK)
+	if (LEDStatus & HID_KEYBOARD_LED_CAPSLOCK)
 	  LEDMask |= LEDS_LED3;
 
-	if (LEDStatus & KEYBOARD_LED_SCROLLLOCK)
+	if (LEDStatus & HID_KEYBOARD_LED_SCROLLLOCK)
 	  LEDMask |= LEDS_LED4;
 
 	/* Set the status LEDs to the current Keyboard LED status */
@@ -219,7 +219,7 @@ void Keyboard_HID_Task(void)
 	if (!(Buttons_GetStatus() & BUTTONS_BUTTON1))
 	{
 		/* Make sent key uppercase by indicating that the left shift key is pressed */
-		KeyboardReportData.Modifier = KEYBOARD_MODIFER_LEFTSHIFT;
+		KeyboardReportData.Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
 
 		if (JoyStatus_LCL & JOY_UP)
 		  KeyboardReportData.KeyCode[0] = 0x04; // A
diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.h b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.h
index 40572992d..bcf77ccd6 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.h
@@ -49,54 +49,6 @@
 		#include <LUFA/Drivers/Board/Buttons.h>
 
 	/* Macros: */
-		/** HID Class specific request to get the next HID report from the device. */
-		#define REQ_GetReport               0x01
-
-		/** HID Class specific request to send the next HID report to the device. */
-		#define REQ_SetReport               0x09
-
-		/** HID Class specific request to get the current HID protocol in use, either report or boot. */
-		#define REQ_GetProtocol             0x03
-
-		/** HID Class specific request to set the current HID protocol in use, either report or boot. */
-		#define REQ_SetProtocol             0x0B
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left control key is currently pressed. */
-		#define KEYBOARD_MODIFER_LEFTCTRL   (1 << 0)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left shift key is currently pressed. */
-		#define KEYBOARD_MODIFER_LEFTSHIFT  (1 << 1)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left alt key is currently pressed. */
-		#define KEYBOARD_MODIFER_LEFTALT    (1 << 2)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left GUI key is currently pressed. */
-		#define KEYBOARD_MODIFER_LEFTGUI    (1 << 3)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right control key is currently pressed. */
-		#define KEYBOARD_MODIFER_RIGHTCTRL  (1 << 4)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right shift key is currently pressed. */
-		#define KEYBOARD_MODIFER_RIGHTSHIFT (1 << 5)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right alt key is currently pressed. */
-		#define KEYBOARD_MODIFER_RIGHTALT   (1 << 6)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right GUI key is currently pressed. */
-		#define KEYBOARD_MODIFER_RIGHTGUI   (1 << 7)
-
-		/** Constant for a keyboard output report LED byte, indicating that the host's NUM LOCK mode is currently set. */
-		#define KEYBOARD_LED_NUMLOCK        (1 << 0)
-
-		/** Constant for a keyboard output report LED byte, indicating that the host's CAPS LOCK mode is currently set. */
-		#define KEYBOARD_LED_CAPSLOCK       (1 << 1)
-
-		/** Constant for a keyboard output report LED byte, indicating that the host's SCROLL LOCK mode is currently set. */
-		#define KEYBOARD_LED_SCROLLLOCK     (1 << 2)
-
-		/** Constant for a keyboard output report LED byte, indicating that the host's KATANA mode is currently set. */
-		#define KEYBOARD_LED_KATANA         (1 << 3)
-
 		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
 		#define LEDMASK_USB_NOTREADY        LEDS_LED1
 
@@ -109,27 +61,6 @@
 		/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
 		#define LEDMASK_USB_ERROR           (LEDS_LED1 | LEDS_LED3)
 
-	/* Type Defines: */
-		/** Type define for the keyboard HID report structure, for creating and sending HID reports to the host PC.
-		 *  This mirrors the layout described to the host in the HID report descriptor, in Descriptors.c.
-		 */
-		typedef struct
-		{
-			uint8_t Modifier; /**< Modifier mask byte, containing a mask of modifier keys set (such as shift or CTRL) */
-			uint8_t Reserved; /**< Reserved, always set as 0x00 */
-			uint8_t KeyCode[6]; /**< Array of up to six simultaneous key codes of pressed keys */
-		} USB_KeyboardReport_Data_t;
-
-		/** Type define for the mouse HID report structure, for creating and sending HID reports to the host PC.
-		 *  This mirrors the layout described to the host in the HID report descriptor, in Descriptors.c.
-		 */
-		typedef struct
-		{
-			uint8_t Button; /**< Bit mask of the currently pressed mouse buttons */
-			int8_t  X; /**< Current mouse delta X movement, as a signed 8-bit integer */
-			int8_t  Y; /**< Current mouse delta Y movement, as a signed 8-bit integer */
-		} USB_MouseReport_Data_t;
-
 	/* Function Prototypes: */
 		void SetupHardware(void);
 		void Keyboard_ProcessLEDReport(const uint8_t LEDStatus);