CVS commit: src/sys

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Sat Dec  8 17:46:14 UTC 2018

Modified Files:
        src/sys/arch/acorn32/mainbus: com_pioc.c
        src/sys/arch/acorn32/podulebus: amps.c
        src/sys/arch/algor/dev: com_mainbus.c
        src/sys/arch/alpha/jensenio: com_jensenio.c
        src/sys/arch/alpha/sableio: com_sableio.c
        src/sys/arch/amiga/clockport: com_ss.c
        src/sys/arch/amiga/dev: com_supio.c
        src/sys/arch/arc/jazz: com_jazzio.c
        src/sys/arch/arm/broadcom: bcm2835_com.c bcm53xx_cca.c
        src/sys/arch/arm/gemini: gemini_com.c lpc_com.c
        src/sys/arch/arm/nvidia: tegra_com.c
        src/sys/arch/arm/omap: obio_com.c omap_com.c omapl1x_com.c
        src/sys/arch/arm/ti: ti_com.c
        src/sys/arch/arm/xscale: ixp425_com.c pxa2x0_com.c
        src/sys/arch/cobalt/dev: com_mainbus.c
        src/sys/arch/evbarm/adi_brh: com_obio.c
        src/sys/arch/evbarm/hdl_g: com_obio.c
        src/sys/arch/evbarm/iq80310: com_obio.c
        src/sys/arch/evbarm/iq80321: com_obio.c
        src/sys/arch/evbarm/npwr_fc: com_obio.c
        src/sys/arch/evbppc/ev64260: com_obio.c
        src/sys/arch/evbppc/explora/dev: com_elb.c
        src/sys/arch/hp300/dev: com_dio.c com_frodo.c
        src/sys/arch/hpcmips/dev: com_hpcio.c
        src/sys/arch/hpcmips/vr: com_vrip.c
        src/sys/arch/hpcsh/dev/hd64461: hd64461uart.c
        src/sys/arch/hpcsh/dev/hd64465: hd64465uart.c
        src/sys/arch/hppa/dev: com_dino.c com_ssio.c
        src/sys/arch/hppa/gsc: com_gsc.c
        src/sys/arch/i386/pnpbios: com_pnpbios.c
        src/sys/arch/iyonix/iyonix: com_obio.c
        src/sys/arch/macppc/dev: com_mainbus.c
        src/sys/arch/mips/alchemy/dev: com_aubus.c
        src/sys/arch/mips/atheros/dev: com_arbus.c
        src/sys/arch/mips/ingenic: ingenic_com.c
        src/sys/arch/mips/ralink: ralink_com.c
        src/sys/arch/mips/rmi: rmixl_com.c
        src/sys/arch/mmeye/dev: com_mainbus.c
        src/sys/arch/powerpc/booke/dev: pq3duart.c
        src/sys/arch/powerpc/ibm4xx/dev: com_opb.c
        src/sys/arch/rs6000/ioplanar: com_iop.c
        src/sys/arch/sandpoint/sandpoint: com_eumb.c
        src/sys/arch/sgimips/mace: com_mace.c
        src/sys/arch/sparc/dev: com_ebus.c com_obio.c
        src/sys/arch/sparc64/dev: com_ebus.c
        src/sys/arch/x68k/dev: com_intio.c
        src/sys/dev/acpi: com_acpi.c
        src/sys/dev/cardbus: com_cardbus.c
        src/sys/dev/fdt: dw_apb_uart.c
        src/sys/dev/ic: com.c com_cpcbus.c com_upc.c comvar.h
        src/sys/dev/isa: com_isa.c com_multi.c
        src/sys/dev/isapnp: com_isapnp.c
        src/sys/dev/marvell: com_mv.c
        src/sys/dev/mca: com_mca.c
        src/sys/dev/ofisa: com_ofisa.c
        src/sys/dev/pci: com_puc.c
        src/sys/dev/pcmcia: com_pcmcia.c mhzc.c pcmcom.c xirc.c
        src/sys/dev/podulebus: acemidi.c

Log Message:
Clean up initialization of com_regs structure, in preparation for
some additional changers.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/acorn32/mainbus/com_pioc.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/acorn32/podulebus/amps.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/algor/dev/com_mainbus.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/jensenio/com_jensenio.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/sableio/com_sableio.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/clockport/com_ss.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amiga/dev/com_supio.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/jazz/com_jazzio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/broadcom/bcm2835_com.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcm53xx_cca.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_com.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/gemini/lpc_com.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_com.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/omap/obio_com.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omap_com.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/omap/omapl1x_com.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_com.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/xscale/ixp425_com.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/pxa2x0_com.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/cobalt/dev/com_mainbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/adi_brh/com_obio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/hdl_g/com_obio.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/iq80310/com_obio.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/iq80321/com_obio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/npwr_fc/com_obio.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/ev64260/com_obio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/explora/dev/com_elb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp300/dev/com_dio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp300/dev/com_frodo.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcmips/dev/com_hpcio.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hpcmips/vr/com_vrip.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcsh/dev/hd64465/hd64465uart.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/dev/com_dino.c \
    src/sys/arch/hppa/dev/com_ssio.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/gsc/com_gsc.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/pnpbios/com_pnpbios.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/iyonix/iyonix/com_obio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/macppc/dev/com_mainbus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/alchemy/dev/com_aubus.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/atheros/dev/com_arbus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/ingenic/ingenic_com.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/ralink/ralink_com.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/rmi/rmixl_com.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mmeye/dev/com_mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/dev/pq3duart.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/rs6000/ioplanar/com_iop.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sandpoint/sandpoint/com_eumb.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sgimips/mace/com_mace.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc/dev/com_ebus.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sparc/dev/com_obio.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sparc64/dev/com_ebus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/dev/com_intio.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/acpi/com_acpi.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/cardbus/com_cardbus.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/fdt/dw_apb_uart.c
cvs rdiff -u -r1.350 -r1.351 src/sys/dev/ic/com.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/com_cpcbus.c \
    src/sys/dev/ic/com_upc.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/ic/comvar.h
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/isa/com_isa.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/isa/com_multi.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/isapnp/com_isapnp.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/marvell/com_mv.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/mca/com_mca.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ofisa/com_ofisa.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/com_puc.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pcmcia/com_pcmcia.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pcmcia/mhzc.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pcmcia/pcmcom.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pcmcia/xirc.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/podulebus/acemidi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/acorn32/mainbus/com_pioc.c
diff -u src/sys/arch/acorn32/mainbus/com_pioc.c:1.16 src/sys/arch/acorn32/mainbus/com_pioc.c:1.17
--- src/sys/arch/acorn32/mainbus/com_pioc.c:1.16	Tue Jul 19 15:59:53 2011
+++ src/sys/arch/acorn32/mainbus/com_pioc.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_pioc.c,v 1.16 2011/07/19 15:59:53 dyoung Exp $	*/
+/*	$NetBSD: com_pioc.c,v 1.17 2018/12/08 17:46:09 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: com_pioc.c,v 1.16 2011/07/19 15:59:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_pioc.c,v 1.17 2018/12/08 17:46:09 thorpej Exp $");
 
 #include <sys/systm.h>
 #include <sys/tty.h>
@@ -167,7 +167,7 @@ com_pioc_attach(device_t parent, device_
 	if (!com_is_console(iot, iobase, &ioh)
 	    && bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh))
 		panic("comattach: io mapping failed");
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	sc->sc_frequency = COM_FREQ;
 

Index: src/sys/arch/acorn32/podulebus/amps.c
diff -u src/sys/arch/acorn32/podulebus/amps.c:1.20 src/sys/arch/acorn32/podulebus/amps.c:1.21
--- src/sys/arch/acorn32/podulebus/amps.c:1.20	Sat Oct 27 17:17:23 2012
+++ src/sys/arch/acorn32/podulebus/amps.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: amps.c,v 1.20 2012/10/27 17:17:23 chs Exp $	*/
+/*	$NetBSD: amps.c,v 1.21 2018/12/08 17:46:09 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amps.c,v 1.20 2012/10/27 17:17:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amps.c,v 1.21 2018/12/08 17:46:09 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -293,7 +293,7 @@ com_amps_attach(device_t parent, device_
 	if (!com_is_console(iot, iobase, &ioh)
 	    && bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh))
 		panic("comattach: io mapping failed");
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	sc->sc_frequency = AMPS_FREQ;
 	com_attach_subr(sc);

Index: src/sys/arch/algor/dev/com_mainbus.c
diff -u src/sys/arch/algor/dev/com_mainbus.c:1.14 src/sys/arch/algor/dev/com_mainbus.c:1.15
--- src/sys/arch/algor/dev/com_mainbus.c:1.14	Sat Jul  9 16:03:01 2011
+++ src/sys/arch/algor/dev/com_mainbus.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_mainbus.c,v 1.14 2011/07/09 16:03:01 matt Exp $	*/
+/*	$NetBSD: com_mainbus.c,v 1.15 2018/12/08 17:46:09 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.14 2011/07/09 16:03:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.15 2018/12/08 17:46:09 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -94,7 +94,7 @@ com_mainbus_attach(device_t parent, devi
 		aprint_error(": can't map i/o space\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, ma->ma_st, ioh, ma->ma_addr);
+	com_init_regs(&sc->sc_regs, ma->ma_st, ioh, ma->ma_addr);
 	sc->sc_frequency = COM_FREQ;
 
 	com_attach_subr(sc);

Index: src/sys/arch/alpha/jensenio/com_jensenio.c
diff -u src/sys/arch/alpha/jensenio/com_jensenio.c:1.14 src/sys/arch/alpha/jensenio/com_jensenio.c:1.15
--- src/sys/arch/alpha/jensenio/com_jensenio.c:1.14	Fri Mar 21 16:39:29 2014
+++ src/sys/arch/alpha/jensenio/com_jensenio.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: com_jensenio.c,v 1.14 2014/03/21 16:39:29 christos Exp $ */
+/* $NetBSD: com_jensenio.c,v 1.15 2018/12/08 17:46:09 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: com_jensenio.c,v 1.14 2014/03/21 16:39:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_jensenio.c,v 1.15 2018/12/08 17:46:09 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -102,7 +102,7 @@ com_jensenio_attach(device_t parent, dev
 		aprint_error(": can't map i/o space\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, ja->ja_iot, ioh, ja->ja_ioaddr);
+	com_init_regs(&sc->sc_regs, ja->ja_iot, ioh, ja->ja_ioaddr);
 
 	sc->sc_frequency = COM_FREQ;
 

Index: src/sys/arch/alpha/sableio/com_sableio.c
diff -u src/sys/arch/alpha/sableio/com_sableio.c:1.13 src/sys/arch/alpha/sableio/com_sableio.c:1.14
--- src/sys/arch/alpha/sableio/com_sableio.c:1.13	Sat Mar 29 19:28:25 2014
+++ src/sys/arch/alpha/sableio/com_sableio.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: com_sableio.c,v 1.13 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: com_sableio.c,v 1.14 2018/12/08 17:46:09 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: com_sableio.c,v 1.13 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_sableio.c,v 1.14 2018/12/08 17:46:09 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -100,7 +100,7 @@ com_sableio_attach(device_t parent, devi
 		aprint_error(": can't map i/o space\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, sa->sa_iot, ioh, sa->sa_ioaddr);
+	com_init_regs(&sc->sc_regs, sa->sa_iot, ioh, sa->sa_ioaddr);
 
 	sc->sc_frequency = COM_FREQ;
 

Index: src/sys/arch/amiga/clockport/com_ss.c
diff -u src/sys/arch/amiga/clockport/com_ss.c:1.1 src/sys/arch/amiga/clockport/com_ss.c:1.2
--- src/sys/arch/amiga/clockport/com_ss.c:1.1	Tue Apr 17 09:59:03 2012
+++ src/sys/arch/amiga/clockport/com_ss.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/*      $NetBSD: com_ss.c,v 1.1 2012/04/17 09:59:03 rkujawa Exp $ */
+/*      $NetBSD: com_ss.c,v 1.2 2018/12/08 17:46:09 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@ com_ss_attach(device_t parent, device_t 
 
 	bus_space_map(caa->cp_iot, 0, COM_SS_REGS, 0, &ioh);
 
-	COM_INIT_REGS(sc->sc_regs, caa->cp_iot, ioh, 0 /* off */);
+	com_init_regs(&sc->sc_regs, caa->cp_iot, ioh, 0 /* off */);
 
 	com_attach_subr(sc);
 

Index: src/sys/arch/amiga/dev/com_supio.c
diff -u src/sys/arch/amiga/dev/com_supio.c:1.30 src/sys/arch/amiga/dev/com_supio.c:1.31
--- src/sys/arch/amiga/dev/com_supio.c:1.30	Tue Jul 19 15:55:26 2011
+++ src/sys/arch/amiga/dev/com_supio.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_supio.c,v 1.30 2011/07/19 15:55:26 dyoung Exp $ */
+/*	$NetBSD: com_supio.c,v 1.31 2018/12/08 17:46:09 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_supio.c,v 1.30 2011/07/19 15:55:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_supio.c,v 1.31 2018/12/08 17:46:09 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -133,7 +133,7 @@ com_supio_attach(device_t parent, device
 
 	if (bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh))
 		panic("comattach: io mapping failed");
-	COM_INIT_REGS(csc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&csc->sc_regs, iot, ioh, iobase);
 
 	csc->sc_frequency = supa->supio_arg;
 	csc->sc_frequency /= 4;	/* XXX IOBlix firmware sets MCR_PRESCALE? */

