Minor makefile fixes - add phony targets, remove silence switch from the root makefil...

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

diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h
index a543658..a03fa54 100644 (file)
--- a/Projects/Magstripe/Descriptors.h
+++ b/Projects/Magstripe/Descriptors.h
@@ -1,6 +1,6 @@
 /*
              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


@@ -8,7 +8,7 @@
 
 /*
   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
 
 /*
   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -42,6 +42,8 @@
 
                #include <LUFA/Drivers/USB/USB.h>
 
 
                #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
        /* 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


@@ -58,8 +60,8 @@
                } USB_Descriptor_Configuration_t;
 
        /* Macros: */
                } 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
 
                /** Size of the keyboard report endpoints, in bytes. */
                #define KEYBOARD_EPSIZE              8