From 00f17466a8eb2f451c2d9019624ca8fee4ac3599 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 2 Dec 2015 13:14:20 -0200 Subject: [PATCH] AP_HAL_Empty: 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_Empty/AnalogIn.cpp | 2 +- libraries/AP_HAL_Empty/AnalogIn.h | 2 +- libraries/AP_HAL_Empty/HAL_Empty_Class.cpp | 2 +- libraries/AP_HAL_Empty/RCInput.cpp | 2 +- libraries/AP_HAL_Empty/RCInput.h | 2 +- libraries/AP_HAL_Empty/RCOutput.cpp | 2 +- libraries/AP_HAL_Empty/RCOutput.h | 2 +- libraries/AP_HAL_Empty/SPIDriver.cpp | 2 +- libraries/AP_HAL_Empty/SPIDriver.h | 2 +- libraries/AP_HAL_Empty/Scheduler.cpp | 2 +- libraries/AP_HAL_Empty/Scheduler.h | 2 +- libraries/AP_HAL_Empty/Storage.cpp | 2 +- libraries/AP_HAL_Empty/Storage.h | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libraries/AP_HAL_Empty/AnalogIn.cpp b/libraries/AP_HAL_Empty/AnalogIn.cpp index f9f16aaf75..ffa8daabcc 100644 --- a/libraries/AP_HAL_Empty/AnalogIn.cpp +++ b/libraries/AP_HAL_Empty/AnalogIn.cpp @@ -34,7 +34,7 @@ void EmptyAnalogSource::set_settle_time(uint16_t settle_time_ms) EmptyAnalogIn::EmptyAnalogIn() {} -void EmptyAnalogIn::init(void* machtnichts) +void EmptyAnalogIn::init() {} AP_HAL::AnalogSource* EmptyAnalogIn::channel(int16_t n) { diff --git a/libraries/AP_HAL_Empty/AnalogIn.h b/libraries/AP_HAL_Empty/AnalogIn.h index ed3ad6eb73..e53ea8a5b1 100644 --- a/libraries/AP_HAL_Empty/AnalogIn.h +++ b/libraries/AP_HAL_Empty/AnalogIn.h @@ -22,7 +22,7 @@ private: class Empty::EmptyAnalogIn : public AP_HAL::AnalogIn { public: EmptyAnalogIn(); - void init(void* implspecific); + void init(); AP_HAL::AnalogSource* channel(int16_t n); float board_voltage(void); }; diff --git a/libraries/AP_HAL_Empty/HAL_Empty_Class.cpp b/libraries/AP_HAL_Empty/HAL_Empty_Class.cpp index 89767318e3..6f63796a32 100644 --- a/libraries/AP_HAL_Empty/HAL_Empty_Class.cpp +++ b/libraries/AP_HAL_Empty/HAL_Empty_Class.cpp @@ -52,7 +52,7 @@ void HAL_Empty::run(int argc, char* const argv[], Callbacks* callbacks) const /* initialize all drivers and private members here. * up to the programmer to do this in the correct order. * Scheduler should likely come first. */ - scheduler->init(NULL); + scheduler->init(); uartA->begin(115200); _member->init(); diff --git a/libraries/AP_HAL_Empty/RCInput.cpp b/libraries/AP_HAL_Empty/RCInput.cpp index a42da8c4a6..f1935dc6df 100644 --- a/libraries/AP_HAL_Empty/RCInput.cpp +++ b/libraries/AP_HAL_Empty/RCInput.cpp @@ -5,7 +5,7 @@ using namespace Empty; EmptyRCInput::EmptyRCInput() {} -void EmptyRCInput::init(void* machtnichts) +void EmptyRCInput::init() {} bool EmptyRCInput::new_input() { diff --git a/libraries/AP_HAL_Empty/RCInput.h b/libraries/AP_HAL_Empty/RCInput.h index 2761891e1f..14b3a1cb79 100644 --- a/libraries/AP_HAL_Empty/RCInput.h +++ b/libraries/AP_HAL_Empty/RCInput.h @@ -7,7 +7,7 @@ class Empty::EmptyRCInput : public AP_HAL::RCInput { public: EmptyRCInput(); - void init(void* machtnichts); + void init(); bool new_input(); uint8_t num_channels(); uint16_t read(uint8_t ch); diff --git a/libraries/AP_HAL_Empty/RCOutput.cpp b/libraries/AP_HAL_Empty/RCOutput.cpp index 534a0b90e5..55e74a5bd6 100644 --- a/libraries/AP_HAL_Empty/RCOutput.cpp +++ b/libraries/AP_HAL_Empty/RCOutput.cpp @@ -3,7 +3,7 @@ using namespace Empty; -void EmptyRCOutput::init(void* machtnichts) {} +void EmptyRCOutput::init() {} void EmptyRCOutput::set_freq(uint32_t chmask, uint16_t freq_hz) {} diff --git a/libraries/AP_HAL_Empty/RCOutput.h b/libraries/AP_HAL_Empty/RCOutput.h index 05d48736d1..7290aa59fe 100644 --- a/libraries/AP_HAL_Empty/RCOutput.h +++ b/libraries/AP_HAL_Empty/RCOutput.h @@ -5,7 +5,7 @@ #include "AP_HAL_Empty.h" class Empty::EmptyRCOutput : public AP_HAL::RCOutput { - 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_Empty/SPIDriver.cpp b/libraries/AP_HAL_Empty/SPIDriver.cpp index cd60a8f116..a6ca786e8c 100644 --- a/libraries/AP_HAL_Empty/SPIDriver.cpp +++ b/libraries/AP_HAL_Empty/SPIDriver.cpp @@ -38,7 +38,7 @@ void EmptySPIDeviceDriver::transfer (const uint8_t *data, uint16_t len) EmptySPIDeviceManager::EmptySPIDeviceManager() {} -void EmptySPIDeviceManager::init(void *) +void EmptySPIDeviceManager::init() {} AP_HAL::SPIDeviceDriver* EmptySPIDeviceManager::device(enum AP_HAL::SPIDevice, uint8_t index) diff --git a/libraries/AP_HAL_Empty/SPIDriver.h b/libraries/AP_HAL_Empty/SPIDriver.h index f0b584aeaf..4a3bd5d08e 100644 --- a/libraries/AP_HAL_Empty/SPIDriver.h +++ b/libraries/AP_HAL_Empty/SPIDriver.h @@ -23,7 +23,7 @@ private: class Empty::EmptySPIDeviceManager : public AP_HAL::SPIDeviceManager { public: EmptySPIDeviceManager(); - void init(void *); + void init(); AP_HAL::SPIDeviceDriver* device(enum AP_HAL::SPIDevice, uint8_t index); private: EmptySPIDeviceDriver _device; diff --git a/libraries/AP_HAL_Empty/Scheduler.cpp b/libraries/AP_HAL_Empty/Scheduler.cpp index 6c2cd64775..39cd9a1ff8 100644 --- a/libraries/AP_HAL_Empty/Scheduler.cpp +++ b/libraries/AP_HAL_Empty/Scheduler.cpp @@ -10,7 +10,7 @@ extern const AP_HAL::HAL& hal; EmptyScheduler::EmptyScheduler() {} -void EmptyScheduler::init(void* machtnichts) +void EmptyScheduler::init() {} void EmptyScheduler::delay(uint16_t ms) diff --git a/libraries/AP_HAL_Empty/Scheduler.h b/libraries/AP_HAL_Empty/Scheduler.h index e7414e7de6..bef1e43c84 100644 --- a/libraries/AP_HAL_Empty/Scheduler.h +++ b/libraries/AP_HAL_Empty/Scheduler.h @@ -7,7 +7,7 @@ class Empty::EmptyScheduler : public AP_HAL::Scheduler { public: EmptyScheduler(); - void init(void* machtnichts); + void init(); void delay(uint16_t ms); void delay_microseconds(uint16_t us); void register_delay_callback(AP_HAL::Proc, diff --git a/libraries/AP_HAL_Empty/Storage.cpp b/libraries/AP_HAL_Empty/Storage.cpp index 9997061ce3..fc87a658df 100644 --- a/libraries/AP_HAL_Empty/Storage.cpp +++ b/libraries/AP_HAL_Empty/Storage.cpp @@ -7,7 +7,7 @@ using namespace Empty; EmptyStorage::EmptyStorage() {} -void EmptyStorage::init(void*) +void EmptyStorage::init() {} void EmptyStorage::read_block(void* dst, uint16_t src, size_t n) { diff --git a/libraries/AP_HAL_Empty/Storage.h b/libraries/AP_HAL_Empty/Storage.h index 8e185f7710..1dacb452f7 100644 --- a/libraries/AP_HAL_Empty/Storage.h +++ b/libraries/AP_HAL_Empty/Storage.h @@ -7,7 +7,7 @@ class Empty::EmptyStorage : public AP_HAL::Storage { public: EmptyStorage(); - void init(void *); + 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); };