diff options
| author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-01-03 16:32:45 +0000 |
|---|---|---|
| committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-01-03 16:32:45 +0000 |
| commit | c9b31ce7375f688d51e9c6fa1cac050648c761b5 (patch) | |
| tree | 7689f0e2ff1070f6e8310953bc4a80d51ad41c68 /os | |
| parent | 2e5931ea531f57400d99c3fa76036593258b72f2 (diff) | |
| download | ChibiOS-c9b31ce7375f688d51e9c6fa1cac050648c761b5.tar.gz ChibiOS-c9b31ce7375f688d51e9c6fa1cac050648c761b5.tar.bz2 ChibiOS-c9b31ce7375f688d51e9c6fa1cac050648c761b5.zip | |
I2C. Added safety timeouts and resets.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3717 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/platforms/STM32/i2c_lld.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/os/hal/platforms/STM32/i2c_lld.c b/os/hal/platforms/STM32/i2c_lld.c index 2641e54b9..c638d7662 100644 --- a/os/hal/platforms/STM32/i2c_lld.c +++ b/os/hal/platforms/STM32/i2c_lld.c @@ -478,6 +478,7 @@ void i2c_lld_start(I2CDriver *i2cp) { i2cp->dmamode = STM32_DMA_CR_DMEIE | STM32_DMA_CR_TEIE; if (i2cp->state == I2C_STOP) { /* If in stopped state then enables the I2C clock.*/ + i2c_lld_reset(i2cp); #if STM32_I2C_USE_I2C1 if (&I2CD1 == i2cp) { @@ -695,12 +696,18 @@ msg_t i2c_lld_master_transmit_timeout(I2CDriver *i2cp, uint8_t slave_addr, dmaStreamSetMode(i2cp->dmatx, ((i2cp->dmamode) | STM32_DMA_CR_DIR_M2P)); /* Wait until BUSY flag is reset. */ - while(i2cp->i2c->SR2 & I2C_SR2_BUSY) - ; + volatile uint32_t tmo = 1 + (STM32_SYSCLK / 1000000) * 20; + while((i2cp->i2c->SR2 & I2C_SR2_BUSY) && tmo) + tmo--; + if (tmo == 0) + return RDY_RESET; /* wait stop bit from previous transaction*/ - while(i2cp->i2c->CR1 & I2C_CR1_STOP) - ; + tmo = 1 + (STM32_SYSCLK / 1000000) * 20; + while((i2cp->i2c->CR1 & I2C_CR1_STOP) && tmo) + tmo--; + if (tmo == 0) + return RDY_RESET; i2cp->i2c->CR2 |= I2C_CR2_ITERREN | I2C_CR2_ITEVTEN; i2cp->i2c->CR1 |= I2C_CR1_START; @@ -721,6 +728,8 @@ void i2c_lld_stop(I2CDriver *i2cp) { if (i2cp->state != I2C_STOP) { /* If in ready state then disables the I2C clock.*/ + i2c_lld_reset(i2cp); + dmaStreamDisable(i2cp->dmatx); dmaStreamDisable(i2cp->dmarx); dmaStreamClearInterrupt(i2cp->dmatx); |