Pseudo-port the projects and dual role demos for possible later multi-arch support.
authorDean Camera <dean@fourwalledcubicle.com>
Sun, 19 May 2013 20:28:02 +0000 (22:28 +0200)
committerDean Camera <dean@fourwalledcubicle.com>
Sun, 19 May 2013 20:28:02 +0000 (22:28 +0200)
34 files changed:
Demos/Device/Incomplete/TestAndMeasurement/Config/LUFAConfig.h
Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.c
Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.h
Demos/DualRole/ClassDriver/MouseHostDevice/asf.xml
Projects/AVRISP-MKII/AVRISP-MKII.c
Projects/AVRISP-MKII/AVRISP-MKII.h
Projects/Benito/Benito.c
Projects/Benito/Benito.h
Projects/HIDReportViewer/HIDReportViewer.c
Projects/HIDReportViewer/HIDReportViewer.h
Projects/LEDNotifier/LEDNotifier.c
Projects/LEDNotifier/LEDNotifier.h
Projects/MIDIToneGenerator/MIDIToneGenerator.c
Projects/MIDIToneGenerator/MIDIToneGenerator.h
Projects/Magstripe/Magstripe.c
Projects/Magstripe/Magstripe.h
Projects/MediaController/MediaController.c
Projects/MediaController/MediaController.h
Projects/MissileLauncher/MissileLauncher.c
Projects/MissileLauncher/MissileLauncher.h
Projects/RelayBoard/RelayBoard.c
Projects/RelayBoard/RelayBoard.h
Projects/SerialToLCD/SerialToLCD.c
Projects/SerialToLCD/SerialToLCD.h
Projects/TempDataLogger/TempDataLogger.c
Projects/TempDataLogger/TempDataLogger.h
Projects/USBtoSerial/USBtoSerial.c
Projects/USBtoSerial/USBtoSerial.h
Projects/Webserver/Webserver.c
Projects/Webserver/Webserver.h
Projects/XPLAINBridge/XPLAINBridge.c
Projects/XPLAINBridge/XPLAINBridge.h

index 3b33e2d..da728ec 100644 (file)
 //             #define NO_AUTO_VBUS_MANAGEMENT
 //             #define INVERTED_VBUS_ENABLE_LINE
 
+       #elif (ARCH == ARCH_XMEGA)
+
+               /* Non-USB Related Configuration Tokens: */
+//             #define DISABLE_TERMINAL_CODES
+
+               /* USB Class Driver Related Tokens: */
+//             #define HID_HOST_BOOT_PROTOCOL_ONLY
+//             #define HID_STATETABLE_STACK_DEPTH       {Insert Value Here}
+//             #define HID_USAGE_STACK_DEPTH            {Insert Value Here}
+//             #define HID_MAX_COLLECTIONS              {Insert Value Here}
+//             #define HID_MAX_REPORTITEMS              {Insert Value Here}
+//             #define HID_MAX_REPORT_IDS               {Insert Value Here}
+//             #define NO_CLASS_DRIVER_AUTOFLUSH
+
+               /* General USB Driver Related Tokens: */
+               #define USE_STATIC_OPTIONS               (USB_DEVICE_OPT_FULLSPEED | USB_OPT_RC32MCLKSRC | USB_OPT_BUSEVENT_PRIHIGH)
+//             #define USB_STREAM_TIMEOUT_MS            {Insert Value Here}
+//             #define NO_LIMITED_CONTROLLER_CONNECT
+//             #define NO_SOF_EVENTS
+
+               /* USB Device Mode Driver Related Tokens: */
+//             #define USE_RAM_DESCRIPTORS
+               #define USE_FLASH_DESCRIPTORS
+//             #define USE_EEPROM_DESCRIPTORS
+//             #define NO_INTERNAL_SERIAL
+               #define FIXED_CONTROL_ENDPOINT_SIZE      8
+//             #define DEVICE_STATE_AS_GPIOR            {Insert Value Here}
+               #define FIXED_NUM_CONFIGURATIONS         1
+//             #define CONTROL_ONLY_DEVICE
+               #define MAX_ENDPOINT_INDEX               4
+//             #define NO_DEVICE_REMOTE_WAKEUP
+//             #define NO_DEVICE_SELF_POWER
+
        #else
 
                #error Unsupported architecture for this LUFA configuration file.
