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

3 files changed, 450 insertions, 450 deletions

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
+
+/** @} */
+
+