Remove some unused setters on configuration manager. (#17752)

We shouldn't need to set MAC addresses from inside the Matter stack.
project-chip · Jul 31, 2023 · 3086ee7 · 3086ee7
1 parent 5884abb
commit 3086ee7
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 18 deletions.
diff --git a/src/include/platform/ConfigurationManager.h b/src/include/platform/ConfigurationManager.h
@@ -111,8 +111,6 @@ class ConfigurationManager
  virtual CHIP_ERROR GetCountryCode(char * buf, size_t bufSize, size_t & codeLen) = 0;
  virtual CHIP_ERROR GetBreadcrumb(uint64_t & breadcrumb) = 0;
  virtual CHIP_ERROR StoreSerialNumber(const char * serialNum, size_t serialNumLen) = 0;
- virtual CHIP_ERROR StorePrimaryWiFiMACAddress(const uint8_t * buf) = 0;
- virtual CHIP_ERROR StorePrimary802154MACAddress(const uint8_t * buf) = 0;
  virtual CHIP_ERROR StoreManufacturingDate(const char * mfgDate, size_t mfgDateLen) = 0;
  virtual CHIP_ERROR StoreSoftwareVersion(uint32_t softwareVer) = 0;
  virtual CHIP_ERROR StoreHardwareVersion(uint16_t hardwareVer) = 0;

diff --git a/src/include/platform/internal/GenericConfigurationManagerImpl.h b/src/include/platform/internal/GenericConfigurationManagerImpl.h
@@ -73,9 +73,7 @@ class GenericConfigurationManagerImpl : public ConfigurationManager
  CHIP_ERROR StoreSerialNumber(const char * serialNum, size_t serialNumLen) override;
  CHIP_ERROR GetPrimaryMACAddress(MutableByteSpan buf) override;
  CHIP_ERROR GetPrimaryWiFiMACAddress(uint8_t * buf) override;
- CHIP_ERROR StorePrimaryWiFiMACAddress(const uint8_t * buf) override;
  CHIP_ERROR GetPrimary802154MACAddress(uint8_t * buf) override;
- CHIP_ERROR StorePrimary802154MACAddress(const uint8_t * buf) override;
  CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & dayOfMonth) override;
  CHIP_ERROR StoreManufacturingDate(const char * mfgDate, size_t mfgDateLen) override;
 #if CHIP_ENABLE_ROTATING_DEVICE_ID && defined(CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID)

diff --git a/src/include/platform/internal/GenericConfigurationManagerImpl.ipp b/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
@@ -387,12 +387,6 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetPrimaryWiFiMACAddres
  return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
 }
 
-template <class ConfigClass>
-CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StorePrimaryWiFiMACAddress(const uint8_t * buf)
-{
- return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
-}
-
 template <class ConfigClass>
 CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetPrimaryMACAddress(MutableByteSpan buf)
 {
@@ -428,12 +422,6 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetPrimary802154MACAddr
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 }
 
-template <class ConfigClass>
-CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StorePrimary802154MACAddress(const uint8_t * buf)
-{
- return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
-}
-
 template <class ConfigClass>
 inline CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetHardwareVersionString(char * buf, size_t bufSize)
 {

diff --git a/src/platform/fake/ConfigurationManagerImpl.h b/src/platform/fake/ConfigurationManagerImpl.h
@@ -49,9 +49,7 @@ class ConfigurationManagerImpl : public ConfigurationManager
  CHIP_ERROR StoreSerialNumber(const char * serialNum, size_t serialNumLen) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
  CHIP_ERROR GetPrimaryMACAddress(MutableByteSpan buf) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
  CHIP_ERROR GetPrimaryWiFiMACAddress(uint8_t * buf) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
- CHIP_ERROR StorePrimaryWiFiMACAddress(const uint8_t * buf) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
  CHIP_ERROR GetPrimary802154MACAddress(uint8_t * buf) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
- CHIP_ERROR StorePrimary802154MACAddress(const uint8_t * buf) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
  CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & dayOfMonth) override
  {
  return CHIP_ERROR_NOT_IMPLEMENTED;