[WiFI][Shell] Review updates

Author: mihai-ignat

src/lib/shell/commands/WiFi.cpp

@@ -18,6 +18,7 @@
 #include <lib/shell/Commands.h>
 #include <lib/shell/Engine.h>
 #include <lib/shell/commands/Help.h>
+#include <lib/shell/commands/WiFi.h>
 #include <lib/shell/streamer.h>
 #include <lib/support/Span.h>
 #include <platform/CHIPDeviceLayer.h>
@@ -31,11 +32,8 @@ using namespace chip::DeviceLayer::NetworkCommissioning;
 namespace chip {
 namespace Shell {
 
-static chip::Shell::Engine sShellWiFiSubCommands;
-static DeviceLayer::NetworkCommissioning::WiFiDriver * mDriver;
-
-void SetWiFiDriver(chip::DeviceLayer::NetworkCommissioning::WiFiDriver * driver);
-chip::DeviceLayer::NetworkCommissioning::WiFiDriver * GetWiFiDriver();
+static Shell::Engine sShellWiFiSubCommands;
+static DeviceLayer::NetworkCommissioning::WiFiDriver * sDriver;
 
 static CHIP_ERROR WiFiHelpHandler(int argc, char ** argv)
 {
@@ -113,14 +111,14 @@ static CHIP_ERROR WifiAddNetwork(char * ssid, char * password)
 {
     CHIP_ERROR error = CHIP_NO_ERROR;
     uint8_t networkIndex;
-    chip::MutableCharSpan debugText;
-    chip::ByteSpan ssidSpan;
-    chip::ByteSpan passwordSpan;
+    MutableCharSpan debugText;
+    ByteSpan ssidSpan;
+    ByteSpan passwordSpan;
 
     VerifyOrReturnError(GetWiFiDriver() != nullptr, error = CHIP_ERROR_NOT_IMPLEMENTED);
 
-    ssidSpan     = chip::ByteSpan(reinterpret_cast<const uint8_t *>(ssid), strlen(ssid));
-    passwordSpan = chip::ByteSpan(reinterpret_cast<const uint8_t *>(password), strlen(password));
+    ssidSpan     = ByteSpan(reinterpret_cast<const uint8_t *>(ssid), strlen(ssid));
+    passwordSpan = ByteSpan(reinterpret_cast<const uint8_t *>(password), strlen(password));
 
     if (IsSpanUsable(ssidSpan) && IsSpanUsable(passwordSpan))
     {
@@ -141,7 +139,7 @@ static CHIP_ERROR WiFiConnectHandler(int argc, char ** argv)
 {
     CHIP_ERROR error = CHIP_NO_ERROR;
     bool connectToNetwork = false;
-    chip::ByteSpan ssidSpan;
+    ByteSpan ssidSpan;
 
     VerifyOrReturnError(GetWiFiDriver() != nullptr, error = CHIP_ERROR_NOT_IMPLEMENTED);
 
@@ -153,14 +151,14 @@ static CHIP_ERROR WiFiConnectHandler(int argc, char ** argv)
     {
         /* Retrieve previously added SSID */
         char ssid[DeviceLayer::Internal::kMaxWiFiSSIDLength + 1] = { 0 };
-        chip::MutableCharSpan ssidMutableSpan(ssid);
+        MutableCharSpan ssidMutableSpan(ssid);
 
         VerifyOrReturnError(ConnectivityMgr().GetNetworkSSID(ssidMutableSpan) == CHIP_NO_ERROR, error = CHIP_ERROR_BUFFER_TOO_SMALL);
 
         if (IsSpanUsable(ssidMutableSpan))
         {
             connectToNetwork = true;
-            ssidSpan = chip::ByteSpan(reinterpret_cast<const uint8_t *>(ssidMutableSpan.data()), ssidMutableSpan.size());
+            ssidSpan = ByteSpan(reinterpret_cast<const uint8_t *>(ssidMutableSpan.data()), ssidMutableSpan.size());
         }
         else
         {
@@ -172,7 +170,7 @@ static CHIP_ERROR WiFiConnectHandler(int argc, char ** argv)
     }
     else if (argc == 2)
     {
-        ssidSpan = chip::ByteSpan(reinterpret_cast<const uint8_t *>(argv[0]), strlen(argv[0]));
+        ssidSpan = ByteSpan(reinterpret_cast<const uint8_t *>(argv[0]), strlen(argv[0]));
 
         if ((IsSpanUsable(ssidSpan)) && (WifiAddNetwork(argv[0], argv[1]) == CHIP_NO_ERROR))
         {
@@ -213,20 +211,20 @@ static CHIP_ERROR WiFiRemoveNwkHandler(int argc, char ** argv)
 {
     VerifyOrReturnError(GetWiFiDriver() != nullptr, CHIP_ERROR_NOT_IMPLEMENTED);
 
-    chip::DeviceLayer::NetworkCommissioning::Status status;
+    DeviceLayer::NetworkCommissioning::Status status;
     uint8_t networkIndex;
-    chip::ByteSpan ssidSpan;
+    ByteSpan ssidSpan;
     char ssid[DeviceLayer::Internal::kMaxWiFiSSIDLength + 1] = { 0 };
-    chip::MutableCharSpan debugText;
-    chip::MutableCharSpan ssidMutableSpan(ssid);
+    MutableCharSpan debugText;
+    MutableCharSpan ssidMutableSpan(ssid);
 
     VerifyOrReturnError(ConnectivityMgr().GetNetworkSSID(ssidMutableSpan) == CHIP_NO_ERROR, CHIP_ERROR_BUFFER_TOO_SMALL);
 
-    ssidSpan = chip::ByteSpan(reinterpret_cast<const uint8_t *>(ssidMutableSpan.data()), ssidMutableSpan.size());
+    ssidSpan = ByteSpan(reinterpret_cast<const uint8_t *>(ssidMutableSpan.data()), ssidMutableSpan.size());
 
     status = GetWiFiDriver()->RemoveNetwork(ssidSpan, debugText, networkIndex);
 
-    if (status != chip::DeviceLayer::NetworkCommissioning::Status::kSuccess)
+    if (status != DeviceLayer::NetworkCommissioning::Status::kSuccess)
     {
         ChipLogError(DeviceLayer, "[Shell] Error: RemoveNetwork: %u", (uint8_t) status);
     }
@@ -236,7 +234,7 @@ static CHIP_ERROR WiFiRemoveNwkHandler(int argc, char ** argv)
 
 static CHIP_ERROR WiFiScanHandler(int argc, char ** argv)
 {
-    chip::ByteSpan ssidSpan;
+    ByteSpan ssidSpan;
 
     VerifyOrReturnError(GetWiFiDriver() != nullptr, CHIP_ERROR_NOT_IMPLEMENTED);
 
@@ -246,11 +244,11 @@ static CHIP_ERROR WiFiScanHandler(int argc, char ** argv)
 
     if (argc == 0)
     {
-        ssidSpan = chip::ByteSpan();
+        ssidSpan = ByteSpan();
     }
     else if (argc == 1)
     {
-        ssidSpan = chip::ByteSpan(reinterpret_cast<const uint8_t *>(argv[0]), strlen(argv[0]));
+        ssidSpan = ByteSpan(reinterpret_cast<const uint8_t *>(argv[0]), strlen(argv[0]));
     }
 
     GetWiFiDriver()->ScanNetworks(ssidSpan, nullptr);
@@ -267,14 +265,14 @@ static CHIP_ERROR WiFiDispatch(int argc, char ** argv)
     return sShellWiFiSubCommands.ExecCommand(argc, argv);
 }
 
-void SetWiFiDriver(chip::DeviceLayer::NetworkCommissioning::WiFiDriver * driver)
+void SetWiFiDriver(WiFiDriver * driver)
 {
-    mDriver = driver;
+    sDriver = driver;
 }
 
-chip::DeviceLayer::NetworkCommissioning::WiFiDriver * GetWiFiDriver()
+WiFiDriver * GetWiFiDriver()
 {
-    return mDriver;
+    return sDriver;
 }
 
 void RegisterWiFiCommands()

src/lib/shell/commands/WiFi.h

@@ -23,12 +23,15 @@
 #pragma once
 
 #include <lib/shell/Engine.h>
+#include <platform/NetworkCommissioning.h>
+
+using namespace chip::DeviceLayer::NetworkCommissioning;
 
 namespace chip {
 namespace Shell {
 
-void SetWiFiDriver(chip::DeviceLayer::NetworkCommissioning::WiFiDriver * driver);
-chip::DeviceLayer::NetworkCommissioning::WiFiDriver * GetWiFiDriver(void);
+void SetWiFiDriver(WiFiDriver * driver);
+WiFiDriver * GetWiFiDriver();
 
 } // namespace Shell
 } // namespace chip