*/
#include <cectypes.h>
-#include "platform/threads.h"
-#include "util/buffer.h"
-#include "util/StdString.h"
-#include <string>
+#include "platform/os.h"
+
+namespace PLATFORM
+{
+ class CSerialPort;
+}
namespace CEC
{
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) { state = ADAPTER_MESSAGE_STATE_UNKNOWN; transmit_timeout = 0; packet.Clear(); }
+ void clear(void) { state = ADAPTER_MESSAGE_STATE_UNKNOWN; transmit_timeout = 0; packet.Clear(); maxTries = CEC_DEFAULT_TRANSMIT_RETRIES + 1; tries = 0; reply = MSGCODE_NOTHING; }
void shift(uint8_t iShiftBy) { packet.Shift(iShiftBy); }
void push_back(uint8_t add) { packet.PushBack(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; };
bool is_error(void) const;
void push_escaped(uint8_t byte);
+ bool needs_retry(void) const { return reply == MSGCODE_NOTHING ||
+ reply == MSGCODE_RECEIVE_FAILED ||
+ reply == MSGCODE_TIMEOUT_ERROR ||
+ reply == MSGCODE_TRANSMIT_FAILED_LINE ||
+ reply == MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA ||
+ reply == MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE ||
+ reply == MSGCODE_TRANSMIT_LINE_TIMEOUT; }
+ uint8_t maxTries;
+ uint8_t tries;
+ cec_adapter_messagecode reply;
cec_datapacket packet;
cec_adapter_message_state state;
int32_t transmit_timeout;
- CMutex mutex;
- CCondition condition;
+ PLATFORM::CMutex mutex;
+ PLATFORM::CCondition condition;
};
- class CSerialPort;
class CCECProcessor;
- class CAdapterCommunication : private CThread
+ class CAdapterCommunication : private PLATFORM::CThread
{
public:
CAdapterCommunication(CCECProcessor *processor);
bool Write(CCECAdapterMessage *data);
bool PingAdapter(void);
void Close(void);
- bool IsOpen(void) const;
+ bool IsOpen(void);
std::string GetError(void) const;
void *Process(void);
+ bool SetLineTimeout(uint8_t iTimeout);
bool StartBootloader(void);
private:
void AddData(uint8_t *data, uint8_t iLen);
bool ReadFromDevice(uint32_t iTimeout);
- CSerialPort * m_port;
- CCECProcessor * m_processor;
- CecBuffer<uint8_t> m_inBuffer;
- CecBuffer<CCECAdapterMessage *> m_outBuffer;
- CMutex m_mutex;
- CCondition m_rcvCondition;
- CCondition m_startCondition;
+ PLATFORM::CSerialPort * m_port;
+ CCECProcessor * m_processor;
+ PLATFORM::SyncedBuffer<uint8_t> m_inBuffer;
+ PLATFORM::SyncedBuffer<CCECAdapterMessage *> m_outBuffer;
+ PLATFORM::CMutex m_mutex;
+ PLATFORM::CCondition m_rcvCondition;
+ PLATFORM::CCondition m_startCondition;
+ uint8_t m_iLineTimeout;
};
};