aboutsummaryrefslogtreecommitdiff
path: root/cores
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@bug.st>2013-09-10 12:10:57 +0200
committerCristian Maglie <c.maglie@bug.st>2013-09-10 12:10:57 +0200
commit1d865de59a7caea545ece77622f1ed8bed6458be (patch)
treee61d4887be774d2d9247b775f0e82ac83e9321cb /cores
parent7dbfd27f654fc123171bf495891d4462ce8e240e (diff)
parentc0ca10c08b0abb376cdb503ccd3b2635cc50f5d8 (diff)
Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts: build/shared/revisions.txt
Diffstat (limited to 'cores')
-rw-r--r--cores/arduino/HardwareSerial.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
index e40bfbc..9a86fa0 100644
--- a/cores/arduino/HardwareSerial.cpp
+++ b/cores/arduino/HardwareSerial.cpp
@@ -91,7 +91,7 @@ inline void store_char(unsigned char c, HardwareSerial *s)
#elif defined(UDR)
if (bit_is_clear(UCSRA, PE)) {
unsigned char c = UDR;
- store_char(c, &rx_buffer);
+ store_char(c, &Serial);
} else {
unsigned char c = UDR;
};