Module Name: src
Committed By: tsutsui
Date: Thu May 26 14:33:29 UTC 2022
Modified Files:
src/sys/arch/x68k/dev: bmd.c grf.c grf_machdep.c intio.c ite.c kbd.c
mha.c par.c powsw.c sram.c vs.c
Log Message:
Explicitly include "ioconf.h" for struct cfdriver.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x68k/dev/bmd.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/x68k/dev/grf.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x68k/dev/grf_machdep.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/x68k/dev/intio.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x68k/dev/ite.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x68k/dev/kbd.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/x68k/dev/mha.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x68k/dev/par.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/dev/powsw.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x68k/dev/sram.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/x68k/dev/vs.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/x68k/dev/bmd.c
diff -u src/sys/arch/x68k/dev/bmd.c:1.25 src/sys/arch/x68k/dev/bmd.c:1.26
--- src/sys/arch/x68k/dev/bmd.c:1.25 Thu Jul 7 06:55:39 2016
+++ src/sys/arch/x68k/dev/bmd.c Thu May 26 14:33:29 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.25
#include <arch/x68k/dev/intiovar.h>
+#include "ioconf.h"
+
#define BMD_ADDR1 (0xece3f0)
#define BMD_ADDR2 (0xecebf0)
@@ -91,8 +93,6 @@ static int bmd_match(device_t, cfdata_t
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);
Index: src/sys/arch/x68k/dev/grf.c
diff -u src/sys/arch/x68k/dev/grf.c:1.45 src/sys/arch/x68k/dev/grf.c:1.46
--- src/sys/arch/x68k/dev/grf.c:1.45 Sun Dec 14 23:48:58 2014
+++ src/sys/arch/x68k/dev/grf.c Thu May 26 14:33:29 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.45
#include <miscfs/specfs/specdev.h>
+#include "ioconf.h"
+
#include "ite.h"
#if NITE == 0
#define iteon(u,f) 0
@@ -87,8 +89,6 @@ static off_t grfaddr(struct grf_softc *,
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);
Index: src/sys/arch/x68k/dev/grf_machdep.c
diff -u src/sys/arch/x68k/dev/grf_machdep.c:1.34 src/sys/arch/x68k/dev/grf_machdep.c:1.35
--- src/sys/arch/x68k/dev/grf_machdep.c:1.34 Sat Aug 7 16:19:07 2021
+++ src/sys/arch/x68k/dev/grf_machdep.c Thu May 26 14:33:29 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: grf_machdep.
#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(grfbus, 0,
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)
{
Index: src/sys/arch/x68k/dev/intio.c
diff -u src/sys/arch/x68k/dev/intio.c:1.51 src/sys/arch/x68k/dev/intio.c:1.52
--- src/sys/arch/x68k/dev/intio.c:1.51 Fri Dec 17 06:28:20 2021
+++ src/sys/arch/x68k/dev/intio.c Thu May 26 14:33:29 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.
#include <arch/x68k/dev/intiovar.h>
+#include "ioconf.h"
/*
* bus_space(9) interface
@@ -123,8 +124,6 @@ static void intio_alloc_system_ports(str
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 {
Index: src/sys/arch/x68k/dev/ite.c
diff -u src/sys/arch/x68k/dev/ite.c:1.65 src/sys/arch/x68k/dev/ite.c:1.66
--- src/sys/arch/x68k/dev/ite.c:1.65 Tue Mar 29 06:56:51 2022
+++ src/sys/arch/x68k/dev/ite.c Thu May 26 14:33:29 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.65
#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 @@ void iteattach(device_t, device_t, void
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);
Index: src/sys/arch/x68k/dev/kbd.c
diff -u src/sys/arch/x68k/dev/kbd.c:1.40 src/sys/arch/x68k/dev/kbd.c:1.41
--- src/sys/arch/x68k/dev/kbd.c:1.40 Fri Jul 25 08:10:35 2014
+++ src/sys/arch/x68k/dev/kbd.c Thu May 26 14:33:29 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.40
#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 @@ kbdenable(int mode) /* 1: interrupt, 0:
aprint_normal(" (no connected keyboard)");
}
-extern struct cfdriver kbd_cd;
-
int
kbdopen(dev_t dev, int flags, int mode, struct lwp *l)
{
Index: src/sys/arch/x68k/dev/mha.c
diff -u src/sys/arch/x68k/dev/mha.c:1.57 src/sys/arch/x68k/dev/mha.c:1.58
--- src/sys/arch/x68k/dev/mha.c:1.57 Wed May 4 07:48:34 2022
+++ src/sys/arch/x68k/dev/mha.c Thu May 26 14:33:29 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.57
#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 @@ static int mha_dataio_dma(int, int, stru
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.
*/
Index: src/sys/arch/x68k/dev/par.c
diff -u src/sys/arch/x68k/dev/par.c:1.43 src/sys/arch/x68k/dev/par.c:1.44
--- src/sys/arch/x68k/dev/par.c:1.43 Mon Sep 3 16:29:28 2018
+++ src/sys/arch/x68k/dev/par.c Thu May 26 14:33:29 2022
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: par.c,v 1.43
#include <arch/x68k/dev/intiovar.h>
+#include "ioconf.h"
+
struct par_softc {
device_t sc_dev;
@@ -115,8 +117,6 @@ void parattach(device_t, device_t, void
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);
Index: src/sys/arch/x68k/dev/powsw.c
diff -u src/sys/arch/x68k/dev/powsw.c:1.1 src/sys/arch/x68k/dev/powsw.c:1.2
--- src/sys/arch/x68k/dev/powsw.c:1.1 Sun Nov 27 09:00:32 2011
+++ src/sys/arch/x68k/dev/powsw.c Thu May 26 14:33:29 2022
@@ -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 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: powsw.c,v 1.1 2011/11/27 09:00:32 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powsw.c,v 1.2 2022/05/26 14:33:29 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,6 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: powsw.c,v 1.
#include <dev/sysmon/sysmonvar.h>
#include <dev/sysmon/sysmon_taskq.h>
+#include "ioconf.h"
+
extern int power_switch_is_off; /* XXX should be in .h */
//#define POWSW_DEBUG
@@ -89,8 +91,6 @@ struct powsw_softc {
#endif
};
-extern struct cfdriver powsw_cd;
-
static int powsw_match(device_t, cfdata_t, void *);
static void powsw_attach(device_t, device_t, void *);
static int powsw_intr(void *);
Index: src/sys/arch/x68k/dev/sram.c
diff -u src/sys/arch/x68k/dev/sram.c:1.20 src/sys/arch/x68k/dev/sram.c:1.21
--- src/sys/arch/x68k/dev/sram.c:1.20 Fri Jul 25 08:10:35 2014
+++ src/sys/arch/x68k/dev/sram.c Thu May 26 14:33:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sram.c,v 1.20 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: sram.c,v 1.21 2022/05/26 14:33:29 tsutsui Exp $ */
/*
* Copyright (c) 1994 Kazuhisa Shimizu.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sram.c,v 1.20 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sram.c,v 1.21 2022/05/26 14:33:29 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,6 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: sram.c,v 1.2
#include <x68k/dev/intiovar.h>
#include <x68k/dev/sramvar.h>
+#include "ioconf.h"
+
#define SRAM_ADDR (0xed0000)
#ifdef DEBUG
@@ -65,8 +67,6 @@ int sramdebug = SRAM_DEBUG_IOCTL;
int srammatch(device_t, cfdata_t, void *);
void sramattach(device_t, device_t, void *);
-extern struct cfdriver sram_cd;
-
dev_type_open(sramopen);
dev_type_close(sramclose);
dev_type_ioctl(sramioctl);
Index: src/sys/arch/x68k/dev/vs.c
diff -u src/sys/arch/x68k/dev/vs.c:1.55 src/sys/arch/x68k/dev/vs.c:1.56
--- src/sys/arch/x68k/dev/vs.c:1.55 Sat Aug 21 10:18:14 2021
+++ src/sys/arch/x68k/dev/vs.c Thu May 26 14:33:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vs.c,v 1.55 2021/08/21 10:18:14 andvar Exp $ */
+/* $NetBSD: vs.c,v 1.56 2022/05/26 14:33:29 tsutsui Exp $ */
/*
* Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.55 2021/08/21 10:18:14 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.56 2022/05/26 14:33:29 tsutsui Exp $");
#include "audio.h"
#include "vs.h"
@@ -55,6 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.55
#include <arch/x68k/dev/vsvar.h>
+#include "ioconf.h"
+
#ifdef VS_DEBUG
#define DPRINTF(y,x) if (vs_debug >= (y)) printf x
static int vs_debug;
@@ -98,8 +100,6 @@ static void vs_get_locks(void *, kmutex_
static int vs_round_sr(u_long);
static inline void vs_set_panout(struct vs_softc *, u_long);
-extern struct cfdriver vs_cd;
-
CFATTACH_DECL_NEW(vs, sizeof(struct vs_softc),
vs_match, vs_attach, NULL, NULL);
