diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-22 12:58:40 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-22 12:58:40 +0000 |
| commit | 2590452104c569f64aeefba3b06734035fb77d66 (patch) | |
| tree | e37c16bf8bddfc7caf36b95b5d8071180720319a /LUFA/Drivers/Board/USBKEY | |
| parent | d2ed97e34b42aff851fa8ba39c43b6cb9e4f6448 (diff) | |
| download | lufa-2590452104c569f64aeefba3b06734035fb77d66.tar.gz lufa-2590452104c569f64aeefba3b06734035fb77d66.tar.bz2 lufa-2590452104c569f64aeefba3b06734035fb77d66.zip | |
Change over board hardware drivers to use the custom uintN_t and intN_t native word size types.
Diffstat (limited to 'LUFA/Drivers/Board/USBKEY')
| -rw-r--r-- | LUFA/Drivers/Board/USBKEY/Buttons.h | 4 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/USBKEY/Joystick.h | 4 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/USBKEY/LEDs.h | 13 |
3 files changed, 10 insertions, 11 deletions
diff --git a/LUFA/Drivers/Board/USBKEY/Buttons.h b/LUFA/Drivers/Board/USBKEY/Buttons.h index db1391c8e..471a19ad2 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 b0829914b..b6dd8d17d 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 e1a5b2314..0864be82d 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);
}
|