* http://www.pulse-eight.net/
*/
-#include "../../include/CECExports.h"
+#include <cectypes.h>
#include "platform/threads.h"
+#include "util/buffer.h"
+#include <string>
namespace CEC
{
class CSerialPort;
class CLibCEC;
- class CAdapterCommunication : CThread
+ class CAdapterCommunication : private CThread
{
public:
CAdapterCommunication(CLibCEC *controller);
virtual ~CAdapterCommunication();
- bool Open(const char *strPort, int iBaudRate = 38400, int iTimeoutMs = 10000);
- bool Read(cec_frame &msg, int iTimeout = 1000);
- bool Write(const cec_frame &frame);
+ bool Open(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000);
+ bool Read(cec_adapter_message &msg, uint32_t iTimeout = 1000);
+ bool Write(const cec_adapter_message &frame);
bool PingAdapter(void);
void Close(void);
- bool IsOpen(void) const { return !m_bStop && m_bStarted; }
+ bool IsOpen(void) const;
std::string GetError(void) const;
void *Process(void);
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, int iLen);
- bool ReadFromDevice(int iTimeout);
+ void WriteNextCommand(void);
+ void AddData(uint8_t *data, uint8_t iLen);
+ bool ReadFromDevice(uint32_t iTimeout);
- CSerialPort * m_port;
- CLibCEC * m_controller;
- uint8_t* m_inbuf;
- int m_iInbufSize;
- int m_iInbufUsed;
- bool m_bStarted;
- bool m_bStop;
- CMutex m_commMutex;
- CMutex m_bufferMutex;
- CCondition m_condition;
+ CSerialPort * m_port;
+ CLibCEC * m_controller;
+ CecBuffer<uint8_t> m_inBuffer;
+ CecBuffer<cec_adapter_message> m_outBuffer;
+ CMutex m_bufferMutex;
+ CMutex m_commMutex;
+ CCondition m_rcvCondition;
};
};