diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-12-29 12:38:12 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-12-29 12:38:12 +0000 |
| commit | e3aa427548a678db8b359e24aade7227792b43ad (patch) | |
| tree | 983736bae395ac0c4654972c39c270e1bee508df /os/hal/ports/STM32/STM32H7xx | |
| parent | ef8caca39a1963d75376b4ae004b0426cc801792 (diff) | |
| download | ChibiOS-e3aa427548a678db8b359e24aade7227792b43ad.tar.gz ChibiOS-e3aa427548a678db8b359e24aade7227792b43ad.tar.bz2 ChibiOS-e3aa427548a678db8b359e24aade7227792b43ad.zip | |
DAC rework for new DMA API , DAC support for STM32H7xx.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12490 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/hal/ports/STM32/STM32H7xx')
| -rw-r--r-- | os/hal/ports/STM32/STM32H7xx/platform.mk | 1 | ||||
| -rw-r--r-- | os/hal/ports/STM32/STM32H7xx/stm32_dmamux.h | 4 | ||||
| -rw-r--r-- | os/hal/ports/STM32/STM32H7xx/stm32_rcc.h | 6 | ||||
| -rw-r--r-- | os/hal/ports/STM32/STM32H7xx/stm32_registry.h | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/os/hal/ports/STM32/STM32H7xx/platform.mk b/os/hal/ports/STM32/STM32H7xx/platform.mk index 890b8999a..d5b700105 100644 --- a/os/hal/ports/STM32/STM32H7xx/platform.mk +++ b/os/hal/ports/STM32/STM32H7xx/platform.mk @@ -24,6 +24,7 @@ endif include $(CHIBIOS)/os/hal/ports/STM32/LLD/ADCv4/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/BDMAv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/CRYPv1/driver.mk
+include $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/DMAv2/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv3/driver.mk
diff --git a/os/hal/ports/STM32/STM32H7xx/stm32_dmamux.h b/os/hal/ports/STM32/STM32H7xx/stm32_dmamux.h index 642aec210..2f173cbc9 100644 --- a/os/hal/ports/STM32/STM32H7xx/stm32_dmamux.h +++ b/os/hal/ports/STM32/STM32H7xx/stm32_dmamux.h @@ -99,8 +99,8 @@ #define STM32_DMAMUX1_UART4_TX 64
#define STM32_DMAMUX1_UART5_RX 65
#define STM32_DMAMUX1_UART5_TX 66
-#define STM32_DMAMUX1_DAC1 67
-#define STM32_DMAMUX1_DAC2 68
+#define STM32_DMAMUX1_DAC1_CH1 67 /* Renamed to L4 name.*/
+#define STM32_DMAMUX1_DAC1_CH2 68 /* Renamed to L4 name.*/
#define STM32_DMAMUX1_TIM6_UP 69
#define STM32_DMAMUX1_TIM7_UP 70
#define STM32_DMAMUX1_USART6_RX 71
diff --git a/os/hal/ports/STM32/STM32H7xx/stm32_rcc.h b/os/hal/ports/STM32/STM32H7xx/stm32_rcc.h index c5d059353..d5a1c6de7 100644 --- a/os/hal/ports/STM32/STM32H7xx/stm32_rcc.h +++ b/os/hal/ports/STM32/STM32H7xx/stm32_rcc.h @@ -500,21 +500,21 @@ *
* @api
*/
-#define rccEnableDAC1(lp) rccEnableAPB1L(RCC_APB1LENR_DACEN, lp)
+#define rccEnableDAC1(lp) rccEnableAPB1L(RCC_APB1LENR_DAC12EN, lp)
/**
* @brief Disables the DAC1 peripheral clock.
*
* @api
*/
-#define rccDisableDAC1() rccDisableAPB1L(RCC_APB1LENR_DACEN)
+#define rccDisableDAC1() rccDisableAPB1L(RCC_APB1LENR_DAC12EN)
/**
* @brief Resets the DAC1 peripheral.
*
* @api
*/
-#define rccResetDAC1() rccResetAPB1L(RCC_APB1LRSTR_DACRST)
+#define rccResetDAC1() rccResetAPB1L(RCC_APB1LRSTR_DAC12RST)
/** @} */
/**
diff --git a/os/hal/ports/STM32/STM32H7xx/stm32_registry.h b/os/hal/ports/STM32/STM32H7xx/stm32_registry.h index 96ed7b079..dcaea0487 100644 --- a/os/hal/ports/STM32/STM32H7xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32H7xx/stm32_registry.h @@ -63,8 +63,8 @@ #define STM32_HAS_CAN3 FALSE
/* DAC attributes.*/
-#define STM32_HAS_DAC1_CH1 FALSE
-#define STM32_HAS_DAC1_CH2 FALSE
+#define STM32_HAS_DAC1_CH1 TRUE
+#define STM32_HAS_DAC1_CH2 TRUE
#define STM32_HAS_DAC2_CH1 FALSE
#define STM32_HAS_DAC2_CH2 FALSE
|