Add missing SVN eol-style property to ensure that source code line endings and converted to the native values on checkout.

5 files changed, 846 insertions, 846 deletions

diff --git a/LUFA/Common/ArchitectureSpecific.h b/LUFA/Common/ArchitectureSpecific.h
index 502723fb7..1a125d6cb 100644
--- a/LUFA/Common/ArchitectureSpecific.h
+++ b/LUFA/Common/ArchitectureSpecific.h
@@ -1,148 +1,148 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2011.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting

-  documentation, and that the name of the author not be used in

-  advertising or publicity pertaining to distribution of the

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *  \brief Architecture specific definitions relating to specific processor architectures.

- *

- *  \copydetails Group_ArchitectureSpecific

- *

- *  \note Do not include this file directly, rather include the Common.h header file instead to gain this file's

- *        functionality.

- */

-

-/** \ingroup Group_Common

- *  \defgroup Group_ArchitectureSpecific Architecture Specific Definitions

- *  \brief Architecture specific definitions relating to specific processor architectures.

- *

- *  Architecture specific macros, functions and other definitions, which relate to specific architectures. This

- *  definitions may or may not be available in some form on other architectures, and thus should be protected by

- *  preprocessor checks in portable code to prevent compile errors.

- *

- *  @{

- */

-

-#ifndef __LUFA_ARCHSPEC_H__

-#define __LUFA_ARCHSPEC_H__

-

-	/* Preprocessor Checks: */

-		#if !defined(__INCLUDE_FROM_COMMON_H)

-			#error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.

-		#endif

-		

-	/* Enable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			extern "C" {

-		#endif

-

-	/* Public Interface - May be used in end-application: */

-		/* Macros: */

-			#if (ARCH == ARCH_AVR8) || defined(__DOXYGEN__)

-				/** Disables the AVR's JTAG bus in software, until a system reset. This will override the current JTAG

-				 *  status as set by the JTAGEN fuse, disabling JTAG debugging and reverting the JTAG pins back to GPIO

-				 *  mode.

-				 *

-				 *  \note This macro is not available for all architectures.

-				 */

-				#define JTAG_DISABLE()                  MACROS{                                      \

-				                                                __asm__ __volatile__ (               \

-				                                                "in __tmp_reg__,__SREG__" "\n\t"     \

-				                                                "cli" "\n\t"                         \

-				                                                "out %1, %0" "\n\t"                  \

-				                                                "out __SREG__, __tmp_reg__" "\n\t"   \

-				                                                "out %1, %0" "\n\t"                  \

-				                                                :                                    \

-				                                                : "r" (1 << JTD),                    \

-				                                                  "M" (_SFR_IO_ADDR(MCUCR))          \

-				                                                : "r0");                             \

-				                                        }MACROE

-			

-				/** Defines a volatile \c NOP statement which cannot be optimized out by the compiler, and thus can always

-				 *  be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimizer

-				 *  removes/reorders code to the point where break points cannot reliably be set.

-				 *

-				 *  \note This macro is not available for all architectures.

-				 */

-				#define JTAG_DEBUG_POINT()              __asm__ __volatile__ ("nop" ::)

-

-				/** Defines an explicit JTAG break point in the resulting binary via the assembly \c BREAK statement. When

-				 *  a JTAG is used, this causes the program execution to halt when reached until manually resumed.

-				 *

-				 *  \note This macro is not available for all architectures.

-				 */

-				#define JTAG_DEBUG_BREAK()              __asm__ __volatile__ ("break" ::)

-

-				/** Macro for testing condition "x" and breaking via \ref JTAG_DEBUG_BREAK() if the condition is false.

-				 *

-				 *  \note This macro is not available for all architectures.

-				 *

-				 *  \param[in] Condition  Condition that will be evaluated.

-				*/

-				#define JTAG_ASSERT(Condition)          MACROS{ if (!(Condition)) { JTAG_DEBUG_BREAK(); } }MACROE

-

-				/** Macro for testing condition \c "x" and writing debug data to the stdout stream if \c false. The stdout stream

-				 *  must be pre-initialized before this macro is run and linked to an output device, such as the microcontroller's

-				 *  USART peripheral.

-				 *

-				 *  The output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion {Condition} failed."

-				 *

-				 *  \note This macro is not available for all architectures.

-				 *

-				 *  \param[in] Condition  Condition that will be evaluated,

-				 */

-				#define STDOUT_ASSERT(Condition)        MACROS{ if (!(x)) { printf_P(PSTR("%s: Function \"%s\", Line %d: "   \

-				                                                "Assertion \"%s\" failed.\r\n"),     \

-				                                                __FILE__, __func__, __LINE__, #Condition); } }MACROE

-

-				#if !defined(pgm_read_ptr) || defined(__DOXYGEN__)

-					/** Reads a pointer out of PROGMEM space on the AVR8 architecture. This is currently a wrapper for the

-					 *  avr-libc \c pgm_read_ptr() macro with a \c void* cast, so that its value can be assigned directly

-					 *  to a pointer variable or used in pointer arithmetic without further casting in C. In a future

-					 *  avr-libc distribution this will be part of the standard API and will be implemented in a more formal

-					 *  manner.

-					 *

-					 *  \note This macro is not available for all architectures.

-					 *

-					 *  \param[in] Address  Address of the pointer to read.

-					 *

-					 *  \return Pointer retrieved from PROGMEM space.

-					 */

-					#define pgm_read_ptr(Address)        (void*)pgm_read_word(Address)

-				#endif

-			#endif

-			

-	/* Disable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			}

-		#endif

-

-#endif

-

-/** @} */

