diff --git a/src/include/platform/internal/DeviceNetworkProvisioning.h b/src/include/platform/internal/DeviceNetworkProvisioningDelegate.h similarity index 96% rename from src/include/platform/internal/DeviceNetworkProvisioning.h rename to src/include/platform/internal/DeviceNetworkProvisioningDelegate.h index 3dd692fc32963e..1a70d2ff6b61d7 100644 --- a/src/include/platform/internal/DeviceNetworkProvisioning.h +++ b/src/include/platform/internal/DeviceNetworkProvisioningDelegate.h @@ -24,6 +24,7 @@ #pragma once #include +#include #include namespace chip { diff --git a/src/include/platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h b/src/include/platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h deleted file mode 100644 index 66768752790653..00000000000000 --- a/src/include/platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * - * Copyright (c) 2020 Project CHIP Authors - * Copyright (c) 2018 Nest Labs, Inc. - * All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include - -#include "DeviceNetworkProvisioning.h" - -namespace chip { -namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl : public DeviceNetworkProvisioningDelegate -{ -public: - CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; - CHIP_ERROR ProvisionThread(ByteSpan threadData) override; - -private: - ImplClass * Impl() { return static_cast(this); } -}; - -template -inline CHIP_ERROR GenericDeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * passwd) -{ - return Impl()->_ProvisionWiFiNetwork(ssid, passwd); -} - -template -inline CHIP_ERROR GenericDeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) -{ - return Impl()->_ProvisionThreadNetwork(threadData); -} - -} // namespace Internal -} // namespace DeviceLayer -} // namespace chip diff --git a/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.cpp index 0a9aa91e0d900b..89fa92e9ff6367 100644 --- a/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.cpp @@ -25,7 +25,7 @@ namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key) { CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.h index 2492fba40c367a..2ae4e39e7a58cf 100644 --- a/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.h @@ -18,26 +18,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { -private: - friend class GenericDeviceNetworkProvisioningDelegateImpl; - - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; } +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; } }; } // namespace DeviceLayer diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn index 10f641e444ec3a..0ccde369725abc 100644 --- a/src/platform/BUILD.gn +++ b/src/platform/BUILD.gn @@ -343,7 +343,7 @@ if (chip_device_platform != "none") { "../include/platform/internal/BLEManager.h", "../include/platform/internal/CHIPDeviceLayerInternal.h", "../include/platform/internal/DeviceNetworkInfo.h", - "../include/platform/internal/DeviceNetworkProvisioning.h", + "../include/platform/internal/DeviceNetworkProvisioningDelegate.h", "../include/platform/internal/EventLogging.h", "../include/platform/internal/GenericConfigurationManagerImpl.h", "../include/platform/internal/GenericConfigurationManagerImpl.ipp", diff --git a/src/platform/Darwin/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Darwin/DeviceNetworkProvisioningDelegateImpl.h index 872c3f9c59469d..adcdfb65dc7208 100644 --- a/src/platform/Darwin/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/Darwin/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; } - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; } +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; } + CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; } }; } // namespace DeviceLayer diff --git a/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.cpp index 743dbda0eaf127..b0c946429f9b6f 100644 --- a/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.cpp @@ -28,7 +28,7 @@ namespace chip { namespace DeviceLayer { CHIP_ERROR -DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_ENABLE_OPENTHREAD CHIP_ERROR error = CHIP_NO_ERROR; @@ -44,7 +44,7 @@ DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadDa } #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key) { CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.h index 6eb53530c0c8d1..16ec2e9283bb9f 100644 --- a/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.h @@ -17,30 +17,20 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: +public: #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; #else - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; } + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; } #endif - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.cpp index aa2bef3b2fc6b8..198a04f108d444 100644 --- a/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.cpp @@ -24,7 +24,7 @@ namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key) { #if CHIP_DEVICE_CONFIG_ENABLE_WIFI CHIP_ERROR err = CHIP_NO_ERROR; @@ -40,7 +40,7 @@ CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const ch #endif } -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_DEVICE_CONFIG_ENABLE_THREAD CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.h index 102699448bd6bc..c69309c92b9a99 100644 --- a/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { -private: - friend class GenericDeviceNetworkProvisioningDelegateImpl; - - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp index 57d9a29113e9fc..aec09109d7af26 100644 --- a/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp @@ -20,7 +20,7 @@ namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_DEVICE_CONFIG_ENABLE_THREAD CHIP_ERROR error = CHIP_NO_ERROR; diff --git a/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.h index e799358e4b7536..9eb0cb979ebaf8 100644 --- a/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; } - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; } + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.cpp index 11919deab2b26e..d7f36db4423c02 100644 --- a/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.cpp @@ -24,7 +24,7 @@ namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * passwd) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * passwd) { CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.h index 776b0bc28d777d..1880572b69030f 100644 --- a/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { -private: - friend class GenericDeviceNetworkProvisioningDelegateImpl; - - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; } +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; } }; } // namespace DeviceLayer diff --git a/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.cpp index 11bfe89cf6752e..693921e8235293 100644 --- a/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.cpp @@ -23,7 +23,7 @@ namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key) { CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.h index 47c9f0f6e8262c..fee3eebdf984ce 100644 --- a/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,19 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +/** + * Concrete implementation of the DeviceNetworkProvisioningDelegate for Linux platforms. + */ +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; } +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; } }; } // namespace DeviceLayer diff --git a/src/platform/Tizen/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Tizen/DeviceNetworkProvisioningDelegateImpl.cpp index 6f6134f23027d1..a0a04c2dc8caac 100644 --- a/src/platform/Tizen/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/Tizen/DeviceNetworkProvisioningDelegateImpl.cpp @@ -23,7 +23,7 @@ namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key) { CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/platform/Tizen/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Tizen/DeviceNetworkProvisioningDelegateImpl.h index b1d7d8d152dd1c..1880572b69030f 100644 --- a/src/platform/Tizen/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/Tizen/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; } +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; } }; } // namespace DeviceLayer diff --git a/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.cpp index 2e75cfc0022518..287550032082a8 100644 --- a/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.cpp @@ -25,7 +25,7 @@ namespace chip { namespace DeviceLayer { CHIP_ERROR -DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_ENABLE_OPENTHREAD CHIP_ERROR error = CHIP_NO_ERROR; diff --git a/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.h index e799358e4b7536..adcdfb65dc7208 100644 --- a/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/Zephyr/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; } - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; } + CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; } }; } // namespace DeviceLayer diff --git a/src/platform/android/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/android/DeviceNetworkProvisioningDelegateImpl.cpp index ad7464014fdea2..99063904d843d3 100644 --- a/src/platform/android/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/android/DeviceNetworkProvisioningDelegateImpl.cpp @@ -23,7 +23,7 @@ namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key) { CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/platform/android/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/android/DeviceNetworkProvisioningDelegateImpl.h index 4b011503f9020c..a5f581798c31fe 100644 --- a/src/platform/android/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/android/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; } +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; } }; } // namespace DeviceLayer diff --git a/src/platform/bouffalolab/BL602/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/bouffalolab/BL602/DeviceNetworkProvisioningDelegateImpl.cpp index 6a8474c9e59f69..495c8cf65ba4ac 100644 --- a/src/platform/bouffalolab/BL602/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/bouffalolab/BL602/DeviceNetworkProvisioningDelegateImpl.cpp @@ -29,7 +29,7 @@ using namespace ::chip::DeviceLayer::Internal; namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key) { // BL602Config::WriteWifiInfo(ssid, passwd); diff --git a/src/platform/bouffalolab/BL602/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/bouffalolab/BL602/DeviceNetworkProvisioningDelegateImpl.h index 47c9f0f6e8262c..4439c841f31874 100644 --- a/src/platform/bouffalolab/BL602/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/bouffalolab/BL602/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; } +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; } }; } // namespace DeviceLayer diff --git a/src/platform/bouffalolab/BL702/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/bouffalolab/BL702/DeviceNetworkProvisioningDelegateImpl.cpp index c96218933aff2c..ba6c0fba20d1c7 100644 --- a/src/platform/bouffalolab/BL702/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/bouffalolab/BL702/DeviceNetworkProvisioningDelegateImpl.cpp @@ -33,7 +33,7 @@ namespace chip { namespace DeviceLayer { CHIP_ERROR -DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_ENABLE_OPENTHREAD CHIP_ERROR error = CHIP_NO_ERROR; @@ -49,7 +49,7 @@ DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadDa } CHIP_ERROR -DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * passwd) +DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * passwd) { #if CHIP_DEVICE_CONFIG_ENABLE_WIFI CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/platform/bouffalolab/BL702/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/bouffalolab/BL702/DeviceNetworkProvisioningDelegateImpl.h index d81c3c9821db8a..803f4c8aafd973 100644 --- a/src/platform/bouffalolab/BL702/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/bouffalolab/BL702/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/cc13x2_26x2/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/cc13x2_26x2/DeviceNetworkProvisioningDelegateImpl.cpp index 0f87641906c80b..d893a9170b16b6 100644 --- a/src/platform/cc13x2_26x2/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/cc13x2_26x2/DeviceNetworkProvisioningDelegateImpl.cpp @@ -25,7 +25,7 @@ namespace chip { namespace DeviceLayer { CHIP_ERROR -DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_ENABLE_OPENTHREAD CHIP_ERROR error = CHIP_NO_ERROR; diff --git a/src/platform/cc13x2_26x2/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/cc13x2_26x2/DeviceNetworkProvisioningDelegateImpl.h index e799358e4b7536..9eb0cb979ebaf8 100644 --- a/src/platform/cc13x2_26x2/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/cc13x2_26x2/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; } - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; } + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/cc32xx/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/cc32xx/DeviceNetworkProvisioningDelegateImpl.cpp index 0f87641906c80b..d893a9170b16b6 100644 --- a/src/platform/cc32xx/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/cc32xx/DeviceNetworkProvisioningDelegateImpl.cpp @@ -25,7 +25,7 @@ namespace chip { namespace DeviceLayer { CHIP_ERROR -DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_ENABLE_OPENTHREAD CHIP_ERROR error = CHIP_NO_ERROR; diff --git a/src/platform/cc32xx/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/cc32xx/DeviceNetworkProvisioningDelegateImpl.h index e799358e4b7536..9eb0cb979ebaf8 100644 --- a/src/platform/cc32xx/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/cc32xx/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; } - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; } + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/mbed/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/mbed/DeviceNetworkProvisioningDelegateImpl.cpp index e31e7093103dff..5a3debf5059bd1 100644 --- a/src/platform/mbed/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/mbed/DeviceNetworkProvisioningDelegateImpl.cpp @@ -25,7 +25,7 @@ using namespace ::chip::DeviceLayer::NetworkCommissioning; namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key) { #if CHIP_DEVICE_CONFIG_ENABLE_WIFI MutableCharSpan emptyBufferForDebugText; @@ -46,7 +46,7 @@ CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const ch #endif } -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; } diff --git a/src/platform/mbed/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/mbed/DeviceNetworkProvisioningDelegateImpl.h index 102699448bd6bc..c69309c92b9a99 100644 --- a/src/platform/mbed/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/mbed/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { -private: - friend class GenericDeviceNetworkProvisioningDelegateImpl; - - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/mt793x/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/mt793x/DeviceNetworkProvisioningDelegateImpl.cpp index a5f1621a6cce1a..48417c74eced76 100644 --- a/src/platform/mt793x/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/mt793x/DeviceNetworkProvisioningDelegateImpl.cpp @@ -28,7 +28,7 @@ namespace chip { namespace DeviceLayer { CHIP_ERROR -DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_ENABLE_OPENTHREAD CHIP_ERROR error = CHIP_NO_ERROR; @@ -44,7 +44,7 @@ DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadDa } #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key) { CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/platform/mt793x/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/mt793x/DeviceNetworkProvisioningDelegateImpl.h index 6eb53530c0c8d1..16ec2e9283bb9f 100644 --- a/src/platform/mt793x/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/mt793x/DeviceNetworkProvisioningDelegateImpl.h @@ -17,30 +17,20 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: +public: #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; #else - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; } + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; } #endif - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/nrfconnect/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/nrfconnect/DeviceNetworkProvisioningDelegateImpl.cpp index 0f87641906c80b..d893a9170b16b6 100644 --- a/src/platform/nrfconnect/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/nrfconnect/DeviceNetworkProvisioningDelegateImpl.cpp @@ -25,7 +25,7 @@ namespace chip { namespace DeviceLayer { CHIP_ERROR -DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_ENABLE_OPENTHREAD CHIP_ERROR error = CHIP_NO_ERROR; diff --git a/src/platform/nrfconnect/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/nrfconnect/DeviceNetworkProvisioningDelegateImpl.h index e799358e4b7536..9eb0cb979ebaf8 100644 --- a/src/platform/nrfconnect/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/nrfconnect/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; } - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; } + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/nxp/k32w/k32w0/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/nxp/k32w/k32w0/DeviceNetworkProvisioningDelegateImpl.cpp index 2915e85c40bbcb..51add4ccb43963 100644 --- a/src/platform/nxp/k32w/k32w0/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/nxp/k32w/k32w0/DeviceNetworkProvisioningDelegateImpl.cpp @@ -25,7 +25,7 @@ namespace chip { namespace DeviceLayer { CHIP_ERROR -DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_ENABLE_OPENTHREAD CHIP_ERROR error = CHIP_NO_ERROR; diff --git a/src/platform/nxp/k32w/k32w0/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/nxp/k32w/k32w0/DeviceNetworkProvisioningDelegateImpl.h index e799358e4b7536..0fb033a5d1f8de 100644 --- a/src/platform/nxp/k32w/k32w0/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/nxp/k32w/k32w0/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; } - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; }; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/nxp/mw320/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/nxp/mw320/DeviceNetworkProvisioningDelegateImpl.cpp index 9c7643ccf5c283..0d7171246956ec 100644 --- a/src/platform/nxp/mw320/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/nxp/mw320/DeviceNetworkProvisioningDelegateImpl.cpp @@ -24,7 +24,7 @@ namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -40,7 +40,7 @@ CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const ch return err; } -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_ENABLE_OPENTHREAD CHIP_ERROR error = CHIP_NO_ERROR; diff --git a/src/platform/nxp/mw320/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/nxp/mw320/DeviceNetworkProvisioningDelegateImpl.h index 44d8d1a5397b6b..c69309c92b9a99 100644 --- a/src/platform/nxp/mw320/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/nxp/mw320/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/qpg/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/qpg/DeviceNetworkProvisioningDelegateImpl.cpp index 0f87641906c80b..d893a9170b16b6 100644 --- a/src/platform/qpg/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/qpg/DeviceNetworkProvisioningDelegateImpl.cpp @@ -25,7 +25,7 @@ namespace chip { namespace DeviceLayer { CHIP_ERROR -DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_ENABLE_OPENTHREAD CHIP_ERROR error = CHIP_NO_ERROR; diff --git a/src/platform/qpg/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/qpg/DeviceNetworkProvisioningDelegateImpl.h index e799358e4b7536..9eb0cb979ebaf8 100644 --- a/src/platform/qpg/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/qpg/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; } - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; } + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/telink/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/telink/DeviceNetworkProvisioningDelegateImpl.cpp index dd26ee538b58e7..72e25522953f64 100644 --- a/src/platform/telink/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/telink/DeviceNetworkProvisioningDelegateImpl.cpp @@ -24,7 +24,7 @@ namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData) { #if CHIP_ENABLE_OPENTHREAD CHIP_ERROR error = CHIP_NO_ERROR; diff --git a/src/platform/telink/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/telink/DeviceNetworkProvisioningDelegateImpl.h index 54af21c0c6af27..53d7e4d1c34441 100644 --- a/src/platform/telink/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/telink/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; } - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData); +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; } + CHIP_ERROR ProvisionThread(ByteSpan threadData) override; }; } // namespace DeviceLayer diff --git a/src/platform/webos/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/webos/DeviceNetworkProvisioningDelegateImpl.cpp index 11bfe89cf6752e..693921e8235293 100644 --- a/src/platform/webos/DeviceNetworkProvisioningDelegateImpl.cpp +++ b/src/platform/webos/DeviceNetworkProvisioningDelegateImpl.cpp @@ -23,7 +23,7 @@ namespace chip { namespace DeviceLayer { -CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key) +CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key) { CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/platform/webos/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/webos/DeviceNetworkProvisioningDelegateImpl.h index 47c9f0f6e8262c..4439c841f31874 100644 --- a/src/platform/webos/DeviceNetworkProvisioningDelegateImpl.h +++ b/src/platform/webos/DeviceNetworkProvisioningDelegateImpl.h @@ -17,26 +17,16 @@ #pragma once -#include +#include namespace chip { namespace DeviceLayer { -namespace Internal { - -template -class GenericDeviceNetworkProvisioningDelegateImpl; - -} // namespace Internal - -class DeviceNetworkProvisioningDelegateImpl final - : public Internal::GenericDeviceNetworkProvisioningDelegateImpl +class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate { - friend class GenericDeviceNetworkProvisioningDelegateImpl; - -private: - CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd); - CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; } +public: + CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override; + CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; } }; } // namespace DeviceLayer