diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2010-09-09 09:57:03 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2010-09-09 09:57:03 +0000 |
| commit | 4e918f621ac91ec4e555d41e70fca3b4cc536d11 (patch) | |
| tree | d48771ffdf6f6a730b15ea41b01cbfb7b03c44b6 /LUFA/Drivers | |
| parent | 1c104153ba5b1265d6a4210f928b13b2dcb5aeba (diff) | |
Added LEDs_ToggleLEDs() function to several board LED drivers which were missing it (thanks to Andrei Krainev).
Simplify some of the LED driver functions to produce more compact code.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1467 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'LUFA/Drivers')
| -rw-r--r-- | LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h | 4 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/BUMBLEB/LEDs.h | 5 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/EVK527/LEDs.h | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/JMDBU2/LEDs.h | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/OLIMEX162/LEDs.h | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/STK525/LEDs.h | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/STK526/LEDs.h | 4 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/USBKEY/LEDs.h | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/USBTINYMKII/LEDs.h | 5 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/XPLAIN/LEDs.h | 4 |
10 files changed, 21 insertions, 11 deletions
diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h index b0fa0f66..1fe71de2 100644 --- a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h +++ b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h @@ -115,12 +115,12 @@ static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) { - PORTD = ((PORTD & ~(LEDMask & LEDS_ALL_LEDS)) | (ActiveMask & LEDS_ALL_LEDS)); + PORTD = ((PORTD & ~LEDMask) | ActiveMask); } static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { - PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS)); + PORTD ^= LEDMask; } static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; diff --git a/LUFA/Drivers/Board/BUMBLEB/LEDs.h b/LUFA/Drivers/Board/BUMBLEB/LEDs.h index 1453da4d..6446d124 100644 --- a/LUFA/Drivers/Board/BUMBLEB/LEDs.h +++ b/LUFA/Drivers/Board/BUMBLEB/LEDs.h @@ -120,6 +120,11 @@ PORTB = ((PORTB & ~LedMask) | ActiveMask); } + static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) + { + PORTB ^= LEDMask; + } + static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) { diff --git a/LUFA/Drivers/Board/EVK527/LEDs.h b/LUFA/Drivers/Board/EVK527/LEDs.h index 7612ba06..9f36ec82 100644 --- a/LUFA/Drivers/Board/EVK527/LEDs.h +++ b/LUFA/Drivers/Board/EVK527/LEDs.h @@ -114,7 +114,7 @@ static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { - PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS)); + PORTD ^= LEDMask; } static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; diff --git a/LUFA/Drivers/Board/JMDBU2/LEDs.h b/LUFA/Drivers/Board/JMDBU2/LEDs.h index 1acf2a9f..70013a31 100644 --- a/LUFA/Drivers/Board/JMDBU2/LEDs.h +++ b/LUFA/Drivers/Board/JMDBU2/LEDs.h @@ -108,7 +108,7 @@ static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { - PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS)); + PORTD ^= LEDMask; } static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; diff --git a/LUFA/Drivers/Board/OLIMEX162/LEDs.h b/LUFA/Drivers/Board/OLIMEX162/LEDs.h index 625d953d..c4a4b3f2 100644 --- a/LUFA/Drivers/Board/OLIMEX162/LEDs.h +++ b/LUFA/Drivers/Board/OLIMEX162/LEDs.h @@ -122,7 +122,7 @@ #if defined(__cplusplus)
}
#endif
-
+
#endif
/** @} */
diff --git a/LUFA/Drivers/Board/STK525/LEDs.h b/LUFA/Drivers/Board/STK525/LEDs.h index d2d1bbb2..407c8927 100644 --- a/LUFA/Drivers/Board/STK525/LEDs.h +++ b/LUFA/Drivers/Board/STK525/LEDs.h @@ -117,7 +117,7 @@ static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { - PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS)); + PORTD ^= LEDMask; } static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; diff --git a/LUFA/Drivers/Board/STK526/LEDs.h b/LUFA/Drivers/Board/STK526/LEDs.h index 2d20e546..de65d26b 100644 --- a/LUFA/Drivers/Board/STK526/LEDs.h +++ b/LUFA/Drivers/Board/STK526/LEDs.h @@ -112,12 +112,12 @@ static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) { - PORTD = ((PORTD & ~(LEDMask & LEDS_ALL_LEDS)) | (ActiveMask & LEDS_ALL_LEDS)); + PORTD = ((PORTD & ~LEDMask) | ActiveMask); } static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { - PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS)); + PORTD ^= LEDMask; } static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; diff --git a/LUFA/Drivers/Board/USBKEY/LEDs.h b/LUFA/Drivers/Board/USBKEY/LEDs.h index 86981f52..ebac08e8 100644 --- a/LUFA/Drivers/Board/USBKEY/LEDs.h +++ b/LUFA/Drivers/Board/USBKEY/LEDs.h @@ -117,7 +117,7 @@ static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { - PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS)); + PORTD ^= LEDMask; } static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; diff --git a/LUFA/Drivers/Board/USBTINYMKII/LEDs.h b/LUFA/Drivers/Board/USBTINYMKII/LEDs.h index b0383a64..f394ec01 100644 --- a/LUFA/Drivers/Board/USBTINYMKII/LEDs.h +++ b/LUFA/Drivers/Board/USBTINYMKII/LEDs.h @@ -110,6 +110,11 @@ PORTB = ((PORTB & ~LedMask) | ActiveMask); } + static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) + { + PORTB ^= LEDMask; + } + static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) { diff --git a/LUFA/Drivers/Board/XPLAIN/LEDs.h b/LUFA/Drivers/Board/XPLAIN/LEDs.h index 00f7bc2a..697ec967 100644 --- a/LUFA/Drivers/Board/XPLAIN/LEDs.h +++ b/LUFA/Drivers/Board/XPLAIN/LEDs.h @@ -103,12 +103,12 @@ static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) { - PORTB = ((PORTB | (LEDMask & LEDS_ALL_LEDS)) & (~ActiveMask & LEDS_ALL_LEDS)); + PORTB = ((PORTB | LEDMask) & ~ActiveMask); } static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { - PORTD = (PORTB ^ (LEDMask & LEDS_ALL_LEDS)); + PORTB ^= LEDMask; } static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; |
