This commit is contained in:
Matthew Kennedy 2020-11-23 17:10:17 -08:00 committed by GitHub
parent 140f892661
commit 55379463c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 4 additions and 11 deletions

View File

@ -314,7 +314,7 @@ void InjectionEvent::onTriggerTooth(size_t trgEventIndex, int rpm, efitick_t now
#endif /* EFI_DEFAILED_LOGGING */ #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); ScopePerf perf(PE::HandleFuel);
efiAssertVoid(CUSTOM_STACK_6627, getCurrentRemainingStack() > 128, "lowstck#3"); efiAssertVoid(CUSTOM_STACK_6627, getCurrentRemainingStack() > 128, "lowstck#3");

View File

@ -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) { int rpm, efitick_t edgeTimestamp DECLARE_ENGINE_PARAMETER_SUFFIX) {
angle_t sparkAngle = event->sparkAngle; angle_t sparkAngle = event->sparkAngle;
@ -421,7 +421,7 @@ void initializeIgnitionActions(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
list->isReady = true; list->isReady = true;
} }
static ALWAYS_INLINE void prepareIgnitionSchedule(DECLARE_ENGINE_PARAMETER_SIGNATURE) { static void prepareIgnitionSchedule(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
ScopePerf perf(PE::PrepareIgnitionSchedule); ScopePerf perf(PE::PrepareIgnitionSchedule);
/** /**

View File

@ -320,7 +320,7 @@ static char shaft_signal_msg_index[15];
static const bool isUpEvent[6] = { false, true, false, true, false, true }; 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 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 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) return; // engineSnifferRpmThreshold is accounted for inside ENGINE(isEngineChartEnabled)
} }

View File

@ -27,12 +27,9 @@
#if defined __GNUC__ #if defined __GNUC__
// GCC // GCC
#include <sys/types.h> #include <sys/types.h>
#define ALWAYS_INLINE __attribute__((always_inline)) inline
#else #else
// IAR // IAR
typedef unsigned int time_t; typedef unsigned int time_t;
// todo: what's the IAR option?
#define ALWAYS_INLINE INLINE
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -30,8 +30,6 @@
#define US_TO_NT_MULTIPLIER 100 #define US_TO_NT_MULTIPLIER 100
#define ALWAYS_INLINE
#define US2NT(x) (US_TO_NT_MULTIPLIER * (x)) #define US2NT(x) (US_TO_NT_MULTIPLIER * (x))
#define NT2US(x) ((x) / US_TO_NT_MULTIPLIER) #define NT2US(x) ((x) / US_TO_NT_MULTIPLIER)

View File

@ -58,8 +58,6 @@ void print(const char *fmt, ...);
#define VCS_VERSION "321" #define VCS_VERSION "321"
#define RUS_EFI_VERSION_TAG "rusEfiVersion" #define RUS_EFI_VERSION_TAG "rusEfiVersion"
#define ALWAYS_INLINE INLINE
#define US2NT(x) (US_TO_NT_MULTIPLIER * (x)) #define US2NT(x) (US_TO_NT_MULTIPLIER * (x))
#define NT2US(x) ((x) / US_TO_NT_MULTIPLIER) #define NT2US(x) ((x) / US_TO_NT_MULTIPLIER)