[src/platform] Separation of nrfconnect and Zephyr platforms

nrfconnect platform is based on the Zephyr and in many cases it uses Zephyr specific components implementation. Zephyr specific files should be located in the Zephyr platform. * Moved Zephyr specific modules from the nrfconnect to the Zephyr platform * Moved BLEManagerImpl and ThreadStackManagerImpl implementations from Generic_Zephyr files. * Removed Generic_Zephyr files. * Aligned READMEs for nrfconnect and Zephyr platforms.
project-chip · Dec 14, 2020 · 2303608 · 2303608
1 parent c0889c6
commit 2303608
Show file tree

Hide file tree

Showing 31 changed files with 691 additions and 781 deletions.
diff --git a/src/include/platform/PlatformManager.h b/src/include/platform/PlatformManager.h
@@ -53,8 +53,6 @@ class FabricProvisioningServer;
 class ServiceProvisioningServer;
 class BLEManagerImpl;
 template <class>
-class GenericBLEManagerImpl_Zephyr;
-template <class>
 class GenericConfigurationManagerImpl;
 template <class>
 class GenericPlatformManagerImpl;
@@ -109,8 +107,6 @@ class PlatformManager
     friend class Internal::ServiceProvisioningServer;
     friend class Internal::BLEManagerImpl;
     template <class>
-    friend class Internal::GenericBLEManagerImpl_Zephyr;
-    template <class>
     friend class Internal::GenericPlatformManagerImpl;
     template <class>
     friend class Internal::GenericPlatformManagerImpl_FreeRTOS;

diff --git a/src/include/platform/ThreadStackManager.h b/src/include/platform/ThreadStackManager.h
@@ -35,8 +35,6 @@ class DeviceNetworkInfo;
 class DeviceControlServer;
 class BLEManagerImpl;
 template <class>
-class GenericBLEManagerImpl_Zephyr;
-template <class>
 class GenericPlatformManagerImpl;
 template <class>
 class GenericConfigurationManagerImpl;
@@ -89,8 +87,6 @@ class ThreadStackManager
     friend class ConfigurationManagerImpl;
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
     friend class Internal::BLEManagerImpl;
-    template <class>
-    friend class Internal::GenericBLEManagerImpl_Zephyr;
 #endif
     friend class Internal::DeviceControlServer;
     template <class>

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -395,32 +395,32 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       public_deps += [ "${chip_root}/third_party/inipp" ]
     } else if (chip_device_platform == "nrfconnect") {
       sources += [
+        "Zephyr/BLEManagerImpl.cpp",
+        "Zephyr/ConfigurationManagerImpl.cpp",
+        "Zephyr/Logging.cpp",
+        "Zephyr/PlatformManagerImpl.cpp",
         "Zephyr/SystemTimeSupport.cpp",
-        "nrfconnect/BLEManagerImpl.cpp",
+        "Zephyr/ZephyrConfig.cpp",
+        "Zephyr/ZephyrConfig.h",
         "nrfconnect/BLEManagerImpl.h",
         "nrfconnect/BlePlatformConfig.h",
         "nrfconnect/CHIPDevicePlatformConfig.h",
         "nrfconnect/CHIPDevicePlatformEvent.h",
         "nrfconnect/CHIPPlatformConfig.h",
-        "nrfconnect/ConfigurationManagerImpl.cpp",
         "nrfconnect/ConfigurationManagerImpl.h",
         "nrfconnect/ConnectivityManagerImpl.cpp",
         "nrfconnect/ConnectivityManagerImpl.h",
         "nrfconnect/DeviceNetworkProvisioningDelegateImpl.cpp",
         "nrfconnect/DeviceNetworkProvisioningDelegateImpl.h",
         "nrfconnect/InetPlatformConfig.h",
-        "nrfconnect/Logging.cpp",
-        "nrfconnect/PlatformManagerImpl.cpp",
         "nrfconnect/PlatformManagerImpl.h",
         "nrfconnect/SystemPlatformConfig.h",
-        "nrfconnect/ZephyrConfig.cpp",
-        "nrfconnect/ZephyrConfig.h",
       ]
 
       if (chip_enable_openthread) {
         sources += [
           "OpenThread/OpenThreadUtils.cpp",
-          "nrfconnect/ThreadStackManagerImpl.cpp",
+          "Zephyr/ThreadStackManagerImpl.cpp",
           "nrfconnect/ThreadStackManagerImpl.h",
         ]
       }