From f2fa9ab00d59bf4ff536283308f839525a5ac169 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Thu, 20 Aug 2015 11:51:12 +0000
Subject: [PATCH] use ioconf files for pseudo-device attach prototypes

---
 sys/rump/dev/lib/libcgd/CGD.ioconf                    | 8 ++++++++
 sys/rump/dev/lib/libcgd/Makefile                      | 4 ++--
 sys/rump/dev/lib/libdm/DM.ioconf                      | 8 ++++++++
 sys/rump/dev/lib/libdm/Makefile                       | 4 ++--
 sys/rump/dev/lib/libfss/FSS.ioconf                    | 8 ++++++++
 sys/rump/dev/lib/libfss/Makefile                      | 4 ++--
 sys/rump/dev/lib/libnetsmb/Makefile                   | 6 +++---
 sys/rump/dev/lib/libnetsmb/NETSMB.ioconf              | 8 ++++++++
 sys/rump/dev/lib/libnetsmb/netsmb_component.c         | 6 +++---
 sys/rump/dev/lib/libopencrypto/Makefile               | 4 ++--
 sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf      | 9 +++++++++
 sys/rump/dev/lib/libopencrypto/opencrypto_component.c | 8 ++++----
 sys/rump/dev/lib/libraidframe/Makefile                | 6 ++----
 sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf        | 8 ++++++++
 sys/rump/dev/lib/libraidframe/raidframe_component.c   | 8 ++++----
 sys/rump/dev/lib/librnd/Makefile                      | 4 ++--
 sys/rump/dev/lib/librnd/RND.ioconf                    | 8 ++++++++
 sys/rump/dev/lib/librnd/rnd_component.c               | 6 +++---
 sys/rump/dev/lib/libvnd/Makefile                      | 4 ++--
 sys/rump/dev/lib/libvnd/VND.ioconf                    | 8 ++++++++
 20 files changed, 96 insertions(+), 33 deletions(-)
 create mode 100644 sys/rump/dev/lib/libcgd/CGD.ioconf
 create mode 100644 sys/rump/dev/lib/libdm/DM.ioconf
 create mode 100644 sys/rump/dev/lib/libfss/FSS.ioconf
 create mode 100644 sys/rump/dev/lib/libnetsmb/NETSMB.ioconf
 create mode 100644 sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf
 create mode 100644 sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf
 create mode 100644 sys/rump/dev/lib/librnd/RND.ioconf
 create mode 100644 sys/rump/dev/lib/libvnd/VND.ioconf

diff --git a/sys/rump/dev/lib/libcgd/CGD.ioconf b/sys/rump/dev/lib/libcgd/CGD.ioconf
new file mode 100644
index 000000000000..393e0cb4f530
--- /dev/null
+++ b/sys/rump/dev/lib/libcgd/CGD.ioconf
@@ -0,0 +1,8 @@
+#	$NetBSD: CGD.ioconf,v 1.1 2015/08/20 11:51:12 christos Exp $
+#
+
+ioconf cgd
+
+include "conf/files"
+
+pseudo-device	cgd
diff --git a/sys/rump/dev/lib/libcgd/Makefile b/sys/rump/dev/lib/libcgd/Makefile
index 69d7da1e93b4..e4624d6a578e 100644
--- a/sys/rump/dev/lib/libcgd/Makefile
+++ b/sys/rump/dev/lib/libcgd/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.4 2014/03/13 01:50:51 pooka Exp $
+#	$NetBSD: Makefile,v 1.5 2015/08/20 11:51:12 christos Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev
 
 LIB=	rumpdev_cgd
-
+IOCONF=	CGD.ioconf
 SRCS=   cgd.c cgd_crypto.c
 
 SRCS+=	cgd_component.c
diff --git a/sys/rump/dev/lib/libdm/DM.ioconf b/sys/rump/dev/lib/libdm/DM.ioconf
new file mode 100644
index 000000000000..0da052001ab2
--- /dev/null
+++ b/sys/rump/dev/lib/libdm/DM.ioconf
@@ -0,0 +1,8 @@
+#	$NetBSD: DM.ioconf,v 1.1 2015/08/20 11:51:12 christos Exp $
+#
+
+ioconf dm
+
+include "conf/files"
+
+pseudo-device	dm
diff --git a/sys/rump/dev/lib/libdm/Makefile b/sys/rump/dev/lib/libdm/Makefile
index 70d751bd5f78..52aad36e3cc7 100644
--- a/sys/rump/dev/lib/libdm/Makefile
+++ b/sys/rump/dev/lib/libdm/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.4 2014/03/13 01:54:22 pooka Exp $
+#	$NetBSD: Makefile,v 1.5 2015/08/20 11:51:12 christos Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev/dm
 
 LIB=	rumpdev_dm
