Skip to content

Commit 3600a50

Browse files
Adding config checks for functions specific to only wifi and thread in NetworkCommissioning Cluster code. (#33268)
* Adding config checks for fucntions specific to only wifi and thread in NetworkCommissioning * Restlyed
1 parent 70d9a61 commit 3600a50

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

src/app/clusters/network-commissioning/network-commissioning.cpp

+11
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ using namespace DeviceLayer::NetworkCommissioning;
5757
namespace {
5858

5959
// For WiFi and Thread scan results, each item will cost ~60 bytes in TLV, thus 15 is a safe upper bound of scan results.
60+
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION || CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP || CHIP_DEVICE_CONFIG_ENABLE_THREAD
6061
constexpr size_t kMaxNetworksInScanResponse = 15;
62+
#endif
6163

6264
constexpr uint16_t kCurrentClusterRevision = 2;
6365

@@ -545,6 +547,7 @@ bool CheckFailSafeArmed(CommandHandlerInterface::HandlerContext & ctx)
545547

546548
void Instance::HandleAddOrUpdateWiFiNetwork(HandlerContext & ctx, const Commands::AddOrUpdateWiFiNetwork::DecodableType & req)
547549
{
550+
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION || CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
548551
MATTER_TRACE_SCOPE("HandleAddOrUpdateWiFiNetwork", "NetworkCommissioning");
549552

550553
VerifyOrReturn(CheckFailSafeArmed(ctx));
@@ -617,6 +620,7 @@ void Instance::HandleAddOrUpdateWiFiNetwork(HandlerContext & ctx, const Commands
617620
UpdateBreadcrumb(req.breadcrumb);
618621
ReportNetworksListChanged();
619622
}
623+
#endif
620624
}
621625

622626
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
@@ -727,6 +731,8 @@ void Instance::HandleAddOrUpdateWiFiNetworkWithPDC(HandlerContext & ctx,
727731

728732
void Instance::HandleAddOrUpdateThreadNetwork(HandlerContext & ctx, const Commands::AddOrUpdateThreadNetwork::DecodableType & req)
729733
{
734+
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
735+
730736
MATTER_TRACE_SCOPE("HandleAddOrUpdateThreadNetwork", "NetworkCommissioning");
731737

732738
VerifyOrReturn(CheckFailSafeArmed(ctx));
@@ -744,6 +750,7 @@ void Instance::HandleAddOrUpdateThreadNetwork(HandlerContext & ctx, const Comman
744750
ReportNetworksListChanged();
745751
UpdateBreadcrumb(req.breadcrumb);
746752
}
753+
#endif
747754
}
748755

749756
void Instance::UpdateBreadcrumb(const Optional<uint64_t> & breadcrumb)
@@ -979,6 +986,7 @@ void Instance::OnResult(Status commissioningError, CharSpan debugText, int32_t i
979986

980987
void Instance::OnFinished(Status status, CharSpan debugText, ThreadScanResponseIterator * networks)
981988
{
989+
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
982990
CHIP_ERROR err = CHIP_NO_ERROR;
983991
auto commandHandleRef = std::move(mAsyncCommandHandle);
984992
auto commandHandle = commandHandleRef.Get();
@@ -1089,10 +1097,12 @@ void Instance::OnFinished(Status status, CharSpan debugText, ThreadScanResponseI
10891097
CommitSavedBreadcrumb();
10901098
}
10911099
networks->Release();
1100+
#endif
10921101
}
10931102

10941103
void Instance::OnFinished(Status status, CharSpan debugText, WiFiScanResponseIterator * networks)
10951104
{
1105+
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION || CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
10961106
CHIP_ERROR err = CHIP_NO_ERROR;
10971107
auto commandHandleRef = std::move(mAsyncCommandHandle);
10981108
auto commandHandle = commandHandleRef.Get();
@@ -1169,6 +1179,7 @@ void Instance::OnFinished(Status status, CharSpan debugText, WiFiScanResponseIte
11691179
{
11701180
networks->Release();
11711181
}
1182+
#endif
11721183
}
11731184

11741185
void Instance::OnPlatformEventHandler(const DeviceLayer::ChipDeviceEvent * event, intptr_t arg)

0 commit comments

Comments
 (0)