diff --git a/sys/dev/raidframe/rf_acctrace.c b/sys/dev/raidframe/rf_acctrace.c
index 6c07734e89c9..9f52396e75e0 100644
--- a/sys/dev/raidframe/rf_acctrace.c
+++ b/sys/dev/raidframe/rf_acctrace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_acctrace.c,v 1.4 1999/08/13 03:41:52 oster Exp $	*/
+/*	$NetBSD: rf_acctrace.c,v 1.5 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -35,9 +35,9 @@
 
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <dev/raidframe/raidframevar.h>
 
 #include "rf_threadstuff.h"
-#include "rf_types.h"
 #include "rf_debugMem.h"
 #include "rf_acctrace.h"
 #include "rf_general.h"
diff --git a/sys/dev/raidframe/rf_acctrace.h b/sys/dev/raidframe/rf_acctrace.h
index 364d970880ed..5d8ad59e6def 100644
--- a/sys/dev/raidframe/rf_acctrace.h
+++ b/sys/dev/raidframe/rf_acctrace.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_acctrace.h,v 1.3 1999/02/05 00:06:06 oster Exp $	*/
+/*	$NetBSD: rf_acctrace.h,v 1.4 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -36,7 +36,7 @@
 #ifndef _RF__RF_ACCTRACE_H_
 #define _RF__RF_ACCTRACE_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 #include "rf_hist.h"
 #include "rf_etimer.h"
 
diff --git a/sys/dev/raidframe/rf_alloclist.c b/sys/dev/raidframe/rf_alloclist.c
index 026e95cd982b..cc4402800ef7 100644
--- a/sys/dev/raidframe/rf_alloclist.c
+++ b/sys/dev/raidframe/rf_alloclist.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_alloclist.c,v 1.5 2001/07/18 06:45:33 thorpej Exp $	*/
+/*	$NetBSD: rf_alloclist.c,v 1.6 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -36,7 +36,8 @@
  *
  ***************************************************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 #include "rf_alloclist.h"
 #include "rf_debugMem.h"
diff --git a/sys/dev/raidframe/rf_alloclist.h b/sys/dev/raidframe/rf_alloclist.h
index ab1af3908872..c0bbc8463f79 100644
--- a/sys/dev/raidframe/rf_alloclist.h
+++ b/sys/dev/raidframe/rf_alloclist.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_alloclist.h,v 1.3 1999/02/05 00:06:06 oster Exp $	*/
+/*	$NetBSD: rf_alloclist.h,v 1.4 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -35,7 +35,7 @@
 #ifndef _RF__RF_ALLOCLIST_H_
 #define _RF__RF_ALLOCLIST_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 #define RF_POINTERS_PER_ALLOC_LIST_ELEMENT 20
 
diff --git a/sys/dev/raidframe/rf_aselect.c b/sys/dev/raidframe/rf_aselect.c
index 797a102371fe..d4ef31d03f0c 100644
--- a/sys/dev/raidframe/rf_aselect.c
+++ b/sys/dev/raidframe/rf_aselect.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_aselect.c,v 1.3 1999/02/05 00:06:06 oster Exp $	*/
+/*	$NetBSD: rf_aselect.c,v 1.4 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -32,9 +32,9 @@
  *
  *****************************************************************************/
 
+#include <dev/raidframe/raidframevar.h>
 
 #include "rf_archs.h"
-#include "rf_types.h"
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagutils.h"
diff --git a/sys/dev/raidframe/rf_callback.c b/sys/dev/raidframe/rf_callback.c
index ee5283610d3f..572585a47713 100644
--- a/sys/dev/raidframe/rf_callback.c
+++ b/sys/dev/raidframe/rf_callback.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_callback.c,v 1.4 2001/09/26 02:52:57 oster Exp $	*/
+/*	$NetBSD: rf_callback.c,v 1.5 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,8 @@
  ****************************************************************************************/
 
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_archs.h"
 #include "rf_threadstuff.h"
 #include "rf_callback.h"
diff --git a/sys/dev/raidframe/rf_callback.h b/sys/dev/raidframe/rf_callback.h
index 3bfaa94c4a47..35cc40a85e11 100644
--- a/sys/dev/raidframe/rf_callback.h
+++ b/sys/dev/raidframe/rf_callback.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_callback.h,v 1.3 1999/02/05 00:06:06 oster Exp $	*/
+/*	$NetBSD: rf_callback.h,v 1.4 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -44,7 +44,7 @@
 #ifndef _RF__RF_CALLBACK_H_
 #define _RF__RF_CALLBACK_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 struct RF_CallbackDesc_s {
 	void    (*callbackFunc) (RF_CBParam_t);	/* function to call */
diff --git a/sys/dev/raidframe/rf_chaindecluster.c b/sys/dev/raidframe/rf_chaindecluster.c
index b8e5f84e077e..d8e1f1370189 100644
--- a/sys/dev/raidframe/rf_chaindecluster.c
+++ b/sys/dev/raidframe/rf_chaindecluster.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_chaindecluster.c,v 1.6 2001/01/26 04:27:16 oster Exp $	*/
+/*	$NetBSD: rf_chaindecluster.c,v 1.7 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -36,7 +36,8 @@
 
 #if (RF_INCLUDE_CHAINDECLUSTER > 0) 
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_chaindecluster.h"
 #include "rf_dag.h"
diff --git a/sys/dev/raidframe/rf_configure.h b/sys/dev/raidframe/rf_configure.h
index 2577d4eaf88f..0611eeceb2ed 100644
--- a/sys/dev/raidframe/rf_configure.h
+++ b/sys/dev/raidframe/rf_configure.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_configure.h,v 1.4 1999/03/02 03:18:49 oster Exp $	*/
+/*	$NetBSD: rf_configure.h,v 1.5 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -39,55 +39,4 @@
 #ifndef _RF__RF_CONFIGURE_H_
 #define _RF__RF_CONFIGURE_H_
 
-#include "rf_archs.h"
-#include "rf_types.h"
-
-#include <sys/param.h>
-#include <sys/proc.h>
-
-#include <sys/ioctl.h>
-
-/* the raidframe configuration, passed down through an ioctl.
- * the driver can be reconfigured (with total loss of data) at any time,
- * but it must be shut down first.
- */
-struct RF_Config_s {
-	RF_RowCol_t numRow, numCol, numSpare;	/* number of rows, columns,
-						 * and spare disks */
-	dev_t   devs[RF_MAXROW][RF_MAXCOL];	/* device numbers for disks
-						 * comprising array */
-	char    devnames[RF_MAXROW][RF_MAXCOL][50];	/* device names */
-	dev_t   spare_devs[RF_MAXSPARE];	/* device numbers for spare
-						 * disks */
-	char    spare_names[RF_MAXSPARE][50];	/* device names */
-	RF_SectorNum_t sectPerSU;	/* sectors per stripe unit */
-	RF_StripeNum_t SUsPerPU;/* stripe units per parity unit */
-	RF_StripeNum_t SUsPerRU;/* stripe units per reconstruction unit */
-	RF_ParityConfig_t parityConfig;	/* identifies the RAID architecture to
-					 * be used */
-	RF_DiskQueueType_t diskQueueType;	/* 'f' = fifo, 'c' = cvscan,
-						 * not used in kernel */
-	char    maxOutstandingDiskReqs;	/* # concurrent reqs to be sent to a
-					 * disk.  not used in kernel. */
-	char    debugVars[RF_MAXDBGV][50];	/* space for specifying debug
-						 * variables & their values */
-	unsigned int layoutSpecificSize;	/* size in bytes of
-						 * layout-specific info */
-	void   *layoutSpecific;	/* a pointer to a layout-specific structure to
-				 * be copied in */
-	int     force;                          /* if !0, ignore many fatal
-						   configuration conditions */
-	/* 
-	   "force" is used to override cases where the component labels would 
-	   indicate that configuration should not proceed without user 
-	   intervention
-	 */
-};
-#ifndef _KERNEL
-int     rf_MakeConfig(char *configname, RF_Config_t * cfgPtr);
-int     rf_MakeLayoutSpecificNULL(FILE * fp, RF_Config_t * cfgPtr, void *arg);
-int     rf_MakeLayoutSpecificDeclustered(FILE * configfp, RF_Config_t * cfgPtr, void *arg);
-void   *rf_ReadSpareTable(RF_SparetWait_t * req, char *fname);
-#endif				/* !_KERNEL */
-
 #endif				/* !_RF__RF_CONFIGURE_H_ */
diff --git a/sys/dev/raidframe/rf_copyback.c b/sys/dev/raidframe/rf_copyback.c
index 49d4b80176bd..89186d94301b 100644
--- a/sys/dev/raidframe/rf_copyback.c
+++ b/sys/dev/raidframe/rf_copyback.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_copyback.c,v 1.15 2001/01/26 02:16:24 oster Exp $	*/
+/*	$NetBSD: rf_copyback.c,v 1.16 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -37,7 +37,7 @@
  *
  ****************************************************************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 #include <sys/time.h>
 #include <sys/buf.h>
diff --git a/sys/dev/raidframe/rf_copyback.h b/sys/dev/raidframe/rf_copyback.h
index 9e7ce18feb3d..6603552a9c64 100644
--- a/sys/dev/raidframe/rf_copyback.h
+++ b/sys/dev/raidframe/rf_copyback.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_copyback.h,v 1.3 1999/02/05 00:06:06 oster Exp $	*/
+/*	$NetBSD: rf_copyback.h,v 1.4 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * rf_copyback.h
  */
@@ -32,7 +32,7 @@
 #ifndef _RF__RF_COPYBACK_H_
 #define _RF__RF_COPYBACK_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 typedef struct RF_CopybackDesc_s {
 	RF_Raid_t *raidPtr;
diff --git a/sys/dev/raidframe/rf_cvscan.c b/sys/dev/raidframe/rf_cvscan.c
index 56766ac3e308..acb96b49e39f 100644
--- a/sys/dev/raidframe/rf_cvscan.c
+++ b/sys/dev/raidframe/rf_cvscan.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_cvscan.c,v 1.6 2001/07/18 06:45:33 thorpej Exp $	*/
+/*	$NetBSD: rf_cvscan.c,v 1.7 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,7 +34,7 @@
  *
  ******************************************************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 #include "rf_alloclist.h"
 #include "rf_stripelocks.h"
 #include "rf_layout.h"
diff --git a/sys/dev/raidframe/rf_dag.h b/sys/dev/raidframe/rf_dag.h
index cadaab8045a8..99b1f1afbbfc 100644
--- a/sys/dev/raidframe/rf_dag.h
+++ b/sys/dev/raidframe/rf_dag.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_dag.h,v 1.3 1999/02/05 00:06:07 oster Exp $	*/
+/*	$NetBSD: rf_dag.h,v 1.4 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -35,7 +35,8 @@
 #ifndef _RF__RF_DAG_H_
 #define _RF__RF_DAG_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 #include "rf_alloclist.h"
 #include "rf_stripelocks.h"
diff --git a/sys/dev/raidframe/rf_dagdegrd.c b/sys/dev/raidframe/rf_dagdegrd.c
index 4369d7e62ee9..e10111e75333 100644
--- a/sys/dev/raidframe/rf_dagdegrd.c
+++ b/sys/dev/raidframe/rf_dagdegrd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_dagdegrd.c,v 1.8 2001/06/08 12:51:17 mrg Exp $	*/
+/*	$NetBSD: rf_dagdegrd.c,v 1.9 2001/10/04 15:58:51 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -32,8 +32,9 @@
  * code for creating degraded read DAGs
  */
 
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_archs.h"
-#include "rf_types.h"
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagutils.h"
diff --git a/sys/dev/raidframe/rf_dagdegrd.h b/sys/dev/raidframe/rf_dagdegrd.h
index ba5ece57c05f..298e639d0846 100644
--- a/sys/dev/raidframe/rf_dagdegrd.h
+++ b/sys/dev/raidframe/rf_dagdegrd.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_dagdegrd.h,v 1.3 1999/02/05 00:06:07 oster Exp $	*/
+/*	$NetBSD: rf_dagdegrd.h,v 1.4 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -29,7 +29,7 @@
 #ifndef _RF__RF_DAGDEGRD_H_
 #define _RF__RF_DAGDEGRD_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 /* degraded read DAG creation routines */
 void 