-
+IOCONF=	DM.ioconf
 SRCS=   device-mapper.c dm_dev.c dm_ioctl.c dm_pdev.c dm_table.c dm_target.c \
         dm_target_linear.c dm_target_stripe.c
 
diff --git a/sys/rump/dev/lib/libfss/FSS.ioconf b/sys/rump/dev/lib/libfss/FSS.ioconf
new file mode 100644
index 000000000000..0359e326eb33
--- /dev/null
+++ b/sys/rump/dev/lib/libfss/FSS.ioconf
@@ -0,0 +1,8 @@
+#	$NetBSD: FSS.ioconf,v 1.1 2015/08/20 11:51:12 christos Exp $
+#
+
+ioconf fss
+
+include "conf/files"
+
+pseudo-device	fss
diff --git a/sys/rump/dev/lib/libfss/Makefile b/sys/rump/dev/lib/libfss/Makefile
index 0ff6a0100863..7644e07352f3 100644
--- a/sys/rump/dev/lib/libfss/Makefile
+++ b/sys/rump/dev/lib/libfss/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.2 2014/03/13 01:59:05 pooka Exp $
+#	$NetBSD: Makefile,v 1.3 2015/08/20 11:51:12 christos Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev
 
 LIB=	rumpdev_fss
-
+IOCONF=	FSS.ioconf
 SRCS=   fss.c
 
 SRCS+=	fss_component.c
diff --git a/sys/rump/dev/lib/libnetsmb/Makefile b/sys/rump/dev/lib/libnetsmb/Makefile
index 92fe10aca21c..7bd591b674e5 100644
--- a/sys/rump/dev/lib/libnetsmb/Makefile
+++ b/sys/rump/dev/lib/libnetsmb/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.5 2014/11/15 18:49:04 nakayama Exp $
+#	$NetBSD: Makefile,v 1.6 2015/08/20 11:51:12 christos Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../netsmb
 
 LIB=	rumpdev_netsmb
-
+IOCONF=	NETSMB.ioconf
 SRCS=	iconv.c smb_conn.c smb_crypt.c smb_dev.c smb_iod.c smb_rq.c	\
 	smb_smb.c smb_subr.c smb_trantcp.c smb_usr.c subr_mchain.c
 
@@ -14,7 +14,7 @@ CPPFLAGS+=	-I${RUMPTOP}/librump/rumpvfs
 #CPPFLAGS+=	-DSMB_SOCKET_DEBUG -DSMB_IOD_DEBUG
 
 SRCS+=	netsmb_iconv.c