-

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Architecture specific definitions relating to specific processor architectures.
+ *
+ *  \copydetails Group_ArchitectureSpecific
+ *
+ *  \note Do not include this file directly, rather include the Common.h header file instead to gain this file's
+ *        functionality.
+ */
+
+/** \ingroup Group_Common
+ *  \defgroup Group_ArchitectureSpecific Architecture Specific Definitions
+ *  \brief Architecture specific definitions relating to specific processor architectures.
+ *
+ *  Architecture specific macros, functions and other definitions, which relate to specific architectures. This
+ *  definitions may or may not be available in some form on other architectures, and thus should be protected by
+ *  preprocessor checks in portable code to prevent compile errors.
+ *
+ *  @{
+ */
+
+#ifndef __LUFA_ARCHSPEC_H__
+#define __LUFA_ARCHSPEC_H__
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_COMMON_H)
+			#error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.
+		#endif
+		
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Macros: */
+			#if (ARCH == ARCH_AVR8) || defined(__DOXYGEN__)
+				/** Disables the AVR's JTAG bus in software, until a system reset. This will override the current JTAG
+				 *  status as set by the JTAGEN fuse, disabling JTAG debugging and reverting the JTAG pins back to GPIO
+				 *  mode.
+				 *
+				 *  \note This macro is not available for all architectures.
+				 */
+				#define JTAG_DISABLE()                  MACROS{                                      \
+				                                                __asm__ __volatile__ (               \
+				                                                "in __tmp_reg__,__SREG__" "\n\t"     \
+				                                                "cli" "\n\t"                         \
+				                                                "out %1, %0" "\n\t"                  \
+				                                                "out __SREG__, __tmp_reg__" "\n\t"   \
+				                                                "out %1, %0" "\n\t"                  \
+				                                                :                                    \
+				                                                : "r" (1 << JTD),                    \
+				                                                  "M" (_SFR_IO_ADDR(MCUCR))          \
+				                                                : "r0");                             \
+				                                        }MACROE
+			
+				/** Defines a volatile \c NOP statement which cannot be optimized out by the compiler, and thus can always
+				 *  be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimizer
+				 *  removes/reorders code to the point where break points cannot reliably be set.
+				 *
+				 *  \note This macro is not available for all architectures.
+				 */
+				#define JTAG_DEBUG_POINT()              __asm__ __volatile__ ("nop" ::)
+
+				/** Defines an explicit JTAG break point in the resulting binary via the assembly \c BREAK statement. When
+				 *  a JTAG is used, this causes the program execution to halt when reached until manually resumed.
+				 *
+				 *  \note This macro is not available for all architectures.
+				 */
+				#define JTAG_DEBUG_BREAK()              __asm__ __volatile__ ("break" ::)
+
+				/** Macro for testing condition "x" and breaking via \ref JTAG_DEBUG_BREAK() if the condition is false.
+				 *
+				 *  \note This macro is not available for all architectures.
+				 *
+				 *  \param[in] Condition  Condition that will be evaluated.
+				*/
+				#define JTAG_ASSERT(Condition)          MACROS{ if (!(Condition)) { JTAG_DEBUG_BREAK(); } }MACROE
+
+				/** Macro for testing condition \c "x" and writing debug data to the stdout stream if \c false. The stdout stream
+				 *  must be pre-initialized before this macro is run and linked to an output device, such as the microcontroller's
+				 *  USART peripheral.
+				 *
+				 *  The output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion {Condition} failed."
+				 *
+				 *  \note This macro is not available for all architectures.
+				 *
+				 *  \param[in] Condition  Condition that will be evaluated,
+				 */
+				#define STDOUT_ASSERT(Condition)        MACROS{ if (!(x)) { printf_P(PSTR("%s: Function \"%s\", Line %d: "   \
+				                                                "Assertion \"%s\" failed.\r\n"),     \
+				                                                __FILE__, __func__, __LINE__, #Condition); } }MACROE
+
+				#if !defined(pgm_read_ptr) || defined(__DOXYGEN__)
+					/** Reads a pointer out of PROGMEM space on the AVR8 architecture. This is currently a wrapper for the
+					 *  avr-libc \c pgm_read_ptr() macro with a \c void* cast, so that its value can be assigned directly
+					 *  to a pointer variable or used in pointer arithmetic without further casting in C. In a future
+					 *  avr-libc distribution this will be part of the standard API and will be implemented in a more formal
+					 *  manner.
+					 *
+					 *  \note This macro is not available for all architectures.
+					 *
+					 *  \param[in] Address  Address of the pointer to read.
+					 *
+					 *  \return Pointer retrieved from PROGMEM space.
+					 */
+					#define pgm_read_ptr(Address)        (void*)pgm_read_word(Address)
+				#endif
+			#endif
+			
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+
+#endif
+
+/** @} */
+
diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
index fc99b9210..74233d4d5 100644
--- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
+++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
@@ -1,103 +1,103 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2011.

-              

-  dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com

-*/

-

-/*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, and distribute this software

-  and its documentation for any purpose and without fee is hereby

-  granted, provided that the above copyright notice appear in all

-  copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting

-  documentation, and that the name of the author not be used in

-  advertising or publicity pertaining to distribution of the

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *  \brief Board specific Buttons driver header for the Atmel XMEGA A3BU Xplained.

- *  \copydetails Group_Buttons_A3BU_XPLAINED

- *

- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver

- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.

- */

-

-/** \ingroup Group_Buttons

- *  \defgroup Group_Buttons_A3BU_XPLAINED XMEGA A3BU Xplained.

- *  \brief Board specific Buttons driver header for the Atmel XMEGA A3BU Xplained.

- *

- *  Board specific Buttons driver header for the Atmel XMEGA A3BU Xplained.

- *

- *  @{

- */

- 

-#ifndef __BUTTONS_A3BU_XPLAINED_H__

-#define __BUTTONS_A3BU_XPLAINED_H__

-

-	/* Includes: */

-		#include <avr/io.h>

-

-	/* Enable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			extern "C" {

-		#endif

-

-	/* Preprocessor Checks: */

-		#if !defined(__INCLUDE_FROM_BUTTONS_H)

-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.

-		#endif

-

-	/* Public Interface - May be used in end-application: */

-		/* Macros: */

-			/** Button mask for the first button on the board. */

-			#define BUTTONS_BUTTON1          (1 << 5)

-

-			/** Button mask for the second button on the board. */

-			#define BUTTONS_BUTTON2          (1 << 1)

-

-			/** Button mask for the third button on the board. */

-			#define BUTTONS_BUTTON3          (1 << 2)

-

-		/* Inline Functions: */

-		#if !defined(__DOXYGEN__)

-			static inline void Buttons_Init(void)

-			{

-				PORTE_OUTCLR = BUTTONS_BUTTON1;

-				PORTF_OUTCLR = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);

-				

-				PORTE_PIN5CTRL = PORT_OPC_PULLUP_gc;

-				PORTF_PIN1CTRL = PORT_OPC_PULLUP_gc;

