aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/ports/STM32/LLD/USARTv2
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-10-22 10:00:10 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-10-22 10:00:10 +0000
commitc499423d9c87fe2ef3c5b9a0cd11aeb871a9701e (patch)
tree2a311a668f5a0949effc3146322d3d2961707c44 /os/hal/ports/STM32/LLD/USARTv2
parenta8c5d48bcfbc6f3cd7284638d30af7c8f4400341 (diff)
downloadChibiOS-c499423d9c87fe2ef3c5b9a0cd11aeb871a9701e.tar.gz
ChibiOS-c499423d9c87fe2ef3c5b9a0cd11aeb871a9701e.tar.bz2
ChibiOS-c499423d9c87fe2ef3c5b9a0cd11aeb871a9701e.zip
Experimental support for STM32F09x devices, not tested yet.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8375 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/STM32/LLD/USARTv2')
-rw-r--r--os/hal/ports/STM32/LLD/USARTv2/serial_lld.c22
-rw-r--r--os/hal/ports/STM32/LLD/USARTv2/serial_lld.h6
2 files changed, 15 insertions, 13 deletions
diff --git a/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c b/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c
index 1d030621e..683df0481 100644
--- a/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c
+++ b/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c
@@ -334,15 +334,16 @@ OSAL_IRQ_HANDLER(STM32_USART2_HANDLER) {
}
#endif
-#if defined(STM32_USART3456_HANDLER)
-#if STM32_SERIAL_USE_USART3 || STM32_SERIAL_USE_UART4 || \
- STM32_SERIAL_USE_UART5 || STM32_SERIAL_USE_USART6 || defined(__DOXYGEN__)
+#if defined(STM32_USART3_8_HANDLER)
+#if STM32_SERIAL_USE_USART3 || STM32_SERIAL_USE_UART4 || \
+ STM32_SERIAL_USE_UART5 || STM32_SERIAL_USE_USART6 || \
+ STM32_SERIAL_USE_UART7 || STM32_SERIAL_USE_UART8 || defined(__DOXYGEN__)
/**
* @brief USART2 interrupt handler.
*
* @isr
*/
-OSAL_IRQ_HANDLER(STM32_USART3456_HANDLER) {
+OSAL_IRQ_HANDLER(STM32_USART3_8_HANDLER) {
OSAL_IRQ_PROLOGUE();
@@ -363,7 +364,7 @@ OSAL_IRQ_HANDLER(STM32_USART3456_HANDLER) {
}
#endif
-#else /* !defined(STM32_USART3456_HANDLER) */
+#else /* !defined(STM32_USART3_8_HANDLER) */
#if STM32_SERIAL_USE_USART3 || defined(__DOXYGEN__)
#if !defined(STM32_USART3_HANDLER)
@@ -441,7 +442,7 @@ OSAL_IRQ_HANDLER(STM32_USART6_HANDLER) {
}
#endif
-#endif /* !defined(STM32_USART3456_HANDLER) */
+#endif /* !defined(STM32_USART3_8_HANDLER) */
#if STM32_SERIAL_USE_UART7 || defined(__DOXYGEN__)
#if !defined(STM32_UART7_HANDLER)
@@ -564,10 +565,11 @@ void sd_lld_init(void) {
#endif
#endif
-#if STM32_SERIAL_USE_USART3 || STM32_SERIAL_USE_UART4 || \
- STM32_SERIAL_USE_UART5 || STM32_SERIAL_USE_USART6 || defined(__DOXYGEN__)
-#if defined(STM32_USART3456_HANDLER)
- nvicEnableVector(STM32_USART3456_NUMBER, STM32_SERIAL_USART3456_PRIORITY);
+#if STM32_SERIAL_USE_USART3 || STM32_SERIAL_USE_UART4 || \
+ STM32_SERIAL_USE_UART5 || STM32_SERIAL_USE_USART6 || \
+ STM32_SERIAL_USE_UART7 || STM32_SERIAL_USE_UART8 || defined(__DOXYGEN__)
+#if defined(STM32_USART3_8_HANDLER)
+ nvicEnableVector(STM32_USART3_8_NUMBER, STM32_SERIAL_USART3_8_PRIORITY);
#endif
#endif
}
diff --git a/os/hal/ports/STM32/LLD/USARTv2/serial_lld.h b/os/hal/ports/STM32/LLD/USARTv2/serial_lld.h
index 5989e560b..ba3d9ed94 100644
--- a/os/hal/ports/STM32/LLD/USARTv2/serial_lld.h
+++ b/os/hal/ports/STM32/LLD/USARTv2/serial_lld.h
@@ -133,11 +133,11 @@
#endif
/**
- * @brief USART3, 4, 5 and 6 interrupt priority level setting.
+ * @brief USART3..8 interrupt priority level setting.
* @note Only valid on those devices with a shared IRQ.
*/
-#if !defined(STM32_SERIAL_USART3456_PRIORITY) || defined(__DOXYGEN__)
-#define STM32_SERIAL_USART3456_PRIORITY 12
+#if !defined(STM32_SERIAL_USART3_8_PRIORITY) || defined(__DOXYGEN__)
+#define STM32_SERIAL_USART3_8_PRIORITY 12
#endif
/**