Add support for the Atmel XMEGA A3BU Xplained board.

More XMEGA USB core fixes.

8 files changed, 251 insertions, 6 deletions

diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h
index 970a8c938..7a141ac71 100644
--- a/LUFA/Common/BoardTypes.h
+++ b/LUFA/Common/BoardTypes.h
@@ -156,6 +156,9 @@
 			/** Selects the Atmel EVK1104 specific board drivers, including the Button and LED drivers. */
 			#define BOARD_EVK1104       30
 			
+			/** Selects the Atmel XMEGA A3BU Xplained specific board drivers, including the Button and LED drivers. */
+			#define BOARD_A3BU_XPLAINED 31
+
 			#if !defined(__DOXYGEN__)
 				#define BOARD_          BOARD_NONE
 
diff --git a/LUFA/DoxygenPages/DeviceSupport.txt b/LUFA/DoxygenPages/DeviceSupport.txt
index b3af29b22..d9029a408 100644
--- a/LUFA/DoxygenPages/DeviceSupport.txt
+++ b/LUFA/DoxygenPages/DeviceSupport.txt
@@ -347,7 +347,7 @@
  *
  *  \section Sec_XMEGASupport_Boards Supported Atmel Boards
  *  Currently supported Atmel XMEGA boards (see \ref Group_BoardTypes):
- *   - None
+ *   - XMEGA A3BU Xplained
  *
  *  \section Sec_XMEGASupport_ThirdParty Supported Third Party Models
  *  Currently supported third-party boards (see \ref Group_BoardTypes for makefile \c BOARD constant names):
diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index 8d19a719f..ba6be381f 100644
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -131,6 +131,8 @@
 			#include "UC3/EVK1100/Buttons.h"
 		#elif (BOARD == BOARD_EVK1104)
 			#include "UC3/EVK1104/Buttons.h"
+		#elif (BOARD == BOARD_A3BU_XPLAINED)
+			#include "XMEGA/A3BU_XPLAINED/Buttons.h"
 		#else
 			#include "Board/Buttons.h"
 		#endif
diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 1e23d7421..5ac361a72 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -171,6 +171,8 @@
 			#include "UC3/EVK1100/LEDs.h"
 		#elif (BOARD == BOARD_EVK1104)
 			#include "UC3/EVK1104/LEDs.h"
+		#elif (BOARD == BOARD_A3BU_XPLAINED)
+			#include "XMEGA/A3BU_XPLAINED/LEDs.h"			
 		#else
 			#include "Board/LEDs.h"
 		#endif
diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
new file mode 100644
index 000000000..e38546598
--- /dev/null
+++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
@@ -0,0 +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

+

+/** @} */

+

+

diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h
new file mode 100644
index 000000000..24a007f3d
--- /dev/null
+++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h
@@ -0,0 +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

+

+/** @} */

+

+

diff --git a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c
index 604427fca..ead993ebb 100644
--- a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c
+++ b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c
@@ -107,8 +107,16 @@ uint8_t Endpoint_WaitUntilReady(void)
 
 	for (;;)
 	{
-		if (Endpoint_IsOUTReceived())
-		  return ENDPOINT_READYWAIT_NoError;
+		if (Endpoint_GetEndpointDirection() == ENDPOINT_DIR_IN)
+		{
+			if (Endpoint_IsINReady())
+			  return ENDPOINT_READYWAIT_NoError;
+		}
+		else
+		{
+			if (Endpoint_IsOUTReceived())
+			  return ENDPOINT_READYWAIT_NoError;
+		}
 		
 		uint8_t USB_DeviceState_LCL = USB_DeviceState;
 
diff --git a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
index 2ba135619..62398762c 100644
--- a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
+++ b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
@@ -305,7 +305,7 @@
 				}
 				
 				if (Type == EP_TYPE_CONTROL)
-				  Endpoint_ConfigureEndpoint_PRV(Number, Direction ^ ENDPOINT_DIR_IN, EPConfigMask, Size);
+				  Endpoint_ConfigureEndpoint_PRV(Number, (Direction ^ ENDPOINT_DIR_IN), EPConfigMask, Size);
 				  
 				return Endpoint_ConfigureEndpoint_PRV(Number, Direction, EPConfigMask, Size);
 			}
@@ -367,7 +367,7 @@
 			 */
 			static inline void Endpoint_AbortPendingIN(void)
 			{
-				// TODO
+				USB_Endpoint_SelectedHandle->STATUS |= USB_EP_BUSNACK0_bm;
 			}
 
 			/** Determines if the currently selected endpoint may be read from (if data is waiting in the endpoint
@@ -581,7 +581,7 @@
 			static inline uint8_t Endpoint_GetEndpointDirection(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
 			static inline uint8_t Endpoint_GetEndpointDirection(void)
 			{
-				return ((USB_Endpoint_SelectedEndpoint & ENDPOINT_DIR_IN) ? true : false);
+				return (USB_Endpoint_SelectedEndpoint & ENDPOINT_DIR_IN);
 			}
 
 			/** Sets the direction of the currently selected endpoint.