From e2ea77d9a9c1adad7649d44f092a8811143a2ca0 Mon Sep 17 00:00:00 2001 From: Pankaj Garg Date: Fri, 13 Mar 2020 13:36:13 -0700 Subject: [PATCH] Change to multi level include directives for platform headers --- .../platform}/CHIPDeviceConfig.h | 0 .../platform}/CHIPDeviceError.h | 0 .../platform}/CHIPDeviceEvent.h | 2 +- .../platform}/CHIPDeviceLayer.h | 18 +++++++++--------- .../platform}/ConfigurationManager.h | 2 +- .../platform}/ConnectivityManager.h | 2 +- .../platform}/ConnectivityManagerImpl.h | 16 ++++++++-------- .../platform}/GeneralUtils.h | 0 .../platform}/PlatformManager.h | 4 ++-- .../platform}/SoftwareUpdateManager.h | 4 ++-- .../platform}/ThreadStackManager.h | 2 +- .../platform}/TimeSyncManager.h | 0 .../platform}/internal/BLEManager.h | 2 +- .../internal/CHIPDeviceLayerInternal.h | 2 +- .../internal/DeviceDescriptionServer.h | 2 +- .../internal/GenericConnectivityManagerImpl.h | 2 +- .../GenericConnectivityManagerImpl_BLE.h | 2 +- .../GenericConnectivityManagerImpl_BLE.ipp | 2 +- .../GenericConnectivityManagerImpl_NoBLE.h | 0 .../GenericConnectivityManagerImpl_NoThread.h | 0 .../GenericConnectivityManagerImpl_NoTunnel.h | 0 .../GenericConnectivityManagerImpl_NoWiFi.h | 0 .../GenericConnectivityManagerImpl_Thread.h | 2 +- .../GenericConnectivityManagerImpl_Thread.ipp | 4 ++-- 24 files changed, 34 insertions(+), 34 deletions(-) rename src/{platform/include => include/platform}/CHIPDeviceConfig.h (100%) rename src/{platform/include => include/platform}/CHIPDeviceError.h (100%) rename src/{platform/include => include/platform}/CHIPDeviceEvent.h (99%) rename src/{platform/include => include/platform}/CHIPDeviceLayer.h (75%) rename src/{platform/include => include/platform}/ConfigurationManager.h (99%) rename src/{platform/include => include/platform}/ConnectivityManager.h (99%) rename src/{platform/include => include/platform}/ConnectivityManagerImpl.h (87%) rename src/{platform/include => include/platform}/GeneralUtils.h (100%) rename src/{platform/include => include/platform}/PlatformManager.h (98%) rename src/{platform/include => include/platform}/SoftwareUpdateManager.h (99%) rename src/{platform/include => include/platform}/ThreadStackManager.h (98%) rename src/{platform/include => include/platform}/TimeSyncManager.h (100%) rename src/{platform/include => include/platform}/internal/BLEManager.h (98%) rename src/{platform/include => include/platform}/internal/CHIPDeviceLayerInternal.h (97%) rename src/{platform/include => include/platform}/internal/DeviceDescriptionServer.h (98%) rename src/{platform/include => include/platform}/internal/GenericConnectivityManagerImpl.h (97%) rename src/{platform/include => include/platform}/internal/GenericConnectivityManagerImpl_BLE.h (99%) rename src/{platform/include => include/platform}/internal/GenericConnectivityManagerImpl_BLE.ipp (96%) rename src/{platform/include => include/platform}/internal/GenericConnectivityManagerImpl_NoBLE.h (100%) rename src/{platform/include => include/platform}/internal/GenericConnectivityManagerImpl_NoThread.h (100%) rename src/{platform/include => include/platform}/internal/GenericConnectivityManagerImpl_NoTunnel.h (100%) rename src/{platform/include => include/platform}/internal/GenericConnectivityManagerImpl_NoWiFi.h (100%) rename src/{platform/include => include/platform}/internal/GenericConnectivityManagerImpl_Thread.h (99%) rename src/{platform/include => include/platform}/internal/GenericConnectivityManagerImpl_Thread.ipp (98%) diff --git a/src/platform/include/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h similarity index 100% rename from src/platform/include/CHIPDeviceConfig.h rename to src/include/platform/CHIPDeviceConfig.h diff --git a/src/platform/include/CHIPDeviceError.h b/src/include/platform/CHIPDeviceError.h similarity index 100% rename from src/platform/include/CHIPDeviceError.h rename to src/include/platform/CHIPDeviceError.h diff --git a/src/platform/include/CHIPDeviceEvent.h b/src/include/platform/CHIPDeviceEvent.h similarity index 99% rename from src/platform/include/CHIPDeviceEvent.h rename to src/include/platform/CHIPDeviceEvent.h index 02cbd65d23389e..92049068ccf9aa 100644 --- a/src/platform/include/CHIPDeviceEvent.h +++ b/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 +#define CHIPDEVICEPLATFORMEVENT_HEADER #include CHIPDEVICEPLATFORMEVENT_HEADER #endif diff --git a/src/platform/include/CHIPDeviceLayer.h b/src/include/platform/CHIPDeviceLayer.h similarity index 75% rename from src/platform/include/CHIPDeviceLayer.h rename to src/include/platform/CHIPDeviceLayer.h index 294e16a98e6abe..2b866a20f56f0f 100644 --- a/src/platform/include/CHIPDeviceLayer.h +++ b/src/include/platform/CHIPDeviceLayer.h @@ -19,19 +19,19 @@ #define CHIP_DEVICE_H #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER -#include +#include #endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER -#include +#include #if CHIP_DEVICE_CONFIG_ENABLE_THREAD -#include +#include #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD namespace chip { diff --git a/src/platform/include/ConfigurationManager.h b/src/include/platform/ConfigurationManager.h similarity index 99% rename from src/platform/include/ConfigurationManager.h rename to src/include/platform/ConfigurationManager.h index 2b77a5b1f2de36..01624707d8cb08 100644 --- a/src/platform/include/ConfigurationManager.h +++ b/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 +#define CONFIGURATIONMANAGERIMPL_HEADER #include CONFIGURATIONMANAGERIMPL_HEADER #endif diff --git a/src/platform/include/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h similarity index 99% rename from src/platform/include/ConnectivityManager.h rename to src/include/platform/ConnectivityManager.h index 21ad39be9cb44d..c04bf4422a35db 100644 --- a/src/platform/include/ConnectivityManager.h +++ b/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 +#define CONNECTIVITYMANAGERIMPL_HEADER #include CONNECTIVITYMANAGERIMPL_HEADER #endif diff --git a/src/platform/include/ConnectivityManagerImpl.h b/src/include/platform/ConnectivityManagerImpl.h similarity index 87% rename from src/platform/include/ConnectivityManagerImpl.h rename to src/include/platform/ConnectivityManagerImpl.h index b61de9bc550e5c..773e8f87484ca2 100644 --- a/src/platform/include/ConnectivityManagerImpl.h +++ b/src/include/platform/ConnectivityManagerImpl.h @@ -18,20 +18,20 @@ #ifndef CONNECTIVITY_MANAGER_IMPL_H #define CONNECTIVITY_MANAGER_IMPL_H -#include -#include +#include +#include #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE -#include +#include #else -#include +#include #endif #if CHIP_DEVICE_CONFIG_ENABLE_THREAD -#include +#include #else -#include +#include #endif -#include -#include +#include +#include #include namespace chip { diff --git a/src/platform/include/GeneralUtils.h b/src/include/platform/GeneralUtils.h similarity index 100% rename from src/platform/include/GeneralUtils.h rename to src/include/platform/GeneralUtils.h diff --git a/src/platform/include/PlatformManager.h b/src/include/platform/PlatformManager.h similarity index 98% rename from src/platform/include/PlatformManager.h rename to src/include/platform/PlatformManager.h index 79b31800480a1e..b93fe85ac7ff0e 100644 --- a/src/platform/include/PlatformManager.h +++ b/src/include/platform/PlatformManager.h @@ -23,7 +23,7 @@ #ifndef PLATFORM_MANAGER_H #define PLATFORM_MANAGER_H -#include +#include namespace chip { namespace System { @@ -148,7 +148,7 @@ extern PlatformManagerImpl & PlatformMgrImpl(void); #ifdef EXTERNAL_PLATFORMMANAGERIMPL_HEADER #include EXTERNAL_PLATFORMMANAGERIMPL_HEADER #else -#define PLATFORMMANAGERIMPL_HEADER +#define PLATFORMMANAGERIMPL_HEADER #include PLATFORMMANAGERIMPL_HEADER #endif diff --git a/src/platform/include/SoftwareUpdateManager.h b/src/include/platform/SoftwareUpdateManager.h similarity index 99% rename from src/platform/include/SoftwareUpdateManager.h rename to src/include/platform/SoftwareUpdateManager.h index a627efb4f90eb8..7b5386ab401b3b 100644 --- a/src/platform/include/SoftwareUpdateManager.h +++ b/src/include/platform/SoftwareUpdateManager.h @@ -26,7 +26,7 @@ #if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER #include -#include +#include namespace chip { namespace DeviceLayer { @@ -356,7 +356,7 @@ extern SoftwareUpdateManagerImpl & SoftwareUpdateMgrImpl(void); #ifdef EXTERNAL_SOFTWAREUPDATEMANAGERIMPL_HEADER #include EXTERNAL_SOFTWAREUPDATEMANAGERIMPL_HEADER #else -#define SOFTWAREUPDATEMANAGERIMPL_HEADER +#define SOFTWAREUPDATEMANAGERIMPL_HEADER #include SOFTWAREUPDATEMANAGERIMPL_HEADER #endif diff --git a/src/platform/include/ThreadStackManager.h b/src/include/platform/ThreadStackManager.h similarity index 98% rename from src/platform/include/ThreadStackManager.h rename to src/include/platform/ThreadStackManager.h index 33e385430dddbe..ae6efbe6f50483 100644 --- a/src/platform/include/ThreadStackManager.h +++ b/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 +#define THREADSTACKMANAGERIMPL_HEADER #include THREADSTACKMANAGERIMPL_HEADER #endif diff --git a/src/platform/include/TimeSyncManager.h b/src/include/platform/TimeSyncManager.h similarity index 100% rename from src/platform/include/TimeSyncManager.h rename to src/include/platform/TimeSyncManager.h diff --git a/src/platform/include/internal/BLEManager.h b/src/include/platform/internal/BLEManager.h similarity index 98% rename from src/platform/include/internal/BLEManager.h rename to src/include/platform/internal/BLEManager.h index c65c4b17c8a84d..c6b84177e24568 100644 --- a/src/platform/include/internal/BLEManager.h +++ b/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 +#define BLEMANAGERIMPL_HEADER #include BLEMANAGERIMPL_HEADER #endif diff --git a/src/platform/include/internal/CHIPDeviceLayerInternal.h b/src/include/platform/internal/CHIPDeviceLayerInternal.h similarity index 97% rename from src/platform/include/internal/CHIPDeviceLayerInternal.h rename to src/include/platform/internal/CHIPDeviceLayerInternal.h index 85db2c55f21aed..ca1b27fc401224 100644 --- a/src/platform/include/internal/CHIPDeviceLayerInternal.h +++ b/src/include/platform/internal/CHIPDeviceLayerInternal.h @@ -29,7 +29,7 @@ enum } // namespace Logging } // namespace chip -#include +#include namespace chip { namespace DeviceLayer { diff --git a/src/platform/include/internal/DeviceDescriptionServer.h b/src/include/platform/internal/DeviceDescriptionServer.h similarity index 98% rename from src/platform/include/internal/DeviceDescriptionServer.h rename to src/include/platform/internal/DeviceDescriptionServer.h index 1f5a9ddc557692..0bf2745ff6e424 100644 --- a/src/platform/include/internal/DeviceDescriptionServer.h +++ b/src/include/platform/internal/DeviceDescriptionServer.h @@ -23,7 +23,7 @@ #ifndef DEVICE_DESCRIPTION_SERVER_H #define DEVICE_DESCRIPTION_SERVER_H -#include +#include #include namespace chip { diff --git a/src/platform/include/internal/GenericConnectivityManagerImpl.h b/src/include/platform/internal/GenericConnectivityManagerImpl.h similarity index 97% rename from src/platform/include/internal/GenericConnectivityManagerImpl.h rename to src/include/platform/internal/GenericConnectivityManagerImpl.h index 58eead848caea5..2e563ecbdb6232 100644 --- a/src/platform/include/internal/GenericConnectivityManagerImpl.h +++ b/src/include/platform/internal/GenericConnectivityManagerImpl.h @@ -24,7 +24,7 @@ #ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_H #define GENERIC_CONNECTIVITY_MANAGER_IMPL_H -#include +#include namespace chip { diff --git a/src/platform/include/internal/GenericConnectivityManagerImpl_BLE.h b/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h similarity index 99% rename from src/platform/include/internal/GenericConnectivityManagerImpl_BLE.h rename to src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h index 9e147ea35a3c99..f0a20ee60b637f 100644 --- a/src/platform/include/internal/GenericConnectivityManagerImpl_BLE.h +++ b/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h @@ -24,7 +24,7 @@ #ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_BLE_H #define GENERIC_CONNECTIVITY_MANAGER_IMPL_BLE_H -#include +#include namespace chip { namespace DeviceLayer { diff --git a/src/platform/include/internal/GenericConnectivityManagerImpl_BLE.ipp b/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.ipp similarity index 96% rename from src/platform/include/internal/GenericConnectivityManagerImpl_BLE.ipp rename to src/include/platform/internal/GenericConnectivityManagerImpl_BLE.ipp index d58d3711084edb..6a64126a19c221 100644 --- a/src/platform/include/internal/GenericConnectivityManagerImpl_BLE.ipp +++ b/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.ipp @@ -24,7 +24,7 @@ #ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_BLE_IPP #define GENERIC_CONNECTIVITY_MANAGER_IMPL_BLE_IPP -#include +#include namespace chip { diff --git a/src/platform/include/internal/GenericConnectivityManagerImpl_NoBLE.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h similarity index 100% rename from src/platform/include/internal/GenericConnectivityManagerImpl_NoBLE.h rename to src/include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h diff --git a/src/platform/include/internal/GenericConnectivityManagerImpl_NoThread.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h similarity index 100% rename from src/platform/include/internal/GenericConnectivityManagerImpl_NoThread.h rename to src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h diff --git a/src/platform/include/internal/GenericConnectivityManagerImpl_NoTunnel.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoTunnel.h similarity index 100% rename from src/platform/include/internal/GenericConnectivityManagerImpl_NoTunnel.h rename to src/include/platform/internal/GenericConnectivityManagerImpl_NoTunnel.h diff --git a/src/platform/include/internal/GenericConnectivityManagerImpl_NoWiFi.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h similarity index 100% rename from src/platform/include/internal/GenericConnectivityManagerImpl_NoWiFi.h rename to src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h diff --git a/src/platform/include/internal/GenericConnectivityManagerImpl_Thread.h b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h similarity index 99% rename from src/platform/include/internal/GenericConnectivityManagerImpl_Thread.h rename to src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h index 1874b75fead1ff..b4a881387a1a83 100644 --- a/src/platform/include/internal/GenericConnectivityManagerImpl_Thread.h +++ b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h @@ -24,7 +24,7 @@ #ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_THREAD_H #define GENERIC_CONNECTIVITY_MANAGER_IMPL_THREAD_H -#include +#include namespace chip { namespace DeviceLayer { diff --git a/src/platform/include/internal/GenericConnectivityManagerImpl_Thread.ipp b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.ipp similarity index 98% rename from src/platform/include/internal/GenericConnectivityManagerImpl_Thread.ipp rename to src/include/platform/internal/GenericConnectivityManagerImpl_Thread.ipp index 457f9c6359a540..81df81e2af199d 100644 --- a/src/platform/include/internal/GenericConnectivityManagerImpl_Thread.ipp +++ b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.ipp @@ -24,8 +24,8 @@ #ifndef GENERIC_CONNECTIVITY_MANAGER_IMPL_THREAD_IPP #define GENERIC_CONNECTIVITY_MANAGER_IMPL_THREAD_IPP -#include -#include +#include +#include namespace chip { namespace DeviceLayer {