repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b62b76
)
cec: don't transmit in CCECProcessor while keeping the mutex locked. don't set the...
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Fri, 17 Feb 2012 11:30:23 +0000
(12:30 +0100)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Fri, 17 Feb 2012 11:30:23 +0000
(12:30 +0100)
src/lib/CECProcessor.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/lib/CECProcessor.cpp
b/src/lib/CECProcessor.cpp
index afe87a979f48cdfb944291575a969f9d5009fcd7..d1e5b278ee103bfbbefe0b3e0828f307d3b2277f 100644
(file)
--- a/
src/lib/CECProcessor.cpp
+++ b/
src/lib/CECProcessor.cpp
@@
-864,7
+864,7
@@
bool CCECProcessor::Transmit(const cec_command &data)
return false;
}
return false;
}
-
cec_adapter_message_state retVal(ADAPTER_MESSAGE_STATE_UNKNOWN
);
+
uint8_t iMaxTries(0
);
{
CLockObject lock(m_mutex);
LogOutput(data);
{
CLockObject lock(m_mutex);
LogOutput(data);
@@
-874,16
+874,11
@@
bool CCECProcessor::Transmit(const cec_command &data)
CLibCEC::AddLog(CEC_LOG_ERROR, "cannot transmit command: connection closed");
return false;
}
CLibCEC::AddLog(CEC_LOG_ERROR, "cannot transmit command: connection closed");
return false;
}
- uint8_t iMaxTries = m_busDevices[data.initiator]->GetHandler()->GetTransmitRetries() + 1;
- retVal = m_communication->Write(data, iMaxTries, m_iLineTimeout, m_iRetryLineTimeout);
+ iMaxTries = m_busDevices[data.initiator]->GetHandler()->GetTransmitRetries() + 1;
}
}
- /* set to "not present" on failed ack */
- if (retVal == ADAPTER_MESSAGE_STATE_SENT_NOT_ACKED &&
- data.destination != CECDEVICE_BROADCAST)
- m_busDevices[data.destination]->SetDeviceStatus(CEC_DEVICE_STATUS_NOT_PRESENT);
-
- return retVal == ADAPTER_MESSAGE_STATE_SENT_ACKED;
+ return m_communication->Write(data, iMaxTries, m_iLineTimeout, m_iRetryLineTimeout)
+ == ADAPTER_MESSAGE_STATE_SENT_ACKED;
}
void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason /* = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE */)
}
void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason /* = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE */)