Revert changes made for the partial port to the AVR32 architecture.

4 files changed, 802 insertions, 0 deletions

diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
new file mode 100644
index 000000000..8b1b47df2
--- /dev/null
+++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
@@ -0,0 +1,322 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2010.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2010  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

+ *

+ *  ADC driver for the AT90USB1287, AT90USB1286, AT90USB647, AT90USB646, ATMEGA16U4 and ATMEGA32U4 AVRs.

+ *

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

+ *        dispatch header located in LUFA/Drivers/Peripheral/ADC.h.

+ */

+

+/** \ingroup Group_ADC

+ *  @defgroup Group_ADC_AVRU4U6U7 Series U4, U6 and U7 Model ADC Driver

+ *

+ *  ADC driver for the AT90USB1287, AT90USB1286, AT90USB647, AT90USB646, ATMEGA16U4 and ATMEGA32U4 AVRs.

+ *

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

+ *        dispatch header located in LUFA/Drivers/Peripheral/ADC.h.

+ *

+ *  @{

+ */

+ 

+#ifndef __ADC_AVRU4U6U7_H__

+#define __ADC_AVRU4U6U7_H__

+

+	/* Includes: */

+		#include "../../../Common/Common.h"

+		

+		#include <avr/io.h>

+		#include <stdbool.h>

+		

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

+		#if defined(__cplusplus)

