Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Silabs] Fix a few issues preventing siwx917 platform builds. #25557

Merged
merged 2 commits into from
Mar 8, 2023
Merged

[Silabs] Fix a few issues preventing siwx917 platform builds. #25557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbab0a8
Fix a few issues preventing siwx917 builds. efr32 KeyValueStoreManage…
jmartinez-silabs Mar 8, 2023
423c1ca
Restyled by clang-format
restyled-commits Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions examples/lighting-app/silabs/SiWx917/include/CHIPProjectConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,6 @@
*/
#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1

/**
* CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
*
* A string identifying the software version running on the device.
* CHIP service currently expects the software version to be in the format
* {MAJOR_VERSION}.0d{MINOR_VERSION}
*/
#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "0.1ALPHA"
#endif

/**
* CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
*
Expand Down
1 change: 1 addition & 0 deletions examples/platform/silabs/SiWx917/SiWx917/rsi_if.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ static void wfx_rsi_save_ap_info()
static void wfx_rsi_do_join(void)
{
int32_t status;
rsi_security_mode_t connect_security_mode;

if (wfx_rsi.dev_state & (WFX_RSI_ST_STA_CONNECTING | WFX_RSI_ST_STA_CONNECTED))
{
Expand Down
2 changes: 1 addition & 1 deletion ...silabs/efr32/KeyValueStoreManagerImpl.cpp → ...tform/silabs/KeyValueStoreManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::Init(void)
err = SilabsConfig::Init();
SuccessOrExit(err);

EFR32::EFR32Migration::GetMigrationManager().applyMigrations();
Silabs::MigrationManager::GetMigrationInstance().applyMigrations();

memset(mKvsKeyMap, 0, sizeof(mKvsKeyMap));
size_t outLen;
Expand Down
10 changes: 5 additions & 5 deletions ...latform/silabs/efr32/MigrationManager.cpp → src/platform/silabs/MigrationManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ using namespace ::chip::DeviceLayer::PersistedStorage;

namespace chip {
namespace DeviceLayer {
namespace EFR32 {
namespace Silabs {

namespace {
typedef void (*func_ptr)();
Expand All @@ -45,7 +45,7 @@ static migrationData_t migrationTable[] = {

} // namespace

void EFR32Migration::applyMigrations()
void MigrationManager::applyMigrations()
{
uint32_t lastMigationGroupDone = 0;
SilabsConfig::ReadConfigValue(SilabsConfig::kConfigKey_MigrationCounter, lastMigationGroupDone);
Expand All @@ -62,12 +62,12 @@ void EFR32Migration::applyMigrations()
SilabsConfig::WriteConfigValue(SilabsConfig::kConfigKey_MigrationCounter, completedMigrationGroup);
}

EFR32Migration & EFR32Migration::GetMigrationManager()
MigrationManager & MigrationManager::GetMigrationInstance()
{
static EFR32Migration sMigrationManager;
static MigrationManager sMigrationManager;
return sMigrationManager;
}

} // namespace EFR32
} // namespace Silabs
} // namespace DeviceLayer
} // namespace chip
14 changes: 7 additions & 7 deletions src/platform/silabs/efr32/MigrationManager.h → src/platform/silabs/MigrationManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@

namespace chip {
namespace DeviceLayer {
namespace EFR32 {
namespace Silabs {

class EFR32Migration
class MigrationManager
{
friend class KeyValueStoreManagerImpl;

public:
/**
* The EFR32 migration manager is implemented as a singleton
* The Silabs migration manager is implemented as a singleton
* User should get the object from this getter.
*/
static EFR32Migration & GetMigrationManager();
static MigrationManager & GetMigrationInstance();
static void applyMigrations();

private:
EFR32Migration(){};
~EFR32Migration(){};
MigrationManager(){};
~MigrationManager(){};
};

} // namespace EFR32
} // namespace Silabs
} // namespace DeviceLayer
} // namespace chip
4 changes: 3 additions & 1 deletion src/platform/silabs/SiWx917/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,11 @@ static_library("SiWx917") {
"${silabs_platform_dir}/DiagnosticDataProviderImpl.cpp",
"${silabs_platform_dir}/DiagnosticDataProviderImpl.h",
"${silabs_platform_dir}/InetPlatformConfig.h",
"${silabs_platform_dir}/KeyValueStoreManagerImpl.cpp",
"${silabs_platform_dir}/KeyValueStoreManagerImpl.h",
"${silabs_platform_dir}/Logging.cpp",
"${silabs_platform_dir}/MigrationManager.cpp",
"${silabs_platform_dir}/MigrationManager.h",
"${silabs_platform_dir}/PlatformManagerImpl.h",
"${silabs_platform_dir}/SilabsConfig.cpp",
"${silabs_platform_dir}/SilabsConfig.h",
Expand All @@ -53,7 +56,6 @@ static_library("SiWx917") {
"../../SingletonConfigurationManager.cpp",
"BLEManagerImpl.cpp",
"ConfigurationManagerImpl.cpp",
"KeyValueStoreManagerImpl.cpp",
"PlatformManagerImpl.cpp",
"bluetooth/rsi_ble_config.h",
"bluetooth/wfx_sl_ble_init.c",
Expand Down
213 changes: 0 additions & 213 deletions src/platform/silabs/SiWx917/KeyValueStoreManagerImpl.cpp
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/platform/silabs/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ static_library("efr32") {
"${silabs_platform_dir}/DiagnosticDataProviderImpl.cpp",
"${silabs_platform_dir}/DiagnosticDataProviderImpl.h",
"${silabs_platform_dir}/InetPlatformConfig.h",
"${silabs_platform_dir}/KeyValueStoreManagerImpl.cpp",
"${silabs_platform_dir}/KeyValueStoreManagerImpl.h",
"${silabs_platform_dir}/Logging.cpp",
"${silabs_platform_dir}/MigrationManager.cpp",
"${silabs_platform_dir}/PlatformManagerImpl.h",
"${silabs_platform_dir}/SilabsConfig.cpp",
"${silabs_platform_dir}/SilabsConfig.h",
"${silabs_platform_dir}/SystemPlatformConfig.h",
"../../FreeRTOS/SystemTimeSupport.cpp",
"../../SingletonConfigurationManager.cpp",
"ConfigurationManagerImpl.cpp",
"KeyValueStoreManagerImpl.cpp",
"MigrationManager.cpp",
"PlatformManagerImpl.cpp",
]

Expand Down