aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/Board
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2010-09-09 09:57:03 +0000
committerDean Camera <dean@fourwalledcubicle.com>2010-09-09 09:57:03 +0000
commit66f14d44a3c3f1744e85cea14061b568c3c1306c (patch)
treed48771ffdf6f6a730b15ea41b01cbfb7b03c44b6 /LUFA/Drivers/Board
parent7aaf9b2036784fadff048172029d0a2029da0ec9 (diff)
downloadlufa-66f14d44a3c3f1744e85cea14061b568c3c1306c.tar.gz
lufa-66f14d44a3c3f1744e85cea14061b568c3c1306c.tar.bz2
lufa-66f14d44a3c3f1744e85cea14061b568c3c1306c.zip
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.
Diffstat (limited to 'LUFA/Drivers/Board')
-rw-r--r--LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h4
-rw-r--r--LUFA/Drivers/Board/BUMBLEB/LEDs.h5
-rw-r--r--LUFA/Drivers/Board/EVK527/LEDs.h2
-rw-r--r--LUFA/Drivers/Board/JMDBU2/LEDs.h2
-rw-r--r--LUFA/Drivers/Board/OLIMEX162/LEDs.h2
-rw-r--r--LUFA/Drivers/Board/STK525/LEDs.h2
-rw-r--r--LUFA/Drivers/Board/STK526/LEDs.h4
-rw-r--r--LUFA/Drivers/Board/USBKEY/LEDs.h2
-rw-r--r--LUFA/Drivers/Board/USBTINYMKII/LEDs.h5
-rw-r--r--LUFA/Drivers/Board/XPLAIN/LEDs.h4
10 files changed, 21 insertions, 11 deletions
diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
index b0fa0f66c..1fe71de2f 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 1453da4d7..6446d1241 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 7612ba060..9f36ec828 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 1acf2a9f4..70013a31e 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 625d953dc..c4a4b3f2f 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 d2d1bbb2c..407c89278 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 2d20e5466..de65d26b3 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 86981f523..ebac08e83 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 b0383a64a..f394ec014 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 00f7bc2a3..697ec9677 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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-01 03:53:57 +0000