#include "../LibCEC.h"
using namespace CEC;
+using namespace PLATFORM;
#define SL_COMMAND_UNKNOWN_01 0x01
#define SL_COMMAND_UNKNOWN_02 0x02
CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice) :
CCECCommandHandler(busDevice),
m_bSLEnabled(false),
- m_bPowerStateReset(false),
m_bActiveSourceSent(false)
{
m_vendorId = CEC_VENDOR_LG;
/* imitate LG devices */
if (primary && m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
+ {
primary->SetVendorId(CEC_VENDOR_LG);
+ primary->ReplaceHandler(false);
+ }
/* LG TVs don't always reply to CEC version requests, so just set it to 1.3a */
if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
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);
+
+ /* send the vendor id */
+ primary->TransmitVendorID(CECDEVICE_BROADCAST);
+ }
- primary->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
return true;
}
bool CSLCommandHandler::ActivateSource(void)
{
- if (m_bActiveSourceSent)
- return false;
- m_bActiveSourceSent = true;
+ if (!SLInitialised())
+ {
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "not activating the source until SL has been initialised");
+ return true;
+ }
+
+ {
+ CLockObject lock(m_SLMutex);
+ if (m_bActiveSourceSent)
+ return true;
+ m_bActiveSourceSent = true;
+ }
CCECBusDevice *primary = m_processor->GetPrimaryDevice();
primary->SetActiveSource();
{
uint16_t iAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
if (iAddress != m_busDevice->GetPhysicalAddress(false))
- m_bSLEnabled = false;
+ {
+ ResetSLState();
+ }
return m_processor->SetActiveSource(iAddress);
}
{
SetVendorId(command);
- if (!m_bSLEnabled)
+ if (!SLInitialised())
{
cec_command response;
cec_command::Format(response, m_processor->GetLogicalAddress(), command.initiator, CEC_OPCODE_FEATURE_ABORT);
CCECBusDevice *device = m_processor->GetPrimaryDevice();
if (device)
{
- m_bSLEnabled = true;
+ SetSLInitialised();
device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON); //XXX
device->TransmitPowerState(command.initiator);
void CSLCommandHandler::HandleVendorCommandSLConnect(const cec_command &command)
{
- m_bSLEnabled = true;
+ SetSLInitialised();
TransmitVendorCommandSetDeviceMode(m_processor->GetLogicalAddress(), command.initiator, CEC_DEVICE_TYPE_RECORDING_DEVICE);
ActivateSource();
bReturn = device->TransmitPowerState(command.initiator);
device->SetPowerStatus(CEC_POWER_STATUS_ON);
}
- else if (!ActivateSource())
- {
- /* 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);
- }
else
{
- bReturn = true;
+ if (!ActiveSourceSent())
+ {
+ 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'");
+ {
+ CLockObject lock(m_SLMutex);
+ 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 false;
}
+
+bool CSLCommandHandler::HandleFeatureAbort(const cec_command &command)
+{
+ if (command.parameters.size == 0 && m_processor->GetPrimaryDevice()->GetPowerStatus() == CEC_POWER_STATUS_ON && !SLInitialised())
+ {
+ 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)
+ ResetSLState();
+
+ return CCECCommandHandler::HandleStandby(command);
+}
+
+void CSLCommandHandler::ResetSLState(void)
+{
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "resetting SL initialised state");
+ CLockObject lock(m_SLMutex);
+ m_bSLEnabled = false;
+ m_bActiveSourceSent = false;
+ m_processor->GetPrimaryDevice()->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
+}
+
+void CSLCommandHandler::SetSLInitialised(void)
+{
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "SL initialised");
+ CLockObject lock(m_SLMutex);
+ m_bSLEnabled = true;
+}
+
+bool CSLCommandHandler::SLInitialised(void)
+{
+ CLockObject lock(m_SLMutex);
+ return m_bSLEnabled;
+}
+
+bool CSLCommandHandler::ActiveSourceSent(void)
+{
+ CLockObject lock(m_SLMutex);
+ return m_bActiveSourceSent;
+}