+			extern "C" {

+		#endif

+

+	/* Preprocessor Checks: */

+		#if !defined(__INCLUDE_FROM_ADC_H)

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

+		#endif

+

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

+		/* Macros: */			

+			/** Reference mask, for using the voltage present at the AVR's AREF pin for the ADC reference. */

+			#define  ADC_REFERENCE_AREF              0

+

+			/** Reference mask, for using the voltage present at the AVR's AVCC pin for the ADC reference. */

+			#define  ADC_REFERENCE_AVCC              (1 << REFS0)

+

+			/** Reference mask, for using the internally generated 2.56V reference voltage as the ADC reference. */

+			#define  ADC_REFERENCE_INT2560MV         ((1 << REFS1)| (1 << REFS0))

+			

+			/** Left-adjusts the 10-bit ADC result, so that the upper 8 bits of the value returned by the

+			 *  ADC_GetResult() macro contain the 8 most significant bits of the result. */

+			#define  ADC_LEFT_ADJUSTED               (1 << ADLAR)

+

+			/** Right-adjusts the 10-bit ADC result, so that the lower 8 bits of the value returned by the

+			 *  ADC_GetResult() macro contain the 8 least significant bits of the result. */

+			#define  ADC_RIGHT_ADJUSTED              (0 << ADLAR)

+			

+			/** Sets the ADC mode to free running, so that conversions take place continuously as fast as the ADC

+			 *  is capable of at the given input clock speed. */

+			#define  ADC_FREE_RUNNING                (1 << ADATE)

+

+			/** Sets the ADC mode to single conversion, so that only a single conversion will take place before

+			 *  the ADC returns to idle. */

+			#define  ADC_SINGLE_CONVERSION           (0 << ADATE)

+			

+			/** Sets the ADC input clock to prescale by a factor of 2 the AVR's system clock. */

+			#define  ADC_PRESCALE_2                  (1 << ADPS0)

+

+			/** Sets the ADC input clock to prescale by a factor of 4 the AVR's system clock. */

+			#define  ADC_PRESCALE_4                  (1 << ADPS1)

+

+			/** Sets the ADC input clock to prescale by a factor of 8 the AVR's system clock. */

+			#define  ADC_PRESCALE_8                  ((1 << ADPS0) | (1 << ADPS1))

+

+			/** Sets the ADC input clock to prescale by a factor of 16 the AVR's system clock. */

+			#define  ADC_PRESCALE_16                 (1 << ADPS2)

+

+			/** Sets the ADC input clock to prescale by a factor of 32 the AVR's system clock. */

+			#define  ADC_PRESCALE_32                 ((1 << ADPS2) | (1 << ADPS0))

+

+			/** Sets the ADC input clock to prescale by a factor of 64 the AVR's system clock. */

+			#define  ADC_PRESCALE_64                 ((1 << ADPS2) | (1 << ADPS1))

+

+			/** Sets the ADC input clock to prescale by a factor of 128 the AVR's system clock. */

+			#define  ADC_PRESCALE_128                ((1 << ADPS2) | (1 << ADPS1) | (1 << ADPS0))

+			

+			//@{

+			/** MUX mask define for the ADC0 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */

+			#define  ADC_CHANNEL0                    0x00

+

+			/** MUX mask define for the ADC1 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */

+			#define  ADC_CHANNEL1                    0x01

+

+			#if !(defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))

+				/** MUX mask define for the ADC2 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.

+				 *

+				 *  \note Note available on all AVR models.

+				 */

+				#define  ADC_CHANNEL2                    0x02

+

+				/** MUX mask define for the ADC3 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.

+				 *

+				 *  \note Note available on all AVR models.

+				 */

+				#define  ADC_CHANNEL3                    0x03

+			#endif

+

+			/** MUX mask define for the ADC4 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */

+			#define  ADC_CHANNEL4                    0x04

+

+			/** MUX mask define for the ADC5 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */

+			#define  ADC_CHANNEL5                    0x05

+

+			/** MUX mask define for the ADC6 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */

+			#define  ADC_CHANNEL6                    0x06

+

+			/** MUX mask define for the ADC7 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */

+			#define  ADC_CHANNEL7                    0x07

+

+			/** MUX mask define for the internal 1.1V bandgap channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */

+			#define  ADC_1100MV_BANDGAP              0x1E

+			

+			#if (defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))

+				/** MUX mask define for the ADC8 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.

+				 *

+				 *  \note Note available on all AVR models.

+				 */

+				#define  ADC_CHANNEL8                0x20

+

+				/** MUX mask define for the ADC9 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.

+				 *

+				 *  \note Note available on all AVR models.

+				 */

+				#define  ADC_CHANNEL9                0x21

+

+				/** MUX mask define for the ADC10 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.

+				 *

+				 *  \note Note available on all AVR models.

+				 */

+				#define  ADC_CHANNEL10               0x22

+

+				/** MUX mask define for the ADC11 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.

+				 *

+				 *  \note Note available on all AVR models.

+				 */

+				#define  ADC_CHANNEL11               0x23

+

+				/** MUX mask define for the ADC12 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.

+				 *

+				 *  \note Note available on all AVR models.

+				 */

+				#define  ADC_CHANNEL12               0x24

+

+				/** MUX mask define for the ADC13 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading.

+				 *

+				 *  \note Note available on all AVR models.

+				 */

+				#define  ADC_CHANNEL13               0x25

+

+				/** MUX mask define for the internal temperature sensor channel of the ADC. See \ref ADC_StartReading and

+				 *  \ref ADC_GetChannelReading.

+				 *

+				 *  \note Note available on all AVR models.

+				 */

+				#define  ADC_INT_TEMP_SENS           0x27			

+			#endif

+			//@}

+		

+		/* Pseudo-Function Macros: */

+			#if defined(__DOXYGEN__)

+				/** Initializes the ADC, ready for conversions. This must be called before any other ADC operations.

+				 *  The "mode" parameter should be a mask comprised of a conversion mode (free running or single) and

+				 *  prescaler masks.

+				 *

+				 *  \param[in] Mode  Mask of ADC settings, including adjustment, prescale, mode and reference

+				 */

+				static inline void ADC_Init(uint8_t Mode);

+

+				/** Turns off the ADC. If this is called, any further ADC operations will require a call to

+				 *  \ref ADC_Init() before the ADC can be used again.

+				 */

+				static inline void ADC_ShutDown(void);

+				

+				/** Indicates if the ADC is currently enabled.

+				 *

+				 *  \return Boolean true if the ADC subsystem is currently enabled, false otherwise.

+				 */

+				static inline bool ADC_GetStatus(void);

+				

+				/** Indicates if the current ADC conversion is completed, or still in progress.

+				 *

+				 *  \return Boolean false if the reading is still taking place, or true if the conversion is

+				 *          complete and ready to be read out with \ref ADC_GetResult()

+				 */

+				static inline bool ADC_IsReadingComplete(void);

+				

+				/** Retrieves the conversion value of the last completed ADC conversion.

+				 *

+				 *  \return The result of the last ADC conversion

+				 */

+				static inline uint16_t ADC_GetResult(void);

+			#else

+				#define  ADC_Init(mode)          MACROS{ ADCSRA = ((1 << ADEN) | mode);         }MACROE

+

+				#define  ADC_ShutDown()          MACROS{ ADCSRA = 0;                            }MACROE

+				

+				#define  ADC_GetStatus()               ((ADCSRA & (1 << ADEN)) ? true : false)

+

+				#define  ADC_IsReadingComplete()        (ADCSRA & (1 << ADSC))

+				

+				#define  ADC_GetResult()                 ADC			

+			#endif

+			

+		/* Inline Functions: */

+			/** Configures the given ADC channel, ready for ADC conversions. This function sets the

+			 *  associated port pin as an input and disables the digital portion of the I/O to reduce

+			 *  power consumption.

+			 *

+			 *  \note This must only be called for ADC channels with are connected to a physical port

+			 *        pin of the AVR, denoted by its special alternative function ADCx.

+			 *

+			 *  \note The channel number must be specified as an integer, and NOT a ADC_CHANNELx mask.

+			 *

+			 *  \param[in] Channel  ADC channel number to set up for conversions

+			 */

+			static inline void ADC_SetupChannel(const uint8_t Channel)

+			{

+				#if (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || \

+					 defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \

+					 defined(__AVR_ATmega32U6__))				

+				DDRF  &= ~(1 << Channel);

+				DIDR0 |=  (1 << Channel);

+				#elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))

+				if (Channel < 8)

+				{

+					DDRF  &= ~(1 << Channel);

+					DIDR0 |=  (1 << Channel);

+				}

+				else if (Channel == 8)

+				{

+					DDRD  &= ~(1 << 4);

+					DIDR2 |=  (1 << 0);

+				}

+				else if (Channel < 11)

+				{

+					DDRD  &= ~(1 << (Channel - 3));

+					DIDR2 |=  (1 << (Channel - 8));

+				}

+				else

+				{

+					DDRB  &= ~(1 << (Channel - 7));

+					DIDR2 |=  (1 << (Channel - 8));

+				}

+				#endif

+			}

