repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: use CecBuffer as input buffer in CAdapterCommunication
[deb_libcec.git]
/
src
/
lib
/
AdapterCommunication.h
diff --git
a/src/lib/AdapterCommunication.h
b/src/lib/AdapterCommunication.h
index 3921446597faeb5f3b73bbd15f82fd465254250a..badeae9cf0fe3285b636deb941fe7fac1a81f48b 100644
(file)
--- a/
src/lib/AdapterCommunication.h
+++ b/
src/lib/AdapterCommunication.h
@@
-31,8
+31,9
@@
* http://www.pulse-eight.net/
*/
* http://www.pulse-eight.net/
*/
-#include
"../../include/CECExports.h"
+#include
<cectypes.h>
#include "platform/threads.h"
#include "platform/threads.h"
+#include "util/buffer.h"
#include <string>
namespace CEC
#include <string>
namespace CEC
@@
-47,8
+48,8
@@
namespace CEC
virtual ~CAdapterCommunication();
bool Open(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000);
virtual ~CAdapterCommunication();
bool Open(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000);
- bool Read(cec_
fram
e &msg, uint32_t iTimeout = 1000);
- bool Write(const cec_
fram
e &frame);
+ bool Read(cec_
adapter_messag
e &msg, uint32_t iTimeout = 1000);
+ bool Write(const cec_
adapter_messag
e &frame);
bool PingAdapter(void);
void Close(void);
bool IsOpen(void) const;
bool PingAdapter(void);
void Close(void);
bool IsOpen(void) const;
@@
-58,16
+59,16
@@
namespace CEC
bool StartBootloader(void);
bool SetAckMask(uint16_t iMask);
bool StartBootloader(void);
bool SetAckMask(uint16_t iMask);
- static void PushEscaped(cec_frame &vec, uint8_t byte);
+ static void PushEscaped(cec_adapter_message &vec, uint8_t byte);
+ static void FormatAdapterMessage(const cec_command &command, cec_adapter_message &packet);
+
private:
void AddData(uint8_t *data, uint8_t iLen);
bool ReadFromDevice(uint32_t iTimeout);
CSerialPort * m_port;
CLibCEC * m_controller;
private:
void AddData(uint8_t *data, uint8_t iLen);
bool ReadFromDevice(uint32_t iTimeout);
CSerialPort * m_port;
CLibCEC * m_controller;
- uint8_t* m_inbuf;
- int16_t m_iInbufSize;
- int16_t m_iInbufUsed;
+ CecBuffer<uint8_t> m_inBuffer;
CMutex m_bufferMutex;
CMutex m_commMutex;
CCondition m_rcvCondition;
CMutex m_bufferMutex;
CMutex m_commMutex;
CCondition m_rcvCondition;