Sun Jan 7 07:58:35 2024 UTC (146d)

TAB/space/indent cleanup.


(isaki)

diff -r1.208 -r1.209 src/sys/arch/x68k/conf/GENERIC
diff -r1.121 -r1.122 src/sys/arch/x68k/conf/INSTALL
diff -r1.33 -r1.34 src/sys/arch/x68k/conf/majors.x68k
diff -r1.27 -r1.28 src/sys/arch/x68k/dev/bmd.c
diff -r1.128 -r1.129 src/sys/arch/x68k/dev/fd.c
diff -r1.39 -r1.40 src/sys/arch/x68k/dev/intio_dmac.c
diff -r1.70 -r1.71 src/sys/arch/x68k/dev/ite.c
diff -r1.19 -r1.20 src/sys/arch/x68k/dev/ite_tv.c
diff -r1.19 -r1.20 src/sys/arch/x68k/dev/vsvar.h
diff -r1.16 -r1.17 src/sys/arch/x68k/dev/itevar.h
diff -r1.8 -r1.9 src/sys/arch/x68k/dev/kbdmap.c
diff -r1.5 -r1.6 src/sys/arch/x68k/dev/kbdmap.c.ascii
diff -r1.60 -r1.61 src/sys/arch/x68k/dev/mha.c
diff -r1.11 -r1.12 src/sys/arch/x68k/dev/mhavar.h
diff -r1.40 -r1.41 src/sys/arch/x68k/dev/ms.c
diff -r1.44 -r1.45 src/sys/arch/x68k/dev/par.c
diff -r1.6 -r1.7 src/sys/arch/x68k/dev/scsiromvar.h
diff -r1.15 -r1.16 src/sys/arch/x68k/dev/slhci_intio.c
diff -r1.21 -r1.22 src/sys/arch/x68k/dev/sram.c
diff -r1.62 -r1.63 src/sys/arch/x68k/include/cpu.h
diff -r1.6 -r1.7 src/sys/arch/x68k/include/disklabel.h
diff -r1.22 -r1.23 src/sys/arch/x68k/include/intr.h
diff -r1.2 -r1.3 src/sys/arch/x68k/include/kbdmap.h
diff -r1.5 -r1.6 src/sys/arch/x68k/include/opmbellio.h
diff -r1.13 -r1.14 src/sys/arch/x68k/stand/aout2hux/aout2hux.c
diff -r1.31 -r1.32 src/sys/arch/x68k/stand/boot/boot.c
diff -r1.9 -r1.10 src/sys/arch/x68k/stand/boot/boot.ldscript
diff -r1.2 -r1.3 src/sys/arch/x68k/stand/boot/if_ne.c
diff -r1.2 -r1.3 src/sys/arch/x68k/stand/boot/srt0.S
diff -r1.17 -r1.18 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
diff -r1.2 -r1.3 src/sys/arch/x68k/stand/common/exec_image.S
diff -r1.3 -r1.4 src/sys/arch/x68k/stand/common/start.S
diff -r1.5 -r1.6 src/sys/arch/x68k/stand/libsa/clock.c
diff -r1.11 -r1.12 src/sys/arch/x68k/stand/libsa/consio.c
diff -r1.8 -r1.9 src/sys/arch/x68k/stand/libsa/fd.c
diff -r1.1 -r1.2 src/sys/arch/x68k/stand/libsa/fdsub.S
diff -r1.3 -r1.4 src/sys/arch/x68k/stand/libsa/parseutils.c
diff -r1.18 -r1.19 src/sys/arch/x68k/stand/libsa/sdcd.c
diff -r1.19 -r1.20 src/sys/arch/x68k/stand/loadbsd/Makefile
diff -r1.15 -r1.16 src/sys/arch/x68k/stand/loadbsd/loadbsd.c
diff -r1.19 -r1.20 src/sys/arch/x68k/stand/mboot/Makefile
diff -r1.3 -r1.4 src/sys/arch/x68k/stand/mboot/srt0.S
diff -r1.20 -r1.21 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
diff -r1.8 -r1.9 src/sys/arch/x68k/stand/xxboot/bootmain.c
diff -r1.1 -r1.2 src/sys/arch/x68k/stand/xxboot/memcmp.S
diff -r1.7 -r1.8 src/sys/arch/x68k/usr.bin/loadkmap/ascii_kmap.c
diff -r1.6 -r1.7 src/sys/arch/x68k/usr.bin/loadkmap/jis_kmap.c
diff -r1.2 -r1.3 src/sys/arch/x68k/usr.bin/loadkmap/kbdmap.h
diff -r1.10 -r1.11 src/sys/arch/x68k/usr.bin/loadkmap/loadkmap.c
diff -r1.68 -r1.69 src/sys/arch/x68k/x68k/autoconf.c
diff -r1.38 -r1.39 src/sys/arch/x68k/x68k/bus.c
diff -r1.35 -r1.36 src/sys/arch/x68k/x68k/clock.c
diff -r1.36 -r1.37 src/sys/arch/x68k/x68k/disksubr.c
diff -r1.18 -r1.19 src/sys/arch/x68k/x68k/iodevice.h
diff -r1.18 -r1.19 src/sys/arch/x68k/x68k/vectors.s
diff -r1.20 -r1.21 src/sys/arch/x68k/x68k/kgdb_stub.c
diff -r1.112 -r1.113 src/sys/arch/x68k/x68k/trap.c

--- src/sys/arch/x68k/conf/GENERIC 2023/02/12 14:50:42	1.208
+++ src/sys/arch/x68k/conf/GENERIC 2024/01/07 07:58:33	1.209

 @@ -1,38 +1,38 @@
-# $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.
+#
 # The machine description file can be customised for your specific
 # machine to reduce the kernel size and improve its performance.
+#
 # For further information on compiling NetBSD kernels, see the config(8)
 # man page.
+#
 # For further information on hardware support for this architecture, see
 # the intro(4) man page.  For further information about kernel options
 # for this architecture, see the options(4) man page.  For an explanation
 # of each device driver in this file see the section 4 man page for the
 # device.
 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
 	# backtraces in DDB.
 maxusers	8
 ## System kernel configuration.  See options(4) for more detail.
 ## Options for variants of the m68k MPU
 ## you must have at least the correct one; REQUIRED
 options 	M68030
 @@ -149,36 +149,36 @@ options 	DDB			# kernel dynamic debugger
 include 	"conf/compat_netbsd09.config"
 options 	COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
 #options 	COMPAT_M68K4K	# NetBSD/m68k4k binaries
 #options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility; broken
 #options 	COMPAT_LINUX	# Linux/m68k binary compatibility
 #options 	COMPAT_OSSAUDIO	# Linux/m68k binary compatibility
 ## File systems.
 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
 #file-system	LFS		# Log-structured filesystem (experimental)
 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
 ## File system options.
 #options 	FFS_EI		# FFS Endian Independent support
 options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	UFS_DIRHASH	# UFS Large Directory Hashing
 #options 	UFS_EXTATTR	# Extended attribute support for UFS1
 options 	WAPBL		# File system journaling support
 options 	NFSSERVER	# Network File System server
 @@ -250,27 +250,27 @@ cd*	at scsibus? target ? lun ?	# SCSI CD
 #ch*	at scsibus? target ? lun ?	# SCSI changer devices
 #uk*	at scsibus? target ? lun ?	# SCSI unknown devices
 ## Ports
 zsc0	at intio0 addr 0xe98000 intr 112
 zstty0	at zsc0 channel 0		# built-in RS-232C
 ms0	at zsc0 channel 1		# standard mouse
 #zsc1	at intio0 addr 0xeafc00 intr 113
 #zstty2	at zsc1 channel 0
 #zstty3	at zsc1 channel 1
 #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
 powsw0	at mfp0				# Front switch
 #powsw1	at mfp0				# External power switch
 com0	at intio0 addr 0xefff00 intr 240	# PSX16550, port1
 com1	at intio0 addr 0xefff10 intr 241	# PSX16550, port2
 ## Audio device
 vs0 at intio0 addr 0xe92000 dma 3 dmaintr 106
 audio*	at vs?
 @@ -401,72 +401,72 @@ bmd*	at intio0 addr 0xecebf0		# Nereid
 #ugen*	at uhub? port ?
 #### Pseudo devices
+#
 # accept filters
 #pseudo-device   accf_data		# "dataready" accept filter
 #pseudo-device   accf_http		# "httpready" accept filter
 ## A disk-like interface to files.  Can be used to create floppy, CD,
 ## miniroot images, etc.
 pseudo-device	vnd
 #options 	VND_COMPRESSION		# compressed vnd(4)
 ## Concatenated and striped disks; with this, you can create a software-based
 ## disk array similar to a "RAID 0" setup.  See ccd(4).
 #pseudo-device	ccd
 ## Cryptographic disk devices.  See cgd(4).
 #pseudo-device	cgd
 ## RAIDframe disk driver: software RAID driver.  See raid(4).
 pseudo-device	raid
 options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
 # Options to enable various other RAIDframe RAID types.
 # options 	RF_INCLUDE_EVENODD=1
 # options 	RF_INCLUDE_RAID5_RS=1
 # options 	RF_INCLUDE_PARITYLOGGING=1
 # options 	RF_INCLUDE_CHAINDECLUSTER=1
 # options 	RF_INCLUDE_INTERDECLUSTER=1
 # options 	RF_INCLUDE_PARITY_DECLUSTERING=1
 # options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
 ## Memory disk device, used on boot floppies with compressed
 ## kernel-plus-root-disk images.
 #pseudo-device	md
 ## Loopback network interface; required
 pseudo-device	loop
 ## SLIP and CSLIP interfaces, for IP over a serial line.
 pseudo-device	sl
 ## PPP, the successor to SLIP.  See pppd(8).
 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	tap			# virtual Ethernet
 ## Generic L3 over IP tunnel
 #pseudo-device	gre			# generic L3 over IP tunnel
 ## Berkeley Packet Filter, required to run RARPD.  A generic C-language
 ## interface that allows selective examining of incoming packets.
 pseudo-device	bpfilter
 #pseudo-device	carp			# Common Address Redundancy Protocol
 #pseudo-device	npf			# NPF packet filter
 @@ -487,20 +487,20 @@ pseudo-device	agr			# IEEE 802.3ad link
 ## Pseudo ttys, required for network logins and programs like screen.
 pseudo-device	pty			# pseudo-terminals
 ## Random device, used to implement /dev/random (a source of random noise),
 ## and generate randomness for some kernel formulae.
 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"
 # Pull in optional local configuration - always at end
 cinclude	"arch/x68k/conf/GENERIC.local"

--- src/sys/arch/x68k/conf/INSTALL 2022/06/11 04:57:57	1.121
+++ src/sys/arch/x68k/conf/INSTALL 2024/01/07 07:58:33	1.122

 @@ -1,24 +1,24 @@
-#	$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.
+#
 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
 maxusers	4
 ## Enable the hooks used for initializing the memory-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on memory-disk
 options 	MEMORY_DISK_SERVER=0	# No user space hooks
 options 	MEMORY_DISK_ROOT_SIZE=3600	# size of memory disk, in blocks
 options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
 ## System kernel configuration.  See options(4) for more detail.
 @@ -131,36 +131,36 @@ options 	PIPE_SOCKETPAIR		# smaller, but
 include 	"conf/compat_netbsd30.config"
 #options 	COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
 #options 	COMPAT_M68K4K	# NetBSD/m68k4k binaries
 #options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility; broken
 #options 	COMPAT_LINUX	# Linux/m68k binary compatibility
 #options 	COMPAT_OSSAUDIO	# Linux/m68k binary compatibility
 ## File systems.
 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
 #file-system	LFS		# Log-structured filesystem (experimental)
 #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 options.
 #options 	NFSSERVER	# Sun NFS-compatible filesystem server
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
 options 	WAPBL		# File system journaling support
 #options 	NFS_V2_ONLY	# Exclude NFS3 code to save space
 options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 ## Network protocol support.  In most environments, INET is required.
 options 	INET		# IP (Internet Protocol) v4
 @@ -215,42 +215,42 @@ st*	at scsibus? target ? lun ?	# SCSI ta
 #ch*	at scsibus? target ? lun ?	# SCSI changer devices
 #uk*	at scsibus? target ? lun ?	# SCSI unknown devices
 ## Ports
 zsc0	at intio0 addr 0xe98000 intr 112
 zstty0	at zsc0 channel 0		# built-in RS-232C
 #ms0	at zsc0 channel 1		# standard mouse
 #zsc1	at intio0 addr 0xeafc00 intr 113
 #zstty2	at zsc1 channel 0
 #zstty3	at zsc1 channel 1
 #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
 #com0	at intio0 addr 0xefff00 intr 240	# PSX16550, port1
 #com1	at intio0 addr 0xefff10 intr 241	# PSX16550, port2
 ## Audio device
 #vs0 at intio0 addr 0xe92000 dma 3 dmaintr 106
 #audio*	at vs?
 #spkr*	at audio?				# PC speaker (synthesized)
 ## Network interfaces
 ne*	at intio0 addr 0xece300 intr 249	# Nereid Ethernet
 ne*	at intio0 addr 0xeceb00 intr 248	# Nereid Ethernet
 neptune0 at intio0 addr 0xece000 intr 249	# Neptune-X
 neptune1 at intio0 addr 0xece400 intr 249	# Neptune-X at alt. addr.
 ne*	at neptune? addr 0x300			# NE2000 or clone
 #### Pseudo devices
 pseudo-device	md			# boot floppy image
 pseudo-device	loop
 pseudo-device	bpfilter
 pseudo-device	sl
 pseudo-device	pty			# pseudo-terminals

--- src/sys/arch/x68k/conf/majors.x68k 2021/06/29 10:22:37	1.33
+++ src/sys/arch/x68k/conf/majors.x68k 2024/01/07 07:58:33	1.34

 @@ -1,14 +1,14 @@
-#	$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
+#
 device-major	cons		char 0
 device-major	ctty		char 1
 device-major	mem		char 2
 device-major	swap		char 3   block 3	vmswap
 device-major	pts		char 4			pty
 device-major	ptc		char 5			pty
 device-major	log		char 6
 device-major	md		char 7   block 8	md
 device-major	sd		char 8   block 4	sd
 @@ -53,15 +53,15 @@ device-major	ugen		char 51			ugen
 device-major	cgd		char 52  block 17	cgd
 device-major	bmd		char 53  block 18	bmd
 device-major	ksyms		char 54			ksyms
 device-major	ses		char 55			ses
 device-major	uhid		char 56			uhid
 device-major	ulpt		char 57			ulpt
 device-major	ucom		char 58			ucom
 #device-major	obsolete	char 59			obsolete (urio)
 #device-major	obsolete	char 60			obsolete (uscanner)
 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
 # sys/conf/majors.

