pim/mgos_i2c_mock
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug in endianness of {get,set}bits_reg_w()

Browse Source
This commit is contained in:
Pim van Pelt
2019-01-16 21:20:06 +01:00
parent 61dfa80322
commit b7febb1bfe
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mgos_i2c_bitfields.c
View File

@ -45,6 +45,7 @@ bool mgos_i2c_getbits_reg_b(struct mgos_i2c *i2c, uint16_t addr, uint8_t reg, ui
bool mgos_i2c_setbits_reg_w(struct mgos_i2c *i2c, uint16_t addr, uint8_t reg, uint8_t bitoffset, uint8_t bitlen, uint16_t value) { bool mgos_i2c_setbits_reg_w(struct mgos_i2c *i2c, uint16_t addr, uint8_t reg, uint8_t bitoffset, uint8_t bitlen, uint16_t value) {
uint16_t old, new; uint16_t old, new;
uint8_t d[2];
if (!i2c || bitoffset + bitlen > 16 || bitlen == 0) { if (!i2c || bitoffset + bitlen > 16 || bitlen == 0) {
return false; return false;
@ -53,14 +54,18 @@ bool mgos_i2c_setbits_reg_w(struct mgos_i2c *i2c, uint16_t addr, uint8_t reg, ui
return false; return false;
} }
if (!mgos_i2c_read_reg_n(i2c, addr, reg, 2, (uint8_t *)&old)) { if (!mgos_i2c_read_reg_n(i2c, addr, reg, 2, d)) {
return false; return false;
} }
old = (d[0] << 8) | d[1];
new = old | (((1 << bitlen) - 1) << bitoffset); new = old | (((1 << bitlen) - 1) << bitoffset);
new &= ~(((1 << bitlen) - 1) << bitoffset); new &= ~(((1 << bitlen) - 1) << bitoffset);
new |= (value) << bitoffset; new |= (value) << bitoffset;
if (!mgos_i2c_write_reg_n(i2c, addr, reg, 2, (uint8_t *)&new)) { d[0] = new >> 8;
d[1] = new & 0xFF;
if (!mgos_i2c_write_reg_n(i2c, addr, reg, 2, d)) {
return false; return false;
} }
return true; return true;
@ -68,14 +73,16 @@ bool mgos_i2c_setbits_reg_w(struct mgos_i2c *i2c, uint16_t addr, uint8_t reg, ui
bool mgos_i2c_getbits_reg_w(struct mgos_i2c *i2c, uint16_t addr, uint8_t reg, uint8_t bitoffset, uint8_t bitlen, uint16_t *value) { bool mgos_i2c_getbits_reg_w(struct mgos_i2c *i2c, uint16_t addr, uint8_t reg, uint8_t bitoffset, uint8_t bitlen, uint16_t *value) {
uint16_t val, mask; uint16_t val, mask;
uint8_t d[2];
if (!i2c || bitoffset + bitlen > 16 || bitlen == 0 || !value) { if (!i2c || bitoffset + bitlen > 16 || bitlen == 0 || !value) {
return false; return false;
} }
if (!mgos_i2c_read_reg_n(i2c, addr, reg, 2, (uint8_t *)&val)) { if (!mgos_i2c_read_reg_n(i2c, addr, reg, 2, d)) {
return false; return false;
} }
val = (d[0] << 8) | d[1];
mask = ((1 << bitlen) - 1); mask = ((1 << bitlen) - 1);
mask <<= bitoffset; mask <<= bitoffset;