cec: cleanups. bugzid: 543

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

diff --git a/src/lib/adapter/USBCECAdapterMessage.h b/src/lib/adapter/USBCECAdapterMessage.h
index 169c115dc4fdef55ca8b34637e3951ec089e36cb..f7cf6f694eef2c6486336558856054832c075f1f 100644 (file)
--- a/src/lib/adapter/USBCECAdapterMessage.h
+++ b/src/lib/adapter/USBCECAdapterMessage.h
@@ -38,7 +38,8 @@ namespace CEC
   class CCECAdapterMessage
   {
   public:
-    CCECAdapterMessage(void)
+    CCECAdapterMessage(void) :
+        event(false)
     {
       Clear();
     }
@@ -218,6 +219,57 @@ namespace CEC
       case MSGCODE_FRAME_ACK:
         strMsg = "FRAME_ACK";
         break;
+      case MSGCODE_SET_POWERSTATE:
+        strMsg = "SET_POWERSTATE";
+        break;
+      case MSGCODE_SET_CONTROLLED:
+        strMsg = "SET_CONTROLLED";
+        break;
+      case MSGCODE_GET_AUTO_ENABLED:
+        strMsg = "GET_AUTO_ENABLED";
+        break;
+      case MSGCODE_SET_AUTO_ENABLED:
+        strMsg = "SET_AUTO_ENABLED";
+        break;
+      case MSGCODE_GET_DEFAULT_LOGICAL_ADDRESS:
+        strMsg = "GET_DEFAULT_LOGICAL_ADDRESS";
+        break;
+      case MSGCODE_SET_DEFAULT_LOGICAL_ADDRESS:
+        strMsg = "SET_DEFAULT_LOGICAL_ADDRESS";
+        break;
+      case MSGCODE_GET_LOGICAL_ADDRESS_MASK:
+        strMsg = "GET_LOGICAL_ADDRESS_MASK";
+        break;
+      case MSGCODE_SET_LOGICAL_ADDRESS_MASK:
+        strMsg = "SET_LOGICAL_ADDRESS_MASK";
+        break;
+      case MSGCODE_GET_PHYSICAL_ADDRESS:
+        strMsg = "GET_PHYSICAL_ADDRESS";
+        break;
+      case MSGCODE_SET_PHYSICAL_ADDRESS:
+        strMsg = "SET_PHYSICAL_ADDRESS";
+        break;
+      case MSGCODE_GET_DEVICE_TYPE:
+        strMsg = "GET_DEVICE_TYPE";
+        break;
+      case MSGCODE_SET_DEVICE_TYPE:
+        strMsg = "SET_DEVICE_TYPE";
+        break;
+      case MSGCODE_GET_HDMI_VERSION:
+        strMsg = "GET_HDMI_VERSION";
+        break;
+      case MSGCODE_SET_HDMI_VERSION:
+        strMsg = "SET_HDMI_VERSION";
+        break;
+      case MSGCODE_GET_OSD_NAME:
+        strMsg = "GET_OSD_NAME";
+        break;
+      case MSGCODE_SET_OSD_NAME:
+        strMsg = "SET_OSD_NAME";
+        break;
+      case MSGCODE_WRITE_EEPROM:
+        strMsg = "WRITE_EEPROM";
+        break;
       }
 
       return strMsg;
@@ -262,6 +314,17 @@ namespace CEC
       packet.Shift(iShiftBy);
     }
 
+    void Append(CCECAdapterMessage &data)
+    {
+      Append(data.packet);
+    }
+
+    void Append(cec_datapacket &data)
+    {
+      for (uint8_t iPtr = 0; iPtr < data.size; iPtr++)
+        PushBack(data[iPtr]);
+    }
+
     void PushBack(uint8_t add)
     {
       packet.PushBack(add);
@@ -340,17 +403,16 @@ namespace CEC
           CECDEVICE_UNKNOWN;
     }
 
-    uint8_t                   maxTries;
-    uint8_t                   tries;
-    cec_adapter_messagecode   reply;
-    cec_datapacket            packet;
-    cec_adapter_message_state state;
-    int32_t                   transmit_timeout;
-    bool                      isTransmission;
-    bool                      expectControllerAck;
-    uint8_t                   lineTimeout;
-    uint8_t                   retryTimeout;
-    PLATFORM::CMutex          mutex;
-    PLATFORM::CCondition      condition;
+    uint8_t                               maxTries;
+    uint8_t                               tries;
+    cec_adapter_messagecode               reply;
+    cec_datapacket                        packet;
+    cec_adapter_message_state             state;
+    int32_t                               transmit_timeout;
+    bool                                  isTransmission;
+    bool                                  expectControllerAck;
+    uint8_t                               lineTimeout;
+    uint8_t                               retryTimeout;
+    PLATFORM::CEvent                      event;
   };
 }