From 2439826c1987ea1979575421f622205f633176a2 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 2 Dec 2015 13:14:20 -0200 Subject: [PATCH] AP_HAL_Linux: 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_Linux/AnalogIn.cpp | 2 +- libraries/AP_HAL_Linux/AnalogIn.h | 2 +- libraries/AP_HAL_Linux/AnalogIn_ADS1115.cpp | 2 +- libraries/AP_HAL_Linux/AnalogIn_ADS1115.h | 2 +- libraries/AP_HAL_Linux/HAL_Linux_Class.cpp | 10 +++++----- libraries/AP_HAL_Linux/RCInput.cpp | 2 +- libraries/AP_HAL_Linux/RCInput.h | 2 +- libraries/AP_HAL_Linux/RCInput_AioPRU.cpp | 2 +- libraries/AP_HAL_Linux/RCInput_AioPRU.h | 2 +- libraries/AP_HAL_Linux/RCInput_PRU.cpp | 2 +- libraries/AP_HAL_Linux/RCInput_PRU.h | 2 +- libraries/AP_HAL_Linux/RCInput_RPI.cpp | 2 +- libraries/AP_HAL_Linux/RCInput_RPI.h | 2 +- libraries/AP_HAL_Linux/RCInput_Raspilot.cpp | 2 +- libraries/AP_HAL_Linux/RCInput_Raspilot.h | 2 +- libraries/AP_HAL_Linux/RCInput_UART.cpp | 2 +- libraries/AP_HAL_Linux/RCInput_UART.h | 2 +- libraries/AP_HAL_Linux/RCInput_UDP.cpp | 2 +- libraries/AP_HAL_Linux/RCInput_UDP.h | 2 +- libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp | 2 +- libraries/AP_HAL_Linux/RCInput_ZYNQ.h | 2 +- libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_AioPRU.h | 2 +- libraries/AP_HAL_Linux/RCOutput_Bebop.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_Bebop.h | 2 +- libraries/AP_HAL_Linux/RCOutput_PCA9685.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_PCA9685.h | 2 +- libraries/AP_HAL_Linux/RCOutput_PRU.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_PRU.h | 2 +- libraries/AP_HAL_Linux/RCOutput_Raspilot.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_Raspilot.h | 2 +- libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_Sysfs.h | 2 +- libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_ZYNQ.h | 2 +- libraries/AP_HAL_Linux/RaspilotAnalogIn.cpp | 2 +- libraries/AP_HAL_Linux/RaspilotAnalogIn.h | 2 +- libraries/AP_HAL_Linux/SPIDriver.cpp | 2 +- libraries/AP_HAL_Linux/SPIDriver.h | 2 +- libraries/AP_HAL_Linux/Scheduler.cpp | 2 +- libraries/AP_HAL_Linux/Scheduler.h | 2 +- libraries/AP_HAL_Linux/Storage.h | 2 +- 42 files changed, 46 insertions(+), 46 deletions(-) diff --git a/libraries/AP_HAL_Linux/AnalogIn.cpp b/libraries/AP_HAL_Linux/AnalogIn.cpp index 4f8c0481eb..8973949cae 100644 --- a/libraries/AP_HAL_Linux/AnalogIn.cpp +++ b/libraries/AP_HAL_Linux/AnalogIn.cpp @@ -37,7 +37,7 @@ void AnalogSource::set_settle_time(uint16_t settle_time_ms) AnalogIn::AnalogIn() {} -void AnalogIn::init(void* machtnichts) +void AnalogIn::init() {} AP_HAL::AnalogSource* AnalogIn::channel(int16_t n) { diff --git a/libraries/AP_HAL_Linux/AnalogIn.h b/libraries/AP_HAL_Linux/AnalogIn.h index d830587800..979d1383e3 100644 --- a/libraries/AP_HAL_Linux/AnalogIn.h +++ b/libraries/AP_HAL_Linux/AnalogIn.h @@ -22,7 +22,7 @@ private: class Linux::AnalogIn : public AP_HAL::AnalogIn { public: AnalogIn(); - void init(void* implspecific); + void init(); AP_HAL::AnalogSource* channel(int16_t n); // we don't yet know how to get the board voltage diff --git a/libraries/AP_HAL_Linux/AnalogIn_ADS1115.cpp b/libraries/AP_HAL_Linux/AnalogIn_ADS1115.cpp index 6bf2895fca..eceb087a09 100644 --- a/libraries/AP_HAL_Linux/AnalogIn_ADS1115.cpp +++ b/libraries/AP_HAL_Linux/AnalogIn_ADS1115.cpp @@ -74,7 +74,7 @@ AP_HAL::AnalogSource* ADS1115AnalogIn::channel(int16_t pin) return NULL; } -void ADS1115AnalogIn::init(void* implspecific) +void ADS1115AnalogIn::init() { _adc->init(); hal.scheduler->suspend_timer_procs(); diff --git a/libraries/AP_HAL_Linux/AnalogIn_ADS1115.h b/libraries/AP_HAL_Linux/AnalogIn_ADS1115.h index 281b5df0a7..2eb3c04b04 100644 --- a/libraries/AP_HAL_Linux/AnalogIn_ADS1115.h +++ b/libraries/AP_HAL_Linux/AnalogIn_ADS1115.h @@ -26,7 +26,7 @@ private: class ADS1115AnalogIn: public AP_HAL::AnalogIn { public: ADS1115AnalogIn(); - void init(void* implspecific); + void init(); AP_HAL::AnalogSource* channel(int16_t n); /* Board voltage is not available */ diff --git a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp index d5946320de..85e40680a4 100644 --- a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp +++ b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp @@ -246,7 +246,7 @@ void HAL_Linux::run(int argc, char* const argv[], Callbacks* callbacks) const } } - scheduler->init(NULL); + scheduler->init(); gpio->init(); #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP i2c->begin(); @@ -258,12 +258,12 @@ void HAL_Linux::run(int argc, char* const argv[], Callbacks* callbacks) const #else i2c->begin(); #endif - spi->init(NULL); - rcout->init(NULL); - rcin->init(NULL); + spi->init(); + rcout->init(); + rcin->init(); uartA->begin(115200); uartE->begin(115200); - analogin->init(NULL); + analogin->init(); utilInstance.init(argc+gopt.optind-1, &argv[gopt.optind-1]); // NOTE: See commit 9f5b4ffca ("AP_HAL_Linux_Class: Correct diff --git a/libraries/AP_HAL_Linux/RCInput.cpp b/libraries/AP_HAL_Linux/RCInput.cpp index ab1a6cbc65..a9b0bdc5b2 100644 --- a/libraries/AP_HAL_Linux/RCInput.cpp +++ b/libraries/AP_HAL_Linux/RCInput.cpp @@ -28,7 +28,7 @@ RCInput::RCInput() : ppm_state._channel_counter = -1; } -void RCInput::init(void* machtnichts) +void RCInput::init() { } diff --git a/libraries/AP_HAL_Linux/RCInput.h b/libraries/AP_HAL_Linux/RCInput.h index 3689efd555..5c0a5298ee 100644 --- a/libraries/AP_HAL_Linux/RCInput.h +++ b/libraries/AP_HAL_Linux/RCInput.h @@ -14,7 +14,7 @@ public: return static_cast(rcinput); } - virtual void init(void* machtnichts); + virtual void init(); bool new_input(); uint8_t num_channels(); uint16_t read(uint8_t ch); diff --git a/libraries/AP_HAL_Linux/RCInput_AioPRU.cpp b/libraries/AP_HAL_Linux/RCInput_AioPRU.cpp index 8e87ef5645..f7741b2522 100644 --- a/libraries/AP_HAL_Linux/RCInput_AioPRU.cpp +++ b/libraries/AP_HAL_Linux/RCInput_AioPRU.cpp @@ -34,7 +34,7 @@ extern const AP_HAL::HAL& hal; using namespace Linux; -void RCInput_AioPRU::init(void*) +void RCInput_AioPRU::init() { int mem_fd = open("/dev/mem", O_RDWR|O_SYNC); if (mem_fd == -1) { diff --git a/libraries/AP_HAL_Linux/RCInput_AioPRU.h b/libraries/AP_HAL_Linux/RCInput_AioPRU.h index 5377e9a990..285b6264b6 100644 --- a/libraries/AP_HAL_Linux/RCInput_AioPRU.h +++ b/libraries/AP_HAL_Linux/RCInput_AioPRU.h @@ -27,7 +27,7 @@ class Linux::RCInput_AioPRU : public Linux::RCInput { public: - void init(void*); + void init(); void _timer_tick(void); private: diff --git a/libraries/AP_HAL_Linux/RCInput_PRU.cpp b/libraries/AP_HAL_Linux/RCInput_PRU.cpp index dbc48087e0..2e417d4c67 100644 --- a/libraries/AP_HAL_Linux/RCInput_PRU.cpp +++ b/libraries/AP_HAL_Linux/RCInput_PRU.cpp @@ -24,7 +24,7 @@ extern const AP_HAL::HAL& hal; using namespace Linux; -void RCInput_PRU::init(void*) +void RCInput_PRU::init() { int mem_fd = open("/dev/mem", O_RDWR|O_SYNC); if (mem_fd == -1) { diff --git a/libraries/AP_HAL_Linux/RCInput_PRU.h b/libraries/AP_HAL_Linux/RCInput_PRU.h index 4465cbfc74..1634b3f491 100644 --- a/libraries/AP_HAL_Linux/RCInput_PRU.h +++ b/libraries/AP_HAL_Linux/RCInput_PRU.h @@ -16,7 +16,7 @@ class Linux::RCInput_PRU : public Linux::RCInput { public: - void init(void*); + void init(); void _timer_tick(void); private: diff --git a/libraries/AP_HAL_Linux/RCInput_RPI.cpp b/libraries/AP_HAL_Linux/RCInput_RPI.cpp index 27f1d9e907..e692d5e4ed 100644 --- a/libraries/AP_HAL_Linux/RCInput_RPI.cpp +++ b/libraries/AP_HAL_Linux/RCInput_RPI.cpp @@ -423,7 +423,7 @@ void RCInput_RPI::init_registers() clk_reg = (uint32_t*)map_peripheral(clk_base, RCIN_RPI_CLK_LEN); } -void RCInput_RPI::init(void*) +void RCInput_RPI::init() { init_registers(); diff --git a/libraries/AP_HAL_Linux/RCInput_RPI.h b/libraries/AP_HAL_Linux/RCInput_RPI.h index 8799ed888c..4e1e2a2747 100644 --- a/libraries/AP_HAL_Linux/RCInput_RPI.h +++ b/libraries/AP_HAL_Linux/RCInput_RPI.h @@ -77,7 +77,7 @@ public: class Linux::RCInput_RPI : public Linux::RCInput { public: - void init(void*); + void init(); void _timer_tick(void); RCInput_RPI(); ~RCInput_RPI(); diff --git a/libraries/AP_HAL_Linux/RCInput_Raspilot.cpp b/libraries/AP_HAL_Linux/RCInput_Raspilot.cpp index e5a1d00868..a4b418fadf 100644 --- a/libraries/AP_HAL_Linux/RCInput_Raspilot.cpp +++ b/libraries/AP_HAL_Linux/RCInput_Raspilot.cpp @@ -19,7 +19,7 @@ static const AP_HAL::HAL& hal = AP_HAL::get_HAL(); using namespace Linux; -void RCInput_Raspilot::init(void*) +void RCInput_Raspilot::init() { _spi = hal.spi->device(AP_HAL::SPIDevice_RASPIO); _spi_sem = _spi->get_semaphore(); diff --git a/libraries/AP_HAL_Linux/RCInput_Raspilot.h b/libraries/AP_HAL_Linux/RCInput_Raspilot.h index a0c4516181..90e9f51620 100644 --- a/libraries/AP_HAL_Linux/RCInput_Raspilot.h +++ b/libraries/AP_HAL_Linux/RCInput_Raspilot.h @@ -8,7 +8,7 @@ class Linux::RCInput_Raspilot : public Linux::RCInput { public: - void init(void*); + void init(); private: uint32_t _last_timer; diff --git a/libraries/AP_HAL_Linux/RCInput_UART.cpp b/libraries/AP_HAL_Linux/RCInput_UART.cpp index 992a3d2ea0..19334b2958 100644 --- a/libraries/AP_HAL_Linux/RCInput_UART.cpp +++ b/libraries/AP_HAL_Linux/RCInput_UART.cpp @@ -31,7 +31,7 @@ RCInput_UART::~RCInput_UART() close(_fd); } -void RCInput_UART::init(void*) +void RCInput_UART::init() { struct termios options; diff --git a/libraries/AP_HAL_Linux/RCInput_UART.h b/libraries/AP_HAL_Linux/RCInput_UART.h index bc5920aafc..2cef96767c 100644 --- a/libraries/AP_HAL_Linux/RCInput_UART.h +++ b/libraries/AP_HAL_Linux/RCInput_UART.h @@ -13,7 +13,7 @@ public: RCInput_UART(const char *path); ~RCInput_UART(); - void init(void*) override; + void init() override; void _timer_tick(void) override; private: diff --git a/libraries/AP_HAL_Linux/RCInput_UDP.cpp b/libraries/AP_HAL_Linux/RCInput_UDP.cpp index 01b6571ec6..8d9c4e76af 100644 --- a/libraries/AP_HAL_Linux/RCInput_UDP.cpp +++ b/libraries/AP_HAL_Linux/RCInput_UDP.cpp @@ -14,7 +14,7 @@ RCInput_UDP::RCInput_UDP() : _last_buf_seq(0) {} -void RCInput_UDP::init(void *) +void RCInput_UDP::init() { _port = RCINPUT_UDP_DEF_PORT; if(!_socket.bind("0.0.0.0", _port)) { diff --git a/libraries/AP_HAL_Linux/RCInput_UDP.h b/libraries/AP_HAL_Linux/RCInput_UDP.h index ff560ccee6..5a798e9b59 100644 --- a/libraries/AP_HAL_Linux/RCInput_UDP.h +++ b/libraries/AP_HAL_Linux/RCInput_UDP.h @@ -12,7 +12,7 @@ class Linux::RCInput_UDP : public Linux::RCInput { public: RCInput_UDP(); - void init(void*); + void init(); void _timer_tick(void); private: SocketAPM _socket{true}; diff --git a/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp b/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp index 86ed37a5dd..bbd6609ac8 100644 --- a/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp +++ b/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp @@ -21,7 +21,7 @@ extern const AP_HAL::HAL& hal; using namespace Linux; -void RCInput_ZYNQ::init(void*) +void RCInput_ZYNQ::init() { int mem_fd = open("/dev/mem", O_RDWR|O_SYNC); if (mem_fd == -1) { diff --git a/libraries/AP_HAL_Linux/RCInput_ZYNQ.h b/libraries/AP_HAL_Linux/RCInput_ZYNQ.h index accaa09473..a1960a8c5d 100644 --- a/libraries/AP_HAL_Linux/RCInput_ZYNQ.h +++ b/libraries/AP_HAL_Linux/RCInput_ZYNQ.h @@ -15,7 +15,7 @@ class Linux::RCInput_ZYNQ : public Linux::RCInput { public: - void init(void*); + void init(); void _timer_tick(void); private: diff --git a/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp b/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp index 54f1f2fb20..5754a924ea 100644 --- a/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp @@ -31,7 +31,7 @@ static void catch_sigbus(int sig) { AP_HAL::panic("RCOutputAioPRU.cpp:SIGBUS error gernerated\n"); } -void RCOutput_AioPRU::init(void* machtnicht) +void RCOutput_AioPRU::init() { uint32_t mem_fd; uint32_t *iram; diff --git a/libraries/AP_HAL_Linux/RCOutput_AioPRU.h b/libraries/AP_HAL_Linux/RCOutput_AioPRU.h index 1428b637a9..5b57444856 100644 --- a/libraries/AP_HAL_Linux/RCOutput_AioPRU.h +++ b/libraries/AP_HAL_Linux/RCOutput_AioPRU.h @@ -20,7 +20,7 @@ #define PWM_CHAN_COUNT 12 class Linux::RCOutput_AioPRU : 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_Linux/RCOutput_Bebop.cpp b/libraries/AP_HAL_Linux/RCOutput_Bebop.cpp index 30f1a51ce2..021b74f502 100644 --- a/libraries/AP_HAL_Linux/RCOutput_Bebop.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_Bebop.cpp @@ -238,7 +238,7 @@ uint16_t RCOutput_Bebop::_period_us_to_rpm(uint16_t period_us) return (uint16_t)rpm_fl; } -void RCOutput_Bebop::init(void* dummy) +void RCOutput_Bebop::init() { int ret=0; struct sched_param param = { .sched_priority = RCOUT_BEBOP_RTPRIO }; diff --git a/libraries/AP_HAL_Linux/RCOutput_Bebop.h b/libraries/AP_HAL_Linux/RCOutput_Bebop.h index b4d336d079..b0e7a2536b 100644 --- a/libraries/AP_HAL_Linux/RCOutput_Bebop.h +++ b/libraries/AP_HAL_Linux/RCOutput_Bebop.h @@ -55,7 +55,7 @@ public: return static_cast(rcout); } - void init(void* dummy); + 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_Linux/RCOutput_PCA9685.cpp b/libraries/AP_HAL_Linux/RCOutput_PCA9685.cpp index d9a789bb33..d5e29f97ab 100644 --- a/libraries/AP_HAL_Linux/RCOutput_PCA9685.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_PCA9685.cpp @@ -80,7 +80,7 @@ RCOutput_PCA9685::~RCOutput_PCA9685() delete [] _pulses_buffer; } -void RCOutput_PCA9685::init(void* machtnicht) +void RCOutput_PCA9685::init() { _i2c_sem = hal.i2c->get_semaphore(); if (_i2c_sem == NULL) { diff --git a/libraries/AP_HAL_Linux/RCOutput_PCA9685.h b/libraries/AP_HAL_Linux/RCOutput_PCA9685.h index b7cabc6c65..fae6cbb38f 100644 --- a/libraries/AP_HAL_Linux/RCOutput_PCA9685.h +++ b/libraries/AP_HAL_Linux/RCOutput_PCA9685.h @@ -13,7 +13,7 @@ class Linux::RCOutput_PCA9685 : public AP_HAL::RCOutput { RCOutput_PCA9685(uint8_t addr, bool external_clock, uint8_t channel_offset, int16_t oe_pin_number); ~RCOutput_PCA9685(); - void init(void* machtnichts); + void init(); void reset_all_channels(); void set_freq(uint32_t chmask, uint16_t freq_hz); uint16_t get_freq(uint8_t ch); diff --git a/libraries/AP_HAL_Linux/RCOutput_PRU.cpp b/libraries/AP_HAL_Linux/RCOutput_PRU.cpp index 9b803576c2..03241a33a5 100644 --- a/libraries/AP_HAL_Linux/RCOutput_PRU.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_PRU.cpp @@ -28,7 +28,7 @@ static void catch_sigbus(int sig) { AP_HAL::panic("RCOutput.cpp:SIGBUS error gernerated\n"); } -void RCOutput_PRU::init(void* machtnicht) +void RCOutput_PRU::init() { uint32_t mem_fd; signal(SIGBUS,catch_sigbus); diff --git a/libraries/AP_HAL_Linux/RCOutput_PRU.h b/libraries/AP_HAL_Linux/RCOutput_PRU.h index 2ded059fd7..558375f9a2 100644 --- a/libraries/AP_HAL_Linux/RCOutput_PRU.h +++ b/libraries/AP_HAL_Linux/RCOutput_PRU.h @@ -16,7 +16,7 @@ #define PWM_CMD_TEST 6 /* various crap */ class Linux::RCOutput_PRU : 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_Linux/RCOutput_Raspilot.cpp b/libraries/AP_HAL_Linux/RCOutput_Raspilot.cpp index 46ddd7c3dd..accf36c834 100644 --- a/libraries/AP_HAL_Linux/RCOutput_Raspilot.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_Raspilot.cpp @@ -22,7 +22,7 @@ using namespace Linux; static const AP_HAL::HAL& hal = AP_HAL::get_HAL(); -void RCOutput_Raspilot::init(void* machtnicht) +void RCOutput_Raspilot::init() { _spi = hal.spi->device(AP_HAL::SPIDevice_RASPIO); _spi_sem = _spi->get_semaphore(); diff --git a/libraries/AP_HAL_Linux/RCOutput_Raspilot.h b/libraries/AP_HAL_Linux/RCOutput_Raspilot.h index e81c19d372..385d67d024 100644 --- a/libraries/AP_HAL_Linux/RCOutput_Raspilot.h +++ b/libraries/AP_HAL_Linux/RCOutput_Raspilot.h @@ -5,7 +5,7 @@ #include "AP_HAL_Linux.h" class Linux::RCOutput_Raspilot : 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_Linux/RCOutput_Sysfs.cpp b/libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp index 8e953f7074..75759aa600 100644 --- a/libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_Sysfs.cpp @@ -43,7 +43,7 @@ RCOutput_Sysfs::~RCOutput_Sysfs() delete _pwm_channels; } -void RCOutput_Sysfs::init(void *machtnichts) +void RCOutput_Sysfs::init() { for (uint8_t i = 0; i < _channel_count; i++) { _pwm_channels[i] = new PWM_Sysfs(_chip, i); diff --git a/libraries/AP_HAL_Linux/RCOutput_Sysfs.h b/libraries/AP_HAL_Linux/RCOutput_Sysfs.h index a68b72baed..ef88a9ac44 100644 --- a/libraries/AP_HAL_Linux/RCOutput_Sysfs.h +++ b/libraries/AP_HAL_Linux/RCOutput_Sysfs.h @@ -13,7 +13,7 @@ public: return static_cast(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_Linux/RCOutput_ZYNQ.cpp b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp index 1e4aae64e0..2c94d463ba 100644 --- a/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp @@ -24,7 +24,7 @@ static void catch_sigbus(int sig) { AP_HAL::panic("RCOutput.cpp:SIGBUS error gernerated\n"); } -void RCOutput_ZYNQ::init(void* machtnicht) +void RCOutput_ZYNQ::init() { uint32_t mem_fd; signal(SIGBUS,catch_sigbus); diff --git a/libraries/AP_HAL_Linux/RCOutput_ZYNQ.h b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.h index 06dd57a64d..e870c8efdb 100644 --- a/libraries/AP_HAL_Linux/RCOutput_ZYNQ.h +++ b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.h @@ -15,7 +15,7 @@ class Linux::RCOutput_ZYNQ : 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_Linux/RaspilotAnalogIn.cpp b/libraries/AP_HAL_Linux/RaspilotAnalogIn.cpp index 5ada5ef52e..3fc209c0a4 100644 --- a/libraries/AP_HAL_Linux/RaspilotAnalogIn.cpp +++ b/libraries/AP_HAL_Linux/RaspilotAnalogIn.cpp @@ -83,7 +83,7 @@ AP_HAL::AnalogSource* RaspilotAnalogIn::channel(int16_t pin) return NULL; } -void RaspilotAnalogIn::init(void* implspecific) +void RaspilotAnalogIn::init() { _vcc_pin_analog_source = channel(4); diff --git a/libraries/AP_HAL_Linux/RaspilotAnalogIn.h b/libraries/AP_HAL_Linux/RaspilotAnalogIn.h index 5b32317090..79c79fca59 100644 --- a/libraries/AP_HAL_Linux/RaspilotAnalogIn.h +++ b/libraries/AP_HAL_Linux/RaspilotAnalogIn.h @@ -26,7 +26,7 @@ private: class RaspilotAnalogIn: public AP_HAL::AnalogIn { public: RaspilotAnalogIn(); - void init(void* implspecific); + void init(); AP_HAL::AnalogSource* channel(int16_t n); /* Board voltage is not available */ diff --git a/libraries/AP_HAL_Linux/SPIDriver.cpp b/libraries/AP_HAL_Linux/SPIDriver.cpp index 508ad202fb..5072e05afa 100644 --- a/libraries/AP_HAL_Linux/SPIDriver.cpp +++ b/libraries/AP_HAL_Linux/SPIDriver.cpp @@ -146,7 +146,7 @@ void SPIDeviceDriver::transfer(const uint8_t *data, uint16_t len) transaction(data, NULL, len); } -void SPIDeviceManager::init(void *) +void SPIDeviceManager::init() { for (uint8_t i=0; i= LINUX_SPI_MAX_BUSES) { diff --git a/libraries/AP_HAL_Linux/SPIDriver.h b/libraries/AP_HAL_Linux/SPIDriver.h index e0eeabe58e..910f6d10d8 100644 --- a/libraries/AP_HAL_Linux/SPIDriver.h +++ b/libraries/AP_HAL_Linux/SPIDriver.h @@ -48,7 +48,7 @@ private: class Linux::SPIDeviceManager : public AP_HAL::SPIDeviceManager { public: - void init(void *); + void init(); AP_HAL::SPIDeviceDriver* device(enum AP_HAL::SPIDevice, uint8_t index = 0); static AP_HAL::Semaphore *get_semaphore(uint16_t bus); diff --git a/libraries/AP_HAL_Linux/Scheduler.cpp b/libraries/AP_HAL_Linux/Scheduler.cpp index c201f68ab4..acf794915a 100644 --- a/libraries/AP_HAL_Linux/Scheduler.cpp +++ b/libraries/AP_HAL_Linux/Scheduler.cpp @@ -77,7 +77,7 @@ void Scheduler::_create_realtime_thread(pthread_t *ctx, int rtprio, } } -void Scheduler::init(void* machtnichts) +void Scheduler::init() { mlockall(MCL_CURRENT|MCL_FUTURE); diff --git a/libraries/AP_HAL_Linux/Scheduler.h b/libraries/AP_HAL_Linux/Scheduler.h index 6b69c21bee..bede9f6f0f 100644 --- a/libraries/AP_HAL_Linux/Scheduler.h +++ b/libraries/AP_HAL_Linux/Scheduler.h @@ -23,7 +23,7 @@ public: return static_cast(scheduler); } - 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_Linux/Storage.h b/libraries/AP_HAL_Linux/Storage.h index 7c5fce8eef..0a2bc4bd20 100644 --- a/libraries/AP_HAL_Linux/Storage.h +++ b/libraries/AP_HAL_Linux/Storage.h @@ -25,7 +25,7 @@ public: return static_cast(storage); } - void init(void* machtnichts) {} + void init() {} uint8_t read_byte(uint16_t loc); uint16_t read_word(uint16_t loc); uint32_t read_dword(uint16_t loc);