summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2015-08-20 14:40:16 +0000
committerchristos <christos@NetBSD.org>2015-08-20 14:40:16 +0000
commit4bf9ea455a386e0892f874217d3a3082eedb6342 (patch)
treea4138fff0acdcd13bbbc8dbd19e1c7b6a6273c39 /sys/dev
parentbc1fa5ae49c6e3f742678ec902a8a3d75be8ccb9 (diff)
include "ioconf.h" to get the 'void <driver>attach(int count);' prototype.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/ata_raid.c7
-rw-r--r--sys/dev/bio.c8
-rw-r--r--sys/dev/bluetooth/bcsp.c5
-rw-r--r--sys/dev/bluetooth/btuart.c5
-rw-r--r--sys/dev/ccd.c7
-rw-r--r--sys/dev/cgd.c8
-rw-r--r--sys/dev/dm/device-mapper.c4
-rw-r--r--sys/dev/dmover/dmover_io.c8
-rw-r--r--sys/dev/dmover/swdmover.c8
-rw-r--r--sys/dev/filemon/filemon.c5
-rw-r--r--sys/dev/fss.c6
-rw-r--r--sys/dev/gpio/gpiosim.c4
-rw-r--r--sys/dev/hpc/biconsdev.c7
-rw-r--r--sys/dev/ir/irframe_tty.c8
-rw-r--r--sys/dev/isa/weasel_isa.c8
-rw-r--r--sys/dev/iscsi/iscsi_main.c3
-rw-r--r--sys/dev/kttcp.c8
-rw-r--r--sys/dev/lockstat.c7
-rw-r--r--sys/dev/md.c7
-rw-r--r--sys/dev/nand/nandemulator.c7
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c7
-rw-r--r--sys/dev/rndpseudo.c9
-rw-r--r--sys/dev/sequencer.c7
-rw-r--r--sys/dev/tprof/tprof.c8
-rw-r--r--sys/dev/vnd.c8
-rw-r--r--sys/dev/wscons/wsmux.c8
-rw-r--r--sys/dev/wsfont/wsfontdev.c6
27 files changed, 92 insertions, 91 deletions
diff --git a/sys/dev/ata/ata_raid.c b/sys/dev/ata/ata_raid.c
index a391f8286fb..e1ae7f8cd89 100644
--- a/sys/dev/ata/ata_raid.c
+++ b/sys/dev/ata/ata_raid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid.c,v 1.35 2012/10/27 17:18:14 chs Exp $ */
+/* $NetBSD: ata_raid.c,v 1.36 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.35 2012/10/27 17:18:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.36 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -64,6 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.35 2012/10/27 17:18:14 chs Exp $");
#include <dev/ata/ata_raidvar.h>
#include "locators.h"
+#include "ioconf.h"
#ifdef ATA_RAID_DEBUG
#define DPRINTF(x) printf x
@@ -71,8 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.35 2012/10/27 17:18:14 chs Exp $");
#define DPRINTF(x) /* nothing */
#endif
-void ataraidattach(int);
-
static int ataraid_match(device_t, cfdata_t, void *);
static void ataraid_attach(device_t, device_t, void *);
static int ataraid_print(void *, const char *);
diff --git a/sys/dev/bio.c b/sys/dev/bio.c
index 127d0fc5c36..50505296ac2 100644
--- a/sys/dev/bio.c
+++ b/sys/dev/bio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bio.c,v 1.12 2015/03/12 15:33:10 christos Exp $ */
+/* $NetBSD: bio.c,v 1.13 2015/08/20 14:40:17 christos Exp $ */
/* $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $ */
/*
@@ -28,7 +28,7 @@
/* A device controller ioctl tunnelling device. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.12 2015/03/12 15:33:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13 2015/08/20 14:40:17 christos Exp $");
#include "opt_compat_netbsd.h"
@@ -47,6 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.12 2015/03/12 15:33:10 christos Exp $");
#include <dev/biovar.h>
#include <dev/sysmon/sysmonvar.h>
+#include "ioconf.h"
+
struct bio_mapping {
LIST_ENTRY(bio_mapping) bm_link;
device_t bm_dev;
@@ -66,8 +68,6 @@ static int bio_delegate_ioctl(void *, u_long, void *);
static struct bio_mapping *bio_lookup(char *);
static int bio_validate(void *);
-void bioattach(int);
-
const struct cdevsw bio_cdevsw = {
.d_open = bioopen,
.d_close = bioclose,
diff --git a/sys/dev/bluetooth/bcsp.c b/sys/dev/bluetooth/bcsp.c
index 7600046aa62..6215eef1527 100644
--- a/sys/dev/bluetooth/bcsp.c
+++ b/sys/dev/bluetooth/bcsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bcsp.c,v 1.28 2015/05/08 11:47:53 christos Exp $ */
+/* $NetBSD: bcsp.c,v 1.29 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.28 2015/05/08 11:47:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.29 2015/08/20 14:40:17 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -131,7 +131,6 @@ struct bcsp_softc {
#define BCSP_XMIT (1 << 0) /* transmit active */
#define BCSP_ENABLED (1 << 1) /* is enabled */
-void bcspattach(int);
static int bcsp_match(device_t, cfdata_t, void *);
static void bcsp_attach(device_t, device_t, void *);
static int bcsp_detach(device_t, int);
diff --git a/sys/dev/bluetooth/btuart.c b/sys/dev/bluetooth/btuart.c
index f08642fe1b0..d8943b2e808 100644
--- a/sys/dev/bluetooth/btuart.c
+++ b/sys/dev/bluetooth/btuart.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btuart.c,v 1.27 2014/05/20 18:25:54 rmind Exp $ */
+/* $NetBSD: btuart.c,v 1.28 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 2006, 2007 KIYOHARA Takashi
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.27 2014/05/20 18:25:54 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.28 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -81,7 +81,6 @@ struct btuart_softc {
#define BTUART_RECV_SCO_DATA 5 /* sco packet data */
#define BTUART_RECV_EVENT_DATA 6 /* event packet data */
-void btuartattach(int);
static int btuart_match(device_t, cfdata_t, void *);
static void btuart_attach(device_t, device_t, void *);
static int btuart_detach(device_t, int);
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index bde6334ad33..eb20379a6af 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.164 2015/07/21 21:42:15 skrll Exp $ */
+/* $NetBSD: ccd.c,v 1.165 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.164 2015/07/21 21:42:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.165 2015/08/20 14:40:17 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -127,6 +127,8 @@ __KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.164 2015/07/21 21:42:15 skrll Exp $");
#include <miscfs/specfs/specdev.h> /* for v_rdev */
+#include "ioconf.h"
+
#if defined(CCDDEBUG) && !defined(DEBUG)
#define DEBUG
#endif
@@ -160,7 +162,6 @@ static pool_cache_t ccd_cache;
(MAKEDISKDEV(major((dev)), ccdunit((dev)), RAW_PART))
/* called by main() at boot time */
-void ccdattach(int);
void ccddetach(void);
/* called by biodone() at interrupt time */
diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c
index 3a25e0e2ce7..c65fe5da524 100644
--- a/sys/dev/cgd.c
+++ b/sys/dev/cgd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.101 2015/08/19 20:15:20 mlelstv Exp $ */
+/* $NetBSD: cgd.c,v 1.102 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.101 2015/08/19 20:15:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.102 2015/08/20 14:40:17 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -57,9 +57,9 @@ __KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.101 2015/08/19 20:15:20 mlelstv Exp $");
#include <miscfs/specfs/specdev.h> /* for v_rdev */
-/* Entry Point Functions */
+#include "ioconf.h"
-void cgdattach(int);
+/* Entry Point Functions */
static dev_type_open(cgdopen);
static dev_type_close(cgdclose);
diff --git a/sys/dev/dm/device-mapper.c b/sys/dev/dm/device-mapper.c
index 046ebc4636f..41a80ed7b05 100644
--- a/sys/dev/dm/device-mapper.c
+++ b/sys/dev/dm/device-mapper.c
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.36 2014/12/31 08:24:50 mlelstv Exp $ */
+/* $NetBSD: device-mapper.c,v 1.37 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -49,6 +49,7 @@
#include "netbsd-dm.h"
#include "dm.h"
+#include "ioconf.h"
static dev_type_open(dmopen);
static dev_type_close(dmclose);
@@ -59,7 +60,6 @@ static dev_type_strategy(dmstrategy);
static dev_type_size(dmsize);
/* attach and detach routines */
-void dmattach(int);
#ifdef _MODULE
static int dmdestroy(void);
#endif
diff --git a/sys/dev/dmover/dmover_io.c b/sys/dev/dmover/dmover_io.c
index 837f04a8c03..8c15e982bcb 100644
--- a/sys/dev/dmover/dmover_io.c
+++ b/sys/dev/dmover/dmover_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmover_io.c,v 1.43 2014/07/25 08:10:36 dholland Exp $ */
+/* $NetBSD: dmover_io.c,v 1.44 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.43 2014/07/25 08:10:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.44 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -81,6 +81,8 @@ __KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.43 2014/07/25 08:10:36 dholland Exp
#include <dev/dmover/dmovervar.h>
#include <dev/dmover/dmover_io.h>
+#include "ioconf.h"
+
struct dmio_usrreq_state {
union {
struct work u_work;
@@ -128,8 +130,6 @@ static void dmio_usrreq_fini1(struct work *wk, void *);
struct pool dmio_state_pool;
struct pool dmio_usrreq_state_pool;
-void dmoverioattach(int);
-
dev_type_open(dmoverioopen);
const struct cdevsw dmoverio_cdevsw = {
diff --git a/sys/dev/dmover/swdmover.c b/sys/dev/dmover/swdmover.c
index c5e422cb161..e38c2a0d281 100644
--- a/sys/dev/dmover/swdmover.c
+++ b/sys/dev/dmover/swdmover.c
@@ -1,4 +1,4 @@
-/* $NetBSD: swdmover.c,v 1.12 2008/01/04 21:17:53 ad Exp $ */
+/* $NetBSD: swdmover.c,v 1.13 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swdmover.c,v 1.12 2008/01/04 21:17:53 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swdmover.c,v 1.13 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/kthread.h>
@@ -58,6 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: swdmover.c,v 1.12 2008/01/04 21:17:53 ad Exp $");
#include <dev/dmover/dmovervar.h>
+#include "ioconf.h"
+
struct swdmover_function {
void (*sdf_process)(struct dmover_request *);
};
@@ -66,8 +68,6 @@ static struct dmover_backend swdmover_backend;
static struct lwp *swdmover_lwp;
static int swdmover_cv;
-void swdmoverattach(int);
-
/*
* swdmover_process:
*
diff --git a/sys/dev/filemon/filemon.c b/sys/dev/filemon/filemon.c
index 543f9669300..f80a3d1c66c 100644
--- a/sys/dev/filemon/filemon.c
+++ b/sys/dev/filemon/filemon.c
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.10 2015/05/30 19:14:46 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.11 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -44,6 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.10 2015/05/30 19:14:46 joerg Exp $");
#include <sys/kauth.h>
#include "filemon.h"
+#include "ioconf.h"
MODULE(MODULE_CLASS_DRIVER, filemon, NULL);
@@ -337,8 +338,6 @@ filemon_load(void *dummy __unused)
filemon_wrapper_install();
}
-void filemonattach(int);
-
/*
* If this gets called we are linked into the kernel
*/
diff --git a/sys/dev/fss.c b/sys/dev/fss.c
index 7d8ee0752ce..c76d86edf1c 100644
--- a/sys/dev/fss.c
+++ b/sys/dev/fss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.92 2014/10/02 22:05:38 justin Exp $ */
+/* $NetBSD: fss.c,v 1.93 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.92 2014/10/02 22:05:38 justin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.93 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.92 2014/10/02 22:05:38 justin Exp $");
#include <uvm/uvm.h>
-void fssattach(int);
+#include "ioconf.h"
dev_type_open(fss_open);
dev_type_close(fss_close);
diff --git a/sys/dev/gpio/gpiosim.c b/sys/dev/gpio/gpiosim.c
index 18437ab64c9..35d14dc92ad 100644
--- a/sys/dev/gpio/gpiosim.c
+++ b/sys/dev/gpio/gpiosim.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiosim.c,v 1.17 2015/08/20 12:09:22 uebayasi Exp $ */
+/* $NetBSD: gpiosim.c,v 1.18 2015/08/20 14:40:18 christos Exp $ */
/* $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $ */
/*
@@ -31,6 +31,7 @@
#include <dev/gpio/gpiovar.h>
#include "gpiosim.h"
+#include "ioconf.h"
#define GPIOSIM_NPINS 64
@@ -45,7 +46,6 @@ struct gpiosim_softc {
};
static int gpiosim_match(device_t, cfdata_t, void *);
-void gpiosimattach(int);
static void gpiosim_attach(device_t, device_t, void *);
static int gpiosim_detach(device_t, int);
static int gpiosim_sysctl(SYSCTLFN_PROTO);
diff --git a/sys/dev/hpc/biconsdev.c b/sys/dev/hpc/biconsdev.c
index b98782e9827..abfb5448996 100644
--- a/sys/dev/hpc/biconsdev.c
+++ b/sys/dev/hpc/biconsdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: biconsdev.c,v 1.22 2014/07/25 08:10:37 dholland Exp $ */
+/* $NetBSD: biconsdev.c,v 1.23 2015/08/20 14:40:18 christos Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.22 2014/07/25 08:10:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.23 2015/08/20 14:40:18 christos Exp $");
#include "biconsdev.h"
#include <sys/param.h>
@@ -83,8 +83,9 @@ __KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.22 2014/07/25 08:10:37 dholland Exp
#include <dev/hpc/bicons.h>
#include <dev/hpc/biconsvar.h>
+#include "ioconf.h"
+
struct tty biconsdev_tty[NBICONSDEV];
-void biconsdevattach(int);
static void biconsdev_output(struct tty *);
dev_type_open(biconsdevopen);
diff --git a/sys/dev/ir/irframe_tty.c b/sys/dev/ir/irframe_tty.c
index 5a1742dbb6e..bc9e14c98dd 100644
--- a/sys/dev/ir/irframe_tty.c
+++ b/sys/dev/ir/irframe_tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.60 2014/11/16 16:20:00 ozaki-r Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.61 2015/08/20 14:40:18 christos Exp $ */
/*
* TODO
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.60 2014/11/16 16:20:00 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.61 2015/08/20 14:40:18 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -63,6 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.60 2014/11/16 16:20:00 ozaki-r Exp
#include <dev/ir/irdaio.h>
#include <dev/ir/irframevar.h>
+#include "ioconf.h"
+
#ifdef IRFRAMET_DEBUG
#define DPRINTF(x) if (irframetdebug) printf x
int irframetdebug = 0;
@@ -124,8 +126,6 @@ int irframetioctl(struct tty *, u_long, void *, int, struct lwp *);
int irframetinput(int, struct tty *);
int irframetstart(struct tty *);
-/* pseudo device init */
-void irframettyattach(int);
/* irframe methods */
static int irframet_open(void *, int, int, struct lwp *);
diff --git a/sys/dev/isa/weasel_isa.c b/sys/dev/isa/weasel_isa.c
index e82f17c2c11..ee2669aa9ed 100644
--- a/sys/dev/isa/weasel_isa.c
+++ b/sys/dev/isa/weasel_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: weasel_isa.c,v 1.5 2008/04/08 20:08:50 cegger Exp $ */
+/* $NetBSD: weasel_isa.c,v 1.6 2015/08/20 14:40:18 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: weasel_isa.c,v 1.5 2008/04/08 20:08:50 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: weasel_isa.c,v 1.6 2015/08/20 14:40:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,14 +56,14 @@ __KERNEL_RCSID(0, "$NetBSD: weasel_isa.c,v 1.5 2008/04/08 20:08:50 cegger Exp $"
#include <dev/sysmon/sysmonvar.h>
+#include "ioconf.h"
+
int weasel_isa_wdog_setmode(struct sysmon_wdog *);
int weasel_isa_wdog_tickle(struct sysmon_wdog *);
int weasel_isa_wdog_arm_disarm(struct weasel_handle *, u_int8_t);
int weasel_isa_wdog_query_state(struct weasel_handle *);
-void pcweaselattach(int);
-
/* ARGSUSED */
void
pcweaselattach(int count)
diff --git a/sys/dev/iscsi/iscsi_main.c b/sys/dev/iscsi/iscsi_main.c
index 3ac202a82aa..7be40250602 100644
--- a/sys/dev/iscsi/iscsi_main.c
+++ b/sys/dev/iscsi/iscsi_main.c
@@ -37,6 +37,7 @@
#include <sys/kmem.h>
#include <sys/socketvar.h>
+#include "ioconf.h"
/*------------------------- Global Variables ------------------------*/
@@ -73,8 +74,6 @@ login_isid_t iscsi_InitiatorISID;
System interface: autoconf and device structures
*/
-void iscsiattach(int);
-
static void iscsi_attach(device_t parent, device_t self, void *aux);
static int iscsi_match(device_t, cfdata_t, void *);
static int iscsi_detach(device_t, int);
diff --git a/sys/dev/kttcp.c b/sys/dev/kttcp.c
index 79a11bd368f..c98a04718b4 100644
--- a/sys/dev/kttcp.c
+++ b/sys/dev/kttcp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kttcp.c,v 1.37 2014/08/08 03:05:44 rtr Exp $ */
+/* $NetBSD: kttcp.c,v 1.38 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.37 2014/08/08 03:05:44 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.38 2015/08/20 14:40:17 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -63,6 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.37 2014/08/08 03:05:44 rtr Exp $");
#include <dev/kttcpio.h>
+#include "ioconf.h"
+
static int kttcp_send(struct lwp *l, struct kttcp_io_args *);
static int kttcp_recv(struct lwp *l, struct kttcp_io_args *);
static int kttcp_sosend(struct socket *, unsigned long long,
@@ -70,8 +72,6 @@ static int kttcp_sosend(struct socket *, unsigned long long,
static int kttcp_soreceive(struct socket *, unsigned long long,
unsigned long long *, struct lwp *, int *);
-void kttcpattach(int);
-
dev_type_ioctl(kttcpioctl);
const struct cdevsw kttcp_cdevsw = {
diff --git a/sys/dev/lockstat.c b/sys/dev/lockstat.c
index 15e8ad0c781..2f1cb92365c 100644
--- a/sys/dev/lockstat.c
+++ b/sys/dev/lockstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lockstat.c,v 1.23 2015/06/07 06:08:37 matt Exp $ */
+/* $NetBSD: lockstat.c,v 1.24 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.23 2015/06/07 06:08:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.24 2015/08/20 14:40:17 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -58,6 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.23 2015/06/07 06:08:37 matt Exp $");
#include <machine/lock.h>
+#include "ioconf.h"
+
#ifndef __HAVE_CPU_COUNTER
#error CPU counters not available
#endif
@@ -85,7 +87,6 @@ typedef struct lscpu {
typedef struct lslist lslist_t;
-void lockstatattach(int);
void lockstat_start(lsenable_t *);
int lockstat_alloc(lsenable_t *);
void lockstat_init_tables(lsenable_t *);
diff --git a/sys/dev/md.c b/sys/dev/md.c
index 8867f152dc0..5d0f4a682eb 100644
--- a/sys/dev/md.c
+++ b/sys/dev/md.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.74 2015/04/26 15:15:20 mlelstv Exp $ */
+/* $NetBSD: md.c,v 1.75 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.74 2015/04/26 15:15:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.75 2015/08/20 14:40:17 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_md.h"
@@ -65,6 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: md.c,v 1.74 2015/04/26 15:15:20 mlelstv Exp $");
#include <dev/md.h>
+#include "ioconf.h"
/*
* The user-space functionality is included by default.
* Use `options MEMORY_DISK_SERVER=0' to turn it off.
@@ -93,8 +94,6 @@ struct md_softc {
#define sc_size sc_md.md_size
#define sc_type sc_md.md_type
-void mdattach(int);
-
static void md_attach(device_t, device_t, void *);
static int md_detach(device_t, int);
diff --git a/sys/dev/nand/nandemulator.c b/sys/dev/nand/nandemulator.c
index cb766638f4c..0a8a542b4d1 100644
--- a/sys/dev/nand/nandemulator.c
+++ b/sys/dev/nand/nandemulator.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nandemulator.c,v 1.6 2012/11/03 12:45:28 ahoka Exp $ */
+/* $NetBSD: nandemulator.c,v 1.7 2015/08/20 14:40:18 christos Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nandemulator.c,v 1.6 2012/11/03 12:45:28 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nandemulator.c,v 1.7 2015/08/20 14:40:18 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -46,8 +46,9 @@ __KERNEL_RCSID(0, "$NetBSD: nandemulator.c,v 1.6 2012/11/03 12:45:28 ahoka Exp $
#include <dev/nand/onfi.h>
#include <dev/nand/nand_crc.h>
+#include "ioconf.h"
+
extern struct cfdriver nandemulator_cd;
-void nandemulatorattach(int n);
static int nandemulator_match(device_t, cfdata_t, void *);
static void nandemulator_attach(device_t, device_t, void *);
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index f06584a3bc0..83e021974db 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.324 2015/07/10 09:49:56 mrg Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.325 2015/08/20 14:40:18 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.324 2015/07/10 09:49:56 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.325 2015/08/20 14:40:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -151,6 +151,8 @@ __KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.324 2015/07/10 09:49:56 mrg Exp
#include "rf_compat50.h"
#endif
+#include "ioconf.h"
+
#ifdef DEBUG
int rf_kdebug_level = 0;
#define db1_printf(a) if (rf_kdebug_level > 0) printf a
@@ -179,7 +181,6 @@ static void InitBP(struct buf *, struct vnode *, unsigned,
struct raid_softc;
static void raidinit(struct raid_softc *);
-void raidattach(int);
static int raid_match(device_t, cfdata_t, void *);
static void raid_attach(device_t, device_t, void *);
static int raid_detach(device_t, int);
diff --git a/sys/dev/rndpseudo.c b/sys/dev/rndpseudo.c
index 0dfd94978fb..77d74731c02 100644
--- a/sys/dev/rndpseudo.c
+++ b/sys/dev/rndpseudo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.34 2015/04/21 12:57:03 riastradh Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.35 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.34 2015/04/21 12:57:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.35 2015/08/20 14:40:17 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -65,6 +65,8 @@ __KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.34 2015/04/21 12:57:03 riastradh Exp
#include <dev/rnd_private.h>
+#include "ioconf.h"
+
#if defined(__HAVE_CPU_COUNTER)
#include <machine/cpu_counter.h>
#endif
@@ -104,8 +106,6 @@ static pool_cache_t rnd_ctx_cache __read_mostly;
*/
static percpu_t *percpu_urandom_cprng __read_mostly;
-/* Used by ioconf.c to attach the rnd pseudo-device. */
-void rndattach(int);
dev_type_open(rndopen);
@@ -175,6 +175,7 @@ rndpseudo_counter(void)
}
/*
+ * Used by ioconf.c to attach the rnd pseudo-device.
* `Attach' the random device. We use the timing of this event as
* another potential source of initial entropy.
*/
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c
index 8a31a30ab00..6c949c36f42 100644
--- a/sys/dev/sequencer.c
+++ b/sys/dev/sequencer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sequencer.c,v 1.63 2014/12/30 07:39:15 mrg Exp $ */
+/* $NetBSD: sequencer.c,v 1.64 2015/08/20 14:40:17 christos Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.63 2014/12/30 07:39:15 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.64 2015/08/20 14:40:17 christos Exp $");
#include "sequencer.h"
@@ -85,6 +85,8 @@ __KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.63 2014/12/30 07:39:15 mrg Exp $");
#include <dev/midivar.h>
#include <dev/sequencervar.h>
+#include "ioconf.h"
+
#define ADDTIMEVAL(a, b) ( \
(a)->tv_sec += (b)->tv_sec, \
(a)->tv_usec += (b)->tv_usec, \
@@ -117,7 +119,6 @@ typedef union sequencer_pcqitem {
char qi_msg[4];
} sequencer_pcqitem_t;
-void sequencerattach(int);
static void seq_reset(struct sequencer_softc *);
static int seq_do_command(struct sequencer_softc *, seq_event_t *);
static int seq_do_chnvoice(struct sequencer_softc *, seq_event_t *);
diff --git a/sys/dev/tprof/tprof.c b/sys/dev/tprof/tprof.c
index a629c77ef25..03ae4fb890e 100644
--- a/sys/dev/tprof/tprof.c
+++ b/sys/dev/tprof/tprof.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof.c,v 1.12 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: tprof.c,v 1.13 2015/08/20 14:40:18 christos Exp $ */
/*-
* Copyright (c)2008,2009,2010 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.12 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.13 2015/08/20 14:40:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,6 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.12 2014/07/25 08:10:39 dholland Exp $");
#include <dev/tprof/tprof.h>
#include <dev/tprof/tprof_ioctl.h>
+#include "ioconf.h"
+
/*
* locking order:
* tprof_reader_lock -> tprof_lock
@@ -502,8 +504,6 @@ tprof_backend_unregister(const char *name)
/* -------------------- cdevsw interfaces */
-void tprofattach(int);
-
static int
tprof_open(dev_t dev, int flags, int type, struct lwp *l)
{
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index b367abbf8d1..872bd851119 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.247 2015/08/02 11:40:41 mlelstv Exp $ */
+/* $NetBSD: vnd.c,v 1.248 2015/08/20 14:40:17 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.247 2015/08/02 11:40:41 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.248 2015/08/20 14:40:17 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -127,6 +127,8 @@ __KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.247 2015/08/02 11:40:41 mlelstv Exp $");
#include <dev/dkvar.h>
#include <dev/vndvar.h>
+#include "ioconf.h"
+
#if defined(VNDDEBUG) && !defined(DEBUG)
#define DEBUG
#endif
@@ -156,8 +158,6 @@ struct vndxfer {
#define VND_MAXPENDING(vnd) ((vnd)->sc_maxactive * 4)
-/* called by main() at boot time */
-void vndattach(int);
static void vndclear(struct vnd_softc *, int);
static int vnddoclear(struct vnd_softc *, int, int, bool);
diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c
index ef53f90e14c..64fb0f6cb68 100644
--- a/sys/dev/wscons/wsmux.c
+++ b/sys/dev/wscons/wsmux.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmux.c,v 1.58 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: wsmux.c,v 1.59 2015/08/20 14:40:18 christos Exp $ */
/*
* Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.58 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.59 2015/08/20 14:40:18 christos Exp $");
#include "opt_compat_netbsd.h"
#include "opt_modular.h"
@@ -70,6 +70,8 @@ __KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.58 2014/07/25 08:10:39 dholland Exp $");
#include <dev/wscons/wscons_callbacks.h>
#include <dev/wscons/wsmuxvar.h>
+#include "ioconf.h"
+
#ifdef WSMUX_DEBUG
#define DPRINTF(x) if (wsmuxdebug) printf x
#define DPRINTFN(n,x) if (wsmuxdebug > (n)) printf x
@@ -111,8 +113,6 @@ static int wsmux_do_ioctl(device_t, u_long, void *,int,struct lwp *);
static int wsmux_add_mux(int, struct wsmux_softc *);
-void wsmuxattach(int);
-
#define WSMUXDEV(n) ((n) & 0x7f)
#define WSMUXCTL(n) ((n) & 0x80)
diff --git a/sys/dev/wsfont/wsfontdev.c b/sys/dev/wsfont/wsfontdev.c
index 1580731f02e..23ac637c7ad 100644
--- a/sys/dev/wsfont/wsfontdev.c
+++ b/sys/dev/wsfont/wsfontdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfontdev.c,v 1.16 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: wsfontdev.c,v 1.17 2015/08/20 14:40:18 christos Exp $ */
/*
* Copyright (c) 2001
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.16 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.17 2015/08/20 14:40:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.16 2014/07/25 08:10:39 dholland Exp
#include <dev/wsfont/wsfont.h>
#include <dev/wscons/wsconsio.h> /* XXX */
-void wsfontattach(int);
+#include "ioconf.h"
static int wsfont_isopen;