X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Flib%2FAdapterCommunication.cpp;h=8d351f058a49164409bd11380211934aa1d650a7;hb=d0d8b3c000e1aa12feeb555c2240e026c4a3dcf5;hp=93648742825ce3f089013615d119afae827bf114;hpb=1de6617c9b9b4c83f7d1318038dcd9a20b9612e6;p=deb_libcec.git

diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp
index 9364874..8d351f0 100644
--- a/src/lib/AdapterCommunication.cpp
+++ b/src/lib/AdapterCommunication.cpp
@@ -265,7 +265,11 @@ CAdapterCommunication::~CAdapterCommunication(void)
 
 bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
 {
+  uint64_t iNow = GetTimeMs();
+  uint64_t iTimeout = iNow + iTimeoutMs;
+
   CLockObject lock(&m_mutex);
+
   if (!m_port)
   {
     m_processor->AddLog(CEC_LOG_ERROR, "port is NULL");
@@ -275,12 +279,23 @@ bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38
   if (IsOpen())
   {
     m_processor->AddLog(CEC_LOG_ERROR, "port is already open");
+    return true;
   }
 
-  if (!m_port->Open(strPort, iBaudRate))
+  CStdString strError;
+  bool bConnected(false);
+  while (!bConnected && iNow < iTimeout)
+  {
+    if ((bConnected = m_port->Open(strPort, iBaudRate)) == false)
+    {
+      strError.Format("error opening serial port '%s': %s", strPort, m_port->GetError().c_str());
+      Sleep(250);
+      iNow = GetTimeMs();
+    }
+  }
+
+  if (!bConnected)
   {
-    CStdString strError;
-    strError.Format("error opening serial port '%s': %s", strPort, m_port->GetError().c_str());
     m_processor->AddLog(CEC_LOG_ERROR, strError);
     return false;
   }
@@ -302,9 +317,6 @@ bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38
     m_processor->AddLog(CEC_LOG_DEBUG, "could not create a communication thread");
   }
 
-  //TODO implement the timeout. use the variable for now to silence the compiler warning
-  iTimeoutMs = 0;
-
   return false;
 }