index bd972e2..4bd7027 100644 (file)
@@ -93,12 +93,24 @@ 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);
+#elif (ARCH == ARCH_XMEGA)
+       /* Start the PLL to multiply the 2MHz RC oscillator to 32MHz and switch the CPU core to run from it */
+       XMEGACLK_StartPLL(CLOCK_SRC_INT_RC2MHZ, 2000000, F_CPU);
+       XMEGACLK_SetCPUClockSource(CLOCK_SRC_PLL);
+
+       /* Start the 32MHz internal RC oscillator and start the DFLL to increase it to 48MHz using the USB SOF as a reference */
+       XMEGACLK_StartInternalOscillator(CLOCK_SRC_INT_RC32MHZ);
+       XMEGACLK_StartDFLL(CLOCK_SRC_INT_RC32MHZ, DFLL_REF_INT_USBSOF, F_USB);
+
+       PMIC.CTRL = PMIC_LOLVLEN_bm | PMIC_MEDLVLEN_bm | PMIC_HILVLEN_bm;
+#endif
 
        /* Hardware Initialization */
        LEDs_Init();
index ed02033..0c86cc8 100644 (file)
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2013.
-              
+
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
@@ -9,13 +9,13 @@
 /*
   Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  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 
+  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 
+  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 disclaims all warranties with regard to this
@@ -39,8 +39,9 @@
 
                #include "Descriptors.h"
 
-               #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Board/LEDs.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. */
@@ -54,7 +55,7 @@
 
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
                #define LEDMASK_USB_ERROR                    (LEDS_LED1 | LEDS_LED3)
-               
+
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
                #define LEDMASK_USB_BUSY                      LEDS_LED2
 
                #define Req_CheckClearStatus                  0x06
                #define Req_GetCapabilities                   0x07
                #define Req_IndicatorPulse                    0x40
-               
+
                #define TMC_STATUS_SUCCESS                    0x01
                #define TMC_STATUS_PENDING                    0x02
                #define TMC_STATUS_FAILED                     0x80
                #define TMC_STATUS_TRANSFER_NOT_IN_PROGRESS   0x81
                #define TMC_STATUS_SPLIT_NOT_IN_PROGRESS      0x82
                #define TMC_STATUS_SPLIT_IN_PROGRESS          0x83
-               
+
                #define TMC_MESSAGEID_DEV_DEP_MSG_OUT         0x01
                #define TMC_MESSAGEID_DEV_DEP_MSG_IN          0x02
                #define TMC_MESSAGEID_DEV_VENDOR_OUT          0x7E
@@ -86,7 +87,7 @@
                        uint8_t  Reserved;
 
                        uint16_t TMCVersion;
-                       
+
                        struct
                        {
                                unsigned ListenOnly             : 1;
                                unsigned PulseIndicateSupported : 1;
                                unsigned Reserved               : 5;
                        } Interface;
-                       
+
                        struct
                        {
                                unsigned SupportsAbortINOnMatch : 1;
                                unsigned Reserved               : 7;
                        } Device;
-                       
+
                        uint8_t Reserved2[6];
-                       uint8_t Reserved3[12];                  
+                       uint8_t Reserved3[12];
                } TMC_Capabilities_t;
