cec: more cleanups. split up cec_adapter_message and cec_command. use cec_command...

diff --git a/include/CECExports.h b/include/CECExports.h
index a378cfe170cd246fd50931c7c76bd4ad08ba2bb2..e5c52e3b6f784afa87560cfa3dda602c2d37c91a 100644 (file)
--- a/include/CECExports.h
+++ b/include/CECExports.h
@@ -54,8 +54,8 @@
 extern "C" {
 namespace CEC {
 #endif
-  #define CEC_MIN_VERSION      5
-  #define CEC_LIB_VERSION      5
+  #define CEC_MIN_VERSION      6
+  #define CEC_LIB_VERSION      6
   #define CEC_SETTLE_DOWN_TIME 1000
   #define CEC_BUTTON_TIMEOUT   500
 
@@ -325,7 +325,7 @@ namespace CEC {
 
   } cec_datapacket;
 
-  typedef struct cec_frame
+  typedef struct cec_adapter_message
   {
     cec_datapacket packet;
 
@@ -341,19 +341,48 @@ namespace CEC {
     bool                    ack(void) const               { return packet.size >= 1 ? (packet.at(0) & MSGCODE_FRAME_ACK) != 0 : false; }
     cec_logical_address     initiator(void) const         { return packet.size >= 2 ? (cec_logical_address) (packet.at(1) >> 4)  : CECDEVICE_UNKNOWN; };
     cec_logical_address     destination(void) const       { return packet.size >= 2 ? (cec_logical_address) (packet.at(1) & 0xF) : CECDEVICE_UNKNOWN; };
-  } cec_frame;
+  } cec_adapter_message;
 
   typedef struct cec_command
   {
-    cec_logical_address source;
+    cec_logical_address initiator;
     cec_logical_address destination;
+    bool                ack;
+    bool                eom;
     cec_opcode          opcode;
     cec_datapacket      parameters;
+    bool                opcode_set;
+
+    static cec_command format(cec_logical_address initiator, cec_logical_address destination, cec_opcode opcode)
+    {
+      cec_command command;
+      command.clear();
+      command.initiator   = initiator;
+      command.destination = destination;
+      command.opcode      = opcode;
+      command.opcode_set  = true;
+
+      return command;
+    }
+
+    void push_back(uint8_t data)
+    {
+      if (!opcode_set)
+      {
+        opcode_set = true;
+        opcode = (cec_opcode) data;
+      }
+      else
+        parameters.push_back(data);
+    }
 
     void clear(void)
     {
-      source      = CECDEVICE_UNKNOWN;
+      initiator   = CECDEVICE_UNKNOWN;
       destination = CECDEVICE_UNKNOWN;
+      ack         = false;
+      eom         = false;
+      opcode_set  = false;
       opcode      = CEC_OPCODE_FEATURE_ABORT;
       parameters.clear();
     };

diff --git a/include/CECExportsC.h b/include/CECExportsC.h
index d1987cb18720233b064ef474976b88e74a6107cd..359b0e6d7a8431e552e49ad715dd6ac3eec932c8 100644 (file)
--- a/include/CECExportsC.h
+++ b/include/CECExportsC.h
@@ -177,9 +177,9 @@ extern DECLSPEC bool cec_get_next_command(cec_command *command);
  * @return True when the data was sent and acked, false otherwise.
  */
 #ifdef __cplusplus
-extern DECLSPEC bool cec_transmit(const CEC::cec_frame &data, bool bWaitForAck = true);
+extern DECLSPEC bool cec_transmit(const CEC::cec_command &data, bool bWaitForAck = true);
 #else
-extern DECLSPEC bool cec_transmit(const cec_frame &data, bool bWaitForAck = true);
+extern DECLSPEC bool cec_transmit(const cec_command &data, bool bWaitForAck = true);
 #endif
 
 /*!

diff --git a/include/CECExportsCpp.h b/include/CECExportsCpp.h
index 188af1a7c2049017987d2ba1ea5ce2e47bde698a..7d70e7fe24c830cf74a36512bf7f316d6a5e0bff 100644 (file)
--- a/include/CECExportsCpp.h
+++ b/include/CECExportsCpp.h
@@ -93,7 +93,7 @@ namespace CEC
     /*!
      * @see cec_transmit
      */
-    virtual bool Transmit(const cec_frame &data, bool bWaitForAck = true) = 0;
+    virtual bool Transmit(const cec_command &data, bool bWaitForAck = true) = 0;
 
     /*!
      * @see cec_set_logical_address

diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp
index 7b82053de77926180e56255b01120e561ce291b8..7749911dcff667e7a2db9920a8545bdec7cda433 100644 (file)
--- a/src/lib/AdapterCommunication.cpp
+++ b/src/lib/AdapterCommunication.cpp
@@ -176,7 +176,7 @@ void CAdapterCommunication::AddData(uint8_t *data, uint8_t iLen)
   m_rcvCondition.Signal();
 }
 
-bool CAdapterCommunication::Write(const cec_frame &data)
+bool CAdapterCommunication::Write(const cec_adapter_message &data)
 {
   CLockObject lock(&m_commMutex);
   if (m_port->Write(data) != (int32_t) data.size())
@@ -193,7 +193,7 @@ bool CAdapterCommunication::Write(const cec_frame &data)
   return true;
 }
 
-bool CAdapterCommunication::Read(cec_frame &msg, uint32_t iTimeout)
+bool CAdapterCommunication::Read(cec_adapter_message &msg, uint32_t iTimeout)
 {
   CLockObject lock(&m_bufferMutex);
 
@@ -298,7 +298,7 @@ bool CAdapterCommunication::StartBootloader(void)
     return false;
 
   m_controller->AddLog(CEC_LOG_DEBUG, "starting the bootloader");
-  cec_frame output;
+  cec_adapter_message output;
   output.clear();
 
   output.push_back(MSGSTART);
@@ -314,7 +314,7 @@ bool CAdapterCommunication::StartBootloader(void)
   return true;
 }
 
-void CAdapterCommunication::PushEscaped(cec_frame &vec, uint8_t byte)
+void CAdapterCommunication::PushEscaped(cec_adapter_message &vec, uint8_t byte)
 {
   if (byte >= MSGESC && byte != MSGSTART)
   {
@@ -336,7 +336,7 @@ bool CAdapterCommunication::SetAckMask(uint16_t iMask)
   strLog.Format("setting ackmask to %2x", iMask);
   m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
 
-  cec_frame output;
+  cec_adapter_message output;
   output.clear();
 
   output.push_back(MSGSTART);
@@ -360,7 +360,7 @@ bool CAdapterCommunication::PingAdapter(void)
     return false;
 
   m_controller->AddLog(CEC_LOG_DEBUG, "sending ping");
-  cec_frame output;
+  cec_adapter_message output;
   output.clear();
 
   output.push_back(MSGSTART);
@@ -383,3 +383,46 @@ bool CAdapterCommunication::IsOpen(void) const
 {
   return !IsStopped() && m_port->IsOpen();
 }
+
+void CAdapterCommunication::FormatAdapterMessage(const cec_command &command, cec_adapter_message &packet)
+{
+  packet.clear();
+
+  //set ack polarity to high when transmitting to the broadcast address
+  //set ack polarity low when transmitting to any other address
+  packet.push_back(MSGSTART);
+  PushEscaped(packet, MSGCODE_TRANSMIT_ACK_POLARITY);
+  if (command.destination == CECDEVICE_BROADCAST)
+    PushEscaped(packet, CEC_TRUE);
+  else
+    PushEscaped(packet, CEC_FALSE);
+  packet.push_back(MSGEND);
+
+  // add source and destination
+  packet.push_back(MSGSTART);
+  PushEscaped(packet, MSGCODE_TRANSMIT);
+  packet.push_back(((uint8_t)command.initiator << 4) + (uint8_t)command.destination);
+  packet.push_back(MSGEND);
+
+  // add opcode
+  packet.push_back(MSGSTART);
+  PushEscaped(packet, command.parameters.empty() ? MSGCODE_TRANSMIT_EOM : MSGCODE_TRANSMIT);
+  packet.push_back((uint8_t) command.opcode);
+  packet.push_back(MSGEND);
+
+  // add parameters
+  for (int8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
+  {
+    packet.push_back(MSGSTART);
+
+    if (iPtr == command.parameters.size - 1)
+      PushEscaped(packet, MSGCODE_TRANSMIT_EOM);
+    else
+      PushEscaped(packet, MSGCODE_TRANSMIT);
+
+    PushEscaped(packet, command.parameters[iPtr]);
+
+    packet.push_back(MSGEND);
+  }
+}
+

diff --git a/src/lib/AdapterCommunication.h b/src/lib/AdapterCommunication.h
index 3921446597faeb5f3b73bbd15f82fd465254250a..934915ba336782e4ee55f1fa7619e1f8cfe6099c 100644 (file)
--- a/src/lib/AdapterCommunication.h
+++ b/src/lib/AdapterCommunication.h
@@ -47,8 +47,8 @@ namespace CEC
     virtual ~CAdapterCommunication();
 
     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 Read(cec_adapter_message &msg, uint32_t iTimeout = 1000);
+    bool Write(const cec_adapter_message &frame);
     bool PingAdapter(void);
     void Close(void);
     bool IsOpen(void) const;
@@ -58,7 +58,9 @@ namespace CEC
 
     bool StartBootloader(void);
     bool SetAckMask(uint16_t iMask);
-    static void PushEscaped(cec_frame &vec, uint8_t byte);
+    static void PushEscaped(cec_adapter_message &vec, uint8_t byte);
+    static void FormatAdapterMessage(const cec_command &command, cec_adapter_message &packet);
+
   private:
     void AddData(uint8_t *data, uint8_t iLen);
     bool ReadFromDevice(uint32_t iTimeout);

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index f53ee901eaa8fefd0a78f14db551e3a23174c054..4b7b66422abb764cad1f0aeeaf7b1fa1e1ebe372 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -86,10 +86,13 @@ void *CCECProcessor::Process(void)
 {
   m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
 
+  cec_command command;
+  cec_adapter_message msg;
+
   while (!IsStopped())
   {
     bool bParseFrame(false);
-    cec_frame msg;
+    command.clear();
     msg.clear();
 
     {
@@ -98,14 +101,11 @@ void *CCECProcessor::Process(void)
         bParseFrame = ParseMessage(msg) && !IsStopped();
 
       if (bParseFrame)
-      {
-        msg.clear();
-        msg = m_currentframe;
-      }
+        command = m_currentframe;
     }
 
     if (bParseFrame)
-      ParseCurrentFrame(msg);
+      ParseCommand(command);
 
     m_controller->CheckKeypressTimeout();
 
@@ -124,12 +124,8 @@ bool CCECProcessor::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV
   CStdString strLog;
   strLog.Format("<< powering on device with logical address %d", (int8_t)address);
   m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
-  cec_frame frame;
-  frame.clear();
 
-  frame.push_back(GetSourceDestination(address));
-  frame.push_back((uint8_t) CEC_OPCODE_IMAGE_VIEW_ON);
-  return Transmit(frame);
+  return Transmit(cec_command::format(m_iLogicalAddress, address, CEC_OPCODE_IMAGE_VIEW_ON));
 }
 
 bool CCECProcessor::StandbyDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
@@ -140,12 +136,8 @@ bool CCECProcessor::StandbyDevices(cec_logical_address address /* = CECDEVICE_BR
   CStdString strLog;
   strLog.Format("<< putting device with logical address %d in standby mode", (int8_t)address);
   m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
-  cec_frame frame;
-  frame.clear();
 
-  frame.push_back(GetSourceDestination(address));
-  frame.push_back((uint8_t) CEC_OPCODE_STANDBY);
-  return Transmit(frame);
+  return Transmit(cec_command::format(m_iLogicalAddress, address, CEC_OPCODE_STANDBY));
 }
 
 bool CCECProcessor::SetActiveView(void)
@@ -154,14 +146,12 @@ bool CCECProcessor::SetActiveView(void)
     return false;
 
   m_controller->AddLog(CEC_LOG_DEBUG, "<< setting active view");
-  cec_frame frame;
-  frame.clear();
-
-  frame.push_back(GetSourceDestination(CECDEVICE_BROADCAST));
-  frame.push_back((uint8_t) CEC_OPCODE_ACTIVE_SOURCE);
-  frame.push_back((m_physicaladdress >> 8) & 0xFF);
-  frame.push_back(m_physicaladdress & 0xFF);
-  return Transmit(frame);
+
+  cec_command command = cec_command::format(m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+  command.parameters.push_back((m_physicaladdress >> 8) & 0xFF);
+  command.parameters.push_back(m_physicaladdress & 0xFF);
+
+  return Transmit(command);
 }
 
 bool CCECProcessor::SetInactiveView(void)
@@ -170,57 +160,32 @@ bool CCECProcessor::SetInactiveView(void)
     return false;
 
   m_controller->AddLog(CEC_LOG_DEBUG, "<< setting inactive view");
-  cec_frame frame;
-  frame.clear();
-
-  frame.push_back(GetSourceDestination(CECDEVICE_BROADCAST));
-  frame.push_back((uint8_t) CEC_OPCODE_INACTIVE_SOURCE);
-  frame.push_back((m_physicaladdress >> 8) & 0xFF);
-  frame.push_back(m_physicaladdress & 0xFF);
-  return Transmit(frame);
+
+  cec_command command = cec_command::format(m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE);
+  command.parameters.push_back((m_physicaladdress >> 8) & 0xFF);
+  command.parameters.push_back(m_physicaladdress & 0xFF);
+
+  return Transmit(command);
 }
 
-bool CCECProcessor::Transmit(const cec_frame &data, bool bWaitForAck /* = true */)
+void CCECProcessor::LogOutput(const cec_command &data)
 {
   CStdString txStr = "transmit ";
-  for (unsigned int i = 0; i < data.size(); i++)
-    txStr.AppendFormat(" %02x", data[i]);
+  txStr.AppendFormat(" %02x", ((uint8_t)data.initiator << 4) + (uint8_t)data.destination);
+  txStr.AppendFormat(" %02x", (uint8_t)data.opcode);
+
+  for (unsigned int iPtr = 0; iPtr < data.parameters.size; iPtr++)
+    txStr.AppendFormat(" %02x", data.parameters[iPtr]);
   m_controller->AddLog(CEC_LOG_DEBUG, txStr.c_str());
+}
 
-  if (data.size() == 0)
-  {
-    m_controller->AddLog(CEC_LOG_WARNING, "transmit buffer is empty");
-    return false;
-  }
+bool CCECProcessor::Transmit(const cec_command &data, bool bWaitForAck /* = true */)
+{
+  LogOutput(data);
 
-  cec_frame output;
+  cec_adapter_message output;
   output.clear();
-
-  //set ack polarity to high when transmitting to the broadcast address
-  //set ack polarity low when transmitting to any other address
-  output.push_back(MSGSTART);
-  CAdapterCommunication::PushEscaped(output, MSGCODE_TRANSMIT_ACK_POLARITY);
-
-  if ((data[0] & 0xF) == 0xF)
-    CAdapterCommunication::PushEscaped(output, CEC_TRUE);
-  else
-    CAdapterCommunication::PushEscaped(output, CEC_FALSE);
-
-  output.push_back(MSGEND);
-
-  for (int8_t i = 0; i < data.size(); i++)
-  {
-    output.push_back(MSGSTART);
-
-    if (i == data.size() - 1)
-      CAdapterCommunication::PushEscaped(output, MSGCODE_TRANSMIT_EOM);
-    else
-      CAdapterCommunication::PushEscaped(output, MSGCODE_TRANSMIT);
-
-    CAdapterCommunication::PushEscaped(output, data[i]);
-
-    output.push_back(MSGEND);
-  }
+  CAdapterCommunication::FormatAdapterMessage(data, output);
 
   return TransmitFormatted(output, bWaitForAck);
 }
@@ -235,7 +200,7 @@ bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
   return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
 }
 
-bool CCECProcessor::TransmitFormatted(const cec_frame &data, bool bWaitForAck /* = true */)
+bool CCECProcessor::TransmitFormatted(const cec_adapter_message &data, bool bWaitForAck /* = true */)
 {
   CLockObject lock(&m_mutex);
   if (!m_communication || !m_communication->Write(data))
@@ -267,59 +232,49 @@ bool CCECProcessor::TransmitFormatted(const cec_frame &data, bool bWaitForAck /*
 
 void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode, ECecAbortReason reason /* = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE */)
 {
-  m_controller->AddLog(CEC_LOG_DEBUG, "transmitting abort message");
-  cec_frame frame;
-  frame.clear();
-
-  frame.push_back(GetSourceDestination(address));
-  frame.push_back((uint8_t) CEC_OPCODE_FEATURE_ABORT);
-  frame.push_back((uint8_t) opcode);
-  frame.push_back((uint8_t) reason);
-  Transmit(frame);
+  m_controller->AddLog(CEC_LOG_DEBUG, "<< transmitting abort message");
+
+  cec_command command = cec_command::format(m_iLogicalAddress, address, CEC_OPCODE_FEATURE_ABORT);
+  command.parameters.push_back((uint8_t)opcode);
+  command.parameters.push_back((uint8_t)reason);
+
+  Transmit(command);
 }
 
 void CCECProcessor::ReportCECVersion(cec_logical_address address /* = CECDEVICE_TV */)
 {
-  cec_frame frame;
-  frame.clear();
-
   m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting CEC version as 1.3a");
-  frame.push_back(GetSourceDestination(address));
-  frame.push_back((uint8_t) CEC_OPCODE_CEC_VERSION);
-  frame.push_back((uint8_t) CEC_VERSION_1_3A);
-  Transmit(frame);
+
+  cec_command command = cec_command::format(m_iLogicalAddress, address, CEC_OPCODE_CEC_VERSION);
+  command.parameters.push_back(CEC_VERSION_1_3A);
+
+  Transmit(command);
 }
 
 void CCECProcessor::ReportPowerState(cec_logical_address address /*= CECDEVICE_TV */, bool bOn /* = true */)
 {
-  cec_frame frame;
-  frame.clear();
-
   if (bOn)
     m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting \"On\" power status");
   else
     m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting \"Off\" power status");
 
-  frame.push_back(GetSourceDestination(address));
-  frame.push_back((uint8_t) CEC_OPCODE_REPORT_POWER_STATUS);
-  frame.push_back(bOn ? (uint8_t) CEC_POWER_STATUS_ON : (uint8_t) CEC_POWER_STATUS_STANDBY);
-  Transmit(frame);
+  cec_command command = cec_command::format(m_iLogicalAddress, address, CEC_OPCODE_REPORT_POWER_STATUS);
+  command.parameters.push_back(bOn ? (uint8_t) CEC_POWER_STATUS_ON : (uint8_t) CEC_POWER_STATUS_STANDBY);
+
+  Transmit(command);
 }
 
 void CCECProcessor::ReportMenuState(cec_logical_address address /* = CECDEVICE_TV */, bool bActive /* = true */)
 {
-  cec_frame frame;
-  frame.clear();
-
   if (bActive)
     m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting menu state as active");
   else
     m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting menu state as inactive");
 
-  frame.push_back(GetSourceDestination(address));
-  frame.push_back((uint8_t) CEC_OPCODE_MENU_STATUS);
-  frame.push_back(bActive ? (uint8_t) CEC_MENU_STATE_ACTIVATED : (uint8_t) CEC_MENU_STATE_DEACTIVATED);
-  Transmit(frame);
+  cec_command command = cec_command::format(m_iLogicalAddress, address, CEC_OPCODE_MENU_STATUS);
+  command.parameters.push_back(bActive ? (uint8_t) CEC_MENU_STATE_ACTIVATED : (uint8_t) CEC_MENU_STATE_DEACTIVATED);
+
+  Transmit(command);
 }
 
 void CCECProcessor::ReportVendorID(cec_logical_address address /* = CECDEVICE_TV */)
