Address review comments

project-chip · Nov 22, 2021 · 8b88ffd · 8b88ffd
1 parent fdc7a1e
commit 8b88ffd
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 169 deletions.
diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
@@ -21,17 +21,12 @@
  *          for Zephy platform.
  */
 
-#if !CONFIG_NORDIC_SECURITY_BACKEND
-#include <crypto/CHIPCryptoPAL.h> // nogncheck
-#endif                            // !CONFIG_NORDIC_SECURITY_BACKEND
-
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/DiagnosticDataProvider.h>
 #include <platform/Zephy/DiagnosticDataProviderImpl.h>
 
-#include <drivers/entropy.h>
 #include <malloc.h>
 
 namespace chip {

diff --git a/src/platform/Zephyr/PlatformManagerImpl.cpp b/src/platform/Zephyr/PlatformManagerImpl.cpp
@@ -73,6 +73,7 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
     err = Internal::ZephyrConfig::Init();
     SuccessOrExit(err);
     SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
+    SetDiagnosticDataProvider(&DiagnosticDataProviderImpl::GetDefaultInstance());
 
 #if !CONFIG_NORDIC_SECURITY_BACKEND
     // Add entropy source based on Zephyr entropy driver

diff --git a/src/platform/nrfconnect/BUILD.gn b/src/platform/nrfconnect/BUILD.gn
@@ -23,6 +23,8 @@ static_library("nrfconnect") {
     "../SingletonConfigurationManager.cpp",
     "../Zephyr/BLEManagerImpl.cpp",
     "../Zephyr/ConfigurationManagerImpl.cpp",
+    "../Zephyr/DiagnosticDataProviderImpl.cpp",
+    "../Zephyr/DiagnosticDataProviderImpl.h",
     "../Zephyr/KeyValueStoreManagerImpl.cpp",
     "../Zephyr/Logging.cpp",
     "../Zephyr/PlatformManagerImpl.cpp",
@@ -39,8 +41,6 @@ static_library("nrfconnect") {
     "ConnectivityManagerImpl.h",
     "DeviceNetworkProvisioningDelegateImpl.cpp",
     "DeviceNetworkProvisioningDelegateImpl.h",
-    "DiagnosticDataProviderImpl.cpp",
-    "DiagnosticDataProviderImpl.h",
     "InetPlatformConfig.h",
     "KeyValueStoreManagerImpl.h",
     "PlatformManagerImpl.h",

diff --git a/src/platform/nrfconnect/DiagnosticDataProviderImpl.cpp b/src/platform/nrfconnect/DiagnosticDataProviderImpl.cpp
diff --git a/src/platform/nrfconnect/DiagnosticDataProviderImpl.h b/src/platform/nrfconnect/DiagnosticDataProviderImpl.h
diff --git a/src/platform/telink/BUILD.gn b/src/platform/telink/BUILD.gn
@@ -23,6 +23,8 @@ static_library("telink") {
     "../SingletonConfigurationManager.cpp",
     "../Zephyr/BLEManagerImpl.cpp",
     "../Zephyr/ConfigurationManagerImpl.cpp",
+    "../Zephyr/DiagnosticDataProviderImpl.cpp",
+    "../Zephyr/DiagnosticDataProviderImpl.h",
     "../Zephyr/KeyValueStoreManagerImpl.cpp",
     "../Zephyr/Logging.cpp",
     "../Zephyr/PlatformManagerImpl.cpp",
@@ -39,8 +41,6 @@ static_library("telink") {
     "ConnectivityManagerImpl.h",
     "DeviceNetworkProvisioningDelegateImpl.cpp",
     "DeviceNetworkProvisioningDelegateImpl.h",
-    "DiagnosticDataProviderImpl.cpp",
-    "DiagnosticDataProviderImpl.h",
     "InetPlatformConfig.h",
     "KeyValueStoreManagerImpl.h",
     "PlatformManagerImpl.h",

diff --git a/src/platform/telink/DiagnosticDataProviderImpl.cpp b/src/platform/telink/DiagnosticDataProviderImpl.cpp
diff --git a/src/platform/telink/DiagnosticDataProviderImpl.h b/src/platform/telink/DiagnosticDataProviderImpl.h