Skip to content

Commit b4a4a76

Browse files
committed
Change by following the review's comment:
- Unconditional functions in SetUpCodePairer - Change the description of the comment Signed-off-by: Lo,Chin-Ran <chin-ran.lo@nxp.com>
1 parent 75a54c5 commit b4a4a76

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

src/controller/SetUpCodePairer.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ CHIP_ERROR SetUpCodePairer::Connect(SetupPayload & payload)
129129
}
130130
VerifyOrReturnError(searchOverAll || CHIP_NO_ERROR == err || CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE == err, err);
131131
}
132-
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
133132
if (searchOverAll || payload.rendezvousInformation.Value().Has(RendezvousInformationFlag::kWiFiPAF))
134133
{
135134
ChipLogProgress(Controller, "WiFi-PAF: has RendezvousInformationFlag::kWiFiPAF");
@@ -139,7 +138,6 @@ CHIP_ERROR SetUpCodePairer::Connect(SetupPayload & payload)
139138
}
140139
VerifyOrReturnError(searchOverAll || CHIP_NO_ERROR == err || CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE == err, err);
141140
}
142-
#endif
143141
}
144142

145143
// We always want to search on network because any node that has already been commissioned will use on-network regardless of the
@@ -254,7 +252,6 @@ CHIP_ERROR SetUpCodePairer::StopConnectOverSoftAP()
254252
return CHIP_NO_ERROR;
255253
}
256254

257-
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
258255
CHIP_ERROR SetUpCodePairer::StartDiscoverOverWiFiPAF(SetupPayload & payload)
259256
{
260257
return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
@@ -265,7 +262,6 @@ CHIP_ERROR SetUpCodePairer::StopConnectOverWiFiPAF()
265262
mWaitingForDiscovery[kWiFiPAFTransport] = false;
266263
return CHIP_NO_ERROR;
267264
}
268-
#endif
269265

270266
bool SetUpCodePairer::ConnectToDiscoveredDevice()
271267
{

src/controller/SetUpCodePairer.h

-2
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,8 @@ class DLL_EXPORT SetUpCodePairer : public DevicePairingDelegate
111111
CHIP_ERROR StopConnectOverIP();
112112
CHIP_ERROR StartDiscoverOverSoftAP(SetupPayload & payload);
113113
CHIP_ERROR StopConnectOverSoftAP();
114-
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
115114
CHIP_ERROR StartDiscoverOverWiFiPAF(SetupPayload & payload);
116115
CHIP_ERROR StopConnectOverWiFiPAF();
117-
#endif
118116

119117
// Returns whether we have kicked off a new connection attempt.
120118
bool ConnectToDiscoveredDevice();

src/include/platform/CHIPDeviceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@
428428
/**
429429
* CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
430430
*
431-
* Name of the WiFiPAF commission function
431+
* Enable support for the WiFiPAF commissioning function
432432
*/
433433
#ifndef CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
434434
#define CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF 0

0 commit comments

Comments
 (0)