Spaces -> tab, no binary change.

10 files changed, 84 insertions, 84 deletions

diff --git a/sys/arch/luna88k/dev/lcd.c b/sys/arch/luna88k/dev/lcd.c
index 7ab8c84413f..0c08a0d2709 100644
--- a/sys/arch/luna88k/dev/lcd.c
+++ b/sys/arch/luna88k/dev/lcd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcd.c,v 1.9 2017/03/20 19:37:54 miod Exp $ */
+/* $OpenBSD: lcd.c,v 1.10 2017/11/03 06:54:06 aoyama Exp $ */
 /* $NetBSD: lcd.c,v 1.2 2000/01/07 05:13:08 nisimura Exp $ */
 
 /*-
@@ -65,13 +65,13 @@
 
 struct pio {
 	volatile u_int8_t portA;
-        volatile unsigned : 24;
+	volatile unsigned : 24;
 	volatile u_int8_t portB;
-        volatile unsigned : 24;
+	volatile unsigned : 24;
 	volatile u_int8_t portC;
-        volatile unsigned : 24;
+	volatile unsigned : 24;
 	volatile u_int8_t cntrl;
-        volatile unsigned : 24;
+	volatile unsigned : 24;
 };
 
 /* Autoconf stuff */
diff --git a/sys/arch/luna88k/dev/lunafb.c b/sys/arch/luna88k/dev/lunafb.c
index ad42b7ac5f4..80d39488b9c 100644
--- a/sys/arch/luna88k/dev/lunafb.c
+++ b/sys/arch/luna88k/dev/lunafb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lunafb.c,v 1.24 2017/03/20 19:37:54 miod Exp $ */
+/* $OpenBSD: lunafb.c,v 1.25 2017/11/03 06:54:06 aoyama Exp $ */
 /* $NetBSD: lunafb.c,v 1.7.6.1 2002/08/07 01:48:34 lukem Exp $ */
 
 /*-
@@ -160,7 +160,7 @@ const struct cfattach fb_ca = {
 };
 
 struct cfdriver fb_cd = {
-        NULL, "fb", DV_DULL
+	NULL, "fb", DV_DULL
 };
 
 /* hardware plane bits; retrieved at boot, will be updated */
@@ -261,8 +261,8 @@ omfbioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
 		*(u_int *)data = WSDISPLAYIO_DEPTH_1;
 		break;
 
