ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xmega compiling (not flashing yet)

Browse source
This commit is contained in:
Jack Humbert 2018-01-16 02:15:21 -05:00
parent 5836d1a06a
commit 6b58b0c7dd
11 changed files with 152 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tmk_core/common/avr/bootloader.c
View file

@ -6,7 +6,9 @@
#include <avr/wdt.h>
#include <util/delay.h>
#include "bootloader.h"
#include <avr/boot.h>
#ifndef __AVR_XMEGA__
#include <avr/boot.h>
#endif
#ifdef PROTOCOL_LUFA
#include <LUFA/Drivers/USB/USB.h>
@ -152,7 +154,7 @@ void bootloader_jump(void) {
#else // Assume remaining boards are DFU, even if the flag isn't set
#ifndef __AVR_ATmega32A__ // no USB - maybe BOOTLOADER_BOOTLOADHID instead though?
#ifdef BOOTLOADER_BOOTLOADHID // no USB - maybe BOOTLOADER_BOOTLOADHID instead though?
UDCON = 1;
USBCON = (1<<FRZCLK); // disable USB
UCSR1B = 0;
@ -178,6 +180,11 @@ void bootloader_jump(void) {
#define MCUSR MCUCSR
#endif
#ifdef __AVR_XMEGA__
#define MCUSR RST_STATUS
#define WDRF RST_WDRF_bp
#endif
/* this runs before main() */
void bootloader_jump_after_watchdog_reset(void) __attribute__ ((used, naked, section (".init3")));
void bootloader_jump_after_watchdog_reset(void)