[src/trunk]: src/sys/arch/x68k/dev Explicitly include "ioconf.h" for struct c...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fd1d13476f2f
branches:  trunk
changeset: 366431:fd1d13476f2f
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu May 26 14:33:29 2022 +0000

description:
Explicitly include "ioconf.h" for struct cfdriver.

diffstat:

 sys/arch/x68k/dev/bmd.c         |  8 ++++----
 sys/arch/x68k/dev/grf.c         |  8 ++++----
 sys/arch/x68k/dev/grf_machdep.c |  8 ++++----
 sys/arch/x68k/dev/intio.c       |  7 +++----
 sys/arch/x68k/dev/ite.c         |  9 +++++----
 sys/arch/x68k/dev/kbd.c         |  8 ++++----
 sys/arch/x68k/dev/mha.c         |  8 ++++----
 sys/arch/x68k/dev/par.c         |  8 ++++----
 sys/arch/x68k/dev/powsw.c       |  8 ++++----
 sys/arch/x68k/dev/sram.c        |  8 ++++----
 sys/arch/x68k/dev/vs.c          |  8 ++++----
 11 files changed, 44 insertions(+), 44 deletions(-)

diffs (truncated from 396 to 300 lines):

diff -r 889a6969f471 -r fd1d13476f2f sys/arch/x68k/dev/bmd.c
--- a/sys/arch/x68k/dev/bmd.c   Thu May 26 14:30:36 2022 +0000
+++ b/sys/arch/x68k/dev/bmd.c   Thu May 26 14:33:29 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bmd.c,v 1.25 2016/07/07 06:55:39 msaitoh Exp $ */
+/*     $NetBSD: bmd.c,v 1.26 2022/05/26 14:33:29 tsutsui Exp $ */
 
 /*
  * Copyright (c) 2002 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.25 2016/07/07 06:55:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.26 2022/05/26 14:33:29 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,6 +50,8 @@
 
 #include <arch/x68k/dev/intiovar.h>
 
+#include "ioconf.h"
+
 #define BMD_ADDR1      (0xece3f0)
 #define BMD_ADDR2      (0xecebf0)
 
@@ -91,8 +93,6 @@
 static void bmd_attach(device_t, device_t, void *);
 static int  bmd_getdisklabel(struct bmd_softc *, dev_t);
 
-extern struct cfdriver bmd_cd;
-
 CFATTACH_DECL_NEW(bmd, sizeof(struct bmd_softc),
        bmd_match, bmd_attach, NULL, NULL);
 
diff -r 889a6969f471 -r fd1d13476f2f sys/arch/x68k/dev/grf.c
--- a/sys/arch/x68k/dev/grf.c   Thu May 26 14:30:36 2022 +0000
+++ b/sys/arch/x68k/dev/grf.c   Thu May 26 14:33:29 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf.c,v 1.45 2014/12/14 23:48:58 chs Exp $     */
+/*     $NetBSD: grf.c,v 1.46 2022/05/26 14:33:29 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.45 2014/12/14 23:48:58 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.46 2022/05/26 14:33:29 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,6 +66,8 @@
 
 #include <miscfs/specfs/specdev.h>
 
+#include "ioconf.h"
+
 #include "ite.h"
 #if NITE == 0
 #define        iteon(u,f)      0
@@ -87,8 +89,6 @@
 static int grfmap(dev_t, void **, struct proc *);
 static int grfunmap(dev_t, void *, struct proc *);
 
-extern struct cfdriver grf_cd;
-
 dev_type_open(grfopen);
 dev_type_close(grfclose);
 dev_type_ioctl(grfioctl);
diff -r 889a6969f471 -r fd1d13476f2f sys/arch/x68k/dev/grf_machdep.c
--- a/sys/arch/x68k/dev/grf_machdep.c   Thu May 26 14:30:36 2022 +0000
+++ b/sys/arch/x68k/dev/grf_machdep.c   Thu May 26 14:33:29 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_machdep.c,v 1.34 2021/08/07 16:19:07 thorpej Exp $ */
+/*     $NetBSD: grf_machdep.c,v 1.35 2022/05/26 14:33:29 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1991 University of Utah.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.34 2021/08/07 16:19:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.35 2022/05/26 14:33:29 tsutsui Exp $");
 
 #include "locators.h"
 
@@ -57,6 +57,8 @@
 #include <x68k/dev/grfvar.h>
 #include <x68k/x68k/iodevice.h>
 
+#include "ioconf.h"
+
 /* grfbus: is this necessary? */
 int grfbusprint(void *, const char *);
 int grfbusmatch(device_t, cfdata_t, void *);
@@ -76,8 +78,6 @@
 CFATTACH_DECL_NEW(grf, sizeof(struct grf_softc),
     grfmatch, grfattach, NULL, NULL);
 
