Commit for the 111009 release.

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

diff --git a/LUFA/Drivers/Board/Joystick.h b/LUFA/Drivers/Board/Joystick.h
index 35b989d..0d91576 100644 (file)
--- a/LUFA/Drivers/Board/Joystick.h
+++ b/LUFA/Drivers/Board/Joystick.h
@@ -55,7 +55,7 @@
  *  Hardware Joystick driver. This module provides an easy to use interface to control the hardware digital Joystick
  *  located on many boards.
  *
- *  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/Joystick.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.
@@ -65,7 +65,7 @@
  *  application.
  *
  *  \code
- *      // Initialise the board Joystick driver before first use
+ *      // Initialize the board Joystick driver before first use
  *      Joystick_Init();
  *
  *      printf("Waiting for joystick movement...\r\n");
@@ -113,25 +113,27 @@
                        #include "AVR8/EVK527/Joystick.h"
                #elif (BOARD == BOARD_EVK1101)
                        #include "UC3/EVK1101/Joystick.h"
+               #elif (BOARD == BOARD_EVK1100)
+                       #include "UC3/EVK1100/Joystick.h"
                #else
                        #include "Board/Joystick.h"
                #endif
 
-               /* Pseudo-Functions for Doxygen: */
-               #if defined(__DOXYGEN__)
-                       /** Initialises the joystick driver so that the joystick position can be read. This sets the appropriate
-                        *  I/O pins to inputs with their pull-ups enabled.
-                        */
-                       static inline void Joystick_Init(void);
+       /* Pseudo-Functions for Doxygen: */
+       #if defined(__DOXYGEN__)
+               /** Initializes the joystick driver so that the joystick position can be read. This sets the appropriate
+                *  I/O pins to inputs with their pull-ups enabled.
+                */
+               static inline void Joystick_Init(void);
 
-                       /** Returns the current status of the joystick, as a mask indicating the direction the joystick is
-                        *  currently facing in (multiple bits can be set).
-                        *
-                        *  \return Mask indicating the joystick direction - see corresponding board specific Joystick.h file
-                        *          for direction masks.
-                        */
-                       static inline uint_reg_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-               #endif
+               /** Returns the current status of the joystick, as a mask indicating the direction the joystick is
+                *  currently facing in (multiple bits can be set).
+                *
+                *  \return Mask indicating the joystick direction - see corresponding board specific Joystick.h file
+                *          for direction masks.
+                */
+               static inline uint_reg_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
+       #endif
 
 #endif