X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=cab483fee4bcb14b6319765785e6e1df3bbf65e3;hb=e0407d3d1acb140e344b95c248259474a44ad89b;hp=e3f75173f7ca619e184582e11bb6f9fe0792d3c2;hpb=e4613795644dcebc6601fe65b148f05f97ad48e2;p=deb_libcec.git

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index e3f7517..cab483f 100644
--- 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,18 +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;
-  CCECAdapterMessagePtr msgPtr;
-
-  m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
-
   while (!IsStopped())
   {
     bool bParseFrame(false);
@@ -115,15 +107,12 @@ void *CCECProcessor::Process(void)
 
     {
       CLockObject lock(&m_mutex);
-      if (m_frameBuffer.Pop(msgPtr))
-        bParseFrame = ParseMessage(msgPtr);
-      else if (m_communication->IsOpen() && m_communication->Read(msg, 50))
+      if (m_communication->IsOpen() && m_communication->Read(msg, 50))
       {
-        msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg));
-        bParseFrame = ParseMessage(msgPtr);
+        m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
+        bParseFrame = ParseMessage(msg) && !IsStopped();
       }
 
-      bParseFrame &= !IsStopped();
       if (bParseFrame)
         command = m_currentframe;
     }
@@ -131,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;
@@ -173,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)
@@ -208,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)
@@ -223,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;
 }
@@ -244,13 +231,15 @@ 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));
+  return Transmit(output);
+}
 
+bool CCECProcessor::Transmit(CCECAdapterMessagePtr output)
+{
+  bool bReturn(false);
   CLockObject lock(&m_mutex);
   {
     CLockObject msgLock(&output->mutex);
@@ -266,16 +255,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;
@@ -293,16 +279,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;
 
@@ -312,159 +298,65 @@ 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())
     {
-    case MSGCODE_TIMEOUT_ERROR:
-    case MSGCODE_HIGH_ERROR:
-    case MSGCODE_LOW_ERROR:
-      {
-        CStdString logStr;
-        if (msg.message() == MSGCODE_TIMEOUT_ERROR)
-          logStr = "MSGCODE_TIMEOUT";
-        else if (msg.message() == MSGCODE_HIGH_ERROR)
-          logStr = "MSGCODE_HIGH_ERROR";
-        else
-          logStr = "MSGCODE_LOW_ERROR";
-
-        int iLine      = (msg.size() >= 3) ? (msg[1] << 8) | (msg[2]) : 0;
-        uint32_t iTime = (msg.size() >= 7) ? (msg[3] << 24) | (msg[4] << 16) | (msg[5] << 8) | (msg[6]) : 0;
-        logStr.AppendFormat(" line:%i", iLine);
-        logStr.AppendFormat(" time:%u", iTime);
-        m_controller->AddLog(CEC_LOG_WARNING, logStr.c_str());
-        *bError = true;
-      }
-      break;
     case MSGCODE_COMMAND_ACCEPTED:
-      m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_COMMAND_ACCEPTED");
-      iPacketsLeft--;
+      if (iPacketsLeft > 0)
+        iPacketsLeft--;
       break;
     case MSGCODE_TRANSMIT_SUCCEEDED:
-      m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_TRANSMIT_SUCCEEDED");
       bTransmitSucceeded = (iPacketsLeft == 0);
-      *bError = !bTransmitSucceeded;
-      break;
-    case MSGCODE_RECEIVE_FAILED:
-      m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_RECEIVE_FAILED");
-      *bError = true;
-      break;
-    case MSGCODE_COMMAND_REJECTED:
-      m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_COMMAND_REJECTED");
-      *bError = true;
-      break;
-    case MSGCODE_TRANSMIT_FAILED_LINE:
-      m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_LINE");
-      *bError = true;
-      break;
-    case MSGCODE_TRANSMIT_FAILED_ACK:
-      m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_ACK");
-      *bError = true;
-      break;
-    case MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA:
-      m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA");
-      *bError = true;
-      break;
-    case MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE:
-      m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE");
-      *bError = true;
+      bError = !bTransmitSucceeded;
       break;
     default:
-      CCECAdapterMessagePtr msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg));
-      m_frameBuffer.Push(msgPtr);
+      CStdString strLog;
+      strLog.Format("received unexpected reply '%s' instead of ack", msg.MessageCodeAsString().c_str());
+      m_controller->AddLog(CEC_LOG_WARNING, strLog);
+      ParseMessage(msg);
+      bError = true;
       break;
     }
 
     iNow = GetTimeMs();
   }
 
-  return bTransmitSucceeded && !*bError;
+  return bTransmitSucceeded && !bError;
 }
 
