[NXP][platform][common] Update RemoveNetwork and Disconnect functions and enable CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION for all NXP WiFi platforms

Author: mihai-ignat

examples/platform/nxp/common/app_task/source/AppTaskBase.cpp

@@ -62,6 +62,10 @@
 #include <app/clusters/ota-requestor/OTATestEventTriggerDelegate.h>
 #endif
 
+#ifdef ENABLE_CHIP_SHELL
+#include <lib/shell/commands/WiFi.h>
+#endif
+
 using namespace chip;
 using namespace chip::TLV;
 using namespace ::chip::Credentials;
@@ -202,6 +206,9 @@ CHIP_ERROR chip::NXP::App::AppTaskBase::Init()
 
 #if CONFIG_CHIP_WIFI || CHIP_DEVICE_CONFIG_ENABLE_WPA
     sNetworkCommissioningInstance.Init();
+#ifdef ENABLE_CHIP_SHELL
+    Shell::SetWiFiDriver(chip::NXP::App::GetAppTask().GetWifiDriverInstance());
+#endif
 #endif
 #if CONFIG_CHIP_OTA_REQUESTOR
     if (err == CHIP_NO_ERROR)

src/platform/nxp/common/ConnectivityManagerImpl.cpp

@@ -590,6 +590,34 @@ void ConnectivityManagerImpl::ConnectNetworkTimerHandler(::chip::System::Layer *
         PlatformMgr().UnlockChipStack();
     }
 }
+
+/* Can be used to disconnect from WiFi network.
+ */
+CHIP_ERROR ConnectivityManagerImpl::_DisconnectNetwork(void)
+{
+    int ret = 0;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    if (ConnectivityMgrImpl().IsWiFiStationConnected())
+    {
+        ChipLogProgress(NetworkProvisioning, "Disconnecting from WiFi network.");
+
+        ret = wlan_disconnect();
+
+        if (ret != WM_SUCCESS)
+        {
+            ChipLogError(NetworkProvisioning, "Failed to disconnect from network with error: %u", (uint8_t) ret);
+            err = CHIP_ERROR_UNEXPECTED_EVENT;
+        }
+    }
+    else
+    {
+        ChipLogError(NetworkProvisioning, "Error: WiFi not connected!");
+        err = CHIP_ERROR_INCORRECT_STATE;
+    }
+
+    return err;
+}
 #endif
 
 } // namespace DeviceLayer

src/platform/nxp/common/ConnectivityManagerImpl.h

@@ -115,6 +115,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
     bool _IsWiFiStationEnabled();
     bool _IsWiFiStationConnected();
     bool _IsWiFiStationApplicationControlled();
+    CHIP_ERROR _DisconnectNetwork(void);
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
 
     // ===== Members for internal use by the following friends.

src/platform/nxp/common/NetworkCommissioningDriver.h

@@ -72,10 +72,6 @@ class NXPWiFiDriver final : public WiFiDriver
     Status ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText) override;
     void ConnectNetwork(ByteSpan networkId, ConnectCallback * callback) override;
 
-    /* Can be used to disconnect from WiFi network.
-     */
-    int DisconnectNetwork();
-
     /* Returns the network SSID. User needs to allocate a buffer of size >= DeviceLayer::Internal::kMaxWiFiSSIDLength.
      * ssid - pointer to the returned SSID
      */

src/platform/nxp/common/NetworkCommissioningWiFiDriver.cpp

@@ -142,14 +142,39 @@ Status NXPWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, Mu
 
 Status NXPWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex)
 {
+    int err_code = 0;
+
     outDebugText.reduce_size(0);
     outNetworkIndex = 0;
     VerifyOrReturnError(NetworkMatch(mStagingNetwork, networkId), Status::kNetworkIDNotFound);
 
-    // Use empty ssid for representing invalid network
-    mStagingNetwork.ssidLen = 0;
-    memset(mStagingNetwork.ssid, 0, DeviceLayer::Internal::kMaxWiFiSSIDLength);
-    memset(mStagingNetwork.credentials, 0, DeviceLayer::Internal::kMaxWiFiKeyLength);
+    err_code = wlan_remove_network((char *)networkId.data());
+
+    switch (err_code)
+    {
+        case -WM_E_INVAL:
+            ChipLogError(DeviceLayer, "Error: Network not found");
+            break;
+
+        case WM_SUCCESS:
+            /* Use empty ssid for representing invalid network */
+            mStagingNetwork.ssidLen = 0;
+            memset(mStagingNetwork.ssid, 0, DeviceLayer::Internal::kMaxWiFiSSIDLength);
+            memset(mStagingNetwork.credentials, 0, DeviceLayer::Internal::kMaxWiFiKeyLength);
+            /* Save to persistent memory */
+            CommitConfiguration();
+            ChipLogProgress(DeviceLayer, "Successfully removed network");
+            break;
+
+        case WLAN_ERROR_STATE:
+            ChipLogError(DeviceLayer, "Error: Can't remove network in this state");
+            break;
+
+        default:
+            ChipLogError(DeviceLayer, "Error: Unable to remove network");
+            break;
+    }
+
     return Status::kSuccess;
 }
 
@@ -238,29 +263,6 @@ void NXPWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callbac
     }
 }
 
-int NXPWiFiDriver::DisconnectNetwork(void)
-{
-    int ret = 0;
-
-    if (ConnectivityMgrImpl().IsWiFiStationConnected())
-    {
-        ChipLogProgress(NetworkProvisioning, "Disconnecting from WiFi network.");
-
-        ret = wlan_disconnect();
-
-        if (ret != WM_SUCCESS)
-        {
-            ChipLogError(NetworkProvisioning, "Failed to disconnect from network with error: %u", (uint8_t) ret);
-        }
-    }
-    else
-    {
-        ChipLogError(NetworkProvisioning, "Error: WiFi not connected!");
-    }
-
-    return ret;
-}
-
 CHIP_ERROR NXPWiFiDriver::StartScanWiFiNetworks(ByteSpan ssid)
 {
     wlan_scan_params_v2_t wlan_scan_param;

third_party/nxp/rt_sdk/rt_sdk.gni

@@ -562,11 +562,7 @@ template("rt_sdk") {
     }
 
     if (chip_enable_wifi) {
-      if (!w8801_transceiver) {
-        defines += [ "CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION=1" ]
-      } else {
-        defines += [ "CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION=0" ]
-      }
+      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION=1" ]
     }
 
     # Now add our "system-header" include dirs