fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-16 16:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

px4_main_t: fix method declaration throughout the code base

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/distance_sensor/ulanding/ulanding.cpp
+3 -2
View File
@@ -122,7 +122,7 @@ private:
unsigned _tail;
uint8_t _buf[BUF_LEN];
static void task_main_trampoline(int argc, char *argv[]);
static int task_main_trampoline(int argc, char *argv[]);
void task_main();
bool read_and_parse(uint8_t *buf, int len, float *range);
@@ -299,10 +299,11 @@ Radar::init()
return ret;
}
void
int
Radar::task_main_trampoline(int argc, char *argv[])
{
radar::g_dev->task_main();
return 0;
}
int
src/drivers/gps/gps.cpp
+3 -2
View File
@@ -134,7 +134,7 @@ public:
/**
* task spawn trampoline for the secondary GPS
*/
static void run_trampoline_secondary(int argc, char *argv[]);
static int run_trampoline_secondary(int argc, char *argv[]);
/** @see ModuleBase::run() */
void run() override;
@@ -997,7 +997,7 @@ int GPS::task_spawn(int argc, char *argv[], Instance instance)
return 0;
}
void GPS::run_trampoline_secondary(int argc, char *argv[])
int GPS::run_trampoline_secondary(int argc, char *argv[])
{
#ifdef __PX4_NUTTX
@@ -1014,6 +1014,7 @@ void GPS::run_trampoline_secondary(int argc, char *argv[])
_secondary_instance = nullptr;
delete gps;
}
return 0;
}
GPS *GPS::instantiate(int argc, char *argv[])
{