From a1e5bf6bf3ebcd91041049680823854ffd83e76d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 3 Aug 2018 08:47:02 -0600 Subject: [PATCH] apps/system/i2c: Adapt to rename I2C_M_RESTART->i2C_M_START. I2C_M_NOSTOP should be in flags of first message in every write-read and write-write mesage sequence. --- system/i2c/i2c_dev.c | 2 +- system/i2c/i2c_get.c | 2 +- system/i2c/i2c_set.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/system/i2c/i2c_dev.c b/system/i2c/i2c_dev.c index b504699b9..38c4afd72 100644 --- a/system/i2c/i2c_dev.c +++ b/system/i2c/i2c_dev.c @@ -156,7 +156,7 @@ int i2ccmd_dev(FAR struct i2ctool_s *i2ctool, int argc, char **argv) msg[0].frequency = i2ctool->freq; msg[0].addr = addr; - msg[0].flags = 0; + msg[0].flags = I2C_M_NOSTOP; msg[0].buffer = ®addr; msg[0].length = 1; diff --git a/system/i2c/i2c_get.c b/system/i2c/i2c_get.c index 56258c88f..e04c40126 100644 --- a/system/i2c/i2c_get.c +++ b/system/i2c/i2c_get.c @@ -184,7 +184,7 @@ int i2ctool_get(FAR struct i2ctool_s *i2ctool, int fd, uint8_t regaddr, msg[0].frequency = i2ctool->freq; msg[0].addr = i2ctool->addr; - msg[0].flags = 0; + msg[0].flags = I2C_M_NOSTOP; msg[0].buffer = ®addr; msg[0].length = 1; diff --git a/system/i2c/i2c_set.c b/system/i2c/i2c_set.c index 348bec90b..ea1f64466 100644 --- a/system/i2c/i2c_set.c +++ b/system/i2c/i2c_set.c @@ -211,13 +211,14 @@ int i2ctool_set(FAR struct i2ctool_s *i2ctool, int fd, uint8_t regaddr, msg[0].frequency = i2ctool->freq; msg[0].addr = i2ctool->addr; - msg[0].flags = 0; + msg[0].flags = I2C_M_NOSTOP; msg[0].buffer = ®addr; msg[0].length = 1; msg[1].frequency = i2ctool->freq; msg[1].addr = i2ctool->addr; msg[1].flags = 0; + if (i2ctool->width == 8) { u.data8 = (uint8_t)value; @@ -241,7 +242,7 @@ int i2ctool_set(FAR struct i2ctool_s *i2ctool, int fd, uint8_t regaddr, } else { - msg[1].flags |= I2C_M_NORESTART; + msg[1].flags |= I2C_M_NOSTART; ret = i2cdev_transfer(fd, msg, 2); }