Revert changes made for the partial port to the AVR32 architecture.

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

diff --git a/LUFA/Drivers/Board/EVK527/Joystick.h b/LUFA/Drivers/Board/EVK527/Joystick.h
index d8583d1..7d208ea 100644 (file)
--- a/LUFA/Drivers/Board/EVK527/Joystick.h
+++ b/LUFA/Drivers/Board/EVK527/Joystick.h
@@ -68,7 +68,7 @@
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Macros: */\r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Macros: */\r

-                       #define JOY_FMASK                ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7))\r
+                       #define JOY_FMASK                 ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7))\r

                        #define JOY_CMASK                 (1 << 6))\r
        #endif\r
        \r
                        #define JOY_CMASK                 (1 << 6))\r
        #endif\r
        \r


@@ -100,7 +100,8 @@
                                PORTC |= JOY_CMASK;                             \r
                        }\r
                        \r
                                PORTC |= JOY_CMASK;                             \r
                        }\r
                        \r

-                       static inline uintN_t Joystick_GetStatus(void)\r
+                       static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;\r
+                       static inline uint8_t Joystick_GetStatus(void)\r

                        {\r
                                return (((uint8_t)~PINF & JOY_FMASK) | (((uint8_t)~PINC & JOY_CMASK) >> 3));\r
                        }\r
                        {\r
                                return (((uint8_t)~PINF & JOY_FMASK) | (((uint8_t)~PINC & JOY_CMASK) >> 3));\r
                        }\r