From 98d641dba5bb38fc9decd46d5786e4b067e2088a Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Wed, 9 Oct 2019 12:06:45 +0200 Subject: [PATCH] WaitUS/WaitMS: accept uint32_t --- armsrc/ticks.c | 8 ++++---- armsrc/ticks.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/armsrc/ticks.c b/armsrc/ticks.c index 7b66d17e6..0ce55e417 100644 --- a/armsrc/ticks.c +++ b/armsrc/ticks.c @@ -250,11 +250,11 @@ void WaitTicks(uint32_t ticks) { // Wait / Spindelay in us (microseconds) // 1us = 1.5ticks. -void WaitUS(uint16_t us) { - WaitTicks((uint32_t)us * 3 / 2); +void WaitUS(uint32_t us) { + WaitTicks((us & 0x3FFFFFFF) * 3 / 2); } -void WaitMS(uint16_t ms) { - WaitTicks((uint32_t)ms * 1500); +void WaitMS(uint32_t ms) { + WaitTicks((ms & 0x1FFFFF) * 1500); } // stop clock diff --git a/armsrc/ticks.h b/armsrc/ticks.h index e036e018c..b39ec52bd 100644 --- a/armsrc/ticks.h +++ b/armsrc/ticks.h @@ -38,8 +38,8 @@ uint32_t RAMFUNC GetCountSspClkDelta(); void StartTicks(void); uint32_t GetTicks(void); void WaitTicks(uint32_t ticks); -void WaitUS(uint16_t us); -void WaitMS(uint16_t ms); +void WaitUS(uint32_t us); +void WaitMS(uint32_t ms); void StopTicks(void);