From f7462aaa613a08ba4b86dbb912ce26722cfccaff Mon Sep 17 00:00:00 2001
From: Luiz Ribeiro <luizribeiro@gmail.com>
Date: Sat, 21 Jan 2017 12:30:06 -0500
Subject: Got ps2avrGB to work with the V-USB protocol

---
 tmk_core/common/avr/bootloader.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'tmk_core/common/avr/bootloader.c')

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)
-- 
cgit v1.2.3


From 9ce38cbccf073fccea6f7ee6492bf472a48852b8 Mon Sep 17 00:00:00 2001
From: Luiz Ribeiro <luizribeiro@gmail.com>
Date: Sat, 21 Jan 2017 17:09:17 -0500
Subject: Simplified and polished a bit the code changes on tmk_core

---
 tmk_core/common/avr/bootloader.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tmk_core/common/avr/bootloader.c')

diff --git a/tmk_core/common/avr/bootloader.c b/tmk_core/common/avr/bootloader.c
index 98a24d1782..34db8d0b0a 100644
--- a/tmk_core/common/avr/bootloader.c
+++ b/tmk_core/common/avr/bootloader.c
@@ -90,8 +90,10 @@ void bootloader_jump(void) {
             _delay_ms(5);
         #endif
 
-        #ifdef EEPROM_BOOTLOADER_START
-            eeprom_write_byte((uint8_t *)EEPROM_BOOTLOADER_START, 0x00);
+        #ifdef BOOTLOADHID_BOOTLOADER
+            // force bootloadHID to stay in bootloader mode, so that it waits
+            // for a new firmware to be flashed
+            eeprom_write_byte((uint8_t *)1, 0x00);
         #endif
 
         // watchdog reset
-- 
cgit v1.2.3