From 4e4dbda41ee4239a2d406076864ada05ad35c203 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 1 Feb 2016 14:14:48 -0600 Subject: [PATCH] I2C: Add frequency to i2c_msg_s structure --- system/i2c/i2c_dev.c | 16 +++++++++------- system/i2c/i2c_get.c | 14 ++++++++------ system/i2c/i2c_set.c | 14 ++++++++------ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/system/i2c/i2c_dev.c b/system/i2c/i2c_dev.c index 23ab89a25..399df580d 100644 --- a/system/i2c/i2c_dev.c +++ b/system/i2c/i2c_dev.c @@ -180,15 +180,17 @@ int i2ccmd_dev(FAR struct i2ctool_s *i2ctool, int argc, char **argv) /* Set up data structures */ - regaddr = 0; + regaddr = 0; - msg[0].addr = addr; - msg[0].flags = 0; - msg[0].buffer = ®addr; - msg[0].length = 1; + msg[0].frequency = i2ctool->freq; + msg[0].addr = addr; + msg[0].flags = 0; + msg[0].buffer = ®addr; + msg[0].length = 1; - msg[1].addr = addr; - msg[1].flags = I2C_M_READ; + msg[1].frequency = i2ctool->freq; + msg[1].addr = addr; + msg[1].flags = I2C_M_READ; if (i2ctool->width == 8) { msg[1].buffer = &u.data8; diff --git a/system/i2c/i2c_get.c b/system/i2c/i2c_get.c index aa6a5b08b..ee0e39e17 100644 --- a/system/i2c/i2c_get.c +++ b/system/i2c/i2c_get.c @@ -210,13 +210,15 @@ int i2ctool_get(FAR struct i2ctool_s *i2ctool, FAR struct i2c_master_s *dev, /* Set up data structures */ - msg[0].addr = i2ctool->addr; - msg[0].flags = 0; - msg[0].buffer = ®addr; - msg[0].length = 1; + msg[0].frequency = i2ctool->freq; + msg[0].addr = i2ctool->addr; + msg[0].flags = 0; + msg[0].buffer = ®addr; + msg[0].length = 1; - msg[1].addr = i2ctool->addr; - msg[1].flags = I2C_M_READ; + msg[0].frequency = i2ctool->freq; + msg[1].addr = i2ctool->addr; + msg[1].flags = I2C_M_READ; if (i2ctool->width == 8) { diff --git a/system/i2c/i2c_set.c b/system/i2c/i2c_set.c index e555ab0ab..756ed3f5c 100644 --- a/system/i2c/i2c_set.c +++ b/system/i2c/i2c_set.c @@ -237,13 +237,15 @@ int i2ctool_set(FAR struct i2ctool_s *i2ctool, FAR struct i2c_master_s *dev, /* Set up data structures */ - msg[0].addr = i2ctool->addr; - msg[0].flags = 0; - msg[0].buffer = ®addr; - msg[0].length = 1; + msg[0].frequency = i2ctool->freq; + msg[0].addr = i2ctool->addr; + msg[0].flags = 0; + msg[0].buffer = ®addr; + msg[0].length = 1; - msg[1].addr = i2ctool->addr; - msg[1].flags = 0; + msg[1].frequency = i2ctool->freq; + msg[1].addr = i2ctool->addr; + msg[1].flags = 0; if (i2ctool->width == 8) { u.data8 = (uint8_t)value;