From fe98957153785bbc3866387b2102d6a66b6e005a Mon Sep 17 00:00:00 2001 From: pooka Date: Thu, 31 Mar 2011 08:22:54 +0000 Subject: [PATCH] add pud as a rump component --- sys/rump/dev/Makefile.rumpdevcomp | 6 ++-- sys/rump/dev/lib/libputter/Makefile | 12 ++++--- sys/rump/dev/lib/libputter/component.c | 45 ++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 sys/rump/dev/lib/libputter/component.c diff --git a/sys/rump/dev/Makefile.rumpdevcomp b/sys/rump/dev/Makefile.rumpdevcomp index d44a13b28e34..e937cfba351b 100644 --- a/sys/rump/dev/Makefile.rumpdevcomp +++ b/sys/rump/dev/Makefile.rumpdevcomp @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.rumpdevcomp,v 1.5 2010/12/07 21:38:07 pooka Exp $ +# $NetBSD: Makefile.rumpdevcomp,v 1.6 2011/03/31 08:22:54 pooka Exp $ # -RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad putter \ - raidframe rnd scsipi scsitest sysmon wscons +RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad pud \ + putter raidframe rnd scsipi scsitest sysmon wscons RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb diff --git a/sys/rump/dev/lib/libputter/Makefile b/sys/rump/dev/lib/libputter/Makefile index 10872b24e5a0..9ae6a324234b 100644 --- a/sys/rump/dev/lib/libputter/Makefile +++ b/sys/rump/dev/lib/libputter/Makefile @@ -1,11 +1,15 @@ -# $NetBSD: Makefile,v 1.1 2010/06/30 16:14:18 pooka Exp $ +# $NetBSD: Makefile,v 1.2 2011/03/31 08:22:54 pooka Exp $ # -.PATH: ${.CURDIR}/../../../../dev/putter +.PATH: ${.CURDIR}/../../../../dev/pud -LIB= rumpdev_putter +LIB= rumpdev_pud -SRCS= putter.c +SRCS= pud.c pud_dev.c + +SRCS+= component.c + +CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs .include .include diff --git a/sys/rump/dev/lib/libputter/component.c b/sys/rump/dev/lib/libputter/component.c new file mode 100644 index 000000000000..24e51f4bbe5f --- /dev/null +++ b/sys/rump/dev/lib/libputter/component.c @@ -0,0 +1,45 @@ +/* $NetBSD: component.c,v 1.1 2011/03/31 08:22:54 pooka Exp $ */ + +/* + * Copyright (c) 2009 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 +__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2011/03/31 08:22:54 pooka Exp $"); + +#include +#include +#include +#include + +#include "rump_private.h" +#include "rump_vfs_private.h" + +RUMP_COMPONENT(RUMP_COMPONENT_DEV) +{ + int error; + + if ((error = rump_vfs_makeonedevnode(S_IFCHR, "/dev/pud", 178, 1)) != 0) + panic("cannot create raw cgd dev nodes: %d", error); +}