Fix "grep: Version.h: No such file or directory" error when including the core LUFA...

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

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
index 707d76b..b4b5767 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -49,22 +49,26 @@
                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_Endpoint_t             HID1_ReportINEndpoint;
+                       USB_Descriptor_Endpoint_t             HID1_ReportINEndpoint;
+
+                       // Mouse HID Interface
                        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: */
-               /** 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 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. */
+               /** Size in bytes of each of the HID reporting IN endpoints. */
                #define HID_EPSIZE                8
 
        /* Function Prototypes: */