X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.h;h=1fdcf05808e12e3d66548d7bd13fb9c6bed6bc17;hb=305500533ee1524692ceaf3cb5f38d24225c5920;hp=0d4ac9b33cd88d5be62e46e1c14de02cfdaf5fbc;hpb=b9abf9202e8d5971805dd63600990673227034a3;p=deb_libcec.git diff --git a/src/lib/AdapterCommunication.h b/src/lib/AdapterCommunication.h index 0d4ac9b..1fdcf05 100644 --- a/src/lib/AdapterCommunication.h +++ b/src/lib/AdapterCommunication.h @@ -34,86 +34,50 @@ #include #include "platform/threads.h" #include "util/buffer.h" +#include "util/StdString.h" #include namespace CEC { - class CCECAdapterMessage + typedef enum cec_adapter_message_state { - public: - CCECAdapterMessage(void) {} - CCECAdapterMessage(const cec_command &command) - { - clear(); - - //set ack polarity to high when transmitting to the broadcast address - //set ack polarity low when transmitting to any other address - push_back(MSGSTART); - push_escaped(MSGCODE_TRANSMIT_ACK_POLARITY); - if (command.destination == CECDEVICE_BROADCAST) - push_escaped(CEC_TRUE); - else - push_escaped(CEC_FALSE); - push_back(MSGEND); - - // add source and destination - push_back(MSGSTART); - push_escaped(MSGCODE_TRANSMIT); - push_back(((uint8_t)command.initiator << 4) + (uint8_t)command.destination); - push_back(MSGEND); - - // add opcode - push_back(MSGSTART); - push_escaped(command.parameters.empty() ? (uint8_t)MSGCODE_TRANSMIT_EOM : (uint8_t)MSGCODE_TRANSMIT); - push_back((uint8_t) command.opcode); - push_back(MSGEND); - - // add parameters - for (int8_t iPtr = 0; iPtr < command.parameters.size; iPtr++) - { - push_back(MSGSTART); + 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; - if (iPtr == command.parameters.size - 1) - push_escaped( MSGCODE_TRANSMIT_EOM); - else - push_escaped(MSGCODE_TRANSMIT); - push_escaped(command.parameters[iPtr]); - - push_back(MSGEND); - } - } - - CCECAdapterMessage &operator =(const CCECAdapterMessage &msg) - { - packet = msg.packet; - return *this; - } + class CCECAdapterMessage + { + public: + CCECAdapterMessage(void) { clear(); } + CCECAdapterMessage(const cec_command &command); + CCECAdapterMessage &operator =(const CCECAdapterMessage &msg); + CStdString ToString(void) const; + CStdString MessageCodeAsString(void) const; - bool empty(void) const { return packet.empty(); } + bool empty(void) const { return packet.IsEmpty(); } 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 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; } - bool eom(void) const { return packet.size >= 1 ? (packet.at(0) & MSGCODE_FRAME_EOM) != 0 : false; } - bool ack(void) const { return packet.size >= 1 ? (packet.at(0) & MSGCODE_FRAME_ACK) != 0 : false; } - cec_logical_address initiator(void) const { return packet.size >= 2 ? (cec_logical_address) (packet.at(1) >> 4) : CECDEVICE_UNKNOWN; }; - 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) - { - if (byte >= MSGESC && byte != MSGSTART) - { - push_back(MSGESC); - push_back(byte - ESCOFFSET); - } - else - push_back(byte); - } - - cec_datapacket packet; + void clear(void) { state = ADAPTER_MESSAGE_STATE_UNKNOWN; transmit_timeout = 0; packet.Clear(); } + 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; } + bool eom(void) const { return packet.size >= 1 ? (packet.At(0) & MSGCODE_FRAME_EOM) != 0 : false; } + bool ack(void) const { return packet.size >= 1 ? (packet.At(0) & MSGCODE_FRAME_ACK) != 0 : false; } + cec_logical_address initiator(void) const { return packet.size >= 2 ? (cec_logical_address) (packet.At(1) >> 4) : CECDEVICE_UNKNOWN; }; + 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); + + cec_datapacket packet; + cec_adapter_message_state state; + int32_t transmit_timeout; + CMutex mutex; + CCondition condition; }; class CSerialPort; @@ -127,7 +91,7 @@ namespace CEC 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(CCECAdapterMessage *data); bool PingAdapter(void); void Close(void); bool IsOpen(void) const; @@ -136,18 +100,18 @@ namespace CEC void *Process(void); bool StartBootloader(void); - bool SetAckMask(uint16_t iMask); private: void WriteNextCommand(void); void AddData(uint8_t *data, uint8_t iLen); bool ReadFromDevice(uint32_t iTimeout); - CSerialPort * m_port; - CLibCEC * m_controller; - CecBuffer m_inBuffer; - CecBuffer m_outBuffer; - CMutex m_bufferMutex; - CCondition m_rcvCondition; + CSerialPort * m_port; + CLibCEC * m_controller; + CecBuffer m_inBuffer; + CecBuffer m_outBuffer; + CMutex m_mutex; + CCondition m_rcvCondition; + CCondition m_startCondition; }; };