summaryrefslogtreecommitdiff
path: root/linux/src
diff options
context:
space:
mode:
authorMarcus Brinkmann <marcus@gnu.org>2000-07-27 16:48:04 +0000
committerMarcus Brinkmann <marcus@gnu.org>2000-07-27 16:48:04 +0000
commit94395a0ecea8e3dcc2f09b3fd35c3c8cfad51eae (patch)
treec9227e16acabf2e6339eaa31e77c7d8b71a24d3b /linux/src
parent91933a41184cd816cb8ce4d96cf8764ebd7dde8c (diff)
2000-07-27 Marcus Brinkmann <marcus@gnu.org>
* Fix omissions in last change: * linux/src/arch/i386/lib/delay.S: Now really remove the file. * linux/src/arch/i386/lib/delay.c: Now really add the file.
Diffstat (limited to 'linux/src')
-rw-r--r--linux/src/arch/i386/lib/delay.S18
-rw-r--r--linux/src/arch/i386/lib/delay.c45
2 files changed, 45 insertions, 18 deletions
diff --git a/linux/src/arch/i386/lib/delay.S b/linux/src/arch/i386/lib/delay.S
deleted file mode 100644
index 9d36420..0000000
--- a/linux/src/arch/i386/lib/delay.S
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/linkage.h>
-
-/*
- * BogoMips loop. Non-inlined because various x86's have so wildly
- * varying results depending on the exact alignment.
- */
-
-ENTRY(__do_delay)
- jmp 1f
-.align 16
-1: jmp 2f
-.align 16
-2: decl %eax
- jns 2b
- ret
-
-
-
diff --git a/linux/src/arch/i386/lib/delay.c b/linux/src/arch/i386/lib/delay.c
new file mode 100644
index 0000000..b1551b2
--- /dev/null
+++ b/linux/src/arch/i386/lib/delay.c
@@ -0,0 +1,45 @@
+/*
+ * Precise Delay Loops for i386
+ *
+ * Copyright (C) 1993 Linus Torvalds
+ * Copyright (C) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *
+ * The __delay function must _NOT_ be inlined as its execution time
+ * depends wildly on alignment on many x86 processors. The additional
+ * jump magic is needed to get the timing stable on all the CPU's
+ * we have to worry about.
+ */
+
+#include <linux/sched.h>
+#include <linux/delay.h>
+
+#ifdef __SMP__
+#include <asm/smp.h>
+#endif
+
+void __delay(unsigned long loops)
+{
+ int d0;
+ __asm__ __volatile__(
+ "\tjmp 1f\n"
+ ".align 16\n"
+ "1:\tjmp 2f\n"
+ ".align 16\n"
+ "2:\tdecl %0\n\tjns 2b"
+ :"=&amp;a" (d0)
+ :"0" (loops));
+}
+
+inline void __const_udelay(unsigned long xloops)
+{
+ int d0;
+ __asm__("mull %0"
+ :"=d" (xloops), "=&amp;a" (d0)
+ :"1" (xloops),"0" (loops_per_sec));
+ __delay(xloops);
+}
+
+void __udelay(unsigned long usecs)
+{
+ __const_udelay(usecs * 0x000010c6); /* 2**32 / 1000000 */
+}