CVS commit: src/sys/rump/dev/lib/libcgd
Module Name:src
Committed By: pooka
Date: Mon Sep 7 11:23:39 UTC 2009
Modified Files:
src/sys/rump/dev/lib/libcgd: Makefile component.c
Log Message:
ketchup: rump_dev_makenodes() -> rump_vfs_makedevnodes()
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libcgd/Makefile \
src/sys/rump/dev/lib/libcgd/component.c
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.1 src/sys/rump/dev/lib/libcgd/Makefile:1.2
--- src/sys/rump/dev/lib/libcgd/Makefile:1.1 Mon Jul 20 18:09:20 2009
+++ src/sys/rump/dev/lib/libcgd/Makefile Mon Sep 7 11:23:39 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/07/20 18:09:20 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/07 11:23:39 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev
@@ -10,6 +10,7 @@
SRCS+= component.c
CPPFLAGS+= -Wno-pointer-sign
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.include
.include
Index: src/sys/rump/dev/lib/libcgd/component.c
diff -u src/sys/rump/dev/lib/libcgd/component.c:1.1 src/sys/rump/dev/lib/libcgd/component.c:1.2
--- src/sys/rump/dev/lib/libcgd/component.c:1.1 Mon Jul 20 18:09:20 2009
+++ src/sys/rump/dev/lib/libcgd/component.c Mon Sep 7 11:23:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.1 2009/07/20 18:09:20 pooka Exp $ */
+/* $NetBSD: component.c,v 1.2 2009/09/07 11:23:39 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2009/07/20 18:09:20 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.2 2009/09/07 11:23:39 pooka Exp $");
#include
#include
@@ -34,6 +34,7 @@
#include
#include "rump_dev_private.h"
+#include "rump_vfs_private.h"
void cgdattach(int);
@@ -52,9 +53,11 @@
&cgd_cdevsw, &cmaj)) != 0)
panic("cannot attach cgd: %d", error);
- if ((error = rump_dev_makenodes(S_IFBLK, "cgd0", 'a', bmaj, 0, 7)) != 0)
+ if ((error = rump_vfs_makedevnodes(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)
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, "rcgd0",'a',
+ cmaj, 0, 7)) != 0)
panic("cannot create raw cgd dev nodes: %d", error);
rump_pdev_add(cgdattach, 4);
CVS commit: src/sys/rump/dev/lib/libcgd
Module Name:src
Committed By: pooka
Date: Wed Jan 13 00:31:57 UTC 2010
Modified Files:
src/sys/rump/dev/lib/libcgd: component.c
Log Message:
cgd is attached via the module interface now instead of pseudodevs.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libcgd/component.c
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/component.c
diff -u src/sys/rump/dev/lib/libcgd/component.c:1.4 src/sys/rump/dev/lib/libcgd/component.c:1.5
--- src/sys/rump/dev/lib/libcgd/component.c:1.4 Thu Dec 3 15:06:04 2009
+++ src/sys/rump/dev/lib/libcgd/component.c Wed Jan 13 00:31:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.4 2009/12/03 15:06:04 pooka Exp $ */
+/* $NetBSD: component.c,v 1.5 2010/01/13 00:31:57 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.4 2009/12/03 15:06:04 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.5 2010/01/13 00:31:57 pooka Exp $");
#include
#include
@@ -36,8 +36,6 @@
#include "rump_dev_private.h"
#include "rump_vfs_private.h"
-void cgdattach(int);
-
void
rump_dev_cgd_init()
{
@@ -59,6 +57,4 @@
if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/rcgd0", 'a',
cmaj, 0, 7)) != 0)
panic("cannot create raw cgd dev nodes: %d", error);
-
- rump_pdev_add(cgdattach, 4);
}
CVS commit: src/sys/rump/dev/lib/libcgd
Module Name:src
Committed By: pooka
Date: Tue Dec 1 09:04:21 UTC 2009
Modified Files:
src/sys/rump/dev/lib/libcgd: component.c
Log Message:
whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libcgd/component.c
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/component.c
diff -u src/sys/rump/dev/lib/libcgd/component.c:1.2 src/sys/rump/dev/lib/libcgd/component.c:1.3
--- src/sys/rump/dev/lib/libcgd/component.c:1.2 Mon Sep 7 11:23:39 2009
+++ src/sys/rump/dev/lib/libcgd/component.c Tue Dec 1 09:04:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.2 2009/09/07 11:23:39 pooka Exp $ */
+/* $NetBSD: component.c,v 1.3 2009/12/01 09:04:21 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.2 2009/09/07 11:23:39 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.3 2009/12/01 09:04:21 pooka Exp $");
#include
#include
@@ -56,7 +56,7 @@
if ((error = rump_vfs_makedevnodes(S_IFBLK, "cgd0", 'a',
bmaj, 0, 7)) != 0)
panic("cannot create cooked cgd dev nodes: %d", error);
- if ((error = rump_vfs_makedevnodes(S_IFCHR, "rcgd0",'a',
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, "rcgd0", 'a',
cmaj, 0, 7)) != 0)
panic("cannot create raw cgd dev nodes: %d", error);
CVS commit: src/sys/rump/dev/lib/libcgd
Module Name:src
Committed By: pooka
Date: Wed Mar 9 11:56:17 UTC 2011
Modified Files:
src/sys/rump/dev/lib/libcgd: component.c
Log Message:
Create cgd block device files in the right directory.
hi pooka!
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libcgd/component.c
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/component.c
diff -u src/sys/rump/dev/lib/libcgd/component.c:1.6 src/sys/rump/dev/lib/libcgd/component.c:1.7
--- src/sys/rump/dev/lib/libcgd/component.c:1.6 Mon Mar 1 13:12:19 2010
+++ src/sys/rump/dev/lib/libcgd/component.c Wed Mar 9 11:56:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.6 2010/03/01 13:12:19 pooka Exp $ */
+/* $NetBSD: component.c,v 1.7 2011/03/09 11:56:17 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.6 2010/03/01 13:12:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.7 2011/03/09 11:56:17 pooka Exp $");
#include
#include
@@ -50,7 +50,7 @@
&cgd_cdevsw, &cmaj)) != 0)
panic("cannot attach cgd: %d", error);
- if ((error = rump_vfs_makedevnodes(S_IFBLK, "cgd0", 'a',
+ if ((error = rump_vfs_makedevnodes(S_IFBLK, "/dev/cgd0", 'a',
bmaj, 0, 7)) != 0)
panic("cannot create cooked cgd dev nodes: %d", error);
if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/rcgd0", 'a',
CVS commit: src/sys/rump/dev/lib/libcgd
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:50:51 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libcgd: Makefile
Added Files:
src/sys/rump/dev/lib/libcgd: cgd_component.c
Removed Files:
src/sys/rump/dev/lib/libcgd: component.c
Log Message:
rename component.c -> cgd_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libcgd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libcgd/cgd_component.c
cvs rdiff -u -r1.7 -r0 src/sys/rump/dev/lib/libcgd/component.c
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.3 src/sys/rump/dev/lib/libcgd/Makefile:1.4
--- src/sys/rump/dev/lib/libcgd/Makefile:1.3 Tue Feb 16 20:42:44 2010
+++ src/sys/rump/dev/lib/libcgd/Makefile Thu Mar 13 01:50:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/02/16 20:42:44 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/13 01:50:51 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev
@@ -7,7 +7,7 @@ LIB= rumpdev_cgd
SRCS= cgd.c cgd_crypto.c
-SRCS+= component.c
+SRCS+= cgd_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libcgd/cgd_component.c
diff -u /dev/null src/sys/rump/dev/lib/libcgd/cgd_component.c:1.1
--- /dev/null Thu Mar 13 01:50:51 2014
+++ src/sys/rump/dev/lib/libcgd/cgd_component.c Thu Mar 13 01:50:51 2014
@@ -0,0 +1,59 @@
+/* $NetBSD: cgd_component.c,v 1.1 2014/03/13 01:50:51 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: cgd_component.c,v 1.1 2014/03/13 01:50:51 pooka Exp $");
+
+#include
+#include
+#include
+#include
+
+#include "rump_private.h"
+#include "rump_vfs_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ 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("/dev/cgd0", &cgd_bdevsw, &bmaj,
+ &cgd_cdevsw, &cmaj)) != 0)
+ panic("cannot attach cgd: %d", error);
+
+ if ((error = rump_vfs_makedevnodes(S_IFBLK, "/dev/cgd0", 'a',
+ bmaj, 0, 7)) != 0)
+ panic("cannot create cooked cgd dev nodes: %d", error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/rcgd0", 'a',
+ cmaj, 0, 7)) != 0)
+ panic("cannot create raw cgd dev nodes: %d", error);
+}
