More AVR32 achitecture ports.

[pub/USBasp.git] / LUFA / Drivers / Board / STK525 / Joystick.h

diff --git a/LUFA/Drivers/Board/STK525/Joystick.h b/LUFA/Drivers/Board/STK525/Joystick.h
index 11abad5..aab650d 100644 (file)
--- a/LUFA/Drivers/Board/STK525/Joystick.h
+++ b/LUFA/Drivers/Board/STK525/Joystick.h
@@ -39,6 +39,11 @@
 /** \ingroup Group_Joystick\r
  *  @defgroup Group_Joystick_STK525 STK525\r
  *\r
+ *  Board specific joystick driver header for the STK525.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the joystick driver\r
+ *        dispatch header located in LUFA/Drivers/Board/Joystick.h.\r
+ *\r
  *  @{\r
  */\r
  \r
@@ -56,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_JOYSTICK_H)\r
+               #if !defined(__INCLUDE_FROM_JOYSTICK_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.\r
                #endif\r
 \r
@@ -95,8 +100,7 @@
                                PORTE |= JOY_EMASK;                             \r
                        }\r
                        \r
-                       static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;\r
-                       static inline uint8_t Joystick_GetStatus(void)\r
+                       static inline uintN_t Joystick_GetStatus(void)\r
                        {\r
                                return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1));\r
                        }\r