-RUMPCOMP_USER_SRCS=	netsmb_user.c
+#RUMPCOMP_USER_SRCS=	netsmb_user.c
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff --git a/sys/rump/dev/lib/libnetsmb/NETSMB.ioconf b/sys/rump/dev/lib/libnetsmb/NETSMB.ioconf
new file mode 100644
index 000000000000..2a492fb3d4b5
--- /dev/null
+++ b/sys/rump/dev/lib/libnetsmb/NETSMB.ioconf
@@ -0,0 +1,8 @@
+#	$NetBSD: NETSMB.ioconf,v 1.1 2015/08/20 11:51:12 christos Exp $
+#
+
+ioconf netsmb
+
+include "conf/files"
+
+pseudo-device	nsmb
diff --git a/sys/rump/dev/lib/libnetsmb/netsmb_component.c b/sys/rump/dev/lib/libnetsmb/netsmb_component.c
index bd62832618bc..ef9de5647675 100644
--- a/sys/rump/dev/lib/libnetsmb/netsmb_component.c
+++ b/sys/rump/dev/lib/libnetsmb/netsmb_component.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netsmb_component.c,v 1.2 2014/07/18 16:25:17 maxv Exp $	*/
+/*	$NetBSD: netsmb_component.c,v 1.3 2015/08/20 11:51:12 christos Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netsmb_component.c,v 1.2 2014/07/18 16:25:17 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netsmb_component.c,v 1.3 2015/08/20 11:51:12 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: netsmb_component.c,v 1.2 2014/07/18 16:25:17 maxv Ex
 #include "rump_dev_private.h"
 #include "rump_vfs_private.h"
 
-void nsmbattach(int); /* XXX */
+#include "ioconf.h"
 
 RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 {
diff --git a/sys/rump/dev/lib/libopencrypto/Makefile b/sys/rump/dev/lib/libopencrypto/Makefile
index d28fda4674d0..d99def261752 100644
--- a/sys/rump/dev/lib/libopencrypto/Makefile
+++ b/sys/rump/dev/lib/libopencrypto/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.7 2014/03/13 01:51:30 pooka Exp $
+#	$NetBSD: Makefile,v 1.8 2015/08/20 11:51:12 christos Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../opencrypto
 
 LIB=	rumpdev_opencrypto
-
+IOCONF=	OPENCRYPTO.ioconf
 SRCS=	opencrypto_component.c
 
 # Sources for crypto framework
diff --git a/sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf b/sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf
new file mode 100644
index 000000000000..bc0701939502
--- /dev/null
+++ b/sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf
@@ -0,0 +1,9 @@
+#	$NetBSD: OPENCRYPTO.ioconf,v 1.1 2015/08/20 11:51:12 christos Exp $
+
+ioconf		opencrypto
+
+include		"conf/files"
+
+pseudo-device   opencrypto
+pseudo-device   crypto
+pseudo-device   swcrypto
diff --git a/sys/rump/dev/lib/libopencrypto/opencrypto_component.c b/sys/rump/dev/lib/libopencrypto/opencrypto_component.c
index cb76cdfc780c..7c710085ddce 100644
--- a/sys/rump/dev/lib/libopencrypto/opencrypto_component.c
+++ b/sys/rump/dev/lib/libopencrypto/opencrypto_component.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: opencrypto_component.c,v 1.2 2015/04/13 16:46:33 riastradh Exp $ */
+/*	$NetBSD: opencrypto_component.c,v 1.3 2015/08/20 11:51:12 christos Exp $ */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opencrypto_component.c,v 1.2 2015/04/13 16:46:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opencrypto_component.c,v 1.3 2015/08/20 11:51:12 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -38,8 +38,8 @@ __KERNEL_RCSID(0, "$NetBSD: opencrypto_component.c,v 1.2 2015/04/13 16:46:33 ria
 #include "rump_dev_private.h"
 #include "rump_vfs_private.h"
 
-void cryptoattach(int);
-void swcryptoattach(int);
+#include "ioconf.h"
+
 void crypto_init(void);
 
 RUMP_COMPONENT(RUMP_COMPONENT_DEV)
diff --git a/sys/rump/dev/lib/libraidframe/Makefile b/sys/rump/dev/lib/libraidframe/Makefile
index 2c420e565f26..a1394796fbf9 100644
--- a/sys/rump/dev/lib/libraidframe/Makefile
+++ b/sys/rump/dev/lib/libraidframe/Makefile
@@ -1,12 +1,10 @@
-#	$NetBSD: Makefile,v 1.6 2015/04/23 14:49:26 pooka Exp $
+#	$NetBSD: Makefile,v 1.7 2015/08/20 11:51:12 christos Exp $
 #
 
-.include <bsd.init.mk>
-
 .PATH:	${.CURDIR}/../../../../dev/raidframe
 
 LIB=	rumpdev_raidframe
-
+IOCONF=	RAIDFRAME.ioconf
 SRCS=   rf_acctrace.c rf_alloclist.c rf_aselect.c rf_callback.c		\
 	rf_chaindecluster.c rf_copyback.c rf_cvscan.c rf_dagdegrd.c	\
 	rf_dagdegwr.c rf_dagffrd.c rf_dagffwr.c rf_dagfuncs.c		\
diff --git a/sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf b/sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf
new file mode 100644
index 000000000000..ca3090c3d135
--- /dev/null
+++ b/sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf
@@ -0,0 +1,8 @@
+#	$NetBSD: RAIDFRAME.ioconf,v 1.1 2015/08/20 11:51:12 christos Exp $
+#
+
+ioconf raidframe
+
+include "conf/files"
+
+pseudo-device	raid
diff --git a/sys/rump/dev/lib/libraidframe/raidframe_component.c b/sys/rump/dev/lib/libraidframe/raidframe_component.c
index 365d6eb02d4d..6ed79e7bcdf1 100644
--- a/sys/rump/dev/lib/libraidframe/raidframe_component.c
+++ b/sys/rump/dev/lib/libraidframe/raidframe_component.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: raidframe_component.c,v 1.1 2014/03/13 01:49:59 pooka Exp $	*/
+/*	$NetBSD: raidframe_component.c,v 1.2 2015/08/20 11:51:12 christos Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raidframe_component.c,v 1.1 2014/03/13 01:49:59 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raidframe_component.c,v 1.2 2015/08/20 11:51:12 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -37,9 +37,9 @@ __KERNEL_RCSID(0, "$NetBSD: raidframe_component.c,v 1.1 2014/03/13 01:49:59 pook
 #include "rump_dev_private.h"
 #include "rump_vfs_private.h"
 
-CFDRIVER_DECL(raid, DV_DISK, NULL);
+#include "ioconf.h"
 
-void raidattach(int);
+CFDRIVER_DECL(raid, DV_DISK, NULL);
 
 RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 {
diff --git a/sys/rump/dev/lib/librnd/Makefile b/sys/rump/dev/lib/librnd/Makefile
index 5c0896c15b7d..5ee3e89147f8 100644
--- a/sys/rump/dev/lib/librnd/Makefile
+++ b/sys/rump/dev/lib/librnd/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.8 2015/04/14 13:32:34 riastradh Exp $
+#	$NetBSD: Makefile,v 1.9 2015/08/20 11:51:12 christos Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev
 
 LIB=	rumpdev_rnd
-
+IOCONF=	RND.ioconf
 SRCS=	rndpseudo.c
 
 SRCS+=	rnd_component.c
diff --git a/sys/rump/dev/lib/librnd/RND.ioconf b/sys/rump/dev/lib/librnd/RND.ioconf
new file mode 100644
index 000000000000..76f1c9fa4af2
--- /dev/null
+++ b/sys/rump/dev/lib/librnd/RND.ioconf
@@ -0,0 +1,8 @@
+#	$NetBSD: RND.ioconf,v 1.1 2015/08/20 11:51:12 christos Exp $
+#
+
+ioconf rnd
+
+include "conf/files"
+
+pseudo-device	rnd
diff --git a/sys/rump/dev/lib/librnd/rnd_component.c b/sys/rump/dev/lib/librnd/rnd_component.c
index 9b56bc75523f..b24015fbfae2 100644
--- a/sys/rump/dev/lib/librnd/rnd_component.c
+++ b/sys/rump/dev/lib/librnd/rnd_component.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rnd_component.c,v 1.1 2014/03/13 01:52:37 pooka Exp $	*/
+/*	$NetBSD: rnd_component.c,v 1.2 2015/08/20 11:51:12 christos Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rnd_component.c,v 1.1 2014/03/13 01:52:37 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd_component.c,v 1.2 2015/08/20 11:51:12 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: rnd_component.c,v 1.1 2014/03/13 01:52:37 pooka Exp
 #include "rump_dev_private.h"
 #include "rump_vfs_private.h"
 
-void rndattach(int);
+#include "ioconf.h"
 
 RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 {
diff --git a/sys/rump/dev/lib/libvnd/Makefile b/sys/rump/dev/lib/libvnd/Makefile
index b143a3979068..e4fe4b4f4a29 100644
--- a/sys/rump/dev/lib/libvnd/Makefile
+++ b/sys/rump/dev/lib/libvnd/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2014/07/17 08:16:12 prlw1 Exp $
+#	$NetBSD: Makefile,v 1.2 2015/08/20 11:51:12 christos Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev
 
 LIB=	rumpdev_vnd
-
+IOCONF=	VND.ioconf
 SRCS=   vnd.c
 
 SRCS+=	vnd_component.c
diff --git a/sys/rump/dev/lib/libvnd/VND.ioconf b/sys/rump/dev/lib/libvnd/VND.ioconf
new file mode 100644
index 000000000000..a3f17ac63608
--- /dev/null
+++ b/sys/rump/dev/lib/libvnd/VND.ioconf
@@ -0,0 +1,8 @@
+#	$NetBSD: VND.ioconf,v 1.1 2015/08/20 11:51:12 christos Exp $
+#
+
+ioconf vnd
+
+include "conf/files"
+
+pseudo-device	vnd