projects
/
pub
/
USBasp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d2ed97e
)
Change over board hardware drivers to use the custom uintN_t and intN_t native word...
author
Dean Camera
<dean@fourwalledcubicle.com>
Mon, 22 Feb 2010 12:58:40 +0000
(12:58 +0000)
committer
Dean Camera
<dean@fourwalledcubicle.com>
Mon, 22 Feb 2010 12:58:40 +0000
(12:58 +0000)
26 files changed:
LUFA/Common/Common.h
patch
|
blob
|
blame
|
history
LUFA/DriverStubs/Buttons.h
patch
|
blob
|
blame
|
history
LUFA/DriverStubs/Joystick.h
patch
|
blob
|
blame
|
history
LUFA/DriverStubs/LEDs.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/BUMBLEB/Buttons.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/BUMBLEB/Joystick.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/BUMBLEB/LEDs.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/EVK1101/Buttons.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/EVK1101/Joystick.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/EVK1101/LEDs.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/EVK527/Buttons.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/EVK527/Joystick.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/EVK527/LEDs.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/STK525/Buttons.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/STK525/Joystick.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/STK525/LEDs.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/STK526/Buttons.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/STK526/Joystick.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/STK526/LEDs.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/USBKEY/Buttons.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/USBKEY/Joystick.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/USBKEY/LEDs.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/Board/XPLAIN/LEDs.h
patch
|
blob
|
blame
|
history
diff --git
a/LUFA/Common/Common.h
b/LUFA/Common/Common.h
index
4052480
..
04480d5
100644
(file)
--- a/
LUFA/Common/Common.h
+++ b/
LUFA/Common/Common.h
@@
-190,10
+190,16
@@
\r
/* Type Defines: */
\r
#if defined(__AVR32__)
\r
\r
/* Type Defines: */
\r
#if defined(__AVR32__)
\r
+ /** Type define for an unsigned native word-sized chunk of data. */
\r
typedef uint32_t uintN_t;
\r
typedef uint32_t uintN_t;
\r
+
\r
+ /** Type define for a signed native word-sized chunk of data. */
\r
typedef int32_t intN_t;
\r
#else
\r
typedef int32_t intN_t;
\r
#else
\r
+ /** Type define for an unsigned native word-sized chunk of data. */
\r
typedef uint8_t uintN_t;
\r
typedef uint8_t uintN_t;
\r
+
\r
+ /** Type define for a signed native word-sized chunk of data. */
\r
typedef int8_t intN_t;
\r
#endif
\r
#endif
\r
typedef int8_t intN_t;
\r
#endif
\r
#endif
\r
diff --git
a/LUFA/DriverStubs/Buttons.h
b/LUFA/DriverStubs/Buttons.h
index
deab56e
..
8c97cd7
100644
(file)
--- 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
\r
}
\r
\r
// TODO: Initialize the appropriate port pins as an inputs here, with pull-ups
\r
}
\r
\r
- static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t Buttons_GetStatus(void)
\r
+ static inline uintN_t Buttons_GetStatus(void)
\r
{
\r
// TODO: Return current button status here, debounced if required
\r
}
\r
{
\r
// TODO: Return current button status here, debounced if required
\r
}
\r
diff --git
a/LUFA/DriverStubs/Joystick.h
b/LUFA/DriverStubs/Joystick.h
index
21e306f
..
859225f
100644
(file)
--- a/
LUFA/DriverStubs/Joystick.h
+++ b/
LUFA/DriverStubs/Joystick.h
@@
-82,8
+82,7
@@
// TODO: Initialize joystick port pins as inputs with pull-ups
\r
}
\r
\r
// TODO: Initialize joystick port pins as inputs with pull-ups
\r
}
\r
\r
- static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t Joystick_GetStatus(void)
\r
+ static inline uintN_t Joystick_GetStatus(void)
\r
{
\r
// TODO: Return current joystick position data which can be obtained by masking against the JOY_* macros
\r
}
\r
{
\r
// TODO: Return current joystick position data which can be obtained by masking against the JOY_* macros
\r
}
\r
diff --git
a/LUFA/DriverStubs/LEDs.h
b/LUFA/DriverStubs/LEDs.h
index
6bdc847
..
1b34e58
100644
(file)
--- 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
\r
}
\r
\r
// TODO: Add code to initialize LED port pins as outputs here
\r
}
\r
\r
- static inline void LEDs_TurnOnLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOnLEDs(const uint
N
_t LEDMask)
\r
{
\r
// TODO: Add code to turn on LEDs given in the LEDMask mask here, leave others as-is
\r
}
\r
\r
{
\r
// TODO: Add code to turn on LEDs given in the LEDMask mask here, leave others as-is
\r
}
\r
\r
- static inline void LEDs_TurnOffLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOffLEDs(const uint
N
_t LEDMask)
\r
{
\r
// TODO: Add code to turn off LEDs given in the LEDMask mask here, leave others as-is
\r
}
\r
\r
{
\r
// TODO: Add code to turn off LEDs given in the LEDMask mask here, leave others as-is
\r
}
\r
\r
- static inline void LEDs_SetAllLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_SetAllLEDs(const uint
N
_t LEDMask)
\r
{
\r
// TODO: Add code to turn on only LEDs given in the LEDMask mask here, all others off
\r
}
\r
\r
{
\r
// TODO: Add code to turn on only LEDs given in the LEDMask mask here, all others off
\r
}
\r
\r
- static inline void LEDs_ChangeLEDs(const uint
8_t LEDMask, const uint8
_t ActiveMask)
\r
+ static inline void LEDs_ChangeLEDs(const uint
N_t LEDMask, const uintN
_t ActiveMask)
\r
{
\r
// TODO: Add code to set the Leds in the given LEDMask to the status given in ActiveMask here
\r
}
\r
\r
{
\r
// TODO: Add code to set the Leds in the given LEDMask to the status given in ActiveMask here
\r
}
\r
\r
- static inline void LEDs_ToggleLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_ToggleLEDs(const uint
N
_t LEDMask)
\r
{
\r
// TODO: Add code to toggle the Leds in the given LEDMask, ignoring all others
\r
}
\r
\r
{
\r
// TODO: Add code to toggle the Leds in the given LEDMask, ignoring all others
\r
}
\r
\r
- static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t LEDs_GetLEDs(void)
\r
+ static inline uintN_t LEDs_GetLEDs(void)
\r
{
\r
// TODO: Add code to return the current LEDs status' here which can be masked against LED_LED* macros
\r
}
\r
{
\r
// TODO: Add code to return the current LEDs status' here which can be masked against LED_LED* macros
\r
}
\r
diff --git
a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
b/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
index
af95a89
..
d26e0e8
100644
(file)
--- a/
LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
+++ b/
LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
@@
-79,8
+79,7
@@
PORTD |= BUTTONS_BUTTON1;
\r
}
\r
\r
PORTD |= BUTTONS_BUTTON1;
\r
}
\r
\r
- static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t Buttons_GetStatus(void)
\r
+ static inline uintN_t Buttons_GetStatus(void)
\r
{
\r
return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
{
\r
return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
index
2208f2e
..
fb7e09f
100644
(file)
--- a/
LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
+++ b/
LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
@@
-96,33
+96,32
@@
PORTD &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
PORTD &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
- static inline void LEDs_TurnOnLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOnLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD |= (LEDMask & LEDS_ALL_LEDS);
\r
}
\r
\r
{
\r
PORTD |= (LEDMask & LEDS_ALL_LEDS);
\r
}
\r
\r
- static inline void LEDs_TurnOffLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOffLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD &= ~(LEDMask & LEDS_ALL_LEDS);
\r
}
\r
\r
{
\r
PORTD &= ~(LEDMask & LEDS_ALL_LEDS);
\r
}
\r
\r
- static inline void LEDs_SetAllLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_SetAllLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = (PORTD & ~LEDS_ALL_LEDS) | (LEDMask & LEDS_ALL_LEDS);
\r
}
\r
\r
{
\r
PORTD = (PORTD & ~LEDS_ALL_LEDS) | (LEDMask & LEDS_ALL_LEDS);
\r
}
\r
\r
- static inline void LEDs_ChangeLEDs(const uint
8_t LEDMask, const uint8
_t ActiveMask)
\r
+ static inline void LEDs_ChangeLEDs(const uint
N_t LEDMask, const uintN
_t ActiveMask)
\r
{
\r
PORTD = ((PORTD & ~(LEDMask & LEDS_ALL_LEDS)) | (ActiveMask & LEDS_ALL_LEDS));
\r
}
\r
\r
{
\r
PORTD = ((PORTD & ~(LEDMask & LEDS_ALL_LEDS)) | (ActiveMask & LEDS_ALL_LEDS));
\r
}
\r
\r
- static inline void LEDs_ToggleLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_ToggleLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
- static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t LEDs_GetLEDs(void)
\r
+ static inline uintN_t LEDs_GetLEDs(void)
\r
{
\r
return (PORTD & LEDS_ALL_LEDS);
\r
}
\r
{
\r
return (PORTD & LEDS_ALL_LEDS);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/BUMBLEB/Buttons.h
b/LUFA/Drivers/Board/BUMBLEB/Buttons.h
index
e0a5cc5
..
166c970
100644
(file)
--- a/
LUFA/Drivers/Board/BUMBLEB/Buttons.h
+++ b/
LUFA/Drivers/Board/BUMBLEB/Buttons.h
@@
-81,8
+81,7
@@
PORTD |= BUTTONS_BUTTON1;
\r
}
\r
\r
PORTD |= BUTTONS_BUTTON1;
\r
}
\r
\r
- static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t Buttons_GetStatus(void)
\r
+ static inline uintN_t Buttons_GetStatus(void)
\r
{
\r
return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
{
\r
return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/BUMBLEB/Joystick.h
b/LUFA/Drivers/Board/BUMBLEB/Joystick.h
index
1809677
..
fdd4b03
100644
(file)
--- a/
LUFA/Drivers/Board/BUMBLEB/Joystick.h
+++ b/
LUFA/Drivers/Board/BUMBLEB/Joystick.h
@@
-98,8
+98,7
@@
PORTD |= JOY_MASK;
\r
}
\r
\r
PORTD |= JOY_MASK;
\r
}
\r
\r
- static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t Joystick_GetStatus(void)
\r
+ static inline uintN_t Joystick_GetStatus(void)
\r
{
\r
return (uint8_t)(~PIND & JOY_MASK);
\r
}
\r
{
\r
return (uint8_t)(~PIND & JOY_MASK);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/BUMBLEB/LEDs.h
b/LUFA/Drivers/Board/BUMBLEB/LEDs.h
index
549bbde
..
a5251be
100644
(file)
--- a/
LUFA/Drivers/Board/BUMBLEB/LEDs.h
+++ b/
LUFA/Drivers/Board/BUMBLEB/LEDs.h
@@
-95,28
+95,27
@@
PORTB &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
PORTB &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
- static inline void LEDs_TurnOnLEDs(const uint
8
_t LedMask)
\r
+ static inline void LEDs_TurnOnLEDs(const uint
N
_t LedMask)
\r
{
\r
PORTB |= LedMask;
\r
}
\r
\r
{
\r
PORTB |= LedMask;
\r
}
\r
\r
- static inline void LEDs_TurnOffLEDs(const uint
8
_t LedMask)
\r
+ static inline void LEDs_TurnOffLEDs(const uint
N
_t LedMask)
\r
{
\r
PORTB &= ~LedMask;
\r
}
\r
\r
{
\r
PORTB &= ~LedMask;
\r
}
\r
\r
- static inline void LEDs_SetAllLEDs(const uint
8
_t LedMask)
\r
+ static inline void LEDs_SetAllLEDs(const uint
N
_t LedMask)
\r
{
\r
PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LedMask);
\r
}
\r
\r
{
\r
PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LedMask);
\r
}
\r
\r
- static inline void LEDs_ChangeLEDs(const uint
8_t LedMask, const uint8
_t ActiveMask)
\r
+ static inline void LEDs_ChangeLEDs(const uint
N_t LedMask, const uintN
_t ActiveMask)
\r
{
\r
PORTB = ((PORTB & ~LedMask) | ActiveMask);
\r
}
\r
\r
{
\r
PORTB = ((PORTB & ~LedMask) | ActiveMask);
\r
}
\r
\r
- static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t LEDs_GetLEDs(void)
\r
+ static inline uintN_t LEDs_GetLEDs(void)
\r
{
\r
return (PORTB & LEDS_ALL_LEDS);
\r
}
\r
{
\r
return (PORTB & LEDS_ALL_LEDS);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/EVK1101/Buttons.h
b/LUFA/Drivers/Board/EVK1101/Buttons.h
index
b827787
..
0aa195f
100644
(file)
--- 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);
\r
}
\r
\r
AVR32_GPIO.port[1].puers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
\r
}
\r
\r
- static inline uint32_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint32_t Buttons_GetStatus(void)
\r
+ static inline uintN_t Buttons_GetStatus(void)
\r
{
\r
return (~AVR32_GPIO.port[1].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2));
\r
}
\r
{
\r
return (~AVR32_GPIO.port[1].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2));
\r
}
\r
diff --git
a/LUFA/Drivers/Board/EVK1101/Joystick.h
b/LUFA/Drivers/Board/EVK1101/Joystick.h
index
0bcc59c
..
f02ec40
100644
(file)
--- 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;
\r
}
\r
\r
AVR32_GPIO.port[1].puers = JOY_MASK_PB;
\r
}
\r
\r
- static inline uint32_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint32_t Joystick_GetStatus(void)
\r
+ static inline uintN_t Joystick_GetStatus(void)
\r
{
\r
return ((~AVR32_GPIO.port[1].pvr & JOY_MASK_PB) |
\r
(~AVR32_GPIO.port[0].pvr & JOY_MASK_PA));
\r
{
\r
return ((~AVR32_GPIO.port[1].pvr & JOY_MASK_PB) |
\r
(~AVR32_GPIO.port[0].pvr & JOY_MASK_PA));
\r
diff --git
a/LUFA/Drivers/Board/EVK1101/LEDs.h
b/LUFA/Drivers/Board/EVK1101/LEDs.h
index
f19e464
..
9b34169
100644
(file)
--- 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;
\r
}
\r
\r
AVR32_GPIO.port[0].ovrs = LEDS_ALL_LEDS;
\r
}
\r
\r
- static inline void LEDs_TurnOnLEDs(const uint
32
_t LEDMask)
\r
+ static inline void LEDs_TurnOnLEDs(const uint
N
_t LEDMask)
\r
{
\r
AVR32_GPIO.port[0].ovrc = LEDMask;
\r
}
\r
\r
{
\r
AVR32_GPIO.port[0].ovrc = LEDMask;
\r
}
\r
\r
- static inline void LEDs_TurnOffLEDs(const uint
32
_t LEDMask)
\r
+ static inline void LEDs_TurnOffLEDs(const uint
N
_t LEDMask)
\r
{
\r
AVR32_GPIO.port[0].ovrs = LEDMask;
\r
}
\r
\r
{
\r
AVR32_GPIO.port[0].ovrs = LEDMask;
\r
}
\r
\r
- static inline void LEDs_SetAllLEDs(const uint
32
_t LEDMask)
\r
+ static inline void LEDs_SetAllLEDs(const uint
N
_t LEDMask)
\r
{
\r
AVR32_GPIO.port[0].ovrs = LEDS_ALL_LEDS;
\r
AVR32_GPIO.port[0].ovrc = LEDMask;
\r
}
\r
\r
{
\r
AVR32_GPIO.port[0].ovrs = LEDS_ALL_LEDS;
\r
AVR32_GPIO.port[0].ovrc = LEDMask;
\r
}
\r
\r
- static inline void LEDs_ChangeLEDs(const uint
32_t LEDMask, const uint32
_t ActiveMask)
\r
+ static inline void LEDs_ChangeLEDs(const uint
N_t LEDMask, const uintN
_t ActiveMask)
\r
{
\r
AVR32_GPIO.port[0].ovrs = LEDMask;
\r
AVR32_GPIO.port[0].ovrc = ActiveMask;
\r
}
\r
\r
{
\r
AVR32_GPIO.port[0].ovrs = LEDMask;
\r
AVR32_GPIO.port[0].ovrc = ActiveMask;
\r
}
\r
\r
- static inline void LEDs_ToggleLEDs(const uint
32
_t LEDMask)
\r
+ static inline void LEDs_ToggleLEDs(const uint
N
_t LEDMask)
\r
{
\r
AVR32_GPIO.port[0].ovrt = LEDMask;
\r
}
\r
\r
{
\r
AVR32_GPIO.port[0].ovrt = LEDMask;
\r
}
\r
\r
- static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint32_t LEDs_GetLEDs(void)
\r
+ static inline uintN_t LEDs_GetLEDs(void)
\r
{
\r
return (AVR32_GPIO.port[0].ovr & LEDS_ALL_LEDS);
\r
}
\r
{
\r
return (AVR32_GPIO.port[0].ovr & LEDS_ALL_LEDS);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/EVK527/Buttons.h
b/LUFA/Drivers/Board/EVK527/Buttons.h
index
0150fa1
..
950c574
100644
(file)
--- a/
LUFA/Drivers/Board/EVK527/Buttons.h
+++ b/
LUFA/Drivers/Board/EVK527/Buttons.h
@@
-85,8
+85,7
@@
PORTE |= BUTTONS_BUTTON1;
\r
}
\r
\r
PORTE |= BUTTONS_BUTTON1;
\r
}
\r
\r
- static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t Buttons_GetStatus(void)
\r
+ static inline uintN_t Buttons_GetStatus(void)
\r
{
\r
return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
{
\r
return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/EVK527/Joystick.h
b/LUFA/Drivers/Board/EVK527/Joystick.h
index
7d208ea
..
d8583d1
100644
(file)
--- 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: */
\r
#if !defined(__DOXYGEN__)
\r
/* Macros: */
\r
/* Private Interface - For use in library only: */
\r
#if !defined(__DOXYGEN__)
\r
/* Macros: */
\r
- #define JOY_FMASK
((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7))
\r
+ #define JOY_FMASK ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7))
\r
#define JOY_CMASK (1 << 6))
\r
#endif
\r
\r
#define JOY_CMASK (1 << 6))
\r
#endif
\r
\r
@@
-100,8
+100,7
@@
PORTC |= JOY_CMASK;
\r
}
\r
\r
PORTC |= JOY_CMASK;
\r
}
\r
\r
- static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t Joystick_GetStatus(void)
\r
+ static inline uintN_t Joystick_GetStatus(void)
\r
{
\r
return (((uint8_t)~PINF & JOY_FMASK) | (((uint8_t)~PINC & JOY_CMASK) >> 3));
\r
}
\r
{
\r
return (((uint8_t)~PINF & JOY_FMASK) | (((uint8_t)~PINC & JOY_CMASK) >> 3));
\r
}
\r
diff --git
a/LUFA/Drivers/Board/EVK527/LEDs.h
b/LUFA/Drivers/Board/EVK527/LEDs.h
index
ea7c7c2
..
d01a814
100644
(file)
--- a/
LUFA/Drivers/Board/EVK527/LEDs.h
+++ b/
LUFA/Drivers/Board/EVK527/LEDs.h
@@
-90,32
+90,31
@@
PORTD &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
PORTD &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
- static inline void LEDs_TurnOnLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOnLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD |= LEDMask;
\r
}
\r
\r
{
\r
PORTD |= LEDMask;
\r
}
\r
\r
- static inline void LEDs_TurnOffLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOffLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD &= ~LEDMask;
\r
}
\r
\r
{
\r
PORTD &= ~LEDMask;
\r
}
\r
\r
- static inline void LEDs_SetAllLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_SetAllLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
\r
}
\r
\r
{
\r
PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
\r
}
\r
\r
- static inline void LEDs_ChangeLEDs(const uint
8_t LEDMask, const uint8
_t ActiveMask)
\r
+ static inline void LEDs_ChangeLEDs(const uint
N_t LEDMask, const uintN
_t ActiveMask)
\r
{
\r
PORTD = ((PORTD & ~LEDMask) | ActiveMask);
\r
}
\r
\r
{
\r
PORTD = ((PORTD & ~LEDMask) | ActiveMask);
\r
}
\r
\r
- static inline void LEDs_ToggleLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_ToggleLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
- static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
\r
static inline uint8_t LEDs_GetLEDs(void)
\r
{
\r
return (PORTD & LEDS_ALL_LEDS);
\r
static inline uint8_t LEDs_GetLEDs(void)
\r
{
\r
return (PORTD & LEDS_ALL_LEDS);
\r
diff --git
a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
index
d095d6e
..
e33aa86
100644
(file)
--- 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);
\r
}
\r
\r
PORTE |= (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);
\r
}
\r
\r
- static inline void LEDs_TurnOnLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOnLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD |= (LEDMask & LEDS_LED1);
\r
PORTD &= ~(LEDMask & LEDS_LED2);
\r
PORTE &= ~((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
\r
}
\r
\r
{
\r
PORTD |= (LEDMask & LEDS_LED1);
\r
PORTD &= ~(LEDMask & LEDS_LED2);
\r
PORTE &= ~((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
\r
}
\r
\r
- static inline void LEDs_TurnOffLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOffLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD &= ~(LEDMask & LEDS_LED1);
\r
PORTD |= (LEDMask & LEDS_LED2);
\r
PORTE |= ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
\r
}
\r
\r
{
\r
PORTD &= ~(LEDMask & LEDS_LED1);
\r
PORTD |= (LEDMask & LEDS_LED2);
\r
PORTE |= ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
\r
}
\r
\r
- static inline void LEDs_SetAllLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_SetAllLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = (((PORTD & ~LEDS_LED1) | (LEDMask & LEDS_LED1)) |
\r
((PORTD | LEDS_LED2) & ~(LEDMask & LEDS_LED2)));
\r
{
\r
PORTD = (((PORTD & ~LEDS_LED1) | (LEDMask & LEDS_LED1)) |
\r
((PORTD | LEDS_LED2) & ~(LEDMask & LEDS_LED2)));
\r
@@
-128,7
+128,7
@@
~((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT));
\r
}
\r
\r
~((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT));
\r
}
\r
\r
- static inline void LEDs_ChangeLEDs(const uint
8_t LEDMask, const uint8
_t ActiveMask)
\r
+ static inline void LEDs_ChangeLEDs(const uint
N_t LEDMask, const uintN
_t ActiveMask)
\r
{
\r
PORTD = (((PORTD & ~(LEDMask & LEDS_LED1)) | (ActiveMask & LEDS_LED1)) |
\r
((PORTD | (LEDMask & LEDS_LED2)) & ~(ActiveMask & LEDS_LED2)));
\r
{
\r
PORTD = (((PORTD & ~(LEDMask & LEDS_LED1)) | (ActiveMask & LEDS_LED1)) |
\r
((PORTD | (LEDMask & LEDS_LED2)) & ~(ActiveMask & LEDS_LED2)));
\r
@@
-136,13
+136,12
@@
~((ActiveMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT));
\r
}
\r
\r
~((ActiveMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT));
\r
}
\r
\r
- static inline void LEDs_ToggleLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_ToggleLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_PORTD_LEDS));
\r
PORTE = (PORTE ^ ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT));
\r
}
\r
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_PORTD_LEDS));
\r
PORTE = (PORTE ^ ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT));
\r
}
\r
\r
- static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
\r
static inline uint8_t LEDs_GetLEDs(void)
\r
{
\r
return (((PORTD & LEDS_LED1) | (~PORTD & LEDS_LED2)) |
\r
static inline uint8_t LEDs_GetLEDs(void)
\r
{
\r
return (((PORTD & LEDS_LED1) | (~PORTD & LEDS_LED2)) |
\r
diff --git
a/LUFA/Drivers/Board/STK525/Buttons.h
b/LUFA/Drivers/Board/STK525/Buttons.h
index
f3dccaf
..
e70822e
100644
(file)
--- a/
LUFA/Drivers/Board/STK525/Buttons.h
+++ b/
LUFA/Drivers/Board/STK525/Buttons.h
@@
-85,8
+85,7
@@
PORTE |= BUTTONS_BUTTON1;
\r
}
\r
\r
PORTE |= BUTTONS_BUTTON1;
\r
}
\r
\r
- static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t Buttons_GetStatus(void)
\r
+ static inline uintN_t Buttons_GetStatus(void)
\r
{
\r
return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
{
\r
return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/STK525/Joystick.h
b/LUFA/Drivers/Board/STK525/Joystick.h
index
6358f95
..
aab650d
100644
(file)
--- a/
LUFA/Drivers/Board/STK525/Joystick.h
+++ b/
LUFA/Drivers/Board/STK525/Joystick.h
@@
-100,8
+100,7
@@
PORTE |= JOY_EMASK;
\r
}
\r
\r
PORTE |= JOY_EMASK;
\r
}
\r
\r
- static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t Joystick_GetStatus(void)
\r
+ static inline uintN_t Joystick_GetStatus(void)
\r
{
\r
return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1));
\r
}
\r
{
\r
return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1));
\r
}
\r
diff --git
a/LUFA/Drivers/Board/STK525/LEDs.h
b/LUFA/Drivers/Board/STK525/LEDs.h
index
b54a8c9
..
1f2e9a2
100644
(file)
--- a/
LUFA/Drivers/Board/STK525/LEDs.h
+++ b/
LUFA/Drivers/Board/STK525/LEDs.h
@@
-93,33
+93,32
@@
PORTD &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
PORTD &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
- static inline void LEDs_TurnOnLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOnLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD |= LEDMask;
\r
}
\r
\r
{
\r
PORTD |= LEDMask;
\r
}
\r
\r
- static inline void LEDs_TurnOffLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOffLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD &= ~LEDMask;
\r
}
\r
\r
{
\r
PORTD &= ~LEDMask;
\r
}
\r
\r
- static inline void LEDs_SetAllLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_SetAllLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
\r
}
\r
\r
{
\r
PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
\r
}
\r
\r
- static inline void LEDs_ChangeLEDs(const uint
8_t LEDMask, const uint8
_t ActiveMask)
\r
+ static inline void LEDs_ChangeLEDs(const uint
N_t LEDMask, const uintN
_t ActiveMask)
\r
{
\r
PORTD = ((PORTD & ~LEDMask) | ActiveMask);
\r
}
\r
\r
{
\r
PORTD = ((PORTD & ~LEDMask) | ActiveMask);
\r
}
\r
\r
- static inline void LEDs_ToggleLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_ToggleLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
- static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t LEDs_GetLEDs(void)
\r
+ static inline uintN_t LEDs_GetLEDs(void)
\r
{
\r
return (PORTD & LEDS_ALL_LEDS);
\r
}
\r
{
\r
return (PORTD & LEDS_ALL_LEDS);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/STK526/Buttons.h
b/LUFA/Drivers/Board/STK526/Buttons.h
index
f480560
..
56af91f
100644
(file)
--- a/
LUFA/Drivers/Board/STK526/Buttons.h
+++ b/
LUFA/Drivers/Board/STK526/Buttons.h
@@
-85,8
+85,8
@@
PORTD |= BUTTONS_BUTTON1;
\r
}
\r
\r
PORTD |= BUTTONS_BUTTON1;
\r
}
\r
\r
- static inline uint
8
_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint
8
_t Buttons_GetStatus(void)
\r
+ static inline uint
N
_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
+ static inline uint
N
_t Buttons_GetStatus(void)
\r
{
\r
return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
{
\r
return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/STK526/Joystick.h
b/LUFA/Drivers/Board/STK526/Joystick.h
index
b095536
..
f17e280
100644
(file)
--- a/
LUFA/Drivers/Board/STK526/Joystick.h
+++ b/
LUFA/Drivers/Board/STK526/Joystick.h
@@
-97,8
+97,8
@@
PORTB |= JOY_BMASK;
\r
}
\r
\r
PORTB |= JOY_BMASK;
\r
}
\r
\r
- static inline uint
8
_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint
8
_t Joystick_GetStatus(void)
\r
+ static inline uint
N
_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
+ static inline uint
N
_t Joystick_GetStatus(void)
\r
{
\r
return ((uint8_t)~PINB & JOY_BMASK);
\r
}
\r
{
\r
return ((uint8_t)~PINB & JOY_BMASK);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/STK526/LEDs.h
b/LUFA/Drivers/Board/STK526/LEDs.h
index
d1ac493
..
fdae8f5
100644
(file)
--- a/
LUFA/Drivers/Board/STK526/LEDs.h
+++ b/
LUFA/Drivers/Board/STK526/LEDs.h
@@
-93,33
+93,32
@@
PORTD &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
PORTD &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
- static inline void LEDs_TurnOnLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOnLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD |= LEDMask;
\r
}
\r
\r
{
\r
PORTD |= LEDMask;
\r
}
\r
\r
- static inline void LEDs_TurnOffLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOffLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD &= ~LEDMask;
\r
}
\r
\r
{
\r
PORTD &= ~LEDMask;
\r
}
\r
\r
- static inline void LEDs_SetAllLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_SetAllLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
\r
}
\r
\r
{
\r
PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
\r
}
\r
\r
- static inline void LEDs_ChangeLEDs(const uint
8_t LEDMask, const uint8
_t ActiveMask)
\r
+ static inline void LEDs_ChangeLEDs(const uint
N_t LEDMask, const uintN
_t ActiveMask)
\r
{
\r
PORTD = ((PORTD & ~(LEDMask & LEDS_ALL_LEDS)) | (ActiveMask & LEDS_ALL_LEDS));
\r
}
\r
\r
{
\r
PORTD = ((PORTD & ~(LEDMask & LEDS_ALL_LEDS)) | (ActiveMask & LEDS_ALL_LEDS));
\r
}
\r
\r
- static inline void LEDs_ToggleLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_ToggleLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
- static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t LEDs_GetLEDs(void)
\r
+ static inline uintN_t LEDs_GetLEDs(void)
\r
{
\r
return (PORTD & LEDS_ALL_LEDS);
\r
}
\r
{
\r
return (PORTD & LEDS_ALL_LEDS);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/USBKEY/Buttons.h
b/LUFA/Drivers/Board/USBKEY/Buttons.h
index
db1391c
..
471a19a
100644
(file)
--- a/
LUFA/Drivers/Board/USBKEY/Buttons.h
+++ b/
LUFA/Drivers/Board/USBKEY/Buttons.h
@@
-79,8
+79,8
@@
PORTE |= BUTTONS_BUTTON1;
\r
}
\r
\r
PORTE |= BUTTONS_BUTTON1;
\r
}
\r
\r
- static inline uint
8
_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint
8
_t Buttons_GetStatus(void)
\r
+ static inline uint
N
_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
+ static inline uint
N
_t Buttons_GetStatus(void)
\r
{
\r
return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
{
\r
return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/USBKEY/Joystick.h
b/LUFA/Drivers/Board/USBKEY/Joystick.h
index
b082991
..
b6dd8d1
100644
(file)
--- a/
LUFA/Drivers/Board/USBKEY/Joystick.h
+++ b/
LUFA/Drivers/Board/USBKEY/Joystick.h
@@
-100,8
+100,8
@@
PORTE |= JOY_EMASK;
\r
}
\r
\r
PORTE |= JOY_EMASK;
\r
}
\r
\r
- static inline uint
8
_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint
8
_t Joystick_GetStatus(void)
\r
+ static inline uint
N
_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
\r
+ static inline uint
N
_t Joystick_GetStatus(void)
\r
{
\r
return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1));
\r
}
\r
{
\r
return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1));
\r
}
\r
diff --git
a/LUFA/Drivers/Board/USBKEY/LEDs.h
b/LUFA/Drivers/Board/USBKEY/LEDs.h
index
e1a5b23
..
0864be8
100644
(file)
--- a/
LUFA/Drivers/Board/USBKEY/LEDs.h
+++ b/
LUFA/Drivers/Board/USBKEY/LEDs.h
@@
-93,33
+93,32
@@
PORTD &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
PORTD &= ~LEDS_ALL_LEDS;
\r
}
\r
\r
- static inline void LEDs_TurnOnLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOnLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD |= LEDMask;
\r
}
\r
\r
{
\r
PORTD |= LEDMask;
\r
}
\r
\r
- static inline void LEDs_TurnOffLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOffLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD &= ~LEDMask;
\r
}
\r
\r
{
\r
PORTD &= ~LEDMask;
\r
}
\r
\r
- static inline void LEDs_SetAllLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_SetAllLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
\r
}
\r
\r
{
\r
PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
\r
}
\r
\r
- static inline void LEDs_ChangeLEDs(const uint
8_t LEDMask, const uint8
_t ActiveMask)
\r
+ static inline void LEDs_ChangeLEDs(const uint
N_t LEDMask, const uintN
_t ActiveMask)
\r
{
\r
PORTD = ((PORTD & ~LEDMask) | ActiveMask);
\r
}
\r
\r
{
\r
PORTD = ((PORTD & ~LEDMask) | ActiveMask);
\r
}
\r
\r
- static inline void LEDs_ToggleLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_ToggleLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
{
\r
PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
- static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t LEDs_GetLEDs(void)
\r
+ static inline uintN_t LEDs_GetLEDs(void)
\r
{
\r
return (PORTD & LEDS_ALL_LEDS);
\r
}
\r
{
\r
return (PORTD & LEDS_ALL_LEDS);
\r
}
\r
diff --git
a/LUFA/Drivers/Board/XPLAIN/LEDs.h
b/LUFA/Drivers/Board/XPLAIN/LEDs.h
index
add868d
..
2c80aa7
100644
(file)
--- a/
LUFA/Drivers/Board/XPLAIN/LEDs.h
+++ b/
LUFA/Drivers/Board/XPLAIN/LEDs.h
@@
-84,33
+84,32
@@
PORTB |= LEDS_ALL_LEDS;
\r
}
\r
\r
PORTB |= LEDS_ALL_LEDS;
\r
}
\r
\r
- static inline void LEDs_TurnOnLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOnLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTB &= ~LEDMask;
\r
}
\r
\r
{
\r
PORTB &= ~LEDMask;
\r
}
\r
\r
- static inline void LEDs_TurnOffLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_TurnOffLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTB |= LEDMask;
\r
}
\r
\r
{
\r
PORTB |= LEDMask;
\r
}
\r
\r
- static inline void LEDs_SetAllLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_SetAllLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTB = ((PORTB | LEDS_ALL_LEDS) & ~LEDMask);
\r
}
\r
\r
{
\r
PORTB = ((PORTB | LEDS_ALL_LEDS) & ~LEDMask);
\r
}
\r
\r
- static inline void LEDs_ChangeLEDs(const uint
8_t LEDMask, const uint8
_t ActiveMask)
\r
+ static inline void LEDs_ChangeLEDs(const uint
N_t LEDMask, const uintN
_t ActiveMask)
\r
{
\r
PORTB = ((PORTB | (LEDMask & LEDS_ALL_LEDS)) & (~ActiveMask & LEDS_ALL_LEDS));
\r
}
\r
\r
{
\r
PORTB = ((PORTB | (LEDMask & LEDS_ALL_LEDS)) & (~ActiveMask & LEDS_ALL_LEDS));
\r
}
\r
\r
- static inline void LEDs_ToggleLEDs(const uint
8
_t LEDMask)
\r
+ static inline void LEDs_ToggleLEDs(const uint
N
_t LEDMask)
\r
{
\r
PORTD = (PORTB ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
{
\r
PORTD = (PORTB ^ (LEDMask & LEDS_ALL_LEDS));
\r
}
\r
\r
- static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
\r
- static inline uint8_t LEDs_GetLEDs(void)
\r
+ static inline uintN_t LEDs_GetLEDs(void)
\r
{
\r
return (~PORTB & LEDS_ALL_LEDS);
\r
}
\r
{
\r
return (~PORTB & LEDS_ALL_LEDS);
\r
}
\r