From 301d7f271f545ade402bf99d49f8c568459a1bde Mon Sep 17 00:00:00 2001 From: Jeremy Brodt Date: Tue, 16 Aug 2016 10:28:56 -0500 Subject: [PATCH] [MAX326xx] Fixed i2c_byte_write() return value. --- hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/i2c_api.c | 6 +++--- hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/i2c_api.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/i2c_api.c b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/i2c_api.c index 46d3f0532d..670d821cd2 100644 --- a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/i2c_api.c +++ b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32600/i2c_api.c @@ -228,11 +228,11 @@ int i2c_byte_write(i2c_t *obj, int data) obj->i2c->trans |= MXC_F_I2CM_TRANS_TX_START; // Wait for the FIFO to be empty - while(!(obj->i2c->intfl & MXC_F_I2CM_INTFL_TX_FIFO_EMPTY)) {} + while (!(obj->i2c->intfl & MXC_F_I2CM_INTFL_TX_FIFO_EMPTY)); if (obj->i2c->intfl & MXC_F_I2CM_INTFL_TX_NACKED) { i2c_reset(obj); - return 1; + return 0; } if (obj->i2c->intfl & (MXC_F_I2CM_INTFL_TX_TIMEOUT | MXC_F_I2CM_INTFL_TX_LOST_ARBITR)) { @@ -240,7 +240,7 @@ int i2c_byte_write(i2c_t *obj, int data) return 2; } - return 0; + return 1; } int i2c_byte_read(i2c_t *obj, int last) diff --git a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/i2c_api.c b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/i2c_api.c index 2d0507a34f..670d821cd2 100644 --- a/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/i2c_api.c +++ b/hal/targets/hal/TARGET_Maxim/TARGET_MAX32610/i2c_api.c @@ -30,7 +30,7 @@ * ownership rights. ******************************************************************************* */ - + #include "mbed_assert.h" #include "i2c_api.h" #include "cmsis.h" @@ -228,11 +228,11 @@ int i2c_byte_write(i2c_t *obj, int data) obj->i2c->trans |= MXC_F_I2CM_TRANS_TX_START; // Wait for the FIFO to be empty - while(!(obj->i2c->intfl & MXC_F_I2CM_INTFL_TX_FIFO_EMPTY)) {} + while (!(obj->i2c->intfl & MXC_F_I2CM_INTFL_TX_FIFO_EMPTY)); if (obj->i2c->intfl & MXC_F_I2CM_INTFL_TX_NACKED) { i2c_reset(obj); - return 1; + return 0; } if (obj->i2c->intfl & (MXC_F_I2CM_INTFL_TX_TIMEOUT | MXC_F_I2CM_INTFL_TX_LOST_ARBITR)) { @@ -240,7 +240,7 @@ int i2c_byte_write(i2c_t *obj, int data) return 2; } - return 0; + return 1; } int i2c_byte_read(i2c_t *obj, int last)