From 3b72c2343ab160290ccf1385829b168925052b8b Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Thu, 8 Sep 2011 18:12:11 -0400 Subject: [PATCH] disabling watchdog in bootloader --- bootloaders/diskloader/DiskLoader.hex | 159 +++++++++++----------- bootloaders/diskloader/src/DiskLoader.cpp | 1 + bootloaders/diskloader/src/Platform.h | 1 + 3 files changed, 82 insertions(+), 79 deletions(-) diff --git a/bootloaders/diskloader/DiskLoader.hex b/bootloaders/diskloader/DiskLoader.hex index 811efed..66acc6f 100644 --- a/bootloaders/diskloader/DiskLoader.hex +++ b/bootloaders/diskloader/DiskLoader.hex @@ -18,88 +18,89 @@ :10791000EE27FF27099408950F931F93CF93DF93CA :10792000982FEB01042F10E088E76030780730F4DF :1079300011E083E0FB0180935700E895892F68E010 -:1079400071E0402FF0D0112311F107B600FCFDCFFC +:1079400071E0402FF8D0112311F107B600FCFDCFF4 :10795000402F4695FE01A8E0B1E020E031E009C0EB :107960008D919D910C0130935700E895112432962A :107970002F5F2417A8F385E0FE0180935700E89558 :1079800007B600FCFDCF81E180935700E895DF91B9 -:10799000CF911F910F910895769A289A47983F9A10 -:1079A000209A6E9A90E8909361001092610081E8AD -:1079B00085BF95BF9FD084E18093880180E180934B -:1079C0008901E0E0F0E0859194918F5F9F4F19F07D -:1079D00081E080938F01EE24FF24BB24B39428EE32 -:1079E000C22E23E0D22E03D2082F8EE098E7FC01AE -:1079F0002491319602964491201711F02223B9F771 -:107A0000109291011092900182E068E071E08BD0B9 -:107A1000013479F4609108016058633028F06831CE -:107A200011F064E001C063E0C62FD0E0CF5DD7481D -:107A30000EC0063571F480910801803311F011E019 -:107A400022C080910A01C82FD0E0C25ED74811E061 -:107A500022C0053721F413E0CEE1D8E71CC005357C -:107A600039F4E0900801F0900901EE0CFF1C0AC007 -:107A7000043631F482E0B701409109014DDF02C0C4 -:107A8000043721F010E0C5E2D8E705C010910901E4 -:107A9000E701E10EF11CABD18097B1F483E068E817 -:107AA00071E041E050E059D0112329F0412F50E01E -:107AB00083E8BE0152D083E469E871E041E050E020 -:107AC0004CD0013509F08FCFD0929101C092900136 -:107AD000B0928F01EE24FF2486CFFC01289884E623 -:107AE00080938D0104C08091F100819361506623E1 -:107AF000D1F70895109291011092900110928E0189 -:107B000010928F0181E08093D70080EA8093D800A3 -:107B100082E189BD09B400FEFDCF80E98093D800E1 -:107B20001092E0000895FB018093E90024E69BE6B3 -:107B300011C08091E80085FFFCCF289820938D012B -:107B40008091F10081938091E80085FD02C09093BF -:107B5000E8004150442369F70895982FFB01282F2E -:107B6000207287708093E90064E63AE317C0809141 -:107B7000E80085FFFCCF97FF02C0849101C080819F -:107B80003196211180E0769860938C018093F1000A -:107B90008091E80085FD02C03093E80041505040DC -:107BA0008FEF4F3F580719F796FF03C08AE3809382 -:107BB000E800089580919301813299F4769884E6E3 -:107BC00080938C0120E030E003C080818093F1003D -:107BD000F901E050FF4F2F5F3F4F28303105A9F7E3 -:107BE00014C0803261F48091E80082FFFCCF80E015 -:107BF00091E067E072DF8BEF8093E80006C082328D -:107C000021F4809194018093070181E008952091EF -:107C10009501223209F1213081F4809198019091EF -:107C20009901089711F420939A0180919A01882371 -:107C300009F03FC0EFE5F8E73EC0223021F484E6CA -:107C4000E1E7F8E70CC0233091F580919401882397 -:107C500071F5E9E4F8E72FC081E0EBE2F8E79091F5 -:107C60009801382F981708F4392F90918C0120E053 -:107C70004EEF8091E8008570E1F38091E80082FD8D -:107C800012C02F5F849176988093F100822F8F73BA -:107C900011F44093E800319694E6231750F3909343 -:107CA0008C0181E0089590938C0180E0089580E03C -:107CB0000895EDE4F8E78491D2CF1092E900809125 -:107CC000E80083FF61C082E991E068E006DF82EFAF -:107CD0008093E8008091920187FF05C08091E800C1 -:107CE00080FFFCCF03C08EEF8093E800809193016A -:107CF000853051F48091E80080FFFCCF80919401A1 -:107D000080688093E30039C08930E1F48091940168 -:107D100080938E01E7E2F8E791E031E026E390936B -:107D2000E9003093EB0084918093EC002093ED0008 -:107D30009F5F3196953099F78EE78093EA00109215 -:107D4000EA001BC0883049F490918E01769884E651 -:107D500080938C019093F10010C0882339F47698B9 -:107D600084E680938C011092F10007C0863011F4F4 -:107D70004EDF01C01FDF882321F08EEF8093E800E3 -:107D8000089581E28093EB0008958091E1001092C4 -:107D9000E100282F83FF0CC01092E90081E080935E -:107DA000EB001092EC0082E38093ED0010928E01C4 -:107DB00022FF1CC080918C01882331F08150809378 -:107DC0008C01882309F4769A80918D01882331F003 -:107DD000815080938D01882309F4289A80918F0126 -:107DE000882321F4109291011092900108951F931D -:107DF000CF93DF9312E0C0E9D1E05FDFC6DF1093DD -:107E0000E9008091E80085FF13C0289884E68093FC -:107E10008D019091F1008091E80085FD03C08BE613 -:107E20008093E800892F90E0DF91CF911F91089512 -:107E3000809190019091910101979093910180938D -:107E400090018091900190919101892B09F459DD65 -:0A7E5000CE010197F1F73FDDD0CF1E -:087E5A0000E10000000000003F +:10799000CF911F910F91089588E10FB6F8948093CD +:1079A0006000109260000FBE769A289A47983F9A1E +:1079B000209A6E9A90E8909361001092610081E89D +:1079C00085BF95BF9FD084E18093880180E180933B +:1079D0008901E0E0F0E0859194918F5F9F4F19F06D +:1079E00081E080938F01EE24FF24BB24B39428EE22 +:1079F000C22E23E0D22E03D2082F8EE098E7FC019E +:107A00002491319602964491201711F02223B9F760 +:107A1000109291011092900182E068E071E08BD0A9 +:107A2000013479F4609108016058633028F06831BE +:107A300011F064E001C063E0C62FD0E0CF5DD7480D +:107A40000EC0063571F480910801803311F011E009 +:107A500022C080910A01C82FD0E0C25ED74811E051 +:107A600022C0053721F413E0CEE1D8E71CC005356C +:107A700039F4E0900801F0900901EE0CFF1C0AC0F7 +:107A8000043631F482E0B7014091090145DF02C0BC +:107A9000043721F010E0C5E2D8E705C010910901D4 +:107AA000E701E10EF11CABD18097B1F483E068E807 +:107AB00071E041E050E059D0112329F0412F50E00E +:107AC00083E8BE0152D083E469E871E041E050E010 +:107AD0004CD0013509F08FCFD0929101C092900126 +:107AE000B0928F01EE24FF2486CFFC01289884E613 +:107AF00080938D0104C08091F100819361506623D1 +:107B0000D1F70895109291011092900110928E0178 +:107B100010928F0181E08093D70080EA8093D80093 +:107B200082E189BD09B400FEFDCF80E98093D800D1 +:107B30001092E0000895FB018093E90024E69BE6A3 +:107B400011C08091E80085FFFCCF289820938D011B +:107B50008091F10081938091E80085FD02C09093AF +:107B6000E8004150442369F70895982FFB01282F1E +:107B7000207287708093E90064E63AE317C0809131 +:107B8000E80085FFFCCF97FF02C0849101C080818F +:107B90003196211180E0769860938C018093F100FA +:107BA0008091E80085FD02C03093E80041505040CC +:107BB0008FEF4F3F580719F796FF03C08AE3809372 +:107BC000E800089580919301813299F4769884E6D3 +:107BD00080938C0120E030E003C080818093F1002D +:107BE000F901E050FF4F2F5F3F4F28303105A9F7D3 +:107BF00014C0803261F48091E80082FFFCCF80E005 +:107C000091E067E072DF8BEF8093E80006C082327C +:107C100021F4809194018093070181E008952091DF +:107C20009501223209F1213081F4809198019091DF +:107C30009901089711F420939A0180919A01882361 +:107C400009F03FC0EFE5F8E73EC0223021F484E6BA +:107C5000E1E7F8E70CC0233091F580919401882387 +:107C600071F5E9E4F8E72FC081E0EBE2F8E79091E5 +:107C70009801382F981708F4392F90918C0120E043 +:107C80004EEF8091E8008570E1F38091E80082FD7D +:107C900012C02F5F849176988093F100822F8F73AA +:107CA00011F44093E800319694E6231750F3909333 +:107CB0008C0181E0089590938C0180E0089580E02C +:107CC0000895EDE4F8E78491D2CF1092E900809115 +:107CD000E80083FF61C082E991E068E006DF82EF9F +:107CE0008093E8008091920187FF05C08091E800B1 +:107CF00080FFFCCF03C08EEF8093E800809193015A +:107D0000853051F48091E80080FFFCCF8091940190 +:107D100080688093E30039C08930E1F48091940158 +:107D200080938E01E7E2F8E791E031E026E390935B +:107D3000E9003093EB0084918093EC002093ED00F8 +:107D40009F5F3196953099F78EE78093EA00109205 +:107D5000EA001BC0883049F490918E01769884E641 +:107D600080938C019093F10010C0882339F47698A9 +:107D700084E680938C011092F10007C0863011F4E4 +:107D80004EDF01C01FDF882321F08EEF8093E800D3 +:107D9000089581E28093EB0008958091E1001092B4 +:107DA000E100282F83FF0CC01092E90081E080934E +:107DB000EB001092EC0082E38093ED0010928E01B4 +:107DC00022FF1CC080918C01882331F08150809368 +:107DD0008C01882309F4769A80918D01882331F0F3 +:107DE000815080938D01882309F4289A80918F0116 +:107DF000882321F4109291011092900108951F930D +:107E0000CF93DF9312E0C0E9D1E05FDFC6DF1093CC +:107E1000E9008091E80085FF13C0289884E68093EC +:107E20008D019091F1008091E80085FD03C08BE603 +:107E30008093E800892F90E0DF91CF911F91089502 +:107E4000809190019091910101979093910180937D +:107E500090018091900190919101892B09F451DD5D +:0A7E6000CE010197F1F737DDD0CF16 +:087E6A0000E10000000000002F :040000030000780081 :00000001FF 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 #include #include +#include #include #include