aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2010-02-05 03:59:42 +0000
committerDean Camera <dean@fourwalledcubicle.com>2010-02-05 03:59:42 +0000
commit6ba0b860ccd1a1f91fd25e4dc1ee162e9eb710ab (patch)
tree1aa4bc0eb6e9145ef2c9b354d3ee5443f402e176 /LUFA/Drivers
parent15f84bb8f5b910de40f081ee5e8ed847c592ea17 (diff)
downloadlufa-6ba0b860ccd1a1f91fd25e4dc1ee162e9eb710ab.tar.gz
lufa-6ba0b860ccd1a1f91fd25e4dc1ee162e9eb710ab.tar.bz2
lufa-6ba0b860ccd1a1f91fd25e4dc1ee162e9eb710ab.zip
Fixed SerialStream driver blocking while waiting for characters to be received instead of returning EOF.
Diffstat (limited to 'LUFA/Drivers')
-rw-r--r--LUFA/Drivers/Peripheral/SerialStream.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/LUFA/Drivers/Peripheral/SerialStream.c b/LUFA/Drivers/Peripheral/SerialStream.c
index fd5676aab..4ae0a7f16 100644
--- 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)
{
(void)Stream;
+
+ if (!(Serial_IsCharReceived()))
+ return EOF;
return Serial_RxByte();
}