cec: moved SetAckMask() back to CCECProcessor, so the result can be processed properly

[deb_libcec.git] / src / lib / AdapterCommunication.cpp

diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp
index 122565ee4093b87e6fddf618e9479a1afdf991cf..e94e8c01b1880095887df982bc6b0c93fe046cab 100644 (file)
--- a/src/lib/AdapterCommunication.cpp
+++ b/src/lib/AdapterCommunication.cpp
@@ -80,6 +80,9 @@ CCECAdapterMessage::CCECAdapterMessage(const cec_command &command)
 
     push_back(MSGEND);
   }
+
+  // set timeout
+  transmit_timeout = command.transmit_timeout;
 }
 
 CCECAdapterMessage &CCECAdapterMessage::operator =(const CCECAdapterMessage &msg)
@@ -310,6 +313,7 @@ void *CAdapterCommunication::Process(void)
   while (!IsStopped())
   {
     ReadFromDevice(500);
+    Sleep(5);
     WriteNextCommand();
     Sleep(5);
   }
@@ -457,32 +461,6 @@ bool CAdapterCommunication::StartBootloader(void)
   return true;
 }
 
-bool CAdapterCommunication::SetAckMask(uint16_t iMask)
-{
-  if (!IsRunning())
-    return false;
-
-  CStdString strLog;
-  strLog.Format("setting ackmask to %2x", iMask);
-  m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
-
-  CCECAdapterMessagePtr output(new CCECAdapterMessage);
-
-  output->push_back(MSGSTART);
-  output->push_escaped(MSGCODE_SET_ACK_MASK);
-  output->push_escaped(iMask >> 8);
-  output->push_escaped((uint8_t)iMask);
-  output->push_back(MSGEND);
-
-  if (!Write(output))
-  {
-    m_controller->AddLog(CEC_LOG_ERROR, "could not set the ackmask");
-    return false;
-  }
-
-  return true;
-}
-
 bool CAdapterCommunication::PingAdapter(void)
 {
   if (!IsRunning())