From e65575d4a5f03a90adfa9850cb71a5d0448098cd Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 22 Sep 2011 16:56:36 +0900 Subject: Refactored bootloader jumping. Added USBaspLoader support. --- pjrc/bootloader_teensy.c | 40 ++++++++++++++++++++++++++++++++++++++++ pjrc/jump_bootloader.c | 39 --------------------------------------- pjrc/jump_bootloader.h | 7 ------- pjrc/main.c | 4 ++-- 4 files changed, 42 insertions(+), 48 deletions(-) create mode 100644 pjrc/bootloader_teensy.c delete mode 100644 pjrc/jump_bootloader.c delete mode 100644 pjrc/jump_bootloader.h (limited to 'pjrc') diff --git a/pjrc/bootloader_teensy.c b/pjrc/bootloader_teensy.c new file mode 100644 index 000000000..9d34852f1 --- /dev/null +++ b/pjrc/bootloader_teensy.c @@ -0,0 +1,40 @@ +/* See http://www.pjrc.com/teensy/jump_to_bootloader.html */ +#include +#include +#include +#include "bootloader.h" + +void bootloader_jump(void) { + cli(); + // disable watchdog, if enabled + // disable all peripherals + UDCON = 1; + USBCON = (1< -#include -#include - -void jump_bootloader(void) { - cli(); - // disable watchdog, if enabled - // disable all peripherals - UDCON = 1; - USBCON = (1<= 4) { print("jump to bootloader...\n"); _delay_ms(1000); - jump_bootloader(); // not return + bootloader_jump(); // not return } -- cgit v1.2.3