diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-07-30 11:41:53 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-07-30 11:41:53 -0600 |
| commit | 0ab489459de3a1b8fbc365aee424693fb6d8f7da (patch) | |
| tree | 1547ba9fef1f9dd2e3df7a9922e09d4b291063f3 | |
| parent | 3568090c977dd1807c38cbbc6807fdc6d4c39479 (diff) | |
| download | px4-nuttx-0ab489459de3a1b8fbc365aee424693fb6d8f7da.tar.gz px4-nuttx-0ab489459de3a1b8fbc365aee424693fb6d8f7da.tar.bz2 px4-nuttx-0ab489459de3a1b8fbc365aee424693fb6d8f7da.zip | |
More DAC changes from John Wharington
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_dac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_dac.c b/nuttx/arch/arm/src/stm32/stm32_dac.c index d3cef440c..c416ed9cf 100644 --- a/nuttx/arch/arm/src/stm32/stm32_dac.c +++ b/nuttx/arch/arm/src/stm32/stm32_dac.c @@ -333,10 +333,10 @@ struct stm32_chan_s #endif uint8_t intf; /* DAC zero-based interface number (0 or 1) */ uint32_t dro; /* Data output register */ + uint32_t tsel; /* CR trigger select value */ #ifdef HAVE_DMA uint16_t dmachan; /* DMA channel needed by this DAC */ DMA_HANDLE dma; /* Allocated DMA channel */ - uint32_t tsel; /* CR trigger select value */ uint32_t tbase; /* Timer base address */ uint32_t tfrequency; /* Timer frequency */ uint16_t dmabuffer[CONFIG_STM32_DAC_DMA_BUFFER_SIZE]; /* DMA transfer buffer */ @@ -741,7 +741,9 @@ static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg) /* Reset counters (generate an update) */ +#ifdef HAVE_DMA tim_modifyreg(chan, STM32_BTIM_EGR_OFFSET, 0, ATIM_EGR_UG); +#endif return OK; } |