Add XMEGA SPI peripheral driver.

LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h

@@ -76,18 +76,18 @@
 		#if !defined(__DOXYGEN__)
 			static inline void Buttons_Init(void)
 			{
-				PORTE.OUTCLR = BUTTONS_BUTTON1;
-				PORTF.OUTCLR = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
+				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;
+				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)));
+				return ((~PORTE_IN & BUTTONS_BUTTON1) | (~PORTF_IN & (BUTTONS_BUTTON2 | BUTTONS_BUTTON3)));
 			}
 		#endif
 

LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h

@@ -79,39 +79,39 @@
 		#if !defined(__DOXYGEN__)
 			static inline void LEDs_Init(void)
 			{
-				PORTR.DIRSET = LEDS_ALL_LEDS;
-				PORTR.OUTSET = LEDS_ALL_LEDS;
+				PORTR_DIRSET = LEDS_ALL_LEDS;
+				PORTR_OUTSET = LEDS_ALL_LEDS;
 			}
 
 			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
 			{
-				PORTR.OUTCLR = LEDMask;
+				PORTR_OUTCLR = LEDMask;
 			}
 
 			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
 			{
-				PORTR.OUTSET = LEDMask;
+				PORTR_OUTSET = LEDMask;
 			}
 
 			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
 			{
-				PORTR.OUT = (PORTR.OUT & ~LEDS_ALL_LEDS) | 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;
+				PORTR_OUT = (PORTR.OUT & ~LEDMask) | ActiveMask;
 			}
 
 			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
 			{
-				PORTR.OUTTGL = 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);
+				return (PORTR_OUT & LEDS_ALL_LEDS);
 			}
 		#endif
 

LUFA/Drivers/Peripheral/SPI.h

@@ -66,6 +66,8 @@
 	/* Includes: */
 		#if (ARCH == ARCH_AVR8)
 			#include "AVR8/SPI_AVR8.h"
+		#elif (ARCH == ARCH_XMEGA)
+			#include "XMEGA/SPI_XMEGA.h"			
 		#else
 			#error The SPI peripheral driver is not currently available for your selected architecture.
 		#endif

LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h

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