zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug 581. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7893 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
Giovanni Di Sirio 2015-04-14 18:31:15 +00:00
parent 6c6132abbb
commit 1dab4fb6ae
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c
View File

@ -141,16 +141,20 @@ static void i2c_lld_serve_interrupt(I2CDriver *i2cp, uint32_t isr) {
/* Starts the read operation.*/ /* Starts the read operation.*/
dp->CR2 |= I2C_CR2_RD_WRN; dp->CR2 |= I2C_CR2_RD_WRN;
dp->CR2 |= I2C_CR2_START; dp->CR2 |= I2C_CR2_START;
return;
} }
else {
/* Nothing to receive - send STOP immediately.*/ /* Nothing to receive - send STOP immediately.*/
dp->CR2 |= I2C_CR2_STOP; dp->CR2 |= I2C_CR2_STOP;
} }
}
if (isr & I2C_ISR_NACKF) { if (isr & I2C_ISR_NACKF) {
/* Starts a STOP sequence immediately on error.*/ /* Starts a STOP sequence immediately on error.*/
dp->CR2 |= I2C_CR2_STOP; dp->CR2 |= I2C_CR2_STOP;
/* Stops the associated DMA streams.*/
dmaStreamDisable(i2cp->dmatx);
dmaStreamDisable(i2cp->dmarx);
/* Error flag.*/
i2cp->errors |= I2C_ACK_FAILURE; i2cp->errors |= I2C_ACK_FAILURE;
} }
if (isr & I2C_ISR_STOPF) { if (isr & I2C_ISR_STOPF) {
@ -158,13 +162,14 @@ static void i2c_lld_serve_interrupt(I2CDriver *i2cp, uint32_t isr) {
dmaStreamDisable(i2cp->dmatx); dmaStreamDisable(i2cp->dmatx);
dmaStreamDisable(i2cp->dmarx); dmaStreamDisable(i2cp->dmarx);
/* The wake up message depends on the presence of errors.*/ /* Errors are propagated to the upper layer.*/
if (i2cp->errors) if (i2cp->errors) {
_i2c_wakeup_error_isr(i2cp); _i2c_wakeup_error_isr(i2cp);
else return;
_i2c_wakeup_isr(i2cp);
} }
} }
_i2c_wakeup_isr(i2cp);
}
/** /**
* @brief DMA RX end IRQ handler. * @brief DMA RX end IRQ handler.
@ -188,7 +193,6 @@ static void i2c_lld_serve_rx_end_irq(I2CDriver *i2cp, uint32_t flags) {
dmaStreamDisable(i2cp->dmarx); dmaStreamDisable(i2cp->dmarx);
dp->CR2 |= I2C_CR2_STOP; dp->CR2 |= I2C_CR2_STOP;
_i2c_wakeup_isr(i2cp);
} }
/** /**
@ -595,8 +599,9 @@ msg_t i2c_lld_master_receive_timeout(I2CDriver *i2cp, i2caddr_t addr,
/* If the system time went outside the allowed window then a timeout /* If the system time went outside the allowed window then a timeout
condition is returned.*/ condition is returned.*/
if (!osalOsIsTimeWithinX(osalOsGetSystemTimeX(), start, end)) if (!osalOsIsTimeWithinX(osalOsGetSystemTimeX(), start, end)) {
return MSG_TIMEOUT; return MSG_TIMEOUT;
}
osalSysUnlock(); osalSysUnlock();
} }
@ -685,8 +690,9 @@ msg_t i2c_lld_master_transmit_timeout(I2CDriver *i2cp, i2caddr_t addr,
/* If the system time went outside the allowed window then a timeout /* If the system time went outside the allowed window then a timeout
condition is returned.*/ condition is returned.*/
if (!osalOsIsTimeWithinX(osalOsGetSystemTimeX(), start, end)) if (!osalOsIsTimeWithinX(osalOsGetSystemTimeX(), start, end)) {
return MSG_TIMEOUT; return MSG_TIMEOUT;
}
osalSysUnlock(); osalSysUnlock();
} }

2
readme.txt
View File

@ -73,6 +73,8 @@
*** Releases and Change Log *** *** Releases and Change Log ***
***************************************************************************** *****************************************************************************
- HAL: Fixed STM32 I2Cv2 driver issue (bug 581).
*** 3.0.0p3 *** *** 3.0.0p3 ***
- RT: Fixed tickless mode instability in RT (bug 577). - RT: Fixed tickless mode instability in RT (bug 577).