From b24153bad2ddb030c3d0c81b89885cc43c7436ba Mon Sep 17 00:00:00 2001 From: skrll Date: Fri, 1 Feb 2013 16:10:16 +0000 Subject: [PATCH] Use bus_space_read_multi_4 and fix copyright year. From Jared. --- sys/arch/arm/broadcom/bcm2835_rng.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/arch/arm/broadcom/bcm2835_rng.c b/sys/arch/arm/broadcom/bcm2835_rng.c index ab90e8c25294..47d25eb05651 100644 --- a/sys/arch/arm/broadcom/bcm2835_rng.c +++ b/sys/arch/arm/broadcom/bcm2835_rng.c @@ -1,7 +1,7 @@ -/* $NetBSD: bcm2835_rng.c,v 1.2 2013/01/30 11:52:54 jmcneill Exp $ */ +/* $NetBSD: bcm2835_rng.c,v 1.3 2013/02/01 16:10:16 skrll Exp $ */ /*- - * Copyright (c) 2012 The NetBSD Foundation, Inc. + * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bcm2835_rng.c,v 1.2 2013/01/30 11:52:54 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_rng.c,v 1.3 2013/02/01 16:10:16 skrll Exp $"); #include #include @@ -126,15 +126,13 @@ bcmrng_tick(void *priv) { struct bcm2835rng_softc *sc = priv; uint32_t status; - int cnt, i; + int cnt; status = bus_space_read_4(sc->sc_iot, sc->sc_ioh, RNG_STATUS); cnt = (status & RNG_STATUS_CNT_MASK) >> RNG_STATUS_CNT_SHIFT; - for (i = 0; i < cnt; i++) { - sc->sc_data[i] = bus_space_read_4(sc->sc_iot, sc->sc_ioh, - RNG_DATA); - } if (cnt > 0) { + bus_space_read_multi_4(sc->sc_iot, sc->sc_ioh, RNG_DATA, + sc->sc_data, cnt); rnd_add_data(&sc->sc_rnd, sc->sc_data, cnt * 4, cnt * 4 * NBBY); }