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

22 files changed, 69 insertions, 87 deletions

diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h b/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
index af95a894..d26e0e86 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 2208f2e4..fb7e09ff 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 e0a5cc5a..166c9708 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 18096775..fdd4b031 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 549bbde6..a5251be5 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 b827787c..0aa195f2 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 0bcc59c9..f02ec405 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 f19e464d..9b341695 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 0150fa15..950c5742 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 7d208ea9..d8583d19 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 ea7c7c2c..d01a8148 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 d095d6e0..e33aa862 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 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);

 			}

diff --git a/LUFA/Drivers/Board/STK526/Buttons.h b/LUFA/Drivers/Board/STK526/Buttons.h
index f480560f..56af91f2 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 b095536a..f17e280b 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 d1ac493a..fdae8f57 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 db1391c8..471a19ad 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 b0829914..b6dd8d17 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 e1a5b231..0864be82 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 add868d2..2c80aa70 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);

 			}