Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_Linux: merge init() and run()

This commit is contained in:
Caio Marcelo de Oliveira Filho 2015-10-19 13:59:47 -02:00 committed by Andrew Tridgell
parent e4ef0e43c0
commit 3c22564307
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
View File

@ -171,8 +171,10 @@ void _usage(void)
printf("\t -t /var/APM/terrain\n");
}
void HAL_Linux::init(int argc,char* const argv[]) const
void HAL_Linux::run(int argc, char* const argv[], Callbacks* callbacks) const
{
assert(callbacks);
int opt;
const struct GetOptLong::option options[] = {
{"uartA", true, 0, 'A'},
@ -236,13 +238,6 @@ void HAL_Linux::init(int argc,char* const argv[]) const
uartE->begin(115200);
analogin->init(NULL);
utilInstance.init(argc+gopt.optind-1, &argv[gopt.optind-1]);
}
void HAL_Linux::run(int argc, char* const argv[], Callbacks* callbacks) const
{
assert(callbacks);
init(argc, argv);
// NOTE: See commit 9f5b4ffca ("AP_HAL_Linux_Class: Correct
// deadlock, and infinite loop in setup()") for details about the

1
libraries/AP_HAL_Linux/HAL_Linux_Class.h
View File

@ -9,7 +9,6 @@
class HAL_Linux : public AP_HAL::HAL {
public:
HAL_Linux();
void init(int argc, char * const * argv) const;
void run(int argc, char* const* argv, Callbacks* callbacks) const override;
};