git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5963 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2013-07-13 07:14:21 +00:00
parent 6627768bdf
commit 43ca8b55d2
2 changed files with 3 additions and 2 deletions

View File

@ -696,8 +696,7 @@
#endif
/* PLL2 activation conditions.*/
#if STM32_OTG_CLOCK_REQUIRED || \
(STM32_PREDIV1SRC == STM32_PREDIV1SRC_PLL2) || \
#if ((STM32_PREDIV1SRC == STM32_PREDIV1SRC_PLL2) && STM32_ACTIVATE_PLL1) || \
(STM32_MCOSEL == STM32_MCOSEL_PLL2DIV2) || \
defined(__DOXYGEN__)
/**

View File

@ -91,6 +91,8 @@
*** 2.7.0 ***
- FIX: Fixed missing casts in time-conversion macros (bug #418)(backported
to 2.6.1, 2.4.4 and 2.2.10).
- FIX: Fixed PLL2 activation condition is wrong in STM32F107 HAL (bug #417)
(backported to 2.6.1 and 2.4.4).
- FIX: Fixed STM32 Serial (v2) driver invalid CR registers size (bug #416)
(backported to 2.6.0).
- FIX: Fixed MS2ST() and US2ST() macros error (bug #415)(backported to 2.6.0,