Fix compile errors when both Host and Device modes are enabled.

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

diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 628f258..5b407b4 100644 (file)
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -55,7 +55,7 @@
  *  Hardware LEDs driver. This provides an easy to use driver for the hardware LEDs present on many boards. It
  *  provides an interface to configure, test and change the status of all the board LEDs.
  *
  *  Hardware LEDs driver. This provides an easy to use driver for the hardware LEDs present on many boards. It
  *  provides an interface to configure, test and change the status of all the board LEDs.
  *

- *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/Dataflash.h file in the user project
+ *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/LEDs.h file in the user project

  *  directory. Otherwise, it will include the appropriate built in board driver header file. If the BOARD value
  *  is set to \c BOARD_NONE, this driver is silently disabled.
  *
  *  directory. Otherwise, it will include the appropriate built in board driver header file. If the BOARD value
  *  is set to \c BOARD_NONE, this driver is silently disabled.
  *


@@ -74,7 +74,7 @@
  *  application.
  *
  *  \code
  *  application.
  *
  *  \code

- *      // Initialise the board LED driver before first use
+ *      // Initialize the board LED driver before first use

  *      LEDs_Init();
  *
  *      // Turn on each of the four LEDs in turn
  *      LEDs_Init();
  *
  *      // Turn on each of the four LEDs in turn


@@ -116,55 +116,57 @@
                static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) {};
                static inline uint8_t LEDs_GetLEDs(void) { return 0; }
        #elif (BOARD == BOARD_USBKEY)
                static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) {};
                static inline uint8_t LEDs_GetLEDs(void) { return 0; }
        #elif (BOARD == BOARD_USBKEY)

-               #include "USBKEY/LEDs.h"
+               #include "AVR8/USBKEY/LEDs.h"

        #elif (BOARD == BOARD_STK525)
        #elif (BOARD == BOARD_STK525)

-               #include "STK525/LEDs.h"
+               #include "AVR8/STK525/LEDs.h"

        #elif (BOARD == BOARD_STK526)
        #elif (BOARD == BOARD_STK526)

-               #include "STK526/LEDs.h"
+               #include "AVR8/STK526/LEDs.h"

        #elif (BOARD == BOARD_RZUSBSTICK)
        #elif (BOARD == BOARD_RZUSBSTICK)

-               #include "RZUSBSTICK/LEDs.h"
+               #include "AVR8/RZUSBSTICK/LEDs.h"

        #elif (BOARD == BOARD_ATAVRUSBRF01)
        #elif (BOARD == BOARD_ATAVRUSBRF01)

-               #include "ATAVRUSBRF01/LEDs.h"
+               #include "AVR8/ATAVRUSBRF01/LEDs.h"

        #elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
        #elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))

-               #include "XPLAIN/LEDs.h"
+               #include "AVR8/XPLAIN/LEDs.h"

        #elif (BOARD == BOARD_BUMBLEB)
        #elif (BOARD == BOARD_BUMBLEB)

-               #include "BUMBLEB/LEDs.h"
+               #include "AVR8/BUMBLEB/LEDs.h"

        #elif (BOARD == BOARD_EVK527)
        #elif (BOARD == BOARD_EVK527)

-               #include "EVK527/LEDs.h"
+               #include "AVR8/EVK527/LEDs.h"

        #elif (BOARD == BOARD_TEENSY)
        #elif (BOARD == BOARD_TEENSY)

-               #include "TEENSY/LEDs.h"
+               #include "AVR8/TEENSY/LEDs.h"

        #elif (BOARD == BOARD_USBTINYMKII)
        #elif (BOARD == BOARD_USBTINYMKII)

-               #include "USBTINYMKII/LEDs.h"
+               #include "AVR8/USBTINYMKII/LEDs.h"

        #elif (BOARD == BOARD_BENITO)
        #elif (BOARD == BOARD_BENITO)

-               #include "BENITO/LEDs.h"
+               #include "AVR8/BENITO/LEDs.h"

        #elif (BOARD == BOARD_JMDBU2)
        #elif (BOARD == BOARD_JMDBU2)

