/*
* 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.
#define CEC_PROCESSOR_SIGNAL_WAIT_TIME 1000
#define ACTIVE_SOURCE_CHECK_INTERVAL 500
+#define TV_PRESENT_CHECK_INTERVAL 30000
#define ToString(x) CCECTypeUtils::ToString(x)
+CCECStandbyProtection::CCECStandbyProtection(CCECProcessor* processor) :
+ m_processor(processor) {}
+CCECStandbyProtection::~CCECStandbyProtection(void) {}
+
+void* CCECStandbyProtection::Process(void)
+{
+ int64_t last = GetTimeMs();
+ int64_t next;
+ while (!IsStopped())
+ {
+ PLATFORM::CEvent::Sleep(1000);
+
+ next = GetTimeMs();
+
+ // reset the connection if the clock changed
+ if (next < last || next - last > 10000)
+ {
+ libcec_parameter param;
+ param.paramData = NULL; param.paramType = CEC_PARAMETER_TYPE_UNKOWN;
+ m_processor->GetLib()->Alert(CEC_ALERT_CONNECTION_LOST, param);
+ break;
+ }
+
+ last = next;
+ }
+ return NULL;
+}
+
CCECProcessor::CCECProcessor(CLibCEC *libcec) :
m_bInitialised(false),
m_communication(NULL),
m_iLastTransmission(0),
m_bMonitor(true),
m_addrAllocator(NULL),
- m_bStallCommunication(false)
+ m_bStallCommunication(false),
+ m_connCheck(NULL)
{
m_busDevices = new CCECDeviceMap(this);
}
SetCECInitialised(false);
// stop the processor
+ DELETE_AND_NULL(m_connCheck);
+ StopThread(-1);
+ m_inBuffer.Broadcast();
StopThread();
// close the connection
{
m_libcec->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ if (!m_connCheck)
+ m_connCheck = new CCECStandbyProtection(this);
+ m_connCheck->CreateThread();
+
cec_command command; command.Clear();
CTimeout activeSourceCheck(ACTIVE_SOURCE_CHECK_INTERVAL);
+ CTimeout tvPresentCheck(TV_PRESENT_CHECK_INTERVAL);
// as long as we're not being stopped and the connection is open
while (!IsStopped() && m_communication->IsOpen())
if (m_inBuffer.Pop(command, CEC_PROCESSOR_SIGNAL_WAIT_TIME))
ProcessCommand(command);
- if (CECInitialised())
+ if (CECInitialised() && !IsStopped())
{
// check clients for keypress timeouts
m_libcec->CheckKeypressTimeout();
TransmitPendingActiveSourceCommands();
activeSourceCheck.Init(ACTIVE_SOURCE_CHECK_INTERVAL);
}
+
+ // check whether the TV is present and responding
+ if (tvPresentCheck.TimeLeft() == 0)
+ {
+ CCECClient *primary = GetPrimaryClient();
+ // only check whether the tv responds to polls when a client is connected and not in monitoring mode
+ if (primary && primary->GetConfiguration()->bMonitorOnly != 1)
+ {
+ if (!m_busDevices->At(CECDEVICE_TV)->IsPresent())
+ {
+ libcec_parameter param;
+ param.paramType = CEC_PARAMETER_TYPE_STRING;
+ param.paramData = (void*)"TV does not respond to CEC polls";
+ primary->Alert(CEC_ALERT_TV_POLL_FAILED, param);
+ }
+ }
+ tvPresentCheck.Init(TV_PRESENT_CHECK_INTERVAL);
+ }
}
}
return bReturn;
}
+void CCECProcessor::SetActiveSource(bool bSetTo, bool bClientUnregistered)
+{
+ if (m_communication)
+ m_communication->SetActiveSource(bSetTo, bClientUnregistered);
+}
+
void CCECProcessor::SetStandardLineTimeout(uint8_t iTimeout)
{
CLockObject lock(m_mutex);
CCECBusDevice *primary = GetPrimaryDevice();
// poll the destination, with the primary as source
if (primary)
- return primary->TransmitPoll(iAddress, false);
+ return primary->TransmitPoll(iAddress, true);
CCECBusDevice *device = m_busDevices->At(CECDEVICE_UNREGISTERED);
if (device)
- return device->TransmitPoll(iAddress, false);
+ return device->TransmitPoll(iAddress, true);
return false;
}
void CCECProcessor::ProcessCommand(const cec_command &command)
{
// log the command
- CStdString dataStr;
- dataStr.Format(">> %1x%1x", command.initiator, command.destination);
- if (command.opcode_set == 1)
- dataStr.AppendFormat(":%02x", command.opcode);
- for (uint8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
- dataStr.AppendFormat(":%02x", (unsigned int)command.parameters[iPtr]);
- m_libcec->AddLog(CEC_LOG_TRAFFIC, dataStr.c_str());
+ m_libcec->AddLog(CEC_LOG_TRAFFIC, ToString(command).c_str());
// find the initiator
CCECBusDevice *device = m_busDevices->At(command.initiator);
config->iFirmwareBuildDate = m_communication->GetFirmwareBuildDate();
config->adapterType = m_communication->GetAdapterType();
+ Close();
+
return true;
}
// replace a previous client
CLockObject lock(m_mutex);
m_clients.erase((*it)->GetLogicalAddress());
- m_clients.insert(make_pair<cec_logical_address, CCECClient *>((*it)->GetLogicalAddress(), client));
+ m_clients.insert(make_pair((*it)->GetLogicalAddress(), client));
}
// set the new ackmask
return true;
}
+uint16_t CCECProcessor::GetPhysicalAddressFromEeprom(void)
+{
+ libcec_configuration config; config.Clear();
+ if (m_communication)
+ m_communication->GetConfiguration(config);
+ return config.iPhysicalAddress;
+}
+
bool CCECProcessor::RegisterClient(CCECClient *client)
{
if (!client)
libcec_configuration &configuration = *client->GetConfiguration();
- if (configuration.clientVersion >= CEC_CLIENT_VERSION_1_6_3 && configuration.bMonitorOnly == 1)
+ if (configuration.clientVersion < CEC_CLIENT_VERSION_2_0_0)
+ {
+ m_libcec->AddLog(CEC_LOG_ERROR, "failed to register a new CEC client: client version %s is no longer supported", ToString((cec_client_version)configuration.clientVersion));
+ return false;
+ }
+
+ if (configuration.bMonitorOnly == 1)
return true;
if (!CECInitialised())
// ensure that controlled mode is enabled
m_communication->SetControlledMode(true);
+ m_bMonitor = false;
+
+ // source logical address for requests
+ cec_logical_address sourceAddress(CECDEVICE_UNREGISTERED);
+ if (!m_communication->SupportsSourceLogicalAddress(CECDEVICE_UNREGISTERED))
+ {
+ if (m_communication->SupportsSourceLogicalAddress(CECDEVICE_FREEUSE))
+ sourceAddress = CECDEVICE_FREEUSE;
+ else
+ {
+ m_libcec->AddLog(CEC_LOG_ERROR, "failed to register a new CEC client: both unregistered and free use are not supported by the device");
+ return false;
+ }
+ }
// ensure that we know the vendor id of the TV
CCECBusDevice *tv = GetTV();
- cec_vendor_id tvVendor = CEC_VENDOR_UNKNOWN;
- if (m_communication->SupportsSourceLogicalAddress(CECDEVICE_UNREGISTERED))
- tvVendor = tv->GetVendorId(CECDEVICE_UNREGISTERED);
- else if (m_communication->SupportsSourceLogicalAddress(CECDEVICE_FREEUSE))
- tvVendor = tv->GetVendorId(CECDEVICE_FREEUSE);
+ cec_vendor_id tvVendor(tv->GetVendorId(sourceAddress));
// wait until the handler is replaced, to avoid double registrations
if (tvVendor != CEC_VENDOR_UNKNOWN &&
// mark the client as registered
client->SetRegistered(true);
+ sourceAddress = client->GetPrimaryLogicalAdddress();
+
// initialise the client
bool bReturn = client->OnRegister();
GetTV()->MarkHandlerReady();
}
+ // report our OSD name to the TV, since some TVs don't request it
+ client->GetPrimaryDevice()->TransmitOSDName(CECDEVICE_TV, false);
+
+ // request the power status of the TV
+ tv->RequestPowerStatus(sourceAddress, true, true);
+
return bReturn;
}
m_clients.erase(entry);
// reset the device status
- (*it)->ResetDeviceStatus();
+ (*it)->ResetDeviceStatus(true);
}
}
}
}
+void CCECProcessor::HandlePhysicalAddressChanged(uint16_t iNewAddress)
+{
+ m_libcec->AddLog(CEC_LOG_NOTICE, "physical address changed to %04x", iNewAddress);
+ CCECClient* client = GetPrimaryClient();
+ if (client)
+ client->SetPhysicalAddress(iNewAddress);
+}
+
uint16_t CCECProcessor::GetAdapterVendorId(void) const
{
return m_communication ? m_communication->GetAdapterVendorId() : 0;
repositories / deb_libcec.git / blobdiff