#include "platform/threads.h"
#include "util/buffer.h"
#include <string>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/shared_ptr.hpp>
namespace CEC
{
- class CCECAdapterMessage
+ typedef enum cec_adapter_message_state
+ {
+ ADAPTER_MESSAGE_STATE_UNKNOWN = 0,
+ ADAPTER_MESSAGE_STATE_WAITING,
+ ADAPTER_MESSAGE_STATE_SENT,
+ ADAPTER_MESSAGE_STATE_RECEIVED,
+ ADAPTER_MESSAGE_STATE_ERROR
+ } cec_adapter_message_state;
+
+
+ class CCECAdapterMessage : public boost::enable_shared_from_this<CCECAdapterMessage>
{
public:
- CCECAdapterMessage(void) {}
+ CCECAdapterMessage(void) { clear(); }
CCECAdapterMessage(const cec_command &command);
- CCECAdapterMessage &operator =(const CCECAdapterMessage &msg);
bool empty(void) const { return packet.empty(); }
uint8_t operator[](uint8_t pos) const { return packet[pos]; }
uint8_t at(uint8_t pos) const { return packet[pos]; }
uint8_t size(void) const { return packet.size; }
- void clear(void) { packet.clear(); }
+ void clear(void) { state = ADAPTER_MESSAGE_STATE_UNKNOWN; packet.clear(); }
void shift(uint8_t iShiftBy) { packet.shift(iShiftBy); }
void push_back(uint8_t add) { packet.push_back(add); }
cec_adapter_messagecode message(void) const { return packet.size >= 1 ? (cec_adapter_messagecode) (packet.at(0) & ~(MSGCODE_FRAME_EOM | MSGCODE_FRAME_ACK)) : MSGCODE_NOTHING; }
cec_logical_address destination(void) const { return packet.size >= 2 ? (cec_logical_address) (packet.at(1) & 0xF) : CECDEVICE_UNKNOWN; };
void push_escaped(int16_t byte);
- cec_datapacket packet;
+ cec_datapacket packet;
+ cec_adapter_message_state state;
+ CMutex mutex;
+ CCondition condition;
+
+ private:
+ CCECAdapterMessage &operator =(const CCECAdapterMessage &msg);
};
+ typedef boost::shared_ptr<CCECAdapterMessage> CCECAdapterMessagePtr;
class CSerialPort;
class CLibCEC;
bool Open(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000);
bool Read(CCECAdapterMessage &msg, uint32_t iTimeout = 1000);
- bool Write(const CCECAdapterMessage &frame);
+ bool Write(CCECAdapterMessagePtr data);
bool PingAdapter(void);
void Close(void);
bool IsOpen(void) const;
void AddData(uint8_t *data, uint8_t iLen);
bool ReadFromDevice(uint32_t iTimeout);
- CSerialPort * m_port;
- CLibCEC * m_controller;
- CecBuffer<uint8_t> m_inBuffer;
- CecBuffer<CCECAdapterMessage> m_outBuffer;
- CMutex m_bufferMutex;
- CCondition m_rcvCondition;
+ CSerialPort * m_port;
+ CLibCEC * m_controller;
+ CecBuffer<uint8_t> m_inBuffer;
+ CecBuffer<CCECAdapterMessagePtr> m_outBuffer;
+ CMutex m_mutex;
+ CCondition m_rcvCondition;
+ CCondition m_startCondition;
};
};