From e47f00743fc4776491344f2c618cc8dc2c23bcbc Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 11 Jan 2001 04:02:40 +0000 Subject: Merge with Linux 2.4.0. --- arch/sh/lib/delay.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'arch/sh/lib') diff --git a/arch/sh/lib/delay.c b/arch/sh/lib/delay.c index cadd7367e..790fd1808 100644 --- a/arch/sh/lib/delay.c +++ b/arch/sh/lib/delay.c @@ -1,21 +1,31 @@ /* * Precise Delay Loops for SuperH * - * Copyright (C) 1999 Niibe Yutaka + * Copyright (C) 1999 Niibe Yutaka & Kaz Kojima */ #include #include +void __delay(unsigned long loops) +{ + __asm__ __volatile__( + "tst %0, %0\n\t" + "1:\t" + "bf/s 1b\n\t" + " dt %0" + : "=r" (loops) + : "0" (loops) + : "t"); +} + inline void __const_udelay(unsigned long xloops) { - xloops *= current_cpu_data.loops_per_sec; - __delay(xloops); + xloops *= current_cpu_data.loops_per_jiffy; + __delay(xloops * HZ); } -#if 0 void __udelay(unsigned long usecs) { __const_udelay(usecs * 0x000010c6); /* 2**32 / 1000000 */ } -#endif -- cgit v1.2.3