aboutsummaryrefslogtreecommitdiff
path: root/bootloaders/diskloader/src
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2011-09-08 18:12:11 -0400
committerZach Eveland <zeveland@blacklabel-development.com>2011-09-08 18:12:11 -0400
commit3b72c2343ab160290ccf1385829b168925052b8b (patch)
treeab4ae35860672550cf4152c5c9eefd95fcaea212 /bootloaders/diskloader/src
parent874cacf143330bf156d44102faba83ade270029d (diff)
disabling watchdog in bootloader
Diffstat (limited to 'bootloaders/diskloader/src')
-rw-r--r--bootloaders/diskloader/src/DiskLoader.cpp1
-rw-r--r--bootloaders/diskloader/src/Platform.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/bootloaders/diskloader/src/DiskLoader.cpp b/bootloaders/diskloader/src/DiskLoader.cpp
index da57e75..8634602 100644
--- a/bootloaders/diskloader/src/DiskLoader.cpp
+++ b/bootloaders/diskloader/src/DiskLoader.cpp
@@ -117,6 +117,7 @@ int main(void) __attribute__ ((naked));
// STK500v1 main loop, very similar to optiboot in protocol and implementation
int main()
{
+ wdt_disable();
TXLED0;
RXLED0;
LED0;
diff --git a/bootloaders/diskloader/src/Platform.h b/bootloaders/diskloader/src/Platform.h
index 278b408..2b00b71 100644
--- a/bootloaders/diskloader/src/Platform.h
+++ b/bootloaders/diskloader/src/Platform.h
@@ -5,6 +5,7 @@
#include <avr/boot.h>
#include <util/delay.h>
#include <avr/interrupt.h>
+#include <avr/wdt.h>
#include <stdio.h>
#include <stdlib.h>