X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=94651fcb45d5c00de77b8323efaca191eb1d38c4;hb=56035c8658776a144f63cdfd35ae32d93aacc987;hp=af45f9a653b04843f8f8c284b8e782527a186f49;hpb=7f9191154db80ab386da77ef6706961d9fbc8b97;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index af45f9a..94651fc 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -57,7 +57,8 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, cec m_bMonitor(false), m_busScan(NULL), m_iStandardLineTimeout(3), - m_iRetryLineTimeout(3) + m_iRetryLineTimeout(3), + m_iLastTransmission(0) { m_communication = new CAdapterCommunication(this); m_logicalAddresses.Clear(); @@ -76,7 +77,8 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con m_controller(controller), m_bMonitor(false), m_iStandardLineTimeout(3), - m_iRetryLineTimeout(3) + m_iRetryLineTimeout(3), + m_iLastTransmission(0) { m_communication = new CAdapterCommunication(this); m_logicalAddresses.Clear(); @@ -115,12 +117,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con CCECProcessor::~CCECProcessor(void) { - if (m_busScan) - { - m_busScan->StopThread(); - delete m_busScan; - } - + m_bStarted = false; m_startCondition.Broadcast(); StopThread(); @@ -155,10 +152,12 @@ bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, } lock.Leave(); - if (SetAckMask(m_logicalAddresses.AckMask()) && - SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) + + m_busDevices[CECDEVICE_TV]->GetVendorId(); + + if (SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) { - m_controller->AddLog(CEC_LOG_ERROR, "processor thread started"); + m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started"); m_busScan = new CCECBusScan(this); m_busScan->CreateThread(true); return true; @@ -263,7 +262,8 @@ void *CCECProcessor::Process(void) } else { - m_busDevices[m_logicalAddresses.primary]->TransmitPhysicalAddress(); + SetAckMask(m_logicalAddresses.AckMask()); + CLockObject lock(&m_mutex); m_bStarted = true; m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started"); @@ -297,6 +297,13 @@ void *CCECProcessor::Process(void) m_controller->CheckKeypressTimeout(); } + if (m_busScan) + { + m_busScan->StopThread(); + delete m_busScan; + m_busScan = NULL; + } + if (m_communication) m_communication->Close(); @@ -314,7 +321,7 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE if (type != CEC_DEVICE_TYPE_RESERVED) { - for (uint8_t iPtr = 0; iPtr < 16; iPtr++) + for (uint8_t iPtr = 0; iPtr <= 11; iPtr++) { if (m_logicalAddresses[iPtr] && m_busDevices[iPtr]->m_type == type) { @@ -324,8 +331,7 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE } } - bReturn = m_busDevices[CECDEVICE_TV]->PowerOn() && - m_busDevices[addr]->TransmitActiveSource() && + bReturn = m_busDevices[addr]->TransmitActiveSource() && SetStreamPath(m_busDevices[addr]->GetPhysicalAddress(false)); if (bReturn && (m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || @@ -349,11 +355,6 @@ void CCECProcessor::SetRetryLineTimeout(uint8_t iTimeout) m_iRetryLineTimeout = iTimeout; } -bool CCECProcessor::SetActiveSource(cec_logical_address iAddress) -{ - return SetStreamPath(m_busDevices[iAddress]->GetPhysicalAddress(false)); -} - bool CCECProcessor::SetActiveView(void) { return SetActiveSource(m_types.IsEmpty() ? CEC_DEVICE_TYPE_RESERVED : m_types[0]); @@ -395,15 +396,15 @@ bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, { bool bReturn(false); - CStdString strLog; - strLog.Format("setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice); - AddLog(CEC_LOG_DEBUG, strLog); - m_iBaseDevice = iBaseDevice; m_iHDMIPort = iPort; if (!m_bStarted && !bForce) return true; + CStdString strLog; + strLog.Format("setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice); + AddLog(CEC_LOG_DEBUG, strLog); + uint16_t iPhysicalAddress(0); iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress(); uint16_t iPos = 0; @@ -520,7 +521,11 @@ bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress) { for (uint8_t iPtr = 0; iPtr < 15; iPtr++) if (m_logicalAddresses[iPtr]) + { + m_busDevices[iPtr]->SetInactiveDevice(); m_busDevices[iPtr]->SetPhysicalAddress(iPhysicalAddress); + m_busDevices[iPtr]->TransmitPhysicalAddress(); + } return SetActiveView(); } return false; @@ -536,7 +541,7 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable) CLockObject lock(&m_mutex); m_bMonitor = bEnable; - if (bEnable) + if (!bEnable) { if (!m_busScan) { @@ -666,6 +671,13 @@ uint64_t CCECProcessor::GetDeviceVendorId(cec_logical_address iAddress) return false; } +uint16_t CCECProcessor::GetDevicePhysicalAddress(cec_logical_address iAddress) +{ + if (m_busDevices[iAddress]) + return m_busDevices[iAddress]->GetPhysicalAddress(false); + return false; +} + cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddress) { if (m_busDevices[iAddress]) @@ -673,6 +685,22 @@ cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddres return CEC_POWER_STATUS_UNKNOWN; } +cec_logical_address CCECProcessor::GetActiveSource(void) +{ + for (uint8_t iPtr = 0; iPtr <= 11; iPtr++) + { + if (m_busDevices[iPtr]->IsActiveSource()) + return (cec_logical_address)iPtr; + } + + return CECDEVICE_UNKNOWN; +} + +bool CCECProcessor::IsActiveSource(cec_logical_address iAddress) +{ + return m_busDevices[iAddress]->IsActiveSource(); +} + bool CCECProcessor::Transmit(const cec_command &data) { bool bReturn(false); @@ -680,8 +708,13 @@ bool CCECProcessor::Transmit(const cec_command &data) CCECAdapterMessage *output = new CCECAdapterMessage(data); bReturn = Transmit(output); - delete output; + /* set to "not present" on failed ack */ + if (output->is_error() && output->reply == MSGCODE_TRANSMIT_FAILED_ACK && + output->destination() != CECDEVICE_BROADCAST) + m_busDevices[output->destination()]->SetDeviceStatus(CEC_DEVICE_STATUS_NOT_PRESENT); + + delete output; return bReturn; } @@ -690,7 +723,9 @@ bool CCECProcessor::Transmit(CCECAdapterMessage *output) bool bReturn(false); CLockObject lock(&m_mutex); { + m_iLastTransmission = GetTimeMs(); m_communication->SetLineTimeout(m_iStandardLineTimeout); + output->tries = 1; do { @@ -717,7 +752,7 @@ bool CCECProcessor::Transmit(CCECAdapterMessage *output) } else bReturn = true; - }while (output->transmit_timeout > 0 && output->needs_retry() && ++output->tries <= output->maxTries); + }while (output->transmit_timeout > 0 && output->needs_retry() && ++output->tries < output->maxTries); } m_communication->SetLineTimeout(m_iStandardLineTimeout); @@ -826,7 +861,7 @@ bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg) m_currentframe.ack = msg.ack(); m_currentframe.eom = msg.eom(); } - if (m_currentframe.ack == true) + if (m_currentframe.ack == 0x1) { m_lastInitiator = m_currentframe.initiator; m_busDevices[m_lastInitiator]->GetHandler()->HandlePoll(m_currentframe.initiator, m_currentframe.destination); @@ -1286,37 +1321,48 @@ const char *CCECProcessor::ToString(const cec_vendor_id vendor) void *CCECBusScan::Process(void) { CCECBusDevice *device(NULL); - int iCount(0); + uint8_t iCounter(0); + while (!IsStopped()) { - if (iCount == 0) + if (++iCounter < 30) + { + Sleep(1000); + continue; + } + for (unsigned int iPtr = 0; iPtr <= 11 && !IsStopped(); iPtr++) { - for (unsigned int iPtr = 0; iPtr < 15 && !IsStopped(); iPtr++) + device = m_processor->m_busDevices[iPtr]; + WaitUntilIdle(); + if (device && device->GetStatus(true) == CEC_DEVICE_STATUS_PRESENT) { - device = m_processor->m_busDevices[iPtr]; - if (device && device->GetStatus(true) == CEC_DEVICE_STATUS_PRESENT) - { - if (!IsStopped()) - { - device->GetVendorId(); - Sleep(5); - } - if (!IsStopped()) - { - device->GetPowerStatus(true); - Sleep(5); - } - } + WaitUntilIdle(); + if (!IsStopped()) + device->GetVendorId(); + + WaitUntilIdle(); + if (!IsStopped()) + device->GetPowerStatus(true); } } - - if (++iCount > 60) - iCount = 0; - Sleep(1000); } + return NULL; } +void CCECBusScan::WaitUntilIdle(void) +{ + if (IsStopped()) + return; + + int64_t iWaitTime = 3000 - (GetTimeMs() - m_processor->GetLastTransmission()); + while (iWaitTime > 0) + { + Sleep(iWaitTime); + iWaitTime = 3000 - (GetTimeMs() - m_processor->GetLastTransmission()); + } +} + bool CCECProcessor::StartBootloader(void) { return m_communication->StartBootloader();