Fix delay() function in the BERI loader code.

Reviewed by:	brooks @
Sponsored by:	DARPA, AFRL

1 files changed, 17 insertions, 5 deletions

diff --git a/sys/boot/mips/beri/loader/main.c b/sys/boot/mips/beri/loader/main.c
index 81d3248..2354614 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;
-
-	t = cp0_count_get() + usecs * 100;
-	while (cp0_count_get() < t);
+	uint32_t delta;
+	uint32_t curr;
+	uint32_t last;
+
+	last = cp0_count_get();
+	while (usecs > 0) {
+		curr = cp0_count_get();
+		delta = curr - last;
+		while (usecs > 0 && delta >= 100) {
+			usecs--;
+			last += 100;
+			delta -= 100;
+		}
+	}
 }