Index: src/sys/arch/arc/jazz/com_jazzio.c
diff -u src/sys/arch/arc/jazz/com_jazzio.c:1.12 src/sys/arch/arc/jazz/com_jazzio.c:1.13
--- src/sys/arch/arc/jazz/com_jazzio.c:1.12	Fri Jul  1 19:25:41 2011
+++ src/sys/arch/arc/jazz/com_jazzio.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_jazzio.c,v 1.12 2011/07/01 19:25:41 dyoung Exp $	*/
+/*	$NetBSD: com_jazzio.c,v 1.13 2018/12/08 17:46:09 thorpej Exp $	*/
 /*	$OpenBSD: com_lbus.c,v 1.7 1998/03/16 09:38:41 pefo Exp $	*/
 /*	NetBSD: com_isa.c,v 1.12 1998/08/15 17:47:17 mycroft Exp 	*/
 
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_jazzio.c,v 1.12 2011/07/01 19:25:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_jazzio.c,v 1.13 2018/12/08 17:46:09 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -135,7 +135,7 @@ com_jazzio_attach(device_t parent, devic
 		aprint_error(": can't map i/o space\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 	sc->sc_frequency = com_freq;
 	SET(sc->sc_hwflags, COM_HW_TXFIFO_DISABLE); /* XXX - NEC M403 */
 	jazzio_intr_establish(ja->ja_intr, comintr, sc);

Index: src/sys/arch/arm/broadcom/bcm2835_com.c
diff -u src/sys/arch/arm/broadcom/bcm2835_com.c:1.4 src/sys/arch/arm/broadcom/bcm2835_com.c:1.5
--- src/sys/arch/arm/broadcom/bcm2835_com.c:1.4	Sun Dec 10 21:38:26 2017
+++ src/sys/arch/arm/broadcom/bcm2835_com.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_com.c,v 1.4 2017/12/10 21:38:26 skrll Exp $ */
+/* $NetBSD: bcm2835_com.c,v 1.5 2018/12/08 17:46:09 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_com.c,v 1.4 2017/12/10 21:38:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_com.c,v 1.5 2018/12/08 17:46:09 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -105,7 +105,7 @@ bcm_com_attach(device_t parent, device_t
 
 	sc->sc_frequency *= 2;
 
-	COM_INIT_REGS(sc->sc_regs, bst, bsh, addr);
+	com_init_regs(&sc->sc_regs, bst, bsh, addr);
 
 	com_attach_subr(sc);
 	aprint_naive("\n");

Index: src/sys/arch/arm/broadcom/bcm53xx_cca.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_cca.c:1.1 src/sys/arch/arm/broadcom/bcm53xx_cca.c:1.2
--- src/sys/arch/arm/broadcom/bcm53xx_cca.c:1.1	Sat Sep  1 00:04:44 2012
+++ src/sys/arch/arm/broadcom/bcm53xx_cca.c	Sat Dec  8 17:46:09 2018
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_cca.c,v 1.1 2012/09/01 00:04:44 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_cca.c,v 1.2 2018/12/08 17:46:09 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -288,7 +288,7 @@ com_cca_attach(device_t parent, device_t
 		panic(": can't map registers\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, ccaaa->ccaaa_bst, bsh, addr);
+	com_init_regs(&sc->sc_regs, ccaaa->ccaaa_bst, bsh, addr);
 
 	com_attach_subr(sc);
 }

Index: src/sys/arch/arm/gemini/gemini_com.c
diff -u src/sys/arch/arm/gemini/gemini_com.c:1.3 src/sys/arch/arm/gemini/gemini_com.c:1.4
--- src/sys/arch/arm/gemini/gemini_com.c:1.3	Fri Jul  1 19:32:28 2011
+++ src/sys/arch/arm/gemini/gemini_com.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: gemini_com.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $	*/
+/*	$NetBSD: gemini_com.c,v 1.4 2018/12/08 17:46:09 thorpej Exp $	*/
 
 /* adapted from:
  *	NetBSD: omap_com.c,v 1.2 2008/03/14 15:09:09 cube Exp
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_com.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_com.c,v 1.4 2018/12/08 17:46:09 thorpej Exp $");
 
 #include "opt_com.h"
 
@@ -119,7 +119,7 @@ gemini_com_attach(device_t parent, devic
 		panic(": can't map registers\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	com_attach_subr(sc);
 	aprint_naive("\n");

Index: src/sys/arch/arm/gemini/lpc_com.c
diff -u src/sys/arch/arm/gemini/lpc_com.c:1.4 src/sys/arch/arm/gemini/lpc_com.c:1.5
--- src/sys/arch/arm/gemini/lpc_com.c:1.4	Fri Jul  1 19:32:28 2011
+++ src/sys/arch/arm/gemini/lpc_com.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpc_com.c,v 1.4 2011/07/01 19:32:28 dyoung Exp $	*/
+/*	$NetBSD: lpc_com.c,v 1.5 2018/12/08 17:46:09 thorpej Exp $	*/
 
 /* adapted from:
  *	NetBSD: gemini_com.c,v 1.1 2008/10/24 04:23:18 matt Exp
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpc_com.c,v 1.4 2011/07/01 19:32:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpc_com.c,v 1.5 2018/12/08 17:46:09 thorpej Exp $");
 
 #include "opt_com.h"
 #include "locators.h"
@@ -170,7 +170,7 @@ lpc_com_attach(device_t parent, device_t
 		return;
 	} 
 
-	COM_INIT_REGS(sc->sc_com.sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_com.sc_regs, iot, ioh, iobase);
 
 	com_attach_subr(&sc->sc_com);
 	aprint_naive("\n");

Index: src/sys/arch/arm/nvidia/tegra_com.c
diff -u src/sys/arch/arm/nvidia/tegra_com.c:1.9 src/sys/arch/arm/nvidia/tegra_com.c:1.10
--- src/sys/arch/arm/nvidia/tegra_com.c:1.9	Mon Jul 16 23:11:47 2018
+++ src/sys/arch/arm/nvidia/tegra_com.c	Sat Dec  8 17:46:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_com.c,v 1.9 2018/07/16 23:11:47 christos Exp $ */
+/* $NetBSD: tegra_com.c,v 1.10 2018/12/08 17:46:09 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: tegra_com.c,v 1.9 2018/07/16 23:11:47 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: tegra_com.c,v 1.10 2018/12/08 17:46:09 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -131,7 +131,7 @@ tegra_com_attach(device_t parent, device
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, bst, bsh, addr);
+	com_init_regs(&sc->sc_regs, bst, bsh, addr);
 
 	com_attach_subr(sc);
 	aprint_naive("\n");

Index: src/sys/arch/arm/omap/obio_com.c
diff -u src/sys/arch/arm/omap/obio_com.c:1.7 src/sys/arch/arm/omap/obio_com.c:1.8
--- src/sys/arch/arm/omap/obio_com.c:1.7	Thu Jul  7 15:27:42 2016
+++ src/sys/arch/arm/omap/obio_com.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio_com.c,v 1.7 2016/07/07 15:27:42 kiyohara Exp $	*/
+/*	$NetBSD: obio_com.c,v 1.8 2018/12/08 17:46:10 thorpej Exp $	*/
 
 /*
  * Based on arch/arm/omap/omap_com.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_com.c,v 1.7 2016/07/07 15:27:42 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_com.c,v 1.8 2018/12/08 17:46:10 thorpej Exp $");
 
 #include "opt_omap.h"
 #include "opt_com.h"
@@ -158,7 +158,7 @@ obiouart_attach(device_t parent, device_
 		panic(": can't map registers\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	com_attach_subr(sc);
 	aprint_naive("\n");

Index: src/sys/arch/arm/omap/omap_com.c
diff -u src/sys/arch/arm/omap/omap_com.c:1.4 src/sys/arch/arm/omap/omap_com.c:1.5
--- src/sys/arch/arm/omap/omap_com.c:1.4	Fri Jul  1 20:30:21 2011
+++ src/sys/arch/arm/omap/omap_com.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_com.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $	*/
+/*	$NetBSD: omap_com.c,v 1.5 2018/12/08 17:46:10 thorpej Exp $	*/
 
 /*
  * Based on arch/arm/xscale/pxa2x0_com.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_com.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_com.c,v 1.5 2018/12/08 17:46:10 thorpej Exp $");
 
 #include "opt_com.h"
 
@@ -122,7 +122,7 @@ omapuart_attach(device_t parent, device_
 		panic(": can't map registers\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	com_attach_subr(sc);
 	aprint_naive("\n");

Index: src/sys/arch/arm/omap/omapl1x_com.c
diff -u src/sys/arch/arm/omap/omapl1x_com.c:1.1 src/sys/arch/arm/omap/omapl1x_com.c:1.2
--- src/sys/arch/arm/omap/omapl1x_com.c:1.1	Wed Oct  2 16:48:26 2013
+++ src/sys/arch/arm/omap/omapl1x_com.c	Sat Dec  8 17:46:10 2018
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_com.c,v 1.1 2013/10/02 16:48:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_com.c,v 1.2 2018/12/08 17:46:10 thorpej Exp $");
 
 #include "opt_com.h"
 
@@ -111,7 +111,7 @@ omapl1xcom_attach(device_t parent, devic
 		panic(": can't map registers\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	com_attach_subr(sc);
 	aprint_naive("\n");

Index: src/sys/arch/arm/ti/ti_com.c
diff -u src/sys/arch/arm/ti/ti_com.c:1.3 src/sys/arch/arm/ti/ti_com.c:1.4
--- src/sys/arch/arm/ti/ti_com.c:1.3	Thu Oct 26 23:28:15 2017
+++ src/sys/arch/arm/ti/ti_com.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_com.c,v 1.3 2017/10/26 23:28:15 jmcneill Exp $ */
+/* $NetBSD: ti_com.c,v 1.4 2018/12/08 17:46:10 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.3 2017/10/26 23:28:15 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.4 2018/12/08 17:46:10 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -113,7 +113,7 @@ ti_com_attach(device_t parent, device_t 
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, bst, bsh, addr);
+	com_init_regs(&sc->sc_regs, bst, bsh, addr);
 
 	com_attach_subr(sc);
 	aprint_naive("\n");

Index: src/sys/arch/arm/xscale/ixp425_com.c
diff -u src/sys/arch/arm/xscale/ixp425_com.c:1.18 src/sys/arch/arm/xscale/ixp425_com.c:1.19
--- src/sys/arch/arm/xscale/ixp425_com.c:1.18	Fri Jul  1 20:32:51 2011
+++ src/sys/arch/arm/xscale/ixp425_com.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp425_com.c,v 1.18 2011/07/01 20:32:51 dyoung Exp $	*/
+/*	$NetBSD: ixp425_com.c,v 1.19 2018/12/08 17:46:10 thorpej Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_com.c,v 1.18 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_com.c,v 1.19 2018/12/08 17:46:10 thorpej Exp $");
 
 #include "opt_com.h"
 #ifndef COM_PXA2X0
@@ -112,7 +112,7 @@ ixsipcom_attach(device_t parent, device_
 		aprint_error(": can't map registers\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	com_attach_subr(sc);
 

Index: src/sys/arch/arm/xscale/pxa2x0_com.c
diff -u src/sys/arch/arm/xscale/pxa2x0_com.c:1.13 src/sys/arch/arm/xscale/pxa2x0_com.c:1.14
--- src/sys/arch/arm/xscale/pxa2x0_com.c:1.13	Fri Jul  1 20:32:51 2011
+++ src/sys/arch/arm/xscale/pxa2x0_com.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_com.c,v 1.13 2011/07/01 20:32:51 dyoung Exp $	*/
+/*	$NetBSD: pxa2x0_com.c,v 1.14 2018/12/08 17:46:10 thorpej Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_com.c,v 1.13 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_com.c,v 1.14 2018/12/08 17:46:10 thorpej Exp $");
 
 #include "opt_com.h"
 
@@ -156,7 +156,7 @@ pxauart_attach(device_t parent, device_t
 		aprint_error(": can't map registers\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	switch (pxa->pxa_addr) {
 	case PXA2X0_FFUART_BASE: cken = CKEN_FFUART; break;

Index: src/sys/arch/cobalt/dev/com_mainbus.c
diff -u src/sys/arch/cobalt/dev/com_mainbus.c:1.21 src/sys/arch/cobalt/dev/com_mainbus.c:1.22
--- src/sys/arch/cobalt/dev/com_mainbus.c:1.21	Sat Jan 20 13:56:09 2018
+++ src/sys/arch/cobalt/dev/com_mainbus.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_mainbus.c,v 1.21 2018/01/20 13:56:09 skrll Exp $	*/
+/*	$NetBSD: com_mainbus.c,v 1.22 2018/12/08 17:46:10 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.21 2018/01/20 13:56:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.22 2018/12/08 17:46:10 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -86,7 +86,7 @@ com_mainbus_attach(device_t parent, devi
 		aprint_error(": can't map i/o space\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, maa->ma_iot, ioh, maa->ma_addr);
+	com_init_regs(&sc->sc_regs, maa->ma_iot, ioh, maa->ma_addr);
 
 	sc->sc_frequency = COM_MAINBUS_FREQ;
 

Index: src/sys/arch/evbarm/adi_brh/com_obio.c
diff -u src/sys/arch/evbarm/adi_brh/com_obio.c:1.7 src/sys/arch/evbarm/adi_brh/com_obio.c:1.8
--- src/sys/arch/evbarm/adi_brh/com_obio.c:1.7	Fri Jul  1 20:38:16 2011
+++ src/sys/arch/evbarm/adi_brh/com_obio.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.8 2018/12/08 17:46:10 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.8 2018/12/08 17:46:10 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -86,7 +86,7 @@ com_obio_attach(device_t parent, device_
 		aprint_error(": failed to map registers: %d\n", error);
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
+	com_init_regs(&sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
 
 	com_attach_subr(sc);
 

Index: src/sys/arch/evbarm/hdl_g/com_obio.c
diff -u src/sys/arch/evbarm/hdl_g/com_obio.c:1.5 src/sys/arch/evbarm/hdl_g/com_obio.c:1.6
--- src/sys/arch/evbarm/hdl_g/com_obio.c:1.5	Fri Jul  1 20:39:34 2011
+++ src/sys/arch/evbarm/hdl_g/com_obio.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.5 2011/07/01 20:39:34 dyoung Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.6 2018/12/08 17:46:10 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.5 2011/07/01 20:39:34 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.6 2018/12/08 17:46:10 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,7 +79,7 @@ com_obio_attach(device_t parent, device_
 	sc->sc_frequency = COM_FREQ;
 	sc->sc_hwflags = COM_HW_NO_TXPRELOAD;
 	error = bus_space_map(oba->oba_st, oba->oba_addr, 8, 0, &ioh);
-	COM_INIT_REGS(sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
+	com_init_regs(&sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
 
 	if (error) {
 		aprint_error(": failed to map registers: %d\n", error);

Index: src/sys/arch/evbarm/iq80310/com_obio.c
diff -u src/sys/arch/evbarm/iq80310/com_obio.c:1.14 src/sys/arch/evbarm/iq80310/com_obio.c:1.15
--- src/sys/arch/evbarm/iq80310/com_obio.c:1.14	Fri Jul  1 20:41:16 2011
+++ src/sys/arch/evbarm/iq80310/com_obio.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.15 2018/12/08 17:46:10 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.15 2018/12/08 17:46:10 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -83,7 +83,7 @@ com_obio_attach(device_t parent, device_
 		aprint_error(": failed to map registers: %d\n", error);
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
+	com_init_regs(&sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
 	com_attach_subr(sc);
 
 	osc->sc_ih = iq80310_intr_establish(oba->oba_irq, IPL_SERIAL,

Index: src/sys/arch/evbarm/iq80321/com_obio.c
diff -u src/sys/arch/evbarm/iq80321/com_obio.c:1.13 src/sys/arch/evbarm/iq80321/com_obio.c:1.14
--- src/sys/arch/evbarm/iq80321/com_obio.c:1.13	Fri Jul  1 20:41:16 2011
+++ src/sys/arch/evbarm/iq80321/com_obio.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.14 2018/12/08 17:46:10 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.14 2018/12/08 17:46:10 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -84,7 +84,7 @@ com_obio_attach(device_t parent, device_
 		aprint_error(": failed to map registers: %d\n", error);
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
+	com_init_regs(&sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
 
 	com_attach_subr(sc);
 

Index: src/sys/arch/evbarm/npwr_fc/com_obio.c
diff -u src/sys/arch/evbarm/npwr_fc/com_obio.c:1.5 src/sys/arch/evbarm/npwr_fc/com_obio.c:1.6
--- src/sys/arch/evbarm/npwr_fc/com_obio.c:1.5	Fri Jul  1 20:44:20 2011
+++ src/sys/arch/evbarm/npwr_fc/com_obio.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.5 2011/07/01 20:44:20 dyoung Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.6 2018/12/08 17:46:10 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.5 2011/07/01 20:44:20 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.6 2018/12/08 17:46:10 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,7 +79,7 @@ com_obio_attach(device_t parent, device_
 	sc->sc_frequency = COM_FREQ;
 	sc->sc_hwflags = COM_HW_NO_TXPRELOAD;
 	error = bus_space_map(oba->oba_st, oba->oba_addr, 8, 0, &ioh);
-	COM_INIT_REGS(sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
+	com_init_regs(&sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
 
 	if (error) {
 		aprint_error(": failed to map registers: %d\n", error);

Index: src/sys/arch/evbppc/ev64260/com_obio.c
diff -u src/sys/arch/evbppc/ev64260/com_obio.c:1.11 src/sys/arch/evbppc/ev64260/com_obio.c:1.12
--- src/sys/arch/evbppc/ev64260/com_obio.c:1.11	Fri Jul  1 20:46:39 2011
+++ src/sys/arch/evbppc/ev64260/com_obio.c	Sat Dec  8 17:46:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.11 2011/07/01 20:46:39 dyoung Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.12 2018/12/08 17:46:10 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.11 2011/07/01 20:46:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.12 2018/12/08 17:46:10 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -142,7 +142,7 @@ com_obio_attach(device_t parent, device_
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, oa->oa_memt, ioh, oa->oa_offset);
+	com_init_regs(&sc->sc_regs, oa->oa_memt, ioh, oa->oa_offset);
 	sc->sc_regs.cr_nports = oa->oa_size;
 	com_attach_subr(sc);
 

Index: src/sys/arch/evbppc/explora/dev/com_elb.c
diff -u src/sys/arch/evbppc/explora/dev/com_elb.c:1.9 src/sys/arch/evbppc/explora/dev/com_elb.c:1.10
--- src/sys/arch/evbppc/explora/dev/com_elb.c:1.9	Fri Jul  1 19:02:32 2011
+++ src/sys/arch/evbppc/explora/dev/com_elb.c	Sat Dec  8 17:46:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $	*/
+/*	$NetBSD: com_elb.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -80,7 +80,7 @@ com_elb_attach(device_t parent, device_t
 	bus_space_map(eaa->elb_bt,
 	    _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base),
 	    COM_NPORTS, 0, &ioh);
-	COM_INIT_REGS(sc->sc_regs, eaa->elb_bt, ioh,
+	com_init_regs(&sc->sc_regs, eaa->elb_bt, ioh,
 	    _BUS_SPACE_UNSTRIDE(eaa->elb_bt, eaa->elb_base));
 
 	sc->sc_frequency = COM_FREQ;

Index: src/sys/arch/hp300/dev/com_dio.c
diff -u src/sys/arch/hp300/dev/com_dio.c:1.8 src/sys/arch/hp300/dev/com_dio.c:1.9
--- src/sys/arch/hp300/dev/com_dio.c:1.8	Mon Apr 28 20:23:19 2008
+++ src/sys/arch/hp300/dev/com_dio.c	Sat Dec  8 17:46:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_dio.c,v 1.8 2008/04/28 20:23:19 martin Exp $	*/
+/*	$NetBSD: com_dio.c,v 1.9 2018/12/08 17:46:11 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_dio.c,v 1.8 2008/04/28 20:23:19 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_dio.c,v 1.9 2018/12/08 17:46:11 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -149,7 +149,7 @@ com_dio_attach(device_t parent, device_t
 		DELAY(1000);
 	}
 
-	COM_INIT_REGS(sc->sc_regs, iot, iohcom,
+	com_init_regs(&sc->sc_regs, iot, iohcom,
 	    da->da_addr + DCA_COM_OFFSET);
 
 	sc->sc_frequency = COM_DIO_FREQ;

Index: src/sys/arch/hp300/dev/com_frodo.c
diff -u src/sys/arch/hp300/dev/com_frodo.c:1.9 src/sys/arch/hp300/dev/com_frodo.c:1.10
--- src/sys/arch/hp300/dev/com_frodo.c:1.9	Sun Apr 20 04:12:54 2014
+++ src/sys/arch/hp300/dev/com_frodo.c	Sat Dec  8 17:46:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_frodo.c,v 1.9 2014/04/20 04:12:54 tsutsui Exp $	*/
+/*	$NetBSD: com_frodo.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_frodo.c,v 1.9 2014/04/20 04:12:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_frodo.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $");
 
 #include "sti_sgc.h"
 
@@ -142,7 +142,7 @@ com_frodo_attach(device_t parent, device
 		aprint_error(": can't map i/o space\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, fa->fa_base + fa->fa_offset);
+	com_init_regs(&sc->sc_regs, iot, ioh, fa->fa_base + fa->fa_offset);
 
 	sc->sc_frequency = COM_FRODO_FREQ;
 	SET(sc->sc_hwflags, COM_HW_NOIEN);

Index: src/sys/arch/hpcmips/dev/com_hpcio.c
diff -u src/sys/arch/hpcmips/dev/com_hpcio.c:1.11 src/sys/arch/hpcmips/dev/com_hpcio.c:1.12
--- src/sys/arch/hpcmips/dev/com_hpcio.c:1.11	Fri Mar 14 15:09:10 2008
+++ src/sys/arch/hpcmips/dev/com_hpcio.c	Sat Dec  8 17:46:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_hpcio.c,v 1.11 2008/03/14 15:09:10 cube Exp $	*/
+/*	$NetBSD: com_hpcio.c,v 1.12 2018/12/08 17:46:11 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 TAKEMRUA Shin. All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_hpcio.c,v 1.11 2008/03/14 15:09:10 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_hpcio.c,v 1.12 2018/12/08 17:46:11 thorpej Exp $");
 
 #include "opt_kgdb.h"
 
@@ -327,7 +327,7 @@ com_hpcio_attach(device_t parent, device
 		aprint_error(": can't map bus space\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, addr);
+	com_init_regs(&sc->sc_regs, iot, ioh, addr);
 
 	sc->enable = NULL;
 	sc->disable = NULL;

Index: src/sys/arch/hpcmips/vr/com_vrip.c
diff -u src/sys/arch/hpcmips/vr/com_vrip.c:1.22 src/sys/arch/hpcmips/vr/com_vrip.c:1.23
--- src/sys/arch/hpcmips/vr/com_vrip.c:1.22	Sat Oct 27 17:17:55 2012
+++ src/sys/arch/hpcmips/vr/com_vrip.c	Sat Dec  8 17:46:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_vrip.c,v 1.22 2012/10/27 17:17:55 chs Exp $	*/
+/*	$NetBSD: com_vrip.c,v 1.23 2018/12/08 17:46:11 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999 SASAKI Takesi. All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_vrip.c,v 1.22 2012/10/27 17:17:55 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_vrip.c,v 1.23 2018/12/08 17:46:11 thorpej Exp $");
 
 #include "opt_kgdb.h"
 
@@ -181,7 +181,7 @@ com_vrip_attach(device_t parent, device_
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, va->va_addr);
+	com_init_regs(&sc->sc_regs, iot, ioh, va->va_addr);
 
 	sc->enable = NULL; /* XXX: CMU control */
 	sc->disable = NULL;

Index: src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c
diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c:1.28 src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c:1.29
--- src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c:1.28	Tue Jul 19 15:30:52 2011
+++ src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c	Sat Dec  8 17:46:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64461uart.c,v 1.28 2011/07/19 15:30:52 dyoung Exp $	*/
+/*	$NetBSD: hd64461uart.c,v 1.29 2018/12/08 17:46:11 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461uart.c,v 1.28 2011/07/19 15:30:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461uart.c,v 1.29 2018/12/08 17:46:11 thorpej Exp $");
 
 #include "opt_kgdb.h"
 
@@ -59,18 +59,6 @@ __KERNEL_RCSID(0, "$NetBSD: hd64461uart.
 #include <hpcsh/dev/hd64461/hd64461uartvar.h>
 #include <hpcsh/dev/hd64461/hd64461uartreg.h>
 
-#define	HD64461UART_INIT_REGS(regs, tag, hdl, addr)			\
-	do {								\
-		int i;							\
-									\
-		regs.cr_iot = tag;					\
-		regs.cr_ioh = hdl;					\
-		regs.cr_iobase = addr;					\
-		regs.cr_nports = COM_NPORTS;				\
-		for (i = 0; i < __arraycount(regs.cr_map); i++)		\
-			regs.cr_map[i] = com_std_map[i] << 1;		\
-	} while (0)
-
 STATIC struct hd64461uart_chip {
 	struct hpcsh_bus_space __tag_body;
 	bus_space_tag_t io_tag;
@@ -101,6 +89,17 @@ STATIC void hd64461uart_init(void);
 #define COMCN_SPEED	19200
 #endif
 
+static void
+hd64461uart_init_regs(struct com_regs *regs, bus_space_tag_t tag,
+		      bus_space_handle_t hdl, bus_addr_t addr)
+{
+
+	com_init_regs(regs, tag, hdl, addr);
+	for (size_t i = 0; i < __arraycount(regs->cr_map); i++)
+		regs->cr_map[i] = regs->cr_map[i] << 1;
+	regs->cr_nports <<= 1;
+}
+
 void
 hd64461uartcnprobe(struct consdev *cp)
 {
@@ -122,7 +121,7 @@ hd64461uartcninit(struct consdev *cp)
 
 	hd64461uart_init();
 
-	HD64461UART_INIT_REGS(regs, hd64461uart_chip.io_tag, 0x0, 0x0);
+	hd64461uart_init_regs(&regs, hd64461uart_chip.io_tag, 0x0, 0x0);
 	comcnattach1(&regs, COMCN_SPEED, COM_FREQ, COM_TYPE_NORMAL, CONMODE);
 
 	hd64461uart_chip.console = 1;
@@ -145,7 +144,7 @@ hd64461uart_kgdb_init(void)
 
 	hd64461uart_init();
 
-	HD64461UART_INIT_REGS(regs, hd64461uart_chip.io_tag, NULL, 0x0);
+	hd64461uart_init_regs(&regs, hd64461uart_chip.io_tag, NULL, 0x0);
 	if (com_kgdb_attach1(&regs,
 	    kgdb_rate, COM_FREQ, COM_TYPE_NORMAL, CONMODE) != 0) {
 		printf("%s: KGDB console open failed.\n", __func__);
@@ -185,7 +184,7 @@ hd64461uart_attach(device_t parent, devi
 
 	bus_space_map(sc->sc_chip->io_tag, 0x0, 8, 0, &ioh);
 	csc->sc_frequency = COM_FREQ;
-	HD64461UART_INIT_REGS(csc->sc_regs, sc->sc_chip->io_tag, ioh, 0x0);
+	hd64461uart_init_regs(&csc->sc_regs, sc->sc_chip->io_tag, ioh, 0x0);
 
 	/* switch port to UART */
 

Index: src/sys/arch/hpcsh/dev/hd64465/hd64465uart.c
diff -u src/sys/arch/hpcsh/dev/hd64465/hd64465uart.c:1.19 src/sys/arch/hpcsh/dev/hd64465/hd64465uart.c:1.20
--- src/sys/arch/hpcsh/dev/hd64465/hd64465uart.c:1.19	Sun Feb 12 16:34:08 2012
+++ src/sys/arch/hpcsh/dev/hd64465/hd64465uart.c	Sat Dec  8 17:46:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64465uart.c,v 1.19 2012/02/12 16:34:08 matt Exp $	*/
+/*	$NetBSD: hd64465uart.c,v 1.20 2018/12/08 17:46:11 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64465uart.c,v 1.19 2012/02/12 16:34:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64465uart.c,v 1.20 2018/12/08 17:46:11 thorpej Exp $");
 
 #include "opt_kgdb.h"
 
@@ -163,7 +163,7 @@ hd64465uart_attach(device_t parent, devi
 		hd64465uart_init();
 
 	bus_space_map(sc->sc_chip->io_tag, 0, 8, 0, &ioh);
-	COM_INIT_REGS(csc->sc_regs, sc->sc_chip->io_tag, ioh, 0);
+	com_init_regs(&csc->sc_regs, sc->sc_chip->io_tag, ioh, 0);
 	csc->sc_frequency = COM_FREQ;
 
 	/* supply clock XXX notyet */

Index: src/sys/arch/hppa/dev/com_dino.c
diff -u src/sys/arch/hppa/dev/com_dino.c:1.1 src/sys/arch/hppa/dev/com_dino.c:1.2
--- src/sys/arch/hppa/dev/com_dino.c:1.1	Mon Feb 24 07:23:42 2014
+++ src/sys/arch/hppa/dev/com_dino.c	Sat Dec  8 17:46:11 2018
@@ -131,7 +131,7 @@ com_dino_attach(device_t parent, device_
 		aprint_error(": can't map I/O space\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, ca->ca_iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, ca->ca_iot, ioh, iobase);
 
 	/* select clock freq */
 	regs->test = COM_DINO_CLK_SEL;
Index: src/sys/arch/hppa/dev/com_ssio.c
diff -u src/sys/arch/hppa/dev/com_ssio.c:1.1 src/sys/arch/hppa/dev/com_ssio.c:1.2
--- src/sys/arch/hppa/dev/com_ssio.c:1.1	Mon Feb 24 07:23:42 2014
+++ src/sys/arch/hppa/dev/com_ssio.c	Sat Dec  8 17:46:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_ssio.c,v 1.1 2014/02/24 07:23:42 skrll Exp $	*/
+/*	$NetBSD: com_ssio.c,v 1.2 2018/12/08 17:46:11 thorpej Exp $	*/
 
 /*	$OpenBSD: com_ssio.c,v 1.2 2007/06/24 16:28:39 kettenis Exp $	*/
 
@@ -101,7 +101,7 @@ com_ssio_attach(device_t parent, device_
 	hppa_pagezero_unmap(pagezero_cookie);
 
 	sc->sc_frequency = COM_SSIO_FREQ;
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 	com_attach_subr(sc);
 
 	sc_ssio->sc_ih = ssio_intr_establish(IPL_TTY, saa->saa_irq,

Index: src/sys/arch/hppa/gsc/com_gsc.c
diff -u src/sys/arch/hppa/gsc/com_gsc.c:1.1 src/sys/arch/hppa/gsc/com_gsc.c:1.2
--- src/sys/arch/hppa/gsc/com_gsc.c:1.1	Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/gsc/com_gsc.c	Sat Dec  8 17:46:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $	*/
+/*	$NetBSD: com_gsc.c,v 1.2 2018/12/08 17:46:11 thorpej Exp $	*/
 
 /*	$OpenBSD: com_gsc.c,v 1.8 2000/03/13 14:39:59 mickey Exp $	*/
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.2 2018/12/08 17:46:11 thorpej Exp $");
 
 #include "opt_kgdb.h"
 
@@ -135,7 +135,7 @@ com_gsc_attach(device_t parent, device_t
 		aprint_error(": can't map I/O space\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	com_attach_subr(sc);
 	gsc->sc_ih = hppa_intr_establish(IPL_TTY, comintr, sc, ga->ga_ir,

Index: src/sys/arch/i386/pnpbios/com_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/com_pnpbios.c:1.15 src/sys/arch/i386/pnpbios/com_pnpbios.c:1.16
--- src/sys/arch/i386/pnpbios/com_pnpbios.c:1.15	Fri Jul  1 18:14:15 2011
+++ src/sys/arch/i386/pnpbios/com_pnpbios.c	Sat Dec  8 17:46:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: com_pnpbios.c,v 1.15 2011/07/01 18:14:15 dyoung Exp $ */
+/* $NetBSD: com_pnpbios.c,v 1.16 2018/12/08 17:46:11 thorpej Exp $ */
 /*
  * Copyright (c) 1999
  * 	Matthias Drochner.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_pnpbios.c,v 1.15 2011/07/01 18:14:15 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_pnpbios.c,v 1.16 2018/12/08 17:46:11 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -94,7 +94,7 @@ com_pnpbios_attach(device_t parent, devi
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	aprint_normal("\n");
 	pnpbios_print_devres(self, aa);

Index: src/sys/arch/iyonix/iyonix/com_obio.c
diff -u src/sys/arch/iyonix/iyonix/com_obio.c:1.6 src/sys/arch/iyonix/iyonix/com_obio.c:1.7
--- src/sys/arch/iyonix/iyonix/com_obio.c:1.6	Fri Jul  1 20:48:22 2011
+++ src/sys/arch/iyonix/iyonix/com_obio.c	Sat Dec  8 17:46:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.6 2011/07/01 20:48:22 dyoung Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.7 2018/12/08 17:46:11 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.6 2011/07/01 20:48:22 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.7 2018/12/08 17:46:11 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,7 +78,7 @@ com_obio_attach(device_t parent, device_
 	sc->sc_frequency = COM_FREQ;
 	sc->sc_hwflags = COM_HW_NO_TXPRELOAD;
 	error = bus_space_map(oba->oba_st, oba->oba_addr, 8, 0, &ioh);
-	COM_INIT_REGS(sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
+	com_init_regs(&sc->sc_regs, oba->oba_st, ioh, oba->oba_addr);
 
 	if (error) {
 		aprint_error(": failed to map registers: %d\n", error);

Index: src/sys/arch/macppc/dev/com_mainbus.c
diff -u src/sys/arch/macppc/dev/com_mainbus.c:1.5 src/sys/arch/macppc/dev/com_mainbus.c:1.6
--- src/sys/arch/macppc/dev/com_mainbus.c:1.5	Sat Oct 27 17:18:00 2012
+++ src/sys/arch/macppc/dev/com_mainbus.c	Sat Dec  8 17:46:11 2018
@@ -83,7 +83,7 @@ com_mainbus_attach(device_t parent, devi
 {
     struct com_mainbus_softc *msc = device_private(self);
     struct com_softc *sc = &msc->sc_com;
-    int serial, interrupt_length;
+    int serial;
     int interrupts[8];
     bus_space_tag_t iot;
     bus_space_handle_t ioh;
@@ -93,8 +93,7 @@ com_mainbus_attach(device_t parent, devi
 
     serial = OF_finddevice("/ht@0/isa@4/serial@0x3f8");
     if (serial != -1) {
-        interrupt_length =
-            OF_getprop(serial, "interrupts", interrupts, sizeof(interrupts));
+        (void)OF_getprop(serial, "interrupts", interrupts, sizeof(interrupts));
     }
 
 
@@ -102,7 +101,7 @@ com_mainbus_attach(device_t parent, devi
     iobase = 0x3f8;
     comcnattach(iot, iobase, 9600, 1843200, COM_TYPE_NORMAL, (CREAD | CS8));
     bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh);
-    COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+    com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
     sc->sc_frequency = 1843200;
 

Index: src/sys/arch/mips/alchemy/dev/com_aubus.c
diff -u src/sys/arch/mips/alchemy/dev/com_aubus.c:1.6 src/sys/arch/mips/alchemy/dev/com_aubus.c:1.7
--- src/sys/arch/mips/alchemy/dev/com_aubus.c:1.6	Fri Jul  1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/dev/com_aubus.c	Sat Dec  8 17:46:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: com_aubus.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: com_aubus.c,v 1.7 2018/12/08 17:46:12 thorpej Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_aubus.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_aubus.c,v 1.7 2018/12/08 17:46:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -62,7 +62,8 @@ static int	com_aubus_probe(device_t, cfd
 static void	com_aubus_attach(device_t, device_t, void *);
 static int	com_aubus_enable(struct com_softc *);
 static void	com_aubus_disable(struct com_softc *);
-static void	com_aubus_initmap(struct com_regs *);
+static void	com_aubus_init_regs(struct com_regs *, bus_space_tag_t,
+				    bus_space_handle_t, bus_addr_t);
 
 CFATTACH_DECL_NEW(com_aubus, sizeof(struct com_aubus_softc),
     com_aubus_probe, com_aubus_attach, NULL, NULL);
@@ -91,20 +92,20 @@ com_aubus_attach(device_t parent, device
 	struct com_aubus_softc *asc = device_private(self);
 	struct com_softc *sc = &asc->sc_com;
 	struct aubus_attach_args *aa = aux;
+	bus_space_handle_t bsh;
 	int addr = aa->aa_addr;
 
 	sc->sc_dev = self;
-	sc->sc_regs.cr_iot = aa->aa_st;
-	sc->sc_regs.cr_iobase = addr;
 	asc->sc_irq = aa->aa_irq[0];
 
-	if (com_is_console(aa->aa_st, addr, &sc->sc_regs.cr_ioh) == 0 &&
+	if (com_is_console(aa->aa_st, addr, &bsh) == 0 &&
 	    bus_space_map(aa->aa_st, addr, AUCOM_NPORTS, 0,
 		&sc->sc_regs.cr_ioh) != 0) {
 		aprint_error(": can't map i/o space\n");
 		return;
 	}
-	com_aubus_initmap(&sc->sc_regs);
+
+	com_aubus_init_regs(&sc->sc_regs, aa->aa_st, bsh, addr);
 
 	/*
 	 * The input to the clock divider is the internal pbus clock (1/4 the
@@ -176,8 +177,12 @@ com_aubus_disable(struct com_softc *sc)
 }
 
 void
-com_aubus_initmap(struct com_regs *regsp)
+com_aubus_init_regs(struct com_regs *regsp, bus_space_tag_t bst,
+		    bus_space_handle_t bsh, bus_addr_t addr)
 {
+
+	com_init_regs(regsp, bst, bsh, addr);
+
 	regsp->cr_nports = AUCOM_NPORTS;
 	regsp->cr_map[COM_REG_RXDATA] = AUCOM_RXDATA;
 	regsp->cr_map[COM_REG_TXDATA] = AUCOM_TXDATA;
@@ -199,10 +204,8 @@ com_aubus_cnattach(bus_addr_t addr, int 
 	struct com_regs		regs;
 	uint32_t		sysfreq;
 
-	regs.cr_iot = aubus_st;
-	regs.cr_iobase = addr;
-	regs.cr_nports = AUCOM_NPORTS;
-	com_aubus_initmap(&regs);
+	com_aubus_init_regs(&regs, aubus_st, (bus_space_handle_t)0/*XXX*/,
+			    addr);
 
 	sysfreq = curcpu()->ci_cpu_freq / 4;
 

Index: src/sys/arch/mips/atheros/dev/com_arbus.c
diff -u src/sys/arch/mips/atheros/dev/com_arbus.c:1.12 src/sys/arch/mips/atheros/dev/com_arbus.c:1.13
--- src/sys/arch/mips/atheros/dev/com_arbus.c:1.12	Sun Feb 23 20:56:29 2014
+++ src/sys/arch/mips/atheros/dev/com_arbus.c	Sat Dec  8 17:46:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: com_arbus.c,v 1.12 2014/02/23 20:56:29 martin Exp $ */
+/* $NetBSD: com_arbus.c,v 1.13 2018/12/08 17:46:12 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_arbus.c,v 1.12 2014/02/23 20:56:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_arbus.c,v 1.13 2018/12/08 17:46:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -126,7 +126,8 @@ struct com_arbus_softc {
 	struct com_softc sc_com;
 };
 
-static void com_arbus_initmap(struct com_regs *);
+static void com_arbus_init_regs(struct com_regs *, bus_space_tag_t,
+				bus_space_handle_t, bus_addr_t, bus_size_t);
 //static bus_space_tag_t com_arbus_get_bus_space_tag(void);
 static int com_arbus_match(device_t, cfdata_t , void *);
 static void com_arbus_attach(device_t, device_t, void *);
@@ -158,6 +159,7 @@ int
 com_arbus_match(device_t parent, cfdata_t cf, void *aux)
 {
 	struct arbus_attach_args	*aa = aux;
+	bus_space_handle_t		bsh;
 	struct com_regs			regs;
 	int				rv;
 
@@ -168,17 +170,14 @@ com_arbus_match(device_t parent, cfdata_
 		return 1;
 
 	if (bus_space_map(aa->aa_bst, aa->aa_addr, aa->aa_size,
-		0, &regs.cr_ioh))
+		0, &bsh))
 		return 0;
 
-	regs.cr_iot = aa->aa_bst;
-	regs.cr_iobase = aa->aa_addr;
-	regs.cr_nports = aa->aa_size;
-	com_arbus_initmap(&regs);
+	com_arbus_init_regs(&regs, aa->aa_bst, bsh, aa->aa_addr, aa->aa_size);
 
 	rv = com_probe_subr(&regs);
 
-	bus_space_unmap(aa->aa_bst, regs.cr_ioh, aa->aa_size);
+	bus_space_unmap(aa->aa_bst, bsh, aa->aa_size);
 
 	return rv;
 }
@@ -211,17 +210,17 @@ com_arbus_attach(device_t parent, device
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, aa->aa_bst, ioh, aa->aa_addr);
-	sc->sc_regs.cr_nports = aa->aa_size;
-	com_arbus_initmap(&sc->sc_regs);
+	com_arbus_init_regs(&sc->sc_regs, aa->aa_bst, ioh, aa->aa_addr,
+			    aa->aa_size);
 
 	com_attach_subr(sc);
 
 	arbus_intr_establish(aa->aa_cirq, aa->aa_mirq, comintr, sc);
 }
 
-void
-com_arbus_initmap(struct com_regs *regsp)
+static void
+com_arbus_init_regs(struct com_regs *regsp, bus_space_tag_t st,
+		    bus_space_handle_t sh, bus_addr_t addr, bus_size_t size)
 {
 #if _BYTE_ORDER == _BIG_ENDIAN
 	int off = 3;
@@ -229,26 +228,29 @@ com_arbus_initmap(struct com_regs *regsp
 	int off = 0;
 #endif
 
+	com_init_regs(regsp, st, sh, addr);
+
 	/* rewrite the map to shift for alignment */
 	for (size_t i = 0; i < __arraycount(regsp->cr_map); i++) {
-		regsp->cr_map[i] = (com_std_map[i] * 4) + off;
+		regsp->cr_map[i] = (regsp->cr_map[i] * 4) + off;
 	}
+	regsp->cr_nports = size;
 }
 
 void
 com_arbus_cnattach(bus_addr_t addr, uint32_t freq)
 {
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
 	struct com_regs		regs;
 
-	regs.cr_iot = arbus_get_bus_space_tag();
-	regs.cr_iobase = addr;
-	regs.cr_nports = 0x1000;
-	com_arbus_initmap(&regs);
+	bst = arbus_get_bus_space_tag();
 
-	if (bus_space_map(regs.cr_iot, regs.cr_iobase, regs.cr_nports, 0,
-		&regs.cr_ioh))
+	if (bus_space_map(bst, addr, 0x1000, 0, &bsh))
 		return;
 
+	com_arbus_init_regs(&regs, bst, bsh, addr, 0x1000);
+
 	comcnattach1(&regs, com_arbus_baud, freq, COM_TYPE_NORMAL, CONMODE);
 }
 

Index: src/sys/arch/mips/ingenic/ingenic_com.c
diff -u src/sys/arch/mips/ingenic/ingenic_com.c:1.6 src/sys/arch/mips/ingenic/ingenic_com.c:1.7
--- src/sys/arch/mips/ingenic/ingenic_com.c:1.6	Fri May 19 07:43:31 2017
+++ src/sys/arch/mips/ingenic/ingenic_com.c	Sat Dec  8 17:46:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ingenic_com.c,v 1.6 2017/05/19 07:43:31 skrll Exp $ */
+/*	$NetBSD: ingenic_com.c,v 1.7 2018/12/08 17:46:12 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2014 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_com.c,v 1.6 2017/05/19 07:43:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_com.c,v 1.7 2018/12/08 17:46:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -64,7 +64,6 @@ void	ingenic_putchar(char);
 # define CONMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8)
 #endif
 
-
 void		ingenic_com_cnattach(void);
 
 static int	ingenic_com_match(device_t, cfdata_t , void *);
@@ -81,9 +80,21 @@ CFATTACH_DECL_NEW(ingenic_com, sizeof(st
 
 static bus_space_handle_t regh = 0;
 static bus_addr_t cons_com = 0;
-static struct com_regs regs;
+static struct com_regs cons_regs;
 extern bus_space_tag_t apbus_memt;
 
+static void
+ingenic_com_init_regs(struct com_regs *regs, bus_space_tag_t st,
+		      bus_space_handle_t sh, bus_addr_t addr)
+{
+
+	com_init_regs(regs, st, sh, addr);
+	for (size_t i = 0; i < __arraycount(regs->cr_map); i++) {
+		regs->cr_map[i] = regs->cr_map[i] << 2;
+	}
+	regs->cr_nports <<= 2;
+}
+
 void
 ingenic_putchar_init(void)
 {
@@ -148,18 +159,12 @@ ingenic_puts(const char *restrict s)
 void
 ingenic_com_cnattach(void)
 {
-	int i;
 
 	bus_space_map(apbus_memt, JZ_UART0, 0x100, 0, &regh);
 	cons_com = JZ_UART0;
-	memset(&regs, 0, sizeof(regs));
-	COM_INIT_REGS(regs, apbus_memt, regh, JZ_UART0);
-	for (i = 0; i < 16; i++) {
-		regs.cr_map[i] = regs.cr_map[i] << 2;
-	}
-	regs.cr_nports = 32;
+	ingenic_com_init_regs(&cons_regs, apbus_memt, regh, JZ_UART0);
 
-	comcnattach1(&regs, 115200, 48000000, COM_TYPE_INGENIC, CONMODE);
+	comcnattach1(&cons_regs, 115200, 48000000, COM_TYPE_INGENIC, CONMODE);
 }
 
 static int
@@ -179,7 +184,6 @@ ingenic_com_attach(device_t parent, devi
 	struct ingenic_com_softc *isc = device_private(self);
 	struct com_softc *sc = &isc->sc_com;
 	struct apbus_attach_args *aa = args;
-	int i;
 
 	sc->sc_dev = self;
 	sc->sc_frequency = 48000000;
@@ -191,11 +195,8 @@ ingenic_com_attach(device_t parent, devi
 	} else {
 		bus_space_map(apbus_memt, aa->aa_addr, 0x1000, 0, &isc->sc_regh);
 	}
-	memset(&sc->sc_regs, 0, sizeof(sc->sc_regs));
-	COM_INIT_REGS(sc->sc_regs, aa->aa_bst, isc->sc_regh, aa->aa_addr);
-	for (i = 0; i < 16; i++)
-		sc->sc_regs.cr_map[i] = sc->sc_regs.cr_map[i] << 2;
-	sc->sc_regs.cr_nports = 32;
+	ingenic_com_init_regs(&sc->sc_regs, aa->aa_bst, isc->sc_regh,
+			      aa->aa_addr);
 
 	com_attach_subr(sc);
 	evbmips_intr_establish(aa->aa_irq, comintr, sc);

Index: src/sys/arch/mips/ralink/ralink_com.c
diff -u src/sys/arch/mips/ralink/ralink_com.c:1.5 src/sys/arch/mips/ralink/ralink_com.c:1.6
--- src/sys/arch/mips/ralink/ralink_com.c:1.5	Wed Oct  5 15:54:58 2016
+++ src/sys/arch/mips/ralink/ralink_com.c	Sat Dec  8 17:46:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ralink_com.c,v 1.5 2016/10/05 15:54:58 ryo Exp $	*/
+/*	$NetBSD: ralink_com.c,v 1.6 2018/12/08 17:46:12 thorpej Exp $	*/
 /*-
  * Copyright (c) 2011 CradlePoint Technology, Inc.
  * All rights reserved.
@@ -130,7 +130,7 @@
 /* ralink_com.c -- Ralink 3052 uart console driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_com.c,v 1.5 2016/10/05 15:54:58 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_com.c,v 1.6 2018/12/08 17:46:12 thorpej Exp $");
 
 #include "locators.h"
 #include <sys/param.h>
@@ -162,7 +162,8 @@ struct ralink_com_softc {
 
 static int ralink_com_match(device_t, cfdata_t , void *);
 static void ralink_com_attach(device_t, device_t, void *);
-static void ralink_com_initmap(struct com_regs *regsp);
+static void ralink_com_init_regs(struct com_regs *regsp, bus_space_tag_t,
+				 bus_space_handle_t, bus_addr_t);
 
 CFATTACH_DECL_NEW(ralink_com, sizeof(struct ralink_com_softc),
 	ralink_com_match, ralink_com_attach, NULL, NULL);
@@ -341,7 +342,6 @@ ralink_com_attach(device_t parent, devic
 
 	sc->sc_dev = self;
 	sc->sc_frequency = RA_UART_FREQ;
-	sc->sc_regs.cr_nports = 32;
 #if defined(MT7628)
 	sc->sc_type = COM_TYPE_NORMAL;
 #else
@@ -367,16 +367,19 @@ ralink_com_attach(device_t parent, devic
 		sysctl_write(RA_SYSCTL_GPIOMODE, r);
 	}
 
-	COM_INIT_REGS(sc->sc_regs, ma->ma_memt, ioh, rtsc->sc_addr);
-	ralink_com_initmap(&sc->sc_regs);
+	ralink_com_init_regs(&sc->sc_regs, ma->ma_memt, ioh, rtsc->sc_addr);
 
 	rtsc->sc_ih = ra_intr_establish(rtsc->sc_irq, comintr, sc, 1);
 	com_attach_subr(sc);
 }
 
 static void
-ralink_com_initmap(struct com_regs *regsp)
+ralink_com_init_regs(struct com_regs *regsp, bus_space_tag_t st,
+		     bus_space_handle_t sh, bus_addr_t addr)
 {
+
+	com_init_regs(regsp, st, sh, addr);
+
 	regsp->cr_map[COM_REG_RXDATA] = RA_UART_RBR;
 	regsp->cr_map[COM_REG_TXDATA] = RA_UART_TBR;
 	regsp->cr_map[COM_REG_DLBL]   = RA_UART_DLL;
@@ -390,12 +393,15 @@ ralink_com_initmap(struct com_regs *regs
 	regsp->cr_map[COM_REG_MCR]    = RA_UART_MCR;
 	regsp->cr_map[COM_REG_LSR]    = RA_UART_LSR;
 	regsp->cr_map[COM_REG_MSR]    = RA_UART_MSR;
+
+	regsp->cr_nports = 32;
 }
 
 void
 ralink_com_early(int silent)
 {
 	struct com_regs regs;
+	bus_space_handle_t bsh;
 	uint32_t r;
 	int error;
 
@@ -437,15 +443,11 @@ ralink_com_early(int silent)
 #endif
 	uart_write(RA_UART_LCR, UART_LCR_WLS0 | UART_LCR_WLS1);
 
-	regs.cr_iot = &ra_bus_memt;
-	regs.cr_iobase = RALINK_CONADDR;
-	regs.cr_nports = 32;
-	ralink_com_initmap(&regs);
-
-	if ((error = bus_space_map(regs.cr_iot, regs.cr_iobase, regs.cr_nports,
-	    0, &regs.cr_ioh)) != 0) {
+	if ((error = bus_space_map(&ra_bus_memt, RALINK_CONADDR,
+				   32, 0, &bsh)) != 0) {
 		return;
 	}
+	ralink_com_init_regs(&regs, &ra_bus_memt, bsh, RALINK_CONADDR);
 
 #if defined(MT7628)
 	comcnattach1(&regs, RA_BAUDRATE, RA_UART_FREQ,

Index: src/sys/arch/mips/rmi/rmixl_com.c
diff -u src/sys/arch/mips/rmi/rmixl_com.c:1.5 src/sys/arch/mips/rmi/rmixl_com.c:1.6
--- src/sys/arch/mips/rmi/rmixl_com.c:1.5	Fri Jul  1 19:01:30 2011
+++ src/sys/arch/mips/rmi/rmixl_com.c	Sat Dec  8 17:46:12 2018
@@ -1,4 +1,4 @@
-/* $Id: rmixl_com.c,v 1.5 2011/07/01 19:01:30 dyoung Exp $ */
+/* $Id: rmixl_com.c,v 1.6 2018/12/08 17:46:12 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,v 1.5 2011/07/01 19:01:30 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,v 1.6 2018/12/08 17:46:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -129,20 +129,12 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,
 /* span of UART regs in bytes */
 #define RMIXL_IO_DEV_UART_SIZE	(COM_NPORTS * sizeof(uint32_t))
 
-#define RMIXL_COM_INIT_REGS(regs, bst, ioh, addr) 		\
-	do {							\
-		memset(&regs, 0, sizeof(regs));			\
-		COM_INIT_REGS(regs, bst, ioh, addr);		\
-		regs.cr_nports = RMIXL_IO_DEV_UART_SIZE;	\
-		rmixl_com_initmap(&regs);			\
-	} while (0)
-
-
 struct rmixl_com_softc {
 	struct com_softc sc_com;
 };
 
-static void rmixl_com_initmap(struct com_regs *);
+static void rmixl_com_init_regs(struct com_regs *, bus_space_tag_t,
+				bus_space_handle_t, bus_addr_t);
 static int rmixl_com_match(device_t, cfdata_t , void *);
 static void rmixl_com_attach(device_t, device_t, void *);
 
@@ -254,7 +246,7 @@ rmixl_com_match(device_t parent, cfdata_
 	if (bus_space_map(bst, addr, size, 0, &ioh))
 		return 0;		/* FAIL */
 
-	RMIXL_COM_INIT_REGS(regs, bst, ioh, addr);
+	rmixl_com_init_regs(&regs, bst, ioh, addr);
 
 	rv = com_probe_subr(&regs);
 
@@ -287,7 +279,7 @@ rmixl_com_attach(device_t parent, device
 		return;
 	}
 
-	RMIXL_COM_INIT_REGS(sc->sc_regs, bst, ioh, addr);
+	rmixl_com_init_regs(&sc->sc_regs, bst, ioh, addr);
 
 	com_attach_subr(sc);
 
@@ -298,13 +290,19 @@ rmixl_com_attach(device_t parent, device
 }
 
 void
-rmixl_com_initmap(struct com_regs *regsp)
+rmixl_com_init_regs(struct com_regs *regsp, bus_space_tag_t st,
+		    bus_space_handle_t sh, bus_addr_t addr)
 {
+
+	com_init_regs(regsp, st, sh, addr);
+
 	/*
 	 * map the 4 byte register stride
 	 */
-	for (int i = 0; i < __arraycount(regsp->cr_map); i++)
-		regsp->cr_map[i] = com_std_map[i] * 4;
+	for (size_t i = 0; i < __arraycount(regsp->cr_map); i++)
+		regsp->cr_map[i] = regsp->cr_map[i] * 4;
+
+	regsp->cr_nports = RMIXL_IO_DEV_UART_SIZE;
 }
 
 void
@@ -316,7 +314,7 @@ rmixl_com_cnattach(bus_addr_t addr, int 
 
 	bst = (bus_space_tag_t)&rmixl_configuration.rc_obio_eb_memt;
 
-	RMIXL_COM_INIT_REGS(regs, bst, 0, addr);
+	rmixl_com_init_regs(&regs, bst, 0, addr);
 
 	comcnattach1(&regs, speed, freq, type, mode);
 }

Index: src/sys/arch/mmeye/dev/com_mainbus.c
diff -u src/sys/arch/mmeye/dev/com_mainbus.c:1.12 src/sys/arch/mmeye/dev/com_mainbus.c:1.13
--- src/sys/arch/mmeye/dev/com_mainbus.c:1.12	Tue Jul 19 15:17:20 2011
+++ src/sys/arch/mmeye/dev/com_mainbus.c	Sat Dec  8 17:46:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_mainbus.c,v 1.12 2011/07/19 15:17:20 dyoung Exp $	*/
+/*	$NetBSD: com_mainbus.c,v 1.13 2018/12/08 17:46:12 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.12 2011/07/19 15:17:20 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.13 2018/12/08 17:46:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -98,7 +98,7 @@ com_mainbus_attach(device_t parent, devi
 		}
 	csc->sc_dev = self;
 	csc->sc_frequency = COM_FREQ;
-	COM_INIT_REGS(csc->sc_regs, iot, ioh, ma->ma_addr1);
+	com_init_regs(&csc->sc_regs, iot, ioh, ma->ma_addr1);
 
 	/* sanity check */
 	if (!comprobe1(iot, ioh)) {

Index: src/sys/arch/powerpc/booke/dev/pq3duart.c
diff -u src/sys/arch/powerpc/booke/dev/pq3duart.c:1.4 src/sys/arch/powerpc/booke/dev/pq3duart.c:1.5
--- src/sys/arch/powerpc/booke/dev/pq3duart.c:1.4	Mon Sep  3 16:29:26 2018
+++ src/sys/arch/powerpc/booke/dev/pq3duart.c	Sat Dec  8 17:46:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3duart.c,v 1.4 2018/09/03 16:29:26 riastradh Exp $	*/
+/*	$NetBSD: pq3duart.c,v 1.5 2018/12/08 17:46:12 thorpej Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pq3duart.c,v 1.4 2018/09/03 16:29:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3duart.c,v 1.5 2018/12/08 17:46:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -114,7 +114,7 @@ com_pq3duart_match(device_t parent, cfda
 	if (bus_space_map(memt, addr, size, 0, &memh))
 		return 0;
 
-	COM_INIT_REGS(regs, memt, memh, addr);
+	com_init_regs(&regs, memt, memh, addr);
 
 	int rv = com_probe_subr(&regs);
 
@@ -212,7 +212,7 @@ com_pq3duart_attach(device_t parent, dev
 		}
 	}
 
-	COM_INIT_REGS(sc->sc_regs, memt, memh, addr);
+	com_init_regs(&sc->sc_regs, memt, memh, addr);
 	sc->sc_regs.cr_nports = size;
 
 	com_attach_subr(sc);

Index: src/sys/arch/powerpc/ibm4xx/dev/com_opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.21 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.22
--- src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.21	Sat Jun 18 06:41:42 2011
+++ src/sys/arch/powerpc/ibm4xx/dev/com_opb.c	Sat Dec  8 17:46:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: com_opb.c,v 1.21 2011/06/18 06:41:42 matt Exp $ */
+/* $NetBSD: com_opb.c,v 1.22 2018/12/08 17:46:12 thorpej Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.21 2011/06/18 06:41:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.22 2018/12/08 17:46:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -119,7 +119,7 @@ com_opb_attach(device_t parent, device_t
 	/* XXX console check */
 
 	bus_space_map(oaa->opb_bt, oaa->opb_addr, COM_NPORTS, 0, &ioh);
-	COM_INIT_REGS(sc->sc_regs, oaa->opb_bt, ioh, oaa->opb_addr);
+	com_init_regs(&sc->sc_regs, oaa->opb_bt, ioh, oaa->opb_addr);
 
 	freq = prop_dictionary_get(device_properties(sc->sc_dev),
 	    "clock-frequency");

Index: src/sys/arch/rs6000/ioplanar/com_iop.c
diff -u src/sys/arch/rs6000/ioplanar/com_iop.c:1.4 src/sys/arch/rs6000/ioplanar/com_iop.c:1.5
--- src/sys/arch/rs6000/ioplanar/com_iop.c:1.4	Mon Jul 18 17:26:55 2011
+++ src/sys/arch/rs6000/ioplanar/com_iop.c	Sat Dec  8 17:46:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_iop.c,v 1.4 2011/07/18 17:26:55 dyoung Exp $	*/
+/*	$NetBSD: com_iop.c,v 1.5 2018/12/08 17:46:12 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_iop.c,v 1.4 2011/07/18 17:26:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_iop.c,v 1.5 2018/12/08 17:46:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -116,7 +116,7 @@ com_iop_attach(device_t parent, device_t
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, idaa->idaa_iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, idaa->idaa_iot, ioh, iobase);
 
 	aprint_normal("i/o %#x-%#x irq %d", iobase, iobase + COM_NPORTS - 1,
 	    irq);

Index: src/sys/arch/sandpoint/sandpoint/com_eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.8 src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.9
--- src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.8	Thu Dec 29 10:27:36 2011
+++ src/sys/arch/sandpoint/sandpoint/com_eumb.c	Sat Dec  8 17:46:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: com_eumb.c,v 1.8 2011/12/29 10:27:36 phx Exp $ */
+/* $NetBSD: com_eumb.c,v 1.9 2018/12/08 17:46:12 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.8 2011/12/29 10:27:36 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.9 2018/12/08 17:46:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -94,7 +94,7 @@ com_eumb_attach(device_t parent, device_
 		sc->sc_regs = cnregs;
 	} else {
 		bus_space_map(eaa->eumb_bt, comaddr, COM_NPORTS, 0, &ioh);
-		COM_INIT_REGS(sc->sc_regs, eaa->eumb_bt, ioh, comaddr);
+		com_init_regs(&sc->sc_regs, eaa->eumb_bt, ioh, comaddr);
 	}
 	sc->sc_frequency = 4 * ticks_per_sec;
 	epicirq = (eaa->eumb_unit == 1) ? 25 : 24;

Index: src/sys/arch/sgimips/mace/com_mace.c
diff -u src/sys/arch/sgimips/mace/com_mace.c:1.11 src/sys/arch/sgimips/mace/com_mace.c:1.12
--- src/sys/arch/sgimips/mace/com_mace.c:1.11	Wed Sep 30 19:44:58 2015
+++ src/sys/arch/sgimips/mace/com_mace.c	Sat Dec  8 17:46:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_mace.c,v 1.11 2015/09/30 19:44:58 macallan Exp $	*/
+/*	$NetBSD: com_mace.c,v 1.12 2018/12/08 17:46:12 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mace.c,v 1.11 2015/09/30 19:44:58 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mace.c,v 1.12 2018/12/08 17:46:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -97,7 +97,7 @@ com_mace_attach(device_t parent, device_
 	 */
 	ioh = maa->maa_sh + maa->maa_offset;
 	/* note that ioh on mac is *also* the iobase address */
-	COM_INIT_REGS(sc->sc_regs, mace_isa_memt, ioh,
+	com_init_regs(&sc->sc_regs, mace_isa_memt, ioh,
 	    MACE_BASE + maa->maa_offset);
 
 	sc->sc_frequency = COM_FREQ;

Index: src/sys/arch/sparc/dev/com_ebus.c
diff -u src/sys/arch/sparc/dev/com_ebus.c:1.16 src/sys/arch/sparc/dev/com_ebus.c:1.17
--- src/sys/arch/sparc/dev/com_ebus.c:1.16	Fri Jul  1 18:50:41 2011
+++ src/sys/arch/sparc/dev/com_ebus.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_ebus.c,v 1.16 2011/07/01 18:50:41 dyoung Exp $ */
+/*	$NetBSD: com_ebus.c,v 1.17 2018/12/08 17:46:13 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.16 2011/07/01 18:50:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.17 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -113,7 +113,7 @@ com_ebus_attach(device_t parent, device_
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	com_attach_subr(sc);
 

Index: src/sys/arch/sparc/dev/com_obio.c
diff -u src/sys/arch/sparc/dev/com_obio.c:1.24 src/sys/arch/sparc/dev/com_obio.c:1.25
--- src/sys/arch/sparc/dev/com_obio.c:1.24	Fri Jul  1 18:50:41 2011
+++ src/sys/arch/sparc/dev/com_obio.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.25 2018/12/08 17:46:13 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.25 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -197,7 +197,7 @@ com_obio_attach(device_t parent, device_
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	if (osc->osc_tadpole) {
 		*AUXIO4M_REG |= (AUXIO4M_LED|AUXIO4M_LTE);

Index: src/sys/arch/sparc64/dev/com_ebus.c
diff -u src/sys/arch/sparc64/dev/com_ebus.c:1.33 src/sys/arch/sparc64/dev/com_ebus.c:1.34
--- src/sys/arch/sparc64/dev/com_ebus.c:1.33	Fri Jul  1 18:48:36 2011
+++ src/sys/arch/sparc64/dev/com_ebus.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_ebus.c,v 1.33 2011/07/01 18:48:36 dyoung Exp $	*/
+/*	$NetBSD: com_ebus.c,v 1.34 2018/12/08 17:46:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.33 2011/07/01 18:48:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.34 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -137,7 +137,7 @@ com_ebus_attach(device_t parent, device_
 		aprint_error(": can't map register space\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	sc->sc_hwflags = 0;
 	sc->sc_frequency = BAUD_BASE;

Index: src/sys/arch/x68k/dev/com_intio.c
diff -u src/sys/arch/x68k/dev/com_intio.c:1.1 src/sys/arch/x68k/dev/com_intio.c:1.2
--- src/sys/arch/x68k/dev/com_intio.c:1.1	Sun Apr 29 07:17:12 2012
+++ src/sys/arch/x68k/dev/com_intio.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_intio.c,v 1.1 2012/04/29 07:17:12 tsutsui Exp $	*/
+/*	$NetBSD: com_intio.c,v 1.2 2018/12/08 17:46:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2009 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_intio.c,v 1.1 2012/04/29 07:17:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_intio.c,v 1.2 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -117,7 +117,7 @@ com_intio_attach(device_t parent, device
 	bus_space_write_1(iot, ioh, COM_PSX16550_REG_VECT, ia->ia_intr);
 
 	sc->sc_frequency = COM_PSX16550_FREQ;
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	/* PSX16550 uses MCR_DRS to switch interrupt priority level */
 	SET(sc->sc_mcr, MCR_DRS);	/* 0: ipl2 / 1: ipl4 */

Index: src/sys/dev/acpi/com_acpi.c
diff -u src/sys/dev/acpi/com_acpi.c:1.35 src/sys/dev/acpi/com_acpi.c:1.36
--- src/sys/dev/acpi/com_acpi.c:1.35	Sat May  5 21:16:31 2018
+++ src/sys/dev/acpi/com_acpi.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: com_acpi.c,v 1.35 2018/05/05 21:16:31 ryoon Exp $ */
+/* $NetBSD: com_acpi.c,v 1.36 2018/12/08 17:46:13 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.35 2018/05/05 21:16:31 ryoon Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.36 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -138,7 +138,7 @@ com_acpi_attach(device_t parent, device_
 			aprint_error_dev(self, "can't map i/o space\n");
 			goto out;
 		}
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, base);
+	com_init_regs(&sc->sc_regs, iot, ioh, base);
 
 	aprint_normal("%s", device_xname(self));
 

Index: src/sys/dev/cardbus/com_cardbus.c
diff -u src/sys/dev/cardbus/com_cardbus.c:1.30 src/sys/dev/cardbus/com_cardbus.c:1.31
--- src/sys/dev/cardbus/com_cardbus.c:1.30	Mon Aug  1 11:20:27 2011
+++ src/sys/dev/cardbus/com_cardbus.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: com_cardbus.c,v 1.30 2011/08/01 11:20:27 drochner Exp $ */
+/* $NetBSD: com_cardbus.c,v 1.31 2018/12/08 17:46:13 thorpej Exp $ */
 
 /*
  * Copyright (c) 2000 Johan Danielsson
@@ -40,7 +40,7 @@
    updated below.  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_cardbus.c,v 1.30 2011/08/01 11:20:27 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_cardbus.c,v 1.31 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -228,7 +228,7 @@ com_cardbus_attach (device_t parent, dev
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, csc->cc_addr);
+	com_init_regs(&sc->sc_regs, iot, ioh, csc->cc_addr);
 
 	csc->cc_base = csc->cc_addr;
 	csc->cc_csr = PCI_COMMAND_MASTER_ENABLE;

Index: src/sys/dev/fdt/dw_apb_uart.c
diff -u src/sys/dev/fdt/dw_apb_uart.c:1.3 src/sys/dev/fdt/dw_apb_uart.c:1.4
--- src/sys/dev/fdt/dw_apb_uart.c:1.3	Tue Jul 17 00:42:06 2018
+++ src/sys/dev/fdt/dw_apb_uart.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dw_apb_uart.c,v 1.3 2018/07/17 00:42:06 christos Exp $ */
+/* $NetBSD: dw_apb_uart.c,v 1.4 2018/12/08 17:46:13 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: dw_apb_uart.c,v 1.3 2018/07/17 00:42:06 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dw_apb_uart.c,v 1.4 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -137,7 +137,7 @@ dw_apb_uart_attach(device_t parent, devi
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, bst, bsh, addr);
+	com_init_regs(&sc->sc_regs, bst, bsh, addr);
 
 	com_attach_subr(sc);
 

Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.350 src/sys/dev/ic/com.c:1.351
--- src/sys/dev/ic/com.c:1.350	Fri Nov 30 16:26:19 2018
+++ src/sys/dev/ic/com.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.350 2018/11/30 16:26:19 jmcneill Exp $ */
+/* $NetBSD: com.c,v 1.351 2018/12/08 17:46:13 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.350 2018/11/30 16:26:19 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.351 2018/12/08 17:46:13 thorpej Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -256,7 +256,7 @@ void	com_kgdb_putc(void *, int);
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, com_usr, com_tfl, com_rfl, \
 	0, 0, 0, 0, 0, 0, 0, com_halt }
 
-const bus_size_t com_std_map[42] = COM_REG_STD;
+static const bus_size_t com_std_map[42] = COM_REG_STD;
 #endif /* COM_REGMAP */
 
 #define	COMDIALOUT_MASK	TTDIALOUT_MASK
@@ -272,6 +272,27 @@ const bus_size_t com_std_map[42] = COM_R
 #define COM_BARRIER(r, f) \
 	bus_space_barrier((r)->cr_iot, (r)->cr_ioh, 0, (r)->cr_nports, (f))
 
+/*
+ * com_init_regs --
+ *	Driver front-ends use this to initialize our register map
+ *	in the standard fashion.  They may then tailor the map to
+ *	their own particular requirements.
+ */
+void
+com_init_regs(struct com_regs *regs, bus_space_tag_t st, bus_space_handle_t sh,
+	      bus_addr_t addr)
+{
+
+	memset(regs, 0, sizeof(*regs));
+	regs->cr_iot = st;
+	regs->cr_ioh = sh;
+	regs->cr_iobase = addr;
+	regs->cr_nports = COM_NPORTS;
+#ifdef COM_REGMAP
+	memcpy(regs->cr_map, com_std_map, sizeof(regs->cr_map));
+#endif
+}
+
 /*ARGSUSED*/
 int
 comspeed(long speed, long frequency, int type)
@@ -350,11 +371,7 @@ comprobe1(bus_space_tag_t iot, bus_space
 {
 	struct com_regs	regs;
 
-	regs.cr_iot = iot;
-	regs.cr_ioh = ioh;
-#ifdef	COM_REGMAP
-	memcpy(regs.cr_map, com_std_map, sizeof (regs.cr_map));
-#endif
+	com_init_regs(&regs, iot, ioh, 0/*XXX*/);
 
 	return com_probe_subr(&regs);
 }
@@ -2508,13 +2525,7 @@ comcnattach(bus_space_tag_t iot, bus_add
 {
 	struct com_regs	regs;
 
-	memset(&regs, 0, sizeof regs);
-	regs.cr_iot = iot;
-	regs.cr_iobase = iobase;
-	regs.cr_nports = COM_NPORTS;
-#ifdef	COM_REGMAP
-	memcpy(regs.cr_map, com_std_map, sizeof (regs.cr_map));
-#endif
+	com_init_regs(&regs, iot, (bus_space_handle_t)0/*XXX*/, iobase);
 
 	return comcnattach1(&regs, rate, frequency, type, cflag);
 }
@@ -2591,12 +2602,7 @@ com_kgdb_attach(bus_space_tag_t iot, bus
 {
 	struct com_regs regs;
 
-	regs.cr_iot = iot;
-	regs.cr_nports = COM_NPORTS;
-	regs.cr_iobase = iobase;
-#ifdef COM_REGMAP
-	memcpy(regs.cr_map, com_std_map, sizeof (regs.cr_map));
-#endif
+	com_init_regs(&regs, iot, (bus_space_handle_t)0/*XXX*/, iobase);
 
 	return com_kgdb_attach1(&regs, rate, frequency, type, cflag);
 }

Index: src/sys/dev/ic/com_cpcbus.c
diff -u src/sys/dev/ic/com_cpcbus.c:1.11 src/sys/dev/ic/com_cpcbus.c:1.12
--- src/sys/dev/ic/com_cpcbus.c:1.11	Mon Apr 28 20:23:49 2008
+++ src/sys/dev/ic/com_cpcbus.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_cpcbus.c,v 1.11 2008/04/28 20:23:49 martin Exp $	*/
+/*	$NetBSD: com_cpcbus.c,v 1.12 2018/12/08 17:46:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_cpcbus.c,v 1.11 2008/04/28 20:23:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_cpcbus.c,v 1.12 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -80,7 +80,7 @@ com_cpc_attach(device_t parent, device_t
 		aprint_error_dev(self, "can't map i/o space\n");
 		return;
 	}
-	COM_INIT_REGS(sc->sc_com.sc_regs, caa->cpca_tag, ioh, iobase);
+	com_init_regs(&sc->sc_com.sc_regs, caa->cpca_tag, ioh, iobase);
 
 	sc->sc_com.sc_frequency = CPC_COM_SPEED(caa->cpca_freq);
 
Index: src/sys/dev/ic/com_upc.c
diff -u src/sys/dev/ic/com_upc.c:1.11 src/sys/dev/ic/com_upc.c:1.12
--- src/sys/dev/ic/com_upc.c:1.11	Sun Jan 25 14:34:14 2009
+++ src/sys/dev/ic/com_upc.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: com_upc.c,v 1.11 2009/01/25 14:34:14 bjh21 Exp $ */
+/* $NetBSD: com_upc.c,v 1.12 2018/12/08 17:46:13 thorpej Exp $ */
 /*-
  * Copyright (c) 2000 Ben Harris
  * All rights reserved.
@@ -28,7 +28,7 @@
 /* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_upc.c,v 1.11 2009/01/25 14:34:14 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_upc.c,v 1.12 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -64,7 +64,7 @@ com_upc_attach(device_t parent, device_t
 	sc->sc_dev = self;
 	sc->sc_frequency = COM_FREQ;
 
-	COM_INIT_REGS(sc->sc_regs, ua->ua_iot, ua->ua_ioh, ua->ua_offset);
+	com_init_regs(&sc->sc_regs, ua->ua_iot, ua->ua_ioh, ua->ua_offset);
 	com_attach_subr(sc);
 	upc_intr_establish(ua->ua_irqhandle, IPL_SERIAL, comintr, sc);
 }

Index: src/sys/dev/ic/comvar.h
diff -u src/sys/dev/ic/comvar.h:1.88 src/sys/dev/ic/comvar.h:1.89
--- src/sys/dev/ic/comvar.h:1.88	Fri Nov 30 16:26:19 2018
+++ src/sys/dev/ic/comvar.h	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: comvar.h,v 1.88 2018/11/30 16:26:19 jmcneill Exp $	*/
+/*	$NetBSD: comvar.h,v 1.89 2018/12/08 17:46:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -92,7 +92,7 @@ int com_is_console(bus_space_tag_t, bus_
 #define	COM_REG_MCR		9
 #define	COM_REG_LSR		10
 #define	COM_REG_MSR		11
-#define	COM_REG_USR		31	/* 16750/DW APB */
+#define	COM_REG_USR		31		/* 16750/DW APB */
 #define	COM_REG_TFL		com_tfl		/* DW APB */
 #define	COM_REG_RFL		com_rfl		/* DW APB */
 #define	COM_REG_HALT		com_halt	/* DW APB */
@@ -104,19 +104,7 @@ struct com_regs {
 	bus_size_t		cr_nports;
 	bus_size_t		cr_map[42];
 };
-
-extern const bus_size_t com_std_map[42];
-
-#define	COM_INIT_REGS(regs, tag, hdl, addr)				\
-	do {								\
-		regs.cr_iot = tag;					\
-		regs.cr_ioh = hdl;					\
-		regs.cr_iobase = addr;					\
-		regs.cr_nports = COM_NPORTS;				\
-		memcpy(regs.cr_map, com_std_map, sizeof (regs.cr_map));	\
-	} while (0)
-
-#else
+#else /* ! COM_REGMAP */
 #define	COM_REG_RXDATA		com_data
 #define	COM_REG_TXDATA		com_data
 #define	COM_REG_DLBL		com_dlbl
@@ -144,15 +132,10 @@ struct com_regs {
 	bus_size_t		cr_nports;
 };
 
-#define	COM_INIT_REGS(regs, tag, hdl, addr)		\
-	do {						\
-		regs.cr_iot = tag;			\
-		regs.cr_ioh = hdl;			\
-		regs.cr_iobase = addr;			\
-		regs.cr_nports = COM_NPORTS;		\
-	} while (0)
+#endif /* COM_REGMAP */
 
-#endif
+void	com_init_regs(struct com_regs *, bus_space_tag_t, bus_space_handle_t,
+		      bus_addr_t);
 
 struct comcons_info {
 	struct com_regs regs;

Index: src/sys/dev/isa/com_isa.c
diff -u src/sys/dev/isa/com_isa.c:1.40 src/sys/dev/isa/com_isa.c:1.41
--- src/sys/dev/isa/com_isa.c:1.40	Tue Oct 18 22:08:30 2016
+++ src/sys/dev/isa/com_isa.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_isa.c,v 1.40 2016/10/18 22:08:30 jdolecek Exp $	*/
+/*	$NetBSD: com_isa.c,v 1.41 2018/12/08 17:46:13 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.40 2016/10/18 22:08:30 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.41 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -187,7 +187,7 @@ com_isa_attach(device_t parent, device_t
 
 	sc->sc_dev = self;
 
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	sc->sc_frequency = COM_FREQ;
 	irq = ia->ia_irq[0].ir_irq;

Index: src/sys/dev/isa/com_multi.c
diff -u src/sys/dev/isa/com_multi.c:1.29 src/sys/dev/isa/com_multi.c:1.30
--- src/sys/dev/isa/com_multi.c:1.29	Mon Nov 23 02:13:47 2009
+++ src/sys/dev/isa/com_multi.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_multi.c,v 1.29 2009/11/23 02:13:47 rmind Exp $	*/
+/*	$NetBSD: com_multi.c,v 1.30 2018/12/08 17:46:13 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.29 2009/11/23 02:13:47 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.30 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -128,7 +128,7 @@ com_multi_attach(device_t parent, device
 	/*
 	 * We're living on a commulti.
 	 */
-	COM_INIT_REGS(sc->sc_regs, ca->ca_iot, ca->ca_ioh, ca->ca_iobase);
+	com_init_regs(&sc->sc_regs, ca->ca_iot, ca->ca_ioh, ca->ca_iobase);
 	sc->sc_frequency = 115200 * 16;
 
 	if (ca->ca_noien)

Index: src/sys/dev/isapnp/com_isapnp.c
diff -u src/sys/dev/isapnp/com_isapnp.c:1.29 src/sys/dev/isapnp/com_isapnp.c:1.30
--- src/sys/dev/isapnp/com_isapnp.c:1.29	Mon Apr 28 20:23:52 2008
+++ src/sys/dev/isapnp/com_isapnp.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_isapnp.c,v 1.29 2008/04/28 20:23:52 martin Exp $	*/
+/*	$NetBSD: com_isapnp.c,v 1.30 2018/12/08 17:46:13 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.29 2008/04/28 20:23:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.30 2018/12/08 17:46:13 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,7 +91,7 @@ com_isapnp_attach(device_t parent, devic
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, ipa->ipa_iot, ipa->ipa_io[0].h,
+	com_init_regs(&sc->sc_regs, ipa->ipa_iot, ipa->ipa_io[0].h,
 	    ipa->ipa_io[0].base);
 
 	/*

Index: src/sys/dev/marvell/com_mv.c
diff -u src/sys/dev/marvell/com_mv.c:1.7 src/sys/dev/marvell/com_mv.c:1.8
--- src/sys/dev/marvell/com_mv.c:1.7	Thu Oct  3 13:23:03 2013
+++ src/sys/dev/marvell/com_mv.c	Sat Dec  8 17:46:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_mv.c,v 1.7 2013/10/03 13:23:03 kiyohara Exp $	*/
+/*	$NetBSD: com_mv.c,v 1.8 2018/12/08 17:46:13 thorpej Exp $	*/
 /*
  * Copyright (c) 2007, 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mv.c,v 1.7 2013/10/03 13:23:03 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mv.c,v 1.8 2018/12/08 17:46:13 thorpej Exp $");
 
 #include "opt_com.h"
 
@@ -55,22 +55,18 @@ CFATTACH_DECL_NEW(mvuart_gt, sizeof(stru
 CFATTACH_DECL_NEW(mvuart_mbus, sizeof(struct com_softc),
     mvuart_match, mvuart_attach, NULL, NULL);
 
+static void
+mvuart_init_regs(struct com_regs *regs, bus_space_tag_t tag,
+		 bus_space_handle_t hdl, bus_addr_t addr, bus_size_t size)
+{
+
+	com_init_regs(regs, tag, hdl, addr);
 #ifdef COM_REGMAP
-#define MVUART_INIT_REGS(regs, tag, hdl, addr, size)		\
-	do {							\
-		int i;						\
-								\
-		regs.cr_iot = tag;				\
-		regs.cr_ioh = hdl;				\
-		regs.cr_iobase = addr;				\
-		regs.cr_nports = size;				\
-		for (i = 0; i < __arraycount(regs.cr_map); i++)	\
-			regs.cr_map[i] = com_std_map[i] << 2;	\
-	} while (0)
-#else
-#define MVUART_INIT_REGS(regs, tag, hdl, addr, size) \
-	COM_INIT_REGS(regs, tag, hdl, addr)
+	for (size_t i = 0; i < __arraycount(regs->cr_map); i++)
+		regs->cr_map[i] = regs->cr_map[i] << 2;
+	regs->cr_nports = size;
 #endif
+}
 
 
 /* ARGSUSED */
@@ -93,7 +89,8 @@ mvuart_match(device_t parent, struct cfd
 	if (bus_space_subregion(mva->mva_iot, mva->mva_ioh, mva->mva_offset,
 	    MVUART_SIZE, &ioh))
 		return 0;
-	MVUART_INIT_REGS(regs, mva->mva_iot, ioh, mva->mva_offset, MVUART_SIZE);
+	mvuart_init_regs(&regs, mva->mva_iot, ioh, mva->mva_offset,
+			 MVUART_SIZE);
 	if (!com_probe_subr(&regs))
 		return 0;
 
@@ -127,7 +124,7 @@ mvuart_attach(device_t parent, device_t 
 			return;
 		}
 	}
-	MVUART_INIT_REGS(sc->sc_regs,
+	mvuart_init_regs(&sc->sc_regs,
 	    iot, ioh, mva->mva_addr + mva->mva_offset, mva->mva_size);
 
 	com_attach_subr(sc);
@@ -144,7 +141,7 @@ mvuart_cnattach(bus_space_tag_t iot, bus
 {
 	struct com_regs regs;
 
-	MVUART_INIT_REGS(regs, iot, 0x0, addr, MVUART_SIZE);
+	mvuart_init_regs(&regs, iot, 0x0, addr, MVUART_SIZE);
 
 	return comcnattach1(&regs, baud, sysfreq, COM_TYPE_16550_NOERS, mode);
 }

Index: src/sys/dev/mca/com_mca.c
diff -u src/sys/dev/mca/com_mca.c:1.22 src/sys/dev/mca/com_mca.c:1.23
--- src/sys/dev/mca/com_mca.c:1.22	Mon Nov 23 02:13:47 2009
+++ src/sys/dev/mca/com_mca.c	Sat Dec  8 17:46:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_mca.c,v 1.22 2009/11/23 02:13:47 rmind Exp $	*/
+/*	$NetBSD: com_mca.c,v 1.23 2018/12/08 17:46:14 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.22 2009/11/23 02:13:47 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.23 2018/12/08 17:46:14 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -166,7 +166,7 @@ com_mca_attach(device_t parent, device_t
 		return;
 	}
 
-	COM_INIT_REGS(sc->sc_regs, ma->ma_iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, ma->ma_iot, ioh, iobase);
 	sc->sc_frequency = COM_FREQ;
 
 	aprint_normal(" slot %d i/o %#x-%#x irq %d", ma->ma_slot + 1,

Index: src/sys/dev/ofisa/com_ofisa.c
diff -u src/sys/dev/ofisa/com_ofisa.c:1.15 src/sys/dev/ofisa/com_ofisa.c:1.16
--- src/sys/dev/ofisa/com_ofisa.c:1.15	Sat Oct 27 17:18:27 2012
+++ src/sys/dev/ofisa/com_ofisa.c	Sat Dec  8 17:46:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_ofisa.c,v 1.15 2012/10/27 17:18:27 chs Exp $	*/
+/*	$NetBSD: com_ofisa.c,v 1.16 2018/12/08 17:46:14 thorpej Exp $	*/
 
 /*
  * Copyright 1997, 1998
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ofisa.c,v 1.15 2012/10/27 17:18:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ofisa.c,v 1.16 2018/12/08 17:46:14 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -147,7 +147,7 @@ com_ofisa_attach(device_t parent, device
 		aprint_error(": can't map register space\n");
                 return;
         }
-	COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&sc->sc_regs, iot, ioh, iobase);
 
 	osc->sc_ih = isa_intr_establish(aa->ic, intr.irq, intr.share,
 	    IPL_SERIAL, comintr, sc);

Index: src/sys/dev/pci/com_puc.c
diff -u src/sys/dev/pci/com_puc.c:1.25 src/sys/dev/pci/com_puc.c:1.26
--- src/sys/dev/pci/com_puc.c:1.25	Fri Nov 30 16:26:59 2018
+++ src/sys/dev/pci/com_puc.c	Sat Dec  8 17:46:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_puc.c,v 1.25 2018/11/30 16:26:59 jmcneill Exp $	*/
+/*	$NetBSD: com_puc.c,v 1.26 2018/12/08 17:46:14 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998 Christopher G. Demetriou.  All rights reserved.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.25 2018/11/30 16:26:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.26 2018/12/08 17:46:14 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -103,7 +103,7 @@ com_puc_attach(device_t parent, device_t
 		aprint_normal(" (%s-compatible)", serialtype[iface]);
 	aprint_normal(": ");
 
-	COM_INIT_REGS(sc->sc_regs, aa->t, aa->h, aa->a);
+	com_init_regs(&sc->sc_regs, aa->t, aa->h, aa->a);
 	sc->sc_frequency = aa->flags & PUC_COM_CLOCKMASK;
 
 	if (!aa->poll) {

Index: src/sys/dev/pcmcia/com_pcmcia.c
diff -u src/sys/dev/pcmcia/com_pcmcia.c:1.61 src/sys/dev/pcmcia/com_pcmcia.c:1.62
--- src/sys/dev/pcmcia/com_pcmcia.c:1.61	Mon Nov 23 02:13:47 2009
+++ src/sys/dev/pcmcia/com_pcmcia.c	Sat Dec  8 17:46:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_pcmcia.c,v 1.61 2009/11/23 02:13:47 rmind Exp $	 */
+/*	$NetBSD: com_pcmcia.c,v 1.62 2018/12/08 17:46:14 thorpej Exp $	 */
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.61 2009/11/23 02:13:47 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.62 2018/12/08 17:46:14 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -188,7 +188,7 @@ com_pcmcia_attach(device_t parent, devic
 	}
 
 	cfe = pa->pf->cfe;
-	COM_INIT_REGS(sc->sc_regs, cfe->iospace[0].handle.iot,
+	com_init_regs(&sc->sc_regs, cfe->iospace[0].handle.iot,
 	    cfe->iospace[0].handle.ioh, -1);
 
 	error = com_pcmcia_enable(sc);

Index: src/sys/dev/pcmcia/mhzc.c
diff -u src/sys/dev/pcmcia/mhzc.c:1.51 src/sys/dev/pcmcia/mhzc.c:1.52
--- src/sys/dev/pcmcia/mhzc.c:1.51	Fri Jun 22 04:17:42 2018
+++ src/sys/dev/pcmcia/mhzc.c	Sat Dec  8 17:46:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: mhzc.c,v 1.51 2018/06/22 04:17:42 msaitoh Exp $	*/
+/*	$NetBSD: mhzc.c,v 1.52 2018/12/08 17:46:14 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.51 2018/06/22 04:17:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.52 2018/12/08 17:46:14 thorpej Exp $");
 
 #include "opt_inet.h"
 
@@ -619,7 +619,7 @@ com_mhzc_attach(device_t parent, device_
 	sc->sc_dev = self;
 	aprint_normal("\n");
 
-	COM_INIT_REGS(sc->sc_regs, 
+	com_init_regs(&sc->sc_regs, 
 	    msc->sc_modem_pcioh.iot,
 	    msc->sc_modem_pcioh.ioh,
 	    -1);

Index: src/sys/dev/pcmcia/pcmcom.c
diff -u src/sys/dev/pcmcia/pcmcom.c:1.40 src/sys/dev/pcmcia/pcmcom.c:1.41
--- src/sys/dev/pcmcia/pcmcom.c:1.40	Sat Oct 27 17:18:37 2012
+++ src/sys/dev/pcmcia/pcmcom.c	Sat Dec  8 17:46:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcmcom.c,v 1.40 2012/10/27 17:18:37 chs Exp $	*/
+/*	$NetBSD: pcmcom.c,v 1.41 2018/12/08 17:46:14 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.40 2012/10/27 17:18:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.41 2018/12/08 17:46:14 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -319,7 +319,7 @@ com_pcmcom_attach(device_t parent, devic
 	struct pcmcom_attach_args *pca = aux;
 
 	sc->sc_dev = self;
-	COM_INIT_REGS(sc->sc_regs, pca->pca_iot, pca->pca_ioh, -1);
+	com_init_regs(&sc->sc_regs, pca->pca_iot, pca->pca_ioh, -1);
 	sc->enabled = 1;
 
 	sc->sc_frequency = COM_FREQ;

Index: src/sys/dev/pcmcia/xirc.c
diff -u src/sys/dev/pcmcia/xirc.c:1.34 src/sys/dev/pcmcia/xirc.c:1.35
--- src/sys/dev/pcmcia/xirc.c:1.34	Fri Jun 22 04:17:42 2018
+++ src/sys/dev/pcmcia/xirc.c	Sat Dec  8 17:46:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: xirc.c,v 1.34 2018/06/22 04:17:42 msaitoh Exp $	*/
+/*	$NetBSD: xirc.c,v 1.35 2018/12/08 17:46:14 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.34 2018/06/22 04:17:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.35 2018/12/08 17:46:14 thorpej Exp $");
 
 #include "opt_inet.h"
 
@@ -553,7 +553,7 @@ com_xirc_attach(device_t parent, device_
 
 	aprint_normal("\n");
 
-	COM_INIT_REGS(sc->sc_regs, 
+	com_init_regs(&sc->sc_regs, 
 	    msc->sc_modem_pcioh.iot,
 	    msc->sc_modem_pcioh.ioh,
 	    -1);

Index: src/sys/dev/podulebus/acemidi.c
diff -u src/sys/dev/podulebus/acemidi.c:1.14 src/sys/dev/podulebus/acemidi.c:1.15
--- src/sys/dev/podulebus/acemidi.c:1.14	Fri Mar 14 15:09:11 2008
+++ src/sys/dev/podulebus/acemidi.c	Sat Dec  8 17:46:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: acemidi.c,v 1.14 2008/03/14 15:09:11 cube Exp $ */
+/* $NetBSD: acemidi.c,v 1.15 2018/12/08 17:46:14 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2001 Ben Harris
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.14 2008/03/14 15:09:11 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.15 2018/12/08 17:46:14 thorpej Exp $");
 
 #include <sys/param.h>
 
@@ -102,7 +102,7 @@ com_acemidi_attach(device_t parent, devi
 	iobase = pa->pa_fast_base + ACEMIDI_16550_BASE;
 
 	bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh);
-	COM_INIT_REGS(csc->sc_regs, iot, ioh, iobase);
+	com_init_regs(&csc->sc_regs, iot, ioh, iobase);
 
 	csc->sc_frequency = ACEMIDI_16550_FREQ;