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/libcgd rename component.c -> cgd_component.c



details:   https://anonhg.NetBSD.org/src/rev/bf5f2a2970fe
branches:  trunk
changeset: 327627:bf5f2a2970fe
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Mar 13 01:50:51 2014 +0000

description:
rename component.c -> cgd_component.c

diffstat:

 sys/rump/dev/lib/libcgd/Makefile        |   4 +-
 sys/rump/dev/lib/libcgd/cgd_component.c |  59 +++++++++++++++++++++++++++++++++
 sys/rump/dev/lib/libcgd/component.c     |  59 ---------------------------------
 3 files changed, 61 insertions(+), 61 deletions(-)

diffs (144 lines):

diff -r cba4a9823b8c -r bf5f2a2970fe sys/rump/dev/lib/libcgd/Makefile
--- a/sys/rump/dev/lib/libcgd/Makefile  Thu Mar 13 01:50:50 2014 +0000
+++ b/sys/rump/dev/lib/libcgd/Makefile  Thu Mar 13 01:50:51 2014 +0000
@@ -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 @@
 
 SRCS=   cgd.c cgd_crypto.c
 
-SRCS+= component.c
+SRCS+= cgd_component.c
 
 CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
 
diff -r cba4a9823b8c -r bf5f2a2970fe sys/rump/dev/lib/libcgd/cgd_component.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libcgd/cgd_component.c   Thu Mar 13 01:50:51 2014 +0000
@@ -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 <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: cgd_component.c,v 1.1 2014/03/13 01:50:51 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/stat.h>
+
+#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);
+}
diff -r cba4a9823b8c -r bf5f2a2970fe sys/rump/dev/lib/libcgd/component.c
--- a/sys/rump/dev/lib/libcgd/component.c       Thu Mar 13 01:50:50 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*     $NetBSD: component.c,v 1.7 2011/03/09 11:56:17 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.7 2011/03/09 11:56:17 pooka Exp $");
-
-#include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/stat.h>
-
-#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);
-}



Home | Main Index | Thread Index | Old Index