Skip to content

Commit de3391d

Browse files
committed
Remove obsolete definitions to fix the build
1 parent 3c48e4d commit de3391d

5 files changed

+3
-31
lines changed

src/platform/ESP32/ConfigurationManagerImpl.cpp

-20
Original file line numberDiff line numberDiff line change
@@ -185,26 +185,6 @@ CHIP_ERROR ConfigurationManagerImpl::StoreTotalOperationalHours(uint32_t totalOp
185185
return WriteConfigValue(ESP32Config::kCounterKey_TotalOperationalHours, totalOperationalHours);
186186
}
187187

188-
CHIP_ERROR ConfigurationManagerImpl::GetProductURL(char * buf, size_t bufSize)
189-
{
190-
CHIP_ERROR err = ReadConfigValueStr(ESP32Config::kConfigKey_ProductURL, buf, bufSize, bufSize);
191-
if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
192-
{
193-
return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
194-
}
195-
return err;
196-
}
197-
198-
CHIP_ERROR ConfigurationManagerImpl::GetProductLabel(char * buf, size_t bufSize)
199-
{
200-
CHIP_ERROR err = ReadConfigValueStr(ESP32Config::kConfigKey_ProductLabel, buf, bufSize, bufSize);
201-
if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
202-
{
203-
return CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
204-
}
205-
return err;
206-
}
207-
208188
CHIP_ERROR ConfigurationManagerImpl::GetSoftwareVersionString(char * buf, size_t bufSize)
209189
{
210190
memset(buf, 0, bufSize);

src/platform/ESP32/ConfigurationManagerImpl.h

-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
5353
CHIP_ERROR StoreRebootCount(uint32_t rebootCount) override;
5454
CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override;
5555
CHIP_ERROR StoreTotalOperationalHours(uint32_t totalOperationalHours) override;
56-
CHIP_ERROR GetProductURL(char * buf, size_t bufSize) override;
57-
CHIP_ERROR GetProductLabel(char * buf, size_t bufSize) override;
5856
CHIP_ERROR GetSoftwareVersionString(char * buf, size_t bufSize);
5957
CHIP_ERROR GetSoftwareVersion(uint32_t & softwareVer) override;
6058
static ConfigurationManagerImpl & GetDefaultInstance();

src/platform/android/ConfigurationManagerImpl.h

-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
4242
static ConfigurationManagerImpl & GetDefaultInstance();
4343
CHIP_ERROR GetSoftwareVersionString(char * buf, size_t bufSize) override;
4444
CHIP_ERROR GetSoftwareVersion(uint32_t & softwareVer) override;
45-
CHIP_ERROR GetPartNumber(char * buf, size_t bufSize) override;
46-
CHIP_ERROR GetProductURL(char * buf, size_t bufSize) override;
47-
CHIP_ERROR GetProductLabel(char * buf, size_t bufSize) override;
4845
CHIP_ERROR GetUniqueId(char * buf, size_t bufSize) override;
4946

5047
private:

src/platform/android/DeviceInstanceInfoProviderImpl.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@ CHIP_ERROR DeviceInstanceInfoProviderImpl::GetProductId(uint16_t & productId)
5555
return CHIP_NO_ERROR;
5656
}
5757

58-
CHIP_ERROR ConfigurationManagerImpl::GetPartNumber(char * buf, size_t bufSize)
58+
CHIP_ERROR DeviceInstanceInfoProviderImpl::GetPartNumber(char * buf, size_t bufSize)
5959
{
6060
size_t dateLen;
6161
return Internal::AndroidConfig::ReadConfigValueStr(Internal::AndroidConfig::kConfigKey_PartNumber, buf, bufSize, dateLen);
6262
}
6363

64-
CHIP_ERROR ConfigurationManagerImpl::GetProductURL(char * buf, size_t bufSize)
64+
CHIP_ERROR DeviceInstanceInfoProviderImpl::GetProductURL(char * buf, size_t bufSize)
6565
{
6666
size_t dateLen;
6767
return Internal::AndroidConfig::ReadConfigValueStr(Internal::AndroidConfig::kConfigKey_ProductURL, buf, bufSize, dateLen);
6868
}
6969

70-
CHIP_ERROR ConfigurationManagerImpl::GetPartNumber(char * buf, size_t bufSize)
70+
CHIP_ERROR DeviceInstanceInfoProviderImpl::GetProductLabel(char * buf, size_t bufSize)
7171
{
7272
size_t dateLen;
7373
return Internal::AndroidConfig::ReadConfigValueStr(Internal::AndroidConfig::kConfigKey_ProductLabel, buf, bufSize, dateLen);

src/platform/fake/ConfigurationManagerImpl.h

-3
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ class ConfigurationManagerImpl : public ConfigurationManager
8282
CHIP_ERROR StoreTotalOperationalHours(uint32_t totalOperationalHours) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
8383
CHIP_ERROR GetBootReason(uint32_t & bootReason) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
8484
CHIP_ERROR StoreBootReason(uint32_t bootReason) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
85-
CHIP_ERROR GetPartNumber(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
86-
CHIP_ERROR GetProductURL(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
87-
CHIP_ERROR GetProductLabel(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
8885
CHIP_ERROR GetUniqueId(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
8986
CHIP_ERROR StoreUniqueId(const char * uniqueId, size_t uniqueIdLen) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
9087
CHIP_ERROR GenerateUniqueId(char * buf, size_t bufSize) override { return CHIP_ERROR_NOT_IMPLEMENTED; }

0 commit comments

Comments
 (0)