From a48b365d59f7ba81c40645370cdfa63cc36092e2 Mon Sep 17 00:00:00 2001
From: Mathieu Kardous <84793247+mkardous-silabs@users.noreply.github.com>
Date: Fri, 15 Nov 2024 17:41:42 -0500
Subject: [PATCH] [SL-UP] Update spi-multiplex header inclusion (#110)

---
 examples/platform/silabs/uart.cpp                          | 2 +-
 examples/refrigerator-app/silabs/src/RefrigeratorUI.cpp    | 6 +++---
 examples/thermostat/silabs/src/ThermostatUI.cpp            | 6 +++---
 src/platform/silabs/multi-ota/OTACustomProcessor.cpp       | 7 ++++---
 src/platform/silabs/multi-ota/OTAFirmwareProcessor.cpp     | 7 ++++---
 .../silabs/multi-ota/OTAMultiImageProcessorImpl.cpp        | 7 ++++---
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/examples/platform/silabs/uart.cpp b/examples/platform/silabs/uart.cpp
index 7e7f454b6c..18efda030e 100644
--- a/examples/platform/silabs/uart.cpp
+++ b/examples/platform/silabs/uart.cpp
@@ -53,7 +53,7 @@ extern "C" {
 #endif
 #include "sl_uartdrv_instances.h"
 #if SL_WIFI
-#include "spi_multiplex.h"
+#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
 #endif // SL_WIFI
 #ifdef SL_CATALOG_UARTDRV_EUSART_PRESENT
 #include "sl_uartdrv_eusart_vcom_config.h"
diff --git a/examples/refrigerator-app/silabs/src/RefrigeratorUI.cpp b/examples/refrigerator-app/silabs/src/RefrigeratorUI.cpp
index 655c803f21..f1b7d7698d 100644
--- a/examples/refrigerator-app/silabs/src/RefrigeratorUI.cpp
+++ b/examples/refrigerator-app/silabs/src/RefrigeratorUI.cpp
@@ -26,10 +26,10 @@
 #include "lcd.h"
 #include <lib/support/logging/CHIPLogging.h>
 
-#if SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
 // Only needed for wifi NCP devices
-#include "spi_multiplex.h"
-#endif // SL_WIFI
+#if SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
+#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
+#endif // SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
 
 // LCD line define
 constexpr uint8_t kTempLcdInitialX = 30;
diff --git a/examples/thermostat/silabs/src/ThermostatUI.cpp b/examples/thermostat/silabs/src/ThermostatUI.cpp
index f82ee36387..4ac0263a0c 100644
--- a/examples/thermostat/silabs/src/ThermostatUI.cpp
+++ b/examples/thermostat/silabs/src/ThermostatUI.cpp
@@ -25,10 +25,10 @@
 #include "glib.h"
 #include "lcd.h"
 
-#if SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
 // Only needed for wifi NCP devices
-#include "spi_multiplex.h"
-#endif // SL_WIFI
+#if SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
+#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
+#endif // SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
 
 // LCD line define
 constexpr uint8_t kTempLcdInitialX = 30;
diff --git a/src/platform/silabs/multi-ota/OTACustomProcessor.cpp b/src/platform/silabs/multi-ota/OTACustomProcessor.cpp
index ef761d003e..d4c8efb3d0 100644
--- a/src/platform/silabs/multi-ota/OTACustomProcessor.cpp
+++ b/src/platform/silabs/multi-ota/OTACustomProcessor.cpp
@@ -22,12 +22,13 @@
 
 #include <app/clusters/ota-requestor/OTARequestorInterface.h>
 
+#if SL_WIFI
+#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
+#endif // SL_WIFI
+
 extern "C" {
 #include "btl_interface.h"
 #include "sl_core.h"
-#if SL_WIFI
-#include "spi_multiplex.h"
-#endif // SL_WIFI
 }
 
 /// No error, operation OK
diff --git a/src/platform/silabs/multi-ota/OTAFirmwareProcessor.cpp b/src/platform/silabs/multi-ota/OTAFirmwareProcessor.cpp
index d8545d01f4..ce99335bac 100644
--- a/src/platform/silabs/multi-ota/OTAFirmwareProcessor.cpp
+++ b/src/platform/silabs/multi-ota/OTAFirmwareProcessor.cpp
@@ -22,12 +22,13 @@
 
 #include <app/clusters/ota-requestor/OTARequestorInterface.h>
 
+#if SL_WIFI
+#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
+#endif // SL_WIFI
+
 extern "C" {
 #include "btl_interface.h"
 #include "sl_core.h"
-#if SL_WIFI
-#include "spi_multiplex.h"
-#endif // SL_WIFI
 }
 
 /// No error, operation OK
diff --git a/src/platform/silabs/multi-ota/OTAMultiImageProcessorImpl.cpp b/src/platform/silabs/multi-ota/OTAMultiImageProcessorImpl.cpp
index a95cb4e1ad..70fb2950a2 100644
--- a/src/platform/silabs/multi-ota/OTAMultiImageProcessorImpl.cpp
+++ b/src/platform/silabs/multi-ota/OTAMultiImageProcessorImpl.cpp
@@ -30,12 +30,13 @@ using namespace ::chip::DeviceLayer::Internal;
 
 static chip::OTAMultiImageProcessorImpl gImageProcessor;
 
+#if SL_WIFI
+#include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
+#endif // SL_WIFI
+
 extern "C" {
 #include "btl_interface.h"
 #include "sl_core.h"
-#if SL_WIFI
-#include "spi_multiplex.h"
-#endif // SL_WIFI
 }
 
 namespace chip {