diff --git a/sys/dev/raidframe/rf_dagdegwr.c b/sys/dev/raidframe/rf_dagdegwr.c
index 2f4e6bc49e47..ba2d594f193d 100644
--- a/sys/dev/raidframe/rf_dagdegwr.c
+++ b/sys/dev/raidframe/rf_dagdegwr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_dagdegwr.c,v 1.7 2001/09/01 23:50:44 thorpej Exp $	*/
+/*	$NetBSD: rf_dagdegwr.c,v 1.8 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,8 @@
  *
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagutils.h"
diff --git a/sys/dev/raidframe/rf_dagffrd.c b/sys/dev/raidframe/rf_dagffrd.c
index 18f82a111855..78cb819180c9 100644
--- a/sys/dev/raidframe/rf_dagffrd.c
+++ b/sys/dev/raidframe/rf_dagffrd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_dagffrd.c,v 1.4 2000/01/07 03:40:58 oster Exp $	*/
+/*	$NetBSD: rf_dagffrd.c,v 1.5 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,8 @@
  *
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagutils.h"
diff --git a/sys/dev/raidframe/rf_dagffrd.h b/sys/dev/raidframe/rf_dagffrd.h
index dee6c1d75485..a5c0c4f81bfc 100644
--- a/sys/dev/raidframe/rf_dagffrd.h
+++ b/sys/dev/raidframe/rf_dagffrd.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_dagffrd.h,v 1.3 1999/02/05 00:06:07 oster Exp $	*/
+/*	$NetBSD: rf_dagffrd.h,v 1.4 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -29,7 +29,7 @@
 #ifndef _RF__RF_DAGFFRD_H_
 #define _RF__RF_DAGFFRD_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 /* fault-free read DAG creation routines */
 void 
diff --git a/sys/dev/raidframe/rf_dagffwr.c b/sys/dev/raidframe/rf_dagffwr.c
index 05477e6c7f11..ba05c06de666 100644
--- a/sys/dev/raidframe/rf_dagffwr.c
+++ b/sys/dev/raidframe/rf_dagffwr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_dagffwr.c,v 1.5 2000/01/07 03:40:58 oster Exp $	*/
+/*	$NetBSD: rf_dagffwr.c,v 1.6 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,8 @@
  *
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagutils.h"
diff --git a/sys/dev/raidframe/rf_dagffwr.h b/sys/dev/raidframe/rf_dagffwr.h
index 570bac186c2c..d37ee9d3e513 100644
--- a/sys/dev/raidframe/rf_dagffwr.h
+++ b/sys/dev/raidframe/rf_dagffwr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_dagffwr.h,v 1.3 1999/02/05 00:06:08 oster Exp $	*/
+/*	$NetBSD: rf_dagffwr.h,v 1.4 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -29,7 +29,7 @@
 #ifndef _RF__RF_DAGFFWR_H_
 #define _RF__RF_DAGFFWR_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 /* fault-free write DAG creation routines */
 void 
diff --git a/sys/dev/raidframe/rf_dagutils.c b/sys/dev/raidframe/rf_dagutils.c
index d38bb803b0e1..2801bbeca9b6 100644
--- a/sys/dev/raidframe/rf_dagutils.c
+++ b/sys/dev/raidframe/rf_dagutils.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_dagutils.c,v 1.7 2001/07/18 06:45:33 thorpej Exp $	*/
+/*	$NetBSD: rf_dagutils.c,v 1.8 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -32,8 +32,9 @@
  *
  *****************************************************************************/
 
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_archs.h"
-#include "rf_types.h"
 #include "rf_threadstuff.h"
 #include "rf_raid.h"
 #include "rf_dag.h"
diff --git a/sys/dev/raidframe/rf_dagutils.h b/sys/dev/raidframe/rf_dagutils.h
index 83d244004d6d..78b291ae4e80 100644
--- a/sys/dev/raidframe/rf_dagutils.h
+++ b/sys/dev/raidframe/rf_dagutils.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_dagutils.h,v 1.3 1999/02/05 00:06:08 oster Exp $	*/
+/*	$NetBSD: rf_dagutils.h,v 1.4 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,8 @@
  *************************************************************************/
 
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_dagfuncs.h"
 #include "rf_general.h"
 
diff --git a/sys/dev/raidframe/rf_debugMem.c b/sys/dev/raidframe/rf_debugMem.c
index 128d35391d21..55228ce9bff8 100644
--- a/sys/dev/raidframe/rf_debugMem.c
+++ b/sys/dev/raidframe/rf_debugMem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_debugMem.c,v 1.7 2000/01/07 03:40:59 oster Exp $	*/
+/*	$NetBSD: rf_debugMem.c,v 1.8 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -36,7 +36,7 @@
  * and to the allocation list stuff.
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 #include "rf_threadstuff.h"
 #include "rf_options.h"
diff --git a/sys/dev/raidframe/rf_debugMem.h b/sys/dev/raidframe/rf_debugMem.h
index 3f1e4a4e0b61..eed40d7fec40 100644
--- a/sys/dev/raidframe/rf_debugMem.h
+++ b/sys/dev/raidframe/rf_debugMem.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_debugMem.h,v 1.8 2001/07/18 06:45:33 thorpej Exp $	*/
+/*	$NetBSD: rf_debugMem.h,v 1.9 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -39,7 +39,6 @@
 
 #include "rf_alloclist.h"
 
-#ifdef _KERNEL
 #include <sys/types.h>
 #include <sys/malloc.h>
 
@@ -73,8 +72,6 @@
      if (rf_memDebug) rf_unrecord_malloc(_p_, (u_int32_t) (_sz_));          \
   }
 
-#endif				/* _KERNEL */
-
 void    rf_record_malloc(void *p, int size, int line, char *filen);
 void    rf_unrecord_malloc(void *p, int sz);
 void    rf_print_unfreed(void);
diff --git a/sys/dev/raidframe/rf_debugprint.c b/sys/dev/raidframe/rf_debugprint.c
index d6a9ffc9c606..893aab891487 100644
--- a/sys/dev/raidframe/rf_debugprint.c
+++ b/sys/dev/raidframe/rf_debugprint.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_debugprint.c,v 1.3 1999/02/05 00:06:08 oster Exp $	*/
+/*	$NetBSD: rf_debugprint.c,v 1.4 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,8 @@
  * printfs, and to capture only the printf's immediately preceding a failure.
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 #include "rf_debugprint.h"
 #include "rf_general.h"
diff --git a/sys/dev/raidframe/rf_decluster.c b/sys/dev/raidframe/rf_decluster.c
index 0d95fc4dc86a..a63ee5c04892 100644
--- a/sys/dev/raidframe/rf_decluster.c
+++ b/sys/dev/raidframe/rf_decluster.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_decluster.c,v 1.6 2001/01/26 04:40:03 oster Exp $	*/
+/*	$NetBSD: rf_decluster.c,v 1.7 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -47,11 +47,10 @@
  *
  *--------------------------------------------------------------------*/
 
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_archs.h"
-#include "rf_types.h"
 #include "rf_raid.h"
-#include "rf_raidframe.h"
-#include "rf_configure.h"
 #include "rf_decluster.h"
 #include "rf_debugMem.h"
 #include "rf_utils.h"
diff --git a/sys/dev/raidframe/rf_decluster.h b/sys/dev/raidframe/rf_decluster.h
index dccb9d51e2f4..11ef73823c72 100644
--- a/sys/dev/raidframe/rf_decluster.h
+++ b/sys/dev/raidframe/rf_decluster.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_decluster.h,v 1.3 1999/02/05 00:06:09 oster Exp $	*/
+/*	$NetBSD: rf_decluster.h,v 1.4 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -38,19 +38,13 @@
 #ifndef _RF__RF_DECLUSTER_H_
 #define _RF__RF_DECLUSTER_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 /*
  * These structures define the tables used to locate the spare unit
  * associated with a particular data or parity unit, and to perform
  * the associated inverse mapping.
  */
-struct RF_SpareTableEntry_s {
-	u_int   spareDisk;	/* disk to which this block is spared */
-	u_int   spareBlockOffsetInSUs;	/* offset into spare table for that
-					 * disk */
-};
-#define RF_SPAREMAP_NAME_LEN 128
 
 /* this is the layout-specific info structure for the declustered layout.
  */
diff --git a/sys/dev/raidframe/rf_declusterPQ.c b/sys/dev/raidframe/rf_declusterPQ.c
index 52e50154de28..1c1628d3faf1 100644
--- a/sys/dev/raidframe/rf_declusterPQ.c
+++ b/sys/dev/raidframe/rf_declusterPQ.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_declusterPQ.c,v 1.5 2001/01/26 14:06:17 oster Exp $	*/
+/*	$NetBSD: rf_declusterPQ.c,v 1.6 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,10 +34,10 @@
  *
  *--------------------------------------------------*/
 
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_archs.h"
-#include "rf_types.h"
 #include "rf_raid.h"
-#include "rf_configure.h"
 #include "rf_decluster.h"
 #include "rf_declusterPQ.h"
 #include "rf_debugMem.h"
