Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Trailing whitespace
details: https://anonhg.NetBSD.org/src/rev/3246c1ef251b
branches: trunk
changeset: 827708:3246c1ef251b
user: skrll <skrll%NetBSD.org@localhost>
date: Thu Nov 09 21:36:46 2017 +0000
description:
Trailing whitespace
diffstat:
distrib/utils/embedded/conf/armv7.conf | 4 +-
distrib/utils/embedded/conf/rpi.conf | 4 +-
sys/arch/arm/broadcom/bcm2835_gpio.c | 38 +++++++++++++++++-----------------
sys/arch/arm/broadcom/bcm2835_space.c | 6 ++--
sys/arch/arm/cortex/gtmr_var.h | 4 +-
5 files changed, 28 insertions(+), 28 deletions(-)
diffs (220 lines):
diff -r 390b66002a73 -r 3246c1ef251b distrib/utils/embedded/conf/armv7.conf
--- a/distrib/utils/embedded/conf/armv7.conf Thu Nov 09 20:30:01 2017 +0000
+++ b/distrib/utils/embedded/conf/armv7.conf Thu Nov 09 21:36:46 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.18 2017/10/08 00:15:13 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.19 2017/11/09 21:36:46 skrll Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -62,7 +62,7 @@
cat > ${mnt}/boot/config.txt << EOF
# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
-enable_uart=1
+enable_uart=1
force_turbo=0
EOF
diff -r 390b66002a73 -r 3246c1ef251b distrib/utils/embedded/conf/rpi.conf
--- a/distrib/utils/embedded/conf/rpi.conf Thu Nov 09 20:30:01 2017 +0000
+++ b/distrib/utils/embedded/conf/rpi.conf Thu Nov 09 21:36:46 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.30 2017/07/31 16:34:22 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.31 2017/11/09 21:36:46 skrll Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -49,7 +49,7 @@
cat > ${mnt}/boot/cmdline.txt << EOF
root=ld0a console=fb
-#fb=1280x1024 # to select a mode, otherwise try EDID
+#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
diff -r 390b66002a73 -r 3246c1ef251b sys/arch/arm/broadcom/bcm2835_gpio.c
--- a/sys/arch/arm/broadcom/bcm2835_gpio.c Thu Nov 09 20:30:01 2017 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_gpio.c Thu Nov 09 21:36:46 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_gpio.c,v 1.4 2017/09/21 19:28:14 skrll Exp $ */
+/* $NetBSD: bcm2835_gpio.c,v 1.5 2017/11/09 21:37:52 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.4 2017/09/21 19:28:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.5 2017/11/09 21:37:52 skrll Exp $");
/*
* Driver for BCM2835 GPIO
@@ -107,12 +107,12 @@
u_int func;
int error;
#endif
-
+
sc->sc_dev = self;
-
+
#if NGPIO > 0
if (device_unit(sc->sc_dev) > 1) {
- aprint_naive(" NO GPIO\n");
+ aprint_naive(" NO GPIO\n");
aprint_normal(": NO GPIO\n");
return;
} else if (device_unit(sc->sc_dev) == 1) {
@@ -122,8 +122,8 @@
maxpin = 31;
minpin = 0;
}
-
- aprint_naive("\n");
+
+ aprint_naive("\n");
aprint_normal(": GPIO [%d...%d]\n", minpin, maxpin);
sc->sc_iot = aaa->aaa_iot;
@@ -137,13 +137,13 @@
for (pin = minpin; pin <= maxpin; pin++) {
int epin = pin - minpin;
-
+
sc->sc_gpio_pins[epin].pin_num = epin;
/*
* find out pins still available for GPIO
*/
func = bcm2835gpio_function_read(pin);
-
+
if (func == BCM2835_GPIO_IN ||
func == BCM2835_GPIO_OUT) {
sc->sc_gpio_pins[epin].pin_caps = GPIO_PIN_INPUT |
@@ -160,13 +160,13 @@
DPRINTF(1, ("%s: skip pin %d - func = 0x%x\n", device_xname(sc->sc_dev), pin, func));
}
}
-
+
/* create controller tag */
sc->sc_gpio_gc.gp_cookie = sc;
sc->sc_gpio_gc.gp_pin_read = bcm2835gpio_gpio_pin_read;
sc->sc_gpio_gc.gp_pin_write = bcm2835gpio_gpio_pin_write;
sc->sc_gpio_gc.gp_pin_ctl = bcm2835gpio_gpio_pin_ctl;
-
+
gba.gba_gc = &sc->sc_gpio_gc;
gba.gba_pins = sc->sc_gpio_pins;
gba.gba_npins = maxpin - minpin + 1;
@@ -190,7 +190,7 @@
if (device_unit(sc->sc_dev) > 1) {
return 0;
}
-
+
val = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
BCM2835_GPIO_GPLEV(epin / BCM2835_GPIO_GPLEV_PINS_PER_REGISTER));
@@ -198,7 +198,7 @@
GPIO_PIN_HIGH : GPIO_PIN_LOW;
DPRINTF(2, ("%s: gpio_read pin %d->%d\n", device_xname(sc->sc_dev), epin, (res == GPIO_PIN_HIGH)));
-
+
return res;
}
@@ -208,17 +208,17 @@
struct bcmgpio_softc *sc = arg;
int epin = pin + device_unit(sc->sc_dev) * 32;
bus_size_t reg;
-
+
if (device_unit(sc->sc_dev) > 1) {
return;
}
-
+
if (value == GPIO_PIN_HIGH) {
reg = BCM2835_GPIO_GPSET(epin / BCM2835_GPIO_GPSET_PINS_PER_REGISTER);
} else {
reg = BCM2835_GPIO_GPCLR(epin / BCM2835_GPIO_GPCLR_PINS_PER_REGISTER);
}
-
+
bus_space_write_4(sc->sc_iot, sc->sc_ioh,
reg, 1 << (epin % BCM2835_GPIO_GPSET_PINS_PER_REGISTER));
DPRINTF(2, ("%s: gpio_write pin %d<-%d\n", device_xname(sc->sc_dev), epin, (value == GPIO_PIN_HIGH)));
@@ -230,11 +230,11 @@
struct bcmgpio_softc *sc = arg;
uint32_t cmd;
int epin = pin + device_unit(sc->sc_dev) * 32;
-
+
if (device_unit(sc->sc_dev) > 1) {
return;
}
-
+
DPRINTF(2, ("%s: gpio_ctl pin %d flags 0x%x\n", device_xname(sc->sc_dev), epin, flags));
if (flags & (GPIO_PIN_OUTPUT|GPIO_PIN_INPUT)) {
@@ -264,7 +264,7 @@
delay(1); /* wait 150 cycles */
/* reset control signal and clock */
bus_space_write_4(sc->sc_iot, sc->sc_ioh,
- BCM2835_GPIO_GPPUD, BCM2835_GPIO_GPPUD_PULLOFF);
+ BCM2835_GPIO_GPPUD, BCM2835_GPIO_GPPUD_PULLOFF);
bus_space_write_4(sc->sc_iot, sc->sc_ioh,
BCM2835_GPIO_GPPUDCLK(device_unit(sc->sc_dev)),
0);
diff -r 390b66002a73 -r 3246c1ef251b sys/arch/arm/broadcom/bcm2835_space.c
--- a/sys/arch/arm/broadcom/bcm2835_space.c Thu Nov 09 20:30:01 2017 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_space.c Thu Nov 09 21:36:46 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_space.c,v 1.10 2016/02/02 13:55:50 skrll Exp $ */
+/* $NetBSD: bcm2835_space.c,v 1.11 2017/11/09 21:37: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.10 2016/02/02 13:55:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_space.c,v 1.11 2017/11/09 21:37:52 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -297,7 +297,7 @@
ba < BCM2835_PERIPHERALS_BASE_BUS + BCM2835_PERIPHERALS_SIZE) {
match = true;
pa = BCM2835_PERIPHERALS_BUS_TO_PHYS(ba);
-
+
}
#ifdef BCM2836
if (ba >= BCM2836_ARM_LOCAL_BASE &&
diff -r 390b66002a73 -r 3246c1ef251b sys/arch/arm/cortex/gtmr_var.h
--- a/sys/arch/arm/cortex/gtmr_var.h Thu Nov 09 20:30:01 2017 +0000
+++ b/sys/arch/arm/cortex/gtmr_var.h Thu Nov 09 21:36:46 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr_var.h,v 1.7 2017/08/24 13:06:23 jmcneill Exp $ */
+/* $NetBSD: gtmr_var.h,v 1.8 2017/11/09 21:38:25 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -53,7 +53,7 @@
void gtmr_bootdelay(unsigned int n);
#ifdef __HAVE_GENERIC_CPU_INITCLOCKS
void gtmr_cpu_initclocks(void);
-#else
+#else
#define gtmr_cpu_initclocks cpu_initclocks
#endif
#endif
Home |
Main Index |
Thread Index |
Old Index