#include "CECProcessor.h"
-#include "AdapterCommunication.h"
+#include "adapter/AdapterMessage.h"
#include "devices/CECBusDevice.h"
#include "devices/CECAudioSystem.h"
#include "devices/CECPlaybackDevice.h"
#include "devices/CECTV.h"
#include "implementations/CECCommandHandler.h"
#include "LibCEC.h"
-#include "util/StdString.h"
-#include "platform/timeutils.h"
using namespace CEC;
using namespace std;
+using namespace PLATFORM;
CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS*/) :
m_bStarted(false),
+ m_bInitialised(false),
m_iHDMIPort(CEC_DEFAULT_HDMI_PORT),
m_iBaseDevice((cec_logical_address)CEC_DEFAULT_BASE_DEVICE),
m_lastInitiator(CECDEVICE_UNKNOWN),
m_strDeviceName(strDeviceName),
m_controller(controller),
m_bMonitor(false),
- m_busScan(NULL),
m_iStandardLineTimeout(3),
m_iRetryLineTimeout(3),
m_iLastTransmission(0)
CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types) :
m_bStarted(false),
+ m_bInitialised(false),
m_iHDMIPort(CEC_DEFAULT_HDMI_PORT),
m_iBaseDevice((cec_logical_address)CEC_DEFAULT_BASE_DEVICE),
m_strDeviceName(strDeviceName),
delete m_busDevices[iPtr];
}
-bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
+bool CCECProcessor::OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs)
{
- CLockObject lock(&m_mutex);
- if (!m_communication || m_communication->IsOpen())
+ bool bReturn(false);
+ CLockObject lock(m_mutex);
+ if (!m_communication)
{
- m_controller->AddLog(CEC_LOG_ERROR, "connection already opened");
- return false;
+ CLibCEC::AddLog(CEC_LOG_ERROR, "no connection handler found");
+ return bReturn;
}
- if (!m_communication->Open(strPort, iBaudRate, iTimeoutMs))
+ /* check for an already opened connection */
+ if (m_communication->IsOpen())
{
- m_controller->AddLog(CEC_LOG_ERROR, "could not open a connection");
- return false;
+ CLibCEC::AddLog(CEC_LOG_ERROR, "connection already opened");
+ return bReturn;
}
- if (CreateThread())
+ /* open a new connection */
+ if ((bReturn = m_communication->Open(strPort, iBaudRate, iTimeoutMs)) == false)
+ CLibCEC::AddLog(CEC_LOG_ERROR, "could not open a connection");
+
+ /* try to ping the adapter */
+ int iPingTry(0);
+ bool bPingOk(false);
+ while (!bPingOk && iPingTry++ < CEC_PING_ADAPTER_TRIES)
{
- if (!m_startCondition.Wait(&m_mutex) || !m_bStarted)
+ if ((bPingOk = m_communication->PingAdapter()) == false)
{
- m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
- return false;
+ CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter did not respond correctly to a ping (try %d of %d)", iPingTry, CEC_PING_ADAPTER_TRIES);
+ Sleep(500);
}
+ }
- lock.Leave();
-
- m_busDevices[CECDEVICE_TV]->GetVendorId();
-
- if (SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true))
+ if (bPingOk)
+ {
+ uint16_t iFirmwareVersion(CEC_FW_VERSION_UNKNOWN);
+ int iFwVersionTry(0);
+ bool bFwVersionOk(false);
+ while (!bFwVersionOk && iFwVersionTry++ < CEC_FW_VERSION_TRIES)
{
- /* init the default handler */
- if (m_busDevices[CECDEVICE_TV]->GetHandler()->GetVendorId() == CEC_VENDOR_UNKNOWN)
- m_busDevices[CECDEVICE_TV]->GetHandler()->InitHandler();
+ if ((iFirmwareVersion = m_communication->GetFirmwareVersion()) == CEC_FW_VERSION_UNKNOWN)
+ {
+ CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter did not respond with a correct firmware version (try %d of %d)", iFwVersionTry, CEC_FW_VERSION_TRIES);
+ Sleep(500);
+ }
+ }
- m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
- m_busScan = new CCECBusScan(this);
- m_busScan->CreateThread(true);
- return true;
+ if (iFirmwareVersion == CEC_FW_VERSION_UNKNOWN)
+ {
+ bReturn = false;
}
else
{
- m_controller->AddLog(CEC_LOG_ERROR, "failed to initialise the processor");
+ bReturn = true;
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "CEC Adapter firmware version: %d", iFirmwareVersion);
}
}
- m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
- return false;
+ return bReturn;
+}
+
+void CCECProcessor::SetInitialised(bool bSetTo /* = true */)
+{
+ CLockObject lock(m_mutex);
+ m_bInitialised = bSetTo;
+}
+
+bool CCECProcessor::Initialise(void)
+{
+ bool bReturn(false);
+ {
+ CLockObject lock(m_mutex);
+ if (!m_logicalAddresses.IsEmpty())
+ m_logicalAddresses.Clear();
+
+ if (!FindLogicalAddresses())
+ {
+ CLibCEC::AddLog(CEC_LOG_ERROR, "could not detect our logical addresses");
+ return bReturn;
+ }
+
+ /* only set our OSD name for the primary device */
+ m_busDevices[m_logicalAddresses.primary]->m_strDeviceName = m_strDeviceName;
+ }
+
+ /* get the vendor id from the TV, so we are using the correct handler */
+ m_busDevices[CECDEVICE_TV]->RequestVendorId();
+ ReplaceHandlers();
+
+ if ((bReturn = SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) == false)
+ CLibCEC::AddLog(CEC_LOG_ERROR, "unable to set HDMI port %d on %s (%x)", m_iHDMIPort, ToString(m_iBaseDevice), (uint8_t)m_iBaseDevice);
+
+ SetInitialised(bReturn);
+
+ return bReturn;
+}
+
+bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
+{
+ bool bReturn(false);
+
+ {
+ CLockObject lock(m_mutex);
+ if (!OpenConnection(strPort, iBaudRate, iTimeoutMs))
+ return bReturn;
+
+ /* create the processor thread */
+ if (!CreateThread() || !m_startCondition.Wait(m_mutex) || !m_bStarted)
+ {
+ CLibCEC::AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+ return bReturn;
+ }
+ }
+
+ if ((bReturn = Initialise()) == false)
+ {
+ CLibCEC::AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+ StopThread(true);
+ }
+ else
+ {
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "processor thread started");
+ }
+
+ return bReturn;
}
bool CCECProcessor::TryLogicalAddress(cec_logical_address address)
bool CCECProcessor::FindLogicalAddressRecordingDevice(void)
{
- AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'recording device'");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'recording device'");
return TryLogicalAddress(CECDEVICE_RECORDINGDEVICE1) ||
TryLogicalAddress(CECDEVICE_RECORDINGDEVICE2) ||
TryLogicalAddress(CECDEVICE_RECORDINGDEVICE3);
bool CCECProcessor::FindLogicalAddressTuner(void)
{
- AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'tuner'");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'tuner'");
return TryLogicalAddress(CECDEVICE_TUNER1) ||
TryLogicalAddress(CECDEVICE_TUNER2) ||
TryLogicalAddress(CECDEVICE_TUNER3) ||
bool CCECProcessor::FindLogicalAddressPlaybackDevice(void)
{
- AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'playback device'");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'playback device'");
return TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE1) ||
TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE2) ||
TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE3);
bool CCECProcessor::FindLogicalAddressAudioSystem(void)
{
- AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'audio'");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'audio'");
return TryLogicalAddress(CECDEVICE_AUDIOSYSTEM);
}
+bool CCECProcessor::ChangeDeviceType(cec_device_type from, cec_device_type to)
+{
+ bool bChanged(false);
+
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "changing device type '%s' into '%s'", ToString(from), ToString(to));
+
+ CLockObject lock(m_mutex);
+ CCECBusDevice *previousDevice = GetDeviceByType(from);
+ m_logicalAddresses.primary = CECDEVICE_UNKNOWN;
+
+ for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
+ {
+ if (m_types.types[iPtr] == CEC_DEVICE_TYPE_RESERVED)
+ continue;
+
+ if (m_types.types[iPtr] == from)
+ {
+ bChanged = true;
+ m_types.types[iPtr] = to;
+ }
+ else if (m_types.types[iPtr] == to && bChanged)
+ {
+ m_types.types[iPtr] = CEC_DEVICE_TYPE_RESERVED;
+ }
+ }
+
+ if (bChanged)
+ {
+ FindLogicalAddresses();
+
+ CCECBusDevice *newDevice = GetDeviceByType(to);
+ if (previousDevice && newDevice)
+ {
+ newDevice->SetDeviceStatus(CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC);
+ previousDevice->SetDeviceStatus(CEC_DEVICE_STATUS_UNKNOWN);
+
+ newDevice->SetCecVersion(previousDevice->GetCecVersion(false));
+ previousDevice->SetCecVersion(CEC_VERSION_UNKNOWN);
+
+ newDevice->SetMenuLanguage(previousDevice->GetMenuLanguage(false));
+ cec_menu_language lang;
+ lang.device = previousDevice->GetLogicalAddress();
+ for (unsigned int iPtr = 0; iPtr < 4; iPtr++)
+ lang.language[iPtr] = '?';
+ lang.language[3] = 0;
+ previousDevice->SetMenuLanguage(lang);
+
+ newDevice->SetMenuState(previousDevice->GetMenuState());
+ previousDevice->SetMenuState(CEC_MENU_STATE_DEACTIVATED);
+
+ newDevice->SetOSDName(previousDevice->GetOSDName(false));
+ previousDevice->SetOSDName(ToString(previousDevice->GetLogicalAddress()));
+
+ newDevice->SetPhysicalAddress(previousDevice->GetPhysicalAddress(false));
+ previousDevice->SetPhysicalAddress(0xFFFF);
+
+ newDevice->SetPowerStatus(previousDevice->GetPowerStatus(false));
+ previousDevice->SetPowerStatus(CEC_POWER_STATUS_UNKNOWN);
+
+ newDevice->SetVendorId(previousDevice->GetVendorId(false));
+ previousDevice->SetVendorId(CEC_VENDOR_UNKNOWN);
+
+ if ((from == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || from == CEC_DEVICE_TYPE_RECORDING_DEVICE) &&
+ (to == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || to == CEC_DEVICE_TYPE_RECORDING_DEVICE))
+ {
+ ((CCECPlaybackDevice *) newDevice)->SetDeckControlMode(((CCECPlaybackDevice *) previousDevice)->GetDeckControlMode());
+ ((CCECPlaybackDevice *) previousDevice)->SetDeckControlMode(CEC_DECK_CONTROL_MODE_STOP);
+
+ ((CCECPlaybackDevice *) newDevice)->SetDeckStatus(((CCECPlaybackDevice *) previousDevice)->GetDeckStatus());
+ ((CCECPlaybackDevice *) previousDevice)->SetDeckStatus(CEC_DECK_INFO_STOP);
+ }
+ }
+ }
+
+ return true;
+}
+
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);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "%s - device %d: type %d", __FUNCTION__, iPtr, m_types.types[iPtr]);
if (m_types.types[iPtr] == CEC_DEVICE_TYPE_RECORDING_DEVICE)
bReturn &= FindLogicalAddressRecordingDevice();
bReturn &= FindLogicalAddressAudioSystem();
}
+ if (bReturn)
+ SetAckMask(m_logicalAddresses.AckMask());
+
return bReturn;
}
+void CCECProcessor::ReplaceHandlers(void)
+{
+ for (uint8_t iPtr = 0; iPtr <= CECDEVICE_PLAYBACKDEVICE3; iPtr++)
+ m_busDevices[iPtr]->ReplaceHandler(m_bInitialised);
+}
+
void *CCECProcessor::Process(void)
{
bool bParseFrame(false);
cec_command command;
CCECAdapterMessage msg;
- if (m_logicalAddresses.IsEmpty() && !FindLogicalAddresses())
- {
- CLockObject lock(&m_mutex);
- m_controller->AddLog(CEC_LOG_ERROR, "could not detect our logical addresses");
- m_startCondition.Signal();
- return NULL;
- }
- else
{
- /* only set our OSD name and active source for the primary device */
- m_busDevices[m_logicalAddresses.primary]->m_strDeviceName = m_strDeviceName;
- m_busDevices[m_logicalAddresses.primary]->m_bActiveSource = true;
-
- SetAckMask(m_logicalAddresses.AckMask());
-
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
m_bStarted = true;
- m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "processor thread started");
m_startCondition.Signal();
}
while (!IsStopped())
{
+ ReplaceHandlers();
command.Clear();
- msg.clear();
+ msg.Clear();
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
if (m_commandBuffer.Pop(command))
{
bParseFrame = true;
m_controller->CheckKeypressTimeout();
}
- if (m_busScan)
- {
- m_busScan->StopThread();
- delete m_busScan;
- m_busScan = NULL;
- }
-
if (m_communication)
m_communication->Close();
bReturn = m_busDevices[addr]->TransmitActiveSource();
if (bReturn && (m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE ||
- m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE))
+ m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE) &&
+ m_busDevices[addr]->GetHandler()->SendDeckStatusUpdateOnActiveSource())
{
bReturn = ((CCECPlaybackDevice *)m_busDevices[addr])->TransmitDeckStatus(CECDEVICE_TV);
}
void CCECProcessor::SetStandardLineTimeout(uint8_t iTimeout)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
m_iStandardLineTimeout = iTimeout;
}
void CCECProcessor::SetRetryLineTimeout(uint8_t iTimeout)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
m_iRetryLineTimeout = iTimeout;
}
bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce /* = false */)
{
bool bReturn(false);
+ CLockObject lock(m_mutex);
m_iBaseDevice = iBaseDevice;
m_iHDMIPort = iPort;
if (!m_bStarted && !bForce)
return true;
- CStdString strLog;
- strLog.Format("setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice);
- AddLog(CEC_LOG_DEBUG, strLog);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice);
uint16_t iPhysicalAddress(0);
if (iBaseDevice > CECDEVICE_TV)
- iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress();
-
- if (iPhysicalAddress == 0xffff)
{
- SetPhysicalAddress((uint16_t)iPort * 0x1000);
- bReturn = false;
+ lock.Unlock();
+ iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress();
+ lock.Lock();
}
- else
+
+ if (iPhysicalAddress < 0xffff)
{
- uint16_t iPos = 0;
if (iPhysicalAddress == 0)
- iPos = 0x1000;
+ iPhysicalAddress += 0x1000 * iPort;
else if (iPhysicalAddress % 0x1000 == 0)
- iPos = 0x100;
+ iPhysicalAddress += 0x100 * iPort;
else if (iPhysicalAddress % 0x100 == 0)
- iPos = 0x10;
+ iPhysicalAddress += 0x10 * iPort;
else if (iPhysicalAddress % 0x10 == 0)
- iPos = 0x1;
+ iPhysicalAddress += iPort;
- while(!bReturn && iPos > 0)
- {
- iPhysicalAddress += (uint16_t)(iPort * iPos);
- strLog.Format("checking physical address %4x", iPhysicalAddress);
- AddLog(CEC_LOG_DEBUG, strLog);
- if (PhysicalAddressInUse(iPhysicalAddress))
- {
- strLog.Format("physical address %4x is in use", iPhysicalAddress);
- AddLog(CEC_LOG_DEBUG, strLog);
- iPos = (iPos == 1) ? 0 : iPos / 0x10;
- }
- else
- {
- strLog.Format("physical address %4x is free", iPhysicalAddress);
- AddLog(CEC_LOG_DEBUG, strLog);
- SetPhysicalAddress(iPhysicalAddress);
- bReturn = true;
- }
- }
+ bReturn = true;
+ }
+
+ if (!bReturn)
+ CLibCEC::AddLog(CEC_LOG_ERROR, "failed to set the physical address");
+ else
+ {
+ lock.Unlock();
+ SetPhysicalAddress(iPhysicalAddress);
}
return bReturn;
for (uint8_t iPtr = 0; iPtr < data.parameters.size; iPtr++)
strTx.AppendFormat(":%02x", data.parameters[iPtr]);
- m_controller->AddLog(CEC_LOG_TRAFFIC, strTx.c_str());
+ CLibCEC::AddLog(CEC_LOG_TRAFFIC, strTx.c_str());
}
bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
{
+ CLockObject lock(m_mutex);
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());
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "<< setting primary logical address to %1x", iLogicalAddress);
m_logicalAddresses.primary = iLogicalAddress;
m_logicalAddresses.Set(iLogicalAddress);
return SetAckMask(m_logicalAddresses.AckMask());
return true;
}
-bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress)
+bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress, bool bSendUpdate /* = true */)
{
- if (!m_logicalAddresses.IsEmpty())
+ bool bSendActiveView(false);
+ bool bReturn(false);
+ cec_logical_addresses sendUpdatesTo;
+
{
- for (uint8_t iPtr = 0; iPtr < 15; iPtr++)
- if (m_logicalAddresses[iPtr])
- {
- m_busDevices[iPtr]->SetInactiveSource();
- m_busDevices[iPtr]->SetPhysicalAddress(iPhysicalAddress);
- m_busDevices[iPtr]->TransmitPhysicalAddress();
- }
- return SetActiveView();
+ CLockObject lock(m_mutex);
+ if (!m_logicalAddresses.IsEmpty())
+ {
+ bool bWasActiveSource(false);
+ for (uint8_t iPtr = 0; iPtr < 15; iPtr++)
+ if (m_logicalAddresses[iPtr])
+ {
+ bWasActiveSource |= m_busDevices[iPtr]->IsActiveSource();
+ m_busDevices[iPtr]->SetInactiveSource();
+ m_busDevices[iPtr]->SetPhysicalAddress(iPhysicalAddress);
+ if (bSendUpdate)
+ sendUpdatesTo.Set((cec_logical_address)iPtr);
+ }
+
+ bSendActiveView = bWasActiveSource && bSendUpdate;
+ bReturn = true;
+ }
}
- return false;
+
+ for (uint8_t iPtr = 0; iPtr < 15; iPtr++)
+ if (sendUpdatesTo[iPtr])
+ m_busDevices[iPtr]->TransmitPhysicalAddress();
+
+ if (bSendActiveView)
+ SetActiveView();
+
+ return bReturn;
}
bool CCECProcessor::SwitchMonitoring(bool bEnable)
{
- CStdString strLog;
- strLog.Format("== %s monitoring mode ==", bEnable ? "enabling" : "disabling");
- m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "== %s monitoring mode ==", bEnable ? "enabling" : "disabling");
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
m_bMonitor = bEnable;
-
- if (!bEnable)
- {
- if (!m_busScan)
- {
- m_busScan = new CCECBusScan(this);
- m_busScan->CreateThread(true);
- }
- }
- else
- {
- if (m_busScan)
- {
- m_busScan->StopThread();
- delete m_busScan;
- m_busScan = NULL;
- }
- }
}
if (bEnable)
{
CCECBusDevice *device = NULL;
- for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
+ for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
{
- if (m_busDevices[iPtr]->m_type == type)
+ if (m_busDevices[iPtr]->m_type == type && m_logicalAddresses[iPtr])
{
device = m_busDevices[iPtr];
break;
bReturn = Transmit(output);
/* set to "not present" on failed ack */
- if (output->is_error() && output->reply == MSGCODE_TRANSMIT_FAILED_ACK &&
- output->destination() != CECDEVICE_BROADCAST)
- m_busDevices[output->destination()]->SetDeviceStatus(CEC_DEVICE_STATUS_NOT_PRESENT);
+ if (output->state == ADAPTER_MESSAGE_STATE_SENT_NOT_ACKED &&
+ output->Destination() != CECDEVICE_BROADCAST)
+ m_busDevices[output->Destination()]->SetDeviceStatus(CEC_DEVICE_STATUS_NOT_PRESENT);
delete output;
return bReturn;
bool CCECProcessor::Transmit(CCECAdapterMessage *output)
{
bool bReturn(false);
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
{
+ if (!m_communication)
+ return bReturn;
+
m_iLastTransmission = GetTimeMs();
m_communication->SetLineTimeout(m_iStandardLineTimeout);
- output->tries = 1;
+ output->tries = 0;
do
{
if (output->tries > 0)
m_communication->SetLineTimeout(m_iRetryLineTimeout);
-
- 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;
- }
- }
-
- if (output->transmit_timeout > 0)
- {
- if ((bReturn = WaitForTransmitSucceeded(output)) == false)
- m_controller->AddLog(CEC_LOG_DEBUG, "did not receive ack");
- }
- else
- bReturn = true;
- }while (output->transmit_timeout > 0 && output->needs_retry() && ++output->tries < output->maxTries);
+ bReturn = m_communication->Write(output);
+ }while (!bReturn && output->transmit_timeout > 0 && output->NeedsRetry() && ++output->tries < output->maxTries);
}
m_communication->SetLineTimeout(m_iStandardLineTimeout);
void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason /* = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE */)
{
- m_controller->AddLog(CEC_LOG_DEBUG, "<< transmitting abort message");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "<< transmitting abort message");
cec_command command;
// TODO
Transmit(command);
}
-bool CCECProcessor::WaitForTransmitSucceeded(CCECAdapterMessage *message)
-{
- bool bError(false);
- bool bTransmitSucceeded(false);
- uint8_t iPacketsLeft(message->size() / 4);
-
- int64_t iNow = GetTimeMs();
- int64_t iTargetTime = iNow + message->transmit_timeout;
-
- while (!bTransmitSucceeded && !bError && (message->transmit_timeout == 0 || iNow < iTargetTime))
- {
- CCECAdapterMessage msg;
-
- if (!m_communication->Read(msg, message->transmit_timeout > 0 ? (int32_t)(iTargetTime - iNow) : 1000))
- {
- iNow = GetTimeMs();
- continue;
- }
-
- if (msg.message() == MSGCODE_FRAME_START && msg.ack())
- {
- m_busDevices[msg.initiator()]->GetHandler()->HandlePoll(msg.initiator(), msg.destination());
- m_lastInitiator = msg.initiator();
- iNow = GetTimeMs();
- continue;
- }
-
- bError = msg.is_error();
- if (msg.message() == MSGCODE_RECEIVE_FAILED &&
- m_lastInitiator != CECDEVICE_UNKNOWN &&
- !m_busDevices[m_lastInitiator]->GetHandler()->HandleReceiveFailed())
- {
- iNow = GetTimeMs();
- continue;
- }
-
- if (bError)
- {
- message->reply = msg.message();
- m_controller->AddLog(CEC_LOG_DEBUG, msg.ToString());
- }
- else
- {
- switch(msg.message())
- {
- case MSGCODE_COMMAND_ACCEPTED:
- m_controller->AddLog(CEC_LOG_DEBUG, msg.ToString());
- if (iPacketsLeft > 0)
- iPacketsLeft--;
- break;
- case MSGCODE_TRANSMIT_SUCCEEDED:
- m_controller->AddLog(CEC_LOG_DEBUG, msg.ToString());
- bTransmitSucceeded = (iPacketsLeft == 0);
- bError = !bTransmitSucceeded;
- message->reply = MSGCODE_TRANSMIT_SUCCEEDED;
- break;
- default:
- // ignore other data while waiting
- break;
- }
-
- iNow = GetTimeMs();
- }
- }
-
- return bTransmitSucceeded && !bError;
-}
-
bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg)
{
bool bEom(false);
- bool bIsError(msg.is_error());
+ bool bIsError(msg.IsError());
- if (msg.empty())
+ if (msg.IsEmpty())
return bEom;
- switch(msg.message())
+ switch(msg.Message())
{
case MSGCODE_FRAME_START:
{
m_currentframe.Clear();
- if (msg.size() >= 2)
+ if (msg.Size() >= 2)
{
- m_currentframe.initiator = msg.initiator();
- m_currentframe.destination = msg.destination();
- m_currentframe.ack = msg.ack();
- m_currentframe.eom = msg.eom();
+ m_currentframe.initiator = msg.Initiator();
+ m_currentframe.destination = msg.Destination();
+ m_currentframe.ack = msg.IsACK();
+ m_currentframe.eom = msg.IsEOM();
}
if (m_currentframe.ack == 0x1)
{
break;
case MSGCODE_FRAME_DATA:
{
- if (msg.size() >= 2)
+ if (msg.Size() >= 2)
{
m_currentframe.PushBack(msg[1]);
- m_currentframe.eom = msg.eom();
+ m_currentframe.eom = msg.IsEOM();
}
- bEom = msg.eom();
+ bEom = msg.IsEOM();
}
break;
default:
break;
}
- m_controller->AddLog(bIsError ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
+ CLibCEC::AddLog(bIsError ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
return bEom;
}
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_TRAFFIC, dataStr.c_str());
+ CLibCEC::AddLog(CEC_LOG_TRAFFIC, dataStr.c_str());
if (!m_bMonitor && command.initiator >= CECDEVICE_TV && command.initiator <= CECDEVICE_BROADCAST)
m_busDevices[(uint8_t)command.initiator]->HandleCommand(command);
return false;
}
-void CCECProcessor::SetCurrentButton(cec_user_control_code iButtonCode)
-{
- m_controller->SetCurrentButton(iButtonCode);
-}
-
-void CCECProcessor::AddCommand(const cec_command &command)
-{
- m_controller->AddCommand(command);
-}
-
-void CCECProcessor::AddKey(cec_keypress &key)
-{
- m_controller->AddKey(key);
-}
-
-void CCECProcessor::AddKey(void)
-{
- m_controller->AddKey();
-}
-
-void CCECProcessor::AddLog(cec_log_level level, const CStdString &strMessage)
-{
- 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;
+ return m_communication->SetAckMask(iMask);
}
bool CCECProcessor::TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = true */)
{
- return m_busDevices[iDestination]->TransmitKeypress(key);
+ return m_busDevices[iDestination]->TransmitKeypress(key, bWait);
}
bool CCECProcessor::TransmitKeyRelease(cec_logical_address iDestination, bool bWait /* = true */)
{
- return m_busDevices[iDestination]->TransmitKeyRelease();
+ return m_busDevices[iDestination]->TransmitKeyRelease(bWait);
+}
+
+const char *CCECProcessor::ToString(const cec_device_type type)
+{
+ switch (type)
+ {
+ case CEC_DEVICE_TYPE_AUDIO_SYSTEM:
+ return "audio system";
+ case CEC_DEVICE_TYPE_PLAYBACK_DEVICE:
+ return "playback device";
+ case CEC_DEVICE_TYPE_RECORDING_DEVICE:
+ return "recording device";
+ case CEC_DEVICE_TYPE_RESERVED:
+ return "reserved";
+ case CEC_DEVICE_TYPE_TUNER:
+ return "tuner";
+ case CEC_DEVICE_TYPE_TV:
+ return "TV";
+ default:
+ return "unknown";
+ }
}
const char *CCECProcessor::ToString(const cec_menu_state state)
}
}
-const char *CCECProcessor::ToString(const cec_audio_status status)
+const char *CCECProcessor::ToString(const cec_audio_status UNUSED(status))
{
// TODO this is a mask
return "TODO";
return "Yamaha";
case CEC_VENDOR_PHILIPS:
return "Philips";
+ case CEC_VENDOR_SONY:
+ return "Sony";
default:
return "Unknown";
}
{
return m_communication->PingAdapter();
}
+
+void CCECProcessor::HandlePoll(cec_logical_address initiator, cec_logical_address destination)
+{
+ m_busDevices[initiator]->GetHandler()->HandlePoll(initiator, destination);
+ m_lastInitiator = initiator;
+}
+
+bool CCECProcessor::HandleReceiveFailed(void)
+{
+ return m_lastInitiator != CECDEVICE_UNKNOWN &&
+ !m_busDevices[m_lastInitiator]->GetHandler()->HandleReceiveFailed();
+}
repositories / deb_libcec.git / blobdiff