diff options
author | Luiz Ribeiro <luizribeiro@gmail.com> | 2017-01-21 12:30:06 -0500 |
---|---|---|
committer | Luiz Ribeiro <luizribeiro@gmail.com> | 2017-01-21 12:55:19 -0500 |
commit | f7462aaa613a08ba4b86dbb912ce26722cfccaff (patch) | |
tree | cd7bd4b109fdb9d6f5253885138e1b34ee277e12 /tmk_core/common/avr/bootloader.c | |
parent | 10ff9623214ee62935a17b3f68d5180756b7a27b (diff) | |
download | qmk_firmware-f7462aaa613a08ba4b86dbb912ce26722cfccaff.tar.gz qmk_firmware-f7462aaa613a08ba4b86dbb912ce26722cfccaff.zip |
Got ps2avrGB to work with the V-USB protocol
Diffstat (limited to 'tmk_core/common/avr/bootloader.c')
-rw-r--r-- | tmk_core/common/avr/bootloader.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tmk_core/common/avr/bootloader.c b/tmk_core/common/avr/bootloader.c index ad547b9853..98a24d1782 100644 --- a/tmk_core/common/avr/bootloader.c +++ b/tmk_core/common/avr/bootloader.c @@ -1,6 +1,7 @@ #include <stdint.h> #include <stdbool.h> #include <avr/io.h> +#include <avr/eeprom.h> #include <avr/interrupt.h> #include <avr/wdt.h> #include <util/delay.h> @@ -89,6 +90,10 @@ void bootloader_jump(void) { _delay_ms(5); #endif + #ifdef EEPROM_BOOTLOADER_START + eeprom_write_byte((uint8_t *)EEPROM_BOOTLOADER_START, 0x00); + #endif + // watchdog reset reset_key = BOOTLOADER_RESET_KEY; wdt_enable(WDTO_250MS); @@ -114,6 +119,11 @@ void bootloader_jump(void) { #endif } +#ifdef __AVR_ATmega32A__ +// MCUSR is actually called MCUCSR in ATmega32A +#define MCUSR MCUCSR +#endif + /* this runs before main() */ void bootloader_jump_after_watchdog_reset(void) __attribute__ ((used, naked, section (".init3"))); void bootloader_jump_after_watchdog_reset(void) |