cec: forgot the return value in HanldeFeatureAbort()

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

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index ec0eb554d62a3e23ab1723bc2604f8c93693f59a..5b1c06ea98b39e2da2da9f206a7803243452680d 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -55,7 +55,6 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, cec
     m_strDeviceName(strDeviceName),
     m_controller(controller),
     m_bMonitor(false),
-    m_busScan(NULL),
     m_iStandardLineTimeout(3),
     m_iRetryLineTimeout(3),
     m_iLastTransmission(0)
@@ -150,20 +149,31 @@ bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */,
       m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
       return false;
     }
-
     lock.Leave();
 
+    if (m_logicalAddresses.IsEmpty() && !FindLogicalAddresses())
+    {
+      m_controller->AddLog(CEC_LOG_ERROR, "could not detect our logical addresses");
+      StopThread(true);
+      return false;
+    }
+    else
+    {
+      /* only set our OSD name and active source for the primary device */
+      m_busDevices[m_logicalAddresses.primary]->m_strDeviceName = m_strDeviceName;
+      m_busDevices[m_logicalAddresses.primary]->m_bActiveSource = true;
+
+      SetAckMask(m_logicalAddresses.AckMask());
+    }
+
     m_busDevices[CECDEVICE_TV]->GetVendorId();
 
     if (SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true))
     {
-      /* init the default handler */
-      if (m_busDevices[CECDEVICE_TV]->GetHandler()->GetVendorId() == CEC_VENDOR_UNKNOWN)
-        m_busDevices[CECDEVICE_TV]->GetHandler()->InitHandler();
+      /* init the handler */
+      m_busDevices[CECDEVICE_TV]->GetHandler()->InitHandler();
 
       m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
-      m_busScan = new CCECBusScan(this);
-      m_busScan->CreateThread(true);
       return true;
     }
     else
@@ -251,21 +261,7 @@ void *CCECProcessor::Process(void)
   cec_command           command;
   CCECAdapterMessage    msg;
 
-  if (m_logicalAddresses.IsEmpty() && !FindLogicalAddresses())
   {
-    CLockObject lock(&m_mutex);
-    m_controller->AddLog(CEC_LOG_ERROR, "could not detect our logical addresses");
-    m_startCondition.Signal();
-    return NULL;
-  }
-  else
-  {
-    /* only set our OSD name and active source for the primary device */
-    m_busDevices[m_logicalAddresses.primary]->m_strDeviceName = m_strDeviceName;
-    m_busDevices[m_logicalAddresses.primary]->m_bActiveSource = true;
-
-    SetAckMask(m_logicalAddresses.AckMask());
-
     CLockObject lock(&m_mutex);
     m_bStarted = true;
     m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
@@ -299,13 +295,6 @@ void *CCECProcessor::Process(void)
     m_controller->CheckKeypressTimeout();
   }
 
-  if (m_busScan)
-  {
-    m_busScan->StopThread();
-    delete m_busScan;
-    m_busScan = NULL;
-  }
-
   if (m_communication)
     m_communication->Close();
 
@@ -435,35 +424,17 @@ bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort,
   }
   else
   {
-    uint16_t iPos = 0;
     if (iPhysicalAddress == 0)
-      iPos = 0x1000;
+      iPhysicalAddress += 0x1000 * iPort;
     else if (iPhysicalAddress % 0x1000 == 0)
-      iPos = 0x100;
+      iPhysicalAddress += 0x100 * iPort;
     else if (iPhysicalAddress % 0x100 == 0)
-      iPos = 0x10;
+      iPhysicalAddress += 0x10 * iPort;
     else if (iPhysicalAddress % 0x10 == 0)
-      iPos = 0x1;
+      iPhysicalAddress += iPort;
 
-    while(!bReturn && iPos > 0)
-    {
-      iPhysicalAddress += (uint16_t)(iPort * iPos);
-      strLog.Format("checking physical address %4x", iPhysicalAddress);
-      AddLog(CEC_LOG_DEBUG, strLog);
-      if (PhysicalAddressInUse(iPhysicalAddress))
-      {
-        strLog.Format("physical address %4x is in use", iPhysicalAddress);
-        AddLog(CEC_LOG_DEBUG, strLog);
-        iPos = (iPos == 1) ? 0 : iPos / 0x10;
-      }
-      else
-      {
-        strLog.Format("physical address %4x is free", iPhysicalAddress);
-        AddLog(CEC_LOG_DEBUG, strLog);
-        SetPhysicalAddress(iPhysicalAddress);
-        bReturn = true;
-      }
-    }
+    SetPhysicalAddress(iPhysicalAddress);
+    bReturn = true;
   }
 
   return bReturn;
@@ -555,24 +526,6 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable)
   {
     CLockObject lock(&m_mutex);
     m_bMonitor = bEnable;
-
-    if (!bEnable)
-    {
-      if (!m_busScan)
-      {
-        m_busScan = new CCECBusScan(this);
-        m_busScan->CreateThread(true);
-      }
-    }
-    else
-    {
-      if (m_busScan)
-      {
-        m_busScan->StopThread();
-        delete m_busScan;
-        m_busScan = NULL;
-      }
-    }
   }
 
   if (bEnable)
@@ -1020,12 +973,12 @@ bool CCECProcessor::SetAckMask(uint16_t iMask)
 
 bool CCECProcessor::TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = true */)
 {
-  return m_busDevices[iDestination]->TransmitKeypress(key);
+  return m_busDevices[iDestination]->TransmitKeypress(key, bWait);
 }
 
 bool CCECProcessor::TransmitKeyRelease(cec_logical_address iDestination, bool bWait /* = true */)
 {
-  return m_busDevices[iDestination]->TransmitKeyRelease();
+  return m_busDevices[iDestination]->TransmitKeyRelease(bWait);
 }
 
 const char *CCECProcessor::ToString(const cec_menu_state state)