From 7d3150423d8c25aba858ddff60cfe29faa7b6729 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Mon, 9 May 2011 14:04:40 +0000
Subject: [PATCH] Add new USE_LUFA_CONFIG_HEADER compile time option.
Add missing LEDS_ToggleLEDs() function to the LED driver for the EVK1101 board.
---
LUFA/Common/Common.h | 4 ++++
LUFA/Drivers/Board/EVK1101/LEDs.h | 21 +++++++++++++--------
LUFA/ManPages/ChangeLog.txt | 2 ++
LUFA/ManPages/CompileTimeTokens.txt | 3 +++
4 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 69c4ff2c3..49a2bcdf1 100644
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -67,6 +67,10 @@
#include <string.h>
#include <stddef.h>
+ #if defined(USE_LUFA_CONFIG_HEADER)
+ #include "LUFAConfig.h"
+ #endif
+
#include "Architectures.h"
#include "Attributes.h"
#include "BoardTypes.h"
diff --git a/LUFA/Drivers/Board/EVK1101/LEDs.h b/LUFA/Drivers/Board/EVK1101/LEDs.h
index 5609b7763..ddb460795 100644
--- a/LUFA/Drivers/Board/EVK1101/LEDs.h
+++ b/LUFA/Drivers/Board/EVK1101/LEDs.h
@@ -98,27 +98,32 @@
AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS;
}
- static inline void LEDs_TurnOnLEDs(const uint32_t LedMask)
+ static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask)
{
- AVR32_GPIO.port[LEDS_PORT].ovrc = LedMask;
+ AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask;
}
- static inline void LEDs_TurnOffLEDs(const uint32_t LedMask)
+ static inline void LEDs_TurnOffLEDs(const uint32_t LEDMask)
{
- AVR32_GPIO.port[LEDS_PORT].ovrs = LedMask;
+ AVR32_GPIO.port[LEDS_PORT].ovrs = LEDMask;
}
- static inline void LEDs_SetAllLEDs(const uint32_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;
+ AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask;
}
- static inline void LEDs_ChangeLEDs(const uint32_t LedMask, const uint32_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].ovrs = LEDMask;
AVR32_GPIO.port[LEDS_PORT].ovrc = ActiveMask;
}
+
+ static inline void LEDs_ToggleLEDs(const uint32_t LEDMask)
+ {
+ AVR32_GPIO.port[LEDS_PORT].ovrt = LEDMask;
+ }
static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint32_t LEDs_GetLEDs(void)
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index d50779068..f937fa3b4 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -27,6 +27,8 @@
* - Internal restructuring for eventual multiple architecture ports
* - Added AVR32 UC3 architecture port (currently incomplete/experimental)
* - Added new architecture independant functions to enable, disable, save and restore the Global Interrupt Enable flags
+ * - Added USE_LUFA_CONFIG_HEADER compile time option to include a LUFAConfig.h header in the user director for LUFA configuration
+ * tokens as an alternative to tokens defined in the project makefile
* - Library Applications:
* - Added ability to write protect Mass Storage disk write operations from the host OS
* - Added new MIDIToneGenerator project
diff --git a/LUFA/ManPages/CompileTimeTokens.txt b/LUFA/ManPages/CompileTimeTokens.txt
index 9dfa80534..415fde549 100644
--- a/LUFA/ManPages/CompileTimeTokens.txt
+++ b/LUFA/ManPages/CompileTimeTokens.txt
@@ -10,6 +10,9 @@
* compiler via the -D switch, to alter the LUFA library code. These tokens may alter the library behaviour,
* or remove features unused by a given application in order to save flash space.
*
+ * If the \c USE_LUFA_CONFIG_HEADER token is defined, the library will include a header file named \c LUFAConfig.h located
+ * in the user directory where the below compile time tokens may be defined. This allows for an alternative to makefile
+ * defined tokens for configuring the library.
*
* \section Sec_SummaryNonUSBTokens Non USB Related Tokens
* This section describes compile tokens which affect non-USB sections of the LUFA library.
--
GitLab