From 071fd8ce536522ca6365580d64cd465e4c18a031 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 24 Feb 2010 06:58:23 +0000 Subject: Revert changes made for the partial port to the AVR32 architecture. --- LUFA/Drivers/Board/USBKEY/Buttons.h | 4 ++-- LUFA/Drivers/Board/USBKEY/Joystick.h | 4 ++-- LUFA/Drivers/Board/USBKEY/LEDs.h | 13 +++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'LUFA/Drivers/Board/USBKEY') diff --git a/LUFA/Drivers/Board/USBKEY/Buttons.h b/LUFA/Drivers/Board/USBKEY/Buttons.h index 471a19ad2..db1391c8e 100644 --- a/LUFA/Drivers/Board/USBKEY/Buttons.h +++ b/LUFA/Drivers/Board/USBKEY/Buttons.h @@ -79,8 +79,8 @@ PORTE |= BUTTONS_BUTTON1; } - static inline uintN_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT; - 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 ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1); } diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/USBKEY/Joystick.h index b6dd8d17d..b0829914b 100644 --- a/LUFA/Drivers/Board/USBKEY/Joystick.h +++ b/LUFA/Drivers/Board/USBKEY/Joystick.h @@ -100,8 +100,8 @@ PORTE |= JOY_EMASK; } - static inline uintN_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; - 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)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1)); } diff --git a/LUFA/Drivers/Board/USBKEY/LEDs.h b/LUFA/Drivers/Board/USBKEY/LEDs.h index 0864be82d..e1a5b2314 100644 --- a/LUFA/Drivers/Board/USBKEY/LEDs.h +++ b/LUFA/Drivers/Board/USBKEY/LEDs.h @@ -93,32 +93,33 @@ PORTD &= ~LEDS_ALL_LEDS; } - static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask) + static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) { PORTD |= LEDMask; } - static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) { PORTD &= ~LEDMask; } - static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) + static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) { PORTD = ((PORTD & ~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) { PORTD = ((PORTD & ~LEDMask) | ActiveMask); } - static inline void LEDs_ToggleLEDs(const uintN_t LEDMask) + static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS)); } - 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 (PORTD & LEDS_ALL_LEDS); } -- cgit v1.2.3