andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3311999 . 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.2.x@3030 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2011-06-05 18:22:02 +00:00
parent 7d2668ce56
commit d0d99a6b8b
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Doxyfile
View File

@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 2.2.5 PROJECT_NUMBER = 2.2.6
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

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

@ -75,21 +75,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
@ -99,7 +99,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
@ -109,7 +109,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
/** /**
@ -118,7 +118,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

4
os/kernel/include/ch.h
View File

@ -46,7 +46,7 @@
/** /**
* @brief Kernel version string. * @brief Kernel version string.
*/ */
#define CH_KERNEL_VERSION "2.2.5" #define CH_KERNEL_VERSION "2.2.6"
/** /**
* @brief Kernel version major number. * @brief Kernel version major number.
@ -61,7 +61,7 @@
/** /**
* @brief Kernel version patch number. * @brief Kernel version patch number.
*/ */
#define CH_KERNEL_PATCH 5 #define CH_KERNEL_PATCH 6
/* /*
* Common values. * Common values.

3
readme.txt
View File

@ -68,6 +68,9 @@
*** Releases *** *** Releases ***
***************************************************************************** *****************************************************************************
*** 2.2.6 ***
- FIX: Fixed wrong macro check in STM32 UART driver (bug 3311999).
*** 2.2.5 *** *** 2.2.5 ***
- FIX: Fixed STM32F107 demo build failure (bug 3294998). - FIX: Fixed STM32F107 demo build failure (bug 3294998).
- NEW: Reorganization of the Cortex-Mx ports in order to reduced code and - NEW: Reorganization of the Cortex-Mx ports in order to reduced code and