diff --git a/sys/arch/x68k/conf/GENERIC b/sys/arch/x68k/conf/GENERIC
index b78623f9b5e7..73a5594b0822 100644
--- a/sys/arch/x68k/conf/GENERIC
+++ b/sys/arch/x68k/conf/GENERIC
@@ -1,7 +1,7 @@
-# $NetBSD: GENERIC,v 1.208 2023/02/12 14:50:42 abs Exp $
+# $NetBSD: GENERIC,v 1.209 2024/01/07 07:58:33 isaki Exp $
 #
 # GENERIC machine description file
-# 
+#
 # This machine description file is used to generate the default NetBSD
 # kernel.  The generic kernel does not include all options, subsystems
 # and device drivers, but should be useful for most applications.
@@ -22,7 +22,7 @@ include 	"arch/x68k/conf/std.x68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.208 $"
+#ident 		"GENERIC-$Revision: 1.209 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks -fno-unwind-tables -fno-omit-frame-pointer"
 	# See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for
@@ -159,7 +159,7 @@ file-system	FFS		# Berkeley Fast Filesystem
 file-system	NFS		# Sun NFS-compatible filesystem client
 file-system	KERNFS		# kernel data-structure filesystem
 file-system	NULLFS		# NULL layered filesystem
-#file-system 	OVERLAY		# overlay file system
+#file-system	OVERLAY		# overlay file system
 file-system	MFS		# memory-based filesystem
 #file-system	FDESC		# user file descriptor filesystem
 #file-system	UMAPFS		# uid/gid remapping filesystem
@@ -168,7 +168,7 @@ file-system	PROCFS		# /proc
 file-system	CD9660		# ISO 9660 + Rock Ridge file system
 #file-system	UNION		# union file system (a little buggy)
 file-system	MSDOSFS		# MS-DOS FAT filesystem(s).
-#file-system 	ADOSFS		# AmigaDOS filesystem
+#file-system	ADOSFS		# AmigaDOS filesystem
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -260,7 +260,7 @@ ms0	at zsc0 channel 1		# standard mouse
 #zsc2	at intio0 addr 0xeafc10 intr 114
 #zstty4	at zsc2 channel 0
 #zstty5	at zsc2 channel 1
-par0	at intio0 addr 0xe8c000 	# Builtin printer port
+par0	at intio0 addr 0xe8c000		# Builtin printer port
 
 sram0	at intio0 addr 0xed0000		# battery-backuped static RAM
 pseudo-device	bell			# OPM bell
@@ -411,7 +411,7 @@ bmd*	at intio0 addr 0xecebf0		# Nereid
 ## A disk-like interface to files.  Can be used to create floppy, CD,
 ## miniroot images, etc.
 
-pseudo-device	vnd	
+pseudo-device	vnd
 #options 	VND_COMPRESSION		# compressed vnd(4)
 
 ## Concatenated and striped disks; with this, you can create a software-based
@@ -425,7 +425,7 @@ pseudo-device	vnd
 
 ## RAIDframe disk driver: software RAID driver.  See raid(4).
 
-pseudo-device	raid	
+pseudo-device	raid
 options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
 # Options to enable various other RAIDframe RAID types.
 # options 	RF_INCLUDE_EVENODD=1
@@ -440,23 +440,23 @@ options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
 ## Memory disk device, used on boot floppies with compressed
 ## kernel-plus-root-disk images.
 
-#pseudo-device	md	
+#pseudo-device	md
 
 ## Loopback network interface; required
 pseudo-device	loop
 
 ## SLIP and CSLIP interfaces, for IP over a serial line.
-pseudo-device	sl		
+pseudo-device	sl
 
 ## PPP, the successor to SLIP.  See pppd(8).
-pseudo-device	ppp		
+pseudo-device	ppp
 
 ## PPP over Ethernet (RFC 2516)
 pseudo-device	pppoe
 
 ## Network "tunnel" device, allowing protocol stacks to run in the userland.
 ## This is used by the third-party user-mode "ppp" program, and others.
-#pseudo-device	tun		
+#pseudo-device	tun
 #pseudo-device	tap			# virtual Ethernet
 
 ## Generic L3 over IP tunnel
@@ -497,7 +497,7 @@ pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	drvctl			# user control of drive subsystem
 pseudo-device	ksyms			# /dev/ksyms
 #pseudo-device	fss			# file system snapshot device
-pseudo-device 	swwdog			# software watchdog timer -- swwdog(4)
+pseudo-device	swwdog			# software watchdog timer -- swwdog(4)
 
 # Veriexec
 # include "dev/veriexec.config"
diff --git a/sys/arch/x68k/conf/INSTALL b/sys/arch/x68k/conf/INSTALL
index 478a2b6af2d3..c5f64e721d76 100644
--- a/sys/arch/x68k/conf/INSTALL
+++ b/sys/arch/x68k/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.121 2022/06/11 04:57:57 tsutsui Exp $
+#	$NetBSD: INSTALL,v 1.122 2024/01/07 07:58:33 isaki Exp $
 
 #
 #	INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"INSTALL-$Revision: 1.121 $"
+#ident 		"INSTALL-$Revision: 1.122 $"
 
 makeoptions	COPTS="-Os -fno-unwind-tables" # Optimise for space. Implies -O2
 
@@ -141,7 +141,7 @@ file-system	FFS		# Berkeley Fast Filesystem
 file-system	NFS		# Sun NFS-compatible filesystem client
 #file-system	KERNFS		# kernel data-structure filesystem
 #file-system	NULLFS		# NULL layered filesystem
-#file-system 	OVERLAY		# overlay file system
+#file-system	OVERLAY		# overlay file system
 #file-system	MFS		# memory-based filesystem
 #file-system	FDESC		# user file descriptor filesystem
 #file-system	UMAPFS		# uid/gid remapping filesystem
@@ -150,7 +150,7 @@ file-system	NFS		# Sun NFS-compatible filesystem client
 file-system	CD9660		# ISO 9660 + Rock Ridge file system
 #file-system	UNION		# union file system (a little buggy)
 file-system	MSDOSFS		# MS-DOS FAT filesystem(s).
-#file-system 	ADOSFS		# AmigaDOS filesystem
+#file-system	ADOSFS		# AmigaDOS filesystem
 #file-system	PTYFS		# /dev/pts/N support
 
 ## File system options.
@@ -225,7 +225,7 @@ zstty0	at zsc0 channel 0		# built-in RS-232C
 #zsc2	at intio0 addr 0xeafc10 intr 114
 #zstty4	at zsc2 channel 0
 #zstty5	at zsc2 channel 1
-#par0	at intio0 addr 0xe8c000 	# Builtin printer port
+#par0	at intio0 addr 0xe8c000		# Builtin printer port
 
 sram0	at intio0 addr 0xed0000		# battery-backuped static RAM
 #pseudo-device	bell			# OPM bell
@@ -252,5 +252,5 @@ ne*	at neptune? addr 0x300			# NE2000 or clone
 pseudo-device	md			# boot floppy image
 pseudo-device	loop
 pseudo-device	bpfilter
-pseudo-device	sl		
+pseudo-device	sl
 pseudo-device	pty			# pseudo-terminals
diff --git a/sys/arch/x68k/conf/majors.x68k b/sys/arch/x68k/conf/majors.x68k
index e3e8aaa322af..9f38142c95d8 100644
--- a/sys/arch/x68k/conf/majors.x68k
+++ b/sys/arch/x68k/conf/majors.x68k
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.x68k,v 1.33 2021/06/29 10:22:37 nia Exp $
+#	$NetBSD: majors.x68k,v 1.34 2024/01/07 07:58:33 isaki Exp $
 #
 # Device majors for x68k
 #
@@ -63,5 +63,5 @@ device-major	sysmon		char 61			sysmon
 #device-major	obsolete	char 98			obsolete (nsmb)
 
 # Majors up to 143 are reserved for machine-dependent drivers.
-# New machine-independent driver majors are assigned in 
+# New machine-independent driver majors are assigned in
 # sys/conf/majors.
diff --git a/sys/arch/x68k/dev/bmd.c b/sys/arch/x68k/dev/bmd.c
index 0631b418ad06..079008893474 100644
--- a/sys/arch/x68k/dev/bmd.c
+++ b/sys/arch/x68k/dev/bmd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bmd.c,v 1.27 2023/12/17 21:51:29 andvar Exp $	*/
+/*	$NetBSD: bmd.c,v 1.28 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 2002 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.27 2023/12/17 21:51:29 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.28 2024/01/07 07:58:33 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -152,7 +152,7 @@ bmd_match(device_t parent, cfdata_t cf, void *aux)
 		return (0);
 
 	/* Check CTRL addr */
- 	if (badaddr((void *)IIOV(ia->ia_addr)))
+	if (badaddr((void *)IIOV(ia->ia_addr)))
 		return (0);
 
 	ia->ia_size = 2;
diff --git a/sys/arch/x68k/dev/fd.c b/sys/arch/x68k/dev/fd.c
index ccec50b91181..987a2cef7eae 100644
--- a/sys/arch/x68k/dev/fd.c
+++ b/sys/arch/x68k/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.128 2023/12/17 21:52:11 andvar Exp $	*/
+/*	$NetBSD: fd.c,v 1.129 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.128 2023/12/17 21:52:11 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.129 2024/01/07 07:58:33 isaki Exp $");
 
 #include "opt_ddb.h"
 #include "opt_m68k_arch.h"
@@ -1768,7 +1768,7 @@ fdioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
 		*(int *)addr = fd->sc_opts;
 		return 0;
 
-	case FDIOCSETOPTS:        	/* set drive options */
+	case FDIOCSETOPTS:		/* set drive options */
 		DPRINTF(("FDIOCSETOPTS\n"));
 		fd->sc_opts = *(int *)addr;
 		return 0;
@@ -1882,7 +1882,7 @@ fdgetdisklabel(struct fd_softc *sc, dev_t dev)
 	lp->d_secperunit  = sc->sc_type->size;
 
 	lp->d_type        = DKTYPE_FLOPPY;
