aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/ports
diff options
context:
space:
mode:
authorRocco Marco Guglielmi <roccomarco.guglielmi@live.com>2016-12-26 09:54:11 +0000
committerRocco Marco Guglielmi <roccomarco.guglielmi@live.com>2016-12-26 09:54:11 +0000
commita00002ab53dc2e566b74fbe1b607a37e7e95a419 (patch)
tree949074edafbc880ed78f71d8c636b76f02848380 /os/hal/ports
parent70aee6011b8f5fc985140464623019f6d57af540 (diff)
downloadChibiOS-a00002ab53dc2e566b74fbe1b607a37e7e95a419.tar.gz
ChibiOS-a00002ab53dc2e566b74fbe1b607a37e7e95a419.tar.bz2
ChibiOS-a00002ab53dc2e566b74fbe1b607a37e7e95a419.zip
Fixed Bug #803
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9987 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports')
-rw-r--r--os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c2
-rw-r--r--os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c
index e63af050f..57c041064 100644
--- a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c
+++ b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c
@@ -249,6 +249,8 @@ void dac_lld_start(DACDriver *dacp) {
channel = 1;
}
#endif
+ /* Copying user configuration into cr */
+ dacp->params->dac->CR = dacp->config->cr;
/* Enabling DAC in SW triggering mode initially, initializing data to
zero.*/
diff --git a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h
index e2fd7b363..e1f7c2dec 100644
--- a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h
+++ b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h
@@ -371,6 +371,10 @@ typedef struct {
* @brief DAC data holding register mode.
*/
dacdhrmode_t datamode;
+ /**
+ * @brief DAC control register.
+ */
+ uint32_t cr;
} DACConfig;
/**