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 Trailing whitespace
details: https://anonhg.NetBSD.org/src/rev/5f809edf22e8
branches: trunk
changeset: 786080:5f809edf22e8
user: skrll <skrll%NetBSD.org@localhost>
date: Sun Apr 14 15:11:52 2013 +0000
description:
Trailing whitespace
diffstat:
sys/arch/arm/broadcom/bcm2835_emmc.c | 8 ++++----
sys/arch/arm/broadcom/bcm2835_gpioreg.h | 4 ++--
sys/arch/arm/broadcom/bcm2835_mbox.c | 6 +++---
sys/arch/arm/broadcom/bcm2835_pm.c | 10 +++++-----
sys/arch/arm/broadcom/bcm2835_space.c | 6 +++---
sys/arch/arm/broadcom/bcm2835_vcaudio.c | 12 ++++++------
sys/arch/arm/broadcom/bcm2835_vcaudioreg.h | 2 +-
7 files changed, 24 insertions(+), 24 deletions(-)
diffs (205 lines):
diff -r 5da7bfb426c6 -r 5f809edf22e8 sys/arch/arm/broadcom/bcm2835_emmc.c
--- a/sys/arch/arm/broadcom/bcm2835_emmc.c Sun Apr 14 13:47:37 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_emmc.c Sun Apr 14 15:11:52 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_emmc.c,v 1.7 2013/01/10 17:21:36 jmcneill Exp $ */
+/* $NetBSD: bcm2835_emmc.c,v 1.8 2013/04/14 15:11:52 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.7 2013/01/10 17:21:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.8 2013/04/14 15:11:52 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,8 +102,8 @@
frequency = prop_dictionary_get(dict, "frequency");
if (frequency != NULL) {
sc->sc.sc_clkbase = prop_number_integer_value(frequency) / 1000;
- }
-
+ }
+
error = bus_space_map(sc->sc_iot, aaa->aaa_addr, aaa->aaa_size, 0,
&sc->sc_ioh);
if (error) {
diff -r 5da7bfb426c6 -r 5f809edf22e8 sys/arch/arm/broadcom/bcm2835_gpioreg.h
--- a/sys/arch/arm/broadcom/bcm2835_gpioreg.h Sun Apr 14 13:47:37 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_gpioreg.h Sun Apr 14 15:11:52 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_gpioreg.h,v 1.1 2013/01/05 19:55:18 jakllsch Exp $ */
+/* $NetBSD: bcm2835_gpioreg.h,v 1.2 2013/04/14 15:11:52 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -31,7 +31,7 @@
#define BCM2835_GPIO_GPFSEL(x) (0x000 + (x) * sizeof(uint32_t))
#define BCM2835_GPIO_GPFSEL_PINS_PER_REGISTER 10
-#define BCM2835_GPIO_GPFSEL_BITS_PER_PIN 3
+#define BCM2835_GPIO_GPFSEL_BITS_PER_PIN 3
#define BCM2835_GPIO_IN 00
#define BCM2835_GPIO_OUT 01
diff -r 5da7bfb426c6 -r 5f809edf22e8 sys/arch/arm/broadcom/bcm2835_mbox.c
--- a/sys/arch/arm/broadcom/bcm2835_mbox.c Sun Apr 14 13:47:37 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_mbox.c Sun Apr 14 15:11:52 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_mbox.c,v 1.5 2013/01/08 12:15:42 skrll Exp $ */
+/* $NetBSD: bcm2835_mbox.c,v 1.6 2013/04/14 15:11:52 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.5 2013/01/08 12:15:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox.c,v 1.6 2013/04/14 15:11:52 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -174,6 +174,6 @@
bus_dmamem_unmap(sc->sc_dmat, dma_buf, buflen);
map_failed:
bus_dmamem_free(sc->sc_dmat, segs, nsegs);
-
+
return error;
}
diff -r 5da7bfb426c6 -r 5f809edf22e8 sys/arch/arm/broadcom/bcm2835_pm.c
--- a/sys/arch/arm/broadcom/bcm2835_pm.c Sun Apr 14 13:47:37 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_pm.c Sun Apr 14 15:11:52 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_pm.c,v 1.2 2013/01/10 02:23:26 jmcneill Exp $ */
+/* $NetBSD: bcm2835_pm.c,v 1.3 2013/04/14 15:11:52 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_pm.c,v 1.2 2013/01/10 02:23:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_pm.c,v 1.3 2013/04/14 15:11:52 skrll Exp $");
#include <sys/param.h>
@@ -107,7 +107,7 @@
if (bcm2835pm_sc == NULL)
bcm2835pm_sc = sc;
-
+
sc->sc_dev = self;
sc->sc_iot = aaa->aaa_iot;
@@ -138,9 +138,9 @@
rstc |= tmp & ~BCM2835_PM_RSTC_CONFIGMASK;
rstc |= BCM2835_PM_RSTC_FULL_RESET;
-
+
wdog |= ticks & BCM2835_PM_WDOG_TIMEMASK;
-
+
bus_space_write_4(sc->sc_iot, sc->sc_ioh, BCM2835_PM_WDOG, wdog);
bus_space_write_4(sc->sc_iot, sc->sc_ioh, BCM2835_PM_RSTC, rstc);
}
diff -r 5da7bfb426c6 -r 5f809edf22e8 sys/arch/arm/broadcom/bcm2835_space.c
--- a/sys/arch/arm/broadcom/bcm2835_space.c Sun Apr 14 13:47:37 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_space.c Sun Apr 14 15:11:52 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_space.c,v 1.5 2013/01/26 08:01:49 skrll Exp $ */
+/* $NetBSD: bcm2835_space.c,v 1.6 2013/04/14 15:11:52 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_space.c,v 1.5 2013/01/26 08:01:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_space.c,v 1.6 2013/04/14 15:11:52 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -355,7 +355,7 @@
bus_size_t len, int flags)
{
flags &= BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE;
-
+
if (flags) {
/* Issue an ARM11 Data Syncronisation Barrier (DSB) */
__asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0)
diff -r 5da7bfb426c6 -r 5f809edf22e8 sys/arch/arm/broadcom/bcm2835_vcaudio.c
--- a/sys/arch/arm/broadcom/bcm2835_vcaudio.c Sun Apr 14 13:47:37 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_vcaudio.c Sun Apr 14 15:11:52 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_vcaudio.c,v 1.1 2013/03/24 19:55:19 jmcneill Exp $ */
+/* $NetBSD: bcm2835_vcaudio.c,v 1.2 2013/04/14 15:11:52 skrll Exp $ */
/*-
* Copyright (c) 2013 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_vcaudio.c,v 1.1 2013/03/24 19:55:19 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_vcaudio.c,v 1.2 2013/04/14 15:11:52 skrll Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -239,7 +239,7 @@
sc->sc_format.frequency_type = 0;
sc->sc_format.frequency[0] = 8000;
sc->sc_format.frequency[1] = 48000;
-
+
error = auconv_create_encodings(&sc->sc_format, 1, &sc->sc_encodings);
if (error) {
aprint_error_dev(sc->sc_dev,
@@ -416,7 +416,7 @@
msg.type = VC_AUDIO_MSG_TYPE_WRITE;
msg.u.write.count = PAGE_SIZE * 3;
msg.u.write.callback = NULL;
- msg.u.write.cookie = NULL;
+ msg.u.write.cookie = NULL;
msg.u.write.silence = 1;
msg.u.write.max_packet = 0;
error = vchi_msg_queue(sc->sc_service, &msg, sizeof(msg),
@@ -435,7 +435,7 @@
msg.u.write.max_packet = 4000;
msg.u.write.count = count;
msg.u.write.callback = intr;
- msg.u.write.cookie = intrarg;
+ msg.u.write.cookie = intrarg;
msg.u.write.silence = 0;
error = vchi_msg_queue(sc->sc_service, &msg, sizeof(msg),
@@ -701,7 +701,7 @@
return 0;
}
-
+
static int
vcaudio_trigger_input(void *priv, void *start, void *end, int blksize,
void (*intr)(void *), void *intrarg, const audio_params_t *params)
diff -r 5da7bfb426c6 -r 5f809edf22e8 sys/arch/arm/broadcom/bcm2835_vcaudioreg.h
--- a/sys/arch/arm/broadcom/bcm2835_vcaudioreg.h Sun Apr 14 13:47:37 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_vcaudioreg.h Sun Apr 14 15:11:52 2013 +0000
@@ -44,7 +44,7 @@
VC_AUDIO_MSG_TYPE_RESULT, // Generic result
VC_AUDIO_MSG_TYPE_COMPLETE, // playback of samples complete
VC_AUDIO_MSG_TYPE_CONFIG, // Configure
- VC_AUDIO_MSG_TYPE_CONTROL, // control
+ VC_AUDIO_MSG_TYPE_CONTROL, // control
VC_AUDIO_MSG_TYPE_OPEN, // open
VC_AUDIO_MSG_TYPE_CLOSE, // close/shutdown
VC_AUDIO_MSG_TYPE_START, // start output (i.e. resume)
Home |
Main Index |
Thread Index |
Old Index