repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: don't use the pid in dev_lock()/dev_unlock() calls
[deb_libcec.git]
/
src
/
lib
/
adapter
/
USBCECAdapterMessage.cpp
diff --git
a/src/lib/adapter/USBCECAdapterMessage.cpp
b/src/lib/adapter/USBCECAdapterMessage.cpp
index e8c575da1a637416ec8510b379d7acbaf428e11f..8ef5662fdf560e56ac33c4b35fe24d457a706427 100644
(file)
--- a/
src/lib/adapter/USBCECAdapterMessage.cpp
+++ b/
src/lib/adapter/USBCECAdapterMessage.cpp
@@
-123,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;
}
}
@@
-184,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:
@@
-218,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";
@@
-293,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);