zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug 3311999. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3029 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2011-06-05 18:19:05 +00:00
parent 03b4c7ddcb
commit 079f323649
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/ARMCM3-STM32F103/halconf.h
View File

@ -129,7 +129,7 @@
* @brief Enables the UART subsystem. * @brief Enables the UART subsystem.
*/ */
#if !defined(HAL_USE_UART) || defined(__DOXYGEN__) #if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
#define HAL_USE_UART FALSE #define HAL_USE_UART TRUE
#endif #endif
/** /**

12
os/hal/platforms/STM32/uart_lld.h
View File

@ -69,21 +69,21 @@
/** /**
* @brief USART1 interrupt priority level setting. * @brief USART1 interrupt priority level setting.
*/ */
#if !defined(STM32_UART_USART1_IRQ_PRIO) || defined(__DOXYGEN__) #if !defined(STM32_UART_USART1_IRQ_PRIORITY) || defined(__DOXYGEN__)
#define STM32_UART_USART1_IRQ_PRIORITY 12 #define STM32_UART_USART1_IRQ_PRIORITY 12
#endif #endif
/** /**
* @brief USART2 interrupt priority level setting. * @brief USART2 interrupt priority level setting.
*/ */
#if !defined(STM32_UART_USART2_IRQ_PRIO) || defined(__DOXYGEN__) #if !defined(STM32_UART_USART2_IRQ_PRIORITY) || defined(__DOXYGEN__)
#define STM32_UART_USART2_IRQ_PRIORITY 12 #define STM32_UART_USART2_IRQ_PRIORITY 12
#endif #endif
/** /**
* @brief USART3 interrupt priority level setting. * @brief USART3 interrupt priority level setting.
*/ */
#if !defined(STM32_UART_USART3_IRQ_PRIO) || defined(__DOXYGEN__) #if !defined(STM32_UART_USART3_IRQ_PRIORITY) || defined(__DOXYGEN__)
#define STM32_UART_USART3_IRQ_PRIORITY 12 #define STM32_UART_USART3_IRQ_PRIORITY 12
#endif #endif
@ -93,7 +93,7 @@
* because of the channels ordering the RX channel has always priority * because of the channels ordering the RX channel has always priority
* over the TX channel. * over the TX channel.
*/ */
#if !defined(STM32_UART_USART1_DMA_PRIO) || defined(__DOXYGEN__) #if !defined(STM32_UART_USART1_DMA_PRIORITY) || defined(__DOXYGEN__)
#define STM32_UART_USART1_DMA_PRIORITY 0 #define STM32_UART_USART1_DMA_PRIORITY 0
#endif #endif
@ -103,7 +103,7 @@
* because of the channels ordering the RX channel has always priority * because of the channels ordering the RX channel has always priority
* over the TX channel. * over the TX channel.
*/ */
#if !defined(STM32_UART_USART2_DMA_PRIO) || defined(__DOXYGEN__) #if !defined(STM32_UART_USART2_DMA_PRIORITY) || defined(__DOXYGEN__)
#define STM32_UART_USART2_DMA_PRIORITY 0 #define STM32_UART_USART2_DMA_PRIORITY 0
#endif #endif
/** /**
@ -112,7 +112,7 @@
* because of the channels ordering the RX channel has always priority * because of the channels ordering the RX channel has always priority
* over the TX channel. * over the TX channel.
*/ */
#if !defined(STM32_UART_USART3_DMA_PRIO) || defined(__DOXYGEN__) #if !defined(STM32_UART_USART3_DMA_PRIORITY) || defined(__DOXYGEN__)
#define STM32_UART_USART3_DMA_PRIORITY 0 #define STM32_UART_USART3_DMA_PRIORITY 0
#endif #endif

2
readme.txt
View File

@ -71,6 +71,8 @@
***************************************************************************** *****************************************************************************
*** 2.3.4 *** *** 2.3.4 ***
- FIX: Fixed wrong macro check in STM32 UART driver (bug 3311999)(backported
to 2.2.6).
- FIX: Fixed wrong macro definition in ARMv6-M architecture files (bug - FIX: Fixed wrong macro definition in ARMv6-M architecture files (bug
3310084). 3310084).
- NEW: FatFs demo for the STM32F103ZG using the SDC driver (untested). - NEW: FatFs demo for the STM32F103ZG using the SDC driver (untested).