Merge pull request #56 from pan-apple/platform-layer

Change to multi level include directives for platform headers
project-chip · Mar 14, 2020 · 608aba1 · 608aba1
2 parents caebe36 + e2ea77d
commit 608aba1
Show file tree

Hide file tree

Showing 24 changed files with 34 additions and 34 deletions.
diff --git a/src/platform/include/CHIPDeviceConfig.h → src/include/platform/CHIPDeviceConfig.h b/src/platform/include/CHIPDeviceConfig.h → src/include/platform/CHIPDeviceConfig.h
diff --git a/src/platform/include/CHIPDeviceError.h → src/include/platform/CHIPDeviceError.h b/src/platform/include/CHIPDeviceError.h → src/include/platform/CHIPDeviceError.h
diff --git a/src/platform/include/CHIPDeviceEvent.h → src/include/platform/CHIPDeviceEvent.h b/src/platform/include/CHIPDeviceEvent.h → src/include/platform/CHIPDeviceEvent.h
@@ -266,7 +266,7 @@ typedef void (*AsyncWorkFunct)(intptr_t arg);
 #ifdef EXTERNAL_CHIPDEVICEPLATFORMEVENT_HEADER
 #include EXTERNAL_CHIPDEVICEPLATFORMEVENT_HEADER
 #else
-#define CHIPDEVICEPLATFORMEVENT_HEADER <CHIP_DEVICE_LAYER_TARGET/ChipDevicePlatformEvent.h>
+#define CHIPDEVICEPLATFORMEVENT_HEADER <platform/CHIP_DEVICE_LAYER_TARGET/ChipDevicePlatformEvent.h>
 #include CHIPDEVICEPLATFORMEVENT_HEADER
 #endif
 

diff --git a/src/platform/include/CHIPDeviceLayer.h → src/include/platform/CHIPDeviceLayer.h b/src/platform/include/CHIPDeviceLayer.h → src/include/platform/CHIPDeviceLayer.h
@@ -19,19 +19,19 @@
 #define CHIP_DEVICE_H
 
 #include <core/CHIPCore.h>
-#include <CHIPDeviceConfig.h>
-#include <CHIPDeviceError.h>
-#include <GeneralUtils.h>
+#include <platform/CHIPDeviceConfig.h>
+#include <platform/CHIPDeviceError.h>
+#include <platform/GeneralUtils.h>
 #include <ble/BleLayer.h>
-#include <PlatformManager.h>
-#include <ConfigurationManager.h>
-#include <ConnectivityManager.h>
+#include <platform/PlatformManager.h>
+#include <platform/ConfigurationManager.h>
+#include <platform/ConnectivityManager.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
-#include <SoftwareUpdateManager.h>
+#include <platform/SoftwareUpdateManager.h>
 #endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
