restyle

project-chip · May 15, 2023 · 57c429e · 57c429e
1 parent 9283848
commit 57c429e
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 51 deletions.
diff --git a/src/platform/Ameba/AmebaConfig.cpp b/src/platform/Ameba/AmebaConfig.cpp
@@ -93,7 +93,7 @@ CHIP_ERROR AmebaConfig::ReadConfigValue(Key key, bool & val)
     uint8_t intVal;
 
     error = getPref_bool_new(key.Namespace, key.Name, &intVal);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "getPref_bool_new: %s/%s failed\n", StringOrNullMarker(key.Namespace),
@@ -110,7 +110,7 @@ CHIP_ERROR AmebaConfig::ReadConfigValue(Key key, uint32_t & val)
     int32_t error;
 
     error = getPref_u32_new(key.Namespace, key.Name, &val);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "getPref_u32_new: %s/%s failed\n", StringOrNullMarker(key.Namespace),
@@ -126,7 +126,7 @@ CHIP_ERROR AmebaConfig::ReadConfigValue(Key key, uint64_t & val)
     int32_t error;
 
     error = getPref_u64_new(key.Namespace, key.Name, &val);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "getPref_u64: %s/%s failed\n", StringOrNullMarker(key.Namespace),
@@ -142,7 +142,7 @@ CHIP_ERROR AmebaConfig::ReadConfigValueStr(Key key, char * buf, size_t bufSize,
     int32_t error;
 
     error = getPref_str_new(key.Namespace, key.Name, buf, bufSize, &outLen);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     outLen -= 1; // Don't count trailing null
     if (err != CHIP_NO_ERROR)
     {
@@ -160,7 +160,7 @@ CHIP_ERROR AmebaConfig::ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSiz
     int32_t error;
 
     error = getPref_bin_new(key.Namespace, key.Name, buf, bufSize, &outLen);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "getPref_bin_new: %s/%s failed\n", StringOrNullMarker(key.Namespace),
@@ -190,9 +190,9 @@ CHIP_ERROR AmebaConfig::WriteConfigValue(Key key, bool val)
             ChipLogError(DeviceLayer, "Warning, KVS leakage, failed to remove old KVS value");
         }
     }
-    
+
     error = setPref_new(key.Namespace, key.Name, &value, 1);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(DeviceLayer, "setPref: %s/%s = %s failed\n", StringOrNullMarker(key.Namespace), StringOrNullMarker(key.Name),
@@ -220,9 +220,9 @@ CHIP_ERROR AmebaConfig::WriteConfigValue(Key key, uint32_t val)
             ChipLogError(DeviceLayer, "Warning, KVS leakage, failed to remove old KVS value");
         }
     }
-    
+
     error = setPref_new(key.Namespace, key.Name, (uint8_t *) &val, sizeof(uint32_t));
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(DeviceLayer, "setPref: %s/%s = %d(0x%x) failed\n", StringOrNullMarker(key.Namespace),
@@ -250,9 +250,9 @@ CHIP_ERROR AmebaConfig::WriteConfigValue(Key key, uint64_t val)
             ChipLogError(DeviceLayer, "Warning, KVS leakage, failed to remove old KVS value");
         }
     }
-    
+
     error = setPref_new(key.Namespace, key.Name, (uint8_t *) &val, sizeof(uint64_t));
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(DeviceLayer, "setPref: %s/%s = %d(0x%x) failed\n", StringOrNullMarker(key.Namespace),
@@ -280,9 +280,9 @@ CHIP_ERROR AmebaConfig::WriteConfigValueStr(Key key, const char * str)
             ChipLogError(DeviceLayer, "Warning, KVS leakage, failed to remove old KVS value");
         }
     }
-    
+
     error = setPref_new(key.Namespace, key.Name, (uint8_t *) str, strlen(str) + 1);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(DeviceLayer, "setPref: %s/%s = %s failed\n", StringOrNullMarker(key.Namespace), StringOrNullMarker(key.Name),
@@ -326,9 +326,9 @@ CHIP_ERROR AmebaConfig::WriteConfigValueBin(Key key, const uint8_t * data, size_
             ChipLogError(DeviceLayer, "Warning, KVS leakage, failed to remove old KVS value");
         }
     }