+			

+			/** Starts the reading of the given channel, but does not wait until the conversion has completed.

+			 *  Once executed, the conversion status can be determined via the \ref ADC_IsReadingComplete() macro and

+			 *  the result read via the \ref ADC_GetResult() macro.

+			 *

+			 *  \param[in] MUXMask  Mask comprising of an ADC channel mask, reference mask and adjustment mask

+			 */

+			static inline void ADC_StartReading(const uint8_t MUXMask)

+			{

+				ADMUX = MUXMask;

+			

+				ADCSRA |= (1 << ADSC);

+			}

+

+			/** Performs a complete single reading from channel, including a polling spin-loop to wait for the

+			 *  conversion to complete, and the returning of the converted value.

+			 *

+			 *  \param[in] MUXMask  Mask comprising of an ADC channel mask, reference mask and adjustment mask

+			 */

+			static inline uint16_t ADC_GetChannelReading(const uint8_t MUXMask) ATTR_WARN_UNUSED_RESULT;

+			static inline uint16_t ADC_GetChannelReading(const uint8_t MUXMask)

+			{

+				ADC_StartReading(MUXMask);

+	

+				while (!(ADC_IsReadingComplete()));

+	

+				return ADC_GetResult();

+			}

+

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

+		#if defined(__cplusplus)

+			}

+		#endif

+		

+#endif

+

+/** @} */

diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/SPI.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/SPI.h
new file mode 100644
index 000000000..3440cc9f1
--- /dev/null
+++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/SPI.h
@@ -0,0 +1,189 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2010.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2010  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

+ *

+ *  SPI driver for the 8-bit AVRs.

+ *

+ *  \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_AVR8 8-Bit AVR SPI Driver

+ *

+ *  SPI driver for the 8-bit AVRs.

+ *

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

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

+ *

