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

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

diff --git a/LUFA/Drivers/Board/BUMBLEB/Joystick.h b/LUFA/Drivers/Board/BUMBLEB/Joystick.h
index fdd4b03..5d57ec5 100644 (file)
--- a/LUFA/Drivers/Board/BUMBLEB/Joystick.h
+++ b/LUFA/Drivers/Board/BUMBLEB/Joystick.h
@@ -30,7 +30,7 @@
 \r
 /** \file\r
  *\r
 \r
 /** \file\r
  *\r

- *  Board specific joystick driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board\r
+ *  Board specific joystick driver header for the USBKEY. The BUMBLEB third-party board does not include any on-board\r

  *  peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick.\r
  *\r
  *  \note This file should not be included directly. It is automatically included as needed by the joystick driver\r
  *  peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick.\r
  *\r
  *  \note This file should not be included directly. It is automatically included as needed by the joystick driver\r


@@ -40,7 +40,7 @@
 /** \ingroup Group_Joystick\r
  *  @defgroup Group_Joystick_BUMBLEB BUMBLEB\r
  *\r
 /** \ingroup Group_Joystick\r
  *  @defgroup Group_Joystick_BUMBLEB BUMBLEB\r
  *\r

- *  Board specific joystick driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board\r
+ *  Board specific joystick driver header for the USBKEY. The BUMBLEB third-party board does not include any on-board\r

  *  peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick.\r
  *\r
  *  \note This file should not be included directly. It is automatically included as needed by the joystick driver\r
  *  peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick.\r
  *\r
  *  \note This file should not be included directly. It is automatically included as needed by the joystick driver\r


@@ -98,7 +98,8 @@
                                PORTD |= JOY_MASK;\r
                        }\r
                        \r
                                PORTD |= JOY_MASK;\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)(~PIND & JOY_MASK);\r
                        }\r
                        {\r
                                return (uint8_t)(~PIND & JOY_MASK);\r
                        }\r