diff --git a/sys/dev/raidframe/rf_declusterPQ.h b/sys/dev/raidframe/rf_declusterPQ.h
index 6f74d57a7b9e..7f606fde2499 100644
--- a/sys/dev/raidframe/rf_declusterPQ.h
+++ b/sys/dev/raidframe/rf_declusterPQ.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_declusterPQ.h,v 1.3 1999/02/05 00:06:09 oster Exp $	*/
+/*	$NetBSD: rf_declusterPQ.h,v 1.4 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -29,7 +29,7 @@
 #ifndef _RF__RF_DECLUSTERPQ_H_
 #define _RF__RF_DECLUSTERPQ_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 int 
 rf_ConfigureDeclusteredPQ(RF_ShutdownList_t ** listp, RF_Raid_t * raidPtr,
diff --git a/sys/dev/raidframe/rf_desc.h b/sys/dev/raidframe/rf_desc.h
index 3ef183c79f49..11ac1b7d87a4 100644
--- a/sys/dev/raidframe/rf_desc.h
+++ b/sys/dev/raidframe/rf_desc.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_desc.h,v 1.5 2000/01/09 00:00:18 oster Exp $	*/
+/*	$NetBSD: rf_desc.h,v 1.6 2001/10/04 15:58:52 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -29,8 +29,9 @@
 #ifndef _RF__RF_DESC_H_
 #define _RF__RF_DESC_H_
 
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_archs.h"
-#include "rf_types.h"
 #include "rf_etimer.h"
 #include "rf_dag.h"
 
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c
index c2bf56028171..6086a063263f 100644
--- a/sys/dev/raidframe/rf_diskqueue.c
+++ b/sys/dev/raidframe/rf_diskqueue.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_diskqueue.c,v 1.13 2000/03/04 04:22:34 oster Exp $	*/
+/*	$NetBSD: rf_diskqueue.c,v 1.14 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -65,14 +65,14 @@
  *
  ****************************************************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 #include "rf_raid.h"
 #include "rf_diskqueue.h"
 #include "rf_alloclist.h"
 #include "rf_acctrace.h"
 #include "rf_etimer.h"
-#include "rf_configure.h"
 #include "rf_general.h"
 #include "rf_freelist.h"
 #include "rf_debugprint.h"
diff --git a/sys/dev/raidframe/rf_diskqueue.h b/sys/dev/raidframe/rf_diskqueue.h
index 7c9a0c0317aa..3ff7f30a62b9 100644
--- a/sys/dev/raidframe/rf_diskqueue.h
+++ b/sys/dev/raidframe/rf_diskqueue.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_diskqueue.h,v 1.5 2000/02/13 04:53:57 oster Exp $	*/
+/*	$NetBSD: rf_diskqueue.h,v 1.6 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -38,10 +38,11 @@
 #ifndef _RF__RF_DISKQUEUE_H_
 #define _RF__RF_DISKQUEUE_H_
 
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 #include "rf_acctrace.h"
 #include "rf_alloclist.h"
-#include "rf_types.h"
 #include "rf_etimer.h"
 
 
diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c
index ec1700dcb6ec..1218092a7fc3 100644
--- a/sys/dev/raidframe/rf_disks.c
+++ b/sys/dev/raidframe/rf_disks.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_disks.c,v 1.34 2000/12/05 01:35:56 oster Exp $	*/
+/*	$NetBSD: rf_disks.c,v 1.35 2001/10/04 15:58:53 oster Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -66,11 +66,11 @@
  * rf_disks.c -- code to perform operations on the actual disks
  ***************************************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_alloclist.h"
 #include "rf_utils.h"
-#include "rf_configure.h"
 #include "rf_general.h"
 #include "rf_options.h"
 #include "rf_kintf.h"
diff --git a/sys/dev/raidframe/rf_disks.h b/sys/dev/raidframe/rf_disks.h
index 2208d3920b48..e91dbcb20c3b 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.9 2001/09/25 02:56:13 oster Exp $	*/
+/*	$NetBSD: rf_disks.h,v 1.10 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -35,54 +35,15 @@
 
 #include <sys/types.h>
 
+#include <dev/raidframe/raidframevar.h>
 #include "rf_archs.h"
-#include "rf_types.h"
 #include "rf_netbsd.h"
 
-/*
- * A physical disk can be in one of several states:
- * IF YOU ADD A STATE, CHECK TO SEE IF YOU NEED TO MODIFY RF_DEAD_DISK() BELOW.
- */
-enum RF_DiskStatus_e {
-	rf_ds_optimal,		/* no problems */
-	rf_ds_failed,		/* reconstruction ongoing */
-	rf_ds_reconstructing,	/* reconstruction complete to spare, dead disk
-				 * not yet replaced */
-	rf_ds_dist_spared,	/* reconstruction complete to distributed
-				 * spare space, dead disk not yet replaced */
-	rf_ds_spared,		/* reconstruction complete to distributed
-				 * spare space, dead disk not yet replaced */
-	rf_ds_spare,		/* an available spare disk */
-	rf_ds_used_spare	/* a spare which has been used, and hence is
-				 * not available */
-};
-typedef enum RF_DiskStatus_e RF_DiskStatus_t;
-
-struct RF_RaidDisk_s {
-	char    devname[56];	/* name of device file */
-	RF_DiskStatus_t status;	/* whether it is up or down */
-	RF_RowCol_t spareRow;	/* if in status "spared", this identifies the
-				 * spare disk */
-	RF_RowCol_t spareCol;	/* if in status "spared", this identifies the
-				 * spare disk */
-	RF_SectorCount_t numBlocks;	/* number of blocks, obtained via READ
-					 * CAPACITY */
-	int     blockSize;
-	RF_SectorCount_t partitionSize; /* The *actual* and *full* size of 
-					   the partition, from the disklabel */
-	int     auto_configured;/* 1 if this component was autoconfigured.
-				   0 otherwise. */
-	dev_t   dev;
-};
-
 /* if a disk is in any of these states, it is inaccessible */
 #define RF_DEAD_DISK(_dstat_) (((_dstat_) == rf_ds_spared) || \
 	((_dstat_) == rf_ds_reconstructing) || ((_dstat_) == rf_ds_failed) || \
 	((_dstat_) == rf_ds_dist_spared))
 
-#ifdef _KERNEL
-#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,
@@ -97,5 +58,5 @@ 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_driver.c b/sys/dev/raidframe/rf_driver.c
index ebea4125e76c..d469eb984d62 100644
--- a/sys/dev/raidframe/rf_driver.c
+++ b/sys/dev/raidframe/rf_driver.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_driver.c,v 1.41 2001/07/27 03:30:07 oster Exp $	*/
+/*	$NetBSD: rf_driver.c,v 1.42 2001/10/04 15:58:53 oster Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -95,7 +95,6 @@
 #include "rf_utils.h"
 #include "rf_etimer.h"
 #include "rf_acctrace.h"
-#include "rf_configure.h"
 #include "rf_general.h"
 #include "rf_desc.h"
 #include "rf_states.h"
diff --git a/sys/dev/raidframe/rf_driver.h b/sys/dev/raidframe/rf_driver.h
index b023ce43078a..d0a1fe81bb71 100644
--- a/sys/dev/raidframe/rf_driver.h
+++ b/sys/dev/raidframe/rf_driver.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_driver.h,v 1.5 2001/07/27 03:30:07 oster Exp $	*/
+/*	$NetBSD: rf_driver.h,v 1.6 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * rf_driver.h
  */
@@ -32,11 +32,11 @@
 #ifndef _RF__RF_DRIVER_H_
 #define _RF__RF_DRIVER_H_
 
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
-#include "rf_types.h"
 #include "rf_netbsd.h"
 
-#if _KERNEL
 RF_DECLARE_EXTERN_MUTEX(rf_printf_mutex)
 int     rf_BootRaidframe(void);
 int     rf_UnbootRaidframe(void);
@@ -68,5 +68,5 @@ void    rf_StartUserStats(RF_Raid_t * raidPtr);
 void    rf_StopUserStats(RF_Raid_t * raidPtr);
 void    rf_UpdateUserStats(RF_Raid_t * raidPtr, int rt, int numsect);
 void    rf_PrintUserStats(RF_Raid_t * raidPtr);
-#endif /* _KERNEL */
+
 #endif				/* !_RF__RF_DRIVER_H_ */
diff --git a/sys/dev/raidframe/rf_etimer.h b/sys/dev/raidframe/rf_etimer.h
index 9616a2bf8763..480cd5064407 100644
--- a/sys/dev/raidframe/rf_etimer.h
+++ b/sys/dev/raidframe/rf_etimer.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_etimer.h,v 1.5 2001/07/18 06:45:33 thorpej Exp $	*/
+/*	$NetBSD: rf_etimer.h,v 1.6 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -40,7 +40,6 @@ struct RF_Etimer_s {
         struct timeval diff;
 };
 
-#if defined(_KERNEL)
 #include <sys/kernel.h>
 
 #define RF_ETIMER_START(_t_)                                    \
@@ -68,6 +67,4 @@ struct RF_Etimer_s {
 #define RF_ETIMER_VAL_US(_t_)      (RF_TIMEVAL_TO_US((_t_).diff))
 #define RF_ETIMER_VAL_MS(_t_)      (RF_TIMEVAL_TO_US((_t_).diff)/1000)
 
-#endif /* _KERNEL */
-
 #endif				/* !_RF__RF_TIMER_H_ */
diff --git a/sys/dev/raidframe/rf_evenodd.c b/sys/dev/raidframe/rf_evenodd.c
index 3d757736b460..b317f169322b 100644
--- a/sys/dev/raidframe/rf_evenodd.c
+++ b/sys/dev/raidframe/rf_evenodd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_evenodd.c,v 1.5 2001/07/18 06:45:33 thorpej Exp $	*/
+/*	$NetBSD: rf_evenodd.c,v 1.6 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -36,7 +36,8 @@
 
 #if RF_INCLUDE_EVENODD > 0
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagffrd.h"
@@ -48,7 +49,6 @@
 #include "rf_etimer.h"
 #include "rf_general.h"
 #include "rf_evenodd.h"
-#include "rf_configure.h"
 #include "rf_parityscan.h"
 #include "rf_utils.h"
 #include "rf_map.h"
diff --git a/sys/dev/raidframe/rf_evenodd_dagfuncs.c b/sys/dev/raidframe/rf_evenodd_dagfuncs.c
index 787d93c06d5c..083ec51bca68 100644
--- a/sys/dev/raidframe/rf_evenodd_dagfuncs.c
+++ b/sys/dev/raidframe/rf_evenodd_dagfuncs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_evenodd_dagfuncs.c,v 1.9 2001/09/01 23:50:44 thorpej Exp $	*/
+/*	$NetBSD: rf_evenodd_dagfuncs.c,v 1.10 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,7 +34,8 @@
 
 #if RF_INCLUDE_EVENODD > 0
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagffrd.h"
@@ -45,7 +46,6 @@
 #include "rf_dagfuncs.h"
 #include "rf_etimer.h"
 #include "rf_general.h"
-#include "rf_configure.h"
 #include "rf_parityscan.h"
 #include "rf_evenodd.h"
 #include "rf_evenodd_dagfuncs.h"
diff --git a/sys/dev/raidframe/rf_evenodd_dags.c b/sys/dev/raidframe/rf_evenodd_dags.c
index 7832b09dc98d..f60bb7244512 100644
--- a/sys/dev/raidframe/rf_evenodd_dags.c
+++ b/sys/dev/raidframe/rf_evenodd_dags.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_evenodd_dags.c,v 1.2 1999/02/05 00:06:11 oster Exp $	*/
+/*	$NetBSD: rf_evenodd_dags.c,v 1.3 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * rf_evenodd_dags.c
  */