-        case WSDISPLAYIO_SETGFXMODE:
-                return omfb_set_gfxmode(sc, (struct wsdisplay_gfx_mode *)data);
+	case WSDISPLAYIO_SETGFXMODE:
+		return omfb_set_gfxmode(sc, (struct wsdisplay_gfx_mode *)data);
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
@@ -309,7 +309,7 @@ int
 omgetcmap(struct omfb_softc *sc, struct wsdisplay_cmap *p)
 {
 	u_int index = p->index, count = p->count;
-        unsigned int cmsize;
+	unsigned int cmsize;
 	int error;
 
 	cmsize = sc->sc_dc->dc_cmsize;
@@ -339,7 +339,7 @@ omsetcmap(struct omfb_softc *sc, struct wsdisplay_cmap *p)
 {
 	struct hwcmap cmap;
 	u_int index = p->index, count = p->count;
-        unsigned int cmsize, i;
+	unsigned int cmsize, i;
 	int error;
 
 	cmsize = sc->sc_dc->dc_cmsize;
@@ -525,43 +525,43 @@ omfb_list_font(void *v, struct wsdisplay_font *font)
 int
 omfb_set_gfxmode(struct omfb_softc *sc, struct wsdisplay_gfx_mode *wsd_gfxmode)
 {
-        /* LUNA's fb is fixed size */
-        if ((wsd_gfxmode->width != sc->sc_dc->dc_wid)
-                || (wsd_gfxmode->height != sc->sc_dc->dc_ht))
-                        return -1;
+	/* LUNA's fb is fixed size */
+	if ((wsd_gfxmode->width != sc->sc_dc->dc_wid)
+	    || (wsd_gfxmode->height != sc->sc_dc->dc_ht))
+		return -1;
 
 	/* if depth == 0, set the original hardware depth */
 	if (wsd_gfxmode->depth == 0)
 		wsd_gfxmode->depth = hwplanebits;
 
-        switch (wsd_gfxmode->depth) {
-        case 1:
+	switch (wsd_gfxmode->depth) {
+	case 1:
 		/* all frame buffer support this */
 		sc->sc_dc->dc_depth = 1;
 		sc->sc_dc->dc_cmsize = 0;
-                break;
-        case 4:
+		break;
+	case 4:
 		if ((hwplanebits == 4) || (hwplanebits == 8)) {
 			sc->sc_dc->dc_depth = 4;
 			sc->sc_dc->dc_cmsize = 16;
 			break;
 		} else
 			return -1;
-        case 8:
+	case 8:
 		if (hwplanebits == 8) {
 			sc->sc_dc->dc_depth = 8;
 			sc->sc_dc->dc_cmsize = 256;
 			break;
 		} else
 			return -1;
-        default:
-                return -1;
-        }
+	default:
+		return -1;
+	}
 
 	omfb_set_default_cmap(sc->sc_dc);
 	omfb_clear_framebuffer(sc->sc_dc);
 
-        return 0;
+	return 0;
 }
 
 /*
diff --git a/sys/arch/luna88k/dev/lunaws.c b/sys/arch/luna88k/dev/lunaws.c
index 7ce87cde7d6..06711caf24b 100644
--- a/sys/arch/luna88k/dev/lunaws.c
+++ b/sys/arch/luna88k/dev/lunaws.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lunaws.c,v 1.14 2017/06/10 12:23:00 aoyama Exp $	*/
+/*	$OpenBSD: lunaws.c,v 1.15 2017/11/03 06:54:06 aoyama Exp $	*/
 /* $NetBSD: lunaws.c,v 1.6 2002/03/17 19:40:42 atatat Exp $ */
 
 /*-
@@ -140,7 +140,7 @@ const struct cfattach ws_ca = {
 };
 
 struct cfdriver ws_cd = {
-        NULL, "ws", DV_TTY
+	NULL, "ws", DV_TTY
 };
 
 extern int  syscngetc(dev_t);
@@ -210,9 +210,9 @@ ws_submatch_kbd(struct device *parent, void *match, void *aux)
 {
 	struct cfdata *cf = match;
 
-        if (strcmp(cf->cf_driver->cd_name, "wskbd"))
-                return (0);
-        return ((*cf->cf_attach->ca_match)(parent, cf, aux));
+	if (strcmp(cf->cf_driver->cd_name, "wskbd"))
+		return (0);
+	return ((*cf->cf_attach->ca_match)(parent, cf, aux));
 }
 
 #if NWSMOUSE > 0
@@ -222,9 +222,9 @@ ws_submatch_mouse(struct device *parent, void *match, void *aux)
 {
 	struct cfdata *cf = match;
 
-        if (strcmp(cf->cf_driver->cd_name, "wsmouse"))
-                return (0);
-        return ((*cf->cf_attach->ca_match)(parent, cf, aux));
+	if (strcmp(cf->cf_driver->cd_name, "wsmouse"))
+		return (0);
+	return ((*cf->cf_attach->ca_match)(parent, cf, aux));
 }
 
 #endif
diff --git a/sys/arch/luna88k/dev/maskbits.h b/sys/arch/luna88k/dev/maskbits.h
index 9773a12452d..99f98e5d1db 100644
--- a/sys/arch/luna88k/dev/maskbits.h
+++ b/sys/arch/luna88k/dev/maskbits.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: maskbits.h,v 1.2 2014/01/02 15:30:34 aoyama Exp $	*/
+/*	$OpenBSD: maskbits.h,v 1.3 2017/11/03 06:54:06 aoyama Exp $	*/
 /*	$NetBSD: maskbits.h,v 1.3 1997/03/31 07:37:28 scottr Exp $	*/
 
 /*-
@@ -74,8 +74,8 @@ do {									\
  * handle display memory images.
  */
  
-#define OMFB_MBL(x,y)        ((y) > 31 ? 0 : (x) << (y))
-#define OMFB_MBR(x,y)        ((y) > 31 ? 0 : (x) >> (y))
+#define OMFB_MBL(x,y)	((y) > 31 ? 0 : (x) << (y))
+#define OMFB_MBR(x,y)	((y) > 31 ? 0 : (x) >> (y))
 
 /*
  * And, our private version of GETBITS/PUTBITS.
@@ -118,7 +118,7 @@ do {									\
 
 #define getunalignedword(psrc, x, dst)					\
 do {									\
-        u_int32_t _tmp; 						\
-        OMFB_GETBITS(psrc, x, 32, _tmp);				\
-        dst = _tmp;							\
+	u_int32_t _tmp; 						\
+	OMFB_GETBITS(psrc, x, 32, _tmp);				\
+	dst = _tmp;							\
 } while (0)
diff --git a/sys/arch/luna88k/dev/mb89352.c b/sys/arch/luna88k/dev/mb89352.c
index d0dbe8e1729..6c5cfb91f75 100644
--- a/sys/arch/luna88k/dev/mb89352.c
+++ b/sys/arch/luna88k/dev/mb89352.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mb89352.c,v 1.22 2017/04/30 16:45:45 mpi Exp $	*/
+/*	$OpenBSD: mb89352.c,v 1.23 2017/11/03 06:54:06 aoyama Exp $	*/
 /*	$NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $	*/
 /*	NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp	*/
 
@@ -858,7 +858,7 @@ nextbyte:
 
 		/* If parity error, just dump everything on the floor. */
 		if ((bus_space_read_1(iot, ioh, SERR) &
-		     (SERR_SCSI_PAR|SERR_SPC_PAR)) != 0) {
+		    (SERR_SCSI_PAR|SERR_SPC_PAR)) != 0) {
 			sc->sc_flags |= SPC_DROP_MSGIN;
 			spc_sched_msgout(sc, SEND_PARITY_ERROR);
 		}
@@ -2037,7 +2037,7 @@ spc_print_acb(spc_acb *acb)
 
 	printf("acb@%p xs=%p flags=%x", acb, acb->xs, acb->flags);
 	printf(" dp=%p dleft=%d target_stat=%x\n",
-	       acb->data_addr, acb->data_length, acb->target_stat);
+	    acb->data_addr, acb->data_length, acb->target_stat);
 	spc_show_scsi_cmd(acb);
 }
 
