diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-11-02 21:18:33 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-02 10:18:33 +0000 |
| commit | 0ecd4926b20b3a3240dcb29f5184853c1ec192b8 (patch) | |
| tree | d31dcffa4558020ebf21ed9c98235e001c3c5384 /tmk_core | |
| parent | 699e69bec52f30cd078ae354cc6b2ca1fd04323f (diff) | |
| download | qmk_firmware-0ecd4926b20b3a3240dcb29f5184853c1ec192b8.tar.gz qmk_firmware-0ecd4926b20b3a3240dcb29f5184853c1ec192b8.zip | |
Fix build failures caused by #12947. (#15019)
* Fix build failures caused by #12947. Unknown if this actually works.
* qmk format-c
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/chibios/eeprom_teensy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/common/chibios/eeprom_teensy.c b/tmk_core/common/chibios/eeprom_teensy.c index 2493c607d..97da6f9e1 100644 --- a/tmk_core/common/chibios/eeprom_teensy.c +++ b/tmk_core/common/chibios/eeprom_teensy.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | 44 | ||
| 45 | #define F_CPU KINETIS_SYSCLK_FREQUENCY | 45 | #define F_CPU KINETIS_SYSCLK_FREQUENCY |
| 46 | 46 | ||
| 47 | static int kinetis_hsrun_disable(void) { | 47 | static inline int kinetis_hsrun_disable(void) { |
| 48 | #if defined(MK66F18) | 48 | #if defined(MK66F18) |
| 49 | if (SMC->PMSTAT == SMC_PMSTAT_HSRUN) { | 49 | if (SMC->PMSTAT == SMC_PMSTAT_HSRUN) { |
| 50 | // First, reduce the CPU clock speed, but do not change | 50 | // First, reduce the CPU clock speed, but do not change |
| @@ -102,7 +102,7 @@ static int kinetis_hsrun_disable(void) { | |||
| 102 | return 0; | 102 | return 0; |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | static int kinetis_hsrun_enable(void) { | 105 | static inline int kinetis_hsrun_enable(void) { |
| 106 | #if defined(MK66F18) | 106 | #if defined(MK66F18) |
| 107 | if (SMC->PMSTAT == SMC_PMSTAT_RUN) { | 107 | if (SMC->PMSTAT == SMC_PMSTAT_RUN) { |
| 108 | // Turn HSRUN mode on | 108 | // Turn HSRUN mode on |
| @@ -234,7 +234,7 @@ void eeprom_initialize(void) { | |||
| 234 | // FlexRAM is configured as traditional RAM | 234 | // FlexRAM is configured as traditional RAM |
| 235 | // We need to reconfigure for EEPROM usage | 235 | // We need to reconfigure for EEPROM usage |
| 236 | kinetis_hsrun_disable(); | 236 | kinetis_hsrun_disable(); |
| 237 | FTFL->FCCOB0 = FTFE_FCCOB0_CCOBn_SET(0x80); // PGMPART = Program Partition Command | 237 | FTFL->FCCOB0 = 0x80; // PGMPART = Program Partition Command |
| 238 | FTFL->FCCOB3 = 0; | 238 | FTFL->FCCOB3 = 0; |
| 239 | FTFL->FCCOB4 = EEESPLIT | EEESIZE; | 239 | FTFL->FCCOB4 = EEESPLIT | EEESIZE; |
| 240 | FTFL->FCCOB5 = EEPARTITION; | 240 | FTFL->FCCOB5 = EEPARTITION; |
