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

stm32:usart: Pull stop bit definitions up as common

Browse Source
This commit is contained in:
Karl Palsson 2017-10-24 23:51:52 +00:00
parent 3dbbbe1113
commit 2bc19d499c
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/libopencm3/stm32/common/usart_common_all.h
View File

@ -85,6 +85,15 @@ specific memorymap.h header before including this header file.*/
#define USART_STOPBITS_1_5 USART_CR2_STOPBITS_1_5 /* 1.5 stop bit*/ #define USART_STOPBITS_1_5 USART_CR2_STOPBITS_1_5 /* 1.5 stop bit*/
/**@}*/ /**@}*/
/* STOP[13:12]: STOP bits */
#define USART_CR2_STOPBITS_1 (0x00 << 12) /* 1 stop bit */
#define USART_CR2_STOPBITS_0_5 (0x01 << 12) /* 0.5 stop bits */
#define USART_CR2_STOPBITS_2 (0x02 << 12) /* 2 stop bits */
#define USART_CR2_STOPBITS_1_5 (0x03 << 12) /* 1.5 stop bits */
#define USART_CR2_STOPBITS_MASK (0x03 << 12)
#define USART_CR2_STOPBITS_SHIFT 12
/* CR3_CTSE/CR3_RTSE combined values */ /* CR3_CTSE/CR3_RTSE combined values */
/****************************************************************************/ /****************************************************************************/
/** @defgroup usart_cr3_flowcontrol USART Hardware Flow Control Selection /** @defgroup usart_cr3_flowcontrol USART Hardware Flow Control Selection

8
include/libopencm3/stm32/common/usart_common_f124.h
View File

@ -195,14 +195,6 @@ specific memorymap.h header before including this header file.*/
/* LINEN: LIN mode enable */ /* LINEN: LIN mode enable */
#define USART_CR2_LINEN (1 << 14) #define USART_CR2_LINEN (1 << 14)
/* STOP[13:12]: STOP bits */
#define USART_CR2_STOPBITS_1 (0x00 << 12) /* 1 stop bit */
#define USART_CR2_STOPBITS_0_5 (0x01 << 12) /* 0.5 stop bits */
#define USART_CR2_STOPBITS_2 (0x02 << 12) /* 2 stop bits */
#define USART_CR2_STOPBITS_1_5 (0x03 << 12) /* 1.5 stop bits */
#define USART_CR2_STOPBITS_MASK (0x03 << 12)
#define USART_CR2_STOPBITS_SHIFT 12
/* CLKEN: Clock enable */ /* CLKEN: Clock enable */
#define USART_CR2_CLKEN (1 << 11) #define USART_CR2_CLKEN (1 << 11)

8
include/libopencm3/stm32/f3/usart.h
View File

@ -50,14 +50,6 @@
#define USART_CR2_ABRMOD_FRAME_0x7F (0x2 << 21) #define USART_CR2_ABRMOD_FRAME_0x7F (0x2 << 21)
#define USART_CR2_ABRMOD_FRAME_0x55 (0x3 << 21) #define USART_CR2_ABRMOD_FRAME_0x55 (0x3 << 21)
/* STOP[13:12]: STOP bits */
#define USART_CR2_STOPBITS_1 (0x00 << 12) /* 1 stop bit */
#define USART_CR2_STOPBITS_0_5 (0x01 << 12) /* 0.5 stop bits */
#define USART_CR2_STOPBITS_2 (0x02 << 12) /* 2 stop bits */
#define USART_CR2_STOPBITS_1_5 (0x03 << 12) /* 1.5 stop bits */
#define USART_CR2_STOPBITS_MASK (0x03 << 12)
#define USART_CR2_STOPBITS_SHIFT 12
/* ADD[3:0]: Address of the usart node /* ADD[3:0]: Address of the usart node
#define USART_CR2_ADD_MASK 0xF */ #define USART_CR2_ADD_MASK 0xF */