diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-08-13 07:48:18 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-08-13 07:48:18 -0600 |
| commit | b10f9ac74ef20d0ff7f56f11e84e8f5d0fcecc2d (patch) | |
| tree | 676a0562d4335c1cca033269618023e54aee82ec | |
| parent | a9aab75d3c0903c8cfb75b4abfc44d2fc82ef2df (diff) | |
| download | nuttx-b10f9ac74ef20d0ff7f56f11e84e8f5d0fcecc2d.tar.gz nuttx-b10f9ac74ef20d0ff7f56f11e84e8f5d0fcecc2d.tar.bz2 nuttx-b10f9ac74ef20d0ff7f56f11e84e8f5d0fcecc2d.zip | |
STM32 F3 fixes from John Wharington
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/Kconfig | 1 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/Make.defs | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32f30xxx_i2c.c | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 71eb912a6..2471c4c7f 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -5385,4 +5385,5 @@ is disconnected, it needs to provide the FunctionAddress to the USB HCD disconnect method so that the HCD will know which port is being disconnected (2013-8-12). - + * nuttx/arch/arm/src/stm32/Kconfig, Make.defs, and /stm32f30xxx_i2c.c: + STM32 F3 I2C fixes from John Wharington (2013-8-13). diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig index b1da40c25..f0fec3b44 100644 --- a/nuttx/arch/arm/src/stm32/Kconfig +++ b/nuttx/arch/arm/src/stm32/Kconfig @@ -2225,7 +2225,6 @@ config STM32_DAC1_TIMER config STM32_DAC1_TIMER_FREQUENCY int "DAC1 timer frequency" default 0 - range 0 14 endif diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs index 3a187d877..0491c91a1 100644 --- a/nuttx/arch/arm/src/stm32/Make.defs +++ b/nuttx/arch/arm/src/stm32/Make.defs @@ -106,7 +106,7 @@ CHIP_CSRCS += stm32_userspace.c stm32_mpuinit.c endif ifeq ($(CONFIG_STM32_STM32F30XX),y) -CHIP_CSRCS += stm32f30xx_i2c.c +CHIP_CSRCS += stm32f30xxx_i2c.c else CHIP_CSRCS += stm32_i2c.c endif diff --git a/nuttx/arch/arm/src/stm32/stm32f30xxx_i2c.c b/nuttx/arch/arm/src/stm32/stm32f30xxx_i2c.c index 837dd92df..747d0cbec 100644 --- a/nuttx/arch/arm/src/stm32/stm32f30xxx_i2c.c +++ b/nuttx/arch/arm/src/stm32/stm32f30xxx_i2c.c @@ -1438,6 +1438,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) { stm32_i2c_traceevent(priv, I2CEVENT_BTFRESTART, priv->msgc); /* ??? */ + stm32_i2c_sendstart(priv); } } else if (priv->msgv) |