#include "CECProcessor.h"
#include "AdapterCommunication.h"
-#include "CECBusDevice.h"
+#include "devices/CECBusDevice.h"
+#include "devices/CECAudioSystem.h"
+#include "devices/CECPlaybackDevice.h"
+#include "devices/CECRecordingDevice.h"
+#include "devices/CECTuner.h"
+#include "devices/CECTV.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_iPhysicalAddress(iPhysicalAddress),
- m_iLogicalAddress(iLogicalAddress),
+ m_bStarted(false),
m_strDeviceName(strDeviceName),
m_communication(serComm),
m_controller(controller),
m_bMonitor(false)
{
- for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
- m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, 0);
+ m_logicalAddresses.clear();
+ m_logicalAddresses.set(iLogicalAddress);
+ m_types.clear();
+ for (int iPtr = 0; iPtr < 16; iPtr++)
+ m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, iPtr == iLogicalAddress ? iPhysicalAddress : 0);
+}
+
+CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, const cec_device_type_list &types) :
+ m_bStarted(false),
+ m_strDeviceName(strDeviceName),
+ m_types(types),
+ m_communication(serComm),
+ m_controller(controller),
+ m_bMonitor(false)
+{
+ m_logicalAddresses.clear();
+ for (int iPtr = 0; iPtr < 16; iPtr++)
+ {
+ switch(iPtr)
+ {
+ case CECDEVICE_AUDIOSYSTEM:
+ m_busDevices[iPtr] = new CCECAudioSystem(this, (cec_logical_address) iPtr, 0xFFFF);
+ break;
+ case CECDEVICE_PLAYBACKDEVICE1:
+ case CECDEVICE_PLAYBACKDEVICE2:
+ case CECDEVICE_PLAYBACKDEVICE3:
+ m_busDevices[iPtr] = new CCECPlaybackDevice(this, (cec_logical_address) iPtr, 0xFFFF);
+ break;
+ case CECDEVICE_RECORDINGDEVICE1:
+ case CECDEVICE_RECORDINGDEVICE2:
+ case CECDEVICE_RECORDINGDEVICE3:
+ m_busDevices[iPtr] = new CCECRecordingDevice(this, (cec_logical_address) iPtr, 0xFFFF);
+ break;
+ case CECDEVICE_TUNER1:
+ case CECDEVICE_TUNER2:
+ case CECDEVICE_TUNER3:
+ case CECDEVICE_TUNER4:
+ m_busDevices[iPtr] = new CCECTuner(this, (cec_logical_address) iPtr, 0xFFFF);
+ break;
+ case CECDEVICE_TV:
+ m_busDevices[iPtr] = new CCECTV(this, (cec_logical_address) iPtr, 0);
+ break;
+ default:
+ m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, 0xFFFF);
+ break;
+ }
+ }
}
CCECProcessor::~CCECProcessor(void)
{
+ m_startCondition.Broadcast();
StopThread();
m_communication = NULL;
m_controller = NULL;
- delete[] m_busDevices;
+ for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
+ delete m_busDevices[iPtr];
}
bool CCECProcessor::Start(void)
{
+ CLockObject lock(&m_mutex);
if (!m_communication || !m_communication->IsOpen())
{
m_controller->AddLog(CEC_LOG_ERROR, "connection is closed");
return false;
}
- if (!SetLogicalAddress(m_iLogicalAddress))
- {
- m_controller->AddLog(CEC_LOG_ERROR, "could not set the logical address");
- return false;
- }
-
if (CreateThread())
+ {
+ if (!m_startCondition.Wait(&m_mutex) || !m_bStarted)
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+ return false;
+ }
return true;
+ }
else
m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
return false;
}
+bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *strLabel, unsigned int iIndex)
+{
+ CStdString strLog;
+ strLog.Format("trying logical address '%s'", strLabel);
+ AddLog(CEC_LOG_DEBUG, strLog);
+
+ SetAckMask(0x1 << address);
+ if (!m_busDevices[address]->TransmitPoll(address))
+ {
+ strLog.Format("using logical address '%s'", strLabel);
+ AddLog(CEC_LOG_NOTICE, strLog);
+
+ /* only set our OSD name for the primary device */
+ if (m_logicalAddresses.empty())
+ m_busDevices[address]->m_strDeviceName = m_strDeviceName;
+ m_busDevices[address]->m_powerStatus = CEC_POWER_STATUS_ON;
+ m_busDevices[address]->m_cecVersion = CEC_VERSION_1_3A;
+ m_logicalAddresses.set(address);
+
+ // TODO
+ m_busDevices[address]->SetPhysicalAddress(CEC_DEFAULT_PHYSICAL_ADDRESS + (iIndex * 0x100));
+
+ return true;
+ }
+
+ strLog.Format("logical address '%s' already taken", strLabel);
+ AddLog(CEC_LOG_DEBUG, strLog);
+ return false;
+}
+
+bool CCECProcessor::FindLogicalAddressRecordingDevice(unsigned int iIndex)
+{
+ AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'recording device'");
+ return TryLogicalAddress(CECDEVICE_RECORDINGDEVICE1, "recording 1", iIndex) ||
+ TryLogicalAddress(CECDEVICE_RECORDINGDEVICE2, "recording 2", iIndex) ||
+ TryLogicalAddress(CECDEVICE_RECORDINGDEVICE3, "recording 3", iIndex);
+}
+
+bool CCECProcessor::FindLogicalAddressTuner(unsigned int iIndex)
+{
+ AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'tuner'");
+ return TryLogicalAddress(CECDEVICE_TUNER1, "tuner 1", iIndex) ||
+ TryLogicalAddress(CECDEVICE_TUNER2, "tuner 2", iIndex) ||
+ TryLogicalAddress(CECDEVICE_TUNER3, "tuner 3", iIndex) ||
+ TryLogicalAddress(CECDEVICE_TUNER4, "tuner 4", iIndex);
+}
+
+bool CCECProcessor::FindLogicalAddressPlaybackDevice(unsigned int iIndex)
+{
+ AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'playback device'");
+ return TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE1, "playback 1", iIndex) ||
+ TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE2, "playback 2", iIndex) ||
+ TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE3, "playback 3", iIndex);
+}
+
+bool CCECProcessor::FindLogicalAddressAudioSystem(unsigned int iIndex)
+{
+ AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'audio'");
+ return TryLogicalAddress(CECDEVICE_AUDIOSYSTEM, "audio", iIndex);
+}
+
+bool CCECProcessor::FindLogicalAddresses(void)
+{
+ bool bReturn(true);
+ m_logicalAddresses.clear();
+ CStdString strLog;
+
+ for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
+ {
+ if (m_types.types[iPtr] == CEC_DEVICE_TYPE_RESERVED)
+ continue;
+
+ strLog.Format("%s - device %d: type %d", __FUNCTION__, iPtr, m_types.types[iPtr]);
+ AddLog(CEC_LOG_DEBUG, strLog);
+
+ if (m_types.types[iPtr] == CEC_DEVICE_TYPE_RECORDING_DEVICE)
+ bReturn &= FindLogicalAddressRecordingDevice(iPtr);
+ if (m_types.types[iPtr] == CEC_DEVICE_TYPE_TUNER)
+ bReturn &= FindLogicalAddressTuner(iPtr);
+ if (m_types.types[iPtr] == CEC_DEVICE_TYPE_PLAYBACK_DEVICE)
+ bReturn &= FindLogicalAddressPlaybackDevice(iPtr);
+ if (m_types.types[iPtr] == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
+ bReturn &= FindLogicalAddressAudioSystem(iPtr);
+ }
+
+ return bReturn;
+}
+
void *CCECProcessor::Process(void)
{
- m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ cec_command command;
+ CCECAdapterMessage msg;
- cec_command command;
- cec_adapter_message msg;
+ {
+ if (m_logicalAddresses.empty() && !FindLogicalAddresses())
+ {
+ CLockObject lock(&m_mutex);
+ m_controller->AddLog(CEC_LOG_ERROR, "could not detect our logical addressed");
+ m_startCondition.Signal();
+ return NULL;
+ }
+
+ SetAckMask(m_logicalAddresses.ackmask());
+
+ {
+ CLockObject lock(&m_mutex);
+ m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ m_bStarted = true;
+ m_startCondition.Signal();
+ }
+ }
while (!IsStopped())
{
bool bParseFrame(false);
- bool bError(false);
- bool bTransmitSucceeded(false);
command.clear();
msg.clear();
{
CLockObject lock(&m_mutex);
if (m_communication->IsOpen() && m_communication->Read(msg, 50))
- ParseMessage(msg, &bError, &bTransmitSucceeded, &bParseFrame);
+ {
+ m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
+ bParseFrame = ParseMessage(msg) && !IsStopped();
+ }
- bParseFrame &= !IsStopped();
if (bParseFrame)
command = m_currentframe;
}
if (bParseFrame)
ParseCommand(command);
+ Sleep(5);
+
m_controller->CheckKeypressTimeout();
- if (!IsStopped())
- Sleep(5);
+ for (unsigned int iDevicePtr = 0; iDevicePtr < 16; iDevicePtr++)
+ m_busDevices[iDevicePtr]->PollVendorId();
+
+ Sleep(5);
}
return NULL;
}
-bool CCECProcessor::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV */)
-{
- if (!IsRunning())
- return false;
-
- CStdString strLog;
- strLog.Format("<< powering on device with logical address %d", (int8_t)address);
- m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
-
- 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 */)
-{
- if (!IsRunning())
- return false;
-
- 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_command command;
- cec_command::format(command, m_iLogicalAddress, address, CEC_OPCODE_STANDBY);
-
- return Transmit(command);
-}
-
bool CCECProcessor::SetActiveView(void)
{
if (!IsRunning())
return false;
- m_controller->AddLog(CEC_LOG_DEBUG, "<< setting active view");
-
- 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);
+ if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
+ return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView();
+ return false;
}
bool CCECProcessor::SetInactiveView(void)
if (!IsRunning())
return false;
- m_controller->AddLog(CEC_LOG_DEBUG, "<< setting inactive view");
-
- 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);
+ if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
+ return m_busDevices[m_logicalAddresses.primary]->TransmitInactiveView();
+ return false;
}
void CCECProcessor::LogOutput(const cec_command &data)
{
- CStdString txStr = "transmit ";
- txStr.AppendFormat(" %02x", ((uint8_t)data.initiator << 4) + (uint8_t)data.destination);
- txStr.AppendFormat(":%02x", (uint8_t)data.opcode);
+ CStdString strTx;
+ strTx.Format("<< %02x", ((uint8_t)data.initiator << 4) + (uint8_t)data.destination);
+ if (data.opcode_set)
+ strTx.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());
-}
-
-bool CCECProcessor::Transmit(const cec_command &data, bool bWaitForAck /* = true */)
-{
- LogOutput(data);
-
- cec_adapter_message output;
- output.clear();
- CAdapterCommunication::FormatAdapterMessage(data, output);
-
- return TransmitFormatted(output, bWaitForAck);
+ strTx.AppendFormat(":%02x", data.parameters[iPtr]);
+ m_controller->AddLog(CEC_LOG_TRAFFIC, strTx.c_str());
}
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());
+ if (m_logicalAddresses.primary != iLogicalAddress)
+ {
+ CStdString strLog;
+ strLog.Format("<< setting primary logical address to %1x", iLogicalAddress);
+ m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
+ m_logicalAddresses.primary = iLogicalAddress;
+ m_logicalAddresses.set(iLogicalAddress);
+ return SetAckMask(m_logicalAddresses.ackmask());
+ }
- m_iLogicalAddress = iLogicalAddress;
- return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+ return true;
}
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());
-
- m_iPhysicalAddress = iPhysicalAddress;
- return SetActiveView();
-}
-
-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());
-
- cec_command command;
- cec_command::format(command, m_iLogicalAddress, iLogicalAddress, CEC_OPCODE_SET_OSD_STRING);
- command.parameters.push_back((uint8_t)duration);
-
- for (unsigned int iPtr = 0; iPtr < strlen(strMessage); iPtr++)
- command.parameters.push_back(strMessage[iPtr]);
-
- return Transmit(command);
+ if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
+ {
+ m_busDevices[m_logicalAddresses.primary]->SetPhysicalAddress(iPhysicalAddress);
+ return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView();
+ }
+ return false;
}
bool CCECProcessor::SwitchMonitoring(bool bEnable)
m_bMonitor = bEnable;
if (bEnable)
- return m_communication && m_communication->SetAckMask(0);
+ return SetAckMask(0);
else
- return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+ return SetAckMask(m_logicalAddresses.ackmask());
}
-bool CCECProcessor::TransmitFormatted(const cec_adapter_message &data, bool bWaitForAck /* = true */)
+bool CCECProcessor::PollDevice(cec_logical_address iAddress)
{
- CLockObject lock(&m_mutex);
- if (!m_communication || !m_communication->Write(data))
- return false;
-
- if (bWaitForAck)
- {
- uint64_t now = GetTimeMs();
- uint64_t target = now + 1000;
- bool bError(false);
- bool bGotAck(false);
-
- while (!bGotAck && now < target)
- {
- bGotAck = WaitForAck(&bError, (uint32_t) (target - now));
- now = GetTimeMs();
-
- if (bError && now < target)
- {
- m_controller->AddLog(CEC_LOG_ERROR, "retransmitting previous frame");
- if (!m_communication->Write(data))
- return false;
- }
- }
- }
-
- return true;
-}
-
-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_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);
+ if (iAddress != CECDEVICE_UNKNOWN && m_busDevices[iAddress])
+ return m_busDevices[m_logicalAddresses.primary]->TransmitPoll(iAddress);
+ return false;
}
-void CCECProcessor::ReportCECVersion(cec_logical_address address /* = CECDEVICE_TV */)
+cec_version CCECProcessor::GetDeviceCecVersion(cec_logical_address iAddress)
{
- m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting CEC version as 1.3a");
-
- cec_command command;
- cec_command::format(command, m_iLogicalAddress, address, CEC_OPCODE_CEC_VERSION);
- command.parameters.push_back(CEC_VERSION_1_3A);
-
- Transmit(command);
+ return m_busDevices[iAddress]->GetCecVersion();
}
-void CCECProcessor::ReportPowerState(cec_logical_address address /*= CECDEVICE_TV */, bool bOn /* = true */)
+bool CCECProcessor::GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language)
{
- if (bOn)
- m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting \"On\" power status");
- else
- m_controller->AddLog(CEC_LOG_NOTICE, "<< reporting \"Off\" power status");
-
- 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);
+ if (m_busDevices[iAddress])
+ {
+ *language = m_busDevices[iAddress]->GetMenuLanguage();
+ return (strcmp(language->language, "???") != 0);
+ }
+ return false;
}
-void CCECProcessor::ReportMenuState(cec_logical_address address /* = CECDEVICE_TV */, bool bActive /* = true */)
+uint64_t CCECProcessor::GetDeviceVendorId(cec_logical_address iAddress)
{
- 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");
-
- 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);
+ if (m_busDevices[iAddress])
+ return m_busDevices[iAddress]->GetVendorId();
+ return false;
}
-void CCECProcessor::ReportVendorID(cec_logical_address address /* = CECDEVICE_TV */)
+cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddress)
{
- m_controller->AddLog(CEC_LOG_NOTICE, "<< vendor ID requested, feature abort");
- TransmitAbort(address, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+ if (m_busDevices[iAddress])
+ return m_busDevices[iAddress]->GetPowerStatus();
+ return CEC_POWER_STATUS_UNKNOWN;
}
-void CCECProcessor::ReportOSDName(cec_logical_address address /* = CECDEVICE_TV */)
+bool CCECProcessor::Transmit(const cec_command &data)
{
- 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());
+ bool bReturn(false);
+ LogOutput(data);
- 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]);
+ CCECAdapterMessage *output = new CCECAdapterMessage(data);
+ bReturn = Transmit(output);
+ delete output;
- Transmit(command);
+ return bReturn;
}
-void CCECProcessor::ReportPhysicalAddress(void)
+bool CCECProcessor::Transmit(CCECAdapterMessage *output)
{
- CStdString strLog;
- strLog.Format("<< reporting physical address as %04x", m_iPhysicalAddress);
- m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
+ bool bReturn(false);
+ CLockObject lock(&m_mutex);
+ {
+ CLockObject msgLock(&output->mutex);
+ if (!m_communication || !m_communication->Write(output))
+ return bReturn;
+ else
+ {
+ output->condition.Wait(&output->mutex);
+ if (output->state != ADAPTER_MESSAGE_STATE_SENT)
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "command was not sent");
+ return bReturn;
+ }
+ }
- 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));
+ if (output->transmit_timeout > 0)
+ {
+ if ((bReturn = WaitForTransmitSucceeded(output->size(), output->transmit_timeout)) == false)
+ m_controller->AddLog(CEC_LOG_DEBUG, "did not receive ack");
+ }
+ else
+ bReturn = true;
+ }
- Transmit(command);
+ return bReturn;
}
-void CCECProcessor::BroadcastActiveSource(void)
+void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode, ECecAbortReason reason /* = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE */)
{
- m_controller->AddLog(CEC_LOG_NOTICE, "<< broadcasting active source");
+ m_controller->AddLog(CEC_LOG_DEBUG, "<< transmitting abort message");
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));
+ // TODO
+ cec_command::format(command, m_logicalAddresses.primary, address, CEC_OPCODE_FEATURE_ABORT);
+ command.parameters.push_back((uint8_t)opcode);
+ command.parameters.push_back((uint8_t)reason);
Transmit(command);
}
-bool CCECProcessor::WaitForAck(bool *bError, uint32_t iTimeout /* = 1000 */)
+bool CCECProcessor::WaitForTransmitSucceeded(uint8_t iLength, uint32_t iTimeout /* = 1000 */)
{
- bool bTransmitSucceeded = false, bEom = false;
- *bError = false;
+ bool bError(false);
+ bool bTransmitSucceeded(false);
+ uint8_t iPacketsLeft(iLength / 4);
int64_t iNow = GetTimeMs();
int64_t iTargetTime = iNow + (uint64_t) iTimeout;
- while (!bTransmitSucceeded && !*bError && (iTimeout == 0 || iNow < iTargetTime))
+ while (!bTransmitSucceeded && !bError && (iTimeout == 0 || iNow < iTargetTime))
{
- cec_adapter_message msg;
- msg.clear();
+ CCECAdapterMessage msg;
if (!m_communication->Read(msg, iTimeout > 0 ? (int32_t)(iTargetTime - iNow) : 1000))
{
continue;
}
- ParseMessage(msg, bError, &bTransmitSucceeded, &bEom, false);
- iNow = GetTimeMs();
+ if ((bError = msg.is_error()) == false)
+ {
+ m_controller->AddLog(bError ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
+
+ switch(msg.message())
+ {
+ case MSGCODE_COMMAND_ACCEPTED:
+ if (iPacketsLeft > 0)
+ iPacketsLeft--;
+ break;
+ case MSGCODE_TRANSMIT_SUCCEEDED:
+ bTransmitSucceeded = (iPacketsLeft == 0);
+ bError = !bTransmitSucceeded;
+ break;
+ default:
+ ParseMessage(msg);
+ }
+
+ iNow = GetTimeMs();
+ }
}
- return bTransmitSucceeded && !*bError;
+ return bTransmitSucceeded && !bError;
}
-void CCECProcessor::ParseMessage(cec_adapter_message &msg, bool *bError, bool *bTransmitSucceeded, bool *bEom, bool bProcessMessages /* = true */)
+bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg)
{
- *bError = false;
- *bTransmitSucceeded = false;
- *bEom = false;
+ bool bEom = false;
if (msg.empty())
- return;
-
- CStdString logStr;
+ return bEom;
switch(msg.message())
{
- case MSGCODE_NOTHING:
- m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_NOTHING");
- break;
- case MSGCODE_TIMEOUT_ERROR:
- case MSGCODE_HIGH_ERROR:
- case MSGCODE_LOW_ERROR:
- {
- if (msg.message() == MSGCODE_TIMEOUT_ERROR)
- logStr = "MSGCODE_TIMEOUT";
- else if (msg.message() == MSGCODE_HIGH_ERROR)
- logStr = "MSGCODE_HIGH_ERROR";
- else
- logStr = "MSGCODE_LOW_ERROR";
-
- int iLine = (msg.size() >= 3) ? (msg[1] << 8) | (msg[2]) : 0;
- uint32_t iTime = (msg.size() >= 7) ? (msg[3] << 24) | (msg[4] << 16) | (msg[5] << 8) | (msg[6]) : 0;
- 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:
{
- if (bProcessMessages)
- {
- 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_currentframe.clear();
+ if (msg.size() >= 2)
{
- m_frameBuffer.Push(msg);
+ m_currentframe.initiator = msg.initiator();
+ m_currentframe.destination = msg.destination();
+ m_currentframe.ack = msg.ack();
+ m_currentframe.eom = msg.eom();
}
}
break;
case MSGCODE_FRAME_DATA:
{
- if (bProcessMessages)
+ if (msg.size() >= 2)
{
- 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_currentframe.push_back(msg[1]);
+ m_currentframe.eom = msg.eom();
}
- else
- {
- m_frameBuffer.Push(msg);
- }
-
- *bEom = msg.eom();
+ bEom = msg.eom();
}
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;
}
-}
-void CCECProcessor::ParseVendorId(cec_logical_address device, const cec_datapacket &data)
-{
- if (data.size < 3)
- {
- m_controller->AddLog(CEC_LOG_WARNING, "invalid vendor ID received");
- return;
- }
-
- uint64_t iVendorId = ((uint64_t)data[0] << 3) +
- ((uint64_t)data[1] << 2) +
- (uint64_t)data[2];
-
- m_busDevices[(uint8_t)device]->SetVendorId(iVendorId, data.size >= 4 ? data[3] : 0);
+ return bEom;
}
void CCECProcessor::ParseCommand(cec_command &command)
{
CStdString dataStr;
- dataStr.Format(">> received frame: %1x%1x:%02x", command.initiator, command.destination, command.opcode);
+ dataStr.Format(">> %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());
+ m_controller->AddLog(CEC_LOG_TRAFFIC, dataStr.c_str());
if (!m_bMonitor)
m_busDevices[(uint8_t)command.initiator]->HandleCommand(command);
}
+uint16_t CCECProcessor::GetPhysicalAddress(void) const
+{
+ if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
+ return m_busDevices[m_logicalAddresses.primary]->GetPhysicalAddress();
+ return false;
+}
+
void CCECProcessor::SetCurrentButton(cec_user_control_code iButtonCode)
{
m_controller->SetCurrentButton(iButtonCode);
m_controller->AddCommand(command);
}
+void CCECProcessor::AddKey(cec_keypress &key)
+{
+ m_controller->AddKey(key);
+}
+
void CCECProcessor::AddKey(void)
{
m_controller->AddKey();
{
m_controller->AddLog(level, strMessage);
}
+
+bool CCECProcessor::SetAckMask(uint16_t iMask)
+{
+ bool bReturn(false);
+ CStdString strLog;
+ strLog.Format("setting ackmask to %2x", iMask);
+ m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
+ CCECAdapterMessage *output = new CCECAdapterMessage;
+
+ output->push_back(MSGSTART);
+ output->push_escaped(MSGCODE_SET_ACK_MASK);
+ output->push_escaped(iMask >> 8);
+ output->push_escaped((uint8_t)iMask);
+ output->push_back(MSGEND);
+
+ if ((bReturn = Transmit(output)) == false)
+ m_controller->AddLog(CEC_LOG_ERROR, "could not set the ackmask");
+
+ delete output;
+
+ return bReturn;
+}
repositories / deb_libcec.git / blobdiff