diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-05-19 22:28:02 +0200 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-05-19 22:28:02 +0200 |
| commit | 65a8d68c5708c8bc87628d9a25cf0a9d951379ea (patch) | |
| tree | 6f1474a96020667da31c09264fa12a99a023f998 /Projects/XPLAINBridge | |
| parent | 139fabb6cdc36bf5259ec2c587f337b106a1c47f (diff) | |
| download | lufa-65a8d68c5708c8bc87628d9a25cf0a9d951379ea.tar.gz lufa-65a8d68c5708c8bc87628d9a25cf0a9d951379ea.tar.bz2 lufa-65a8d68c5708c8bc87628d9a25cf0a9d951379ea.zip | |
Pseudo-port the projects and dual role demos for possible later multi-arch support.
Diffstat (limited to 'Projects/XPLAINBridge')
| -rw-r--r-- | Projects/XPLAINBridge/XPLAINBridge.c | 6 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/XPLAINBridge.h | 5 |
2 files changed, 7 insertions, 4 deletions
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 |