From c214d19778a6184cf45ed5d9d3d1e93565fdb95e Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Thu, 8 Mar 2012 16:25:04 +0100 Subject: [PATCH] cec: implemented the write methods for the v2 configuration. bugzid: 543 --- .../adapter/USBCECAdapterCommunication.cpp | 187 ++++++++++++++++++ src/lib/adapter/USBCECAdapterCommunication.h | 10 +- 2 files changed, 196 insertions(+), 1 deletion(-) diff --git a/src/lib/adapter/USBCECAdapterCommunication.cpp b/src/lib/adapter/USBCECAdapterCommunication.cpp index 85c92f3..d2d4e6d 100644 --- a/src/lib/adapter/USBCECAdapterCommunication.cpp +++ b/src/lib/adapter/USBCECAdapterCommunication.cpp @@ -569,6 +569,16 @@ bool CUSBCECAdapterCommunication::SetAckMaskInternal(uint16_t iMask, bool bWrite return bReturn; } +bool CUSBCECAdapterCommunication::PersistConfiguration(libcec_configuration *configuration) +{ + return SetAutoEnabled(true) && + //SetDefaultLogicalAddress() TODO + //SetLogicalAddressMask() TODO + SetPhysicalAddress(configuration->iPhysicalAddress) && + SetCECVersion(CEC_VERSION_1_3A) && + SetOSDName(configuration->strDeviceName) && + WriteEEPROM(); +} bool CUSBCECAdapterCommunication::SetControlledMode(bool controlled) { @@ -595,6 +605,183 @@ bool CUSBCECAdapterCommunication::SetControlledMode(bool controlled) return true; } +bool CUSBCECAdapterCommunication::SetAutoEnabled(bool enabled) +{ + CLockObject lock(m_mutex); + CLibCEC::AddLog(CEC_LOG_DEBUG, "turning autonomous mode %s", enabled ? "on" : "off"); + + CCECAdapterMessage *output = new CCECAdapterMessage; + + output->PushBack(MSGSTART); + output->PushEscaped(MSGCODE_SET_AUTO_ENABLED); + output->PushEscaped(enabled); + output->PushBack(MSGEND); + output->isTransmission = false; + + SendMessageToAdapter(output); + bool bWriteOk = output->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + delete output; + if (!bWriteOk) + { + CLibCEC::AddLog(CEC_LOG_ERROR, "could not set autonomous mode"); + return false; + } + + return true; +} + +bool CUSBCECAdapterCommunication::SetDefaultLogicalAddress(cec_logical_address address) +{ + CLockObject lock(m_mutex); + CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the default logical address to %1X", address); + + CCECAdapterMessage *output = new CCECAdapterMessage; + + output->PushBack(MSGSTART); + output->PushEscaped(MSGCODE_SET_DEFAULT_LOGICAL_ADDRESS); + output->PushEscaped((uint8_t) address); + output->PushBack(MSGEND); + output->isTransmission = false; + + SendMessageToAdapter(output); + bool bWriteOk = output->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + delete output; + if (!bWriteOk) + { + CLibCEC::AddLog(CEC_LOG_ERROR, "could not set the default logical address"); + return false; + } + + return true; +} + +bool CUSBCECAdapterCommunication::SetLogicalAddressMask(uint16_t iMask) +{ + CLockObject lock(m_mutex); + CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the logical address mask to %2X", iMask); + + CCECAdapterMessage *output = new CCECAdapterMessage; + + output->PushBack(MSGSTART); + output->PushEscaped(MSGCODE_SET_LOGICAL_ADDRESS_MASK); + output->PushEscaped(iMask >> 8); + output->PushEscaped((uint8_t)iMask); + output->PushBack(MSGEND); + output->isTransmission = false; + + SendMessageToAdapter(output); + bool bWriteOk = output->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + delete output; + if (!bWriteOk) + { + CLibCEC::AddLog(CEC_LOG_ERROR, "could not set the logical address mask"); + return false; + } + + return true; +} + +bool CUSBCECAdapterCommunication::SetPhysicalAddress(uint16_t iPhysicalAddress) +{ + CLockObject lock(m_mutex); + CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the physical address to %2X", iPhysicalAddress); + + CCECAdapterMessage *output = new CCECAdapterMessage; + + output->PushBack(MSGSTART); + output->PushEscaped(MSGCODE_SET_PHYSICAL_ADDRESS); + output->PushEscaped(iPhysicalAddress >> 8); + output->PushEscaped((uint8_t)iPhysicalAddress); + output->PushBack(MSGEND); + output->isTransmission = false; + + SendMessageToAdapter(output); + bool bWriteOk = output->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + delete output; + if (!bWriteOk) + { + CLibCEC::AddLog(CEC_LOG_ERROR, "could not set the physical address"); + return false; + } + + return true; +} + +bool CUSBCECAdapterCommunication::SetCECVersion(cec_version version) +{ + CLockObject lock(m_mutex); + CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the CEC version to %s", CLibCEC::GetInstance()->ToString(version)); + + CCECAdapterMessage *output = new CCECAdapterMessage; + + output->PushBack(MSGSTART); + output->PushEscaped(MSGCODE_SET_HDMI_VERSION); + output->PushEscaped((uint8_t)version); + output->PushBack(MSGEND); + output->isTransmission = false; + + SendMessageToAdapter(output); + bool bWriteOk = output->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + delete output; + if (!bWriteOk) + { + CLibCEC::AddLog(CEC_LOG_ERROR, "could not set the CEC version"); + return false; + } + + return true; +} + +bool CUSBCECAdapterCommunication::SetOSDName(const char *strOSDName) +{ + CLockObject lock(m_mutex); + CLibCEC::AddLog(CEC_LOG_DEBUG, "setting the OSD name to %s", strOSDName); + + CCECAdapterMessage *output = new CCECAdapterMessage; + + output->PushBack(MSGSTART); + output->PushEscaped(MSGCODE_SET_OSD_NAME); + for (size_t iPtr = 0; iPtr < strlen(strOSDName); iPtr++) + output->PushEscaped(strOSDName[iPtr]); + output->PushBack(MSGEND); + output->isTransmission = false; + + SendMessageToAdapter(output); + bool bWriteOk = output->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + delete output; + if (!bWriteOk) + { + CLibCEC::AddLog(CEC_LOG_ERROR, "could not set the OSD name"); + return false; + } + + return true; +} + +bool CUSBCECAdapterCommunication::WriteEEPROM(void) +{ + CLockObject lock(m_mutex); + CLibCEC::AddLog(CEC_LOG_DEBUG, "writing settings in the EEPROM"); + + CCECAdapterMessage *output = new CCECAdapterMessage; + + output->PushBack(MSGSTART); + output->PushEscaped(MSGCODE_WRITE_EEPROM); + output->PushBack(MSGEND); + output->isTransmission = false; + + SendMessageToAdapter(output); + bool bWriteOk = output->state == ADAPTER_MESSAGE_STATE_SENT_ACKED; + delete output; + if (!bWriteOk) + { + CLibCEC::AddLog(CEC_LOG_ERROR, "could not write the settings in the EEPROM"); + return false; + } + + return true; +} + bool CUSBCECAdapterCommunication::IsOpen(void) { return !IsStopped() && m_port->IsOpen() && IsRunning(); diff --git a/src/lib/adapter/USBCECAdapterCommunication.h b/src/lib/adapter/USBCECAdapterCommunication.h index c71453a..98f72fc 100644 --- a/src/lib/adapter/USBCECAdapterCommunication.h +++ b/src/lib/adapter/USBCECAdapterCommunication.h @@ -83,12 +83,20 @@ namespace CEC virtual bool PingAdapter(void); virtual uint16_t GetFirmwareVersion(void); virtual bool SetControlledMode(bool controlled); - virtual bool PersistConfiguration(libcec_configuration * UNUSED(configuration)) { return false; } // TODO + virtual bool PersistConfiguration(libcec_configuration *configuration); virtual CStdString GetPortName(void); virtual uint16_t GetPhysicalAddress(void) { return 0; } void *Process(void); private: + bool SetAutoEnabled(bool enabled); + bool SetDefaultLogicalAddress(cec_logical_address address); + bool SetLogicalAddressMask(uint16_t iMask); + bool SetPhysicalAddress(uint16_t iPhysicalAddress); + bool SetCECVersion(cec_version version); + bool SetOSDName(const char *strOSDName); + bool WriteEEPROM(void); + bool SetAckMaskInternal(uint16_t iMask, bool bWriteDirectly = false); bool CheckAdapter(uint32_t iTimeoutMs = 10000); -- 2.34.1