diff --git a/sys/arch/luna88k/dev/omkbdmap.c b/sys/arch/luna88k/dev/omkbdmap.c
index e87ca688bdf..0f582d1d472 100644
--- a/sys/arch/luna88k/dev/omkbdmap.c
+++ b/sys/arch/luna88k/dev/omkbdmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: omkbdmap.c,v 1.2 2013/11/16 18:31:44 miod Exp $	*/
+/*	$OpenBSD: omkbdmap.c,v 1.3 2017/11/03 06:54:06 aoyama Exp $	*/
 
 /* Partially from:
  *	$NetBSD: lunaws.c,v 1.6 2002/03/17 19:40:42 atatat Exp $
@@ -294,6 +294,6 @@ static const keysym_t omkbd_keydesc_jp[] = {
 #define	SIZE(map) (sizeof(map)/sizeof(keysym_t))
 
 const struct wscons_keydesc omkbd_keydesctab[] = {
-       { KB_JP, 0, SIZE(omkbd_keydesc_jp), omkbd_keydesc_jp, },
-       { 0, 0, 0, 0 },
+	{ KB_JP, 0, SIZE(omkbd_keydesc_jp), omkbd_keydesc_jp, },
+	{ 0, 0, 0, 0 },
 };
diff --git a/sys/arch/luna88k/dev/omrasops.h b/sys/arch/luna88k/dev/omrasops.h
index 064dbbc2d45..20c7fd7a242 100644
--- a/sys/arch/luna88k/dev/omrasops.h
+++ b/sys/arch/luna88k/dev/omrasops.h
@@ -27,8 +27,8 @@
 /*
  * Replacement Rules (rops) (derived from hp300)
  */
