Skip to content

Commit 2f284f4

Browse files
authored
Replace _NO_NETWORK_COMMISSIONING_DRIVER_ with _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_ (#33608)
1 parent 3d78493 commit 2f284f4

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

examples/shell/genio/include/CHIPProjectConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@
105105
*/
106106
#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
107107

108-
#define _NO_NETWORK_COMMISSIONING_DRIVER_
108+
#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_

examples/shell/mbed/main/include/CHIPProjectConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@
3636

3737
// shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
3838
// Do not instantiate the NETWORK_COMMISSIONING thread driver
39-
#define _NO_NETWORK_COMMISSIONING_DRIVER_
39+
#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_

examples/shell/nrfconnect/CHIPProjectConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434

3535
// shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
3636
// Do not instantiate the NETWORK_COMMISSIONING thread driver
37-
#define _NO_NETWORK_COMMISSIONING_DRIVER_
37+
#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_

examples/shell/qpg/include/CHIPProjectConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
// shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
3838
// Do not instantiate the NETWORK_COMMISSIONING thread driver
39-
#define _NO_NETWORK_COMMISSIONING_DRIVER_
39+
#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
4040

4141
// For convenience, enable Chip Security Test Mode and disable the requirement for
4242
// authentication in various protocols.

examples/shell/telink/include/CHIPProjectConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@
3838

3939
// shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
4040
// Do not instantiate the NETWORK_COMMISSIONING thread driver
41-
#define _NO_NETWORK_COMMISSIONING_DRIVER_
41+
#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_

src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ static_assert(OPENTHREAD_API_VERSION >= 219, "OpenThread version too old");
7474

7575
// Network commissioning
7676
namespace {
77-
#ifndef _NO_NETWORK_COMMISSIONING_DRIVER_
77+
#ifndef _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
7878
NetworkCommissioning::GenericThreadDriver sGenericThreadDriver;
7979
app::Clusters::NetworkCommissioning::Instance
8080
sThreadNetworkCommissioningInstance(CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID /* Endpoint Id */, &sGenericThreadDriver);
8181
#endif
8282

8383
void initNetworkCommissioningThreadDriver(void)
8484
{
85-
#ifndef _NO_NETWORK_COMMISSIONING_DRIVER_
85+
#ifndef _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
8686
sThreadNetworkCommissioningInstance.Init();
8787
#endif
8888
}

src/platform/nxp/rt/rw61x/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ config("nxp_platform_config") {
4646
}
4747
if (chip_enable_wifi && chip_enable_openthread) {
4848
# Disable thread nwk commissioning instance on endpoint 0, when OTBR is enabled
49-
defines += [ "_NO_NETWORK_COMMISSIONING_DRIVER_" ]
49+
defines += [ "_NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_" ]
5050
}
5151
}
5252

src/test_driver/efr32/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ efr32_sdk("sdk") {
5959
"PW_RPC_ENABLED",
6060

6161
# Thread is built but test driver do not have the NETWORK_COMMISSIONING cluster or zap config.
62-
"_NO_NETWORK_COMMISSIONING_DRIVER_",
62+
"_NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_",
6363
]
6464
}
6565

0 commit comments

Comments
 (0)