diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-05-13 09:25:53 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-05-13 09:25:53 +0000 |
| commit | e4b3c5cdde11f8624b19a14835c0eabde46edb6d (patch) | |
| tree | 995aa729bd43c99b8f71d5ac26c56c64e44b39a2 /os/hal | |
| parent | e294750f0643ad284b9ccb52626dcbfa67b54e92 (diff) | |
| download | ChibiOS-e4b3c5cdde11f8624b19a14835c0eabde46edb6d.tar.gz ChibiOS-e4b3c5cdde11f8624b19a14835c0eabde46edb6d.tar.bz2 ChibiOS-e4b3c5cdde11f8624b19a14835c0eabde46edb6d.zip | |
DAC driver improvement.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7975 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/include/dac.h | 5 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/DACv1/dac_lld.c | 8 | ||||
| -rw-r--r-- | os/hal/src/dac.c | 20 |
3 files changed, 7 insertions, 26 deletions
diff --git a/os/hal/include/dac.h b/os/hal/include/dac.h index 8a23ade4f..5ad15c2f9 100644 --- a/os/hal/include/dac.h +++ b/os/hal/include/dac.h @@ -239,10 +239,7 @@ extern "C" { void dacObjectInit(DACDriver *dacp);
void dacStart(DACDriver *dacp, const DACConfig *config);
void dacStop(DACDriver *dacp);
- void dacPutChannel(DACDriver *dacp,
- dacchannel_t channel,
- dacsample_t sample);
- void dacPutChannelI(DACDriver *dacp,
+ void dacPutChannelX(DACDriver *dacp,
dacchannel_t channel,
dacsample_t sample);
void dacStartConversion(DACDriver *dacp, const DACConversionGroup *grpp,
diff --git a/os/hal/ports/STM32/LLD/DACv1/dac_lld.c b/os/hal/ports/STM32/LLD/DACv1/dac_lld.c index 9ba9ef31c..15e11b59f 100644 --- a/os/hal/ports/STM32/LLD/DACv1/dac_lld.c +++ b/os/hal/ports/STM32/LLD/DACv1/dac_lld.c @@ -437,14 +437,14 @@ void dac_lld_start_conversion(DACDriver *dacp) { #endif
default:
chDbgAssert(false, "unexpected DAC mode");
- break;
+ return;
}
dmaStreamSetMemory0(dacp->params->dma, dacp->samples);
dmaStreamSetTransactionSize(dacp->params->dma, n);
- dmaStreamSetMode(dacp->params->dma, dmamode |
- STM32_DMA_CR_DMEIE | STM32_DMA_CR_TEIE |
- STM32_DMA_CR_HTIE | STM32_DMA_CR_TCIE);
+ dmaStreamSetMode(dacp->params->dma, dmamode |
+ STM32_DMA_CR_DMEIE | STM32_DMA_CR_TEIE |
+ STM32_DMA_CR_HTIE | STM32_DMA_CR_TCIE);
dmaStreamEnable(dacp->params->dma);
/* DAC configuration.*/
diff --git a/os/hal/src/dac.c b/os/hal/src/dac.c index 024547b78..98b2ad03c 100644 --- a/os/hal/src/dac.c +++ b/os/hal/src/dac.c @@ -137,25 +137,9 @@ void dacStop(DACDriver *dacp) { * @param[in] channel DAC channel number
* @param[in] sample value to be output
*
- * @api
- */
-void dacPutChannel(DACDriver *dacp, dacchannel_t channel, dacsample_t sample) {
-
- osalSysLock();
- dacPutChannelI(dacp, channel, sample);
- osalSysUnlock();
-}
-
-/**
- * @brief Outputs a value directly on a DAC channel.
- *
- * @param[in] dacp pointer to the @p DACDriver object
- * @param[in] channel DAC channel number
- * @param[in] sample value to be output
- *
- * @iclass
+ * @xclass
*/
-void dacPutChannelI(DACDriver *dacp, dacchannel_t channel, dacsample_t sample) {
+void dacPutChannelX(DACDriver *dacp, dacchannel_t channel, dacsample_t sample) {
osalDbgCheckClassI();
osalDbgCheck(channel < DAC_MAX_CHANNELS);
|