#include "../LibCEC.h"
using namespace CEC;
+using namespace PLATFORM;
#define SL_COMMAND_UNKNOWN_01 0x01
#define SL_COMMAND_UNKNOWN_02 0x02
-#define SL_COMMAND_UNKNOWN_03 0x05
+
+#define SL_COMMAND_TYPE_HDDRECORDER_DISC 0x01
+#define SL_COMMAND_TYPE_VCR 0x02
+#define SL_COMMAND_TYPE_DVDPLAYER 0x03
+#define SL_COMMAND_TYPE_HDDRECORDER_DISC2 0x04
+#define SL_COMMAND_TYPE_HDDRECORDER 0x05
#define SL_COMMAND_REQUEST_POWER_STATUS 0xa0
#define SL_COMMAND_POWER_ON 0x03
CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice) :
CCECCommandHandler(busDevice),
m_bSLEnabled(false),
- m_bPowerStateReset(false),
- m_bActiveSourceSent(false),
- m_bVendorIdSent(false)
+ m_bActiveSourceSent(false)
{
m_vendorId = CEC_VENDOR_LG;
CCECBusDevice *primary = m_processor->GetPrimaryDevice();
/* 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;
- CCECBusDevice *primary = m_processor->GetPrimaryDevice();
- if (m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
+ if (m_busDevice->GetLogicalAddress() == CECDEVICE_TV)
{
+ CCECBusDevice *primary = m_processor->GetPrimaryDevice();
+
/* 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);
}
return true;
bool CSLCommandHandler::ActivateSource(void)
{
- /* reply with LGs vendor id */
- if (!m_bVendorIdSent)
+ if (!SLInitialised())
{
- 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 true;
- m_bActiveSourceSent = 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() && command.initiator == CECDEVICE_TV)
{
cec_command response;
cec_command::Format(response, m_processor->GetLogicalAddress(), command.initiator, CEC_OPCODE_FEATURE_ABORT);
bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
{
+ if (!m_busDevice->MyLogicalAddressContains(command.destination))
+ return true;
+
if (command.parameters.size == 1 &&
command.parameters[0] == SL_COMMAND_UNKNOWN_01)
{
cec_command response;
cec_command::Format(response, iSource, iDestination, CEC_OPCODE_VENDOR_COMMAND);
response.PushBack(SL_COMMAND_UNKNOWN_02);
- response.PushBack(SL_COMMAND_UNKNOWN_03);
+ response.PushBack(SL_COMMAND_TYPE_HDDRECORDER);
Transmit(response, false);
}
void CSLCommandHandler::HandleVendorCommandPowerOn(const cec_command &command)
{
+ if (command.initiator != CECDEVICE_TV)
+ return;
+
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();
bool CSLCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command)
{
bool bReturn(false);
- if (m_processor->IsRunning() && m_busDevice->MyLogicalAddressContains(command.destination))
+ if (m_processor->IsRunning() && m_busDevice->MyLogicalAddressContains(command.destination) && command.initiator == CECDEVICE_TV)
{
CCECBusDevice *device = GetDevice(command.destination);
if (device && device->GetPowerStatus(false) != CEC_POWER_STATUS_ON)
}
else
{
- if (!m_bActiveSourceSent)
+ if (!ActiveSourceSent())
{
device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
bReturn = device->TransmitPowerState(command.initiator);
}
else if (m_resetPowerState.IsSet() && m_resetPowerState.TimeLeft() > 0)
{
- /* assume that we've bugged out */
+ /* TODO assume that we've bugged out. the return button no longer works after this */
CLibCEC::AddLog(CEC_LOG_NOTICE, "LG seems to have bugged out. resetting to 'in transition standby to on'");
- m_bActiveSourceSent = false;
+ {
+ 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);
bool CSLCommandHandler::HandleFeatureAbort(const cec_command &command)
{
- if (command.parameters.size == 0 && m_processor->GetPrimaryDevice()->GetPowerStatus() == CEC_POWER_STATUS_ON && !m_bSLEnabled)
+ if (command.parameters.size == 0 && m_processor->GetPrimaryDevice()->GetPowerStatus() == CEC_POWER_STATUS_ON && !SLInitialised() &&
+ command.initiator == CECDEVICE_TV)
{
m_processor->GetPrimaryDevice()->TransmitPowerState(command.initiator);
m_processor->GetPrimaryDevice()->TransmitVendorID(CECDEVICE_BROADCAST, false);
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;
+}
+
+bool CSLCommandHandler::PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination)
+{
+ if (iDestination != CECDEVICE_TV)
{
- m_bSLEnabled = false;
- m_bPowerStateReset = false;
- m_bActiveSourceSent = false;
+ cec_command command;
+ cec_command::Format(command, CECDEVICE_TV, iDestination, CEC_OPCODE_VENDOR_COMMAND);
+ command.PushBack(SL_COMMAND_POWER_ON);
+ command.PushBack(0);
+ return Transmit(command);
}
- CCECBusDevice *device = GetDevice(command.initiator);
- if (device)
- device->SetPowerStatus(CEC_POWER_STATUS_STANDBY);
-
- return true;
+ return CCECCommandHandler::PowerOn(iInitiator, iDestination);
}
repositories / deb_libcec.git / blobdiff