-				PORTF_PIN2CTRL = PORT_OPC_PULLUP_gc;

-			}

-

-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;

-			static inline uint8_t Buttons_GetStatus(void)

-			{

-				return ((~PORTE_IN & BUTTONS_BUTTON1) | (~PORTF_IN & (BUTTONS_BUTTON2 | BUTTONS_BUTTON3)));

-			}

-		#endif

-

-	/* Disable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			}

-		#endif

-

-#endif

-

-/** @} */

-

-

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, and distribute this software
+  and its documentation for any purpose and without fee is hereby
+  granted, provided that the above copyright notice appear in all
+  copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Board specific Buttons driver header for the Atmel XMEGA A3BU Xplained.
+ *  \copydetails Group_Buttons_A3BU_XPLAINED
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
+ *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
+ */
+
+/** \ingroup Group_Buttons
+ *  \defgroup Group_Buttons_A3BU_XPLAINED XMEGA A3BU Xplained.
+ *  \brief Board specific Buttons driver header for the Atmel XMEGA A3BU Xplained.
+ *
+ *  Board specific Buttons driver header for the Atmel XMEGA A3BU Xplained.
+ *
+ *  @{
+ */
+ 
+#ifndef __BUTTONS_A3BU_XPLAINED_H__
+#define __BUTTONS_A3BU_XPLAINED_H__
+
+	/* Includes: */
+		#include <avr/io.h>
+
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_BUTTONS_H)
+			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
+		#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Macros: */
+			/** Button mask for the first button on the board. */
+			#define BUTTONS_BUTTON1          (1 << 5)
+
+			/** Button mask for the second button on the board. */
+			#define BUTTONS_BUTTON2          (1 << 1)
+
+			/** Button mask for the third button on the board. */
+			#define BUTTONS_BUTTON3          (1 << 2)
+
+		/* Inline Functions: */
+		#if !defined(__DOXYGEN__)
+			static inline void Buttons_Init(void)
+			{
+				PORTE_OUTCLR = BUTTONS_BUTTON1;
+				PORTF_OUTCLR = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
+				
+				PORTE_PIN5CTRL = PORT_OPC_PULLUP_gc;
+				PORTF_PIN1CTRL = PORT_OPC_PULLUP_gc;
+				PORTF_PIN2CTRL = PORT_OPC_PULLUP_gc;
+			}
+
+			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
+			static inline uint8_t Buttons_GetStatus(void)
+			{
+				return ((~PORTE_IN & BUTTONS_BUTTON1) | (~PORTF_IN & (BUTTONS_BUTTON2 | BUTTONS_BUTTON3)));
+			}
+		#endif
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+
+#endif
+
+/** @} */
+
+
diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h
index a03878f5c..18c66078e 100644
--- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h
+++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h
@@ -1,220 +1,220 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2011.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting

-  documentation, and that the name of the author not be used in

-  advertising or publicity pertaining to distribution of the

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.

- *  \copydetails Group_Dataflash_A3BU_XPLAINED

- *

- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver

- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.

- */

-

-/** \ingroup Group_Dataflash

- *  \defgroup Group_Dataflash_A3BU_XPLAINED XMEGA A3BU Xplained.

- *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.

- *

- *  Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained board.

- *

- *  @{

- */

-

-#ifndef __DATAFLASH_A3BU_XPLAINED_H__

-#define __DATAFLASH_A3BU_XPLAINED_H__

-

-	/* Includes: */

-		#include "../../../../Common/Common.h"

-		#include "../../../Misc/AT45DB642D.h"

-

-	/* Preprocessor Checks: */

-		#if !defined(__INCLUDE_FROM_DATAFLASH_H)

-			#error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.

-		#endif

-

-	/* Private Interface - For use in library only: */

-	#if !defined(__DOXYGEN__)

-		/* Macros: */

-			#define DATAFLASH_CHIPCS_MASK                (1 << 4)

-			#define DATAFLASH_CHIPCS_PORT                PORTF

-	#endif

-

-	/* Public Interface - May be used in end-application: */

-		/* Macros: */

-			/** Constant indicating the total number of dataflash ICs mounted on the selected board. */

-			#define DATAFLASH_TOTALCHIPS                 1

-

-			/** Mask for no dataflash chip selected. */

-			#define DATAFLASH_NO_CHIP                    DATAFLASH_CHIPCS_MASK

-

-			/** Mask for the first dataflash chip selected. */

-			#define DATAFLASH_CHIP1                      0

-

-			/** Internal main memory page size for the board's dataflash ICs. */

-			#define DATAFLASH_PAGE_SIZE                  1024

-

-			/** Total number of pages inside each of the board's dataflash ICs. */

-			#define DATAFLASH_PAGES                      8192

-

-		/* Inline Functions: */

-			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.

-			 *  The microcontroller's SPI driver MUST be initialized before any of the dataflash commands are used.

-			 */

-			static inline void Dataflash_Init(void)

-			{

-				DATAFLASH_CHIPCS_PORT.DIRSET = DATAFLASH_CHIPCS_MASK;

-				DATAFLASH_CHIPCS_PORT.OUTSET = DATAFLASH_CHIPCS_MASK;

-			}

-

-			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.

-			 *

-			 *  \param[in] Byte of data to send to the dataflash

-			 *

-			 *  \return Last response byte from the dataflash

-			 */

-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;

-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)

-			{

-				// TODO

-				return 0;

-			}

-

-			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.

-			 *

-			 *  \param[in] Byte of data to send to the dataflash

-			 */

-			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;

-			static inline void Dataflash_SendByte(const uint8_t Byte)

-			{

-				// TODO

-			}

-

-			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.

-			 *

-			 *  \return Last response byte from the dataflash

-			 */

-			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;

-			static inline uint8_t Dataflash_ReceiveByte(void)

-			{

-				// TODO

-				return 0;

-			}

-

-			/** Determines the currently selected dataflash chip.

-			 *

-			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected

-			 *  or a DATAFLASH_CHIPn mask (where n is the chip number).

-			 */

-			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;

-			static inline uint8_t Dataflash_GetSelectedChip(void)

-			{

-				return (DATAFLASH_CHIPCS_PORT.OUT & DATAFLASH_CHIPCS_MASK);

-			}

-

-			/** Selects the given dataflash chip.

-			 *

-			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of DATAFLASH_CHIPn mask (where n is

-			 *              the chip number).

-			 */

