Added board hardware driver support for the EVK1104 board.

Fix inverted LEDs_GetLEDs() result for the EVK1100 and EVK1101 boards.

9 files changed, 262 insertions, 2 deletions

diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h
index b67abdade..970a8c938 100644
--- a/LUFA/Common/BoardTypes.h
+++ b/LUFA/Common/BoardTypes.h
@@ -152,6 +152,9 @@
 
 			/** Selects the Atmel EVK1100 specific board drivers, including the Button, Joystick and LED drivers. */
 			#define BOARD_EVK1100       29
+
+			/** Selects the Atmel EVK1104 specific board drivers, including the Button and LED drivers. */
+			#define BOARD_EVK1104       30
 			
 			#if !defined(__DOXYGEN__)
 				#define BOARD_          BOARD_NONE
diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index a64b4ec8d..75f444d29 100644
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -129,6 +129,8 @@
 			#include "AVR8/TUL/Buttons.h"
 		#elif (BOARD == BOARD_EVK1100)
 			#include "UC3/EVK1100/Buttons.h"
+		#elif (BOARD == BOARD_EVK1104)
+			#include "UC3/EVK1104/Buttons.h"
 		#else
 			#include "Board/Buttons.h"
 		#endif
diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 4a2e2f51a..ff5d2ff7f 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -169,6 +169,8 @@
 		#include "AVR8/TUL/LEDs.h"	
 	#elif (BOARD == BOARD_EVK1100)
 		#include "UC3/EVK1100/LEDs.h"
+	#elif (BOARD == BOARD_EVK1104)
+		#include "UC3/EVK1104/LEDs.h"
 	#else
 		#include "Board/LEDs.h"
 	#endif
diff --git a/LUFA/Drivers/Board/UC3/EVK1100/LEDs.h b/LUFA/Drivers/Board/UC3/EVK1100/LEDs.h
index 0c0861883..aac407a28 100644
--- a/LUFA/Drivers/Board/UC3/EVK1100/LEDs.h
+++ b/LUFA/Drivers/Board/UC3/EVK1100/LEDs.h
@@ -139,7 +139,7 @@
 			static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;

 			static inline uint32_t LEDs_GetLEDs(void)

 			{

-				return (AVR32_GPIO.port[LEDS_PORT].ovr & LEDS_ALL_LEDS);

+				return (~AVR32_GPIO.port[LEDS_PORT].ovr & LEDS_ALL_LEDS);

 			}

 		#endif

 

diff --git a/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h b/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h
index 83415e01b..44720da86 100644
--- a/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h
+++ b/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h
@@ -126,7 +126,7 @@
 			static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;

 			static inline uint32_t LEDs_GetLEDs(void)

 			{

-				return (AVR32_GPIO.port[LEDS_PORT].ovr & LEDS_ALL_LEDS);

+				return (~AVR32_GPIO.port[LEDS_PORT].ovr & LEDS_ALL_LEDS);

 			}

 		#endif

 

diff --git a/LUFA/Drivers/Board/UC3/EVK1104/Buttons.h b/LUFA/Drivers/Board/UC3/EVK1104/Buttons.h
new file mode 100644
index 000000000..35f2bfadf
--- /dev/null
+++ b/LUFA/Drivers/Board/UC3/EVK1104/Buttons.h
@@ -0,0 +1,97 @@
+/*

+             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 EVK1104.

+ *  \copydetails Group_Buttons_EVK1104

+ *

+ *  \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_EVK1104 EVK1104

+ *  \brief Board specific Buttons driver header for the Atmel EVK1104.

+ *

+ *  Board specific Buttons driver header for the Atmel EVK1104.

+ *

+ *  @{

+ */

+ 

+#ifndef __BUTTONS_EVK1104_H__

+#define __BUTTONS_EVK1104_H__

+

+	/* Includes: */

+		#include "../../../../Common/Common.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

+		

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

+	#if !defined(__DOXYGEN__)

+		/* Macros: */

+			#define BUTTONS_PORT          1

+	#endif

+

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

+		/* Macros: */

+			/** Mask of the first button on the board */

+			#define BUTTONS_BUTTON1       (1UL << 10)

+

+		/* Inline Functions: */

+		#if !defined(__DOXYGEN__)

+			static inline void Buttons_Init(void)

+			{

+				AVR32_GPIO.port[BUTTONS_PORT].gpers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);

+				AVR32_GPIO.port[BUTTONS_PORT].puers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);

+			}

+

+			static inline uint32_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;

+			static inline uint32_t Buttons_GetStatus(void)

+			{

+				return (~(AVR32_GPIO.port[JOY_MOVE_PORT].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2)));

+			}

+		#endif

+

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

+		#if defined(__cplusplus)

+			}

+		#endif

+			

+#endif

+

+/** @} */

diff --git a/LUFA/Drivers/Board/UC3/EVK1104/LEDs.h b/LUFA/Drivers/Board/UC3/EVK1104/LEDs.h
new file mode 100644
index 000000000..963bd1b9c
--- /dev/null
+++ b/LUFA/Drivers/Board/UC3/EVK1104/LEDs.h
@@ -0,0 +1,154 @@
+/*

+             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 EVK1104.

+ *  \copydetails Group_LEDs_EVK1104

+ *

+ *  \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_EVK1104 EVK1104

+ *  \brief Board specific LED driver header for the Atmel EVK1104.

+ *

+ *  Board specific LED driver header for the Atmel EVK1104.

+ *

+ *  @{

+ */

