X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.cpp;h=2bdbb04deded358fa721a2305cb254479a02f8fa;hb=0ecbcd4dd338a4e0e7dcf0400274cebf6744ff4e;hp=6cc482f238c55d437dc95dc9398cd34f5d72dd32;hpb=9e1cfa5c37120c1bad3eba0e9c5e6acf8129610b;p=deb_libcec.git diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp index 6cc482f..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), 1000) > 0) {} + uint8_t buff[1]; + while (m_port->Read(buff, 1, 5) == 1) {} if (CreateThread()) { @@ -328,6 +328,10 @@ void *CAdapterCommunication::Process(void) WriteNextCommand(); } + CCECAdapterMessage *msg; + if (m_outBuffer.Pop(msg)) + msg->condition.Broadcast(); + return NULL; }