cec: receive and send full cec_commands, not CCECAdapterMessages in CAdapterCommunica...

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

diff --git a/src/lib/adapter/AdapterMessage.h b/src/lib/adapter/USBCECAdapterMessage.h
similarity index 96%
rename from src/lib/adapter/AdapterMessage.h
rename to src/lib/adapter/USBCECAdapterMessage.h
index 2ba59a1946d85f447c44a8977f2d6e0385e53eba..169c115dc4fdef55ca8b34637e3951ec089e36cb 100644 (file)
--- a/src/lib/adapter/AdapterMessage.h
+++ b/src/lib/adapter/USBCECAdapterMessage.h
@@ -35,18 +35,6 @@
 
 namespace CEC
 {
-  typedef enum cec_adapter_message_state
-  {
-    ADAPTER_MESSAGE_STATE_UNKNOWN = 0,
-    ADAPTER_MESSAGE_STATE_WAITING_TO_BE_SENT,
-    ADAPTER_MESSAGE_STATE_SENT,
-    ADAPTER_MESSAGE_STATE_SENT_NOT_ACKED,
-    ADAPTER_MESSAGE_STATE_SENT_ACKED,
-    ADAPTER_MESSAGE_STATE_INCOMING,
-    ADAPTER_MESSAGE_STATE_ERROR
-  } cec_adapter_message_state;
-
-
   class CCECAdapterMessage
   {
   public:
@@ -265,6 +253,8 @@ namespace CEC
       reply               = MSGCODE_NOTHING;
       isTransmission      = true;
       expectControllerAck = true;
+      lineTimeout         = 3;
+      retryTimeout        = 3;
     }
 
     void Shift(uint8_t iShiftBy)
@@ -358,6 +348,8 @@ namespace CEC
     int32_t                   transmit_timeout;
     bool                      isTransmission;
     bool                      expectControllerAck;
+    uint8_t                   lineTimeout;
+    uint8_t                   retryTimeout;
     PLATFORM::CMutex          mutex;
     PLATFORM::CCondition      condition;
   };