X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.h;h=1b815269f8ebb4cf65f2c96a43b64e1aa80133d1;hb=2efa39b7105c98a2219a12e5ab3432b77e042112;hp=461ed586f887e427615feb5a2ccb30f95ab9cc93;hpb=82d1a9a150628b179d1ad501eb9a73feb3f6dd1d;p=deb_libcec.git diff --git a/src/lib/AdapterCommunication.h b/src/lib/AdapterCommunication.h index 461ed58..1b81526 100644 --- a/src/lib/AdapterCommunication.h +++ b/src/lib/AdapterCommunication.h @@ -62,7 +62,7 @@ namespace CEC uint8_t operator[](uint8_t pos) const { return packet[pos]; } uint8_t at(uint8_t pos) const { return packet[pos]; } uint8_t size(void) const { return packet.size; } - void clear(void) { state = ADAPTER_MESSAGE_STATE_UNKNOWN; transmit_timeout = 0; packet.Clear(); maxTries = 5; tries = 0; reply = MSGCODE_NOTHING; } + void clear(void) { state = ADAPTER_MESSAGE_STATE_UNKNOWN; transmit_timeout = 0; packet.Clear(); maxTries = CEC_DEFAULT_TRANSMIT_RETRIES + 1; tries = 0; reply = MSGCODE_NOTHING; } void shift(uint8_t iShiftBy) { packet.Shift(iShiftBy); } void push_back(uint8_t add) { packet.PushBack(add); } cec_adapter_messagecode message(void) const { return packet.size >= 1 ? (cec_adapter_messagecode) (packet.At(0) & ~(MSGCODE_FRAME_EOM | MSGCODE_FRAME_ACK)) : MSGCODE_NOTHING; } @@ -75,7 +75,6 @@ namespace CEC bool needs_retry(void) const { return reply == MSGCODE_NOTHING || reply == MSGCODE_RECEIVE_FAILED || reply == MSGCODE_TIMEOUT_ERROR || - reply == MSGCODE_TRANSMIT_FAILED_ACK || reply == MSGCODE_TRANSMIT_FAILED_LINE || reply == MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA || reply == MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE || @@ -110,6 +109,7 @@ namespace CEC void *Process(void); + bool SetLineTimeout(uint8_t iTimeout); bool StartBootloader(void); private: @@ -125,5 +125,6 @@ namespace CEC CMutex m_mutex; CCondition m_rcvCondition; CCondition m_startCondition; + uint8_t m_iLineTimeout; }; };