aboutsummaryrefslogtreecommitdiff
path: root/include/libopencm3/stm32/f4
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2011-11-14 04:05:35 -0800
committerPiotr Esden-Tempski2011-11-16 18:17:56 -0800
commitc6f30043fd61861d5d2aef6cbc8c8ca1cc93c2fe (patch)
tree2c071ad00eca45c61b2e490414e9150002215cef /include/libopencm3/stm32/f4
parent608ca2a81196ac175a8f850d21998c56d99e976a (diff)
Added UART4 and UART5 gpio definitions for stm32f1. Also corrected the naming everywhere. Both peripherals are UARTS not U_S_ARTS.
Diffstat (limited to 'include/libopencm3/stm32/f4')
-rw-r--r--include/libopencm3/stm32/f4/nvic_f4.h4
-rw-r--r--include/libopencm3/stm32/f4/rcc.h12
2 files changed, 8 insertions, 8 deletions
diff --git a/include/libopencm3/stm32/f4/nvic_f4.h b/include/libopencm3/stm32/f4/nvic_f4.h
index 21274b0..d3ae375 100644
--- a/include/libopencm3/stm32/f4/nvic_f4.h
+++ b/include/libopencm3/stm32/f4/nvic_f4.h
@@ -79,8 +79,8 @@
#define NVIC_SDIO_IRQ 49
#define NVIC_TIM5_IRQ 50
#define NVIC_SPI3_IRQ 51
-#define NVIC_USART4_IRQ 52
-#define NVIC_USART5_IRQ 53
+#define NVIC_UART4_IRQ 52
+#define NVIC_UART5_IRQ 53
#define NVIC_TIM6_DAC_IRQ 54
#define NVIC_TIM7_IRQ 55
#define NVIC_DMA2_STREAM0_IRQ 56
diff --git a/include/libopencm3/stm32/f4/rcc.h b/include/libopencm3/stm32/f4/rcc.h
index a01aaad..50bafad 100644
--- a/include/libopencm3/stm32/f4/rcc.h
+++ b/include/libopencm3/stm32/f4/rcc.h
@@ -224,8 +224,8 @@
#define RCC_APB1RSTR_I2C3RST (1 << 23)
#define RCC_APB1RSTR_I2C2RST (1 << 22)
#define RCC_APB1RSTR_I2C1RST (1 << 21)
-#define RCC_APB1RSTR_USART5RST (1 << 20)
-#define RCC_APB1RSTR_USART4RST (1 << 19)
+#define RCC_APB1RSTR_UART5RST (1 << 20)
+#define RCC_APB1RSTR_UART4RST (1 << 19)
#define RCC_APB1RSTR_USART3RST (1 << 18)
#define RCC_APB1RSTR_USART2RST (1 << 17)
#define RCC_APB1RSTR_SPI3RST (1 << 15)
@@ -298,8 +298,8 @@
#define RCC_APB1ENR_I2C3EN (1 << 23)
#define RCC_APB1ENR_I2C2EN (1 << 22)
#define RCC_APB1ENR_I2C1EN (1 << 21)
-#define RCC_APB1ENR_USART5EN (1 << 20)
-#define RCC_APB1ENR_USART4EN (1 << 19)
+#define RCC_APB1ENR_UART5EN (1 << 20)
+#define RCC_APB1ENR_UART4EN (1 << 19)
#define RCC_APB1ENR_USART3EN (1 << 18)
#define RCC_APB1ENR_USART2EN (1 << 17)
#define RCC_APB1ENR_SPI3EN (1 << 15)
@@ -377,8 +377,8 @@
#define RCC_APB1LPENR_I2C3LPEN (1 << 23)
#define RCC_APB1LPENR_I2C2LPEN (1 << 22)
#define RCC_APB1LPENR_I2C1LPEN (1 << 21)
-#define RCC_APB1LPENR_USART5LPEN (1 << 20)
-#define RCC_APB1LPENR_USART4LPEN (1 << 19)
+#define RCC_APB1LPENR_UART5LPEN (1 << 20)
+#define RCC_APB1LPENR_UART4LPEN (1 << 19)
#define RCC_APB1LPENR_USART3LPEN (1 << 18)
#define RCC_APB1LPENR_USART2LPEN (1 << 17)
#define RCC_APB1LPENR_SPI3LPEN (1 << 15)