From bd2f6cc305e22f88e18ec5fe64c0a65228f4bc04 Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 22 Feb 2010 12:58:40 +0000 Subject: Change over board hardware drivers to use the custom uintN_t and intN_t native word size types. git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1149 d5102386-fcda-11dd-9fdb-3debd5008f28 --- LUFA/Drivers/Board/STK525/Buttons.h | 3 +-- LUFA/Drivers/Board/STK525/Joystick.h | 3 +-- LUFA/Drivers/Board/STK525/LEDs.h | 13 ++++++------- 3 files changed, 8 insertions(+), 11 deletions(-) (limited to 'LUFA/Drivers/Board/STK525') diff --git a/LUFA/Drivers/Board/STK525/Buttons.h b/LUFA/Drivers/Board/STK525/Buttons.h index f3dccafd..e70822ea 100644 --- a/LUFA/Drivers/Board/STK525/Buttons.h +++ b/LUFA/Drivers/Board/STK525/Buttons.h @@ -85,8 +85,7 @@ PORTE |= BUTTONS_BUTTON1; } - static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT; - static inline uint8_t Buttons_GetStatus(void) + static inline uintN_t Buttons_GetStatus(void) { return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1); } diff --git a/LUFA/Drivers/Board/STK525/Joystick.h b/LUFA/Drivers/Board/STK525/Joystick.h index 6358f957..aab650d9 100644 --- a/LUFA/Drivers/Board/STK525/Joystick.h +++ b/LUFA/Drivers/Board/STK525/Joystick.h @@ -100,8 +100,7 @@ PORTE |= JOY_EMASK; } - static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; - static inline uint8_t Joystick_GetStatus(void) + static inline uintN_t Joystick_GetStatus(void) { return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1)); } diff --git a/LUFA/Drivers/Board/STK525/LEDs.h b/LUFA/Drivers/Board/STK525/LEDs.h index b54a8c98..1f2e9a2b 100644 --- a/LUFA/Drivers/Board/STK525/LEDs.h +++ b/LUFA/Drivers/Board/STK525/LEDs.h @@ -93,33 +93,32 @@ PORTD &= ~LEDS_ALL_LEDS; } - static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) + static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask) { PORTD |= LEDMask; } - static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) { PORTD &= ~LEDMask; } - static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) + static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) { PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask); } - static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) + static inline void LEDs_ChangeLEDs(const uintN_t LEDMask, const uintN_t ActiveMask) { PORTD = ((PORTD & ~LEDMask) | ActiveMask); } - static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) + static inline void LEDs_ToggleLEDs(const uintN_t LEDMask) { PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS)); } - static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; - static inline uint8_t LEDs_GetLEDs(void) + static inline uintN_t LEDs_GetLEDs(void) { return (PORTD & LEDS_ALL_LEDS); } -- cgit v1.2.3