diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-16 15:26:22 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-16 15:26:22 +0200 |
commit | c5e4f33bb33689df5acb26ee4f40c70496f9b1eb (patch) | |
tree | 381976022f870a4543281589e7d42b67ad76926d /src/drivers/device | |
parent | ca98070f8b479f5d643d810a077ad09e84d32721 (diff) | |
parent | 654aaa0ca852b95e4e2bec5cf9b77ca3242d1d63 (diff) | |
download | px4-firmware-c5e4f33bb33689df5acb26ee4f40c70496f9b1eb.tar.gz px4-firmware-c5e4f33bb33689df5acb26ee4f40c70496f9b1eb.tar.bz2 px4-firmware-c5e4f33bb33689df5acb26ee4f40c70496f9b1eb.zip |
Merge sensor_startup_cleanup
Diffstat (limited to 'src/drivers/device')
-rw-r--r-- | src/drivers/device/i2c.h | 3 | ||||
-rw-r--r-- | src/drivers/device/ringbuffer.h | 4 | ||||
-rw-r--r-- | src/drivers/device/spi.h | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/drivers/device/i2c.h b/src/drivers/device/i2c.h index 549879352..705b398b0 100644 --- a/src/drivers/device/i2c.h +++ b/src/drivers/device/i2c.h @@ -138,6 +138,9 @@ private: uint16_t _address; uint32_t _frequency; struct i2c_dev_s *_dev; + + I2C(const device::I2C&); + I2C operator=(const device::I2C&); }; } // namespace device diff --git a/src/drivers/device/ringbuffer.h b/src/drivers/device/ringbuffer.h index a9e22eaa6..b26e2e7c8 100644 --- a/src/drivers/device/ringbuffer.h +++ b/src/drivers/device/ringbuffer.h @@ -162,6 +162,10 @@ private: volatile unsigned _tail; /**< removal point in _item_size units */ unsigned _next(unsigned index); + + /* we don't want this class to be copied */ + RingBuffer(const RingBuffer&); + RingBuffer operator=(const RingBuffer&); }; RingBuffer::RingBuffer(unsigned num_items, size_t item_size) : diff --git a/src/drivers/device/spi.h b/src/drivers/device/spi.h index 54849c8c3..1d9837689 100644 --- a/src/drivers/device/spi.h +++ b/src/drivers/device/spi.h @@ -129,10 +129,15 @@ private: uint32_t _frequency; struct spi_dev_s *_dev; + /* this class does not allow copying */ + SPI(const SPI&); + SPI operator=(const SPI&); + protected: int _bus; int _transfer(uint8_t *send, uint8_t *recv, unsigned len); + }; } // namespace device |