diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-24 06:58:23 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-24 06:58:23 +0000 |
| commit | 071fd8ce536522ca6365580d64cd465e4c18a031 (patch) | |
| tree | 604c4881c36b11f37d0203f9466d6078080847b7 /LUFA/Drivers/Board/BUMBLEB | |
| parent | a7aaa45ec4c3f415bf6073a5cc016635d5ecf77d (diff) | |
| download | lufa-071fd8ce536522ca6365580d64cd465e4c18a031.tar.gz lufa-071fd8ce536522ca6365580d64cd465e4c18a031.tar.bz2 lufa-071fd8ce536522ca6365580d64cd465e4c18a031.zip | |
Revert changes made for the partial port to the AVR32 architecture.
Diffstat (limited to 'LUFA/Drivers/Board/BUMBLEB')
| -rw-r--r-- | LUFA/Drivers/Board/BUMBLEB/Buttons.h | 3 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/BUMBLEB/Joystick.h | 7 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/BUMBLEB/LEDs.h | 11 |
3 files changed, 12 insertions, 9 deletions
diff --git a/LUFA/Drivers/Board/BUMBLEB/Buttons.h b/LUFA/Drivers/Board/BUMBLEB/Buttons.h index 166c97083..e0a5cc5a9 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Buttons.h +++ b/LUFA/Drivers/Board/BUMBLEB/Buttons.h @@ -81,7 +81,8 @@ PORTD |= BUTTONS_BUTTON1;
}
- static inline uintN_t Buttons_GetStatus(void)
+ static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
+ static inline uint8_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 fdd4b0319..5d57ec559 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Joystick.h +++ b/LUFA/Drivers/Board/BUMBLEB/Joystick.h @@ -30,7 +30,7 @@ /** \file
*
- * Board specific joystick driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board
+ * Board specific joystick driver header for the USBKEY. The BUMBLEB third-party board does not include any on-board
* peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick.
*
* \note This file should not be included directly. It is automatically included as needed by the joystick driver
@@ -40,7 +40,7 @@ /** \ingroup Group_Joystick
* @defgroup Group_Joystick_BUMBLEB BUMBLEB
*
- * Board specific joystick driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board
+ * Board specific joystick driver header for the USBKEY. The BUMBLEB third-party board does not include any on-board
* peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick.
*
* \note This file should not be included directly. It is automatically included as needed by the joystick driver
@@ -98,7 +98,8 @@ PORTD |= JOY_MASK;
}
- static inline uintN_t Joystick_GetStatus(void)
+ static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
+ static inline uint8_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 a5251be58..549bbde62 100644 --- a/LUFA/Drivers/Board/BUMBLEB/LEDs.h +++ b/LUFA/Drivers/Board/BUMBLEB/LEDs.h @@ -95,27 +95,28 @@ PORTB &= ~LEDS_ALL_LEDS;
}
- static inline void LEDs_TurnOnLEDs(const uintN_t LedMask)
+ static inline void LEDs_TurnOnLEDs(const uint8_t LedMask)
{
PORTB |= LedMask;
}
- static inline void LEDs_TurnOffLEDs(const uintN_t LedMask)
+ static inline void LEDs_TurnOffLEDs(const uint8_t LedMask)
{
PORTB &= ~LedMask;
}
- static inline void LEDs_SetAllLEDs(const uintN_t LedMask)
+ static inline void LEDs_SetAllLEDs(const uint8_t LedMask)
{
PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LedMask);
}
- static inline void LEDs_ChangeLEDs(const uintN_t LedMask, const uintN_t ActiveMask)
+ static inline void LEDs_ChangeLEDs(const uint8_t LedMask, const uint8_t ActiveMask)
{
PORTB = ((PORTB & ~LedMask) | ActiveMask);
}
- static inline uintN_t LEDs_GetLEDs(void)
+ static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
+ static inline uint8_t LEDs_GetLEDs(void)
{
return (PORTB & LEDS_ALL_LEDS);
}
|