+ *  @{

+ */

+

+#ifndef __SPI_AVR8_H__

+#define __SPI_AVR8_H__

+

+	/* Includes: */

+		#include <stdbool.h>

+

+	/* Preprocessor Checks: */

+		#if !defined(__INCLUDE_FROM_SPI_H)

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

+		#endif

+

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

+		#if defined(__cplusplus)

+			extern "C" {

+		#endif

+

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

+	#if !defined(__DOXYGEN__)

+		/* Macros: */

+			#define SPI_USE_DOUBLESPEED            (1 << SPE)

+	#endif

+	

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

+		/* Macros: */

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

+			#define SPI_SPEED_FCPU_DIV_2           SPI_USE_DOUBLESPEED

+

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

+			#define SPI_SPEED_FCPU_DIV_4           0

+

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

+			#define SPI_SPEED_FCPU_DIV_8           (SPI_USE_DOUBLESPEED | (1 << SPR0))

+

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

+			#define SPI_SPEED_FCPU_DIV_16          (1 << SPR0)

+

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

+			#define SPI_SPEED_FCPU_DIV_32          (SPI_USE_DOUBLESPEED | (1 << SPR1))

+

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

+			#define SPI_SPEED_FCPU_DIV_64          (SPI_USE_DOUBLESPEED | (1 << SPR1) | (1 << SPR0))

+

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

+			#define SPI_SPEED_FCPU_DIV_128         ((1 << SPR1) | (1 << SPR0))

+			

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

+			#define SPI_SCK_LEAD_RISING            (0 << CPOL)

+

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

+			#define SPI_SCK_LEAD_FALLING           (1 << CPOL)

+

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

+			#define SPI_SAMPLE_LEADING             (0 << CPHA)

+

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

+			#define SPI_SAMPLE_TRAILING            (1 << CPHA)

+			

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

+			#define SPI_MODE_SLAVE                 (0 << MSTR)

+

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

+			#define SPI_MODE_MASTER                (1 << MSTR)

+

+		/* Inline Functions: */

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

+			 *  SPI routines.

+			 *

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

+			 *                         SPI_SCK_*, SPI_SAMPLE_* and SPI_MODE_* masks

+			 */

+			static inline void SPI_Init(const uint8_t SPIOptions)

+			{

+				DDRB  |= ((1 << 1) | (1 << 2));

+				PORTB |= ((1 << 0) | (1 << 3));

+				

+				SPCR   = ((1 << SPE) | SPIOptions);

+				

+				if (SPIOptions & SPI_USE_DOUBLESPEED)

+				  SPSR |= (1 << SPI2X);

+				else

+				  SPSR &= ~(1 << SPI2X);

+			}

+			

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

+			static inline void SPI_ShutDown(void)

+			{

+				DDRB  &= ~((1 << 1) | (1 << 2));

+				PORTB &= ~((1 << 0) | (1 << 3));

+				

+				SPCR   = 0;

+				SPSR   = 0;

+			}

+			

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

+			 *

+			 *  \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 uint8_t Byte) ATTR_ALWAYS_INLINE;

+			static inline uint8_t SPI_TransferByte(const uint8_t Byte)

+			{

+				SPDR = Byte;

+				while (!(SPSR & (1 << SPIF)));

+				return SPDR;

+			}

+

+			/** 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] Byte Byte to send through the SPI interface

+			 */

+			static inline void SPI_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;

+			static inline void SPI_SendByte(const uint8_t Byte)

+			{

+				SPDR = Byte;

+				while (!(SPSR & (1 << SPIF)));

+			}

+

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

+			 *  byte from the attached SPI device is returned.

+			 *

+			 *  \return The response byte from the attached SPI device

+			 */

+			static inline uint8_t SPI_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;

+			static inline uint8_t SPI_ReceiveByte(void)

+			{

+				SPDR = 0x00;

+				while (!(SPSR & (1 << SPIF)));

+				return SPDR;

+			}

+

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

+		#if defined(__cplusplus)

+			}

+		#endif

+		

+#endif

+

+/** @} */

diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/Serial.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/Serial.h
new file mode 100644
index 000000000..0421dea73
--- /dev/null
+++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/Serial.h
@@ -0,0 +1,145 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2010.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2010  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

+ *

+ *  ADC driver for the 8-bit AVRs.

