summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2000-03-27 03:01:33 +0000
committeroster <oster@NetBSD.org>2000-03-27 03:01:33 +0000
commitb97e06092d9a5acc64245776aa50d961cc23c159 (patch)
tree0601d72e36e7e270b6611bb2080ffdc23b623ed0 /sys/dev/raidframe
parent24571569fac062780a21e79c7d65e670342db212 (diff)
Shuffle some prototypes to a more appropriate location.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_disks.h29
-rw-r--r--sys/dev/raidframe/rf_netbsd.h9
2 files changed, 17 insertions, 21 deletions
diff --git a/sys/dev/raidframe/rf_disks.h b/sys/dev/raidframe/rf_disks.h
index e143df82c6b..a8ad1bb7447 100644
--- a/sys/dev/raidframe/rf_disks.h
+++ b/sys/dev/raidframe/rf_disks.h
@@ -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 @@ typedef void RF_DiskOp_t;
((_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 --git a/sys/dev/raidframe/rf_netbsd.h b/sys/dev/raidframe/rf_netbsd.h
index 6192a95bb76..6c2a1e14947 100644
--- a/sys/dev/raidframe/rf_netbsd.h
+++ b/sys/dev/raidframe/rf_netbsd.h
@@ -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 @@ typedef struct RF_SingleComponent_s {
#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 */