@@ -33,7 +33,8 @@
 
 #if RF_INCLUDE_EVENODD > 0
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagfuncs.h"
diff --git a/sys/dev/raidframe/rf_evenodd_dags.h b/sys/dev/raidframe/rf_evenodd_dags.h
index e7b01c6d9583..9889b03c24ef 100644
--- a/sys/dev/raidframe/rf_evenodd_dags.h
+++ b/sys/dev/raidframe/rf_evenodd_dags.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_evenodd_dags.h,v 1.2 1999/02/05 00:06:11 oster Exp $	*/
+/*	$NetBSD: rf_evenodd_dags.h,v 1.3 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * rf_evenodd_dags.h
  */
@@ -32,7 +32,7 @@
 #ifndef _RF__RF_EVENODD_DAGS_H_
 #define _RF__RF_EVENODD_DAGS_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 #if RF_UTILITY == 0
 #include "rf_dag.h"
diff --git a/sys/dev/raidframe/rf_fifo.c b/sys/dev/raidframe/rf_fifo.c
index 5e7d9ed7d0dc..2b9b08e7c84e 100644
--- a/sys/dev/raidframe/rf_fifo.c
+++ b/sys/dev/raidframe/rf_fifo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_fifo.c,v 1.5 2000/03/04 03:27:13 oster Exp $	*/
+/*	$NetBSD: rf_fifo.c,v 1.6 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -35,7 +35,8 @@
  *
  ***************************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_alloclist.h"
 #include "rf_stripelocks.h"
 #include "rf_layout.h"
@@ -45,7 +46,6 @@
 #include "rf_general.h"
 #include "rf_options.h"
 #include "rf_raid.h"
-#include "rf_types.h"
 
 /* just malloc a header, zero it (via calloc), and return it */
 /*ARGSUSED*/
diff --git a/sys/dev/raidframe/rf_fifo.h b/sys/dev/raidframe/rf_fifo.h
index 55bf5edddfdb..9fa00435181e 100644
--- a/sys/dev/raidframe/rf_fifo.h
+++ b/sys/dev/raidframe/rf_fifo.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_fifo.h,v 1.3 1999/02/05 00:06:11 oster Exp $	*/
+/*	$NetBSD: rf_fifo.h,v 1.4 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -36,8 +36,9 @@
 #ifndef _RF__RF_FIFO_H_
 #define _RF__RF_FIFO_H_
 
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_archs.h"
-#include "rf_types.h"
 #include "rf_diskqueue.h"
 
 typedef struct RF_FifoHeader_s {
diff --git a/sys/dev/raidframe/rf_freelist.h b/sys/dev/raidframe/rf_freelist.h
index 179b72f6ecc4..95d7c91fc65b 100644
--- a/sys/dev/raidframe/rf_freelist.h
+++ b/sys/dev/raidframe/rf_freelist.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_freelist.h,v 1.4 2001/07/18 06:45:33 thorpej Exp $	*/
+/*	$NetBSD: rf_freelist.h,v 1.5 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * rf_freelist.h
  */
@@ -41,7 +41,8 @@
 #ifndef _RF__RF_FREELIST_H_
 #define _RF__RF_FREELIST_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_debugMem.h"
 #include "rf_general.h"
 #include "rf_threadstuff.h"
diff --git a/sys/dev/raidframe/rf_general.h b/sys/dev/raidframe/rf_general.h
index 9a2c6c708321..a10fc3a7d97b 100644
--- a/sys/dev/raidframe/rf_general.h
+++ b/sys/dev/raidframe/rf_general.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_general.h,v 1.8 2001/09/01 23:50:44 thorpej Exp $	*/
+/*	$NetBSD: rf_general.h,v 1.9 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -30,6 +30,8 @@
  * rf_general.h -- some general-use definitions
  */
 
+/* #define NOASSERT */
+
 #ifndef _RF__RF_GENERAL_H_
 #define _RF__RF_GENERAL_H_
 
@@ -39,9 +41,7 @@
 
 /* error reporting and handling */
 
-#ifdef _KERNEL
 #include<sys/systm.h>		/* printf, sprintf, and friends */
-#endif
 
 #define RF_ERRORMSG(s)            printf((s))
 #define RF_ERRORMSG1(s,a)         printf((s),(a))
@@ -55,16 +55,12 @@ extern char rf_panicbuf[];
 #define RF_PANIC() {rf_print_panic_message(__LINE__,__FILE__); panic(rf_panicbuf);}
 
 #ifdef RAID_DIAGNOSTIC
-#ifdef _KERNEL
 #define RF_ASSERT(_x_) { \
   if (!(_x_)) { \
     rf_print_assert_panic_message(__LINE__, __FILE__, #_x_); \
     panic(rf_panicbuf); \
   } \
 }
-#else /* _KERNEL */
-#define RF_ASSERT(x) {/*noop*/}
-#endif /* _KERNEL */
 #else /* RAID_DIAGNOSTIC */
 #define RF_ASSERT(x) {/*noop*/}
 #endif /* RAID_DIAGNOSTIC */
diff --git a/sys/dev/raidframe/rf_hist.h b/sys/dev/raidframe/rf_hist.h
index a1b343ad4cb0..92eab8de7c44 100644
--- a/sys/dev/raidframe/rf_hist.h
+++ b/sys/dev/raidframe/rf_hist.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_hist.h,v 1.3 1999/02/05 00:06:12 oster Exp $	*/
+/*	$NetBSD: rf_hist.h,v 1.4 2001/10/04 15:58:53 oster Exp $	*/
 /*
  * rf_hist.h
  *
@@ -34,7 +34,7 @@
 #ifndef _RF__RF_HIST_H_
 #define _RF__RF_HIST_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 #define RF_HIST_RESOLUTION   5
 #define RF_HIST_MIN_VAL      0
diff --git a/sys/dev/raidframe/rf_interdecluster.c b/sys/dev/raidframe/rf_interdecluster.c
index 10b16e3cacea..d612a6d081cb 100644
--- a/sys/dev/raidframe/rf_interdecluster.c
+++ b/sys/dev/raidframe/rf_interdecluster.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_interdecluster.c,v 1.5 2001/01/26 05:09:13 oster Exp $	*/
+/*	$NetBSD: rf_interdecluster.c,v 1.6 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -36,7 +36,8 @@
 
 #if RF_INCLUDE_INTERDECLUSTER > 0
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_interdecluster.h"
 #include "rf_dag.h"
diff --git a/sys/dev/raidframe/rf_kintf.h b/sys/dev/raidframe/rf_kintf.h
index b96d0719fc8b..38da10188c96 100644
--- a/sys/dev/raidframe/rf_kintf.h
+++ b/sys/dev/raidframe/rf_kintf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_kintf.h,v 1.15 2000/10/20 02:24:45 oster Exp $	*/
+/*	$NetBSD: rf_kintf.h,v 1.16 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * rf_kintf.h
  *
@@ -34,7 +34,7 @@
 #ifndef _RF__RF_KINTF_H_
 #define _RF__RF_KINTF_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 int     rf_GetSpareTableFromDaemon(RF_SparetWait_t * req);
 
diff --git a/sys/dev/raidframe/rf_layout.c b/sys/dev/raidframe/rf_layout.c
index 417c0c39b0be..22fe262783a0 100644
--- a/sys/dev/raidframe/rf_layout.c
+++ b/sys/dev/raidframe/rf_layout.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_layout.c,v 1.9 2001/01/27 19:34:43 oster Exp $	*/
+/*	$NetBSD: rf_layout.c,v 1.10 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -29,10 +29,10 @@
 /* rf_layout.c -- driver code dealing with layout and mapping issues
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_archs.h"
 #include "rf_raid.h"
-#include "rf_configure.h"
 #include "rf_dag.h"
 #include "rf_desc.h"
 #include "rf_decluster.h"
diff --git a/sys/dev/raidframe/rf_layout.h b/sys/dev/raidframe/rf_layout.h
index 608ab326772f..f1a8aaa7641f 100644
--- a/sys/dev/raidframe/rf_layout.h
+++ b/sys/dev/raidframe/rf_layout.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_layout.h,v 1.5 2001/01/26 04:14:14 oster Exp $	*/
+/*	$NetBSD: rf_layout.h,v 1.6 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -32,102 +32,10 @@
 #ifndef _RF__RF_LAYOUT_H_
 #define _RF__RF_LAYOUT_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 #include "rf_archs.h"
 #include "rf_alloclist.h"
 
-#ifndef _KERNEL
-#include <stdio.h>
-#endif
-
-/*****************************************************************************************
- *
- * This structure identifies all layout-specific operations and parameters.
- *
- ****************************************************************************************/
-
-typedef struct RF_LayoutSW_s {
-	RF_ParityConfig_t parityConfig;
-	const char *configName;
-
-#ifndef _KERNEL
-	/* layout-specific parsing */
-	int     (*MakeLayoutSpecific) (FILE * fp, RF_Config_t * cfgPtr, void *arg);
-	void   *makeLayoutSpecificArg;
-#endif				/* !KERNEL */
-
-#if RF_UTILITY == 0
-	/* initialization routine */
-	int     (*Configure) (RF_ShutdownList_t ** shutdownListp, RF_Raid_t * raidPtr, RF_Config_t * cfgPtr);
-
-	/* routine to map RAID sector address -> physical (row, col, offset) */
-	void    (*MapSector) (RF_Raid_t * raidPtr, RF_RaidAddr_t raidSector,
-	            RF_RowCol_t * row, RF_RowCol_t * col, RF_SectorNum_t * diskSector, int remap);
-
-	/* routine to map RAID sector address -> physical (r,c,o) of parity
-	 * unit */
-	void    (*MapParity) (RF_Raid_t * raidPtr, RF_RaidAddr_t raidSector,
-	            RF_RowCol_t * row, RF_RowCol_t * col, RF_SectorNum_t * diskSector, int remap);
-
-	/* routine to map RAID sector address -> physical (r,c,o) of Q unit */
-	void    (*MapQ) (RF_Raid_t * raidPtr, RF_RaidAddr_t raidSector, RF_RowCol_t * row,
-	            RF_RowCol_t * col, RF_SectorNum_t * diskSector, int remap);
-
-	/* routine to identify the disks comprising a stripe */
-	void    (*IdentifyStripe) (RF_Raid_t * raidPtr, RF_RaidAddr_t addr,
-	            RF_RowCol_t ** diskids, RF_RowCol_t * outRow);
-
-	/* routine to select a dag */
-	void    (*SelectionFunc) (RF_Raid_t * raidPtr, RF_IoType_t type,
-	            RF_AccessStripeMap_t * asmap,
-	            RF_VoidFuncPtr *);
-#if 0
-	void    (**createFunc) (RF_Raid_t *,
-	            RF_AccessStripeMap_t *,
-	            RF_DagHeader_t *, void *,
-	            RF_RaidAccessFlags_t,
-	            RF_AllocListElem_t *);
-
-#endif
-
-	/* map a stripe ID to a parity stripe ID.  This is typically the
-	 * identity mapping */
-	void    (*MapSIDToPSID) (RF_RaidLayout_t * layoutPtr, RF_StripeNum_t stripeID,
-	            RF_StripeNum_t * psID, RF_ReconUnitNum_t * which_ru);
-
-	/* get default head separation limit (may be NULL) */
-	        RF_HeadSepLimit_t(*GetDefaultHeadSepLimit) (RF_Raid_t * raidPtr);
-
-	/* get default num recon buffers (may be NULL) */
-	int     (*GetDefaultNumFloatingReconBuffers) (RF_Raid_t * raidPtr);
-
-	/* get number of spare recon units (may be NULL) */
-	        RF_ReconUnitCount_t(*GetNumSpareRUs) (RF_Raid_t * raidPtr);
-
-	/* spare table installation (may be NULL) */
-	int     (*InstallSpareTable) (RF_Raid_t * raidPtr, RF_RowCol_t frow, RF_RowCol_t fcol);
-
-	/* recon buffer submission function */
-	int     (*SubmitReconBuffer) (RF_ReconBuffer_t * rbuf, int keep_it,
-	            int use_committed);
-
-	/*
-         * verify that parity information for a stripe is correct
-         * see rf_parityscan.h for return vals
-         */
-	int     (*VerifyParity) (RF_Raid_t * raidPtr, RF_RaidAddr_t raidAddr,
-	            RF_PhysDiskAddr_t * parityPDA, int correct_it, RF_RaidAccessFlags_t flags);
-
-	/* number of faults tolerated by this mapping */
-	int     faultsTolerated;
-
-	/* states to step through in an access. Must end with "LastState". The
-	 * default is DefaultStates in rf_layout.c */
-	RF_AccessState_t *states;
-
-	RF_AccessStripeMapFlags_t flags;
-#endif				/* RF_UTILITY == 0 */
-}       RF_LayoutSW_t;
 /* enables remapping to spare location under dist sparing */
 #define RF_REMAP       1
 #define RF_DONT_REMAP  0
