From 0295c343b9fceb356f30d93a0d6fb3f20ecb1b8c Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 4 Jul 2019 03:25:35 -0400 Subject: [PATCH] Refactoring: OS access should be explicit #867 --- firmware/controllers/core/fsio_impl.cpp | 3 ++- firmware/global.h | 2 -- firmware/hw_layer/hardware.cpp | 6 +++--- firmware/hw_layer/io_pins.h | 7 +++---- firmware/hw_layer/pin_repository.cpp | 1 + firmware/hw_layer/trigger_input.cpp | 16 +++++----------- 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp index 46781713e8..4f6b8d8f99 100644 --- a/firmware/controllers/core/fsio_impl.cpp +++ b/firmware/controllers/core/fsio_impl.cpp @@ -6,13 +6,14 @@ * https://rusefi.com/wiki/index.php?title=Manual:Flexible_Logic * * @date Oct 5, 2014 - * @author Andrey Belomutskiy, (c) 2012-2018 + * @author Andrey Belomutskiy, (c) 2012-2019 */ #include "global.h" #if EFI_FSIO +#include "os_access.h" #include "fsio_impl.h" #include "settings.h" #include "allsensors.h" diff --git a/firmware/global.h b/firmware/global.h index dd6c026b4d..53fc27b5fa 100644 --- a/firmware/global.h +++ b/firmware/global.h @@ -23,9 +23,7 @@ extern "C" // todo: remove these two from here and rely on os_access.h #include #include -#include "chprintf.h" #include "common_headers.h" -#include "io_pins.h" // this is about MISRA not liking 'time.h'. todo: figure out something #if defined __GNUC__ diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 8ca4fce208..58846606f8 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -8,14 +8,14 @@ #include "global.h" -#include "trigger_input.h" -#include "servo.h" #if EFI_PROD_CODE +#include "os_access.h" +#include "trigger_input.h" +#include "servo.h" #include "adc_inputs.h" #include "can_hw.h" #include "hardware.h" -#include "io_pins.h" #include "rtc_helper.h" #include "rfiutil.h" #include "injector_central.h" diff --git a/firmware/hw_layer/io_pins.h b/firmware/hw_layer/io_pins.h index 1b84579b55..7f2344bedb 100644 --- a/firmware/hw_layer/io_pins.h +++ b/firmware/hw_layer/io_pins.h @@ -55,13 +55,12 @@ EXTERNC void efiSetPadMode(const char *msg, brain_pin_e pin, iomode_t mode); EXTERNC void efiSetPadUnused(brain_pin_e brainPin); -bool efiReadPin(brain_pin_e pin); +EXTERNC bool efiReadPin(brain_pin_e pin); -iomode_t getInputMode(pin_input_mode_e mode); +EXTERNC iomode_t getInputMode(pin_input_mode_e mode); #if HAL_USE_ICU -void efiIcuStart(const char *msg, ICUDriver *icup, const ICUConfig *config); +EXTERNC void efiIcuStart(const char *msg, ICUDriver *icup, const ICUConfig *config); #endif /* HAL_USE_ICU */ #endif /* EFI_GPIO_HARDWARE */ - #endif /* IO_PINS_H_ */ diff --git a/firmware/hw_layer/pin_repository.cpp b/firmware/hw_layer/pin_repository.cpp index 6c53381f3d..e1c69d3d3d 100644 --- a/firmware/hw_layer/pin_repository.cpp +++ b/firmware/hw_layer/pin_repository.cpp @@ -15,6 +15,7 @@ #include "eficonsole.h" #include "memstreams.h" #include "drivers/gpio/gpio_ext.h" +#include "os_access.h" #ifndef BOARD_EXT_PINREPOPINS #define BOARD_EXT_PINREPOPINS 0 diff --git a/firmware/hw_layer/trigger_input.cpp b/firmware/hw_layer/trigger_input.cpp index 772f7a5740..c3a38ae683 100644 --- a/firmware/hw_layer/trigger_input.cpp +++ b/firmware/hw_layer/trigger_input.cpp @@ -47,8 +47,7 @@ int vvtEventFallCounter = 0; /* static vars for PAL implementation */ static ioline_t primary_line; -static void shaft_callback(void *arg) -{ +static void shaft_callback(void *arg) { bool rise; bool isPrimary; ioline_t pal_line; @@ -81,8 +80,7 @@ static void shaft_callback(void *arg) } -static void cam_callback(void *arg) -{ +static void cam_callback(void *arg) { bool rise; ioline_t pal_line = (ioline_t)arg; @@ -95,11 +93,9 @@ static void cam_callback(void *arg) vvtEventFallCounter++; hwHandleVvtCamSignal(TV_FALL); } - } -static int turnOnTriggerInputPin(const char *msg, brain_pin_e brainPin, bool is_shaft) -{ +static int turnOnTriggerInputPin(const char *msg, brain_pin_e brainPin, bool is_shaft) { ioline_t pal_line; scheduleMsg(logger, "turnOnTriggerInputPin(PAL) %s %s", msg, hwPortname(brainPin)); @@ -111,13 +107,11 @@ static int turnOnTriggerInputPin(const char *msg, brain_pin_e brainPin, bool is_ return efiExtiEnablePin(msg, brainPin, PAL_EVENT_MODE_BOTH_EDGES, is_shaft ? shaft_callback : cam_callback, (void *)pal_line); } -static void turnOffTriggerInputPin(brain_pin_e brainPin) -{ +static void turnOffTriggerInputPin(brain_pin_e brainPin) { efiExtiDisablePin(brainPin); } -static void setPrimaryChannel(brain_pin_e brainPin) -{ +static void setPrimaryChannel(brain_pin_e brainPin) { primary_line = PAL_LINE(getHwPort("trg", brainPin), getHwPin("trg", brainPin)); }