aboutsummaryrefslogtreecommitdiff
path: root/bootloaders
diff options
context:
space:
mode:
authorFederico Fissore <f.fissore@arduino.cc>2013-10-14 12:42:42 +0200
committerFederico Fissore <f.fissore@arduino.cc>2013-10-14 12:42:42 +0200
commit5cbb7ba8ad4b68eaa77c952eaef91fd5847dfec8 (patch)
tree40bcd92f99275eb548be00b97972af28df4b0466 /bootloaders
parentd27087455d338fcffe0719c14d87f18268a085db (diff)
parent85018c2f47ca13d22db96e718e05f2a4cec31056 (diff)
merge
Diffstat (limited to 'bootloaders')
-rw-r--r--bootloaders/atmega/ATmegaBOOT_168.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootloaders/atmega/ATmegaBOOT_168.c b/bootloaders/atmega/ATmegaBOOT_168.c
index 2b9fefa..880cf9b 100644
--- a/bootloaders/atmega/ATmegaBOOT_168.c
+++ b/bootloaders/atmega/ATmegaBOOT_168.c
@@ -950,10 +950,10 @@ char getch(void)
count++;
if (count > MAX_TIME_COUNT)
app_start();
- }
-
- return UDR0;
}
+
+ return UDR0;
+ }
else if(bootuart == 2) {
while(!(UCSR1A & _BV(RXC1))) {
/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/