X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fserial.cpp;h=26ef92ed9015ae4f04aa1f96670a38f27dfcacfc;hp=5d335b6faa82e0226c043d14ba3a158e8a84d8ae;hb=2dd1d157ddccb7a48351d58db05982428b7b3a6d;hpb=d85465dd66a6fc80a9fb7868d1193a86abfe5b7c

diff --git a/source/io/serial.cpp b/source/io/serial.cpp
index 5d335b6..26ef92e 100644
--- a/source/io/serial.cpp
+++ b/source/io/serial.cpp
@@ -158,7 +158,7 @@ Serial::Serial(const string &descr):
 #ifdef WIN32
 	port = "\\\\.\\"+port;
 
-	*handle = CreateFile(port.c_str(), GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+	*handle = CreateFile(port.c_str(), GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL|FILE_FLAG_OVERLAPPED, 0);
 	if(!handle)
 		throw system_error(format("CreateFile(%s)", port));
 	mode = M_READ|M_WRITE;
@@ -181,8 +181,11 @@ Serial::Serial(const string &descr):
 
 	termios t;
 	tcgetattr(*handle, &t);
-	t.c_lflag &= ~(ECHO|ICANON);
-	t.c_oflag &= ~OPOST;
+	t.c_iflag &= ~(ISTRIP|INLCR|IGNCR|ICRNL|IXON);
+	t.c_lflag &= ~(ECHO|ICANON|ISIG|IEXTEN);
+	t.c_oflag &= ~(OPOST|OCRNL|ONOCR|ONLRET);
+	t.c_cc[VMIN] = 1;
+	t.c_cc[VTIME] = 0;
 	tcsetattr(*handle, TCSADRAIN, &t);
 #endif
 
@@ -292,7 +295,11 @@ unsigned Serial::do_read(char *buf, unsigned size)
 	if(size==0)
 		return 0;
 
-	return reader.read(buf, size);
+	unsigned ret = reader.read(buf, size);
+	if(ret==0)
+		set_eof();
+
+	return ret;
 }
 
 } // namespace IO