From a5278476a44bd3c9d94c78668f3f89c7ecc87331 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Fri, 15 Mar 2024 22:26:36 -0600
Subject: [PATCH] only:cleaner guards

---
 firmware/console/eficonsole.cpp            | 2 +-
 firmware/hw_layer/drivers/gpio/l9779.cpp   | 2 +-
 firmware/hw_layer/drivers/gpio/mc33810.cpp | 2 +-
 firmware/hw_layer/drivers/gpio/tle9104.h   | 2 +-
 firmware/hw_layer/smart_gpio.cpp           | 2 +-
 simulator/simulator/efifeatures.h          | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/firmware/console/eficonsole.cpp b/firmware/console/eficonsole.cpp
index 32760f79b2..3c43f4a6ef 100644
--- a/firmware/console/eficonsole.cpp
+++ b/firmware/console/eficonsole.cpp
@@ -51,7 +51,7 @@ static void sayHello() {
 	efiPrintf(PROTOCOL_HELLO_PREFIX " with OPENBLT");
 #endif
 
-#if ENABLE_AUTO_DETECT_HSE
+#if EFI_PROD_CODE && ENABLE_AUTO_DETECT_HSE
 	extern float hseFrequencyMhz;
 	extern uint8_t autoDetectedRoundedMhz;
 	efiPrintf(PROTOCOL_HELLO_PREFIX " detected HSE clock %.2f MHz PLLM = %d", hseFrequencyMhz, autoDetectedRoundedMhz);
diff --git a/firmware/hw_layer/drivers/gpio/l9779.cpp b/firmware/hw_layer/drivers/gpio/l9779.cpp
index e324daceb9..693fd6b369 100644
--- a/firmware/hw_layer/drivers/gpio/l9779.cpp
+++ b/firmware/hw_layer/drivers/gpio/l9779.cpp
@@ -31,7 +31,7 @@
 
 #include "gpio/l9779.h"
 
-#if (BOARD_L9779_COUNT > 0)
+#if EFI_PROD_CODE && (BOARD_L9779_COUNT > 0)
 
 #include "persistent_configuration.h"
 #include "hardware.h"
diff --git a/firmware/hw_layer/drivers/gpio/mc33810.cpp b/firmware/hw_layer/drivers/gpio/mc33810.cpp
index 80ff99f7be..a07e2066d2 100644
--- a/firmware/hw_layer/drivers/gpio/mc33810.cpp
+++ b/firmware/hw_layer/drivers/gpio/mc33810.cpp
@@ -23,7 +23,7 @@
 #include "gpio/gpio_ext.h"
 #include "gpio/mc33810.h"
 
-#if (BOARD_MC33810_COUNT > 0)
+#if EFI_PROD_CODE && (BOARD_MC33810_COUNT > 0)
 
 /*
  * TODO list:
diff --git a/firmware/hw_layer/drivers/gpio/tle9104.h b/firmware/hw_layer/drivers/gpio/tle9104.h
index 1f37a2311d..51bdd97cb6 100644
--- a/firmware/hw_layer/drivers/gpio/tle9104.h
+++ b/firmware/hw_layer/drivers/gpio/tle9104.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#if BOARD_TLE9104_COUNT > 0
+#if EFI_PROD_CODE && BOARD_TLE9104_COUNT > 0
 
 struct tle9104_config {
 	SPIDriver		*spi_bus;
diff --git a/firmware/hw_layer/smart_gpio.cpp b/firmware/hw_layer/smart_gpio.cpp
index 658bf1ac59..2fdaf5ae7b 100644
--- a/firmware/hw_layer/smart_gpio.cpp
+++ b/firmware/hw_layer/smart_gpio.cpp
@@ -276,7 +276,7 @@ void initSmartGpio() {
 	}
 #endif /* (BOARD_TLE8888_COUNT > 0) */
 
-#if (BOARD_DRV8860_COUNT > 0)
+#if EFI_PROD_CODE && (BOARD_DRV8860_COUNT > 0)
 	if (isBrainPinValid(engineConfiguration->drv8860_cs)) {
 		drv8860.spi_config.ssport = getHwPort("drv8860 CS", engineConfiguration->drv8860_cs);
 		drv8860.spi_config.sspad = getHwPin("drv8860 CS", engineConfiguration->drv8860_cs);
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index a18de87b3b..d226a0be35 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -27,13 +27,14 @@
 #define EFI_DYNO_VIEW FALSE
 #define EFI_ONBOARD_MEMS FALSE
 #define EFI_DAC FALSE
+#define EFI_ETHERNET FALSE
 #define EFI_POTENTIOMETER FALSE
 #define EFI_PERF_METRICS FALSE
 #define EFI_WIFI FALSE
 #define EFI_BACKUP_SRAM FALSE
 #define EFI_UART_GPS FALSE
 #define EFI_HELLA_OIL FALSE
-#define USE_OPENBLT FALSE
+#define EFI_USE_OPENBLT FALSE
 #define EFI_BOOTLOADER FALSE
 #define EFI_WS2812 FALSE
 #define EFI_MCP_3208 FALSE