From b30f652cec5ecb574074eae02962188c0498389d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 5 Oct 2013 18:32:57 +1000 Subject: [PATCH] HAL_Linux: removed Console driver --- .../AP_HAL_Linux/AP_HAL_Linux_Namespace.h | 1 - libraries/AP_HAL_Linux/AP_HAL_Linux_Private.h | 1 - libraries/AP_HAL_Linux/Console.cpp | 48 ------------------- libraries/AP_HAL_Linux/Console.h | 27 ----------- libraries/AP_HAL_Linux/HAL_Linux_Class.cpp | 3 +- 5 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 libraries/AP_HAL_Linux/Console.cpp delete mode 100644 libraries/AP_HAL_Linux/Console.h diff --git a/libraries/AP_HAL_Linux/AP_HAL_Linux_Namespace.h b/libraries/AP_HAL_Linux/AP_HAL_Linux_Namespace.h index a773680531..465e8c7e41 100644 --- a/libraries/AP_HAL_Linux/AP_HAL_Linux_Namespace.h +++ b/libraries/AP_HAL_Linux/AP_HAL_Linux_Namespace.h @@ -15,7 +15,6 @@ namespace Linux { class LinuxAnalogSource; class LinuxAnalogIn; class LinuxStorage; - class LinuxConsoleDriver; class LinuxGPIO; class LinuxDigitalSource; class LinuxRCInput; diff --git a/libraries/AP_HAL_Linux/AP_HAL_Linux_Private.h b/libraries/AP_HAL_Linux/AP_HAL_Linux_Private.h index 7adcdf5937..28485c73e0 100644 --- a/libraries/AP_HAL_Linux/AP_HAL_Linux_Private.h +++ b/libraries/AP_HAL_Linux/AP_HAL_Linux_Private.h @@ -11,7 +11,6 @@ #include "SPIDriver.h" #include "AnalogIn.h" #include "Storage.h" -#include "Console.h" #include "GPIO.h" #include "RCInput.h" #include "RCOutput.h" diff --git a/libraries/AP_HAL_Linux/Console.cpp b/libraries/AP_HAL_Linux/Console.cpp deleted file mode 100644 index a61f09550f..0000000000 --- a/libraries/AP_HAL_Linux/Console.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include -#include "Console.h" - -using namespace Linux; - -LinuxConsoleDriver::LinuxConsoleDriver(AP_HAL::BetterStream* delegate) : - _d(delegate) -{} - -void LinuxConsoleDriver::init(void* machtnichts) -{} - -void LinuxConsoleDriver::backend_open() -{} - -void LinuxConsoleDriver::backend_close() -{} - -size_t LinuxConsoleDriver::backend_read(uint8_t *data, size_t len) { - return 0; -} - -size_t LinuxConsoleDriver::backend_write(const uint8_t *data, size_t len) { - return 0; -} - -int16_t LinuxConsoleDriver::available() { - return _d->available(); -} - -int16_t LinuxConsoleDriver::txspace() { - return _d->txspace(); -} - -int16_t LinuxConsoleDriver::read() { - return _d->read(); -} - -size_t LinuxConsoleDriver::write(uint8_t c) -{ - return _d->write(c); -} - -size_t LinuxConsoleDriver::write(const uint8_t *buffer, size_t size) { - return _d->write(buffer, size); -} - - diff --git a/libraries/AP_HAL_Linux/Console.h b/libraries/AP_HAL_Linux/Console.h deleted file mode 100644 index f525a212f9..0000000000 --- a/libraries/AP_HAL_Linux/Console.h +++ /dev/null @@ -1,27 +0,0 @@ - -#ifndef __AP_HAL_LINUX_CONSOLE_H__ -#define __AP_HAL_LINUX_CONSOLE_H__ - -#include - -class Linux::LinuxConsoleDriver : public AP_HAL::ConsoleDriver { -public: - LinuxConsoleDriver(AP_HAL::BetterStream* delegate); - void init(void* machtnichts); - void backend_open(); - void backend_close(); - size_t backend_read(uint8_t *data, size_t len); - size_t backend_write(const uint8_t *data, size_t len); - - int16_t available(); - int16_t txspace(); - int16_t read(); - - size_t write(uint8_t c); - size_t write(const uint8_t *buffer, size_t size); - -private: - AP_HAL::BetterStream *_d; -}; - -#endif // __AP_HAL_LINUX_CONSOLE_H__ diff --git a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp index 1cad64a97e..cc8174c7d8 100644 --- a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp +++ b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp @@ -21,7 +21,6 @@ static LinuxI2CDriver i2cDriver(&i2cSemaphore, "/dev/i2c-1"); static LinuxSPIDeviceManager spiDeviceManager; static LinuxAnalogIn analogIn; static LinuxStorage storageDriver; -static LinuxConsoleDriver consoleDriver(&uartADriver); static LinuxGPIO gpioDriver; static LinuxRCInput rcinDriver; static LinuxRCOutput rcoutDriver; @@ -37,7 +36,7 @@ HAL_Linux::HAL_Linux() : &spiDeviceManager, &analogIn, &storageDriver, - &consoleDriver, + &uartADriver, &gpioDriver, &rcinDriver, &rcoutDriver,