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

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2821 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2011-03-13 08:27:25 +00:00
parent 887409c0c9
commit a1427e9a22
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
os/hal/platforms/STM32/hal_lld_f105_f107.h
View File

@ -324,7 +324,6 @@
#if STM32_ACTIVATE_PLL2 && \ #if STM32_ACTIVATE_PLL2 && \
(STM32_PREDIV1SRC != STM32_PREDIV1SRC_PLL2) && \ (STM32_PREDIV1SRC != STM32_PREDIV1SRC_PLL2) && \
(STM32_MCO != STM32_MCO_PLL2) (STM32_MCO != STM32_MCO_PLL2)
#error "PLL2 activated but not used" #error "PLL2 activated but not used"
#endif #endif
@ -442,10 +441,15 @@
#endif #endif
#endif /* STM32_ACTIVATE_PLL3 */ #endif /* STM32_ACTIVATE_PLL3 */
/* The following values are only used if PLL1 is activated */
#if STM32_ACTIVATE_PLL1
/** /**
* @brief PREDIV1 input frequency. * @brief PREDIV1 input frequency.
*/ */
#if (STM32_PREDIV1SRC == STM32_PREDIV1SRC_PLL2) || defined(__DOXYGEN__) #if (STM32_PREDIV1SRC == STM32_PREDIV1SRC_PLL2) || defined(__DOXYGEN__)
#if !STM32_ACTIVATE_PLL2
#error "PLL2 selected as clock source for STM32_PREDIV1SRC but not activated"
#endif
#define STM32_PREDIV1CLK STM32_PLL2CLKOUT #define STM32_PREDIV1CLK STM32_PLL2CLKOUT
#elif STM32_PREDIV1SRC == STM32_PREDIV1SRC_HSE #elif STM32_PREDIV1SRC == STM32_PREDIV1SRC_HSE
#define STM32_PREDIV1CLK STM32_HSECLK #define STM32_PREDIV1CLK STM32_HSECLK
@ -483,11 +487,15 @@
#if (STM32_PLLVCO < 36000000) || (STM32_PLLVCO > 144000000) #if (STM32_PLLVCO < 36000000) || (STM32_PLLVCO > 144000000)
#error "STM32_PLLVCO outside acceptable range (36...144MHz)" #error "STM32_PLLVCO outside acceptable range (36...144MHz)"
#endif #endif
#endif /* STM32_ACTIVATE_PLL1 */
/** /**
* @brief System clock source. * @brief System clock source.
*/ */
#if (STM32_SW == STM32_SW_PLL) || defined(__DOXYGEN__) #if (STM32_SW == STM32_SW_PLL) || defined(__DOXYGEN__)
#if !STM32_ACTIVATE_PLL1
#error "PLL1 selected as clock source for STM32_SYSCLK but not activated"
#endif
#define STM32_SYSCLK STM32_PLLCLKOUT #define STM32_SYSCLK STM32_PLLCLKOUT
#elif (STM32_SW == STM32_SW_HSI) #elif (STM32_SW == STM32_SW_HSI)
#define STM32_SYSCLK STM32_HSICLK #define STM32_SYSCLK STM32_HSICLK