Oops - fix broken SPI driver due to missing bit inversion on a port mask.

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

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index ec25f5f..6cb7ac6 100644 (file)
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */


@@ -9,13 +9,13 @@
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -39,6 +39,8 @@
  *
  *  If the BOARD value is set to BOARD_USER, this will include the /Board/Buttons.h file in the user project
  *  directory.
  *
  *  If the BOARD value is set to BOARD_USER, this will include the /Board/Buttons.h file in the user project
  *  directory.

+ *
+ *  For possible BOARD makefile values, see \ref Group_BoardTypes.

  */
 
 /** \ingroup Group_BoardDrivers
  */
 
 /** \ingroup Group_BoardDrivers


@@ -56,6 +58,8 @@
  *  If the BOARD value is set to BOARD_USER, this will include the /Board/Dataflash.h file in the user project
  *  directory. Otherwise, it will include the appropriate built in board driver header file.
  *
  *  If the BOARD value is set to BOARD_USER, this will include the /Board/Dataflash.h file in the user project
  *  directory. Otherwise, it will include the appropriate built in board driver header file.
  *

+ *  For possible BOARD makefile values, see \ref Group_BoardTypes.
+ *

  *  @{
  */
 
  *  @{
  */
 


@@ -70,7 +74,7 @@
 
        /* Includes: */
        #include "../../Common/Common.h"
 
        /* Includes: */
        #include "../../Common/Common.h"

-       
+

        #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)


@@ -86,29 +90,39 @@
        #elif (BOARD == BOARD_EVK527)
                #include "EVK527/Buttons.h"
        #elif (BOARD == BOARD_USBTINYMKII)
        #elif (BOARD == BOARD_EVK527)
                #include "EVK527/Buttons.h"
        #elif (BOARD == BOARD_USBTINYMKII)

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

        #elif (BOARD == BOARD_BENITO)
                #include "BENITO/Buttons.h"
        #elif (BOARD == BOARD_JMDBU2)
                #include "JMDBU2/Buttons.h"
        #elif (BOARD == BOARD_BENITO)
                #include "BENITO/Buttons.h"
        #elif (BOARD == BOARD_JMDBU2)
                #include "JMDBU2/Buttons.h"

+       #elif (BOARD == BOARD_OLIMEX162)
+               #include "OLIMEX162/Buttons.h"
+       #elif (BOARD == BOARD_USBFOO)
+               #include "USBFOO/Buttons.h"
+       #elif (BOARD == BOARD_UDIP)
+               #include "UDIP/Buttons.h"
+       #elif (BOARD == BOARD_CULV3)
+               #include "CULV3/Buttons.h"
+       #elif (BOARD == BOARD_MINIMUS)
+               #include "MINIMUS/Buttons.h"

        #elif (BOARD == BOARD_USER)
                #include "Board/Buttons.h"
        #else
                #error The selected board does not contain any GPIO buttons.
        #endif
        #elif (BOARD == BOARD_USER)
                #include "Board/Buttons.h"
        #else
                #error The selected board does not contain any GPIO buttons.
        #endif

-       
+

        /* Pseudo-Functions for Doxygen: */
        #if defined(__DOXYGEN__)
        /* Pseudo-Functions for Doxygen: */
        #if defined(__DOXYGEN__)

-               /** Initializes the BUTTONS driver, so that the current button position can be read. This sets the appropriate
+               /** 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);
                 *  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.
                 *
                /** Returns a mask indicating which board buttons are currently pressed.
                 *

-                *  \return Mask indicating which board buttons are currently pressed
+                *  \return Mask indicating which board buttons are currently pressed.

                 */
                static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
        #endif
                 */
                static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
        #endif


@@ -116,3 +130,4 @@
 #endif
 
 /** @} */
 #endif
 
 /** @} */

+