More AVR32 achitecture ports.

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

diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h
index 0fff2c2..6dbdd25 100644 (file)
--- a/Projects/Magstripe/Descriptors.h
+++ b/Projects/Magstripe/Descriptors.h
@@ -1,22 +1,22 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Denver Gingerich (denver [at] ossguy [dot] com)\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \r
 \r

-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


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

-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r

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


@@ -52,7 +52,7 @@
                {\r
                        USB_Descriptor_Configuration_Header_t Config; /**< Configuration descriptor header structure */\r
                        USB_Descriptor_Interface_t            Interface; /**< Keyboard interface descriptor */\r
                {\r
                        USB_Descriptor_Configuration_Header_t Config; /**< Configuration descriptor header structure */\r
                        USB_Descriptor_Interface_t            Interface; /**< Keyboard interface descriptor */\r

-                       USB_Descriptor_HID_t                  KeyboardHID; /**< Keyboard HID descriptor */\r
+                       USB_HID_Descriptor_t                  KeyboardHID; /**< Keyboard HID descriptor */\r

                USB_Descriptor_Endpoint_t             KeyboardEndpoint; /**< Keyboard key report endpoint descriptor */\r
                } USB_Descriptor_Configuration_t;\r
                                        \r
                USB_Descriptor_Endpoint_t             KeyboardEndpoint; /**< Keyboard key report endpoint descriptor */\r
                } USB_Descriptor_Configuration_t;\r
                                        \r