Skip to content

Commit

Permalink
Format code according to conventions (#15593)
Browse files Browse the repository at this point in the history
  • Loading branch information
qmk-bot authored Dec 27, 2021
1 parent 1127e0d commit be2265d
Show file tree
Hide file tree
Showing 15 changed files with 37 additions and 46 deletions.
22 changes: 14 additions & 8 deletions platforms/arm_atsam/bootloaders/md_boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
// WARNING: These are only for CTRL bootloader release "v2.18Jun 22 2018 17:28:08" for bootloader_jump support
extern uint32_t _eram;

#define BOOTLOADER_MAGIC 0x3B9ACA00
#define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4)
# define BOOTLOADER_MAGIC 0x3B9ACA00
# define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4)

// CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method.
void bootloader_jump(void) {
Expand All @@ -40,7 +40,8 @@ void bootloader_jump(void) {
*MAGIC_ADDR = BOOTLOADER_MAGIC; // Set magic number into RAM
NVIC_SystemReset(); // Perform system reset

while (1); // Won't get here
while (1)
; // Won't get here
}
}

Expand All @@ -50,17 +51,22 @@ void bootloader_jump(void) {
void bootloader_jump(void) {
WDT->CTRLA.bit.ENABLE = 0;

while (WDT->SYNCBUSY.bit.ENABLE);
while (WDT->CTRLA.bit.ENABLE);
while (WDT->SYNCBUSY.bit.ENABLE)
;
while (WDT->CTRLA.bit.ENABLE)
;

WDT->CONFIG.bit.WINDOW = 0;
WDT->CONFIG.bit.PER = 0;
WDT->EWCTRL.bit.EWOFFSET = 0;
WDT->CTRLA.bit.ENABLE = 1;

while (WDT->SYNCBUSY.bit.ENABLE);
while (!WDT->CTRLA.bit.ENABLE);
while (WDT->SYNCBUSY.bit.ENABLE)
;
while (!WDT->CTRLA.bit.ENABLE)
;

while (1); // Wait on timeout
while (1)
; // Wait on timeout
}
#endif
3 changes: 1 addition & 2 deletions platforms/avr/bootloaders/bootloadhid.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
#include <avr/eeprom.h>
#include <avr/wdt.h>

__attribute__((weak))
void bootloader_jump(void) {
__attribute__((weak)) void bootloader_jump(void) {
// force bootloadHID to stay in bootloader mode, so that it waits
// for a new firmware to be flashed
// NOTE: this byte is part of QMK's "magic number" - changing it causes the EEPROM to be re-initialized
Expand Down
6 changes: 3 additions & 3 deletions platforms/avr/bootloaders/caterina.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@

#include <avr/wdt.h>

__attribute__((weak))
void bootloader_jump(void) {
__attribute__((weak)) void bootloader_jump(void) {
// this block may be optional
// TODO: figure it out

Expand All @@ -35,5 +34,6 @@ void bootloader_jump(void) {
wdt_enable(WDTO_60MS);

// wait for watchdog timer to trigger
while (1) { }
while (1) {
}
}
3 changes: 1 addition & 2 deletions platforms/avr/bootloaders/dfu.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
#define BOOTLOADER_RESET_KEY 0xB007B007
uint32_t reset_key __attribute__((section(".noinit,\"aw\",@nobits;")));

__attribute__((weak))
void bootloader_jump(void) {
__attribute__((weak)) void bootloader_jump(void) {
UDCON = 1;
USBCON = (1 << FRZCLK); // disable USB
UCSR1B = 0;
Expand Down
3 changes: 1 addition & 2 deletions platforms/avr/bootloaders/halfkay.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
#include <avr/interrupt.h>
#include <util/delay.h>

__attribute__((weak))
void bootloader_jump(void) {
__attribute__((weak)) void bootloader_jump(void) {
// http://www.pjrc.com/teensy/jump_to_bootloader.html

cli();
Expand Down
3 changes: 1 addition & 2 deletions platforms/avr/bootloaders/none.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@

#include "bootloader.h"

__attribute__((weak))
void bootloader_jump(void) { }
__attribute__((weak)) void bootloader_jump(void) {}
3 changes: 1 addition & 2 deletions platforms/avr/bootloaders/usbasploader.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
# endif
#endif

__attribute__((weak))
void bootloader_jump(void) {
__attribute__((weak)) void bootloader_jump(void) {
// Taken with permission of Stephan Baerwolf from https://github.com/tinyusbboard/API/blob/master/apipage.c

wdt_enable(WDTO_15MS);
Expand Down
5 changes: 2 additions & 3 deletions platforms/chibios/bootloaders/gd32v_dfu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) {}
3 changes: 1 addition & 2 deletions platforms/chibios/bootloaders/halfkay.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
3 changes: 1 addition & 2 deletions platforms/chibios/bootloaders/kiibohd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
3 changes: 1 addition & 2 deletions platforms/chibios/bootloaders/none.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@

#include "bootloader.h"

__attribute__((weak))
void bootloader_jump(void) { }
__attribute__((weak)) void bootloader_jump(void) {}
14 changes: 6 additions & 8 deletions platforms/chibios/bootloaders/stm32_dfu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
Expand Down
5 changes: 1 addition & 4 deletions platforms/chibios/bootloaders/stm32duino.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,4 @@

#include <ch.h>

__attribute__((weak))
void bootloader_jump(void) {
NVIC_SystemReset();
}
__attribute__((weak)) void bootloader_jump(void) { NVIC_SystemReset(); }
5 changes: 2 additions & 3 deletions platforms/chibios/bootloaders/tinyuf2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
2 changes: 1 addition & 1 deletion platforms/test/bootloaders/none.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

#include "bootloader.h"

void bootloader_jump(void) { }
void bootloader_jump(void) {}

0 comments on commit be2265d

Please sign in to comment.