cec: don't hack around the issue that samsung's vendor specific keypresses aren't...

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

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 19984f0312c3b33b68eb04a6fc6a79e092001afd..f781b6fb58b94f99f970a8eb2248937f958aa1cc 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -46,8 +46,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm
     m_strDeviceName(strDeviceName),
     m_communication(serComm),
     m_controller(controller),
-    m_bMonitor(false),
-    m_bLogicalAddressSet(false)
+    m_bMonitor(false)
 {
   for (int iPtr = 0; iPtr < 16; iPtr++)
     m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, iPtr == iLogicalAddress ? iPhysicalAddress : 0);
@@ -72,12 +71,6 @@ bool CCECProcessor::Start(void)
     return false;
   }
 
-  if (!SetLogicalAddress(m_iLogicalAddress))
-  {
-    m_controller->AddLog(CEC_LOG_ERROR, "could not set the logical address");
-    return false;
-  }
-
   if (CreateThread())
   {
     if (!m_startCondition.Wait(&m_mutex))
@@ -95,17 +88,17 @@ bool CCECProcessor::Start(void)
 
 void *CCECProcessor::Process(void)
 {
+  cec_command           command;
+  CCECAdapterMessage    msg;
+
+  SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+
   {
     CLockObject lock(&m_mutex);
     m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
     m_startCondition.Signal();
   }
 
-  cec_command           command;
-  CCECAdapterMessage    msg;
-
-  m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
-
   while (!IsStopped())
   {
     bool bParseFrame(false);
@@ -115,7 +108,10 @@ void *CCECProcessor::Process(void)
     {
       CLockObject lock(&m_mutex);
       if (m_communication->IsOpen() && m_communication->Read(msg, 50))
+      {
+        m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
         bParseFrame = ParseMessage(msg) && !IsStopped();
+      }
 
       if (bParseFrame)
         command = m_currentframe;
@@ -124,13 +120,14 @@ void *CCECProcessor::Process(void)
     if (bParseFrame)
       ParseCommand(command);
 
+    Sleep(5);
+
     m_controller->CheckKeypressTimeout();
 
     for (unsigned int iDevicePtr = 0; iDevicePtr < 16; iDevicePtr++)
       m_busDevices[iDevicePtr]->PollVendorId();
 
-    if (!IsStopped())
-      Sleep(5);
+    Sleep(5);
   }
 
   return NULL;
@@ -166,21 +163,18 @@ void CCECProcessor::LogOutput(const cec_command &data)
   m_controller->AddLog(CEC_LOG_TRAFFIC, strTx.c_str());
 }
 
-bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress /* = CECDEVICE_UNKNOWN */)
+bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
 {
-  if (iLogicalAddress != CECDEVICE_UNKNOWN)
+  if (m_iLogicalAddress != iLogicalAddress)
   {
     CStdString strLog;
     strLog.Format("<< setting logical address to %1x", iLogicalAddress);
     m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
     m_iLogicalAddress = iLogicalAddress;
-    m_bLogicalAddressSet = false;
+    return SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
   }
 
-  if (!m_bLogicalAddressSet && m_iLogicalAddress != CECDEVICE_UNKNOWN)
-    m_bLogicalAddressSet = m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
-
-  return m_bLogicalAddressSet;
+  return true;
 }
 
 bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress)
@@ -201,9 +195,9 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable)
 
   m_bMonitor = bEnable;
   if (bEnable)
-    return m_communication && m_communication->SetAckMask(0);
+    return SetAckMask(0);
   else
-    return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+    return SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
 }
 
 cec_version CCECProcessor::GetDeviceCecVersion(cec_logical_address iAddress)
@@ -216,7 +210,7 @@ bool CCECProcessor::GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu
   if (m_busDevices[iAddress])
   {
     *language = m_busDevices[iAddress]->GetMenuLanguage();
-    return (strcmp(language->language, "???") == 0);
+    return (strcmp(language->language, "???") != 0);
   }
   return false;
 }
