Mark build test makefiles as being incompatible with parallel make builds, as they...

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

diff --git a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h
index 03606cf..5a59b4d 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this


@@ -50,24 +50,28 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t Config;
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t Config;

+
+                       // Keyboard HID Interface

                        USB_Descriptor_Interface_t            HID1_KeyboardInterface;
                        USB_HID_Descriptor_HID_t              HID1_KeyboardHID;
                        USB_Descriptor_Interface_t            HID1_KeyboardInterface;
                        USB_HID_Descriptor_HID_t              HID1_KeyboardHID;

-               USB_Descriptor_Endpoint_t             HID1_ReportINEndpoint;
-               USB_Descriptor_Endpoint_t             HID1_ReportOUTEndpoint;
+                       USB_Descriptor_Endpoint_t             HID1_ReportINEndpoint;
+                       USB_Descriptor_Endpoint_t             HID1_ReportOUTEndpoint;
+
+                       // Mouse HID Interface

                        USB_Descriptor_Interface_t            HID2_MouseInterface;
                        USB_HID_Descriptor_HID_t              HID2_MouseHID;
                        USB_Descriptor_Interface_t            HID2_MouseInterface;
                        USB_HID_Descriptor_HID_t              HID2_MouseHID;

-               USB_Descriptor_Endpoint_t             HID2_ReportINEndpoint;
+                       USB_Descriptor_Endpoint_t             HID2_ReportINEndpoint;

                } USB_Descriptor_Configuration_t;
 
        /* Macros: */
                } USB_Descriptor_Configuration_t;
 
        /* Macros: */

-               /** Endpoint number of the Keyboard HID reporting IN endpoint. */
-               #define KEYBOARD_IN_EPNUM         1
+               /** Endpoint address of the Keyboard HID reporting IN endpoint. */
+               #define KEYBOARD_IN_EPADDR        (ENDPOINT_DIR_IN  | 1)

 
 

-               /** Endpoint number of the Keyboard HID reporting OUT endpoint. */
-               #define KEYBOARD_OUT_EPNUM        2
+               /** Endpoint address of the Keyboard HID reporting OUT endpoint. */
+               #define KEYBOARD_OUT_EPADDR       (ENDPOINT_DIR_OUT | 2)

 
 

-               /** Endpoint number of the Mouse HID reporting IN endpoint. */
-               #define MOUSE_IN_EPNUM            3
+               /** Endpoint address of the Mouse HID reporting IN endpoint. */
+               #define MOUSE_IN_EPADDR           (ENDPOINT_DIR_IN  | 3)

 
                /** Size in bytes of each of the HID reporting IN and OUT endpoints. */
                #define HID_EPSIZE                8
 
                /** Size in bytes of each of the HID reporting IN and OUT endpoints. */
                #define HID_EPSIZE                8