-	lp->d_rpm         = 300; 	/* XXX */
+	lp->d_rpm         = 300;	/* XXX */
 	lp->d_interleave  = 1;		/* FIXME: is this OK?		*/
 	lp->d_bbsize      = 0;
 	lp->d_sbsize      = 0;
diff --git a/sys/arch/x68k/dev/intio_dmac.c b/sys/arch/x68k/dev/intio_dmac.c
index 0abb4c08cf15..9adb9a7aa0b1 100644
--- a/sys/arch/x68k/dev/intio_dmac.c
+++ b/sys/arch/x68k/dev/intio_dmac.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: intio_dmac.c,v 1.39 2023/12/17 22:03:50 andvar Exp $	*/
+/*	$NetBSD: intio_dmac.c,v 1.40 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include "opt_m68k_arch.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.39 2023/12/17 22:03:50 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.40 2024/01/07 07:58:33 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -180,7 +180,7 @@ dmac_alloc_channel(device_t self, int ch, const char *name,
 	if (chan->ch_name[0])
 		panic("DMAC: channel in use.");
 	if (strlen(name) > 8)
-	  	panic("DMAC: wrong user name.");
+		panic("DMAC: wrong user name.");
 #endif
 
 #ifdef DMAC_ARRAYCHAIN
@@ -380,7 +380,7 @@ dmac_start_xfer_offset(struct dmac_softc *dmac, struct dmac_dma_xfer *xf,
 	if ((offset >= dmamap->dm_mapsize) ||
 	    (offset + size > dmamap->dm_mapsize))
 		panic("dmac_start_xfer_offset: invalid offset: "
-			"offset=%d, size=%d, mapsize=%ld",
+		      "offset=%d, size=%d, mapsize=%ld",
 		       offset, size, dmamap->dm_mapsize);
 #endif
 	/* program DMAC in single block mode or array chainning mode */
diff --git a/sys/arch/x68k/dev/ite.c b/sys/arch/x68k/dev/ite.c
index 2f04f5fcaec1..702d2dcfcf31 100644
--- a/sys/arch/x68k/dev/ite.c
+++ b/sys/arch/x68k/dev/ite.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite.c,v 1.70 2022/06/25 05:01:31 tsutsui Exp $	*/
+/*	$NetBSD: ite.c,v 1.71 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.70 2022/06/25 05:01:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.71 2024/01/07 07:58:33 isaki Exp $");
 
 #include "ite.h"
 #if NITE > 0
@@ -186,7 +186,7 @@ static int
 itematch(device_t parent, cfdata_t cf, void *aux)
 {
 	struct grf_softc *gp;
-	
+
 	gp = aux;
 	if (cf->cf_loc[GRFCF_GRFADDR] != gp->g_cfaddr)
 		return 0;
@@ -844,7 +844,7 @@ ite_filter(u_char c)
 		    (key.mode & KBD_MODE_CAPS) != 0)
 			key = kbdmap.shift_keys[c];
 		else if ((mod & KBD_MOD_OPT2) != 0 &&
-		    	 (key.mode & KBD_MODE_KPAD) != 0)
+		         (key.mode & KBD_MODE_KPAD) != 0)
 			key = kbdmap.shift_keys[c];
 	}
 	code = key.code;
@@ -1205,7 +1205,7 @@ ite_putstr(const u_char *s, int len, dev_t dev)
 
 	/* XXX avoid problems */
 	if ((ip->flags & (ITE_ACTIVE|ITE_INGRF)) != ITE_ACTIVE)
-	  	return;
+		return;
 
 	SUBR_CURSOR(ip, START_CURSOROPT);
 	for (i = 0; i < len; i++)
@@ -2222,7 +2222,7 @@ iteputchar(int c, struct ite_softc *ip)
 	case SO:
 		ip->GL = &ip->G1;
 		break;
-		
+
 	case SI:
 		ip->GL = &ip->G0;
 		break;
@@ -2234,16 +2234,16 @@ iteputchar(int c, struct ite_softc *ip)
 	case 0x14:	/* DC4 */
 	case 0x15:	/* NAK */
 	case 0x16:	/* SYN */
-	case 0x17:	/* ETB */		
+	case 0x17:	/* ETB */
 		break;
 
 	case CAN:
 		ip->escape = 0;	/* cancel any escape sequence in progress */
 		break;
-		
+
 	case 0x19:	/* EM */
 		break;
-					
+
 	case SUB:
 		ip->escape = 0;	/* dito, but see below */
 		/* should also display a reverse question mark!! */
@@ -2263,7 +2263,7 @@ iteputchar(int c, struct ite_softc *ip)
 	case IND:	/* index: move cursor down, scroll */
 		ite_index(ip);
 		break;
-		
+
 	case NEL:	/* next line. next line, first pos. */
 		ite_crlf(ip);
 		break;
@@ -2272,7 +2272,7 @@ iteputchar(int c, struct ite_softc *ip)
 		if (ip->curx < ip->cols)
 			ip->tabs[ip->curx] = 1;
 		break;
-		
+
 	case RI:	/* reverse index */
 		ite_rlf(ip);
 		break;
@@ -2281,26 +2281,26 @@ iteputchar(int c, struct ite_softc *ip)
 		ip->save_GL = ip->GR;	/* GL XXX EUC */
 		ip->GR = &ip->G2;	/* GL XXX */
 		break;
-		
+
 	case SS3:	/* go into G3 for one character */
 		ip->save_GL = ip->GR;	/* GL XXX EUC */
 		ip->GR = &ip->G3;	/* GL XXX */
 		break;
-		
+
 	case DCS:	/* device control string introducer */
 		ip->escape = DCS;
 		ip->ap = ip->argbuf;
 		break;
-		
+
 	case CSI:	/* control sequence introducer */
 		ip->escape = CSI;
 		ip->ap = ip->argbuf;
 		break;
-		
+
 	case ST:	/* string terminator */
 		/* ignore, if not used as terminator */
 		break;
-		
+
 	case OSC:	/* introduces OS command. */
 		/* Ignore everything upto ST */
 		ip->escape = OSC;
@@ -2310,7 +2310,7 @@ iteputchar(int c, struct ite_softc *ip)
 		/* ignore everything upto ST */
 		ip->escape = PM;
 		break;
-		
+
 	case APC:	/* application program command */
 		/* ignore everything upto ST */
 		ip->escape = APC;
@@ -2547,7 +2547,7 @@ itecnputc(dev_t dev, int c)
 #ifdef ITE_KERNEL_ATTR
 	short save_attribute;
 #endif
