Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src/sys The raidframe compat code lives in sys/dev/rai...
details: https://anonhg.NetBSD.org/src/rev/51801dcff7d6
branches: pgoyette-compat
changeset: 447785:51801dcff7d6
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Thu Jan 24 02:06:34 2019 +0000
description:
The raidframe compat code lives in sys/dev/raidframe/ so move all the
module stuff there. Update the Makefiles appropriately.
diffstat:
sys/compat/common/compat_raid_50.c | 83 -------------------------------------
sys/compat/common/compat_raid_80.c | 83 -------------------------------------
sys/dev/raidframe/rf_compat50.c | 6 +-
sys/dev/raidframe/rf_compat80.c | 20 ++++++++-
sys/modules/compat_raid_50/Makefile | 4 +-
sys/modules/compat_raid_80/Makefile | 7 +--
6 files changed, 25 insertions(+), 178 deletions(-)
diffs (258 lines):
diff -r 365830658859 -r 51801dcff7d6 sys/compat/common/compat_raid_50.c
--- a/sys/compat/common/compat_raid_50.c Thu Jan 24 02:05:16 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/* $NetBSD: compat_raid_50.c,v 1.1.2.2 2019/01/23 02:55:09 pgoyette Exp $ */
-
-/*-
- * Copyright (c) 2018 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software developed for The NetBSD Foundation
- * by Paul Goyette
- *
- * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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 FOUNDATION 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.
- */
-
-/*
- * Linkage for the compat module: spaghetti.
- */
-
-#if defined(_KERNEL_OPT)
-#include "opt_compat_netbsd.h"
-#endif
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_raid_50.c,v 1.1.2.2 2019/01/23 02:55:09 pgoyette Exp $");
-
-#include <sys/systm.h>
-#include <sys/module.h>
-
-#include <compat/common/compat_util.h>
-#include <compat/common/compat_mod.h>
-
-#include <dev/raidframe/rf_compat50_mod.h>
-
-int compat_raid_50_init(void)
-{
-
- raidframe_50_init();
-
- return 0;
-}
-
-int compat_raid_50_fini(void)
-{
-
- raidframe_50_fini();
-
- return 0;
-}
-
-MODULE(MODULE_CLASS_EXEC, compat_raid_50, "compat_50,raid,compat_raid_80");
-
-static int
-compat_50_modcmd(modcmd_t cmd, void *arg)
-{
-
- switch (cmd) {
- case MODULE_CMD_INIT:
- return compat_raid_50_init();
-
- case MODULE_CMD_FINI:
- return compat_raid_50_fini();
-
- default:
- return ENOTTY;
- }
-}
diff -r 365830658859 -r 51801dcff7d6 sys/compat/common/compat_raid_80.c
--- a/sys/compat/common/compat_raid_80.c Thu Jan 24 02:05:16 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/* $NetBSD: compat_raid_80.c,v 1.1.2.1 2018/09/22 22:21:46 pgoyette Exp $ */
-
-/*-
- * Copyright (c) 2018 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software developed for The NetBSD Foundation
- * by Paul Goyette
- *
- * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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 FOUNDATION 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.
- */
-
-/*
- * Linkage for the compat module: spaghetti.
- */
-
-#if defined(_KERNEL_OPT)
-#include "opt_compat_netbsd.h"
-#endif
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_raid_80.c,v 1.1.2.1 2018/09/22 22:21:46 pgoyette Exp $");
-
-#include <sys/systm.h>
-#include <sys/module.h>
-
-#include <compat/common/compat_util.h>
-#include <compat/common/compat_mod.h>
-
-#include <dev/raidframe/rf_compat80_mod.h>
-
-int compat_raid_80_init(void)
-{
-
- raidframe_80_init();
-
- return 0;
-}
-
-int compat_raid_80_fini(void)
-{
-
- raidframe_80_fini();
-
- return 0;
-}
-
-MODULE(MODULE_CLASS_EXEC, compat_raid_80, "compat_80,raid");
-
-static int
-compat_80_modcmd(modcmd_t cmd, void *arg)
-{
-
- switch (cmd) {
- case MODULE_CMD_INIT:
- return compat_raid_80_init();
-
- case MODULE_CMD_FINI:
- return compat_raid_80_fini();
-
- default:
- return ENOTTY;
- }
-}
diff -r 365830658859 -r 51801dcff7d6 sys/dev/raidframe/rf_compat50.c
--- a/sys/dev/raidframe/rf_compat50.c Thu Jan 24 02:05:16 2019 +0000
+++ b/sys/dev/raidframe/rf_compat50.c Thu Jan 24 02:06:34 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat50.c,v 1.3.2.8 2019/01/23 09:33:47 pgoyette Exp $ */
+/* $NetBSD: rf_compat50.c,v 1.3.2.9 2019/01/24 02:06:34 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -254,10 +254,10 @@
MODULE_UNSET_HOOK(raidframe50_ioctl_hook);
}
-MODULE(MODULE_CLASS_EXEC, raid_50, "raid,compat_50");
+MODULE(MODULE_CLASS_EXEC, compat_raid_50, "raid,compat_50,compat_raid_80");
static int
-raid_50_modcmd(modcmd_t cmd, void *arg)
+compat_raid_50_modcmd(modcmd_t cmd, void *arg)
{
switch (cmd) {
diff -r 365830658859 -r 51801dcff7d6 sys/dev/raidframe/rf_compat80.c
--- a/sys/dev/raidframe/rf_compat80.c Thu Jan 24 02:05:16 2019 +0000
+++ b/sys/dev/raidframe/rf_compat80.c Thu Jan 24 02:06:34 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat80.c,v 1.2.2.6 2019/01/23 20:19:47 pgoyette Exp $ */
+/* $NetBSD: rf_compat80.c,v 1.2.2.7 2019/01/24 02:06:34 pgoyette Exp $ */
/*
* Copyright (c) 2017 Matthew R. Green
@@ -277,3 +277,21 @@
MODULE_UNSET_HOOK(raidframe80_ioctl_hook);
}
+
+MODULE(MODULE_CLASS_EXEC, compat_raid_80, "raid,compat_80");
+
+static int
+compat_raid_80_modcmd(modcmd_t cmd, void *arg)
+{
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ raidframe_80_init();
+ return 0;
+ case MODULE_CMD_FINI:
+ raidframe_80_fini();
+ return 0;
+ default:
+ return ENOTTY;
+ }
+}
diff -r 365830658859 -r 51801dcff7d6 sys/modules/compat_raid_50/Makefile
--- a/sys/modules/compat_raid_50/Makefile Thu Jan 24 02:05:16 2019 +0000
+++ b/sys/modules/compat_raid_50/Makefile Thu Jan 24 02:06:34 2019 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.1.2.2 2018/09/23 01:33:26 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.2.3 2019/01/24 02:06:35 pgoyette Exp $
.include "../Makefile.inc"
-.PATH: ${S}/compat/common
-
KMOD= compat_raid_50
.PATH: ${S}/dev/raidframe
diff -r 365830658859 -r 51801dcff7d6 sys/modules/compat_raid_80/Makefile
--- a/sys/modules/compat_raid_80/Makefile Thu Jan 24 02:05:16 2019 +0000
+++ b/sys/modules/compat_raid_80/Makefile Thu Jan 24 02:06:34 2019 +0000
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.1.2.2 2018/10/04 01:55:17 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.2.3 2019/01/24 02:06:35 pgoyette Exp $
.include "../Makefile.inc"
-.PATH: ${S}/compat/common
-
-KMOD= compat_raid_80
-
+KMOD= compat_raid_80
CPPFLAGS+= -DCOMPAT_80
.PATH: ${S}/dev/raidframe
Home |
Main Index |
Thread Index |
Old Index