patch-2.1.48 linux/include/asm-ppc/delay.h

Next file: linux/include/asm-ppc/dma.h
Previous file: linux/include/asm-ppc/current.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.47/linux/include/asm-ppc/delay.h linux/include/asm-ppc/delay.h
@@ -1,14 +1,31 @@
 #ifndef _PPC_DELAY_H
 #define _PPC_DELAY_H
 
+/*
+ * Copyright 1996, Paul Mackerras.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
 
-extern __inline__ void __delay(unsigned long );
-extern __inline__ void __udelay(unsigned long );
-
+extern __inline__ void __delay(unsigned int loops)
+{
+	if (loops != 0)
+		__asm__ __volatile__("mtctr %0; 1: bdnz 1b" : :
+				     "r" (loops) : "ctr");
+}
 
-extern __inline__ unsigned long muldiv(unsigned long a, unsigned long b, unsigned long c)
+extern __inline__ void udelay(unsigned long usecs)
 {
-	return (a*b)/c;
+	unsigned long loops;
+
+	/* compute (usecs * 2^32 / 10^6) * loops_per_sec / 2^32 */
+	usecs *= 0x10c6;		/* 2^32 / 10^6 */
+	__asm__("mulhwu %0,%1,%2" : "=r" (loops) :
+		"r" (usecs), "r" (loops_per_sec));
+	__delay(loops);
 }
 
 #endif /* defined(_PPC_DELAY_H) */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov