repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: stick some interfaces before the pthread stuff, so we can add other implementati...
[deb_libcec.git]
/
src
/
lib
/
AdapterCommunication.cpp
diff --git
a/src/lib/AdapterCommunication.cpp
b/src/lib/AdapterCommunication.cpp
index 8d351f058a49164409bd11380211934aa1d650a7..9697759e4e081bfa65da88a235148e456b229725 100644
(file)
--- a/
src/lib/AdapterCommunication.cpp
+++ b/
src/lib/AdapterCommunication.cpp
@@
-33,9
+33,8
@@
#include "AdapterCommunication.h"
#include "CECProcessor.h"
#include "AdapterCommunication.h"
#include "CECProcessor.h"
+#include "platform/os-dependent.h"
#include "platform/serialport.h"
#include "platform/serialport.h"
-#include "util/StdString.h"
-#include "platform/timeutils.h"
using namespace std;
using namespace CEC;
using namespace std;
using namespace CEC;
@@
-197,9
+196,9
@@
CStdString CCECAdapterMessage::ToString(void) const
case MSGCODE_HIGH_ERROR:
case MSGCODE_LOW_ERROR:
{
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;
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;
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);
void CAdapterCommunication::AddData(uint8_t *data, uint8_t iLen)
{
CLockObject lock(&m_mutex);
- for (u
nsigned in
t iPtr = 0; iPtr < iLen; iPtr++)
+ for (u
int8_
t iPtr = 0; iPtr < iLen; iPtr++)
m_inBuffer.Push(data[iPtr]);
m_rcvCondition.Signal();
m_inBuffer.Push(data[iPtr]);
m_rcvCondition.Signal();