repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed the year in copyright notices to 2011-2012
[deb_libcec.git]
/
src
/
lib
/
adapter
/
AdapterCommunication.cpp
diff --git
a/src/lib/adapter/AdapterCommunication.cpp
b/src/lib/adapter/AdapterCommunication.cpp
index 2bbcb0153ba0ec798fe76ff7ee0786abb3760f58..cd112c21e0f2263175a33d098d7c862610998c3f 100644
(file)
--- a/
src/lib/adapter/AdapterCommunication.cpp
+++ b/
src/lib/adapter/AdapterCommunication.cpp
@@
-1,7
+1,7
@@
/*
* This file is part of the libCEC(R) library.
*
/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011
-2012
Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
@@
-34,7
+34,8
@@
#include "AdapterMessage.h"
#include "../CECProcessor.h"
#include "AdapterMessage.h"
#include "../CECProcessor.h"
-#include "../platform/serialport/serialport.h"
+#include "../platform/sockets/serialport.h"
+#include "../platform/util/timeutils.h"
#include "../LibCEC.h"
using namespace std;
#include "../LibCEC.h"
using namespace std;
@@
-234,9
+235,11
@@
bool CAdapterCommunication::Read(CCECAdapterMessage &msg, uint32_t iTimeout)
return bGotFullMessage;
}
return bGotFullMessage;
}
-
std::s
tring CAdapterCommunication::GetError(void) const
+
CStdS
tring CAdapterCommunication::GetError(void) const
{
{
- return m_port->GetError();
+ CStdString strError;
+ strError = m_port->GetError();
+ return strError;
}
bool CAdapterCommunication::StartBootloader(void)
}
bool CAdapterCommunication::StartBootloader(void)