X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fplatform%2Fwindows%2Fserialport.cpp;h=ad7f8711d059e7679b2f1bd00c94b9f9a95ad27c;hb=2b44051cbfa70deafc30d9767323214debbc1a75;hp=fe917255d5ad2e921b4ce628077ea42d57027c49;hpb=5347b94bbd7455453754fd79b6aaa64aa368ce59;p=deb_libcec.git

diff --git a/src/lib/platform/windows/serialport.cpp b/src/lib/platform/windows/serialport.cpp
index fe91725..ad7f871 100644
--- a/src/lib/platform/windows/serialport.cpp
+++ b/src/lib/platform/windows/serialport.cpp
@@ -30,14 +30,15 @@
  *     http://www.pulse-eight.net/
  */
 
-#include "../sockets/serialport.h"
-#include "../util/baudrate.h"
-#include "../util/timeutils.h"
+#include "env.h"
+#include "lib/platform/sockets/serialport.h"
+#include "lib/platform/util/baudrate.h"
+#include "lib/platform/util/timeutils.h"
 
 using namespace std;
 using namespace PLATFORM;
 
-void FormatWindowsError(int iErrorCode, CStdString &strMessage)
+void FormatWindowsError(int iErrorCode, std::string &strMessage)
 {
   if (iErrorCode != ERROR_SUCCESS)
   {
@@ -48,32 +49,38 @@ void FormatWindowsError(int iErrorCode, CStdString &strMessage)
   }
 }
 
-bool CSerialSocket::SetTimeouts(serial_socket_t socket, int* iError, DWORD iTimeout)
+bool CSerialSocket::SetTimeouts(serial_socket_t socket, int* iError, DWORD iTimeoutMs)
 {
   if (socket == INVALID_HANDLE_VALUE)
 	  return false;
 
-  if (iTimeout == m_iCurrentTimeout)
+  if (iTimeoutMs == m_iCurrentReadTimeout)
     return true;
 
   COMMTIMEOUTS cto;
-  if (!GetCommTimeouts(socket, &cto))
+  if (iTimeoutMs == 0)
   {
-    *iError = GetLastError();
-    return false;
+    cto.ReadIntervalTimeout         = MAXDWORD;
+    cto.ReadTotalTimeoutConstant    = 0;
+    cto.ReadTotalTimeoutMultiplier  = 0;
+  }
+  else
+  {
+    cto.ReadIntervalTimeout         = 0;
+    cto.ReadTotalTimeoutConstant    = iTimeoutMs;
+    cto.ReadTotalTimeoutMultiplier  = 0;
   }
-
-  cto.ReadIntervalTimeout         = 0;
-  cto.ReadTotalTimeoutConstant    = iTimeout;
-  cto.ReadTotalTimeoutMultiplier  = 0;
 
   if (!SetCommTimeouts(socket, &cto))
   {
     *iError = GetLastError();
     return false;
   }
+  else
+  {
+    m_iCurrentReadTimeout = iTimeoutMs;
+  }
 
-  m_iCurrentTimeout = iTimeout;
   return true;
 }
 
@@ -98,20 +105,13 @@ ssize_t CSerialSocket::Write(void* data, size_t len)
 
 ssize_t CSerialSocket::Read(void* data, size_t len, uint64_t iTimeoutMs /* = 0 */)
 {
-  if (IsOpen())
-  {
-    DWORD iTimeout((DWORD)iTimeoutMs);
-    if (iTimeout != iTimeoutMs)
-      return -1;
-
-    int iError(0);
-    if (!SetTimeouts(m_socket, &iError, iTimeout))
-      return -1;
-
-    return SerialSocketRead(m_socket, &m_iError, data, len, iTimeoutMs);
-  }
+  DWORD dwTimeoutMs((DWORD)iTimeoutMs);
+  if (iTimeoutMs != (uint64_t)iTimeoutMs)
+    dwTimeoutMs = MAXDWORD;
 
-  return -1;
+  return IsOpen() && SetTimeouts(m_socket, &m_iError, dwTimeoutMs) ?
+    SerialSocketRead(m_socket, &m_iError, data, len, iTimeoutMs) :
+    -1;
 }
 
 bool CSerialSocket::Open(uint64_t iTimeoutMs /* = 0 */)
@@ -120,7 +120,7 @@ bool CSerialSocket::Open(uint64_t iTimeoutMs /* = 0 */)
   if (IsOpen())
     return false;
 
-  CStdString strComPath = "\\\\.\\" + m_strName;
+  std::string strComPath = "\\\\.\\" + m_strName;
   CLockObject lock(m_mutex);
   m_socket = CreateFile(strComPath.c_str(), GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
   if (m_socket == INVALID_HANDLE_VALUE)
@@ -161,7 +161,7 @@ bool CSerialSocket::Open(uint64_t iTimeoutMs /* = 0 */)
     return false;
   }
 
-  if (!SetTimeouts(m_socket, &m_iError, MAXDWORD))
+  if (!SetTimeouts(m_socket, &m_iError, 0))
   {
     m_strError = "unable to set timeouts";
     FormatWindowsError(GetLastError(), m_strError);