m_iRetryLineTimeout(3),
m_iLastTransmission(0),
m_bMonitor(true),
- m_addrAllocator(NULL)
+ m_addrAllocator(NULL),
+ m_bStallCommunication(false)
{
m_busDevices = new CCECDeviceMap(this);
}
CCECProcessor::~CCECProcessor(void)
{
+ m_bStallCommunication = false;
DELETE_AND_NULL(m_addrAllocator);
Close();
DELETE_AND_NULL(m_busDevices);
SetCECInitialised(false);
// stop the processor
+ StopThread(-1);
+ m_inBuffer.Broadcast();
StopThread();
// close the connection
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();
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;
}
}
}
+ // wait until we finished allocating a new LA if it got lost
+ while (m_bStallCommunication) Sleep(5);
+
{
CLockObject lock(m_mutex);
m_iLastTransmission = GetTimeMs();
iLineTimeout = m_iRetryLineTimeout;
}
- return adapterState == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+ return bIsReply ?
+ adapterState == ADAPTER_MESSAGE_STATE_SENT_ACKED || adapterState == ADAPTER_MESSAGE_STATE_SENT || adapterState == ADAPTER_MESSAGE_STATE_WAITING_TO_BE_SENT :
+ adapterState == ADAPTER_MESSAGE_STATE_SENT_ACKED;
}
void CCECProcessor::TransmitAbort(cec_logical_address source, cec_logical_address destination, cec_opcode opcode, cec_abort_reason reason /* = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE */)
// set the new ackmask
SetLogicalAddresses(GetLogicalAddresses());
+ // resume outgoing communication
+ m_bStallCommunication = false;
+
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();
}
+ // request the power status of the TV
+ tv->RequestPowerStatus(sourceAddress, true);
+
return bReturn;
}
m_clients.erase(entry);
// reset the device status
- (*it)->ResetDeviceStatus();
+ (*it)->ResetDeviceStatus(true);
}
}
void CCECProcessor::UnregisterClients(void)
{
- m_libcec->AddLog(CEC_LOG_NOTICE, "unregistering all CEC clients");
+ m_libcec->AddLog(CEC_LOG_DEBUG, "unregistering all CEC clients");
vector<CCECClient *> clients = m_libcec->GetClients();
for (vector<CCECClient *>::iterator client = clients.begin(); client != clients.end(); client++)
void CCECProcessor::HandleLogicalAddressLost(cec_logical_address oldAddress)
{
+ // stall outgoing messages until we know our new LA
+ m_bStallCommunication = true;
+
m_libcec->AddLog(CEC_LOG_NOTICE, "logical address %x was taken by another device, allocating a new address", oldAddress);
CCECClient* client = GetClient(oldAddress);
+ if (!client)
+ client = GetPrimaryClient();
if (client)
{
if (m_addrAllocator)
}
}
+uint16_t CCECProcessor::GetAdapterVendorId(void) const
+{
+ return m_communication ? m_communication->GetAdapterVendorId() : 0;
+}
+
+uint16_t CCECProcessor::GetAdapterProductId(void) const
+{
+ return m_communication ? m_communication->GetAdapterProductId() : 0;
+}
+
CCECAllocateLogicalAddress::CCECAllocateLogicalAddress(CCECProcessor* processor, CCECClient* client) :
m_processor(processor),
m_client(client) { }