using namespace CEC;
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*/) :
+CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS*/) :
m_bStarted(false),
m_iHDMIPort(CEC_DEFAULT_HDMI_PORT),
+ m_iBaseDevice((cec_logical_address)CEC_DEFAULT_BASE_DEVICE),
+ m_lastInitiator(CECDEVICE_UNKNOWN),
m_strDeviceName(strDeviceName),
- m_communication(serComm),
m_controller(controller),
m_bMonitor(false),
m_busScan(NULL)
{
+ m_communication = new CAdapterCommunication(this);
m_logicalAddresses.Clear();
m_logicalAddresses.Set(iLogicalAddress);
m_types.clear();
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) :
+CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types) :
m_bStarted(false),
m_iHDMIPort(CEC_DEFAULT_HDMI_PORT),
+ m_iBaseDevice((cec_logical_address)CEC_DEFAULT_BASE_DEVICE),
m_strDeviceName(strDeviceName),
m_types(types),
- m_communication(serComm),
m_controller(controller),
m_bMonitor(false)
{
+ m_communication = new CAdapterCommunication(this);
m_logicalAddresses.Clear();
for (int iPtr = 0; iPtr < 16; iPtr++)
{
m_startCondition.Broadcast();
StopThread();
+ delete m_communication;
m_communication = NULL;
m_controller = NULL;
for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
delete m_busDevices[iPtr];
}
-bool CCECProcessor::Start(void)
+bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
{
CLockObject lock(&m_mutex);
- if (!m_communication || !m_communication->IsOpen())
+ if (!m_communication || m_communication->IsOpen())
{
- m_controller->AddLog(CEC_LOG_ERROR, "connection is closed");
+ m_controller->AddLog(CEC_LOG_ERROR, "connection already opened");
+ return false;
+ }
+
+ if (!m_communication->Open(strPort, iBaudRate, iTimeoutMs))
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "could not open a connection");
return false;
}
lock.Leave();
if (SetAckMask(m_logicalAddresses.AckMask()) &&
- SetHDMIPort(m_iHDMIPort, true))
+ SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true))
{
m_busScan = new CCECBusScan(this);
m_busScan->CreateThread(true);
return bReturn;
}
+bool CCECProcessor::SetLineTimeout(uint8_t iTimeout)
+{
+ bool bReturn(false);
+ CCECAdapterMessage *output = new CCECAdapterMessage;
+
+ output->push_back(MSGSTART);
+ output->push_escaped(MSGCODE_TRANSMIT_IDLETIME);
+ output->push_escaped(iTimeout);
+ output->push_back(MSGEND);
+
+ if ((bReturn = Transmit(output)) == false)
+ m_controller->AddLog(CEC_LOG_ERROR, "could not set the idletime");
+ delete output;
+ return bReturn;
+}
+
void *CCECProcessor::Process(void)
{
bool bParseFrame(false);
}
else if (m_communication->IsOpen() && m_communication->Read(msg, 50))
{
- m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
if ((bParseFrame = (ParseMessage(msg) && !IsStopped())) == true)
command = m_currentframe;
}
m_controller->CheckKeypressTimeout();
}
+ if (m_communication)
+ m_communication->Close();
+
return NULL;
}
return bReturn;
}
-bool CCECProcessor::SetHDMIPort(uint8_t iPort, bool bForce /* = false */)
+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", iPort);
+ strLog.Format("setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice);
AddLog(CEC_LOG_DEBUG, strLog);
+ m_iBaseDevice = iBaseDevice;
m_iHDMIPort = iPort;
if (!m_bStarted && !bForce)
return true;
uint16_t iPhysicalAddress(0);
- int iPos = 3;
- while(!bReturn && iPos >= 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)
{
- iPhysicalAddress += ((uint16_t)iPort * (0x1 << iPos*4));
+ iPhysicalAddress += (uint16_t)(iPort * iPos);
strLog.Format("checking physical address %4x", iPhysicalAddress);
AddLog(CEC_LOG_DEBUG, strLog);
if (CheckPhysicalAddress(iPhysicalAddress))
{
strLog.Format("physical address %4x is in use", iPhysicalAddress);
AddLog(CEC_LOG_DEBUG, strLog);
- iPos--;
+ iPos = (iPos == 1) ? 0 : iPos / 0x10;
}
else
{
strLog.Format("== %s monitoring mode ==", bEnable ? "enabling" : "disabling");
m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
- m_bMonitor = bEnable;
+ {
+ 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 SetAckMask(0);
else
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 = msg.is_error()) == false)
{
m_controller->AddLog(bError ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg)
{
- bool bEom = false;
+ bool bEom(false);
+ bool bIsError(msg.is_error());
if (msg.empty())
return bEom;
m_currentframe.ack = msg.ack();
m_currentframe.eom = msg.eom();
}
+ if (m_currentframe.ack == true)
+ {
+ m_lastInitiator = m_currentframe.initiator;
+ m_busDevices[m_lastInitiator]->GetHandler()->HandlePoll(m_currentframe.initiator, m_currentframe.destination);
+ }
+ }
+ break;
+ case MSGCODE_RECEIVE_FAILED:
+ {
+ if (m_lastInitiator != CECDEVICE_UNKNOWN)
+ bIsError = m_busDevices[m_lastInitiator]->GetHandler()->HandleReceiveFailed();
}
break;
case MSGCODE_FRAME_DATA:
break;
}
+ m_controller->AddLog(bIsError ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
return bEom;
}
Sleep(5);
}
}
- Sleep(1000);
+ Sleep(5000);
}
return NULL;
}
+
+bool CCECProcessor::StartBootloader(void)
+{
+ return m_communication->StartBootloader();
+}
+
+bool CCECProcessor::PingAdapter(void)
+{
+ return m_communication->PingAdapter();
+}