diff options
| author | QMK Bot <hello@qmk.fm> | 2020-04-02 21:59:37 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-04-02 21:59:37 +0000 |
| commit | 59188bf29d10cdf0500811a68f611ab6a724494f (patch) | |
| tree | 1d4244ebfa2ca2f470a1235877453bef62a39a7e /tmk_core | |
| parent | 9c4bf0ac4aed4ab315f27bfa5d2f54b0dd931138 (diff) | |
| download | qmk_firmware-59188bf29d10cdf0500811a68f611ab6a724494f.tar.gz qmk_firmware-59188bf29d10cdf0500811a68f611ab6a724494f.zip | |
format code according to conventions [skip ci]
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/avr/bootloader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/common/avr/bootloader.c b/tmk_core/common/avr/bootloader.c index 32f69ae8b..7e5d2b057 100644 --- a/tmk_core/common/avr/bootloader.c +++ b/tmk_core/common/avr/bootloader.c | |||
| @@ -237,13 +237,13 @@ void bootloader_jump(void) { | |||
| 237 | "bootloader_startup_loop%=: \n\t" | 237 | "bootloader_startup_loop%=: \n\t" |
| 238 | "rjmp bootloader_startup_loop%= \n\t" | 238 | "rjmp bootloader_startup_loop%= \n\t" |
| 239 | : | 239 | : |
| 240 | : [ mcucsrio ] "I"(_SFR_IO_ADDR(MCUCSR)), | 240 | : [mcucsrio] "I"(_SFR_IO_ADDR(MCUCSR)), |
| 241 | # if (FLASHEND > 131071) | 241 | # if (FLASHEND > 131071) |
| 242 | [ ramendhi ] "M"(((RAMEND - 2) >> 8) & 0xff), [ ramendlo ] "M"(((RAMEND - 2) >> 0) & 0xff), [ bootaddrhi ] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 16) & 0xff), | 242 | [ramendhi] "M"(((RAMEND - 2) >> 8) & 0xff), [ramendlo] "M"(((RAMEND - 2) >> 0) & 0xff), [bootaddrhi] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 16) & 0xff), |
| 243 | # else | 243 | # else |
| 244 | [ ramendhi ] "M"(((RAMEND - 1) >> 8) & 0xff), [ ramendlo ] "M"(((RAMEND - 1) >> 0) & 0xff), | 244 | [ramendhi] "M"(((RAMEND - 1) >> 8) & 0xff), [ramendlo] "M"(((RAMEND - 1) >> 0) & 0xff), |
| 245 | # endif | 245 | # endif |
| 246 | [ bootaddrme ] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 8) & 0xff), [ bootaddrlo ] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 0) & 0xff)); | 246 | [bootaddrme] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 8) & 0xff), [bootaddrlo] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 0) & 0xff)); |
| 247 | 247 | ||
| 248 | #else // Assume remaining boards are DFU, even if the flag isn't set | 248 | #else // Assume remaining boards are DFU, even if the flag isn't set |
| 249 | 249 | ||