diff options
| author | Fede85 <f.vanzati@gmail.com> | 2013-10-14 17:19:48 +0200 |
|---|---|---|
| committer | Fede85 <f.vanzati@gmail.com> | 2013-10-14 17:19:48 +0200 |
| commit | 513089156b69385e6074849a9e1a40a2ef6c536a (patch) | |
| tree | 0535d26d228729cc01fb251b397baa7cf6bc356f /bootloaders/atmega | |
| parent | 295043ddbf4db9131f541a5c4caec9f5f07a9aae (diff) | |
| parent | 5cbb7ba8ad4b68eaa77c952eaef91fd5847dfec8 (diff) | |
Merge remote-tracking branch 'origin/ide-1.5.x' into ide-1.5.x
Diffstat (limited to 'bootloaders/atmega')
| -rw-r--r-- | bootloaders/atmega/ATmegaBOOT_168.c | 6 |
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*/
|