From bf59660e37574a53de00dbac24ca10f534207d79 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Tue, 8 Aug 2023 06:59:00 -0400
Subject: [PATCH] encapsulation

---
 firmware/pch/pch.h                | 1 +
 firmware/util/cli_registry.cpp    | 5 +++++
 firmware/util/efilib.h            | 6 ------
 firmware/util/efistringutil.h     | 5 +++++
 simulator/simulator/efifeatures.h | 2 --
 unit_tests/efifeatures.h          | 2 --
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/firmware/pch/pch.h b/firmware/pch/pch.h
index ccd1b9f60c..4e5fa46509 100644
--- a/firmware/pch/pch.h
+++ b/firmware/pch/pch.h
@@ -19,6 +19,7 @@
 
 #include "global.h"
 #include "efifeatures.h"
+#include "efistringutil.h"
 #include "rusefi_generated.h"
 #include "loggingcentral.h"
 #include "error_handling.h"
diff --git a/firmware/util/cli_registry.cpp b/firmware/util/cli_registry.cpp
index c38472b76c..ead28a0e86 100644
--- a/firmware/util/cli_registry.cpp
+++ b/firmware/util/cli_registry.cpp
@@ -16,6 +16,7 @@
 
 #include "pch.h"
 #include <cstring>
+#include <cstdint>
 #include "efiprintf.h"
 #include "efistringutil.h"
 #include "cli_registry.h"
@@ -23,6 +24,10 @@
 /* for isspace() */
 #include <ctype.h>
 
+#ifndef CONSOLE_MAX_ACTIONS
+#define CONSOLE_MAX_ACTIONS 256
+#endif
+
 #ifndef MAX_CMD_LINE_LENGTH
 #define MAX_CMD_LINE_LENGTH		100
 #endif
diff --git a/firmware/util/efilib.h b/firmware/util/efilib.h
index f61e6cbf6d..940c3a3f70 100644
--- a/firmware/util/efilib.h
+++ b/firmware/util/efilib.h
@@ -43,8 +43,6 @@ static inline uint32_t SWAP_UINT32(uint32_t x)
 // number of microseconds in one period of given frequency (per second)
 #define frequency2periodUs(freq) ((1000000.0f) / (freq))
 
-#define ATOI_ERROR_CODE 311223344
-
 #define Q(x) #x
 #define QUOTE(x) Q(x)
 
@@ -62,7 +60,6 @@ uint32_t efiStrlen(const char *param);
 int efiPow10(int param);
 bool startsWith(const char *line, const char *prefix);
 float atoff(const char *string);
-int atoi(const char *string);
 
 #ifndef UNUSED
 #define UNUSED(x) (void)(x)
@@ -82,9 +79,6 @@ char* itoa10(char *p, int num);
  */
 #define clampPercentValue(x) (clampF(0, x, 100))
 
-bool strEqualCaseInsensitive(const char *str1, const char *str2);
-bool strEqual(const char *str1, const char *str2);
-
 // Currently used by air-interp. tCharge mode (see EngineState::updateTChargeK()).
 float limitRateOfChange(float newValue, float oldValue, float incrLimitPerSec, float decrLimitPerSec, float secsPassed);
 
diff --git a/firmware/util/efistringutil.h b/firmware/util/efistringutil.h
index f2b3fe001b..ff0fb53a9f 100644
--- a/firmware/util/efistringutil.h
+++ b/firmware/util/efistringutil.h
@@ -1 +1,6 @@
+#define ATOI_ERROR_CODE 311223344
+
 int indexOf(const char *string, char ch);
+bool strEqualCaseInsensitive(const char *str1, const char *str2);
+bool strEqual(const char *str1, const char *str2);
+int atoi(const char *string);
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index 5eb8044255..143006c1d8 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -72,8 +72,6 @@
 #define EFI_TOOTH_LOGGER TRUE
 #endif
 
-#define CONSOLE_MAX_ACTIONS 256
-
 #define EFI_USE_UART_DMA FALSE
 
 #define EFI_MAP_AVERAGING TRUE
diff --git a/unit_tests/efifeatures.h b/unit_tests/efifeatures.h
index 3355e93d19..5dcc361c1a 100644
--- a/unit_tests/efifeatures.h
+++ b/unit_tests/efifeatures.h
@@ -55,8 +55,6 @@
 
 #define EFI_HISTOGRAMS FALSE
 
-#define CONSOLE_MAX_ACTIONS 128
-
 #define EFI_CLI_SUPPORT FALSE
 
 #define EFI_SIGNAL_EXECUTOR_ONE_TIMER FALSE