cec: added a couple of debug lines
[deb_libcec.git] / src / lib / implementations / SLCommandHandler.cpp
index 2a8beab45226c85ceea6ce08b718681d4519e1e8..4d95fad47e4d11b9ff945dbdc824187dffb5176d 100644 (file)
@@ -34,6 +34,7 @@
 #include "../devices/CECBusDevice.h"
 #include "../devices/CECPlaybackDevice.h"
 #include "../CECProcessor.h"
+#include "../LibCEC.h"
 
 using namespace CEC;
 
@@ -44,13 +45,14 @@ using namespace CEC;
 #define SL_COMMAND_REQUEST_POWER_STATUS 0xa0
 #define SL_COMMAND_POWER_ON             0x03
 #define SL_COMMAND_CONNECT_REQUEST      0x04
-#define SL_COMMAND_CONNECT_ACCEPT       0x05
+#define SL_COMMAND_SET_DEVICE_MODE      0x05
 
 CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice) :
     CCECCommandHandler(busDevice),
     m_bSLEnabled(false),
     m_bPowerStateReset(false),
-    m_bActiveSourceSent(false)
+    m_bActiveSourceSent(false),
+    m_bVendorIdSent(false)
 {
   m_vendorId = CEC_VENDOR_LG;
   CCECBusDevice *primary = m_processor->GetPrimaryDevice();
@@ -76,19 +78,34 @@ bool CSLCommandHandler::InitHandler(void)
     return true;
   m_bHandlerInited = true;
 
-  /* reply with LGs vendor id */
   CCECBusDevice *primary = m_processor->GetPrimaryDevice();
   if (m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
-    primary->TransmitVendorID(CECDEVICE_TV, false);
+  {
+    /* start as 'in transition standby->on' */
+    primary->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
+    primary->TransmitPowerState(CECDEVICE_TV);
+  }
 
-  primary->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
   return true;
 }
 
 bool CSLCommandHandler::ActivateSource(void)
 {
+  /* reply with LGs vendor id */
+  if (!m_bVendorIdSent)
+  {
+    m_bVendorIdSent = true;
+    m_processor->GetPrimaryDevice()->TransmitVendorID(CECDEVICE_BROADCAST, false);
+  }
+
+  if (!m_bSLEnabled)
+  {
+    CLibCEC::AddLog(CEC_LOG_NOTICE, "not activating the source until SL has been initialised");
+    return true;
+  }
+
   if (m_bActiveSourceSent)
-    return false;
+    return true;
   m_bActiveSourceSent = true;
 
   CCECBusDevice *primary = m_processor->GetPrimaryDevice();
@@ -103,7 +120,10 @@ bool CSLCommandHandler::HandleActiveSource(const cec_command &command)
   {
     uint16_t iAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
     if (iAddress != m_busDevice->GetPhysicalAddress(false))
+    {
+      CLibCEC::AddLog(CEC_LOG_NOTICE, "resetting SL initialised state");
       m_bSLEnabled = false;
+    }
     return m_processor->SetActiveSource(iAddress);
   }
 
@@ -114,23 +134,13 @@ bool CSLCommandHandler::HandleDeviceVendorId(const cec_command &command)
 {
   SetVendorId(command);
 
-  cec_command response;
-  cec_command::Format(response, m_processor->GetLogicalAddress(), command.initiator, CEC_OPCODE_FEATURE_ABORT);
-  return Transmit(response);
-}
-
-bool CSLCommandHandler::HandleFeatureAbort(const cec_command &command)
-{
-  CCECBusDevice *primary = m_processor->GetPrimaryDevice();
-  if (primary->GetPowerStatus(false) == CEC_POWER_STATUS_ON && !m_bPowerStateReset && !m_bSLEnabled)
+  if (!m_bSLEnabled)
   {
-    // reset to standby->on while SL hasn't been initialised
-    m_bPowerStateReset = true;
-    m_bActiveSourceSent = false;
-    primary->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
+    cec_command response;
+    cec_command::Format(response, m_processor->GetLogicalAddress(), command.initiator, CEC_OPCODE_FEATURE_ABORT);
+    return Transmit(response);
   }
-
-  return CCECCommandHandler::HandleFeatureAbort(command);
+  return true;
 }
 
 bool CSLCommandHandler::HandleGivePhysicalAddress(const cec_command &command)
@@ -220,18 +230,17 @@ void CSLCommandHandler::HandleVendorCommandPowerOnStatus(const cec_command &comm
 void CSLCommandHandler::HandleVendorCommandSLConnect(const cec_command &command)
 {
   m_bSLEnabled = true;
-  CCECBusDevice *primary = m_processor->GetPrimaryDevice();
-  primary->SetPowerStatus(CEC_POWER_STATUS_ON);
+  TransmitVendorCommandSetDeviceMode(m_processor->GetLogicalAddress(), command.initiator, CEC_DEVICE_TYPE_RECORDING_DEVICE);
 
-  TransmitVendorCommand05(primary->GetLogicalAddress(), command.initiator);
+  ActivateSource();
 }
 
-void CSLCommandHandler::TransmitVendorCommand05(const cec_logical_address iSource, const cec_logical_address iDestination)
+void CSLCommandHandler::TransmitVendorCommandSetDeviceMode(const cec_logical_address iSource, const cec_logical_address iDestination, const cec_device_type type)
 {
   cec_command response;
   cec_command::Format(response, iSource, iDestination, CEC_OPCODE_VENDOR_COMMAND);
-  response.PushBack(SL_COMMAND_CONNECT_ACCEPT);
-  response.PushBack((uint8_t)m_processor->m_busDevices[iSource]->GetType());
+  response.PushBack(SL_COMMAND_SET_DEVICE_MODE);
+  response.PushBack((uint8_t)type);
   Transmit(response, false);
 }
 
@@ -244,15 +253,16 @@ bool CSLCommandHandler::HandleGiveDeckStatus(const cec_command &command)
     {
       if (command.parameters.size > 0)
       {
-        ((CCECPlaybackDevice *) device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
         if (command.parameters[0] == CEC_STATUS_REQUEST_ON)
         {
+          ((CCECPlaybackDevice *) device)->SetDeckStatus(CEC_DECK_INFO_STOP);
           return ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator) &&
               device->TransmitImageViewOn() &&
               device->TransmitPhysicalAddress();
         }
         else if (command.parameters[0] == CEC_STATUS_REQUEST_ONCE)
         {
+          ((CCECPlaybackDevice *) device)->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
           return ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator);
         }
       }
@@ -265,17 +275,78 @@ bool CSLCommandHandler::HandleGiveDeckStatus(const cec_command &command)
 
 bool CSLCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command)
 {
+  bool bReturn(false);
   if (m_processor->IsRunning() && m_busDevice->MyLogicalAddressContains(command.destination))
   {
     CCECBusDevice *device = GetDevice(command.destination);
     if (device && device->GetPowerStatus(false) != CEC_POWER_STATUS_ON)
-      return device->TransmitPowerState(command.initiator);
-    else if (!ActivateSource())
     {
-      // assume that we've bugged out, reset
-      device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
+      bReturn = device->TransmitPowerState(command.initiator);
+      device->SetPowerStatus(CEC_POWER_STATUS_ON);
+    }
+    else
+    {
+      if (!m_bActiveSourceSent)
+      {
+        device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
+        bReturn = device->TransmitPowerState(command.initiator);
+        ActivateSource();
+      }
+      else if (m_resetPowerState.IsSet() && m_resetPowerState.TimeLeft() > 0)
+      {
+        /* assume that we've bugged out */
+        CLibCEC::AddLog(CEC_LOG_NOTICE, "LG seems to have bugged out. resetting to 'in transition standby to on'");
+        m_bActiveSourceSent = false;
+        device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
+        bReturn = device->TransmitPowerState(command.initiator);
+        device->SetPowerStatus(CEC_POWER_STATUS_ON);
+        m_resetPowerState.Init(5000);
+      }
+      else
+      {
+        bReturn = device->TransmitPowerState(command.initiator);
+        m_resetPowerState.Init(5000);
+      }
     }
   }
 
+  return bReturn;
+}
+
+bool CSLCommandHandler::HandleRequestActiveSource(const cec_command &command)
+{
+  if (m_processor->IsRunning())
+  {
+    CLibCEC::AddLog(CEC_LOG_DEBUG, ">> %i requests active source, ignored", (uint8_t) command.initiator);
+    return true;
+  }
   return false;
 }
+
+bool CSLCommandHandler::HandleFeatureAbort(const cec_command &command)
+{
+  if (command.parameters.size == 0 && m_processor->GetPrimaryDevice()->GetPowerStatus() == CEC_POWER_STATUS_ON && !m_bSLEnabled)
+  {
+    m_processor->GetPrimaryDevice()->TransmitPowerState(command.initiator);
+    m_processor->GetPrimaryDevice()->TransmitVendorID(CECDEVICE_BROADCAST, false);
+  }
+
+  return CCECCommandHandler::HandleFeatureAbort(command);
+}
+
+bool CSLCommandHandler::HandleStandby(const cec_command &command)
+{
+  if (command.initiator == CECDEVICE_TV)
+  {
+    CLibCEC::AddLog(CEC_LOG_NOTICE, "resetting SL initialised state");
+    m_bSLEnabled = false;
+    m_bPowerStateReset = false;
+    m_bActiveSourceSent = false;
+  }
+
+  CCECBusDevice *device = GetDevice(command.initiator);
+  if (device)
+    device->SetPowerStatus(CEC_POWER_STATUS_STANDBY);
+
+  return true;
+}