Replace _NO_NETWORK_COMMISSIONING_DRIVER_ with _NO_GENERIC_THREAD_NET…

…WORK_COMMISSIONING_DRIVER_ (project-chip#33608)
joonhaengHeo · Jun 14, 2024 · 2f284f4 · 2f284f4
1 parent 3d78493
commit 2f284f4
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/examples/shell/genio/include/CHIPProjectConfig.h b/examples/shell/genio/include/CHIPProjectConfig.h
@@ -105,4 +105,4 @@
  */
 #define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
 
-#define _NO_NETWORK_COMMISSIONING_DRIVER_
+#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
diff --git a/examples/shell/mbed/main/include/CHIPProjectConfig.h b/examples/shell/mbed/main/include/CHIPProjectConfig.h
@@ -36,4 +36,4 @@
 
 // shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
 // Do not instantiate the NETWORK_COMMISSIONING thread driver
-#define _NO_NETWORK_COMMISSIONING_DRIVER_
+#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
diff --git a/examples/shell/nrfconnect/CHIPProjectConfig.h b/examples/shell/nrfconnect/CHIPProjectConfig.h
@@ -34,4 +34,4 @@
 
 // shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
 // Do not instantiate the NETWORK_COMMISSIONING thread driver
-#define _NO_NETWORK_COMMISSIONING_DRIVER_
+#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
diff --git a/examples/shell/qpg/include/CHIPProjectConfig.h b/examples/shell/qpg/include/CHIPProjectConfig.h
@@ -36,7 +36,7 @@
 
 // shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
 // Do not instantiate the NETWORK_COMMISSIONING thread driver
-#define _NO_NETWORK_COMMISSIONING_DRIVER_
+#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
 
 // For convenience, enable Chip Security Test Mode and disable the requirement for
 // authentication in various protocols.

diff --git a/examples/shell/telink/include/CHIPProjectConfig.h b/examples/shell/telink/include/CHIPProjectConfig.h
@@ -38,4 +38,4 @@
 
 // shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
 // Do not instantiate the NETWORK_COMMISSIONING thread driver
-#define _NO_NETWORK_COMMISSIONING_DRIVER_
+#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp
@@ -74,15 +74,15 @@ static_assert(OPENTHREAD_API_VERSION >= 219, "OpenThread version too old");
 
 // Network commissioning
 namespace {
-#ifndef _NO_NETWORK_COMMISSIONING_DRIVER_
+#ifndef _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
 NetworkCommissioning::GenericThreadDriver sGenericThreadDriver;
 app::Clusters::NetworkCommissioning::Instance
  sThreadNetworkCommissioningInstance(CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID /* Endpoint Id */, &sGenericThreadDriver);
 #endif
 
 void initNetworkCommissioningThreadDriver(void)
 {
-#ifndef _NO_NETWORK_COMMISSIONING_DRIVER_
+#ifndef _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
  sThreadNetworkCommissioningInstance.Init();
 #endif
 }

diff --git a/src/platform/nxp/rt/rw61x/BUILD.gn b/src/platform/nxp/rt/rw61x/BUILD.gn
@@ -46,7 +46,7 @@ config("nxp_platform_config") {
  }
  if (chip_enable_wifi && chip_enable_openthread) {
  # Disable thread nwk commissioning instance on endpoint 0, when OTBR is enabled
- defines += [ "_NO_NETWORK_COMMISSIONING_DRIVER_" ]
+ defines += [ "_NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_" ]
  }
 }
 

diff --git a/src/test_driver/efr32/BUILD.gn b/src/test_driver/efr32/BUILD.gn
@@ -59,7 +59,7 @@ efr32_sdk("sdk") {
  "PW_RPC_ENABLED",
 
  # Thread is built but test driver do not have the NETWORK_COMMISSIONING cluster or zap config.
- "_NO_NETWORK_COMMISSIONING_DRIVER_",
+ "_NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_",
  ]
 }