-extern struct cfdriver grfbus_cd;
-
 int
 grfbusmatch(device_t parent, cfdata_t cf, void *aux)
 {
diff -r 889a6969f471 -r fd1d13476f2f sys/arch/x68k/dev/intio.c
--- a/sys/arch/x68k/dev/intio.c Thu May 26 14:30:36 2022 +0000
+++ b/sys/arch/x68k/dev/intio.c Thu May 26 14:33:29 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intio.c,v 1.51 2021/12/17 06:28:20 skrll Exp $ */
+/*     $NetBSD: intio.c,v 1.52 2022/05/26 14:33:29 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.51 2021/12/17 06:28:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.52 2022/05/26 14:33:29 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,6 +47,7 @@
 
 #include <arch/x68k/dev/intiovar.h>
 
+#include "ioconf.h"
 
 /*
  * bus_space(9) interface
@@ -123,8 +124,6 @@
 CFATTACH_DECL_NEW(intio, sizeof(struct intio_softc),
     intio_match, intio_attach, NULL, NULL);
 
-extern struct cfdriver intio_cd;
-
 static int intio_attached;
 
 static struct intio_interrupt_vector {
diff -r 889a6969f471 -r fd1d13476f2f sys/arch/x68k/dev/ite.c
--- a/sys/arch/x68k/dev/ite.c   Thu May 26 14:30:36 2022 +0000
+++ b/sys/arch/x68k/dev/ite.c   Thu May 26 14:33:29 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ite.c,v 1.65 2022/03/29 06:56:51 riastradh Exp $       */
+/*     $NetBSD: ite.c,v 1.66 2022/05/26 14:33:29 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.65 2022/03/29 06:56:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.66 2022/05/26 14:33:29 tsutsui Exp $");
 
 #include "ite.h"
 #if NITE > 0
@@ -77,6 +77,9 @@
 #include <arch/x68k/dev/itevar.h>
 #include <arch/x68k/dev/kbdmap.h>
 #include <arch/x68k/dev/mfp.h>
+
+#include "ioconf.h"
+
 #if NBELL > 0
 void opm_bell(void);
 #endif
@@ -156,8 +159,6 @@
 CFATTACH_DECL_NEW(ite, sizeof(struct ite_softc),
     itematch, iteattach, NULL, NULL);
 
-extern struct cfdriver ite_cd;
-
 dev_type_open(iteopen);
 dev_type_close(iteclose);
 dev_type_read(iteread);
diff -r 889a6969f471 -r fd1d13476f2f sys/arch/x68k/dev/kbd.c
--- a/sys/arch/x68k/dev/kbd.c   Thu May 26 14:30:36 2022 +0000
+++ b/sys/arch/x68k/dev/kbd.c   Thu May 26 14:33:29 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kbd.c,v 1.40 2014/07/25 08:10:35 dholland Exp $        */
+/*     $NetBSD: kbd.c,v 1.41 2022/05/26 14:33:29 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.40 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.41 2022/05/26 14:33:29 tsutsui Exp $");
 
 #include "ite.h"
 #include "bell.h"
@@ -63,6 +63,8 @@
 #include <machine/kbd.h>
 #include <machine/vuid_event.h>
 
+#include "ioconf.h"
+
 struct kbd_softc {
        device_t sc_dev;
        int sc_event_mode;      /* if true, collect events, else pass to ite */
@@ -179,8 +181,6 @@
                aprint_normal(" (no connected keyboard)");
 }
 
-extern struct cfdriver kbd_cd;
-
 int
 kbdopen(dev_t dev, int flags, int mode, struct lwp *l)
 {
diff -r 889a6969f471 -r fd1d13476f2f sys/arch/x68k/dev/mha.c
--- a/sys/arch/x68k/dev/mha.c   Thu May 26 14:30:36 2022 +0000
+++ b/sys/arch/x68k/dev/mha.c   Thu May 26 14:33:29 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mha.c,v 1.57 2022/05/04 07:48:34 andvar Exp $  */
+/*     $NetBSD: mha.c,v 1.58 2022/05/26 14:33:29 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.57 2022/05/04 07:48:34 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.58 2022/05/26 14:33:29 tsutsui Exp $");
 
 #include "opt_ddb.h"
 
@@ -118,6 +118,8 @@
 #include <x68k/dev/intiovar.h>
 #include <x68k/dev/scsiromvar.h>
 
+#include "ioconf.h"
+
 #if 0
 #define WAIT {if (sc->sc_pc[2]) {printf("[W_%d", __LINE__); while (sc->sc_pc[2] & 0x40);printf("]");}}
 #else
@@ -267,8 +269,6 @@
 CFATTACH_DECL_NEW(mha, sizeof(struct mha_softc),
     mhamatch, mhaattach, NULL, NULL);
 
-extern struct cfdriver mha_cd;
-
 /*
  * returns non-zero value if a controller is found.
  */
diff -r 889a6969f471 -r fd1d13476f2f sys/arch/x68k/dev/par.c
--- a/sys/arch/x68k/dev/par.c   Thu May 26 14:30:36 2022 +0000
+++ b/sys/arch/x68k/dev/par.c   Thu May 26 14:33:29 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: par.c,v 1.43 2018/09/03 16:29:28 riastradh Exp $       */
+/*     $NetBSD: par.c,v 1.44 2022/05/26 14:33:29 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: par.c,v 1.43 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: par.c,v 1.44 2022/05/26 14:33:29 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -56,6 +56,8 @@
 
 #include <arch/x68k/dev/intiovar.h>
 
+#include "ioconf.h"
+
 struct par_softc {
        device_t                sc_dev;
 
@@ -115,8 +117,6 @@
 CFATTACH_DECL_NEW(par, sizeof(struct par_softc),
     parmatch, parattach, NULL, NULL);
 
-extern struct cfdriver par_cd;
-
 static int par_attached;
 
 dev_type_open(paropen);
diff -r 889a6969f471 -r fd1d13476f2f sys/arch/x68k/dev/powsw.c
--- a/sys/arch/x68k/dev/powsw.c Thu May 26 14:30:36 2022 +0000
+++ b/sys/arch/x68k/dev/powsw.c Thu May 26 14:33:29 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: powsw.c,v 1.1 2011/11/27 09:00:32 isaki Exp $  */
+/*     $NetBSD: powsw.c,v 1.2 2022/05/26 14:33:29 tsutsui Exp $        */
 
 /*
  * Copyright (c) 2011 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
  */