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

Fixed bug #603. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8022 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
Giovanni Di Sirio 2015-06-13 09:01:31 +00:00
parent 0c59cbe3c8
commit b536b10992
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
os/hal/ports/STM32/STM32F3xx/hal_lld.h
View File

@ -905,7 +905,7 @@
/** /**
* @brief ADC34 frequency. * @brief ADC34 frequency.
*/ */
#if (STM32_ADC43PRES == STM32_ADC34PRES_NOCLOCK) || defined(__DOXYGEN__) #if (STM32_ADC34PRES == STM32_ADC34PRES_NOCLOCK) || defined(__DOXYGEN__)
#define STM32_ADC34CLK 0 #define STM32_ADC34CLK 0
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV1 #elif STM32_ADC34PRES == STM32_ADC34PRES_DIV1
#define STM32_ADC34CLK (STM32_PLLCLKOUT / 1) #define STM32_ADC34CLK (STM32_PLLCLKOUT / 1)
@ -974,9 +974,9 @@
#define STM32_USART1CLK STM32_PCLK2 #define STM32_USART1CLK STM32_PCLK2
#elif STM32_USART1SW == STM32_USART1SW_SYSCLK #elif STM32_USART1SW == STM32_USART1SW_SYSCLK
#define STM32_USART1CLK STM32_SYSCLK #define STM32_USART1CLK STM32_SYSCLK
#elif STM32_USART1SW == STM32_USART1SW_LSECLK #elif STM32_USART1SW == STM32_USART1SW_LSE
#define STM32_USART1CLK STM32_LSECLK #define STM32_USART1CLK STM32_LSECLK
#elif STM32_USART1SW == STM32_USART1SW_HSICLK #elif STM32_USART1SW == STM32_USART1SW_HSI
#define STM32_USART1CLK STM32_HSICLK #define STM32_USART1CLK STM32_HSICLK
#else #else
#error "invalid source selected for USART1 clock" #error "invalid source selected for USART1 clock"
@ -989,9 +989,9 @@
#define STM32_USART2CLK STM32_PCLK1 #define STM32_USART2CLK STM32_PCLK1
#elif STM32_USART2SW == STM32_USART2SW_SYSCLK #elif STM32_USART2SW == STM32_USART2SW_SYSCLK
#define STM32_USART2CLK STM32_SYSCLK #define STM32_USART2CLK STM32_SYSCLK
#elif STM32_USART2SW == STM32_USART2SW_LSECLK #elif STM32_USART2SW == STM32_USART2SW_LSE
#define STM32_USART2CLK STM32_LSECLK #define STM32_USART2CLK STM32_LSECLK
#elif STM32_USART2SW == STM32_USART2SW_HSICLK #elif STM32_USART2SW == STM32_USART2SW_HSI
#define STM32_USART2CLK STM32_HSICLK #define STM32_USART2CLK STM32_HSICLK
#else #else
#error "invalid source selected for USART2 clock" #error "invalid source selected for USART2 clock"
@ -1004,9 +1004,9 @@
#define STM32_USART3CLK STM32_PCLK1 #define STM32_USART3CLK STM32_PCLK1
#elif STM32_USART3SW == STM32_USART3SW_SYSCLK #elif STM32_USART3SW == STM32_USART3SW_SYSCLK
#define STM32_USART3CLK STM32_SYSCLK #define STM32_USART3CLK STM32_SYSCLK
#elif STM32_USART3SW == STM32_USART3SW_LSECLK #elif STM32_USART3SW == STM32_USART3SW_LSE
#define STM32_USART3CLK STM32_LSECLK #define STM32_USART3CLK STM32_LSECLK
#elif STM32_USART3SW == STM32_USART3SW_HSICLK #elif STM32_USART3SW == STM32_USART3SW_HSI
#define STM32_USART3CLK STM32_HSICLK #define STM32_USART3CLK STM32_HSICLK
#else #else
#error "invalid source selected for USART3 clock" #error "invalid source selected for USART3 clock"
@ -1019,9 +1019,9 @@
#define STM32_UART4CLK STM32_PCLK1 #define STM32_UART4CLK STM32_PCLK1
#elif STM32_UART4SW == STM32_UART4SW_SYSCLK #elif STM32_UART4SW == STM32_UART4SW_SYSCLK
#define STM32_UART4CLK STM32_SYSCLK #define STM32_UART4CLK STM32_SYSCLK
#elif STM32_UART4SW == STM32_UART4SW_LSECLK #elif STM32_UART4SW == STM32_UART4SW_LSE
#define STM32_UART4CLK STM32_LSECLK #define STM32_UART4CLK STM32_LSECLK
#elif STM32_UART4SW == STM32_UART4SW_HSICLK #elif STM32_UART4SW == STM32_UART4SW_HSI
#define STM32_UART4CLK STM32_HSICLK #define STM32_UART4CLK STM32_HSICLK
#else #else
#error "invalid source selected for UART4 clock" #error "invalid source selected for UART4 clock"
@ -1034,9 +1034,9 @@
#define STM32_UART5CLK STM32_PCLK1 #define STM32_UART5CLK STM32_PCLK1
#elif STM32_UART5SW == STM32_UART5SW_SYSCLK #elif STM32_UART5SW == STM32_UART5SW_SYSCLK
#define STM32_UART5CLK STM32_SYSCLK #define STM32_UART5CLK STM32_SYSCLK
#elif STM32_UART5SW == STM32_UART5SW_LSECLK #elif STM32_UART5SW == STM32_UART5SW_LSE
#define STM32_UART5CLK STM32_LSECLK #define STM32_UART5CLK STM32_LSECLK
#elif STM32_UART5SW == STM32_UART5SW_HSICLK #elif STM32_UART5SW == STM32_UART5SW_HSI
#define STM32_UART5CLK STM32_HSICLK #define STM32_UART5CLK STM32_HSICLK
#else #else
#error "invalid source selected for UART5 clock" #error "invalid source selected for UART5 clock"

1
readme.txt
View File

@ -77,6 +77,7 @@
- NIL: Added INTC priorities check to the e200z port. - NIL: Added INTC priorities check to the e200z port.
- RT: Added INTC priorities check to the e200z port. - RT: Added INTC priorities check to the e200z port.
- HAL: Added support for extra DMA channels in STM32F072 devices. - HAL: Added support for extra DMA channels in STM32F072 devices.
- HAL: Fixed wrong macro names in STM32F3xx HAL driver (bug #603).
- HAL: Fixed errors in STM32 OTGv1 driver (bug #601). - HAL: Fixed errors in STM32 OTGv1 driver (bug #601).
- DEM: Fixed missing paths in e200z demos (bug #600). - DEM: Fixed missing paths in e200z demos (bug #600).
- HAL: Fixed error in platform_f105_f107.mk file (bug #599). - HAL: Fixed error in platform_f105_f107.mk file (bug #599).