From cb8feb4160641e48180542d195f704170bfbaf90 Mon Sep 17 00:00:00 2001
From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 10 Aug 2012 10:10:16 +0200
Subject: [PATCH] moved cec_adapter_messagecode from cectypes.h to
 USBCECAdapterMessage.h

---
 include/cectypes.h                            | 46 -------------------
 .../Pulse-Eight/USBCECAdapterCommands.h       |  1 +
 .../Pulse-Eight/USBCECAdapterCommunication.h  |  1 +
 .../Pulse-Eight/USBCECAdapterMessage.h        | 46 +++++++++++++++++++
 .../Pulse-Eight/USBCECAdapterMessageQueue.h   |  1 +
 5 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/include/cectypes.h b/include/cectypes.h
index 4656141..f0ccd67 100644
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -615,52 +615,6 @@ typedef enum cec_log_level
   CEC_LOG_ALL     = 31
 } cec_log_level;
 
-typedef enum cec_adapter_messagecode
-{
-  MSGCODE_NOTHING = 0,
-  MSGCODE_PING,
-  MSGCODE_TIMEOUT_ERROR,
-  MSGCODE_HIGH_ERROR,
-  MSGCODE_LOW_ERROR,
-  MSGCODE_FRAME_START,
-  MSGCODE_FRAME_DATA,
-  MSGCODE_RECEIVE_FAILED,
-  MSGCODE_COMMAND_ACCEPTED,
-  MSGCODE_COMMAND_REJECTED,
-  MSGCODE_SET_ACK_MASK,
-  MSGCODE_TRANSMIT,
-  MSGCODE_TRANSMIT_EOM,
-  MSGCODE_TRANSMIT_IDLETIME,
-  MSGCODE_TRANSMIT_ACK_POLARITY,
-  MSGCODE_TRANSMIT_LINE_TIMEOUT,
-  MSGCODE_TRANSMIT_SUCCEEDED,
-  MSGCODE_TRANSMIT_FAILED_LINE,
-  MSGCODE_TRANSMIT_FAILED_ACK,
-  MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA,
-  MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE,
-  MSGCODE_FIRMWARE_VERSION,
-  MSGCODE_START_BOOTLOADER,
-  MSGCODE_GET_BUILDDATE,
-  MSGCODE_SET_CONTROLLED,
-  MSGCODE_GET_AUTO_ENABLED,
-  MSGCODE_SET_AUTO_ENABLED,
-  MSGCODE_GET_DEFAULT_LOGICAL_ADDRESS,
-  MSGCODE_SET_DEFAULT_LOGICAL_ADDRESS,
-  MSGCODE_GET_LOGICAL_ADDRESS_MASK,
-  MSGCODE_SET_LOGICAL_ADDRESS_MASK,
-  MSGCODE_GET_PHYSICAL_ADDRESS,
-  MSGCODE_SET_PHYSICAL_ADDRESS,
-  MSGCODE_GET_DEVICE_TYPE,
-  MSGCODE_SET_DEVICE_TYPE,
-  MSGCODE_GET_HDMI_VERSION,
-  MSGCODE_SET_HDMI_VERSION,
-  MSGCODE_GET_OSD_NAME,
-  MSGCODE_SET_OSD_NAME,
-  MSGCODE_WRITE_EEPROM,
-  MSGCODE_FRAME_EOM = 0x80,
-  MSGCODE_FRAME_ACK = 0x40,
-} cec_adapter_messagecode;
-
 typedef enum cec_bus_device_status
 {
   CEC_DEVICE_STATUS_UNKNOWN,
diff --git a/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.h b/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.h
index 897ed1c..13e2249 100644
--- a/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.h
+++ b/src/lib/adapter/Pulse-Eight/USBCECAdapterCommands.h
@@ -32,6 +32,7 @@
  */
 
 #include "lib/platform/threads/mutex.h"
+#include "USBCECAdapterMessage.h"
 
 namespace CEC
 {
diff --git a/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.h b/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.h
index 1144d0e..ae7fa1c 100644
--- a/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.h
+++ b/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.h
@@ -33,6 +33,7 @@
 
 #include "lib/platform/threads/threads.h"
 #include "lib/adapter/AdapterCommunication.h"
+#include "USBCECAdapterMessage.h"
 
 namespace PLATFORM
 {
diff --git a/src/lib/adapter/Pulse-Eight/USBCECAdapterMessage.h b/src/lib/adapter/Pulse-Eight/USBCECAdapterMessage.h
index 40ee1a4..74980bb 100644
--- a/src/lib/adapter/Pulse-Eight/USBCECAdapterMessage.h
+++ b/src/lib/adapter/Pulse-Eight/USBCECAdapterMessage.h
@@ -35,6 +35,52 @@
 
 namespace CEC
 {
+  typedef enum cec_adapter_messagecode
+  {
+    MSGCODE_NOTHING = 0,
+    MSGCODE_PING,
+    MSGCODE_TIMEOUT_ERROR,
+    MSGCODE_HIGH_ERROR,
+    MSGCODE_LOW_ERROR,
+    MSGCODE_FRAME_START,
+    MSGCODE_FRAME_DATA,
+    MSGCODE_RECEIVE_FAILED,
+    MSGCODE_COMMAND_ACCEPTED,
+    MSGCODE_COMMAND_REJECTED,
+    MSGCODE_SET_ACK_MASK,
+    MSGCODE_TRANSMIT,
+    MSGCODE_TRANSMIT_EOM,
+    MSGCODE_TRANSMIT_IDLETIME,
+    MSGCODE_TRANSMIT_ACK_POLARITY,
+    MSGCODE_TRANSMIT_LINE_TIMEOUT,
+    MSGCODE_TRANSMIT_SUCCEEDED,
+    MSGCODE_TRANSMIT_FAILED_LINE,
+    MSGCODE_TRANSMIT_FAILED_ACK,
+    MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA,
+    MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE,
+    MSGCODE_FIRMWARE_VERSION,
+    MSGCODE_START_BOOTLOADER,
+    MSGCODE_GET_BUILDDATE,
+    MSGCODE_SET_CONTROLLED,
+    MSGCODE_GET_AUTO_ENABLED,
+    MSGCODE_SET_AUTO_ENABLED,
+    MSGCODE_GET_DEFAULT_LOGICAL_ADDRESS,
+    MSGCODE_SET_DEFAULT_LOGICAL_ADDRESS,
+    MSGCODE_GET_LOGICAL_ADDRESS_MASK,
+    MSGCODE_SET_LOGICAL_ADDRESS_MASK,
+    MSGCODE_GET_PHYSICAL_ADDRESS,
+    MSGCODE_SET_PHYSICAL_ADDRESS,
+    MSGCODE_GET_DEVICE_TYPE,
+    MSGCODE_SET_DEVICE_TYPE,
+    MSGCODE_GET_HDMI_VERSION,
+    MSGCODE_SET_HDMI_VERSION,
+    MSGCODE_GET_OSD_NAME,
+    MSGCODE_SET_OSD_NAME,
+    MSGCODE_WRITE_EEPROM,
+    MSGCODE_FRAME_EOM = 0x80,
+    MSGCODE_FRAME_ACK = 0x40,
+  } cec_adapter_messagecode;
+
   class CCECAdapterMessage
   {
   public:
diff --git a/src/lib/adapter/Pulse-Eight/USBCECAdapterMessageQueue.h b/src/lib/adapter/Pulse-Eight/USBCECAdapterMessageQueue.h
index edd34be..b81c908 100644
--- a/src/lib/adapter/Pulse-Eight/USBCECAdapterMessageQueue.h
+++ b/src/lib/adapter/Pulse-Eight/USBCECAdapterMessageQueue.h
@@ -34,6 +34,7 @@
 #include "lib/platform/threads/threads.h"
 #include "lib/platform/util/buffer.h"
 #include <map>
+#include "USBCECAdapterMessage.h"
 
 namespace CEC
 {
-- 
2.34.1