rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Workarounds for GCC 8 (#637)

This commit is contained in:
Fabien Poussin 2018-12-27 15:40:40 +01:00 committed by rusefi
parent 4280806887
commit 72fe39ff32
23 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/aux_pid.cpp
View File

@ -134,7 +134,7 @@ void stopAuxPins(void) {
void initAuxPid(Logging *sharedLogger) {
chThdCreateStatic(auxPidThreadStack, sizeof(auxPidThreadStack), LOWPRIO,
(tfunc_t) auxPidThread, NULL);
(tfunc_t)(void*) auxPidThread, NULL);
logger = sharedLogger;

2
firmware/controllers/alternatorController.cpp
View File

@ -167,7 +167,7 @@ void initAlternatorCtrl(Logging *sharedLogger) {
engineConfiguration->alternatorPwmFrequency, 0.1, applyAlternatorPinState);
}
chThdCreateStatic(alternatorControlThreadStack, sizeof(alternatorControlThreadStack), LOWPRIO,
(tfunc_t) AltCtrlThread, NULL);
(tfunc_t)(void*) AltCtrlThread, NULL);
}
#endif /* EFI_ALTERNATOR_CONTROL */

2
firmware/controllers/electronic_throttle.cpp
View File

@ -371,7 +371,7 @@ void initElectronicThrottle(void) {
pid.reset();
chThdCreateStatic(etbTreadStack, sizeof(etbTreadStack), NORMALPRIO, (tfunc_t) etbThread, NULL);
chThdCreateStatic(etbTreadStack, sizeof(etbTreadStack), NORMALPRIO, (tfunc_t)(void*) etbThread, NULL);
}
#endif /* EFI_ELECTRONIC_THROTTLE_BODY */

2
firmware/controllers/engine_controller.cpp
View File

@ -691,7 +691,7 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX)
return;
}
chThdCreateStatic(csThreadStack, sizeof(csThreadStack), LOWPRIO, (tfunc_t) csThread, NULL);
chThdCreateStatic(csThreadStack, sizeof(csThreadStack), LOWPRIO, (tfunc_t)(void*) csThread, NULL);
#if (EFI_PROD_CODE && EFI_ENGINE_CONTROL) || defined(__DOXYGEN__)
/**

2
firmware/controllers/idle_thread.cpp
View File

@ -480,7 +480,7 @@ void startIdleThread(Logging*sharedLogger) {
//scheduleMsg(logger, "initial idle %d", idlePositionController.value);
chThdCreateStatic(ivThreadStack, sizeof(ivThreadStack), NORMALPRIO, (tfunc_t) ivThread, NULL);
chThdCreateStatic(ivThreadStack, sizeof(ivThreadStack), NORMALPRIO, (tfunc_t)(void*) ivThread, NULL);
// this is idle switch INPUT - sometimes there is a switch on the throttle pedal
// this switch is not used yet

2
firmware/controllers/injector_central.cpp
View File

@ -264,7 +264,7 @@ void runIoTest(int subsystem, int index) {
void initInjectorCentral(Logging *sharedLogger) {
logger = sharedLogger;
chThdCreateStatic(benchThreadStack, sizeof(benchThreadStack), NORMALPRIO, (tfunc_t) benchThread, NULL);
chThdCreateStatic(benchThreadStack, sizeof(benchThreadStack), NORMALPRIO, (tfunc_t)(void*) benchThread, NULL);
for (int i = 0; i < INJECTION_PIN_COUNT; i++) {
is_injector_enabled[i] = true;

2
firmware/controllers/malfunction_indicator.cpp
View File

@ -114,7 +114,7 @@ void initMalfunctionIndicator(void) {
return;
}
// create static thread
chThdCreateStatic(mfiThreadStack, sizeof(mfiThreadStack), LOWPRIO, (tfunc_t) mfiThread, NULL);
chThdCreateStatic(mfiThreadStack, sizeof(mfiThreadStack), LOWPRIO, (tfunc_t)(void*) mfiThread, NULL);
addConsoleAction("testmil", testMil);
}

2
firmware/controllers/math/biquad.cpp
View File

@ -10,7 +10,7 @@
EXTERN_ENGINE;
Biquad::Biquad() {
a0 = a1 = a2 = b1 = b2;
a0 = a1 = a2 = b1 = b2 = 0;
z1 = z2 = 0;
}

4
firmware/controllers/system/pwm_generator_logic.cpp
View File

@ -30,8 +30,8 @@ SimplePwm::SimplePwm() {
}
void PwmConfig::baseConstructor() {
memset(&scheduling, 0, sizeof(scheduling));
memset(&safe, 0, sizeof(safe));
memset((void*)&scheduling, 0, sizeof(scheduling));
memset((void*)&safe, 0, sizeof(safe));
dbgNestingLevel = 0;
periodNt = NAN;
mode = PM_NORMAL;

4
firmware/controllers/trigger/trigger_central.cpp
View File

@ -65,7 +65,7 @@ efitime_t getStartOfRevolutionIndex(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
void TriggerCentral::addEventListener(ShaftPositionListener listener, const char *name, Engine *engine) {
print("registerCkpListener: %s\r\n", name);
triggerListeneres.registerCallback((VoidInt) listener, engine);
triggerListeneres.registerCallback((VoidInt)(void*)listener, engine);
}
/**
@ -397,7 +397,7 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal DECLARE_ENGINE_PAR
* Here we invoke all the listeners - the main engine control logic is inside these listeners
*/
for (int i = 0; i < triggerListeneres.currentListenersCount; i++) {
ShaftPositionListener listener = (ShaftPositionListener) triggerListeneres.callbacks[i];
ShaftPositionListener listener = (ShaftPositionListener) (void*) triggerListeneres.callbacks[i];
(listener)(signal, triggerIndexForListeners PASS_ENGINE_PARAMETER_SUFFIX);
}

