summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb@NetBSD.org>2001-06-19 08:34:49 +0000
committersimonb <simonb@NetBSD.org>2001-06-19 08:34:49 +0000
commit43eba608496d3c8a69bdf6bbadfec0df69f828ea (patch)
treede113112be3e4d0174f318550f9de50095ad526e
parenta8068ab82d9a7ff598ed92ae2b86a6ed21597334 (diff)
Make all the ppc delay() functions the same - formating change only, no
code changes. Step one of a unified ppc clock.c.
-rw-r--r--sys/arch/bebox/bebox/clock.c7
-rw-r--r--sys/arch/ofppc/ofppc/clock.c9
-rw-r--r--sys/arch/prep/prep/clock.c8
-rw-r--r--sys/arch/sandpoint/sandpoint/clock.c7
4 files changed, 17 insertions, 14 deletions
diff --git a/sys/arch/bebox/bebox/clock.c b/sys/arch/bebox/bebox/clock.c
index 7b5b1183694..605773fc15a 100644
--- a/sys/arch/bebox/bebox/clock.c
+++ b/sys/arch/bebox/bebox/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.7 2000/01/19 02:52:18 msaitoh Exp $ */
+/* $NetBSD: clock.c,v 1.8 2001/06/19 08:34:49 simonb Exp $ */
/* $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $ */
/*
@@ -166,8 +166,9 @@ delay(n)
tb += (n * 1000 + ns_per_tick - 1) / ns_per_tick;
tbh = tb >> 32;
tbl = tb;
- asm ("1: mftbu %0; cmpw %0,%1; blt 1b; bgt 2f; mftb %0; cmpw %0,%2; blt 1b; 2:"
- :: "r"(scratch), "r"(tbh), "r"(tbl));
+ asm volatile ("1: mftbu %0; cmplw %0,%1; blt 1b; bgt 2f;"
+ "mftb %0; cmplw %0,%2; blt 1b; 2:"
+ : "=r"(scratch) : "r"(tbh), "r"(tbl));
}
/*
diff --git a/sys/arch/ofppc/ofppc/clock.c b/sys/arch/ofppc/ofppc/clock.c
index 7e8060ed19e..a9cd864331c 100644
--- a/sys/arch/ofppc/ofppc/clock.c
+++ b/sys/arch/ofppc/ofppc/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.3 2000/01/19 02:52:20 msaitoh Exp $ */
+/* $NetBSD: clock.c,v 1.4 2001/06/19 08:34:50 simonb Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -177,7 +177,7 @@ microtime(tvp)
*/
void
delay(n)
- unsigned n;
+ unsigned int n;
{
u_quad_t tb;
u_long tbh, tbl, scratch;
@@ -186,8 +186,9 @@ delay(n)
tb += (n * 1000 + ns_per_tick - 1) / ns_per_tick;
tbh = tb >> 32;
tbl = tb;
- asm ("1: mftbu %0; cmpw %0,%1; blt 1b; bgt 2f; mftb %0; cmpw %0,%2; blt 1b; 2:"
- :: "r"(scratch), "r"(tbh), "r"(tbl));
+ asm volatile ("1: mftbu %0; cmplw %0,%1; blt 1b; bgt 2f;"
+ "mftb %0; cmplw %0,%2; blt 1b; 2:"
+ : "=r"(scratch) : "r"(tbh), "r"(tbl));
}
/*
diff --git a/sys/arch/prep/prep/clock.c b/sys/arch/prep/prep/clock.c
index 51dec305e79..ad931ea6bfc 100644
--- a/sys/arch/prep/prep/clock.c
+++ b/sys/arch/prep/prep/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.1 2000/02/29 15:21:47 nonaka Exp $ */
+/* $NetBSD: clock.c,v 1.2 2001/06/19 08:34:50 simonb Exp $ */
/* $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $ */
/*
@@ -320,7 +320,7 @@ delay(n)
tb += (n * 1000 + ns_per_tick - 1) / ns_per_tick;
tbh = tb >> 32;
tbl = tb;
- asm ("1: mftbu %0; cmpw %0,%1; blt 1b; bgt 2f; mftb %0; cmpw %0,%2; blt 1b; 2:"
- :: "r"(scratch), "r"(tbh), "r"(tbl));
+ asm volatile ("1: mftbu %0; cmplw %0,%1; blt 1b; bgt 2f;"
+ "mftb %0; cmplw %0,%2; blt 1b; 2:"
+ : "=r"(scratch) : "r"(tbh), "r"(tbl));
}
-
diff --git a/sys/arch/sandpoint/sandpoint/clock.c b/sys/arch/sandpoint/sandpoint/clock.c
index d8513da33cd..129883ceb23 100644
--- a/sys/arch/sandpoint/sandpoint/clock.c
+++ b/sys/arch/sandpoint/sandpoint/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.1 2001/02/04 18:32:17 briggs Exp $ */
+/* $NetBSD: clock.c,v 1.2 2001/06/19 08:34:51 simonb Exp $ */
/* $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $ */
/*
@@ -168,8 +168,9 @@ delay(n)
tb += (n * 1000 + ns_per_tick - 1) / ns_per_tick;
tbh = tb >> 32;
tbl = tb;
- asm ("1: mftbu %0; cmpw %0,%1; blt 1b; bgt 2f; mftb %0; cmpw %0,%2; blt 1b; 2:"
- :: "r"(scratch), "r"(tbh), "r"(tbl));
+ asm volatile ("1: mftbu %0; cmplw %0,%1; blt 1b; bgt 2f;"
+ "mftb %0; cmplw %0,%2; blt 1b; 2:"
+ : "=r"(scratch) : "r"(tbh), "r"(tbl));
}
/*