X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.cpp;h=9697759e4e081bfa65da88a235148e456b229725;hb=6f14b51266d3af3f215171a4a5fca5be011c023e;hp=8d351f058a49164409bd11380211934aa1d650a7;hpb=a9056daaa4fa20d8048be09ff9dba8b392c7d3d8;p=deb_libcec.git diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp index 8d351f0..9697759 100644 --- a/src/lib/AdapterCommunication.cpp +++ b/src/lib/AdapterCommunication.cpp @@ -33,9 +33,8 @@ #include "AdapterCommunication.h" #include "CECProcessor.h" +#include "platform/os-dependent.h" #include "platform/serialport.h" -#include "util/StdString.h" -#include "platform/timeutils.h" using namespace std; using namespace CEC; @@ -197,9 +196,9 @@ CStdString CCECAdapterMessage::ToString(void) const case MSGCODE_HIGH_ERROR: case MSGCODE_LOW_ERROR: { - int iLine = (size() >= 3) ? (at(1) << 8) | at(2) : 0; + uint32_t iLine = (size() >= 3) ? (at(1) << 8) | at(2) : 0; uint32_t iTime = (size() >= 7) ? (at(3) << 24) | (at(4) << 16) | (at(5) << 8) | at(6) : 0; - strMsg.AppendFormat(" line:%i", iLine); + strMsg.AppendFormat(" line:%u", iLine); strMsg.AppendFormat(" time:%u", iTime); } break; @@ -373,7 +372,7 @@ bool CAdapterCommunication::ReadFromDevice(uint32_t iTimeout) void CAdapterCommunication::AddData(uint8_t *data, uint8_t iLen) { CLockObject lock(&m_mutex); - for (unsigned int iPtr = 0; iPtr < iLen; iPtr++) + for (uint8_t iPtr = 0; iPtr < iLen; iPtr++) m_inBuffer.Push(data[iPtr]); m_rcvCondition.Signal();