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

Correctly check return codes from bytewise write function of I2C.

pull/12446/head
Stephan Brunner 2020-02-17 20:50:49 +01:00
parent 52aed22978
commit e850984715
No known key found for this signature in database
GPG Key ID: D3CD7237AFB7EF6B
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
View File

@ -69,17 +69,18 @@ int I2CEEBlockDevice::read(void *buffer, bd_addr_t addr, bd_size_t size)
{ {
_i2c->start(); _i2c->start();
auto const pagedDeviceAddress = get_paged_device_address(page); if (1 != _i2c->write(pagedDeviceAddress))
{
if (!_i2c->write(pagedDeviceAddress)) {
return BD_ERROR_DEVICE_ERROR; return BD_ERROR_DEVICE_ERROR;
} }
if (!_address_is_eight_bit && !_i2c->write((char)(pagedStart >> 8u))) { if (!_address_is_eight_bit && 1 != _i2c->write((char) (pagedStart >> 8u)))
{
return BD_ERROR_DEVICE_ERROR; return BD_ERROR_DEVICE_ERROR;
} }
if (!_i2c->write((char)(pagedStart & 0xffu))) { if (1 != _i2c->write((char) (pagedStart & 0xffu)))
{
return BD_ERROR_DEVICE_ERROR; return BD_ERROR_DEVICE_ERROR;
} }
@ -113,28 +114,34 @@ int I2CEEBlockDevice::program(const void *buffer, bd_addr_t addr, bd_size_t size
const uint8_t &pagedDeviceAddress) -> int const uint8_t &pagedDeviceAddress) -> int
{ {
// While we have some more data to write. // While we have some more data to write.
while (size > 0) { while (size > 0)
{
uint32_t off = addr % _block; uint32_t off = addr % _block;
uint32_t chunk = (off + size < _block) ? size : (_block - off); uint32_t chunk = (off + size < _block) ? size : (_block - off);
_i2c->start(); _i2c->start();
auto const pagedDeviceAddress = get_paged_device_address(page); if (1 != _i2c->write(pagedDeviceAddress))
{
if (!_i2c->write(pagedDeviceAddress)) {
return BD_ERROR_DEVICE_ERROR; return BD_ERROR_DEVICE_ERROR;
} }
if (!_address_is_eight_bit && !_i2c->write((char)(pagedStart >> 8u))) { if (!_address_is_eight_bit && 1 != _i2c->write((char) (pagedStart >> 8u)))
{
return BD_ERROR_DEVICE_ERROR; return BD_ERROR_DEVICE_ERROR;
} }
if (!_i2c->write((char)(addr & 0xffu))) { if (1 != _i2c->write((char) (addr & 0xffu)))
{
return BD_ERROR_DEVICE_ERROR; return BD_ERROR_DEVICE_ERROR;
} }
for (unsigned i = 0; i < chunk; i++) { for (unsigned i = 0; i < chunk; i++)
_i2c->write(charBuffer[i]); {
if (1 != _i2c->write(charBuffer[i]))
{
return BD_ERROR_DEVICE_ERROR;
}
} }
_i2c->stop(); _i2c->stop();