From cb61bdd8d11e2227ae0a94099025c0506d215dfd Mon Sep 17 00:00:00 2001
From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Date: Mon, 19 Oct 2015 13:59:47 -0200
Subject: [PATCH] AP_HAL_PX4: merge init() and run()

---
 libraries/AP_HAL_PX4/HAL_PX4_Class.cpp | 12 ++++--------
 libraries/AP_HAL_PX4/HAL_PX4_Class.h   |  1 -
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libraries/AP_HAL_PX4/HAL_PX4_Class.cpp b/libraries/AP_HAL_PX4/HAL_PX4_Class.cpp
index 8d76684c3c..43998c8e60 100644
--- a/libraries/AP_HAL_PX4/HAL_PX4_Class.cpp
+++ b/libraries/AP_HAL_PX4/HAL_PX4_Class.cpp
@@ -200,7 +200,7 @@ static void usage(void)
 }
 
 
-void HAL_PX4::init(int argc, char * const argv[]) const 
+void HAL_PX4::run(int argc, char * const argv[], Callbacks* callbacks) const
 {
     int i;
     const char *deviceA = UARTA_DEFAULT_DEVICE;
@@ -215,6 +215,9 @@ void HAL_PX4::init(int argc, char * const argv[]) const
         exit(1);
     }
 
+    assert(callbacks);
+    g_callbacks = callbacks;
+
     for (i=0; i<argc; i++) {
         if (strcmp(argv[i], "start") == 0) {
             if (thread_running) {
@@ -305,13 +308,6 @@ void HAL_PX4::init(int argc, char * const argv[]) const
     exit(1);
 }
 
-void HAL_PX4::run(int argc, char * const argv[], Callbacks* callbacks) const
-{
-    assert(callbacks);
-    g_callbacks = callbacks;
-    init(argc, argv);
-}
-
 const AP_HAL::HAL& AP_HAL::get_HAL() {
     static const HAL_PX4 hal_px4;
     return hal_px4;
diff --git a/libraries/AP_HAL_PX4/HAL_PX4_Class.h b/libraries/AP_HAL_PX4/HAL_PX4_Class.h
index 367a644b90..7f5cf7ff7c 100644
--- a/libraries/AP_HAL_PX4/HAL_PX4_Class.h
+++ b/libraries/AP_HAL_PX4/HAL_PX4_Class.h
@@ -14,7 +14,6 @@
 class HAL_PX4 : public AP_HAL::HAL {
 public:
     HAL_PX4();    
-    void init(int argc, char * const argv[]) const;
     void run(int argc, char* const argv[], Callbacks* callbacks) const override;
 };