dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Off by one in GetTickCountDelta (FIXes #301)

Browse Source 
FIXes #301 and prevent a `-1`aka`UINT_MAX` delta.
This commit is contained in:
Colin J. Brigato
2019-08-01 01:56:30 +02:00
committed by GitHub
parent 733a7d836d
commit b4e004abc2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
armsrc/ticks.c
View File

@@ -64,7 +64,7 @@ uint32_t RAMFUNC GetTickCount(void) {
uint32_t RAMFUNC GetTickCountDelta(uint32_t start_ticks) { uint32_t RAMFUNC GetTickCountDelta(uint32_t start_ticks) {
uint32_t stop_ticks = AT91C_BASE_RTTC->RTTC_RTVR; uint32_t stop_ticks = AT91C_BASE_RTTC->RTTC_RTVR;
if (stop_ticks > start_ticks) if (stop_ticks >= start_ticks)
return stop_ticks - start_ticks; return stop_ticks - start_ticks;
return (UINT32_MAX - start_ticks) + stop_ticks; return (UINT32_MAX - start_ticks) + stop_ticks;
} }