-			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;

-			static inline void Dataflash_SelectChip(const uint8_t ChipMask)

-			{

-				DATAFLASH_CHIPCS_PORT.OUT = ((DATAFLASH_CHIPCS_PORT.OUT & ~DATAFLASH_CHIPCS_MASK) | ChipMask);

-			}

-

-			/** Deselects the current dataflash chip, so that no dataflash is selected. */

-			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;

-			static inline void Dataflash_DeselectChip(void)

-			{

-				Dataflash_SelectChip(DATAFLASH_NO_CHIP);

-			}

-

-			/** Selects a dataflash IC from the given page number, which should range from 0 to

-			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one

-			 *  dataflash IC, this will select DATAFLASH_CHIP1. If the given page number is outside

-			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs

-			 *  are deselected.

-			 *

-			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from

-			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).

-			 */

-			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress)

-			{

-				Dataflash_DeselectChip();

-

-				if (PageAddress >= (DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS))

-				  return;

-

-				if (PageAddress & 0x01)

-				  Dataflash_SelectChip(DATAFLASH_CHIP2);

-				else

-				  Dataflash_SelectChip(DATAFLASH_CHIP1);

-			}

-

-			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive

-			 *  a new command.

-			 */

-			static inline void Dataflash_ToggleSelectedChipCS(void)

-			{

-				uint8_t SelectedChipMask = Dataflash_GetSelectedChip();

-

-				Dataflash_DeselectChip();

-				Dataflash_SelectChip(SelectedChipMask);

-			}

-

-			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main

-			 *  memory page program or main memory to buffer transfer.

-			 */

-			static inline void Dataflash_WaitWhileBusy(void)

-			{

-				Dataflash_ToggleSelectedChipCS();

-				Dataflash_SendByte(DF_CMD_GETSTATUS);

-				while (!(Dataflash_ReceiveByte() & DF_STATUS_READY));

-				Dataflash_ToggleSelectedChipCS();

-			}

-

-			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with

-			 *  dataflash commands which require a complete 24-bit address.

-			 *

-			 *  \param[in] PageAddress  Page address within the selected dataflash IC

-			 *  \param[in] BufferByte   Address within the dataflash's buffer

-			 */

-			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,

-			                                              const uint16_t BufferByte)

-			{

-				PageAddress >>= 1;

-

-				Dataflash_SendByte(PageAddress >> 5);

-				Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));

-				Dataflash_SendByte(BufferByte);

-			}

-

-#endif

-

-/** @} */

-

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.
+ *  \copydetails Group_Dataflash_A3BU_XPLAINED
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
+ *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
+ */
+
+/** \ingroup Group_Dataflash
+ *  \defgroup Group_Dataflash_A3BU_XPLAINED XMEGA A3BU Xplained.
+ *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.
+ *
+ *  Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained board.
+ *
+ *  @{
+ */
+
+#ifndef __DATAFLASH_A3BU_XPLAINED_H__
+#define __DATAFLASH_A3BU_XPLAINED_H__
+
+	/* Includes: */
+		#include "../../../../Common/Common.h"
+		#include "../../../Misc/AT45DB642D.h"
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
+			#error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.
+		#endif
+
+	/* Private Interface - For use in library only: */
+	#if !defined(__DOXYGEN__)
+		/* Macros: */
+			#define DATAFLASH_CHIPCS_MASK                (1 << 4)
+			#define DATAFLASH_CHIPCS_PORT                PORTF
+	#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Macros: */
+			/** Constant indicating the total number of dataflash ICs mounted on the selected board. */
+			#define DATAFLASH_TOTALCHIPS                 1
+
+			/** Mask for no dataflash chip selected. */
+			#define DATAFLASH_NO_CHIP                    DATAFLASH_CHIPCS_MASK
+
+			/** Mask for the first dataflash chip selected. */
+			#define DATAFLASH_CHIP1                      0
+
+			/** Internal main memory page size for the board's dataflash ICs. */
+			#define DATAFLASH_PAGE_SIZE                  1024
+
+			/** Total number of pages inside each of the board's dataflash ICs. */
+			#define DATAFLASH_PAGES                      8192
+
+		/* Inline Functions: */
+			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
+			 *  The microcontroller's SPI driver MUST be initialized before any of the dataflash commands are used.
+			 */
+			static inline void Dataflash_Init(void)
+			{
+				DATAFLASH_CHIPCS_PORT.DIRSET = DATAFLASH_CHIPCS_MASK;
+				DATAFLASH_CHIPCS_PORT.OUTSET = DATAFLASH_CHIPCS_MASK;
+			}
+
+			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
+			 *
+			 *  \param[in] Byte of data to send to the dataflash
+			 *
+			 *  \return Last response byte from the dataflash
+			 */
+			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
+			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
+			{
+				// TODO
+				return 0;
+			}
+
+			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
+			 *
+			 *  \param[in] Byte of data to send to the dataflash
+			 */
+			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
+			static inline void Dataflash_SendByte(const uint8_t Byte)
+			{
+				// TODO
+			}
+
+			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
+			 *
+			 *  \return Last response byte from the dataflash
+			 */
+			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
+			static inline uint8_t Dataflash_ReceiveByte(void)
+			{
+				// TODO
+				return 0;
+			}
+
+			/** Determines the currently selected dataflash chip.
+			 *
+			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
+			 *  or a DATAFLASH_CHIPn mask (where n is the chip number).
+			 */
+			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
+			static inline uint8_t Dataflash_GetSelectedChip(void)
+			{
+				return (DATAFLASH_CHIPCS_PORT.OUT & DATAFLASH_CHIPCS_MASK);
+			}
+
+			/** Selects the given dataflash chip.
+			 *
+			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of DATAFLASH_CHIPn mask (where n is
+			 *              the chip number).
+			 */
+			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
+			static inline void Dataflash_SelectChip(const uint8_t ChipMask)
+			{
+				DATAFLASH_CHIPCS_PORT.OUT = ((DATAFLASH_CHIPCS_PORT.OUT & ~DATAFLASH_CHIPCS_MASK) | ChipMask);
+			}
+
+			/** Deselects the current dataflash chip, so that no dataflash is selected. */
+			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;
+			static inline void Dataflash_DeselectChip(void)
+			{
+				Dataflash_SelectChip(DATAFLASH_NO_CHIP);
+			}
+
+			/** Selects a dataflash IC from the given page number, which should range from 0 to
+			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one
+			 *  dataflash IC, this will select DATAFLASH_CHIP1. If the given page number is outside
+			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs
+			 *  are deselected.
+			 *
+			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from
+			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
+			 */
+			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress)
+			{
+				Dataflash_DeselectChip();
+
+				if (PageAddress >= (DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS))
+				  return;
+
+				if (PageAddress & 0x01)
+				  Dataflash_SelectChip(DATAFLASH_CHIP2);
+				else
+				  Dataflash_SelectChip(DATAFLASH_CHIP1);
+			}
+
+			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
+			 *  a new command.
+			 */
+			static inline void Dataflash_ToggleSelectedChipCS(void)
+			{
+				uint8_t SelectedChipMask = Dataflash_GetSelectedChip();
+
+				Dataflash_DeselectChip();
+				Dataflash_SelectChip(SelectedChipMask);
+			}
+
+			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main
+			 *  memory page program or main memory to buffer transfer.
+			 */
+			static inline void Dataflash_WaitWhileBusy(void)
+			{
+				Dataflash_ToggleSelectedChipCS();
+				Dataflash_SendByte(DF_CMD_GETSTATUS);
+				while (!(Dataflash_ReceiveByte() & DF_STATUS_READY));
+				Dataflash_ToggleSelectedChipCS();
+			}
+
+			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
+			 *  dataflash commands which require a complete 24-bit address.
+			 *
+			 *  \param[in] PageAddress  Page address within the selected dataflash IC
+			 *  \param[in] BufferByte   Address within the dataflash's buffer
+			 */
+			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
+			                                              const uint16_t BufferByte)
+			{
+				PageAddress >>= 1;
+
+				Dataflash_SendByte(PageAddress >> 5);
+				Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));
+				Dataflash_SendByte(BufferByte);
+			}
+
+#endif
+
+/** @} */
+
diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h
index ad6d9070f..eb37ae4c6 100644
--- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h
+++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h
@@ -1,127 +1,127 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2011.

