Module Name: src
Committed By: christos
Date: Thu Aug 20 11:51:12 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libcgd: Makefile
src/sys/rump/dev/lib/libdm: Makefile
src/sys/rump/dev/lib/libfss: Makefile
src/sys/rump/dev/lib/libnetsmb: Makefile netsmb_component.c
src/sys/rump/dev/lib/libopencrypto: Makefile opencrypto_component.c
src/sys/rump/dev/lib/libraidframe: Makefile raidframe_component.c
src/sys/rump/dev/lib/librnd: Makefile rnd_component.c
src/sys/rump/dev/lib/libvnd: Makefile
Added Files:
src/sys/rump/dev/lib/libcgd: CGD.ioconf
src/sys/rump/dev/lib/libdm: DM.ioconf
src/sys/rump/dev/lib/libfss: FSS.ioconf
src/sys/rump/dev/lib/libnetsmb: NETSMB.ioconf
src/sys/rump/dev/lib/libopencrypto: OPENCRYPTO.ioconf
src/sys/rump/dev/lib/libraidframe: RAIDFRAME.ioconf
src/sys/rump/dev/lib/librnd: RND.ioconf
src/sys/rump/dev/lib/libvnd: VND.ioconf
Log Message:
use ioconf files for pseudo-device attach prototypes
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libcgd/CGD.ioconf
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libcgd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libdm/DM.ioconf
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libdm/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libfss/FSS.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libfss/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libnetsmb/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libnetsmb/NETSMB.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libnetsmb/netsmb_component.c
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libopencrypto/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf
cvs rdiff -u -r1.2 -r1.3 \
src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libraidframe/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf
cvs rdiff -u -r1.1 -r1.2 \
src/sys/rump/dev/lib/libraidframe/raidframe_component.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/librnd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/librnd/RND.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/librnd/rnd_component.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libvnd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libvnd/VND.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libcgd/Makefile
diff -u src/sys/rump/dev/lib/libcgd/Makefile:1.4 src/sys/rump/dev/lib/libcgd/Makefile:1.5
--- src/sys/rump/dev/lib/libcgd/Makefile:1.4 Wed Mar 12 21:50:51 2014
+++ src/sys/rump/dev/lib/libcgd/Makefile Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/libdm/Makefile
diff -u src/sys/rump/dev/lib/libdm/Makefile:1.4 src/sys/rump/dev/lib/libdm/Makefile:1.5
--- src/sys/rump/dev/lib/libdm/Makefile:1.4 Wed Mar 12 21:54:22 2014
+++ src/sys/rump/dev/lib/libdm/Makefile Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/libfss/Makefile
diff -u src/sys/rump/dev/lib/libfss/Makefile:1.2 src/sys/rump/dev/lib/libfss/Makefile:1.3
--- src/sys/rump/dev/lib/libfss/Makefile:1.2 Wed Mar 12 21:59:05 2014
+++ src/sys/rump/dev/lib/libfss/Makefile Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/libnetsmb/Makefile
diff -u src/sys/rump/dev/lib/libnetsmb/Makefile:1.5 src/sys/rump/dev/lib/libnetsmb/Makefile:1.6
--- src/sys/rump/dev/lib/libnetsmb/Makefile:1.5 Sat Nov 15 13:49:04 2014
+++ src/sys/rump/dev/lib/libnetsmb/Makefile Thu Aug 20 07:51:12 2015
@@ -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>
Index: src/sys/rump/dev/lib/libnetsmb/netsmb_component.c
diff -u src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.2 src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.3
--- src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.2 Fri Jul 18 12:25:17 2014
+++ src/sys/rump/dev/lib/libnetsmb/netsmb_component.c Thu Aug 20 07:51:12 2015
@@ -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_compo
#include "rump_dev_private.h"
#include "rump_vfs_private.h"
-void nsmbattach(int); /* XXX */
+#include "ioconf.h"
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
Index: src/sys/rump/dev/lib/libopencrypto/Makefile
diff -u src/sys/rump/dev/lib/libopencrypto/Makefile:1.7 src/sys/rump/dev/lib/libopencrypto/Makefile:1.8
--- src/sys/rump/dev/lib/libopencrypto/Makefile:1.7 Wed Mar 12 21:51:30 2014
+++ src/sys/rump/dev/lib/libopencrypto/Makefile Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c
diff -u src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.2 src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.3
--- src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.2 Mon Apr 13 12:46:33 2015
+++ src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c Thu Aug 20 07:51:12 2015
@@ -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_c
#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)
Index: src/sys/rump/dev/lib/libraidframe/Makefile
diff -u src/sys/rump/dev/lib/libraidframe/Makefile:1.6 src/sys/rump/dev/lib/libraidframe/Makefile:1.7
--- src/sys/rump/dev/lib/libraidframe/Makefile:1.6 Thu Apr 23 10:49:26 2015
+++ src/sys/rump/dev/lib/libraidframe/Makefile Thu Aug 20 07:51:12 2015
@@ -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 \
Index: src/sys/rump/dev/lib/libraidframe/raidframe_component.c
diff -u src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.1 src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.2
--- src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.1 Wed Mar 12 21:49:59 2014
+++ src/sys/rump/dev/lib/libraidframe/raidframe_component.c Thu Aug 20 07:51:12 2015
@@ -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_co
#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)
{
Index: src/sys/rump/dev/lib/librnd/Makefile
diff -u src/sys/rump/dev/lib/librnd/Makefile:1.8 src/sys/rump/dev/lib/librnd/Makefile:1.9
--- src/sys/rump/dev/lib/librnd/Makefile:1.8 Tue Apr 14 09:32:34 2015
+++ src/sys/rump/dev/lib/librnd/Makefile Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/librnd/rnd_component.c
diff -u src/sys/rump/dev/lib/librnd/rnd_component.c:1.1 src/sys/rump/dev/lib/librnd/rnd_component.c:1.2
--- src/sys/rump/dev/lib/librnd/rnd_component.c:1.1 Wed Mar 12 21:52:37 2014
+++ src/sys/rump/dev/lib/librnd/rnd_component.c Thu Aug 20 07:51:12 2015
@@ -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_componen
#include "rump_dev_private.h"
#include "rump_vfs_private.h"
-void rndattach(int);
+#include "ioconf.h"
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
Index: src/sys/rump/dev/lib/libvnd/Makefile
diff -u src/sys/rump/dev/lib/libvnd/Makefile:1.1 src/sys/rump/dev/lib/libvnd/Makefile:1.2
--- src/sys/rump/dev/lib/libvnd/Makefile:1.1 Thu Jul 17 04:16:12 2014
+++ src/sys/rump/dev/lib/libvnd/Makefile Thu Aug 20 07:51:12 2015
@@ -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
Added files:
Index: src/sys/rump/dev/lib/libcgd/CGD.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libcgd/CGD.ioconf:1.1
--- /dev/null Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libcgd/CGD.ioconf Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/libdm/DM.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libdm/DM.ioconf:1.1
--- /dev/null Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libdm/DM.ioconf Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/libfss/FSS.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libfss/FSS.ioconf:1.1
--- /dev/null Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libfss/FSS.ioconf Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/libnetsmb/NETSMB.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libnetsmb/NETSMB.ioconf:1.1
--- /dev/null Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libnetsmb/NETSMB.ioconf Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf:1.1
--- /dev/null Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf:1.1
--- /dev/null Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/librnd/RND.ioconf
diff -u /dev/null src/sys/rump/dev/lib/librnd/RND.ioconf:1.1
--- /dev/null Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/librnd/RND.ioconf Thu Aug 20 07:51:12 2015
@@ -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
Index: src/sys/rump/dev/lib/libvnd/VND.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libvnd/VND.ioconf:1.1
--- /dev/null Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libvnd/VND.ioconf Thu Aug 20 07:51:12 2015
@@ -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
