X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.h;h=fcb2817a67b3b4d7dc431bdbdbfd4010827bad3a;hb=faa6a23b5900133cac7585bd4b36f17f95c6ff42;hp=426601767347d55c76316286e21024e586ab74f2;hpb=b9187cc6999276ce37a5c9852655fd558ea76b8e;p=deb_libcec.git

diff --git a/src/lib/AdapterCommunication.h b/src/lib/AdapterCommunication.h
index 4266017..fcb2817 100644
--- a/src/lib/AdapterCommunication.h
+++ b/src/lib/AdapterCommunication.h
@@ -31,46 +31,47 @@
  *     http://www.pulse-eight.net/
  */
 
-#include "../../include/CECExports.h"
+#include <cectypes.h>
 #include "platform/threads.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 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;
+    int16_t              m_iInbufSize;
+    int16_t              m_iInbufUsed;
     CMutex               m_bufferMutex;
-    CCondition           m_condition;
+    CMutex               m_commMutex;
+    CCondition           m_rcvCondition;
   };
 };