From f0c92ef2f4ca9c150d29fa94201ced9b55a87158 Mon Sep 17 00:00:00 2001 From: shgutte Date: Thu, 11 Jan 2024 02:12:48 +0530 Subject: [PATCH] Added restyler changes --- .../silabs/efr32/rs911x/hal/efx32_ncp_host.c | 1 - .../rs911x/hal/sl_board_configuration_SiWx917.h | 5 ++++- .../silabs/efr32/rs911x/hal/sl_si91x_ncp_utility.c | 1 - src/platform/silabs/rs911x/BLEManagerImpl.cpp | 6 +++--- third_party/silabs/efr32_sdk.gni | 12 +++++++----- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c b/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c index 237ef9557cf0df..414153ecd0164c 100644 --- a/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c +++ b/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c @@ -33,7 +33,6 @@ #include #include - #if defined(SL_CATLOG_POWER_MANAGER_PRESENT) #include "sl_power_manager.h" #endif diff --git a/examples/platform/silabs/efr32/rs911x/hal/sl_board_configuration_SiWx917.h b/examples/platform/silabs/efr32/rs911x/hal/sl_board_configuration_SiWx917.h index 3c119a6e7a7771..7145e318b33d30 100644 --- a/examples/platform/silabs/efr32/rs911x/hal/sl_board_configuration_SiWx917.h +++ b/examples/platform/silabs/efr32/rs911x/hal/sl_board_configuration_SiWx917.h @@ -38,7 +38,10 @@ typedef struct } sl_pin_t; #define PIN(port_id, pin_id) \ - (sl_pin_t) { .port = gpioPort##port_id, .pin = pin_id } + (sl_pin_t) \ + { \ + .port = gpioPort##port_id, .pin = pin_id \ + } #define SLEEP_CONFIRM_PIN PIN(D, 2) #define WAKE_INDICATOR_PIN PIN(A, 5) diff --git a/examples/platform/silabs/efr32/rs911x/hal/sl_si91x_ncp_utility.c b/examples/platform/silabs/efr32/rs911x/hal/sl_si91x_ncp_utility.c index 35e97e467c8d07..6a9d02f47dd027 100644 --- a/examples/platform/silabs/efr32/rs911x/hal/sl_si91x_ncp_utility.c +++ b/examples/platform/silabs/efr32/rs911x/hal/sl_si91x_ncp_utility.c @@ -36,7 +36,6 @@ #include "spidrv.h" #include "task.h" - #include "sl_device_init_clocks.h" #include "sl_device_init_hfxo.h" #include "sl_status.h" diff --git a/src/platform/silabs/rs911x/BLEManagerImpl.cpp b/src/platform/silabs/rs911x/BLEManagerImpl.cpp index 66a31f2a540d36..bc79b1429ff94a 100644 --- a/src/platform/silabs/rs911x/BLEManagerImpl.cpp +++ b/src/platform/silabs/rs911x/BLEManagerImpl.cpp @@ -242,8 +242,8 @@ namespace { #define BLE_CONFIG_MIN_INTERVAL (16) // Time = Value x 1.25 ms = 30ms #define BLE_CONFIG_MAX_INTERVAL (80) // Time = Value x 1.25 ms = 100ms #define BLE_CONFIG_LATENCY (0) -#define BLE_CONFIG_TIMEOUT (100) // Time = Value x 10 ms = 1s -#define BLE_CONFIG_MIN_CE_LENGTH (0) // Leave to min value +#define BLE_CONFIG_TIMEOUT (100) // Time = Value x 10 ms = 1s +#define BLE_CONFIG_MIN_CE_LENGTH (0) // Leave to min value #define BLE_CONFIG_MAX_CE_LENGTH (0xFFFF) // Leave to max value #define BLE_DEFAULT_TIMER_PERIOD_MS (1) @@ -251,7 +251,7 @@ namespace { TimerHandle_t sbleAdvTimeoutTimer; // FreeRTOS sw timer. const uint8_t UUID_CHIPoBLEService[] = { 0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80, - 0x00, 0x10, 0x00, 0x00, 0xF6, 0xFF, 0x00, 0x00 }; + 0x00, 0x10, 0x00, 0x00, 0xF6, 0xFF, 0x00, 0x00 }; const uint8_t ShortUUID_CHIPoBLEService[] = { 0xF6, 0xFF }; const ChipBleUUID ChipUUID_CHIPoBLEChar_RX = { { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42, 0x9F, 0x9D, 0x11 } }; diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni index 928645108506a2..cf5397b8193223 100644 --- a/third_party/silabs/efr32_sdk.gni +++ b/third_party/silabs/efr32_sdk.gni @@ -130,6 +130,7 @@ template("efr32_sdk") { # Treat these includes as system includes, so warnings in them are not fatal. _include_dirs = [ "${efr32_sdk_root}", + #TODO: Added this as include files because of spi_multiplexing.h file. we will remove it after the cleanup. "${examples_plat_dir}", "${efr32_sdk_root}/util/plugin/security_manager/", @@ -207,14 +208,13 @@ template("efr32_sdk") { ] if (silabs_family == "efr32mg24") { - _include_dirs += [ - "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG24/Include", - ] + _include_dirs += + [ "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG24/Include" ] } if (use_SiWx917) { _include_dirs += [ - # si91x component + # si91x component "${wifi_sdk_root}/components/si91x/memory", "${wifi_sdk_root}/components/device/silabs/si91x/wireless/sl_net/inc", "${wifi_sdk_root}/components/device/silabs/si91x/mcu/drivers/rom_driver/inc", @@ -255,7 +255,9 @@ template("efr32_sdk") { if (use_rs9116) { _include_dirs += [ "${wiseconnect_sdk_root}/sapi/include" ] } else { - _include_dirs += [ "${wifi_sdk_root}/components/device/silabs/si91x/wireless/ble/inc" ] + _include_dirs += [ + "${wifi_sdk_root}/components/device/silabs/si91x/wireless/ble/inc", + ] } }