Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Clean up initialization of com_regs structure, in prepar...
details: https://anonhg.NetBSD.org/src/rev/cb8752b36678
branches: trunk
changeset: 446509:cb8752b36678
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sat Dec 08 17:46:09 2018 +0000
description:
Clean up initialization of com_regs structure, in preparation for
some additional changers.
diffstat:
sys/arch/acorn32/mainbus/com_pioc.c | 6 ++--
sys/arch/acorn32/podulebus/amps.c | 6 ++--
sys/arch/algor/dev/com_mainbus.c | 6 ++--
sys/arch/alpha/jensenio/com_jensenio.c | 6 ++--
sys/arch/alpha/sableio/com_sableio.c | 6 ++--
sys/arch/amiga/clockport/com_ss.c | 4 +-
sys/arch/amiga/dev/com_supio.c | 6 ++--
sys/arch/arc/jazz/com_jazzio.c | 6 ++--
sys/arch/arm/broadcom/bcm2835_com.c | 6 ++--
sys/arch/arm/broadcom/bcm53xx_cca.c | 4 +-
sys/arch/arm/gemini/gemini_com.c | 6 ++--
sys/arch/arm/gemini/lpc_com.c | 6 ++--
sys/arch/arm/nvidia/tegra_com.c | 6 ++--
sys/arch/arm/omap/obio_com.c | 6 ++--
sys/arch/arm/omap/omap_com.c | 6 ++--
sys/arch/arm/omap/omapl1x_com.c | 4 +-
sys/arch/arm/ti/ti_com.c | 6 ++--
sys/arch/arm/xscale/ixp425_com.c | 6 ++--
sys/arch/arm/xscale/pxa2x0_com.c | 6 ++--
sys/arch/cobalt/dev/com_mainbus.c | 6 ++--
sys/arch/evbarm/adi_brh/com_obio.c | 6 ++--
sys/arch/evbarm/hdl_g/com_obio.c | 6 ++--
sys/arch/evbarm/iq80310/com_obio.c | 6 ++--
sys/arch/evbarm/iq80321/com_obio.c | 6 ++--
sys/arch/evbarm/npwr_fc/com_obio.c | 6 ++--
sys/arch/evbppc/ev64260/com_obio.c | 6 ++--
sys/arch/evbppc/explora/dev/com_elb.c | 6 ++--
sys/arch/hp300/dev/com_dio.c | 6 ++--
sys/arch/hp300/dev/com_frodo.c | 6 ++--
sys/arch/hpcmips/dev/com_hpcio.c | 6 ++--
sys/arch/hpcmips/vr/com_vrip.c | 6 ++--
sys/arch/hpcsh/dev/hd64461/hd64461uart.c | 33 ++++++++++-----------
sys/arch/hpcsh/dev/hd64465/hd64465uart.c | 6 ++--
sys/arch/hppa/dev/com_dino.c | 2 +-
sys/arch/hppa/dev/com_ssio.c | 4 +-
sys/arch/hppa/gsc/com_gsc.c | 6 ++--
sys/arch/i386/pnpbios/com_pnpbios.c | 6 ++--
sys/arch/iyonix/iyonix/com_obio.c | 6 ++--
sys/arch/macppc/dev/com_mainbus.c | 7 ++--
sys/arch/mips/alchemy/dev/com_aubus.c | 27 ++++++++++--------
sys/arch/mips/atheros/dev/com_arbus.c | 44 +++++++++++++++--------------
sys/arch/mips/ingenic/ingenic_com.c | 37 ++++++++++++------------
sys/arch/mips/ralink/ralink_com.c | 30 ++++++++++---------
sys/arch/mips/rmi/rmixl_com.c | 34 ++++++++++------------
sys/arch/mmeye/dev/com_mainbus.c | 6 ++--
sys/arch/powerpc/booke/dev/pq3duart.c | 8 ++--
sys/arch/powerpc/ibm4xx/dev/com_opb.c | 6 ++--
sys/arch/rs6000/ioplanar/com_iop.c | 6 ++--
sys/arch/sandpoint/sandpoint/com_eumb.c | 6 ++--
sys/arch/sgimips/mace/com_mace.c | 6 ++--
sys/arch/sparc/dev/com_ebus.c | 6 ++--
sys/arch/sparc/dev/com_obio.c | 6 ++--
sys/arch/sparc64/dev/com_ebus.c | 6 ++--
sys/arch/x68k/dev/com_intio.c | 6 ++--
sys/dev/acpi/com_acpi.c | 6 ++--
sys/dev/cardbus/com_cardbus.c | 6 ++--
sys/dev/fdt/dw_apb_uart.c | 6 ++--
sys/dev/ic/com.c | 48 ++++++++++++++++++--------------
sys/dev/ic/com_cpcbus.c | 6 ++--
sys/dev/ic/com_upc.c | 6 ++--
sys/dev/ic/comvar.h | 29 ++++---------------
sys/dev/isa/com_isa.c | 6 ++--
sys/dev/isa/com_multi.c | 6 ++--
sys/dev/isapnp/com_isapnp.c | 6 ++--
sys/dev/marvell/com_mv.c | 35 ++++++++++------------
sys/dev/mca/com_mca.c | 6 ++--
sys/dev/ofisa/com_ofisa.c | 6 ++--
sys/dev/pci/com_puc.c | 6 ++--
sys/dev/pcmcia/com_pcmcia.c | 6 ++--
sys/dev/pcmcia/mhzc.c | 6 ++--
sys/dev/pcmcia/pcmcom.c | 6 ++--
sys/dev/pcmcia/xirc.c | 6 ++--
sys/dev/podulebus/acemidi.c | 6 ++--
73 files changed, 341 insertions(+), 351 deletions(-)
diffs (truncated from 2486 to 300 lines):
diff -r 7bca225034ac -r cb8752b36678 sys/arch/acorn32/mainbus/com_pioc.c
--- a/sys/arch/acorn32/mainbus/com_pioc.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/acorn32/mainbus/com_pioc.c Sat Dec 08 17:46:09 2018 +0000
@@ -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 @@
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;
diff -r 7bca225034ac -r cb8752b36678 sys/arch/acorn32/podulebus/amps.c
--- a/sys/arch/acorn32/podulebus/amps.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/acorn32/podulebus/amps.c Sat Dec 08 17:46:09 2018 +0000
@@ -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 @@
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);
diff -r 7bca225034ac -r cb8752b36678 sys/arch/algor/dev/com_mainbus.c
--- a/sys/arch/algor/dev/com_mainbus.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/algor/dev/com_mainbus.c Sat Dec 08 17:46:09 2018 +0000
@@ -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 @@
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);
diff -r 7bca225034ac -r cb8752b36678 sys/arch/alpha/jensenio/com_jensenio.c
--- a/sys/arch/alpha/jensenio/com_jensenio.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/alpha/jensenio/com_jensenio.c Sat Dec 08 17:46:09 2018 +0000
@@ -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 @@
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;
diff -r 7bca225034ac -r cb8752b36678 sys/arch/alpha/sableio/com_sableio.c
--- a/sys/arch/alpha/sableio/com_sableio.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/alpha/sableio/com_sableio.c Sat Dec 08 17:46:09 2018 +0000
@@ -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 @@
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;
diff -r 7bca225034ac -r cb8752b36678 sys/arch/amiga/clockport/com_ss.c
--- a/sys/arch/amiga/clockport/com_ss.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/amiga/clockport/com_ss.c Sat Dec 08 17:46:09 2018 +0000
@@ -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 @@
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);
diff -r 7bca225034ac -r cb8752b36678 sys/arch/amiga/dev/com_supio.c
--- a/sys/arch/amiga/dev/com_supio.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/amiga/dev/com_supio.c Sat Dec 08 17:46:09 2018 +0000
@@ -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 @@
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? */
diff -r 7bca225034ac -r cb8752b36678 sys/arch/arc/jazz/com_jazzio.c
--- a/sys/arch/arc/jazz/com_jazzio.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/arc/jazz/com_jazzio.c Sat Dec 08 17:46:09 2018 +0000
@@ -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 @@
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);
diff -r 7bca225034ac -r cb8752b36678 sys/arch/arm/broadcom/bcm2835_com.c
--- a/sys/arch/arm/broadcom/bcm2835_com.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_com.c Sat Dec 08 17:46:09 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
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");
diff -r 7bca225034ac -r cb8752b36678 sys/arch/arm/broadcom/bcm53xx_cca.c
--- a/sys/arch/arm/broadcom/bcm53xx_cca.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_cca.c Sat Dec 08 17:46:09 2018 +0000
@@ -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 @@
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);
}
diff -r 7bca225034ac -r cb8752b36678 sys/arch/arm/gemini/gemini_com.c
--- a/sys/arch/arm/gemini/gemini_com.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/arm/gemini/gemini_com.c Sat Dec 08 17:46:09 2018 +0000
@@ -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 @@
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");
diff -r 7bca225034ac -r cb8752b36678 sys/arch/arm/gemini/lpc_com.c
--- a/sys/arch/arm/gemini/lpc_com.c Sat Dec 08 17:07:27 2018 +0000
+++ b/sys/arch/arm/gemini/lpc_com.c Sat Dec 08 17:46:09 2018 +0000
@@ -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"
Home |
Main Index |
Thread Index |
Old Index