Merge branch 'fix-flush' of https://github.com/cmaglie/Arduino

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()