diff --git a/sys/dev/raidframe/rf_map.c b/sys/dev/raidframe/rf_map.c
index 37e125335592..fe8a4784548c 100644
--- a/sys/dev/raidframe/rf_map.c
+++ b/sys/dev/raidframe/rf_map.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_map.c,v 1.6 2001/07/18 06:45:33 thorpej Exp $	*/
+/*	$NetBSD: rf_map.c,v 1.7 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -32,7 +32,8 @@
  *
  **************************************************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 #include "rf_raid.h"
 #include "rf_general.h"
diff --git a/sys/dev/raidframe/rf_map.h b/sys/dev/raidframe/rf_map.h
index 93f8362d82d2..05c66d292582 100644
--- a/sys/dev/raidframe/rf_map.h
+++ b/sys/dev/raidframe/rf_map.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_map.h,v 1.3 1999/02/05 00:06:12 oster Exp $	*/
+/*	$NetBSD: rf_map.h,v 1.4 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -31,7 +31,8 @@
 #ifndef _RF__RF_MAP_H_
 #define _RF__RF_MAP_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_alloclist.h"
 #include "rf_raid.h"
 
diff --git a/sys/dev/raidframe/rf_mcpair.c b/sys/dev/raidframe/rf_mcpair.c
index 6ae6d6782e73..5722d92fd2b3 100644
--- a/sys/dev/raidframe/rf_mcpair.c
+++ b/sys/dev/raidframe/rf_mcpair.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_mcpair.c,v 1.5 2001/09/26 02:52:57 oster Exp $	*/
+/*	$NetBSD: rf_mcpair.c,v 1.6 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -31,7 +31,8 @@
  * it's used to block the current thread until some event occurs.
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_archs.h"
 #include "rf_threadstuff.h"
 #include "rf_mcpair.h"
diff --git a/sys/dev/raidframe/rf_mcpair.h b/sys/dev/raidframe/rf_mcpair.h
index fdd787037c5e..9f0323ab56d8 100644
--- a/sys/dev/raidframe/rf_mcpair.h
+++ b/sys/dev/raidframe/rf_mcpair.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_mcpair.h,v 1.6 2000/09/21 01:45:46 oster Exp $	*/
+/*	$NetBSD: rf_mcpair.h,v 1.7 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
 #ifndef _RF__RF_MCPAIR_H_
 #define _RF__RF_MCPAIR_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 #include "rf_threadstuff.h"
 
 struct RF_MCPair_s {
diff --git a/sys/dev/raidframe/rf_memchunk.c b/sys/dev/raidframe/rf_memchunk.c
index fe4635e8aab6..1f9e55c68264 100644
--- a/sys/dev/raidframe/rf_memchunk.c
+++ b/sys/dev/raidframe/rf_memchunk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_memchunk.c,v 1.5 2001/07/18 06:45:33 thorpej Exp $	*/
+/*	$NetBSD: rf_memchunk.c,v 1.6 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -58,7 +58,8 @@
  *
  ********************************************************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 #include "rf_debugMem.h"
 #include "rf_memchunk.h"
diff --git a/sys/dev/raidframe/rf_memchunk.h b/sys/dev/raidframe/rf_memchunk.h
index fe19db311dc5..00dddabb0364 100644
--- a/sys/dev/raidframe/rf_memchunk.h
+++ b/sys/dev/raidframe/rf_memchunk.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_memchunk.h,v 1.3 1999/02/05 00:06:13 oster Exp $	*/
+/*	$NetBSD: rf_memchunk.h,v 1.4 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -31,7 +31,7 @@
 #ifndef _RF__RF_MEMCHUNK_H_
 #define _RF__RF_MEMCHUNK_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 struct RF_ChunkDesc_s {
 	int     size;
diff --git a/sys/dev/raidframe/rf_netbsd.h b/sys/dev/raidframe/rf_netbsd.h
index 3bb3c7eaf0ee..09bdd2cff499 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.12 2000/05/28 22:53:49 oster Exp $	*/
+/*	$NetBSD: rf_netbsd.h,v 1.13 2001/10/04 15:58:54 oster Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,71 +39,12 @@
 #ifndef _RF__RF_NETBSDSTUFF_H_
 #define _RF__RF_NETBSDSTUFF_H_
 
-#ifdef _KERNEL
 #include <sys/fcntl.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
-#endif /* _KERNEL */
 
