X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fadapter%2FUSBCECAdapterCommunication.h;h=8cc701f094d353c017a3271f2d02358c91cc247f;hb=120d4ca86e6f7e187e2d4a97e8fe9b8e31c85c8c;hp=fc9e16ce044d30da4357288e88ed3b0ac1fd306e;hpb=8670c97085f27ad5d7f3fc218247f32332462b1d;p=deb_libcec.git diff --git a/src/lib/adapter/USBCECAdapterCommunication.h b/src/lib/adapter/USBCECAdapterCommunication.h index fc9e16c..8cc701f 100644 --- a/src/lib/adapter/USBCECAdapterCommunication.h +++ b/src/lib/adapter/USBCECAdapterCommunication.h @@ -46,6 +46,23 @@ namespace CEC { class CCECProcessor; + class CUSBCECAdapterProcessor: public PLATFORM::CThread + { + public: + CUSBCECAdapterProcessor(IAdapterCommunicationCallback *cb) : + m_callback(cb) {}; + virtual ~CUSBCECAdapterProcessor(void) + { + StopThread(); + } + + void *Process(void); + void AddCommand(cec_command command); + private: + IAdapterCommunicationCallback * m_callback; + PLATFORM::SyncedBuffer m_inBuffer; + }; + class CUSBCECAdapterCommunication : public IAdapterCommunication, private PLATFORM::CThread { public: @@ -72,6 +89,8 @@ namespace CEC void *Process(void); private: + bool SetAckMaskInternal(uint16_t iMask, bool bWriteDirectly = false); + bool CheckAdapter(uint32_t iTimeoutMs = 10000); bool Write(CCECAdapterMessage *data); bool Read(CCECAdapterMessage &msg, uint32_t iTimeout = 1000); @@ -87,7 +106,7 @@ namespace CEC PLATFORM::SyncedBuffer m_inBuffer; PLATFORM::SyncedBuffer m_outBuffer; PLATFORM::CMutex m_mutex; - PLATFORM::CCondition m_rcvCondition; + PLATFORM::CCondition m_rcvCondition; volatile bool m_bHasData; uint8_t m_iLineTimeout; uint16_t m_iFirmwareVersion; @@ -97,5 +116,6 @@ namespace CEC bool m_bNextIsEscaped; bool m_bGotStart; IAdapterCommunicationCallback * m_callback; + CUSBCECAdapterProcessor * m_messageProcessor; }; };