Module Name: src
Committed By: tsutsui
Date: Tue Jan 22 15:44:25 UTC 2013
Modified Files:
src/sys/arch/luna68k/dev: siotty.c spc.c timekeeper.c
Log Message:
Whitespace cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/luna68k/dev/siotty.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/luna68k/dev/spc.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/luna68k/dev/timekeeper.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/luna68k/dev/siotty.c
diff -u src/sys/arch/luna68k/dev/siotty.c:1.34 src/sys/arch/luna68k/dev/siotty.c:1.35
--- src/sys/arch/luna68k/dev/siotty.c:1.34 Sat Oct 13 06:16:18 2012
+++ src/sys/arch/luna68k/dev/siotty.c Tue Jan 22 15:44:25 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1
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 @@ struct siotty_softc {
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 @@ const struct cdevsw siotty_cdevsw = {
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 @@ siotty_match(device_t parent, cfdata_t c
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 @@ siostart(struct tty *tp)
{
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 @@ siostop(struct tty *tp, int flag)
{
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 @@ siomctl(struct siotty_softc *sc, int con
sc->sc_wr[WR5] = wr5;
setsioreg(sc->sc_ctl, WR5, wr5);
val = 0;
- done:
+ done:
splx(s);
return val;
}
@@ -391,7 +391,7 @@ sioopen(dev_t dev, int flag, int mode, s
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 @@ sioclose(dev_t dev, int flag, int mode,
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 @@ siopoll(dev_t dev, int events, struct lw
{
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 @@ struct tty *
siotty(dev_t dev)
{
struct siotty_softc *sc;
-
+
sc = device_lookup_private(&siotty_cd, minor(dev));
return sc->sc_tty;
}
Index: src/sys/arch/luna68k/dev/spc.c
diff -u src/sys/arch/luna68k/dev/spc.c:1.9 src/sys/arch/luna68k/dev/spc.c:1.10
--- src/sys/arch/luna68k/dev/spc.c:1.9 Wed Jul 27 14:17:55 2011
+++ src/sys/arch/luna68k/dev/spc.c Tue Jan 22 15:44:25 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: spc.c,v 1.9
#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 @@ spc_mainbus_match(device_t parent, cfdat
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
Index: src/sys/arch/luna68k/dev/timekeeper.c
diff -u src/sys/arch/luna68k/dev/timekeeper.c:1.10 src/sys/arch/luna68k/dev/timekeeper.c:1.11
--- src/sys/arch/luna68k/dev/timekeeper.c:1.10 Wed Jul 27 14:17:55 2011
+++ src/sys/arch/luna68k/dev/timekeeper.c Tue Jan 22 15:44:25 2013
@@ -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 @@ clock_attach(device_t parent, device_t s
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 @@ clock_attach(device_t parent, device_t s
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;
}
