aboutsummaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@arduino.cc>2015-11-18 10:03:05 +0100
committerCristian Maglie <c.maglie@arduino.cc>2015-11-18 10:06:01 +0100
commitb15e001b0d1b78caf3475c004d993fda58fcebef (patch)
treeb513756458eb5423b910db26cb247c206aa93608 /libraries
parent5a56dd34ea8ddba8de58f7235e1a26c177395011 (diff)
parent7bd71f04b0ad70ffb8470fb77052b7f4e0d5b91f (diff)
Merge branch 'fix-flush' of https://github.com/cmaglie/Arduino
Diffstat (limited to 'libraries')
-rw-r--r--libraries/SoftwareSerial/SoftwareSerial.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/libraries/SoftwareSerial/SoftwareSerial.cpp b/libraries/SoftwareSerial/SoftwareSerial.cpp
index 80df664..0a16ff7 100644
--- a/libraries/SoftwareSerial/SoftwareSerial.cpp
+++ b/libraries/SoftwareSerial/SoftwareSerial.cpp
@@ -469,13 +469,7 @@ size_t SoftwareSerial::write(uint8_t b)
void SoftwareSerial::flush()
{
- if (!isListening())
- return;
-
- uint8_t oldSREG = SREG;
- cli();
- _receive_buffer_head = _receive_buffer_tail = 0;
- SREG = oldSREG;
+ // There is no tx buffering, simply return
}
int SoftwareSerial::peek()