px4_main_t: fix method declaration throughout the code base

px4_main_t is defined as:
typedef int (*px4_main_t)(int argc, char *argv[]);
which matches with the definition in NuttX, given to task_create
This commit is contained in:
Beat Küng
2018-05-07 13:16:53 +02:00
parent 9772380779
commit 13ab5ed0d0
16 changed files with 43 additions and 31 deletions
@@ -479,27 +479,27 @@ GroundRoverPositionControl::task_main()
_control_task = -1;
}
void
int
GroundRoverPositionControl::task_main_trampoline(int argc, char *argv[])
{
gnd_control::g_control = new GroundRoverPositionControl();
if (gnd_control::g_control == nullptr) {
warnx("OUT OF MEM");
return;
return -1;
}
/* only returns on exit */
gnd_control::g_control->task_main();
delete gnd_control::g_control;
gnd_control::g_control = nullptr;
return 0;
}
int
GroundRoverPositionControl::start()
{
ASSERT(_control_task == -1);
warn("Starting by marco");
/* start the task */
_control_task = px4_task_spawn_cmd("gnd_pos_ctrl",
@@ -508,7 +508,6 @@ GroundRoverPositionControl::start()
1700,
(px4_main_t)&GroundRoverPositionControl::task_main_trampoline,
nullptr);
warn("done");
if (_control_task < 0) {
warn("task start failed");