X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fplatform%2Fsockets%2Fserialport.h;h=a16e3ca72115a77279de9837bb8311f0ba025115;hb=65108638b4d86198e03bc709a8a51a4658aef160;hp=fb4be19d4ec650856defb3d59046510f851f942c;hpb=5347b94bbd7455453754fd79b6aaa64aa368ce59;p=deb_libcec.git diff --git a/src/lib/platform/sockets/serialport.h b/src/lib/platform/sockets/serialport.h index fb4be19..a16e3ca 100644 --- a/src/lib/platform/sockets/serialport.h +++ b/src/lib/platform/sockets/serialport.h @@ -71,9 +71,11 @@ namespace PLATFORM public: CSerialSocket(const CStdString &strName, uint32_t iBaudrate, SerialDataBits iDatabits = SERIAL_DATA_BITS_EIGHT, SerialStopBits iStopbits = SERIAL_STOP_BITS_ONE, SerialParity iParity = SERIAL_PARITY_NONE) : CCommonSocket(INVALID_SERIAL_SOCKET_VALUE, strName), -#ifdef __WINDOWS__ - m_iCurrentTimeout(0), -#endif + #ifdef __WINDOWS__ + m_iCurrentReadTimeout(MAXDWORD), + #else + m_lockPid(0), + #endif m_bIsOpen(false), m_iBaudrate(iBaudrate), m_iDatabits(iDatabits), @@ -99,9 +101,10 @@ namespace PLATFORM protected: #ifndef __WINDOWS__ struct termios m_options; + pid_t m_lockPid; #else - bool SetTimeouts(serial_socket_t socket, int* iError, DWORD iTimeout); - DWORD m_iCurrentTimeout; + bool SetTimeouts(serial_socket_t socket, int* iError, DWORD iTimeoutMs); + DWORD m_iCurrentReadTimeout; #endif bool m_bIsOpen;