MK BL CTRL: Fix startup routine to be compliant with signature.

This commit is contained in:
Lorenz Meier
2019-01-20 15:37:44 +01:00
committed by Daniel Agar
parent 652c9dfc49
commit b719033d02
+6 -6
View File
@@ -177,8 +177,8 @@ private:
actuator_controls_s _controls; actuator_controls_s _controls;
MotorData_t Motor[MAX_MOTORS]; MotorData_t Motor[MAX_MOTORS];
static void task_main_trampoline(int argc, char *argv[]); static int task_main_trampoline(int argc, char *argv[]);
void task_main(); int task_main();
static int control_callback(uintptr_t handle, static int control_callback(uintptr_t handle,
uint8_t control_group, uint8_t control_group,
@@ -319,10 +319,10 @@ MK::init(unsigned motors)
return OK; return OK;
} }
void int
MK::task_main_trampoline(int argc, char *argv[]) MK::task_main_trampoline(int argc, char *argv[])
{ {
g_mk->task_main(); return g_mk->task_main();
} }
void void
@@ -458,7 +458,7 @@ MK::play_beep(int count)
} }
void int
MK::task_main() MK::task_main()
{ {
int32_t param_mkblctrl_test = 0; int32_t param_mkblctrl_test = 0;
@@ -664,7 +664,7 @@ MK::task_main()
/* tell the dtor that we are exiting */ /* tell the dtor that we are exiting */
_task = -1; _task = -1;
_exit(0); return 0;
} }