Skip to content

Commit 2124700

Browse files
pankorerestyled-commits
authored and
pull[bot]
committed
[Ameba] Remove GetUniqueId in ConfigurationManagerImpl (#19033)
* [ConfigurationManager] Remove GetUniqueId in ConfigurationManagerImpl - Also removed CHIPSessionResumptionIndex key, and added CHIPGroupDataProvider key * Restyled by clang-format Co-authored-by: Restyled.io <[email protected]>
1 parent 5d8e2c5 commit 2124700

File tree

4 files changed

+22
-47
lines changed

4 files changed

+22
-47
lines changed

‎src/platform/Ameba/AmebaConfig.cpp

+19-19
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,25 @@ namespace Internal {
4242
// *** CAUTION ***: Changing the names or namespaces of these values will *break* existing devices.
4343

4444
// NVS namespaces used to store device configuration information.
45-
const char AmebaConfig::kConfigNamespace_ChipFactory[] = "chip-factory";
46-
const char AmebaConfig::kConfigNamespace_ChipConfig[] = "chip-config";
47-
const char AmebaConfig::kConfigNamespace_ChipCounters[] = "chip-counters";
48-
const char AmebaConfig::kConfigNamespace_ChipFabric1[] = "chip-fabric-1";
49-
const char AmebaConfig::kConfigNamespace_ChipFabric2[] = "chip-fabric-2";
50-
const char AmebaConfig::kConfigNamespace_ChipFabric3[] = "chip-fabric-3";
51-
const char AmebaConfig::kConfigNamespace_ChipFabric4[] = "chip-fabric-4";
52-
const char AmebaConfig::kConfigNamespace_ChipFabric5[] = "chip-fabric-5";
53-
const char AmebaConfig::kConfigNamespace_ChipACL[] = "chip-acl";
54-
const char AmebaConfig::kConfigNamespace_ChipGroupMessageCounters[] = "chip-groupmsgcounters";
55-
const char AmebaConfig::kConfigNamespace_ChipAttributes[] = "chip-attributes";
56-
const char AmebaConfig::kConfigNamespace_ChipBindingTable[] = "chip-bindingtable";
57-
const char AmebaConfig::kConfigNamespace_ChipOTA[] = "chip-ota";
58-
const char AmebaConfig::kConfigNamespace_ChipFailSafe[] = "chip-failsafe";
59-
const char AmebaConfig::kConfigNamespace_ChipSessionResumptionIndex[] = "chip-sessionresumptionindex";
60-
const char AmebaConfig::kConfigNamespace_ChipSessionResumption[] = "chip-sessionresumption";
61-
const char AmebaConfig::kConfigNamespace_ChipDeviceInfoProvider[] = "chip-deviceinfoprovider";
62-
const char AmebaConfig::kConfigNamespace_ChipOthers[] = "chip-others";
63-
const char AmebaConfig::kConfigNamespace_ChipOthers2[] = "chip-others2";
45+
const char AmebaConfig::kConfigNamespace_ChipFactory[] = "chip-factory";
46+
const char AmebaConfig::kConfigNamespace_ChipConfig[] = "chip-config";
47+
const char AmebaConfig::kConfigNamespace_ChipCounters[] = "chip-counters";
48+
const char AmebaConfig::kConfigNamespace_ChipFabric1[] = "chip-fabric-1";
49+
const char AmebaConfig::kConfigNamespace_ChipFabric2[] = "chip-fabric-2";
50+
const char AmebaConfig::kConfigNamespace_ChipFabric3[] = "chip-fabric-3";
51+
const char AmebaConfig::kConfigNamespace_ChipFabric4[] = "chip-fabric-4";
52+
const char AmebaConfig::kConfigNamespace_ChipFabric5[] = "chip-fabric-5";
53+
const char AmebaConfig::kConfigNamespace_ChipACL[] = "chip-acl";
54+
const char AmebaConfig::kConfigNamespace_ChipGroupMessageCounters[] = "chip-groupmsgcounters";
55+
const char AmebaConfig::kConfigNamespace_ChipAttributes[] = "chip-attributes";
56+
const char AmebaConfig::kConfigNamespace_ChipBindingTable[] = "chip-bindingtable";
57+
const char AmebaConfig::kConfigNamespace_ChipOTA[] = "chip-ota";
58+
const char AmebaConfig::kConfigNamespace_ChipFailSafe[] = "chip-failsafe";
59+
const char AmebaConfig::kConfigNamespace_ChipSessionResumption[] = "chip-sessionresumption";
60+
const char AmebaConfig::kConfigNamespace_ChipDeviceInfoProvider[] = "chip-deviceinfoprovider";
61+
const char AmebaConfig::kConfigNamespace_ChipGroupDataProvider[] = "chip-groupdataprovider";
62+
const char AmebaConfig::kConfigNamespace_ChipOthers[] = "chip-others";
63+
const char AmebaConfig::kConfigNamespace_ChipOthers2[] = "chip-others2";
6464

6565
// Keys stored in the chip-factory namespace
6666
const AmebaConfig::Key AmebaConfig::kConfigKey_SerialNum = { kConfigNamespace_ChipFactory, "serial-num" };

‎src/platform/Ameba/AmebaConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ class AmebaConfig
5151
static const char kConfigNamespace_ChipBindingTable[];
5252
static const char kConfigNamespace_ChipOTA[];
5353
static const char kConfigNamespace_ChipFailSafe[];
54-
static const char kConfigNamespace_ChipSessionResumptionIndex[];
5554
static const char kConfigNamespace_ChipSessionResumption[];
5655
static const char kConfigNamespace_ChipDeviceInfoProvider[];
56+
static const char kConfigNamespace_ChipGroupDataProvider[];
5757
static const char kConfigNamespace_ChipOthers[];
5858
static const char kConfigNamespace_ChipOthers2[];
5959

‎src/platform/Ameba/ConfigurationManagerImpl.cpp

+2-26
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
7777
SuccessOrExit(err);
7878
err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipFailSafe);
7979
SuccessOrExit(err);
80-
err = AmebaConfig::EnsureNamespace2(AmebaConfig::kConfigNamespace_ChipSessionResumptionIndex);
81-
SuccessOrExit(err);
8280
err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipSessionResumption);
8381
SuccessOrExit(err);
8482
err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipDeviceInfoProvider);
8583
SuccessOrExit(err);
84+
err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipGroupDataProvider);
85+
SuccessOrExit(err);
8686
err = AmebaConfig::EnsureNamespace(AmebaConfig::kConfigNamespace_ChipOthers);
8787
SuccessOrExit(err);
8888
err = AmebaConfig::EnsureNamespace2(AmebaConfig::kConfigNamespace_ChipOthers2);
@@ -177,30 +177,6 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
177177
return CHIP_NO_ERROR;
178178
}
179179

