Added board hardware driver support for the UDIP development board.

10 files changed, 266 insertions, 8 deletions

diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h
index 57fc12216..bd66e4d8d 100644
--- a/LUFA/Common/BoardTypes.h
+++ b/LUFA/Common/BoardTypes.h
@@ -109,6 +109,9 @@
 
 			/** Selects the Olimex AVR-USB-162 specific board drivers, including the Button and LEDs drivers. */
 			#define BOARD_OLIMEX162     15
+
+			/** Selects the UDIP specific board drivers, including the Button and LEDs drivers. */
+			#define BOARD_UDIP          16
 			
 			#if !defined(__DOXYGEN__)
 				#define BOARD_          BOARD_NONE
diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index 7706ac619..d6104ce00 100644
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -99,6 +99,8 @@
 		#include "OLIMEX162/Buttons.h"
 	#elif (BOARD == BOARD_USBFOO)
 		#include "USBFOO/Buttons.h"
+	#elif (BOARD == BOARD_UDIP)
+		#include "UDIP/Buttons.h"
 	#elif (BOARD == BOARD_USER)
 		#include "Board/Buttons.h"
 	#else
diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 923566c36..da2d010e4 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -119,6 +119,8 @@
 		#include "OLIMEX162/LEDs.h"
 	#elif (BOARD == BOARD_USBFOO)
 		#include "USBFOO/LEDs.h"
+	#elif (BOARD == BOARD_UDIP)
+		#include "UDIP/LEDs.h"		
 	#elif (BOARD == BOARD_USER)
 		#include "Board/LEDs.h"
 	#endif
diff --git a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
index 6abd0e3a3..df4f52492 100644
--- a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
+++ b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
@@ -78,22 +78,22 @@
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1             (1 << 7)
+			#define LEDS_LED1        (1 << 7)
 
 			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2             (1 << 5)
+			#define LEDS_LED2        (1 << 5)
 
 			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3             ((1 << 6) >> LEDS_PORTE_MASK_SHIFT)
+			#define LEDS_LED3        ((1 << 6) >> LEDS_PORTE_MASK_SHIFT)
 
 			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4             ((1 << 7) >> LEDS_PORTE_MASK_SHIFT)
+			#define LEDS_LED4        ((1 << 7) >> LEDS_PORTE_MASK_SHIFT)
 
 			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS         (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
+			#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
+			#define LEDS_NO_LEDS     0
 			
 		/* Inline Functions: */
 		#if !defined(__DOXYGEN__)
diff --git a/LUFA/Drivers/Board/UDIP/Buttons.h b/LUFA/Drivers/Board/UDIP/Buttons.h
new file mode 100644
index 000000000..7615fe6d7
--- /dev/null
+++ b/LUFA/Drivers/Board/UDIP/Buttons.h
@@ -0,0 +1,97 @@
+/*

+             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

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

+ *

+ *  Board specific Buttons driver header for the Benito (http://dorkbotpdx.org/wiki/benito).

+ *

+ *  \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_UDIP UDIP

+ *

+ *  Board specific Buttons driver header for the UDIP (http://linnix.com/udip/).

+ *

+ *  \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.

+ *

+ *  @{

+ */

+

+#ifndef __BUTTONS_UDIP_H__

+#define __BUTTONS_UDIP_H__

+

+	/* Includes: */

+		#include <avr/io.h>

+		#include <stdbool.h>

+

+		#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

+		

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

+		/* Macros: */

+			/** Button mask for the first button on the board. */

+			#define BUTTONS_BUTTON1      (1 << 7)

+	

+		/* Inline Functions: */

+		#if !defined(__DOXYGEN__)

+			static inline void Buttons_Init(void)

+			{

+				DDRD  &= ~BUTTONS_BUTTON1;

+				PORTD |=  BUTTONS_BUTTON1;

+			}

+

+			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;

+			static inline uint8_t Buttons_GetStatus(void)

+			{

+				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);

+			}

+		#endif

+

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

+		#if defined(__cplusplus)

+			}

+		#endif

+			

+#endif

+

+/** @} */

diff --git a/LUFA/Drivers/Board/UDIP/LEDs.h b/LUFA/Drivers/Board/UDIP/LEDs.h
new file mode 100644
index 000000000..e7bdfe289
--- /dev/null
+++ b/LUFA/Drivers/Board/UDIP/LEDs.h
@@ -0,0 +1,153 @@
+/*

+             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

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

+ *

+ *  Board specific LED driver header for the UDIP (http://linnix.com/udip/).

+ *

+ *  \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_UDIP UDIP

+ *

+ *  Board specific LED driver header for the UDIP (http://linnix.com/udip/).

+ *

+ *  \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.

+ *

+ *  @{

+ */

