Steins7/stm32f1xx_HBL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rcc_configure failing silently

Browse Source 
The function being so important, any failure should be fatal
This commit is contained in:
Steins7 2024-11-03 22:28:00 +01:00
parent 4df0ba5c6a
commit 99f3bb79c3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drv/rcc.c
View File

@ -161,7 +161,7 @@ static void apply_speed_preset(void)
//restore sane values //restore sane values
apply_default_preset(); apply_default_preset();
//try enabling HSE, fallback to HSI if HSE fails //enable HSE
regs->CR.HSEON = 1; regs->CR.HSEON = 1;
for (uint32_t i=0; i<10000; ++i) { for (uint32_t i=0; i<10000; ++i) {
__asm__("nop"); __asm__("nop");
@ -169,18 +169,19 @@ static void apply_speed_preset(void)
if (regs->CR.HSERDY == 0x1) { if (regs->CR.HSERDY == 0x1) {
regs->CFGR.PLLSCR = 1; regs->CFGR.PLLSCR = 1;
} else { } else {
regs->CR.HSEON = 0; apply_default_preset();
while (true);
} }
//configure PLL, fallback to HSI if PLL fails //configure PLL
regs->CFGR.PLLMUL = 0x7; //PLL x9 regs->CFGR.PLLMUL = 0x7; //PLL x9
regs->CR.PLLON = 1; regs->CR.PLLON = 1;
for (uint32_t i=0; i<10000; ++i) { for (uint32_t i=0; i<10000; ++i) {
__asm__("nop"); __asm__("nop");
} }
if (regs->CR.PLLRDY != 0x1) { if (regs->CR.PLLRDY != 0x1) {
regs->CR.PLLON = 0; apply_default_preset();
return; //clock low enough, no need for prescalers while (true);
} }
//configure prescalers //configure prescalers