changed the year in copyright notices to 2011-2012

[deb_libcec.git] / src / lib / adapter / AdapterCommunication.h

diff --git a/src/lib/adapter/AdapterCommunication.h b/src/lib/adapter/AdapterCommunication.h
index bdc3de30f3f543e8bfd30d46528ef1a1d01e973f..e8dab2a6dba3d3d96e2978b4b06e92696c9891a6 100644 (file)
--- a/src/lib/adapter/AdapterCommunication.h
+++ b/src/lib/adapter/AdapterCommunication.h
@@ -2,7 +2,7 @@
 /*
  * This file is part of the libCEC(R) library.
  *
- * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -32,7 +32,9 @@
  */
 
 #include <cectypes.h>
-#include "platform/os.h"
+#include "../platform/threads/threads.h"
+#include "../platform/util/buffer.h"
+#include "../platform/util/StdString.h"
 
 namespace PLATFORM
 {
@@ -53,18 +55,19 @@ 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(CCECAdapterMessage *data);
-    bool PingAdapter(void);
     void Close(void);
     bool IsOpen(void);
-    std::string GetError(void) const;
+    CStdString GetError(void) const;
 
     void *Process(void);
 
     bool SetLineTimeout(uint8_t iTimeout);
     bool StartBootloader(void);
     bool SetAckMask(uint16_t iMask);
+    bool PingAdapter(void);
+    uint16_t GetFirmwareVersion(void);
 
-    bool WaitForTransmitSucceeded(CCECAdapterMessage *message);
+    bool WaitForAck(CCECAdapterMessage &message);
 
   private:
     void SendMessageToAdapter(CCECAdapterMessage *msg);
@@ -79,5 +82,6 @@ namespace CEC
     PLATFORM::CMutex                             m_mutex;
     PLATFORM::CCondition                         m_rcvCondition;
     uint8_t                                      m_iLineTimeout;
+    uint16_t                                     m_iFirmwareVersion;
   };
 };