Module Name: src
Committed By: pgoyette
Date: Sat Mar 24 08:22:45 UTC 2018
Modified Files:
src/sys/dev/raidframe [pgoyette-compat]: rf_compat80.c rf_compat80.h
Added Files:
src/sys/dev/raidframe [pgoyette-compat]: rf_compat80_mod.h
Log Message:
Finish clean-up of raidframe compat_80
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/sys/dev/raidframe/rf_compat80.c \
src/sys/dev/raidframe/rf_compat80.h
cvs rdiff -u -r0 -r1.1.2.1 src/sys/dev/raidframe/rf_compat80_mod.h
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_compat80.c
diff -u src/sys/dev/raidframe/rf_compat80.c:1.2.2.1 src/sys/dev/raidframe/rf_compat80.c:1.2.2.2
--- src/sys/dev/raidframe/rf_compat80.c:1.2.2.1 Sat Mar 24 01:59:15 2018
+++ src/sys/dev/raidframe/rf_compat80.c Sat Mar 24 08:22:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat80.c,v 1.2.2.1 2018/03/24 01:59:15 pgoyette Exp $ */
+/* $NetBSD: rf_compat80.c,v 1.2.2.2 2018/03/24 08:22:44 pgoyette Exp $ */
/*
* Copyright (c) 2017 Matthew R. Green
@@ -39,6 +39,7 @@
#include "rf_raid.h"
#include "rf_compat80.h"
+#include "rf_compat80_mod.h"
#include "rf_kintf.h"
int
Index: src/sys/dev/raidframe/rf_compat80.h
diff -u src/sys/dev/raidframe/rf_compat80.h:1.2.2.1 src/sys/dev/raidframe/rf_compat80.h:1.2.2.2
--- src/sys/dev/raidframe/rf_compat80.h:1.2.2.1 Sat Mar 24 01:59:15 2018
+++ src/sys/dev/raidframe/rf_compat80.h Sat Mar 24 08:22:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat80.h,v 1.2.2.1 2018/03/24 01:59:15 pgoyette Exp $ */
+/* $NetBSD: rf_compat80.h,v 1.2.2.2 2018/03/24 08:22:44 pgoyette Exp $ */
/*
* Copyright (c) 2017 Matthew R. Green
@@ -132,9 +132,4 @@ int rf_get_info80(RF_Raid_t *, void *);
int rf_get_component_label80(RF_Raid_t *, void *);
int rf_config80(RF_Raid_t *, int, void *, RF_Config_t **);
-int raidframe_ioctl_80(int, int, RF_Raid_t *, int, void *, RF_Config_t **);
-
-void raidframe_80_init(void);
-void raidframe_80_fini(void);
-
#endif /* _RF_COMPAT80_H_ */
Added files:
Index: src/sys/dev/raidframe/rf_compat80_mod.h
diff -u /dev/null src/sys/dev/raidframe/rf_compat80_mod.h:1.1.2.1
--- /dev/null Sat Mar 24 08:22:45 2018
+++ src/sys/dev/raidframe/rf_compat80_mod.h Sat Mar 24 08:22:44 2018
@@ -0,0 +1,44 @@
+/* $NetBSD: rf_compat80_mod.h,v 1.1.2.1 2018/03/24 08:22:44 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to 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.
+ */
+
+#ifndef _RF_COMPAT80_MOD_H_
+#define _RF_COMPAT80_MOD_H_
+
+struct RF_Raid_s;
+struct RF_Config_s;
+
+int raidframe_ioctl_80(int, int, struct RF_Raid_s *, int, void *,
+ struct RF_Config_s **);
+
+void raidframe_80_init(void);
+void raidframe_80_fini(void);
+
+#endif /* _RF_COMPAT80_MOD_H_ */
