From 2590452104c569f64aeefba3b06734035fb77d66 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 22 Feb 2010 12:58:40 +0000 Subject: [PATCH] Change over board hardware drivers to use the custom uintN_t and intN_t native word size types. --- LUFA/Common/Common.h | 6 ++++++ LUFA/DriverStubs/Buttons.h | 3 +-- LUFA/DriverStubs/Joystick.h | 3 +-- LUFA/DriverStubs/LEDs.h | 13 ++++++------- LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h | 3 +-- LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h | 13 ++++++------- LUFA/Drivers/Board/BUMBLEB/Buttons.h | 3 +-- LUFA/Drivers/Board/BUMBLEB/Joystick.h | 3 +-- LUFA/Drivers/Board/BUMBLEB/LEDs.h | 11 +++++------ LUFA/Drivers/Board/EVK1101/Buttons.h | 3 +-- LUFA/Drivers/Board/EVK1101/Joystick.h | 3 +-- LUFA/Drivers/Board/EVK1101/LEDs.h | 13 ++++++------- LUFA/Drivers/Board/EVK527/Buttons.h | 3 +-- LUFA/Drivers/Board/EVK527/Joystick.h | 5 ++--- LUFA/Drivers/Board/EVK527/LEDs.h | 11 +++++------ LUFA/Drivers/Board/RZUSBSTICK/LEDs.h | 11 +++++------ LUFA/Drivers/Board/STK525/Buttons.h | 3 +-- LUFA/Drivers/Board/STK525/Joystick.h | 3 +-- LUFA/Drivers/Board/STK525/LEDs.h | 13 ++++++------- LUFA/Drivers/Board/STK526/Buttons.h | 4 ++-- LUFA/Drivers/Board/STK526/Joystick.h | 4 ++-- LUFA/Drivers/Board/STK526/LEDs.h | 13 ++++++------- LUFA/Drivers/Board/USBKEY/Buttons.h | 4 ++-- LUFA/Drivers/Board/USBKEY/Joystick.h | 4 ++-- LUFA/Drivers/Board/USBKEY/LEDs.h | 13 ++++++------- LUFA/Drivers/Board/XPLAIN/LEDs.h | 13 ++++++------- 26 files changed, 83 insertions(+), 98 deletions(-) diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h index 4052480dda..04480d5143 100644 --- a/LUFA/Common/Common.h +++ b/LUFA/Common/Common.h @@ -190,10 +190,16 @@ /* Type Defines: */ #if defined(__AVR32__) + /** Type define for an unsigned native word-sized chunk of data. */ typedef uint32_t uintN_t; + + /** Type define for a signed native word-sized chunk of data. */ typedef int32_t intN_t; #else + /** Type define for an unsigned native word-sized chunk of data. */ typedef uint8_t uintN_t; + + /** Type define for a signed native word-sized chunk of data. */ typedef int8_t intN_t; #endif #endif diff --git a/LUFA/DriverStubs/Buttons.h b/LUFA/DriverStubs/Buttons.h index deab56e9ef..8c97cd7503 100644 --- a/LUFA/DriverStubs/Buttons.h +++ b/LUFA/DriverStubs/Buttons.h @@ -70,8 +70,7 @@ // TODO: Initialize the appropriate port pins as an inputs here, with pull-ups } - 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) { // TODO: Return current button status here, debounced if required } diff --git a/LUFA/DriverStubs/Joystick.h b/LUFA/DriverStubs/Joystick.h index 21e306f1e6..859225f132 100644 --- a/LUFA/DriverStubs/Joystick.h +++ b/LUFA/DriverStubs/Joystick.h @@ -82,8 +82,7 @@ // TODO: Initialize joystick port pins as inputs with pull-ups } - 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) { // TODO: Return current joystick position data which can be obtained by masking against the JOY_* macros } diff --git a/LUFA/DriverStubs/LEDs.h b/LUFA/DriverStubs/LEDs.h index 6bdc847d15..1b34e58fd7 100644 --- a/LUFA/DriverStubs/LEDs.h +++ b/LUFA/DriverStubs/LEDs.h @@ -84,33 +84,32 @@ // TODO: Add code to initialize LED port pins as outputs here } - static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) + static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask) { // TODO: Add code to turn on LEDs given in the LEDMask mask here, leave others as-is } - static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) { // TODO: Add code to turn off LEDs given in the LEDMask mask here, leave others as-is } - static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) + static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) { // TODO: Add code to turn on only LEDs given in the LEDMask mask here, all others off } - 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) { // TODO: Add code to set the Leds in the given LEDMask to the status given in ActiveMask here } - static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) + static inline void LEDs_ToggleLEDs(const uintN_t LEDMask) { // TODO: Add code to toggle the Leds in the given LEDMask, ignoring all others } - 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) { // TODO: Add code to return the current LEDs status' here which can be masked against LED_LED* macros } diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h b/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h index af95a894b7..d26e0e8616 100644 --- a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h +++ b/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h @@ -79,8 +79,7 @@ PORTD |= 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 ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1); } diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h index 2208f2e401..fb7e09ff46 100644 --- a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h +++ b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h @@ -96,33 +96,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 & LEDS_ALL_LEDS); } - static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) { PORTD &= ~(LEDMask & LEDS_ALL_LEDS); } - static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) + static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) { PORTD = (PORTD & ~LEDS_ALL_LEDS) | (LEDMask & LEDS_ALL_LEDS); } - 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 & LEDS_ALL_LEDS)) | (ActiveMask & LEDS_ALL_LEDS)); } - 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); } diff --git a/LUFA/Drivers/Board/BUMBLEB/Buttons.h b/LUFA/Drivers/Board/BUMBLEB/Buttons.h index e0a5cc5a9a..166c97083a 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Buttons.h +++ b/LUFA/Drivers/Board/BUMBLEB/Buttons.h @@ -81,8 +81,7 @@ PORTD |= 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 ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1); } diff --git a/LUFA/Drivers/Board/BUMBLEB/Joystick.h b/LUFA/Drivers/Board/BUMBLEB/Joystick.h index 1809677596..fdd4b03194 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Joystick.h +++ b/LUFA/Drivers/Board/BUMBLEB/Joystick.h @@ -98,8 +98,7 @@ PORTD |= JOY_MASK; } - 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)(~PIND & JOY_MASK); } diff --git a/LUFA/Drivers/Board/BUMBLEB/LEDs.h b/LUFA/Drivers/Board/BUMBLEB/LEDs.h index 549bbde62a..a5251be582 100644 --- a/LUFA/Drivers/Board/BUMBLEB/LEDs.h +++ b/LUFA/Drivers/Board/BUMBLEB/LEDs.h @@ -95,28 +95,27 @@ PORTB &= ~LEDS_ALL_LEDS; } - static inline void LEDs_TurnOnLEDs(const uint8_t LedMask) + static inline void LEDs_TurnOnLEDs(const uintN_t LedMask) { PORTB |= LedMask; } - static inline void LEDs_TurnOffLEDs(const uint8_t LedMask) + static inline void LEDs_TurnOffLEDs(const uintN_t LedMask) { PORTB &= ~LedMask; } - static inline void LEDs_SetAllLEDs(const uint8_t LedMask) + static inline void LEDs_SetAllLEDs(const uintN_t LedMask) { PORTB = ((PORTB & ~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) { PORTB = ((PORTB & ~LedMask) | ActiveMask); } - 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 (PORTB & LEDS_ALL_LEDS); } diff --git a/LUFA/Drivers/Board/EVK1101/Buttons.h b/LUFA/Drivers/Board/EVK1101/Buttons.h index b827787c7d..0aa195f27c 100644 --- a/LUFA/Drivers/Board/EVK1101/Buttons.h +++ b/LUFA/Drivers/Board/EVK1101/Buttons.h @@ -82,8 +82,7 @@ AVR32_GPIO.port[1].puers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2); } - static inline uint32_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT; - static inline uint32_t Buttons_GetStatus(void) + static inline uintN_t Buttons_GetStatus(void) { return (~AVR32_GPIO.port[1].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2)); } diff --git a/LUFA/Drivers/Board/EVK1101/Joystick.h b/LUFA/Drivers/Board/EVK1101/Joystick.h index 0bcc59c949..f02ec405fd 100644 --- a/LUFA/Drivers/Board/EVK1101/Joystick.h +++ b/LUFA/Drivers/Board/EVK1101/Joystick.h @@ -99,8 +99,7 @@ AVR32_GPIO.port[1].puers = JOY_MASK_PB; } - static inline uint32_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; - static inline uint32_t Joystick_GetStatus(void) + static inline uintN_t Joystick_GetStatus(void) { return ((~AVR32_GPIO.port[1].pvr & JOY_MASK_PB) | (~AVR32_GPIO.port[0].pvr & JOY_MASK_PA)); diff --git a/LUFA/Drivers/Board/EVK1101/LEDs.h b/LUFA/Drivers/Board/EVK1101/LEDs.h index f19e464d72..9b341695c7 100644 --- a/LUFA/Drivers/Board/EVK1101/LEDs.h +++ b/LUFA/Drivers/Board/EVK1101/LEDs.h @@ -94,35 +94,34 @@ AVR32_GPIO.port[0].ovrs = LEDS_ALL_LEDS; } - static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask) + static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask) { AVR32_GPIO.port[0].ovrc = LEDMask; } - static inline void LEDs_TurnOffLEDs(const uint32_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) { AVR32_GPIO.port[0].ovrs = LEDMask; } - static inline void LEDs_SetAllLEDs(const uint32_t LEDMask) + static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) { AVR32_GPIO.port[0].ovrs = LEDS_ALL_LEDS; AVR32_GPIO.port[0].ovrc = LEDMask; } - static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask) + static inline void LEDs_ChangeLEDs(const uintN_t LEDMask, const uintN_t ActiveMask) { AVR32_GPIO.port[0].ovrs = LEDMask; AVR32_GPIO.port[0].ovrc = ActiveMask; } - static inline void LEDs_ToggleLEDs(const uint32_t LEDMask) + static inline void LEDs_ToggleLEDs(const uintN_t LEDMask) { AVR32_GPIO.port[0].ovrt = LEDMask; } - static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; - static inline uint32_t LEDs_GetLEDs(void) + static inline uintN_t LEDs_GetLEDs(void) { return (AVR32_GPIO.port[0].ovr & LEDS_ALL_LEDS); } diff --git a/LUFA/Drivers/Board/EVK527/Buttons.h b/LUFA/Drivers/Board/EVK527/Buttons.h index 0150fa151e..950c5742d0 100644 --- a/LUFA/Drivers/Board/EVK527/Buttons.h +++ b/LUFA/Drivers/Board/EVK527/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/EVK527/Joystick.h b/LUFA/Drivers/Board/EVK527/Joystick.h index 7d208ea9fd..d8583d19dc 100644 --- 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: */ #if !defined(__DOXYGEN__) /* Macros: */ - #define JOY_FMASK ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7)) + #define JOY_FMASK ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7)) #define JOY_CMASK (1 << 6)) #endif @@ -100,8 +100,7 @@ PORTC |= JOY_CMASK; } - 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)~PINF & JOY_FMASK) | (((uint8_t)~PINC & JOY_CMASK) >> 3)); } diff --git a/LUFA/Drivers/Board/EVK527/LEDs.h b/LUFA/Drivers/Board/EVK527/LEDs.h index ea7c7c2c71..d01a814808 100644 --- a/LUFA/Drivers/Board/EVK527/LEDs.h +++ b/LUFA/Drivers/Board/EVK527/LEDs.h @@ -90,32 +90,31 @@ 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) { return (PORTD & LEDS_ALL_LEDS); diff --git a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h index d095d6e0f0..e33aa862bc 100644 --- a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h +++ b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h @@ -106,21 +106,21 @@ PORTE |= (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT); } - static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) + static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask) { PORTD |= (LEDMask & LEDS_LED1); PORTD &= ~(LEDMask & LEDS_LED2); PORTE &= ~((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT); } - static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) { PORTD &= ~(LEDMask & LEDS_LED1); PORTD |= (LEDMask & LEDS_LED2); PORTE |= ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT); } - static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) + static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) { PORTD = (((PORTD & ~LEDS_LED1) | (LEDMask & LEDS_LED1)) | ((PORTD | LEDS_LED2) & ~(LEDMask & LEDS_LED2))); @@ -128,7 +128,7 @@ ~((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT)); } - 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 & LEDS_LED1)) | (ActiveMask & LEDS_LED1)) | ((PORTD | (LEDMask & LEDS_LED2)) & ~(ActiveMask & LEDS_LED2))); @@ -136,13 +136,12 @@ ~((ActiveMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT)); } - static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) + static inline void LEDs_ToggleLEDs(const uintN_t LEDMask) { PORTD = (PORTD ^ (LEDMask & LEDS_PORTD_LEDS)); PORTE = (PORTE ^ ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT)); } - static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) { return (((PORTD & LEDS_LED1) | (~PORTD & LEDS_LED2)) | diff --git a/LUFA/Drivers/Board/STK525/Buttons.h b/LUFA/Drivers/Board/STK525/Buttons.h index f3dccafd9a..e70822ea40 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 6358f957e6..aab650d98b 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 b54a8c987d..1f2e9a2b0e 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); } diff --git a/LUFA/Drivers/Board/STK526/Buttons.h b/LUFA/Drivers/Board/STK526/Buttons.h index f480560f65..56af91f29e 100644 --- a/LUFA/Drivers/Board/STK526/Buttons.h +++ b/LUFA/Drivers/Board/STK526/Buttons.h @@ -85,8 +85,8 @@ PORTD |= 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) ATTR_WARN_UNUSED_RESULT; + static inline uintN_t Buttons_GetStatus(void) { return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1); } diff --git a/LUFA/Drivers/Board/STK526/Joystick.h b/LUFA/Drivers/Board/STK526/Joystick.h index b095536aa7..f17e280bea 100644 --- a/LUFA/Drivers/Board/STK526/Joystick.h +++ b/LUFA/Drivers/Board/STK526/Joystick.h @@ -97,8 +97,8 @@ PORTB |= JOY_BMASK; } - 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) ATTR_WARN_UNUSED_RESULT; + static inline uintN_t Joystick_GetStatus(void) { return ((uint8_t)~PINB & JOY_BMASK); } diff --git a/LUFA/Drivers/Board/STK526/LEDs.h b/LUFA/Drivers/Board/STK526/LEDs.h index d1ac493adb..fdae8f5772 100644 --- a/LUFA/Drivers/Board/STK526/LEDs.h +++ b/LUFA/Drivers/Board/STK526/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 & LEDS_ALL_LEDS)) | (ActiveMask & LEDS_ALL_LEDS)); } - 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); } diff --git a/LUFA/Drivers/Board/USBKEY/Buttons.h b/LUFA/Drivers/Board/USBKEY/Buttons.h index db1391c8e1..471a19ad2f 100644 --- a/LUFA/Drivers/Board/USBKEY/Buttons.h +++ b/LUFA/Drivers/Board/USBKEY/Buttons.h @@ -79,8 +79,8 @@ 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) ATTR_WARN_UNUSED_RESULT; + static inline uintN_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 b0829914b0..b6dd8d17df 100644 --- a/LUFA/Drivers/Board/USBKEY/Joystick.h +++ b/LUFA/Drivers/Board/USBKEY/Joystick.h @@ -100,8 +100,8 @@ 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) ATTR_WARN_UNUSED_RESULT; + 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/USBKEY/LEDs.h b/LUFA/Drivers/Board/USBKEY/LEDs.h index e1a5b23147..0864be82df 100644 --- a/LUFA/Drivers/Board/USBKEY/LEDs.h +++ b/LUFA/Drivers/Board/USBKEY/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); } diff --git a/LUFA/Drivers/Board/XPLAIN/LEDs.h b/LUFA/Drivers/Board/XPLAIN/LEDs.h index add868d20b..2c80aa702b 100644 --- a/LUFA/Drivers/Board/XPLAIN/LEDs.h +++ b/LUFA/Drivers/Board/XPLAIN/LEDs.h @@ -84,33 +84,32 @@ PORTB |= LEDS_ALL_LEDS; } - static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) + static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask) { PORTB &= ~LEDMask; } - static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) { PORTB |= LEDMask; } - static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) + static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) { PORTB = ((PORTB | 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) { PORTB = ((PORTB | (LEDMask & LEDS_ALL_LEDS)) & (~ActiveMask & LEDS_ALL_LEDS)); } - static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) + static inline void LEDs_ToggleLEDs(const uintN_t LEDMask) { PORTD = (PORTB ^ (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 (~PORTB & LEDS_ALL_LEDS); }