summaryrefslogtreecommitdiff
path: root/platforms/arm_atsam
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-02-12 10:29:31 -0800
committerGitHub <noreply@github.com>2022-02-12 18:29:31 +0000
commit63646e8906e062d1c1de3925cba70c4e3426a855 (patch)
tree4e91648b77b838e1125cf86331d7e84bde6d07a9 /platforms/arm_atsam
parentafcdd7079c774dec2aa4b7f2d08adf8b7310919b (diff)
Format code according to conventions (#16322)
Diffstat (limited to 'platforms/arm_atsam')
-rw-r--r--platforms/arm_atsam/bootloaders/md_boot.c22
-rw-r--r--platforms/arm_atsam/eeprom_samd.c4
-rw-r--r--[-rwxr-xr-x]platforms/arm_atsam/eeprom_samd.h2
-rw-r--r--platforms/arm_atsam/suspend.c2
-rw-r--r--platforms/arm_atsam/timer.c32
5 files changed, 40 insertions, 22 deletions
diff --git a/platforms/arm_atsam/bootloaders/md_boot.c b/platforms/arm_atsam/bootloaders/md_boot.c
index 9cf16f3597..32cf850448 100644
--- a/platforms/arm_atsam/bootloaders/md_boot.c
+++ b/platforms/arm_atsam/bootloaders/md_boot.c
@@ -26,20 +26,20 @@ extern uint32_t _eram;
// CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method.
void bootloader_jump(void) {
#ifdef KEYBOARD_massdrop_ctrl
- uint8_t ver_ram_method[] = "v2.18Jun 22 2018 17:28:08"; // The version to match (NULL terminated by compiler)
- uint8_t *ver_check = ver_ram_method; // Pointer to version match string for traversal
- uint8_t *ver_rom = (uint8_t *)0x21A0; // Pointer to address in ROM where this specific bootloader version would exist
+ uint8_t ver_ram_method[] = "v2.18Jun 22 2018 17:28:08"; // The version to match (NULL terminated by compiler)
+ uint8_t *ver_check = ver_ram_method; // Pointer to version match string for traversal
+ uint8_t *ver_rom = (uint8_t *)0x21A0; // Pointer to address in ROM where this specific bootloader version would exist
- while (*ver_check && *ver_rom == *ver_check) { // While there are check version characters to match and bootloader's version matches check's version
- ver_check++; // Move check version pointer to next character
- ver_rom++; // Move ROM version pointer to next character
+ while (*ver_check && *ver_rom == *ver_check) { // While there are check version characters to match and bootloader's version matches check's version
+ ver_check++; // Move check version pointer to next character
+ ver_rom++; // Move ROM version pointer to next character
}
- if (!*ver_check) { // If check version pointer is NULL, all characters have matched
- *MAGIC_ADDR = BOOTLOADER_MAGIC; // Set magic number into RAM
- NVIC_SystemReset(); // Perform system reset
+ if (!*ver_check) { // If check version pointer is NULL, all characters have matched
+ *MAGIC_ADDR = BOOTLOADER_MAGIC; // Set magic number into RAM
+ NVIC_SystemReset(); // Perform system reset
while (1)
- ; // Won't get here
+ ; // Won't get here
}
#endif
@@ -61,5 +61,5 @@ void bootloader_jump(void) {
while (!WDT->CTRLA.bit.ENABLE)
;
while (1)
- ; // Wait on timeout
+ ; // Wait on timeout
}
diff --git a/platforms/arm_atsam/eeprom_samd.c b/platforms/arm_atsam/eeprom_samd.c
index beaffeec30..1c1e031e5d 100644
--- a/platforms/arm_atsam/eeprom_samd.c
+++ b/platforms/arm_atsam/eeprom_samd.c
@@ -155,7 +155,9 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
}
}
-void eeprom_update_byte(uint8_t *addr, uint8_t value) { eeprom_write_byte(addr, value); }
+void eeprom_update_byte(uint8_t *addr, uint8_t value) {
+ eeprom_write_byte(addr, value);
+}
void eeprom_update_word(uint16_t *addr, uint16_t value) {
uint8_t *p = (uint8_t *)addr;
diff --git a/platforms/arm_atsam/eeprom_samd.h b/platforms/arm_atsam/eeprom_samd.h
index 7dbff9bfa1..878e72865c 100755..100644
--- a/platforms/arm_atsam/eeprom_samd.h
+++ b/platforms/arm_atsam/eeprom_samd.h
@@ -4,5 +4,5 @@
#ifndef EEPROM_SIZE
# include "eeconfig.h"
-# define EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4) // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
+# define EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4) // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
#endif
diff --git a/platforms/arm_atsam/suspend.c b/platforms/arm_atsam/suspend.c
index de2285bc5f..242e9c91a2 100644
--- a/platforms/arm_atsam/suspend.c
+++ b/platforms/arm_atsam/suspend.c
@@ -9,7 +9,7 @@
*/
void suspend_power_down(void) {
#ifdef RGB_MATRIX_ENABLE
- I2C3733_Control_Set(0); // Disable LED driver
+ I2C3733_Control_Set(0); // Disable LED driver
#endif
suspend_power_down_kb();
diff --git a/platforms/arm_atsam/timer.c b/platforms/arm_atsam/timer.c
index b835dd5e75..cf01e3625e 100644
--- a/platforms/arm_atsam/timer.c
+++ b/platforms/arm_atsam/timer.c
@@ -2,18 +2,34 @@
#include "timer.h"
#include "tmk_core/protocol/arm_atsam/clks.h"
-void set_time(uint64_t tset) { ms_clk = tset; }
+void set_time(uint64_t tset) {
+ ms_clk = tset;
+}
-void timer_init(void) { timer_clear(); }
+void timer_init(void) {
+ timer_clear();
+}
-uint16_t timer_read(void) { return (uint16_t)ms_clk; }
+uint16_t timer_read(void) {
+ return (uint16_t)ms_clk;
+}
-uint32_t timer_read32(void) { return (uint32_t)ms_clk; }
+uint32_t timer_read32(void) {
+ return (uint32_t)ms_clk;
+}
-uint64_t timer_read64(void) { return ms_clk; }
+uint64_t timer_read64(void) {
+ return ms_clk;
+}
-uint16_t timer_elapsed(uint16_t tlast) { return TIMER_DIFF_16(timer_read(), tlast); }
+uint16_t timer_elapsed(uint16_t tlast) {
+ return TIMER_DIFF_16(timer_read(), tlast);
+}
-uint32_t timer_elapsed32(uint32_t tlast) { return TIMER_DIFF_32(timer_read32(), tlast); }
+uint32_t timer_elapsed32(uint32_t tlast) {
+ return TIMER_DIFF_32(timer_read32(), tlast);
+}
-void timer_clear(void) { set_time(0); }
+void timer_clear(void) {
+ set_time(0);
+}