From be71d06dfcc5ff4fb8e3db61b9808afbc3fe552b Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 23 Nov 2020 17:10:17 -0800 Subject: [PATCH] remove (#1985) --- firmware/controllers/engine_cycle/main_trigger_callback.cpp | 2 +- firmware/controllers/engine_cycle/spark_logic.cpp | 4 ++-- firmware/controllers/trigger/trigger_central.cpp | 2 +- firmware/global.h | 3 --- simulator/simulator/global.h | 2 -- unit_tests/global.h | 2 -- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp index 5633d1df0c..b3b7600b8e 100644 --- a/firmware/controllers/engine_cycle/main_trigger_callback.cpp +++ b/firmware/controllers/engine_cycle/main_trigger_callback.cpp @@ -314,7 +314,7 @@ void InjectionEvent::onTriggerTooth(size_t trgEventIndex, int rpm, efitick_t now #endif /* EFI_DEFAILED_LOGGING */ } -static ALWAYS_INLINE void handleFuel(const bool limitedFuel, uint32_t trgEventIndex, int rpm, efitick_t nowNt DECLARE_ENGINE_PARAMETER_SUFFIX) { +static void handleFuel(const bool limitedFuel, uint32_t trgEventIndex, int rpm, efitick_t nowNt DECLARE_ENGINE_PARAMETER_SUFFIX) { ScopePerf perf(PE::HandleFuel); efiAssertVoid(CUSTOM_STACK_6627, getCurrentRemainingStack() > 128, "lowstck#3"); diff --git a/firmware/controllers/engine_cycle/spark_logic.cpp b/firmware/controllers/engine_cycle/spark_logic.cpp index bd4d7e0eb1..1d7ae86887 100644 --- a/firmware/controllers/engine_cycle/spark_logic.cpp +++ b/firmware/controllers/engine_cycle/spark_logic.cpp @@ -319,7 +319,7 @@ bool scheduleOrQueue(AngleBasedEvent *event, } } -static ALWAYS_INLINE void handleSparkEvent(bool limitedSpark, uint32_t trgEventIndex, IgnitionEvent *event, +static void handleSparkEvent(bool limitedSpark, uint32_t trgEventIndex, IgnitionEvent *event, int rpm, efitick_t edgeTimestamp DECLARE_ENGINE_PARAMETER_SUFFIX) { angle_t sparkAngle = event->sparkAngle; @@ -421,7 +421,7 @@ void initializeIgnitionActions(DECLARE_ENGINE_PARAMETER_SIGNATURE) { list->isReady = true; } -static ALWAYS_INLINE void prepareIgnitionSchedule(DECLARE_ENGINE_PARAMETER_SIGNATURE) { +static void prepareIgnitionSchedule(DECLARE_ENGINE_PARAMETER_SIGNATURE) { ScopePerf perf(PE::PrepareIgnitionSchedule); /** diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 8a0a133df9..6b95b789e0 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -320,7 +320,7 @@ static char shaft_signal_msg_index[15]; static const bool isUpEvent[6] = { false, true, false, true, false, true }; static const char *eventId[6] = { PROTOCOL_CRANK1, PROTOCOL_CRANK1, PROTOCOL_CRANK2, PROTOCOL_CRANK2, PROTOCOL_CRANK3, PROTOCOL_CRANK3 }; -static ALWAYS_INLINE void reportEventToWaveChart(trigger_event_e ckpSignalType, int index DECLARE_ENGINE_PARAMETER_SUFFIX) { +static void reportEventToWaveChart(trigger_event_e ckpSignalType, int index DECLARE_ENGINE_PARAMETER_SUFFIX) { if (!ENGINE(isEngineChartEnabled)) { // this is here just as a shortcut so that we avoid engine sniffer as soon as possible return; // engineSnifferRpmThreshold is accounted for inside ENGINE(isEngineChartEnabled) } diff --git a/firmware/global.h b/firmware/global.h index 3733206794..79922befbe 100644 --- a/firmware/global.h +++ b/firmware/global.h @@ -27,12 +27,9 @@ #if defined __GNUC__ // GCC #include -#define ALWAYS_INLINE __attribute__((always_inline)) inline #else // IAR typedef unsigned int time_t; -// todo: what's the IAR option? -#define ALWAYS_INLINE INLINE #endif #ifdef __cplusplus diff --git a/simulator/simulator/global.h b/simulator/simulator/global.h index 0c1233021a..2f10859135 100644 --- a/simulator/simulator/global.h +++ b/simulator/simulator/global.h @@ -30,8 +30,6 @@ #define US_TO_NT_MULTIPLIER 100 -#define ALWAYS_INLINE - #define US2NT(x) (US_TO_NT_MULTIPLIER * (x)) #define NT2US(x) ((x) / US_TO_NT_MULTIPLIER) diff --git a/unit_tests/global.h b/unit_tests/global.h index 26d435de76..9348797780 100644 --- a/unit_tests/global.h +++ b/unit_tests/global.h @@ -58,8 +58,6 @@ void print(const char *fmt, ...); #define VCS_VERSION "321" #define RUS_EFI_VERSION_TAG "rusEfiVersion" -#define ALWAYS_INLINE INLINE - #define US2NT(x) (US_TO_NT_MULTIPLIER * (x)) #define NT2US(x) ((x) / US_TO_NT_MULTIPLIER)