/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
* http://www.pulse-eight.net/
*/
+#include "env.h"
#include "SLCommandHandler.h"
-#include "../devices/CECBusDevice.h"
-#include "../devices/CECPlaybackDevice.h"
-#include "../CECProcessor.h"
-#include "../LibCEC.h"
+
+#include "lib/platform/util/timeutils.h"
+#include "lib/devices/CECBusDevice.h"
+#include "lib/devices/CECPlaybackDevice.h"
+#include "lib/CECProcessor.h"
+#include "lib/LibCEC.h"
using namespace CEC;
using namespace PLATFORM;
#define LIB_CEC m_busDevice->GetProcessor()->GetLib()
#define ToString(p) LIB_CEC->ToString(p)
-CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice) :
- CCECCommandHandler(busDevice),
+CSLCommandHandler::CSLCommandHandler(CCECBusDevice *busDevice,
+ int32_t iTransmitTimeout /* = CEC_DEFAULT_TRANSMIT_TIMEOUT */,
+ int32_t iTransmitWait /* = CEC_DEFAULT_TRANSMIT_WAIT */,
+ int8_t iTransmitRetries /* = CEC_DEFAULT_TRANSMIT_RETRIES */,
+ int64_t iActiveSourcePending /* = 0 */) :
+ CCECCommandHandler(busDevice, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending),
m_bSLEnabled(false),
m_bActiveSourceSent(false)
{
return true;
m_bHandlerInited = true;
+ if (m_busDevice->GetLogicalAddress() != CECDEVICE_TV)
+ return true;
+
CCECBusDevice *primary = m_processor->GetPrimaryDevice();
if (primary && primary->GetLogicalAddress() != CECDEVICE_UNREGISTERED)
{
{
/* start as 'in transition standby->on' */
primary->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
- primary->TransmitPowerState(CECDEVICE_TV);
+ primary->TransmitPowerState(CECDEVICE_TV, false);
/* send the vendor id */
- primary->TransmitVendorID(CECDEVICE_BROADCAST);
+ primary->TransmitVendorID(CECDEVICE_BROADCAST, false, false);
}
}
return true;
}
-bool CSLCommandHandler::HandleActiveSource(const cec_command &command)
+int CSLCommandHandler::HandleActiveSource(const cec_command &command)
{
if (command.parameters.size == 2)
{
uint16_t iAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
- CCECBusDevice *primary = m_processor->GetPrimaryDevice();
- bool bSendPowerOffState(iAddress != primary->GetCurrentPhysicalAddress() && primary->IsActiveSource());
-
CCECBusDevice *device = m_processor->GetDeviceByPhysicalAddress(iAddress);
if (device)
device->MarkAsActiveSource();
- if (bSendPowerOffState)
+
{
- {
- CLockObject lock(m_SLMutex);
- m_bActiveSourceSent = false;
- }
- primary->TransmitPowerState(CECDEVICE_TV);
+ CLockObject lock(m_SLMutex);
+ m_bActiveSourceSent = false;
}
+
+ return COMMAND_HANDLED;
}
- return true;
+ return CEC_ABORT_REASON_INVALID_OPERAND;
}
-bool CSLCommandHandler::HandleDeviceVendorId(const cec_command &command)
+int CSLCommandHandler::HandleDeviceVendorId(const cec_command &command)
{
SetVendorId(command);
cec_command response;
cec_command::Format(response, initiator, command.initiator, CEC_OPCODE_FEATURE_ABORT);
- return Transmit(response);
+ Transmit(response, false, true);
+ return COMMAND_HANDLED;
}
}
- return true;
+
+ return CCECCommandHandler::HandleDeviceVendorId(command);
}
-bool CSLCommandHandler::HandleVendorCommand(const cec_command &command)
+int CSLCommandHandler::HandleVendorCommand(const cec_command &command)
{
if (!m_processor->IsHandledByLibCEC(command.destination))
return true;
command.parameters[0] == SL_COMMAND_UNKNOWN_01)
{
HandleVendorCommand01(command);
- return true;
+ return COMMAND_HANDLED;
}
else if (command.parameters.size == 2 &&
command.parameters[0] == SL_COMMAND_POWER_ON)
{
HandleVendorCommandPowerOn(command);
- return true;
+ return COMMAND_HANDLED;
}
else if (command.parameters.size == 2 &&
command.parameters[0] == SL_COMMAND_CONNECT_REQUEST)
{
HandleVendorCommandSLConnect(command);
- return true;
+ return COMMAND_HANDLED;
}
else if (command.parameters.size == 1 &&
command.parameters[0] == SL_COMMAND_REQUEST_POWER_STATUS)
{
HandleVendorCommandPowerOnStatus(command);
- return true;
+ return COMMAND_HANDLED;
}
- return false;
+ return CCECCommandHandler::HandleVendorCommand(command);
}
void CSLCommandHandler::HandleVendorCommand01(const cec_command &command)
{
m_processor->GetPrimaryDevice()->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
TransmitVendorCommand0205(command.destination, command.initiator);
+
+ CCECBusDevice* dev = m_processor->GetDevice(command.destination);
+ if (dev && dev->IsHandledByLibCEC() && dev->IsActiveSource())
+ dev->TransmitActiveSource(false);
}
void CSLCommandHandler::TransmitVendorCommand0205(const cec_logical_address iSource, const cec_logical_address iDestination)
response.PushBack(SL_COMMAND_UNKNOWN_02);
response.PushBack(SL_COMMAND_TYPE_HDDRECORDER);
- Transmit(response);
+ Transmit(response, false, true);
+ SetSLInitialised();
}
void CSLCommandHandler::HandleVendorCommandPowerOn(const cec_command &command)
SetSLInitialised();
device->MarkAsActiveSource();
device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
- device->TransmitPowerState(command.initiator);
+ device->TransmitPowerState(command.initiator, true);
CEvent::Sleep(2000);
device->SetPowerStatus(CEC_POWER_STATUS_ON);
- device->TransmitPowerState(command.initiator);
- device->TransmitPhysicalAddress();
+ device->TransmitPowerState(command.initiator, false);
+ device->TransmitPhysicalAddress(false);
{
CLockObject lock(m_SLMutex);
m_bActiveSourceSent = false;
}
+ if (device->IsActiveSource())
+ ActivateSource();
}
}
void CSLCommandHandler::HandleVendorCommandPowerOnStatus(const cec_command &command)
if (device)
{
device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
- device->TransmitPowerState(command.initiator);
+ device->TransmitPowerState(command.initiator, true);
device->SetPowerStatus(CEC_POWER_STATUS_ON);
}
}
cec_command::Format(response, iSource, iDestination, CEC_OPCODE_VENDOR_COMMAND);
response.PushBack(SL_COMMAND_SET_DEVICE_MODE);
response.PushBack((uint8_t)type);
- Transmit(response);
+ Transmit(response, false, true);
}
-bool CSLCommandHandler::HandleGiveDeckStatus(const cec_command &command)
+int CSLCommandHandler::HandleGiveDeckStatus(const cec_command &command)
{
- if (m_processor->CECInitialised() && m_processor->IsHandledByLibCEC(command.destination))
+ if (!m_processor->CECInitialised() ||
+ !m_processor->IsHandledByLibCEC(command.destination))
+ return CEC_ABORT_REASON_NOT_IN_CORRECT_MODE_TO_RESPOND;
+
+ CCECPlaybackDevice *device = CCECBusDevice::AsPlaybackDevice(GetDevice(command.destination));
+ if (!device || command.parameters.size == 0)
+ return CEC_ABORT_REASON_INVALID_OPERAND;
+
+ device->SetDeckStatus(CEC_DECK_INFO_OTHER_STATUS_LG);
+ if (command.parameters[0] == CEC_STATUS_REQUEST_ON)
{
- CCECBusDevice *device = GetDevice(command.destination);
- if (device && (device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE))
- {
- if (command.parameters.size > 0)
- {
- ((CCECPlaybackDevice *) device)->SetDeckStatus(!device->IsActiveSource() ? CEC_DECK_INFO_OTHER_STATUS : CEC_DECK_INFO_OTHER_STATUS_LG);
- if (command.parameters[0] == CEC_STATUS_REQUEST_ON)
- {
- bool bReturn = ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator);
- if (!ActiveSourceSent())
- ActivateSource();
- return bReturn;
- }
- else if (command.parameters[0] == CEC_STATUS_REQUEST_ONCE)
- {
- return ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator);
- }
- }
- }
- return CCECCommandHandler::HandleGiveDeckStatus(command);
+ device->TransmitDeckStatus(command.initiator, true);
+ if (!ActiveSourceSent())
+ ActivateSource();
+ return COMMAND_HANDLED;
+ }
+ else if (command.parameters[0] == CEC_STATUS_REQUEST_ONCE)
+ {
+ device->TransmitDeckStatus(command.initiator, true);
+ return COMMAND_HANDLED;
}
- return false;
+ return CCECCommandHandler::HandleGiveDeckStatus(command);
}
-bool CSLCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command)
+int CSLCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command)
{
- bool bReturn(false);
if (m_processor->CECInitialised() && m_processor->IsHandledByLibCEC(command.destination) && command.initiator == CECDEVICE_TV)
{
CCECBusDevice *device = GetDevice(command.destination);
if (device && device->GetCurrentPowerStatus() != CEC_POWER_STATUS_ON)
{
- bReturn = device->TransmitPowerState(command.initiator);
+ device->TransmitPowerState(command.initiator, true);
device->SetPowerStatus(CEC_POWER_STATUS_ON);
}
else
if (!ActiveSourceSent())
{
device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
- bReturn = device->TransmitPowerState(command.initiator);
+ device->TransmitPowerState(command.initiator, true);
ActivateSource();
}
else if (m_resetPowerState.IsSet() && m_resetPowerState.TimeLeft() > 0)
m_bActiveSourceSent = false;
}
device->SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
- bReturn = device->TransmitPowerState(command.initiator);
+ device->TransmitPowerState(command.initiator, true);
device->SetPowerStatus(CEC_POWER_STATUS_ON);
m_resetPowerState.Init(5000);
}
else
{
- bReturn = device->TransmitPowerState(command.initiator);
+ device->TransmitPowerState(command.initiator, true);
m_resetPowerState.Init(5000);
}
}
+
+ return COMMAND_HANDLED;
}
- return bReturn;
+ return CEC_ABORT_REASON_NOT_IN_CORRECT_MODE_TO_RESPOND;
}
-bool CSLCommandHandler::HandleRequestActiveSource(const cec_command &command)
+int CSLCommandHandler::HandleRequestActiveSource(const cec_command &command)
{
if (m_processor->CECInitialised())
{
LIB_CEC->AddLog(CEC_LOG_DEBUG, ">> %i requests active source, ignored", (uint8_t) command.initiator);
else
ActivateSource();
- return true;
+ return COMMAND_HANDLED;
}
- return false;
+ return CEC_ABORT_REASON_NOT_IN_CORRECT_MODE_TO_RESPOND;
}
-bool CSLCommandHandler::HandleFeatureAbort(const cec_command &command)
+int CSLCommandHandler::HandleFeatureAbort(const cec_command &command)
{
if (command.parameters.size == 0 && m_processor->GetPrimaryDevice()->GetCurrentPowerStatus() == CEC_POWER_STATUS_ON && !SLInitialised() &&
command.initiator == CECDEVICE_TV)
{
- m_processor->GetPrimaryDevice()->TransmitPowerState(command.initiator);
- m_processor->GetPrimaryDevice()->TransmitVendorID(CECDEVICE_BROADCAST, false);
+ m_processor->GetPrimaryDevice()->TransmitPowerState(command.initiator, false);
+ m_processor->GetPrimaryDevice()->TransmitVendorID(CECDEVICE_BROADCAST, false, false);
}
return CCECCommandHandler::HandleFeatureAbort(command);
}
-bool CSLCommandHandler::HandleStandby(const cec_command &command)
+int CSLCommandHandler::HandleStandby(const cec_command &command)
{
if (command.initiator == CECDEVICE_TV)
{
cec_command command;
if (!m_bSLEnabled)
- TransmitVendorID(CECDEVICE_TV, CEC_VENDOR_LG);
+ TransmitVendorID(CECDEVICE_TV, iDestination, CEC_VENDOR_LG, false);
cec_command::Format(command, CECDEVICE_TV, iDestination, CEC_OPCODE_VENDOR_COMMAND);
command.PushBack(SL_COMMAND_POWER_ON);
command.PushBack(0);
- return Transmit(command);
+ return Transmit(command, false, false);
}
return CCECCommandHandler::PowerOn(iInitiator, iDestination);
}
+
+void CSLCommandHandler::VendorPreActivateSourceHook(void)
+{
+ CCECPlaybackDevice *device = m_busDevice->AsPlaybackDevice();
+ if (device)
+ device->SetDeckStatus(!device->IsActiveSource() ? CEC_DECK_INFO_OTHER_STATUS : CEC_DECK_INFO_OTHER_STATUS_LG);
+}
repositories / deb_libcec.git / blobdiff