X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.h;h=3921446597faeb5f3b73bbd15f82fd465254250a;hb=d5bffd3c6eec0adbbb8bef6f4fd4ae484efe6f41;hp=f7dafa0250dbd1e5bc9030d9a62a4ae00ff17c50;hpb=2abe74ebbd27d8c30060b3eebb363e10d3fbfd80;p=deb_libcec.git

diff --git a/src/lib/AdapterCommunication.h b/src/lib/AdapterCommunication.h
index f7dafa0..3921446 100644
--- a/src/lib/AdapterCommunication.h
+++ b/src/lib/AdapterCommunication.h
@@ -32,26 +32,26 @@
  */
 
 #include "../../include/CECExports.h"
-#include "util/threads.h"
-
-class CSerialPort;
+#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 Open(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000);
+    bool Read(cec_frame &msg, uint32_t iTimeout = 1000);
     bool Write(const cec_frame &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);
@@ -60,18 +60,16 @@ namespace CEC
     bool SetAckMask(uint16_t iMask);
     static void PushEscaped(cec_frame &vec, uint8_t byte);
   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;
   };
 };