+ *

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

+ *        dispatch header located in LUFA/Drivers/Peripheral/Serial.h.

+ */

+ 

+/** \ingroup Group_Serial

+ *  @defgroup Group_Serial_AVR8 8-Bit AVR Serial Driver

+ *

+ *  Serial driver for the 8-bit AVRs.

+ *

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

+ *        dispatch header located in LUFA/Drivers/Peripheral/USART.h.

+ *

+ *  @{

+ */

+ 

+#ifndef __SERIAL_AVR8_H__

+#define __SERIAL_AVR8_H__

+

+	/* Includes: */

+		#include <avr/io.h>

+		#include <avr/pgmspace.h>

+		#include <stdbool.h>

+		

+	/* Preprocessor Checks: */

+		#if !defined(__INCLUDE_FROM_SERIAL_H)

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

+		#endif

+

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

+		/* Macros: */

+			/** Macro for calculating the baud value from a given baud rate when the U2X (double speed) bit is

+			 *  not set.

+			 */

+			#define SERIAL_UBBRVAL(baud)    ((((F_CPU / 16) + (baud / 2)) / (baud)) - 1)

+

+			/** Macro for calculating the baud value from a given baud rate when the U2X (double speed) bit is

+			 *  set.

+			 */

+			#define SERIAL_2X_UBBRVAL(baud) ((((F_CPU / 8) + (baud / 2)) / (baud)) - 1)

+

+		/* Pseudo-Function Macros: */

+			#if defined(__DOXYGEN__)

+				/** Indicates whether a character has been received through the USART.

+				 *

+				 *  \return Boolean true if a character has been received, false otherwise

+				 */

+				static inline bool Serial_IsCharReceived(void);

+			#else

+				#define Serial_IsCharReceived() ((UCSR1A & (1 << RXC1)) ? true : false)

+			#endif

+

+		/* Inline Functions: */

+			/** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to

+			 *  standard 8-bit, no parity, 1 stop bit settings suitable for most applications.

+			 *

+			 *  \param[in] BaudRate     Serial baud rate, in bits per second

+			 *  \param[in] DoubleSpeed  Enables double speed mode when set, halving the sample time to double the baud rate

+			 */

+			static inline void Serial_Init(const uint32_t BaudRate, const bool DoubleSpeed)

+			{

+				UCSR1A = (DoubleSpeed ? (1 << U2X1) : 0);

+				UCSR1B = ((1 << TXEN1)  | (1 << RXEN1));

+				UCSR1C = ((1 << UCSZ11) | (1 << UCSZ10));

+				

+				DDRD  |= (1 << 3);	

+				PORTD |= (1 << 2);

+				

+				UBRR1  = (DoubleSpeed ? SERIAL_2X_UBBRVAL(BaudRate) : SERIAL_UBBRVAL(BaudRate));

+			}

+

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

+			static inline void Serial_ShutDown(void)

+			{

+				UCSR1A = 0;

+				UCSR1B = 0;

+				UCSR1C = 0;

+				

+				DDRD  &= ~(1 << 3);	

+				PORTD &= ~(1 << 2);

+				

+				UBRR1  = 0;

+			}

+			

+			/** Transmits a given byte through the USART.

+			 *

+			 *  \param[in] DataByte  Byte to transmit through the USART

+			 */

+			static inline void Serial_TxByte(const char DataByte)

+			{

+				while (!(UCSR1A & (1 << UDRE1)));

+				UDR1 = DataByte;

+			}

+

+			/** Receives a byte from the USART.

+			 *

+			 *  \return Byte received from the USART

+			 */

+			static inline uint8_t Serial_RxByte(void)

+			{

+				while (!(UCSR1A & (1 << RXC1)));

+				return UDR1; 

+			}

+

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

+		#if defined(__cplusplus)

+			}

+		#endif

+		

+#endif

+

+/** @} */

diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h
new file mode 100644
index 000000000..13db86e69
--- /dev/null
+++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h
@@ -0,0 +1,146 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2010.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2010  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

+ *

+ *  Master mode TWI driver for the AT90USB1287, AT90USB1286, AT90USB647, AT90USB646, ATMEGA16U4 and ATMEGA32U4 AVRs.

