Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/rump/dev/lib use ioconf files for pseudo-device attach p...
details: https://anonhg.NetBSD.org/src/rev/50f5e06c1658
branches: trunk
changeset: 810167:50f5e06c1658
user: christos <christos%NetBSD.org@localhost>
date: Thu Aug 20 11:51:12 2015 +0000
description:
use ioconf files for pseudo-device attach prototypes
diffstat:
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(-)
diffs (truncated from 349 to 300 lines):
diff -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libcgd/CGD.ioconf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libcgd/CGD.ioconf Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libcgd/Makefile
--- a/sys/rump/dev/lib/libcgd/Makefile Thu Aug 20 11:42:56 2015 +0000
+++ b/sys/rump/dev/lib/libcgd/Makefile Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libdm/DM.ioconf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libdm/DM.ioconf Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libdm/Makefile
--- a/sys/rump/dev/lib/libdm/Makefile Thu Aug 20 11:42:56 2015 +0000
+++ b/sys/rump/dev/lib/libdm/Makefile Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libfss/FSS.ioconf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libfss/FSS.ioconf Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libfss/Makefile
--- a/sys/rump/dev/lib/libfss/Makefile Thu Aug 20 11:42:56 2015 +0000
+++ b/sys/rump/dev/lib/libfss/Makefile Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libnetsmb/Makefile
--- a/sys/rump/dev/lib/libnetsmb/Makefile Thu Aug 20 11:42:56 2015 +0000
+++ b/sys/rump/dev/lib/libnetsmb/Makefile Thu Aug 20 11:51:12 2015 +0000
@@ -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+= -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libnetsmb/NETSMB.ioconf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libnetsmb/NETSMB.ioconf Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libnetsmb/netsmb_component.c
--- a/sys/rump/dev/lib/libnetsmb/netsmb_component.c Thu Aug 20 11:42:56 2015 +0000
+++ b/sys/rump/dev/lib/libnetsmb/netsmb_component.c Thu Aug 20 11:51:12 2015 +0000
@@ -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 @@
#include "rump_dev_private.h"
#include "rump_vfs_private.h"
-void nsmbattach(int); /* XXX */
+#include "ioconf.h"
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
diff -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libopencrypto/Makefile
--- a/sys/rump/dev/lib/libopencrypto/Makefile Thu Aug 20 11:42:56 2015 +0000
+++ b/sys/rump/dev/lib/libopencrypto/Makefile Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libopencrypto/opencrypto_component.c
--- a/sys/rump/dev/lib/libopencrypto/opencrypto_component.c Thu Aug 20 11:42:56 2015 +0000
+++ b/sys/rump/dev/lib/libopencrypto/opencrypto_component.c Thu Aug 20 11:51:12 2015 +0000
@@ -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 @@
#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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libraidframe/Makefile
--- a/sys/rump/dev/lib/libraidframe/Makefile Thu Aug 20 11:42:56 2015 +0000
+++ b/sys/rump/dev/lib/libraidframe/Makefile Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/libraidframe/raidframe_component.c
--- a/sys/rump/dev/lib/libraidframe/raidframe_component.c Thu Aug 20 11:42:56 2015 +0000
+++ b/sys/rump/dev/lib/libraidframe/raidframe_component.c Thu Aug 20 11:51:12 2015 +0000
@@ -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 @@
#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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/librnd/Makefile
--- a/sys/rump/dev/lib/librnd/Makefile Thu Aug 20 11:42:56 2015 +0000
+++ b/sys/rump/dev/lib/librnd/Makefile Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/librnd/RND.ioconf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/librnd/RND.ioconf Thu Aug 20 11:51:12 2015 +0000
@@ -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 -r 2df8322a0731 -r 50f5e06c1658 sys/rump/dev/lib/librnd/rnd_component.c
--- a/sys/rump/dev/lib/librnd/rnd_component.c Thu Aug 20 11:42:56 2015 +0000
+++ b/sys/rump/dev/lib/librnd/rnd_component.c Thu Aug 20 11:51:12 2015 +0000
@@ -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 $ */
Home |
Main Index |
Thread Index |
Old Index