diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-30 15:36:46 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-30 15:36:46 +0000 |
| commit | 73e37856afedca2090dd25820b9e484381aff6eb (patch) | |
| tree | 23c40db9c1c2047b74bd10c336a243270af01ffa /nuttx/arch/arm/src | |
| parent | ad70e05275b54d9d89a6709b3ec65dbdd3c02196 (diff) | |
| download | px4-nuttx-73e37856afedca2090dd25820b9e484381aff6eb.tar.gz px4-nuttx-73e37856afedca2090dd25820b9e484381aff6eb.tar.bz2 px4-nuttx-73e37856afedca2090dd25820b9e484381aff6eb.zip | |
Fix return values from sleep(), usleep(), and sigtimedwait(). Fix STM32 F2 I2C bug-for-bug compatibility
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4786 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_i2c.c b/nuttx/arch/arm/src/stm32/stm32_i2c.c index 4f55a5709..cbd6f6b14 100644 --- a/nuttx/arch/arm/src/stm32/stm32_i2c.c +++ b/nuttx/arch/arm/src/stm32/stm32_i2c.c @@ -1125,11 +1125,11 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) } #endif - /* Was last byte received or sent? Hmmm... the F4 seems to differ from + /* Was last byte received or sent? Hmmm... the F2 and F4 seems to differ from * the F1 in that BTF is not set after data is received (only RXNE). */ -#ifdef CONFIG_STM32_STM32F40XX +#if defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F40XX) if (priv->dcnt <= 0 && (status & (I2C_SR1_BTF|I2C_SR1_RXNE)) != 0) #else if (priv->dcnt <= 0 && (status & I2C_SR1_BTF) != 0) |