Device mode class driver callbacks are now fired before the control request status...

[pub/USBasp.git] / LUFA / DriverStubs / Buttons.h

diff --git a/LUFA/DriverStubs/Buttons.h b/LUFA/DriverStubs/Buttons.h
index 0d02e5c..deab56e 100644 (file)
--- a/LUFA/DriverStubs/Buttons.h
+++ b/LUFA/DriverStubs/Buttons.h
@@ -1,21 +1,21 @@
 /*\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  Dean Camera (dean [at] fourwalledcubicle [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


@@ -46,8 +46,6 @@
                #include <avr/io.h>\r
                #include <stdbool.h>\r
 \r
                #include <avr/io.h>\r
                #include <stdbool.h>\r
 \r

-               #include "../../../Common/Common.h"\r
-\r

                // TODO: Add any required includes here\r
 \r
        /* Enable C linkage for C++ Compilers: */\r
                // TODO: Add any required includes here\r
 \r
        /* Enable C linkage for C++ Compilers: */\r


@@ -56,14 +54,14 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
                #endif\r
 \r
        /* Preprocessor Checks: */\r

-               #if !defined(INCLUDE_FROM_BUTTONS_H)\r
+               #if !defined(__INCLUDE_FROM_BUTTONS_H)\r

                        #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.\r
                #endif\r
                \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Button mask for the first button on the board. */\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.\r
                #endif\r
                \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Button mask for the first button on the board. */\r

-                       #define BUTTONS_BUTTON1          // TODO: Add mask for first board buton here\r
+                       #define BUTTONS_BUTTON1          // TODO: Add mask for first board button here\r

        \r
                /* Inline Functions: */\r
                #if !defined(__DOXYGEN__)\r
        \r
                /* Inline Functions: */\r
                #if !defined(__DOXYGEN__)\r