Make sure that the NVM bus/controller busy waits in the AVRISP MKII clone project...

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

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index d1de8d5..0077df3 100644 (file)
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -29,6 +29,7 @@
 */\r
 \r
 /** \file\r
 */\r
 \r
 /** \file\r

+ *  \brief Master include file for the board digital button driver.\r

  *\r
  *  This file is the master dispatch header file for the board-specific Buttons driver, for boards containing\r
  *  physical pushbuttons connected to the AVR's GPIO pins.\r
  *\r
  *  This file is the master dispatch header file for the board-specific Buttons driver, for boards containing\r
  *  physical pushbuttons connected to the AVR's GPIO pins.\r


@@ -63,14 +64,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


@@ -83,6 +85,12 @@
                #include "BUMBLEB/Buttons.h"\r
        #elif (BOARD == BOARD_EVK527)\r
                #include "EVK527/Buttons.h"\r
                #include "BUMBLEB/Buttons.h"\r
        #elif (BOARD == BOARD_EVK527)\r
                #include "EVK527/Buttons.h"\r

+       #elif (BOARD == BOARD_USBTINYMKII)\r
+               #include "USBTINYMKII/Buttons.h"                \r
+       #elif (BOARD == BOARD_BENITO)\r
+               #include "BENITO/Buttons.h"\r
+       #elif (BOARD == BOARD_JMDBU2)\r
+               #include "JMDBU2/Buttons.h"\r

        #elif (BOARD == BOARD_USER)\r
                #include "Board/Buttons.h"\r
        #else\r
        #elif (BOARD == BOARD_USER)\r
                #include "Board/Buttons.h"\r
        #else\r