Module Name: src
Committed By: pooka
Date: Mon Jul 20 18:09:20 UTC 2009
Modified Files:
src/sys/rump/dev: Makefile.rumpdev
Added Files:
src/sys/rump/dev/lib/libcgd: Makefile component.c shlib_version
Log Message:
Add cgd rump kernel component.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/Makefile.rumpdev
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libcgd/Makefile \
src/sys/rump/dev/lib/libcgd/component.c \
src/sys/rump/dev/lib/libcgd/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.rumpdev
diff -u src/sys/rump/dev/Makefile.rumpdev:1.1 src/sys/rump/dev/Makefile.rumpdev:1.2
--- src/sys/rump/dev/Makefile.rumpdev:1.1 Tue Jun 9 16:16:15 2009
+++ src/sys/rump/dev/Makefile.rumpdev Mon Jul 20 18:09:20 2009
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpdev,v 1.1 2009/06/09 16:16:15 pooka Exp $
+# $NetBSD: Makefile.rumpdev,v 1.2 2009/07/20 18:09:20 pooka Exp $
#
-RUMPDEVLIST= disk raidframe
+RUMPDEVLIST= cgd disk raidframe
.for var in ${RUMPDEVLIST}
RUMPDEVLIBS+=lib${var}
Added files:
Index: src/sys/rump/dev/lib/libcgd/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libcgd/Makefile:1.1
--- /dev/null Mon Jul 20 18:09:20 2009
+++ src/sys/rump/dev/lib/libcgd/Makefile Mon Jul 20 18:09:20 2009
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2009/07/20 18:09:20 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../dev
+
+LIB= rumpdev_cgd
+
+SRCS= cgd.c cgd_crypto.c
+
+SRCS+= component.c
+
+CPPFLAGS+= -Wno-pointer-sign
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/dev/lib/libcgd/component.c
diff -u /dev/null src/sys/rump/dev/lib/libcgd/component.c:1.1
--- /dev/null Mon Jul 20 18:09:20 2009
+++ src/sys/rump/dev/lib/libcgd/component.c Mon Jul 20 18:09:20 2009
@@ -0,0 +1,61 @@
+/* $NetBSD: component.c,v 1.1 2009/07/20 18:09:20 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 <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2009/07/20 18:09:20 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/stat.h>
+
+#include "rump_dev_private.h"
+
+void cgdattach(int);
+
+void
+rump_dev_cgd_init()
+{
+ extern const struct bdevsw cgd_bdevsw;
+ extern const struct cdevsw cgd_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ /* go, mydevfs */
+ bmaj = cmaj = -1;
+
+ if ((error = devsw_attach("cgd0", &cgd_bdevsw, &bmaj,
+ &cgd_cdevsw, &cmaj)) != 0)
+ panic("cannot attach cgd: %d", error);
+
+ if ((error = rump_dev_makenodes(S_IFBLK, "cgd0", 'a', bmaj, 0, 7)) != 0)
+ panic("cannot create cooked cgd dev nodes: %d", error);
+ if ((error = rump_dev_makenodes(S_IFCHR, "rcgd0",'a', cmaj, 0, 7)) != 0)
+ panic("cannot create raw cgd dev nodes: %d", error);
+
+ rump_pdev_add(cgdattach, 4);
+}
Index: src/sys/rump/dev/lib/libcgd/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libcgd/shlib_version:1.1
--- /dev/null Mon Jul 20 18:09:20 2009
+++ src/sys/rump/dev/lib/libcgd/shlib_version Mon Jul 20 18:09:20 2009
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2009/07/20 18:09:20 pooka Exp $
+#
+major=0
+minor=0
