Refactoring: OS access should be explicit #867

firmware/controllers/actuators/alternator_controller.cpp

@@ -21,6 +21,10 @@
 #include "pin_repository.h"
 #include "tunerstudio_configuration.h"
 
+#if defined(HAS_OS_ACCESS)
+#error "Unexpected OS ACCESS HERE"
+#endif
+
 EXTERN_ENGINE
 ;
 

firmware/controllers/actuators/aux_pid.cpp

@@ -19,6 +19,10 @@
 #include "pin_repository.h"
 #include "periodic_controller.h"
 
+#if defined(HAS_OS_ACCESS)
+#error "Unexpected OS ACCESS HERE"
+#endif
+
 EXTERN_ENGINE
 ;
 

firmware/controllers/actuators/aux_pid.h

@@ -2,13 +2,13 @@
  * @file aux_pid.h
  *
  * @date Jun 26, 2016
- * @author Andrey Belomutskiy, (c) 2012-2017
+ * @author Andrey Belomutskiy, (c) 2012-2019
  */
 
 #ifndef CONTROLLERS_ALGO_AUX_PID_H_
 #define CONTROLLERS_ALGO_AUX_PID_H_
 
-#include "engine.h"
+#include "global.h"
 
 void initAuxPid(Logging *sharedLogger);
 void startAuxPins(void);

firmware/controllers/actuators/electronic_throttle.cpp

@@ -78,13 +78,17 @@
 #include "pid.h"
 #include "engine_controller.h"
 #include "periodic_controller.h"
-
-#define ETB_MAX_COUNT 2
-
 #include "pin_repository.h"
 #include "pwm_generator.h"
 #include "dc_motor.h"
 #include "pid_auto_tune.h"
+
+#if defined(HAS_OS_ACCESS)
+#error "Unexpected OS ACCESS HERE"
+#endif
+
+#define ETB_MAX_COUNT 2
+
 #if EFI_TUNER_STUDIO
 extern TunerStudioOutputChannels tsOutputChannels;
 #endif /* EFI_TUNER_STUDIO */

firmware/controllers/system/efi_gpio.h

@@ -9,8 +9,8 @@
 #ifndef efi_gpio_H_
 #define efi_gpio_H_
 
-#include "io_pins.h"
 #include "global.h"
+#include "io_pins.h"
 
 void initPrimaryPins(void);
 void initOutputPins(void);

firmware/controllers/trigger/rpm_calculator.h

@@ -9,7 +9,7 @@
 #ifndef RPM_REPORTER_H_
 #define RPM_REPORTER_H_
 
-#include <global.h>
+#include "global.h"
 #include "scheduler.h"
 
 // see TOP_DEAD_CENTER_MESSAGE in rusEfi console source code

firmware/global.h

@@ -20,8 +20,7 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-// todo: remove these two from here and rely on os_access.h
-#include <ch.h>
+// todo: remove this from here and rely on os_access.h. unfortunately hal.h includes ch.h :(
 #include <hal.h>
 #include "common_headers.h"
 

simulator/simulator/global.h

@@ -10,7 +10,6 @@
 #ifndef GLOBAL_H_
 #define GLOBAL_H_
 
-#include <ch.h>
 #include <hal.h>
 
 #include <stdlib.h>