From 9fcf0056380f5d1cd450a5a19f2cd041aae09dae Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 18 Feb 2014 22:25:10 +0100 Subject: [PATCH] [sam] Removed workaround in banzai() subroutine after 8120558af569cc62588442b78cc0960acd30466b See #1876 --- build/shared/revisions.txt | 1 + hardware/arduino/sam/cores/arduino/Reset.cpp | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt index e7fd79d01..dee422ee4 100644 --- a/build/shared/revisions.txt +++ b/build/shared/revisions.txt @@ -26,6 +26,7 @@ ARDUINO 1.5.6 BETA improve throughput when using high baudrates (KurtE) * sam: Fixed wrap-around bug in delay() (Mark Tillotson) * sam: Fixed regression in analogRead() (fails to read multiple channels) (Mark Tillotson) +* sam: Fixed loops in Reset.cpp (Matthijs Kooijman) * sam: Optimized delayMicroseconds() (Rob Tillaart) #1121 * Optimized Print::print(String&) method, now uses internal string buffer to perform block write * Improved portability of String class (maniacbug) #695 diff --git a/hardware/arduino/sam/cores/arduino/Reset.cpp b/hardware/arduino/sam/cores/arduino/Reset.cpp index 7485eecfb..67ef9e32e 100644 --- a/hardware/arduino/sam/cores/arduino/Reset.cpp +++ b/hardware/arduino/sam/cores/arduino/Reset.cpp @@ -40,11 +40,6 @@ void banzai() { // From here flash memory is no more available. - // Memory swap needs some time to stabilize - for (uint32_t i=0; i<1000000; i++) - // force compiler to not optimize this - __asm__ __volatile__(""); - // BANZAIIIIIII!!! const int RSTC_KEY = 0xA5; RSTC->RSTC_CR =