From 1427d5f07553802fc43cd64416aff0a9d485d8b4 Mon Sep 17 00:00:00 2001 From: asterix Date: Mon, 28 Jun 2010 14:51:19 +0000 Subject: [PATCH] Use different name for clear masks. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3954 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/cortex-m3/io/stm32_uart.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bertos/cpu/cortex-m3/io/stm32_uart.h b/bertos/cpu/cortex-m3/io/stm32_uart.h index c7e8abf0..e35fc447 100644 --- a/bertos/cpu/cortex-m3/io/stm32_uart.h +++ b/bertos/cpu/cortex-m3/io/stm32_uart.h @@ -138,7 +138,7 @@ #define CR1_RWU_SET ((uint16_t)0x0002) /* USART mute mode Enable MASK */ #define CR1_RWU_RESET ((uint16_t)0xFFFD) /* USART mute mode Enable MASK */ #define CR1_SBK_SET ((uint16_t)0x0001) /* USART Break Character send MASK */ -#define CR1_CLEAR_MASK ((uint16_t)0xE9F3) /* USART CR1 MASK */ +#define CR1_USART_CLEAR_MASK ((uint16_t)0xE9F3) /* USART CR1 MASK */ #define CR1_UE 13 #define CR1_M 12 #define CR1_WAKE 11 @@ -157,7 +157,7 @@ #define CR2_MASK ((uint16_t)0xFFF0) /* USART address MASK */ #define CR2_LINE_SET ((uint16_t)0x4000) /* USART LIN Enable MASK */ #define CR2_LINE_RESET ((uint16_t)0xBFFF) /* USART LIN Disable MASK */ -#define CR2_CLEAR_MASK ((uint16_t)0xC0FF) /* USART CR2 MASK */ +#define CR2_USART_CLEAR_MASK ((uint16_t)0xC0FF) /* USART CR2 MASK */ #define CR3_SCEN_SET ((uint16_t)0x0020) /* USART SC Enable MASK */ #define CR3_SCEN_RESET ((uint16_t)0xFFDF) /* USART SC Disable MASK */ -- 2.25.1