ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed I2C default instance to use placement new

pull/10711/head
Christopher Haster 2018-07-25 11:40:00 -05:00
parent ffcc850104
commit b440d72114
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
I2CEEBlockDevice.cpp
View File

@ -23,7 +23,7 @@ I2CEEBlockDevice::I2CEEBlockDevice(
bd_size_t size, bd_size_t block, int freq) bd_size_t size, bd_size_t block, int freq)
: _i2c_addr(addr), _size(size), _block(block) : _i2c_addr(addr), _size(size), _block(block)
{ {
_i2c = new I2C(sda, scl); _i2c = new (_i2c_buffer) I2C(sda, scl);
_i2c->frequency(freq); _i2c->frequency(freq);
} }
@ -36,8 +36,10 @@ I2CEEBlockDevice::I2CEEBlockDevice(
} }
I2CEEBlockDevice::~I2CEEBlockDevice() I2CEEBlockDevice::~I2CEEBlockDevice()
{ {
if (_i2c == (I2C*)_i2c_buffer) {
_i2c->~I2C(); _i2c->~I2C();
} }
}
int I2CEEBlockDevice::init() int I2CEEBlockDevice::init()
{ {

1
I2CEEBlockDevice.h
View File

@ -159,6 +159,7 @@ public:
private: private:
I2C * _i2c; I2C * _i2c;
uint32_t _i2c_buffer[sizeof(I2C) / sizeof(uint32_t)];
uint8_t _i2c_addr; uint8_t _i2c_addr;
uint32_t _size; uint32_t _size;
uint32_t _block; uint32_t _block;