From: Mikko Rasa Date: Fri, 10 Dec 2010 06:45:37 +0000 (+0000) Subject: Partial serial port implementation on win32 X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=48926b1ed17db1fed149f89140ea99f6d968adc2;p=libs%2Fcore.git Partial serial port implementation on win32 Events are not supported yet --- diff --git a/source/serial.cpp b/source/serial.cpp index e6eff51..1aedd41 100644 --- a/source/serial.cpp +++ b/source/serial.cpp @@ -5,9 +5,13 @@ Copyright © 2010 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ +#ifdef WIN32 +#include +#else #include #include #include +#endif #include #include "except.h" #include "serial.h" @@ -19,9 +23,37 @@ namespace { using namespace Msp; using namespace Msp::IO; -#ifndef WIN32 -void set_baud_rate(termios &t, unsigned baud) +#ifdef WIN32 +typedef DCB DeviceState; +#else +typedef termios DeviceState; +#endif + +void get_state(Handle handle, DeviceState &state) { +#ifdef WIN32 + GetCommState(handle, &state); +#else + tcgetattr(handle, &state); +#endif +} + +void set_state(Handle handle, DeviceState &state) +{ +#ifdef WIN32 + if(SetCommState(handle, &state)==0) + throw SystemError("Cannot set serial port parameters", GetLastError()); +#else + if(tcsetattr(handle, TCSADRAIN, &state)==-1) + throw SystemError("Cannot set serial port parameters", errno); +#endif +} + +void set_baud_rate(DeviceState &state, unsigned baud) +{ +#ifdef WIN32 + state.BaudRate = baud; +#else speed_t speed; switch(baud) { @@ -47,12 +79,16 @@ void set_baud_rate(termios &t, unsigned baud) default: throw InvalidParameterValue("Invalid baud rate"); } - cfsetospeed(&t, speed); - cfsetispeed(&t, speed); + cfsetospeed(&state, speed); + cfsetispeed(&state, speed); +#endif } -void set_data_bits(termios &t, unsigned bits) +void set_data_bits(DeviceState &state, unsigned bits) { +#ifdef WIN32 + state.ByteSize = bits; +#else tcflag_t flag; switch(bits) { @@ -63,11 +99,21 @@ void set_data_bits(termios &t, unsigned bits) default: throw InvalidParameterValue("Invalid data bit count"); } - t.c_cflag = (t.c_cflag&~CSIZE)|flag; + state.c_cflag = (state.c_cflag&~CSIZE)|flag; +#endif } -void set_parity(termios &t, Serial::Parity par) +void set_parity(DeviceState &state, Serial::Parity par) { +#ifdef WIN32 + switch(par) + { + case Serial::NONE: state.Parity = NOPARITY; break; + case Serial::EVEN: state.Parity = EVENPARITY; break; + case Serial::ODD: state.Parity = ODDPARITY; break; + default: throw InvalidParameterValue("Invalid parity"); + } +#else tcflag_t flag; switch(par) { @@ -77,11 +123,20 @@ void set_parity(termios &t, Serial::Parity par) default: throw InvalidParameterValue("Invalid parity"); } - t.c_cflag = (t.c_cflag&~(PARENB|PARODD))|flag; + state.c_cflag = (state.c_cflag&~(PARENB|PARODD))|flag; +#endif } -void set_stop_bits(termios &t, unsigned bits) +void set_stop_bits(DeviceState &state, unsigned bits) { +#ifdef WIN32 + switch(bits) + { + case 1: state.StopBits = ONESTOPBIT; break; + case 2: state.StopBits = TWOSTOPBITS; break; + default: throw InvalidParameterValue("Invalid stop bit count"); + } +#else tcflag_t flag; switch(bits) { @@ -90,9 +145,9 @@ void set_stop_bits(termios &t, unsigned bits) default: throw InvalidParameterValue("Invalid stop bit count"); } - t.c_cflag = (t.c_cflag&~CSTOPB)|flag; -} + state.c_cflag = (state.c_cflag&~CSTOPB)|flag; #endif +} } @@ -105,7 +160,22 @@ Serial::Serial(const string &descr) string::size_type comma = descr.find(','); string port = descr.substr(0, comma); -#ifndef WIN32 +#ifdef WIN32 + port = "\\\\.\\"+port; + + handle = CreateFile(port.c_str(), GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + if(handle==INVALID_HANDLE_VALUE) + throw SystemError(format("Can't open serial port '%s'", port), GetLastError()); + mode = M_READ|M_WRITE; + + COMMTIMEOUTS timeouts; + timeouts.ReadIntervalTimeout = MAXDWORD; + timeouts.ReadTotalTimeoutMultiplier = MAXDWORD; + timeouts.ReadTotalTimeoutConstant = MAXDWORD-1; + timeouts.WriteTotalTimeoutMultiplier = 0; + timeouts.WriteTotalTimeoutConstant = 0; + SetCommTimeouts(handle, &timeouts); +#else if(port.compare(0, 5, "/dev/")) port = "/dev/"+port; @@ -117,9 +187,8 @@ Serial::Serial(const string &descr) termios t; tcgetattr(handle, &t); t.c_lflag &= ~(ECHO|ICANON); + t.c_oflag &= ~OPOST; tcsetattr(handle, TCSADRAIN, &t); -#else - throw Exception("Serial ports not supported in win32 yet"); #endif if(comma!=string::npos) @@ -158,42 +227,34 @@ void Serial::set_block(bool b) void Serial::set_baud_rate(unsigned rate) { -#ifndef WIN32 - termios t; - tcgetattr(handle, &t); - ::set_baud_rate(t, rate); - tcsetattr(handle, TCSADRAIN, &t); -#endif + DeviceState state; + get_state(handle, state); + ::set_baud_rate(state, rate); + set_state(handle, state); } void Serial::set_data_bits(unsigned bits) { -#ifndef WIN32 - termios t; - tcgetattr(handle, &t); - ::set_data_bits(t, bits); - tcsetattr(handle, TCSADRAIN, &t); -#endif + DeviceState state; + get_state(handle, state); + ::set_data_bits(state, bits); + set_state(handle, state); } void Serial::set_parity(Parity par) { -#ifndef WIN32 - termios t; - tcgetattr(handle, &t); - ::set_parity(t, par); - tcsetattr(handle, TCSADRAIN, &t); -#endif + DeviceState state; + get_state(handle, state); + ::set_parity(state, par); + set_state(handle, state); } void Serial::set_stop_bits(unsigned bits) { -#ifndef WIN32 - termios t; - tcgetattr(handle, &t); - ::set_stop_bits(t, bits); - tcsetattr(handle, TCSADRAIN, &t); -#endif + DeviceState state; + get_state(handle, state); + ::set_stop_bits(state, bits); + set_state(handle, state); } void Serial::set_parameters(const string ¶ms) @@ -209,20 +270,29 @@ void Serial::set_parameters(const string ¶ms) if(params[i+3]!='1' && params[i+3]!='2') throw InvalidParameterValue("Invalid stop bit count"); -#ifndef WIN32 - termios t; - tcgetattr(handle, &t); - ::set_baud_rate(t, lexical_cast(params.substr(0, i))); - ::set_data_bits(t, params[i+1]-'0'); - ::set_parity(t, (params[i+2]=='E' ? EVEN : params[i+2]=='O' ? ODD : NONE)); - ::set_stop_bits(t, params[i+3]-'0'); - tcsetattr(handle, TCSADRAIN, &t); + DeviceState state; + get_state(handle, state); + ::set_baud_rate(state, lexical_cast(params.substr(0, i))); + ::set_data_bits(state, params[i+1]-'0'); + ::set_parity(state, (params[i+2]=='E' ? EVEN : params[i+2]=='O' ? ODD : NONE)); + ::set_stop_bits(state, params[i+3]-'0'); + set_state(handle, state); +} + +Handle Serial::get_event_handle() +{ +#ifdef WIN32 + throw Exception("Serial port events not supported on win32 yet"); +#else + return handle; #endif } void Serial::close() { -#ifndef WIN32 +#ifdef WIN32 + CloseHandle(handle); +#else ::close(handle); #endif } @@ -232,7 +302,11 @@ unsigned Serial::do_write(const char *buf, unsigned size) if(size==0) return 0; -#ifndef WIN32 +#ifdef WIN32 + DWORD ret; + if(WriteFile(handle, buf, size, &ret, 0)==0) + throw SystemError("Writing to serial port failed", GetLastError()); +#else int ret = ::write(handle, buf, size); if(ret==-1) { @@ -251,7 +325,11 @@ unsigned Serial::do_read(char *buf, unsigned size) if(size==0) return 0; -#ifndef WIN32 +#ifdef WIN32 + DWORD ret; + if(ReadFile(handle, buf, size, &ret, 0)==0) + throw SystemError("Reading from serial port failed", GetLastError()); +#else int ret = ::read(handle, buf, size); if(ret==-1) { diff --git a/source/serial.h b/source/serial.h index 0e87361..fd34cde 100644 --- a/source/serial.h +++ b/source/serial.h @@ -24,10 +24,7 @@ public: }; private: - struct Private; - Handle handle; - Private *priv; public: Serial(const std::string &); @@ -41,7 +38,7 @@ public: void set_stop_bits(unsigned); void set_parameters(const std::string &); - virtual Handle get_event_handle() { return handle; } + virtual Handle get_event_handle(); private: void close();