Refactoring: OS access should be explicit #867

firmware/console/binary/tunerstudio.cpp

@@ -60,6 +60,7 @@
  */
 
 #include "global.h"
+#include "os_access.h"
 
 #include "allsensors.h"
 #include "tunerstudio.h"

firmware/controllers/actuators/lcd_controller.cpp

@@ -19,6 +19,7 @@
 #include "global.h"
 
 #if EFI_HD44780_LCD
+#include "os_access.h"
 
 #include "lcd_controller.h"
 #include "lcd_HD44780.h"

firmware/controllers/algo/engine_configuration.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "global.h"
+#include "os_access.h"
 #include "engine_configuration.h"
 #include "fsio_impl.h"
 #include "allsensors.h"

firmware/controllers/algo/event_registry.h

@@ -9,7 +9,6 @@
 #define EVENT_REGISTRY_H_
 
 #include "global.h"
-#include "os_access.h"
 #include "signal_executor.h"
 #include "fl_stack.h"
 #include "trigger_structure.h"

firmware/controllers/core/error_handling.cpp

@@ -2,12 +2,11 @@
  * @file error_handling.cpp
  *
  * @date Apr 1, 2014
- * @author Andrey Belomutskiy, (c) 2012-2018
+ * @author Andrey Belomutskiy, (c) 2012-2019
  */
 
 #include "engine.h"
-#include "io_pins.h"
+#include "os_access.h"
-
 
 #if EFI_SIMULATOR || EFI_PROD_CODE
 //todo: move into simulator global

firmware/controllers/core/fsio_core.cpp

@@ -16,6 +16,7 @@
 #include "global.h"
 
 #if EFI_FSIO
+#include "os_access.h"
 
 #include "fsio_core.h"
 #include "fsio_impl.h"

firmware/controllers/flash_main.cpp

@@ -11,6 +11,8 @@
 #if EFI_INTERNAL_FLASH
 #include "flash_main.h"
 #include "eficonsole.h"
+#include "os_access.h"
+
 #include "flash.h"
 #include "engine_math.h"
 

firmware/controllers/map_averaging.cpp

@@ -26,6 +26,7 @@
 #include "map.h"
 
 #if EFI_MAP_AVERAGING
+#include "os_access.h"
 
 #include "map_averaging.h"
 #include "trigger_central.h"

firmware/controllers/math/speed_density.cpp

@@ -16,9 +16,9 @@
 #include "maf2map.h"
 #include "config_engine_specs.h"
 
-//todo#if defined(HAS_OS_ACCESS)
+#if defined(HAS_OS_ACCESS)
-//todo#error "Unexpected OS ACCESS HERE"
+#error "Unexpected OS ACCESS HERE"
-//todo#endif
+#endif
 
 #define rpmMin 500
 #define rpmMax 8000

firmware/controllers/scheduling/single_timer_executor.cpp

@@ -25,6 +25,8 @@
 
 
 #if EFI_SIGNAL_EXECUTOR_ONE_TIMER
+#include "os_access.h"
+
 #include "microsecond_timer.h"
 #include "tunerstudio_configuration.h"
 #include "rfiutil.h"

firmware/controllers/trigger/decoders/trigger_structure.cpp

@@ -21,6 +21,7 @@
 
 #include "global.h"
 #include "engine.h"
+#include "os_access.h"
 #include "trigger_bmw.h"
 #include "trigger_chrysler.h"
 #include "trigger_gm.h"

firmware/controllers/trigger/main_trigger_callback.cpp

@@ -22,6 +22,7 @@
  */
 
 #include "global.h"
+#include "os_access.h"
 #if EFI_PROD_CODE
 #include <nvic.h>
 #endif

firmware/controllers/trigger/trigger_central.cpp

@@ -7,6 +7,7 @@
  */
 
 #include "global.h"
+#include "os_access.h"
 
 #include "trigger_central.h"
 #include "trigger_decoder.h"

firmware/development/engine_sniffer.cpp

@@ -25,6 +25,7 @@
  */
 
 #include "global.h"
+#include "os_access.h"
 #include "engine_sniffer.h"
 #include "adc_inputs.h"
 

firmware/hw_layer/adc_inputs.cpp

@@ -23,6 +23,7 @@
 #include "global.h"
 
 #if HAL_USE_ADC
+#include "os_access.h"
 
 #include "engine.h"
 #include "adc_inputs.h"

firmware/hw_layer/ports/stm32/stm32f0/mpu_util.cpp

@@ -7,7 +7,7 @@
 
 #include "global.h"
 
-int getRemainingStack(Thread *otp) {
+EXTERNC int getRemainingStack(Thread *otp) {
 	return 9999;
 }
 

firmware/hw_layer/ports/stm32/stm32f4/mpu_util.cpp

@@ -32,7 +32,7 @@ extern uint32_t __main_stack_base__;
 
 typedef struct port_intctx intctx_t;
 
-int getRemainingStack(thread_t *otp) {
+EXTERNC int getRemainingStack(thread_t *otp) {
 
 #if CH_DBG_ENABLE_STACK_CHECK
 	// this would dismiss coverity warning - see http://rusefi.com/forum/viewtopic.php?f=5&t=655
@@ -59,7 +59,7 @@ int getRemainingStack(thread_t *otp) {
 extern uint32_t CSTACK$$Base; /* symbol created by the IAR linker */
 extern uint32_t IRQSTACK$$Base; /* symbol created by the IAR linker */
 
-int getRemainingStack(thread_t *otp) {
+EXTERNC int getRemainingStack(thread_t *otp) {
 #if CH_DBG_ENABLE_STACK_CHECK
 	int remainingStack;
 	if (ch.dbg.isr_cnt > 0) {

firmware/hw_layer/ports/stm32/stm32f7/mpu_util.cpp

@@ -29,7 +29,7 @@ extern uint32_t __main_stack_base__;
 
 typedef struct port_intctx intctx_t;
 
-int getRemainingStack(thread_t *otp) {
+EXTERNC int getRemainingStack(thread_t *otp) {
 
 #if CH_DBG_ENABLE_STACK_CHECK
 	// this would dismiss coverity warning - see http://rusefi.com/forum/viewtopic.php?f=5&t=655
@@ -57,7 +57,7 @@ int getRemainingStack(thread_t *otp) {
 extern uint32_t CSTACK$$Base; /* symbol created by the IAR linker */
 extern uint32_t IRQSTACK$$Base; /* symbol created by the IAR linker */
 
-int getRemainingStack(thread_t *otp) {
+EXTERNC int getRemainingStack(thread_t *otp) {
 #if CH_DBG_ENABLE_STACK_CHECK
 	int remainingStack;
 	if (ch.dbg.isr_cnt > 0) {

firmware/os_access.h

@@ -18,17 +18,18 @@ extern "C"
 #include <ch.h>
 #include <hal.h>
 #include "chprintf.h"
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #include "io_pins.h"
 
 /*
  * Stack debugging
  * See also getMaxUsedStack()
  */
-int getRemainingStack(thread_t *otp);
+EXTERNC int getRemainingStack(thread_t *otp);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
 #define HAS_OS_ACCESS
 

firmware/util/math/pid.h

@@ -9,7 +9,6 @@
 #define PID_H_
 
 #include "global.h"
-#include "os_access.h"
 #include "engine_configuration_generated_structures.h"
 
 #if EFI_PROD_CODE || EFI_SIMULATOR