Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sort includes platform/EFR32 #697

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/platform/EFR32/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@
* for the Silicon Labs EFR32 platforms.
*/

/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>

#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE

#include <platform/internal/BLEManager.h>

#include <ble/CHIPBleServiceData.h>
#include <platform/EFR32/freertos_bluetooth.h>
#include <support/CodeUtils.h>
#include <support/logging/CHIPLogging.h>
#include <new>

#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE

#include <platform/EFR32/freertos_bluetooth.h>
#include "rtos_gecko.h"

using namespace ::chip;
Expand Down Expand Up @@ -724,7 +726,6 @@ void BLEManagerImpl::HandleConnectionCloseEvent(volatile struct gecko_cmd_packet

void BLEManagerImpl::HandleWriteEvent(volatile struct gecko_cmd_packet * evt)
{
struct gecko_msg_gatt_server_read_attribute_type_rsp_t * rsp;
uint16_t attribute = evt->data.evt_gatt_server_user_write_request.characteristic;

ChipLogProgress(DeviceLayer, "Char Write Req, char : %d", attribute);
Expand Down
10 changes: 6 additions & 4 deletions src/platform/EFR32/ConfigurationManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@
* Provides the implementation of the Device Layer ConfigurationManager object
* for EFR32 platforms using the Silicon Labs SDK.
*/

/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>

#include <platform/internal/GenericConfigurationManagerImpl.ipp>

#include <platform/ConfigurationManager.h>
#include <platform/Profiles/security/CHIPApplicationKeys.h>
#include <platform/EFR32/GroupKeyStoreImpl.h>
#include <platform/EFR32/EFR32Config.h>
#include <platform/internal/GenericConfigurationManagerImpl.ipp>
#include <platform/EFR32/GroupKeyStoreImpl.h>
#include <platform/Profiles/security/CHIPApplicationKeys.h>

namespace chip {
namespace DeviceLayer {
Expand Down
14 changes: 6 additions & 8 deletions src/platform/EFR32/ConnectivityManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>

#include <platform/ConnectivityManager.h>
#include <platform/internal/BLEManager.h>
#include <support/CodeUtils.h>
#include <support/logging/CHIPLogging.h>

#include <lwip/dns.h>
#include <lwip/ip_addr.h>
#include <lwip/netif.h>
#include <lwip/nd6.h>
#include <lwip/dns.h>

#include <new>

#include <support/logging/CHIPLogging.h>
#include <support/CodeUtils.h>
#include <lwip/netif.h>

#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
#include <platform/internal/GenericConnectivityManagerImpl_BLE.ipp>
Expand Down
6 changes: 4 additions & 2 deletions src/platform/EFR32/EFR32Config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,17 @@
* Utilities for accessing persisted device configuration on
* platforms based on the Silicon Labs SDK.
*/

/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>

#include <platform/EFR32/EFR32Config.h>

#include <core/CHIPEncoding.h>
#include <platform/internal/testing/ConfigUnitTest.h>

#include "FreeRTOS.h"
#include "nvm3.h"
#include "nvm3_hal_flash.h"
#include "FreeRTOS.h"

namespace chip {
namespace DeviceLayer {
Expand Down
5 changes: 4 additions & 1 deletion src/platform/EFR32/Entropy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@
* Provides implementations for the Chip entropy sourcing functions
* on the Silcon Labs EFR32 platforms.
*/

/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>

#include <support/crypto/CHIPRNG.h>

#include <mbedtls/entropy_poll.h>

#include <em_device.h>

#if defined(_SILICON_LABS_32B_SERIES_1)
Expand Down
3 changes: 2 additions & 1 deletion src/platform/EFR32/GroupKeyStoreImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
* Provides an implementation of the CHIP GroupKeyStore interface
* for platforms based on the Silicon Labs SDK.
*/

/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>

#include <platform/EFR32/GroupKeyStoreImpl.h>

using namespace ::chip;
Expand Down
10 changes: 6 additions & 4 deletions src/platform/EFR32/Logging.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@
* logs wait indefinitely until a slot is available whereas
* non-error logs are dropped to avoid delays.
*/

#include <stdio.h>
#include <retargetserial.h>
/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>

#include <support/logging/CHIPLogging.h>
#include <task.h>

#include <queue.h>
#include <retargetserial.h>
#include <stdio.h>
#include <task.h>

// RTT Buffer size and name
#ifndef LOG_RTT_BUFFER_INDEX
Expand Down
7 changes: 4 additions & 3 deletions src/platform/EFR32/NetworkProvisioningServerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>

#include <platform/internal/NetworkProvisioningServer.h>
#include <platform/internal/DeviceNetworkInfo.h>

#include <core/CHIPTLV.h>
#include <platform/Profiles/CHIPProfiles.h>
#include <platform/Profiles/common/CommonProfile.h>

#include <platform/internal/DeviceNetworkInfo.h>
#include <platform/internal/GenericNetworkProvisioningServerImpl.ipp>

namespace chip {
Expand Down
3 changes: 2 additions & 1 deletion src/platform/EFR32/PlatformManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
* Provides an implementation of the PlatformManager object
* for EFR32 platforms using the Silicon Labs EFR32 SDK.
*/

/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>

#include <platform/PlatformManager.h>
#include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp>

Expand Down
8 changes: 4 additions & 4 deletions src/platform/EFR32/SoftwareUpdateManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>

#if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER

#include <platform/internal/GenericSoftwareUpdateManagerImpl.ipp>
#include <platform/internal/GenericSoftwareUpdateManagerImpl_BDX.ipp>

#include <platform/Profiles/CHIPProfiles.h>
#include <platform/Profiles/common/CommonProfile.h>

#include <platform/internal/GenericSoftwareUpdateManagerImpl_BDX.ipp>
#include <platform/internal/GenericSoftwareUpdateManagerImpl.ipp>

namespace chip {
namespace DeviceLayer {

Expand Down
6 changes: 3 additions & 3 deletions src/platform/EFR32/ThreadStackManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
* stack.
*
*/

/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>
#include <platform/ThreadStackManager.h>
#include <platform/OpenThread/OpenThreadUtils.h>

#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.ipp>
#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.ipp>

#include <platform/OpenThread/OpenThreadUtils.h>

namespace chip {
namespace DeviceLayer {

Expand Down
7 changes: 4 additions & 3 deletions src/platform/EFR32/freertos_bluetooth.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
* limitations under the License.
*/

#include <platform/EFR32/freertos_bluetooth.h>

#include <em_device.h>
#include <stdint.h>
#include <string.h>
#include <em_device.h>

#include "rtos_gecko.h"
#include "gecko_configuration.h"
#include <platform/EFR32/freertos_bluetooth.h>
#include "rtos_gecko.h"

#ifdef CONFIGURATION_HEADER
#include CONFIGURATION_HEADER
Expand Down
3 changes: 2 additions & 1 deletion src/platform/EFR32/gatt_db.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
* Autogenerated file, do not edit.
*******************************************************************/

#include <stdint.h>
#include "bg_gattdb_def.h"

#include <stdint.h>

#define GATT_HEADER(F) F
#define GATT_DATA(F) F
GATT_DATA(const uint16_t bg_gattdb_data_uuidtable_16_map[]) = {
Expand Down