Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00
Code Issues Wiki Activity

Handle H7 RESET_MSC_REQUEST reset case

Browse source
This commit is contained in:
Steve Evans 2020-11-17 20:55:21 +00:00
parent 31184af37c
commit c63447e7e7
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/drivers/system_stm32h7xx.c
View file

@ -165,11 +165,9 @@ void systemJumpToBootloader(void)
} }
static uint32_t bootloaderRequest;
void systemCheckResetReason(void) void systemCheckResetReason(void)
{ {
bootloaderRequest = persistentObjectRead(PERSISTENT_OBJECT_RESET_REASON); uint32_t bootloaderRequest = persistentObjectRead(PERSISTENT_OBJECT_RESET_REASON);
switch (bootloaderRequest) { switch (bootloaderRequest) {
#if defined(USE_FLASH_BOOT_LOADER) #if defined(USE_FLASH_BOOT_LOADER)
@ -183,18 +181,16 @@ void systemCheckResetReason(void)
persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE); persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE);
return; return;
case RESET_NONE:
if (!(RCC->RSR & RCC_RSR_SFTRSTF)) {
// Direct hard reset case
return;
}
// Soft reset; boot loader may have been active with BOOT pin pulled high.
FALLTHROUGH;
case RESET_BOOTLOADER_POST: case RESET_BOOTLOADER_POST:
// Boot loader activity magically prevents SysTick from interrupting. // Boot loader activity magically prevents SysTick from interrupting.
// Issue a soft reset to prevent the condition. // Issue a soft reset to prevent the condition.
forcedSystemResetWithoutDisablingCaches(); // observed that disabling dcache after cold boot with BOOT pin high causes segfault. forcedSystemResetWithoutDisablingCaches(); // observed that disabling dcache after cold boot with BOOT pin high causes segfault.
case RESET_MSC_REQUEST:
case RESET_NONE:
default:
return;
} }
systemJumpToBootloader(); systemJumpToBootloader();