+

+#ifndef __LEDS_UDIP_H__

+#define __LEDS_UDIP_H__

+

+	/* Includes: */

+		#include <avr/io.h>

+

+		#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_PORTB_LEDS       (LEDS_LED1 | LEDS_LED2)

+			#define LEDS_PORTD_LEDS       (LEDS_LED3 | LEDS_LED4)

+			

+			#define LEDS_PORTD_MASK_SHIFT 1

+	#endif

+

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

+		/* Macros: */

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

+			#define LEDS_LED1        (1 << 6)

+

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

+			#define LEDS_LED2        (1 << 5)

+

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

+			#define LEDS_LED3        ((1 << 5) >> LEDS_PORTD_MASK_SHIFT)

+

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

+			#define LEDS_LED4        ((1 << 4) >> LEDS_PORTD_MASK_SHIFT)

+

+			/** 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)

+			{

+				DDRB |= LEDS_PORTB_LEDS;

+				DDRD |= (LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT);

+			}

+			

+			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)

+			{

+				PORTB |= (LEDMask & LEDS_PORTB_LEDS);

+				PORTD |= ((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);

+			}

+

+			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)

+			{

+				PORTB &= ~(LEDMask & LEDS_PORTB_LEDS);

+				PORTD &= ~((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);

+			}

+

+			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)

+			{

+				PORTB = (PORTB & ~LEDS_PORTB_LEDS) | (LEDMask & LEDS_PORTB_LEDS);

+				PORTD = (PORTD & ~(LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT)) |

+				        ((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);

+			}

+			

+			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,

+			                                   const uint8_t ActiveMask)

+			{

+				PORTB = (PORTB & ~(LEDMask & LEDS_PORTB_LEDS)) | (ActiveMask & LEDS_PORTB_LEDS);

+				PORTD = (PORTD & ~((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT)) |

+				        ((ActiveMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);

+			}

+			

+			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)

+			{

+				PORTB ^= (LEDMask & LEDS_PORTB_LEDS);

+				PORTD ^= ((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);

+			}

+			

+			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;

+			static inline uint8_t LEDs_GetLEDs(void)

+			{

+				return ((PORTB & LEDS_PORTB_LEDS) | ((PORTD & LEDS_PORTD_LEDS) >> LEDS_PORTD_MASK_SHIFT));

+			}

+		#endif

+

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

+		#if defined(__cplusplus)

+			}

+		#endif

+		

+#endif

+

+/** @} */

diff --git a/LUFA/Drivers/Board/USBFOO/LEDS.h b/LUFA/Drivers/Board/USBFOO/LEDS.h
index 15518bc97..31a4ccbde 100644
--- a/LUFA/Drivers/Board/USBFOO/LEDS.h
+++ b/LUFA/Drivers/Board/USBFOO/LEDS.h
@@ -29,7 +29,7 @@
 */

 

 /** \file

- *  \brief Board specific LED driver header for the USBFOO Development Board.

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

  *

  *  Board specific LED driver header for the USBFOO Development Board (http://shop.kernelconcepts.de/product_info.php?products_id=102).

  *

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index beacd79ad..5aaf9fa1f 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -20,6 +20,7 @@
   *    Print Host Class driver
   *  - Added class specific descriptor type defines with standard USB-IF element naming
   *  - Added new project makefile template to the library and moved board driver stub files into in a new "CodeTemplates" directory
+  *  - Added board hardware driver support for the UDIP development board
   *
   *  <b>Changed:</b>
   *  - Removed complicated logic for the Endpoint_ConfigureEndpoint() function to use inlined or function called versions
diff --git a/LUFA/ManPages/DeviceSupport.txt b/LUFA/ManPages/DeviceSupport.txt
index 7a72f3cee..3c0900b14 100644
--- a/LUFA/ManPages/DeviceSupport.txt
+++ b/LUFA/ManPages/DeviceSupport.txt
@@ -38,6 +38,7 @@
  *   - USBTINY-MKII (all revisions and versions)
  *   - Olimex AVR-USB-162
  *   - USBFOO
+ *   - UDIP
  *   - Any Other Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers)
  */
  
\ No newline at end of file
diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index df22a6e62..555971f8e 100644
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -31,7 +31,6 @@
   *      -# Finish BluetoothHost demo
   *      -# Finish SideShow demo
   *      -# Finish StandaloneProgrammer project
-  *      -# Correct mishandling of error cases in Mass Storage demos
   *  - Ports
   *      -# AVR32 UC3B series microcontrollers
   *      -# Atmel ARM7 series microcontrollers