[src/trunk]: src/sys/dev/raidframe Shuffle some prototypes to a more appropri...

[oster <oster%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/988eaf402937
branches:  trunk
changeset: 484153:988eaf402937
user:      oster <oster%NetBSD.org@localhost>
date:      Mon Mar 27 03:01:33 2000 +0000

description:
Shuffle some prototypes to a more appropriate location.

diffstat:

 sys/dev/raidframe/rf_disks.h  |  29 ++++++++++++++++-------------
 sys/dev/raidframe/rf_netbsd.h |   9 +--------
 2 files changed, 17 insertions(+), 21 deletions(-)

diffs (65 lines):

diff -r ad224c2feb8b -r 988eaf402937 sys/dev/raidframe/rf_disks.h
--- a/sys/dev/raidframe/rf_disks.h      Mon Mar 27 02:55:13 2000 +0000
+++ b/sys/dev/raidframe/rf_disks.h      Mon Mar 27 03:01:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_disks.h,v 1.6 2000/02/23 02:01:55 oster Exp $       */
+/*     $NetBSD: rf_disks.h,v 1.7 2000/03/27 03:01:33 oster Exp $       */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -87,17 +87,20 @@
        ((_dstat_) == rf_ds_dist_spared))
 
 #ifdef _KERNEL
-int 
-rf_ConfigureDisks(RF_ShutdownList_t ** listp, RF_Raid_t * raidPtr,
-                 RF_Config_t * cfgPtr);
-int 
-rf_ConfigureSpareDisks(RF_ShutdownList_t ** listp, RF_Raid_t * raidPtr,
-                      RF_Config_t * cfgPtr);
-int 
-rf_ConfigureDisk(RF_Raid_t * raidPtr, char *buf, RF_RaidDisk_t * diskPtr,
-                RF_RowCol_t row, RF_RowCol_t col);
-int
-rf_AutoConfigureDisks(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr,
-                     RF_AutoConfig_t *auto_config);
+#include "rf_netbsd.h"
+
+int rf_ConfigureDisks(RF_ShutdownList_t ** listp, RF_Raid_t * raidPtr,
+                     RF_Config_t * cfgPtr);
+int rf_ConfigureSpareDisks(RF_ShutdownList_t ** listp, RF_Raid_t * raidPtr,
+                          RF_Config_t * cfgPtr);
+int rf_ConfigureDisk(RF_Raid_t * raidPtr, char *buf, RF_RaidDisk_t * diskPtr,
+                    RF_RowCol_t row, RF_RowCol_t col);
+int rf_AutoConfigureDisks(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr,
+                         RF_AutoConfig_t *auto_config);
+int rf_add_hot_spare(RF_Raid_t *raidPtr, RF_SingleComponent_t *sparePtr);
+int rf_remove_hot_spare(RF_Raid_t *raidPtr, RF_SingleComponent_t *sparePtr);
+int rf_delete_component(RF_Raid_t *raidPtr, RF_SingleComponent_t *component);
+int rf_incorporate_hot_spare(RF_Raid_t *raidPtr, 
+                            RF_SingleComponent_t *component);
 #endif /* _KERNEL */
 #endif                         /* !_RF__RF_DISKS_H_ */
diff -r ad224c2feb8b -r 988eaf402937 sys/dev/raidframe/rf_netbsd.h
--- a/sys/dev/raidframe/rf_netbsd.h     Mon Mar 27 02:55:13 2000 +0000
+++ b/sys/dev/raidframe/rf_netbsd.h     Mon Mar 27 03:01:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_netbsd.h,v 1.10 2000/03/26 22:38:29 oster Exp $     */
+/*     $NetBSD: rf_netbsd.h,v 1.11 2000/03/27 03:01:33 oster Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -105,13 +105,6 @@
 
 #ifdef _KERNEL
 
-/* XXX this is *not* the place for these... */
-int rf_add_hot_spare(RF_Raid_t *raidPtr, RF_SingleComponent_t *sparePtr);
-int rf_remove_hot_spare(RF_Raid_t *raidPtr, RF_SingleComponent_t *sparePtr);
-int rf_delete_component(RF_Raid_t *raidPtr, RF_SingleComponent_t *component);
-int rf_incorporate_hot_spare(RF_Raid_t *raidPtr, 
-                            RF_SingleComponent_t *component);
-
 struct raidcinfo {
        struct vnode *ci_vp;    /* component device's vnode */
        dev_t   ci_dev;         /* component device's dev_t */