@@ -330,54 +285,40 @@ void CCECProcessor::ReportVendorID(cec_logical_address address /* = CECDEVICE_TV
 
 void CCECProcessor::ReportOSDName(cec_logical_address address /* = CECDEVICE_TV */)
 {
-  cec_frame frame;
-  frame.clear();
-
   const char *osdname = m_strDeviceName.c_str();
   CStdString strLog;
   strLog.Format("<< reporting OSD name as %s", osdname);
   m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
-  frame.push_back(GetSourceDestination(address));
-  frame.push_back((uint8_t) CEC_OPCODE_SET_OSD_NAME);
 
-  for (unsigned int i = 0; i < strlen(osdname); i++)
-    frame.push_back(osdname[i]);
+  cec_command command = cec_command::format(m_iLogicalAddress, address, CEC_OPCODE_SET_OSD_NAME);
+  for (unsigned int iPtr = 0; iPtr < strlen(osdname); iPtr++)
+    command.parameters.push_back(osdname[iPtr]);
 
-  Transmit(frame);
+  Transmit(command);
 }
 
 void CCECProcessor::ReportPhysicalAddress(void)
 {
-  cec_frame frame;
-  frame.clear();
-
   CStdString strLog;
   strLog.Format("<< reporting physical address as %04x", m_physicaladdress);
   m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
-  frame.push_back(GetSourceDestination(CECDEVICE_BROADCAST));
-  frame.push_back((uint8_t) CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
-  frame.push_back((uint8_t) ((m_physicaladdress >> 8) & 0xFF));
-  frame.push_back((uint8_t) (m_physicaladdress & 0xFF));
-  frame.push_back((uint8_t) CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
-  Transmit(frame);
+
+  cec_command command = cec_command::format(m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
+  command.parameters.push_back((uint8_t) ((m_physicaladdress >> 8) & 0xFF));
+  command.parameters.push_back((uint8_t) (m_physicaladdress & 0xFF));
+
+  Transmit(command);
 }
 
 void CCECProcessor::BroadcastActiveSource(void)
 {
-  cec_frame frame;
-  frame.clear();
-
   m_controller->AddLog(CEC_LOG_NOTICE, "<< broadcasting active source");
-  frame.push_back(GetSourceDestination(CECDEVICE_BROADCAST));
-  frame.push_back((uint8_t) CEC_OPCODE_ACTIVE_SOURCE);
-  frame.push_back((uint8_t) ((m_physicaladdress >> 8) & 0xFF));
-  frame.push_back((uint8_t) (m_physicaladdress & 0xFF));
-  Transmit(frame);
-}
 
-uint8_t CCECProcessor::GetSourceDestination(cec_logical_address destination /* = CECDEVICE_BROADCAST */) const
-{
-  return ((uint8_t)m_iLogicalAddress << 4) + (uint8_t)destination;
+  cec_command command = cec_command::format(m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+  command.parameters.push_back((uint8_t) ((m_physicaladdress >> 8) & 0xFF));
+  command.parameters.push_back((uint8_t) (m_physicaladdress & 0xFF));
+
+  Transmit(command);
 }
 
 bool CCECProcessor::WaitForAck(bool *bError, uint32_t iTimeout /* = 1000 */)
@@ -390,7 +331,7 @@ bool CCECProcessor::WaitForAck(bool *bError, uint32_t iTimeout /* = 1000 */)
 
   while (!bGotAck && !*bError && (iTimeout == 0 || iNow < iTargetTime))
   {
-    cec_frame msg;
+    cec_adapter_message msg;
     msg.clear();
 
     if (!m_communication->Read(msg, iTimeout > 0 ? iTargetTime - iNow : 1000))
@@ -399,9 +340,7 @@ bool CCECProcessor::WaitForAck(bool *bError, uint32_t iTimeout /* = 1000 */)
       continue;
     }
 
-    uint8_t iCode = msg[0] & ~(MSGCODE_FRAME_EOM | MSGCODE_FRAME_ACK);
-
-    switch (iCode)
+    switch (msg.message())
     {
     case MSGCODE_COMMAND_ACCEPTED:
       m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_COMMAND_ACCEPTED");
@@ -445,7 +384,7 @@ bool CCECProcessor::WaitForAck(bool *bError, uint32_t iTimeout /* = 1000 */)
   return bGotAck && !*bError;
 }
 
-bool CCECProcessor::ParseMessage(cec_frame &msg)
+bool CCECProcessor::ParseMessage(cec_adapter_message &msg)
 {
   bool bReturn(false);
 
@@ -484,8 +423,10 @@ bool CCECProcessor::ParseMessage(cec_frame &msg)
       if (msg.size() >= 2)
       {
         logStr.AppendFormat(" initiator:%u destination:%u ack:%s %s", msg.initiator(), msg.destination(), msg.ack() ? "high" : "low", msg.eom() ? "eom" : "");
-
-        m_currentframe.push_back(msg[1]);
+        m_currentframe.initiator   =  msg.initiator();
+        m_currentframe.destination = msg.destination();
+        m_currentframe.ack         = msg.ack();
+        m_currentframe.eom         = msg.eom();
       }
       m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
     }
@@ -511,9 +452,9 @@ bool CCECProcessor::ParseMessage(cec_frame &msg)
   return bReturn;
 }
 
-void CCECProcessor::ParseVendorId(cec_logical_address device, cec_frame data)
+void CCECProcessor::ParseVendorId(cec_logical_address device, const cec_datapacket &data)
 {
-  if (data.size() < 3)
+  if (data.size < 3)
   {
     m_controller->AddLog(CEC_LOG_WARNING, "invalid vendor ID received");
     return;
@@ -524,100 +465,89 @@ void CCECProcessor::ParseVendorId(cec_logical_address device, cec_frame data)
                         (uint64_t)data[2];
 
   m_vendorIds[(uint8_t)device]     = iVendorId;
-  m_vendorClasses[(uint8_t)device] = data.size() >= 4 ? data[3] : 0;
+  m_vendorClasses[(uint8_t)device] = data.size >= 4 ? data[3] : 0;
 
   CStdString strLog;
   strLog.Format("device %d: vendor = %s (%lld) class = %2x", (uint8_t)device, CECVendorIdToString(m_vendorIds[(uint8_t)device]), iVendorId, m_vendorClasses[(uint8_t)device]);
   m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
 }
 
-void CCECProcessor::ParseCurrentFrame(cec_frame &frame)
+void CCECProcessor::ParseCommand(cec_command &command)
 {
-  uint8_t initiator = frame[0] >> 4;
-  uint8_t destination = frame[0] & 0xF;
-
   CStdString dataStr;
-  dataStr.Format(">> received frame: initiator: %u destination: %u", initiator, destination);
-
-  if (frame.size() > 1)
+  dataStr.Format(">> received frame: initiator: %u destination: %u", command.initiator, command.destination);
+  if (command.parameters.size > 1)
   {
     dataStr += " data:";
-    for (unsigned int i = 1; i < frame.size(); i++)
-      dataStr.AppendFormat(" %02x", frame[i]);
+    for (unsigned int iPtr = 0; iPtr < command.parameters.size; iPtr++)
+      dataStr.AppendFormat(" %02x", command.parameters[iPtr]);
   }
   m_controller->AddLog(CEC_LOG_DEBUG, dataStr.c_str());
 
-  if (frame.size() <= 1)
-    return;
-
-  cec_opcode opCode = (cec_opcode) frame[1];
-  if (destination == (uint16_t) m_iLogicalAddress)
+  if (command.destination == m_iLogicalAddress)
   {
-    switch(opCode)
+    switch(command.opcode)
     {
     case CEC_OPCODE_GIVE_PHYSICAL_ADDRESS:
       ReportPhysicalAddress();
       break;
     case CEC_OPCODE_GIVE_OSD_NAME:
-      ReportOSDName((cec_logical_address)initiator);
+      ReportOSDName(command.initiator);
       break;
     case CEC_OPCODE_GIVE_DEVICE_VENDOR_ID:
-      ReportVendorID((cec_logical_address)initiator);
+      ReportVendorID(command.initiator);
       break;
     case CEC_OPCODE_VENDOR_COMMAND_WITH_ID:
-      frame.shift(2);
-      ParseVendorId((cec_logical_address)initiator, frame);
-      TransmitAbort((cec_logical_address)initiator, CEC_OPCODE_VENDOR_COMMAND_WITH_ID);
+      ParseVendorId(command.initiator, command.parameters);
+      TransmitAbort(command.initiator, CEC_OPCODE_VENDOR_COMMAND_WITH_ID);
       break;
     case CEC_OPCODE_GIVE_DECK_STATUS:
       // need to support opcodes play and deck control before doing anything with this
-      TransmitAbort((cec_logical_address)initiator, CEC_OPCODE_GIVE_DECK_STATUS);
+      TransmitAbort(command.initiator, CEC_OPCODE_GIVE_DECK_STATUS);
       break;
     case CEC_OPCODE_MENU_REQUEST:
-      frame.shift(2);
-      if (frame[0] == CEC_MENU_REQUEST_TYPE_QUERY)
-        ReportMenuState((cec_logical_address)initiator);
+      if (command.parameters[0] == CEC_MENU_REQUEST_TYPE_QUERY)
+        ReportMenuState(command.initiator);
       break;
     case CEC_OPCODE_GIVE_DEVICE_POWER_STATUS:
-      ReportPowerState((cec_logical_address)initiator);
+      ReportPowerState(command.initiator);
       SetActiveView();
       break;
     case CEC_OPCODE_GET_CEC_VERSION:
-      ReportCECVersion((cec_logical_address)initiator);
+      ReportCECVersion(command.initiator);
       break;
     case CEC_OPCODE_USER_CONTROL_PRESSED:
-      if (frame.size() > 2)
+      if (command.parameters.size > 0)
       {
         m_controller->AddKey();
 
-        if (frame[2] <= CEC_USER_CONTROL_CODE_MAX)
-          m_controller->SetCurrentButton((cec_user_control_code) frame[2]);
+        if (command.parameters[0] <= CEC_USER_CONTROL_CODE_MAX)
+          m_controller->SetCurrentButton((cec_user_control_code) command.parameters[0]);
       }
       break;
     case CEC_OPCODE_USER_CONTROL_RELEASE:
       m_controller->AddKey();
       break;
     default:
-      frame.shift(2);
-      m_controller->AddCommand((cec_logical_address) initiator, (cec_logical_address) destination, opCode, &frame);
+      m_controller->AddCommand(command);
       break;
     }
   }
-  else if (destination == (uint8_t) CECDEVICE_BROADCAST)
+  else if (command.destination == CECDEVICE_BROADCAST)
   {
     CStdString strLog;
-    if (opCode == CEC_OPCODE_REQUEST_ACTIVE_SOURCE)
+    if (command.opcode == CEC_OPCODE_REQUEST_ACTIVE_SOURCE)
     {
-      strLog.Format(">> %i requests active source", initiator);
+      strLog.Format(">> %i requests active source", (uint8_t) command.initiator);
       m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
       BroadcastActiveSource();
     }
-    else if (opCode == CEC_OPCODE_SET_STREAM_PATH)
+    else if (command.opcode == CEC_OPCODE_SET_STREAM_PATH)
     {
-      if (frame.size() >= 4)
+      if (command.parameters.size >= 2)
       {
-        int streamaddr = ((int)frame[2] << 8) | ((int)frame[3]);
-        strLog.Format(">> %i requests stream path from physical address %04x", initiator, streamaddr);
+        int streamaddr = ((int)command.parameters[0] << 8) | ((int)command.parameters[1]);
+        strLog.Format(">> %i requests stream path from physical address %04x", command.initiator, streamaddr);
         m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
         if (streamaddr == m_physicaladdress)
           BroadcastActiveSource();
@@ -625,15 +555,13 @@ void CCECProcessor::ParseCurrentFrame(cec_frame &frame)
     }
     else
     {
-      cec_frame params = frame;
-      frame.shift(2);
-      m_controller->AddCommand((cec_logical_address) initiator, (cec_logical_address) destination, opCode, &params);
+      m_controller->AddCommand(command);
     }
   }
   else
   {
     CStdString strLog;
-    strLog.Format("ignoring frame: destination: %u != %u", destination, (uint16_t)m_iLogicalAddress);
+    strLog.Format("ignoring frame: destination: %u != %u", command.destination, (uint8_t)m_iLogicalAddress);
     m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
   }
 }

diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h
index 2084d1aae56baf55ec0d3d35d1c76db479f0aa58..2bebc5c05a27d4b5e245082aa6be0ee3c35ca1a2 100644 (file)
--- a/src/lib/CECProcessor.h
+++ b/src/lib/CECProcessor.h
@@ -57,10 +57,10 @@ namespace CEC
       virtual bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST);
       virtual bool SetActiveView(void);
       virtual bool SetInactiveView(void);
-      virtual bool Transmit(const cec_frame &data, bool bWaitForAck = true);
+      virtual bool Transmit(const cec_command &data, bool bWaitForAck = true);
       virtual bool SetLogicalAddress(cec_logical_address iLogicalAddress);
     protected:
-      virtual bool TransmitFormatted(const cec_frame &data, bool bWaitForAck = true);
+      virtual bool TransmitFormatted(const cec_adapter_message &data, bool bWaitForAck = true);
       virtual void TransmitAbort(cec_logical_address address, cec_opcode opcode, ECecAbortReason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE);
       virtual void ReportCECVersion(cec_logical_address address = CECDEVICE_TV);
       virtual void ReportPowerState(cec_logical_address address = CECDEVICE_TV, bool bOn = true);
@@ -69,23 +69,23 @@ namespace CEC
       virtual void ReportOSDName(cec_logical_address address = CECDEVICE_TV);
       virtual void ReportPhysicalAddress(void);
       virtual void BroadcastActiveSource(void);
-      virtual uint8_t GetSourceDestination(cec_logical_address destination = CECDEVICE_BROADCAST) const;
 
     private:
+      void LogOutput(const cec_command &data);
       bool WaitForAck(bool *bError, uint32_t iTimeout = 1000);
-      bool ParseMessage(cec_frame &msg);
-      void ParseCurrentFrame(cec_frame &frame);
-      void ParseVendorId(cec_logical_address device, cec_frame data);
+      bool ParseMessage(cec_adapter_message &msg);
+      void ParseCommand(cec_command &command);
+      void ParseVendorId(cec_logical_address device, const cec_datapacket &data);
 
-      cec_frame                  m_currentframe;
-      uint16_t                   m_physicaladdress;
-      cec_logical_address        m_iLogicalAddress;
-      CecBuffer<cec_frame>       m_frameBuffer;
-      std::string                m_strDeviceName;
-      CMutex                     m_mutex;
-      CAdapterCommunication     *m_communication;
-      CLibCEC                   *m_controller;
-      uint64_t                   m_vendorIds[16];
-      uint8_t                    m_vendorClasses[16];
+      cec_command                    m_currentframe;
+      uint16_t                       m_physicaladdress;
+      cec_logical_address            m_iLogicalAddress;
+      CecBuffer<cec_adapter_message> m_frameBuffer;
+      std::string                    m_strDeviceName;
+      CMutex                         m_mutex;
+      CAdapterCommunication         *m_communication;
+      CLibCEC                       *m_controller;
+      uint64_t                       m_vendorIds[16];
+      uint8_t                        m_vendorClasses[16];
   };
 };

diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index 6b53f049563ff74397089944f9fcf84f307bb773..afbf2260f5c16dbeaee4e55a764bf2eb49875e16 100644 (file)
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -148,7 +148,7 @@ bool CLibCEC::GetNextCommand(cec_command *command)
   return m_commandBuffer.Pop(*command);
 }
 
-bool CLibCEC::Transmit(const cec_frame &data, bool bWaitForAck /* = true */)
+bool CLibCEC::Transmit(const cec_command &data, bool bWaitForAck /* = true */)
 {
   return m_cec ? m_cec->Transmit(data, bWaitForAck) : false;
 }
@@ -204,20 +204,12 @@ void CLibCEC::AddKey(void)
   }
 }
 
