X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.cpp;h=2bdbb04deded358fa721a2305cb254479a02f8fa;hb=56035c8658776a144f63cdfd35ae32d93aacc987;hp=7f801b62d2bf8162b652f39d25621f9f99631d7c;hpb=9b223b298b838c216281f580c4dc0e62cf8d41f6;p=deb_libcec.git diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp index 7f801b6..2bdbb04 100644 --- a/src/lib/AdapterCommunication.cpp +++ b/src/lib/AdapterCommunication.cpp @@ -227,9 +227,9 @@ bool CCECAdapterMessage::is_error(void) const code == MSGCODE_LOW_ERROR || code == MSGCODE_RECEIVE_FAILED || code == MSGCODE_COMMAND_REJECTED || - code == MSGCODE_TRANSMIT_LINE_TIMEOUT || + code == MSGCODE_TRANSMIT_LINE_TIMEOUT || code == MSGCODE_TRANSMIT_FAILED_LINE || - code == MSGCODE_TRANSMIT_FAILED_ACK || + code == MSGCODE_TRANSMIT_FAILED_ACK || code == MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA || code == MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE); } @@ -289,8 +289,8 @@ bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38 m_processor->AddLog(CEC_LOG_DEBUG, "connection opened"); //clear any input bytes - uint8_t buff[1024]; - while (m_port->Read(buff, sizeof(buff), 500) > 0) {} + uint8_t buff[1]; + while (m_port->Read(buff, 1, 5) == 1) {} if (CreateThread()) { @@ -323,11 +323,15 @@ void *CAdapterCommunication::Process(void) while (!IsStopped()) { - ReadFromDevice(500); + ReadFromDevice(50); Sleep(5); WriteNextCommand(); } + CCECAdapterMessage *msg; + if (m_outBuffer.Pop(msg)) + msg->condition.Broadcast(); + return NULL; }