-	
+
 	if (panicstr && !paniced &&
 	    (ip->flags & (ITE_ACTIVE|ITE_INGRF)) != ITE_ACTIVE) {
 		(void) iteon(dev, 3);
diff --git a/sys/arch/x68k/dev/ite_tv.c b/sys/arch/x68k/dev/ite_tv.c
index 5deb5e570ccc..ddf6ad54a97e 100644
--- a/sys/arch/x68k/dev/ite_tv.c
+++ b/sys/arch/x68k/dev/ite_tv.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_tv.c,v 1.19 2022/06/25 03:57:17 tsutsui Exp $	*/
+/*	$NetBSD: ite_tv.c,v 1.20 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1997 Masaru Oki.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_tv.c,v 1.19 2022/06/25 03:57:17 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_tv.c,v 1.20 2024/01/07 07:58:33 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -142,7 +142,7 @@ void
 ite_set_glyph(void)
 {
 	uint8_t glyph = IODEVbase->io_sram[0x59];
-	
+
 	if ((glyph & 4) != 0)
 		SETGLYPH(0x82, '|');
 	if ((glyph & 2) != 0)
diff --git a/sys/arch/x68k/dev/itevar.h b/sys/arch/x68k/dev/itevar.h
index 6da2e2e4c3e4..7f8177a99af9 100644
--- a/sys/arch/x68k/dev/itevar.h
+++ b/sys/arch/x68k/dev/itevar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: itevar.h,v 1.16 2022/06/25 03:18:38 tsutsui Exp $	*/
+/*	$NetBSD: itevar.h,v 1.17 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -146,7 +146,7 @@ enum emul_level {
 	(((c) / (ip)->cpl) * (ip)->ftheight + (ip)->fonty)
 
 /* Character attributes */
-#define ATTR_NOR        0x0             /* normal */
+#define ATTR_NOR	0x0		/* normal */
 #define	ATTR_INV	0x1		/* inverse */
 #define	ATTR_UL		0x2		/* underline */
 #define ATTR_BOLD	0x4		/* bold */
@@ -160,14 +160,14 @@ enum emul_level {
 #define RR_CLEAR		0x0
 #define RR_COPY			0x3
 #define RR_XOR			0x6
-#define RR_COPYINVERTED  	0xc
+#define RR_COPYINVERTED		0xc
 
 #define SCROLL_UP	0x01
 #define SCROLL_DOWN	0x02
 #define SCROLL_LEFT	0x03
 #define SCROLL_RIGHT	0x04
 #define DRAW_CURSOR	0x05
-#define ERASE_CURSOR    0x06
+#define ERASE_CURSOR	0x06
 #define MOVE_CURSOR	0x07
 #define START_CURSOROPT	0x08	/* at start of output. May disable cursor */
 #define END_CURSOROPT	0x09	/* at end, make sure cursor state is ok */
diff --git a/sys/arch/x68k/dev/kbdmap.c b/sys/arch/x68k/dev/kbdmap.c
index 3b2a63da1282..81efa7e0608a 100644
--- a/sys/arch/x68k/dev/kbdmap.c
+++ b/sys/arch/x68k/dev/kbdmap.c
@@ -1,10 +1,10 @@
-/*	$NetBSD: kbdmap.c,v 1.8 2022/05/26 14:28:56 tsutsui Exp $	*/
+/*	$NetBSD: kbdmap.c,v 1.9 2024/01/07 07:58:33 isaki Exp $	*/
 
 /* from: arch/amiga/dev/kbdmap.c */
 /* modified for X680x0 by Masaru Oki and Makoto MINOURA */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbdmap.c,v 1.8 2022/05/26 14:28:56 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbdmap.c,v 1.9 2024/01/07 07:58:33 isaki Exp $");
 
 #include "kbdmap.h"
 
@@ -180,7 +180,7 @@ const struct kbdmap ascii_kbdmap = {
 	   {0, '+'},
 	   {0, '*'},	/* 0x28 */
 	   {0, '}'},
-	   {C, 'Z'},	
+	   {C, 'Z'},
 	   {C, 'X'},
 	   {C, 'C'},
 	   {C, 'V'},
diff --git a/sys/arch/x68k/dev/kbdmap.c.ascii b/sys/arch/x68k/dev/kbdmap.c.ascii
index 1dea36863a45..d2948886ae0e 100644
--- a/sys/arch/x68k/dev/kbdmap.c.ascii
+++ b/sys/arch/x68k/dev/kbdmap.c.ascii
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbdmap.c.ascii,v 1.5 2022/05/26 14:28:56 tsutsui Exp $	*/
+/*	$NetBSD: kbdmap.c.ascii,v 1.6 2024/01/07 07:58:33 isaki Exp $	*/
 /* from: arch/amiga/dev/kbdmap.c */
 /* modified for X680x0 by Masaru Oki */
 
@@ -176,7 +176,7 @@ const struct kbdmap ascii_kbdmap = {
 	   0, ':',
 	   0, '\"',	/* 0x28 */
 	   0, '~',
-	   C, 'Z',	
+	   C, 'Z',
 	   C, 'X',
 	   C, 'C',
 	   C, 'V',
@@ -300,5 +300,3 @@ const struct kbdmap ascii_kbdmap = {
 
 unsigned char acctable[KBD_NUM_ACC][64] = {
 };
-
-	
diff --git a/sys/arch/x68k/dev/mha.c b/sys/arch/x68k/dev/mha.c
index a8280bc4c160..288be32a816b 100644
--- a/sys/arch/x68k/dev/mha.c
+++ b/sys/arch/x68k/dev/mha.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mha.c,v 1.60 2023/12/17 22:07:34 andvar Exp $	*/
+/*	$NetBSD: mha.c,v 1.61 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -59,13 +59,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.60 2023/12/17 22:07:34 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.61 2024/01/07 07:58:33 isaki Exp $");
 
 #include "opt_ddb.h"
 
 /* Synchronous data transfers? */
 #define SPC_USE_SYNCHRONOUS	0
-#define SPC_SYNC_REQ_ACK_OFS 	8
+#define SPC_SYNC_REQ_ACK_OFS	8
 
 /* Default DMA mode? */
 #define MHA_DMA_LIMIT_XFER	1
@@ -247,7 +247,7 @@ int	mha_datain_pio(struct mha_softc *, u_char *, int);
 int	mha_dataout(struct mha_softc *, u_char *, int);
 int	mha_datain(struct mha_softc *, u_char *, int);
 void	mha_abort(struct mha_softc *, struct acb *);
-void 	mha_init(struct mha_softc *);
+void	mha_init(struct mha_softc *);
 void	mha_scsi_request(struct scsipi_channel *, scsipi_adapter_req_t, void *);
 void	mha_poll(struct mha_softc *, struct acb *);
 void	mha_sched(struct mha_softc *);
@@ -1215,7 +1215,7 @@ printf("%s: unimplemented message: %d\n", device_xname(sc->sc_dev), sc->sc_imess
 		struct spc_tinfo *ti;
 		u_char lunit;
 
-		if (MSG_ISIDENTIFY(sc->sc_imess[0])) { 	/* Identify? */
+		if (MSG_ISIDENTIFY(sc->sc_imess[0])) {	/* Identify? */
 			SPC_MISC(("searching "));
 			/*
 			 * Search wait queue for disconnected cmd
diff --git a/sys/arch/x68k/dev/mhavar.h b/sys/arch/x68k/dev/mhavar.h
index 92ba2d8219ef..9492d0f8dfb3 100644
--- a/sys/arch/x68k/dev/mhavar.h
+++ b/sys/arch/x68k/dev/mhavar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: mhavar.h,v 1.11 2022/01/01 21:07:14 andvar Exp $	*/
+/*	$NetBSD: mhavar.h,v 1.12 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1994 Peter Galbavy.  All rights reserved.
@@ -55,7 +55,7 @@ struct acb {
 	int	 clen;
 	char	*daddr;		/* Saved data pointer */
 	int	 dleft;		/* Residue */
-	u_char 	 stat;		/* SCSI status byte */
+	u_char	 stat;		/* SCSI status byte */
 
 /*	struct spc_dma_seg dma[SPC_NSEG];*/ /* Physical addresses+len */
 };
@@ -110,9 +110,9 @@ struct mha_softc {
 	int	sc_phase;	/* Copy of what bus phase we are in */
 	int	sc_prevphase;	/* Copy of what bus phase we were in */
 	u_char	sc_state;	/* State applicable to the adapter */
-	u_char	 sc_flags;
+	u_char	sc_flags;
 	u_char	sc_selid;	/* Reselection ID */
-	volatile u_char	 sc_spcinitialized;	/* */
+	volatile u_char	sc_spcinitialized;	/* */
 
 	/* Message stuff */
 	u_char	sc_msgpriq;	/* Messages we want to send */
@@ -121,7 +121,7 @@ struct mha_softc {
 	u_char	sc_lastmsg;	/* Message last transmitted */
 	u_char	sc_currmsg;	/* Message currently ready to transmit */
 #define SPC_MAX_MSG_LEN 8
-	u_char  sc_omess[SPC_MAX_MSG_LEN];
+	u_char	sc_omess[SPC_MAX_MSG_LEN];
 	u_char	*sc_omp;		/* Outgoing message pointer */
 	u_char	sc_imess[SPC_MAX_MSG_LEN];
 	u_char	*sc_imp;		/* Incoming message pointer */
@@ -173,7 +173,7 @@ struct mha_softc {
 #define SEND_PARITY_ERROR	0x02
 #define SEND_INIT_DET_ERR	0x04
 #define SEND_REJECT		0x08
-#define SEND_IDENTIFY  		0x10
+#define SEND_IDENTIFY		0x10
 #define SEND_ABORT		0x20
 #define SEND_SDTR		0x40
 #define	SEND_WDTR		0x80
diff --git a/sys/arch/x68k/dev/ms.c b/sys/arch/x68k/dev/ms.c
index da656d9adb5e..2b1d14b35e68 100644
--- a/sys/arch/x68k/dev/ms.c
+++ b/sys/arch/x68k/dev/ms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ms.c,v 1.40 2022/05/23 16:58:37 tsutsui Exp $ */
+/*	$NetBSD: ms.c,v 1.41 2024/01/07 07:58:33 isaki Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.40 2022/05/23 16:58:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.41 2024/01/07 07:58:33 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -469,7 +469,7 @@ ms_input(struct ms_softc *ms, int c)
 		 * moving up (forward) is positive. (see vuid_event.h)
 		 * On the other hand, X680x0 mouse protocol reports
 		 * moving down (backward) is positive.
-		 * 
+		 *
 		 * Note wsmouse(9) also defines moving upward is positive,
 		 * but Xorg DIX layer requires moving down is positive.
 		 */
diff --git a/sys/arch/x68k/dev/par.c b/sys/arch/x68k/dev/par.c
index a68b735ac0e1..245049977878 100644
--- a/sys/arch/x68k/dev/par.c
+++ b/sys/arch/x68k/dev/par.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: par.c,v 1.44 2022/05/26 14:33:29 tsutsui Exp $	*/
+/*	$NetBSD: par.c,v 1.45 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: par.c,v 1.44 2022/05/26 14:33:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: par.c,v 1.45 2024/01/07 07:58:33 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -65,9 +65,9 @@ struct	par_softc {
 	bus_space_handle_t	sc_bsh;
 	int			sc_flags;
 	struct parparam		sc_param;
-#define sc_burst 	sc_param.burst
-#define sc_timo  	sc_param.timo
-#define sc_delay 	sc_param.delay
+#define sc_burst	sc_param.burst
+#define sc_timo		sc_param.timo
+#define sc_delay	sc_param.delay
 	struct callout		sc_timo_ch;
 	struct callout		sc_start_ch;
 } ;
@@ -77,8 +77,8 @@ struct	par_softc {
 #define PAR_STROBE	3
 
 /* sc_flags values */
-#define	PARF_ALIVE	0x01	
-#define	PARF_OPEN	0x02	
+#define	PARF_ALIVE	0x01
+#define	PARF_OPEN	0x02
 #define PARF_UIO	0x04
 #define PARF_TIMO	0x08
 #define PARF_DELAY	0x10
@@ -169,7 +169,7 @@ parattach(device_t parent, device_t self, void *aux)
 	struct par_softc *sc = device_private(self);
 	struct intio_attach_args *ia = aux;
 	int r __diagused;
-	
+
 	par_attached = 1;
 
 	sc->sc_dev = self;
@@ -207,7 +207,7 @@ paropen(dev_t dev, int flags, int mode, struct lwp *l)
 {
 	int unit = UNIT(dev);
 	struct par_softc *sc;
-	
+
 	sc = device_lookup_private(&par_cd, unit);
 	if (sc == NULL || !(sc->sc_flags & PARF_ALIVE))
 		return(ENXIO);
@@ -216,11 +216,11 @@ paropen(dev_t dev, int flags, int mode, struct lwp *l)
 	/* X680x0 can't read */
 	if ((flags & FREAD) == FREAD)
 		return (EINVAL);
-	
+
 	sc->sc_flags |= PARF_OPEN;
-	
+
 	sc->sc_flags |= PARF_OWRITE;
-	
+
 	sc->sc_burst = PAR_BURST;
 	sc->sc_timo = parmstohz(PAR_TIMO);
 	sc->sc_delay = parmstohz(PAR_DELAY);
@@ -234,7 +234,7 @@ parclose(dev_t dev, int flags, int mode, struct lwp *l)
 	int unit = UNIT(dev);
 	int s;
 	struct par_softc *sc = device_lookup_private(&par_cd, unit);
-	
+
 	sc->sc_flags &= ~(PARF_OPEN|PARF_OWRITE);
 
 	/* don't allow interrupts any longer */
@@ -273,7 +273,7 @@ partimo(void *arg)
 int
 parwrite(dev_t dev, struct uio *uio, int flag)
 {
-	
+
 #ifdef DEBUG
 	if (pardebug & PDB_FOLLOW)
 		printf("parwrite(%x, %p)\n", UNIT(dev), uio);
@@ -292,13 +292,13 @@ parrw(dev_t dev, struct uio *uio)
 	int error = 0;
 	int buflen;
 	char *buf;
-	
+
 	if (!!(sc->sc_flags & PARF_OREAD) ^ (uio->uio_rw == UIO_READ))
 		return EINVAL;
-	
+
 	if (uio->uio_resid == 0)
 		return(0);
-	
+
 	buflen = uimin(sc->sc_burst, uio->uio_resid);
 	buf = (char *)malloc(buflen, M_DEVBUF, M_WAITOK);
 	sc->sc_flags |= PARF_UIO;
@@ -341,7 +341,7 @@ parrw(dev_t dev, struct uio *uio)
 			error = -cnt;
 			break;
 		}
-		
+
 		s = splsoftclock();
 		/*
 		 * Operation timeout (or non-blocking), quit now.
@@ -418,7 +418,7 @@ parioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 	struct par_softc *sc = device_lookup_private(&par_cd, UNIT(dev));
 	struct parparam *pp, *upp;
 	int error = 0;
-	
+
 	switch (cmd) {
 	case PARIOCGPARAM:
 		pp = &sc->sc_param;
@@ -427,7 +427,7 @@ parioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 		upp->timo = parhztoms(pp->timo);
 		upp->delay = parhztoms(pp->delay);
 		break;
-		
+
 	case PARIOCSPARAM:
 		pp = &sc->sc_param;
 		upp = (struct parparam *)data;
@@ -438,7 +438,7 @@ parioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 		pp->timo = parmstohz(upp->timo);
 		pp->delay = parmstohz(upp->delay);
 		break;
-		
+
 	default:
 		return(EINVAL);
 	}
@@ -449,7 +449,7 @@ int
 parhztoms(int h)
 {
 	int m = h;
-	
+
 	if (m > 0)
 		m = m * 1000 / hz;
 	return(m);
@@ -459,7 +459,7 @@ int
 parmstohz(int m)
 {
 	int h = m;
-	
+
 	if (h > 0) {
 		h = h * hz / 1000;
 		if (h == 0)
@@ -499,10 +499,10 @@ parintr(void *arg)
 		if (parsend_pending)
 			parsend_pending = 0;
 	}
-	
+
 	/* either way, there won't be a timeout pending any longer */
 	partimeout_pending = 0;
-	
+
 	wakeup(parintr);
 	splx(s);
 }
@@ -512,7 +512,7 @@ parsendch(struct par_softc *sc, u_char ch)
 {
 	int error = 0;
 	int s;
-	
+
 	/* if either offline, busy or out of paper, wait for that
 	   condition to clear */
 	s = spl1();
@@ -556,9 +556,9 @@ parsendch(struct par_softc *sc, u_char ch)
 		bus_space_write_1(sc->sc_bst, sc->sc_bsh, PAR_STROBE, 1);
 		parsend_pending = 1;
 	}
-	
+
 	splx(s);
-	
+
 	return error;
 }
 
@@ -567,11 +567,11 @@ int
 parsend(struct par_softc *sc, u_char *buf, int len)
 {
 	int err, orig_len = len;
-	
+
 	for (; len; len--, buf++)
 		if ((err = parsendch(sc, *buf)))
 			return err < 0 ? -EINTR : -err;
-	
+
 	/* either all or nothing.. */
 	return orig_len;
 }
diff --git a/sys/arch/x68k/dev/scsiromvar.h b/sys/arch/x68k/dev/scsiromvar.h
index 92b7e20b7755..d88100f48b94 100644
--- a/sys/arch/x68k/dev/scsiromvar.h
+++ b/sys/arch/x68k/dev/scsiromvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsiromvar.h,v 1.6 2008/06/25 08:14:59 isaki Exp $	*/
+/*	$NetBSD: scsiromvar.h,v 1.7 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1998 NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@ struct scsirom_softc {
 	enum {
 		INTERNAL = 0,	/* onboard */
 		EXTERNAL = 1,	/* optional */
-	} 		sc_which;
+	}		sc_which;
 	paddr_t		sc_addr;
 };
 
diff --git a/sys/arch/x68k/dev/slhci_intio.c b/sys/arch/x68k/dev/slhci_intio.c
index 67da66ad76f9..2a62c610dc8c 100644
--- a/sys/arch/x68k/dev/slhci_intio.c
+++ b/sys/arch/x68k/dev/slhci_intio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: slhci_intio.c,v 1.15 2016/04/23 10:15:30 skrll Exp $	*/
+/*	$NetBSD: slhci_intio.c,v 1.16 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slhci_intio.c,v 1.15 2016/04/23 10:15:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slhci_intio.c,v 1.16 2024/01/07 07:58:33 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -63,7 +63,7 @@ CFATTACH_DECL_NEW(slhci_intio, sizeof(struct slhci_intio_softc),
     slhci_intio_match, slhci_intio_attach, NULL, NULL);
 
 #define INTR_ON 	1
-#define INTR_OFF 	0
+#define INTR_OFF	0
 
 static int
 slhci_intio_match(device_t parent, cfdata_t cf, void *aux)
@@ -147,7 +147,7 @@ slhci_intio_attach(device_t parent, device_t self, void *aux)
 	}
 
 	/* Initialize sc */
-	slhci_preinit(sc, slhci_intio_enable_power, iot, ioh, 30, 
+	slhci_preinit(sc, slhci_intio_enable_power, iot, ioh, 30,
 	    SL11_IDX_DATA);
 
 	/* Establish the interrupt handler */
diff --git a/sys/arch/x68k/dev/sram.c b/sys/arch/x68k/dev/sram.c
index 3485d97ae78f..5fc4a2683d92 100644
--- a/sys/arch/x68k/dev/sram.c
+++ b/sys/arch/x68k/dev/sram.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sram.c,v 1.21 2022/05/26 14:33:29 tsutsui Exp $	*/
+/*	$NetBSD: sram.c,v 1.22 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1994 Kazuhisa Shimizu.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sram.c,v 1.21 2022/05/26 14:33:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sram.c,v 1.22 2024/01/07 07:58:33 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -218,9 +218,9 @@ sramioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 		if ((sc->sc_flags & SRF_WRITE) == 0)
 			return EPERM;
 		DPRINTF(SRAM_DEBUG_IOCTL,
-    			("Sram ioctl SIOPSRAM address=%p\n", data));
+			("Sram ioctl SIOPSRAM address=%p\n", data));
 		DPRINTF(SRAM_DEBUG_IOCTL,
-    			("Sram ioctl SIOPSRAM offset=%x\n", sram_io->offset));
+			("Sram ioctl SIOPSRAM offset=%x\n", sram_io->offset));
 		if (sram_io->offset + SRAM_IO_SIZE > SRAM_SIZE)
 			return EFAULT;
 #ifdef DEBUG
diff --git a/sys/arch/x68k/dev/vsvar.h b/sys/arch/x68k/dev/vsvar.h
index a3cda9fa76fb..ee1acdc818b8 100644
--- a/sys/arch/x68k/dev/vsvar.h
+++ b/sys/arch/x68k/dev/vsvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vsvar.h,v 1.19 2021/02/06 12:50:04 isaki Exp $	*/
+/*	$NetBSD: vsvar.h,v 1.20 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -59,7 +59,7 @@
 #define VS_MAX_BUFSIZE	(65536*4) /* XXX: enough? */
 
 /* XXX: msm6258vreg.h */
-#define MSM6258_CMD 	0		/* W */
+#define MSM6258_CMD	0		/* W */
 #define MSM6258_CMD_STOP	(0x01)
 #define MSM6258_CMD_PLAY_START	(0x02)
 #define MSM6258_CMD_REC_START	(0x04)
diff --git a/sys/arch/x68k/include/cpu.h b/sys/arch/x68k/include/cpu.h
index e34e54f1cd6c..79bd8b564f61 100644
--- a/sys/arch/x68k/include/cpu.h
+++ b/sys/arch/x68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.62 2019/11/23 19:40:37 ad Exp $	*/
+/*	$NetBSD: cpu.h,v 1.63 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -89,7 +89,7 @@ struct clockframe {
  * or after the current trap/syscall if in system mode.
  */
 #define	cpu_need_resched(ci,l,flags)	do {	\
-	__USE(flags); 				\
+	__USE(flags);				\
 	aston();				\
 } while (/*CONSTCOND*/0)
 
diff --git a/sys/arch/x68k/include/disklabel.h b/sys/arch/x68k/include/disklabel.h
index 9f997b0d3dde..452d855890bd 100644
--- a/sys/arch/x68k/include/disklabel.h
+++ b/sys/arch/x68k/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: disklabel.h,v 1.6 2011/08/30 12:39:59 bouyer Exp $	*/
+/*	$NetBSD: disklabel.h,v 1.7 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1994 Masaru Oki
@@ -46,10 +46,10 @@
 #define NDOSPART	8
 
 struct dos_partition {
-  unsigned char dp_typname[8];	/* partition name */
-  unsigned int  dp_flag:8;	/* state of partition */
-  unsigned int  dp_start:24;	/* start position (1024bytes/block) */
-  unsigned long dp_size;	/* partition size (1024bytes/block) */
+	unsigned char dp_typname[8];	/* partition name */
+	unsigned int  dp_flag:8;	/* state of partition */
+	unsigned int  dp_start:24;	/* start position (1024bytes/block) */
+	unsigned long dp_size;		/* partition size (1024bytes/block) */
 };
 
 #if HAVE_NBTOOL_CONFIG_H
diff --git a/sys/arch/x68k/include/intr.h b/sys/arch/x68k/include/intr.h
index 9c6c3e7917cc..b7459557be75 100644
--- a/sys/arch/x68k/include/intr.h
+++ b/sys/arch/x68k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.22 2023/07/11 11:50:39 riastradh Exp $	*/
+/*	$NetBSD: intr.h,v 1.23 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -40,9 +40,9 @@
 #define splsoftclock()	splraise1()
 #define splsoftnet()	splraise1()
 #define splsoftserial()	splraise1()
-#define splvm()         splraise5()
-#define splsched()      spl7()
-#define splhigh()       spl7()
+#define splvm()		splraise5()
+#define splsched()	spl7()
+#define splhigh()	spl7()
 
 #define	splnone()	spl0()
 #define	splzs()		splraise5()	/* disallow serial interrupts */
diff --git a/sys/arch/x68k/include/kbdmap.h b/sys/arch/x68k/include/kbdmap.h
index c99efab1a058..025a3cf6a833 100644
--- a/sys/arch/x68k/include/kbdmap.h
+++ b/sys/arch/x68k/include/kbdmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbdmap.h,v 1.2 2005/12/11 12:19:44 christos Exp $	*/
+/*	$NetBSD: kbdmap.h,v 1.3 2024/01/07 07:58:33 isaki Exp $	*/
 
 #ifndef _X68K_KBDMAP_H_
 #define _X68K_KBDMAP_H_
@@ -97,9 +97,9 @@ struct key {
 #define KBD_MODE_ACCMASK  (0xf0)
 
 struct kbdmap {
-	struct key 	keys[KBD_NUM_KEYS],
-		   	shift_keys[KBD_NUM_KEYS],
-		   	alt_keys[KBD_NUM_KEYS],
+	struct key	keys[KBD_NUM_KEYS],
+			shift_keys[KBD_NUM_KEYS],
+			alt_keys[KBD_NUM_KEYS],
 			alt_shift_keys[KBD_NUM_KEYS];
 	unsigned char	strings[KBD_STRTAB_SIZE];
 };
diff --git a/sys/arch/x68k/include/opmbellio.h b/sys/arch/x68k/include/opmbellio.h
index 14314237645f..3323a287804f 100644
--- a/sys/arch/x68k/include/opmbellio.h
+++ b/sys/arch/x68k/include/opmbellio.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: opmbellio.h,v 1.5 2005/12/11 12:19:44 christos Exp $	*/
+/*	$NetBSD: opmbellio.h,v 1.6 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1995 Takuya Harakawa.
@@ -58,7 +58,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$NetBSD: opmbellio.h,v 1.5 2005/12/11 12:19:44 christos Exp $
+ *	$NetBSD: opmbellio.h,v 1.6 2024/01/07 07:58:33 isaki Exp $
  */
 
 #ifndef _X68K_OPMBELLIO_H_
@@ -75,7 +75,7 @@ struct bell_info {
 };
 
 /* default values */
-#define	BELL_VOLUME	100	/* percentage */
+#define BELL_VOLUME	100	/* percentage */
 #define BELL_PITCH	440
 #define BELL_DURATION	100
 #define BELL_CHANNEL	7
diff --git a/sys/arch/x68k/stand/aout2hux/aout2hux.c b/sys/arch/x68k/stand/aout2hux/aout2hux.c
index bc19740a134b..09feb4f7ce80 100644
--- a/sys/arch/x68k/stand/aout2hux/aout2hux.c
+++ b/sys/arch/x68k/stand/aout2hux/aout2hux.c
@@ -21,7 +21,7 @@
  *	% cc -N -static -Wl,-Ttext,10203040 -o aout2 *.o
  *	% aout2hux -o foo.x aout1 0 aout2 10203040
  *
- *	$NetBSD: aout2hux.c,v 1.13 2011/02/21 02:31:58 itohy Exp $
+ *	$NetBSD: aout2hux.c,v 1.14 2024/01/07 07:58:33 isaki Exp $
  */
 
 #include <sys/types.h>
@@ -593,7 +593,7 @@ aout2hux(const char *fn1, const char *fn2, u_int32_t loadadr1, u_int32_t loadadr
 	datasize = inf1.data_size;
 	execoff = inf1.entry_addr - loadadr1;
 
-	DPRINTF(("text: %u, data: %u, pad: %u, bss: %u, exec: %u\n", 
+	DPRINTF(("text: %u, data: %u, pad: %u, bss: %u, exec: %u\n",
 		textsize, datasize, paddingsize, inf1.bss_size, execoff));
 
 	if (textsize & 1) {
diff --git a/sys/arch/x68k/stand/boot/boot.c b/sys/arch/x68k/stand/boot/boot.c
index 2cab3cd6e199..b6b2a4d75a24 100644
--- a/sys/arch/x68k/stand/boot/boot.c
+++ b/sys/arch/x68k/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.31 2020/01/14 03:48:10 isaki Exp $	*/
+/*	$NetBSD: boot.c,v 1.32 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 Minoura Makoto
@@ -317,7 +317,7 @@ bootmenu(void)
 	printf("\r");
 	printf("booting %s - starting in %d seconds. ", default_kernel, 0);
 	printf("\n");
-	
+
 	if (c == 0 || c == '\r') {
 		doboot(default_kernel, 0);
 		printf("Could not start %s; ", default_kernel);
@@ -378,7 +378,7 @@ extern const char bootprog_name[];
 
 /*
  * Arguments from the boot block:
- *   bootdev - specifies the device from which /boot was read, in 
+ *   bootdev - specifies the device from which /boot was read, in
  *		bootdev format.
  */
 void
diff --git a/sys/arch/x68k/stand/boot/boot.ldscript b/sys/arch/x68k/stand/boot/boot.ldscript
index 9c416f55cb27..168a70bb34d7 100644
--- a/sys/arch/x68k/stand/boot/boot.ldscript
+++ b/sys/arch/x68k/stand/boot/boot.ldscript
@@ -1,7 +1,7 @@
 /* /boot must be a.out, OMAGIC starting from 0x6000. */
-/* ... but new binutils don't support a.out anymore... 
+/* ... but new binutils don't support a.out anymore...
 OUTPUT_FORMAT("a.out-m68k-netbsd", "a.out-m68k-netbsd",
- 	      "a.out-m68k-netbsd")
+	      "a.out-m68k-netbsd")
 */
 OUTPUT_ARCH(m68k)
 ENTRY(start)
diff --git a/sys/arch/x68k/stand/boot/if_ne.c b/sys/arch/x68k/stand/boot/if_ne.c
index 239f0e491b0b..1e28495ba855 100644
--- a/sys/arch/x68k/stand/boot/if_ne.c
+++ b/sys/arch/x68k/stand/boot/if_ne.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne.c,v 1.2 2012/11/01 14:46:26 isaki Exp $ */
+/* $NetBSD: if_ne.c,v 1.3 2024/01/07 07:58:33 isaki Exp $ */
 
 /*
  * Copyright (c) 2003 Tetsuya Isaki. All rights reserved.
@@ -114,14 +114,14 @@ static int
 ne_put(struct iodesc *desc, void *pkt, size_t len)
 {
 #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);
+	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 EtherSend(pkt, len);
 }
 
diff --git a/sys/arch/x68k/stand/boot/srt0.S b/sys/arch/x68k/stand/boot/srt0.S
index 053901fa41c6..709c22d56782 100644
--- a/sys/arch/x68k/stand/boot/srt0.S
+++ b/sys/arch/x68k/stand/boot/srt0.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: srt0.S,v 1.2 2011/04/12 14:07:35 tsutsui Exp $	*/
+/*	$NetBSD: srt0.S,v 1.3 2024/01/07 07:58:33 isaki Exp $	*/
 
 /*-
  * Copyright (c) 2001 Minoura Makoto
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 
-#include <m68k/asm.h>	
+#include <m68k/asm.h>
 
 ASENTRY(start)
 	bra		start0
diff --git a/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c b/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
index d98359eb4180..9614f1de69a2 100644
--- a/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
+++ b/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: readufs_lfs.c,v 1.17 2015/08/21 15:33:04 christos Exp $	*/
+/*	$NetBSD: readufs_lfs.c,v 1.18 2024/01/07 07:58:33 isaki Exp $	*/
 /*	from Id: readufs_lfs.c,v 1.7 2003/10/15 14:16:58 itohy Exp 	*/
 
 /*
@@ -170,7 +170,7 @@ get_lfs_inode(ino32_t ino, union ufs_dinode *dibuf)
 		printf("LFS: ino: %d\nifpb: %d, bsize: %d\n",
 			ino, fsi_lfs.ifpb, fsi.bsize);
 #endif
-		ufs_read((union ufs_dinode *) &ifile_dinode, buf, 
+		ufs_read((union ufs_dinode *) &ifile_dinode, buf,
 			 ino / fsi_lfs.ifpb + fsi_lfs.ioffset,
 			 fsi.bsize);
 		i = ino % fsi_lfs.ifpb;
diff --git a/sys/arch/x68k/stand/common/exec_image.S b/sys/arch/x68k/stand/common/exec_image.S
index 07a6da04dfaa..de81a9eb7bd2 100644
--- a/sys/arch/x68k/stand/common/exec_image.S
+++ b/sys/arch/x68k/stand/common/exec_image.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_image.S,v 1.2 2001/09/27 14:08:28 minoura Exp $	*/
+/*	$NetBSD: exec_image.S,v 1.3 2024/01/07 07:58:34 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 Minoura Makoto.
@@ -36,7 +36,7 @@
 
 ENTRY_NOPROFILE(exec_image)
 ||	void exec_image(loaded,executed,entry,size,bootdev,boothowto)
-|| 	unsigned int loaded;
+||	unsigned int loaded;
 ||	unsigned int executed;
 ||	unsigned int entry;
 ||	int size;
diff --git a/sys/arch/x68k/stand/common/start.S b/sys/arch/x68k/stand/common/start.S
index 8eb15fea8670..d1049de460cf 100644
--- a/sys/arch/x68k/stand/common/start.S
+++ b/sys/arch/x68k/stand/common/start.S
@@ -9,7 +9,7 @@
 |
 |	This file is in the public domain
 |
-|	$NetBSD: start.S,v 1.3 2011/02/21 02:31:58 itohy Exp $
+|	$NetBSD: start.S,v 1.4 2024/01/07 07:58:34 isaki Exp $
 
 #include <machine/asm.h>
 
@@ -84,10 +84,10 @@
 #define __SETBLOCK	0xFF4A
 #define __EXIT2		0xFF4C
 
-|	
+|
 |	seed to estimate argument string/vector and environment vector size
 |	(max nohupair argv[0](92+4) + NULLs(8) + alignment(3))	<- donburi?
-|	
+|
 #define estimated_argsz	107
 #define estimated_com	92	/* estimated command name length (included) */
 
diff --git a/sys/arch/x68k/stand/libsa/clock.c b/sys/arch/x68k/stand/libsa/clock.c
index d87f0a3b9c1d..65e14afb9da6 100644
--- a/sys/arch/x68k/stand/libsa/clock.c
+++ b/sys/arch/x68k/stand/libsa/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.5 2014/11/21 01:18:39 christos Exp $ */
+/* $NetBSD: clock.c,v 1.6 2024/01/07 07:58:34 isaki Exp $ */
 
 /*
  * Copyright (c) 2003 Tetsuya Isaki. All rights reserved.
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
- 
+
 #include <sys/types.h>
 #include <sys/clock.h>
 #include <lib/libsa/stand.h>
diff --git a/sys/arch/x68k/stand/libsa/consio.c b/sys/arch/x68k/stand/libsa/consio.c
index 9c3c53d2cb53..12d930229900 100644
--- a/sys/arch/x68k/stand/libsa/consio.c
+++ b/sys/arch/x68k/stand/libsa/consio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: consio.c,v 1.11 2014/10/17 17:48:53 snj Exp $	*/
+/*	$NetBSD: consio.c,v 1.12 2024/01/07 07:58:34 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 MINOURA Makoto.
@@ -115,7 +115,7 @@ check_getchar(void)
 			}
 			/* discard non ASCII keys (CTRL, OPT.1 etc) */
 			(void)IOCS_B_KEYINP();
-		} 
+		}
 		/* no input */
 		return 0;
 	case SERIAL:
diff --git a/sys/arch/x68k/stand/libsa/fd.c b/sys/arch/x68k/stand/libsa/fd.c
index cfc8b58e93dc..fe9b96250d4d 100644
--- a/sys/arch/x68k/stand/libsa/fd.c
+++ b/sys/arch/x68k/stand/libsa/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.8 2014/03/08 03:20:24 isaki Exp $	*/
+/*	$NetBSD: fd.c,v 1.9 2024/01/07 07:58:34 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 MINOURA Makoto.
@@ -108,7 +108,7 @@ fdstrategy(void *arg, int rw, daddr_t dblk, size_t size,
 	nhead = sc->fmt.maxsec.H - sc->fmt.minsec.H + 1;
 	nsect = sc->fmt.maxsec.R - sc->fmt.minsec.R + 1;
 
-	sect = 	dblk % nsect + sc->fmt.minsec.R;
+	sect =  dblk % nsect + sc->fmt.minsec.R;
 	head = (dblk / nsect) % nhead + sc->fmt.minsec.H;
 	cyl = (dblk / nsect) / nhead + sc->fmt.minsec.C;
 
diff --git a/sys/arch/x68k/stand/libsa/fdsub.S b/sys/arch/x68k/stand/libsa/fdsub.S
index 74fabb577bd1..d3288c0b116d 100644
--- a/sys/arch/x68k/stand/libsa/fdsub.S
+++ b/sys/arch/x68k/stand/libsa/fdsub.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fdsub.S,v 1.1 2001/09/27 10:03:28 minoura Exp $	*/
+/*	$NetBSD: fdsub.S,v 1.2 2024/01/07 07:58:34 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 MINOURA Makoto.
@@ -33,7 +33,7 @@
  *	int drive;		(0-3)
  *	int head;		(0-1)
  *	struct fdfmt *minmax;	(results are stored)
- *	return value:	0 on success, or negative 
+ *	return value:	0 on success, or negative
  */
 
 	.text
diff --git a/sys/arch/x68k/stand/libsa/parseutils.c b/sys/arch/x68k/stand/libsa/parseutils.c
index 9ffd3891dbd3..96bf8b4d3ef1 100644
--- a/sys/arch/x68k/stand/libsa/parseutils.c
+++ b/sys/arch/x68k/stand/libsa/parseutils.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: parseutils.c,v 1.3 2016/05/31 04:12:10 dholland Exp $	*/
+/*	$NetBSD: parseutils.c,v 1.4 2024/01/07 07:58:34 isaki Exp $	*/
 
 /*
  *	from /sys/arch/i386/lib/parseutils.c
@@ -75,7 +75,7 @@ parseopts(const char *opts, int *howto)
 {
 	int r, tmpopt = 0;
 
-	opts++; 	/* skip - */
+	opts++;		/* skip - */
 	while (*opts && *opts != ' ') {
 		r = 0;
 		BOOT_FLAG(*opts, r);
diff --git a/sys/arch/x68k/stand/libsa/sdcd.c b/sys/arch/x68k/stand/libsa/sdcd.c
index 9ad20410932b..c4f17dbf29b6 100644
--- a/sys/arch/x68k/stand/libsa/sdcd.c
+++ b/sys/arch/x68k/stand/libsa/sdcd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdcd.c,v 1.18 2022/06/23 12:32:22 isaki Exp $	*/
+/*	$NetBSD: sdcd.c,v 1.19 2024/01/07 07:58:34 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 MINOURA Makoto.
@@ -51,7 +51,7 @@ static int check_unit(int);
 #ifdef DEBUG
 #define DPRINTF(x)	printf x
 #else
-#define DPRINTF(x)	
+#define DPRINTF(x)
 #endif
 
 /*
diff --git a/sys/arch/x68k/stand/loadbsd/Makefile b/sys/arch/x68k/stand/loadbsd/Makefile
index 1358a4aeb374..8ff1a3c04aeb 100644
--- a/sys/arch/x68k/stand/loadbsd/Makefile
+++ b/sys/arch/x68k/stand/loadbsd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2019/09/23 13:42:37 christos Exp $
+#	$NetBSD: Makefile,v 1.20 2024/01/07 07:58:34 isaki Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -24,7 +24,7 @@ LIBIOCS!=	cd ${.CURDIR}/../libiocs && ${PRINTOBJDIR}
 
 CPPFLAGS=	-W -Wall -O -fomit-frame-pointer -fno-unwind-tables
 CPPFLAGS+=	-m68000 -Wa,-mc68000
-CPPFLAGS+=	-nostdinc 
+CPPFLAGS+=	-nostdinc
 CPPFLAGS+=	-I$S -I.
 CPPFLAGS+=	-I${.CURDIR}/../libdos -I${.CURDIR}/../libiocs
 CPPFLAGS+=	-I${DESTDIR}/usr/include
diff --git a/sys/arch/x68k/stand/loadbsd/loadbsd.c b/sys/arch/x68k/stand/loadbsd/loadbsd.c
index 704678ad85a8..ec267cb2314b 100644
--- a/sys/arch/x68k/stand/loadbsd/loadbsd.c
+++ b/sys/arch/x68k/stand/loadbsd/loadbsd.c
@@ -20,13 +20,13 @@
  *		-q	quiet boot
  *		-v	verbose boot (also turn on verbosity of loadbsd)
  *
- *	$NetBSD: loadbsd.c,v 1.15 2023/12/23 20:57:16 andvar Exp $
+ *	$NetBSD: loadbsd.c,v 1.16 2024/01/07 07:58:34 isaki Exp $
  */
 
 #include <sys/cdefs.h>
 
-__RCSID("$NetBSD: loadbsd.c,v 1.15 2023/12/23 20:57:16 andvar Exp $");
-#define VERSION	"$Revision: 1.15 $ $Date: 2023/12/23 20:57:16 $"
+__RCSID("$NetBSD: loadbsd.c,v 1.16 2024/01/07 07:58:34 isaki Exp $");
+#define VERSION	"$Revision: 1.16 $ $Date: 2024/01/07 07:58:34 $"
 
 #include <sys/types.h>		/* ntohl */
 #include <sys/reboot.h>
@@ -365,8 +365,8 @@ read_kernel(const char *fn)
 	arg->xk.d5 = IOCS_BOOTINF();	/* unused for now */
 #if 0
 	/* filled afterwards */
-	arg->xk.rootdev = 
-	arg->xk.boothowto = 
+	arg->xk.rootdev =
+	arg->xk.boothowto =
 #endif
 
 	if (opt_v)
diff --git a/sys/arch/x68k/stand/mboot/Makefile b/sys/arch/x68k/stand/mboot/Makefile
index 77781e2ac284..4c2352aa0c21 100644
--- a/sys/arch/x68k/stand/mboot/Makefile
+++ b/sys/arch/x68k/stand/mboot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2020/08/10 07:00:49 rin Exp $
+#	$NetBSD: Makefile,v 1.20 2024/01/07 07:58:34 isaki Exp $
 
 NOMAN=		# defined
 .include <bsd.own.mk>
@@ -21,7 +21,7 @@ KERN!=		cd ${.CURDIR}/../../../..; pwd
 CPPFLAGS+=	-D_STANDALONE
 CPPFLAGS+=	-nostdinc -I${KERN} -I${.CURDIR} -I.
 CPPFLAGS+=	-I${.CURDIR}/../libiocs
-CPPFLAGS+=	-DTEXTADDR="0x${TEXT}" 
+CPPFLAGS+=	-DTEXTADDR="0x${TEXT}"
 CPPFLAGS+=	-DBOOT=\"${BOOT}\" -DBOOT_VERS=\"${VERSION}\"
 CFLAGS=		-Wno-main -Os -m68000 -Wno-attributes
 AFLAGS+=	-m68000
diff --git a/sys/arch/x68k/stand/mboot/srt0.S b/sys/arch/x68k/stand/mboot/srt0.S
index 6641b6378606..5a12b9935c3d 100644
--- a/sys/arch/x68k/stand/mboot/srt0.S
+++ b/sys/arch/x68k/stand/mboot/srt0.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: srt0.S,v 1.3 2008/04/28 20:23:40 martin Exp $	*/
+/*	$NetBSD: srt0.S,v 1.4 2024/01/07 07:58:34 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <m68k/asm.h>	
+#include <m68k/asm.h>
 
 ENTRY_NOPROFILE(_start)
 	bra		start0
diff --git a/sys/arch/x68k/stand/xxboot/Makefile.xxboot b/sys/arch/x68k/stand/xxboot/Makefile.xxboot
index e78e672edb5a..fb0255dfe107 100644
--- a/sys/arch/x68k/stand/xxboot/Makefile.xxboot
+++ b/sys/arch/x68k/stand/xxboot/Makefile.xxboot
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xxboot,v 1.20 2022/04/25 15:12:07 mlelstv Exp $
+#	$NetBSD: Makefile.xxboot,v 1.21 2024/01/07 07:58:34 isaki Exp $
 
 NOMAN=		# defined
 
@@ -66,7 +66,7 @@ CPPFLAGS+= -DLIBSA_NO_TWIDDLE
 CPPFLAGS+= -DUSTAR_SECT_PER_CYL=30
 SRCS+=	open.c close.c read.c lseek.c loadfile.c loadfile_aout.c alloc.c
 SRCS+=	errno.c globals.c files.c
-SRCS+=  $(FS).c
+SRCS+=	$(FS).c
 SRCS+=	${BOOTSRCS}
 
 .PATH: $M/stand/common
diff --git a/sys/arch/x68k/stand/xxboot/bootmain.c b/sys/arch/x68k/stand/xxboot/bootmain.c
index 22323e1fa6f9..028af90988e6 100644
--- a/sys/arch/x68k/stand/xxboot/bootmain.c
+++ b/sys/arch/x68k/stand/xxboot/bootmain.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootmain.c,v 1.8 2020/08/16 06:43:43 isaki Exp $	*/
+/*	$NetBSD: bootmain.c,v 1.9 2024/01/07 07:58:34 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Takumi Nakamura.
@@ -243,8 +243,8 @@ bootmain(void)
 		exec_image(BOOT_TEXTADDR, /* image loaded at */
 			   BOOT_TEXTADDR, /* image executed at */
 			   BOOT_TEXTADDR, /* XXX: entry point */
-			   0, 		  /* XXX: image size */
-			   bootdev, 0);	  /* arguments */
+			   0,		  /* XXX: image size */
+			   bootdev, 0);   /* arguments */
 	}
 	IOCS_B_PRINT("can't load the secondary bootstrap.");
 	exit(0);
diff --git a/sys/arch/x68k/stand/xxboot/memcmp.S b/sys/arch/x68k/stand/xxboot/memcmp.S
index 6caabe65aeac..7639474f4af3 100644
--- a/sys/arch/x68k/stand/xxboot/memcmp.S
+++ b/sys/arch/x68k/stand/xxboot/memcmp.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: memcmp.S,v 1.1 2020/08/16 06:43:43 isaki Exp $	*/
+/*	$NetBSD: memcmp.S,v 1.2 2024/01/07 07:58:34 isaki Exp $	*/
 
 /*
  * Copyright (C) 2020 Tetsuya Isaki. All rights reserved.
@@ -106,7 +106,7 @@ fail:
 
 test1:
 		| b1 == b2 within length
-		.long 	0x11223344		| b1
+		.long	0x11223344		| b1
 		.long	0x11223355		| b2
 		.long	3			| len
 		.long	0			| expected
diff --git a/sys/arch/x68k/usr.bin/loadkmap/ascii_kmap.c b/sys/arch/x68k/usr.bin/loadkmap/ascii_kmap.c
index 4c10800ee8cc..a496b8ccba8c 100644
--- a/sys/arch/x68k/usr.bin/loadkmap/ascii_kmap.c
+++ b/sys/arch/x68k/usr.bin/loadkmap/ascii_kmap.c
@@ -1,13 +1,13 @@
-/*	$NetBSD: ascii_kmap.c,v 1.7 2011/05/19 21:26:39 tsutsui Exp $	*/
+/*	$NetBSD: ascii_kmap.c,v 1.8 2024/01/07 07:58:34 isaki Exp $	*/
 /* from: arch/amiga/dev/kbdmap.c */
 /* modified for X680x0 by Masaru Oki */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ascii_kmap.c,v 1.7 2011/05/19 21:26:39 tsutsui Exp $");
+__RCSID("$NetBSD: ascii_kmap.c,v 1.8 2024/01/07 07:58:34 isaki Exp $");
 
 #include <machine/kbdmap.h>
 
-/* define a default keymap. This can be changed by keyboard ioctl's 
+/* define a default keymap. This can be changed by keyboard ioctl's
    (later at least..) */
 
 /* mode shortcuts: */
@@ -174,7 +174,7 @@ struct kbdmap ascii_kbdmap = {
 	   {0, ':'},
 	   {0, '\"'},	/* 0x28 */
 	   {0, '~'},
-	   {C, 'Z'},	
+	   {C, 'Z'},
 	   {C, 'X'},
 	   {C, 'C'},
 	   {C, 'V'},
@@ -252,14 +252,14 @@ struct kbdmap ascii_kbdmap = {
 	{
 	},
 
-	{	   
+	{
 	  /* string table. If there's a better way to get the offsets into the
 	     above table, please tell me..
-	     
+
 	     NOTE: save yourself and others a lot of grief by *not* using
 	           CSI == 0x9b, using the two-character sequence gives
 	           much less trouble, especially in GNU-Emacs.. */
-	  
+
 	  3, ESC, '[', 'A',		/* 0x00: CRSR UP */
 	  3, ESC, '[', 'B',		/* 0x04: CRSR DOWN */
 	  3, ESC, '[', 'C',		/* 0x08: CRSR RIGHT */
diff --git a/sys/arch/x68k/usr.bin/loadkmap/jis_kmap.c b/sys/arch/x68k/usr.bin/loadkmap/jis_kmap.c
index 1d04999fa76a..bdff9ec99342 100644
--- a/sys/arch/x68k/usr.bin/loadkmap/jis_kmap.c
+++ b/sys/arch/x68k/usr.bin/loadkmap/jis_kmap.c
@@ -1,13 +1,13 @@
-/*	$NetBSD: jis_kmap.c,v 1.6 2011/05/19 21:26:39 tsutsui Exp $	*/
+/*	$NetBSD: jis_kmap.c,v 1.7 2024/01/07 07:58:34 isaki Exp $	*/
 /* from: arch/amiga/dev/kbdmap.c */
 /* modified for X680x0 by Masaru Oki */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: jis_kmap.c,v 1.6 2011/05/19 21:26:39 tsutsui Exp $");
+__RCSID("$NetBSD: jis_kmap.c,v 1.7 2024/01/07 07:58:34 isaki Exp $");
 
 #include <machine/kbdmap.h>
 
-/* define a default keymap. This can be changed by keyboard ioctl's 
+/* define a default keymap. This can be changed by keyboard ioctl's
    (later at least..) */
 
 /* mode shortcuts: */
@@ -174,7 +174,7 @@ struct kbdmap ascii_kbdmap = {
 	   {0, '+'},
 	   {0, '*'},	/* 0x28 */
 	   {0, '}'},
-	   {C, 'Z'},	
+	   {C, 'Z'},
 	   {C, 'X'},
 	   {C, 'C'},
 	   {C, 'V'},
@@ -252,14 +252,14 @@ struct kbdmap ascii_kbdmap = {
 	{
 	},
 
-	{	   
+	{
 	  /* string table. If there's a better way to get the offsets into the
 	     above table, please tell me..
-	     
+
 	     NOTE: save yourself and others a lot of grief by *not* using
 	           CSI == 0x9b, using the two-character sequence gives
 	           much less trouble, especially in GNU-Emacs.. */
-	  
+
 	  3, ESC, '[', 'A',		/* 0x00: CRSR UP */
 	  3, ESC, '[', 'B',		/* 0x04: CRSR DOWN */
 	  3, ESC, '[', 'C',		/* 0x08: CRSR RIGHT */
diff --git a/sys/arch/x68k/usr.bin/loadkmap/kbdmap.h b/sys/arch/x68k/usr.bin/loadkmap/kbdmap.h
index b4eaf1027d74..bece889bb124 100644
--- a/sys/arch/x68k/usr.bin/loadkmap/kbdmap.h
+++ b/sys/arch/x68k/usr.bin/loadkmap/kbdmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbdmap.h,v 1.2 1998/01/05 20:52:29 perry Exp $	*/
+/*	$NetBSD: kbdmap.h,v 1.3 2024/01/07 07:58:34 isaki Exp $	*/
 
 #define NUL	0
 #define SOH	1
@@ -94,9 +94,9 @@ struct key {
 #define KBD_MODE_ACCMASK  (0xf0)
 
 struct kbdmap {
-	struct key 	keys[KBD_NUM_KEYS],
-		   	shift_keys[KBD_NUM_KEYS],
-		   	alt_keys[KBD_NUM_KEYS],
+	struct key	keys[KBD_NUM_KEYS],
+			shift_keys[KBD_NUM_KEYS],
+			alt_keys[KBD_NUM_KEYS],
 			alt_shift_keys[KBD_NUM_KEYS];
 	unsigned char	strings[KBD_STRTAB_SIZE];
 };
diff --git a/sys/arch/x68k/usr.bin/loadkmap/loadkmap.c b/sys/arch/x68k/usr.bin/loadkmap/loadkmap.c
index 5bce226da257..e8f3fe463b59 100644
--- a/sys/arch/x68k/usr.bin/loadkmap/loadkmap.c
+++ b/sys/arch/x68k/usr.bin/loadkmap/loadkmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: loadkmap.c,v 1.10 2011/05/19 21:26:39 tsutsui Exp $	*/
+/*	$NetBSD: loadkmap.c,v 1.11 2024/01/07 07:58:34 isaki Exp $	*/
 /*
  * loadkmap - load keyboard map (for NetBSD/X680x0)
  * from: amiga/stand/loadkmap/loadkmap.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: loadkmap.c,v 1.10 2011/05/19 21:26:39 tsutsui Exp $");
+__RCSID("$NetBSD: loadkmap.c,v 1.11 2024/01/07 07:58:34 isaki Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,6 +50,6 @@ load_kmap(const char *file)
 
 		close (fd);
 	} else {
-	    perror("open kbdmap");
+		perror("open kbdmap");
 	}
 }
diff --git a/sys/arch/x68k/x68k/autoconf.c b/sys/arch/x68k/x68k/autoconf.c
index c130ec21dded..71e69f04ee5f 100644
--- a/sys/arch/x68k/x68k/autoconf.c
+++ b/sys/arch/x68k/x68k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.68 2014/03/26 08:17:59 christos Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.69 2024/01/07 07:58:35 isaki Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.68 2014/03/26 08:17:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.69 2024/01/07 07:58:35 isaki Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "scsibus.h"
@@ -85,7 +85,7 @@ cpu_rootconf(void)
 
 void
 config_console(void)
-{	
+{
 	mfp_config_console();
 	grf_config_console();
 	ite_config_console();
diff --git a/sys/arch/x68k/x68k/bus.c b/sys/arch/x68k/x68k/bus.c
index 532b687773fe..633bd5f74508 100644
--- a/sys/arch/x68k/x68k/bus.c
+++ b/sys/arch/x68k/x68k/bus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.c,v 1.38 2022/07/26 20:08:56 andvar Exp $	*/
+/*	$NetBSD: bus.c,v 1.39 2024/01/07 07:58:35 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 #include "opt_m68k_arch.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.38 2022/07/26 20:08:56 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.39 2024/01/07 07:58:35 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -367,7 +367,7 @@ x68k_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
 		ICIA();		/* no per-page/per-line control */
 		DCIA();
 		return;
-	}		
+	}
 #endif
 	if (offset >= map->dm_mapsize)
 		return;	/* driver bug; warn it? */
@@ -461,7 +461,7 @@ x68k_bus_dmamem_mmap(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
 	rv = _bus_dmamem_mmap_common(t, segs, nsegs, off, prot, flags);
 	if (rv == (bus_addr_t)-1)
 		return (-1);
-	
+
 	return (m68k_btop((char *)rv));
 }
 
diff --git a/sys/arch/x68k/x68k/clock.c b/sys/arch/x68k/x68k/clock.c
index d57ffe2a102e..8cb82ae3e4b9 100644
--- a/sys/arch/x68k/x68k/clock.c
+++ b/sys/arch/x68k/x68k/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.35 2023/12/20 00:40:44 thorpej Exp $	*/
+/*	$NetBSD: clock.c,v 1.36 2024/01/07 07:58:35 isaki Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.35 2023/12/20 00:40:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.36 2024/01/07 07:58:35 isaki Exp $");
 
 #include "clock.h"
 
@@ -130,7 +130,7 @@ cpu_initclocks(void)
 		.tc_get_timecount = mfp_get_timecount,
 		.tc_quality = 100,
 	};
-	
+
 	if (CLOCKS_PER_SEC % hz ||
 	    hz <= (CLOCKS_PER_SEC / 256) || hz > CLOCKS_PER_SEC) {
 		printf("cannot set %d Hz clock. using 100 Hz\n", hz);
@@ -275,7 +275,7 @@ int
 clockioctl(dev_t dev, u_long cmd, void *data, int flag, struct proc *p)
 {
 	int error = 0;
-	
+
 	switch (cmd) {
 
 	case CLOCKMAP:
diff --git a/sys/arch/x68k/x68k/disksubr.c b/sys/arch/x68k/x68k/disksubr.c
index 5a358e3483cd..c019092a0a21 100644
--- a/sys/arch/x68k/x68k/disksubr.c
+++ b/sys/arch/x68k/x68k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.36 2020/06/18 19:54:08 tsutsui Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.37 2024/01/07 07:58:35 isaki Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.36 2020/06/18 19:54:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.37 2024/01/07 07:58:35 isaki Exp $");
 
 #include "opt_compat_netbsd.h"
 
@@ -404,7 +404,7 @@ dodospart:
 	/* disklabel in appropriate location? */
 	if (lp->d_partitions[0].p_offset != 0
 		&& lp->d_partitions[0].p_offset != dospartoff) {
-		error = EXDEV;		
+		error = EXDEV;
 		goto done;
 	}
 #endif
diff --git a/sys/arch/x68k/x68k/iodevice.h b/sys/arch/x68k/x68k/iodevice.h
index aa0a272c8548..dd7c89363cb3 100644
--- a/sys/arch/x68k/x68k/iodevice.h
+++ b/sys/arch/x68k/x68k/iodevice.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: iodevice.h,v 1.18 2011/05/14 10:19:58 tsutsui Exp $	*/
+/*	$NetBSD: iodevice.h,v 1.19 2024/01/07 07:58:35 isaki Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1995 Masaru Oki
@@ -266,8 +266,8 @@ struct zsdevice {
 	/* Yes, they are backwards. */
 	struct zschan zs_chan_b;
 	struct zschan zs_chan_a;
-	char pad4; unsigned char bstat;   /* external only        : 2 bytes */
-	char pad[6];			  /* ---                  : 6 bytes */
+	char pad4; unsigned char bstat;	/* external only        : 2 bytes */
+	char pad[6];			/* ---                  : 6 bytes */
 };
 
 struct ppi8255 {
diff --git a/sys/arch/x68k/x68k/kgdb_stub.c b/sys/arch/x68k/x68k/kgdb_stub.c
index 66e647ff2694..550898a532c2 100644
--- a/sys/arch/x68k/x68k/kgdb_stub.c
+++ b/sys/arch/x68k/x68k/kgdb_stub.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kgdb_stub.c,v 1.20 2023/03/28 20:10:01 andvar Exp $	*/
+/*	$NetBSD: kgdb_stub.c,v 1.21 2024/01/07 07:58:35 isaki Exp $	*/
 
 /*
  * Copyright (c) 1990, 1993
@@ -45,13 +45,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_stub.c,v 1.20 2023/03/28 20:10:01 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_stub.c,v 1.21 2024/01/07 07:58:35 isaki Exp $");
 
 #include "opt_kgdb.h"
 
 #ifdef KGDB
 #ifndef lint
-static char rcsid[] = "$NetBSD: kgdb_stub.c,v 1.20 2023/03/28 20:10:01 andvar Exp $";
+static char rcsid[] = "$NetBSD: kgdb_stub.c,v 1.21 2024/01/07 07:58:35 isaki Exp $";
 #endif
 
 #include <sys/param.h>
@@ -159,7 +159,7 @@ restart:
 			if (escape)
 				c = FRAME_START;
 			break;
-			
+
 		case FRAME_START:
 			goto restart;
 
@@ -338,11 +338,12 @@ kgdb_trap(int type, struct frame *frame)
 			return (0);
 		}
 		kgdb_getc = 0;
-		for (inlen = 0; constab[inlen].cn_probe; inlen++)
-		    if (major(constab[inlen].cn_dev) == major(kgdb_dev)) {
-			kgdb_getc = constab[inlen].cn_getc;
-			kgdb_putc = constab[inlen].cn_putc;
-			break;
+		for (inlen = 0; constab[inlen].cn_probe; inlen++) {
+			if (major(constab[inlen].cn_dev) == major(kgdb_dev)) {
+				kgdb_getc = constab[inlen].cn_getc;
+				kgdb_putc = constab[inlen].cn_putc;
+				break;
+			}
 		}
 		if (kgdb_getc == 0 || kgdb_putc == 0)
 			return (0);
@@ -443,7 +444,7 @@ kgdb_trap(int type, struct frame *frame)
 				}
 			}
 			break;
-			
+
 		case KGDB_REG_W:
 		case KGDB_REG_W | KGDB_DELTA:
 			cp = inbuffer;
@@ -457,7 +458,7 @@ kgdb_trap(int type, struct frame *frame)
 			gdb_to_regs(frame, gdb_regs);
 			outlen = 0;
 			break;
-				
+
 		case KGDB_MEM_R:
 			len = inbuffer[0];
 			kgdb_copy(&inbuffer[1], (u_char *)&addr, 4);
diff --git a/sys/arch/x68k/x68k/trap.c b/sys/arch/x68k/x68k/trap.c
index 8d9d02668e0a..5a6c4d8ef4f3 100644
--- a/sys/arch/x68k/x68k/trap.c
+++ b/sys/arch/x68k/x68k/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.112 2023/10/05 19:41:06 ad Exp $	*/
+/*	$NetBSD: trap.c,v 1.113 2024/01/07 07:58:35 isaki Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.112 2023/10/05 19:41:06 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.113 2024/01/07 07:58:35 isaki Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -544,8 +544,8 @@ trap(struct frame *fp, int type, unsigned code, unsigned v)
 #endif
 		/*
 		 * It is only a kernel address space fault iff:
-		 * 	1. (type & T_USER) == 0  and
-		 * 	2. pcb_onfault not set or
+		 *	1. (type & T_USER) == 0  and
+		 *	2. pcb_onfault not set or
 		 *	3. pcb_onfault set but supervisor space data fault
 		 * The last can occur during an exec() copyin where the
 		 * argument space is lazy-allocated.
diff --git a/sys/arch/x68k/x68k/vectors.s b/sys/arch/x68k/x68k/vectors.s
index 95fd00f3da63..ff7accec169f 100644
--- a/sys/arch/x68k/x68k/vectors.s
+++ b/sys/arch/x68k/x68k/vectors.s
@@ -1,4 +1,4 @@
-|	$NetBSD: vectors.s,v 1.18 2014/03/14 20:24:24 tsutsui Exp $
+|	$NetBSD: vectors.s,v 1.19 2024/01/07 07:58:35 isaki Exp $
 
 | Copyright (c) 1988 University of Utah
 | Copyright (c) 1990, 1993
@@ -75,7 +75,7 @@ GLOBAL(vectab)
 #ifdef COMPAT_16
 	VECTOR(trap3)		/* 35: compat_16_sigreturn */
 #else
-	VECTOR(illinst)	
+	VECTOR(illinst)
 #endif
 	VECTOR(illinst)		/* 36: TRAP instruction vector */
 	VECTOR(illinst)		/* 37: TRAP instruction vector */