Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/broadcom Whitespace



details:   https://anonhg.NetBSD.org/src/rev/fb2f3b1371b2
branches:  trunk
changeset: 783773:fb2f3b1371b2
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Jan 08 12:15:42 2013 +0000

description:
Whitespace

diffstat:

 sys/arch/arm/broadcom/bcm2835_intr.c |  18 +++++++++---------
 sys/arch/arm/broadcom/bcm2835_mbox.c |   7 ++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diffs (103 lines):

diff -r 79d14e10b02d -r fb2f3b1371b2 sys/arch/arm/broadcom/bcm2835_intr.c
--- a/sys/arch/arm/broadcom/bcm2835_intr.c      Tue Jan 08 12:13:58 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_intr.c      Tue Jan 08 12:15:42 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm2835_intr.c,v 1.2 2012/08/18 22:28:23 jakllsch Exp $        */
+/*     $NetBSD: bcm2835_intr.c,v 1.3 2013/01/08 12:15:42 skrll Exp $   */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.2 2012/08/18 22:28:23 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.3 2013/01/08 12:15:42 skrll Exp $");
 
 #define _INTR_PRIVATE
 
@@ -78,10 +78,10 @@
 };
 
 struct bcm2835icu_softc *bcmicu_sc;
-       
+
 #define read_bcm2835reg(o)     \
        bus_space_read_4(bcmicu_sc->sc_iot, bcmicu_sc->sc_ioh, (o))
-       
+
 #define write_bcm2835reg(o, v) \
        bus_space_write_4(bcmicu_sc->sc_iot, bcmicu_sc->sc_ioh, (o), (v))
 
@@ -89,7 +89,7 @@
 #define bcm2835_barrier() \
        bus_space_barrier(bcmicu_sc->sc_iot, bcmicu_sc->sc_ioh, 0, \
            BCM2835_ARMICU_SIZE, BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE)
-       
+
 static const char * const bcm2835_sources[BCM2835_NIRQ] = {
        "(unused  0)",  "(unused  1)",  "(unused  2)",  "timer3",
        "(unused  4)",  "(unused  5)",  "(unused  6)",  "jpeg",
@@ -212,24 +212,24 @@
        if (armirq) {
                ipl |= pic_mark_pending_sources(pic, BCM2835_INT_BASICBASE,
                    armirq);
-               
+
        }
 
        if (gpu0irq || (bpending & BCM2835_INTBIT_PENDING1)) {
                uint32_t pending1;
-               
+
                pending1 = read_bcm2835reg(BCM2835_INTC_IRQ1PENDING);
                ipl |= pic_mark_pending_sources(pic, BCM2835_INT_GPU0BASE,
                    pending1);
        }
        if (gpu1irq || (bpending & BCM2835_INTBIT_PENDING2)) {
                uint32_t pending2;
-               
+
                pending2 = read_bcm2835reg(BCM2835_INTC_IRQ2PENDING);
                ipl |= pic_mark_pending_sources(pic, BCM2835_INT_GPU1BASE,
                    pending2);
        }
-               
+
        return ipl;
 }
 
diff -r 79d14e10b02d -r fb2f3b1371b2 sys/arch/arm/broadcom/bcm2835_mbox.c
--- a/sys/arch/arm/broadcom/bcm2835_mbox.c      Tue Jan 08 12:13:58 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_mbox.c      Tue Jan 08 12:15:42 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm2835_mbox.c,v 1.4 2013/01/08 09:11:11 jmcneill Exp $        */
+/*     $NetBSD: bcm2835_mbox.c,v 1.5 2013/01/08 12:15:42 skrll Exp $   */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox.c,v 1.4 2013/01/08 09:11:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox.c,v 1.5 2013/01/08 12:15:42 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -88,7 +88,7 @@
 
        if (bcm2835mbox_sc == NULL)
                bcm2835mbox_sc = sc;
-       
+
        sc->sc_dev = self;
        sc->sc_iot = aaa->aaa_iot;
        sc->sc_dmat = aaa->aaa_dmat;
@@ -174,5 +174,6 @@
        bus_dmamem_unmap(sc->sc_dmat, dma_buf, buflen);
 map_failed:
        bus_dmamem_free(sc->sc_dmat, segs, nsegs);
+       
        return error;
 }



Home | Main Index | Thread Index | Old Index