From ab4b451195e5d416047d7d45b140e46692fbd144 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 7 Sep 2022 15:56:45 -0400 Subject: [PATCH] os_access.h dead? --- firmware/console/binary/bluetooth.cpp | 1 - firmware/console/binary/serial_can.cpp | 2 +- firmware/console/binary/tunerstudio.cpp | 2 +- firmware/console/binary/tunerstudio_io.cpp | 2 +- firmware/console/eficonsole.cpp | 2 +- firmware/controllers/algo/engine.cpp | 2 +- firmware/controllers/algo/engine2.cpp | 2 +- firmware/controllers/algo/engine_configuration.cpp | 2 +- firmware/controllers/bench_test.cpp | 2 +- firmware/controllers/can/obd2.cpp | 2 +- firmware/controllers/core/error_handling.cpp | 2 +- firmware/controllers/engine_controller.cpp | 2 +- firmware/controllers/engine_controller_misc.cpp | 2 +- firmware/controllers/engine_cycle/knock_controller.cpp | 2 +- firmware/controllers/engine_cycle/map_averaging.cpp | 2 +- firmware/controllers/engine_cycle/rpm_calculator.cpp | 2 +- firmware/controllers/flash_main.cpp | 2 +- firmware/controllers/gauges/lcd_controller.cpp | 2 +- firmware/controllers/gauges/malfunction_indicator.cpp | 2 +- firmware/controllers/settings.cpp | 2 +- firmware/controllers/system/efi_gpio.cpp | 2 +- firmware/controllers/system/timer/event_queue.cpp | 2 +- firmware/controllers/system/timer/pwm_generator_logic.cpp | 2 +- firmware/controllers/system/timer/signal_executor_sleep.cpp | 2 +- firmware/controllers/system/timer/single_timer_executor.cpp | 2 +- firmware/controllers/system/timer/trigger_scheduler.cpp | 2 +- firmware/controllers/trigger/decoders/trigger_structure.cpp | 2 +- firmware/controllers/trigger/trigger_central.cpp | 2 +- firmware/controllers/trigger/trigger_decoder.cpp | 2 +- firmware/development/engine_sniffer.cpp | 2 +- firmware/development/hw_layer/poten.cpp | 2 +- firmware/development/logic_analyzer.cpp | 2 +- firmware/development/sensor_chart.cpp | 2 +- firmware/hw_layer/adc/adc_inputs.cpp | 2 +- firmware/hw_layer/adc/mcp3208.cpp | 2 +- firmware/hw_layer/drivers/can/can_msg_tx.h | 2 +- firmware/hw_layer/hardware.cpp | 2 +- firmware/hw_layer/io_pins.cpp | 2 +- firmware/hw_layer/pin_repository.cpp | 2 +- firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.cpp | 2 +- firmware/hw_layer/rtc_helper.cpp | 2 +- firmware/main.cpp | 2 +- firmware/pch/pch.h | 2 ++ firmware/rusefi.cpp | 2 +- firmware/util/datalogging.cpp | 2 +- firmware/util/loggingcentral.cpp | 2 +- firmware/util/math/efi_pid.cpp | 2 +- 47 files changed, 47 insertions(+), 46 deletions(-) diff --git a/firmware/console/binary/bluetooth.cpp b/firmware/console/binary/bluetooth.cpp index f15e117369..5641c27cc4 100644 --- a/firmware/console/binary/bluetooth.cpp +++ b/firmware/console/binary/bluetooth.cpp @@ -12,7 +12,6 @@ #include "pch.h" -#include "os_access.h" #include "tunerstudio.h" #include "tunerstudio_io.h" diff --git a/firmware/console/binary/serial_can.cpp b/firmware/console/binary/serial_can.cpp index 3b13aac09b..a61bc4ff7f 100644 --- a/firmware/console/binary/serial_can.cpp +++ b/firmware/console/binary/serial_can.cpp @@ -11,7 +11,7 @@ */ #include "pch.h" -#include "os_access.h" + #if EFI_UNIT_TEST #define PRINT printf diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index bf92fce150..01a1099f30 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -60,7 +60,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "tunerstudio.h" #include "tunerstudio_impl.h" diff --git a/firmware/console/binary/tunerstudio_io.cpp b/firmware/console/binary/tunerstudio_io.cpp index e637d71c0b..d3e50290ec 100644 --- a/firmware/console/binary/tunerstudio_io.cpp +++ b/firmware/console/binary/tunerstudio_io.cpp @@ -6,7 +6,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "tunerstudio_io.h" #if EFI_SIMULATOR diff --git a/firmware/console/eficonsole.cpp b/firmware/console/eficonsole.cpp index 95c421e407..a087feb756 100644 --- a/firmware/console/eficonsole.cpp +++ b/firmware/console/eficonsole.cpp @@ -23,7 +23,7 @@ #include "pch.h" -#include "os_access.h" + #include "eficonsole.h" #include "console_io.h" #include "svnversion.h" diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index b54a58bbb6..7cd19389a6 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -16,7 +16,7 @@ #include "advance_map.h" #include "speed_density.h" #include "advance_map.h" -#include "os_access.h" + #include "aux_valves.h" #include "map_averaging.h" #include "perf_trace.h" diff --git a/firmware/controllers/algo/engine2.cpp b/firmware/controllers/algo/engine2.cpp index 11e026a6a2..5185a47171 100644 --- a/firmware/controllers/algo/engine2.cpp +++ b/firmware/controllers/algo/engine2.cpp @@ -9,7 +9,7 @@ #include "pch.h" -#include "os_access.h" + #include "speed_density.h" #include "fuel_math.h" #include "advance_map.h" diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index ea30600a7b..1de1dca040 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -22,7 +22,7 @@ #include "pch.h" -#include "os_access.h" + #include "speed_density.h" #include "advance_map.h" #include "flash_main.h" diff --git a/firmware/controllers/bench_test.cpp b/firmware/controllers/bench_test.cpp index d441971a92..9c1ffd10c7 100644 --- a/firmware/controllers/bench_test.cpp +++ b/firmware/controllers/bench_test.cpp @@ -26,7 +26,7 @@ #if EFI_ENGINE_CONTROL #if !EFI_UNIT_TEST -#include "os_access.h" + #include "flash_main.h" #include "bench_test.h" #include "main_trigger_callback.h" diff --git a/firmware/controllers/can/obd2.cpp b/firmware/controllers/can/obd2.cpp index cddae3007f..135dfb1591 100644 --- a/firmware/controllers/can/obd2.cpp +++ b/firmware/controllers/can/obd2.cpp @@ -24,7 +24,7 @@ #include "pch.h" #if EFI_CAN_SUPPORT -#include "os_access.h" + #include "obd2.h" #include "can.h" #include "can_msg_tx.h" diff --git a/firmware/controllers/core/error_handling.cpp b/firmware/controllers/core/error_handling.cpp index 5bb451ddc7..20cab03c5c 100644 --- a/firmware/controllers/core/error_handling.cpp +++ b/firmware/controllers/core/error_handling.cpp @@ -6,7 +6,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "backup_ram.h" static critical_msg_t warningBuffer; diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 57821fe7cf..de5d0804f0 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -23,7 +23,7 @@ #include "pch.h" -#include "os_access.h" + #include "trigger_central.h" #include "script_impl.h" #include "idle_thread.h" diff --git a/firmware/controllers/engine_controller_misc.cpp b/firmware/controllers/engine_controller_misc.cpp index 086999ad25..fcd2d5d3c0 100644 --- a/firmware/controllers/engine_controller_misc.cpp +++ b/firmware/controllers/engine_controller_misc.cpp @@ -6,7 +6,7 @@ */ #include "pch.h" -#include "os_access.h" + extern ButtonDebounce startStopButtonDebounce; diff --git a/firmware/controllers/engine_cycle/knock_controller.cpp b/firmware/controllers/engine_cycle/knock_controller.cpp index 4e0bb80bee..e3f38878bd 100644 --- a/firmware/controllers/engine_cycle/knock_controller.cpp +++ b/firmware/controllers/engine_cycle/knock_controller.cpp @@ -7,7 +7,7 @@ #include "pch.h" #include "knock_logic.h" -#include "os_access.h" + #include "hip9011.h" diff --git a/firmware/controllers/engine_cycle/map_averaging.cpp b/firmware/controllers/engine_cycle/map_averaging.cpp index 5a2e10c50c..535e87fedc 100644 --- a/firmware/controllers/engine_cycle/map_averaging.cpp +++ b/firmware/controllers/engine_cycle/map_averaging.cpp @@ -23,7 +23,7 @@ #include "pch.h" -#include "os_access.h" + #if EFI_MAP_AVERAGING diff --git a/firmware/controllers/engine_cycle/rpm_calculator.cpp b/firmware/controllers/engine_cycle/rpm_calculator.cpp index 54ee93bfbd..c1563b50ad 100644 --- a/firmware/controllers/engine_cycle/rpm_calculator.cpp +++ b/firmware/controllers/engine_cycle/rpm_calculator.cpp @@ -14,7 +14,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "trigger_central.h" #include "tooth_logger.h" diff --git a/firmware/controllers/flash_main.cpp b/firmware/controllers/flash_main.cpp index 323276b698..752e927845 100644 --- a/firmware/controllers/flash_main.cpp +++ b/firmware/controllers/flash_main.cpp @@ -10,7 +10,7 @@ #include "pch.h" #if EFI_INTERNAL_FLASH -#include "os_access.h" + #include "flash_main.h" #include "eficonsole.h" diff --git a/firmware/controllers/gauges/lcd_controller.cpp b/firmware/controllers/gauges/lcd_controller.cpp index 54ca558b8a..2a5dac315d 100644 --- a/firmware/controllers/gauges/lcd_controller.cpp +++ b/firmware/controllers/gauges/lcd_controller.cpp @@ -19,7 +19,7 @@ #include "pch.h" #if EFI_HD44780_LCD -#include "os_access.h" + #include "lcd_controller.h" #include "HD44780.h" diff --git a/firmware/controllers/gauges/malfunction_indicator.cpp b/firmware/controllers/gauges/malfunction_indicator.cpp index 572b5ecce7..76c897e4f3 100644 --- a/firmware/controllers/gauges/malfunction_indicator.cpp +++ b/firmware/controllers/gauges/malfunction_indicator.cpp @@ -30,7 +30,7 @@ #if EFI_MALFUNCTION_INDICATOR #include "malfunction_central.h" #include "malfunction_indicator.h" -#include "os_access.h" + #include "periodic_thread_controller.h" #define TEST_MIL_CODE FALSE diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index d820692f7c..6888e90d76 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -9,7 +9,7 @@ #include "pch.h" #if !EFI_UNIT_TEST -#include "os_access.h" + #include "eficonsole.h" #include "trigger_decoder.h" #include "console_io.h" diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp index 73ef4b45dd..ea6b14fe6f 100644 --- a/firmware/controllers/system/efi_gpio.cpp +++ b/firmware/controllers/system/efi_gpio.cpp @@ -8,7 +8,7 @@ #include "pch.h" -#include "os_access.h" + #include "drivers/gpio/gpio_ext.h" #if HW_HELLEN diff --git a/firmware/controllers/system/timer/event_queue.cpp b/firmware/controllers/system/timer/event_queue.cpp index 2d18e547d0..d1f717ba02 100644 --- a/firmware/controllers/system/timer/event_queue.cpp +++ b/firmware/controllers/system/timer/event_queue.cpp @@ -12,7 +12,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "event_queue.h" #include "efitime.h" diff --git a/firmware/controllers/system/timer/pwm_generator_logic.cpp b/firmware/controllers/system/timer/pwm_generator_logic.cpp index bb891b6703..30f1936783 100644 --- a/firmware/controllers/system/timer/pwm_generator_logic.cpp +++ b/firmware/controllers/system/timer/pwm_generator_logic.cpp @@ -9,7 +9,7 @@ */ #include "pch.h" -#include "os_access.h" + #if EFI_PROD_CODE #include "mpu_util.h" diff --git a/firmware/controllers/system/timer/signal_executor_sleep.cpp b/firmware/controllers/system/timer/signal_executor_sleep.cpp index 96db12062b..0c42ba30a9 100644 --- a/firmware/controllers/system/timer/signal_executor_sleep.cpp +++ b/firmware/controllers/system/timer/signal_executor_sleep.cpp @@ -23,7 +23,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "scheduler.h" #include "main_trigger_callback.h" diff --git a/firmware/controllers/system/timer/single_timer_executor.cpp b/firmware/controllers/system/timer/single_timer_executor.cpp index 64bc3d6e84..92e02cc436 100644 --- a/firmware/controllers/system/timer/single_timer_executor.cpp +++ b/firmware/controllers/system/timer/single_timer_executor.cpp @@ -22,7 +22,7 @@ #include "pch.h" -#include "os_access.h" + #include "single_timer_executor.h" #include "efitime.h" diff --git a/firmware/controllers/system/timer/trigger_scheduler.cpp b/firmware/controllers/system/timer/trigger_scheduler.cpp index 89ba493e01..b6dbbf6497 100644 --- a/firmware/controllers/system/timer/trigger_scheduler.cpp +++ b/firmware/controllers/system/timer/trigger_scheduler.cpp @@ -1,7 +1,7 @@ #include "pch.h" #include "event_queue.h" -#include "os_access.h" + bool TriggerScheduler::assertNotInList(AngleBasedEvent *head, AngleBasedEvent *element) { assertNotInListMethodBody(AngleBasedEvent, head, element, nextToothEvent) diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index 1769eb6a9b..fe4f5dfce8 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -21,7 +21,7 @@ #include "pch.h" -#include "os_access.h" + #include "trigger_chrysler.h" #include "trigger_gm.h" #include "trigger_nissan.h" diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 4128cceb27..c3271f7b9e 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -7,7 +7,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "trigger_central.h" #include "trigger_decoder.h" diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index c7f0ccb0ce..1c840e4fc0 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -26,7 +26,7 @@ #include "pch.h" -#include "os_access.h" + #include "obd_error_codes.h" #include "trigger_decoder.h" diff --git a/firmware/development/engine_sniffer.cpp b/firmware/development/engine_sniffer.cpp index c0eb30332c..f2d5bb2cdb 100644 --- a/firmware/development/engine_sniffer.cpp +++ b/firmware/development/engine_sniffer.cpp @@ -25,7 +25,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "engine_sniffer.h" #if EFI_ENGINE_SNIFFER diff --git a/firmware/development/hw_layer/poten.cpp b/firmware/development/hw_layer/poten.cpp index 92c4183ec2..2d70aae01f 100644 --- a/firmware/development/hw_layer/poten.cpp +++ b/firmware/development/hw_layer/poten.cpp @@ -7,7 +7,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "poten.h" #include "eficonsole.h" #include "hardware.h" diff --git a/firmware/development/logic_analyzer.cpp b/firmware/development/logic_analyzer.cpp index bc4edac186..d0872eada0 100644 --- a/firmware/development/logic_analyzer.cpp +++ b/firmware/development/logic_analyzer.cpp @@ -13,7 +13,7 @@ #include "pch.h" #include "logic_analyzer.h" -#include "os_access.h" + #include "eficonsole.h" #include "trigger_central.h" #include "os_util.h" diff --git a/firmware/development/sensor_chart.cpp b/firmware/development/sensor_chart.cpp index fb2e40a557..cfe5504521 100644 --- a/firmware/development/sensor_chart.cpp +++ b/firmware/development/sensor_chart.cpp @@ -6,7 +6,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "sensor_chart.h" #if EFI_SENSOR_CHART diff --git a/firmware/hw_layer/adc/adc_inputs.cpp b/firmware/hw_layer/adc/adc_inputs.cpp index 5f9ed872f5..21bded5f33 100644 --- a/firmware/hw_layer/adc/adc_inputs.cpp +++ b/firmware/hw_layer/adc/adc_inputs.cpp @@ -22,7 +22,7 @@ #include "pch.h" #if HAL_USE_ADC -#include "os_access.h" + #include "adc_subscription.h" #include "AdcConfiguration.h" diff --git a/firmware/hw_layer/adc/mcp3208.cpp b/firmware/hw_layer/adc/mcp3208.cpp index db8c9b8741..763c3cf6d8 100644 --- a/firmware/hw_layer/adc/mcp3208.cpp +++ b/firmware/hw_layer/adc/mcp3208.cpp @@ -7,7 +7,7 @@ */ #include "global.h" -#include "os_access.h" + #if EFI_MCP_3208 #include "mcp3208.h" diff --git a/firmware/hw_layer/drivers/can/can_msg_tx.h b/firmware/hw_layer/drivers/can/can_msg_tx.h index 8f6379b8aa..5aecfd9b91 100644 --- a/firmware/hw_layer/drivers/can/can_msg_tx.h +++ b/firmware/hw_layer/drivers/can/can_msg_tx.h @@ -12,7 +12,7 @@ #include #include -#include "os_access.h" + #include "can.h" enum class CanCategory : uint16_t { diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 9ae259f0b8..ee22741efd 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -8,7 +8,7 @@ #include "pch.h" -#include "os_access.h" + #include "trigger_input.h" #include "can_hw.h" #include "hardware.h" diff --git a/firmware/hw_layer/io_pins.cpp b/firmware/hw_layer/io_pins.cpp index 42f4989d9c..b9ffb573c3 100644 --- a/firmware/hw_layer/io_pins.cpp +++ b/firmware/hw_layer/io_pins.cpp @@ -10,7 +10,7 @@ #include "pch.h" #if EFI_PROD_CODE -#include "os_access.h" + #include "drivers/gpio/gpio_ext.h" #include "status_loop.h" diff --git a/firmware/hw_layer/pin_repository.cpp b/firmware/hw_layer/pin_repository.cpp index 40be41559c..4cd1f32479 100644 --- a/firmware/hw_layer/pin_repository.cpp +++ b/firmware/hw_layer/pin_repository.cpp @@ -108,7 +108,7 @@ PinRepository::PinRepository() { } #if EFI_PROD_CODE -#include "os_access.h" + #include "eficonsole.h" #include "drivers/gpio/gpio_ext.h" #include "smart_gpio.h" diff --git a/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.cpp b/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.cpp index 79bafa23e2..49866b0625 100644 --- a/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.cpp +++ b/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.cpp @@ -7,7 +7,7 @@ */ #include "pch.h" -#include "os_access.h" + #if EFI_USB_SERIAL diff --git a/firmware/hw_layer/rtc_helper.cpp b/firmware/hw_layer/rtc_helper.cpp index f4aaf67eda..d6f1126029 100644 --- a/firmware/hw_layer/rtc_helper.cpp +++ b/firmware/hw_layer/rtc_helper.cpp @@ -10,7 +10,7 @@ #include #include -#include "os_access.h" + #include "rtc_helper.h" #include diff --git a/firmware/main.cpp b/firmware/main.cpp index d074bc0f3d..2d07f7814a 100644 --- a/firmware/main.cpp +++ b/firmware/main.cpp @@ -8,7 +8,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "rusefi.h" #include "mpu_util.h" diff --git a/firmware/pch/pch.h b/firmware/pch/pch.h index 082fae5ee1..70d48142a4 100644 --- a/firmware/pch/pch.h +++ b/firmware/pch/pch.h @@ -43,4 +43,6 @@ #include "mocks.h" #include "engine_test_helper.h" #include "mock/mock_sensor.h" +#else +#include "chprintf.h" #endif diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index ece3016bd7..714acee4f3 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -117,7 +117,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "trigger_structure.h" #include "hardware.h" diff --git a/firmware/util/datalogging.cpp b/firmware/util/datalogging.cpp index 9fc1186716..bc79dd2a30 100644 --- a/firmware/util/datalogging.cpp +++ b/firmware/util/datalogging.cpp @@ -33,7 +33,7 @@ #include "pch.h" #if ! EFI_UNIT_TEST -#include "os_access.h" + #include "chmtx.h" #include "memstreams.h" #include "console_io.h" diff --git a/firmware/util/loggingcentral.cpp b/firmware/util/loggingcentral.cpp index 5a62952187..e00ac660a9 100644 --- a/firmware/util/loggingcentral.cpp +++ b/firmware/util/loggingcentral.cpp @@ -23,7 +23,7 @@ #include "pch.h" -#include "os_access.h" + #include "thread_controller.h" template diff --git a/firmware/util/math/efi_pid.cpp b/firmware/util/math/efi_pid.cpp index cbbb501fb4..9e80d496bb 100644 --- a/firmware/util/math/efi_pid.cpp +++ b/firmware/util/math/efi_pid.cpp @@ -9,7 +9,7 @@ */ #include "pch.h" -#include "os_access.h" + #include "efi_pid.h" #include "math.h"