-void CLibCEC::AddCommand(cec_logical_address source, cec_logical_address destination, cec_opcode opcode, cec_frame *parameters)
+void CLibCEC::AddCommand(cec_command &command)
 {
-  cec_command command;
-  command.clear();
-
-  command.source       = source;
-  command.destination  = destination;
-  command.opcode       = opcode;
-  if (parameters)
-    command.parameters = parameters->packet;
   if (m_commandBuffer.Push(command))
   {
     CStdString strDebug;
-    strDebug.Format("stored command '%2x' in the command buffer. buffer size = %d", opcode, m_commandBuffer.Size());
+    strDebug.Format("stored command '%2x' in the command buffer. buffer size = %d", command.opcode, m_commandBuffer.Size());
     AddLog(CEC_LOG_DEBUG, strDebug);
   }
   else

diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h
index 013288e763153319d2e1ab8799ff79977dbefd65..a602beafa62d0024ea542f4f680e4b83d736e92f 100644 (file)
--- a/src/lib/LibCEC.h
+++ b/src/lib/LibCEC.h
@@ -64,7 +64,7 @@ namespace CEC
       virtual bool GetNextKeypress(cec_keypress *key);
       virtual bool GetNextCommand(cec_command *command);
 
-      virtual bool Transmit(const cec_frame &data, bool bWaitForAck = true);
+      virtual bool Transmit(const cec_command &data, bool bWaitForAck = true);
       virtual bool SetLogicalAddress(cec_logical_address iLogicalAddress);
 
       virtual bool PowerOnDevices(cec_logical_address address = CECDEVICE_TV);
@@ -75,7 +75,7 @@ namespace CEC
 
       virtual void AddLog(cec_log_level level, const std::string &strMessage);
       virtual void AddKey(void);
-      virtual void AddCommand(cec_logical_address source, cec_logical_address destination, cec_opcode opcode, cec_frame *parameters);
+      virtual void AddCommand(cec_command &command);
       virtual void CheckKeypressTimeout(void);
       virtual void SetCurrentButton(cec_user_control_code iButtonCode);
 

diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp
index 4c7276a0fe5d8c28c4861ced3c1c6ad56f653b56..98c020de26df1ca864814e98ebc60587f657fb7f 100644 (file)
--- a/src/lib/LibCECC.cpp
+++ b/src/lib/LibCECC.cpp
@@ -123,7 +123,7 @@ bool cec_get_next_command(cec_command *command)
   return false;
 }
 
