Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Whitespace
details: https://anonhg.NetBSD.org/src/rev/5f1db9320db2
branches: trunk
changeset: 789726:5f1db9320db2
user: skrll <skrll%NetBSD.org@localhost>
date: Thu Sep 05 07:06:37 2013 +0000
description:
Whitespace
diffstat:
sys/arch/arm/broadcom/bcm2835_emmc.c | 6 +-
sys/arch/evbarm/conf/files.rpi | 4 +-
sys/arch/evbarm/dev/plcom.c | 82 ++++++++++++++++++------------------
sys/arch/evbarm/rpi/rpi.h | 4 +-
4 files changed, 48 insertions(+), 48 deletions(-)
diffs (truncated from 396 to 300 lines):
diff -r 15742d37fcd4 -r 5f1db9320db2 sys/arch/arm/broadcom/bcm2835_emmc.c
--- a/sys/arch/arm/broadcom/bcm2835_emmc.c Thu Sep 05 05:15:47 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_emmc.c Thu Sep 05 07:06:37 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_emmc.c,v 1.8 2013/04/14 15:11:52 skrll Exp $ */
+/* $NetBSD: bcm2835_emmc.c,v 1.9 2013/09/05 07:06:37 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.8 2013/04/14 15:11:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.9 2013/09/05 07:06:37 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -126,7 +126,7 @@
aprint_normal_dev(self, "interrupting on intr %d\n", aaa->aaa_intr);
error = sdhc_host_found(&sc->sc, sc->sc_iot, sc->sc_ioh,
- aaa->aaa_size);
+ aaa->aaa_size);
if (error != 0) {
aprint_error_dev(self, "couldn't initialize host, error=%d\n",
error);
diff -r 15742d37fcd4 -r 5f1db9320db2 sys/arch/evbarm/conf/files.rpi
--- a/sys/arch/evbarm/conf/files.rpi Thu Sep 05 05:15:47 2013 +0000
+++ b/sys/arch/evbarm/conf/files.rpi Thu Sep 05 07:06:37 2013 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: files.rpi,v 1.3 2013/01/07 20:19:33 jmcneill Exp $
+# $NetBSD: files.rpi,v 1.4 2013/09/05 07:08:09 skrll Exp $
#
-# Raspberry Pi
+# Raspberry Pi
#
file arch/arm/arm32/arm32_boot.c
diff -r 15742d37fcd4 -r 5f1db9320db2 sys/arch/evbarm/dev/plcom.c
--- a/sys/arch/evbarm/dev/plcom.c Thu Sep 05 05:15:47 2013 +0000
+++ b/sys/arch/evbarm/dev/plcom.c Thu Sep 05 07:06:37 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: plcom.c,v 1.45 2013/05/01 07:38:01 mlelstv Exp $ */
+/* $NetBSD: plcom.c,v 1.46 2013/09/05 07:09:14 skrll Exp $ */
/*-
* Copyright (c) 2001 ARM Ltd
@@ -27,7 +27,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ *
* Copyright (c) 1998, 1999, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.45 2013/05/01 07:38:01 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.46 2013/09/05 07:09:14 skrll Exp $");
#include "opt_plcom.h"
#include "opt_ddb.h"
@@ -218,9 +218,9 @@
static int ppscap =
PPS_TSFMT_TSPEC |
- PPS_CAPTUREASSERT |
+ PPS_CAPTUREASSERT |
PPS_CAPTURECLEAR |
-#ifdef PPS_SYNC
+#ifdef PPS_SYNC
PPS_HARDPPSONASSERT | PPS_HARDPPSONCLEAR |
#endif /* PPS_SYNC */
PPS_OFFSETASSERT | PPS_OFFSETCLEAR;
@@ -328,10 +328,10 @@
int denom = 16 * speed;
int div = frequency / denom;
int rem = frequency % denom;
-
+
int ibrd = div << 6;
int fbrd = (((8 * rem) / speed) + 1) / 2;
-
+
/* Tolerance? */
return ibrd | fbrd;
}
@@ -463,7 +463,7 @@
* hang when trying to print.
*/
sc->sc_cr = PL01X_CR_UARTEN;
- if (pi->pi_type == PLCOM_TYPE_PL011)
+ if (pi->pi_type == PLCOM_TYPE_PL011)
SET(sc->sc_cr, PL011_CR_RXE | PL011_CR_TXE);
}
@@ -471,12 +471,12 @@
case PLCOM_TYPE_PL010:
PWRITE1(pi, PL010COM_CR, sc->sc_cr);
break;
-
+
case PLCOM_TYPE_PL011:
PWRITE4(pi, PL011COM_CR, sc->sc_cr);
PWRITE4(pi, PL011COM_IMSC, sc->sc_imsc);
break;
- }
+ }
if (sc->sc_fifolen == 0) {
switch (pi->pi_type) {
@@ -514,7 +514,7 @@
sc->sc_rbavail = plcom_rbuf_size;
if (sc->sc_rbuf == NULL) {
aprint_error_dev(sc->sc_dev,
- "unable to allocate ring buffer\n");
+ "unable to allocate ring buffer\n");
return;
}
sc->sc_ebuf = sc->sc_rbuf + (plcom_rbuf_size << 1);
@@ -579,12 +579,12 @@
case PLCOM_TYPE_PL010:
PWRITE1(pi, PL010COM_CR, sc->sc_cr);
break;
-
+
case PLCOM_TYPE_PL011:
PWRITE4(pi, PL011COM_CR, sc->sc_cr);
PWRITE4(pi, PL011COM_IMSC, sc->sc_imsc);
break;
- }
+ }
if (ISSET(sc->sc_hwflags, PLCOM_HW_CONSOLE|PLCOM_HW_KGDB))
plcom_enable_debugport(sc);
@@ -618,7 +618,7 @@
/*
* Ring buffer allocation failed in the plcom_attach_subr,
* only the tty is allocated, and nothing else.
- */
+ */
tty_free(sc->sc_tty);
return 0;
}
@@ -697,7 +697,7 @@
/* Turn off interrupts. */
if (ISSET(sc->sc_hwflags, PLCOM_HW_CONSOLE)) {
/* interrupt on break */
-
+
sc->sc_cr = PL01X_CR_UARTEN;
sc->sc_imsc = 0;
switch (pi->pi_type) {
@@ -872,7 +872,7 @@
mutex_spin_exit(&sc->sc_lock);
}
-
+
splx(s);
error = ttyopen(tp, PLCOMDIALOUT(dev), ISSET(flag, O_NONBLOCK));
@@ -896,7 +896,7 @@
return error;
}
-
+
int
plcomclose(dev_t dev, int flag, int mode, struct lwp *l)
{
@@ -925,7 +925,7 @@
return 0;
}
-
+
int
plcomread(dev_t dev, struct uio *uio, int flag)
{
@@ -935,10 +935,10 @@
if (PLCOM_ISALIVE(sc) == 0)
return EIO;
-
+
return (*tp->t_linesw->l_read)(tp, uio, flag);
}
-
+
int
plcomwrite(dev_t dev, struct uio *uio, int flag)
{
@@ -948,7 +948,7 @@
if (PLCOM_ISALIVE(sc) == 0)
return EIO;
-
+
return (*tp->t_linesw->l_write)(tp, uio, flag);
}
@@ -961,7 +961,7 @@
if (PLCOM_ISALIVE(sc) == 0)
return EIO;
-
+
return (*tp->t_linesw->l_poll)(tp, events, l);
}
@@ -1074,7 +1074,7 @@
break;
}
sc->ppsparam = *pp;
- /*
+ /*
* Compute msr masks from user-specified timestamp state.
*/
mode = sc->ppsparam.mode;
@@ -1092,13 +1092,13 @@
case 0:
sc->sc_ppsmask = 0;
break;
-
+
case PPS_CAPTUREASSERT:
sc->sc_ppsmask = PL01X_MSR_DCD;
sc->sc_ppsassert = PL01X_MSR_DCD;
sc->sc_ppsclear = -1;
break;
-
+
case PPS_CAPTURECLEAR:
sc->sc_ppsmask = PL01X_MSR_DCD;
sc->sc_ppsassert = -1;
@@ -1135,7 +1135,7 @@
case TIOCDCDTIMESTAMP: /* XXX old, overloaded API used by xntpd v3 */
/*
* Some GPS clocks models use the falling rather than
- * rising edge as the on-the-second signal.
+ * rising edge as the on-the-second signal.
* The old API has no way to specify PPS polarity.
*/
mutex_spin_enter(&timecounter_lock);
@@ -1143,12 +1143,12 @@
#ifndef PPS_TRAILING_EDGE
sc->sc_ppsassert = PL01X_MSR_DCD;
sc->sc_ppsclear = -1;
- TIMESPEC_TO_TIMEVAL((struct timeval *)data,
+ TIMESPEC_TO_TIMEVAL((struct timeval *)data,
&sc->ppsinfo.assert_timestamp);
#else
sc->sc_ppsassert = -1
sc->sc_ppsclear = 0;
- TIMESPEC_TO_TIMEVAL((struct timeval *)data,
+ TIMESPEC_TO_TIMEVAL((struct timeval *)data,
&sc->ppsinfo.clear_timestamp);
#endif
mutex_spin_exit(&timecounter_lock);
@@ -1230,7 +1230,7 @@
SET(plcombits, PL01X_MCR_DTR);
if (ISSET(ttybits, TIOCM_RTS))
SET(plcombits, PL01X_MCR_RTS);
-
+
switch (how) {
case TIOCMBIC:
CLR(sc->sc_mcr, plcombits);
@@ -1569,7 +1569,7 @@
return 0;
mutex_spin_enter(&sc->sc_lock);
-
+
if (block) {
if (!ISSET(sc->sc_rx_flags, RX_TTY_BLOCKED)) {
SET(sc->sc_rx_flags, RX_TTY_BLOCKED);
@@ -1589,7 +1589,7 @@
mutex_spin_exit(&sc->sc_lock);
return 1;
}
-
+
/*
* (un)block input via hw flowcontrol
*/
@@ -1891,7 +1891,7 @@
return;
tp = sc->sc_tty;
-
+
if (sc->sc_rx_ready) {
sc->sc_rx_ready = 0;
plcom_rxsoft(sc, tp);
Home |
Main Index |
Thread Index |
Old Index