From 5a4c7b38cd70557eaeac1f64bea6d436611a0092 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Mon, 14 Oct 2019 16:04:28 -0400
Subject: [PATCH] preparing for #974 code comments & refactoring

---
 firmware/controllers/algo/engine.cpp   | 4 ----
 firmware/controllers/map_averaging.cpp | 5 +----
 unit_tests/global.h                    | 4 ++++
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 7d14c191bc..41f0e44b02 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -53,10 +53,8 @@ FsioState::FsioState() {
 
 void Engine::eInitializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMETER_SUFFIX) {
 #if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT
-#if !EFI_UNIT_TEST
 	// we have a confusing threading model so some synchronization would not hurt
 	bool alreadyLocked = lockAnyContext();
-#endif /* EFI_UNIT_TEST */
 
 	TRIGGER_SHAPE(initializeTriggerShape(logger,
 			engineConfiguration->ambiguousOperationMode,
@@ -86,11 +84,9 @@ void Engine::eInitializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMETER_SU
 		engine->engineCycleEventCount = TRIGGER_SHAPE(getLength());
 	}
 
-#if !EFI_UNIT_TEST
 	if (!alreadyLocked) {
 		unlockAnyContext();
 	}
-#endif /* EFI_UNIT_TEST */
 
 	if (!TRIGGER_SHAPE(shapeDefinitionError)) {
 		prepareOutputSignals(PASS_ENGINE_PARAMETER_SIGNATURE);
diff --git a/firmware/controllers/map_averaging.cpp b/firmware/controllers/map_averaging.cpp
index 3a6cda0e5a..446373ca7a 100644
--- a/firmware/controllers/map_averaging.cpp
+++ b/firmware/controllers/map_averaging.cpp
@@ -110,18 +110,15 @@ static bool isAveraging = false;
 static void startAveraging(void *arg) {
 	(void) arg;
 	efiAssertVoid(CUSTOM_ERR_6649, getCurrentRemainingStack() > 128, "lowstck#9");
-#if !EFI_UNIT_TEST
+
 	bool wasLocked = lockAnyContext();
-#endif
 	// with locking we would have a consistent state
 	mapAdcAccumulator = 0;
 	mapMeasurementsCounter = 0;
 	isAveraging = true;
-#if !EFI_UNIT_TEST
 	if (!wasLocked) {
 		unlockAnyContext();
 	}
-#endif /* !EFI_UNIT_TEST */
 
 	mapAveragingPin.setHigh();
 }
diff --git a/unit_tests/global.h b/unit_tests/global.h
index eaaf6a0b88..312f4eabb2 100644
--- a/unit_tests/global.h
+++ b/unit_tests/global.h
@@ -100,4 +100,8 @@ void print(const char *fmt, ...);
 
 #define CONFIG_PARAM(x) (x)
 
+#define lockAnyContext() false
+
+#define unlockAnyContext() {}
+
 #endif /* GLOBAL_H_ */