2
firmware/development/engine_emulator.cpp
View File

@ -91,7 +91,7 @@ static void initECUstimulator(Engine *engine) {
setDiag(1);
chThdCreateStatic(eeThreadStack, sizeof(eeThreadStack), NORMALPRIO, (tfunc_t) eeThread, engine);
chThdCreateStatic(eeThreadStack, sizeof(eeThreadStack), NORMALPRIO, (tfunc_t)(void*) eeThread, engine);
}
void initEngineEmulator(Logging *sharedLogger, Engine *engine) {

4
firmware/development/wave_analyzer.cpp
View File

@ -129,9 +129,9 @@ static void initWave(const char *name, int index) {
reader->hw = addWaveAnalyzerDriver("wave input", brainPin);
reader->hw->widthListeners.registerCallback((VoidInt) waAnaWidthCallback, (void*) reader);
reader->hw->widthListeners.registerCallback((VoidInt)(void*) waAnaWidthCallback, (void*) reader);
reader->hw->periodListeners.registerCallback((VoidInt) waIcuPeriodCallback, (void*) reader);
reader->hw->periodListeners.registerCallback((VoidInt)(void*) waIcuPeriodCallback, (void*) reader);
print("wave%d input on %s\r\n", index, hwPortname(brainPin));

2
firmware/hw_layer/HIP9011.cpp
View File

@ -476,7 +476,7 @@ void initHip9011(Logging *sharedLogger) {
addConsoleActionI("set_hip_prescalerandsdo", setPrescalerAndSDO);
addConsoleActionF("set_knock_threshold", setKnockThresh);
addConsoleActionI("set_max_knock_sub_deg", setMaxKnockSubDeg);
chThdCreateStatic(hipTreadStack, sizeof(hipTreadStack), NORMALPRIO, (tfunc_t) hipThread, NULL);
chThdCreateStatic(hipTreadStack, sizeof(hipTreadStack), NORMALPRIO, (tfunc_t)(void*) hipThread, NULL);
}
#endif /* EFI_HIP_9011 */

2
firmware/hw_layer/accelerometer.cpp
View File

@ -95,7 +95,7 @@ void initAccelerometer(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
lis302dlWriteRegister(driver, LIS302DL_CTRL_REG2, 0x00); // 4 wire mode
lis302dlWriteRegister(driver, LIS302DL_CTRL_REG3, 0x00);
chThdCreateStatic(ivThreadStack, sizeof(ivThreadStack), NORMALPRIO, (tfunc_t) ivThread, NULL);
chThdCreateStatic(ivThreadStack, sizeof(ivThreadStack), NORMALPRIO, (tfunc_t)(void*) ivThread, NULL);
#endif /* HAL_USE_SPI */
}

2
firmware/hw_layer/board_test.cpp
View File

@ -199,7 +199,7 @@ void initBoardTest(void) {
btInitOutputPins();
blinkAllOutputPins();
chThdCreateStatic(btThreadStack, sizeof(btThreadStack), NORMALPRIO, (tfunc_t) ivThread, NULL);
chThdCreateStatic(btThreadStack, sizeof(btThreadStack), NORMALPRIO, (tfunc_t)(void*) ivThread, NULL);
// this code is ugly as hell, I had no time to think. Todo: refactor
#if HAL_USE_ADC || defined(__DOXYGEN__)

2
firmware/hw_layer/can_hw.cpp
View File

@ -333,7 +333,7 @@ void initCan(void) {
canStart(&CAND1, &canConfig500);
#endif /* STM32_CAN_USE_CAN2 */
chThdCreateStatic(canTreadStack, sizeof(canTreadStack), NORMALPRIO, (tfunc_t) canThread, NULL);
chThdCreateStatic(canTreadStack, sizeof(canTreadStack), NORMALPRIO, (tfunc_t)(void*) canThread, NULL);
startCanPins();

2
firmware/hw_layer/microsecond_timer.cpp
View File

@ -152,7 +152,7 @@ void initMicrosecondTimer(void) {
lastSetTimerTimeNt = getTimeNowNt();
#if EFI_EMULATE_POSITION_SENSORS
chThdCreateStatic(mwThreadStack, sizeof(mwThreadStack), NORMALPRIO, (tfunc_t) mwThread, NULL);
chThdCreateStatic(mwThreadStack, sizeof(mwThreadStack), NORMALPRIO, (tfunc_t)(void*) mwThread, NULL);
#endif /* EFI_ENGINE_EMULATOR */
// // test code

2
firmware/hw_layer/mmc_card.cpp
View File

@ -444,7 +444,7 @@ void initMmcCard(void) {
mmcObjectInit(&MMCD1); // Initializes an instance.
mmcStart(&MMCD1, &mmccfg);
chThdCreateStatic(mmcThreadStack, sizeof(mmcThreadStack), LOWPRIO, (tfunc_t) MMCmonThread, NULL);
chThdCreateStatic(mmcThreadStack, sizeof(mmcThreadStack), LOWPRIO, (tfunc_t)(void*) MMCmonThread, NULL);
addConsoleAction("mountsd", MMCmount);
addConsoleActionS("appendtolog", appendToLog);

2
firmware/hw_layer/neo6m.cpp
View File

@ -117,7 +117,7 @@ void initGps(void) {
efiSetPadMode("GPS rx", boardConfiguration->gps_rx_pin, PAL_MODE_ALTERNATE(7));
// todo: add a thread which would save location. If the GPS 5Hz - we should save the location each 200 ms
chThdCreateStatic(gpsThreadStack, sizeof(gpsThreadStack), LOWPRIO, (tfunc_t)GpsThreadEntryPoint, NULL);
chThdCreateStatic(gpsThreadStack, sizeof(gpsThreadStack), LOWPRIO, (tfunc_t)(void*) GpsThreadEntryPoint, NULL);
addConsoleAction("gpsinfo", &printGpsInfo);
}

2
firmware/hw_layer/sensors/CJ125.cpp
View File

@ -644,7 +644,7 @@ void initCJ125(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
addConsoleActionI("cj125_set_init2", cjSetInit2);
#endif /* CJ125_DEBUG */
chThdCreateStatic(cjThreadStack, sizeof(cjThreadStack), LOWPRIO, (tfunc_t) cjThread, NULL);
chThdCreateStatic(cjThreadStack, sizeof(cjThreadStack), LOWPRIO, (tfunc_t)(void*) cjThread, NULL);
}
#endif /* EFI_CJ125 */

2
firmware/hw_layer/servo.cpp
View File

@ -79,7 +79,7 @@ void initServo(void) {
chThdCreateStatic(seThreadStack, sizeof(seThreadStack), NORMALPRIO, (tfunc_t) seThread, NULL);
chThdCreateStatic(seThreadStack, sizeof(seThreadStack), NORMALPRIO, (tfunc_t)(void*) seThread, NULL);
}

2
firmware/hw_layer/stepper.cpp
View File

@ -178,6 +178,6 @@ void StepperMotor::initialize(brain_pin_e stepPin, brain_pin_e directionPin, pin
this->directionPin.setValue(false);
this->currentDirection = false;
chThdCreateStatic(stThreadStack, sizeof(stThreadStack), NORMALPRIO, (tfunc_t) stThread, this);
chThdCreateStatic(stThreadStack, sizeof(stThreadStack), NORMALPRIO, (tfunc_t)(void*) stThread, this);
}

2
firmware/util/listener_array.h
View File

@ -85,7 +85,7 @@ void invokeCallbacks(IntListenerArray<MAX_INT_LISTENER_COUNT> *array, int value)
template<int MAX_INT_LISTENER_COUNT>
void IntListenerArray<MAX_INT_LISTENER_COUNT>::invokeJustArgCallbacks() {
for (int i = 0; i < currentListenersCount; i++) {
VoidPtr listener = (VoidPtr)callbacks[i];
VoidPtr listener = (VoidPtr)(void*)callbacks[i];
void *arg = args[i];
(listener)(arg);
}