michaelh/zephyr
1
0
Fork 0
Code Releases Activity

i2c/i2c_quark_se_ss: properly process abort during send

Browse source 
This actually makes the code to bail out when transmit is aborted
during send operation.

Change-Id: I3dda7ec4a6e15d1483738bb90d63d674a994903d
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2016-01-12 16:21:38 -08:00 • committed by Anas Nashif
commit 0ac7a5b162
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
drivers/i2c/i2c_quark_se_ss.c
View file

@ -279,6 +279,7 @@ void i2c_qse_ss_isr(void *arg)
struct device *dev = (struct device *)arg;
struct i2c_qse_ss_dev_config * const dw = dev->driver_data;
uint32_t ic_intr_stat;
int ret = DEV_OK;
/*
* Causes of an intterrupts:
@ -300,8 +301,7 @@ void i2c_qse_ss_isr(void *arg)
IC_INTR_RX_OVER | IC_INTR_RX_UNDER) &
ic_intr_stat) {
dw->state = I2C_QSE_SS_CMD_ERROR;
_i2c_qse_ss_transfer_complete(dev);
return;
goto done;
}
/* Check if the RX FIFO reached threshold */
@ -316,7 +316,7 @@ void i2c_qse_ss_isr(void *arg)
*/
if (ic_intr_stat & IC_INTR_TX_EMPTY) {
if ((dw->xfr_flags & I2C_MSG_RW_MASK) == I2C_MSG_WRITE) {
_i2c_qse_ss_data_send(dev);
ret = _i2c_qse_ss_data_send(dev);
} else {
_i2c_qse_ss_data_ask(dev);
}
@ -324,19 +324,25 @@ void i2c_qse_ss_isr(void *arg)
/* If STOP is not expected, finish processing this
* message if there is nothing left to do anymore.
* Or bail if there is any error.
*/
if ((dw->xfr_len == 0)
&& !(dw->xfr_flags & I2C_MSG_STOP)) {
_i2c_qse_ss_transfer_complete(dev);
return;
if (((dw->xfr_len == 0)
&& !(dw->xfr_flags & I2C_MSG_STOP))
|| (ret != DEV_OK)) {
goto done;
}
}
/* STOP detected */
if (ic_intr_stat & IC_INTR_STOP_DET) {
_i2c_qse_ss_reg_write(dev, REG_INTR_CLR, IC_INTR_STOP_DET);
_i2c_qse_ss_transfer_complete(dev);
goto done;
}
return;
done:
_i2c_qse_ss_transfer_complete(dev);
}
static int _i2c_qse_ss_setup(struct device *dev, uint16_t addr)