--- src/sys/arch/x68k/dev/bmd.c 2023/12/17 21:51:29	1.27
+++ src/sys/arch/x68k/dev/bmd.c 2024/01/07 07:58:33	1.28

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -20,27 +20,27 @@
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Nereid bank memory disk
  */
 #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>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/stat.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/proc.h>
 @@ -142,27 +142,27 @@ bmd_match(device_t parent, cfdata_t cf,
 	bus_space_tag_t iot = ia->ia_bst;
 	bus_space_handle_t ioh;
 	int window;
 	int r;
 	if (ia->ia_addr == INTIOCF_ADDR_DEFAULT)
 		ia->ia_addr = BMD_ADDR1;
 	/* fixed parameter */
 	if (ia->ia_addr != BMD_ADDR1 && ia->ia_addr != BMD_ADDR2)
 		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;
 	if (bus_space_map(iot, ia->ia_addr, ia->ia_size, 0, &ioh))
 		return (0);
 	/* Check window addr */
 	r = bus_space_read_1(iot, ioh, BMD_CTRL);
 	bus_space_unmap(iot, ioh, ia->ia_size);
 	if ((r & BMD_CTRL_WINDOW))
 		window = 0xef0000;
 	else

--- src/sys/arch/x68k/dev/fd.c 2023/12/17 21:52:11	1.128
+++ src/sys/arch/x68k/dev/fd.c 2024/01/07 07:58:33	1.129

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and Minoura Makoto.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -54,27 +54,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)fd.c	7.4 (Berkeley) 5/25/91
  */
 #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"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 @@ -1758,27 +1758,27 @@ fdioctl(dev_t dev, u_long cmd, void *add
 			fd_formb->fd_formb_secno(i) = il[i + 1];
 			fd_formb->fd_formb_secsize(i) = fd->sc_type->secsize;
