#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),
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)
{
bool bReturn(false);
+ CLockObject lock(m_mutex);
+ if (!m_communication)
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "no connection handler found");
+ return bReturn;
+ }
+ /* check for an already opened connection */
+ if (m_communication->IsOpen())
{
- CLockObject lock(&m_mutex);
+ m_controller->AddLog(CEC_LOG_ERROR, "connection already opened");
+ return bReturn;
+ }
- /* check for an already opened connection */
- if (!m_communication || m_communication->IsOpen())
- {
- m_controller->AddLog(CEC_LOG_ERROR, "connection already opened");
- return bReturn;
- }
+ /* open a new connection */
+ if ((bReturn = m_communication->Open(strPort, iBaudRate, iTimeoutMs)) == false)
+ m_controller->AddLog(CEC_LOG_ERROR, "could not open a connection");
- /* open a new connection */
- if (!m_communication->Open(strPort, iBaudRate, iTimeoutMs))
- {
- m_controller->AddLog(CEC_LOG_ERROR, "could not open a connection");
- return bReturn;
- }
+ return bReturn;
+}
- /* create the processor thread */
- if (!CreateThread() || !m_startCondition.Wait(&m_mutex) || !m_bStarted)
+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())
{
- m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+ m_controller->AddLog(CEC_LOG_ERROR, "could not detect our logical addresses");
return bReturn;
}
- }
- /* find the logical address for the adapter */
- bReturn = m_logicalAddresses.IsEmpty() ? FindLogicalAddresses() : true;
- if (!bReturn)
- m_controller->AddLog(CEC_LOG_ERROR, "could not detect our logical addresses");
-
- /* set the physical address for the adapter */
- if (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();
+ /* get the vendor id from the TV, so we are using the correct handler */
+ m_busDevices[CECDEVICE_TV]->RequestVendorId();
+ ReplaceHandlers();
- bReturn = SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true);
+ if ((bReturn = SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) == false)
+ {
+ CStdString strLog;
+ strLog.Format("unable to set HDMI port %d on %s (%x)", m_iHDMIPort, ToString(m_iBaseDevice), (uint8_t)m_iBaseDevice);
+ m_controller->AddLog(CEC_LOG_ERROR, strLog);
}
- if (bReturn)
+ SetInitialised(bReturn);
+
+ return bReturn;
+}
+
+bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
+{
+ bool bReturn(false);
+
{
- m_bInitialised = true;
- m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ CLockObject lock(m_mutex);
+ if (!OpenConnection(strPort, iBaudRate, iTimeoutMs))
+ return bReturn;
+
+ /* create the processor thread */
+ if (!CreateThread() || !m_startCondition.Wait(m_mutex) || !m_bStarted)
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+ return bReturn;
+ }
}
- else
+
+ if ((bReturn = Initialise()) == false)
{
m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
StopThread(true);
}
+ else
+ {
+ m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ }
return bReturn;
}
strLog.Format("changing device type '%s' into '%s'", ToString(from), ToString(to));
AddLog(CEC_LOG_NOTICE, strLog);
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
CCECBusDevice *previousDevice = GetDeviceByType(from);
m_logicalAddresses.primary = CECDEVICE_UNKNOWN;
CCECAdapterMessage msg;
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
m_bStarted = true;
m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
m_startCondition.Signal();
msg.clear();
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
if (m_commandBuffer.Pop(command))
{
bParseFrame = true;
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);
+ CLockObject lock(m_mutex);
m_iBaseDevice = iBaseDevice;
m_iHDMIPort = iPort;
uint16_t iPhysicalAddress(0);
if (iBaseDevice > CECDEVICE_TV)
+ {
+ lock.Unlock();
iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress();
+ lock.Lock();
+ }
if (iPhysicalAddress < 0xffff)
{
else if (iPhysicalAddress % 0x10 == 0)
iPhysicalAddress += iPort;
- SetPhysicalAddress(iPhysicalAddress);
bReturn = true;
}
if (!bReturn)
m_controller->AddLog(CEC_LOG_ERROR, "failed to set the physical address");
+ else
+ {
+ lock.Unlock();
+ SetPhysicalAddress(iPhysicalAddress);
+ }
return bReturn;
}
bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
if (m_logicalAddresses.primary != iLogicalAddress)
{
CStdString strLog;
bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress, bool bSendUpdate /* = true */)
{
- bool bWasActiveSource(false);
- CLockObject lock(&m_mutex);
- 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])
- {
- bWasActiveSource |= m_busDevices[iPtr]->IsActiveSource();
- m_busDevices[iPtr]->SetInactiveSource();
- m_busDevices[iPtr]->SetPhysicalAddress(iPhysicalAddress);
- if (bSendUpdate)
- m_busDevices[iPtr]->TransmitPhysicalAddress();
- }
+ 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);
+ }
- return bWasActiveSource && bSendUpdate ? SetActiveView() : true;
+ 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)
m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
m_bMonitor = bEnable;
}
bool CCECProcessor::Transmit(CCECAdapterMessage *output)
{
bool bReturn(false);
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
{
m_iLastTransmission = GetTimeMs();
m_communication->SetLineTimeout(m_iStandardLineTimeout);
if (output->tries > 0)
m_communication->SetLineTimeout(m_iRetryLineTimeout);
- CLockObject msgLock(&output->mutex);
+ CLockObject msgLock(output->mutex);
if (!m_communication || !m_communication->Write(output))
return bReturn;
else
{
- output->condition.Wait(&output->mutex);
+ output->condition.Wait(output->mutex);
if (output->state != ADAPTER_MESSAGE_STATE_SENT)
{
m_controller->AddLog(CEC_LOG_ERROR, "command was not sent");
}
}
-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";
}
repositories / deb_libcec.git / blobdiff