-#define RR_CLEAR        0x0
-#define RR_COPY         0x3
+#define RR_CLEAR	0x0
+#define RR_COPY		0x3
 
 /*
  * ROP function
diff --git a/sys/arch/luna88k/dev/siotty.c b/sys/arch/luna88k/dev/siotty.c
index 597705d9d15..fd75f8b71bc 100644
--- a/sys/arch/luna88k/dev/siotty.c
+++ b/sys/arch/luna88k/dev/siotty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: siotty.c,v 1.20 2017/06/10 12:23:00 aoyama Exp $ */
+/* $OpenBSD: siotty.c,v 1.21 2017/11/03 06:54:06 aoyama Exp $ */
 /* $NetBSD: siotty.c,v 1.9 2002/03/17 19:40:43 atatat Exp $ */
 
 /*-
@@ -110,7 +110,7 @@ const struct cfattach siotty_ca = {
 };
 
 struct cfdriver siotty_cd = {
-        NULL, "siotty", DV_TTY
+	NULL, "siotty", DV_TTY
 };
 
 int 
diff --git a/sys/arch/luna88k/dev/timekeeper.c b/sys/arch/luna88k/dev/timekeeper.c
index 3d589651ff2..b08dfe4d287 100644
--- a/sys/arch/luna88k/dev/timekeeper.c
+++ b/sys/arch/luna88k/dev/timekeeper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timekeeper.c,v 1.9 2014/06/07 11:55:35 aoyama Exp $ */
+/* $OpenBSD: timekeeper.c,v 1.10 2017/11/03 06:54:06 aoyama Exp $ */
 /* $NetBSD: timekeeper.c,v 1.1 2000/01/05 08:48:56 nisimura Exp $ */
 
 /*-
@@ -58,8 +58,8 @@ struct timekeeper_softc {
 /*
  * BCD to decimal and decimal to BCD.
  */
-#define FROMBCD(x)      (((x) >> 4) * 10 + ((x) & 0xf))
-#define TOBCD(x)        (((x) / 10 * 16) + ((x) % 10))
+#define FROMBCD(x)	(((x) >> 4) * 10 + ((x) & 0xf))
+#define TOBCD(x)	(((x) / 10 * 16) + ((x) % 10))
 
 int  clock_match(struct device *, void *, void *);
 void clock_attach(struct device *, struct device *, void *);
@@ -69,7 +69,7 @@ struct cfattach clock_ca = {
 };
 
 struct cfdriver clock_cd = {
-        NULL, "clock", DV_DULL
+	NULL, "clock", DV_DULL
 };
 
 void mkclock_get(struct device *, time_t, struct clock_ymdhms *);
diff --git a/sys/arch/luna88k/dev/timekeeper.h b/sys/arch/luna88k/dev/timekeeper.h
index fa555167b02..d99ad2abc5f 100644
--- a/sys/arch/luna88k/dev/timekeeper.h
+++ b/sys/arch/luna88k/dev/timekeeper.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: timekeeper.h,v 1.3 2013/08/10 22:27:14 aoyama Exp $ */
+/* $OpenBSD: timekeeper.h,v 1.4 2017/11/03 06:54:06 aoyama Exp $ */
 /* $NetBSD: timekeeper.h,v 1.1 2000/01/05 08:48:56 nisimura Exp $ */
 
 /*-
@@ -50,39 +50,39 @@
 /*
  * Dallas Semiconductor DS1397 for LUNA-88K2
  */
-#define DS_SEC          0x0     /* Time of year: seconds (0-59) */
-#define DS_MIN          0x2     /* Time of year: minutes (0-59) */
-#define DS_HOUR         0x4     /* Time of year: hour (see above) */
-#define DS_DOW          0x6     /* Time of year: day of week (1-7) */
-#define DS_DOM          0x7     /* Time of year: day of month (1-31) */
-#define DS_MONTH        0x8     /* Time of year: month (1-12) */
-#define DS_YEAR         0x9     /* Time of year: year in century (0-99) */
+#define DS_SEC		0x0	/* Time of year: seconds (0-59) */
+#define DS_MIN		0x2	/* Time of year: minutes (0-59) */
+#define DS_HOUR		0x4	/* Time of year: hour (see above) */
+#define DS_DOW		0x6	/* Time of year: day of week (1-7) */
+#define DS_DOM		0x7	/* Time of year: day of month (1-31) */
+#define DS_MONTH	0x8	/* Time of year: month (1-12) */
+#define DS_YEAR		0x9	/* Time of year: year in century (0-99) */
 
