[Silabs] [EFR32] Refactor 917 NCP and 917 SoC Bluetooth to use the sa…

…me implementation (#26390) * Refactor 917 NCP and 917 SoC bluetooth to use the same implementation file * Restyled by gn * Added changes for coding standard --------- Co-authored-by: Restyled.io <[email protected]>
project-chip · Jan 9, 2024 · ad31ed0 · ad31ed0
1 parent e562930
commit ad31ed0
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 1,863 deletions.
diff --git a/src/platform/silabs/SiWx917/BLEManagerImpl.cpp b/src/platform/silabs/SiWx917/BLEManagerImpl.cpp
diff --git a/src/platform/silabs/SiWx917/BUILD.gn b/src/platform/silabs/SiWx917/BUILD.gn
@@ -58,12 +58,12 @@ static_library("SiWx917") {
     "${silabs_platform_dir}/platformAbstraction/WiseMcuSpam.cpp",
     "../../FreeRTOS/SystemTimeSupport.cpp",
     "../../SingletonConfigurationManager.cpp",
-    "BLEManagerImpl.cpp",
+    "../rs911x/BLEManagerImpl.cpp",
+    "../rs911x/rsi_ble_config.h",
+    "../rs911x/wfx_sl_ble_init.c",
+    "../rs911x/wfx_sl_ble_init.h",
     "ConfigurationManagerImpl.cpp",
     "PlatformManagerImpl.cpp",
-    "bluetooth/rsi_ble_config.h",
-    "bluetooth/wfx_sl_ble_init.c",
-    "bluetooth/wfx_sl_ble_init.h",
   ]
 
   # TODO: OTA on CCP platform

diff --git a/src/platform/silabs/efr32/BUILD.gn b/src/platform/silabs/efr32/BUILD.gn
@@ -68,10 +68,10 @@ static_library("efr32") {
 
   if (chip_enable_ble_rs911x) {
     sources += [
-      "rs911x/BLEManagerImpl.cpp",
-      "rs911x/rsi_ble_config.h",
-      "rs911x/wfx_sl_ble_init.c",
-      "rs911x/wfx_sl_ble_init.h",
+      "../rs911x/BLEManagerImpl.cpp",
+      "../rs911x/rsi_ble_config.h",
+      "../rs911x/wfx_sl_ble_init.c",
+      "../rs911x/wfx_sl_ble_init.h",
     ]
   } else {
     sources += [ "BLEManagerImpl.cpp" ]

diff --git a/src/platform/silabs/efr32/rs911x/rsi_ble_config.h b/src/platform/silabs/efr32/rs911x/rsi_ble_config.h