From 14289f3686d3a982d4ebf4db8d8a77fe2651f358 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sun, 3 Feb 2019 21:19:26 -0500
Subject: [PATCH] Migrate to Chibios 18 stable #631 removing unused ChibiOS
 references

---
 unit_tests/Makefile | 18 ++----------------
 unit_tests/main.cpp |  6 +-----
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index 837f4c5a91..dfd8aa0bd7 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -4,16 +4,6 @@
 #
 
 PROJECT_DIR = ../firmware
-CHIBIOS=$(PROJECT_DIR)/ChibiOS4
-STREAMSFILE = $(CHIBIOS)/os/hal/include/hal_streams.h
-
-ifeq ("$(wildcard $(STREAMSFILE))","")
-$(info Invoking "git submodule update --init")
-$(shell git submodule update --init)
-$(info Invoked "git submodule update --init")
-# make is not happy about newly checked out module for some reason but next invocation would work
-$(error Please run 'make' again)
-endif
 
 # Compiler options here.
 ifeq ($(USE_OPT),)
@@ -162,13 +152,9 @@ INCDIR = . \
 	$(PROJECT_DIR)/controllers/trigger \
 	$(PROJECT_DIR)/controllers/trigger/decoders \
 	$(PROJECT_DIR)/ext_algo \
-	$(CHIBIOS)/os/rt/include \
-	$(CHIBIOS)/os/rt/various \
-	$(CHIBIOS)/os/hal/lib/streams \
-	$(CHIBIOS)/os/hal/include \
 	$(PROJECT_DIR)/hw_layer \
-          $(PROJECT_DIR)/hw_layer/algo \
-          $(PROJECT_DIR)/hw_layer/sensors/ \
+	$(PROJECT_DIR)/hw_layer/algo \
+	$(PROJECT_DIR)/hw_layer/sensors/ \
 	test_data_structures \
 	googletest/googlemock/include \
 	googletest/googletest \
diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp
index 517f806179..e379eeb518 100644
--- a/unit_tests/main.cpp
+++ b/unit_tests/main.cpp
@@ -22,11 +22,6 @@
 #include "engine_test_helper.h"
 #include "gtest/gtest.h"
 
-typedef int32_t         msg_t;
-
-#include "hal_streams.h"
-#include "memstreams.h"
-
 int timeNowUs = 0;
 
 efitimeus_t getTimeNowUs(void) {
@@ -44,6 +39,7 @@ extern int revolutionCounterSinceBootForUnitTest;
 int getRevolutionCounter(void) {
 	return revolutionCounterSinceBootForUnitTest;
 }
+
 extern bool printTriggerDebug;
 
 GTEST_API_ int main(int argc, char **argv) {