-              

-  dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com

-*/

-

-/*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, and distribute this software

-  and its documentation for any purpose and without fee is hereby

-  granted, provided that the above copyright notice appear in all

-  copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting

-  documentation, and that the name of the author not be used in

-  advertising or publicity pertaining to distribution of the

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *  \brief Board specific LED driver header for the Atmel XMEGA A3BU Xplained.

- *  \copydetails Group_LEDs_A3BU_XPLAINED

- *

- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver

- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.

- */

-

-/** \ingroup Group_LEDs

- *  \defgroup Group_LEDs_A3BU_XPLAINED XMEGA A3BU Xplained

- *  \brief Board specific LED driver header for the Atmel XMEGA A3BU Xplained.

- *

- *  Board specific LED driver header for the Atmel XMEGA A3BU Xplained.

- *

- *  @{

- */

-

-#ifndef __LEDS_A3BU_XPLAINED_H__

-#define __LEDS_A3BU_XPLAINED_H__

-

-	/* Includes: */

-		#include <avr/io.h>

-

-	/* Enable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			extern "C" {

-		#endif

-

-	/* Preprocessor Checks: */

-		#if !defined(__INCLUDE_FROM_LEDS_H)

-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.

-		#endif

-

-	/* Public Interface - May be used in end-application: */

-		/* Macros: */

-			/** LED mask for the first LED on the board. */

-			#define LEDS_LED1        (1 << 0)

-

-			/** LED mask for the second LED on the board. */

-			#define LEDS_LED2        (1 << 1)

-

-			/** LED mask for all the LEDs on the board. */

-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)

-

-			/** LED mask for none of the board LEDs. */

-			#define LEDS_NO_LEDS     0

-

-		/* Inline Functions: */

-		#if !defined(__DOXYGEN__)

-			static inline void LEDs_Init(void)

-			{

-				PORTR_DIRSET = LEDS_ALL_LEDS;

-				PORTR_OUTSET = LEDS_ALL_LEDS;

-			}

-

-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)

-			{

-				PORTR_OUTCLR = LEDMask;

-			}

-

-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)

-			{

-				PORTR_OUTSET = LEDMask;

-			}

-

-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)

-			{

-				PORTR_OUT = (PORTR.OUT & ~LEDS_ALL_LEDS) | LEDMask;

-			}

-

-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask)

-			{

-				PORTR_OUT = (PORTR.OUT & ~LEDMask) | ActiveMask;

-			}

-

-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)

-			{

-				PORTR_OUTTGL = LEDMask;

-			}

-

-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;

-			static inline uint8_t LEDs_GetLEDs(void)

-			{

-				return (PORTR_OUT & LEDS_ALL_LEDS);

-			}

-		#endif

-

-	/* Disable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			}

-		#endif

-

-#endif

-

-/** @} */

-

-

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, and distribute this software
+  and its documentation for any purpose and without fee is hereby
+  granted, provided that the above copyright notice appear in all
+  copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Board specific LED driver header for the Atmel XMEGA A3BU Xplained.
+ *  \copydetails Group_LEDs_A3BU_XPLAINED
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
+ *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
+ */
+
+/** \ingroup Group_LEDs
+ *  \defgroup Group_LEDs_A3BU_XPLAINED XMEGA A3BU Xplained
+ *  \brief Board specific LED driver header for the Atmel XMEGA A3BU Xplained.
+ *
+ *  Board specific LED driver header for the Atmel XMEGA A3BU Xplained.
+ *
+ *  @{
+ */
+
+#ifndef __LEDS_A3BU_XPLAINED_H__
+#define __LEDS_A3BU_XPLAINED_H__
+
+	/* Includes: */
+		#include <avr/io.h>
+
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_LEDS_H)
+			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
+		#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Macros: */
+			/** LED mask for the first LED on the board. */
+			#define LEDS_LED1        (1 << 0)
+
+			/** LED mask for the second LED on the board. */
+			#define LEDS_LED2        (1 << 1)
+
+			/** LED mask for all the LEDs on the board. */
+			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
+
+			/** LED mask for none of the board LEDs. */
+			#define LEDS_NO_LEDS     0
+
+		/* Inline Functions: */
+		#if !defined(__DOXYGEN__)
+			static inline void LEDs_Init(void)
+			{
+				PORTR_DIRSET = LEDS_ALL_LEDS;
+				PORTR_OUTSET = LEDS_ALL_LEDS;
+			}
+
+			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
+			{
+				PORTR_OUTCLR = LEDMask;
+			}
+
+			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
+			{
+				PORTR_OUTSET = LEDMask;
+			}
+
+			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
+			{
+				PORTR_OUT = (PORTR.OUT & ~LEDS_ALL_LEDS) | LEDMask;
+			}
+
+			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask)
+			{
+				PORTR_OUT = (PORTR.OUT & ~LEDMask) | ActiveMask;
+			}
+
+			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
+			{
+				PORTR_OUTTGL = LEDMask;
+			}
+
+			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
+			static inline uint8_t LEDs_GetLEDs(void)
+			{
+				return (PORTR_OUT & LEDS_ALL_LEDS);
+			}
+		#endif
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+
+#endif
+
+/** @} */
+
+
diff --git a/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h b/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h
index 688b91684..91e86c38f 100644
--- a/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h
+++ b/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h
@@ -1,248 +1,248 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2011.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, distribute, and sell this

