From f427529a30487de45ebfbe6fbba9c290738878ab Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sat, 30 Jun 2012 11:19:07 +0900
Subject: Fix bootloader.c

---
 common/bootloader.c | 68 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 17 deletions(-)

(limited to 'common/bootloader.c')

diff --git a/common/bootloader.c b/common/bootloader.c
index 5cbfc72e5..cb971c704 100644
--- a/common/bootloader.c
+++ b/common/bootloader.c
@@ -1,22 +1,56 @@
-/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include "bootloader.h"
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+/* Start Bootloader from Application
+ * See 
+ * http://www.pjrc.com/teensy/jump_to_bootloader.html
+ * http://www.fourwalledcubicle.com/files/LUFA/Doc/120219/html/_page__software_bootloader_start.html
+ */
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/* Boot Section Size in bytes
+ * Teensy halfKay   512
+ * Atmel DFU loader 4096
+ * LUFA bootloader  4096
+ */
+#ifndef BOOT_SIZE
+#define BOOT_SIZE 512
+#endif
 
-#include "bootloader.h"
+#define FLASH_SIZE          (FLASHEND + 1)
+#define BOOTLOADER_START    (FLASHEND - BOOT_SIZE)
 
+void bootloader_jump(void) {
+    cli();
+    // disable watchdog, if enabled
+    // disable all peripherals
+    UDCON = 1;
+    USBCON = (1<<FRZCLK);  // disable USB
+    UCSR1B = 0;
+    _delay_ms(5);
+#if defined(__AVR_AT90USB162__)
+    EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0;
+    TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0;
+    DDRB = 0; DDRC = 0; DDRD = 0;
+    PORTB = 0; PORTC = 0; PORTD = 0;
+#elif defined(__AVR_ATmega32U4__)
+    EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
+    TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0;
+    DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0;
+    PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
+#elif defined(__AVR_AT90USB646__)
+    EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
+    TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
+    DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
+    PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
+#elif defined(__AVR_AT90USB1286__)
+    EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
+    TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
+    DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
+    PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
+#endif
 
-void bootloader_jump(void) __attribute__ ((weak));
-void bootloader_jump(void) {}
+    // start Bootloader
+    ((void (*)(void))BOOTLOADER_START)();
+}
-- 
cgit v1.2.3


From 2c5d3ac76f0ef3c72aa0416aef8b775864b50eb1 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sat, 30 Jun 2012 13:26:09 +0900
Subject: Add Makefile.lufa to keyboard/hhkb and hbkb.

---
 common/bootloader.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'common/bootloader.c')

diff --git a/common/bootloader.c b/common/bootloader.c
index cb971c704..e45295cd5 100644
--- a/common/bootloader.c
+++ b/common/bootloader.c
@@ -9,6 +9,7 @@
  * http://www.fourwalledcubicle.com/files/LUFA/Doc/120219/html/_page__software_bootloader_start.html
  */
 
+// TODO: support usbasp
 /* Boot Section Size in bytes
  * Teensy halfKay   512
  * Atmel DFU loader 4096
-- 
cgit v1.2.3


From 6d79e6579f1b769f3547856b8af56bd357580adf Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sat, 30 Jun 2012 14:44:14 +0900
Subject: Add support of USBasp bootloader.

---
 common/bootloader.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'common/bootloader.c')

diff --git a/common/bootloader.c b/common/bootloader.c
index e45295cd5..612b94964 100644
--- a/common/bootloader.c
+++ b/common/bootloader.c
@@ -24,12 +24,22 @@
 
 void bootloader_jump(void) {
     cli();
+
+    //
+    //Teensy
+    //
+#if defined(__AVR_AT90USB162__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)
     // disable watchdog, if enabled
     // disable all peripherals
     UDCON = 1;
     USBCON = (1<<FRZCLK);  // disable USB
     UCSR1B = 0;
     _delay_ms(5);
+#else
+    // This makes custom USBasploader come up.
+    MCUSR = 0;
+#endif
+
 #if defined(__AVR_AT90USB162__)
     EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0;
     TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0;
@@ -52,6 +62,26 @@ void bootloader_jump(void) {
     PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
 #endif
 
+
+    //
+    //USBasp
+    //
+#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P)
+    // This makes custom USBasploader come up.
+    MCUSR = 0;
+
+    // initialize ports
+    PORTB = 0; PORTC= 0; PORTD = 0;
+    DDRB = 0; DDRC= 0; DDRD = 0;
+
+    // disable interrupts
+    EIMSK = 0; EECR = 0; SPCR = 0;
+    ACSR = 0; SPMCSR = 0; WDTCSR = 0; PCICR = 0;
+    TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0;
+    ADCSRA = 0; TWCR = 0; UCSR0B = 0;
+#endif
+
+
     // start Bootloader
     ((void (*)(void))BOOTLOADER_START)();
 }
-- 
cgit v1.2.3