Slight cleanups to the architecture specific makefile templates to make the common...

[pub/USBasp.git] / LUFA / Drivers / Board / LEDs.h

diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 9ef2ea1..628f258 100644 (file)
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -29,7 +29,7 @@
 */
 
 /** \file
- *  \brief Master include file for the board LEDs driver.
+ *  \brief LED board hardware driver.
  *
  *  This file is the master dispatch header file for the board-specific LED driver, for boards containing user
  *  controllable LEDs.
@@ -45,6 +45,7 @@
 
 /** \ingroup Group_BoardDrivers
  *  \defgroup Group_LEDs LEDs Driver - LUFA/Drivers/Board/LEDs.h
+ *  \brief LED board hardware driver.
  *
  *  \section Sec_Dependencies Module Source Dependencies
  *  The following files must be built with any user project that uses this module:
@@ -78,17 +79,17 @@
  *
  *      // Turn on each of the four LEDs in turn
  *      LEDs_SetAllLEDs(LEDS_LED1); 
- *      _delay_ms(500);
+ *      Delay_MS(500);
  *      LEDs_SetAllLEDs(LEDS_LED1); 
- *      _delay_ms(500);
+ *      Delay_MS(500);
  *      LEDs_SetAllLEDs(LEDS_LED1); 
- *      _delay_ms(500);
+ *      Delay_MS(500);
  *      LEDs_SetAllLEDs(LEDS_LED1); 
- *      _delay_ms(500);
+ *      Delay_MS(500);
  *
  *      // Turn on all LEDs
  *      LEDs_SetAllLEDs(LEDS_ALL_LEDS);
- *      _delay_ms(1000);
+ *      Delay_MS(1000);
  *
  *      // Turn on LED 1, turn off LED 2, leaving LEDs 3 and 4 in their current state
  *      LEDs_ChangeLEDs((LEDS_LED1 | LEDS_LED2), LEDS_LED1);
@@ -101,10 +102,7 @@
 #define __LEDS_H__
 
        /* Macros: */
-       #if !defined(__DOXYGEN__)
                #define __INCLUDE_FROM_LEDS_H
-               #define INCLUDE_FROM_LEDS_H
-       #endif
 
        /* Includes: */
        #include "../../Common/Common.h"
@@ -165,6 +163,8 @@
                #include "MICROSIN162/LEDs.h"
        #elif (BOARD == BOARD_SPARKFUN8U2)
                #include "SPARKFUN8U2/LEDs.h"
+       #elif (BOARD == BOARD_EVK1101)
+               #include "EVK1101/LEDs.h"
        #else
                #include "Board/LEDs.h"
        #endif
@@ -196,20 +196,20 @@
                 *
                 *  \param[in] LEDMask  Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file).
                 */
-               static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask);
+               static inline void LEDs_TurnOnLEDs(const uint_reg_t LEDMask);
 
                /** Turns off the LEDs specified in the given LED mask.
                 *
                 *  \param[in] LEDMask  Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file).
                 */
-               static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask);
+               static inline void LEDs_TurnOffLEDs(const uint_reg_t LEDMask);
 
                /** Turns off all LEDs not specified in the given LED mask, and turns on all the LEDs in the given LED
                 *  mask.
                 *
                 *  \param[in] LEDMask  Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file).
                 */
-               static inline void LEDs_SetAllLEDs(const uint8_t LEDMask);
+               static inline void LEDs_SetAllLEDs(const uint_reg_t LEDMask);
 
                /** Turns off all LEDs in the LED mask that are not set in the active mask, and turns on all the LEDs
                 *  specified in both the LED and active masks.
@@ -217,21 +217,21 @@
                 *  \param[in] LEDMask     Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file).
                 *  \param[in] ActiveMask  Mask of whether the LEDs in the LED mask should be turned on or off.
                 */
-               static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-                                                  const uint8_t ActiveMask);
+               static inline void LEDs_ChangeLEDs(const uint_reg_t LEDMask,
+                                                  const uint_reg_t ActiveMask);
 
                /** Toggles all LEDs in the LED mask, leaving all others in their current states.
                 *
                 *  \param[in] LEDMask  Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file).
                 */
-               static inline void LEDs_ToggleLEDs(const uint8_t LEDMask);
+               static inline void LEDs_ToggleLEDs(const uint_reg_t LEDMask);
 
                /** Returns the status of all the board LEDs; set LED masks in the return value indicate that the
                 *  corresponding LED is on.
                 *
                 *  \return Mask of the board LEDs which are currently turned on.
                 */
-               static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
+               static inline uint_reg_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
        #endif
 
 #endif