X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2FCECProcessor.cpp;h=11065ebfec6e5b6bb7198986825db3f93d8c9bd9;hb=ef79edcce663c6156731ad73d63acbe0c6be85b9;hp=3eb4734757da194b2539779b0c16d6b27bcc4fbb;hpb=1113cb7d55328a6c15846955626187615a9ad02e;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 3eb4734..11065eb 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -154,14 +154,18 @@ bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, if (SetAckMask(m_logicalAddresses.AckMask()) && SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) { + m_controller->AddLog(CEC_LOG_ERROR, "processor thread started"); m_busScan = new CCECBusScan(this); m_busScan->CreateThread(true); return true; } + else + { + m_controller->AddLog(CEC_LOG_ERROR, "failed to initialise the processor"); + } } - else - m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread"); + m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread"); return false; } @@ -240,22 +244,6 @@ bool CCECProcessor::FindLogicalAddresses(void) return bReturn; } -bool CCECProcessor::SetLineTimeout(uint8_t iTimeout) -{ - bool bReturn(false); - CCECAdapterMessage *output = new CCECAdapterMessage; - - output->push_back(MSGSTART); - output->push_escaped(MSGCODE_TRANSMIT_IDLETIME); - output->push_escaped(iTimeout); - output->push_back(MSGEND); - - if ((bReturn = Transmit(output)) == false) - m_controller->AddLog(CEC_LOG_ERROR, "could not set the idletime"); - delete output; - return bReturn; -} - void *CCECProcessor::Process(void) { bool bParseFrame(false); @@ -271,6 +259,7 @@ void *CCECProcessor::Process(void) } else { + m_busDevices[m_logicalAddresses.primary]->TransmitPhysicalAddress(); CLockObject lock(&m_mutex); m_bStarted = true; m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started"); @@ -331,8 +320,17 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE } } - return SetStreamPath(m_busDevices[addr]->GetPhysicalAddress(false)) && - m_busDevices[addr]->TransmitActiveSource(); + bReturn = m_busDevices[CECDEVICE_TV]->PowerOn() && + m_busDevices[addr]->TransmitActiveSource() && + SetStreamPath(m_busDevices[addr]->GetPhysicalAddress(false)); + + if (bReturn && (m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || + m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)) + { + bReturn = ((CCECPlaybackDevice *)m_busDevices[addr])->TransmitDeckStatus(CECDEVICE_TV); + } + + return bReturn; } bool CCECProcessor::SetActiveSource(cec_logical_address iAddress) @@ -407,7 +405,7 @@ bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, iPhysicalAddress += (uint16_t)(iPort * iPos); strLog.Format("checking physical address %4x", iPhysicalAddress); AddLog(CEC_LOG_DEBUG, strLog); - if (CheckPhysicalAddress(iPhysicalAddress)) + if (PhysicalAddressInUse(iPhysicalAddress)) { strLog.Format("physical address %4x is in use", iPhysicalAddress); AddLog(CEC_LOG_DEBUG, strLog); @@ -415,6 +413,8 @@ bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, } else { + strLog.Format("physical address %4x is free", iPhysicalAddress); + AddLog(CEC_LOG_DEBUG, strLog); SetPhysicalAddress(iPhysicalAddress); bReturn = true; } @@ -423,7 +423,7 @@ bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, return bReturn; } -bool CCECProcessor::CheckPhysicalAddress(uint16_t iPhysicalAddress) +bool CCECProcessor::PhysicalAddressInUse(uint16_t iPhysicalAddress) { for (unsigned int iPtr = 0; iPtr < 15; iPtr++) { @@ -674,28 +674,38 @@ bool CCECProcessor::Transmit(CCECAdapterMessage *output) bool bReturn(false); CLockObject lock(&m_mutex); { - CLockObject msgLock(&output->mutex); - if (!m_communication || !m_communication->Write(output)) - return bReturn; - else + m_communication->SetLineTimeout(3); + + do { - output->condition.Wait(&output->mutex); - if (output->state != ADAPTER_MESSAGE_STATE_SENT) - { - m_controller->AddLog(CEC_LOG_ERROR, "command was not sent"); + if (output->tries > 0) + m_communication->SetLineTimeout(5); + + CLockObject msgLock(&output->mutex); + if (!m_communication || !m_communication->Write(output)) return bReturn; + else + { + output->condition.Wait(&output->mutex); + if (output->state != ADAPTER_MESSAGE_STATE_SENT) + { + m_controller->AddLog(CEC_LOG_ERROR, "command was not sent"); + return bReturn; + } } - } - if (output->transmit_timeout > 0) - { - if ((bReturn = WaitForTransmitSucceeded(output->size(), output->transmit_timeout)) == false) - m_controller->AddLog(CEC_LOG_DEBUG, "did not receive ack"); - } - else - bReturn = true; + if (output->transmit_timeout > 0) + { + if ((bReturn = WaitForTransmitSucceeded(output)) == false) + m_controller->AddLog(CEC_LOG_DEBUG, "did not receive ack"); + } + else + bReturn = true; + }while (output->transmit_timeout > 0 && output->needs_retry() && ++output->tries <= output->maxTries); } + m_communication->SetLineTimeout(3); + return bReturn; } @@ -712,20 +722,20 @@ void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode Transmit(command); } -bool CCECProcessor::WaitForTransmitSucceeded(uint8_t iLength, uint32_t iTimeout /* = 1000 */) +bool CCECProcessor::WaitForTransmitSucceeded(CCECAdapterMessage *message) { bool bError(false); bool bTransmitSucceeded(false); - uint8_t iPacketsLeft(iLength / 4); + uint8_t iPacketsLeft(message->size() / 4); int64_t iNow = GetTimeMs(); - int64_t iTargetTime = iNow + (uint64_t) iTimeout; + int64_t iTargetTime = iNow + message->transmit_timeout; - while (!bTransmitSucceeded && !bError && (iTimeout == 0 || iNow < iTargetTime)) + while (!bTransmitSucceeded && !bError && (message->transmit_timeout == 0 || iNow < iTargetTime)) { CCECAdapterMessage msg; - if (!m_communication->Read(msg, iTimeout > 0 ? (int32_t)(iTargetTime - iNow) : 1000)) + if (!m_communication->Read(msg, message->transmit_timeout > 0 ? (int32_t)(iTargetTime - iNow) : 1000)) { iNow = GetTimeMs(); continue; @@ -748,23 +758,29 @@ bool CCECProcessor::WaitForTransmitSucceeded(uint8_t iLength, uint32_t iTimeout continue; } - if ((bError = msg.is_error()) == false) + if (bError) + { + message->reply = msg.message(); + m_controller->AddLog(CEC_LOG_DEBUG, msg.ToString()); + } + else { - m_controller->AddLog(bError ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString()); - switch(msg.message()) { case MSGCODE_COMMAND_ACCEPTED: + m_controller->AddLog(CEC_LOG_DEBUG, msg.ToString()); if (iPacketsLeft > 0) iPacketsLeft--; break; case MSGCODE_TRANSMIT_SUCCEEDED: + m_controller->AddLog(CEC_LOG_DEBUG, msg.ToString()); bTransmitSucceeded = (iPacketsLeft == 0); bError = !bTransmitSucceeded; + message->reply = MSGCODE_TRANSMIT_SUCCEEDED; break; default: - if (ParseMessage(msg)) - m_commandBuffer.Push(m_currentframe); + // ignore other data while waiting + break; } iNow = GetTimeMs(); @@ -1254,27 +1270,26 @@ const char *CCECProcessor::ToString(const cec_vendor_id vendor) void *CCECBusScan::Process(void) { CCECBusDevice *device(NULL); + int iCount(0); while (!IsStopped()) { - for (unsigned int iPtr = 0; iPtr < 15 && !IsStopped(); iPtr++) + if (iCount == 0) { - device = m_processor->m_busDevices[iPtr]; - if (device && device->GetStatus() == CEC_DEVICE_STATUS_PRESENT) + for (unsigned int iPtr = 0; iPtr < 15 && !IsStopped(); iPtr++) { - if (!IsStopped()) - device->GetPhysicalAddress(false); - Sleep(5); - - if (!IsStopped()) - device->GetCecVersion(); - Sleep(5); - - if (!IsStopped()) - device->GetVendorId(); - Sleep(5); + device = m_processor->m_busDevices[iPtr]; + if (device && device->GetStatus(true) == CEC_DEVICE_STATUS_PRESENT) + { + if (!IsStopped()) + device->GetVendorId(); + Sleep(5); + } } } - Sleep(5000); + + if (++iCount > 60) + iCount = 0; + Sleep(1000); } return NULL; }