X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fadapter%2FUSBCECAdapterCommunication.cpp;h=8f3bb7f0bef62dde35165454f35b4c13061ee122;hb=5ee2ae29d79824f71b011059d23d4b6e04012c1d;hp=2f1247410e6f099013fcce5a20097482ae4b6477;hpb=9ff1aa8068f4d4b0db936cfa6c69674a8c520ad6;p=deb_libcec.git diff --git a/src/lib/adapter/USBCECAdapterCommunication.cpp b/src/lib/adapter/USBCECAdapterCommunication.cpp index 2f12474..8f3bb7f 100644 --- a/src/lib/adapter/USBCECAdapterCommunication.cpp +++ b/src/lib/adapter/USBCECAdapterCommunication.cpp @@ -66,20 +66,17 @@ CUSBCECAdapterCommunication::CUSBCECAdapterCommunication(CCECProcessor *processo m_bHasData(false), m_iLineTimeout(0), m_iFirmwareVersion(CEC_FW_VERSION_UNKNOWN), - m_lastInitiator(CECDEVICE_UNKNOWN), + m_lastDestination(CECDEVICE_UNKNOWN), m_bNextIsEscaped(false), m_bGotStart(false), m_messageProcessor(NULL), m_bInitialised(false) { + for (unsigned int iPtr = 0; iPtr < 15; iPtr++) + m_bWaitingForAck[iPtr] = false; m_port = new CSerialPort(strPort, iBaudRate); } -CUSBCECAdapterCommunication::~CUSBCECAdapterCommunication(void) -{ - Close(); -} - bool CUSBCECAdapterCommunication::CheckAdapter(uint32_t iTimeoutMs /* = 10000 */) { bool bReturn(false); @@ -136,7 +133,7 @@ bool CUSBCECAdapterCommunication::CheckAdapter(uint32_t iTimeoutMs /* = 10000 */ return bReturn; } -bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs /* = 10000 */, bool bSkipChecks /* = false */) +bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs /* = 10000 */, bool bSkipChecks /* = false */, bool bStartListening /* = true */) { uint64_t iNow = GetTimeMs(); uint64_t iTimeout = iNow + iTimeoutMs; @@ -181,9 +178,20 @@ bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32 { //clear any input bytes uint8_t buff[1024]; - while (m_port->Read(buff, 1024, 100) > 0) + ssize_t iBytesRead(0); + bool bGotMsgStart(false), bGotMsgEnd(false); + while ((iBytesRead = m_port->Read(buff, 1024, 100)) > 0 || (bGotMsgStart && !bGotMsgEnd)) { - CLibCEC::AddLog(CEC_LOG_DEBUG, "data received, clearing it"); + if (!bGotMsgStart) + CLibCEC::AddLog(CEC_LOG_DEBUG, "data received, clearing it"); + // if something was received, wait for MSGEND + for (ssize_t iPtr = 0; iPtr < iBytesRead; iPtr++) + { + if (buff[iPtr] == MSGSTART) + bGotMsgStart = true; + else if (buff[iPtr] == MSGEND) + bGotMsgEnd = true; + } Sleep(250); } } @@ -192,9 +200,11 @@ bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32 if (!bSkipChecks && !CheckAdapter()) { CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter failed to pass basic checks"); + delete m_port; + m_port = NULL; return false; } - else + else if (bStartListening) { if (CreateThread()) { @@ -203,16 +213,24 @@ bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32 } else { + delete m_port; + m_port = NULL; CLibCEC::AddLog(CEC_LOG_ERROR, "could not create a communication thread"); + return false; } } + else + { + delete m_port; + m_port = NULL; + } - return false; + return true; } void CUSBCECAdapterCommunication::Close(void) { - StopThread(); + StopThread(0); } void *CUSBCECAdapterCommunication::Process(void) @@ -253,6 +271,7 @@ void *CUSBCECAdapterCommunication::Process(void) /* stop the message processor */ m_messageProcessor->StopThread(); delete m_messageProcessor; + m_messageProcessor = NULL; /* notify all threads that are waiting on messages to be sent */ CCECAdapterMessage *msg(NULL); @@ -271,6 +290,7 @@ void *CUSBCECAdapterCommunication::Process(void) m_port = NULL; } + m_rcvCondition.Broadcast(); return NULL; } @@ -292,6 +312,12 @@ cec_adapter_message_state CUSBCECAdapterCommunication::Write(const cec_command & output->retryTimeout = iRetryLineTimeout; output->tries = 0; + if (data.destination < 15) + { + CLockObject lock(m_mutex); + m_bWaitingForAck[data.destination] = true; + } + bool bRetry(true); while (bRetry && ++output->tries < output->maxTries) { @@ -415,16 +441,22 @@ bool CUSBCECAdapterCommunication::ParseMessage(const CCECAdapterMessage &msg) } if (m_currentframe.ack == 0x1) { - m_lastInitiator = m_currentframe.initiator; - m_processor->HandlePoll(m_currentframe.initiator, m_currentframe.destination); + m_lastDestination = m_currentframe.destination; + if (m_currentframe.destination < 15) + { + if (!m_bWaitingForAck[m_currentframe.destination]) + m_processor->HandlePoll(m_currentframe.initiator, m_currentframe.destination); + else + m_bWaitingForAck[m_currentframe.destination] = false; + } } } break; case MSGCODE_RECEIVE_FAILED: { m_currentframe.Clear(); - if (m_lastInitiator != CECDEVICE_UNKNOWN) - bIsError = m_processor->HandleReceiveFailed(m_lastInitiator); + if (m_lastDestination != CECDEVICE_UNKNOWN) + bIsError = m_processor->HandleReceiveFailed(m_lastDestination); } break; case MSGCODE_FRAME_DATA: @@ -466,15 +498,16 @@ uint16_t CUSBCECAdapterCommunication::GetFirmwareVersion(void) bool CUSBCECAdapterCommunication::SetLineTimeout(uint8_t iTimeout) { - m_iLineTimeout = iTimeout; - bool bReturn(m_iLineTimeout != iTimeout); + bool bReturn(true); - if (!bReturn) + if (m_iLineTimeout != iTimeout) { CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the line timeout to %d", iTimeout); CCECAdapterMessage params; params.PushEscaped(iTimeout); bReturn = SendCommand(MSGCODE_TRANSMIT_IDLETIME, params); + if (bReturn) + m_iLineTimeout = iTimeout; } return bReturn; @@ -515,6 +548,7 @@ bool CUSBCECAdapterCommunication::PersistConfiguration(libcec_configuration *con bool CUSBCECAdapterCommunication::GetConfiguration(libcec_configuration *configuration) { + configuration->iFirmwareVersion = m_iFirmwareVersion; if (m_iFirmwareVersion < 2) return false; @@ -794,15 +828,20 @@ bool CUSBCECAdapterCommunication::WaitForAck(CCECAdapterMessage &message) if (msg.Message() == MSGCODE_FRAME_START && msg.IsACK()) { - m_processor->HandlePoll(msg.Initiator(), msg.Destination()); - m_lastInitiator = msg.Initiator(); + if (msg.Initiator() < 15 && m_bWaitingForAck[msg.Initiator()]) + m_bWaitingForAck[msg.Initiator()] = false; + else if (msg.Initiator() < 15) + { + m_processor->HandlePoll(msg.Initiator(), msg.Destination()); + m_lastDestination = msg.Initiator(); + } iNow = GetTimeMs(); continue; } if (msg.Message() == MSGCODE_RECEIVE_FAILED && - m_lastInitiator != CECDEVICE_UNKNOWN && - m_processor->HandleReceiveFailed(m_lastInitiator)) + m_lastDestination != CECDEVICE_UNKNOWN && + m_processor->HandleReceiveFailed(m_lastDestination)) { iNow = GetTimeMs(); continue; @@ -986,12 +1025,14 @@ bool CUSBCECAdapterCommunication::SendCommand(cec_adapter_messagecode msgCode, C Write(output); bool bWriteOk = output->state == (output->expectControllerAck ? ADAPTER_MESSAGE_STATE_SENT_ACKED : ADAPTER_MESSAGE_STATE_SENT); + cec_adapter_messagecode reply = output->reply; + delete output; + if (!bWriteOk) { CLibCEC::AddLog(CEC_LOG_ERROR, "'%s' failed", CCECAdapterMessage::ToString(msgCode)); - delete output; - if (!bIsRetry && output->reply == MSGCODE_COMMAND_REJECTED && msgCode != MSGCODE_SET_CONTROLLED) + if (!bIsRetry && reply == MSGCODE_COMMAND_REJECTED && msgCode != MSGCODE_SET_CONTROLLED) { CLibCEC::AddLog(CEC_LOG_DEBUG, "setting controlled mode and retrying"); if (SetControlledMode(true)) @@ -1000,7 +1041,6 @@ bool CUSBCECAdapterCommunication::SendCommand(cec_adapter_messagecode msgCode, C return false; } - delete output; return true; }