-  software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting

-  documentation, and that the name of the author not be used in

-  advertising or publicity pertaining to distribution of the

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *  \brief SPI Peripheral Driver (XMEGA)

- *

- *  On-chip SPI driver for the XMEGA microcontrollers.

- *

- *  \note This file should not be included directly. It is automatically included as needed by the SPI driver

- *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.

- */

-

-/** \ingroup Group_SPI

- *  \defgroup Group_SPI_XMEGA SPI Peripheral Driver (XMEGA)

- *

- *  \section Sec_ModDescription Module Description

- *  Driver for the hardware SPI port(s) available on XMEGA AVR microcontroller models. This

- *  module provides an easy to use driver for the setup and transfer of data over the AVR's

- *  SPI ports.

- *

- *  \note This file should not be included directly. It is automatically included as needed by the SPI driver

- *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.

- *

- *  \code

- *      // Initialize the SPI driver before first use

- *      SPI_Init(&SPIC,

- *               SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING |

- *               SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);

- *

- *      // Send several bytes, ignoring the returned data

- *      SPI_SendByte(&SPIC, 0x01);

- *      SPI_SendByte(&SPIC, 0x02);

- *      SPI_SendByte(&SPIC, 0x03);

- *

- *      // Receive several bytes, sending a dummy 0x00 byte each time

- *      uint8_t Byte1 = SPI_ReceiveByte(&SPIC);

- *      uint8_t Byte2 = SPI_ReceiveByte(&SPIC);

- *      uint8_t Byte3 = SPI_ReceiveByte(&SPIC);

- *

- *      // Send a byte, and store the received byte from the same transaction

- *      uint8_t ResponseByte = SPI_TransferByte(&SPIC, 0xDC);

- *  \endcode

- * 

- *  @{

- */

-

-#ifndef __SPI_XMEGA_H__

-#define __SPI_XMEGA_H__

-

-	/* Includes: */

-		#include "../../../Common/Common.h"

-

-	/* Enable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			extern "C" {

-		#endif

-

-	/* Preprocessor Checks: */

-		#if !defined(__INCLUDE_FROM_SPI_H)

-			#error Do not include this file directly. Include LUFA/Drivers/Peripheral/SPI.h instead.

-		#endif

-

-	/* Private Interface - For use in library only: */

-	#if !defined(__DOXYGEN__)

-		/* Macros: */

-			#define SPI_USE_DOUBLESPEED            SPI_CLK2X_bm

-	#endif

-

-	/* Public Interface - May be used in end-application: */

-		/* Macros: */

-			/** \name SPI Prescaler Configuration Masks */

-			//@{

-			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 2. */

-			#define SPI_SPEED_FCPU_DIV_2           SPI_USE_DOUBLESPEED

-

-			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 4. */

-			#define SPI_SPEED_FCPU_DIV_4           0

-

-			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 8. */

-			#define SPI_SPEED_FCPU_DIV_8           (SPI_USE_DOUBLESPEED | (1 << SPI_PRESCALER_gp))

-

-			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 16. */

-			#define SPI_SPEED_FCPU_DIV_16          (1 << SPI_PRESCALER_gp)

-

-			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 32. */

-			#define SPI_SPEED_FCPU_DIV_32          (SPI_USE_DOUBLESPEED | (2 << SPI_PRESCALER_gp))

-

-			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 64. */

-			#define SPI_SPEED_FCPU_DIV_64          (2 << SPI_PRESCALER_gp)

-

-			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 128. */

-			#define SPI_SPEED_FCPU_DIV_128         (3 << SPI_PRESCALER_gp)

-			//@}

-

-			/** \name SPI SCK Polarity Configuration Masks */

-			//@{

-			/** SPI clock polarity mask for \c SPI_Init(). Indicates that the SCK should lead on the rising edge. */

-			#define SPI_SCK_LEAD_RISING            0

-

-			/** SPI clock polarity mask for \c SPI_Init(). Indicates that the SCK should lead on the falling edge. */

-			#define SPI_SCK_LEAD_FALLING           SPI_MODE1_bm

-			//@}

-

-			/** \name SPI Sample Edge Configuration Masks */

-			//@{

-			/** SPI data sample mode mask for \c SPI_Init(). Indicates that the data should sampled on the leading edge. */

-			#define SPI_SAMPLE_LEADING             0

-

-			/** SPI data sample mode mask for \c SPI_Init(). Indicates that the data should be sampled on the trailing edge. */

-			#define SPI_SAMPLE_TRAILING            SPI_MODE0_bm

-			//@}

-			

-			/** \name SPI Data Ordering Configuration Masks */

-			//@{

-			/** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out MSB first. */

-			#define SPI_ORDER_MSB_FIRST            0

-

-			/** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out LSB first. */

-			#define SPI_ORDER_LSB_FIRST            SPI_DORD_bm

-			//@}

-			

-			/** \name SPI Mode Configuration Masks */

-			//@{

-			/** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */

-			#define SPI_MODE_SLAVE                 0

-

-			/** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */

-			#define SPI_MODE_MASTER                SPI_MASTER_bm

-			//@}

-			

-		/* Inline Functions: */

