Module Name: src
Committed By: skrll
Date: Sat Oct 13 07:57:50 UTC 2012
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_mbox_subr.c
Log Message:
Unwrap short line. Other whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcm2835_mbox_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_mbox_subr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_mbox_subr.c:1.1 src/sys/arch/arm/broadcom/bcm2835_mbox_subr.c:1.2
--- src/sys/arch/arm/broadcom/bcm2835_mbox_subr.c:1.1 Wed Aug 22 13:19:47 2012
+++ src/sys/arch/arm/broadcom/bcm2835_mbox_subr.c Sat Oct 13 07:57:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_mbox_subr.c,v 1.1 2012/08/22 13:19:47 jakllsch Exp $ */
+/* $NetBSD: bcm2835_mbox_subr.c,v 1.2 2012/10/13 07:57:50 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox_subr.c,v 1.1 2012/08/22 13:19:47 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox_subr.c,v 1.2 2012/10/13 07:57:50 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,15 +54,14 @@ bcm2835_mbox_read(bus_space_tag_t iot, b
uint8_t rchan;
uint32_t rdata;
- bus_space_barrier(iot, ioh, 0,
- BCM2835_MBOX_SIZE, BUS_SPACE_BARRIER_READ);
+ bus_space_barrier(iot, ioh, 0, BCM2835_MBOX_SIZE,
+ BUS_SPACE_BARRIER_READ);
if ((bus_space_read_4(iot, ioh,
BCM2835_MBOX0_STATUS) & BCM2835_MBOX_STATUS_EMPTY) != 0)
continue;
- mbox = bus_space_read_4(iot, ioh,
- BCM2835_MBOX0_READ);
+ mbox = bus_space_read_4(iot, ioh, BCM2835_MBOX0_READ);
rchan = BCM2835_MBOX_CHAN(mbox);
rdata = BCM2835_MBOX_DATA(mbox);
@@ -82,17 +81,17 @@ bcm2835_mbox_write(bus_space_tag_t iot,
for (;;) {
- bus_space_barrier(iot, ioh, 0,
- BCM2835_MBOX_SIZE, BUS_SPACE_BARRIER_READ);
+ bus_space_barrier(iot, ioh, 0, BCM2835_MBOX_SIZE,
+ BUS_SPACE_BARRIER_READ);
if ((rdata = bus_space_read_4(iot, ioh,
BCM2835_MBOX0_STATUS) & BCM2835_MBOX_STATUS_FULL) == 0)
break;
}
- bus_space_write_4(iot, ioh,
- BCM2835_MBOX1_WRITE, BCM2835_MBOX_MSG(chan, data));
+ bus_space_write_4(iot, ioh, BCM2835_MBOX1_WRITE,
+ BCM2835_MBOX_MSG(chan, data));
- bus_space_barrier(iot, ioh, 0,
- BCM2835_MBOX_SIZE, BUS_SPACE_BARRIER_WRITE);
+ bus_space_barrier(iot, ioh, 0, BCM2835_MBOX_SIZE,
+ BUS_SPACE_BARRIER_WRITE);
}