-/* The per-component label information that the user can set */
-typedef struct RF_ComponentInfo_s {
-	int row;              /* the row number of this component */
-	int column;           /* the column number of this component */
-	int serial_number;    /* a user-specified serial number for this
-				 RAID set */
-} RF_ComponentInfo_t;
-
-/* The per-component label information */
-typedef struct RF_ComponentLabel_s {
-	int version;          /* The version of this label. */
-	int serial_number;    /* a user-specified serial number for this
-				 RAID set */
-	int mod_counter;      /* modification counter.  Changed (usually
-				 by incrementing) every time the label 
-				 is changed */
-	int row;              /* the row number of this component */
-	int column;           /* the column number of this component */
-	int num_rows;         /* number of rows in this RAID set */
-	int num_columns;      /* number of columns in this RAID set */
-	int clean;            /* 1 when clean, 0 when dirty */
-	int status;           /* rf_ds_optimal, rf_ds_dist_spared, whatever. */
-	/* stuff that will be in version 2 of the label */
-	int sectPerSU;        /* Sectors per Stripe Unit */
-	int SUsPerPU;         /* Stripe Units per Parity Units */
-	int SUsPerRU;         /* Stripe Units per Reconstruction Units */
-	int parityConfig;     /* '0' == RAID0, '1' == RAID1, etc. */
-	int maxOutstanding;   /* maxOutstanding disk requests */
-	int blockSize;        /* size of component block. 
-				 (disklabel->d_secsize) */
-	int numBlocks;        /* number of blocks on this component.  May
-			         be smaller than the partition size. */
-	int partitionSize;    /* number of blocks on this *partition*. 
-				 Must exactly match the partition size
-				 from the disklabel. */
-	int future_use[33];   /* Future expansion */
-	int autoconfigure;    /* automatically configure this RAID set. 
-				 0 == no, 1 == yes */
-	int root_partition;   /* Use this set as /
-				 0 == no, 1 == yes*/
-	int last_unit;        /* last unit number (e.g. 0 for /dev/raid0) 
-				 of this component.  Used for autoconfigure
-				 only. */
-	int config_order;     /* 0 .. n.  The order in which the component
-				 should be auto-configured.  E.g. 0 is will 
-				 done first, (and would become raid0).
-				 This may be in conflict with last_unit!!?! */
-	                      /* Not currently used. */
-	int future_use2[44];  /* More future expansion */
-} RF_ComponentLabel_t;
-
-typedef struct RF_SingleComponent_s {
-	int row;
-	int column;
-	char component_name[50]; /* name of the component */
-} RF_SingleComponent_t; 
-
-#ifdef _KERNEL
+#include <dev/raidframe/raidframevar.h>
 
 struct raidcinfo {
 	struct vnode *ci_vp;	/* component device's vnode */
@@ -136,5 +77,4 @@ typedef struct RF_ConfigSet_s {
 	struct RF_ConfigSet_s *next;
 } RF_ConfigSet_t;
 
-#endif /* _KERNEL */
 #endif /* _RF__RF_NETBSDSTUFF_H_ */
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 3964d5bb25fb..44e62c409dd9 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.110 2001/10/04 15:58:54 oster Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -135,10 +135,11 @@
 #include <sys/user.h>
 #include <sys/reboot.h>
 
+#include <dev/raidframe/raidframevar.h>
+#include <dev/raidframe/raidframeio.h>
 #include "raid.h"
 #include "opt_raid_autoconfig.h"
 #include "rf_raid.h"
-#include "rf_raidframe.h"
 #include "rf_copyback.h"
 #include "rf_dag.h"
 #include "rf_dagflags.h"
@@ -154,7 +155,6 @@
 #include "rf_parityscan.h"
 #include "rf_debugprint.h"
 #include "rf_threadstuff.h"
-#include "rf_configure.h"
 
 int     rf_kdebug_level = 0;
 
@@ -239,7 +239,7 @@ int numraid = 0;
  * a single 64K write will typically require 64K for the old data, 
  * 64K for the old parity, and 64K for the new parity, for a total 
  * of 192K (if the parity buffer is not re-used immediately).
- * Even it if is used immedately, that's still 128K, which when multiplied
+ * Even it if is used immediately, that's still 128K, which when multiplied
  * by say 10 requests, is 1280K, *on top* of the 640K of incoming data.
  * 
  * Now in degraded mode, for example, a 64K read on the above setup may
@@ -2438,7 +2438,9 @@ rf_update_component_labels(raidPtr, final)
 
 	for( c = 0; c < raidPtr->numSpare ; c++) {
 		sparecol = raidPtr->numCol + c;
-		if (raidPtr->Disks[0][sparecol].status == rf_ds_used_spare) {
+		/* Need to ensure that the reconstruct actually completed! */
+		if ((raidPtr->Disks[0][sparecol].status == rf_ds_used_spare) &&
+		    (raidPtr->status[0] == rf_rs_optimal)) {
 			/* 
 			   
 			   we claim this disk is "optimal" if it's 
diff --git a/sys/dev/raidframe/rf_nwayxor.h b/sys/dev/raidframe/rf_nwayxor.h
index 9931e26f037b..ff975d1f09a6 100644
--- a/sys/dev/raidframe/rf_nwayxor.h
+++ b/sys/dev/raidframe/rf_nwayxor.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_nwayxor.h,v 1.3 1999/02/05 00:06:13 oster Exp $	*/
+/*	$NetBSD: rf_nwayxor.h,v 1.4 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * rf_nwayxor.h
  */
@@ -35,7 +35,8 @@
 #ifndef _RF__RF_NWAYXOR_H_
 #define _RF__RF_NWAYXOR_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_reconstruct.h"
 
diff --git a/sys/dev/raidframe/rf_options.c b/sys/dev/raidframe/rf_options.c
index 660ff920df99..6bdfcfc7cbdf 100644
--- a/sys/dev/raidframe/rf_options.c
+++ b/sys/dev/raidframe/rf_options.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_options.c,v 1.3 1999/02/05 00:06:13 oster Exp $	*/
+/*	$NetBSD: rf_options.c,v 1.4 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * rf_options.c
  */
@@ -29,9 +29,9 @@
  * rights to redistribute these changes.
  */
 
+#include <dev/raidframe/raidframevar.h>
 
 #include "rf_threadstuff.h"
-#include "rf_types.h"
 #include "rf_archs.h"
 #include "rf_general.h"
 #include "rf_options.h"
diff --git a/sys/dev/raidframe/rf_paritylog.c b/sys/dev/raidframe/rf_paritylog.c
index ffc51b9b2e39..1bcf100ef9a9 100644
--- a/sys/dev/raidframe/rf_paritylog.c
+++ b/sys/dev/raidframe/rf_paritylog.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_paritylog.c,v 1.5 2000/01/07 03:41:01 oster Exp $	*/
+/*	$NetBSD: rf_paritylog.c,v 1.6 2001/10/04 15:58:54 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -38,7 +38,8 @@
  * Append-only log for recording parity "update" and "overwrite" records
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 #include "rf_mcpair.h"
 #include "rf_raid.h"
diff --git a/sys/dev/raidframe/rf_paritylog.h b/sys/dev/raidframe/rf_paritylog.h
index 20884c5c9d98..c57fe2d71e89 100644
--- a/sys/dev/raidframe/rf_paritylog.h
+++ b/sys/dev/raidframe/rf_paritylog.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_paritylog.h,v 1.3 1999/02/05 00:06:14 oster Exp $	*/
+/*	$NetBSD: rf_paritylog.h,v 1.4 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
 #ifndef _RF__RF_PARITYLOG_H_
 #define _RF__RF_PARITYLOG_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 #define RF_DEFAULT_NUM_SECTORS_PER_LOG 64
 
diff --git a/sys/dev/raidframe/rf_paritylogDiskMgr.c b/sys/dev/raidframe/rf_paritylogDiskMgr.c
index 394c83cd4c94..3d1c5f3f0ad0 100644
--- a/sys/dev/raidframe/rf_paritylogDiskMgr.c
+++ b/sys/dev/raidframe/rf_paritylogDiskMgr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_paritylogDiskMgr.c,v 1.11 2001/07/18 06:45:34 thorpej Exp $	*/
+/*	$NetBSD: rf_paritylogDiskMgr.c,v 1.12 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,8 @@
 
 #if RF_INCLUDE_PARITYLOGGING > 0
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 #include "rf_mcpair.h"
 #include "rf_raid.h"
diff --git a/sys/dev/raidframe/rf_paritylogDiskMgr.h b/sys/dev/raidframe/rf_paritylogDiskMgr.h
index 245ac6d01327..b263cfbbb71c 100644
--- a/sys/dev/raidframe/rf_paritylogDiskMgr.h
+++ b/sys/dev/raidframe/rf_paritylogDiskMgr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_paritylogDiskMgr.h,v 1.3 1999/02/05 00:06:14 oster Exp $	*/
+/*	$NetBSD: rf_paritylogDiskMgr.h,v 1.4 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
 #ifndef _RF__RF_PARITYLOGDISKMGR_H_
 #define _RF__RF_PARITYLOGDISKMGR_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 int     rf_ShutdownLogging(RF_Raid_t * raidPtr);
 int     rf_ParityLoggingDiskManager(RF_Raid_t * raidPtr);
diff --git a/sys/dev/raidframe/rf_paritylogging.c b/sys/dev/raidframe/rf_paritylogging.c
index 243b812e3f89..00b80d5915e7 100644
--- a/sys/dev/raidframe/rf_paritylogging.c
+++ b/sys/dev/raidframe/rf_paritylogging.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_paritylogging.c,v 1.10 2000/02/12 16:06:27 oster Exp $	*/
+/*	$NetBSD: rf_paritylogging.c,v 1.11 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -35,7 +35,8 @@
 
 #if RF_INCLUDE_PARITYLOGGING > 0
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagutils.h"
diff --git a/sys/dev/raidframe/rf_parityloggingdags.c b/sys/dev/raidframe/rf_parityloggingdags.c
index ed308c1e5426..480656ac9bd1 100644
--- a/sys/dev/raidframe/rf_parityloggingdags.c
+++ b/sys/dev/raidframe/rf_parityloggingdags.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_parityloggingdags.c,v 1.5 2001/09/01 23:50:44 thorpej Exp $	*/
+/*	$NetBSD: rf_parityloggingdags.c,v 1.6 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,7 +34,8 @@
   DAGs specific to parity logging are created here
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagutils.h"
diff --git a/sys/dev/raidframe/rf_parityscan.c b/sys/dev/raidframe/rf_parityscan.c
index 98629c4f7332..87d56fdc71a5 100644
--- a/sys/dev/raidframe/rf_parityscan.c
+++ b/sys/dev/raidframe/rf_parityscan.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_parityscan.c,v 1.10 2001/07/18 06:45:34 thorpej Exp $	*/
+/*	$NetBSD: rf_parityscan.c,v 1.11 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -32,7 +32,8 @@
  *
  *****************************************************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagfuncs.h"
diff --git a/sys/dev/raidframe/rf_parityscan.h b/sys/dev/raidframe/rf_parityscan.h
index 51b12b0ea7a7..9df902a0427b 100644
--- a/sys/dev/raidframe/rf_parityscan.h
+++ b/sys/dev/raidframe/rf_parityscan.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_parityscan.h,v 1.3 1999/02/05 00:06:14 oster Exp $	*/
+/*	$NetBSD: rf_parityscan.h,v 1.4 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -29,7 +29,8 @@
 #ifndef _RF__RF_PARITYSCAN_H_
 #define _RF__RF_PARITYSCAN_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_alloclist.h"
 
 int     rf_RewriteParity(RF_Raid_t * raidPtr);
diff --git a/sys/dev/raidframe/rf_pq.c b/sys/dev/raidframe/rf_pq.c
index edec22f5f5f0..da2c85d7ecb0 100644
--- a/sys/dev/raidframe/rf_pq.c
+++ b/sys/dev/raidframe/rf_pq.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_pq.c,v 1.9 2001/07/18 06:45:34 thorpej Exp $	*/
+/*	$NetBSD: rf_pq.c,v 1.10 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,7 +34,8 @@
 
 #if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0) || (RF_INCLUDE_EVENODD > 0)
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagffrd.h"
diff --git a/sys/dev/raidframe/rf_pqdeg.c b/sys/dev/raidframe/rf_pqdeg.c
index 9405c54aff23..8d972336cc76 100644
--- a/sys/dev/raidframe/rf_pqdeg.c
+++ b/sys/dev/raidframe/rf_pqdeg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_pqdeg.c,v 1.5 2000/01/07 03:41:04 oster Exp $	*/
+/*	$NetBSD: rf_pqdeg.c,v 1.6 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -30,7 +30,8 @@
 
 #if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0)
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagutils.h"
diff --git a/sys/dev/raidframe/rf_pqdeg.h b/sys/dev/raidframe/rf_pqdeg.h
index 65abcc7cb805..395b8388d8d8 100644
--- a/sys/dev/raidframe/rf_pqdeg.h
+++ b/sys/dev/raidframe/rf_pqdeg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_pqdeg.h,v 1.4 2001/06/20 03:09:23 oster Exp $	*/
+/*	$NetBSD: rf_pqdeg.h,v 1.5 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -31,9 +31,8 @@
 
 #if (RF_INCLUDE_PQ > 0) || (RF_INCLUDE_RAID6 > 0)
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
-#if RF_UTILITY == 0
 #include "rf_dag.h"
 
 /* extern decl's of the failure mode PQ functions.
@@ -59,7 +58,6 @@ RF_CREATE_DAG_FUNC_DECL(rf_PQ_011_CreateWriteDAG);
 RF_CREATE_DAG_FUNC_DECL(rf_PQ_110_CreateWriteDAG);
 RF_CREATE_DAG_FUNC_DECL(rf_PQ_101_CreateWriteDAG);
 RF_CREATE_DAG_FUNC_DECL(rf_PQ_200_CreateWriteDAG);
-#endif				/* RF_UTILITY == 0 */
 
 typedef RF_uint32 RF_ua32_t[32];
 typedef RF_uint8 RF_ua1024_t[1024];
diff --git a/sys/dev/raidframe/rf_pqdegdags.c b/sys/dev/raidframe/rf_pqdegdags.c
index dbb9e6b3d4b3..093b683f2f9e 100644
--- a/sys/dev/raidframe/rf_pqdegdags.c
+++ b/sys/dev/raidframe/rf_pqdegdags.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_pqdegdags.c,v 1.6 2001/07/18 06:45:34 thorpej Exp $	*/
+/*	$NetBSD: rf_pqdegdags.c,v 1.7 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -36,7 +36,8 @@
 
 #if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0)
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagdegrd.h"
diff --git a/sys/dev/raidframe/rf_psstatus.c b/sys/dev/raidframe/rf_psstatus.c
index c287de07daf2..f051ad6d4a28 100644
--- a/sys/dev/raidframe/rf_psstatus.c
+++ b/sys/dev/raidframe/rf_psstatus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_psstatus.c,v 1.6 2001/07/18 06:45:34 thorpej Exp $	*/
+/*	$NetBSD: rf_psstatus.c,v 1.7 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -36,7 +36,8 @@
  *
  *****************************************************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_general.h"
 #include "rf_debugprint.h"
diff --git a/sys/dev/raidframe/rf_psstatus.h b/sys/dev/raidframe/rf_psstatus.h
index 57313c37f7f4..e704faaeaab7 100644
--- a/sys/dev/raidframe/rf_psstatus.h
+++ b/sys/dev/raidframe/rf_psstatus.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_psstatus.h,v 1.3 1999/02/05 00:06:15 oster Exp $	*/
+/*	$NetBSD: rf_psstatus.h,v 1.4 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -39,7 +39,8 @@
 #ifndef _RF__RF_PSSTATUS_H_
 #define _RF__RF_PSSTATUS_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 #include "rf_callback.h"
 
diff --git a/sys/dev/raidframe/rf_raid.h b/sys/dev/raidframe/rf_raid.h
index 00fb9953f225..997e11f7a08e 100644
--- a/sys/dev/raidframe/rf_raid.h
+++ b/sys/dev/raidframe/rf_raid.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_raid.h,v 1.13 2001/09/26 03:01:19 oster Exp $	*/
+/*	$NetBSD: rf_raid.h,v 1.14 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,8 +34,8 @@
 #ifndef _RF__RF_RAID_H_
 #define _RF__RF_RAID_H_
 
+#include <dev/raidframe/raidframevar.h>
 #include "rf_archs.h"
-#include "rf_types.h"
 #include "rf_threadstuff.h"
 
 #include "rf_netbsd.h"
@@ -56,8 +56,6 @@
 #include "rf_paritylog.h"
 #endif				/* RF_INCLUDE_PARITYLOGGING > 0 */
 
-#define RF_MAX_DISKS 128	/* max disks per array */
-
 #define RF_COMPONENT_LABEL_VERSION_1 1
 #define RF_COMPONENT_LABEL_VERSION 2
 #define RF_RAID_DIRTY 0
diff --git a/sys/dev/raidframe/rf_raid0.c b/sys/dev/raidframe/rf_raid0.c
index 58b583415e38..64520660d8a5 100644
--- a/sys/dev/raidframe/rf_raid0.c
+++ b/sys/dev/raidframe/rf_raid0.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_raid0.c,v 1.4 2000/01/07 03:41:02 oster Exp $	*/
+/*	$NetBSD: rf_raid0.c,v 1.5 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -32,7 +32,8 @@
  *
  ***************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_raid0.h"
 #include "rf_dag.h"
@@ -41,7 +42,6 @@
 #include "rf_dagutils.h"
 #include "rf_dagfuncs.h"
 #include "rf_general.h"
-#include "rf_configure.h"
 #include "rf_parityscan.h"
 
 typedef struct RF_Raid0ConfigInfo_s {
diff --git a/sys/dev/raidframe/rf_raid1.h b/sys/dev/raidframe/rf_raid1.h
index 3e4a3926e6d7..7cfb67f98935 100644
--- a/sys/dev/raidframe/rf_raid1.h
+++ b/sys/dev/raidframe/rf_raid1.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_raid1.h,v 1.3 1999/02/05 00:06:16 oster Exp $	*/
+/*	$NetBSD: rf_raid1.h,v 1.4 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -31,7 +31,7 @@
 #ifndef _RF__RF_RAID1_H_
 #define _RF__RF_RAID1_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 int 
 rf_ConfigureRAID1(RF_ShutdownList_t ** listp, RF_Raid_t * raidPtr,
diff --git a/sys/dev/raidframe/rf_raid5.c b/sys/dev/raidframe/rf_raid5.c
index aebd21a05fd0..74eb17188887 100644
--- a/sys/dev/raidframe/rf_raid5.c
+++ b/sys/dev/raidframe/rf_raid5.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_raid5.c,v 1.4 2000/01/08 22:57:30 oster Exp $	*/
+/*	$NetBSD: rf_raid5.c,v 1.5 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -32,7 +32,8 @@
  *
  *****************************************************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_raid5.h"
 #include "rf_dag.h"
diff --git a/sys/dev/raidframe/rf_raidframe.h b/sys/dev/raidframe/rf_raidframe.h
index 3ffbb8a07fb4..1a3d21b314d2 100644
--- a/sys/dev/raidframe/rf_raidframe.h
+++ b/sys/dev/raidframe/rf_raidframe.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_raidframe.h,v 1.11 2000/05/28 00:48:31 oster Exp $	*/
+/*	$NetBSD: rf_raidframe.h,v 1.12 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -38,111 +38,6 @@
 #ifndef _RF__RF_RAIDFRAME_H_
 #define _RF__RF_RAIDFRAME_H_
 
-#include "rf_types.h"
-#include "rf_configure.h"
-#include "rf_disks.h"
-#include "rf_raid.h"
-
-typedef RF_uint32 RF_ReconReqFlags_t;
-
-struct rf_recon_req {		/* used to tell the kernel to fail a disk */
-	RF_RowCol_t row, col;
-	RF_ReconReqFlags_t flags;
-	void   *raidPtr;	/* used internally; need not be set at ioctl
-				 * time */
-	struct rf_recon_req *next;	/* used internally; need not be set at
-					 * ioctl time */
-};
-
-struct RF_SparetWait_s {
-	int     C, G, fcol;	/* C = # disks in row, G = # units in stripe,
-				 * fcol = which disk has failed */
-
-	RF_StripeCount_t SUsPerPU;	/* this stuff is the info required to
-					 * create a spare table */
-	int     TablesPerSpareRegion;
-	int     BlocksPerTable;
-	RF_StripeCount_t TableDepthInPUs;
-	RF_StripeCount_t SpareSpaceDepthPerRegionInSUs;
-
-	RF_SparetWait_t *next;	/* used internally; need not be set at ioctl
-				 * time */
-};
-
-typedef struct RF_DeviceConfig_s {
-	u_int   rows;
-	u_int   cols;
-	u_int   maxqdepth;
-	int     ndevs;
-	RF_RaidDisk_t devs[RF_MAX_DISKS];
-	int     nspares;
-	RF_RaidDisk_t spares[RF_MAX_DISKS];
-}       RF_DeviceConfig_t;
-
-typedef struct RF_ProgressInfo_s {
-	RF_uint64 remaining;
-	RF_uint64 completed;
-	RF_uint64 total;
-} RF_ProgressInfo_t;
-
-/* flags that can be put in the rf_recon_req structure */
-#define RF_FDFLAGS_NONE   0x0	/* just fail the disk */
-#define RF_FDFLAGS_RECON  0x1	/* fail and initiate recon */
-
-#define RAIDFRAME_CONFIGURE         _IOW ('r',  1, void *)	/* configure the driver */
-#define RAIDFRAME_SHUTDOWN          _IO  ('r',  2)	/* shutdown the driver */
-#define RAIDFRAME_TUR               _IOW ('r',  3, dev_t)	/* debug only: test unit
-								 * ready */
-#define RAIDFRAME_TEST_ACC          _IOWR('r',  4, struct rf_test_acc)	/* run a test access */
-#define RAIDFRAME_FAIL_DISK         _IOW ('r',  5, struct rf_recon_req)	/* fail a disk &
-									 * optionally start
-									 * recon */
-#define RAIDFRAME_CHECK_RECON_STATUS _IOWR('r',  6, int)	/* get reconstruction %
-							 * complete on indicated
-							 * row */
-#define RAIDFRAME_REWRITEPARITY     _IO  ('r',  7)	/* rewrite (initialize)
-							 * all parity */
-#define RAIDFRAME_COPYBACK          _IO  ('r',  8)	/* copy reconstructed
-							 * data back to replaced
-							 * disk */
-#define RAIDFRAME_SPARET_WAIT       _IOR ('r',  9, RF_SparetWait_t)	/* does not return until
-									 * kernel needs a spare
-									 * table */
-#define RAIDFRAME_SEND_SPARET       _IOW ('r', 10, void *)	/* used to send a spare
-								 * table down into the
-								 * kernel */
-#define RAIDFRAME_ABORT_SPARET_WAIT _IO  ('r', 11)	/* used to wake up the
-							 * sparemap daemon &
-							 * tell it to exit */
-#define RAIDFRAME_START_ATRACE      _IO  ('r', 12)	/* start tracing
-							 * accesses */
-#define RAIDFRAME_STOP_ATRACE       _IO  ('r', 13)	/* stop tracing accesses */
-#define RAIDFRAME_GET_SIZE          _IOR ('r', 14, int)	/* get size (# sectors)
-							 * in raid device */
-#define RAIDFRAME_GET_INFO          _IOWR('r', 15, RF_DeviceConfig_t *)	/* get configuration */
-#define RAIDFRAME_RESET_ACCTOTALS   _IO  ('r', 16)	/* reset AccTotals for
-							 * device */
-#define RAIDFRAME_GET_ACCTOTALS     _IOR ('r', 17, RF_AccTotals_t)	/* retrieve AccTotals
-									 * for device */
-#define RAIDFRAME_KEEP_ACCTOTALS    _IOW ('r', 18, int)	/* turn AccTotals on or
-							 * off for device */
-#define RAIDFRAME_GET_COMPONENT_LABEL _IOWR ('r', 19, RF_ComponentLabel_t *) 
-#define RAIDFRAME_SET_COMPONENT_LABEL _IOW ('r', 20, RF_ComponentLabel_t) 
-
-#define RAIDFRAME_INIT_LABELS _IOW ('r', 21, RF_ComponentLabel_t)
-#define RAIDFRAME_ADD_HOT_SPARE     _IOW ('r', 22, RF_SingleComponent_t)
-#define RAIDFRAME_REMOVE_HOT_SPARE  _IOW ('r', 23, RF_SingleComponent_t)
-#define RAIDFRAME_REBUILD_IN_PLACE  _IOW ('r', 24, RF_SingleComponent_t)
-#define RAIDFRAME_CHECK_PARITY      _IOWR ('r', 25, int)
-#define RAIDFRAME_CHECK_PARITYREWRITE_STATUS _IOWR ('r', 26, int)
-#define RAIDFRAME_CHECK_COPYBACK_STATUS _IOWR ('r', 27, int)
-#define RAIDFRAME_SET_AUTOCONFIG _IOWR ('r', 28, int)
-#define RAIDFRAME_SET_ROOT _IOWR ('r', 29, int)
-#define RAIDFRAME_DELETE_COMPONENT _IOW ('r', 30, RF_SingleComponent_t)
-#define RAIDFRAME_INCORPORATE_HOT_SPARE _IOW ('r', 31, RF_SingleComponent_t)
-/* 'Extended' status versions */
-#define RAIDFRAME_CHECK_RECON_STATUS_EXT _IOWR('r',  32, RF_ProgressInfo_t *)
-#define RAIDFRAME_CHECK_PARITYREWRITE_STATUS_EXT _IOWR ('r', 33, RF_ProgressInfo_t *)
-#define RAIDFRAME_CHECK_COPYBACK_STATUS_EXT _IOWR ('r', 34, RF_ProgressInfo_t *)
+#include <dev/raidframe/raidframevar.h>
 
 #endif				/* !_RF__RF_RAIDFRAME_H_ */
diff --git a/sys/dev/raidframe/rf_reconbuffer.h b/sys/dev/raidframe/rf_reconbuffer.h
index f22dceca645f..54193df261d4 100644
--- a/sys/dev/raidframe/rf_reconbuffer.h
+++ b/sys/dev/raidframe/rf_reconbuffer.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_reconbuffer.h,v 1.3 1999/02/05 00:06:16 oster Exp $	*/
+/*	$NetBSD: rf_reconbuffer.h,v 1.4 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -35,7 +35,8 @@
 #ifndef _RF__RF_RECONBUFFER_H_
 #define _RF__RF_RECONBUFFER_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_reconstruct.h"
 
 int 
diff --git a/sys/dev/raidframe/rf_reconmap.h b/sys/dev/raidframe/rf_reconmap.h
index 0d49a6bbfc4b..4102163d839e 100644
--- a/sys/dev/raidframe/rf_reconmap.h
+++ b/sys/dev/raidframe/rf_reconmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_reconmap.h,v 1.3 1999/02/05 00:06:16 oster Exp $	*/
+/*	$NetBSD: rf_reconmap.h,v 1.4 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,8 @@
 #ifndef _RF__RF_RECONMAP_H_
 #define _RF__RF_RECONMAP_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 
 /*
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c
index 566cdfc188f6..0ee85e1f1bde 100644
--- a/sys/dev/raidframe/rf_reconstruct.c
+++ b/sys/dev/raidframe/rf_reconstruct.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_reconstruct.c,v 1.29 2001/07/18 06:45:34 thorpej Exp $	*/
+/*	$NetBSD: rf_reconstruct.c,v 1.30 2001/10/04 15:58:55 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -32,7 +32,6 @@
  *
  ************************************************************/
 
-#include "rf_types.h"
 #include <sys/time.h>
 #include <sys/buf.h>
 #include <sys/errno.h>
@@ -44,7 +43,7 @@
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
-
+#include <dev/raidframe/raidframevar.h>
 
 #include "rf_raid.h"
 #include "rf_reconutil.h"
diff --git a/sys/dev/raidframe/rf_reconstruct.h b/sys/dev/raidframe/rf_reconstruct.h
index 41e3fa23f3d5..653416654ede 100644
--- a/sys/dev/raidframe/rf_reconstruct.h
+++ b/sys/dev/raidframe/rf_reconstruct.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_reconstruct.h,v 1.5 2000/05/28 00:48:30 oster Exp $	*/
+/*	$NetBSD: rf_reconstruct.h,v 1.6 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
 #ifndef _RF__RF_RECONSTRUCT_H_
 #define _RF__RF_RECONSTRUCT_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 #include <sys/time.h>
 #include "rf_reconmap.h"
 #include "rf_psstatus.h"
diff --git a/sys/dev/raidframe/rf_reconutil.c b/sys/dev/raidframe/rf_reconutil.c
index 4d94685cf66b..77421dd41a85 100644
--- a/sys/dev/raidframe/rf_reconutil.c
+++ b/sys/dev/raidframe/rf_reconutil.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_reconutil.c,v 1.3 1999/02/05 00:06:17 oster Exp $	*/
+/*	$NetBSD: rf_reconutil.c,v 1.4 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -30,7 +30,8 @@
  * rf_reconutil.c -- reconstruction utilities
  ********************************************/
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_desc.h"
 #include "rf_reconutil.h"
diff --git a/sys/dev/raidframe/rf_reconutil.h b/sys/dev/raidframe/rf_reconutil.h
index 4c58e6746f64..6a7ca3e4c1af 100644
--- a/sys/dev/raidframe/rf_reconutil.h
+++ b/sys/dev/raidframe/rf_reconutil.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_reconutil.h,v 1.3 1999/02/05 00:06:17 oster Exp $	*/
+/*	$NetBSD: rf_reconutil.h,v 1.4 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,8 @@
 #ifndef _RF__RF_RECONUTIL_H_
 #define _RF__RF_RECONUTIL_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_reconstruct.h"
 
 RF_ReconCtrl_t *
diff --git a/sys/dev/raidframe/rf_revent.h b/sys/dev/raidframe/rf_revent.h
index 0172286038ff..667308ca4e0e 100644
--- a/sys/dev/raidframe/rf_revent.h
+++ b/sys/dev/raidframe/rf_revent.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_revent.h,v 1.3 1999/02/05 00:06:17 oster Exp $	*/
+/*	$NetBSD: rf_revent.h,v 1.4 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -35,7 +35,7 @@
 #ifndef _RF__RF_REVENT_H_
 #define _RF__RF_REVENT_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 int     rf_ConfigureReconEvent(RF_ShutdownList_t ** listp);
 
diff --git a/sys/dev/raidframe/rf_shutdown.c b/sys/dev/raidframe/rf_shutdown.c
index 9b4cc5440bdb..934f54e460b4 100644
--- a/sys/dev/raidframe/rf_shutdown.c
+++ b/sys/dev/raidframe/rf_shutdown.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_shutdown.c,v 1.7 2001/09/26 02:52:57 oster Exp $	*/
+/*	$NetBSD: rf_shutdown.c,v 1.8 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * rf_shutdown.c
  */
@@ -33,7 +33,8 @@
  * thread startup and shutdown.
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_archs.h"
 #include "rf_threadstuff.h"
 #include "rf_shutdown.h"
diff --git a/sys/dev/raidframe/rf_shutdown.h b/sys/dev/raidframe/rf_shutdown.h
index 0baa6e470752..5512b235b035 100644
--- a/sys/dev/raidframe/rf_shutdown.h
+++ b/sys/dev/raidframe/rf_shutdown.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_shutdown.h,v 1.2 1999/02/05 00:06:17 oster Exp $	*/
+/*	$NetBSD: rf_shutdown.h,v 1.3 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * rf_shutdown.h
  */
@@ -36,7 +36,8 @@
 #ifndef _RF__RF_SHUTDOWN_H_
 #define _RF__RF_SHUTDOWN_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 
 /*
diff --git a/sys/dev/raidframe/rf_sstf.c b/sys/dev/raidframe/rf_sstf.c
index 3b45f4b44fda..f1a9379bd5c3 100644
--- a/sys/dev/raidframe/rf_sstf.c
+++ b/sys/dev/raidframe/rf_sstf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_sstf.c,v 1.6 2001/01/27 20:18:55 oster Exp $	*/
+/*	$NetBSD: rf_sstf.c,v 1.7 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -31,6 +31,7 @@
  * sstf.c --  prioritized shortest seek time first disk queueing code
  *
  ******************************************************************************/
+#include <dev/raidframe/raidframevar.h>
 
 #include "rf_alloclist.h"
 #include "rf_stripelocks.h"
@@ -41,7 +42,6 @@
 #include "rf_general.h"
 #include "rf_options.h"
 #include "rf_raid.h"
-#include "rf_types.h"
 
 #define DIR_LEFT   1
 #define DIR_RIGHT  2
diff --git a/sys/dev/raidframe/rf_states.h b/sys/dev/raidframe/rf_states.h
index 7e93ecff7870..dae4e9048461 100644
--- a/sys/dev/raidframe/rf_states.h
+++ b/sys/dev/raidframe/rf_states.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_states.h,v 1.3 1999/02/05 00:06:17 oster Exp $	*/
+/*	$NetBSD: rf_states.h,v 1.4 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -29,7 +29,7 @@
 #ifndef _RF__RF_STATES_H_
 #define _RF__RF_STATES_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 
 void    rf_ContinueRaidAccess(RF_RaidAccessDesc_t * desc);
 void    rf_ContinueDagAccess(RF_DagList_t * dagList);
diff --git a/sys/dev/raidframe/rf_stripelocks.c b/sys/dev/raidframe/rf_stripelocks.c
index ebdfb85f9b19..0eb6a3e16910 100644
--- a/sys/dev/raidframe/rf_stripelocks.c
+++ b/sys/dev/raidframe/rf_stripelocks.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_stripelocks.c,v 1.7 2001/09/01 23:50:44 thorpej Exp $	*/
+/*	$NetBSD: rf_stripelocks.c,v 1.8 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -56,7 +56,8 @@
  * searching through stripe lock descriptors.
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_raid.h"
 #include "rf_stripelocks.h"
 #include "rf_alloclist.h"
diff --git a/sys/dev/raidframe/rf_stripelocks.h b/sys/dev/raidframe/rf_stripelocks.h
index d68b178a96b2..10190f9ca2ac 100644
--- a/sys/dev/raidframe/rf_stripelocks.h
+++ b/sys/dev/raidframe/rf_stripelocks.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_stripelocks.h,v 1.3 1999/02/05 00:06:18 oster Exp $	*/
+/*	$NetBSD: rf_stripelocks.h,v 1.4 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -45,8 +45,8 @@
 #define _RF__RF_STRIPELOCKS_H_
 
 #include <sys/buf.h>
+#include <dev/raidframe/raidframevar.h>
 
-#include "rf_types.h"
 #include "rf_threadstuff.h"
 #include "rf_general.h"
 
diff --git a/sys/dev/raidframe/rf_threadstuff.c b/sys/dev/raidframe/rf_threadstuff.c
index a86671c47c89..d86f60c1d0a5 100644
--- a/sys/dev/raidframe/rf_threadstuff.c
+++ b/sys/dev/raidframe/rf_threadstuff.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_threadstuff.c,v 1.5 1999/12/07 02:13:28 oster Exp $	*/
+/*	$NetBSD: rf_threadstuff.c,v 1.6 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * rf_threadstuff.c
  */
@@ -29,7 +29,8 @@
  * rights to redistribute these changes.
  */
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
 #include "rf_threadstuff.h"
 #include "rf_general.h"
 #include "rf_shutdown.h"
diff --git a/sys/dev/raidframe/rf_threadstuff.h b/sys/dev/raidframe/rf_threadstuff.h
index 9db723bc7106..b109b0920834 100644
--- a/sys/dev/raidframe/rf_threadstuff.h
+++ b/sys/dev/raidframe/rf_threadstuff.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_threadstuff.h,v 1.10 2001/01/27 20:42:21 oster Exp $	*/
+/*	$NetBSD: rf_threadstuff.h,v 1.11 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -43,14 +43,13 @@
 #ifndef _RF__RF_THREADSTUFF_H_
 #define _RF__RF_THREADSTUFF_H_
 
-#include "rf_types.h"
 #include <sys/types.h>
 #include <sys/param.h>
-#ifdef _KERNEL
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
-#endif
+
+#include <dev/raidframe/raidframevar.h>
 
 #define rf_create_managed_mutex(a,b) _rf_create_managed_mutex(a,b,__FILE__,__LINE__)
 #define rf_create_managed_cond(a,b) _rf_create_managed_cond(a,b,__FILE__,__LINE__)
diff --git a/sys/dev/raidframe/rf_types.h b/sys/dev/raidframe/rf_types.h
index 1969af75ddc9..72ce02d84edb 100644
--- a/sys/dev/raidframe/rf_types.h
+++ b/sys/dev/raidframe/rf_types.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_types.h,v 1.7 2001/09/26 02:52:57 oster Exp $	*/
+/*	$NetBSD: rf_types.h,v 1.8 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * rf_types.h
  */
@@ -221,6 +221,8 @@ typedef enum RF_AccessState_e {
 #define RF_MAXCOL    40
 #define RF_MAXSPARE  10
 #define RF_MAXDBGV   75		/* max number of debug variables */
+#define RF_MAX_DISKS 128	/* max disks per array */
+
 
 union RF_GenericParam_u {
 	void   *p;
diff --git a/sys/dev/raidframe/rf_utils.h b/sys/dev/raidframe/rf_utils.h
index 62e639c067fd..6c0ca91b3524 100644
--- a/sys/dev/raidframe/rf_utils.h
+++ b/sys/dev/raidframe/rf_utils.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_utils.h,v 1.4 1999/08/13 03:26:55 oster Exp $	*/
+/*	$NetBSD: rf_utils.h,v 1.5 2001/10/04 15:58:56 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -36,7 +36,7 @@
 #ifndef _RF__RF_UTILS_H_
 #define _RF__RF_UTILS_H_
 
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
 #include "rf_alloclist.h"
 #include "rf_threadstuff.h"