-#define DS_REGA         0xa     /* Control register A */
-#define  DS_REGA_RSMASK 0x0f    /* Interrupt rate select mask (see below) */
-#define  DS_REGA_DVMASK 0x70    /* Divisor select mask (see below) */
-#define  DS_REGA_UIP    0x80    /* Update in progress; read only. */
+#define DS_REGA		0xa	/* Control register A */
+#define  DS_REGA_RSMASK	0x0f	/* Interrupt rate select mask (see below) */
+#define  DS_REGA_DVMASK	0x70	/* Divisor select mask (see below) */
+#define  DS_REGA_UIP	0x80	/* Update in progress; read only. */
 
-#define DS_REGB         0xb     /* Control register B */
-#define  DS_REGB_DSE    0x01    /* Daylight Savings Enable */
-#define  DS_REGB_24HR   0x02    /* 24-hour mode (AM/PM mode when clear) */
-#define  DS_REGB_BINARY 0x04    /* Binary mode (BCD mode when clear) */
-#define  DS_REGB_SQWE   0x08    /* Square Wave Enable */
-#define  DS_REGB_UIE    0x10    /* Update End interrupt enable */
-#define  DS_REGB_AIE    0x20    /* Alarm interrupt enable */
-#define  DS_REGB_PIE    0x40    /* Periodic interrupt enable */
-#define  DS_REGB_SET    0x80    /* Allow time to be set; stops updates */
+#define DS_REGB		0xb	/* Control register B */
+#define  DS_REGB_DSE	0x01	/* Daylight Savings Enable */
+#define  DS_REGB_24HR	0x02	/* 24-hour mode (AM/PM mode when clear) */
+#define  DS_REGB_BINARY	0x04	/* Binary mode (BCD mode when clear) */
+#define  DS_REGB_SQWE	0x08	/* Square Wave Enable */
+#define  DS_REGB_UIE	0x10	/* Update End interrupt enable */
+#define  DS_REGB_AIE	0x20	/* Alarm interrupt enable */
+#define  DS_REGB_PIE	0x40	/* Periodic interrupt enable */
+#define  DS_REGB_SET	0x80	/* Allow time to be set; stops updates */
 
-#define DS_REGC         0xc     /* Control register C */
-/*       DS_REGC_UNUSED 0x0f    UNUSED */
-#define  DS_REGC_UF     0x10    /* Update End interrupt flag */
-#define  DS_REGC_AF     0x20    /* Alarm interrupt flag */
-#define  DS_REGC_PF     0x40    /* Periodic interrupt flag */
-#define  DS_REGC_IRQF   0x80    /* Interrupt request pending flag */
+#define DS_REGC		0xc	/* Control register C */
+/*	 DS_REGC_UNUSED	0x0f	   UNUSED */
+#define	 DS_REGC_UF	0x10	/* Update End interrupt flag */
+#define	 DS_REGC_AF	0x20	/* Alarm interrupt flag */
+#define	 DS_REGC_PF	0x40	/* Periodic interrupt flag */
+#define	 DS_REGC_IRQF	0x80	/* Interrupt request pending flag */
 
-#define DS_REGD         0xd     /* Control register D */
-/*       DS_REGD_UNUSED 0x7f    UNUSED */
-#define  DS_REGD_VRT    0x80    /* Valid RAM and Time bit */
+#define	DS_REGD		0xd	/* Control register D */
+/*	 DS_REGD_UNUSED	0x7f	   UNUSED */
+#define	 DS_REGD_VRT	0x80	/* Valid RAM and Time bit */
 
-#define DS_NREGS        0xe     /* 14 registers; CMOS follows */
-#define DS_NTODREGS     0xa     /* 10 of those regs are for TOD and alarm */
+#define	DS_NREGS	0xe	/* 14 registers; CMOS follows */
+#define	DS_NTODREGS	0xa	/* 10 of those regs are for TOD and alarm */