From f116535a69d7b1c6a5af7a2392eb7a4fb2bb7e40 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 10 Feb 2013 11:16:47 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5148 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/STM32F0xx/hal_lld.h | 2 + os/hal/platforms/STM32F1xx/hal_lld_f100.h | 2 + os/hal/platforms/STM32F1xx/hal_lld_f103.h | 8 +++ .../platforms/STM32F1xx/hal_lld_f105_f107.h | 2 + os/hal/platforms/STM32F30x/hal_lld.h | 6 +- os/hal/platforms/STM32F37x/hal_lld.h | 58 ++----------------- os/hal/platforms/STM32F4xx/hal_lld.h | 2 + os/hal/platforms/STM32L1xx/hal_lld.h | 2 + 8 files changed, 26 insertions(+), 56 deletions(-) diff --git a/os/hal/platforms/STM32F0xx/hal_lld.h b/os/hal/platforms/STM32F0xx/hal_lld.h index 2dbaeb626..40cc595f3 100644 --- a/os/hal/platforms/STM32F0xx/hal_lld.h +++ b/os/hal/platforms/STM32F0xx/hal_lld.h @@ -332,6 +332,8 @@ #define STM32_HAS_TIM15 TRUE #define STM32_HAS_TIM16 TRUE #define STM32_HAS_TIM17 TRUE +#define STM32_HAS_TIM18 FALSE +#define STM32_HAS_TIM19 FALSE /* USART attributes.*/ #define STM32_HAS_USART1 TRUE diff --git a/os/hal/platforms/STM32F1xx/hal_lld_f100.h b/os/hal/platforms/STM32F1xx/hal_lld_f100.h index 83a39fc56..7b5a88983 100644 --- a/os/hal/platforms/STM32F1xx/hal_lld_f100.h +++ b/os/hal/platforms/STM32F1xx/hal_lld_f100.h @@ -285,6 +285,8 @@ #define STM32_HAS_TIM15 TRUE #define STM32_HAS_TIM16 TRUE #define STM32_HAS_TIM17 TRUE +#define STM32_HAS_TIM18 FALSE +#define STM32_HAS_TIM19 FALSE /* USART attributes.*/ #define STM32_HAS_USART1 TRUE diff --git a/os/hal/platforms/STM32F1xx/hal_lld_f103.h b/os/hal/platforms/STM32F1xx/hal_lld_f103.h index 821e3e2e5..3148c80ee 100644 --- a/os/hal/platforms/STM32F1xx/hal_lld_f103.h +++ b/os/hal/platforms/STM32F1xx/hal_lld_f103.h @@ -296,6 +296,8 @@ #define STM32_HAS_TIM15 FALSE #define STM32_HAS_TIM16 FALSE #define STM32_HAS_TIM17 FALSE +#define STM32_HAS_TIM18 FALSE +#define STM32_HAS_TIM19 FALSE /* USART attributes.*/ #define STM32_HAS_USART1 TRUE @@ -444,6 +446,8 @@ #define STM32_HAS_TIM15 FALSE #define STM32_HAS_TIM16 FALSE #define STM32_HAS_TIM17 FALSE +#define STM32_HAS_TIM18 FALSE +#define STM32_HAS_TIM19 FALSE /* USART attributes.*/ #define STM32_HAS_USART1 TRUE @@ -592,6 +596,8 @@ #define STM32_HAS_TIM15 FALSE #define STM32_HAS_TIM16 FALSE #define STM32_HAS_TIM17 FALSE +#define STM32_HAS_TIM18 FALSE +#define STM32_HAS_TIM19 FALSE /* USART attributes.*/ #define STM32_HAS_USART1 TRUE @@ -740,6 +746,8 @@ #define STM32_HAS_TIM15 FALSE #define STM32_HAS_TIM16 FALSE #define STM32_HAS_TIM17 FALSE +#define STM32_HAS_TIM18 FALSE +#define STM32_HAS_TIM19 FALSE /* USART attributes.*/ #define STM32_HAS_USART1 TRUE diff --git a/os/hal/platforms/STM32F1xx/hal_lld_f105_f107.h b/os/hal/platforms/STM32F1xx/hal_lld_f105_f107.h index e7bd16c5f..d88ae5fe3 100644 --- a/os/hal/platforms/STM32F1xx/hal_lld_f105_f107.h +++ b/os/hal/platforms/STM32F1xx/hal_lld_f105_f107.h @@ -313,6 +313,8 @@ #define STM32_HAS_TIM15 FALSE #define STM32_HAS_TIM16 FALSE #define STM32_HAS_TIM17 FALSE +#define STM32_HAS_TIM18 FALSE +#define STM32_HAS_TIM19 FALSE /* USART attributes.*/ #define STM32_HAS_USART1 TRUE diff --git a/os/hal/platforms/STM32F30x/hal_lld.h b/os/hal/platforms/STM32F30x/hal_lld.h index 684faf5d1..713640e48 100644 --- a/os/hal/platforms/STM32F30x/hal_lld.h +++ b/os/hal/platforms/STM32F30x/hal_lld.h @@ -403,6 +403,8 @@ #define STM32_HAS_TIM15 TRUE #define STM32_HAS_TIM16 TRUE #define STM32_HAS_TIM17 TRUE +#define STM32_HAS_TIM18 FALSE +#define STM32_HAS_TIM19 FALSE /* USART attributes.*/ #define STM32_HAS_USART1 TRUE @@ -1202,7 +1204,7 @@ #endif /** - * @brief Timers 2, 3, 4, 5, 6, 7, 12, 13, 14 frequency. + * @brief Timers 2, 3, 4, 6, 7 frequency. */ #if (STM32_PPRE1 == STM32_PPRE1_DIV1) || defined(__DOXYGEN__) #define STM32_TIMCLK1 (STM32_PCLK1 * 1) @@ -1211,7 +1213,7 @@ #endif /** - * @brief Timers 1, 8, 9, 10, 11 frequency. + * @brief Timers 1, 8, 15, 16, 17 frequency. */ #if (STM32_PPRE2 == STM32_PPRE2_DIV1) || defined(__DOXYGEN__) #define STM32_TIMCLK2 (STM32_PCLK2 * 1) diff --git a/os/hal/platforms/STM32F37x/hal_lld.h b/os/hal/platforms/STM32F37x/hal_lld.h index 3704eba84..1e2ef0910 100644 --- a/os/hal/platforms/STM32F37x/hal_lld.h +++ b/os/hal/platforms/STM32F37x/hal_lld.h @@ -384,6 +384,8 @@ #define STM32_HAS_TIM15 TRUE #define STM32_HAS_TIM16 TRUE #define STM32_HAS_TIM17 TRUE +#define STM32_HAS_TIM18 TRUE +#define STM32_HAS_TIM19 TRUE /* USART attributes.*/ #define STM32_HAS_USART1 TRUE @@ -1017,59 +1019,7 @@ #endif /** - * @brief UART4 frequency. - */ -#if STM32_UART4SW == STM32_UART4SW_PCLK -#define STM32_UART4CLK STM32_PCLK1 -#elif STM32_UART4SW == STM32_UART4SW_SYSCLK -#define STM32_UART4CLK STM32_SYSCLK -#elif STM32_UART4SW == STM32_UART4SW_LSECLK -#define STM32_UART4CLK STM32_LSECLK -#elif STM32_UART4SW == STM32_UART4SW_HSICLK -#define STM32_UART4CLK STM32_HSICLK -#else -#error "invalid source selected for UART4 clock" -#endif - -/** - * @brief UART5 frequency. - */ -#if STM32_UART5SW == STM32_UART5SW_PCLK -#define STM32_UART5CLK STM32_PCLK1 -#elif STM32_UART5SW == STM32_UART5SW_SYSCLK -#define STM32_UART5CLK STM32_SYSCLK -#elif STM32_UART5SW == STM32_UART5SW_LSECLK -#define STM32_UART5CLK STM32_LSECLK -#elif STM32_UART5SW == STM32_UART5SW_HSICLK -#define STM32_UART5CLK STM32_HSICLK -#else -#error "invalid source selected for UART5 clock" -#endif - -/** - * @brief TIM1 frequency. - */ -#if STM32_TIM1SW == STM32_TIM1SW_PCLK2 -#define STM32_TIM1CLK STM32_PCLK2 -#elif STM32_TIM1SW == STM32_TIM1SW_PLLX2 -#define STM32_TIM1CLK (STM32_PLLCLKOUT * 2) -#else -#error "invalid source selected for TIM1 clock" -#endif - -/** - * @brief TIM8 frequency. - */ -#if STM32_TIM8SW == STM32_TIM8SW_PCLK2 -#define STM32_TIM8CLK STM32_PCLK2 -#elif STM32_TIM8SW == STM32_TIM8SW_PLLX2 -#define STM32_TIM8CLK (STM32_PLLCLKOUT * 2) -#else -#error "invalid source selected for TIM8 clock" -#endif - -/** - * @brief Timers 2, 3, 4, 5, 6, 7, 12, 13, 14 frequency. + * @brief Timers 2, 3, 4, 5, 6, 7, 12, 13, 14, 18 frequency. */ #if (STM32_PPRE1 == STM32_PPRE1_DIV1) || defined(__DOXYGEN__) #define STM32_TIMCLK1 (STM32_PCLK1 * 1) @@ -1078,7 +1028,7 @@ #endif /** - * @brief Timers 1, 8, 9, 10, 11 frequency. + * @brief Timers 15, 16, 17, 19 frequency. */ #if (STM32_PPRE2 == STM32_PPRE2_DIV1) || defined(__DOXYGEN__) #define STM32_TIMCLK2 (STM32_PCLK2 * 1) diff --git a/os/hal/platforms/STM32F4xx/hal_lld.h b/os/hal/platforms/STM32F4xx/hal_lld.h index 8fb88013b..dbab42003 100644 --- a/os/hal/platforms/STM32F4xx/hal_lld.h +++ b/os/hal/platforms/STM32F4xx/hal_lld.h @@ -419,6 +419,8 @@ #define STM32_HAS_TIM15 FALSE #define STM32_HAS_TIM16 FALSE #define STM32_HAS_TIM17 FALSE +#define STM32_HAS_TIM18 FALSE +#define STM32_HAS_TIM19 FALSE /* USART attributes.*/ #define STM32_HAS_USART1 TRUE diff --git a/os/hal/platforms/STM32L1xx/hal_lld.h b/os/hal/platforms/STM32L1xx/hal_lld.h index db8eacf92..ef42ba6a0 100644 --- a/os/hal/platforms/STM32L1xx/hal_lld.h +++ b/os/hal/platforms/STM32L1xx/hal_lld.h @@ -278,6 +278,8 @@ #define STM32_HAS_TIM15 FALSE #define STM32_HAS_TIM16 FALSE #define STM32_HAS_TIM17 FALSE +#define STM32_HAS_TIM18 FALSE +#define STM32_HAS_TIM19 FALSE /* USART attributes.*/ #define STM32_HAS_USART1 TRUE