Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/luna68k Whitespace cleanup.
details: https://anonhg.NetBSD.org/src/rev/49c0953e05ca
branches: trunk
changeset: 784227:49c0953e05ca
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Tue Jan 22 15:44:25 2013 +0000
description:
Whitespace cleanup.
diffstat:
sys/arch/luna68k/dev/siotty.c | 44 +++++++++++++-------------
sys/arch/luna68k/dev/spc.c | 8 ++--
sys/arch/luna68k/dev/timekeeper.c | 8 ++--
sys/arch/luna68k/stand/boot/Makefile | 4 +-
sys/arch/luna68k/stand/boot/autoconf.c | 4 +-
sys/arch/luna68k/stand/boot/disklabel.c | 4 +-
sys/arch/luna68k/stand/boot/if_le.c | 8 ++--
sys/arch/luna68k/stand/boot/locore.S | 4 +-
sys/arch/luna68k/stand/boot/omron_disklabel.h | 4 +-
sys/arch/luna68k/stand/boot/parse.c | 4 +-
sys/arch/luna68k/stand/boot/prf.c | 6 +-
sys/arch/luna68k/stand/boot/samachdep.h | 4 +-
sys/arch/luna68k/stand/boot/sc.c | 6 +-
sys/arch/luna68k/stand/boot/scsireg.h | 10 +++---
sys/arch/luna68k/stand/boot/sd.c | 4 +-
15 files changed, 61 insertions(+), 61 deletions(-)
diffs (truncated from 489 to 300 lines):
diff -r 9d93879ab8c3 -r 49c0953e05ca sys/arch/luna68k/dev/siotty.c
--- a/sys/arch/luna68k/dev/siotty.c Tue Jan 22 15:35:08 2013 +0000
+++ b/sys/arch/luna68k/dev/siotty.c Tue Jan 22 15:44:25 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siotty.c,v 1.34 2012/10/13 06:16:18 tsutsui Exp $ */
+/* $NetBSD: siotty.c,v 1.35 2013/01/22 15:44:25 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.34 2012/10/13 06:16:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.35 2013/01/22 15:44:25 tsutsui Exp $");
#include "opt_ddb.h"
@@ -59,7 +59,7 @@
static const uint8_t ch0_regs[6] = {
WR0_RSTINT, /* reset E/S interrupt */
- WR1_RXALLS | WR1_TXENBL, /* Rx per char, Tx */
+ WR1_RXALLS | WR1_TXENBL, /* Rx per char, Tx */
0, /* */
WR3_RX8BIT | WR3_RXENBL, /* Rx */
WR4_BAUD96 | WR4_STOP1, /* Tx/Rx */
@@ -77,7 +77,7 @@
device_t sc_dev;
struct tty *sc_tty;
struct sioreg *sc_ctl;
- u_int sc_flags;
+ u_int sc_flags;
uint8_t sc_wr[6];
};
@@ -107,7 +107,7 @@
siostop, siotty, siopoll, nommap, ttykqfilter, D_TTY
};
-static int
+static int
siotty_match(device_t parent, cfdata_t cf, void *aux)
{
struct sio_attach_args *args = aux;
@@ -117,7 +117,7 @@
return 1;
}
-static void
+static void
siotty_attach(device_t parent, device_t self, void *aux)
{
struct sio_softc *scp = device_private(parent);
@@ -200,7 +200,7 @@
{
struct siotty_softc *sc;
int s, c;
-
+
sc = device_lookup_private(&siotty_cd, minor(tp->t_dev));
s = splserial();
if (tp->t_state & (TS_BUSY|TS_TIMEOUT|TS_TTSTOP))
@@ -222,14 +222,14 @@
{
int s;
- s = splserial();
- if (TS_BUSY == (tp->t_state & (TS_BUSY|TS_TTSTOP))) {
- /*
- * Device is transmitting; must stop it.
- */
+ s = splserial();
+ if (TS_BUSY == (tp->t_state & (TS_BUSY|TS_TTSTOP))) {
+ /*
+ * Device is transmitting; must stop it.
+ */
tp->t_state |= TS_FLUSH;
- }
- splx(s);
+ }
+ splx(s);
}
static int
@@ -331,7 +331,7 @@
sc->sc_wr[WR5] = wr5;
setsioreg(sc->sc_ctl, WR5, wr5);
val = 0;
- done:
+ done:
splx(s);
return val;
}
@@ -391,7 +391,7 @@
return error;
return (*tp->t_linesw->l_open)(dev, tp);
}
-
+
int
sioclose(dev_t dev, int flag, int mode, struct lwp *l)
{
@@ -414,24 +414,24 @@
splx(s);
return ttyclose(tp);
}
-
+
int
sioread(dev_t dev, struct uio *uio, int flag)
{
struct siotty_softc *sc;
struct tty *tp;
-
+
sc = device_lookup_private(&siotty_cd, minor(dev));
tp = sc->sc_tty;
return (*tp->t_linesw->l_read)(tp, uio, flag);
}
-
+
int
siowrite(dev_t dev, struct uio *uio, int flag)
{
struct siotty_softc *sc;
struct tty *tp;
-
+
sc = device_lookup_private(&siotty_cd, minor(dev));
tp = sc->sc_tty;
return (*tp->t_linesw->l_write)(tp, uio, flag);
@@ -442,7 +442,7 @@
{
struct siotty_softc *sc;
struct tty *tp;
-
+
sc = device_lookup_private(&siotty_cd, minor(dev));
tp = sc->sc_tty;
return ((*tp->t_linesw->l_poll)(tp, events, l));
@@ -508,7 +508,7 @@
siotty(dev_t dev)
{
struct siotty_softc *sc;
-
+
sc = device_lookup_private(&siotty_cd, minor(dev));
return sc->sc_tty;
}
diff -r 9d93879ab8c3 -r 49c0953e05ca sys/arch/luna68k/dev/spc.c
--- a/sys/arch/luna68k/dev/spc.c Tue Jan 22 15:35:08 2013 +0000
+++ b/sys/arch/luna68k/dev/spc.c Tue Jan 22 15:44:25 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: spc.c,v 1.9 2011/07/27 14:17:55 tsutsui Exp $ */
+/* $NetBSD: spc.c,v 1.10 2013/01/22 15:44:25 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: spc.c,v 1.9 2011/07/27 14:17:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spc.c,v 1.10 2013/01/22 15:44:25 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
-#include <dev/scsipi/scsi_message.h>
+#include <dev/scsipi/scsi_message.h>
#include <dev/scsipi/scsiconf.h>
#include <dev/ic/mb89352reg.h>
@@ -67,7 +67,7 @@
if (strcmp(ma->ma_name, spc_cd.cd_name))
return 0;
#if 0
- if (badaddr((void *)ma->ma_addr, 4))
+ if (badaddr((void *)ma->ma_addr, 4))
return 0;
/* Experiments proved 2nd SPC address does NOT make a buserror. */
#endif
diff -r 9d93879ab8c3 -r 49c0953e05ca sys/arch/luna68k/dev/timekeeper.c
--- a/sys/arch/luna68k/dev/timekeeper.c Tue Jan 22 15:35:08 2013 +0000
+++ b/sys/arch/luna68k/dev/timekeeper.c Tue Jan 22 15:44:25 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: timekeeper.c,v 1.10 2011/07/27 14:17:55 tsutsui Exp $ */
+/* $NetBSD: timekeeper.c,v 1.11 2013/01/22 15:44:25 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: timekeeper.c,v 1.10 2011/07/27 14:17:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timekeeper.c,v 1.11 2013/01/22 15:44:25 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,7 +93,7 @@
sc->sc_nvramsize = 2040;
sc->sc_todr.todr_gettime_ymdhms = mkclock_get;
sc->sc_todr.todr_settime_ymdhms = mkclock_set;
- sc->sc_todr.cookie = sc;
+ sc->sc_todr.cookie = sc;
aprint_normal(": mk48t02\n");
break;
case LUNA_II: /* Dallas DS1287A */
@@ -102,7 +102,7 @@
sc->sc_nvramsize = 50;
sc->sc_todr.todr_gettime_ymdhms = dsclock_get;
sc->sc_todr.todr_settime_ymdhms = dsclock_set;
- sc->sc_todr.cookie = sc;
+ sc->sc_todr.cookie = sc;
aprint_normal(": ds1287a\n");
break;
}
diff -r 9d93879ab8c3 -r 49c0953e05ca sys/arch/luna68k/stand/boot/Makefile
--- a/sys/arch/luna68k/stand/boot/Makefile Tue Jan 22 15:35:08 2013 +0000
+++ b/sys/arch/luna68k/stand/boot/Makefile Tue Jan 22 15:44:25 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/01/21 11:58:12 tsutsui Exp $
+# $NetBSD: Makefile,v 1.9 2013/01/22 15:48:40 tsutsui Exp $
# @(#)Makefile 8.2 (Berkeley) 8/15/93
NOMAN= # defined
@@ -37,7 +37,7 @@
SRCS+= devopen.c
SRCS+= conf.c
SRCS+= machdep.c
-SRCS+= getline.c parse.c
+SRCS+= getline.c parse.c
SRCS+= boot.c
SRCS+= cons.c prf.c awaitkey.c
SRCS+= romcons.c
diff -r 9d93879ab8c3 -r 49c0953e05ca sys/arch/luna68k/stand/boot/autoconf.c
--- a/sys/arch/luna68k/stand/boot/autoconf.c Tue Jan 22 15:35:08 2013 +0000
+++ b/sys/arch/luna68k/stand/boot/autoconf.c Tue Jan 22 15:44:25 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.6 2013/01/14 12:28:11 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.7 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -70,7 +70,7 @@
* @(#)autoconf.c 8.1 (Berkeley) 6/10/93
*/
-/*
+/*
* autoconf.c -- Determine mass storage and memory configuration for a machine.
* by A.Fujita, NOV-30-1991
*
diff -r 9d93879ab8c3 -r 49c0953e05ca sys/arch/luna68k/stand/boot/disklabel.c
--- a/sys/arch/luna68k/stand/boot/disklabel.c Tue Jan 22 15:35:08 2013 +0000
+++ b/sys/arch/luna68k/stand/boot/disklabel.c Tue Jan 22 15:44:25 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.2 2013/01/10 16:20:11 tsutsui Exp $ */
+/* $NetBSD: disklabel.c,v 1.3 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -391,7 +391,7 @@
else
cnputc(' ');
printf("- %d",
- (pp->p_offset +
+ (pp->p_offset +
pp->p_size + lp->d_secpercyl - 1) /
lp->d_secpercyl - 1);
if (pp->p_size % lp->d_secpercyl)
diff -r 9d93879ab8c3 -r 49c0953e05ca sys/arch/luna68k/stand/boot/if_le.c
--- a/sys/arch/luna68k/stand/boot/if_le.c Tue Jan 22 15:35:08 2013 +0000
+++ b/sys/arch/luna68k/stand/boot/if_le.c Tue Jan 22 15:44:25 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.2 2013/01/20 13:35:43 tsutsui Exp $ */
+/* $NetBSD: if_le.c,v 1.3 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 2013 Izumi Tsutsui. All rights reserved.
@@ -216,13 +216,13 @@
void *cookie = dif->dif_private;
#ifdef DEBUG
struct ether_header *eh;
-
+
eh = pkt;
printf("dst: %s\n", ether_sprintf(eh->ether_dhost));
printf("src: %s\n", ether_sprintf(eh->ether_shost));
printf("type: 0x%x\n", eh->ether_type & 0xffff);
#endif
-
+
return lance_put(cookie, pkt, len) ? len : -1;
}
Home |
Main Index |
Thread Index |
Old Index