aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-02-10 17:36:37 +0000
committerbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-02-10 17:36:37 +0000
commite96e10761e38f07f884553c8ec6bcbaa06f42dd4 (patch)
tree3580584a2aaf649e9ca4c30fbf0917d390ff67b0
parent12778b0075823d399f0ac911bc9725fe8c8312c1 (diff)
downloadChibiOS-e96e10761e38f07f884553c8ec6bcbaa06f42dd4.tar.gz
ChibiOS-e96e10761e38f07f884553c8ec6bcbaa06f42dd4.tar.bz2
ChibiOS-e96e10761e38f07f884553c8ec6bcbaa06f42dd4.zip
I2C. Small bugfix.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@2731 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/platforms/STM32/i2c_lld.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/os/hal/platforms/STM32/i2c_lld.c b/os/hal/platforms/STM32/i2c_lld.c
index ea535f246..ebfe9b423 100644
--- a/os/hal/platforms/STM32/i2c_lld.c
+++ b/os/hal/platforms/STM32/i2c_lld.c
@@ -160,7 +160,7 @@ static void i2c_serve_event_interrupt(I2CDriver *i2cp) {
}
// "wait" interrupt with ADDR (ADD10 in 10-bit receiver mode) flag
- if ((i2cp->id_state == I2C_MWAIT_ADDR_ACK) && (i2cp->id_i2c->SR1 & I2C_SR1_ADDR & I2C_SR1_ADD10)){// address ACKed
+ if ((i2cp->id_state == I2C_MWAIT_ADDR_ACK) && (i2cp->id_i2c->SR1 & (I2C_SR1_ADDR | I2C_SR1_ADD10))){// address ACKed
if(i2cp->id_i2c->SR2 & I2C_SR2_TRA){// I2C is transmitting data
i2cp->id_state = I2C_MTRANSMIT; // change state
i2c_lld_txbyte(i2cp); // send first byte