repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: drop shared_ptr and use a normal pointer. removed boost dependency
[deb_libcec.git]
/
src
/
lib
/
AdapterCommunication.cpp
diff --git
a/src/lib/AdapterCommunication.cpp
b/src/lib/AdapterCommunication.cpp
index 2286a01e57080e8c12663e7b6c5a48d0d628f1c0..00fa87e408615828cf0615dd045d1e1df74f5bc8 100644
(file)
--- a/
src/lib/AdapterCommunication.cpp
+++ b/
src/lib/AdapterCommunication.cpp
@@
-353,7
+353,7
@@
void CAdapterCommunication::AddData(uint8_t *data, uint8_t iLen)
void CAdapterCommunication::WriteNextCommand(void)
{
void CAdapterCommunication::WriteNextCommand(void)
{
- CCECAdapterMessage
Ptr
msg;
+ CCECAdapterMessage
*
msg;
if (m_outBuffer.Pop(msg))
{
CLockObject lock(&msg->mutex);
if (m_outBuffer.Pop(msg))
{
CLockObject lock(&msg->mutex);
@@
-374,7
+374,7
@@
void CAdapterCommunication::WriteNextCommand(void)
}
}
}
}
-bool CAdapterCommunication::Write(CCECAdapterMessage
Ptr
data)
+bool CAdapterCommunication::Write(CCECAdapterMessage
*
data)
{
data->state = ADAPTER_MESSAGE_STATE_WAITING;
m_outBuffer.Push(data);
{
data->state = ADAPTER_MESSAGE_STATE_WAITING;
m_outBuffer.Push(data);
@@
-442,47
+442,45
@@
std::string CAdapterCommunication::GetError(void) const
bool CAdapterCommunication::StartBootloader(void)
{
bool CAdapterCommunication::StartBootloader(void)
{
+ bool bReturn(false);
if (!IsRunning())
if (!IsRunning())
- return
false
;
+ return
bReturn
;
m_controller->AddLog(CEC_LOG_DEBUG, "starting the bootloader");
m_controller->AddLog(CEC_LOG_DEBUG, "starting the bootloader");
- CCECAdapterMessage
Ptr output(new CCECAdapterMessage)
;
+ CCECAdapterMessage
*output = new CCECAdapterMessage
;
output->push_back(MSGSTART);
output->push_escaped(MSGCODE_START_BOOTLOADER);
output->push_back(MSGEND);
output->push_back(MSGSTART);
output->push_escaped(MSGCODE_START_BOOTLOADER);
output->push_back(MSGEND);
- if (!Write(output))
- {
+ if ((bReturn = Write(output)) == false)
m_controller->AddLog(CEC_LOG_ERROR, "could not start the bootloader");
m_controller->AddLog(CEC_LOG_ERROR, "could not start the bootloader");
- return false;
- }
- m_controller->AddLog(CEC_LOG_DEBUG, "bootloader start command transmitted");
- return
true
;
+
+ delete output;
+
+ return
bReturn
;
}
bool CAdapterCommunication::PingAdapter(void)
{
}
bool CAdapterCommunication::PingAdapter(void)
{
+ bool bReturn(false);
if (!IsRunning())
if (!IsRunning())
- return
false
;
+ return
bReturn
;
m_controller->AddLog(CEC_LOG_DEBUG, "sending ping");
m_controller->AddLog(CEC_LOG_DEBUG, "sending ping");
- CCECAdapterMessage
Ptr output(new CCECAdapterMessage)
;
+ CCECAdapterMessage
*output = new CCECAdapterMessage
;
output->push_back(MSGSTART);
output->push_escaped(MSGCODE_PING);
output->push_back(MSGEND);
output->push_back(MSGSTART);
output->push_escaped(MSGCODE_PING);
output->push_back(MSGEND);
- if (!Write(output))
- {
+ if ((bReturn = Write(output)) == false)
m_controller->AddLog(CEC_LOG_ERROR, "could not send ping command");
m_controller->AddLog(CEC_LOG_ERROR, "could not send ping command");
- return false;
- }
-
- m_controller->AddLog(CEC_LOG_DEBUG, "ping tranmitted");
// TODO check for pong
// TODO check for pong
- return true;
+ delete output;
+
+ return bReturn;
}
bool CAdapterCommunication::IsOpen(void) const
}
bool CAdapterCommunication::IsOpen(void) const