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/libmd rename component.c -> md_component.c



details:   https://anonhg.NetBSD.org/src/rev/11208db36db7
branches:  trunk
changeset: 794556:11208db36db7
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Mar 17 11:30:40 2014 +0000

description:
rename component.c -> md_component.c

diffstat:

 sys/rump/dev/lib/libmd/Makefile       |   4 +-
 sys/rump/dev/lib/libmd/component.c    |  68 -----------------------------------
 sys/rump/dev/lib/libmd/md_component.c |  68 +++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 70 deletions(-)

diffs (162 lines):

diff -r 2b5ece49a136 -r 11208db36db7 sys/rump/dev/lib/libmd/Makefile
--- a/sys/rump/dev/lib/libmd/Makefile   Mon Mar 17 11:08:11 2014 +0000
+++ b/sys/rump/dev/lib/libmd/Makefile   Mon Mar 17 11:30:40 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2010/11/22 21:20:32 pooka Exp $
+#      $NetBSD: Makefile,v 1.2 2014/03/17 11:30:40 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev
@@ -7,7 +7,7 @@
 IOCONF=        MD.ioconf
 
 SRCS=  md.c
-SRCS+= component.c
+SRCS+= md_component.c
 
 CPPFLAGS+=     -I${.CURDIR}/../../../librump/rumpvfs
 
diff -r 2b5ece49a136 -r 11208db36db7 sys/rump/dev/lib/libmd/component.c
--- a/sys/rump/dev/lib/libmd/component.c        Mon Mar 17 11:08:11 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*     $NetBSD: component.c,v 1.3 2013/04/04 01:38:47 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.3 2013/04/04 01:38:47 pooka Exp $");
-
-#include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/mbuf.h>
-#include <sys/stat.h>
-
-#include "ioconf.c"
-
-#include "rump_private.h"
-#include "rump_dev_private.h"
-#include "rump_vfs_private.h"
-
-extern void mdattach(int); /* XXX */
-
-RUMP_COMPONENT(RUMP_COMPONENT_DEV)
-{
-        extern const struct bdevsw md_bdevsw;
-        extern const struct cdevsw md_cdevsw;
-       devmajor_t bmaj, cmaj;
-       int error;
-
-       config_init_component(cfdriver_ioconf_md,
-           cfattach_ioconf_md, cfdata_ioconf_md);
-
-       bmaj = cmaj = NODEVMAJOR;
-       if ((error = devsw_attach("md", &md_bdevsw, &bmaj,
-           &md_cdevsw, &cmaj)) != 0)
-               panic("md devsw attach failed: %d", error);
-
-        if ((error = rump_vfs_makedevnodes(S_IFBLK, "/dev/md0", 'a',
-            bmaj, 0, 7)) != 0)
-                panic("cannot create cooked md dev nodes: %d", error);
-        if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/rmd0", 'a',
-            cmaj, 0, 7)) != 0)
-                panic("cannot create raw md dev nodes: %d", error);
-
-       rump_pdev_add(mdattach, 0);
-}
diff -r 2b5ece49a136 -r 11208db36db7 sys/rump/dev/lib/libmd/md_component.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libmd/md_component.c     Mon Mar 17 11:30:40 2014 +0000
@@ -0,0 +1,68 @@
+/*     $NetBSD: md_component.c,v 1.1 2014/03/17 11:30:40 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: md_component.c,v 1.1 2014/03/17 11:30:40 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/mbuf.h>
+#include <sys/stat.h>
+
+#include "ioconf.c"
+
+#include "rump_private.h"
+#include "rump_dev_private.h"
+#include "rump_vfs_private.h"
+
+extern void mdattach(int); /* XXX */
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+        extern const struct bdevsw md_bdevsw;
+        extern const struct cdevsw md_cdevsw;
+       devmajor_t bmaj, cmaj;
+       int error;
+
+       config_init_component(cfdriver_ioconf_md,
+           cfattach_ioconf_md, cfdata_ioconf_md);
+
+       bmaj = cmaj = NODEVMAJOR;
+       if ((error = devsw_attach("md", &md_bdevsw, &bmaj,
+           &md_cdevsw, &cmaj)) != 0)
+               panic("md devsw attach failed: %d", error);
+
+        if ((error = rump_vfs_makedevnodes(S_IFBLK, "/dev/md0", 'a',
+            bmaj, 0, 7)) != 0)
+                panic("cannot create cooked md dev nodes: %d", error);
+        if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/rmd0", 'a',
+            cmaj, 0, 7)) != 0)
+                panic("cannot create raw md dev nodes: %d", error);
+
+       rump_pdev_add(mdattach, 0);
+}



Home | Main Index | Thread Index | Old Index