X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.cpp;h=54077d6ed776b4b6ef72f0dcc0d76cffd948ab45;hb=dfb08039104f9477f7a974977ec31ce30a4fa92c;hp=3a1cfeb735b022749de36aa61cb18f4622d62d02;hpb=a171d2fdf17b447edd79134c5a092abe4658c919;p=deb_libcec.git diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp index 3a1cfeb..54077d6 100644 --- a/src/lib/AdapterCommunication.cpp +++ b/src/lib/AdapterCommunication.cpp @@ -226,9 +226,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); } @@ -288,8 +288,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()) { @@ -322,11 +322,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; }