summaryrefslogtreecommitdiffstats
path: root/platforms/avr
diff options
context:
space:
mode:
Diffstat (limited to 'platforms/avr')
-rw-r--r--platforms/avr/bootloaders/bootloadhid.c3
-rw-r--r--platforms/avr/bootloaders/caterina.c6
-rw-r--r--platforms/avr/bootloaders/dfu.c3
-rw-r--r--platforms/avr/bootloaders/halfkay.c3
-rw-r--r--platforms/avr/bootloaders/none.c3
-rw-r--r--platforms/avr/bootloaders/usbasploader.c3
6 files changed, 8 insertions, 13 deletions
diff --git a/platforms/avr/bootloaders/bootloadhid.c b/platforms/avr/bootloaders/bootloadhid.c
index 8d18114613..ae58760d7d 100644
--- a/platforms/avr/bootloaders/bootloadhid.c
+++ b/platforms/avr/bootloaders/bootloadhid.c
@@ -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
diff --git a/platforms/avr/bootloaders/caterina.c b/platforms/avr/bootloaders/caterina.c
index 1b43ed4e44..82a16a3765 100644
--- a/platforms/avr/bootloaders/caterina.c
+++ b/platforms/avr/bootloaders/caterina.c
@@ -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
@@ -35,5 +34,6 @@ void bootloader_jump(void) {
wdt_enable(WDTO_60MS);
// wait for watchdog timer to trigger
- while (1) { }
+ while (1) {
+ }
}
diff --git a/platforms/avr/bootloaders/dfu.c b/platforms/avr/bootloaders/dfu.c
index bdf5908934..cb42821a93 100644
--- a/platforms/avr/bootloaders/dfu.c
+++ b/platforms/avr/bootloaders/dfu.c
@@ -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;
diff --git a/platforms/avr/bootloaders/halfkay.c b/platforms/avr/bootloaders/halfkay.c
index abef86980b..6ce2e19114 100644
--- a/platforms/avr/bootloaders/halfkay.c
+++ b/platforms/avr/bootloaders/halfkay.c
@@ -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();
diff --git a/platforms/avr/bootloaders/none.c b/platforms/avr/bootloaders/none.c
index 8af151c04d..624fbe242a 100644
--- a/platforms/avr/bootloaders/none.c
+++ b/platforms/avr/bootloaders/none.c
@@ -16,5 +16,4 @@
#include "bootloader.h"
-__attribute__((weak))
-void bootloader_jump(void) { }
+__attribute__((weak)) void bootloader_jump(void) {}
diff --git a/platforms/avr/bootloaders/usbasploader.c b/platforms/avr/bootloaders/usbasploader.c
index b3e9b2d72d..008bd16069 100644
--- a/platforms/avr/bootloaders/usbasploader.c
+++ b/platforms/avr/bootloaders/usbasploader.c
@@ -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);