namespace Msp {
namespace IO {
-Serial::Serial(const string &descr)
+Serial::Serial(const string &descr):
+ reader(handle, 1024)
{
string::size_type comma = descr.find(',');
string port = descr.substr(0, comma);
#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;
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
if(size==0)
return 0;
- return sys_read(handle, buf, size);
-}
+ unsigned ret = reader.read(buf, size);
+ if(ret==0)
+ set_eof();
-const Handle &Serial::get_event_handle()
-{
-#ifdef WIN32
- throw logic_error("Serial port events not supported on win32 yet");
-#else
- return handle;
-#endif
+ return ret;
}
} // namespace IO