X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=6791d514401b41d3f356a01037e2e87161535710;hb=5606e90bb3c5a85ab8e29e639e8248581247699e;hp=673e83e34dc9e799da86d66d2f4f7036fb3b1276;hpb=855a3a98394762b90bd86e7522110057a616fa6e;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 673e83e..6791d51 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -47,17 +47,17 @@ using namespace CEC; using namespace std; -CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS*/) : +CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS*/) : m_bStarted(false), m_iHDMIPort(CEC_DEFAULT_HDMI_PORT), m_iBaseDevice((cec_logical_address)CEC_DEFAULT_BASE_DEVICE), m_lastInitiator(CECDEVICE_UNKNOWN), m_strDeviceName(strDeviceName), - m_communication(serComm), m_controller(controller), m_bMonitor(false), m_busScan(NULL) { + m_communication = new CAdapterCommunication(this); m_logicalAddresses.Clear(); m_logicalAddresses.Set(iLogicalAddress); m_types.clear(); @@ -65,16 +65,16 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, iPtr == iLogicalAddress ? iPhysicalAddress : 0); } -CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, const cec_device_type_list &types) : +CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types) : m_bStarted(false), m_iHDMIPort(CEC_DEFAULT_HDMI_PORT), m_iBaseDevice((cec_logical_address)CEC_DEFAULT_BASE_DEVICE), m_strDeviceName(strDeviceName), m_types(types), - m_communication(serComm), m_controller(controller), m_bMonitor(false) { + m_communication = new CAdapterCommunication(this); m_logicalAddresses.Clear(); for (int iPtr = 0; iPtr < 16; iPtr++) { @@ -120,18 +120,25 @@ CCECProcessor::~CCECProcessor(void) m_startCondition.Broadcast(); StopThread(); + delete m_communication; m_communication = NULL; m_controller = NULL; for (unsigned int iPtr = 0; iPtr < 16; iPtr++) delete m_busDevices[iPtr]; } -bool CCECProcessor::Start(void) +bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */) { CLockObject lock(&m_mutex); - if (!m_communication || !m_communication->IsOpen()) + if (!m_communication || m_communication->IsOpen()) { - m_controller->AddLog(CEC_LOG_ERROR, "connection is closed"); + m_controller->AddLog(CEC_LOG_ERROR, "connection already opened"); + return false; + } + + if (!m_communication->Open(strPort, iBaudRate, iTimeoutMs)) + { + m_controller->AddLog(CEC_LOG_ERROR, "could not open a connection"); return false; } @@ -233,22 +240,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); @@ -297,6 +288,9 @@ void *CCECProcessor::Process(void) m_controller->CheckKeypressTimeout(); } + if (m_communication) + m_communication->Close(); + return NULL; } @@ -321,8 +315,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) @@ -664,28 +667,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; } @@ -702,20 +715,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; @@ -738,23 +751,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(); @@ -1251,20 +1270,22 @@ void *CCECBusScan::Process(void) device = m_processor->m_busDevices[iPtr]; if (device && device->GetStatus() == CEC_DEVICE_STATUS_PRESENT) { - if (!IsStopped()) - device->GetPhysicalAddress(false); - Sleep(5); - - if (!IsStopped()) - device->GetCecVersion(); - Sleep(5); - if (!IsStopped()) device->GetVendorId(); Sleep(5); } } - Sleep(1000); + Sleep(5000); } return NULL; } + +bool CCECProcessor::StartBootloader(void) +{ + return m_communication->StartBootloader(); +} + +bool CCECProcessor::PingAdapter(void) +{ + return m_communication->PingAdapter(); +}