180-
CHIP_ERROR ConfigurationManagerImpl::GetUniqueId(char * buf, size_t bufSize)
181-
{
182-
#ifdef CHIP_DEVICE_CONFIG_UNIQUE_ID
183-
ReturnErrorCodeIf(bufSize < sizeof(CHIP_DEVICE_CONFIG_UNIQUE_ID), CHIP_ERROR_BUFFER_TOO_SMALL);
184-
strcpy(buf, CHIP_DEVICE_CONFIG_UNIQUE_ID);
185-
return CHIP_NO_ERROR;
186-
#else
187-
ReturnErrorCodeIf(bufSize != 32, CHIP_ERROR_INVALID_MESSAGE_LENGTH);
188-
char temp[32];
189-
int i = 0, j = 0;
190-
191-
memset(&temp[0], 0, 32);
192-
ReturnErrorCodeIf(wifi_get_mac_address(temp) != 0, CHIP_ERROR_INVALID_ARGUMENT);
193-
194-
for (i = 0; i < bufSize; i++)
195-
{
196-
if (temp[i] != ':')
197-
buf[j++] = temp[i];
198-
}
199-
200-
return CHIP_NO_ERROR;
201-
#endif
202-
}
203-
204180
bool ConfigurationManagerImpl::CanFactoryReset()
205181
{
206182
// TODO: query the application to determine if factory reset is allowed.

‎src/platform/Ameba/ConfigurationManagerImpl.h

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
5555
void InitiateFactoryReset(void) override;
5656
CHIP_ERROR ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value) override;
5757
CHIP_ERROR WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value) override;
58-
CHIP_ERROR GetUniqueId(char * buf, size_t bufSize) override;
5958
// NOTE: Other public interface methods are implemented by GenericConfigurationManagerImpl<>.
6059

6160
// ===== Members that implement the GenericConfigurationManagerImpl protected interface.

0 commit comments

Comments
 (0)