 @@ -1,14 +1,14 @@
-/*	$NetBSD: clock.c,v 1.37 2005/12/24 20:06:58 perry Exp $	*/
+/*	$NetBSD: clock.c,v 1.37.34.1 2009/01/03 11:17:41 jdc Exp $	*/
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -67,27 +67,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from: Utah $Hdr: clock.c 1.18 91/01/21$
+ *
  *	@(#)clock.c	7.6 (Berkeley) 5/7/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.37 2005/12/24 20:06:58 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.37.34.1 2009/01/03 11:17:41 jdc Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/uio.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/event.h>
 #include <dev/clock_subr.h>
 #include <machine/psl.h>
 @@ -323,59 +323,55 @@ clkread()
 		return(delta + tick);
 	return(delta);
+}
 #define TIMB_FREQ	614400
 #define TIMB_LIMIT	256
 /*
  * Wait "n" microseconds.
  * Relies on MFP-Timer B counting down from TIMB_LIMIT at TIMB_FREQ Hz.
  * Note: timer had better have been programmed before this is first used!
  */
 void
-delay(n)
+delay(unsigned int n)
 int	n;
+{
-	int	ticks, otick;
+	int	ticks, otick, remaining;
 	/*
 	 * Read the counter first, so that the rest of the setup overhead is
 	 * counted.
 	 */
 	otick = MFP->mf_tbdr;
-	/*
+	if (n <= UINT_MAX / TIMB_FREQ) {
-	 * Calculate ((n * TIMER_FREQ) / 1e6) using explicit assembler code so
+		/*
-	 * we can take advantage of the intermediate 64-bit quantity to prevent
+		 * For unsigned arithmetic, division can be replaced with
-	 * loss of significance.
+		 * multiplication with the inverse and a shift.
-	 */
+		 */
-	n -= 5;
+		remaining = n * TIMB_FREQ / 1000000;
-	if(n < 0)
+	} else {
-		return;
+		/* This is a very long delay.
 		 * Being slow here doesn't matter.
-	    u_int	temp;
+		 */
 		remaining = (unsigned long long) n * TIMB_FREQ / 1000000;
 	    __asm volatile ("mulul %2,%1:%0" : "=d" (n), "=d" (temp)
 					       : "d" (TIMB_FREQ), "d" (n));
 	    __asm volatile ("divul %1,%2:%0" : "=d" (n)
 					       : "d"(1000000),"d"(temp),"0"(n));
+	}
-	while(n > 0) {
+	while(remaining > 0) {
 		ticks = MFP->mf_tbdr;
 		if(ticks > otick)
-			n -= TIMB_LIMIT - (ticks - otick);
+			remaining -= TIMB_LIMIT - (ticks - otick);
-		else n -= otick - ticks;
+		else
 			remaining -= otick - ticks;
 		otick = ticks;
+	}
+}
 #ifdef GPROF
 /*
  * profclock() is expanded in line in lev6intr() unless profiling kernel.
  * Assumes it is called with clock interrupts blocked.
  */
 profclock(pc, ps)
 	caddr_t pc;
 	int ps;
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: param.h,v 1.30 2005/12/11 12:16:59 christos Exp $	*/
+/*	$NetBSD: param.h,v 1.30.68.1 2009/01/03 11:17:41 jdc Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -102,19 +102,19 @@
 #define	NPTEPG		(NBPG/(sizeof (pt_entry_t)))
 /*
  * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
  * logical pages.
  */
 #define	NKMEMPAGES_MIN_DEFAULT	((3 * 1024 * 1024) >> PAGE_SHIFT)
 #define	NKMEMPAGES_MAX_DEFAULT	((3 * 1024 * 1024) >> PAGE_SHIFT)
 #ifdef	_KERNEL
 #include <machine/intr.h>
-void delay __P((int));
+void delay(unsigned int);
 #define	DELAY(n)	delay(n)
 #endif	/* _KERNEL */
 #endif	/* !_MACHINE_PARAM_H_ */