-#include <TimeSyncManager.h>
+#include <platform/TimeSyncManager.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-#include <ThreadStackManager.h>
+#include <platform/ThreadStackManager.h>
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 
 namespace chip {

diff --git a/src/platform/include/ConfigurationManager.h → src/include/platform/ConfigurationManager.h b/src/platform/include/ConfigurationManager.h → src/include/platform/ConfigurationManager.h
@@ -193,7 +193,7 @@ extern ConfigurationManagerImpl & ConfigurationMgrImpl(void);
 #ifdef EXTERNAL_CONFIGURATIONMANAGERIMPL_HEADER
 #include EXTERNAL_CONFIGURATIONMANAGERIMPL_HEADER
 #else
-#define CONFIGURATIONMANAGERIMPL_HEADER <CHIP_DEVICE_LAYER_TARGET/ConfigurationManagerImpl.h>
+#define CONFIGURATIONMANAGERIMPL_HEADER <platform/CHIP_DEVICE_LAYER_TARGET/ConfigurationManagerImpl.h>
 #include CONFIGURATIONMANAGERIMPL_HEADER
 #endif
 

diff --git a/src/platform/include/ConnectivityManager.h → src/include/platform/ConnectivityManager.h b/src/platform/include/ConnectivityManager.h → src/include/platform/ConnectivityManager.h
@@ -243,7 +243,7 @@ extern ConnectivityManagerImpl & ConnectivityMgrImpl(void);
 #ifdef EXTERNAL_CONNECTIVITYMANAGERIMPL_HEADER
 #include EXTERNAL_CONNECTIVITYMANAGERIMPL_HEADER
 #else
-#define CONNECTIVITYMANAGERIMPL_HEADER <ConnectivityManagerImpl.h>
+#define CONNECTIVITYMANAGERIMPL_HEADER <platform/ConnectivityManagerImpl.h>
 #include CONNECTIVITYMANAGERIMPL_HEADER
 #endif
 

diff --git a/...latform/include/ConnectivityManagerImpl.h → ...nclude/platform/ConnectivityManagerImpl.h b/...latform/include/ConnectivityManagerImpl.h → ...nclude/platform/ConnectivityManagerImpl.h
@@ -18,20 +18,20 @@
 #ifndef CONNECTIVITY_MANAGER_IMPL_H
 #define CONNECTIVITY_MANAGER_IMPL_H
 
-#include <ConnectivityManager.h>
-#include <internal/GenericConnectivityManagerImpl.h>
+#include <platform/ConnectivityManager.h>
+#include <platform/internal/GenericConnectivityManagerImpl.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-#include <internal/GenericConnectivityManagerImpl_BLE.h>
+#include <platform/internal/GenericConnectivityManagerImpl_BLE.h>
 #else
-#include <internal/GenericConnectivityManagerImpl_NoBLE.h>
+#include <platform/internal/GenericConnectivityManagerImpl_NoBLE.h>
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-#include <internal/GenericConnectivityManagerImpl_Thread.h>
+#include <platform/internal/GenericConnectivityManagerImpl_Thread.h>
 #else
-#include <internal/GenericConnectivityManagerImpl_NoThread.h>
+#include <platform/internal/GenericConnectivityManagerImpl_NoThread.h>
 #endif
-#include <internal/GenericConnectivityManagerImpl_NoWiFi.h>
-#include <internal/GenericConnectivityManagerImpl_NoTunnel.h>
+#include <platform/internal/GenericConnectivityManagerImpl_NoWiFi.h>
+#include <platform/internal/GenericConnectivityManagerImpl_NoTunnel.h>
 #include <support/FlagUtils.hpp>
 
 namespace chip {

diff --git a/src/platform/include/GeneralUtils.h → src/include/platform/GeneralUtils.h b/src/platform/include/GeneralUtils.h → src/include/platform/GeneralUtils.h
diff --git a/src/platform/include/PlatformManager.h → src/include/platform/PlatformManager.h b/src/platform/include/PlatformManager.h → src/include/platform/PlatformManager.h
@@ -23,7 +23,7 @@
 #ifndef PLATFORM_MANAGER_H
 #define PLATFORM_MANAGER_H
 
-#include <CHIPDeviceEvent.h>
+#include <platform/CHIPDeviceEvent.h>
 
 namespace chip {
 namespace System {
@@ -148,7 +148,7 @@ extern PlatformManagerImpl & PlatformMgrImpl(void);
 #ifdef EXTERNAL_PLATFORMMANAGERIMPL_HEADER
 #include EXTERNAL_PLATFORMMANAGERIMPL_HEADER
 #else
-#define PLATFORMMANAGERIMPL_HEADER <CHIP_DEVICE_LAYER_TARGET/PlatformManagerImpl.h>
+#define PLATFORMMANAGERIMPL_HEADER <platform/CHIP_DEVICE_LAYER_TARGET/PlatformManagerImpl.h>
 #include PLATFORMMANAGERIMPL_HEADER
 #endif
 

diff --git a/src/platform/include/SoftwareUpdateManager.h → src/include/platform/SoftwareUpdateManager.h b/src/platform/include/SoftwareUpdateManager.h → src/include/platform/SoftwareUpdateManager.h
@@ -26,7 +26,7 @@
 #if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
 
 #include <profiles/software-update/SoftwareUpdateProfile.h>
-#include <internal/CHIPDeviceLayerInternal.h>
+#include <platform/internal/CHIPDeviceLayerInternal.h>
 
 namespace chip {
 namespace DeviceLayer {
@@ -356,7 +356,7 @@ extern SoftwareUpdateManagerImpl & SoftwareUpdateMgrImpl(void);
 #ifdef EXTERNAL_SOFTWAREUPDATEMANAGERIMPL_HEADER
 #include EXTERNAL_SOFTWAREUPDATEMANAGERIMPL_HEADER
 #else
-#define SOFTWAREUPDATEMANAGERIMPL_HEADER <SoftwareUpdateManagerImpl.h>
+#define SOFTWAREUPDATEMANAGERIMPL_HEADER <platform/SoftwareUpdateManagerImpl.h>
 #include SOFTWAREUPDATEMANAGERIMPL_HEADER
 #endif
 

diff --git a/src/platform/include/ThreadStackManager.h → src/include/platform/ThreadStackManager.h b/src/platform/include/ThreadStackManager.h → src/include/platform/ThreadStackManager.h
@@ -137,7 +137,7 @@ extern ThreadStackManagerImpl & ThreadStackMgrImpl(void);
 #ifdef EXTERNAL_THREADSTACKMANAGERIMPL_HEADER
 #include EXTERNAL_THREADSTACKMANAGERIMPL_HEADER
 #else
-#define THREADSTACKMANAGERIMPL_HEADER <CHIP_DEVICE_LAYER_TARGET/ThreadStackManagerImpl.h>
+#define THREADSTACKMANAGERIMPL_HEADER <platform/CHIP_DEVICE_LAYER_TARGET/ThreadStackManagerImpl.h>
 #include THREADSTACKMANAGERIMPL_HEADER
 #endif
 

diff --git a/src/platform/include/TimeSyncManager.h → src/include/platform/TimeSyncManager.h b/src/platform/include/TimeSyncManager.h → src/include/platform/TimeSyncManager.h
diff --git a/src/platform/include/internal/BLEManager.h → src/include/platform/internal/BLEManager.h b/src/platform/include/internal/BLEManager.h → src/include/platform/internal/BLEManager.h
@@ -102,7 +102,7 @@ extern BLEManagerImpl & BLEMgrImpl(void);
 #ifdef EXTERNAL_BLEMANAGERIMPL_HEADER
 #include EXTERNAL_BLEMANAGERIMPL_HEADER
 #else
-#define BLEMANAGERIMPL_HEADER <CHIP_DEVICE_LAYER_TARGET/BLEManagerImpl.h>
+#define BLEMANAGERIMPL_HEADER <platform/CHIP_DEVICE_LAYER_TARGET/BLEManagerImpl.h>
 #include BLEMANAGERIMPL_HEADER
 #endif
 

diff --git a/...nclude/internal/CHIPDeviceLayerInternal.h → ...atform/internal/CHIPDeviceLayerInternal.h b/...nclude/internal/CHIPDeviceLayerInternal.h → ...atform/internal/CHIPDeviceLayerInternal.h
@@ -29,7 +29,7 @@ enum
 } // namespace Logging
 } // namespace chip
 
-#include <CHIPDeviceLayer.h>
+#include <platform/CHIPDeviceLayer.h>
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/...nclude/internal/DeviceDescriptionServer.h → ...atform/internal/DeviceDescriptionServer.h b/...nclude/internal/DeviceDescriptionServer.h → ...atform/internal/DeviceDescriptionServer.h
@@ -23,7 +23,7 @@
 #ifndef DEVICE_DESCRIPTION_SERVER_H
 #define DEVICE_DESCRIPTION_SERVER_H
 
-#include <internal/ChipDeviceLayerInternal.h>
+#include <platform/internal/ChipDeviceLayerInternal.h>
 #include <profiles/device-description/DeviceDescription.h>
 
 namespace chip {

diff --git a/...internal/GenericConnectivityManagerImpl.h → ...internal/GenericConnectivityManagerImpl.h b/...internal/GenericConnectivityManagerImpl.h → ...internal/GenericConnectivityManagerImpl.h
@@ -24,7 +24,7 @@
 #ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_H
 #define GENERIC_CONNECTIVITY_MANAGER_IMPL_H
 
-#include <internal/DeviceDescriptionServer.h>
+#include <platform/internal/DeviceDescriptionServer.h>
 
 
 namespace chip {

diff --git a/...rnal/GenericConnectivityManagerImpl_BLE.h → ...rnal/GenericConnectivityManagerImpl_BLE.h b/...rnal/GenericConnectivityManagerImpl_BLE.h → ...rnal/GenericConnectivityManagerImpl_BLE.h
@@ -24,7 +24,7 @@
 #ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_BLE_H
 #define GENERIC_CONNECTIVITY_MANAGER_IMPL_BLE_H
 
-#include <internal/BLEManager.h>
+#include <platform/internal/BLEManager.h>
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/...al/GenericConnectivityManagerImpl_BLE.ipp → ...al/GenericConnectivityManagerImpl_BLE.ipp b/...al/GenericConnectivityManagerImpl_BLE.ipp → ...al/GenericConnectivityManagerImpl_BLE.ipp
@@ -24,7 +24,7 @@
 #ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_BLE_IPP
 #define GENERIC_CONNECTIVITY_MANAGER_IMPL_BLE_IPP
 
-#include <internal/GenericConnectivityManagerImpl_BLE.h>
+#include <platform/internal/GenericConnectivityManagerImpl_BLE.h>
 
 
 namespace chip {

diff --git a/...al/GenericConnectivityManagerImpl_NoBLE.h → ...al/GenericConnectivityManagerImpl_NoBLE.h b/...al/GenericConnectivityManagerImpl_NoBLE.h → ...al/GenericConnectivityManagerImpl_NoBLE.h
diff --git a/...GenericConnectivityManagerImpl_NoThread.h → ...GenericConnectivityManagerImpl_NoThread.h b/...GenericConnectivityManagerImpl_NoThread.h → ...GenericConnectivityManagerImpl_NoThread.h
diff --git a/...GenericConnectivityManagerImpl_NoTunnel.h → ...GenericConnectivityManagerImpl_NoTunnel.h b/...GenericConnectivityManagerImpl_NoTunnel.h → ...GenericConnectivityManagerImpl_NoTunnel.h
diff --git a/...l/GenericConnectivityManagerImpl_NoWiFi.h → ...l/GenericConnectivityManagerImpl_NoWiFi.h b/...l/GenericConnectivityManagerImpl_NoWiFi.h → ...l/GenericConnectivityManagerImpl_NoWiFi.h
diff --git a/...l/GenericConnectivityManagerImpl_Thread.h → ...l/GenericConnectivityManagerImpl_Thread.h b/...l/GenericConnectivityManagerImpl_Thread.h → ...l/GenericConnectivityManagerImpl_Thread.h
@@ -24,7 +24,7 @@
 #ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_THREAD_H
 #define GENERIC_CONNECTIVITY_MANAGER_IMPL_THREAD_H
 
-#include <ThreadStackManager.h>
+#include <platform/ThreadStackManager.h>
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/...GenericConnectivityManagerImpl_Thread.ipp → ...GenericConnectivityManagerImpl_Thread.ipp b/...GenericConnectivityManagerImpl_Thread.ipp → ...GenericConnectivityManagerImpl_Thread.ipp
@@ -24,8 +24,8 @@
 #ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_THREAD_IPP
 #define GENERIC_CONNECTIVITY_MANAGER_IMPL_THREAD_IPP
 
-#include <internal/ChipDeviceLayerInternal.h>
-#include <internal/GenericConnectivityManagerImpl_Thread.h>
+#include <platform/internal/ChipDeviceLayerInternal.h>
+#include <platform/internal/GenericConnectivityManagerImpl_Thread.h>
 
 namespace chip {
 namespace DeviceLayer {