From df4879bea58a4c3fa8f1f3a7dec19cd08cdb8bd4 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 24 Feb 2010 06:58:23 +0000 Subject: Revert changes made for the partial port to the AVR32 architecture. git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1155 d5102386-fcda-11dd-9fdb-3debd5008f28 --- LUFA/Drivers/Board/BUMBLEB/Buttons.h | 3 ++- LUFA/Drivers/Board/BUMBLEB/Joystick.h | 7 ++++--- LUFA/Drivers/Board/BUMBLEB/LEDs.h | 11 ++++++----- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'LUFA/Drivers/Board/BUMBLEB') diff --git a/LUFA/Drivers/Board/BUMBLEB/Buttons.h b/LUFA/Drivers/Board/BUMBLEB/Buttons.h index 166c9708..e0a5cc5a 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Buttons.h +++ b/LUFA/Drivers/Board/BUMBLEB/Buttons.h @@ -81,7 +81,8 @@ PORTD |= BUTTONS_BUTTON1; } - static inline uintN_t Buttons_GetStatus(void) + static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT; + static inline uint8_t Buttons_GetStatus(void) { return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1); } diff --git a/LUFA/Drivers/Board/BUMBLEB/Joystick.h b/LUFA/Drivers/Board/BUMBLEB/Joystick.h index fdd4b031..5d57ec55 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Joystick.h +++ b/LUFA/Drivers/Board/BUMBLEB/Joystick.h @@ -30,7 +30,7 @@ /** \file * - * Board specific joystick driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board + * Board specific joystick driver header for the USBKEY. The BUMBLEB third-party board does not include any on-board * peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick. * * \note This file should not be included directly. It is automatically included as needed by the joystick driver @@ -40,7 +40,7 @@ /** \ingroup Group_Joystick * @defgroup Group_Joystick_BUMBLEB BUMBLEB * - * Board specific joystick driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board + * Board specific joystick driver header for the USBKEY. The BUMBLEB third-party board does not include any on-board * peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick. * * \note This file should not be included directly. It is automatically included as needed by the joystick driver @@ -98,7 +98,8 @@ PORTD |= JOY_MASK; } - static inline uintN_t Joystick_GetStatus(void) + static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; + static inline uint8_t Joystick_GetStatus(void) { return (uint8_t)(~PIND & JOY_MASK); } diff --git a/LUFA/Drivers/Board/BUMBLEB/LEDs.h b/LUFA/Drivers/Board/BUMBLEB/LEDs.h index a5251be5..549bbde6 100644 --- a/LUFA/Drivers/Board/BUMBLEB/LEDs.h +++ b/LUFA/Drivers/Board/BUMBLEB/LEDs.h @@ -95,27 +95,28 @@ PORTB &= ~LEDS_ALL_LEDS; } - static inline void LEDs_TurnOnLEDs(const uintN_t LedMask) + static inline void LEDs_TurnOnLEDs(const uint8_t LedMask) { PORTB |= LedMask; } - static inline void LEDs_TurnOffLEDs(const uintN_t LedMask) + static inline void LEDs_TurnOffLEDs(const uint8_t LedMask) { PORTB &= ~LedMask; } - static inline void LEDs_SetAllLEDs(const uintN_t LedMask) + static inline void LEDs_SetAllLEDs(const uint8_t LedMask) { PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LedMask); } - static inline void LEDs_ChangeLEDs(const uintN_t LedMask, const uintN_t ActiveMask) + static inline void LEDs_ChangeLEDs(const uint8_t LedMask, const uint8_t ActiveMask) { PORTB = ((PORTB & ~LedMask) | ActiveMask); } - static inline uintN_t LEDs_GetLEDs(void) + static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; + static inline uint8_t LEDs_GetLEDs(void) { return (PORTB & LEDS_ALL_LEDS); } -- cgit v1.2.3