Alter VSIX build script to verify all referenced filenames in all modules and project...

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

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index 1b70a6b..31a8653 100644 (file)
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2013.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -57,7 +57,7 @@
  *  actions can be taken.
  *
  *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/Buttons.h file in the user project
  *  actions can be taken.
  *
  *  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.
+ *  directory. Otherwise, it will include the appropriate built-in board driver header file.

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


@@ -144,9 +144,13 @@
                #elif (BOARD == BOARD_B1_XPLAINED)
                        #include "XMEGA/B1_XPLAINED/Buttons.h"
                #elif (BOARD == BOARD_OLIMEX32U4)
                #elif (BOARD == BOARD_B1_XPLAINED)
                        #include "XMEGA/B1_XPLAINED/Buttons.h"
                #elif (BOARD == BOARD_OLIMEX32U4)

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

                #elif (BOARD == BOARD_OLIMEXT32U4)
                #elif (BOARD == BOARD_OLIMEXT32U4)

-                       #include "AVR8/OLIMEXT32U4/Buttons.h"           
+                       #include "AVR8/OLIMEXT32U4/Buttons.h"
+               #elif (BOARD == BOARD_OLIMEXISPMK2)
+                       #include "AVR8/OLIMEXISPMK2/Buttons.h"
+               #elif (BOARD == BOARD_UC3A3_XPLAINED)
+                       #include "UC3/UC3A3_XPLAINED/Buttons.h"

                #else
                        #include "Board/Buttons.h"
                #endif
                #else
                        #include "Board/Buttons.h"
                #endif


@@ -160,12 +164,12 @@
                 */
                static inline void Buttons_Init(void);
 
                 */
                static inline void Buttons_Init(void);
 

-               /** Disables the buttons driver, releasing the I/O pins back to their default high-impedence input mode. */
+               /** Disables the buttons driver, releasing the I/O pins back to their default high-impedance input mode. */

                static inline void Buttons_Disable(void);
 
                /** Returns a mask indicating which board buttons are currently pressed.
                 *
                static inline void Buttons_Disable(void);
 
                /** Returns a mask indicating which board buttons are currently pressed.
                 *

-                *  \return Mask indicating which board buttons are currently pressed.
+                *  \return Mask of \c BUTTONS_BUTTON* constants indicating which board buttons are currently pressed.

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