riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11729 from MrKevinWeiss/pr/kinetis/i2c/errorcodefix

Browse Source 
cpu/kinetis/i2c: Fix false positive for expected EIO during i2c write
This commit is contained in:
Sebastian Meiling 2019-06-21 13:18:26 +02:00 committed by GitHub
commit 7fa201ef24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cpu/kinetis/periph/i2c.c
View File

@ -380,8 +380,10 @@ int i2c_read_bytes(i2c_t dev, uint16_t addr, void *data, size_t len, uint8_t fla
/* Initiate master receive mode by reading the data register once when /* Initiate master receive mode by reading the data register once when
* the C1[TX] bit is cleared and C1[MST] is set */ * the C1[TX] bit is cleared and C1[MST] is set */
volatile uint8_t dummy; volatile uint8_t dummy;
/* cppcheck-suppress unreadVariable
* (reason: needed to empty D register) */
dummy = i2c->D; dummy = i2c->D;
++dummy; (void)dummy;
/* Wait until the ISR signals back */ /* Wait until the ISR signals back */
TRACE("i2c: read C1=%02x S=%02x\n", (unsigned)i2c->C1, (unsigned)i2c->S); TRACE("i2c: read C1=%02x S=%02x\n", (unsigned)i2c->C1, (unsigned)i2c->S);
thread_flags_t tflg = thread_flags_wait_any(THREAD_FLAG_KINETIS_I2C | THREAD_FLAG_TIMEOUT); thread_flags_t tflg = thread_flags_wait_any(THREAD_FLAG_KINETIS_I2C | THREAD_FLAG_TIMEOUT);
@ -471,21 +473,21 @@ static void i2c_irq_mst_tx_handler(I2C_Type *i2c, i2c_state_t *state, uint8_t S)
assert(len != 0); /* This only happens if this periph driver is broken */ assert(len != 0); /* This only happens if this periph driver is broken */
--len; --len;
state->tx.bytes_left = len; state->tx.bytes_left = len;
if (len == 0) { if (S & I2C_S_RXAK_MASK) {
/* NACK */
/* Abort master transfer */
DEBUG("i2c: NACK\n");
bit_clear8(&i2c->C1, I2C_C1_MST_SHIFT);
state->active = 0;
state->retval = -EIO;
i2c_irq_signal_done(i2c, state->pid);
}
else if (len == 0) {
/* We are done, NACK on the last byte is OK */ /* We are done, NACK on the last byte is OK */
DEBUG("i2c: TX done\n"); DEBUG("i2c: TX done\n");
i2c_irq_signal_done(i2c, state->pid); i2c_irq_signal_done(i2c, state->pid);
} }
else { else {
if (S & I2C_S_RXAK_MASK) {
/* NACK */
/* Abort master transfer */
DEBUG("i2c: NACK\n");
bit_clear8(&i2c->C1, I2C_C1_MST_SHIFT);
state->active = 0;
state->retval = -EIO;
i2c_irq_signal_done(i2c, state->pid);
}
/* transmit the next byte */ /* transmit the next byte */
/* Increment first, datap points to the last byte transmitted */ /* Increment first, datap points to the last byte transmitted */
++state->tx.datap; ++state->tx.datap;