refactoring - reducing complexity

firmware/controllers/system/efiGpio.h

@@ -176,9 +176,13 @@ public:
 		}
 #endif
 
-void outputPinRegisterExt2(const char *msg, OutputPin *output, brain_pin_e brainPin, pin_output_mode_e *outputMode);
 
 void turnPinHigh(NamedOutputPin *output);
 void turnPinLow(NamedOutputPin *output);
 
+void initOutputPin(const char *msg, OutputPin *outputPin, ioportid_t port, uint32_t pinNumber);
+void initOutputPinExt(const char *msg, OutputPin *outputPin, ioportid_t port, uint32_t pinNumber, iomode_t mode);
+
+void outputPinRegisterExt2(const char *msg, OutputPin *output, brain_pin_e brainPin, pin_output_mode_e *outputMode);
+
 #endif /* EFIGPIO_H_ */

firmware/development/rfi_perftest.cpp

@@ -12,7 +12,7 @@
 #include "eficonsole.h"
 #include "time.h"
 #include "engine_math.h"
-#include "gpio_helper.h"
+#include "efiGpio.h"
 #include "efilib2.h"
 #include "console_io.h"
 #include "engine.h"

firmware/hw_layer/board_test.cpp

@@ -25,7 +25,7 @@
 #include "board_test.h"
 #include "rusefi_enums.h"
 #include "pin_repository.h"
-#include "gpio_helper.h"
+#include "efiGpio.h"
 #include "adc_inputs.h"
 #include "AdcConfiguration.h"
 

firmware/hw_layer/gpio_helper.h

@@ -11,7 +11,5 @@
 
 #include "efiGpio.h"
 
-void initOutputPin(const char *msg, OutputPin *outputPin, ioportid_t port, uint32_t pinNumber);
-void initOutputPinExt(const char *msg, OutputPin *outputPin, ioportid_t port, uint32_t pinNumber, iomode_t mode);
 
 #endif /* GPIO_HELPER_H_ */

firmware/hw_layer/io_pins.cpp

@@ -12,7 +12,6 @@
 #include "efiGpio.h"
 
 #include "pin_repository.h"
-#include "gpio_helper.h"
 #include "status_loop.h"
 #include "engine_configuration.h"
 #include "console_io.h"

firmware/hw_layer/pwm_generator.h

@@ -13,7 +13,7 @@
 
 #define DEBUG_PWM FALSE
 
-#include "gpio_helper.h"
+#include "efiGpio.h"
 
 void initPwmGenerator(void);