di0ib/tmk_keyboard
1
0
Fork 0
Code Releases Activity

ChibiOS: make reset request more CMSISy.

Browse Source
This commit is contained in:
flabbergast 2015-10-18 10:44:08 +01:00
parent 7524f5c9c3
commit 44421f5bf4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmk_core/common/chibios/bootloader.c
View File

@ -25,13 +25,13 @@ void bootloader_jump(void) {
#if defined(KIIBOHD_BOOTLOADER) #if defined(KIIBOHD_BOOTLOADER)
/* Kiibohd Bootloader (MCHCK and Infinity KB) */ /* Kiibohd Bootloader (MCHCK and Infinity KB) */
#define SCB_AIRCR (*(volatile uint32_t *)0xE000ED0C) // Application Interrupt and Reset Control #define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000
#define VBAT (*(volatile uint8_t *)0x4003E000) // VBAT register file (32 bytes) #define VBAT (*(volatile uint8_t *)0x4003E000) // VBAT register file (32 bytes)
const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff"; const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff";
void bootloader_jump(void) { void bootloader_jump(void) {
__builtin_memcpy((void *)&VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic)); __builtin_memcpy((void *)&VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));
// request reset // request reset
SCB_AIRCR = 0x05FA0004; SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk;
} }
#else /* defined(KIIBOHD_BOOTLOADER) */ #else /* defined(KIIBOHD_BOOTLOADER) */