From e4ef0e43c0637bf35eb2075e4f76d237518d5146 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_SITL: merge init() and run()

---
 libraries/AP_HAL_SITL/HAL_SITL_Class.cpp | 11 +++--------
 libraries/AP_HAL_SITL/HAL_SITL_Class.h   |  1 -
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp b/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
index b28ecbcdc8..e4fa87d064 100644
--- a/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
+++ b/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
@@ -66,8 +66,10 @@ HAL_SITL::HAL_SITL() :
     _sitl_state(&sitlState)
 {}
 
-void HAL_SITL::init(int argc, char * const argv[]) const
+void HAL_SITL::run(int argc, char * const argv[], Callbacks* callbacks) const
 {
+    assert(callbacks);
+
     _sitl_state->init(argc, argv);
     scheduler->init(NULL);
     uartA->begin(115200);
@@ -79,13 +81,6 @@ void HAL_SITL::init(int argc, char * const argv[]) const
     //i2c->begin();
     //i2c->setTimeout(100);
     analogin->init(NULL);
-}
-
-void HAL_SITL::run(int argc, char * const argv[], Callbacks* callbacks) const
-{
-    assert(callbacks);
-
-    init(argc, argv);
 
     callbacks->setup();
     scheduler->system_initialized();
diff --git a/libraries/AP_HAL_SITL/HAL_SITL_Class.h b/libraries/AP_HAL_SITL/HAL_SITL_Class.h
index 0749f47c9e..31e23c3d3d 100644
--- a/libraries/AP_HAL_SITL/HAL_SITL_Class.h
+++ b/libraries/AP_HAL_SITL/HAL_SITL_Class.h
@@ -13,7 +13,6 @@
 class HAL_SITL : public AP_HAL::HAL {
 public:
     HAL_SITL();
-    void init(int argc, char * const argv[]) const;
     void run(int argc, char * const argv[], Callbacks* callbacks) const override;
 
 private: