gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-22 03:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge f5ff9d0388 into 36b5559b99

Browse Source
This commit is contained in:
David Hoelscher 2024-11-20 23:06:05 -08:00 committed by GitHub
commit ed6ffc0b54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platforms/chibios/timer.c
View File

@ -99,7 +99,7 @@ uint16_t timer_read(void) {
} }
uint32_t timer_read32(void) { uint32_t timer_read32(void) {
chSysLock(); syssts_t sts = chSysGetStatusAndLockX();
uint32_t ticks = get_system_time_ticks() - ticks_offset; uint32_t ticks = get_system_time_ticks() - ticks_offset;
if (ticks < last_ticks) { if (ticks < last_ticks) {
// The 32-bit tick counter overflowed and wrapped around. We cannot just extend the counter to 64 bits here, // The 32-bit tick counter overflowed and wrapped around. We cannot just extend the counter to 64 bits here,
@ -114,7 +114,7 @@ uint32_t timer_read32(void) {
} }
last_ticks = ticks; last_ticks = ticks;
uint32_t ms_offset_copy = ms_offset; // read while still holding the lock to ensure a consistent value uint32_t ms_offset_copy = ms_offset; // read while still holding the lock to ensure a consistent value
chSysUnlock(); chSysRestoreStatusX(sts);
return (uint32_t)TIME_I2MS(ticks) + ms_offset_copy; return (uint32_t)TIME_I2MS(ticks) + ms_offset_copy;
} }