X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fadapter%2FUSBCECAdapterCommunication.cpp;h=8f3bb7f0bef62dde35165454f35b4c13061ee122;hb=5ee2ae29d79824f71b011059d23d4b6e04012c1d;hp=2944c0cd6361f96ce4b51bd261af4a220b33d6ba;hpb=12a36be9d076db48fc6c13d8edf8cf4ea73fd10d;p=deb_libcec.git diff --git a/src/lib/adapter/USBCECAdapterCommunication.cpp b/src/lib/adapter/USBCECAdapterCommunication.cpp index 2944c0c..8f3bb7f 100644 --- a/src/lib/adapter/USBCECAdapterCommunication.cpp +++ b/src/lib/adapter/USBCECAdapterCommunication.cpp @@ -66,20 +66,17 @@ CUSBCECAdapterCommunication::CUSBCECAdapterCommunication(CCECProcessor *processo m_bHasData(false), m_iLineTimeout(0), m_iFirmwareVersion(CEC_FW_VERSION_UNKNOWN), - m_lastInitiator(CECDEVICE_UNKNOWN), + m_lastDestination(CECDEVICE_UNKNOWN), m_bNextIsEscaped(false), m_bGotStart(false), m_messageProcessor(NULL), m_bInitialised(false) { + for (unsigned int iPtr = 0; iPtr < 15; iPtr++) + m_bWaitingForAck[iPtr] = false; m_port = new CSerialPort(strPort, iBaudRate); } -CUSBCECAdapterCommunication::~CUSBCECAdapterCommunication(void) -{ - Close(); -} - bool CUSBCECAdapterCommunication::CheckAdapter(uint32_t iTimeoutMs /* = 10000 */) { bool bReturn(false); @@ -136,7 +133,7 @@ bool CUSBCECAdapterCommunication::CheckAdapter(uint32_t iTimeoutMs /* = 10000 */ 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; @@ -181,9 +178,20 @@ bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32 { //clear any input bytes uint8_t buff[1024]; - while (m_port->Read(buff, 1024, 100) > 0) + ssize_t iBytesRead(0); + bool bGotMsgStart(false), bGotMsgEnd(false); + while ((iBytesRead = m_port->Read(buff, 1024, 100)) > 0 || (bGotMsgStart && !bGotMsgEnd)) { - CLibCEC::AddLog(CEC_LOG_DEBUG, "data received, clearing it"); + if (!bGotMsgStart) + CLibCEC::AddLog(CEC_LOG_DEBUG, "data received, clearing it"); + // if something was received, wait for MSGEND + for (ssize_t iPtr = 0; iPtr < iBytesRead; iPtr++) + { + if (buff[iPtr] == MSGSTART) + bGotMsgStart = true; + else if (buff[iPtr] == MSGEND) + bGotMsgEnd = true; + } Sleep(250); } } @@ -192,9 +200,11 @@ bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32 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()) { @@ -203,16 +213,24 @@ bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32 } 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) { - StopThread(); + StopThread(0); } void *CUSBCECAdapterCommunication::Process(void) @@ -253,6 +271,7 @@ void *CUSBCECAdapterCommunication::Process(void) /* stop the message processor */ m_messageProcessor->StopThread(); delete m_messageProcessor; + m_messageProcessor = NULL; /* notify all threads that are waiting on messages to be sent */ CCECAdapterMessage *msg(NULL); @@ -271,6 +290,7 @@ void *CUSBCECAdapterCommunication::Process(void) m_port = NULL; } + m_rcvCondition.Broadcast(); return NULL; } @@ -292,6 +312,12 @@ cec_adapter_message_state CUSBCECAdapterCommunication::Write(const cec_command & output->retryTimeout = iRetryLineTimeout; output->tries = 0; + if (data.destination < 15) + { + CLockObject lock(m_mutex); + m_bWaitingForAck[data.destination] = true; + } + bool bRetry(true); while (bRetry && ++output->tries < output->maxTries) { @@ -415,16 +441,22 @@ bool CUSBCECAdapterCommunication::ParseMessage(const CCECAdapterMessage &msg) } if (m_currentframe.ack == 0x1) { - m_lastInitiator = m_currentframe.initiator; - m_processor->HandlePoll(m_currentframe.initiator, m_currentframe.destination); + m_lastDestination = m_currentframe.destination; + 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; case MSGCODE_RECEIVE_FAILED: { m_currentframe.Clear(); - if (m_lastInitiator != CECDEVICE_UNKNOWN) - bIsError = m_processor->HandleReceiveFailed(m_lastInitiator); + if (m_lastDestination != CECDEVICE_UNKNOWN) + bIsError = m_processor->HandleReceiveFailed(m_lastDestination); } break; case MSGCODE_FRAME_DATA: @@ -452,7 +484,7 @@ uint16_t CUSBCECAdapterCommunication::GetFirmwareVersion(void) { CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting the firmware version"); - cec_datapacket response = GetSetting(MSGCODE_FIRMWARE_VERSION); + cec_datapacket response = GetSetting(MSGCODE_FIRMWARE_VERSION, 2); if (response.size == 2) { m_iFirmwareVersion = (response[0] << 8 | response[1]); @@ -466,15 +498,16 @@ uint16_t CUSBCECAdapterCommunication::GetFirmwareVersion(void) bool CUSBCECAdapterCommunication::SetLineTimeout(uint8_t iTimeout) { - m_iLineTimeout = iTimeout; - bool bReturn(m_iLineTimeout != iTimeout); + bool bReturn(true); - if (!bReturn) + if (m_iLineTimeout != iTimeout) { CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the line timeout to %d", iTimeout); CCECAdapterMessage params; params.PushEscaped(iTimeout); bReturn = SendCommand(MSGCODE_TRANSMIT_IDLETIME, params); + if (bReturn) + m_iLineTimeout = iTimeout; } return bReturn; @@ -515,6 +548,7 @@ bool CUSBCECAdapterCommunication::PersistConfiguration(libcec_configuration *con bool CUSBCECAdapterCommunication::GetConfiguration(libcec_configuration *configuration) { + configuration->iFirmwareVersion = m_iFirmwareVersion; if (m_iFirmwareVersion < 2) return false; @@ -561,11 +595,11 @@ bool CUSBCECAdapterCommunication::GetConfiguration(libcec_configuration *configu // - CEC version (1.3a) // TODO to be added to the firmware: - // - base device (1 byte) - // - HDMI port number (1 byte) - // - TV vendor id (3 bytes) - // - wake devices (1 byte) - // - standby devices (1 bytes) + // - base device (4 bits) + // - HDMI port number (4 bits) + // - TV vendor id (12 bits) + // - wake devices (8 bits) + // - standby devices (8 bits) // - use TV menu language (1 bit) // - activate source (1 bit) // - power off screensaver (1 bit) @@ -599,7 +633,7 @@ bool CUSBCECAdapterCommunication::GetSettingAutoEnabled(bool &enabled) CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting autonomous mode setting"); - cec_datapacket response = GetSetting(MSGCODE_GET_AUTO_ENABLED); + cec_datapacket response = GetSetting(MSGCODE_GET_AUTO_ENABLED, 1); if (response.size == 1) { enabled = response[0] == 1; @@ -623,7 +657,7 @@ bool CUSBCECAdapterCommunication::GetSettingDeviceType(cec_device_type &value) CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting device type setting"); - cec_datapacket response = GetSetting(MSGCODE_GET_DEVICE_TYPE); + cec_datapacket response = GetSetting(MSGCODE_GET_DEVICE_TYPE, 1); if (response.size == 1) { value = (cec_device_type)response[0]; @@ -647,7 +681,7 @@ bool CUSBCECAdapterCommunication::GetSettingDefaultLogicalAddress(cec_logical_ad CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting default logical address setting"); - cec_datapacket response = GetSetting(MSGCODE_GET_DEFAULT_LOGICAL_ADDRESS); + cec_datapacket response = GetSetting(MSGCODE_GET_DEFAULT_LOGICAL_ADDRESS, 1); if (response.size == 1) { address = (cec_logical_address)response[0]; @@ -672,7 +706,7 @@ bool CUSBCECAdapterCommunication::GetSettingLogicalAddressMask(uint16_t &iMask) CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting logical address mask setting"); - cec_datapacket response = GetSetting(MSGCODE_GET_LOGICAL_ADDRESS_MASK); + cec_datapacket response = GetSetting(MSGCODE_GET_LOGICAL_ADDRESS_MASK, 2); if (response.size == 2) { iMask = ((uint16_t)response[0] << 8) | ((uint16_t)response[1]); @@ -684,7 +718,7 @@ bool CUSBCECAdapterCommunication::GetSettingLogicalAddressMask(uint16_t &iMask) bool CUSBCECAdapterCommunication::SetSettingPhysicalAddress(uint16_t iPhysicalAddress) { CLockObject lock(m_mutex); - CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the physical address to %2X", iPhysicalAddress); + CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the physical address to %04X", iPhysicalAddress); CCECAdapterMessage params; params.PushEscaped(iPhysicalAddress >> 8); @@ -697,7 +731,7 @@ bool CUSBCECAdapterCommunication::GetSettingPhysicalAddress(uint16_t &iPhysicalA CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting physical address setting"); - cec_datapacket response = GetSetting(MSGCODE_GET_PHYSICAL_ADDRESS); + cec_datapacket response = GetSetting(MSGCODE_GET_PHYSICAL_ADDRESS, 2); if (response.size == 2) { iPhysicalAddress = ((uint16_t)response[0] << 8) | ((uint16_t)response[1]); @@ -721,7 +755,7 @@ bool CUSBCECAdapterCommunication::GetSettingCECVersion(cec_version &version) CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting CEC version setting"); - cec_datapacket response = GetSetting(MSGCODE_GET_HDMI_VERSION); + cec_datapacket response = GetSetting(MSGCODE_GET_HDMI_VERSION, 1); if (response.size == 1) { version = (cec_version)response[0]; @@ -746,12 +780,12 @@ bool CUSBCECAdapterCommunication::GetSettingOSDName(CStdString &strOSDName) CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting OSD name setting"); - cec_datapacket response = GetSetting(MSGCODE_GET_OSD_NAME); + cec_datapacket response = GetSetting(MSGCODE_GET_OSD_NAME, 13); if (response.size == 0) return false; - char buf[15]; - for (uint8_t iPtr = 0; iPtr < response.size && iPtr < 15; iPtr++) + char buf[14]; + for (uint8_t iPtr = 0; iPtr < response.size && iPtr < 13; iPtr++) buf[iPtr] = (char)response[iPtr]; buf[response.size] = 0; @@ -794,15 +828,20 @@ bool CUSBCECAdapterCommunication::WaitForAck(CCECAdapterMessage &message) if (msg.Message() == MSGCODE_FRAME_START && msg.IsACK()) { - m_processor->HandlePoll(msg.Initiator(), msg.Destination()); - m_lastInitiator = msg.Initiator(); + if (msg.Initiator() < 15 && m_bWaitingForAck[msg.Initiator()]) + m_bWaitingForAck[msg.Initiator()] = false; + else if (msg.Initiator() < 15) + { + m_processor->HandlePoll(msg.Initiator(), msg.Destination()); + m_lastDestination = msg.Initiator(); + } iNow = GetTimeMs(); continue; } if (msg.Message() == MSGCODE_RECEIVE_FAILED && - m_lastInitiator != CECDEVICE_UNKNOWN && - m_processor->HandleReceiveFailed(m_lastInitiator)) + m_lastDestination != CECDEVICE_UNKNOWN && + m_processor->HandleReceiveFailed(m_lastDestination)) { iNow = GetTimeMs(); continue; @@ -967,14 +1006,14 @@ CStdString CUSBCECAdapterCommunication::GetPortName(void) return strName; } -bool CUSBCECAdapterCommunication::SendCommand(cec_adapter_messagecode msgCode, CCECAdapterMessage ¶ms, bool bExpectAck /* = true */, bool bIsTransmission /* = false */, bool bSendDirectly /* = true */) +bool CUSBCECAdapterCommunication::SendCommand(cec_adapter_messagecode msgCode, CCECAdapterMessage ¶ms, bool bExpectAck /* = true */, bool bIsTransmission /* = false */, bool bSendDirectly /* = true */, bool bIsRetry /* = false */) { CLockObject lock(m_mutex); CCECAdapterMessage *output = new CCECAdapterMessage; output->PushBack(MSGSTART); - output->PushEscaped(msgCode); + output->PushEscaped((uint8_t)msgCode); output->Append(params); output->PushBack(MSGEND); output->isTransmission = bIsTransmission; @@ -986,18 +1025,26 @@ bool CUSBCECAdapterCommunication::SendCommand(cec_adapter_messagecode msgCode, C 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 && reply == MSGCODE_COMMAND_REJECTED && msgCode != MSGCODE_SET_CONTROLLED) + { + CLibCEC::AddLog(CEC_LOG_DEBUG, "setting controlled mode and retrying"); + if (SetControlledMode(true)) + return SendCommand(msgCode, params, bExpectAck, bIsTransmission, bSendDirectly, true); + } return false; } - delete output; return true; } -cec_datapacket CUSBCECAdapterCommunication::GetSetting(cec_adapter_messagecode msgCode) +cec_datapacket CUSBCECAdapterCommunication::GetSetting(cec_adapter_messagecode msgCode, uint8_t iResponseLength) { cec_datapacket retVal; retVal.Clear(); @@ -1010,7 +1057,7 @@ cec_datapacket CUSBCECAdapterCommunication::GetSetting(cec_adapter_messagecode m } Sleep(250); // TODO ReadFromDevice() isn't waiting for the timeout to pass on win32 - ReadFromDevice(CEC_DEFAULT_TRANSMIT_WAIT, 5 /* start + msgcode + 2 bytes for fw version + end */); + ReadFromDevice(CEC_DEFAULT_TRANSMIT_WAIT, iResponseLength + 3 /* start + msgcode + iResponseLength + end */); CCECAdapterMessage input; if (Read(input, 0)) {