X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fadapter%2FUSBCECAdapterCommunication.cpp;h=8e0b44e58b57e72fbf440d123f1da58b1094fcb9;hb=960f33c651b2dd1e6331dafe5b21705c11cee1a2;hp=a27765c6651eedf4df027c17d40c5f6d23748bd2;hpb=b1f94db151af0ba66f9fe1043ef80c9769591e4b;p=deb_libcec.git diff --git a/src/lib/adapter/USBCECAdapterCommunication.cpp b/src/lib/adapter/USBCECAdapterCommunication.cpp index a27765c..8e0b44e 100644 --- a/src/lib/adapter/USBCECAdapterCommunication.cpp +++ b/src/lib/adapter/USBCECAdapterCommunication.cpp @@ -43,6 +43,7 @@ using namespace PLATFORM; CUSBCECAdapterCommunication::CUSBCECAdapterCommunication(CCECProcessor *processor, const char *strPort, uint16_t iBaudRate /* = 38400 */) : m_port(NULL), m_processor(processor), + m_bHasData(false), m_iLineTimeout(0), m_iFirmwareVersion(CEC_FW_VERSION_UNKNOWN), m_lastInitiator(CECDEVICE_UNKNOWN), @@ -57,70 +58,124 @@ CUSBCECAdapterCommunication::~CUSBCECAdapterCommunication(void) Close(); } -bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs /* = 10000 */) +bool CUSBCECAdapterCommunication::CheckAdapter(uint32_t iTimeoutMs /* = 10000 */) { + bool bReturn(false); uint64_t iNow = GetTimeMs(); - uint64_t iTimeout = iNow + iTimeoutMs; - - CLockObject lock(m_mutex); + uint64_t iTarget = iTimeoutMs > 0 ? iNow + iTimeoutMs : iNow + CEC_DEFAULT_TRANSMIT_WAIT; - if (!m_port) + /* try to ping the adapter */ + bool bPinged(false); + unsigned iPingTry(0); + while (iNow < iTarget && (bPinged = PingAdapter()) == false) { - CLibCEC::AddLog(CEC_LOG_ERROR, "port is NULL"); - return false; + CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter did not respond correctly to a ping (try %d)", ++iPingTry); + Sleep(500); + iNow = GetTimeMs(); } - if (IsOpen()) + /* try to read the firmware version */ + m_iFirmwareVersion = CEC_FW_VERSION_UNKNOWN; + unsigned iFwVersionTry(0); + while (bPinged && iNow < iTarget && (m_iFirmwareVersion = GetFirmwareVersion()) == CEC_FW_VERSION_UNKNOWN) { - CLibCEC::AddLog(CEC_LOG_ERROR, "port is already open"); - return true; + CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter did not respond with a correct firmware version (try %d)", ++iFwVersionTry); + Sleep(500); + iNow = GetTimeMs(); } - m_callback = cb; - CStdString strError; - bool bConnected(false); - while (!bConnected && iNow < iTimeout) + if (m_iFirmwareVersion >= 2) { - if ((bConnected = m_port->Open(iTimeout)) == false) + /* try to set controlled mode */ + unsigned iControlledTry(0); + bool bControlled(false); + while (iNow < iTarget && (bControlled = SetControlledMode(true)) == false) { - strError.Format("error opening serial port '%s': %s", m_port->GetName().c_str(), m_port->GetError().c_str()); - Sleep(250); + CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter did not respond correctly to setting controlled mode (try %d)", ++iControlledTry); + Sleep(500); iNow = GetTimeMs(); } + bReturn = bControlled; } + else + bReturn = true; - if (!bConnected) - { - CLibCEC::AddLog(CEC_LOG_ERROR, strError); - return false; - } + return bReturn; +} - CLibCEC::AddLog(CEC_LOG_DEBUG, "connection opened, clearing any previous input and waiting for active transmissions to end before starting"); +bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs /* = 10000 */) +{ + uint64_t iNow = GetTimeMs(); + uint64_t iTimeout = iNow + iTimeoutMs; - //clear any input bytes - uint8_t buff[1024]; - while (m_port->Read(buff, 1024, 100) > 0) { - CLibCEC::AddLog(CEC_LOG_DEBUG, "data received, clearing it"); - Sleep(250); + CLockObject lock(m_mutex); + + if (!m_port) + { + CLibCEC::AddLog(CEC_LOG_ERROR, "port is NULL"); + return false; + } + + if (IsOpen()) + { + CLibCEC::AddLog(CEC_LOG_ERROR, "port is already open"); + return true; + } + + m_callback = cb; + CStdString strError; + bool bConnected(false); + while (!bConnected && iNow < iTimeout) + { + if ((bConnected = m_port->Open(iTimeout)) == false) + { + strError.Format("error opening serial port '%s': %s", m_port->GetName().c_str(), m_port->GetError().c_str()); + Sleep(250); + iNow = GetTimeMs(); + } + } + + if (!bConnected) + { + CLibCEC::AddLog(CEC_LOG_ERROR, strError); + return false; + } + + CLibCEC::AddLog(CEC_LOG_DEBUG, "connection opened, clearing any previous input and waiting for active transmissions to end before starting"); + + //clear any input bytes + uint8_t buff[1024]; + while (m_port->Read(buff, 1024, 100) > 0) + { + CLibCEC::AddLog(CEC_LOG_DEBUG, "data received, clearing it"); + Sleep(250); + } } if (CreateThread()) { - CLibCEC::AddLog(CEC_LOG_DEBUG, "communication thread started"); - return true; - } - else - { - CLibCEC::AddLog(CEC_LOG_ERROR, "could not create a communication thread"); + if (!CheckAdapter()) + { + StopThread(); + CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter failed to pass basic checks"); + } + else + { + CLibCEC::AddLog(CEC_LOG_DEBUG, "communication thread started"); + return true; + } } + CLibCEC::AddLog(CEC_LOG_ERROR, "could not create a communication thread"); return false; } void CUSBCECAdapterCommunication::Close(void) { + SetAckMask(0); CLockObject lock(m_mutex); + m_bHasData = true; m_rcvCondition.Broadcast(); StopThread(); } @@ -128,21 +183,29 @@ void CUSBCECAdapterCommunication::Close(void) void *CUSBCECAdapterCommunication::Process(void) { cec_command command; + bool bCommandReceived(false); while (!IsStopped()) { - ReadFromDevice(50); + { + CLockObject lock(m_mutex); + ReadFromDevice(50); + bCommandReceived = m_callback && Read(command, 0); + } /* push the next command to the callback method if there is one */ - if (m_callback && Read(command, 0)) + if (!IsStopped() && bCommandReceived) m_callback->OnCommandReceived(command); - Sleep(5); - WriteNextCommand(); + if (!IsStopped()) + { + Sleep(5); + WriteNextCommand(); + } } CCECAdapterMessage *msg(NULL); if (m_outBuffer.Pop(msg)) - msg->condition.Broadcast(); + msg->event.Broadcast(); if (m_port) { @@ -156,6 +219,8 @@ void *CUSBCECAdapterCommunication::Process(void) cec_adapter_message_state CUSBCECAdapterCommunication::Write(const cec_command &data, uint8_t iMaxTries, uint8_t iLineTimeout /* = 3 */, uint8_t iRetryLineTimeout /* = 3 */) { cec_adapter_message_state retVal(ADAPTER_MESSAGE_STATE_UNKNOWN); + if (!IsRunning()) + return retVal; CCECAdapterMessage *output = new CCECAdapterMessage(data); @@ -184,10 +249,9 @@ cec_adapter_message_state CUSBCECAdapterCommunication::Write(const cec_command & bool CUSBCECAdapterCommunication::Write(CCECAdapterMessage *data) { - CLockObject lock(data->mutex); data->state = ADAPTER_MESSAGE_STATE_WAITING_TO_BE_SENT; m_outBuffer.Push(data); - data->condition.Wait(data->mutex); + data->event.Wait(); if ((data->expectControllerAck && data->state != ADAPTER_MESSAGE_STATE_SENT_ACKED) || (!data->expectControllerAck && data->state != ADAPTER_MESSAGE_STATE_SENT)) @@ -201,6 +265,9 @@ bool CUSBCECAdapterCommunication::Write(CCECAdapterMessage *data) bool CUSBCECAdapterCommunication::Read(cec_command &command, uint32_t iTimeout) { + if (!IsRunning()) + return false; + CCECAdapterMessage msg; if (Read(msg, iTimeout)) { @@ -223,15 +290,16 @@ bool CUSBCECAdapterCommunication::Read(CCECAdapterMessage &msg, uint32_t iTimeou if (!m_inBuffer.Pop(buf)) { - if (iTimeout == 0 || !m_rcvCondition.Wait(m_mutex, iTimeout)) + if (iTimeout == 0 || !m_rcvCondition.Wait(m_mutex, m_bHasData, iTimeout)) return false; m_inBuffer.Pop(buf); + m_bHasData = m_inBuffer.Size() > 0; } if (buf) { msg.packet = buf->packet; - msg.state = msg.state = ADAPTER_MESSAGE_STATE_INCOMING; + msg.state = ADAPTER_MESSAGE_STATE_INCOMING; delete buf; return true; } @@ -348,6 +416,7 @@ uint16_t CUSBCECAdapterCommunication::GetFirmwareVersion(void) if (iReturn == CEC_FW_VERSION_UNKNOWN) { + CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting the firmware version"); CCECAdapterMessage *output = new CCECAdapterMessage; @@ -357,24 +426,32 @@ uint16_t CUSBCECAdapterCommunication::GetFirmwareVersion(void) output->isTransmission = false; output->expectControllerAck = false; - bool bWriteOk = Write(output); + SendMessageToAdapter(output); + bool bWriteOk = output->state == ADAPTER_MESSAGE_STATE_SENT; delete output; if (!bWriteOk) { CLibCEC::AddLog(CEC_LOG_ERROR, "could not request the firmware version"); + return iReturn; } - else + + Sleep(250); // TODO ReadFromDevice() isn't waiting for the timeout to pass on win32 + ReadFromDevice(CEC_DEFAULT_TRANSMIT_WAIT, 5 /* start + msgcode + 2 bytes for fw version + end */); + CCECAdapterMessage input; + if (Read(input, 0)) { - ReadFromDevice(CEC_DEFAULT_TRANSMIT_WAIT, 5 /* start + msgcode + 2 bytes for fw version + end */); - CCECAdapterMessage input; - if (!Read(input, 0) || input.Message() != MSGCODE_FIRMWARE_VERSION || input.Size() != 3) - CLibCEC::AddLog(CEC_LOG_ERROR, "no or invalid firmware version (size = %d, message = %d)", input.Size(), input.Message()); + if (input.Message() != MSGCODE_FIRMWARE_VERSION || input.Size() != 3) + CLibCEC::AddLog(CEC_LOG_ERROR, "invalid firmware version (size = %d, message = %d)", input.Size(), input.Message()); else { m_iFirmwareVersion = (input[1] << 8 | input[2]); iReturn = m_iFirmwareVersion; } } + else + { + CLibCEC::AddLog(CEC_LOG_ERROR, "no firmware version received"); + } } return iReturn; @@ -551,6 +628,7 @@ void CUSBCECAdapterCommunication::AddData(uint8_t *data, size_t iLen) m_currentAdapterMessage.Clear(); m_bGotStart = false; m_bNextIsEscaped = false; + m_bHasData = true; m_rcvCondition.Signal(); } else if (m_bNextIsEscaped) @@ -596,7 +674,6 @@ bool CUSBCECAdapterCommunication::ReadFromDevice(uint32_t iTimeout, size_t iSize void CUSBCECAdapterCommunication::SendMessageToAdapter(CCECAdapterMessage *msg) { CLockObject adapterLock(m_mutex); - CLockObject lock(msg->mutex); if (msg->tries == 1) SetLineTimeout(msg->lineTimeout); else @@ -618,7 +695,7 @@ void CUSBCECAdapterCommunication::SendMessageToAdapter(CCECAdapterMessage *msg) CLibCEC::AddLog(CEC_LOG_DEBUG, "did not receive ack"); } } - msg->condition.Signal(); + msg->event.Signal(); } void CUSBCECAdapterCommunication::WriteNextCommand(void)