-               
+
                typedef struct
                {
                        uint8_t LastMessageTransaction;
                        uint8_t  InverseTag;
                        uint8_t  Reserved;
                        uint32_t TransferSize;
-                       
+
                        union
                        {
                                TMC_DevOUTMessageHeader_t DeviceOUT;
index 620e809..f7c3c01 100644 (file)
@@ -68,12 +68,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 */
        Serial_Init(9600, false);
index 48b6389..1269939 100644 (file)
@@ -50,6 +50,7 @@
                #include <LUFA/Drivers/Board/Joystick.h>
                #include <LUFA/Drivers/Board/Buttons.h>
                #include <LUFA/Drivers/USB/USB.h>
+               #include <LUFA/Platform/Platform.h>
 
                #include "Descriptors.h"
                #include "DeviceFunctions.h"
@@ -70,7 +71,7 @@
 
        /* Function Prototypes: */
                void SetupHardware(void);
-               
+
                void EVENT_USB_UIDChange(void);
 
 #endif
index d2b4214..19a0905 100644 (file)
@@ -1,14 +1,14 @@
 <asf xmlversion="1.0">\r
-       <project caption="Mouse HID Dual USB Mode Demo (Class Driver APIs)" id="lufa.demos.dualrole.class.mouse.example">\r
+       <project caption="Mouse HID Dual USB Mode Demo (Class Driver APIs)" id="lufa.demos.dualrole.class.mouse.example.avr8">\r
                <require idref="lufa.demos.dualrole.class.mouse"/>\r
                <require idref="lufa.boards.dummy.avr8"/>\r
                <generator value="as5_8"/>\r
 \r
                <device-support value="at90usb1287"/>\r
-               <config name="lufa.drivers.board.name" value="usbkey"/>\r
+               <config name="lufa.drivers.board.name" value="none"/>\r
 \r
-               <build type="define" name="F_CPU" value="8000000UL"/>\r
-               <build type="define" name="F_USB" value="8000000UL"/>\r
+               <build type="define" name="F_CPU" value="16000000UL"/>\r
+               <build type="define" name="F_USB" value="16000000UL"/>\r
        </project>\r
 \r
        <module type="application" id="lufa.demos.dualrole.class.mouse" caption="Mouse HID Dual USB Mode Demo (Class Driver APIs)">\r
index 24b14b8..685d7c6 100644 (file)
@@ -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();
index 0418f21..138947a 100644 (file)
@@ -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>
                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
 
index 7f5d507..a89e6ca 100644 (file)
@@ -171,10 +171,15 @@ 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();
        USB_Init();
index 938680b..beac29f 100644 (file)
@@ -48,6 +48,7 @@
                #include <LUFA/Drivers/Peripheral/Serial.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 TX activity. */
index 70b2f9e..6ca33e5 100644 (file)
@@ -202,12 +202,14 @@ void OutputCollectionPath(const HID_CollectionPath_t* const CollectionPath)
 /** 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 */
        Serial_Init(9600, false);
index 781cfb0..ffe4e00 100644 (file)
@@ -49,6 +49,7 @@
                #include <LUFA/Drivers/Peripheral/Serial.h>
                #include <LUFA/Drivers/Board/LEDs.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. */
index 886bf53..d6a8fdc 100644 (file)
@@ -142,12 +142,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();
index 4bb9c04..0b8579f 100644 (file)
@@ -48,6 +48,7 @@
 
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/USB/USB.h>
+               #include <LUFA/Platform/Platform.h>
 
        /* Function Prototypes: */
                void SetupHardware(void);
index 2505a3e..662c815 100644 (file)
@@ -185,12 +185,14 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
 /** 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();
index 27ee34b..ab434f3 100644 (file)
@@ -49,6 +49,7 @@
 
                #include <LUFA/Drivers/Board/LEDs.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. */
index 85df8b5..8dba737 100644 (file)
@@ -94,12 +94,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 */
        Magstripe_Init();
index 6d349df..1291f3d 100644 (file)
@@ -49,6 +49,7 @@
                #include "Config/AppConfig.h"
 
                #include <LUFA/Drivers/USB/USB.h>
+               #include <LUFA/Platform/Platform.h>
 
        /* Macros: */
                /** Total number of tracks which can be read from the card, between 1 and 3. */
index f1bf649..d12a21a 100644 (file)
@@ -80,12 +80,14 @@ int main(void)
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware()
 {
+#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 */
        Joystick_Init();
index 99f0e12..d68e276 100644 (file)
@@ -50,6 +50,7 @@
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Board/Buttons.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. */
index 14134d7..6294f2d 100644 (file)
@@ -112,12 +112,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();
index 5b51b6e..4e72829 100644 (file)
@@ -49,6 +49,7 @@
                #include <LUFA/Drivers/Board/Buttons.h>
                #include <LUFA/Drivers/Board/Joystick.h>
                #include <LUFA/Drivers/Board/LEDs.h>
+               #include <LUFA/Platform/Platform.h>
 
                #include "ConfigDescriptor.h"
 
index 2c236de..f2ba464 100644 (file)
@@ -54,12 +54,14 @@ int main(void)
 /** Configures the board hardware and chip peripherals for the project'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 */
        USB_Init();
index e43eb2b..149685a 100644 (file)
@@ -47,6 +47,7 @@
 
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/USB/USB.h>
+               #include <LUFA/Platform/Platform.h>
 
        /* Macros: */
                #define RELAY1      (1 << 7)
index 385bcde..aac4fad 100644 (file)
@@ -29,7 +29,7 @@
   this software.
 */
 
-/** \file 
+/** \file
  *
  *  Main source file for the SerialToLCD program. This file contains the main tasks of
  *  the project and is responsible for the initial application hardware configuration.
@@ -101,7 +101,7 @@ int main(void)
                {
                        static uint8_t EscapePending = 0;
                        int16_t HD44780Byte = RingBuffer_Remove(&FromHost_Buffer);
-                       
+
                        if (HD44780Byte == COMMAND_ESCAPE)
                        {
                                if (EscapePending)
@@ -137,12 +137,14 @@ int main(void)
 /** Configures the board hardware and chip peripherals for the application'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 */
        USB_Init();
@@ -150,7 +152,7 @@ void SetupHardware(void)
        /* Power up the HD44780 Interface */
        HD44780_Initialize();
        HD44780_WriteCommand(CMD_DISPLAY_ON);
-       
+
        /* Start the flush timer so that overflows occur rapidly to push received bytes to the USB interface */
        TCCR0B = (1 << CS02);
 }
index b67b84c..22537d6 100644 (file)
@@ -49,7 +49,8 @@
         #include <LUFA/Version.h>
         #include <LUFA/Drivers/Misc/RingBuffer.h>
         #include <LUFA/Drivers/USB/USB.h>
-               
+               #include <LUFA/Platform/Platform.h>
+
        /* Macros: */
                #define COMMAND_ESCAPE     0x1B
 
index 415ad9f..7590aee 100644 (file)
@@ -190,12 +190,14 @@ void CloseLogFile(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();
index 21373f4..86364f4 100644 (file)
                #include "Lib/FATFs/ff.h"
                #include "Lib/DS1307.h"
                #include "Config/AppConfig.h"
-               
+
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Board/Temperature.h>
                #include <LUFA/Drivers/Peripheral/ADC.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. */
index 76e3cb8..6df9063 100644 (file)
@@ -145,12 +145,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();
index d37a540..220500f 100644 (file)
@@ -48,6 +48,7 @@
                #include <LUFA/Drivers/Peripheral/Serial.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. */
index be53032..173b52e 100644 (file)
@@ -60,12 +60,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 */
        SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
index 1dfa830..a828e89 100644 (file)
@@ -47,6 +47,7 @@
                #include <LUFA/Drivers/Board/Dataflash.h>
                #include <LUFA/Drivers/Peripheral/SPI.h>
                #include <LUFA/Drivers/USB/USB.h>
+               #include <LUFA/Platform/Platform.h>
 
                #include "USBDeviceMode.h"
                #include "USBHostMode.h"
index 79145a1..2ef1d20 100644 (file)
@@ -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();
 }
 
index 1f08b2a..55921d8 100644 (file)
@@ -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