From 372c0074b19fed316a7e04b8309e1e5e98dd2183 Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Tue, 18 Dec 2012 16:09:04 -0800 Subject: [PATCH] AP_HAL_AVR: remove old style HAL_AVR classes (deprecated) --- libraries/AP_HAL_AVR/HAL_AVR.cpp | 22 ------------------ libraries/AP_HAL_AVR/HAL_AVR.h | 38 -------------------------------- 2 files changed, 60 deletions(-) delete mode 100644 libraries/AP_HAL_AVR/HAL_AVR.cpp delete mode 100644 libraries/AP_HAL_AVR/HAL_AVR.h diff --git a/libraries/AP_HAL_AVR/HAL_AVR.cpp b/libraries/AP_HAL_AVR/HAL_AVR.cpp deleted file mode 100644 index bd5552cbd6..0000000000 --- a/libraries/AP_HAL_AVR/HAL_AVR.cpp +++ /dev/null @@ -1,22 +0,0 @@ - -#include "HAL_AVR.h" -using namespace AP_HAL_AVR; - -void HAL_AVR::init(int argc, char * const argv[]) const { - - scheduler->init((void*)&isr_registry); - - /* uartA is the serial port used for the console, so lets make sure - * it is initialized at boot */ - uartA->begin(115200); - console->init((void*)uartA); - /* The AVR RCInput drivers take an AP_HAL_AVR::ISRRegistry* - * as the init argument */ - rcin->init((void*)&isr_registry); - rcout->init(NULL); - spi->init(NULL); - i2c->begin(); - i2c->setTimeout(100); - analogin->init(NULL); -}; - diff --git a/libraries/AP_HAL_AVR/HAL_AVR.h b/libraries/AP_HAL_AVR/HAL_AVR.h deleted file mode 100644 index b4cc56bde4..0000000000 --- a/libraries/AP_HAL_AVR/HAL_AVR.h +++ /dev/null @@ -1,38 +0,0 @@ - -#ifndef __AP_HAL_AVR_HAL_AVR_H__ -#define __AP_HAL_AVR_HAL_AVR_H__ - -#include -#include "AP_HAL_AVR_Namespace.h" -#include "utility/ISRRegistry.h" - -/** - * HAL_AVR class derives from HAL but provides an AVR-specific - * init method. - */ - -class AP_HAL_AVR::HAL_AVR : public AP_HAL::HAL { -public: - HAL_AVR( - AP_HAL::UARTDriver* _uartA, - AP_HAL::UARTDriver* _uartB, - AP_HAL::UARTDriver* _uartC, - AP_HAL::I2CDriver* _i2c, - AP_HAL::SPIDeviceManager* _spi, - AP_HAL::AnalogIn* _analogin, - AP_HAL::Storage* _storage, - AP_HAL::ConsoleDriver* _console, - AP_HAL::GPIO* _gpio, - AP_HAL::RCInput* _rcin, - AP_HAL::RCOutput* _rcout, - AP_HAL::Scheduler* _scheduler) - : AP_HAL::HAL( _uartA, _uartB, _uartC, - _i2c, _spi, _analogin, _storage, - _console, _gpio, _rcin, - _rcout, _scheduler) {} - - void init(int argc, char * const argv[]) const; - AP_HAL_AVR::ISRRegistry isr_registry; -}; -#endif // __AP_HAL_AVR_HAL_AVR_H__ -