Oops - fix incorrect value of AOA_CSCP_AOADataSubclass in the Android Open Accessory...

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

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index b91c770..ba6be38 100644 (file)
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -56,7 +56,7 @@
  *  It provides a way to easily configure and check the status of all the buttons on the board so that appropriate
  *  actions can be taken.
  *
  *  It provides a way to easily configure and check the status of all the buttons on the board so that appropriate
  *  actions can be taken.
  *

- *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/Dataflash.h file in the user project
+ *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/Buttons.h file in the user project

  *  directory. Otherwise, it will include the appropriate built in board driver header file.
  *
  *  For possible \c BOARD makefile values, see \ref Group_BoardTypes.
  *  directory. Otherwise, it will include the appropriate built in board driver header file.
  *
  *  For possible \c BOARD makefile values, see \ref Group_BoardTypes.


@@ -66,7 +66,7 @@
  *  application.
  *
  *  \code
  *  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");
  *      Buttons_Init();
  *
  *      printf("Waiting for button press...\r\n");


@@ -86,10 +86,7 @@
 #define __BUTTONS_H__
 
        /* Macros: */
 #define __BUTTONS_H__
 
        /* Macros: */

-       #if !defined(__DOXYGEN__)

                #define __INCLUDE_FROM_BUTTONS_H
                #define __INCLUDE_FROM_BUTTONS_H

-               #define INCLUDE_FROM_BUTTONS_H
-       #endif

 
        /* Includes: */
                #include "../../Common/Common.h"
 
        /* Includes: */
                #include "../../Common/Common.h"


@@ -97,56 +94,64 @@
                #if (BOARD == BOARD_NONE)
                        #error The Board Buttons driver cannot be used if the makefile BOARD option is not set.
                #elif (BOARD == BOARD_USBKEY)
                #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)
                #elif (BOARD == BOARD_STK525)

-                       #include "STK525/Buttons.h"
+                       #include "AVR8/STK525/Buttons.h"

                #elif (BOARD == BOARD_STK526)
                #elif (BOARD == BOARD_STK526)

-                       #include "STK526/Buttons.h"
+                       #include "AVR8/STK526/Buttons.h"

                #elif (BOARD == BOARD_ATAVRUSBRF01)
                #elif (BOARD == BOARD_ATAVRUSBRF01)

-                       #include "ATAVRUSBRF01/Buttons.h"
+                       #include "AVR8/ATAVRUSBRF01/Buttons.h"

                #elif (BOARD == BOARD_BUMBLEB)
                #elif (BOARD == BOARD_BUMBLEB)

-                       #include "BUMBLEB/Buttons.h"
+                       #include "AVR8/BUMBLEB/Buttons.h"

                #elif (BOARD == BOARD_EVK527)
                #elif (BOARD == BOARD_EVK527)

-                       #include "EVK527/Buttons.h"
+                       #include "AVR8/EVK527/Buttons.h"

                #elif (BOARD == BOARD_USBTINYMKII)
                #elif (BOARD == BOARD_USBTINYMKII)

-                       #include "USBTINYMKII/Buttons.h"
+                       #include "AVR8/USBTINYMKII/Buttons.h"

                #elif (BOARD == BOARD_BENITO)
                #elif (BOARD == BOARD_BENITO)

-                       #include "BENITO/Buttons.h"
+                       #include "AVR8/BENITO/Buttons.h"

                #elif (BOARD == BOARD_JMDBU2)
                #elif (BOARD == BOARD_JMDBU2)

-                       #include "JMDBU2/Buttons.h"
+                       #include "AVR8/JMDBU2/Buttons.h"

                #elif (BOARD == BOARD_OLIMEX162)
                #elif (BOARD == BOARD_OLIMEX162)

-                       #include "OLIMEX162/Buttons.h"
+                       #include "AVR8/OLIMEX162/Buttons.h"

                #elif (BOARD == BOARD_USBFOO)
                #elif (BOARD == BOARD_USBFOO)

-                       #include "USBFOO/Buttons.h"
+                       #include "AVR8/USBFOO/Buttons.h"

                #elif (BOARD == BOARD_UDIP)
                #elif (BOARD == BOARD_UDIP)

-                       #include "UDIP/Buttons.h"
+                       #include "AVR8/UDIP/Buttons.h"

                #elif (BOARD == BOARD_CULV3)
                #elif (BOARD == BOARD_CULV3)

-                       #include "CULV3/Buttons.h"
+                       #include "AVR8/CULV3/Buttons.h"

                #elif (BOARD == BOARD_MINIMUS)
                #elif (BOARD == BOARD_MINIMUS)

-                       #include "MINIMUS/Buttons.h"
+                       #include "AVR8/MINIMUS/Buttons.h"

                #elif (BOARD == BOARD_MICROSIN162)
                #elif (BOARD == BOARD_MICROSIN162)

-                       #include "MICROSIN162/Buttons.h"
+                       #include "AVR8/MICROSIN162/Buttons.h"

                #elif (BOARD == BOARD_EVK1101)
                #elif (BOARD == BOARD_EVK1101)

-                       #include "EVK1101/Buttons.h"
+                       #include "UC3/EVK1101/Buttons.h"
+               #elif (BOARD == BOARD_TUL)
+                       #include "AVR8/TUL/Buttons.h"
+               #elif (BOARD == BOARD_EVK1100)
+                       #include "UC3/EVK1100/Buttons.h"
+               #elif (BOARD == BOARD_EVK1104)
+                       #include "UC3/EVK1104/Buttons.h"
+               #elif (BOARD == BOARD_A3BU_XPLAINED)
+                       #include "XMEGA/A3BU_XPLAINED/Buttons.h"

                #else
                        #include "Board/Buttons.h"
                #endif
 
                #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
-                        *  I/O pins to an inputs with pull-ups enabled.
-                        *
-                        *  This must be called before any Button driver functions are used.
-                        */
-                       static inline void Buttons_Init(void);
+       /* Pseudo-Functions for Doxygen: */
+       #if defined(__DOXYGEN__)
+               /** 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.
+                */
+               static inline void Buttons_Init(void);

 
 

-                       /** Returns a mask indicating which board buttons are currently pressed.
-                        *
-                        *  \return Mask indicating which board buttons are currently pressed.
-                        */
-                       static inline uint_reg_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-               #endif
+               /** Returns a mask indicating which board buttons are currently pressed.
+                *
+                *  \return Mask indicating which board buttons are currently pressed.
+                */
+               static inline uint_reg_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
+       #endif

 
 #endif
 
 
 #endif