[src/netbsd-6]: src/sys/arch/arm/broadcom Pull up revision 1.2 (requested by ...

[jdc <jdc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ccb8e2590513
branches:  netbsd-6
changeset: 775516:ccb8e2590513
user:      jdc <jdc%NetBSD.org@localhost>
date:      Sat Nov 24 19:14:49 2012 +0000

description:
Pull up revision 1.2 (requested by skrll in ticket #704).

Fix delay.

diffstat:

 sys/arch/arm/broadcom/bcm2835_tmr.c |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r 02bed9daec3e -r ccb8e2590513 sys/arch/arm/broadcom/bcm2835_tmr.c
--- a/sys/arch/arm/broadcom/bcm2835_tmr.c       Sat Nov 24 19:02:09 2012 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_tmr.c       Sat Nov 24 19:14:49 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm2835_tmr.c,v 1.1.2.2 2012/08/09 06:36:50 jdc Exp $  */
+/*     $NetBSD: bcm2835_tmr.c,v 1.1.2.3 2012/11/24 19:14:49 jdc Exp $  */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.1.2.2 2012/08/09 06:36:50 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.1.2.3 2012/11/24 19:14:49 jdc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -159,22 +159,19 @@
        uint32_t delta, usecs;
 
        KASSERT(sc != NULL);
-       int nhloops = 0;
 
        last = bus_space_read_4(sc->sc_iot, sc->sc_ioh, BCM2835_STIMER_CLO);
 
        delta = usecs = 0;
        while (n > usecs) {
-               if (nhloops++ > 0x100000) Debugger();
                curr = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
                    BCM2835_STIMER_CLO);
 
-               /* XXXNH !?!?!?!?!?!?! - use CHI? */
                /* Check to see if the timer has wrapped around. */
                if (curr < last)
-                       delta += (last + (counts_per_hz - curr));
+                       delta += curr + (UINT32_MAX - last);
                else
-                       delta += (last - curr);
+                       delta += curr - last;
 
                last = curr;