Refactoring: OS access should be explicit #867

firmware/controllers/math/speed_density.cpp

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

firmware/controllers/obd2.cpp

@@ -27,8 +27,7 @@
 #include "global.h"
 
 #if EFI_CAN_SUPPORT
-
+#include "os_access.h"
-
 #include "engine.h"
 #include "obd2.h"
 #include "can_hw.h"
@@ -39,7 +38,6 @@
 #include "engine_math.h"
 #include "fuel_math.h"
 
-
 extern CANTxFrame txmsg;
 
 EXTERN_ENGINE

firmware/global.h

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

firmware/hw_layer/mcp3208.c

@@ -3,10 +3,11 @@
  * @brief   MCP3208 external ADC chip implementation. Not really used right now.
  *
  * @date Aug 12, 2013
- * @author Andrey Belomutskiy, (c) 2012-2018
+ * @author Andrey Belomutskiy, (c) 2012-2019
  */
 
 #include "global.h"
+#include "os_access.h"
 
 #if EFI_MCP_3208
 #include "mcp3208.h"

firmware/hw_layer/ports/stm32/flash.c

@@ -8,6 +8,7 @@
  */
 
 #include "global.h"
+#include "os_access.h"
 
 #if EFI_INTERNAL_FLASH
 

firmware/hw_layer/serial_over_usb/usbcfg.c

@@ -15,6 +15,7 @@
 */
 
 #include "global.h"
+#include "os_access.h"
 
 #if HAL_USE_SERIAL_USB
 

firmware/hw_layer/serial_over_usb/usbconsole.c

@@ -7,6 +7,7 @@
  */
 
 #include "global.h"
+#include "os_access.h"
 
 #if EFI_USB_SERIAL
 

firmware/os_access.h

@@ -0,0 +1,27 @@
+/*
+ * os_access.h
+ *
+ * OS access is not part of global.h in order to help separate synchronous code from asynchronous
+ *
+ *  Created on: Jul 3, 2019
+ * @author Andrey Belomutskiy, (c) 2012-2019
+ */
+
+#ifndef OS_ACCESS_H_
+#define OS_ACCESS_H_
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+#include <ch.h>
+#include <hal.h>
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#define HAS_OS_ACCESS
+
+#endif /* OS_ACCESS_H_ */

firmware/util/histogram.c

@@ -13,6 +13,10 @@
 #include "histogram.h"
 #include "global.h"
 
+#if defined(HAS_OS_ACCESS)
+#error "Unexpected OS ACCESS HERE"
+#endif
+
 #if EFI_HISTOGRAMS || EFI_UNIT_TEST
 
 #define H_ACCURACY 0.05

firmware/util/rfiutil.c

@@ -56,6 +56,7 @@
  */
 
 #if !EFI_UNIT_TEST
+#include "os_access.h"
 
 void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par) {
 	bool wasLocked = lockAnyContext();

simulator/simulator/os_access.h

@@ -0,0 +1,27 @@
+/*
+ * os_access.h
+ *
+ * OS access is not part of global.h in order to help separate synchronous code from asynchronous
+ *
+ *  Created on: Jul 3, 2019
+ * @author Andrey Belomutskiy, (c) 2012-2019
+ */
+
+#ifndef OS_ACCESS_H_
+#define OS_ACCESS_H_
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+#include <ch.h>
+#include <hal.h>
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#define HAS_OS_ACCESS
+
+#endif /* OS_ACCESS_H_ */