From 6cdd2fc633a4ff6a092d3bb500a6d1781bfba954 Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Fri, 30 May 2014 13:53:37 +0000 Subject: [PATCH] Fix delay() function in the BERI loader code. Reviewed by: brooks @ Sponsored by: DARPA, AFRL --- sys/boot/mips/beri/loader/main.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/boot/mips/beri/loader/main.c b/sys/boot/mips/beri/loader/main.c index 81d3248de46..2354614176d 100644 --- a/sys/boot/mips/beri/loader/main.c +++ b/sys/boot/mips/beri/loader/main.c @@ -215,13 +215,25 @@ time(time_t *tloc) } /* - * Delay - presumably in usecs? + * Delay - in usecs + * + * NOTE: We are assuming that the CPU is running at 100MHz. */ void delay(int usecs) { - register_t t; + uint32_t delta; + uint32_t curr; + uint32_t last; - t = cp0_count_get() + usecs * 100; - while (cp0_count_get() < t); + last = cp0_count_get(); + while (usecs > 0) { + curr = cp0_count_get(); + delta = curr - last; + while (usecs > 0 && delta >= 100) { + usecs--; + last += 100; + delta -= 100; + } + } }