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

Modified the STM32F4xx HSI (re)activation, removed redundant |= 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6433 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2013-11-10 10:04:42 +00:00
parent 1f424e6042
commit 3693a12c72
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
os/hal/platforms/STM32F4xx/hal_lld.c
View File

@ -158,11 +158,15 @@ void stm32_clock_init(void) {
PWR->CR = 0; PWR->CR = 0;
#endif #endif
/* Initial clocks setup and wait for HSI stabilization, the MSI clock is /* HSI setup, it enforces the reset situation in order to handle possible
always enabled because it is the fallback clock when PLL the fails.*/ problems with JTAG probes and re-initializations.*/
RCC->CR |= RCC_CR_HSION; RCC->CR |= RCC_CR_HSION; /* Make sure HSI is ON. */
while ((RCC->CR & RCC_CR_HSIRDY) == 0) while (!(RCC->CR & RCC_CR_HSIRDY))
; /* Waits until HSI is stable. */ ; /* Wait until HSI is stable. */
RCC->CR &= RCC_CR_HSITRIM | RCC_CR_HSION; /* CR Reset value. */
RCC->CFGR = 0; /* CFGR reset value. */
while ((RCC->CFGR & RCC_CFGR_SWS) != RCC_CFGR_SWS_HSI)
; /* Waits until HSI is selected. */
#if STM32_HSE_ENABLED #if STM32_HSE_ENABLED
/* HSE activation.*/ /* HSE activation.*/
@ -223,8 +227,8 @@ void stm32_clock_init(void) {
#endif #endif
/* Other clock-related settings (dividers, MCO etc).*/ /* Other clock-related settings (dividers, MCO etc).*/
RCC->CFGR |= STM32_MCO2PRE | STM32_MCO2SEL | STM32_MCO1PRE | STM32_MCO1SEL | RCC->CFGR = STM32_MCO2PRE | STM32_MCO2SEL | STM32_MCO1PRE | STM32_MCO1SEL |
STM32_RTCPRE | STM32_PPRE2 | STM32_PPRE1 | STM32_HPRE; STM32_RTCPRE | STM32_PPRE2 | STM32_PPRE1 | STM32_HPRE;
/* Flash setup.*/ /* Flash setup.*/
#if defined(STM32_USE_REVISION_A_FIX) #if defined(STM32_USE_REVISION_A_FIX)