@@ -237,13 +231,19 @@ cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddres
 
 bool CCECProcessor::Transmit(const cec_command &data)
 {
-  SetLogicalAddress();
-
   bool bReturn(false);
   LogOutput(data);
 
-  CCECAdapterMessagePtr output(new CCECAdapterMessage(data));
+  CCECAdapterMessage *output = new CCECAdapterMessage(data);
+  bReturn = Transmit(output);
+  delete output;
 
+  return bReturn;
+}
+
+bool CCECProcessor::Transmit(CCECAdapterMessage *output)
+{
+  bool bReturn(false);
   CLockObject lock(&m_mutex);
   {
     CLockObject msgLock(&output->mutex);
@@ -251,7 +251,7 @@ bool CCECProcessor::Transmit(const cec_command &data)
       return bReturn;
     else
     {
-      output->condition.Wait(&output->mutex, 1000);
+      output->condition.Wait(&output->mutex);
       if (output->state != ADAPTER_MESSAGE_STATE_SENT)
       {
         m_controller->AddLog(CEC_LOG_ERROR, "command was not sent");
@@ -259,16 +259,13 @@ bool CCECProcessor::Transmit(const cec_command &data)
       }
     }
 
-    if (data.ack_timeout > 0)
+    if (output->transmit_timeout > 0)
     {
-      bool bError(false);
-      if ((bReturn = WaitForAck(&bError, output->size(), data.ack_timeout)) == false)
+      if ((bReturn = WaitForTransmitSucceeded(output->size(), output->transmit_timeout)) == false)
         m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
     }
     else
-    {
       bReturn = true;
-    }
   }
 
   return bReturn;
@@ -286,16 +283,16 @@ void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode
   Transmit(command);
 }
 
-bool CCECProcessor::WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout /* = 1000 */)
+bool CCECProcessor::WaitForTransmitSucceeded(uint8_t iLength, uint32_t iTimeout /* = 1000 */)
 {
-  bool bTransmitSucceeded = false;
+  bool bError(false);
+  bool bTransmitSucceeded(false);
   uint8_t iPacketsLeft(iLength / 4);
-  *bError = false;
 
   int64_t iNow = GetTimeMs();
   int64_t iTargetTime = iNow + (uint64_t) iTimeout;
 
-  while (!bTransmitSucceeded && !*bError && (iTimeout == 0 || iNow < iTargetTime))
+  while (!bTransmitSucceeded && !bError && (iTimeout == 0 || iNow < iTargetTime))
   {
     CCECAdapterMessage msg;
 
@@ -305,30 +302,29 @@ bool CCECProcessor::WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout
       continue;
     }
 
-    *bError = msg.is_error();
-    m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
-
-    switch(msg.message())
+    if ((bError = msg.is_error()) == false)
     {
-    case MSGCODE_COMMAND_ACCEPTED:
-      iPacketsLeft--;
-      break;
-    case MSGCODE_TRANSMIT_SUCCEEDED:
-      bTransmitSucceeded = (iPacketsLeft == 0);
-      *bError = !bTransmitSucceeded;
-      break;
-    default:
-      CStdString strLog;
-      strLog.Format("received unexpected reply '%1x' instead of ack", msg.message());
-      m_controller->AddLog(CEC_LOG_WARNING, strLog);
-      *bError = true;
-      break;
-    }
+      m_controller->AddLog(bError ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
+
+      switch(msg.message())
+      {
+      case MSGCODE_COMMAND_ACCEPTED:
+        if (iPacketsLeft > 0)
+          iPacketsLeft--;
+        break;
+      case MSGCODE_TRANSMIT_SUCCEEDED:
+        bTransmitSucceeded = (iPacketsLeft == 0);
+        bError = !bTransmitSucceeded;
+        break;
+      default:
+        ParseMessage(msg);
+      }
 
-    iNow = GetTimeMs();
+      iNow = GetTimeMs();
+    }
   }
 
-  return bTransmitSucceeded && !*bError;
+  return bTransmitSucceeded && !bError;
 }
 
 bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg)
@@ -338,8 +334,6 @@ bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg)
   if (msg.empty())
     return bEom;
 
-  m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
-
   switch(msg.message())
   {
   case MSGCODE_FRAME_START:
@@ -400,6 +394,11 @@ void CCECProcessor::AddCommand(const cec_command &command)
   m_controller->AddCommand(command);
 }
 
+void CCECProcessor::AddKey(cec_keypress &key)
+{
+  m_controller->AddKey(key);
+}
+
 void CCECProcessor::AddKey(void)
 {
   m_controller->AddKey();
@@ -409,3 +408,26 @@ void CCECProcessor::AddLog(cec_log_level level, const CStdString &strMessage)
 {
   m_controller->AddLog(level, strMessage);
 }
+
+bool CCECProcessor::SetAckMask(uint16_t iMask)
+{
+  bool bReturn(false);
+  CStdString strLog;
+  strLog.Format("setting ackmask to %2x", iMask);
+  m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
+  CCECAdapterMessage *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 ((bReturn = Transmit(output)) == false)
+    m_controller->AddLog(CEC_LOG_ERROR, "could not set the ackmask");
+
+  delete output;
+
+  return bReturn;
+}