From 315bfe6531c095550dab19e8998d992968edf31b Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Mon, 23 Nov 2020 23:33:46 -0500
Subject: [PATCH] avoid float -> int64 conversion #1977 cherry picking...

---
 firmware/global.h            | 10 ----------
 firmware/util/efitime.h      |  9 +++++++++
 simulator/simulator/global.h |  4 ----
 unit_tests/global.h          |  4 ----
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/firmware/global.h b/firmware/global.h
index 79922befbe..f372d56f4d 100644
--- a/firmware/global.h
+++ b/firmware/global.h
@@ -96,14 +96,4 @@ typedef unsigned int time_t;
 #define CCM_OPTIONAL
 #endif /* EFI_USE_CCM */
 
-/**
- * converts efitimeus_t to efitick_t
- */
-#define US2NT(us) (((efitime_t)(us))*US_TO_NT_MULTIPLIER)
-
-/**
- * converts efitick_t to efitimeus_t
- */
-#define NT2US(nt) ((nt) / US_TO_NT_MULTIPLIER)
-
 #define UNIT_TEST_BUSY_WAIT_CALLBACK() {}
diff --git a/firmware/util/efitime.h b/firmware/util/efitime.h
index 38d260ead9..824968545c 100644
--- a/firmware/util/efitime.h
+++ b/firmware/util/efitime.h
@@ -19,8 +19,17 @@
 
 #define MS2US(MS_TIME) ((MS_TIME) * 1000)
 
+// microseconds to ticks
+
+#define US2NT(us) (((efitime_t)(us)) * US_TO_NT_MULTIPLIER)
+#define USF2NT(us_float) ((us_float) * US_TO_NT_MULTIPLIER)
+
+// And back
+#define NT2US(x) ((x) / US_TO_NT_MULTIPLIER)
+
 // milliseconds to ticks
 #define MS2NT(msTime) US2NT(MS2US(msTime))
+#define MSF2NT(msTimeFloat) USF2NT(MS2US(msTimeFloat))
 
 /**
  * We use this 'deep in past, before ECU has ever started' value as a way to unify
diff --git a/simulator/simulator/global.h b/simulator/simulator/global.h
index 2f10859135..6824e0508d 100644
--- a/simulator/simulator/global.h
+++ b/simulator/simulator/global.h
@@ -30,10 +30,6 @@
 
 #define US_TO_NT_MULTIPLIER 100
 
-#define US2NT(x) (US_TO_NT_MULTIPLIER * (x))
-
-#define NT2US(x) ((x) / US_TO_NT_MULTIPLIER)
-
 // need to fight 32bit int overflow
 
 #define MY_US2ST(x) ((x) / 10)
diff --git a/unit_tests/global.h b/unit_tests/global.h
index 9348797780..7dca6bafec 100644
--- a/unit_tests/global.h
+++ b/unit_tests/global.h
@@ -58,10 +58,6 @@ void print(const char *fmt, ...);
 #define VCS_VERSION "321"
 #define RUS_EFI_VERSION_TAG "rusEfiVersion"
 
-#define US2NT(x) (US_TO_NT_MULTIPLIER * (x))
-
-#define NT2US(x) ((x) / US_TO_NT_MULTIPLIER)
-
 #define INLINE inline
 
 #define EFI_ERROR_CODE 0xffffffff