Module Name: src
Committed By: tsutsui
Date: Mon Sep 23 17:27:09 UTC 2013
Modified Files:
src/sys/arch/luna68k/dev: if_le.c lunaws.c sio.c siotty.c
Log Message:
Tab/space cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/dev/if_le.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/luna68k/dev/lunaws.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/luna68k/dev/sio.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/luna68k/dev/siotty.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/if_le.c
diff -u src/sys/arch/luna68k/dev/if_le.c:1.6 src/sys/arch/luna68k/dev/if_le.c:1.7
--- src/sys/arch/luna68k/dev/if_le.c:1.6 Tue Jan 19 22:06:20 2010
+++ src/sys/arch/luna68k/dev/if_le.c Mon Sep 23 17:27:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.6 2010/01/19 22:06:20 pooka Exp $ */
+/* $NetBSD: if_le.c,v 1.7 2013/09/23 17:27:09 tsutsui Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.6 2010/01/19 22:06:20 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.7 2013/09/23 17:27:09 tsutsui Exp $");
#include "opt_inet.h"
@@ -225,7 +225,7 @@ myetheraddr(uint8_t *ether)
u = (u < 'A') ? u & 0xf : u - 'A' + 10;
l = ea[1];
l = (l < 'A') ? l & 0xf : l - 'A' + 10;
-
+
ether[i] = l | (u << 4);
ea += 2;
}
Index: src/sys/arch/luna68k/dev/lunaws.c
diff -u src/sys/arch/luna68k/dev/lunaws.c:1.26 src/sys/arch/luna68k/dev/lunaws.c:1.27
--- src/sys/arch/luna68k/dev/lunaws.c:1.26 Tue May 14 13:28:01 2013
+++ src/sys/arch/luna68k/dev/lunaws.c Mon Sep 23 17:27:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lunaws.c,v 1.26 2013/05/14 13:28:01 tsutsui Exp $ */
+/* $NetBSD: lunaws.c,v 1.27 2013/09/23 17:27:09 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: lunaws.c,v 1.26 2013/05/14 13:28:01 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.27 2013/09/23 17:27:09 tsutsui Exp $");
#include "wsmouse.h"
@@ -152,7 +152,7 @@ wsattach(device_t parent, device_t self,
sc->sc_ctl = (struct sioreg *)scp->scp_ctl + 1;
memcpy(sc->sc_wr, ch1_regs, sizeof(ch1_regs));
scp->scp_intr[1] = wsintr;
-
+
setsioreg(sc->sc_ctl, WR0, sc->sc_wr[WR0]);
setsioreg(sc->sc_ctl, WR4, sc->sc_wr[WR4]);
setsioreg(sc->sc_ctl, WR3, sc->sc_wr[WR3]);
@@ -179,7 +179,7 @@ wsattach(device_t parent, device_t self,
{
struct wsmousedev_attach_args b;
b.accessops = &omms_accessops;
- b.accesscookie = (void *)sc;
+ b.accesscookie = (void *)sc;
sc->sc_wsmousedev =
config_found_ia(self, "wsmousedev", &b, wsmousedevprint);
sc->sc_msreport = 0;
@@ -227,7 +227,7 @@ wssoftintr(void *arg)
/*
* if (code >= 0x80 && code <= 0x87), then
* it's the first byte of 3 byte long mouse report
- * code[0] & 07 -> LMR button condition
+ * code[0] & 07 -> LMR button condition
* code[1], [2] -> x,y delta
* otherwise, key press or release event.
*/
@@ -269,7 +269,7 @@ omkbd_input(void *v, int data)
int key;
if (omkbd_decode(v, data, &type, &key))
- wskbd_input(sc->sc_wskbddev, type, key);
+ wskbd_input(sc->sc_wskbddev, type, key);
}
static int
@@ -285,8 +285,8 @@ omkbd_decode(void *v, int datain, u_int
static const keysym_t omkbd_keydesc_1[] = {
/* pos command normal shifted */
- KC(0x9), KS_Tab,
- KC(0xa), KS_Control_L,
+ KC(0x9), KS_Tab,
+ KC(0xa), KS_Control_L,
KC(0xb), KS_Mode_switch, /* Kana */
KC(0xc), KS_Shift_R,
KC(0xd), KS_Shift_L,
@@ -309,7 +309,7 @@ static const keysym_t omkbd_keydesc_1[]
KC(0x1f), KS_KP_Down,
/* KC(0x20), KS_f11, */
/* KC(0x21), KS_f12, */
- KC(0x22), KS_1, KS_exclam,
+ KC(0x22), KS_1, KS_exclam,
KC(0x23), KS_2, KS_quotedbl,
KC(0x24), KS_3, KS_numbersign,
KC(0x25), KS_4, KS_dollar,
Index: src/sys/arch/luna68k/dev/sio.c
diff -u src/sys/arch/luna68k/dev/sio.c:1.11 src/sys/arch/luna68k/dev/sio.c:1.12
--- src/sys/arch/luna68k/dev/sio.c:1.11 Thu Jul 28 10:01:44 2011
+++ src/sys/arch/luna68k/dev/sio.c Mon Sep 23 17:27:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sio.c,v 1.11 2011/07/28 10:01:44 tsutsui Exp $ */
+/* $NetBSD: sio.c,v 1.12 2013/09/23 17:27:09 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: sio.c,v 1.11 2011/07/28 10:01:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.12 2013/09/23 17:27:09 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,7 +109,7 @@ xsiointr(void *arg)
{
struct sio_softc *sc = arg;
- (*sc->scp_intr[0])(0); /* 0: ttya system serial port */
+ (*sc->scp_intr[0])(0); /* 0: ttya system serial port */
(*sc->scp_intr[1])(1); /* 1: keyboard and mouse */
return 1;
}
Index: src/sys/arch/luna68k/dev/siotty.c
diff -u src/sys/arch/luna68k/dev/siotty.c:1.35 src/sys/arch/luna68k/dev/siotty.c:1.36
--- src/sys/arch/luna68k/dev/siotty.c:1.35 Tue Jan 22 15:44:25 2013
+++ src/sys/arch/luna68k/dev/siotty.c Mon Sep 23 17:27:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: siotty.c,v 1.35 2013/01/22 15:44:25 tsutsui Exp $ */
+/* $NetBSD: siotty.c,v 1.36 2013/09/23 17:27:09 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.35 2013/01/22 15:44:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.36 2013/09/23 17:27:09 tsutsui Exp $");
#include "opt_ddb.h"
@@ -279,7 +279,7 @@ sioparam(struct tty *tp, struct termios
if ((tp->t_cflag & PARODD) == 0)
wr4 |= WR4_EPARITY;
}
- wr4 |= (tp->t_cflag & CSTOPB) ? WR4_STOP2 : WR4_STOP1;
+ wr4 |= (tp->t_cflag & CSTOPB) ? WR4_STOP2 : WR4_STOP1;
sc->sc_wr[WR4] = wr4;
s = splserial();
