cec: read the persisted settings from the ROM, and update it in libcec_configuration...

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index c1c999c34454d95e6f214a956f81ccc763287f8a..1f4678245fe49e699c40fb68771ee7dcdaab8d73 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -194,6 +194,9 @@ bool CCECProcessor::OpenConnection(const char *strPort, uint16_t iBaudRate, uint
   if (bReturn)
     CLibCEC::AddLog(CEC_LOG_NOTICE, "connected to the CEC adapter. firmware version = %d, client version = %s", m_communication->GetFirmwareVersion(), ToString((cec_client_version)m_configuration.clientVersion));
 
+  if (m_configuration.bGetSettingsFromROM == 1)
+    m_communication->GetConfiguration(&m_configuration);
+
   return bReturn;
 }
 

diff --git a/src/lib/adapter/AdapterCommunication.h b/src/lib/adapter/AdapterCommunication.h
index d78b11d0164d37e4cf66f1c13b353aa2bc62717b..15f0c9c305e61157cdea80aaca28ebc0bb18aaca 100644 (file)
--- a/src/lib/adapter/AdapterCommunication.h
+++ b/src/lib/adapter/AdapterCommunication.h
@@ -151,6 +151,13 @@ namespace CEC
      */
     virtual bool PersistConfiguration(libcec_configuration *configuration) = 0;
 
+    /*!
+     * @brief Get the persisted configuration from the adapter (if supported)
+     * @param configuration The updated configuration.
+     * @return True when the configuration was updated, false otherwise.
+     */
+    virtual bool GetConfiguration(libcec_configuration *configuration) = 0;
+
     /*!
      * @return The name of the port
      */

diff --git a/src/lib/adapter/USBCECAdapterCommunication.cpp b/src/lib/adapter/USBCECAdapterCommunication.cpp
index 360eff5d1fde41257d339f9b58a9b046c4f18884..2944c0cd6361f96ce4b51bd261af4a220b33d6ba 100644 (file)
--- a/src/lib/adapter/USBCECAdapterCommunication.cpp
+++ b/src/lib/adapter/USBCECAdapterCommunication.cpp
@@ -501,18 +501,79 @@ 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)
+{
+  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 (1 byte)
+  // - HDMI port number (1 byte)
+  // - TV vendor id (3 bytes)
+  // - wake devices (1 byte)
+  // - standby devices (1 bytes)
+  // - 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 +584,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 +594,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);
+  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 +618,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);
+  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 +642,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);
+  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,7 +667,21 @@ 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);
+  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);
@@ -575,7 +692,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);
+  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 +716,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);
+  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 +741,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);
+  if (response.size == 0)
+    return false;
+
+  char buf[15];
+  for (uint8_t iPtr = 0; iPtr < response.size && iPtr < 15; iPtr++)
+    buf[iPtr] = (char)response[iPtr];
+  buf[response.size] = 0;
+
+  strOSDName.Format("%s", buf);
+  return true;
+}
+
 bool CUSBCECAdapterCommunication::WriteEEPROM(void)
 {
   CLockObject lock(m_mutex);

diff --git a/src/lib/adapter/USBCECAdapterCommunication.h b/src/lib/adapter/USBCECAdapterCommunication.h
index e33413e933d8f2777ab1a99c16a65cc22f7f5203..5db99606a96e89e885445d3138767c456f6383d6 100644 (file)
--- a/src/lib/adapter/USBCECAdapterCommunication.h
+++ b/src/lib/adapter/USBCECAdapterCommunication.h
@@ -84,6 +84,7 @@ namespace CEC
     virtual uint16_t GetFirmwareVersion(void);
     virtual bool SetControlledMode(bool controlled);
     virtual bool PersistConfiguration(libcec_configuration *configuration);
+    virtual bool GetConfiguration(libcec_configuration *configuration);
     virtual CStdString GetPortName(void);
     virtual uint16_t GetPhysicalAddress(void) { return 0; }
 
@@ -92,13 +93,27 @@ namespace CEC
     bool SendCommand(cec_adapter_messagecode msgCode, CCECAdapterMessage &params, bool bExpectAck = true, bool bIsTransmission = false, bool bSendDirectly = true);
     cec_datapacket GetSetting(cec_adapter_messagecode msgCode);
 
-    bool SetAutoEnabled(bool enabled);
-    bool SetDeviceType(cec_device_type type);
-    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 SetSettingAutoEnabled(bool enabled);
+    bool GetSettingAutoEnabled(bool &enabled);
+
+    bool SetSettingDeviceType(cec_device_type type);
+    bool GetSettingDeviceType(cec_device_type &type);
+
+    bool SetSettingDefaultLogicalAddress(cec_logical_address address);
+    bool GetSettingDefaultLogicalAddress(cec_logical_address &address);
+
+    bool SetSettingLogicalAddressMask(uint16_t iMask);
+    bool GetSettingLogicalAddressMask(uint16_t &iMask);
+
+    bool SetSettingPhysicalAddress(uint16_t iPhysicalAddress);
+    bool GetSettingPhysicalAddress(uint16_t &iPhysicalAddress);
+
+    bool SetSettingCECVersion(cec_version version);
+    bool GetSettingCECVersion(cec_version &version);
+
+    bool SetSettingOSDName(const char *strOSDName);
+    bool GetSettingOSDName(CStdString &strOSDName);
+
     bool WriteEEPROM(void);
 
     bool SetAckMaskInternal(uint16_t iMask, bool bWriteDirectly = false);