From 65a8d68c5708c8bc87628d9a25cf0a9d951379ea Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 19 May 2013 22:28:02 +0200
Subject: Pseudo-port the projects and dual role demos for possible later
 multi-arch support.

---
 Projects/XPLAINBridge/XPLAINBridge.c | 6 ++++--
 Projects/XPLAINBridge/XPLAINBridge.h | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'Projects/XPLAINBridge')

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index 79145a138..2ef1d20ee 100644
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -169,12 +169,14 @@ void UARTBridge_Task(void)
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {
+#if (ARCH == ARCH_AVR8)
 	/* Disable watchdog if enabled by bootloader/fuses */
 	MCUSR &= ~(1 << WDRF);
 	wdt_disable();
 
 	/* Disable clock division */
 	clock_prescale_set(clock_div_1);
+#endif
 
 	/* Disable JTAG debugging */
 	MCUCR |= (1 << JTD);
@@ -197,8 +199,8 @@ void SetupHardware(void)
 	#if defined(RESET_TOGGLES_LIBUSB_COMPAT)
 	UpdateCurrentCompatibilityMode();
 	#endif
-	
-	/* USB Stack Initialization */	
+
+	/* USB Stack Initialization */
 	USB_Init();
 }
 
diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h
index 1f08b2aba..55921d804 100644
--- a/Projects/XPLAINBridge/XPLAINBridge.h
+++ b/Projects/XPLAINBridge/XPLAINBridge.h
@@ -45,7 +45,7 @@
 
 		#include "USARTDescriptors.h"
 
-		#include "AVRISPDescriptors.h"		
+		#include "AVRISPDescriptors.h"
 		#include "Lib/V2Protocol.h"
 		#include "Lib/SoftUART.h"
 		#include "Config/AppConfig.h"
@@ -53,6 +53,7 @@
 		#include <LUFA/Drivers/Board/LEDs.h>
 		#include <LUFA/Drivers/Misc/RingBuffer.h>
 		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Platform/Platform.h>
 
 	/* Macros: */
 		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
@@ -97,7 +98,7 @@
 		                                    const uint8_t wIndex,
 		                                    const void** const DescriptorAddress,
 		                                    uint8_t* const DescriptorMemorySpace)
-		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);		
+		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);
 
 #endif
 
-- 
cgit v1.2.3