From 0dc5f19ea9d65bbe3222a48212a7dcbbc08c9441 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Fri, 21 Oct 2011 17:25:59 -0400 Subject: [PATCH] cleaning up code and comments in main - getting rid of leftover stuff from experiments --- .../bootloaders/nuevo_diskloader/src/DiskLoader.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hardware/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp b/hardware/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp index 10544d1dd..83ffc1b44 100644 --- a/hardware/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp +++ b/hardware/arduino/bootloaders/nuevo_diskloader/src/DiskLoader.cpp @@ -19,17 +19,15 @@ void entrypoint(void) ::); } -ISR(BADISR_vect) -{ - L_LED_ON(); -} - int main(void) __attribute__ ((naked)); int main() -{ - +{ wdt_disable(); BOARD_INIT(); + /* move interrupts to boot section: + * uses inline assembly because the procedure must be completed in four cycles. + * seems to fail if called before disabling WDT and calling BOARD_INIT() + */ asm volatile ( "ldi r16, 0x01\n" // (1<