-bool cec_transmit(const CEC::cec_frame &data, bool bWaitForAck /* = true */)
+bool cec_transmit(const CEC::cec_command &data, bool bWaitForAck /* = true */)
 {
   if (cec_parser)
     return cec_parser->Transmit(data, bWaitForAck);

diff --git a/src/lib/platform/linux/serialport.cpp b/src/lib/platform/linux/serialport.cpp
index 4e4ac4627d8f109dc722a80f5991a0a6df30827b..d323708214c8b602a9edc1dd02f0ead087a3b635 100644 (file)
--- a/src/lib/platform/linux/serialport.cpp
+++ b/src/lib/platform/linux/serialport.cpp
@@ -46,7 +46,7 @@ CSerialPort::~CSerialPort()
   Close();
 }
 
-int8_t CSerialPort::Write(const cec_frame &data)
+int8_t CSerialPort::Write(const cec_adapter_message &data)
 {
   fd_set port;
 
@@ -84,7 +84,7 @@ int8_t CSerialPort::Write(const cec_frame &data)
 //  {
 //    printf("%s write:", m_name.c_str());
 //    for (int i = 0; i < byteswritten; i++)
-//      printf(" %02x", (unsigned int)data.data[i]);
+//      printf(" %02x", (unsigned int)data[i]);
 //
 //    printf("\n");
 //  }

diff --git a/src/lib/platform/serialport.h b/src/lib/platform/serialport.h
index 9cc2c9a1439b5530b5380e1d85312b7451c992bf..f4f085e6b81d33a897189a7c697818281ea801fa 100644 (file)
--- a/src/lib/platform/serialport.h
+++ b/src/lib/platform/serialport.h
@@ -46,7 +46,7 @@ namespace CEC
       bool IsOpen();
       void Close();
 
-      int8_t Write(const cec_frame &data);
+      int8_t Write(const cec_adapter_message &data);
       int32_t Read(uint8_t* data, uint32_t len, uint64_t iTimeoutMs = 0);
 
       std::string GetError() { return m_error; }

diff --git a/src/lib/platform/windows/serialport.cpp b/src/lib/platform/windows/serialport.cpp
index 443b426b2fd9c9e174e830b00e1ece7b5ade7961..6e1c7bdef7b0509ebf942ae09674e0c7984e8def 100644 (file)
--- a/src/lib/platform/windows/serialport.cpp
+++ b/src/lib/platform/windows/serialport.cpp
@@ -166,7 +166,7 @@ void CSerialPort::Close(void)
   }
 }
 
-int8_t CSerialPort::Write(const cec_frame &data)
+int8_t CSerialPort::Write(const cec_adapter_message &data)
 {
   CLockObject lock(&m_mutex);
   DWORD iBytesWritten = 0;

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index 52a5af462b2becc356ca4ca5541e138c4e7bb711..c67f0cc90ef020f0a0ef2d5b563c5c006c3c544c 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -42,7 +42,7 @@
 using namespace CEC;
 using namespace std;
 
-#define CEC_TEST_CLIENT_VERSION 5
+#define CEC_TEST_CLIENT_VERSION 6
 
 
 inline bool HexStrToInt(const std::string& data, uint8_t& value)
@@ -276,7 +276,7 @@ int main (int argc, char *argv[])
         {
           string strvalue;
           uint8_t ivalue;
-          cec_frame bytes;
+          cec_command bytes;
           bytes.clear();
 
           while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue))