From 4c82c535cc382fe2108c7cee471ea576bc8587bd Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Wed, 2 Dec 2015 13:14:20 -0200
Subject: [PATCH] AP_HAL_SITL: use init() method without arguments

Override the init() method from parent class that doesn't have a
parameter since it's not used here.
---
 libraries/AP_HAL_SITL/AnalogIn.cpp       |  2 +-
 libraries/AP_HAL_SITL/AnalogIn.h         |  2 +-
 libraries/AP_HAL_SITL/HAL_SITL_Class.cpp | 10 +++++-----
 libraries/AP_HAL_SITL/RCInput.cpp        |  2 +-
 libraries/AP_HAL_SITL/RCInput.h          |  2 +-
 libraries/AP_HAL_SITL/RCOutput.cpp       |  2 +-
 libraries/AP_HAL_SITL/RCOutput.h         |  2 +-
 libraries/AP_HAL_SITL/Scheduler.cpp      |  2 +-
 libraries/AP_HAL_SITL/Scheduler.h        |  2 +-
 libraries/AP_HAL_SITL/Storage.h          |  2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libraries/AP_HAL_SITL/AnalogIn.cpp b/libraries/AP_HAL_SITL/AnalogIn.cpp
index 0fc7f47bec..24597d0794 100644
--- a/libraries/AP_HAL_SITL/AnalogIn.cpp
+++ b/libraries/AP_HAL_SITL/AnalogIn.cpp
@@ -55,7 +55,7 @@ void ADCSource::set_pin(uint8_t pin) {
     _pin = pin;
 }
 
-void SITLAnalogIn::init(void *ap_hal_scheduler) {
+void SITLAnalogIn::init() {
 }
 
 AP_HAL::AnalogSource* SITLAnalogIn::channel(int16_t pin) {
diff --git a/libraries/AP_HAL_SITL/AnalogIn.h b/libraries/AP_HAL_SITL/AnalogIn.h
index 0de13b1dbf..6a130476f7 100644
--- a/libraries/AP_HAL_SITL/AnalogIn.h
+++ b/libraries/AP_HAL_SITL/AnalogIn.h
@@ -37,7 +37,7 @@ public:
     SITLAnalogIn(SITL_State *sitlState) {
         _sitlState = sitlState;
     }
-    void init(void* ap_hal_scheduler);
+    void init();
     AP_HAL::AnalogSource* channel(int16_t n);
     float board_voltage(void) {
         return 5.0f;
diff --git a/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp b/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
index e4fa87d064..8d48e3e38e 100644
--- a/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
+++ b/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
@@ -71,16 +71,16 @@ void HAL_SITL::run(int argc, char * const argv[], Callbacks* callbacks) const
     assert(callbacks);
 
     _sitl_state->init(argc, argv);
-    scheduler->init(NULL);
+    scheduler->init();
     uartA->begin(115200);
 
-    rcin->init(NULL);
-    rcout->init(NULL);
+    rcin->init();
+    rcout->init();
 
-    //spi->init(NULL);
+    //spi->init();
     //i2c->begin();
     //i2c->setTimeout(100);
-    analogin->init(NULL);
+    analogin->init();
 
     callbacks->setup();
     scheduler->system_initialized();
diff --git a/libraries/AP_HAL_SITL/RCInput.cpp b/libraries/AP_HAL_SITL/RCInput.cpp
index ce0e0ff587..73cb3ee123 100644
--- a/libraries/AP_HAL_SITL/RCInput.cpp
+++ b/libraries/AP_HAL_SITL/RCInput.cpp
@@ -7,7 +7,7 @@ using namespace HALSITL;
 
 extern const AP_HAL::HAL& hal;
 
-void SITLRCInput::init(void* machtnichts)
+void SITLRCInput::init()
 {
     clear_overrides();
 }
diff --git a/libraries/AP_HAL_SITL/RCInput.h b/libraries/AP_HAL_SITL/RCInput.h
index 7c61891350..8e78b2c37e 100644
--- a/libraries/AP_HAL_SITL/RCInput.h
+++ b/libraries/AP_HAL_SITL/RCInput.h
@@ -11,7 +11,7 @@ public:
     SITLRCInput(SITL_State *sitlState) {
         _sitlState = sitlState;
     }
-    void init(void* machtnichts);
+    void init();
     bool  new_input();
     uint8_t num_channels() {
         return 8;
diff --git a/libraries/AP_HAL_SITL/RCOutput.cpp b/libraries/AP_HAL_SITL/RCOutput.cpp
index 8f636d2418..5f6d4deb04 100644
--- a/libraries/AP_HAL_SITL/RCOutput.cpp
+++ b/libraries/AP_HAL_SITL/RCOutput.cpp
@@ -5,7 +5,7 @@
 
 using namespace HALSITL;
 
-void SITLRCOutput::init(void* machtnichts) {}
+void SITLRCOutput::init() {}
 
 void SITLRCOutput::set_freq(uint32_t chmask, uint16_t freq_hz) {
     _freq_hz = freq_hz;
diff --git a/libraries/AP_HAL_SITL/RCOutput.h b/libraries/AP_HAL_SITL/RCOutput.h
index f2f08c19cb..834c5cb907 100644
--- a/libraries/AP_HAL_SITL/RCOutput.h
+++ b/libraries/AP_HAL_SITL/RCOutput.h
@@ -12,7 +12,7 @@ public:
         _sitlState = sitlState;
         _freq_hz = 50;
     }
-    void     init(void* machtnichts);
+    void     init();
     void     set_freq(uint32_t chmask, uint16_t freq_hz);
     uint16_t get_freq(uint8_t ch);
     void     enable_ch(uint8_t ch);
diff --git a/libraries/AP_HAL_SITL/Scheduler.cpp b/libraries/AP_HAL_SITL/Scheduler.cpp
index 2cef0ccb88..f95c192071 100644
--- a/libraries/AP_HAL_SITL/Scheduler.cpp
+++ b/libraries/AP_HAL_SITL/Scheduler.cpp
@@ -33,7 +33,7 @@ SITLScheduler::SITLScheduler(SITL_State *sitlState) :
 {
 }
 
-void SITLScheduler::init(void *unused)
+void SITLScheduler::init()
 {
 }
 
diff --git a/libraries/AP_HAL_SITL/Scheduler.h b/libraries/AP_HAL_SITL/Scheduler.h
index 954b3d104f..45b724f3e9 100644
--- a/libraries/AP_HAL_SITL/Scheduler.h
+++ b/libraries/AP_HAL_SITL/Scheduler.h
@@ -19,7 +19,7 @@ public:
 
     /* AP_HAL::Scheduler methods */
 
-    void     init(void *unused);
+    void     init();
     void     delay(uint16_t ms);
     void     delay_microseconds(uint16_t us);
     void     register_delay_callback(AP_HAL::Proc, uint16_t min_time_ms);
diff --git a/libraries/AP_HAL_SITL/Storage.h b/libraries/AP_HAL_SITL/Storage.h
index 23c1436cbb..a609b2a4c5 100644
--- a/libraries/AP_HAL_SITL/Storage.h
+++ b/libraries/AP_HAL_SITL/Storage.h
@@ -11,7 +11,7 @@ public:
     SITLEEPROMStorage() {
         _eeprom_fd = -1;
     }
-    void init(void* machtnichts) {}
+    void init() {}
     void read_block(void *dst, uint16_t src, size_t n);
     void write_block(uint16_t dst, const void* src, size_t n);