Module Name: src Committed By: pooka Date: Tue Dec 7 21:38:07 UTC 2010
Modified Files: src/sys/rump/dev: Makefile.rumpdevcomp Added Files: src/sys/rump/dev/lib/libdrvctl: DRVCTL.ioconf Makefile component.c shlib_version Log Message: add drvctl component To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/Makefile.rumpdevcomp cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libdrvctl/DRVCTL.ioconf \ src/sys/rump/dev/lib/libdrvctl/Makefile \ src/sys/rump/dev/lib/libdrvctl/component.c \ src/sys/rump/dev/lib/libdrvctl/shlib_version 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/Makefile.rumpdevcomp diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.4 src/sys/rump/dev/Makefile.rumpdevcomp:1.5 --- src/sys/rump/dev/Makefile.rumpdevcomp:1.4 Tue Dec 7 17:25:40 2010 +++ src/sys/rump/dev/Makefile.rumpdevcomp Tue Dec 7 21:38:07 2010 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.rumpdevcomp,v 1.4 2010/12/07 17:25:40 pooka Exp $ +# $NetBSD: Makefile.rumpdevcomp,v 1.5 2010/12/07 21:38:07 pooka Exp $ # -RUMPDEVCOMP= audio bpf cgd disk dm fss md netsmb pad putter raidframe \ - rnd scsipi scsitest sysmon wscons +RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad putter \ + raidframe rnd scsipi scsitest sysmon wscons RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb Added files: Index: src/sys/rump/dev/lib/libdrvctl/DRVCTL.ioconf diff -u /dev/null src/sys/rump/dev/lib/libdrvctl/DRVCTL.ioconf:1.1 --- /dev/null Tue Dec 7 21:38:08 2010 +++ src/sys/rump/dev/lib/libdrvctl/DRVCTL.ioconf Tue Dec 7 21:38:07 2010 @@ -0,0 +1,8 @@ +# $NetBSD: DRVCTL.ioconf,v 1.1 2010/12/07 21:38:07 pooka Exp $ +# + +ioconf drvctl + +include "conf/files" + +pseudo-device drvctl Index: src/sys/rump/dev/lib/libdrvctl/Makefile diff -u /dev/null src/sys/rump/dev/lib/libdrvctl/Makefile:1.1 --- /dev/null Tue Dec 7 21:38:08 2010 +++ src/sys/rump/dev/lib/libdrvctl/Makefile Tue Dec 7 21:38:07 2010 @@ -0,0 +1,13 @@ +# $NetBSD: Makefile,v 1.1 2010/12/07 21:38:07 pooka Exp $ +# + +.PATH: ${.CURDIR}/../../../../kern + +LIB= rumpdev_drvctl +IOCONF= DRVCTL.ioconf + +SRCS= kern_drvctl.c +SRCS+= component.c + +.include <bsd.lib.mk> +.include <bsd.klinks.mk> Index: src/sys/rump/dev/lib/libdrvctl/component.c diff -u /dev/null src/sys/rump/dev/lib/libdrvctl/component.c:1.1 --- /dev/null Tue Dec 7 21:38:08 2010 +++ src/sys/rump/dev/lib/libdrvctl/component.c Tue Dec 7 21:38:07 2010 @@ -0,0 +1,55 @@ +/* $NetBSD: component.c,v 1.1 2010/12/07 21:38:07 pooka Exp $ */ + +/* + * Copyright (c) 2010 Antti Kantee. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2010/12/07 21:38:07 pooka Exp $"); + +#include <sys/param.h> +#include <sys/conf.h> +#include <sys/device.h> +#include <sys/stat.h> + +#include "ioconf.c" + +#include "rump_private.h" + +RUMP_COMPONENT(RUMP_COMPONENT_DEV) +{ + extern const struct cdevsw drvctl_cdevsw; + devmajor_t bmaj, cmaj; + int error; + + drvctl_init(); + + config_init_component(cfdriver_ioconf_drvctl, + cfattach_ioconf_drvctl, cfdata_ioconf_drvctl); + + bmaj = cmaj = NODEVMAJOR; + if ((error = devsw_attach("drvctl", NULL, &bmaj, + &drvctl_cdevsw, &cmaj)) != 0) + panic("audio devsw attach failed: %d", error); +} Index: src/sys/rump/dev/lib/libdrvctl/shlib_version diff -u /dev/null src/sys/rump/dev/lib/libdrvctl/shlib_version:1.1 --- /dev/null Tue Dec 7 21:38:08 2010 +++ src/sys/rump/dev/lib/libdrvctl/shlib_version Tue Dec 7 21:38:07 2010 @@ -0,0 +1,4 @@ +# $NetBSD: shlib_version,v 1.1 2010/12/07 21:38:07 pooka Exp $ +# +major=0 +minor=0