From 2c1cbdae75d944f85ff66b8095b3d38d97a4cfd4 Mon Sep 17 00:00:00 2001
From: mark <mark@NetBSD.org>
Date: Tue, 2 Jun 1998 21:57:58 +0000
Subject: [PATCH] Moved delay() from machdep.c to iomd_clock.c as delay will be
 dependant on the system timers being used.

---
 sys/arch/arm32/arm32/machdep.c   | 28 +---------------------------
 sys/arch/arm32/iomd/iomd_clock.c | 28 +++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/sys/arch/arm32/arm32/machdep.c b/sys/arch/arm32/arm32/machdep.c
index 843cd4a53366..dfe57e561f12 100644
--- a/sys/arch/arm32/arm32/machdep.c
+++ b/sys/arch/arm32/arm32/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.36 1998/06/02 20:41:49 mark Exp $	*/
+/*	$NetBSD: machdep.c,v 1.37 1998/06/02 21:57:58 mark Exp $	*/
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -224,32 +224,6 @@ bootsync(void)
 	vfs_shutdown();
 }
 
-/*
- * Estimated loop for n microseconds
- */
-
-/* Need to re-write this to use the timers */
-
-/* One day soon I will actually do this */
-
-int delaycount = 50;
-
-void
-delay(n)
-	u_int n;
-{
-	u_int i;
-
-	if (n == 0) return;
-	while (--n > 0) {
-		if (cputype == ID_SA110)	/* XXX - Seriously gross hack */
-			for (i = delaycount; --i;);
-		else
-			for (i = 8; --i;);
-	}
-}
-
-
 /*
  * A few functions that are used to help construct the page tables
  * during the bootstrap process.
diff --git a/sys/arch/arm32/iomd/iomd_clock.c b/sys/arch/arm32/iomd/iomd_clock.c
index 7025d8e91a02..d31998803c01 100644
--- a/sys/arch/arm32/iomd/iomd_clock.c
+++ b/sys/arch/arm32/iomd/iomd_clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iomd_clock.c,v 1.17 1998/03/26 21:27:12 mark Exp $	*/
+/*	$NetBSD: iomd_clock.c,v 1.18 1998/06/02 21:57:58 mark Exp $	*/
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
@@ -53,6 +53,7 @@
 #include <sys/device.h>
 
 #include <machine/irqhandler.h>
+#include <machine/cpufunc.h>
 #include <arm32/iomd/iomdvar.h>
 #include <arm32/iomd/iomdreg.h>
 
@@ -313,4 +314,29 @@ need_proftick(p)
 {
 }
 
+/*
+ * Estimated loop for n microseconds
+ */
+
+/* Need to re-write this to use the timers */
+
+/* One day soon I will actually do this */
+
+int delaycount = 50;
+
+void
+delay(n)
+	u_int n;
+{
+	u_int i;
+
+	if (n == 0) return;
+	while (--n > 0) {
+		if (cputype == ID_SA110)	/* XXX - Seriously gross hack */
+			for (i = delaycount; --i;);
+		else
+			for (i = 8; --i;);
+	}
+}
+
 /* End of iomd_clock.c */