-    
+
     error = setPref_new(key.Namespace, key.Name, (uint8_t *) data, dataLen);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(DeviceLayer, "setPref: %s/%s failed\n", StringOrNullMarker(key.Namespace), StringOrNullMarker(key.Name));
@@ -348,7 +348,7 @@ CHIP_ERROR AmebaConfig::ClearConfigValue(Key key)
     int32_t error;
 
     error = deleteKey(key.Namespace, key.Name);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "%s : %s/%s failed\n", __FUNCTION__, StringOrNullMarker(key.Namespace),
@@ -373,15 +373,15 @@ CHIP_ERROR AmebaConfig::InitNamespace()
     int32_t error;
 
     error = registerPref();
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(DeviceLayer, "DCT modules registration failed");
         goto exit;
     }
 
     error = registerPref2();
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(DeviceLayer, "DCT2 modules registration failed");
@@ -397,15 +397,15 @@ CHIP_ERROR AmebaConfig::ClearNamespace()
     int32_t error;
 
     error = clearPref();
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(DeviceLayer, "DCT modules unregistration failed\n");
         goto exit;
     }
 
     error = clearPref2();
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(DeviceLayer, "DCT2 modules unregistration failed\n");

diff --git a/src/platform/Ameba/AmebaUtils.cpp b/src/platform/Ameba/AmebaUtils.cpp
@@ -41,7 +41,7 @@ constexpr char kWiFiCredentialsKeyName[] = "wifi-pass";
 CHIP_ERROR AmebaUtils::StartWiFi(void)
 {
     // Ensure that the WiFi layer is started.
-    int32_t error = matter_wifi_on(RTW_MODE_STA);
+    int32_t error  = matter_wifi_on(RTW_MODE_STA);
     CHIP_ERROR err = MapError(error, AmebaErrorType::kWiFiError);
     return CHIP_NO_ERROR; // will fail if wifi is already initialized, let it pass
 }
@@ -60,16 +60,16 @@ bool AmebaUtils::IsStationProvisioned(void)
 
 CHIP_ERROR AmebaUtils::IsStationConnected(bool & connected)
 {
-    int32_t error = matter_wifi_is_connected_to_ap();
+    int32_t error  = matter_wifi_is_connected_to_ap();
     CHIP_ERROR err = MapError(error, AmebaErrorType::kWiFiError);
-    connected = (err == CHIP_NO_ERROR) ? true : false;
+    connected      = (err == CHIP_NO_ERROR) ? true : false;
     return err;
 }
 
 CHIP_ERROR AmebaUtils::EnableStationMode(void)
 {
     // Ensure that station mode is enabled in the WiFi layer.
-    int32_t error = matter_wifi_set_mode(RTW_MODE_STA);
+    int32_t error  = matter_wifi_set_mode(RTW_MODE_STA);
     CHIP_ERROR err = MapError(error, AmebaErrorType::kWiFiError);
     return err;
 }
