diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-17 23:02:58 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-17 23:02:58 +0000 |
| commit | 68e8befbc94818cc60bbfd4fb3f8f556e76ecba2 (patch) | |
| tree | 73190e5163186ab1028a6b26ef5b3794bc6910ba /nuttx/arch/arm/src/stm32 | |
| parent | 14f445102e0b861845ccd53a5d6777a25bc75c7e (diff) | |
| download | px4-nuttx-68e8befbc94818cc60bbfd4fb3f8f556e76ecba2.tar.gz px4-nuttx-68e8befbc94818cc60bbfd4fb3f8f556e76ecba2.tar.bz2 px4-nuttx-68e8befbc94818cc60bbfd4fb3f8f556e76ecba2.zip | |
Fix ENC28J60 Tx transmit (still a receive problem); Add HTTP 408 logic from Kate
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5158 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_i2c.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_i2c.c b/nuttx/arch/arm/src/stm32/stm32_i2c.c index bd3031b2d..2d1c365cd 100644 --- a/nuttx/arch/arm/src/stm32/stm32_i2c.c +++ b/nuttx/arch/arm/src/stm32/stm32_i2c.c @@ -116,8 +116,10 @@ /* Interrupt wait time timeout in system timer ticks */ -#define CONFIG_STM32_I2CTIMEOTICKS \ - (SEC2TICK(CONFIG_STM32_I2CTIMEOSEC) + MSEC2TICK(CONFIG_STM32_I2CTIMEOMS)) +#ifndef CONFIG_STM32_I2CTIMEOTICKS +# define CONFIG_STM32_I2CTIMEOTICKS \ + (SEC2TICK(CONFIG_STM32_I2CTIMEOSEC) + MSEC2TICK(CONFIG_STM32_I2CTIMEOMS)) +#endif #ifndef CONFIG_STM32_I2C_DYNTIMEO_STARTSTOP # define CONFIG_STM32_I2C_DYNTIMEO_STARTSTOP TICK2USEC(CONFIG_STM32_I2CTIMEOTICKS) |