Clean up bootloader project ASF integration code.

[pub/USBasp.git] / Projects / Magstripe / Descriptors.h

diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h
index 9a71ada..b09124b 100644 (file)
--- a/Projects/Magstripe/Descriptors.h
+++ b/Projects/Magstripe/Descriptors.h
@@ -1,6 +1,6 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
@@ -8,7 +8,7 @@
 
 /*
   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
-  Copyright 2011  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
@@ -19,7 +19,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
@@ -42,6 +42,8 @@
 
                #include <LUFA/Drivers/USB/USB.h>
 
+               #include "Config/AppConfig.h"
+
        /* Type Defines: */
                /** 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
@@ -50,7 +52,7 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t Config; /**< Configuration descriptor header structure */
-                       
+
                        // Keyboard HID Interface
                        USB_Descriptor_Interface_t            HID_Interface; /**< Keyboard interface descriptor */
                        USB_HID_Descriptor_HID_t              HID_KeyboardHID; /**< Keyboard HID descriptor */
@@ -58,8 +60,8 @@
                } USB_Descriptor_Configuration_t;
 
        /* Macros: */
-               /** Endpoint number of the keyboard key press reporting endpoint. */
-               #define KEYBOARD_EPNUM               1
+               /** Endpoint address of the keyboard key press reporting endpoint. */
+               #define KEYBOARD_EPADDR              (ENDPOINT_DIR_IN | 1)
 
                /** Size of the keyboard report endpoints, in bytes. */
                #define KEYBOARD_EPSIZE              8