#define CEC_ADAPTER_PING_TIMEOUT 15000
-void *CUSBCECAdapterProcessor::Process(void)
-{
- cec_command command;
- while (!IsStopped())
- {
- if (m_inBuffer.Pop(command))
- m_callback->OnCommandReceived(command);
- Sleep(5);
- }
-
- return NULL;
-}
-
-void CUSBCECAdapterProcessor::AddCommand(cec_command command)
-{
- m_inBuffer.Push(command);
-}
-
CUSBCECAdapterCommunication::CUSBCECAdapterCommunication(CCECProcessor *processor, const char *strPort, uint16_t iBaudRate /* = 38400 */) :
m_port(NULL),
m_processor(processor),
m_lastDestination(CECDEVICE_UNKNOWN),
m_bNextIsEscaped(false),
m_bGotStart(false),
- m_messageProcessor(NULL),
m_bInitialised(false)
{
for (unsigned int iPtr = 0; iPtr < 15; iPtr++)
return bReturn;
}
-bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs /* = 10000 */, bool bSkipChecks /* = false */)
+bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32_t iTimeoutMs /* = 10000 */, bool bSkipChecks /* = false */, bool bStartListening /* = true */)
{
uint64_t iNow = GetTimeMs();
uint64_t iTimeout = iNow + iTimeoutMs;
if (!bSkipChecks && !CheckAdapter())
{
CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter failed to pass basic checks");
+ delete m_port;
+ m_port = NULL;
return false;
}
- else
+ else if (bStartListening)
{
if (CreateThread())
{
}
else
{
+ delete m_port;
+ m_port = NULL;
CLibCEC::AddLog(CEC_LOG_ERROR, "could not create a communication thread");
+ return false;
}
}
+ else
+ {
+ delete m_port;
+ m_port = NULL;
+ }
- return false;
+ return true;
}
void CUSBCECAdapterCommunication::Close(void)
void *CUSBCECAdapterCommunication::Process(void)
{
- m_messageProcessor = new CUSBCECAdapterProcessor(m_callback);
- m_messageProcessor->CreateThread();
-
cec_command command;
command.Clear();
bool bCommandReceived(false);
{
{
CLockObject lock(m_mutex);
- ReadFromDevice(50);
+ ReadFromDevice(5);
bCommandReceived = m_callback && Read(command, 0) && m_bInitialised;
}
/* push the next command to the callback method if there is one */
if (!IsStopped() && bCommandReceived)
- m_messageProcessor->AddCommand(command);
+ m_callback->OnCommandReceived(command);
/* ping the adapter every 15 seconds */
if (pingTimeout.TimeLeft() == 0)
}
if (!IsStopped())
- {
- Sleep(5);
WriteNextCommand();
- }
}
- /* stop the message processor */
- m_messageProcessor->StopThread();
- delete m_messageProcessor;
-
/* notify all threads that are waiting on messages to be sent */
CCECAdapterMessage *msg(NULL);
while (m_outBuffer.Pop(msg))
m_port = NULL;
}
+ m_rcvCondition.Broadcast();
return NULL;
}
output->retryTimeout = iRetryLineTimeout;
output->tries = 0;
+ if (data.destination < 15)
{
CLockObject lock(m_mutex);
m_bWaitingForAck[data.destination] = true;
if (m_currentframe.ack == 0x1)
{
m_lastDestination = m_currentframe.destination;
- if (!m_bWaitingForAck[m_currentframe.destination])
- m_processor->HandlePoll(m_currentframe.initiator, m_currentframe.destination);
- else
- m_bWaitingForAck[m_currentframe.destination] = false;
+ if (m_currentframe.destination < 15)
+ {
+ if (!m_bWaitingForAck[m_currentframe.destination])
+ m_processor->HandlePoll(m_currentframe.initiator, m_currentframe.destination);
+ else
+ m_bWaitingForAck[m_currentframe.destination] = false;
+ }
}
}
break;
bool CUSBCECAdapterCommunication::GetConfiguration(libcec_configuration *configuration)
{
+ configuration->iFirmwareVersion = m_iFirmwareVersion;
if (m_iFirmwareVersion < 2)
return false;
if (msg.Message() == MSGCODE_FRAME_START && msg.IsACK())
{
- if (m_bWaitingForAck[msg.Initiator()])
+ if (msg.Initiator() < 15 && m_bWaitingForAck[msg.Initiator()])
m_bWaitingForAck[msg.Initiator()] = false;
- else
+ else if (msg.Initiator() < 15)
{
m_processor->HandlePoll(msg.Initiator(), msg.Destination());
m_lastDestination = msg.Initiator();
Write(output);
bool bWriteOk = output->state == (output->expectControllerAck ? ADAPTER_MESSAGE_STATE_SENT_ACKED : ADAPTER_MESSAGE_STATE_SENT);
+ cec_adapter_messagecode reply = output->reply;
+ delete output;
+
if (!bWriteOk)
{
CLibCEC::AddLog(CEC_LOG_ERROR, "'%s' failed", CCECAdapterMessage::ToString(msgCode));
- delete output;
- if (!bIsRetry && output->reply == MSGCODE_COMMAND_REJECTED && msgCode != MSGCODE_SET_CONTROLLED)
+ if (!bIsRetry && reply == MSGCODE_COMMAND_REJECTED && msgCode != MSGCODE_SET_CONTROLLED)
{
CLibCEC::AddLog(CEC_LOG_DEBUG, "setting controlled mode and retrying");
if (SetControlledMode(true))
return false;
}
- delete output;
return true;
}
return retVal;
}
- Sleep(250); // TODO ReadFromDevice() isn't waiting for the timeout to pass on win32
ReadFromDevice(CEC_DEFAULT_TRANSMIT_WAIT, iResponseLength + 3 /* start + msgcode + iResponseLength + end */);
CCECAdapterMessage input;
if (Read(input, 0))