-			/** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other

-			 *  SPI routines.

-			 *

-			 *  \param[in, out] SPI         Pointer to the base of the SPI peripheral within the device.

-			 *  \param[in]      SPIOptions  SPI Options, a mask consisting of one of each of the \c SPI_SPEED_*,

-			 *                         \c SPI_SCK_*, \c SPI_SAMPLE_*, \c SPI_ORDER_* and \c SPI_MODE_* masks.

-			 */

-			static inline void SPI_Init(const SPI_t* SPI,

-			                            const uint8_t SPIOptions)

-			{

-				SPI->CTRL = (SPIOptions | SPI_ENABLE_bm);

-			}

-

-			/** Turns off the SPI driver, disabling and returning used hardware to their default configuration.

-			 *

-			 *  \param[in, out] SPI Pointer to the base of the SPI peripheral within the device.

-			 */

-			static inline void SPI_Disable(const SPI_t* SPI)

-			{

-				SPI->CTRL &= ~SPI_ENABLE_bm;

-			}

-			

-			/** Retrieves the currently selected SPI mode, once the SPI interface has been configured.

-			 *

-			 *  \param[in, out] SPI         Pointer to the base of the SPI peripheral within the device.

-			 *

-			 *  \return \ref SPI_MODE_MASTER if the interface is currently in SPI Master mode, \ref SPI_MODE_SLAVE otherwise

-			 */

-			static inline uint8_t SPI_GetCurrentMode(const SPI_t* SPI) ATTR_ALWAYS_INLINE;

-			static inline uint8_t SPI_GetCurrentMode(const SPI_t* SPI)

-			{

-				return (SPI->CTRL & SPI_MASTER_bm);

-			}

-

-			/** Sends and receives a byte through the SPI interface, blocking until the transfer is complete.

-			 *

-			 *  \param[in, out] SPI   Pointer to the base of the SPI peripheral within the device.

-			 *  \param[in]      Byte  Byte to send through the SPI interface.

-			 *

-			 *  \return Response byte from the attached SPI device.

-			 */

-			static inline uint8_t SPI_TransferByte(const SPI_t* SPI,

-			                                       const uint8_t Byte) ATTR_ALWAYS_INLINE;

-			static inline uint8_t SPI_TransferByte(const SPI_t* SPI,

-			                                       const uint8_t Byte)

-			{

-				SPI->DATA = Byte;

-				while (!(SPI->STATUS & SPI_IF_bm));

-				return SPI->DATA;

-			}

-

-			/** Sends a byte through the SPI interface, blocking until the transfer is complete. The response

-			 *  byte sent to from the attached SPI device is ignored.

-			 *

-			 *  \param[in, out] SPI   Pointer to the base of the SPI peripheral within the device.

-			 *  \param[in]      Byte  Byte to send through the SPI interface.

-			 */

-			static inline void SPI_SendByte(const SPI_t* SPI,

-			                                const uint8_t Byte) ATTR_ALWAYS_INLINE;

-			static inline void SPI_SendByte(const SPI_t* SPI,

-			                                const uint8_t Byte)

-			{

-				SPI->DATA = Byte;

-				while (!(SPI->STATUS & SPI_IF_bm));

-			}

-

-			/** Sends a dummy byte through the SPI interface, blocking until the transfer is complete. The response

-			 *  byte from the attached SPI device is returned.

-			 *

-			 *  \param[in, out] SPI  Pointer to the base of the SPI peripheral within the device.

-			 *

-			 *  \return The response byte from the attached SPI device.

-			 */

-			static inline uint8_t SPI_ReceiveByte(const SPI_t* SPI) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;

-			static inline uint8_t SPI_ReceiveByte(const SPI_t* SPI)

-			{

-				SPI->DATA = 0;

-				while (!(SPI->STATUS & SPI_IF_bm));

-				return SPI->DATA;

-			}

-

-	/* Disable C linkage for C++ Compilers: */

-		#if defined(__cplusplus)

-			}

-		#endif

-

-#endif

-

-/** @} */

