patch-2.4.22 linux-2.4.22/include/asm-mips64/delay.h

• Lines: 75
• Date: 2003-08-25 04:44:44.000000000 -0700
• Orig file: linux-2.4.21/include/asm-mips64/delay.h
• Orig date: 2002-11-28 15:53:15.000000000 -0800

diff -urN linux-2.4.21/include/asm-mips64/delay.h linux-2.4.22/include/asm-mips64/delay.h
@@ -11,11 +11,11 @@
 #define _ASM_DELAY_H
 
 #include <linux/config.h>
-#include <asm/param.h>
+#include <linux/param.h>
 
 extern unsigned long loops_per_jiffy;
 
-extern __inline__ void
+static __inline__ void
 __delay(unsigned long loops)
 {
 	__asm__ __volatile__ (
@@ -37,14 +37,20 @@
  * first constant multiplications gets optimized away if the delay is
  * a constant)
  */
-extern __inline__ void __udelay(unsigned long usecs, unsigned long lpj)
+static inline void __udelay(unsigned long usecs, unsigned long lpj)
 {
 	unsigned long lo;
 
-#if (HZ == 100)
-	usecs *= 0x00068db8bac710cbUL;		/* 2**64 / (1000000 / HZ) */
-#elif (HZ == 128)
-	usecs *= 0x0008637bd05af6c6UL;		/* 2**64 / (1000000 / HZ) */
+	/*
+	 * The common rates of 1000 and 128 are rounded wrongly by the
+	 * catchall case.  Excessive precission?  Probably ...
+	 */
+#if (HZ == 128)
+	usecs *= 0x0008637bd05af6c7UL;		/* 2**64 / (1000000 / HZ) */
+#elif (HZ == 1000)
+	usecs *= 0x004189374BC6A7f0UL;		/* 2**64 / (1000000 / HZ) */
+#else
+	usecs *= (0x8000000000000000UL / (500000 / HZ));
 #endif
 	__asm__("dmultu\t%2,%3"
 		:"=h" (usecs), "=l" (lo)
@@ -52,6 +58,27 @@
 	__delay(usecs);
 }
 
+static inline void __ndelay(unsigned long nsecs, unsigned long lpj)
+{
+	unsigned long lo;
+
+	/*
+	 * The common rates of 1000 and 128 are rounded wrongly by the
+	 * catchall case.  Excessive precission?  Probably ...
+	 */
+#if (HZ == 128)
+	nsecs *= 0x000001ad7f29abcbUL;		/* 2**64 / (1000000000 / HZ) */
+#elif (HZ == 1000)
+	nsecs *= 0x0010c6f7a0b5eeUL;		/* 2**64 / (1000000000 / HZ) */
+#else
+	nsecs *= (0x8000000000000000UL / (500000000 / HZ));
+#endif
+	__asm__("dmultu\t%2,%3"
+		:"=h" (nsecs), "=l" (lo)
+		:"r" (nsecs),"r" (lpj));
+	__delay(nsecs);
+}
+
 #ifdef CONFIG_SMP
 #define __udelay_val cpu_data[smp_processor_id()].udelay_val
 #else
@@ -59,5 +86,6 @@
 #endif
 
 #define udelay(usecs) __udelay((usecs),__udelay_val)
+#define ndelay(nsecs) __ndelay((nsecs),__udelay_val)
 
 #endif /* _ASM_DELAY_H */