-               #include "JMDBU2/LEDs.h"
+               #include "AVR8/JMDBU2/LEDs.h"

        #elif (BOARD == BOARD_OLIMEX162)
        #elif (BOARD == BOARD_OLIMEX162)

-               #include "OLIMEX162/LEDs.h"
+               #include "AVR8/OLIMEX162/LEDs.h"

        #elif (BOARD == BOARD_USBFOO)
        #elif (BOARD == BOARD_USBFOO)

-               #include "USBFOO/LEDs.h"
+               #include "AVR8/USBFOO/LEDs.h"

        #elif (BOARD == BOARD_UDIP)
        #elif (BOARD == BOARD_UDIP)

-               #include "UDIP/LEDs.h"
+               #include "AVR8/UDIP/LEDs.h"

        #elif (BOARD == BOARD_BUI)
        #elif (BOARD == BOARD_BUI)

-               #include "BUI/LEDs.h"
+               #include "AVR8/BUI/LEDs.h"

        #elif (BOARD == BOARD_UNO)
        #elif (BOARD == BOARD_UNO)

-               #include "UNO/LEDs.h"
+               #include "AVR8/UNO/LEDs.h"

        #elif (BOARD == BOARD_CULV3)
        #elif (BOARD == BOARD_CULV3)

-               #include "CULV3/LEDs.h"
+               #include "AVR8/CULV3/LEDs.h"

        #elif (BOARD == BOARD_BLACKCAT)
        #elif (BOARD == BOARD_BLACKCAT)

-               #include "BLACKCAT/LEDs.h"
+               #include "AVR8/BLACKCAT/LEDs.h"

        #elif (BOARD == BOARD_MAXIMUS)
        #elif (BOARD == BOARD_MAXIMUS)

-               #include "MAXIMUS/LEDs.h"
+               #include "AVR8/MAXIMUS/LEDs.h"

        #elif (BOARD == BOARD_MINIMUS)
        #elif (BOARD == BOARD_MINIMUS)

-               #include "MINIMUS/LEDs.h"
+               #include "AVR8/MINIMUS/LEDs.h"

        #elif (BOARD == BOARD_ADAFRUITU4)
        #elif (BOARD == BOARD_ADAFRUITU4)

-               #include "ADAFRUITU4/LEDs.h"
+               #include "AVR8/ADAFRUITU4/LEDs.h"

        #elif (BOARD == BOARD_MICROSIN162)
        #elif (BOARD == BOARD_MICROSIN162)

-               #include "MICROSIN162/LEDs.h"
+               #include "AVR8/MICROSIN162/LEDs.h"

        #elif (BOARD == BOARD_SPARKFUN8U2)
        #elif (BOARD == BOARD_SPARKFUN8U2)

-               #include "SPARKFUN8U2/LEDs.h"
+               #include "AVR8/SPARKFUN8U2/LEDs.h"

        #elif (BOARD == BOARD_EVK1101)
        #elif (BOARD == BOARD_EVK1101)

-               #include "EVK1101/LEDs.h"
+               #include "UC3/EVK1101/LEDs.h"
+       #elif (BOARD == BOARD_TUL)
+               #include "AVR8/TUL/LEDs.h"      

        #else
                #include "Board/LEDs.h"
        #endif
        #else
                #include "Board/LEDs.h"
        #endif


@@ -187,7 +189,7 @@
 
        /* Pseudo-Functions for Doxygen: */
        #if defined(__DOXYGEN__)
 
        /* Pseudo-Functions for Doxygen: */
        #if defined(__DOXYGEN__)

-               /** Initialises the board LED driver so that the LEDs can be controlled. This sets the appropriate port
+               /** Initializes the board LED driver so that the LEDs can be controlled. This sets the appropriate port

                 *  I/O pins as outputs, and sets the LEDs to default to off.
                 */
                static inline void LEDs_Init(void);
                 *  I/O pins as outputs, and sets the LEDs to default to off.
                 */
                static inline void LEDs_Init(void);