X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.cpp;h=2286a01e57080e8c12663e7b6c5a48d0d628f1c0;hb=4fb58ac466ff4c60c3796bbe5e62385320cf2f3d;hp=8fc70cd65f2ef129e29b8b2abcd0bd47e7e6c180;hpb=b5f34cf9fe42a1c12269a6f97db94a2a354cf8cd;p=deb_libcec.git diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp index 8fc70cd..2286a01 100644 --- a/src/lib/AdapterCommunication.cpp +++ b/src/lib/AdapterCommunication.cpp @@ -80,6 +80,9 @@ CCECAdapterMessage::CCECAdapterMessage(const cec_command &command) push_back(MSGEND); } + + // set timeout + transmit_timeout = command.transmit_timeout; } CCECAdapterMessage &CCECAdapterMessage::operator =(const CCECAdapterMessage &msg) @@ -364,7 +367,7 @@ void CAdapterCommunication::WriteNextCommand(void) else { m_controller->AddLog(CEC_LOG_DEBUG, "command sent"); - CCondition::Sleep((uint32_t) msg->size() * (uint32_t)24 /*data*/ + (uint32_t)5 /*start bit (4.5 ms)*/); + CCondition::Sleep((uint32_t) msg->size() * 24 /*data*/ + 5 /*start bit (4.5 ms)*/ + 10); msg->state = ADAPTER_MESSAGE_STATE_SENT; } msg->condition.Signal(); @@ -458,32 +461,6 @@ bool CAdapterCommunication::StartBootloader(void) return true; } -bool CAdapterCommunication::SetAckMask(uint16_t iMask) -{ - if (!IsRunning()) - return false; - - CStdString strLog; - strLog.Format("setting ackmask to %2x", iMask); - m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str()); - - CCECAdapterMessagePtr output(new CCECAdapterMessage); - - output->push_back(MSGSTART); - output->push_escaped(MSGCODE_SET_ACK_MASK); - output->push_escaped(iMask >> 8); - output->push_escaped((uint8_t)iMask); - output->push_back(MSGEND); - - if (!Write(output)) - { - m_controller->AddLog(CEC_LOG_ERROR, "could not set the ackmask"); - return false; - } - - return true; -} - bool CAdapterCommunication::PingAdapter(void) { if (!IsRunning())