Format code according to conventions (#15593)
This commit is contained in:
		
							parent
							
								
									1127e0da6b
								
							
						
					
					
						commit
						be2265d0d1
					
				
					 15 changed files with 37 additions and 46 deletions
				
			
		| 
						 | 
				
			
			@ -24,8 +24,7 @@
 | 
			
		|||
__IO uint32_t *DBGMCU_KEY = (uint32_t *)DBGMCU_BASE + 0x0CU;
 | 
			
		||||
__IO uint32_t *DBGMCU_CMD = (uint32_t *)DBGMCU_BASE + 0x08U;
 | 
			
		||||
 | 
			
		||||
__attribute__((weak))
 | 
			
		||||
void bootloader_jump(void) {
 | 
			
		||||
__attribute__((weak)) void bootloader_jump(void) {
 | 
			
		||||
    /* The MTIMER unit of the GD32VF103 doesn't have the MSFRST
 | 
			
		||||
     * register to generate a software reset request.
 | 
			
		||||
     * BUT instead two undocumented registers in the debug peripheral
 | 
			
		||||
| 
						 | 
				
			
			@ -37,4 +36,4 @@ void bootloader_jump(void) {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
/* Jumping to bootloader is not possible from user code. */
 | 
			
		||||
void enter_bootloader_mode_if_requested(void) { }
 | 
			
		||||
void enter_bootloader_mode_if_requested(void) {}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,8 +19,7 @@
 | 
			
		|||
#include <ch.h>
 | 
			
		||||
#include "wait.h"
 | 
			
		||||
 | 
			
		||||
__attribute__((weak))
 | 
			
		||||
void bootloader_jump(void) {
 | 
			
		||||
__attribute__((weak)) void bootloader_jump(void) {
 | 
			
		||||
    wait_ms(100);
 | 
			
		||||
    __BKPT(0);
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,8 +23,7 @@
 | 
			
		|||
 | 
			
		||||
const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
 | 
			
		||||
 | 
			
		||||
__attribute__((weak))
 | 
			
		||||
void bootloader_jump(void) {
 | 
			
		||||
__attribute__((weak)) void bootloader_jump(void) {
 | 
			
		||||
    void *volatile vbat = (void *)VBAT;
 | 
			
		||||
    __builtin_memcpy(vbat, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,5 +16,4 @@
 | 
			
		|||
 | 
			
		||||
#include "bootloader.h"
 | 
			
		||||
 | 
			
		||||
__attribute__((weak))
 | 
			
		||||
void bootloader_jump(void) { }
 | 
			
		||||
__attribute__((weak)) void bootloader_jump(void) {}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,8 +41,7 @@ extern uint32_t __ram0_end__;
 | 
			
		|||
#        define STM32_BOOTLOADER_DUAL_BANK_DELAY 100000
 | 
			
		||||
#    endif
 | 
			
		||||
 | 
			
		||||
__attribute__((weak))
 | 
			
		||||
void bootloader_jump(void) {
 | 
			
		||||
__attribute__((weak)) void bootloader_jump(void) {
 | 
			
		||||
    // For STM32 MCUs with dual-bank flash, and we're incapable of jumping to the bootloader. The first valid flash
 | 
			
		||||
    // bank is executed unconditionally after a reset, so it doesn't enter DFU unless BOOT0 is high. Instead, we do
 | 
			
		||||
    // it with hardware...in this case, we pull a GPIO high/low depending on the configuration, connects 3.3V to
 | 
			
		||||
| 
						 | 
				
			
			@ -63,17 +62,16 @@ void bootloader_jump(void) {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
// not needed at all, but if anybody attempts to invoke it....
 | 
			
		||||
void enter_bootloader_mode_if_requested(void) { }
 | 
			
		||||
void enter_bootloader_mode_if_requested(void) {}
 | 
			
		||||
 | 
			
		||||
#else
 | 
			
		||||
 | 
			
		||||
/* This code should be checked whether it runs correctly on platforms */
 | 
			
		||||
#define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
 | 
			
		||||
#define BOOTLOADER_MAGIC 0xDEADBEEF
 | 
			
		||||
#define MAGIC_ADDR (unsigned long *)(SYMVAL(__ram0_end__) - 4)
 | 
			
		||||
#    define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
 | 
			
		||||
#    define BOOTLOADER_MAGIC 0xDEADBEEF
 | 
			
		||||
#    define MAGIC_ADDR (unsigned long *)(SYMVAL(__ram0_end__) - 4)
 | 
			
		||||
 | 
			
		||||
__attribute__((weak))
 | 
			
		||||
void bootloader_jump(void) {
 | 
			
		||||
__attribute__((weak)) void bootloader_jump(void) {
 | 
			
		||||
    *MAGIC_ADDR = BOOTLOADER_MAGIC;  // set magic flag => reset handler will jump into boot loader
 | 
			
		||||
    NVIC_SystemReset();
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,7 +18,4 @@
 | 
			
		|||
 | 
			
		||||
#include <ch.h>
 | 
			
		||||
 | 
			
		||||
__attribute__((weak))
 | 
			
		||||
void bootloader_jump(void) {
 | 
			
		||||
    NVIC_SystemReset();
 | 
			
		||||
}
 | 
			
		||||
__attribute__((weak)) void bootloader_jump(void) { NVIC_SystemReset(); }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,11 +25,10 @@
 | 
			
		|||
extern uint32_t _board_dfu_dbl_tap[];
 | 
			
		||||
#define DBL_TAP_REG _board_dfu_dbl_tap[0]
 | 
			
		||||
 | 
			
		||||
__attribute__((weak))
 | 
			
		||||
void bootloader_jump(void) {
 | 
			
		||||
__attribute__((weak)) void bootloader_jump(void) {
 | 
			
		||||
    DBL_TAP_REG = DBL_TAP_MAGIC;
 | 
			
		||||
    NVIC_SystemReset();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* not needed, no two-stage reset */
 | 
			
		||||
void enter_bootloader_mode_if_requested(void) { }
 | 
			
		||||
void enter_bootloader_mode_if_requested(void) {}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue