repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: fixed - ensure that the correct libCEC version is set after initialising the...
[deb_libcec.git]
/
src
/
lib
/
adapter
/
USBCECAdapterMessage.cpp
diff --git
a/src/lib/adapter/USBCECAdapterMessage.cpp
b/src/lib/adapter/USBCECAdapterMessage.cpp
index c23c21b24b91c016d5852b2c92a383af77597e67..8ef5662fdf560e56ac33c4b35fe24d457a706427 100644
(file)
--- a/
src/lib/adapter/USBCECAdapterMessage.cpp
+++ b/
src/lib/adapter/USBCECAdapterMessage.cpp
@@
-41,7
+41,7
@@
CCECAdapterMessage::CCECAdapterMessage(void)
Clear();
}
Clear();
}
-CCECAdapterMessage::CCECAdapterMessage(const cec_command &command, uint8_t i
MaxTries /* = 1 */, uint8_t iLineTimeout /* = 3 */, uint8_t iRetry
LineTimeout /* = 3 */)
+CCECAdapterMessage::CCECAdapterMessage(const cec_command &command, uint8_t iLineTimeout /* = 3 */)
{
Clear();
{
Clear();
@@
-88,15
+88,7
@@
CCECAdapterMessage::CCECAdapterMessage(const cec_command &command, uint8_t iMaxT
// set timeout
transmit_timeout = command.transmit_timeout;
// set timeout
transmit_timeout = command.transmit_timeout;
- /* set the number of retries */
- if (command.opcode == CEC_OPCODE_NONE) //TODO
- maxTries = 1;
- else if (command.initiator != CECDEVICE_BROADCAST)
- maxTries = iMaxTries;
-
lineTimeout = iLineTimeout;
lineTimeout = iLineTimeout;
- retryTimeout = iRetryLineTimeout;
- tries = 0;
}
CStdString CCECAdapterMessage::ToString(void) const
}
CStdString CCECAdapterMessage::ToString(void) const
@@
-131,6
+123,9
@@
CStdString CCECAdapterMessage::ToString(void) const
strMsg.AppendFormat(" %02x %s", At(2), IsEOM() ? "eom" : "");
break;
default:
strMsg.AppendFormat(" %02x %s", At(2), IsEOM() ? "eom" : "");
break;
default:
+ for (uint8_t iPtr = 2; iPtr < Size(); iPtr++)
+ if (At(iPtr) != MSGEND)
+ strMsg.AppendFormat(" %02x", At(iPtr));
break;
}
}
break;
}
}
@@
-192,8
+187,8
@@
const char *CCECAdapterMessage::ToString(cec_adapter_messagecode msgCode)
return "FRAME_EOM";
case MSGCODE_FRAME_ACK:
return "FRAME_ACK";
return "FRAME_EOM";
case MSGCODE_FRAME_ACK:
return "FRAME_ACK";
- case MSGCODE_
SET_POWERST
ATE:
- return "
SET_POWERST
ATE";
+ case MSGCODE_
GET_BUILDD
ATE:
+ return "
GET_BUILDD
ATE";
case MSGCODE_SET_CONTROLLED:
return "SET_CONTROLLED";
case MSGCODE_GET_AUTO_ENABLED:
case MSGCODE_SET_CONTROLLED:
return "SET_CONTROLLED";
case MSGCODE_GET_AUTO_ENABLED:
@@
-226,6
+221,8
@@
const char *CCECAdapterMessage::ToString(cec_adapter_messagecode msgCode)
return "SET_OSD_NAME";
case MSGCODE_WRITE_EEPROM:
return "WRITE_EEPROM";
return "SET_OSD_NAME";
case MSGCODE_WRITE_EEPROM:
return "WRITE_EEPROM";
+ default:
+ break;
}
return "unknown";
}
return "unknown";
@@
-257,10
+254,7
@@
void CCECAdapterMessage::Clear(void)
transmit_timeout = CEC_DEFAULT_TRANSMIT_TIMEOUT;
response.Clear();
packet.Clear();
transmit_timeout = CEC_DEFAULT_TRANSMIT_TIMEOUT;
response.Clear();
packet.Clear();
- maxTries = CEC_DEFAULT_TRANSMIT_RETRIES + 1;
- tries = 0;
lineTimeout = 3;
lineTimeout = 3;
- retryTimeout = 3;
bNextByteIsEscaped = false;
}
bNextByteIsEscaped = false;
}
@@
-304,7
+298,7
@@
bool CCECAdapterMessage::PushReceivedByte(uint8_t byte)
{
if (HasStartMessage())
{
{
if (HasStartMessage())
{
- CLibCEC::AddLog(CEC_LOG_WARNING, "received MSGSTART before MSGEND, removing previous buffer contents");
+
//TODO
CLibCEC::AddLog(CEC_LOG_WARNING, "received MSGSTART before MSGEND, removing previous buffer contents");
Clear();
}
PushBack(byte);
Clear();
}
PushBack(byte);