Module Name: src
Committed By: pgoyette
Date: Thu Jan 24 02:06:35 UTC 2019
Modified Files:
src/sys/dev/raidframe [pgoyette-compat]: rf_compat50.c rf_compat80.c
src/sys/modules/compat_raid_50 [pgoyette-compat]: Makefile
src/sys/modules/compat_raid_80 [pgoyette-compat]: Makefile
Removed Files:
src/sys/compat/common [pgoyette-compat]: compat_raid_50.c
compat_raid_80.c
Log Message:
The raidframe compat code lives in sys/dev/raidframe/ so move all the
module stuff there. Update the Makefiles appropriately.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r0 src/sys/compat/common/compat_raid_50.c
cvs rdiff -u -r1.1.2.1 -r0 src/sys/compat/common/compat_raid_80.c
cvs rdiff -u -r1.3.2.8 -r1.3.2.9 src/sys/dev/raidframe/rf_compat50.c
cvs rdiff -u -r1.2.2.6 -r1.2.2.7 src/sys/dev/raidframe/rf_compat80.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/modules/compat_raid_50/Makefile
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/modules/compat_raid_80/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/raidframe/rf_compat50.c
diff -u src/sys/dev/raidframe/rf_compat50.c:1.3.2.8 src/sys/dev/raidframe/rf_compat50.c:1.3.2.9
--- src/sys/dev/raidframe/rf_compat50.c:1.3.2.8 Wed Jan 23 09:33:47 2019
+++ src/sys/dev/raidframe/rf_compat50.c Thu Jan 24 02:06:34 2019
@@ -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 @@ raidframe_50_fini(void)
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) {
Index: src/sys/dev/raidframe/rf_compat80.c
diff -u src/sys/dev/raidframe/rf_compat80.c:1.2.2.6 src/sys/dev/raidframe/rf_compat80.c:1.2.2.7
--- src/sys/dev/raidframe/rf_compat80.c:1.2.2.6 Wed Jan 23 20:19:47 2019
+++ src/sys/dev/raidframe/rf_compat80.c Thu Jan 24 02:06:34 2019
@@ -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 @@ raidframe_80_fini(void)
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;
+ }
+}
Index: src/sys/modules/compat_raid_50/Makefile
diff -u src/sys/modules/compat_raid_50/Makefile:1.1.2.2 src/sys/modules/compat_raid_50/Makefile:1.1.2.3
--- src/sys/modules/compat_raid_50/Makefile:1.1.2.2 Sun Sep 23 01:33:26 2018
+++ src/sys/modules/compat_raid_50/Makefile Thu Jan 24 02:06:35 2019
@@ -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
Index: src/sys/modules/compat_raid_80/Makefile
diff -u src/sys/modules/compat_raid_80/Makefile:1.1.2.2 src/sys/modules/compat_raid_80/Makefile:1.1.2.3
--- src/sys/modules/compat_raid_80/Makefile:1.1.2.2 Thu Oct 4 01:55:17 2018
+++ src/sys/modules/compat_raid_80/Makefile Thu Jan 24 02:06:35 2019
@@ -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
