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 e664996..b4b5767 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
@@ -1,25 +1,24 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2013.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  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 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
   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
   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.
 
   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
   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


@@ -33,7 +32,7 @@
  *
  *  Header file for Descriptors.c.
  */
  *
  *  Header file for Descriptors.c.
  */

- 
+

 #ifndef _DESCRIPTORS_H_
 #define _DESCRIPTORS_H_
 
 #ifndef _DESCRIPTORS_H_
 #define _DESCRIPTORS_H_
 


@@ -41,7 +40,6 @@
                #include <avr/pgmspace.h>
 
                #include <LUFA/Drivers/USB/USB.h>
                #include <avr/pgmspace.h>
 
                #include <LUFA/Drivers/USB/USB.h>

-               #include <LUFA/Drivers/USB/Class/HID.h>

 
        /* Type Defines: */
                /** Type define for the device configuration descriptor structure. This must be defined in the
 
        /* Type Defines: */
                /** Type define for the device configuration descriptor structure. This must be defined in the


@@ -51,26 +49,33 @@
                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_Descriptor_Interface_t            HID1_KeyboardInterface;

-                       USB_HID_Descriptor_t                  HID1_KeyboardHID;
-               USB_Descriptor_Endpoint_t             HID1_ReportINEndpoint;
+                       USB_HID_Descriptor_HID_t              HID1_KeyboardHID;
+                       USB_Descriptor_Endpoint_t             HID1_ReportINEndpoint;
+
+                       // Mouse HID Interface

                        USB_Descriptor_Interface_t            HID2_MouseInterface;
                        USB_Descriptor_Interface_t            HID2_MouseInterface;

-                       USB_HID_Descriptor_t                  HID2_MouseHID;
-               USB_Descriptor_Endpoint_t             HID2_ReportINEndpoint;
+                       USB_HID_Descriptor_HID_t              HID2_MouseHID;
+                       USB_Descriptor_Endpoint_t             HID2_ReportINEndpoint;

                } USB_Descriptor_Configuration_t;
                } USB_Descriptor_Configuration_t;

-                                       
+

        /* Macros: */
        /* 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: */
                #define HID_EPSIZE                8
 
        /* Function Prototypes: */

-               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                                   const uint8_t wIndex,
+                                                   const void** const DescriptorAddress)

                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif
                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif

+