Skip to content

Commit

Permalink
[nrf toup] Fix defines for ZMS
Browse files Browse the repository at this point in the history
It can be squashed with the 0c49058 commit.

Signed-off-by: Arkadiusz Balys <[email protected]>
  • Loading branch information
ArekBalysNordic committed Oct 21, 2024
1 parent 731aac5 commit 5148b72
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/platform/Zephyr/ConfigurationManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@

#ifdef CONFIG_CHIP_FACTORY_RESET_ERASE_SETTINGS
#include <zephyr/settings/settings.h>
#ifdef CONFIG_SETTINGS_NVS
#if defined(CONFIG_SETTINGS_NVS)
#include <zephyr/fs/nvs.h>
#elif CONFIG_SETTINGS_ZMS
#elif defined(CONFIG_SETTINGS_ZMS)
#include <zephyr/fs/zms.h>
#endif // CONFIG_SETTINGS_NVS || CONFIG_SETTINGS_ZMS
#endif // CONFIG_CHIP_FACTORY_RESET_ERASE_SETTINGS
Expand Down Expand Up @@ -204,9 +204,9 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)

if (status == 0)
{
#ifdef CONFIG_SETTINGS_NVS
#if defined(CONFIG_SETTINGS_NVS)
status = nvs_clear(static_cast<nvs_fs *>(storage));
#elif CONFIG_SETTINGS_ZMS
#elif defined(CONFIG_SETTINGS_ZMS)
status = zms_clear(static_cast<zms_fs *>(storage));
#endif // CONFIG_SETTINGS_NVS || CONFIG_SETTINGS_ZMS
}
Expand Down

0 comments on commit 5148b72

Please sign in to comment.