Skip to content

Commit

Permalink
restyle
Browse files Browse the repository at this point in the history
  • Loading branch information
mkardous-silabs committed Jan 29, 2024
1 parent 3dfc2ce commit bf5376f
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/app/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,9 @@ static_library("interaction-model") {
":app_config",
":message-def",
":paths",
"${chip_root}/src/app/icd:configuration-data",
"${chip_root}/src/app/icd:icd_config",
"${chip_root}/src/app/icd:observer",
"${chip_root}/src/app/icd:configuration-data",
"${chip_root}/src/lib/address_resolve",
"${chip_root}/src/lib/support",
"${chip_root}/src/protocols/interaction_model",
Expand Down
4 changes: 2 additions & 2 deletions src/app/icd/ICDManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ void ICDManager::Shutdown()
mOperationalState = OperationalState::ActiveMode;
mStorage = nullptr;
mFabricTable = nullptr;
mEngine = nullptr;
mEngine = nullptr;
mStateObserverPool.ReleaseAll();
mICDSenderPool.ReleaseAll();
}
Expand Down Expand Up @@ -572,7 +572,7 @@ bool ICDManager::CheckInMessagesWouldBeSent()
}

bool isActive = false;
mEngine->GetMinGuaranteedSubscriptionsPerFabric();
mEngine->GetMinGuaranteedSubscriptionsPerFabric();
if (!isActive)
{
// At least one registration would require a Check-In message
Expand Down
8 changes: 4 additions & 4 deletions src/app/icd/ICDManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
#pragma once

#include <app-common/zap-generated/cluster-enums.h>
#include <app/InteractionModelEngine.h>
#include <app/icd/ICDCheckInSender.h>
#include <app/icd/ICDConfigurationData.h>
#include <app/icd/ICDMonitoringTable.h>
#include <app/InteractionModelEngine.h>
#include <app/icd/ICDNotifier.h>
#include <app/icd/ICDStateObserver.h>
#include <credentials/FabricTable.h>
Expand Down Expand Up @@ -142,15 +142,15 @@ class ICDManager : public ICDListener
KeepActiveFlags mKeepActiveFlags{ 0 };

// Initialize mOperationalState to ActiveMode so the init sequence at bootup triggers the IdleMode behaviour first.
OperationalState mOperationalState = OperationalState::ActiveMode;
OperationalState mOperationalState = OperationalState::ActiveMode;

PersistentStorageDelegate * mStorage = nullptr;
FabricTable * mFabricTable = nullptr;
Messaging::ExchangeManager * mExchangeManager = nullptr;
Crypto::SymmetricKeystore * mSymmetricKeystore = nullptr;
InteractionModelEngine * mEngine = nullptr;
InteractionModelEngine * mEngine = nullptr;

bool mTransitionToIdleCalled = false;
bool mTransitionToIdleCalled = false;

ObjectPool<ObserverPointer, CHIP_CONFIG_ICD_OBSERVERS_POOL_SIZE> mStateObserverPool;
ObjectPool<ICDCheckInSender, (CHIP_CONFIG_ICD_CLIENTS_SUPPORTED_PER_FABRIC * CHIP_CONFIG_MAX_FABRICS)> mICDSenderPool;
Expand Down
3 changes: 2 additions & 1 deletion src/app/server/Server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,8 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
mICDManager.RegisterObserver(mReportScheduler);
mICDManager.RegisterObserver(&app::DnssdServer::Instance());

mICDManager.Init(mDeviceStorage, &GetFabricTable(), mSessionKeystore, &mExchangeMgr, chip::app::InteractionModelEngine::GetInstance());
mICDManager.Init(mDeviceStorage, &GetFabricTable(), mSessionKeystore, &mExchangeMgr,
chip::app::InteractionModelEngine::GetInstance());
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER

// This code is necessary to restart listening to existing groups after a reboot
Expand Down
5 changes: 3 additions & 2 deletions src/app/tests/TestICDManager.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
*
* Copyright (c) 2023 Project CHIP Authors
* All rights reserved.
Expand Down Expand Up @@ -93,7 +93,8 @@ class TestContext : public chip::Test::AppContext
CHIP_ERROR SetUp() override
{
ReturnErrorOnFailure(chip::Test::AppContext::SetUp());
mICDManager.Init(&testStorage, &GetFabricTable(), &mKeystore, &GetExchangeManager(), chip::app::InteractionModelEngine::GetInstance());
mICDManager.Init(&testStorage, &GetFabricTable(), &mKeystore, &GetExchangeManager(),
chip::app::InteractionModelEngine::GetInstance());
mICDManager.RegisterObserver(&mICDStateObserver);
return CHIP_NO_ERROR;
}
Expand Down

0 comments on commit bf5376f

Please sign in to comment.