jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

stm32: dac: move DAC_SR to common.

Browse Source 
It's available on f0, f2, f3, f4, f7, l0, l1 and l4.
Just note that it's not available on f1.
This commit is contained in:
Karl Palsson 2019-05-09 11:49:25 +00:00
parent 486446e1db
commit ca43a73ea3
3 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/libopencm3/stm32/common/dac_common_all.h
View File

@ -77,6 +77,10 @@ specific memorymap.h header before including this header file.*/
/* DAC channel2 data output register (DAC_DOR2) */ /* DAC channel2 data output register (DAC_DOR2) */
#define DAC_DOR2 MMIO32(DAC_BASE + 0x30) #define DAC_DOR2 MMIO32(DAC_BASE + 0x30)
/** DAC status register.
* @note not available on F1
*/
#define DAC_SR MMIO32(DAC_BASE + 0x34)
/* --- DAC_CR values ------------------------------------------------------- */ /* --- DAC_CR values ------------------------------------------------------- */
@ -377,6 +381,15 @@ Unmask bits [(n-1)..0] of LFSR/Triangle Amplitude equal to (2**(n+1)-1
#define DAC_DOR2_DACC2DOR_LSB (1 << 0) #define DAC_DOR2_DACC2DOR_LSB (1 << 0)
#define DAC_DOR2_DACC2DOR_MSK (0x0FFF << 0) #define DAC_DOR2_DACC2DOR_MSK (0x0FFF << 0)
/** @defgroup dac_sr_values DAC_SR Values
@{*/
/** DAC channel 1 DMA underrun flag */
#define DAC_SR_DMAUDR1 (1 << 13)
/** DAC channel 2 DMA underrun flag */
#define DAC_SR_DMAUDR2 (1 << 29)
/*@}*/
/** DAC channel identifier */ /** DAC channel identifier */
typedef enum { typedef enum {
CHANNEL_1, CHANNEL_2, CHANNEL_D CHANNEL_1, CHANNEL_2, CHANNEL_D

17
include/libopencm3/stm32/f4/dac.h
View File

@ -33,21 +33,4 @@ LGPL License Terms @ref lgpl_license
#include <libopencm3/stm32/common/dac_common_all.h> #include <libopencm3/stm32/common/dac_common_all.h>
/** DAC status register (DAC_SR).
* not available on STM32F4x1/STM32F4x2 */
#define DAC_SR MMIO32(DAC_BASE + 0x34)
/* --- DAC_SR values ------------------------------------------------------- */
/** DMAUDR2: DAC channel 1 DMA underrun flag */
#define DAC_SR_DMAUDR1 (1 << 13)
/** DMAUDR2: DAC channel 2 DMA underrun flag.
* not available on STM32F4x1/STM32F4x2 and STM32F410*/
#define DAC_SR_DMAUDR2 (1 << 29)
#endif #endif

14
include/libopencm3/stm32/f7/dac.h
View File

@ -33,18 +33,4 @@ LGPL License Terms @ref lgpl_license
#include <libopencm3/stm32/common/dac_common_all.h> #include <libopencm3/stm32/common/dac_common_all.h>
/** DAC status register (DAC_SR) */
#define DAC_SR MMIO32(DAC_BASE + 0x34)
/* --- DAC_SR values ------------------------------------------------------- */
/** DMAUDR1: DAC channel 1 DMA underrun flag */
#define DAC_SR_DMAUDR1 (1 << 13)
/** DMAUDR2: DAC channel 2 DMA underrun flag */
#define DAC_SR_DMAUDR2 (1 << 29)
#endif #endif