X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fadapter%2FUSBCECAdapterCommunication.cpp;h=527292acc9d12c8ade59cf3caad4d1e85ea8d7d9;hb=17dd542c8184a64fbf48151b55ba307598f8116e;hp=360eff5d1fde41257d339f9b58a9b046c4f18884;hpb=d4db0c6f1121a5e43c98255af5202ebd33f2b800;p=deb_libcec.git diff --git a/src/lib/adapter/USBCECAdapterCommunication.cpp b/src/lib/adapter/USBCECAdapterCommunication.cpp index 360eff5..527292a 100644 --- a/src/lib/adapter/USBCECAdapterCommunication.cpp +++ b/src/lib/adapter/USBCECAdapterCommunication.cpp @@ -42,44 +42,22 @@ using namespace PLATFORM; #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_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 +114,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 +159,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 +181,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,23 +194,28 @@ 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) { - m_messageProcessor = new CUSBCECAdapterProcessor(m_callback); - m_messageProcessor->CreateThread(); - cec_command command; command.Clear(); bool bCommandReceived(false); @@ -228,13 +224,13 @@ void *CUSBCECAdapterCommunication::Process(void) { { 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) @@ -250,10 +246,6 @@ void *CUSBCECAdapterCommunication::Process(void) } } - /* 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)) @@ -271,6 +263,7 @@ void *CUSBCECAdapterCommunication::Process(void) m_port = NULL; } + m_rcvCondition.Broadcast(); return NULL; } @@ -292,6 +285,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 +414,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 +457,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 +471,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; @@ -501,18 +507,80 @@ bool CUSBCECAdapterCommunication::PersistConfiguration(libcec_configuration *con return false; bool bReturn(true); - bReturn &= SetAutoEnabled(true); - bReturn &= SetDeviceType(CLibCEC::GetType(configuration->logicalAddresses.primary)); - bReturn &= SetDefaultLogicalAddress(configuration->logicalAddresses.primary); - bReturn &= SetLogicalAddressMask(CLibCEC::GetMaskForType(configuration->logicalAddresses.primary)); - bReturn &= SetPhysicalAddress(configuration->iPhysicalAddress); - bReturn &= SetCECVersion(CEC_VERSION_1_3A); - bReturn &= SetOSDName(configuration->strDeviceName); + bReturn &= SetSettingAutoEnabled(true); + bReturn &= SetSettingDeviceType(CLibCEC::GetType(configuration->logicalAddresses.primary)); + bReturn &= SetSettingDefaultLogicalAddress(configuration->logicalAddresses.primary); + bReturn &= SetSettingLogicalAddressMask(CLibCEC::GetMaskForType(configuration->logicalAddresses.primary)); + bReturn &= SetSettingPhysicalAddress(configuration->iPhysicalAddress); + bReturn &= SetSettingCECVersion(CEC_VERSION_1_3A); + bReturn &= SetSettingOSDName(configuration->strDeviceName); if (bReturn) bReturn = WriteEEPROM(); return bReturn; } +bool CUSBCECAdapterCommunication::GetConfiguration(libcec_configuration *configuration) +{ + configuration->iFirmwareVersion = m_iFirmwareVersion; + if (m_iFirmwareVersion < 2) + return false; + + bool bReturn(true); + cec_device_type type; + if (GetSettingDeviceType(type)) + { + CLibCEC::AddLog(CEC_LOG_DEBUG, "using persisted device type setting %s", m_processor->ToString(type)); + configuration->deviceTypes.Clear(); + configuration->deviceTypes.Add(type); + } + else + { + CLibCEC::AddLog(CEC_LOG_DEBUG, "no persisted device type setting"); + bReturn = false; + } + + if (GetSettingPhysicalAddress(configuration->iPhysicalAddress)) + { + CLibCEC::AddLog(CEC_LOG_DEBUG, "using persisted physical address setting %4x", configuration->iPhysicalAddress); + } + else + { + CLibCEC::AddLog(CEC_LOG_DEBUG, "no persisted physical address setting"); + bReturn = false; + } + + CStdString strDeviceName; + if (GetSettingOSDName(strDeviceName)) + { + snprintf(configuration->strDeviceName, 13, "%s", strDeviceName.c_str()); + CLibCEC::AddLog(CEC_LOG_DEBUG, "using persisted device name setting %s", configuration->strDeviceName); + } + else + { + CLibCEC::AddLog(CEC_LOG_DEBUG, "no persisted device name setting"); + bReturn = false; + } + + // don't read the following settings: + // - auto enabled (always enabled) + // - default logical address (autodetected) + // - logical address mask (autodetected) + // - CEC version (1.3a) + + // TODO to be added to the firmware: + // - 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) + // - power off on standby (1 bit) + // - send inactive source (1 bit) + return bReturn; +} + bool CUSBCECAdapterCommunication::SetControlledMode(bool controlled) { CLockObject lock(m_mutex); @@ -523,7 +591,7 @@ bool CUSBCECAdapterCommunication::SetControlledMode(bool controlled) return SendCommand(MSGCODE_SET_CONTROLLED, params); } -bool CUSBCECAdapterCommunication::SetAutoEnabled(bool enabled) +bool CUSBCECAdapterCommunication::SetSettingAutoEnabled(bool enabled) { CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "turning autonomous mode %s", enabled ? "on" : "off"); @@ -533,7 +601,21 @@ bool CUSBCECAdapterCommunication::SetAutoEnabled(bool enabled) return SendCommand(MSGCODE_SET_AUTO_ENABLED, params); } -bool CUSBCECAdapterCommunication::SetDeviceType(cec_device_type type) +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, 1); + if (response.size == 1) + { + enabled = response[0] == 1; + return true; + } + return false; +} + +bool CUSBCECAdapterCommunication::SetSettingDeviceType(cec_device_type type) { CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the device type to %1X", (uint8_t)type); @@ -543,7 +625,21 @@ bool CUSBCECAdapterCommunication::SetDeviceType(cec_device_type type) return SendCommand(MSGCODE_SET_DEVICE_TYPE, params); } -bool CUSBCECAdapterCommunication::SetDefaultLogicalAddress(cec_logical_address address) +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, 1); + if (response.size == 1) + { + value = (cec_device_type)response[0]; + return true; + } + return false; +} + +bool CUSBCECAdapterCommunication::SetSettingDefaultLogicalAddress(cec_logical_address address) { CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the default logical address to %1X", address); @@ -553,7 +649,21 @@ bool CUSBCECAdapterCommunication::SetDefaultLogicalAddress(cec_logical_address a return SendCommand(MSGCODE_SET_DEFAULT_LOGICAL_ADDRESS, params); } -bool CUSBCECAdapterCommunication::SetLogicalAddressMask(uint16_t iMask) +bool CUSBCECAdapterCommunication::GetSettingDefaultLogicalAddress(cec_logical_address &address) +{ + CLockObject lock(m_mutex); + CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting default logical address setting"); + + cec_datapacket response = GetSetting(MSGCODE_GET_DEFAULT_LOGICAL_ADDRESS, 1); + if (response.size == 1) + { + address = (cec_logical_address)response[0]; + return true; + } + return false; +} + +bool CUSBCECAdapterCommunication::SetSettingLogicalAddressMask(uint16_t iMask) { CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the logical address mask to %2X", iMask); @@ -564,10 +674,24 @@ bool CUSBCECAdapterCommunication::SetLogicalAddressMask(uint16_t iMask) return SendCommand(MSGCODE_SET_LOGICAL_ADDRESS_MASK, params); } -bool CUSBCECAdapterCommunication::SetPhysicalAddress(uint16_t iPhysicalAddress) +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, 2); + if (response.size == 2) + { + iMask = ((uint16_t)response[0] << 8) | ((uint16_t)response[1]); + return true; + } + return false; +} + +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); @@ -575,7 +699,21 @@ bool CUSBCECAdapterCommunication::SetPhysicalAddress(uint16_t iPhysicalAddress) return SendCommand(MSGCODE_SET_PHYSICAL_ADDRESS, params); } -bool CUSBCECAdapterCommunication::SetCECVersion(cec_version version) +bool CUSBCECAdapterCommunication::GetSettingPhysicalAddress(uint16_t &iPhysicalAddress) +{ + CLockObject lock(m_mutex); + CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting physical address setting"); + + cec_datapacket response = GetSetting(MSGCODE_GET_PHYSICAL_ADDRESS, 2); + if (response.size == 2) + { + iPhysicalAddress = ((uint16_t)response[0] << 8) | ((uint16_t)response[1]); + return true; + } + return false; +} + +bool CUSBCECAdapterCommunication::SetSettingCECVersion(cec_version version) { CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the CEC version to %s", CLibCEC::GetInstance()->ToString(version)); @@ -585,7 +723,21 @@ bool CUSBCECAdapterCommunication::SetCECVersion(cec_version version) return SendCommand(MSGCODE_SET_HDMI_VERSION, params); } -bool CUSBCECAdapterCommunication::SetOSDName(const char *strOSDName) +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, 1); + if (response.size == 1) + { + version = (cec_version)response[0]; + return true; + } + return false; +} + +bool CUSBCECAdapterCommunication::SetSettingOSDName(const char *strOSDName) { CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the OSD name to %s", strOSDName); @@ -596,6 +748,24 @@ bool CUSBCECAdapterCommunication::SetOSDName(const char *strOSDName) return SendCommand(MSGCODE_SET_OSD_NAME, params); } +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, 13); + if (response.size == 0) + return false; + + char buf[14]; + for (uint8_t iPtr = 0; iPtr < response.size && iPtr < 13; iPtr++) + buf[iPtr] = (char)response[iPtr]; + buf[response.size] = 0; + + strOSDName.Format("%s", buf); + return true; +} + bool CUSBCECAdapterCommunication::WriteEEPROM(void) { CLockObject lock(m_mutex); @@ -631,15 +801,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; @@ -804,14 +979,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; @@ -823,18 +998,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(); @@ -846,8 +1029,7 @@ cec_datapacket CUSBCECAdapterCommunication::GetSetting(cec_adapter_messagecode m return retVal; } - 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)) {