Fixed SerialStream driver blocking while waiting for characters to be received instea...

diff --git a/LUFA/Drivers/Peripheral/SerialStream.c b/LUFA/Drivers/Peripheral/SerialStream.c
index fd5676a..4ae0a7f 100644 (file)
--- a/LUFA/Drivers/Peripheral/SerialStream.c
+++ b/LUFA/Drivers/Peripheral/SerialStream.c
@@ -44,6 +44,9 @@ static int SerialStream_TxByte(char DataByte, FILE *Stream)
 static int SerialStream_RxByte(FILE *Stream)\r
 {\r
        (void)Stream;\r
+       \r
+       if (!(Serial_IsCharReceived()))\r
+         return EOF;\r
 \r
        return Serial_RxByte();\r
 }\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 521ab38..5fd1b2b 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -53,6 +53,7 @@
   *  - Fixed Pipe_IsEndpointBound() not taking the endpoint's direction into account\r
   *  - Fixed EEPROM and FLASH ISP programming in the AVRISP project\r
   *  - Fixed incorrect values of USB_CONFIG_ATTR_SELFPOWERED and USB_CONFIG_ATTR_REMOTEWAKEUP tokens (thanks to Claus Christensen)\r
+  *  - Fixed SerialStream driver blocking while waiting for characters to be received instead of returning EOF\r
   *\r
   *  \section Sec_ChangeLog091223 Version 091223\r
   *\r