Module Name: src
Committed By: skrll
Date: Tue Apr 1 06:55:29 UTC 2014
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c rpi_start.S rpi_vcmbox.c
Log Message:
Trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/rpi/rpi_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/rpi/rpi_start.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/rpi/rpi_vcmbox.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/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.39 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.40
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.39 Tue Dec 10 16:30:36 2013
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Tue Apr 1 06:55:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.39 2013/12/10 16:30:36 joerg Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.40 2014/04/01 06:55:29 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.39 2013/12/10 16:30:36 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.40 2014/04/01 06:55:29 skrll Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_ddb.h"
@@ -380,20 +380,20 @@ rpi_bootparams(void)
bcm2835_mbox_write(iot, ioh, BCMMBOX_CHANPM, (
#if (NSDHC > 0)
- (1 << VCPM_POWER_SDCARD) |
+ (1 << VCPM_POWER_SDCARD) |
#endif
#if (NPLCOM > 0)
(1 << VCPM_POWER_UART0) |
#endif
#if (NBCMDWCTWO > 0)
- (1 << VCPM_POWER_USB) |
+ (1 << VCPM_POWER_USB) |
#endif
#if (NBSCIIC > 0)
- (1 << VCPM_POWER_I2C0) | (1 << VCPM_POWER_I2C1) |
+ (1 << VCPM_POWER_I2C0) | (1 << VCPM_POWER_I2C1) |
/* (1 << VCPM_POWER_I2C2) | */
#endif
#if (NBCMSPI > 0)
- (1 << VCPM_POWER_SPI) |
+ (1 << VCPM_POWER_SPI) |
#endif
0) << 4);
@@ -645,7 +645,7 @@ rpi_fb_get_edid_mode(uint32_t *pwidth, u
uint8_t edid_data[1024];
uint32_t res;
int error;
-
+
error = bcmmbox_request(BCMMBOX_CHANARM2VC, &vb_edid,
sizeof(vb_edid), &res);
if (error) {
@@ -688,7 +688,7 @@ rpi_fb_init(prop_dictionary_t dict)
uint32_t width = 0, height = 0;
uint32_t res;
char *ptr;
- int integer;
+ int integer;
int error;
if (get_bootconf_option(boot_args, "fb",
Index: src/sys/arch/evbarm/rpi/rpi_start.S
diff -u src/sys/arch/evbarm/rpi/rpi_start.S:1.8 src/sys/arch/evbarm/rpi/rpi_start.S:1.9
--- src/sys/arch/evbarm/rpi/rpi_start.S:1.8 Tue Nov 12 17:14:39 2013
+++ src/sys/arch/evbarm/rpi/rpi_start.S Tue Apr 1 06:55:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_start.S,v 1.8 2013/11/12 17:14:39 skrll Exp $ */
+/* $NetBSD: rpi_start.S,v 1.9 2014/04/01 06:55:29 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -87,11 +87,11 @@
#include <arm/armreg.h>
#include "assym.h"
-RCSID("$NetBSD: rpi_start.S,v 1.8 2013/11/12 17:14:39 skrll Exp $")
+RCSID("$NetBSD: rpi_start.S,v 1.9 2014/04/01 06:55:29 skrll Exp $")
/*
- * Workaround Erratum 411920
- *
+ * Workaround Erratum 411920
+ *
* - value of arg 'reg' Should Be Zero
*/
#define Invalidate_I_cache(reg) \
@@ -230,12 +230,12 @@ _C_LABEL(rpi_start):
ldr r1, Lcontrol_set
orr r0, r0, r1
ldr lr, Lstart
-
+
.align 5
@ turn mmu on!
mov r0, r0
mcr p15, 0, r0, c1, c0, 0
-
+
/*
* Ensure that the coprocessor has finished turning on the MMU.
*/
@@ -258,7 +258,7 @@ Ll1_s_frame:
Ltemp_l1_table:
/* Put the temporary L1 translation table just below the kernel. */
.word 0x4000
-
+
Lstart:
.word start
/*
Index: src/sys/arch/evbarm/rpi/rpi_vcmbox.c
diff -u src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.2 src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.3
--- src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.2 Mon Jan 7 22:32:24 2013
+++ src/sys/arch/evbarm/rpi/rpi_vcmbox.c Tue Apr 1 06:55:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_vcmbox.c,v 1.2 2013/01/07 22:32:24 jmcneill Exp $ */
+/* $NetBSD: rpi_vcmbox.c,v 1.3 2014/04/01 06:55:29 skrll Exp $ */
/*-
* Copyright (c) 2013 Jared D. McNeill <[email protected]>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rpi_vcmbox.c,v 1.2 2013/01/07 22:32:24 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_vcmbox.c,v 1.3 2014/04/01 06:55:29 skrll Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -264,7 +264,7 @@ vcmbox_cpufreq_init(struct vcmbox_softc
error = sysctl_createv(&sc->sc_log, 0, &freqnode, &node,
CTLFLAG_READWRITE, CTLTYPE_INT, "target", NULL,
vcmbox_cpufreq_sysctl_helper, 0, (void *)sc, 0,
- CTL_CREATE, CTL_EOL);
+ CTL_CREATE, CTL_EOL);
if (error)
goto sysctl_failed;
sc->sc_node_target = node->sysctl_num;
@@ -272,7 +272,7 @@ vcmbox_cpufreq_init(struct vcmbox_softc
error = sysctl_createv(&sc->sc_log, 0, &freqnode, &node,
0, CTLTYPE_INT, "current", NULL,
vcmbox_cpufreq_sysctl_helper, 0, (void *)sc, 0,
- CTL_CREATE, CTL_EOL);
+ CTL_CREATE, CTL_EOL);
if (error)
goto sysctl_failed;
sc->sc_node_current = node->sysctl_num;
@@ -280,7 +280,7 @@ vcmbox_cpufreq_init(struct vcmbox_softc
error = sysctl_createv(&sc->sc_log, 0, &freqnode, &node,
0, CTLTYPE_INT, "min", NULL,
vcmbox_cpufreq_sysctl_helper, 0, (void *)sc, 0,
- CTL_CREATE, CTL_EOL);
+ CTL_CREATE, CTL_EOL);
if (error)
goto sysctl_failed;
sc->sc_node_min = node->sysctl_num;
@@ -288,7 +288,7 @@ vcmbox_cpufreq_init(struct vcmbox_softc
error = sysctl_createv(&sc->sc_log, 0, &freqnode, &node,
0, CTLTYPE_INT, "max", NULL,
vcmbox_cpufreq_sysctl_helper, 0, (void *)sc, 0,
- CTL_CREATE, CTL_EOL);
+ CTL_CREATE, CTL_EOL);
if (error)
goto sysctl_failed;
sc->sc_node_max = node->sysctl_num;
@@ -361,7 +361,7 @@ vcmbox_create_sensors(struct vcmbox_soft
sizeof(sc->sc_sensor[VCMBOX_SENSOR_TEMP].desc));
if (vcmbox_read_temp(sc, VCPROPTAG_GET_MAX_TEMPERATURE,
vcmbox_sensor_id[VCMBOX_SENSOR_TEMP], &val) == 0) {
- sc->sc_sensor[VCMBOX_SENSOR_TEMP].value_max =
+ sc->sc_sensor[VCMBOX_SENSOR_TEMP].value_max =
val * 1000 + 273150000;
sc->sc_sensor[VCMBOX_SENSOR_TEMP].flags |= ENVSYS_FVALID_MAX;
}
