Move DHCP negotiation timer into the DHCP connection application state structure...

[pub/USBasp.git] / LUFA / Drivers / Board / Buttons.h

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index 4216d07..d908fd4 100644 (file)
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/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


@@ -63,14 +63,15 @@
 \r
        /* Macros: */\r
        #if !defined(__DOXYGEN__)\r
 \r
        /* Macros: */\r
        #if !defined(__DOXYGEN__)\r

+               #define __INCLUDE_FROM_BUTTONS_H\r

                #define INCLUDE_FROM_BUTTONS_H\r
        #endif\r
 \r
        /* Includes: */\r
        #include "../../Common/Common.h"\r
        \r
                #define INCLUDE_FROM_BUTTONS_H\r
        #endif\r
 \r
        /* Includes: */\r
        #include "../../Common/Common.h"\r
        \r

-       #if !defined(BOARD)\r
-               #error BOARD must be set in makefile to a value specified in BoardTypes.h.\r
+       #if (BOARD == BOARD_NONE)\r
+               #error The Board Buttons driver cannot be used if the makefile BOARD option is not set.\r

        #elif (BOARD == BOARD_USBKEY)\r
                #include "USBKEY/Buttons.h"\r
        #elif (BOARD == BOARD_STK525)\r
        #elif (BOARD == BOARD_USBKEY)\r
                #include "USBKEY/Buttons.h"\r
        #elif (BOARD == BOARD_STK525)\r


@@ -79,8 +80,12 @@
                #include "STK526/Buttons.h"\r
        #elif (BOARD == BOARD_ATAVRUSBRF01)\r
                #include "ATAVRUSBRF01/Buttons.h"\r
                #include "STK526/Buttons.h"\r
        #elif (BOARD == BOARD_ATAVRUSBRF01)\r
                #include "ATAVRUSBRF01/Buttons.h"\r

+       #elif (BOARD == BOARD_BUMBLEB)\r
+               #include "BUMBLEB/Buttons.h"\r
+       #elif (BOARD == BOARD_EVK527)\r
+               #include "EVK527/Buttons.h"\r

        #elif (BOARD == BOARD_USER)\r
        #elif (BOARD == BOARD_USER)\r

-               #include "Board/Buttons.h"              \r
+               #include "Board/Buttons.h"\r

        #else\r
                #error The selected board does not contain any GPIO buttons.\r
        #endif\r
        #else\r
                #error The selected board does not contain any GPIO buttons.\r
        #endif\r