summaryrefslogtreecommitdiff
path: root/extmod/machine_i2c.c
diff options
context:
space:
mode:
Diffstat (limited to 'extmod/machine_i2c.c')
-rw-r--r--extmod/machine_i2c.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 7d0628a2d..452f07a2e 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -515,19 +515,20 @@ STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t a
size_t memaddr_len = fill_memaddr_buf(&memaddr_buf[0], memaddr, addrsize);
#if MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1
-
- // Create partial write and read buffers
- mp_machine_i2c_buf_t bufs[2] = {
- {.len = memaddr_len, .buf = memaddr_buf},
- {.len = len, .buf = buf},
- };
-
- // Do write+read I2C transfer
+ // The I2C transfer function may support the MP_MACHINE_I2C_FLAG_WRITE1 option
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
- return i2c_p->transfer(self, addr, 2, bufs,
- MP_MACHINE_I2C_FLAG_WRITE1 | MP_MACHINE_I2C_FLAG_READ | MP_MACHINE_I2C_FLAG_STOP);
+ if (i2c_p->transfer_supports_write1) {
+ // Create partial write and read buffers
+ mp_machine_i2c_buf_t bufs[2] = {
+ {.len = memaddr_len, .buf = memaddr_buf},
+ {.len = len, .buf = buf},
+ };
- #else
+ // Do write+read I2C transfer
+ return i2c_p->transfer(self, addr, 2, bufs,
+ MP_MACHINE_I2C_FLAG_WRITE1 | MP_MACHINE_I2C_FLAG_READ | MP_MACHINE_I2C_FLAG_STOP);
+ }
+ #endif
int ret = mp_machine_i2c_writeto(self, addr, memaddr_buf, memaddr_len, false);
if (ret != memaddr_len) {
@@ -536,8 +537,6 @@ STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t a
return ret;
}
return mp_machine_i2c_readfrom(self, addr, buf, len, true);
-
- #endif
}
STATIC int write_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t addrsize, const uint8_t *buf, size_t len) {