+		}
 		error = fdformat(dev, fd_formb, l);
 		free(fd_formb, M_TEMP);
 		return error;
 	case FDIOCGETOPTS:		/* get drive options */
 		DPRINTF(("FDIOCGETOPTS\n"));
 		*(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;
 	case DIOCLOCK:
 		/*
 		 * Nothing to do here, really.
 		 */
 		return 0; /* XXX */
 	case DIOCEJECT:
 		DPRINTF(("DIOCEJECT\n"));
 		if (*(int *)addr == 0) {
 @@ -1872,27 +1872,27 @@ fdgetdisklabel(struct fd_softc *sc, dev_
 	part = DISKPART(dev);
 	lp = sc->sc_dk.dk_label;
 	memset(lp, 0, sizeof(struct disklabel));
 	lp->d_secsize     = 128 << sc->sc_type->secsize;
 	lp->d_ntracks     = sc->sc_type->heads;
 	lp->d_nsectors    = sc->sc_type->sectrac;
 	lp->d_secpercyl   = lp->d_ntracks * lp->d_nsectors;
 	lp->d_ncylinders  = sc->sc_type->size / lp->d_secpercyl;
 	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;
 	lp->d_npartitions = part + 1;
 #define STEP_DELAY	6000	/* 6ms (6000us) delay after stepping	*/
 	lp->d_trkseek     = STEP_DELAY; /* XXX */
 	lp->d_magic       = DISKMAGIC;
 	lp->d_magic2      = DISKMAGIC;
 	lp->d_checksum    = dkcksum(lp);
 	lp->d_partitions[part].p_size   = lp->d_secperunit;
 	lp->d_partitions[part].p_fstype = FS_UNUSED;
 	lp->d_partitions[part].p_fsize  = 1024;
 	lp->d_partitions[part].p_frag   = 8;

--- src/sys/arch/x68k/dev/intio_dmac.c 2023/12/17 22:03:50	1.39
+++ src/sys/arch/x68k/dev/intio_dmac.c 2024/01/07 07:58:33	1.40

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Minoura Makoto.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -26,27 +26,27 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Hitachi HD63450 (= Motorola MC68450) DMAC driver for x68k.
  */
 #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>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arch/x68k/dev/intiovar.h>
 #include <arch/x68k/dev/dmacvar.h>
 @@ -170,27 +170,27 @@ dmac_alloc_channel(device_t self, int ch
 #ifdef DMAC_ARRAYCHAIN
 	int r, dummy;
 #endif
 	aprint_normal_dev(dmac->sc_dev, "allocating ch %d for %s.\n",
 		ch, name);
 	DPRINTF(3, ("dmamap=%p\n", (void *)chan->ch_xfer.dx_dmamap));
 #ifdef DIAGNOSTIC
 	if (ch < 0 || ch >= DMAC_NCHAN)
 		panic("Invalid DMAC channel.");
 	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
 	/* allocate the DMAC arraychaining map */
 	r = bus_dmamem_alloc(intio->sc_dmat,
 			     sizeof(struct dmac_sg_array) * DMAC_MAPSIZE,
 , 0, &chan->ch_seg[0], 1, &dummy,
 			     BUS_DMA_NOWAIT);
 	if (r)
 		panic("DMAC: cannot alloc DMA safe memory");
 	r = bus_dmamem_map(intio->sc_dmat,
 			   &chan->ch_seg[0], 1,
 			   sizeof(struct dmac_sg_array) * DMAC_MAPSIZE,
 @@ -370,27 +370,27 @@ dmac_start_xfer_offset(struct dmac_softc
+	}
 #ifdef DMAC_ARRAYCHAIN
 #ifdef DIAGNOSTIC
 	if (xf->dx_done)
 		panic("dmac_start_xfer: DMA transfer in progress");
 #endif
 #endif
 	DPRINTF(3, ("First program:\n"));
 #ifdef DIAGNOSTIC
 	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 */
 	if (dmamap->dm_nsegs == 1) {
 		DPRINTF(3, ("single block mode\n"));
 #ifdef DIAGNOSTIC
 		if (dmamap->dm_mapsize != dmamap->dm_segs[0].ds_len)
 			panic("dmac_start_xfer_offset: dmamap curruption");
 #endif
 		paddr = dmamap->dm_segs[0].ds_addr + offset;
 		csr = bus_space_read_1(dmac->sc_bst, chan->ch_bht, DMAC_REG_CSR);
 		if ((csr & DMAC_CSR_ACT) != 0) {
 			/* Use 'Continue Mode' */

--- src/sys/arch/x68k/dev/ite.c 2022/06/25 05:01:31	1.70
+++ src/sys/arch/x68k/dev/ite.c 2024/01/07 07:58:33	1.71

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -35,27 +35,27 @@
+ *
  * from: Utah $Hdr: ite.c 1.1 90/07/09$
+ *
  *	@(#)ite.c	7.6 (Berkeley) 5/16/91
  */
 /*
  * ite - bitmaped terminal.
  * Supports VT200, a few terminal features will be unavailable until
  * the system actually probes the device (i.e. not after consinit())
  */
 #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
 #include "bell.h"
 #include "kbd.h"
 #include "opt_ite.h"
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 @@ -176,27 +176,27 @@ const struct cdevsw ite_cdevsw = {
 	.d_stop = nostop,
 	.d_tty = itetty,
 	.d_poll = itepoll,
 	.d_mmap = nommap,
 	.d_kqfilter = ttykqfilter,
 	.d_discard = nodiscard,
 	.d_flag = D_TTY
 };
 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;
 	return 1;
+}
 /*
  * iteinit() is the standard entry point for initialization of
  * an ite device, it is also called from ite_cninit().
  */
 static void
 iteattach(device_t parent, device_t self, void *aux)
 @@ -834,27 +834,27 @@ ite_filter(u_char c)
 		if ((mod & KBD_MOD_ALT) != 0)
 			key = kbdmap.alt_shift_keys[c];
 		else
 			key = kbdmap.shift_keys[c];
 	} else if ((mod & KBD_MOD_ALT) != 0)
 		key = kbdmap.alt_keys[c];
 	else {
 		key = kbdmap.keys[c];
 		/* if CAPS and key is CAPable (no pun intended) */
 		if ((mod & KBD_MOD_CAPS) != 0 &&
 		    (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;
 	/* handle dead keys */
 	if ((key.mode & KBD_MODE_DEAD) != 0) {
 		splx(s);
 		return;
+	}
 	/* if not string, apply META and CTRL modifiers */
 	if ((key.mode & KBD_MODE_STRING) == 0 &&
 	    ((key.mode & KBD_MODE_KPAD) == 0 ||
 	     (kbd_ite != NULL && kbd_ite->keypad_appmode == 0))) {
 @@ -1195,27 +1195,27 @@ ite_zargnum(struct ite_softc *ip)
 	return n;	/* don't "n ? n : 1" here, <CSI>0m != <CSI>1m ! */
+}
 static void
 ite_putstr(const u_char *s, int len, dev_t dev)
+{
 	struct ite_softc *ip;
 	int i;
 	ip = getitesp(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++)
 		if (s[i] != 0)
 			iteputchar(s[i], ip);
 	SUBR_CURSOR(ip, END_CURSOROPT);
+}
 static void
 iteputchar(int c, struct ite_softc *ip)
+{
 	int n, x, y;
 	char *cp;
 @@ -2212,115 +2212,115 @@ iteputchar(int c, struct ite_softc *ip)
 		if (ip->linefeed_newline)
 			ite_crlf(ip);
 		else
 			ite_lf(ip);
 		break;
 	case CR:
 		ite_cr(ip);
 		break;
 	case SO:
 		ip->GL = &ip->G1;
 		break;
 	case SI:
 		ip->GL = &ip->G0;
 		break;
 	case 0x10:	/* DLE */
 	case 0x11:	/* DC1/XON */
 	case 0x12:	/* DC2 */
 	case 0x13:	/* DC3/XOFF */
 	case 0x14:	/* DC4 */
 	case 0x15:	/* NAK */
 	case 0x16:	/* SYN */
 	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!! */
 		break;
 	case ESC:
 		ip->escape = ESC;
 		break;
 	case 0x1c:	/* FS */
 	case 0x1d:	/* GS */
 	case 0x1e:	/* RS */
 	case 0x1f:	/* US */
 		break;
 	/* now it gets weird.. 8bit control sequences.. */
 	case IND:	/* index: move cursor down, scroll */
 		ite_index(ip);
 		break;
 	case NEL:	/* next line. next line, first pos. */
 		ite_crlf(ip);
 		break;
 	case HTS:	/* set horizontal tab */
 		if (ip->curx < ip->cols)
 			ip->tabs[ip->curx] = 1;
 		break;
 	case RI:	/* reverse index */
 		ite_rlf(ip);
 		break;
 	case SS2:	/* go into G2 for one character */
 		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;
 		break;
 	case PM:	/* privacy message */
 		/* ignore everything upto ST */
 		ip->escape = PM;
 		break;
 	case APC:	/* application program command */
 		/* ignore everything upto ST */
 		ip->escape = APC;
 		break;
 	case DEL:
 		break;
 	default:
 		if (ip->save_char == 0 &&
 		    (*((c & 0x80) ? ip->GR : ip->GL) & CSET_MULTI) != 0) {
 			ip->save_char = c;
 			break;
 @@ -2537,27 +2537,27 @@ itecngetc(dev_t dev)
 	} while (c == -1);
 	return (c);
+}
 void
 itecnputc(dev_t dev, int c)
+{
 	static int paniced = 0;
 	struct ite_softc *ip = getitesp(dev);
 	char ch = c;
 #ifdef ITE_KERNEL_ATTR
 	short save_attribute;
 #endif
 	if (panicstr && !paniced &&
 	    (ip->flags & (ITE_ACTIVE|ITE_INGRF)) != ITE_ACTIVE) {
 		(void) iteon(dev, 3);
 		paniced = 1;
+	}
 #ifdef ITE_KERNEL_ATTR
 	save_attribute = ip->attribute;
 	ip->attribute = ITE_KERNEL_ATTR;
 #endif
 	ite_putstr(&ch, 1, dev);
 #ifdef ITE_KERNEL_ATTR
 	ip->attribute = save_attribute;
 #endif

--- src/sys/arch/x68k/dev/ite_tv.c 2022/06/25 03:57:17	1.19
+++ src/sys/arch/x68k/dev/ite_tv.c 2024/01/07 07:58:33	1.20

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <machine/bus.h>
 #include <machine/grfioctl.h>
 #include <arch/x68k/x68k/iodevice.h>
 #include <arch/x68k/dev/itevar.h>
 #include <arch/x68k/dev/grfvar.h>
 #include <arch/x68k/dev/mfp.h>
 @@ -132,27 +132,27 @@ txrascpy(uint8_t src, uint8_t dst, int16
 	/* stop raster copy */
 	CRTC.crtctrl = 0x0000;
 	CRTC.r21 = saved_r21;
+}
 /*
  * Change glyphs from SRAM switch.
  */
 void
 ite_set_glyph(void)
+{
 	uint8_t glyph = IODEVbase->io_sram[0x59];
 	if ((glyph & 4) != 0)
 		SETGLYPH(0x82, '|');
 	if ((glyph & 2) != 0)
 		SETGLYPH(0x81, '~');
 	if ((glyph & 1) != 0)
 		SETGLYPH(0x80, '\\');
+}
 /*
  * Initialize
  */
 void
 tv_init(struct ite_softc *ip)

--- src/sys/arch/x68k/dev/vsvar.h 2021/02/06 12:50:04	1.19
+++ src/sys/arch/x68k/dev/vsvar.h 2024/01/07 07:58:33	1.20

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -49,27 +49,27 @@
 #define VS_SRATE_1024	(0x00)
 #define VS_SRATE_768	(0x04)
 #define VS_SRATE_512	(0x08)
 #define VS_PANOUT_LR	(0x00)
 #define VS_PANOUT_R	(0x01)
 #define VS_PANOUT_L	(0x02)
 #define VS_PANOUT_OFF	(0x03)
 #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)
 #define MSM6258_STAT	0		/* R */
 #define MSM6258_DATA	1		/* R/W */
 struct vs_dma {
 	bus_dma_tag_t		vd_dmat;
 	bus_dmamap_t		vd_map;
 	void *			vd_addr;
 	bus_dma_segment_t	vd_segs[1];
 	int			vd_nsegs;
 	size_t			vd_size;

--- src/sys/arch/x68k/dev/itevar.h 2022/06/25 03:18:38	1.16
+++ src/sys/arch/x68k/dev/itevar.h 2024/01/07 07:58:33	1.17

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -136,48 +136,48 @@ enum emul_level {
 #endif
 /*
  * X and Y location of character 'c' in the framebuffer, in pixels.
  */
 #define	charX(ip,c)	\
 	(((c) % (ip)->cpl) * (ip)->ftwidth + (ip)->fontx)
 #define	charY(ip,c)	\
 	(((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 */
 #define ATTR_BLINK	0x8		/* blink */
 #define ATTR_ALL	(ATTR_INV | ATTR_UL|ATTR_BOLD|ATTR_BLINK)
 /* Keyboard attributes */
 #define ATTR_KPAD	0x80		/* keypad transmit */
 /* Replacement Rules */
 #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 */
 /* special key codes */
 #define KBD_LEFT_SHIFT	0x70
 #define KBD_RIGHT_SHIFT	0x70
 #define KBD_CAPS_LOCK	0x5d
 #define KBD_CTRL	0x71
 #define KBD_LEFT_ALT	0x55
 #define KBD_RIGHT_ALT	0x58
 #define KBD_LEFT_META	0x56
 #define KBD_RIGHT_META	0x57

--- src/sys/arch/x68k/dev/kbdmap.c 2022/05/26 14:28:56	1.8
+++ src/sys/arch/x68k/dev/kbdmap.c 2024/01/07 07:58:33	1.9

 @@ -1,20 +1,20 @@
-/*	$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"
 /* define a default keymap. This can be changed by keyboard ioctl's */
 /* mode shortcuts: */
 #define	S KBD_MODE_STRING
 #define DG (KBD_MODE_DEAD | KBD_MODE_GRAVE)
 #define DA (KBD_MODE_DEAD | KBD_MODE_ACUTE)
 #define DC (KBD_MODE_DEAD | KBD_MODE_CIRC)
 #define DT (KBD_MODE_DEAD | KBD_MODE_TILDE)
 #define DD (KBD_MODE_DEAD | KBD_MODE_DIER)
 #define C KBD_MODE_CAPS
 @@ -170,27 +170,27 @@ const struct kbdmap ascii_kbdmap = {
 	   {0, '\r'},	/* return */
 	   {C, 'A'},
 	   {C, 'S'},
 	   {C, 'D'},	/* 0x20 */
 	   {C, 'F'},
 	   {C, 'G'},
 	   {C, 'H'},
 	   {C, 'J'},
 	   {C, 'K'},
 	   {C, 'L'},
 	   {0, '+'},
 	   {0, '*'},	/* 0x28 */
 	   {0, '}'},
 	   {C, 'Z'},
 	   {C, 'X'},
 	   {C, 'C'},
 	   {C, 'V'},
 	   {C, 'B'},
 	   {C, 'N'},
 	   {C, 'M'},	/* 0x30 */
 	   {0, '<'},	/* 0x38 */
 	   {0, '>'},
 	   {0, '?'},
 	   {0, '_'},
 	   {0, ' '},
 	   {S, 0x4a},	/* HOME */
 	   {0, '\b'},	/* really DEL, BS & DEL swapped */

--- src/sys/arch/x68k/dev/kbdmap.c.ascii 2022/05/26 14:28:56	1.5
+++ src/sys/arch/x68k/dev/kbdmap.c.ascii 2024/01/07 07:58:33	1.6

 @@ -1,14 +1,14 @@
-/*	$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 */
 #include "kbdmap.h"
 /* define a default keymap. This can be changed by keyboard ioctl's
    (later at least..) */
 /* mode shortcuts: */
 #define	S KBD_MODE_STRING
 #define DG (KBD_MODE_DEAD | KBD_MODE_GRAVE)
 #define DA (KBD_MODE_DEAD | KBD_MODE_ACUTE)
 #define DC (KBD_MODE_DEAD | KBD_MODE_CIRC)
 @@ -166,27 +166,27 @@ const struct kbdmap ascii_kbdmap = {
 , '\r',	/* return */
 	   C, 'A',
 	   C, 'S',
 	   C, 'D',	/* 0x20 */
 	   C, 'F',
 	   C, 'G',
 	   C, 'H',
 	   C, 'J',
 	   C, 'K',
 	   C, 'L',
 , ':',
 , '\"',	/* 0x28 */
 , '~',
 	   C, 'Z',
 	   C, 'X',
 	   C, 'C',
 	   C, 'V',
 	   C, 'B',
 	   C, 'N',
 	   C, 'M',	/* 0x30 */
 , '<',	/* 0x38 */
 , '>',
 , '?',
 , '_',
 , ' ',
 , 0,	/* HOME */
 , '\b',	/* really DEL, BS & DEL swapped */
 @@ -290,15 +290,13 @@ const struct kbdmap ascii_kbdmap = {
 , ESC, '[', '1', '4', '~',	/* 0x75: shift F5 */
 , ESC, '[', '1', '5', '~',	/* 0x7B: shift F6 */
 , ESC, '[', '1', '6', '~',	/* 0x81: shift F7 */
 , ESC, '[', '1', '7', '~',	/* 0x87: shift F8 */
 , ESC, '[', '1', '8', '~',	/* 0x8D: shift F9 */
 , ESC, '[', '1', '9', '~',	/* 0x93: shift F10 */
 , ESC, '[', 'Z',		/* 0x99: shift TAB */
 , ESC, '[',			/* 0x9d: alt ESC == CSI */
 	},
 };
 unsigned char acctable[KBD_NUM_ACC][64] = {
 };

--- src/sys/arch/x68k/dev/mha.c 2023/12/17 22:07:34	1.60
+++ src/sys/arch/x68k/dev/mha.c 2024/01/07 07:58:33	1.61

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, Masaru Oki, Takumi Nakamura, Masanobu Saitoh and
  * Minoura Makoto.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -49,33 +49,33 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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
 #define MHA_DMA_BURST_XFER	1
 #define MHA_DMA_SHORT_BUS_CYCLE	1
 #define MHA_DMA_DATAIN	(0 | (MHA_DMA_LIMIT_XFER << 1)		\
 			   | (MHA_DMA_BURST_XFER << 2)		\
 			   | (MHA_DMA_SHORT_BUS_CYCLE << 3))
 #define MHA_DMA_DATAOUT	(1 | (MHA_DMA_LIMIT_XFER << 1)		\
 			   | (MHA_DMA_BURST_XFER << 2)		\
 			   | (MHA_DMA_SHORT_BUS_CYCLE << 3))
 @@ -237,27 +237,27 @@ int	mhamatch(device_t, cfdata_t, void *)
 void	mhaattach(device_t, device_t, void *);
 void	mhaselect(struct mha_softc *, u_char, u_char, u_char *, u_char);
 void	mha_scsi_reset(struct mha_softc *);
 void	mha_reset(struct mha_softc *);
 void	mha_free_acb(struct mha_softc *, struct acb *, int);
 void	mha_sense(struct mha_softc *, struct acb *);
 void	mha_msgin(struct mha_softc *);
 void	mha_msgout(struct mha_softc *);
 int	mha_dataout_pio(struct mha_softc *, u_char *, int);
 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 *);
 void	mha_done(struct mha_softc *, struct acb *);
 int	mhaintr(void *);
 void	mha_timeout(void *);
 void	mha_minphys(struct buf *);
 void	mha_dequeue(struct mha_softc *, struct acb *);
 inline void	mha_setsync(struct mha_softc *, struct spc_tinfo *);
 #if SPC_DEBUG
 void	mha_print_acb(struct acb *);
 void	mha_show_scsi_cmd(struct acb *);
 void	mha_print_active_acb(void);
 @@ -1205,27 +1205,27 @@ gotit:
 			if (!MSG_ISIDENTIFY(sc->sc_imess[0])) {
 				SPC_MISC(("unknown "));
 printf("%s: unimplemented message: %d\n", device_xname(sc->sc_dev), sc->sc_imess[0]);
 				CMR = CMD_SET_ATN; /* XXX? */
+			}
 			break;
+		}
 	} else if (sc->sc_state == SPC_RESELECTED) {
 		struct scsipi_periph *periph = NULL;
 		struct acb *acb;
 		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
 			 * The list should be short, so I haven't bothered with
 			 * any more sophisticated structures than a simple
 			 * singly linked list.
 			 */
 			lunit = sc->sc_imess[0] & 0x07;
 			TAILQ_FOREACH(acb, &sc->nexus_list, chain) {
 				periph = acb->xs->xs_periph;
 				if (periph->periph_lun == lunit &&
 				    sc->sc_selid == (1<<periph->periph_target)) {
 					TAILQ_REMOVE(&sc->nexus_list, acb,

--- src/sys/arch/x68k/dev/mhavar.h 2022/01/01 21:07:14	1.11
+++ src/sys/arch/x68k/dev/mhavar.h 2024/01/07 07:58:33	1.12

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -45,27 +45,27 @@ struct acb {
 #define ACB_QFREE	1
 #define ACB_QREADY	2
 #define ACB_QNEXUS	3
 #define ACB_QBITS	0x07
 #define ACB_CHKSENSE	0x08
 #define	ACB_ABORTED	0x10
 #define	ACB_RESET	0x80
 #define ACB_SETQ(e, q)	do (e)->flags = ((e)->flags&~ACB_QBITS)|(q); while(0)
 	struct scsipi_generic cmd;  /* SCSI command block */
 	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 */
 };
 /*
  * Some info about each (possible) target on the SCSI bus.  This should
  * probably have been a "per target+lunit" structure, but we'll leave it at
  * this for now.
  */
 struct spc_tinfo {
 	int	cmds;		/* #commands processed */
 	int	dconns;		/* #disconnects */
 	int	touts;		/* #timeouts */
 @@ -100,38 +100,38 @@ struct mha_softc {
 	struct spc_tinfo sc_tinfo[8];
 	/* Data about the current nexus (updated for every cmd switch) */
 	u_char	*sc_dp;		/* Current data pointer */
 	size_t	sc_dleft;	/* Data bytes left to transfer */
 	u_char	*sc_cp;		/* Current command pointer */
 	size_t	sc_cleft;	/* Command bytes left to transfer */
 	/* Adapter state */
 	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 */
 	u_char	sc_msgout;	/* What message is on its way out? */
 	u_char	sc_msgoutq;	/* Messages sent during last MESSAGE OUT */
 	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 */
 	size_t	sc_imlen;
 	/* Hardware stuff */
 	int	sc_freq;		/* Clock frequency in MHz */
 	int	sc_id;			/* our scsi id */
 	int	sc_minsync;		/* Minimum sync period / 4 */
 	int	sc_maxsync;		/* Maximum sync period / 4 */
 	/* DMA buffer */
 	bus_dma_tag_t		sc_dmat;
 @@ -163,27 +163,27 @@ struct mha_softc {
 #define SPC_BUSFREE_OK	0x04	/* Bus free phase is OK. */
 #define SPC_SYNCHNEGO	0x08	/* Synch negotiation in progress. */
 #define SPC_DISCON	0x10	/* Target sent DISCONNECT msg */
 #define	SPC_ABORTING	0x20	/* Bailing out */
 #define ESP_ICCS	0x40	/* Expect status phase results */
 #define ESP_WAITI	0x80	/* Waiting for non-DMA data to arrive */
 /* values for sc_msgout */
 #define SEND_DEV_RESET		0x01
 #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
 /* SCSI Status codes */
 #define ST_GOOD			0x00
 #define ST_CHKCOND		0x02
 #define ST_CONDMET		0x04
 #define ST_BUSY			0x08
 #define ST_INTERMED		0x10
 #define ST_INTERMED_CONDMET	0x14
 #define ST_RESERVATION_CONFLICT	0x18
 #define ST_CMD_TERM		0x22

--- src/sys/arch/x68k/dev/ms.c 2022/05/23 16:58:37	1.40
+++ src/sys/arch/x68k/dev/ms.c 2024/01/07 07:58:33	1.41

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -35,27 +35,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ms.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * X68k mouse driver.
  */
 #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>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
 #include <sys/device.h>
 #include <sys/signalvar.h>
 #include <sys/mutex.h>
 @@ -459,27 +459,27 @@ ms_input(struct ms_softc *ms, int c)
 		firm_gettime(fe);
 		ADVANCE;
 		ms->ms_dx = 0;
 		any++;
+	}
 	if (ms->ms_dy) {
 		NEXT;
 		fe->id = LOC_Y_DELTA;
 		/*
 		 * struct firm_events (derived from SunOS) defines
 		 * 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.
 		 */
 		fe->value = -ms->ms_dy;
 		firm_gettime(fe);
 		ADVANCE;
 		ms->ms_dy = 0;
 		any++;
+	}
 out:
 	if (any) {
 		ms->ms_ub = ub;
 		ms->ms_events.ev_put = put;

--- src/sys/arch/x68k/dev/par.c 2022/05/26 14:33:29	1.44
+++ src/sys/arch/x68k/dev/par.c 2024/01/07 07:58:33	1.45

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -26,27 +26,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ppi.c	7.3 (Berkeley) 12/16/90
  */
 /*
  * parallel port interface
  */
 #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>
 #include <sys/uio.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/file.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 @@ -55,40 +55,40 @@ __KERNEL_RCSID(0, "$NetBSD: par.c,v 1.44
 #include <machine/parioctl.h>
 #include <arch/x68k/dev/intiovar.h>
 #include "ioconf.h"
 struct	par_softc {
 	device_t		sc_dev;
 	bus_space_tag_t		sc_bst;
 	bus_space_handle_t	sc_bsh;
 	int			sc_flags;
 	struct parparam		sc_param;
-#define sc_burst 	sc_param.burst
+#define sc_burst	sc_param.burst
-#define sc_timo  	sc_param.timo
+#define sc_timo		sc_param.timo
-#define sc_delay 	sc_param.delay
+#define sc_delay	sc_param.delay
 	struct callout		sc_timo_ch;
 	struct callout		sc_start_ch;
 } ;
 /* par registers */
 #define PAR_DATA	1
 #define PAR_STROBE	3
 /* sc_flags values */
 #define	PARF_ALIVE	0x01
 #define	PARF_OPEN	0x02
 #define PARF_UIO	0x04
 #define PARF_TIMO	0x08
 #define PARF_DELAY	0x10
 #define PARF_OREAD	0x40	/* no support */
 #define PARF_OWRITE	0x80
 void partimo(void *);
 void parstart(void *);
 void parintr(void *);
 int parrw(dev_t, struct uio *);
 int parhztoms(int);
 int parmstohz(int);
 @@ -159,27 +159,27 @@ parmatch(device_t parent, cfdata_t cf, v
 	if (ia->ia_intr != 99)
 		return 0;
 #endif
 	return 1;
+}
 void
 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;
 	sc->sc_flags = PARF_ALIVE;
 	aprint_normal(": parallel port (write only, interrupt)\n");
 	ia->ia_size = 0x2000;
 	r = intio_map_allocate_region(parent, ia, INTIO_MAP_ALLOCATE);
 #ifdef DIAGNOSTIC
 	if (r)
 		panic("IO map for PAR corruption??");
 #endif
 	sc->sc_bst = ia->ia_bst;
 	r = bus_space_map(sc->sc_bst,
 @@ -197,54 +197,54 @@ parattach(device_t parent, device_t self
 	intio_intr_establish(ia->ia_intr, "par",
 			     (intio_intr_handler_t)parintr, (void *)1);
 	callout_init(&sc->sc_timo_ch, 0);
 	callout_init(&sc->sc_start_ch, 0);
 	callout_init(&intr_callout, 0);
+}
 int
 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);
 	if (sc->sc_flags & PARF_OPEN)
 		return(EBUSY);
 	/* 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);
 	return(0);
+}
 int
 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 */
 	s = spl1();
 	intio_set_sicilian_intr(intio_get_sicilian_intr() &
 				~SICILIAN_INTR_PAR);
 	splx(s);
 	return (0);
+}
 void
 parstart(void *arg)
 @@ -263,52 +263,52 @@ partimo(void *arg)
+{
 	struct par_softc *sc = arg;
 #ifdef DEBUG
 	if (pardebug & PDB_FOLLOW)
 		printf("partimo(%x)\n", device_unit(sc->sc_dev));
 #endif
 	sc->sc_flags &= ~(PARF_UIO|PARF_TIMO);
 	wakeup(sc);
+}
 int
 parwrite(dev_t dev, struct uio *uio, int flag)
+{
 #ifdef DEBUG
 	if (pardebug & PDB_FOLLOW)
 		printf("parwrite(%x, %p)\n", UNIT(dev), uio);
 #endif
 	return (parrw(dev, uio));
+}
 int
 parrw(dev_t dev, struct uio *uio)
+{
 	int unit = UNIT(dev);
 	struct par_softc *sc = device_lookup_private(&par_cd, unit);
 	int len=0xdeadbeef;	/* XXX: shutup gcc */
 	int s, cnt=0;
 	char *cp;
 	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;
 	if (sc->sc_timo > 0) {
 		sc->sc_flags |= PARF_TIMO;
 		callout_reset(&sc->sc_timo_ch, sc->sc_timo, partimo, sc);
+	}
 	while (uio->uio_resid > 0) {
 		len = uimin(buflen, uio->uio_resid);
 		cp = buf;
 		if (uio->uio_rw == UIO_WRITE) {
 			error = uiomove(cp, len, uio);
 			if (error)
 @@ -331,27 +331,27 @@ parrw(dev_t dev, struct uio *uio)
+			}
 			splx(s);
 			break;
+		}
 		splx(s);
 		/*
 		 * Perform the operation
 		 */
 		cnt = parsend(sc, cp, len);
 		if (cnt < 0) {
 			error = -cnt;
 			break;
+		}
 		s = splsoftclock();
 		/*
 		 * Operation timeout (or non-blocking), quit now.
 		 */
 		if ((sc->sc_flags & PARF_UIO) == 0) {
 #ifdef DEBUG
 			if (pardebug & PDB_IO)
 				printf("parrw: timeout/done\n");
 #endif
 			splx(s);
 			break;
+		}
 		/*
 @@ -408,68 +408,68 @@ parrw(dev_t dev, struct uio *uio)
 #ifdef DEBUG
 	if (pardebug & (PDB_FOLLOW|PDB_IO))
 		printf("parrw: return %d, resid %d\n", error, uio->uio_resid);
 #endif
 	return (error);
+}
 int
 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;
 		upp = (struct parparam *)data;
 		upp->burst = pp->burst;
 		upp->timo = parhztoms(pp->timo);
 		upp->delay = parhztoms(pp->delay);
 		break;
 	case PARIOCSPARAM:
 		pp = &sc->sc_param;
 		upp = (struct parparam *)data;
 		if (upp->burst < PAR_BURST_MIN || upp->burst > PAR_BURST_MAX ||
 		    upp->delay < PAR_DELAY_MIN || upp->delay > PAR_DELAY_MAX)
 			return(EINVAL);
 		pp->burst = upp->burst;
 		pp->timo = parmstohz(upp->timo);
 		pp->delay = parmstohz(upp->delay);
 		break;
 	default:
 		return(EINVAL);
+	}
 	return (error);
+}
 int
 parhztoms(int h)
+{
 	int m = h;
 	if (m > 0)
 		m = m * 1000 / hz;
 	return(m);
+}
 int
 parmstohz(int m)
+{
 	int h = m;
 	if (h > 0) {
 		h = h * hz / 1000;
 		if (h == 0)
 			h = 1000 / hz;
+	}
 	return(h);
+}
 /* stuff below here if for interrupt driven output of data thru
    the parallel port. */
 int partimeout_pending;
 int parsend_pending;
 @@ -489,40 +489,40 @@ parintr(void *arg)
 	if (pardebug & PDB_INTERRUPT)
 		printf("parintr %d(%s)\n", mask, mask ? "FLG" : "tout");
 #endif
 	/* if invoked from timeout handler, mask will be 0,
 	 * if from interrupt, it will contain the cia-icr mask,
 	 * which is != 0
 	 */
 	if (mask) {
 		if (partimeout_pending)
 			callout_stop(&intr_callout);
 		if (parsend_pending)
 			parsend_pending = 0;
+	}
 	/* either way, there won't be a timeout pending any longer */
 	partimeout_pending = 0;
 	wakeup(parintr);
 	splx(s);
+}
 int
 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();
 	while (!error
 	       && (parsend_pending
 		   || !(intio_get_sicilian_intr() & SICILIAN_STAT_PAR)))
+	{
 		/* wait a second, and try again */
 		callout_reset(&intr_callout, hz, parintr, 0);
 		partimeout_pending = 1;
 		/* this is essentially a flipflop to have us wait for the
 		   first character being transmitted when trying to transmit
 		   the second, etc. */
 @@ -546,32 +546,32 @@ parsendch(struct par_softc *sc, u_char c
 #ifdef DEBUG
 		if (pardebug & PDB_INTERRUPT)
 			printf("#%d", ch);
 #endif
 		bus_space_write_1(sc->sc_bst, sc->sc_bsh, PAR_DATA, ch);
 		DELAY(1);	/* (DELAY(1) == 1us) > 0.5us */
 		bus_space_write_1(sc->sc_bst, sc->sc_bsh, PAR_STROBE, 0);
 		intio_set_sicilian_intr(intio_get_sicilian_intr() |
 					 SICILIAN_INTR_PAR);
 		DELAY(1);
 		bus_space_write_1(sc->sc_bst, sc->sc_bsh, PAR_STROBE, 1);
 		parsend_pending = 1;
+	}
 	splx(s);
 	return error;
+}
 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;
+}

--- src/sys/arch/x68k/dev/scsiromvar.h 2008/06/25 08:14:59	1.6
+++ src/sys/arch/x68k/dev/scsiromvar.h 2024/01/07 07:58:33	1.7

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -31,18 +31,18 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * SCSI BIOS ROM.
  * Used to probe the board.
  */
 struct scsirom_softc {
 	enum {
 		INTERNAL = 0,	/* onboard */
 		EXTERNAL = 1,	/* optional */
-	} 		sc_which;
+	}		sc_which;
 	paddr_t		sc_addr;
 };
 int scsirom_find_rom(int);

--- src/sys/arch/x68k/dev/slhci_intio.c 2016/04/23 10:15:30	1.15
+++ src/sys/arch/x68k/dev/slhci_intio.c 2024/01/07 07:58:33	1.16

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tetsuya Isaki.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * USB part of Nereid Ethernet/USB/Memory board
  */
 #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>
 #include <sys/device.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/ic/sl811hsreg.h>
 @@ -53,27 +53,27 @@ __KERNEL_RCSID(0, "$NetBSD: slhci_intio.
 #include <arch/x68k/dev/intiovar.h>
 #include <arch/x68k/dev/slhci_intio_var.h>
 static int  slhci_intio_match(device_t, cfdata_t, void *);
 static void slhci_intio_attach(device_t, device_t, void *);
 static void slhci_intio_enable_power(void *, enum power_change);
 static void slhci_intio_enable_intr(void *, int);
 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)
+{
 	struct intio_attach_args *ia = aux;
 	bus_space_tag_t iot = ia->ia_bst;
 	bus_space_handle_t ioh;
 	bus_space_handle_t nch;
 	int nc_addr;
 	int nc_size;
 	if (ia->ia_addr == INTIOCF_ADDR_DEFAULT)
 		ia->ia_addr = SLHCI_INTIO_ADDR1;
 @@ -137,27 +137,27 @@ slhci_intio_attach(device_t parent, devi
 		return;
+	}
 	nc_addr = ia->ia_addr + NEREID_ADDR_OFFSET;
 	nc_size = 0x02;
 	if (bus_space_map(iot, nc_addr, nc_size,
 			BUS_SPACE_MAP_SHIFTED, &isc->sc_nch)) {
 		printf("%s: can't map I/O control space\n",
 			device_xname(self));
 		return;
+	}
 	/* Initialize sc */
 	slhci_preinit(sc, slhci_intio_enable_power, iot, ioh, 30,
 	    SL11_IDX_DATA);
 	/* Establish the interrupt handler */
 	if (intio_intr_establish(ia->ia_intr, "slhci", slhci_intr, sc)) {
 		printf("%s: can't establish interrupt\n",
 			device_xname(self));
 		return;
+	}
 	/* Reset controller */
 	bus_space_write_1(iot, isc->sc_nch, NEREID_CTRL, NEREID_CTRL_RESET);
 	delay(40000);

--- src/sys/arch/x68k/dev/sram.c 2022/05/26 14:33:29	1.21
+++ src/sys/arch/x68k/dev/sram.c 2024/01/07 07:58:33	1.22

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <machine/sram.h>
 #include <x68k/dev/intiovar.h>
 #include <x68k/dev/sramvar.h>
 @@ -208,29 +208,29 @@ sramioctl(dev_t dev, u_long cmd, void *d
 		DPRINTF(SRAM_DEBUG_IOCTL,
 			("Sram ioctl SIOGSRAM address=%p\n", data));
 		DPRINTF(SRAM_DEBUG_IOCTL,
 			("Sram ioctl SIOGSRAM offset=%x\n", sram_io->offset));
 		if (sram_io->offset + SRAM_IO_SIZE > SRAM_SIZE)
 			return EFAULT;
 		bus_space_read_region_1(sc->sc_iot, sc->sc_ioh, sram_io->offset,
 			(uint8_t *)&sram_io->sram, SRAM_IO_SIZE);
 		break;
 	case SIOPSRAM:
 		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
 		if (sramdebug & SRAM_DEBUG_DONTDOIT) {
 			printf("Sram ioctl SIOPSRAM: skipping actual write\n");
 			break;
+		}
 #endif
 		intio_set_sysport_sramwp(0x31);
 		bus_space_write_region_1(sc->sc_iot, sc->sc_ioh,
 			sram_io->offset, (uint8_t *)&sram_io->sram,
 			SRAM_IO_SIZE);
 		intio_set_sysport_sramwp(0x00);

--- src/sys/arch/x68k/include/cpu.h 2019/11/23 19:40:37	1.62
+++ src/sys/arch/x68k/include/cpu.h 2024/01/07 07:58:33	1.63

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (c) 1982, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -79,27 +79,27 @@ struct clockframe {
 /* We would like to do it this way... */
 #define	CLKF_INTR(framep)	(((framep)->sr & PSL_M) == 0)
 #else
 /* but until we start using PSL_M, we have to do this instead */
 #define	CLKF_INTR(framep)	(0)	/* XXX */
 #endif
 /*
  * Preempt the current process if in interrupt from user mode,
  * 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)
 /*
  * Give a profiling tick to the current process when the user profiling
  * buffer pages are invalid.  On the x68k, request an ast to send us
  * through trap, marking the proc as needing a profiling tick.
  */
 #define	cpu_need_proftick(l)	\
 	do { (l)->l_pflag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */ 0)
 /*
  * Notify the current process (p) that it has a signal pending,

--- src/sys/arch/x68k/include/disklabel.h 2011/08/30 12:39:59	1.6
+++ src/sys/arch/x68k/include/disklabel.h 2024/01/07 07:58:33	1.7

 @@ -1,14 +1,14 @@
-/*	$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
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -36,30 +36,30 @@
 #define LABELUSESMBR	0			/* no MBR partitionning */
 #define	LABELSECTOR	0			/* sector containing label */
 #define	LABELOFFSET	64			/* offset of label in sector */
 #define	MAXPARTITIONS	8			/* number of partitions */
 #define	RAW_PART	2			/* raw partition: xx?c */
 /* DOS partition table -- located in boot block */
 #define DOSBBSECTOR	0
 #define DOSPARTOFF	4
 #define NDOSPART	8
 struct dos_partition {
-  unsigned char dp_typname[8];	/* partition name */
+	unsigned char dp_typname[8];	/* partition name */
-  unsigned int  dp_flag:8;	/* state of partition */
+	unsigned int  dp_flag:8;	/* state of partition */
-  unsigned int  dp_start:24;	/* start position (1024bytes/block) */
+	unsigned int  dp_start:24;	/* start position (1024bytes/block) */
-  unsigned long dp_size;	/* partition size (1024bytes/block) */
+	unsigned long dp_size;		/* partition size (1024bytes/block) */
 };
 #if HAVE_NBTOOL_CONFIG_H
 #include <nbinclude/sys/dkbad.h>
 #else
 #include <sys/dkbad.h>
 #endif /* HAVE_NBTOOL_CONFIG_H */
 struct cpu_disklabel {
 	struct dos_partition dosparts[NDOSPART];
 #define __HAVE_DISKLABEL_DKBAD
 	struct dkbad bad;
 };

--- src/sys/arch/x68k/include/intr.h 2023/07/11 11:50:39	1.22
+++ src/sys/arch/x68k/include/intr.h 2024/01/07 07:58:33	1.23

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Minoura Makoto and Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -30,29 +30,29 @@
  */
 #ifndef _X68K_INTR_H_
 #define	_X68K_INTR_H_
 #include <machine/psl.h>
 #define spl0()		_spl0()
 #define splsoftbio()	splraise1()
 #define splsoftclock()	splraise1()
 #define splsoftnet()	splraise1()
 #define splsoftserial()	splraise1()
-#define splvm()         splraise5()
+#define splvm()		splraise5()
-#define splsched()      spl7()
+#define splsched()	spl7()
-#define splhigh()       spl7()
+#define splhigh()	spl7()
 #define	splnone()	spl0()
 #define	splzs()		splraise5()	/* disallow serial interrupts */
 #define	IPL_NONE	0
 #define	IPL_SOFTCLOCK	1
 #define	IPL_SOFTBIO	2
 #define	IPL_SOFTNET	3
 #define	IPL_SOFTSERIAL	4
 #define	IPL_VM		5
 #define	IPL_SCHED	6
 #define	IPL_HIGH	7
 #define	NIPL		8

--- src/sys/arch/x68k/include/kbdmap.h 2005/12/11 12:19:44	1.2
+++ src/sys/arch/x68k/include/kbdmap.h 2024/01/07 07:58:33	1.3

 @@ -1,14 +1,14 @@
-/*	$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_
 #define NUL	0
 #define SOH	1
 #define STX	2
 #define ETX	3
 #define EOT	4
 #define ENQ	5
 #define ACK	6
 #define	BEL	7
 #define BS	8
 @@ -87,21 +87,21 @@ struct key {
 #define KBD_MODE_STRING	(1<<0)	/* code is index into strings[] */
 #define KBD_MODE_DEAD	(1<<1)	/* acc-index in upper nibble, code = plain acc */
 #define KBD_MODE_CAPS	(1<<2)	/* key is capsable. Only used in non-shifted maps */
 #define KBD_MODE_KPAD	(1<<3)	/* key is on keypad */
 #define KBD_MODE_GRAVE	(KBD_ACC_GRAVE << 4)
 #define KBD_MODE_ACUTE	(KBD_ACC_ACUTE << 4)
 #define KBD_MODE_CIRC	(KBD_ACC_CIRC  << 4)
 #define KBD_MODE_TILDE	(KBD_ACC_TILDE << 4)
 #define KBD_MODE_DIER	(KBD_ACC_DIER  << 4)
 #define KBD_MODE_ACCENT(m) ((m) >> 4)	/* get accent from mode */
 #define KBD_MODE_ACCMASK  (0xf0)
 struct kbdmap {
-	struct key 	keys[KBD_NUM_KEYS],
+	struct key	keys[KBD_NUM_KEYS],
-		   	shift_keys[KBD_NUM_KEYS],
+			shift_keys[KBD_NUM_KEYS],
-		   	alt_keys[KBD_NUM_KEYS],
+			alt_keys[KBD_NUM_KEYS],
 			alt_shift_keys[KBD_NUM_KEYS];
 	unsigned char	strings[KBD_STRTAB_SIZE];
 };
 #endif

--- src/sys/arch/x68k/include/opmbellio.h 2005/12/11 12:19:44	1.5
+++ src/sys/arch/x68k/include/opmbellio.h 2024/01/07 07:58:33	1.6

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -48,44 +48,44 @@
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * 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_
 #define _X68K_OPMBELLIO_H_
 #ifndef _IOCTL_
 #include <sys/ioctl.h>
 #endif
 #include <machine/opmreg.h>
 struct bell_info {
     int	volume;
     int	pitch;
     int	msec;
 };
 /* default values */
-#define	BELL_VOLUME	100	/* percentage */
+#define BELL_VOLUME	100	/* percentage */
 #define BELL_PITCH	440
 #define BELL_DURATION	100
 #define BELL_CHANNEL	7
 /* Initial Voice Parameter; struct opm_voice */
 #define DEFAULT_BELL_VOICE {				\
 /*  AR  DR  SR  RR  SL  OL  KS  ML DT1 DT2 AME  */	\
   { 31,  0,  0,  0,  0, 39,  1,  1,  0,  0,  0, },	\
   { 19, 11,  0, 11,  4, 37,  0,  2,  0,  0,  0, },	\
   { 31, 15,  0,  9,  0, 55,  1,  4,  0,  0,  0, },	\
   { 19, 15,  0,  9,  0,  0,  1,  1,  0,  0,  0, },	\
 /*  CON FL  OP  */					\
 ,  7, 15						\

--- src/sys/arch/x68k/stand/aout2hux/aout2hux.c 2011/02/21 02:31:58	1.13
+++ src/sys/arch/x68k/stand/aout2hux/aout2hux.c 2024/01/07 07:58:33	1.14

 @@ -11,27 +11,27 @@
  *	aout2hux [ -o output.x ] a.out1 loadaddr1 a.out2 loadaddr2
+ *
  *	The input files must be static OMAGIC/NMAGIC m68k a.out executables
  *	or m68k ELF executables.
  *	Two executables must have different loading addresses.
  *	Each of the load address must be a hexadecimal number.
  *	Load address shall be multiple of 4 for as / ld of NetBSD/m68k.
+ *
  * example:
  *	% cc -N -static -Wl,-Ttext,0        -o aout1 *.o
  *	% 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>
 #ifndef NO_UNISTD
 # include <unistd.h>
 #endif
 #ifndef NO_STDLIB
 # include <stdlib.h>
 #endif
 #include <stdio.h>
 #include <string.h>
 #include "type_local.h"
 @@ -583,27 +583,27 @@ aout2hux(const char *fn1, const char *fn
 		fprintf(stderr, "address of %s or %s may be incorrect\n",
 				fn1, fn2);
 		goto out;
+	}
 	/*
 	 * get information of the executables
 	 */
 	textsize = inf1.text_size;
 	paddingsize = inf1.text_pad;
 	datasize = inf1.data_size;
 	execoff = inf1.entry_addr - loadadr1;
 	DPRINTF(("text: %u, data: %u, pad: %u, bss: %u, exec: %u\n",
 		textsize, datasize, paddingsize, inf1.bss_size, execoff));
 	if (textsize & 1) {
 		fprintf(stderr, "text size is not even\n");
 		goto out;
+	}
 	if (datasize & 1) {
 		fprintf(stderr, "data size is not even\n");
 		goto out;
+	}
 	if (execoff >= textsize &&
 	    (execoff < textsize + paddingsize ||
 	     execoff >= textsize + paddingsize + datasize)) {

--- src/sys/arch/x68k/stand/boot/boot.c 2020/01/14 03:48:10	1.31
+++ src/sys/arch/x68k/stand/boot/boot.c 2024/01/07 07:58:33	1.32

 @@ -1,14 +1,14 @@
-/*	$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
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -307,27 +307,27 @@ bootmenu(void)
 	int n = 5, c;
 	printf("Press return to boot now, any other key for boot menu\n");
 	printf("booting %s - starting in %d seconds. ",
 		default_kernel, n);
 	while (n-- > 0 && (c = awaitkey_1sec()) == 0) {
 		printf("\r");
 		printf("booting %s - starting in %d seconds. ",
 		       default_kernel, n);
+	}
 	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);
 		strcat(default_kernel, ".gz");
 		printf("trying %s.\n", default_kernel);
 		doboot(default_kernel, 0);
 		printf("Could not start %s; ", default_kernel);
+	}
 	printf("Please use the absolute unit# (e.g. SCSI ID)"
 	       " instead of the NetBSD logical #.\n");
 	for (;;) {
 		char *p, *options;
 @@ -368,27 +368,27 @@ checkmemsize(void)
 			/* no memory */
 			break;
+		}
+	}
 	return (m - 1) * 1024 * 1024;
+}
 extern const char bootprog_rev[];
 extern const char bootprog_name[];
 /*
  * Arguments from the boot block:
  *   bootdev - specifies the device from which /boot was read, in
  *		bootdev format.
  */
 void
 bootmain(int bootdev)
+{
 	u_int sram_memsize;
 	u_int probed_memsize;
 	console_device = consio_init(console_device);
 	hostadaptor = get_scsi_host_adapter();
 	rtc_offset = RTC_OFFSET;
 	try_bootp = 1;

--- src/sys/arch/x68k/stand/boot/boot.ldscript 2020/01/18 06:03:02	1.9
+++ src/sys/arch/x68k/stand/boot/boot.ldscript 2024/01/07 07:58:33	1.10

 @@ -1,17 +1,17 @@
 /* /boot must be a.out, OMAGIC starting from 0x6000. */
 /* ... 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)
 SEARCH_DIR(/usr/lib);
 /*__DYNAMIC = 0; */
 PROVIDE (__stack = 0);
 SECTIONS
+{
   . = TEXTADDR;
   .text :
+  {
     CREATE_OBJECT_SYMBOLS
     *(.text)

--- src/sys/arch/x68k/stand/boot/if_ne.c 2012/11/01 14:46:26	1.2
+++ src/sys/arch/x68k/stand/boot/if_ne.c 2024/01/07 07:58:33	1.3

 @@ -1,14 +1,14 @@
-/* $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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -104,34 +104,34 @@ ne_get(struct iodesc *desc, void *pkt, s
 	while (getsecs() < t) {
 		len = EtherReceive(pkt, maxlen);
 		if (len)
 			break;
+	}
 	return len;
+}
 static int
 ne_put(struct iodesc *desc, void *pkt, size_t len)
+{
 #ifdef DEBUG
- 	struct ether_header *eh;
+	struct ether_header *eh;
- 	eh = pkt;
+	eh = pkt;
- 	printf("dst:  %s\n", ether_sprintf(eh->ether_dhost));
+	printf("dst:  %s\n", ether_sprintf(eh->ether_dhost));
- 	printf("src:  %s\n", ether_sprintf(eh->ether_shost));
+	printf("src:  %s\n", ether_sprintf(eh->ether_shost));
- 	printf("type: 0x%x\n", eh->ether_type & 0xffff);
+	printf("type: 0x%x\n", eh->ether_type & 0xffff);
 #endif
 	return EtherSend(pkt, len);
+}
 static void
 ne_end(struct netif *nif)
+{
 #ifdef DEBUG
 	printf("ne_end\n");
 #endif
 	EtherStop();
+}

--- src/sys/arch/x68k/stand/boot/srt0.S 2011/04/12 14:07:35	1.2
+++ src/sys/arch/x68k/stand/boot/srt0.S 2024/01/07 07:58:33	1.3

 @@ -1,14 +1,14 @@
-/*	$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
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <m68k/asm.h>
 ASENTRY(start)
 	bra		start0
 	.ascii		BOOT
 	.byte		0x20
 	.asciz		BOOT_VERS
 	.even
 /*
  * via stack:	(firstpa, physsize, esym)
  * via regs:	%d6:	bootdev
  *		%d7:	boothowto
  *  for /boot, only %d6 is used.

--- src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c 2015/08/21 15:33:04	1.17
+++ src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c 2024/01/07 07:58:33	1.18

 @@ -1,14 +1,14 @@
-/*	$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 	*/
 /*
  * FS specific support for 4.4BSD Log-structured Filesystem
+ *
  * Written in 1999, 2002, 2003 by ITOH Yasufumi.
  * Public domain.
+ *
  * Intended to be used for boot programs (first stage).
  * DON'T ADD ANY FANCY FEATURE.  THIS SHALL BE COMPACT.
  */
 #include "readufs.h"
 @@ -160,27 +160,27 @@ get_lfs_inode(ino32_t ino, union ufs_din
 	daddr_t daddr;
 	char *buf = alloca(fsi.bsize);
 	struct lfs32_dinode *di, *diend;
 	int i;
 	/* Get fs block which contains the specified inode. */
 	if (ino == LFS_IFILE_INUM)
 		daddr = fsi_lfs.idaddr;
 	else {
 #ifdef DEBUG_WITH_STDIO
 		printf("LFS: ino: %d\nifpb: %d, bsize: %d\n",
 			ino, fsi_lfs.ifpb, fsi.bsize);
 #endif
 		ufs_read((union ufs_dinode *) &ifile_dinode, buf,
 			 ino / fsi_lfs.ifpb + fsi_lfs.ioffset,
 			 fsi.bsize);
 		i = ino % fsi_lfs.ifpb;
 		daddr = (fsi_lfs.version == 1) ?
 		    ((IFILE_V1 *) buf + i)->if_daddr
 		    : ((IFILE32 *) buf + i)->if_daddr;
+	}
 #ifdef DEBUG_WITH_STDIO
 	printf("LFS(%d): daddr: %d\n", ino, (int) daddr);
 #endif
 	if (daddr == LFS_UNUSED_DADDR)
 		return 1;

--- src/sys/arch/x68k/stand/common/exec_image.S 2001/09/27 14:08:28	1.2
+++ src/sys/arch/x68k/stand/common/exec_image.S 2024/01/07 07:58:34	1.3

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -26,27 +26,27 @@
  */
 #include <machine/asm.h>
 #ifndef LASTADDR
 #define LASTADDR	(0x00ed0008)
 #endif
 	.text
 	.even
 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;
 ||	int bootdev;
 ||	int boothowto;
 	addl		#4,%sp			| throw away the return address
 	moveml		%sp@+,%a4-%a6
 	moveml		%sp@+,%d5-%d7
 /* copy the trampoline to the last physical page. */
 	moval		LASTADDR,%sp		| tmpstack from end of physmem
 	lea		%sp@(-4096),%a3		| use last phys page as tramp

--- src/sys/arch/x68k/stand/common/start.S 2011/02/21 02:31:58	1.3
+++ src/sys/arch/x68k/stand/common/start.S 2024/01/07 07:58:34	1.4

	@@ -1,25 +1,25 @@		@@ -1,25 +1,25 @@
1	\|-----------------------------------------------------------	1	\|-----------------------------------------------------------
2	\|	2	\|
3	\| Simple C runtime startup for Human68k	3	\| Simple C runtime startup for Human68k
4	\|	4	\|
5	\| o no stdio support (DOS/IOCS only)	5	\| o no stdio support (DOS/IOCS only)
6	\| o HUPAIR support	6	\| o HUPAIR support
7	\|	7	\|
8	\| written by ITOH Yasufumi	8	\| written by ITOH Yasufumi
9	\|	9	\|
10	\| This file is in the public domain	10	\| This file is in the public domain
11	\|	11	\|
12	\| $NetBSD: start.S,v 1.3 2011/02/21 02:31:58 itohy Exp $	12	\| $NetBSD: start.S,v 1.4 2024/01/07 07:58:34 isaki Exp $
13		13
14	#include <machine/asm.h>	14	#include <machine/asm.h>
15		15
16	\|-----------------------------------------------------------	16	\|-----------------------------------------------------------
17	\|	17	\|
18	\| configuration	18	\| configuration
19	\|	19	\|
20	#ifndef STACK_SIZE	20	#ifndef STACK_SIZE
21	#define STACK_SIZE 65536 /* stack size in bytes */	21	#define STACK_SIZE 65536 /* stack size in bytes */
22	#endif	22	#endif
23		23
24	#ifndef STACK_SYMBOL	24	#ifndef STACK_SYMBOL
25	#ifdef __ELF__	25	#ifdef __ELF__
	@@ -74,30 +74,30 @@		@@ -74,30 +74,30 @@
74	#endif	74	#endif
75		75
76	\|-----------------------------------------------------------	76	\|-----------------------------------------------------------
77	\|	77	\|
78	\| DOS call	78	\| DOS call
79	\|	79	\|
80	#define DOS(x) .word x	80	#define DOS(x) .word x
81		81
82	#define __FPUTS 0xFF1E	82	#define __FPUTS 0xFF1E
83	#define __VERNUM 0xFF30	83	#define __VERNUM 0xFF30
84	#define __SETBLOCK 0xFF4A	84	#define __SETBLOCK 0xFF4A
85	#define __EXIT2 0xFF4C	85	#define __EXIT2 0xFF4C
86		86
87	\|	87	\|
88	\| seed to estimate argument string/vector and environment vector size	88	\| seed to estimate argument string/vector and environment vector size
89	\| (max nohupair argv[0](92+4) + NULLs(8) + alignment(3)) <- donburi?	89	\| (max nohupair argv[0](92+4) + NULLs(8) + alignment(3)) <- donburi?
90	\|	90	\|
91	#define estimated_argsz 107	91	#define estimated_argsz 107
92	#define estimated_com 92 /* estimated command name length (included) */	92	#define estimated_com 92 /* estimated command name length (included) */
93		93
94	\|	94	\|
95	\| other constants	95	\| other constants
96	\|	96	\|
97	#define char_tab 0x09	97	#define char_tab 0x09
98	#define char_space 0x20	98	#define char_space 0x20
99	#define char_dquote 0x22	99	#define char_dquote 0x22
100	#define char_squote 0x27	100	#define char_squote 0x27
101	#define char_slash 0x2f	101	#define char_slash 0x2f
102	#define char_backslash 0x5c	102	#define char_backslash 0x5c
103		103

--- src/sys/arch/x68k/stand/libsa/clock.c 2014/11/21 01:18:39	1.5
+++ src/sys/arch/x68k/stand/libsa/clock.c 2024/01/07 07:58:34	1.6

 @@ -1,40 +1,40 @@
-/* $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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * 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>
 #include <lib/libsa/net.h>
 #include "iocs.h"
 #include "libx68k.h"
 #include "consio.h"	/* XXX: for MFP_TIMERC */
 /* x68k's RTC is defunct 2079, so there is no y2100 problem. */
 int rtc_offset;
 const int yday[] = {

--- src/sys/arch/x68k/stand/libsa/consio.c 2014/10/17 17:48:53	1.11
+++ src/sys/arch/x68k/stand/libsa/consio.c 2024/01/07 07:58:34	1.12

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -105,27 +105,27 @@ check_getchar(void)
+{
 	int keycode;
 	switch (x68k_console_device) {
 	case ITE:
 		while ((keycode = IOCS_B_KEYSNS()) != 0) {
 			keycode &= 0xff;
 			if (keycode != 0) {
 				/* valid ASCII code */
 				return keycode;
+			}
 			/* discard non ASCII keys (CTRL, OPT.1 etc) */
 			(void)IOCS_B_KEYINP();
+		}
 		/* no input */
 		return 0;
 	case SERIAL:
 		return IOCS_ISNS232C() & 0xff;
+	}
 	return -1;
+}
 int
 awaitkey_1sec(void)
+{
 	int i, c;

--- src/sys/arch/x68k/stand/libsa/fd.c 2014/03/08 03:20:24	1.8
+++ src/sys/arch/x68k/stand/libsa/fd.c 2024/01/07 07:58:34	1.9

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -98,27 +98,27 @@ fdstrategy(void *arg, int rw, daddr_t db
 	int error, nbytes;
 	if (size == 0) {
 		if (rsize)
 			*rsize = 0;
 		return 0;
+	}
 	nbytes = howmany(size, 128 << sc->fmt.minsec.N)
 		* (128 << sc->fmt.minsec.N);
 	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;
 	error = IOCS_B_READ((sc->unit + 0x90) * 256 + 0x70,
 			    ((sc->fmt.minsec.N << 24) |
 			     (cyl << 16) |
 			     (head << 8) |
 			     (sect)),
 			    nbytes,
 			    buf);
 	if (error & 0xf8ffff00) {
 		nbytes = 0;
 		error = EIO;

--- src/sys/arch/x68k/stand/libsa/fdsub.S 2001/09/27 10:03:28	1.1
+++ src/sys/arch/x68k/stand/libsa/fdsub.S 2024/01/07 07:58:34	1.2

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,27 +23,27 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <machine/asm.h>
 #include "iocscall.h"
 /*
  * int fd_check_fmt(drive, head, minmax)
  *	int drive;		(0-3)
  *	int head;		(0-1)
  *	struct fdfmt *minmax;	(results are stored)
  *	return value:	0 on success, or negative
  */
 	.text
 ENTRY_NOPROFILE(fd_check_format)
 ||	movl	%sp@(4),%d1
 ||	andil	#3,%d1
 ||	orib	#0x90,%d1
 ||	lslw	#8,%d1
 ||	movql	#0,%d2
 ||	IOCS(__B_DRVCHK)
 ||	btst.b	#1,%d0
 ||	beq	fail
 ||	IOCS(__B_RECALI)

--- src/sys/arch/x68k/stand/libsa/parseutils.c 2016/05/31 04:12:10	1.3
+++ src/sys/arch/x68k/stand/libsa/parseutils.c 2024/01/07 07:58:34	1.4

 @@ -1,14 +1,14 @@
-/*	$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
  *	NetBSD: parseutils.c,v 1.3 2000/09/24 12:32:35 jdolecek Exp
  */
 /*
  * Copyright (c) 1996, 1997
  * 	Matthias Drochner.  All rights reserved.
  * Copyright (c) 1996, 1997
  * 	Perry E. Metzger.  All rights reserved.
  * Copyright (c) 1997
  *	Jason R. Thorpe.  All rights reserved
 @@ -65,27 +65,27 @@ gettrailer(char *arg)
 	/* trim leading blanks */
 	while (*options == ' ')
 		options++;
 	return options;
+}
 int
 parseopts(const char *opts, int *howto)
+{
 	int r, tmpopt = 0;
-	opts++; 	/* skip - */
+	opts++;		/* skip - */
 	while (*opts && *opts != ' ') {
 		r = 0;
 		BOOT_FLAG(*opts, r);
 		if (r == 0) {
 			printf("-%c: unknown flag\n", *opts);
 			return 0;
+		}
 		tmpopt |= r;
 		opts++;
+	}
 	*howto = tmpopt;
 	return 1;

--- src/sys/arch/x68k/stand/libsa/sdcd.c 2022/06/23 12:32:22	1.18
+++ src/sys/arch/x68k/stand/libsa/sdcd.c 2024/01/07 07:58:34	1.19

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -41,27 +41,27 @@ static int current_blkbytes;
 static int current_blkshift;
 static int current_devsize, current_npart;
 static struct boot_partinfo partitions[MAXPARTITIONS];
 static uint human2blk(uint);
 static uint human2bsd(uint);
 static uint bsd2blk(uint);
 static int readdisklabel(int);
 static int check_unit(int);
 #ifdef DEBUG
 #define DPRINTF(x)	printf x
 #else
 #define DPRINTF(x)
 #endif
 /*
  * Convert the number of sectors on Human68k
  * into the number of blocks on the current device.
  */
 static uint
 human2blk(uint n)
+{
 	uint blk_per_sect;
 	/* Human68k uses 1024 byte/sector. */
 	blk_per_sect = 4 >> current_blkshift;

--- src/sys/arch/x68k/stand/loadbsd/Makefile 2019/09/23 13:42:37	1.19
+++ src/sys/arch/x68k/stand/loadbsd/Makefile 2024/01/07 07:58:34	1.20

 @@ -1,40 +1,40 @@
-#	$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}/../../../..
 BASE=	loadbsd
 PROG=	${BASE}.x	# Human68k ".x" executable
 BINMODE=444		# not to be run on NetBSD
 SRCS=	start.S loadbsd.c xprintf.c trampoline.S
 NOMAN=	# defined
 BINDIR=		/usr/mdec
 .PATH:	${.CURDIR}/../common
 .include <bsd.own.mk>
 .include <bsd.klinks.mk>
 STRIPFLAG=		# not an elf
 AOUT2HUXDIR!=	cd ${.CURDIR}/../aout2hux && ${PRINTOBJDIR}
 AOUT2HUX=	${AOUT2HUXDIR}/aout2hux
 LIBDOS!=	cd ${.CURDIR}/../libdos && ${PRINTOBJDIR}
 LIBIOCS!=	cd ${.CURDIR}/../libiocs && ${PRINTOBJDIR}
 CPPFLAGS=	-W -Wall -O -fomit-frame-pointer -fno-unwind-tables
 CPPFLAGS+=	-m68000 -Wa,-mc68000
 CPPFLAGS+=	-nostdinc
 CPPFLAGS+=	-I$S -I.
 CPPFLAGS+=	-I${.CURDIR}/../libdos -I${.CURDIR}/../libiocs
 CPPFLAGS+=	-I${DESTDIR}/usr/include
 LDFLAGS=	-nostdlib -static -N
 LDLIBS=		-L${LIBDOS} -ldos -L${LIBIOCS} -liocs -L${DESTDIR}/usr/lib -lc
 DPADD+=		${AOUT2HUX}
 CLEANFILES+=	${BASE}1 ${BASE}2
 ${PROG}: ${BASE}1 ${BASE}2
 	${_MKTARGET_LINK}
 	${AOUT2HUX} -o ${.TARGET} ${BASE}1 11000 ${BASE}2 22000

--- src/sys/arch/x68k/stand/loadbsd/loadbsd.c 2023/12/23 20:57:16	1.15
+++ src/sys/arch/x68k/stand/loadbsd/loadbsd.c 2024/01/07 07:58:34	1.16

 @@ -10,33 +10,33 @@
  *		-h	help
  *		-N	do not actually execute kernel
  *		-V	print version and exit
+ *
  *	kernel options:
  *		-a	auto boot, opposite of -s
  *		-s	single user boot (default)
  *		-D	enter kernel debugger
  *		-b	ask root device
  *		-r	specify root device
  *		-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 $");
+__RCSID("$NetBSD: loadbsd.c,v 1.16 2024/01/07 07:58:34 isaki Exp $");
-#define VERSION	"$Revision: 1.15 $ $Date: 2023/12/23 20:57:16 $"
+#define VERSION	"$Revision: 1.16 $ $Date: 2024/01/07 07:58:34 $"
 #include <sys/types.h>		/* ntohl */
 #include <sys/reboot.h>
 #include <sys/param.h>		/* ALIGN, ALIGNBYTES */
 #include <a.out.h>
 #include <sys/exec_elf.h>
 #include <string.h>
 #include <machine/bootinfo.h>
 #include <dos.h>
 #include <iocs.h>
 #include "../common/xprintf.h"
 #include "trampoline.h"
 @@ -355,28 +355,28 @@ read_kernel(const char *fn)
 	xk_load(&arg->xk, buf, 0 /* XXX load addr should not be fixed */);
 	/*
 	 * create argument for trampoline code
 	 */
 	arg->bsr_inst = TRAMP_BSR + sizeof(struct tramparg) - 2;
 	arg->tmp_stack = (char *) arg + sizeof(struct tramparg)
 				+ size_tramp + SIZE_TMPSTACK;
 	arg->mpu_type = IOCS_MPU_STAT() & 0xff;
 	arg->xk.d5 = IOCS_BOOTINF();	/* unused for now */
 #if 0
 	/* filled afterwards */
 	arg->xk.rootdev =
 	arg->xk.boothowto =
 #endif
 	if (opt_v)
 		xwarnx("args: mpu %d, image %p, load 0x%x, entry 0x%x",
 			arg->mpu_type, arg->xk.sec[0].sec_image,
 			arg->xk.load_addr, arg->xk.entry_addr);
 	/*
 	 * copy trampoline code
 	 */
 	if (opt_v)
 		xwarnx("trampoline code at %p (%u bytes)",
 			(char *) arg + sizeof(struct tramparg), size_tramp);

--- src/sys/arch/x68k/stand/mboot/Makefile 2020/08/10 07:00:49	1.19
+++ src/sys/arch/x68k/stand/mboot/Makefile 2024/01/07 07:58:34	1.20

 @@ -1,37 +1,37 @@
-#	$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>
 BOOT=		mboot
 VERSION=	0.1
 # text address
 TEXT=		00002000
 TEXTSZ=		1024
 PROG=		${BOOT}
 BINDIR=		/usr/mdec
 BINMODE=	444
 STRIPFLAG=
 SRCS=		srt0.S mboot.c
 KERN!=		cd ${.CURDIR}/../../../..; pwd
 CPPFLAGS+=	-D_STANDALONE
 CPPFLAGS+=	-nostdinc -I${KERN} -I${.CURDIR} -I.
 CPPFLAGS+=	-I${.CURDIR}/../libiocs
 CPPFLAGS+=	-DTEXTADDR="0x${TEXT}"
 CPPFLAGS+=	-DBOOT=\"${BOOT}\" -DBOOT_VERS=\"${VERSION}\"
 CFLAGS=		-Wno-main -Os -m68000 -Wno-attributes
 AFLAGS+=	-m68000
 LINKFLAGS=	-N -static -Ttext ${TEXT}
 LIBIOCS!=	cd ${.CURDIR}/../libiocs && ${PRINTOBJDIR}
 LDLIBS+=	${LIBIOCS}/libiocs.a
 .include "../Makefile.booters"
 realall: ${PROG}
 ${BOOT}:	${OBJS} ${LDLIBS}
 	${_MKTARGET_LINK}

--- src/sys/arch/x68k/stand/mboot/srt0.S 2008/04/28 20:23:40	1.3
+++ src/sys/arch/x68k/stand/mboot/srt0.S 2024/01/07 07:58:34	1.4

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Minoura Makoto.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <m68k/asm.h>
 ENTRY_NOPROFILE(_start)
 	bra		start0
 	.ascii		BOOT
 	.byte		0x20
 	.asciz		BOOT_VERS
 	.even
 start0:
 	lea		%pc@(_C_LABEL(_start)),%a7
 	movl		%d4,%sp@-
 	bsr		_C_LABEL(bootmain)
 	addql		#4,%a7

--- src/sys/arch/x68k/stand/xxboot/Makefile.xxboot 2022/04/25 15:12:07	1.20
+++ src/sys/arch/x68k/stand/xxboot/Makefile.xxboot 2024/01/07 07:58:34	1.21

 @@ -1,14 +1,14 @@
-#	$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
 .include <bsd.own.mk>
 BOOT=	xxboot_$(FS)
 VERSIONFILE=	${.CURDIR}/../version
 VERSION!=	${TOOL_AWK} -F: '$$1 ~ /^[0-9.]*$$/ { it = $$1; } \
 			END { print it }' ${VERSIONFILE}
 NEWVERSWHAT=	"${BOOT}"
 # text and bss addresses
 TEXT=		0x003000	# Primary (me)
 @@ -56,27 +56,27 @@ LIBSA!=	  cd $M/stand/libsa && ${PRINTOB
 LDLIBS=	  -L ${LIBSA}/lib/kern -lkern
 LDLIBS+=  -L${LIBIOCS} -liocs
 .PATH: $S/lib/libsa
 CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=$(FS)
 CPPFLAGS+= -DLIBSA_SINGLE_DEVICE=xx
 CPPFLAGS+= -DLIBSA_NO_FD_CHECKING
 CPPFLAGS+= -DLIBSA_NO_FS_WRITE
 CPPFLAGS+= -DLIBSA_NO_RAW_ACCESS
 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
 SRCS+=	exec_image.S
 .include "${.CURDIR}/../../Makefile.booters"
 CLEANFILES+=	${PROG}.map
 ${PROG}: $(OBJS)
 	${_MKTARGET_LINK}
 	$(LD) $(LINKFLAGS) -Map=${PROG}.map -o ${PROG} $(OBJS) $(LDLIBS)

--- src/sys/arch/x68k/stand/xxboot/bootmain.c 2020/08/16 06:43:43	1.8
+++ src/sys/arch/x68k/stand/xxboot/bootmain.c 2024/01/07 07:58:34	1.9

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (c) 1999, 2000 Itoh Yasufumi.
  * Copyright (c) 2001 Minoura Makoto.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -233,27 +233,27 @@ bootmain(void)
 	fd = loadfile("USTAR.volsize.4540", marks,
 	    LOAD_TEXT|LOAD_DATA|LOAD_BSS);
 #else
 	/* XXX what is x68k/boot? */
 	fd = loadfile("x68k/boot", marks, LOAD_TEXT|LOAD_DATA|LOAD_BSS);
 	if (fd < 0)
 		fd = loadfile("boot", marks, LOAD_TEXT|LOAD_DATA|LOAD_BSS);
 #endif
 	if (fd >= 0) {
 		close(fd);
 		exec_image(BOOT_TEXTADDR, /* image loaded at */
 			   BOOT_TEXTADDR, /* image executed at */
 			   BOOT_TEXTADDR, /* XXX: entry point */
-, 		  /* XXX: image size */
+,		  /* XXX: image size */
-			   bootdev, 0);	  /* arguments */
+			   bootdev, 0);   /* arguments */
+	}
 	IOCS_B_PRINT("can't load the secondary bootstrap.");
 	exit(0);
+}
 int
 devopen(struct open_file *f, const char *fname, char **file)
+{
 	*file = __UNCONST(fname);
 	return DEV_OPEN()(f);
+}

--- src/sys/arch/x68k/stand/xxboot/memcmp.S 2020/08/16 06:43:43	1.1
+++ src/sys/arch/x68k/stand/xxboot/memcmp.S 2024/01/07 07:58:34	1.2

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (C) 2020 Y.Sugahara (moveccr). All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -96,27 +96,27 @@ test:
 		jbsr	memcmp
 		leal	%sp@(12),%sp
 		cmpl	%a2@,%d0		| compare return value
 		jne	fail
 		PRINT	%pc@(msg_ok)
 		rts
 fail:
 		PRINT	%pc@(msg_fail)
 		rts
 test1:
 		| b1 == b2 within length
-		.long 	0x11223344		| b1
+		.long	0x11223344		| b1
 		.long	0x11223355		| b2
 		.long	3			| len
 		.long	0			| expected
 test2:
 		| b1 > b2 before the last
 		.long	0x11813344		| b1
 		.long	0x11013344		| b2
 		.long	3			| len
 		.long	0x00000080		| expected
 test3:
 		| b1 < b2 in the last byte

--- src/sys/arch/x68k/usr.bin/loadkmap/ascii_kmap.c 2011/05/19 21:26:39	1.7
+++ src/sys/arch/x68k/usr.bin/loadkmap/ascii_kmap.c 2024/01/07 07:58:34	1.8

 @@ -1,23 +1,23 @@
-/*	$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
    (later at least..) */
 /* mode shortcuts: */
 #define	S KBD_MODE_STRING
 #define C KBD_MODE_CAPS
 #define K KBD_MODE_KPAD
 #define D KBD_MODE_DEAD
 struct kbdmap ascii_kbdmap = {
 	/* normal map */
+	{
 	   {0, 0},	/* 0x00 */
 	   {0, ESC},
 @@ -164,27 +164,27 @@ struct kbdmap ascii_kbdmap = {
 	   {0, '\r'},	/* return */
 	   {C, 'A'},
 	   {C, 'S'},
 	   {C, 'D'},	/* 0x20 */
 	   {C, 'F'},
 	   {C, 'G'},
 	   {C, 'H'},
 	   {C, 'J'},
 	   {C, 'K'},
 	   {C, 'L'},
 	   {0, ':'},
 	   {0, '\"'},	/* 0x28 */
 	   {0, '~'},
 	   {C, 'Z'},
 	   {C, 'X'},
 	   {C, 'C'},
 	   {C, 'V'},
 	   {C, 'B'},
 	   {C, 'N'},
 	   {C, 'M'},	/* 0x30 */
 	   {0, '<'},	/* 0x38 */
 	   {0, '>'},
 	   {0, '?'},
 	   {0, '_'},
 	   {0, ' '},
 	   {0, 0},	/* HOME */
 	   {0, '\b'},	/* really DEL, BS & DEL swapped */
 @@ -242,34 +242,34 @@ struct kbdmap ascii_kbdmap = {
 	   {S, 0x8D},	/* shift F9 */
 	   {S, 0x93},	/* shift F10 */
 	},
 	/* alt map */
+	{
 	},
 	/* shift alt map */
+	{
 	},
+	{
 	  /* 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.. */
 , ESC, '[', 'A',		/* 0x00: CRSR UP */
 , ESC, '[', 'B',		/* 0x04: CRSR DOWN */
 , ESC, '[', 'C',		/* 0x08: CRSR RIGHT */
 , ESC, '[', 'D',		/* 0x0C: CRSR LEFT */
 , ESC, '[', '0', '~',	/* 0x10: F1 */
 , ESC, '[', '1', '~',	/* 0x15: F2 */
 , ESC, '[', '2', '~',	/* 0x1A: F3 */
 , ESC, '[', '3', '~',	/* 0x1F: F4 */
 , ESC, '[', '4', '~',	/* 0x24: F5 */
 , ESC, '[', '5', '~',	/* 0x29: F6 */
 , ESC, '[', '6', '~',	/* 0x2E: F7 */
 , ESC, '[', '7', '~',	/* 0x33: F8 */
 , ESC, '[', '8', '~',	/* 0x38: F9 */

--- src/sys/arch/x68k/usr.bin/loadkmap/jis_kmap.c 2011/05/19 21:26:39	1.6
+++ src/sys/arch/x68k/usr.bin/loadkmap/jis_kmap.c 2024/01/07 07:58:34	1.7

 @@ -1,23 +1,23 @@
-/*	$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
    (later at least..) */
 /* mode shortcuts: */
 #define	S KBD_MODE_STRING
 #define C KBD_MODE_CAPS
 #define K KBD_MODE_KPAD
 #define D KBD_MODE_DEAD
 struct kbdmap ascii_kbdmap = {
 	/* normal map */
+	{
 	   {0, 0},	/* 0x00 */
 	   {0, ESC},
 @@ -164,27 +164,27 @@ struct kbdmap ascii_kbdmap = {
 	   {0, '\r'},	/* return */
 	   {C, 'A'},
 	   {C, 'S'},
 	   {C, 'D'},	/* 0x20 */
 	   {C, 'F'},
 	   {C, 'G'},
 	   {C, 'H'},
 	   {C, 'J'},
 	   {C, 'K'},
 	   {C, 'L'},
 	   {0, '+'},
 	   {0, '*'},	/* 0x28 */
 	   {0, '}'},
 	   {C, 'Z'},
 	   {C, 'X'},
 	   {C, 'C'},
 	   {C, 'V'},
 	   {C, 'B'},
 	   {C, 'N'},
 	   {C, 'M'},	/* 0x30 */
 	   {0, '<'},	/* 0x38 */
 	   {0, '>'},
 	   {0, '?'},
 	   {0, '_'},
 	   {0, ' '},
 	   {0, 0},	/* HOME */
 	   {0, '\b'},	/* really DEL, BS & DEL swapped */
 @@ -242,34 +242,34 @@ struct kbdmap ascii_kbdmap = {
 	   {S, 0x8D},	/* shift F9 */
 	   {S, 0x93},	/* shift F10 */
 	},
 	/* alt map */
+	{
 	},
 	/* shift alt map */
+	{
 	},
+	{
 	  /* 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.. */
 , ESC, '[', 'A',		/* 0x00: CRSR UP */
 , ESC, '[', 'B',		/* 0x04: CRSR DOWN */
 , ESC, '[', 'C',		/* 0x08: CRSR RIGHT */
 , ESC, '[', 'D',		/* 0x0C: CRSR LEFT */
 , ESC, '[', '0', '~',	/* 0x10: F1 */
 , ESC, '[', '1', '~',	/* 0x15: F2 */
 , ESC, '[', '2', '~',	/* 0x1A: F3 */
 , ESC, '[', '3', '~',	/* 0x1F: F4 */
 , ESC, '[', '4', '~',	/* 0x24: F5 */
 , ESC, '[', '5', '~',	/* 0x29: F6 */
 , ESC, '[', '6', '~',	/* 0x2E: F7 */
 , ESC, '[', '7', '~',	/* 0x33: F8 */
 , ESC, '[', '8', '~',	/* 0x38: F9 */

--- src/sys/arch/x68k/usr.bin/loadkmap/kbdmap.h 1998/01/05 20:52:29	1.2
+++ src/sys/arch/x68k/usr.bin/loadkmap/kbdmap.h 2024/01/07 07:58:34	1.3

 @@ -1,14 +1,14 @@
-/*	$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
 #define STX	2
 #define ETX	3
 #define EOT	4
 #define ENQ	5
 #define ACK	6
 #define	BEL	7
 #define BS	8
 #define HT	9
 #define LF	10
 #define VT	11
 @@ -84,26 +84,26 @@ struct key {
 #define KBD_MODE_STRING	(1<<0)	/* code is index into strings[] */
 #define KBD_MODE_DEAD	(1<<1)	/* acc-index in upper nibble, code = plain acc */
 #define KBD_MODE_CAPS	(1<<2)	/* key is capsable. Only used in non-shifted maps */
 #define KBD_MODE_KPAD	(1<<3)	/* key is on keypad */
 #define KBD_MODE_GRAVE	(KBD_ACC_GRAVE << 4)
 #define KBD_MODE_ACUTE	(KBD_ACC_ACUTE << 4)
 #define KBD_MODE_CIRC	(KBD_ACC_CIRC  << 4)
 #define KBD_MODE_TILDE	(KBD_ACC_TILDE << 4)
 #define KBD_MODE_DIER	(KBD_ACC_DIER  << 4)
 #define KBD_MODE_ACCENT(m) ((m) >> 4)	/* get accent from mode */
 #define KBD_MODE_ACCMASK  (0xf0)
 struct kbdmap {
-	struct key 	keys[KBD_NUM_KEYS],
+	struct key	keys[KBD_NUM_KEYS],
-		   	shift_keys[KBD_NUM_KEYS],
+			shift_keys[KBD_NUM_KEYS],
-		   	alt_keys[KBD_NUM_KEYS],
+			alt_keys[KBD_NUM_KEYS],
 			alt_shift_keys[KBD_NUM_KEYS];
 	unsigned char	strings[KBD_STRTAB_SIZE];
 };
 #ifdef KERNEL
 /* XXX: ITE interface */
 extern struct kbdmap kbdmap, ascii_kbdmap;
 extern unsigned char acctable[KBD_NUM_ACC][64];
 #endif

--- src/sys/arch/x68k/usr.bin/loadkmap/loadkmap.c 2011/05/19 21:26:39	1.10
+++ src/sys/arch/x68k/usr.bin/loadkmap/loadkmap.c 2024/01/07 07:58:34	1.11

 @@ -1,22 +1,22 @@
-/*	$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
  * Copyright 1994 by Masaru Oki
  */
 #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>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <machine/kbdmap.h>
 #include <machine/iteioctl.h>
 void load_kmap(const char *);
 int
 @@ -40,16 +40,16 @@ load_kmap(const char *file)
 	if ((fd = open(file, 0)) >= 0) {
 		if (read(fd, buf, sizeof(buf)) == sizeof(buf)) {
 			if (ioctl(0, ITEIOCSKMAP, buf) == 0)
 				return;
 			else
 				perror("ITEIOCSKMAP");
 		} else {
 			perror("read kbdmap");
+		}
 		close (fd);
 	} else {
-	    perror("open kbdmap");
+		perror("open kbdmap");
+	}
+}

--- src/sys/arch/x68k/x68k/autoconf.c 2014/03/26 08:17:59	1.68
+++ src/sys/arch/x68k/x68k/autoconf.c 2024/01/07 07:58:35	1.69

 @@ -1,14 +1,14 @@
-/*	$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
  * Copyright (c) 1994 Christian E. Hopps
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <machine/cpu.h>
 #include <machine/bootinfo.h>
 @@ -75,27 +75,27 @@ cpu_configure(void)
 void
 cpu_rootconf(void)
+{
 	findroot();
 	printf("boot device: %s\n",
 	    booted_device ? device_xname(booted_device) : "<unknown>");
 	rootconf();
+}
 void
 config_console(void)
+{
 	mfp_config_console();
 	grf_config_console();
 	ite_config_console();
+}
 uint32_t bootdev = 0;
 static void
 findroot(void)
+{
 	int majdev, unit, part;
 	const char *name;

--- src/sys/arch/x68k/x68k/bus.c 2022/07/26 20:08:56	1.38
+++ src/sys/arch/x68k/x68k/bus.c 2024/01/07 07:58:35	1.39

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * bus_space(9) and bus_dma(9) implementation for NetBSD/x68k.
  * These are default implementations; some buses may use their own.
  */
 #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>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <uvm/uvm_extern.h>
 #include <m68k/cacheops.h>
 @@ -357,27 +357,27 @@ x68k_bus_dmamap_sync(bus_dma_tag_t t, bu
 	bus_dma_segment_t *ds = map->dm_segs;
 	bus_addr_t seg;
 	int i;
 	if ((ops & (BUS_DMASYNC_PREREAD|BUS_DMASYNC_POSTWRITE)) == 0)
 		return;
 #if defined(M68020) || defined(M68030)
 	if (mmutype != MMU_68040) {
 		if ((ops & BUS_DMASYNC_POSTWRITE) == 0)
 			return;	/* no copyback cache */
 		ICIA();		/* no per-page/per-line control */
 		DCIA();
 		return;
+	}
 #endif
 	if (offset >= map->dm_mapsize)
 		return;	/* driver bug; warn it? */
 	if (offset+len > map->dm_mapsize)
 		len = map->dm_mapsize; /* driver bug; warn it? */
 	i = 0;
 	while (ds[i].ds_len <= offset) {
 		offset -= ds[i++].ds_len;
 		continue;
+	}
 	while (len > 0) {
 		seg = ds[i].ds_len - offset;
 @@ -451,27 +451,27 @@ x68k_bus_dmamem_unmap(bus_dma_tag_t t, v
 /*
  * Common function for mmap(2)'ing DMA-safe memory.  May be called by
  * bus-specific DMA mmap(2)'ing functions.
  */
 paddr_t
 x68k_bus_dmamem_mmap(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
     off_t off, int prot, int flags)
+{
 	bus_addr_t rv;
 	rv = _bus_dmamem_mmap_common(t, segs, nsegs, off, prot, flags);
 	if (rv == (bus_addr_t)-1)
 		return (-1);
 	return (m68k_btop((char *)rv));
+}
 /**********************************************************************
  * DMA utility functions
  **********************************************************************/
 /*
  * Utility function to load a linear buffer.  lastaddrp holds state
  * between invocations (for multiple-buffer loads).  segp contains
  * the starting segment on entrance, and the ending segment on exit.
  * first indicates if this is the first invocation of this function.

--- src/sys/arch/x68k/x68k/clock.c 2023/12/20 00:40:44	1.35
+++ src/sys/arch/x68k/x68k/clock.c 2024/01/07 07:58:35	1.36

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (c) 1982, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from: Utah $Hdr: clock.c 1.18 91/01/21$
+ *
  *	@(#)clock.c	8.2 (Berkeley) 1/12/94
  */
 #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"
 #if NCLOCK > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timetc.h>
 #include <machine/psl.h>
 #include <machine/cpu.h>
 @@ -120,27 +120,27 @@ clock_attach(device_t parent, device_t s
  * no alternative timer is available.
+ *
  */
 void
 cpu_initclocks(void)
+{
 	static struct	timecounter tc = {
 		.tc_name = "mfp",
 		.tc_frequency = CLOCKS_PER_SEC,
 		.tc_counter_mask = 0xff,
 		.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);
 		hz = 100;
+	}
 	mfp_set_tcdcr(0);		/* stop timers C and D */
 	mfp_set_tcdcr(mfp_get_tcdcr() | 0x70); /* 1/200 delay mode */
 	mfp_set_tcdr(CLOCKS_PER_SEC / hz);
 	mfp_bit_set_ierb(MFP_INTR_TIMER_C);
 	mfp_set_tddr(0);	/* maximum free run -- only 8 bits wide */
 @@ -265,27 +265,27 @@ int
 clockclose(dev_t dev, int flags)
+{
 	(void) clockunmmap(dev, NULL, curproc);	/* XXX */
 	stopclock();
 	clockon = 0;
 	return(0);
+}
 /*ARGSUSED*/
 int
 clockioctl(dev_t dev, u_long cmd, void *data, int flag, struct proc *p)
+{
 	int error = 0;
 	switch (cmd) {
 	case CLOCKMAP:
 		error = clockmmap(dev, (void **)data, p);
 		break;
 	case CLOCKUNMAP:
 		error = clockunmmap(dev, *(void **)data, p);
 		break;
 	case CLOCKGETRES:
 		*(int *)data = CLK_RESOLUTION;
 		break;

--- src/sys/arch/x68k/x68k/disksubr.c 2020/06/18 19:54:08	1.36
+++ src/sys/arch/x68k/x68k/disksubr.c 2024/01/07 07:58:35	1.37

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  */
 #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"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/syslog.h>
 #include <sys/disk.h>
 /* get rid of DEV_BSIZE dependency */
 #define DEF_BSIZE	DEV_BSIZE  /* default sector size = 512 */
 @@ -394,27 +394,27 @@ dodospart:
+			}
 			bp->b_oflags &= ~(BO_DONE);
 			bp->b_flags &= ~(B_READ);
 			bp->b_flags |= B_WRITE;
 			(*strat)(bp);
 			error = biowait(bp);
+		}
+	}
 #ifdef maybe
 	/* disklabel in appropriate location? */
 	if (lp->d_partitions[0].p_offset != 0
 		&& lp->d_partitions[0].p_offset != dospartoff) {
 		error = EXDEV;
 		goto done;
+	}
 #endif
 done:
 	brelse(bp, 0);
 	return (error);
+}
 static void
 parttbl_consistency_check(struct disklabel *lp, struct dos_partition *dp)
+{
 	int i, j;

--- src/sys/arch/x68k/x68k/iodevice.h 2011/05/14 10:19:58	1.18
+++ src/sys/arch/x68k/x68k/iodevice.h 2024/01/07 07:58:35	1.19

 @@ -1,14 +1,14 @@
-/*	$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
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -256,28 +256,28 @@ struct spc {
  * Zilog scc.
  */
 struct zschan {
 	unsigned char	zc_xxx0;
 	unsigned char	zc_csr;		/* control and status, and indirect access */
 	unsigned char	zc_xxx1;
 	unsigned char	zc_data;	/* data */
 };
 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 pad4; unsigned char bstat;	/* external only        : 2 bytes */
-	char pad[6];			  /* ---                  : 6 bytes */
+	char pad[6];			/* ---                  : 6 bytes */
 };
 struct ppi8255 {
 	char pad0; unsigned char porta;
 	char pad1; unsigned char portb;
 	char pad2; unsigned char portc;
 	char pad3; unsigned char ctrl;
 	char pad[0x1ff8];
 };
 struct ioctlr {
 	char pad0; unsigned char intr;
 	char pad1; unsigned char vect;

--- src/sys/arch/x68k/x68k/vectors.s 2014/03/14 20:24:24	1.18
+++ src/sys/arch/x68k/x68k/vectors.s 2024/01/07 07:58:35	1.19

 @@ -1,14 +1,14 @@
-|	$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
 |	The Regents of the University of California.  All rights reserved.
+|
 | Redistribution and use in source and binary forms, with or without
 | modification, are permitted provided that the following conditions
 | are met:
 | 1. Redistributions of source code must retain the above copyright
 |    notice, this list of conditions and the following disclaimer.
 | 2. Redistributions in binary form must reproduce the above copyright
 |    notice, this list of conditions and the following disclaimer in the
 |    documentation and/or other materials provided with the distribution.
 @@ -65,27 +65,27 @@ GLOBAL(vectab)
 	VECTOR(lev5intr)	/* 29: level 5 interrupt autovector */
 	VECTOR(lev6intr)	/* 30: level 6 interrupt autovector */
 	VECTOR(lev7intr)	/* 31: level 7 interrupt autovector */
 	VECTOR(trap0)		/* 32: syscalls */
 #ifdef COMPAT_13
 	VECTOR(trap1)		/* 33: compat_13_sigreturn */
 #else
 	VECTOR(illinst)
 #endif
 	VECTOR(trap2)		/* 34: trace */
 #ifdef COMPAT_16
 	VECTOR(trap3)		/* 35: compat_16_sigreturn */
 #else
 	VECTOR(illinst)
 #endif
 	VECTOR(illinst)		/* 36: TRAP instruction vector */
 	VECTOR(illinst)		/* 37: TRAP instruction vector */
 	VECTOR(illinst)		/* 38: TRAP instruction vector */
 	VECTOR(illinst)		/* 39: TRAP instruction vector */
 	VECTOR(illinst)		/* 40: TRAP instruction vector */
 	VECTOR(illinst)		/* 41: TRAP instruction vector */
 	VECTOR(illinst)		/* 42: TRAP instruction vector */
 	VECTOR(illinst)		/* 43: TRAP instruction vector */
 	VECTOR(trap12)		/* 44: TRAP instruction vector */
 	VECTOR(illinst)		/* 45: TRAP instruction vector */
 	VECTOR(illinst)		/* 46: TRAP instruction vector */
 	VECTOR(trap15)		/* 47: TRAP instruction vector */

--- src/sys/arch/x68k/x68k/kgdb_stub.c 2023/03/28 20:10:01	1.20
+++ src/sys/arch/x68k/x68k/kgdb_stub.c 2024/01/07 07:58:35	1.21

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
 @@ -35,33 +35,33 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kgdb_stub.c	8.4 (Berkeley) 1/12/94
  */
 /*
  * "Stub" to allow remote CPU to debug over a serial line using gdb.
  */
 #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>
 #include <sys/systm.h>
 #include <machine/trap.h>
 #include <machine/cpu.h>
 #include <machine/psl.h>
 #include <machine/reg.h>
 #include <machine/frame.h>
 #include <sys/buf.h>
 #include <dev/cons.h>
 @@ -149,27 +149,27 @@ restart:
 			if (escape)
 				c = FRAME_ESCAPE;
 			break;
 		case TRANS_FRAME_END:
 			if (escape)
 				c = FRAME_END;
 			break;
 		case TRANS_FRAME_START:
 			if (escape)
 				c = FRAME_START;
 			break;
 		case FRAME_START:
 			goto restart;
 		case FRAME_END:
 			if (type < 0 || --len < 0) {
 				csum = len = escape = 0;
 				type = -1;
 				continue;
+			}
 			if (csum != 0) {
 				return (0);
+			}
 			*lenp = len;
 @@ -328,31 +328,32 @@ kgdb_trap(int type, struct frame *frame)
 	int inlen;
 	u_long gdb_regs[NUM_REGS];
 	if ((int)kgdb_dev < 0) {
 		/* not debugging */
 		return (0);
+	}
 	if (kgdb_active == 0) {
 		if (type != T_TRAP15) {
 			/* No debugger active -- let trap handle this. */
 			return (0);
+		}
 		kgdb_getc = 0;
-		for (inlen = 0; constab[inlen].cn_probe; inlen++)
+		for (inlen = 0; constab[inlen].cn_probe; inlen++) {
-		    if (major(constab[inlen].cn_dev) == major(kgdb_dev)) {
+			if (major(constab[inlen].cn_dev) == major(kgdb_dev)) {
-			kgdb_getc = constab[inlen].cn_getc;
+				kgdb_getc = constab[inlen].cn_getc;
-			kgdb_putc = constab[inlen].cn_putc;
+				kgdb_putc = constab[inlen].cn_putc;
-			break;
+				break;
+			}
+		}
 		if (kgdb_getc == 0 || kgdb_putc == 0)
 			return (0);
 		/*
 		 * If the packet that woke us up isn't an exec packet,
 		 * ignore it since there is no active debugger.  Also,
 		 * we check that it's not an ack to be sure that the
 		 * remote side doesn't send back a response after the
 		 * local gdb has exited.  Otherwise, the local host
 		 * could trap into gdb if it's running a gdb kernel too.
 		 */
 		in = GETC;
 		/*
 @@ -433,41 +434,41 @@ kgdb_trap(int type, struct frame *frame)
 				    (in & KGDB_DELTA) == 0) {
 					if (outlen + 5 > SL_MAXDATA) {
 						out |= KGDB_MORE;
 						break;
+					}
 					cp[outlen] = len;
 					kgdb_copy((u_char *)&gdb_regs[len],
 						  &cp[outlen + 1], 4);
 					reg_cache[len] = gdb_regs[len];
 					outlen += 5;
+				}
+			}
 			break;
 		case KGDB_REG_W:
 		case KGDB_REG_W | KGDB_DELTA:
 			cp = inbuffer;
 			for (len = 0; len < inlen; len += 5) {
 				int j = cp[len];
 				kgdb_copy(&cp[len + 1],
 					  (u_char *)&gdb_regs[j], 4);
 				reg_cache[j] = gdb_regs[j];
+			}
 			gdb_to_regs(frame, gdb_regs);
 			outlen = 0;
 			break;
 		case KGDB_MEM_R:
 			len = inbuffer[0];
 			kgdb_copy(&inbuffer[1], (u_char *)&addr, 4);
 			if (len > SL_MAXDATA) {
 				outlen = 1;
 				outbuffer[0] = E2BIG;
 			} else if (!kgdb_acc(addr, len, B_READ)) {
 				outlen = 1;
 				outbuffer[0] = EFAULT;
 			} else {
 				outlen = len + 1;
 				outbuffer[0] = 0;
 				kgdb_copy(addr, &outbuffer[1], len);

--- src/sys/arch/x68k/x68k/trap.c 2023/10/05 19:41:06	1.112
+++ src/sys/arch/x68k/x68k/trap.c 2024/01/07 07:58:35	1.113

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (c) 1982, 1986, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from: Utah $Hdr: trap.c 1.37 92/12/20$
+ *
  *	@(#)trap.c	8.5 (Berkeley) 1/4/94
  */
 #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"
 #include "opt_execfmt.h"
 #include "opt_compat_sunos.h"
 #include "opt_fpu_emulate.h"
 #include "opt_m68k_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/acct.h>
 #include <sys/kernel.h>
 @@ -534,28 +534,28 @@ trap(struct frame *fp, int type, unsigne
 		struct vm_map *map;
 		vm_prot_t ftype;
 		extern struct vm_map *kernel_map;
 		onfault = pcb->pcb_onfault;
 #ifdef DEBUG
 		if ((mmudebug & MDB_WBFOLLOW) || MDB_ISPID(p->p_pid))
 		printf("trap: T_MMUFLT pid=%d, code=%x, v=%x, pc=%x, sr=%x\n",
 		       p->p_pid, code, v, fp->f_pc, fp->f_sr);
 #endif
 		/*
 		 * It is only a kernel address space fault iff:
-		 * 	1. (type & T_USER) == 0  and
+		 *	1. (type & T_USER) == 0  and
-		 * 	2. pcb_onfault not set or
+		 *	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.
 		 */
 		if ((type & T_USER) == 0 && (onfault == NULL || KDFAULT(code)))
 			map = kernel_map;
 		else {
 			map = vm ? &vm->vm_map : kernel_map;
+		}
 		if (WRFAULT(code))
 			ftype = VM_PROT_WRITE;
 		else