Tue Dec 1 09:04:21 2009 UTC ()
whitespace


(pooka)
diff -r1.2 -r1.3 src/sys/rump/dev/lib/libcgd/component.c
cvs diff -r1.2 -r1.3 src/sys/rump/dev/lib/libcgd/Attic/component.c (expand / switch to unified diff)

--- src/sys/rump/dev/lib/libcgd/Attic/component.c 2009/09/07 11:23:39 1.2
+++ src/sys/rump/dev/lib/libcgd/Attic/component.c 2009/12/01 09:04:21 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: component.c,v 1.2 2009/09/07 11:23:39 pooka Exp $ */ 1/* $NetBSD: component.c,v 1.3 2009/12/01 09:04:21 pooka Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2009 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -16,27 +16,27 @@ @@ -16,27 +16,27 @@
16 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 16 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 18 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE. 25 * SUCH DAMAGE.
26 */ 26 */
27 27
28#include <sys/cdefs.h> 28#include <sys/cdefs.h>
29__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.2 2009/09/07 11:23:39 pooka Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.3 2009/12/01 09:04:21 pooka Exp $");
30 30
31#include <sys/param.h> 31#include <sys/param.h>
32#include <sys/conf.h> 32#include <sys/conf.h>
33#include <sys/device.h> 33#include <sys/device.h>
34#include <sys/stat.h> 34#include <sys/stat.h>
35 35
36#include "rump_dev_private.h" 36#include "rump_dev_private.h"
37#include "rump_vfs_private.h" 37#include "rump_vfs_private.h"
38 38
39void cgdattach(int); 39void cgdattach(int);
40 40
41void 41void
42rump_dev_cgd_init() 42rump_dev_cgd_init()
@@ -46,19 +46,19 @@ rump_dev_cgd_init() @@ -46,19 +46,19 @@ rump_dev_cgd_init()
46 devmajor_t bmaj, cmaj; 46 devmajor_t bmaj, cmaj;
47 int error; 47 int error;
48 48
49 /* go, mydevfs */ 49 /* go, mydevfs */
50 bmaj = cmaj = -1; 50 bmaj = cmaj = -1;
51 51
52 if ((error = devsw_attach("cgd0", &cgd_bdevsw, &bmaj, 52 if ((error = devsw_attach("cgd0", &cgd_bdevsw, &bmaj,
53 &cgd_cdevsw, &cmaj)) != 0) 53 &cgd_cdevsw, &cmaj)) != 0)
54 panic("cannot attach cgd: %d", error); 54 panic("cannot attach cgd: %d", error);
55 55
56 if ((error = rump_vfs_makedevnodes(S_IFBLK, "cgd0", 'a', 56 if ((error = rump_vfs_makedevnodes(S_IFBLK, "cgd0", 'a',
57 bmaj, 0, 7)) != 0) 57 bmaj, 0, 7)) != 0)
58 panic("cannot create cooked cgd dev nodes: %d", error); 58 panic("cannot create cooked cgd dev nodes: %d", error);
59 if ((error = rump_vfs_makedevnodes(S_IFCHR, "rcgd0",'a', 59 if ((error = rump_vfs_makedevnodes(S_IFCHR, "rcgd0", 'a',
60 cmaj, 0, 7)) != 0) 60 cmaj, 0, 7)) != 0)
61 panic("cannot create raw cgd dev nodes: %d", error); 61 panic("cannot create raw cgd dev nodes: %d", error);
62 62
63 rump_pdev_add(cgdattach, 4); 63 rump_pdev_add(cgdattach, 4);
64} 64}