From 83deb47a279e9cf1cfd0ca03ed043098aca85356 Mon Sep 17 00:00:00 2001 From: Arkadiusz Bokowy Date: Thu, 21 Jul 2022 17:30:14 +0200 Subject: [PATCH] Remove non-used field from WiFi commissioning driver (#21048) --- src/include/platform/NetworkCommissioning.h | 2 +- src/platform/Ameba/NetworkCommissioningDriver.h | 1 - src/platform/EFR32/NetworkCommissioningWiFiDriver.h | 5 ++--- src/platform/ESP32/NetworkCommissioningDriver.h | 1 - src/platform/Linux/NetworkCommissioningDriver.h | 3 +-- src/platform/P6/NetworkCommissioningDriver.h | 1 - src/platform/Tizen/NetworkCommissioningDriver.h | 1 - src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h | 1 - src/platform/mbed/NetworkCommissioningDriver.h | 1 - src/platform/webos/NetworkCommissioningDriver.h | 3 +-- 10 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/include/platform/NetworkCommissioning.h b/src/include/platform/NetworkCommissioning.h index 589f1d17a61dfb..5880ec56658fca 100644 --- a/src/include/platform/NetworkCommissioning.h +++ b/src/include/platform/NetworkCommissioning.h @@ -135,7 +135,7 @@ class BaseDriver public: /** * @brief Callback for the network driver pushing the event of network status change to the network commissioning cluster. - * The platforms is explected to push the status from operations such as autonomous connection after loss of connectivity or + * The platforms is expected to push the status from operations such as autonomous connection after loss of connectivity or * during initial establishment. * * This function must be called in a thread-safe manner with CHIP stack. diff --git a/src/platform/Ameba/NetworkCommissioningDriver.h b/src/platform/Ameba/NetworkCommissioningDriver.h index 70708df983da45..0303642d3c6396 100644 --- a/src/platform/Ameba/NetworkCommissioningDriver.h +++ b/src/platform/Ameba/NetworkCommissioningDriver.h @@ -127,7 +127,6 @@ class AmebaWiFiDriver final : public WiFiDriver bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId); CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid); - WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this); WiFiNetwork mSavedNetwork; WiFiNetwork mStagingNetwork; ScanCallback * mpScanCallback; diff --git a/src/platform/EFR32/NetworkCommissioningWiFiDriver.h b/src/platform/EFR32/NetworkCommissioningWiFiDriver.h index 411de01e3d1637..d311b11dda43a7 100644 --- a/src/platform/EFR32/NetworkCommissioningWiFiDriver.h +++ b/src/platform/EFR32/NetworkCommissioningWiFiDriver.h @@ -134,9 +134,8 @@ class SlWiFiDriver final : public WiFiDriver bool StartScanWiFiNetworks(ByteSpan ssid); static void OnScanWiFiNetworkDone(wfx_wifi_scan_result_t * aScanResult); - WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this); - WiFiNetwork mSavedNetwork = {}; - WiFiNetwork mStagingNetwork = {}; + WiFiNetwork mSavedNetwork = {}; + WiFiNetwork mStagingNetwork = {}; ScanCallback * mpScanCallback; ConnectCallback * mpConnectCallback; }; diff --git a/src/platform/ESP32/NetworkCommissioningDriver.h b/src/platform/ESP32/NetworkCommissioningDriver.h index d8d9288508e06c..d2c6bb160e745d 100644 --- a/src/platform/ESP32/NetworkCommissioningDriver.h +++ b/src/platform/ESP32/NetworkCommissioningDriver.h @@ -127,7 +127,6 @@ class ESPWiFiDriver final : public WiFiDriver bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId); CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid); - WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this); WiFiNetwork mSavedNetwork; WiFiNetwork mStagingNetwork; ScanCallback * mpScanCallback; diff --git a/src/platform/Linux/NetworkCommissioningDriver.h b/src/platform/Linux/NetworkCommissioningDriver.h index e0e522a29eff3e..1fbe4588fcf264 100644 --- a/src/platform/Linux/NetworkCommissioningDriver.h +++ b/src/platform/Linux/NetworkCommissioningDriver.h @@ -47,7 +47,7 @@ class LinuxScanResponseIterator : public Iterator private: size_t currentIterating = 0; - // Note: We cannot post a event in ScheduleLambda since std::vector is not trivial copiable. + // Note: We cannot post a event in ScheduleLambda since std::vector is not trivial copyable. std::vector * mpScanResponse; }; @@ -102,7 +102,6 @@ class LinuxWiFiDriver final : public WiFiDriver private: bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId); - WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this); WiFiNetwork mSavedNetwork; WiFiNetwork mStagingNetwork; Optional mScanStatus; diff --git a/src/platform/P6/NetworkCommissioningDriver.h b/src/platform/P6/NetworkCommissioningDriver.h index e56967fff761b1..76a232213e92c2 100644 --- a/src/platform/P6/NetworkCommissioningDriver.h +++ b/src/platform/P6/NetworkCommissioningDriver.h @@ -133,7 +133,6 @@ class P6WiFiDriver final : public WiFiDriver bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId); CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid); - WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this); WiFiNetwork mSavedNetwork; WiFiNetwork mStagingNetwork; ScanCallback * mpScanCallback; diff --git a/src/platform/Tizen/NetworkCommissioningDriver.h b/src/platform/Tizen/NetworkCommissioningDriver.h index d128b8ab04b40c..d998d76c6c7384 100644 --- a/src/platform/Tizen/NetworkCommissioningDriver.h +++ b/src/platform/Tizen/NetworkCommissioningDriver.h @@ -74,7 +74,6 @@ class TizenWiFiDriver final : public WiFiDriver private: bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId); - WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this); WiFiNetwork mSavedNetwork; WiFiNetwork mStagingNetwork; }; diff --git a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h index c5bfac61a21383..70090297551aa3 100644 --- a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h +++ b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h @@ -129,7 +129,6 @@ class BLWiFiDriver final : public WiFiDriver bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId); CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid); - WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this); WiFiNetwork mSavedNetwork; WiFiNetwork mStagingNetwork; ScanCallback * mpScanCallback; diff --git a/src/platform/mbed/NetworkCommissioningDriver.h b/src/platform/mbed/NetworkCommissioningDriver.h index 29c917c6b56888..82d83d73558417 100644 --- a/src/platform/mbed/NetworkCommissioningDriver.h +++ b/src/platform/mbed/NetworkCommissioningDriver.h @@ -143,7 +143,6 @@ class WiFiDriverImpl final : public WiFiDriver chip::DeviceLayer::Internal::WiFiAuthSecurityType NsapiToNetworkSecurity(nsapi_security_t nsapi_security); - WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this); WiFiNetwork mSavedNetwork; WiFiNetwork mStagingNetwork; ScanCallback * mScanCallback; diff --git a/src/platform/webos/NetworkCommissioningDriver.h b/src/platform/webos/NetworkCommissioningDriver.h index 330f1b6d03295e..9a9dc45a73957f 100644 --- a/src/platform/webos/NetworkCommissioningDriver.h +++ b/src/platform/webos/NetworkCommissioningDriver.h @@ -47,7 +47,7 @@ class LinuxScanResponseIterator : public Iterator private: size_t currentIterating = 0; - // Note: We cannot post a event in ScheduleLambda since std::vector is not trivial copiable. + // Note: We cannot post a event in ScheduleLambda since std::vector is not trivial copyable. std::vector * mpScanResponse; }; @@ -102,7 +102,6 @@ class LinuxWiFiDriver final : public WiFiDriver private: bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId); - WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this); WiFiNetwork mSavedNetwork; WiFiNetwork mStagingNetwork; Optional mScanStatus;