-bool CCECProcessor::ParseMessage(CCECAdapterMessagePtr msg)
+bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg)
 {
   bool bEom = false;
 
-  if (msg->empty())
+  if (msg.empty())
     return bEom;
 
-  CStdString logStr;
-
-  switch(msg->message())
+  switch(msg.message())
   {
-  case MSGCODE_NOTHING:
-    m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_NOTHING");
-    break;
-  case MSGCODE_TIMEOUT_ERROR:
-  case MSGCODE_HIGH_ERROR:
-  case MSGCODE_LOW_ERROR:
-    {
-      if (msg->message() == MSGCODE_TIMEOUT_ERROR)
-        logStr = "MSGCODE_TIMEOUT";
-      else if (msg->message() == MSGCODE_HIGH_ERROR)
-        logStr = "MSGCODE_HIGH_ERROR";
-      else
-        logStr = "MSGCODE_LOW_ERROR";
-
-      int iLine      = (msg->size() >= 3) ? (msg->at(1) << 8) | (msg->at(2)) : 0;
-      uint32_t iTime = (msg->size() >= 7) ? (msg->at(3) << 24) | (msg->at(4) << 16) | (msg->at(5) << 8) | (msg->at(6)) : 0;
-      logStr.AppendFormat(" line:%i", iLine);
-      logStr.AppendFormat(" time:%u", iTime);
-      m_controller->AddLog(CEC_LOG_WARNING, logStr.c_str());
-    }
-    break;
   case MSGCODE_FRAME_START:
     {
-      logStr = "MSGCODE_FRAME_START";
       m_currentframe.clear();
-      if (msg->size() >= 2)
+      if (msg.size() >= 2)
       {
-        logStr.AppendFormat(" initiator:%u destination:%u ack:%s %s", msg->initiator(), msg->destination(), msg->ack() ? "high" : "low", msg->eom() ? "eom" : "");
-        m_currentframe.initiator   = msg->initiator();
-        m_currentframe.destination = msg->destination();
-        m_currentframe.ack         = msg->ack();
-        m_currentframe.eom         = msg->eom();
+        m_currentframe.initiator   = msg.initiator();
+        m_currentframe.destination = msg.destination();
+        m_currentframe.ack         = msg.ack();
+        m_currentframe.eom         = msg.eom();
       }
-      m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
     }
     break;
   case MSGCODE_FRAME_DATA:
     {
-      logStr = "MSGCODE_FRAME_DATA";
-      if (msg->size() >= 2)
+      if (msg.size() >= 2)
       {
-        uint8_t iData = msg->at(1);
-        logStr.AppendFormat(" %02x", iData);
-        m_currentframe.push_back(iData);
-        m_currentframe.eom = msg->eom();
+        m_currentframe.push_back(msg[1]);
+        m_currentframe.eom = msg.eom();
       }
-      m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
-
-      bEom = msg->eom();
+      bEom = msg.eom();
     }
     break;
-  case MSGCODE_COMMAND_ACCEPTED:
-    m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_COMMAND_ACCEPTED");
-    break;
-  case MSGCODE_TRANSMIT_SUCCEEDED:
-    m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_TRANSMIT_SUCCEEDED");
-    break;
-  case MSGCODE_RECEIVE_FAILED:
-    m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_RECEIVE_FAILED");
-    break;
-  case MSGCODE_COMMAND_REJECTED:
-    m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_COMMAND_REJECTED");
-    break;
-  case MSGCODE_TRANSMIT_FAILED_LINE:
-    m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_LINE");
-    break;
-  case MSGCODE_TRANSMIT_FAILED_ACK:
-    m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_ACK");
-    break;
-  case MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA:
-    m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA");
-    break;
-  case MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE:
-    m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE");
-    break;
   default:
     break;
   }
@@ -498,7 +390,7 @@ void CCECProcessor::SetCurrentButton(cec_user_control_code iButtonCode)
 
 void CCECProcessor::AddCommand(const cec_command &command)
 {
-  m_controller->AddCommand(command);
+//  m_controller->AddCommand(command);
 }
 
 void CCECProcessor::AddKey(void)
@@ -510,3 +402,26 @@ void CCECProcessor::AddLog(cec_log_level level, const CStdString &strMessage)
 {
   m_controller->AddLog(level, strMessage);
 }
+
+bool CCECProcessor::SetAckMask(uint16_t iMask)
+{
+  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 (!Transmit(output))
+  {
+    m_controller->AddLog(CEC_LOG_ERROR, "could not set the ackmask");
+    return false;
+  }
+
+  return true;
+}