Fixed compile errors in the incomplete BluetoothHost demo application (thanks to...

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

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index b91c770..ed584e1 100644 (file)
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -66,7 +66,7 @@
  *  application.
  *
  *  \code
- *      // Initialise the button driver before first use
+ *      // Initialize the button driver before first use
  *      Buttons_Init();
  *
  *      printf("Waiting for button press...\r\n");
@@ -86,10 +86,7 @@
 #define __BUTTONS_H__
 
        /* Macros: */
-       #if !defined(__DOXYGEN__)
                #define __INCLUDE_FROM_BUTTONS_H
-               #define INCLUDE_FROM_BUTTONS_H
-       #endif
 
        /* Includes: */
                #include "../../Common/Common.h"
@@ -97,44 +94,46 @@
                #if (BOARD == BOARD_NONE)
                        #error The Board Buttons driver cannot be used if the makefile BOARD option is not set.
                #elif (BOARD == BOARD_USBKEY)
-                       #include "USBKEY/Buttons.h"
+                       #include "AVR8/USBKEY/Buttons.h"
                #elif (BOARD == BOARD_STK525)
-                       #include "STK525/Buttons.h"
+                       #include "AVR8/STK525/Buttons.h"
                #elif (BOARD == BOARD_STK526)
-                       #include "STK526/Buttons.h"
+                       #include "AVR8/STK526/Buttons.h"
                #elif (BOARD == BOARD_ATAVRUSBRF01)
-                       #include "ATAVRUSBRF01/Buttons.h"
+                       #include "AVR8/ATAVRUSBRF01/Buttons.h"
                #elif (BOARD == BOARD_BUMBLEB)
-                       #include "BUMBLEB/Buttons.h"
+                       #include "AVR8/BUMBLEB/Buttons.h"
                #elif (BOARD == BOARD_EVK527)
-                       #include "EVK527/Buttons.h"
+                       #include "AVR8/EVK527/Buttons.h"
                #elif (BOARD == BOARD_USBTINYMKII)
-                       #include "USBTINYMKII/Buttons.h"
+                       #include "AVR8/USBTINYMKII/Buttons.h"
                #elif (BOARD == BOARD_BENITO)
-                       #include "BENITO/Buttons.h"
+                       #include "AVR8/BENITO/Buttons.h"
                #elif (BOARD == BOARD_JMDBU2)
-                       #include "JMDBU2/Buttons.h"
+                       #include "AVR8/JMDBU2/Buttons.h"
                #elif (BOARD == BOARD_OLIMEX162)
-                       #include "OLIMEX162/Buttons.h"
+                       #include "AVR8/OLIMEX162/Buttons.h"
                #elif (BOARD == BOARD_USBFOO)
-                       #include "USBFOO/Buttons.h"
+                       #include "AVR8/USBFOO/Buttons.h"
                #elif (BOARD == BOARD_UDIP)
-                       #include "UDIP/Buttons.h"
+                       #include "AVR8/UDIP/Buttons.h"
                #elif (BOARD == BOARD_CULV3)
-                       #include "CULV3/Buttons.h"
+                       #include "AVR8/CULV3/Buttons.h"
                #elif (BOARD == BOARD_MINIMUS)
-                       #include "MINIMUS/Buttons.h"
+                       #include "AVR8/MINIMUS/Buttons.h"
                #elif (BOARD == BOARD_MICROSIN162)
-                       #include "MICROSIN162/Buttons.h"
+                       #include "AVR8/MICROSIN162/Buttons.h"
                #elif (BOARD == BOARD_EVK1101)
-                       #include "EVK1101/Buttons.h"
+                       #include "UC3/EVK1101/Buttons.h"
+               #elif (BOARD == BOARD_TUL)
+                       #include "AVR8/TUL/Buttons.h"           
                #else
                        #include "Board/Buttons.h"
                #endif
 
                /* Pseudo-Functions for Doxygen: */
                #if defined(__DOXYGEN__)
-                       /** Initialises the BUTTONS driver, so that the current button position can be read. This sets the appropriate
+                       /** Initializes the BUTTONS driver, so that the current button position can be read. This sets the appropriate
                         *  I/O pins to an inputs with pull-ups enabled.
                         *
                         *  This must be called before any Button driver functions are used.