diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-02-20 19:18:06 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-02-20 19:18:06 +0000 |
| commit | 8e9fe243a26fc3e8006418eb7f35ece03bce2866 (patch) | |
| tree | 5a84e044ba97a78d52255edfd2b2c3a3dc75d279 /LUFA/Drivers/Board/EVK1101 | |
| parent | 793b81cea131beada6d5eaa79e6b925a8adcb29c (diff) | |
Update board driver common APIs to use uint_reg_t.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1680 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'LUFA/Drivers/Board/EVK1101')
| -rw-r--r-- | LUFA/Drivers/Board/EVK1101/Buttons.h | 8 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/EVK1101/Joystick.h | 8 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/EVK1101/LEDs.h | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/LUFA/Drivers/Board/EVK1101/Buttons.h b/LUFA/Drivers/Board/EVK1101/Buttons.h index e76bc52d..51a4eafc 100644 --- a/LUFA/Drivers/Board/EVK1101/Buttons.h +++ b/LUFA/Drivers/Board/EVK1101/Buttons.h @@ -82,12 +82,12 @@ #if !defined(__DOXYGEN__)
static inline void Buttons_Init(void)
{
- AVR32_GPIO.port[BUTTONS_PORT].gpers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
- AVR32_GPIO.port[BUTTONS_PORT].puers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
+ AVR32_GPIO.port[BUTTONS_PORT].gpers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
+ AVR32_GPIO.port[BUTTONS_PORT].puers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
}
- static inline uintN_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
- static inline uintN_t Buttons_GetStatus(void)
+ static inline uint32_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
+ static inline uint32_t Buttons_GetStatus(void)
{
return (~(AVR32_GPIO.port[JOY_MOVE_PORT].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2)));
}
diff --git a/LUFA/Drivers/Board/EVK1101/Joystick.h b/LUFA/Drivers/Board/EVK1101/Joystick.h index 9bb7f6b8..a27c29dd 100644 --- a/LUFA/Drivers/Board/EVK1101/Joystick.h +++ b/LUFA/Drivers/Board/EVK1101/Joystick.h @@ -102,11 +102,11 @@ AVR32_GPIO.port[JOY_PRESS_PORT].puers = JOY_PRESS_MASK;
};
- static inline uintN_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
- static inline uintN_t Joystick_GetStatus(void)
+ static inline uint32_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
+ static inline uint32_t Joystick_GetStatus(void)
{
- return (uintN_t)(~(((AVR32_GPIO.port[JOY_MOVE_PORT].pvr & JOY_MOVE_MASK) |
- (AVR32_GPIO.port[JOY_PRESS_PORT].pvr & JOY_PRESS_MASK)) << JOY_SHIFT_LEFT));
+ return (uint32_t)(~(((AVR32_GPIO.port[JOY_MOVE_PORT].pvr & JOY_MOVE_MASK) |
+ (AVR32_GPIO.port[JOY_PRESS_PORT].pvr & JOY_PRESS_MASK)) << JOY_SHIFT_LEFT));
}
#endif
diff --git a/LUFA/Drivers/Board/EVK1101/LEDs.h b/LUFA/Drivers/Board/EVK1101/LEDs.h index 5eeaa7a6..4dae3fb9 100644 --- a/LUFA/Drivers/Board/EVK1101/LEDs.h +++ b/LUFA/Drivers/Board/EVK1101/LEDs.h @@ -98,23 +98,23 @@ AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS;
}
- static inline void LEDs_TurnOnLEDs(const uintN_t LedMask)
+ static inline void LEDs_TurnOnLEDs(const uint32_t LedMask)
{
AVR32_GPIO.port[LEDS_PORT].ovrc = LedMask;
}
- static inline void LEDs_TurnOffLEDs(const uintN_t LedMask)
+ static inline void LEDs_TurnOffLEDs(const uint32_t LedMask)
{
AVR32_GPIO.port[LEDS_PORT].ovrs = LedMask;
}
- static inline void LEDs_SetAllLEDs(const uintN_t LedMask)
+ static inline void LEDs_SetAllLEDs(const uint32_t LedMask)
{
AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS;
AVR32_GPIO.port[LEDS_PORT].ovrc = LedMask;
}
- static inline void LEDs_ChangeLEDs(const uintN_t LedMask, const uintN_t ActiveMask)
+ static inline void LEDs_ChangeLEDs(const uint32_t LedMask, const uint32_t ActiveMask)
{
AVR32_GPIO.port[LEDS_PORT].ovrs = LedMask;
AVR32_GPIO.port[LEDS_PORT].ovrc = ActiveMask;
|