AP_HAL: remove I2CDriver

libraries/AP_HAL/AP_HAL.h

@@ -10,7 +10,6 @@
 
 /* HAL Module Classes (all pure virtual) */
 #include "UARTDriver.h"
-#include "I2CDriver.h"
 #include "SPIDriver.h"
 #include "AnalogIn.h"
 #include "Storage.h"

libraries/AP_HAL/AP_HAL_Namespace.h

@@ -12,7 +12,6 @@ namespace AP_HAL {
     class UARTDriver;
     class I2CDevice;
     class I2CDeviceManager;
-    class I2CDriver;
     class Device;
 
     class SPIDevice;

libraries/AP_HAL/HAL.h

@@ -21,9 +21,6 @@ public:
         AP_HAL::UARTDriver* _uartE, // 2nd GPS
         AP_HAL::UARTDriver* _uartF, // extra1
         AP_HAL::I2CDeviceManager* _i2c_mgr,
-        AP_HAL::I2CDriver*  _i2c0,
-        AP_HAL::I2CDriver*  _i2c1,
-        AP_HAL::I2CDriver*  _i2c2,
         AP_HAL::SPIDeviceManager* _spi,
         AP_HAL::AnalogIn*   _analogin,
         AP_HAL::Storage*    _storage,
@@ -42,9 +39,6 @@ public:
         uartE(_uartE),
         uartF(_uartF),
         i2c_mgr(_i2c_mgr),
-        i2c(_i2c0),
-        i2c1(_i2c1),
-        i2c2(_i2c2),
         spi(_spi),
         analogin(_analogin),
         storage(_storage),
@@ -84,9 +78,6 @@ public:
     AP_HAL::UARTDriver* uartE;
     AP_HAL::UARTDriver* uartF;
     AP_HAL::I2CDeviceManager* i2c_mgr;
-    AP_HAL::I2CDriver*  i2c;
-    AP_HAL::I2CDriver*  i2c1;
-    AP_HAL::I2CDriver*  i2c2;
     AP_HAL::SPIDeviceManager* spi;
     AP_HAL::AnalogIn*   analogin;
     AP_HAL::Storage*    storage;

libraries/AP_HAL/I2CDriver.h

@@ -1,49 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#include "AP_HAL_Namespace.h"
-
-class AP_HAL::I2CDriver {
-public:
-    virtual void begin() = 0;
-    virtual void end() = 0;
-    virtual void setTimeout(uint16_t ms) = 0;
-    virtual void setHighSpeed(bool active) = 0;
-
-    /* write: for i2c devices which do not obey register conventions */
-    virtual uint8_t write(uint8_t addr, uint8_t len, uint8_t* data) = 0;
-    /* writeRegister: write a single 8-bit value to a register */
-    virtual uint8_t writeRegister(uint8_t addr, uint8_t reg, uint8_t val) = 0;
-    /* writeRegisters: write bytes to contiguous registers */
-    virtual uint8_t writeRegisters(uint8_t addr, uint8_t reg,
-                                   uint8_t len, uint8_t* data) = 0;
-
-    /* read: for i2c devices which do not obey register conventions */
-    virtual uint8_t read(uint8_t addr, uint8_t len, uint8_t* data) = 0;
-    /* readRegister: read from a device register - writes the register,
-     * then reads back an 8-bit value. */
-    virtual uint8_t readRegister(uint8_t addr, uint8_t reg, uint8_t* data) = 0;
-
-    /* readRegisters: read contiguous device registers - writes the first 
-     * register, then reads back multiple bytes */
-    virtual uint8_t readRegisters(uint8_t addr, uint8_t reg,
-                                  uint8_t len, uint8_t* data) = 0;
-
-#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX
-    /* readRegistersMultiple: read contiguous device registers. 
-       Equivalent to count calls to readRegisters() */
-    virtual uint8_t readRegistersMultiple(uint8_t addr, uint8_t reg,
-                                          uint8_t len, uint8_t count, 
-                                          uint8_t* data) = 0;
-#endif
-
-    virtual bool do_transfer(uint8_t address, const uint8_t *send,
-                             uint32_t send_len, uint8_t *recv,
-                             uint32_t recv_len) { return false;}
-    virtual uint8_t lockup_count() = 0;
-    void ignore_errors(bool b) { _ignore_errors = b; }
-    virtual AP_HAL::Semaphore* get_semaphore() = 0;
-protected:
-    bool _ignore_errors;
-};