#include "CECProcessor.h"
#include "AdapterCommunication.h"
+#include "CECBusDevice.h"
#include "LibCEC.h"
#include "util/StdString.h"
#include "platform/timeutils.h"
using namespace std;
CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS*/) :
- m_physicaladdress(iPhysicalAddress),
+ m_iPhysicalAddress(iPhysicalAddress),
m_iLogicalAddress(iLogicalAddress),
m_strDeviceName(strDeviceName),
m_communication(serComm),
- m_controller(controller)
+ m_controller(controller),
+ m_bMonitor(false)
{
- for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
- m_vendorIds[iPtr] = CEC_VENDOR_UNKNOWN;
- for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
- m_vendorClasses[iPtr] = (uint8_t) 0;
+ for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
+ m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, 0);
}
CCECProcessor::~CCECProcessor(void)
StopThread();
m_communication = NULL;
m_controller = NULL;
+ delete[] m_busDevices;
}
bool CCECProcessor::Start(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;
+ bool bError(false);
+ bool bTransmitSucceeded(false);
+ command.clear();
msg.clear();
{
CLockObject lock(&m_mutex);
if (m_communication->IsOpen() && m_communication->Read(msg, 50))
- bParseFrame = ParseMessage(msg) && !IsStopped();
+ ParseMessage(msg, &bError, &bTransmitSucceeded, &bParseFrame);
+ bParseFrame &= !IsStopped();
if (bParseFrame)
- {
- msg.clear();
- msg = m_currentframe;
- }
+ command = m_currentframe;
}
if (bParseFrame)
- ParseCurrentFrame(msg);
+ ParseCommand(command);
m_controller->CheckKeypressTimeout();
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);
+ cec_command command;
+ cec_command::format(command, m_iLogicalAddress, address, CEC_OPCODE_IMAGE_VIEW_ON);
+
+ return Transmit(command);
}
bool CCECProcessor::StandbyDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
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);
+ cec_command command;
+ cec_command::format(command, m_iLogicalAddress, address, CEC_OPCODE_STANDBY);
+
+ return Transmit(command);
}
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(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+ command.parameters.push_back((m_iPhysicalAddress >> 8) & 0xFF);
+ command.parameters.push_back(m_iPhysicalAddress & 0xFF);
+
+ return Transmit(command);
}
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(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE);
+ command.parameters.push_back((m_iPhysicalAddress >> 8) & 0xFF);
+ command.parameters.push_back(m_iPhysicalAddress & 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 (uint8_t 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();
+ CAdapterCommunication::FormatAdapterMessage(data, output);
- //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);
+ return TransmitFormatted(output, bWaitForAck);
+}
- if ((data[0] & 0xF) == 0xF)
- CAdapterCommunication::PushEscaped(output, CEC_TRUE);
- else
- CAdapterCommunication::PushEscaped(output, CEC_FALSE);
+bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
+{
+ CStdString strLog;
+ strLog.Format("<< setting logical address to %1x", iLogicalAddress);
+ m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
- output.push_back(MSGEND);
+ m_iLogicalAddress = iLogicalAddress;
+ return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+}
- for (int8_t i = 0; i < data.size(); i++)
- {
- output.push_back(MSGSTART);
+bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress)
+{
+ CStdString strLog;
+ strLog.Format("<< setting physical address to %2x", iPhysicalAddress);
+ m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
- if (i == data.size() - 1)
- CAdapterCommunication::PushEscaped(output, MSGCODE_TRANSMIT_EOM);
- else
- CAdapterCommunication::PushEscaped(output, MSGCODE_TRANSMIT);
+ m_iPhysicalAddress = iPhysicalAddress;
+ return SetActiveView();
+}
- CAdapterCommunication::PushEscaped(output, data[i]);
+bool CCECProcessor::SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage)
+{
+ CStdString strLog;
+ strLog.Format("<< display message '%s'", strMessage);
+ m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
- output.push_back(MSGEND);
- }
+ cec_command command;
+ cec_command::format(command, m_iLogicalAddress, iLogicalAddress, CEC_OPCODE_SET_OSD_STRING);
+ command.parameters.push_back((uint8_t)duration);
- return TransmitFormatted(output, bWaitForAck);
+ for (unsigned int iPtr = 0; iPtr < strlen(strMessage); iPtr++)
+ command.parameters.push_back(strMessage[iPtr]);
+
+ return Transmit(command);
}
-bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
+bool CCECProcessor::SwitchMonitoring(bool bEnable)
{
CStdString strLog;
- strLog.Format("<< setting logical address to %d", iLogicalAddress);
+ strLog.Format("== %s monitoring mode ==", bEnable ? "enabling" : "disabling");
m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
- m_iLogicalAddress = iLogicalAddress;
- return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+ m_bMonitor = bEnable;
+ if (bEnable)
+ return m_communication && m_communication->SetAckMask(0);
+ else
+ 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))
while (!bGotAck && now < target)
{
- bGotAck = WaitForAck(&bError, (uint64_t) (target - now));
+ bGotAck = WaitForAck(&bError, (uint32_t) (target - now));
now = GetTimeMs();
if (bError && now < target)
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(command, 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(command, 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(command, 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(command, 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 */)
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(command, 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);
+ strLog.Format("<< reporting physical address as %04x", m_iPhysicalAddress);
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(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
+ command.parameters.push_back((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
+ command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
+ command.parameters.push_back((uint8_t) (CEC_DEVICE_TYPE_PLAYBACK_DEVICE));
+
+ 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(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+ command.parameters.push_back((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
+ command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
+
+ Transmit(command);
}
bool CCECProcessor::WaitForAck(bool *bError, uint32_t iTimeout /* = 1000 */)
{
- bool bGotAck(false);
+ bool bTransmitSucceeded = false, bEom = false;
*bError = false;
int64_t iNow = GetTimeMs();
int64_t iTargetTime = iNow + (uint64_t) iTimeout;
- while (!bGotAck && !*bError && (iTimeout == 0 || iNow < iTargetTime))
+ while (!bTransmitSucceeded && !*bError && (iTimeout == 0 || iNow < iTargetTime))
{
- cec_frame msg;
+ cec_adapter_message msg;
msg.clear();
- if (!m_communication->Read(msg, iTimeout > 0 ? iTargetTime - iNow : 1000))
+ if (!m_communication->Read(msg, iTimeout > 0 ? (int32_t)(iTargetTime - iNow) : 1000))
{
iNow = GetTimeMs();
continue;
}
- uint8_t iCode = msg[0] & ~(MSGCODE_FRAME_EOM | MSGCODE_FRAME_ACK);
-
- switch (iCode)
- {
- case MSGCODE_COMMAND_ACCEPTED:
- m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_COMMAND_ACCEPTED");
- break;
- case MSGCODE_TRANSMIT_SUCCEEDED:
- m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_TRANSMIT_SUCCEEDED");
- bGotAck = true;
- break;
- case MSGCODE_RECEIVE_FAILED:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_RECEIVE_FAILED");
- *bError = true;
- break;
- case MSGCODE_COMMAND_REJECTED:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_COMMAND_REJECTED");
- *bError = true;
- break;
- case MSGCODE_TRANSMIT_FAILED_LINE:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_LINE");
- *bError = true;
- break;
- case MSGCODE_TRANSMIT_FAILED_ACK:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_ACK");
- *bError = true;
- break;
- case MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA");
- *bError = true;
- break;
- case MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE");
- *bError = true;
- break;
- default:
- m_frameBuffer.Push(msg);
- break;
- }
-
+ ParseMessage(msg, bError, &bTransmitSucceeded, &bEom, false);
iNow = GetTimeMs();
}
- return bGotAck && !*bError;
+ return bTransmitSucceeded && !*bError;
}
-bool CCECProcessor::ParseMessage(cec_frame &msg)
+void CCECProcessor::ParseMessage(cec_adapter_message &msg, bool *bError, bool *bTransmitSucceeded, bool *bEom, bool bProcessMessages /* = true */)
{
- bool bReturn(false);
+ *bError = false;
+ *bTransmitSucceeded = false;
+ *bEom = false;
if (msg.empty())
- return bReturn;
+ return;
CStdString logStr;
logStr.AppendFormat(" line:%i", iLine);
logStr.AppendFormat(" time:%u", iTime);
m_controller->AddLog(CEC_LOG_WARNING, logStr.c_str());
+ *bError = true;
}
break;
case MSGCODE_FRAME_START:
{
- logStr = "MSGCODE_FRAME_START";
- m_currentframe.clear();
- if (msg.size() >= 2)
+ if (bProcessMessages)
{
- 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]);
+ logStr = "MSGCODE_FRAME_START";
+ m_currentframe.clear();
+ 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.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());
+ }
+ else
+ {
+ m_frameBuffer.Push(msg);
}
- m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
}
break;
case MSGCODE_FRAME_DATA:
{
- logStr = "MSGCODE_FRAME_DATA";
- if (msg.size() >= 2)
+ if (bProcessMessages)
{
- uint8_t iData = msg[1];
- logStr.AppendFormat(" %02x", iData);
- m_currentframe.push_back(iData);
+ logStr = "MSGCODE_FRAME_DATA";
+ if (msg.size() >= 2)
+ {
+ uint8_t iData = msg[1];
+ logStr.AppendFormat(" %02x", iData);
+ m_currentframe.push_back(iData);
+ m_currentframe.eom = msg.eom();
+ }
+ m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
}
- m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
+ else
+ {
+ m_frameBuffer.Push(msg);
+ }
+
+ *bEom = msg.eom();
}
- if (msg.eom())
- bReturn = true;
+ break;
+ case MSGCODE_COMMAND_ACCEPTED:
+ m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_COMMAND_ACCEPTED");
+ break;
+ case MSGCODE_TRANSMIT_SUCCEEDED:
+ m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_TRANSMIT_SUCCEEDED");
+ *bTransmitSucceeded = true;
+ break;
+ case MSGCODE_RECEIVE_FAILED:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_RECEIVE_FAILED");
+ *bError = true;
+ break;
+ case MSGCODE_COMMAND_REJECTED:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_COMMAND_REJECTED");
+ *bError = true;
+ break;
+ case MSGCODE_TRANSMIT_FAILED_LINE:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_LINE");
+ *bError = true;
+ break;
+ case MSGCODE_TRANSMIT_FAILED_ACK:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_ACK");
+ *bError = true;
+ break;
+ case MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA");
+ *bError = true;
+ break;
+ case MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE");
+ *bError = true;
break;
default:
break;
}
-
- 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;
((uint64_t)data[1] << 2) +
(uint64_t)data[2];
- m_vendorIds[(uint8_t)device] = iVendorId;
- 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());
+ m_busDevices[(uint8_t)device]->SetVendorId(iVendorId, data.size >= 4 ? data[3] : 0);
}
-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 += " data:";
- for (unsigned int i = 1; i < frame.size(); i++)
- dataStr.AppendFormat(" %02x", frame[i]);
- }
+ dataStr.Format(">> received frame: %1x%1x:%02x", command.initiator, command.destination, command.opcode);
+ for (uint8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
+ dataStr.AppendFormat(":%02x", (unsigned int)command.parameters[iPtr]);
m_controller->AddLog(CEC_LOG_DEBUG, dataStr.c_str());
- if (frame.size() <= 1)
- return;
+ if (!m_bMonitor)
+ m_busDevices[(uint8_t)command.initiator]->HandleCommand(command);
+}
- cec_opcode opCode = (cec_opcode) frame[1];
- if (destination == (uint16_t) m_iLogicalAddress)
- {
- switch(opCode)
- {
- case CEC_OPCODE_GIVE_PHYSICAL_ADDRESS:
- ReportPhysicalAddress();
- break;
- case CEC_OPCODE_GIVE_OSD_NAME:
- ReportOSDName((cec_logical_address)initiator);
- break;
- case CEC_OPCODE_GIVE_DEVICE_VENDOR_ID:
- ReportVendorID((cec_logical_address)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);
- 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);
- break;
- case CEC_OPCODE_MENU_REQUEST:
- frame.shift(2);
- if (frame[0] == CEC_MENU_REQUEST_TYPE_QUERY)
- ReportMenuState((cec_logical_address)initiator);
- break;
- case CEC_OPCODE_GIVE_DEVICE_POWER_STATUS:
- ReportPowerState((cec_logical_address)initiator);
- SetActiveView();
- break;
- case CEC_OPCODE_GET_CEC_VERSION:
- ReportCECVersion((cec_logical_address)initiator);
- break;
- case CEC_OPCODE_USER_CONTROL_PRESSED:
- if (frame.size() > 2)
- {
- m_controller->AddKey();
+void CCECProcessor::SetCurrentButton(cec_user_control_code iButtonCode)
+{
+ m_controller->SetCurrentButton(iButtonCode);
+}
- if (frame[2] <= CEC_USER_CONTROL_CODE_MAX)
- m_controller->SetCurrentButton((cec_user_control_code) frame[2]);
- }
- 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);
- break;
- }
- }
- else if (destination == (uint8_t) CECDEVICE_BROADCAST)
- {
- CStdString strLog;
- if (opCode == CEC_OPCODE_REQUEST_ACTIVE_SOURCE)
- {
- strLog.Format(">> %i requests active source", initiator);
- m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
- BroadcastActiveSource();
- }
- else if (opCode == CEC_OPCODE_SET_STREAM_PATH)
- {
- if (frame.size() >= 4)
- {
- int streamaddr = ((int)frame[2] << 8) | ((int)frame[3]);
- strLog.Format(">> %i requests stream path from physical address %04x", initiator, streamaddr);
- m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
- if (streamaddr == m_physicaladdress)
- BroadcastActiveSource();
- }
- }
- else
- {
- cec_frame params = frame;
- frame.shift(2);
- m_controller->AddCommand((cec_logical_address) initiator, (cec_logical_address) destination, opCode, ¶ms);
- }
- }
- else
- {
- CStdString strLog;
- strLog.Format("ignoring frame: destination: %u != %u", destination, (uint16_t)m_iLogicalAddress);
- m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
- }
+void CCECProcessor::AddCommand(const cec_command &command)
+{
+ m_controller->AddCommand(command);
+}
+
+void CCECProcessor::AddKey(void)
+{
+ m_controller->AddKey();
+}
+
+void CCECProcessor::AddLog(cec_log_level level, const CStdString &strMessage)
+{
+ m_controller->AddLog(level, strMessage);
}
repositories / deb_libcec.git / blobdiff