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_iRetryLineTimeout(3),
+ m_iLastTransmission(0)
{
m_communication = new CAdapterCommunication(this);
m_logicalAddresses.Clear();
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),
m_controller(controller),
m_bMonitor(false),
m_iStandardLineTimeout(3),
- m_iRetryLineTimeout(3)
+ m_iRetryLineTimeout(3),
+ m_iLastTransmission(0)
{
m_communication = new CAdapterCommunication(this);
m_logicalAddresses.Clear();
CCECProcessor::~CCECProcessor(void)
{
- if (m_busScan)
- {
- m_busScan->StopThread();
- delete m_busScan;
- }
-
+ m_bStarted = false;
m_startCondition.Broadcast();
StopThread();
bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
{
- CLockObject lock(&m_mutex);
- if (!m_communication || m_communication->IsOpen())
- {
- m_controller->AddLog(CEC_LOG_ERROR, "connection already opened");
- return false;
- }
+ bool bReturn(false);
- if (!m_communication->Open(strPort, iBaudRate, iTimeoutMs))
{
- m_controller->AddLog(CEC_LOG_ERROR, "could not open a connection");
- return false;
- }
+ CLockObject lock(&m_mutex);
- if (CreateThread())
- {
- if (!m_startCondition.Wait(&m_mutex) || !m_bStarted)
+ /* check for an already opened connection */
+ if (!m_communication || m_communication->IsOpen())
{
- m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
- return false;
+ m_controller->AddLog(CEC_LOG_ERROR, "connection already opened");
+ return bReturn;
}
- lock.Leave();
- if (SetAckMask(m_logicalAddresses.AckMask()) &&
- SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true))
+ /* open a new connection */
+ if (!m_communication->Open(strPort, iBaudRate, iTimeoutMs))
{
- m_controller->AddLog(CEC_LOG_ERROR, "processor thread started");
- m_busScan = new CCECBusScan(this);
- m_busScan->CreateThread(true);
- return true;
+ m_controller->AddLog(CEC_LOG_ERROR, "could not open a connection");
+ return bReturn;
}
- else
+
+ /* create the processor thread */
+ if (!CreateThread() || !m_startCondition.Wait(&m_mutex) || !m_bStarted)
{
- m_controller->AddLog(CEC_LOG_ERROR, "failed to initialise the processor");
+ m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+ return bReturn;
}
}
- m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
- return false;
+ /* 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]->GetVendorId();
+
+ bReturn = SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true);
+ }
+
+ /* make the primary device the active source */
+ if (bReturn)
+ {
+ m_bInitialised = true;
+ m_busDevices[m_logicalAddresses.primary]->m_bActiveSource = true;
+ bReturn = m_busDevices[CECDEVICE_TV]->InitHandler();
+ }
+
+ if (bReturn)
+ {
+ m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ }
+ else
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+ StopThread(true);
+ }
+
+ return bReturn;
}
bool CCECProcessor::TryLogicalAddress(cec_logical_address address)
{
if (m_busDevices[address]->TryLogicalAddress())
{
- /* only set our OSD name and active source for the primary device */
- if (m_logicalAddresses.IsEmpty())
- {
- m_busDevices[address]->m_strDeviceName = m_strDeviceName;
- m_busDevices[address]->m_bActiveSource = true;
- }
m_logicalAddresses.Set(address);
return true;
}
bReturn &= FindLogicalAddressAudioSystem();
}
+ if (bReturn)
+ SetAckMask(m_logicalAddresses.AckMask());
+
return bReturn;
}
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
- {
- m_busDevices[m_logicalAddresses.primary]->TransmitPhysicalAddress();
CLockObject lock(&m_mutex);
m_bStarted = true;
m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
if (type != CEC_DEVICE_TYPE_RESERVED)
{
- for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
+ for (uint8_t iPtr = 0; iPtr <= 11; iPtr++)
{
if (m_logicalAddresses[iPtr] && m_busDevices[iPtr]->m_type == type)
{
}
}
- bReturn = m_busDevices[CECDEVICE_TV]->PowerOn() &&
- m_busDevices[addr]->TransmitActiveSource() &&
- SetStreamPath(m_busDevices[addr]->GetPhysicalAddress(false));
+ m_busDevices[addr]->SetActiveSource();
+ if (m_busDevices[addr]->GetPhysicalAddress(false) != 0xFFFF)
+ {
+ 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))
+ {
+ bReturn = ((CCECPlaybackDevice *)m_busDevices[addr])->TransmitDeckStatus(CECDEVICE_TV);
+ }
+ }
+
+ return bReturn;
+}
+
+bool CCECProcessor::SetActiveSource(uint16_t iStreamPath)
+{
+ bool bReturn(false);
- if (bReturn && (m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE ||
- m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE))
+ CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamPath);
+ if (device)
{
- bReturn = ((CCECPlaybackDevice *)m_busDevices[addr])->TransmitDeckStatus(CECDEVICE_TV);
+ device->SetActiveSource();
+ bReturn = true;
}
return bReturn;
m_iRetryLineTimeout = iTimeout;
}
-bool CCECProcessor::SetActiveSource(cec_logical_address iAddress)
-{
- return SetStreamPath(m_busDevices[iAddress]->GetPhysicalAddress(false));
-}
-
bool CCECProcessor::SetActiveView(void)
{
return SetActiveSource(m_types.IsEmpty() ? CEC_DEVICE_TYPE_RESERVED : m_types[0]);
bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce /* = false */)
{
bool bReturn(false);
-
- CStdString strLog;
- strLog.Format("setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice);
- AddLog(CEC_LOG_DEBUG, strLog);
+ 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);
+
uint16_t iPhysicalAddress(0);
- iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress();
- uint16_t iPos = 0;
- if (iPhysicalAddress == 0)
- iPos = 0x1000;
- else if (iPhysicalAddress % 0x1000 == 0)
- iPos = 0x100;
- else if (iPhysicalAddress % 0x100 == 0)
- iPos = 0x10;
- else if (iPhysicalAddress % 0x10 == 0)
- iPos = 0x1;
-
- while(!bReturn && iPos > 0)
+ if (iBaseDevice > CECDEVICE_TV)
+ iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress();
+
+ if (iPhysicalAddress < 0xffff)
{
- 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;
- }
+ if (iPhysicalAddress == 0)
+ iPhysicalAddress += 0x1000 * iPort;
+ else if (iPhysicalAddress % 0x1000 == 0)
+ iPhysicalAddress += 0x100 * iPort;
+ else if (iPhysicalAddress % 0x100 == 0)
+ iPhysicalAddress += 0x10 * iPort;
+ 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");
+
return bReturn;
}
return false;
}
-bool CCECProcessor::SetStreamPath(uint16_t iStreamPath)
-{
- bool bReturn(false);
-
- CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamPath);
- if (device)
- {
- device->SetActiveDevice();
- bReturn = true;
- }
-
- return bReturn;
-}
-
bool CCECProcessor::TransmitInactiveSource(void)
{
if (!IsRunning())
bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
{
+ CLockObject lock(&m_mutex);
if (m_logicalAddresses.primary != iLogicalAddress)
{
CStdString strLog;
bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress)
{
+ CLockObject lock(&m_mutex);
if (!m_logicalAddresses.IsEmpty())
{
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();
}
return false;
{
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)
return false;
}
-uint8_t CCECProcessor::VolumeUp(void)
+uint8_t CCECProcessor::VolumeUp(bool bSendRelease /* = true */)
{
uint8_t status = 0;
- if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
- status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp();
+ if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM))
+ status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp(bSendRelease);
return status;
}
-uint8_t CCECProcessor::VolumeDown(void)
+uint8_t CCECProcessor::VolumeDown(bool bSendRelease /* = true */)
{
uint8_t status = 0;
- if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
- status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown();
+ if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM))
+ status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown(bSendRelease);
return status;
}
-uint8_t CCECProcessor::MuteAudio(void)
+uint8_t CCECProcessor::MuteAudio(bool bSendRelease /* = true */)
{
uint8_t status = 0;
- if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
- status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio();
+ if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM))
+ status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio(bSendRelease);
return status;
}
for (unsigned int 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;
return device;
}
+CCECBusDevice *CCECProcessor::GetPrimaryDevice(void) const
+{
+ CCECBusDevice *device(NULL);
+ cec_logical_address primary = m_logicalAddresses.primary;
+ if (primary != CECDEVICE_UNKNOWN)
+ device = m_busDevices[primary];
+ return device;
+}
+
cec_version CCECProcessor::GetDeviceCecVersion(cec_logical_address iAddress)
{
return m_busDevices[iAddress]->GetCecVersion();
return false;
}
+uint16_t CCECProcessor::GetDevicePhysicalAddress(cec_logical_address iAddress)
+{
+ if (m_busDevices[iAddress])
+ return m_busDevices[iAddress]->GetPhysicalAddress(false);
+ return false;
+}
+
cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddress)
{
if (m_busDevices[iAddress])
return CEC_POWER_STATUS_UNKNOWN;
}
+cec_logical_address CCECProcessor::GetActiveSource(void)
+{
+ for (uint8_t iPtr = 0; iPtr <= 11; iPtr++)
+ {
+ if (m_busDevices[iPtr]->IsActiveSource())
+ return (cec_logical_address)iPtr;
+ }
+
+ return CECDEVICE_UNKNOWN;
+}
+
+bool CCECProcessor::IsActiveSource(cec_logical_address iAddress)
+{
+ return m_busDevices[iAddress]->IsActiveSource();
+}
+
bool CCECProcessor::Transmit(const cec_command &data)
{
bool bReturn(false);
LogOutput(data);
CCECAdapterMessage *output = new CCECAdapterMessage(data);
+
+ /* set the number of retries */
+ if (data.opcode == CEC_OPCODE_NONE)
+ output->maxTries = 1;
+ else if (data.initiator != CECDEVICE_BROADCAST)
+ output->maxTries = m_busDevices[data.initiator]->GetHandler()->GetTransmitRetries() + 1;
+
bReturn = Transmit(output);
- delete 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);
+
+ delete output;
return bReturn;
}
bool bReturn(false);
CLockObject lock(&m_mutex);
{
+ m_iLastTransmission = GetTimeMs();
m_communication->SetLineTimeout(m_iStandardLineTimeout);
output->tries = 1;
m_currentframe.ack = msg.ack();
m_currentframe.eom = msg.eom();
}
- if (m_currentframe.ack == true)
+ if (m_currentframe.ack == 0x1)
{
m_lastInitiator = m_currentframe.initiator;
m_busDevices[m_lastInitiator]->GetHandler()->HandlePoll(m_currentframe.initiator, m_currentframe.destination);
return addresses;
}
-bool CCECProcessor::IsActiveDevice(cec_logical_address address)
+bool CCECProcessor::IsPresentDevice(cec_logical_address address)
{
return m_busDevices[address]->GetStatus() == CEC_DEVICE_STATUS_PRESENT;
}
-bool CCECProcessor::IsActiveDeviceType(cec_device_type type)
+bool CCECProcessor::IsPresentDeviceType(cec_device_type type)
{
for (unsigned int iPtr = 0; iPtr < 15; iPtr++)
{
return bReturn;
}
-bool CCECProcessor::TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key)
+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 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_menu_state state)
void *CCECBusScan::Process(void)
{
CCECBusDevice *device(NULL);
- int iCount(0);
+ uint8_t iCounter(0);
+
while (!IsStopped())
{
- if (iCount == 0)
+ if (++iCounter < 10)
{
- for (unsigned int iPtr = 0; iPtr < 15 && !IsStopped(); iPtr++)
+ Sleep(1000);
+ continue;
+ }
+ for (unsigned int iPtr = 0; iPtr <= 11 && !IsStopped(); iPtr++)
+ {
+ device = m_processor->m_busDevices[iPtr];
+ WaitUntilIdle();
+ if (device && device->GetStatus(true) == CEC_DEVICE_STATUS_PRESENT)
{
- device = m_processor->m_busDevices[iPtr];
- if (device && device->GetStatus(true) == CEC_DEVICE_STATUS_PRESENT)
- {
- if (!IsStopped())
- {
- device->GetVendorId();
- Sleep(5);
- }
- if (!IsStopped())
- {
- device->GetPowerStatus(true);
- Sleep(5);
- }
- }
+ WaitUntilIdle();
+ if (!IsStopped())
+ device->GetVendorId();
+
+ WaitUntilIdle();
+ if (!IsStopped())
+ device->GetPowerStatus(true);
}
}
-
- if (++iCount > 60)
- iCount = 0;
- Sleep(1000);
}
+
return NULL;
}
+void CCECBusScan::WaitUntilIdle(void)
+{
+ if (IsStopped())
+ return;
+
+ int32_t iWaitTime = 3000 - (int32_t)(GetTimeMs() - m_processor->GetLastTransmission());
+ while (iWaitTime > 0)
+ {
+ Sleep(iWaitTime);
+ iWaitTime = 3000 - (int32_t)(GetTimeMs() - m_processor->GetLastTransmission());
+ }
+}
+
bool CCECProcessor::StartBootloader(void)
{
return m_communication->StartBootloader();
repositories / deb_libcec.git / blobdiff