-

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief SPI Peripheral Driver (XMEGA)
+ *
+ *  On-chip SPI driver for the XMEGA microcontrollers.
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the SPI driver
+ *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.
+ */
+
+/** \ingroup Group_SPI
+ *  \defgroup Group_SPI_XMEGA SPI Peripheral Driver (XMEGA)
+ *
+ *  \section Sec_ModDescription Module Description
+ *  Driver for the hardware SPI port(s) available on XMEGA AVR microcontroller models. This
+ *  module provides an easy to use driver for the setup and transfer of data over the AVR's
+ *  SPI ports.
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the SPI driver
+ *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.
+ *
+ *  \code
+ *      // Initialize the SPI driver before first use
+ *      SPI_Init(&SPIC,
+ *               SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING |
+ *               SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
+ *
+ *      // Send several bytes, ignoring the returned data
+ *      SPI_SendByte(&SPIC, 0x01);
+ *      SPI_SendByte(&SPIC, 0x02);
+ *      SPI_SendByte(&SPIC, 0x03);
+ *
+ *      // Receive several bytes, sending a dummy 0x00 byte each time
+ *      uint8_t Byte1 = SPI_ReceiveByte(&SPIC);
+ *      uint8_t Byte2 = SPI_ReceiveByte(&SPIC);
+ *      uint8_t Byte3 = SPI_ReceiveByte(&SPIC);
+ *
+ *      // Send a byte, and store the received byte from the same transaction
+ *      uint8_t ResponseByte = SPI_TransferByte(&SPIC, 0xDC);
+ *  \endcode
+ * 
+ *  @{
+ */
+
+#ifndef __SPI_XMEGA_H__
+#define __SPI_XMEGA_H__
+
+	/* Includes: */
+		#include "../../../Common/Common.h"
+
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_SPI_H)
+			#error Do not include this file directly. Include LUFA/Drivers/Peripheral/SPI.h instead.
+		#endif
+
+	/* Private Interface - For use in library only: */
+	#if !defined(__DOXYGEN__)
+		/* Macros: */
+			#define SPI_USE_DOUBLESPEED            SPI_CLK2X_bm
+	#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Macros: */
+			/** \name SPI Prescaler Configuration Masks */
+			//@{
+			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 2. */
+			#define SPI_SPEED_FCPU_DIV_2           SPI_USE_DOUBLESPEED
+
+			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 4. */
+			#define SPI_SPEED_FCPU_DIV_4           0
+
+			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 8. */
+			#define SPI_SPEED_FCPU_DIV_8           (SPI_USE_DOUBLESPEED | (1 << SPI_PRESCALER_gp))
+
+			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 16. */
+			#define SPI_SPEED_FCPU_DIV_16          (1 << SPI_PRESCALER_gp)
+
+			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 32. */
+			#define SPI_SPEED_FCPU_DIV_32          (SPI_USE_DOUBLESPEED | (2 << SPI_PRESCALER_gp))
+
+			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 64. */
+			#define SPI_SPEED_FCPU_DIV_64          (2 << SPI_PRESCALER_gp)
+
+			/** SPI prescaler mask for \c SPI_Init(). Divides the system clock by a factor of 128. */
+			#define SPI_SPEED_FCPU_DIV_128         (3 << SPI_PRESCALER_gp)
+			//@}
+
+			/** \name SPI SCK Polarity Configuration Masks */
+			//@{
+			/** SPI clock polarity mask for \c SPI_Init(). Indicates that the SCK should lead on the rising edge. */
+			#define SPI_SCK_LEAD_RISING            0
+
+			/** SPI clock polarity mask for \c SPI_Init(). Indicates that the SCK should lead on the falling edge. */
+			#define SPI_SCK_LEAD_FALLING           SPI_MODE1_bm
+			//@}
+
+			/** \name SPI Sample Edge Configuration Masks */
+			//@{
+			/** SPI data sample mode mask for \c SPI_Init(). Indicates that the data should sampled on the leading edge. */
+			#define SPI_SAMPLE_LEADING             0
+
+			/** SPI data sample mode mask for \c SPI_Init(). Indicates that the data should be sampled on the trailing edge. */
+			#define SPI_SAMPLE_TRAILING            SPI_MODE0_bm
+			//@}
+			
+			/** \name SPI Data Ordering Configuration Masks */
+			//@{
+			/** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out MSB first. */
+			#define SPI_ORDER_MSB_FIRST            0
+
+			/** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out LSB first. */
+			#define SPI_ORDER_LSB_FIRST            SPI_DORD_bm
+			//@}
+			
+			/** \name SPI Mode Configuration Masks */
+			//@{
+			/** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */
+			#define SPI_MODE_SLAVE                 0
+
+			/** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */
+			#define SPI_MODE_MASTER                SPI_MASTER_bm
+			//@}
+			
+		/* Inline Functions: */
+			/** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other
+			 *  SPI routines.
+			 *
+			 *  \param[in, out] SPI         Pointer to the base of the SPI peripheral within the device.
+			 *  \param[in]      SPIOptions  SPI Options, a mask consisting of one of each of the \c SPI_SPEED_*,
+			 *                         \c SPI_SCK_*, \c SPI_SAMPLE_*, \c SPI_ORDER_* and \c SPI_MODE_* masks.
+			 */
+			static inline void SPI_Init(const SPI_t* SPI,
+			                            const uint8_t SPIOptions)
+			{
+				SPI->CTRL = (SPIOptions | SPI_ENABLE_bm);
+			}
+
+			/** Turns off the SPI driver, disabling and returning used hardware to their default configuration.
+			 *
+			 *  \param[in, out] SPI Pointer to the base of the SPI peripheral within the device.
+			 */
+			static inline void SPI_Disable(const SPI_t* SPI)
+			{
+				SPI->CTRL &= ~SPI_ENABLE_bm;
+			}
+			
+			/** Retrieves the currently selected SPI mode, once the SPI interface has been configured.
+			 *
+			 *  \param[in, out] SPI         Pointer to the base of the SPI peripheral within the device.
+			 *
+			 *  \return \ref SPI_MODE_MASTER if the interface is currently in SPI Master mode, \ref SPI_MODE_SLAVE otherwise
+			 */
+			static inline uint8_t SPI_GetCurrentMode(const SPI_t* SPI) ATTR_ALWAYS_INLINE;
+			static inline uint8_t SPI_GetCurrentMode(const SPI_t* SPI)
+			{
+				return (SPI->CTRL & SPI_MASTER_bm);
+			}
+
+			/** Sends and receives a byte through the SPI interface, blocking until the transfer is complete.
+			 *
+			 *  \param[in, out] SPI   Pointer to the base of the SPI peripheral within the device.
+			 *  \param[in]      Byte  Byte to send through the SPI interface.
+			 *
+			 *  \return Response byte from the attached SPI device.
+			 */
+			static inline uint8_t SPI_TransferByte(const SPI_t* SPI,
+			                                       const uint8_t Byte) ATTR_ALWAYS_INLINE;
+			static inline uint8_t SPI_TransferByte(const SPI_t* SPI,
+			                                       const uint8_t Byte)
+			{
+				SPI->DATA = Byte;
+				while (!(SPI->STATUS & SPI_IF_bm));
+				return SPI->DATA;
+			}
+
+			/** Sends a byte through the SPI interface, blocking until the transfer is complete. The response
+			 *  byte sent to from the attached SPI device is ignored.
+			 *
+			 *  \param[in, out] SPI   Pointer to the base of the SPI peripheral within the device.
+			 *  \param[in]      Byte  Byte to send through the SPI interface.
+			 */
+			static inline void SPI_SendByte(const SPI_t* SPI,
+			                                const uint8_t Byte) ATTR_ALWAYS_INLINE;
+			static inline void SPI_SendByte(const SPI_t* SPI,
+			                                const uint8_t Byte)
+			{
+				SPI->DATA = Byte;
+				while (!(SPI->STATUS & SPI_IF_bm));
+			}
+
+			/** Sends a dummy byte through the SPI interface, blocking until the transfer is complete. The response
+			 *  byte from the attached SPI device is returned.
+			 *
+			 *  \param[in, out] SPI  Pointer to the base of the SPI peripheral within the device.
+			 *
+			 *  \return The response byte from the attached SPI device.
+			 */
+			static inline uint8_t SPI_ReceiveByte(const SPI_t* SPI) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
+			static inline uint8_t SPI_ReceiveByte(const SPI_t* SPI)
+			{
+				SPI->DATA = 0;
+				while (!(SPI->STATUS & SPI_IF_bm));
+				return SPI->DATA;
+			}
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+
+#endif
+
+/** @} */
+