+

+#ifndef __LEDS_EVK1104_H__

+#define __LEDS_EVK1104_H__

+

+	/* Includes: */

+		#include "../../../../Common/Common.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

+

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

+	#if !defined(__DOXYGEN__)

+		/* Macros: */

+			#define LEDS_LEDMASK2    (1UL << 3)

+			#define LEDS_LEDMASK3   ((1UL << 9) | (1UL << 6) | (1UL << 5))

+	#endif

+

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

+		/* Macros: */

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

+			#define LEDS_LED1        (1UL << 3)

+

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

+			#define LEDS_LED2        (1UL << 5)

+

+			/** LED mask for the third LED on the board. */

+			#define LEDS_LED3        (1UL << 9)

+

+			/** LED mask for the fourth LED on the board. */

+			#define LEDS_LED4        (1UL << 6)

+

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

+			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)

+

+			/** LED mask for the none of the board LEDs */

+			#define LEDS_NO_LEDS     0

+

+		/* Inline Functions: */

+		#if !defined(__DOXYGEN__)

+			static inline void LEDs_Init(void)

+			{

+				AVR32_GPIO.port[2].gpers = LEDS_LEDMASK2;

+				AVR32_GPIO.port[2].oders = LEDS_LEDMASK2;

+				AVR32_GPIO.port[2].ovrs  = LEDS_LEDMASK2;

+

+				AVR32_GPIO.port[3].gpers = LEDS_LEDMASK3;

+				AVR32_GPIO.port[3].oders = LEDS_LEDMASK3;

+				AVR32_GPIO.port[3].ovrs  = LEDS_LEDMASK3;

+			}

+			

+			static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask)

+			{

+				AVR32_GPIO.port[2].ovrc  = (LEDMask & LEDS_LEDMASK2);

+				AVR32_GPIO.port[3].ovrc  = (LEDMask & LEDS_LEDMASK3);

+			}

+

+			static inline void LEDs_TurnOffLEDs(const uint32_t LEDMask)

+			{

+				AVR32_GPIO.port[2].ovrs  = (LEDMask & LEDS_LEDMASK2);

+				AVR32_GPIO.port[3].ovrs  = (LEDMask & LEDS_LEDMASK3);

+			}

+

+			static inline void LEDs_SetAllLEDs(const uint32_t LEDMask)

+			{

+				AVR32_GPIO.port[2].ovrs  = LEDS_LEDMASK2;

+				AVR32_GPIO.port[2].ovrc  = (LEDMask & LEDS_LEDMASK2);

+

+				AVR32_GPIO.port[3].ovrs  = LEDS_LEDMASK3;

+				AVR32_GPIO.port[3].ovrc  = (LEDMask & LEDS_LEDMASK3);

+			}

+			

+			static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask)

+			{

+				AVR32_GPIO.port[2].ovrs  = (LEDMask    & LEDS_LEDMASK2);

+				AVR32_GPIO.port[2].ovrc  = (ActiveMask & LEDS_LEDMASK2);

+

+				AVR32_GPIO.port[3].ovrs  = (LEDMask    & LEDS_LEDMASK3);

+				AVR32_GPIO.port[3].ovrc  = (ActiveMask & LEDS_LEDMASK3);

+			}

+

+			static inline void LEDs_ToggleLEDs(const uint32_t LEDMask)

+			{

+				AVR32_GPIO.port[2].ovrt  = (LEDMask & LEDS_LEDMASK2);

+				AVR32_GPIO.port[3].ovrt  = (LEDMask & LEDS_LEDMASK3);

+			}

+			

+			static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;

+			static inline uint32_t LEDs_GetLEDs(void)

+			{

+				return ((~AVR32_GPIO.port[2].ovr & LEDS_LEDMASK2) | (~AVR32_GPIO.port[3].ovr & LEDS_LEDMASK3));

+			}

+		#endif

+

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

+		#if defined(__cplusplus)

+			}

+		#endif

+		

+#endif

+

+/** @} */

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 7b64fab31..619c67716 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -21,6 +21,7 @@
   *   - Added new Host mode Audio Class driver
   *   - Added new SPI_GetCurrentMode() function to the SPI peripheral driver
   *   - Added board hardware driver support for the EVK1100 board
+  *   - Added board hardware driver support for the EVK1104 board
   *  - Library Applications:
   *   - Added RNDIS device mode to the Webserver project
   *   - Added new incomplete AndroidAccessoryHost Host LowLevel demo
diff --git a/LUFA/ManPages/DeviceSupport.txt b/LUFA/ManPages/DeviceSupport.txt
index 0e800f87c..d8ac7ad26 100644
--- a/LUFA/ManPages/DeviceSupport.txt
+++ b/LUFA/ManPages/DeviceSupport.txt
@@ -88,6 +88,7 @@
  *  Currently supported Atmel UC3 boards (see \ref Group_BoardTypes):
  *   - EVK1100
  *   - EVK1101
+ *   - EVK1104
  *
  *  Currently supported third-party boards (see \ref Group_BoardTypes for makefile BOARD constant names):
  *   - Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers)