Add user callback function to the Bluetooth host demo to filter out connections from...

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

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index 5763a99..0077df3 100644 (file)
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -1,13 +1,13 @@
 /*\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
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r


@@ -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