+ *

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

+ *        dispatch header located in LUFA/Drivers/Peripheral/TWI.h.

+ */

+

+/** \ingroup Group_TWI

+ *  @defgroup Group_TWI_AVRU4U6U7 Series U4, U6 and U7 Model TWI Driver

+ *

+ *  Master mode TWI driver for the AT90USB1287, AT90USB1286, AT90USB647, AT90USB646, ATMEGA16U4 and ATMEGA32U4 AVRs.

+ *

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

+ *        dispatch header located in LUFA/Drivers/Peripheral/TWI.h.

+ *

+ *  @{

+ */

+

+#ifndef __TWI_AVRU4U6U7_H__

+#define __TWI_AVRU4U6U7_H__

+

+	/* Includes: */

+		#include "../../../Common/Common.h"

+		

+		#include <avr/io.h>

+		#include <stdbool.h>

+		#include <util/twi.h>

+		

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

+		#if defined(__cplusplus)

+			extern "C" {

+		#endif

+

+	/* Preprocessor Checks: */

+		#if !defined(__INCLUDE_FROM_TWI_H)

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

+		#endif

+

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

+		/* Pseudo-Function Macros: */

+			#if defined(__DOXYGEN__)

+				/** Initializes the TWI hardware into master mode, ready for data transmission and reception. This must be

+				 *  before any other TWI operations.

+				 */

+				static inline void TWI_Init(void);

+				

+				/** Turns off the TWI driver hardware. If this is called, any further TWI operations will require a call to

+				 *  \ref TWI_Init() before the TWI can be used again.

+				 */				

+				static inline void TWI_ShutDown(void);

+			#else

+				#define TWI_Init()        MACROS{ TWCR |=  (1 << TWEN); }MACROE

+				#define TWI_ShutDown()    MACROS{ TWCR &= ~(1 << TWEN); }MACROE

+			#endif

+

+		/* Inline Functions: */

+			/** Sends a TWI STOP onto the TWI bus, terminating communication with the currently addressed device. */

+			static inline void TWI_StopTransmission(void)

+			{

+				TWCR = ((1 << TWINT) | (1 << TWSTO) | (1 << TWEN));

+			}

+

+			/** Sends a byte to the currently addressed device on the TWI bus.

+			 *

+			 *  \param[in] Byte  Byte to send to the currently addressed device

+			 *

+			 *  \return Boolean true if the recipient ACKed the byte, false otherwise

+			 */

+			static inline bool TWI_SendByte(uint8_t Byte)

+			{

+				TWDR = Byte;

+				TWCR = ((1 << TWINT) | (1 << TWEN));	

+				while (!(TWCR & (1 << TWINT)));

+

+				return ((TWSR & TW_STATUS_MASK) == TW_MT_DATA_ACK);

+			}

+

+			/** Receives a byte from the currently addressed device on the TWI bus.

+			 *

+			 *  \param[in] Byte  Location where the read byte is to be stored

+			 *  \param[in] LastByte  Indicates if the byte should be ACKed if false, NAKed if true

+			 *

+			 *  \return Boolean true if the byte reception sucessfully completed, false otherwise

+			 */

+			static inline bool TWI_ReceiveByte(uint8_t* Byte, bool LastByte)

+			{

+				uint8_t TWCRMask = ((1 << TWINT) | (1 << TWEN));

+				

+				if (!(LastByte))

+				  TWCRMask |= (1 << TWEA);

+

+				TWCR = TWCRMask;

+				while (!(TWCR & (1 << TWINT)));

+				*Byte = TWDR;

+

+				return ((TWSR & TW_STATUS_MASK) == TW_MR_DATA_ACK);

+			}

+

+		/* Function Prototypes: */

+			/** Begins a master mode TWI bus communication with the given slave device address.

+			 *

+			 *  \param[in] SlaveAddress  Address of the slave TWI device to communicate with

+			 *

+			 *  \return Boolean true if the device is ready for data, false otherwise

+			 */

+			bool TWI_StartTransmission(uint8_t SlaveAddress);

+

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

+		#if defined(__cplusplus)

+			}

+		#endif

+

+#endif

+

+/** @} */