phy_serial: Simplify discard

Signed-off-by: Michael Buesch <m@bues.ch>

phy_serial: Simplify discard
Signed-off-by: Michael Buesch <m@bues.ch>
5a4f5914 · Michael Buesch · 210a819c · 5a4f5914
Commit 5a4f5914 authored 4 years ago by Michael Buesch
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

pyprofibus/phy_serial.py pyprofibus/phy_serial.py +4 -6

No files found.
--- a/pyprofibus/phy_serial.py
+++ b/pyprofibus/phy_serial.py
@@ -117,12 +117,10 @@ class CpPhySerial(CpPhy):
 		size = -1
 		getSize = FdlTelegram.getSizeFromRaw

-		if self.__discardTimeout is not None:
-			while self.__discardTimeout is not None:
-				self.__discard()
-				if (timeout == 0.0 or
-				    (timeout > 0.0 and monotonic_time() >= timeoutStamp)):
-					return None
+		while self.__discardTimeout is not None:
+			self.__discard()
+			if timeout > 0.0 and monotonic_time() >= timeoutStamp:
+				return None

 		try:
 			rxBufLen = len(rxBuf)