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 f509777..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


@@ -84,10 +85,14 @@
                #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
        #elif (BOARD == BOARD_USER)\r
                #include "Board/Buttons.h"\r

-       #elif (BOARD == BOARD_EVK1101)\r
-               #include "EVK1101/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


@@ -105,7 +110,7 @@
                 *\r
                 *  \return Mask indicating which board buttons are currently pressed\r
                 */\r
                 *\r
                 *  \return Mask indicating which board buttons are currently pressed\r
                 */\r

-               static inline uintN_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;\r
+               static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;\r

        #endif\r
 \r
 #endif\r
        #endif\r
 \r
 #endif\r