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/AVRISP-MKII | |
| 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/AVRISP-MKII')
| -rw-r--r-- | Projects/AVRISP-MKII/AVRISP-MKII.c | 2 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/AVRISP-MKII.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Projects/AVRISP-MKII/AVRISP-MKII.c b/Projects/AVRISP-MKII/AVRISP-MKII.c index 24b14b8ba..685d7c611 100644 --- a/Projects/AVRISP-MKII/AVRISP-MKII.c +++ b/Projects/AVRISP-MKII/AVRISP-MKII.c @@ -63,12 +63,14 @@ int main(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 /* Hardware Initialization */ LEDs_Init(); diff --git a/Projects/AVRISP-MKII/AVRISP-MKII.h b/Projects/AVRISP-MKII/AVRISP-MKII.h index 0418f213f..138947a48 100644 --- a/Projects/AVRISP-MKII/AVRISP-MKII.h +++ b/Projects/AVRISP-MKII/AVRISP-MKII.h @@ -44,6 +44,7 @@ #include <LUFA/Drivers/Board/LEDs.h> #include <LUFA/Drivers/USB/USB.h> + #include <LUFA/Platform/Platform.h> #if defined(ADC) #include <LUFA/Drivers/Peripheral/ADC.h> @@ -79,12 +80,12 @@ void EVENT_USB_Device_Connect(void); void EVENT_USB_Device_Disconnect(void); void EVENT_USB_Device_ConfigurationChanged(void); - + uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, 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 |