@@ -119,7 +119,7 @@ CHIP_ERROR AmebaUtils::ClearWiFiConfig()
 {
     /* Clear Wi-Fi Configurations in Storage */
     CHIP_ERROR err;
-    err            = PersistedStorage::KeyValueStoreMgr().Delete(kWiFiSSIDKeyName);
+    err = PersistedStorage::KeyValueStoreMgr().Delete(kWiFiSSIDKeyName);
     SuccessOrExit(err);
 
     err = PersistedStorage::KeyValueStoreMgr().Delete(kWiFiCredentialsKeyName);
@@ -132,7 +132,7 @@ CHIP_ERROR AmebaUtils::ClearWiFiConfig()
 CHIP_ERROR AmebaUtils::WiFiDisconnect(void)
 {
     ChipLogProgress(DeviceLayer, "Disconnecting WiFi");
-    int32_t error = matter_wifi_disconnect();
+    int32_t error  = matter_wifi_disconnect();
     CHIP_ERROR err = MapError(error, AmebaErrorType::kWiFiError);
 
     if (err == CHIP_NO_ERROR)
@@ -149,9 +149,9 @@ CHIP_ERROR AmebaUtils::WiFiConnectProvisionedNetwork(void)
     memset(config, 0, sizeof(rtw_wifi_config_t));
     GetWiFiConfig(config);
     ChipLogProgress(DeviceLayer, "Connecting to AP : [%s]", (char *) config->ssid);
-    int32_t error = matter_wifi_connect((char *) config->ssid, RTW_SECURITY_WPA_WPA2_MIXED, (char *) config->password,
+    int32_t error  = matter_wifi_connect((char *) config->ssid, RTW_SECURITY_WPA_WPA2_MIXED, (char *) config->password,
                                         strlen((const char *) config->ssid), strlen((const char *) config->password), 0, nullptr);
-    CHIP_ERROR err =  MapError(error, AmebaErrorType::kWiFiError);
+    CHIP_ERROR err = MapError(error, AmebaErrorType::kWiFiError);
 
     vPortFree(config);
     return err;
@@ -160,17 +160,17 @@ CHIP_ERROR AmebaUtils::WiFiConnectProvisionedNetwork(void)
 CHIP_ERROR AmebaUtils::WiFiConnect(const char * ssid, const char * password)
 {
     ChipLogProgress(DeviceLayer, "Connecting to AP : [%s]", (char *) ssid);
-    int32_t error = matter_wifi_connect((char *) ssid, RTW_SECURITY_WPA_WPA2_MIXED, (char *) password, strlen(ssid),
+    int32_t error  = matter_wifi_connect((char *) ssid, RTW_SECURITY_WPA_WPA2_MIXED, (char *) password, strlen(ssid),
                                         strlen(password), 0, nullptr);
-    CHIP_ERROR err =  MapError(error, AmebaErrorType::kWiFiError);
+    CHIP_ERROR err = MapError(error, AmebaErrorType::kWiFiError);
     return err;
 }
 
 CHIP_ERROR AmebaUtils::SetCurrentProvisionedNetwork()
 {
     rtw_wifi_setting_t pSetting;
-    int32_t error = matter_get_sta_wifi_info(&pSetting);
-    CHIP_ERROR err =  MapError(error, AmebaErrorType::kWiFiError);
+    int32_t error  = matter_get_sta_wifi_info(&pSetting);
+    CHIP_ERROR err = MapError(error, AmebaErrorType::kWiFiError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "STA No Wi-Fi Info");
@@ -248,6 +248,6 @@ CHIP_ERROR AmebaUtils::MapWiFiError(int32_t error)
 {
     if (error == RTW_SUCCESS)
         return CHIP_NO_ERROR;
-    
+
     return CHIP_ERROR_INTERNAL;
 }
diff --git a/src/platform/Ameba/AmebaUtils.h b/src/platform/Ameba/AmebaUtils.h
@@ -47,7 +47,7 @@ class AmebaUtils
     static CHIP_ERROR WiFiConnect(const char * ssid, const char * password);
     static CHIP_ERROR SetCurrentProvisionedNetwork(void);
     static CHIP_ERROR WiFiConnect(void);
-    
+
     static CHIP_ERROR MapError(int32_t error, AmebaErrorType type);
 
 private:

diff --git a/src/platform/Ameba/ConfigurationManagerImpl.cpp b/src/platform/Ameba/ConfigurationManagerImpl.cpp
@@ -158,10 +158,10 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
     char temp[32];
     uint32_t mac[ETH_ALEN];
     char * token = strtok(temp, ":");
-    int i = 0;
+    int i        = 0;
 
     error = matter_wifi_get_mac_address(temp);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kWiFiError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kWiFiError);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(DeviceLayer, "Failed to get mac address");

diff --git a/src/platform/Ameba/DiagnosticDataProviderImpl.cpp b/src/platform/Ameba/DiagnosticDataProviderImpl.cpp
@@ -25,8 +25,8 @@
 
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/support/CHIPMemString.h>
-#include <platform/Ameba/DiagnosticDataProviderImpl.h>
 #include <platform/Ameba/AmebaUtils.h>
+#include <platform/Ameba/DiagnosticDataProviderImpl.h>
 
 #include <lwip_netconf.h>
 
@@ -258,7 +258,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(MutableByteSpan & BssId)
     VerifyOrReturnError(BssId.size() >= bssIdSize, CHIP_ERROR_BUFFER_TOO_SMALL);
 
     error = matter_wifi_get_ap_bssid(BssId.data());
-    err = AmebaUtils::MapError(error, AmebaErrorType::kWiFiError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kWiFiError);
 
     if (err != CHIP_NO_ERROR)
     {
@@ -292,7 +292,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNe
     rtw_wifi_setting_t setting;
 
     error = matter_wifi_get_security_type("wlan0", &security, &setting.key_idx, setting.password);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kWiFiError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kWiFiError);
     if (err != CHIP_NO_ERROR)
     {
         securityType = SecurityTypeEnum::kUnspecified;
@@ -361,7 +361,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiChannelNumber(uint16_t & channelNu
     unsigned char channel;
 
     error = matter_wifi_get_wifi_channel_number("wlan0", &channel);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kWiFiError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kWiFiError);
     if (err != CHIP_NO_ERROR)
         channelNumber = 0;
     else
@@ -375,8 +375,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiRssi(int8_t & rssi)
     CHIP_ERROR err;
     int32_t error;
 
-    error = matter_wifi_get_rssi((int *)&rssi);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kWiFiError);
+    error = matter_wifi_get_rssi((int *) &rssi);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kWiFiError);
 
     if (err != CHIP_NO_ERROR)
     {

diff --git a/src/platform/Ameba/FactoryDataDecoder.cpp b/src/platform/Ameba/FactoryDataDecoder.cpp
@@ -27,15 +27,15 @@ namespace DeviceLayer {
 
 CHIP_ERROR FactoryDataDecoder::ReadFactoryData(uint8_t * buffer, uint16_t * pfactorydata_len)
 {
-    int32_t error          = ReadFactory(buffer, pfactorydata_len);
+    int32_t error  = ReadFactory(buffer, pfactorydata_len);
     CHIP_ERROR err = AmebaUtils::MapError(error, AmebaErrorType::kFlashError);
 
     return err;
 }
 
 CHIP_ERROR FactoryDataDecoder::DecodeFactoryData(uint8_t * buffer, FactoryData * fdata, uint16_t factorydata_len)
 {
-    int32_t error          = DecodeFactory(buffer, fdata, factorydata_len);
+    int32_t error  = DecodeFactory(buffer, fdata, factorydata_len);
     CHIP_ERROR err = AmebaUtils::MapError(error, AmebaErrorType::kFlashError);
 
     return err;

diff --git a/src/platform/Ameba/KeyValueStoreManagerImpl.cpp b/src/platform/Ameba/KeyValueStoreManagerImpl.cpp
@@ -23,8 +23,8 @@
 /* this file behaves like a config.h, comes first */
 #include "FreeRTOS.h"
 #include "chip_porting.h"
-#include <platform/KeyValueStoreManager.h>
 #include <platform/Ameba/AmebaUtils.h>
+#include <platform/KeyValueStoreManager.h>
 #include <support/CodeUtils.h>
 
 using namespace chip::DeviceLayer::Internal;
@@ -58,7 +58,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t
     if (read_bytes_size)
     {
         error = getPref_bin_new(key, key, (uint8_t *) value, value_size, read_bytes_size);
-        err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+        err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
     }
     else
     {
@@ -69,7 +69,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t
             goto exit;
         }
         error = getPref_bin_new(key, key, (uint8_t *) value, value_size, dummy_read_bytes_size);
-        err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+        err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
         vPortFree(dummy_read_bytes_size);
     }
 
@@ -91,23 +91,23 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Put(const char * key, const void * value,
     if (checkExist(key, key))
     {
         error = deleteKey(key, key);
-        err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+        err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
         if (err != CHIP_NO_ERROR)
         {
             ChipLogError(DeviceLayer, "Warning, KVS leakage, failed to remove old kvs value");
         }
     }
 
     error = setPref_new(key, key, (uint8_t *) value, value_size);
-    err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
+    err   = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
 
 exit:
     return err;
 }
 
 CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
 {
-    int32_t error = deleteKey(key, key);
+    int32_t error  = deleteKey(key, key);
     CHIP_ERROR err = AmebaUtils::MapError(error, AmebaErrorType::kDctError);
 
     return err;

diff --git a/src/platform/Ameba/SystemTimeSupport.cpp b/src/platform/Ameba/SystemTimeSupport.cpp
@@ -29,8 +29,8 @@
 #include <support/logging/CHIPLogging.h>
 
 #include "task.h"
-#include <time.h>
 #include <chip_porting.h>
+#include <time.h>
 
 struct rtkTimeVal
 {