Fix more chrtoblktbl[] sloppyness, and add proper block st nodes to *ppc and

sgi.

17 files changed, 170 insertions, 229 deletions

diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 02f89f38b81..f7f5aeb5867 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.19 2008/04/30 13:59:32 dlg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.20 2008/05/14 20:49:46 miod Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -344,28 +344,28 @@ int chrtoblktbl[] = {
 	/*  0 */	NODEV,
 	/*  1 */	NODEV,
 	/*  2 */	NODEV,
-	/*  3 */	0,
+	/*  3 */	0,		/* wd */
 	/*  4 */	NODEV,
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
 	/*  7 */	NODEV,
 	/*  8 */	NODEV,
-	/*  9 */	2,
-	/* 10 */	3,
-	/* 11 */	15,
+	/*  9 */	2,		/* fd */
+	/* 10 */	NODEV,
+	/* 11 */	NODEV,
 	/* 12 */	NODEV,
-	/* 13 */	4,
-	/* 14 */	5,
-	/* 15 */	6,
+	/* 13 */	4,		/* sd */
+	/* 14 */	5,		/* st */
+	/* 15 */	6,		/* cd */
 	/* 16 */	NODEV,
 	/* 17 */	NODEV,
-	/* 18 */	16,
+	/* 18 */	16,		/* ccd */
 	/* 19 */	NODEV,
 	/* 20 */	NODEV,
 	/* 21 */	NODEV,
 	/* 22 */	NODEV,
 	/* 23 */	NODEV,
-	/* 24 */	18,
+	/* 24 */	NODEV,
 	/* 25 */	NODEV,
 	/* 26 */	NODEV,
 	/* 27 */	NODEV,
@@ -380,22 +380,22 @@ int chrtoblktbl[] = {
 	/* 36 */	NODEV,
 	/* 37 */	NODEV,
 	/* 38 */	NODEV,
-	/* 39 */	7,
+	/* 39 */	7,		/* mcd */
 	/* 40 */	NODEV,
-	/* 41 */	14,
+	/* 41 */	14,		/* vnd */
 	/* 42 */	NODEV,
 	/* 43 */	NODEV,
 	/* 44 */	NODEV,
 	/* 45 */	NODEV,
 	/* 46 */	NODEV,
-	/* 47 */	17,
+	/* 47 */	17,		/* rd */
 	/* 48 */	NODEV,
 	/* 49 */	NODEV,
 	/* 50 */	NODEV,
 	/* 51 */	NODEV,
 	/* 52 */	NODEV,
 	/* 53 */	NODEV,
-	/* 54 */	19,
+	/* 54 */	19,		/* raid */
 };
 
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 321f37c289e..8a591bb9bf0 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.17 2008/04/08 14:31:54 claudio Exp $	*/
+/*	$OpenBSD: conf.c,v 1.18 2008/05/14 20:49:48 miod Exp $	*/
 /*	$NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $	*/
 
 /*
@@ -438,7 +438,7 @@ int chrtoblktbl[] = {
 /* XXXX This needs to be dynamic for LKMs. */
     /*VCHR*/        /*VBLK*/
     /*  0 */        NODEV,
-    /*  1 */        1,
+    /*  1 */        NODEV,
     /*  2 */        NODEV,
     /*  3 */        NODEV,
     /*  4 */        NODEV,
@@ -453,17 +453,17 @@ int chrtoblktbl[] = {
     /* 13 */        NODEV,
     /* 14 */        NODEV,
     /* 15 */        NODEV,
-    /* 16 */        16,
-    /* 17 */        17,
-    /* 18 */        18,
-    /* 19 */        19,
+    /* 16 */        16,		/* wd */
+    /* 17 */        NODEV,
+    /* 18 */        18,		/* rd */
+    /* 19 */        19,		/* vnd */
     /* 20 */        NODEV,
-    /* 21 */        21,
+    /* 21 */        21,		/* ccd */
     /* 22 */        NODEV,
     /* 23 */        NODEV,
-    /* 24 */        24,
-    /* 25 */        25,
-    /* 26 */        26,
+    /* 24 */        24,		/* sd */
+    /* 25 */        25,		/* st */
+    /* 26 */        26,		/* cd */
     /* 27 */        NODEV,
     /* 28 */        NODEV,
     /* 29 */        NODEV,
@@ -508,37 +508,10 @@ int chrtoblktbl[] = {
     /* 68 */	    NODEV,
     /* 69 */	    NODEV,
     /* 70 */	    NODEV,
-    /* 71 */	    71,
-    /* 72 */	    NODEV,
-    /* 73 */	    NODEV,
-    /* 74 */	    NODEV,
-    /* 75 */	    NODEV,
-    /* 76 */	    NODEV,
-    /* 77 */	    NODEV,
-    /* 78 */	    NODEV,
-    /* 79 */	    NODEV,
-    /* 80 */	    NODEV,
-    /* 81 */	    NODEV,
-    /* 82 */	    NODEV,
-    /* 83 */	    NODEV,
-    /* 84 */	    NODEV,
-    /* 85 */	    NODEV,
-    /* 86 */	    NODEV,
-    /* 87 */	    NODEV,
-    /* 88 */	    NODEV,
-    /* 89 */	    NODEV,
-    /* 90 */	    NODEV,
-    /* 91 */	    NODEV,
-    /* 92 */	    92,
-    /* 93 */	    NODEV,
-    /* 94 */	    NODEV,
-    /* 95 */	    NODEV,
-    /* 96 */	    NODEV,
-    /* 97 */	    NODEV,
+    /* 71 */	    71,		/* raid */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
-
 dev_t
 getnulldev()
 {
diff --git a/sys/arch/aviion/aviion/conf.c b/sys/arch/aviion/aviion/conf.c
index 892a52af789..26f239f339f 100644
--- a/sys/arch/aviion/aviion/conf.c
+++ b/sys/arch/aviion/aviion/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.5 2008/04/08 14:31:54 claudio Exp $	*/
+/*	$OpenBSD: conf.c,v 1.6 2008/05/14 20:49:48 miod Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -202,8 +202,8 @@ int chrtoblktbl[] = {
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
 	/*  7 */	NODEV,
-	/*  8 */	4,	/* SCSI disk */
-	/*  9 */	6,	/* SCSI CD-ROM */
+	/*  8 */	4,	/* sd */
+	/*  9 */	6,	/* cd */
 	/* 10 */	NODEV,
 	/* 11 */	NODEV,
 	/* 12 */	NODEV,
@@ -211,16 +211,10 @@ int chrtoblktbl[] = {
 	/* 14 */	NODEV,
 	/* 15 */	NODEV,
 	/* 16 */	NODEV,
-	/* 17 */	NODEV,
-	/* 18 */	7,	/* ram disk */
-	/* 19 */	8,	/* vnode disk */
-	/* 20 */	NODEV,
-	/* 21 */	NODEV,
-	/* 22 */	NODEV,
-	/* 23 */	NODEV,
-	/* 24 */	NODEV,
-	/* 25 */	NODEV,
-	/* 26 */	10,	/* XD disk */
+	/* 17 */	9,	/* ccd */
+	/* 18 */	7,	/* rd */
+	/* 19 */	8,	/* vnd */
+	/* 20 */	5,	/* st */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 8ffe6900093..f4ba8320e32 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.42 2008/04/08 14:31:54 claudio Exp $	*/
+/*	$OpenBSD: conf.c,v 1.43 2008/05/14 20:49:48 miod Exp $	*/
 /*	$NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $	*/
 
 /*-
@@ -228,20 +228,20 @@ int chrtoblktbl[] = {
 	/*  4 */	NODEV,
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
-	/*  7 */	0,
-	/*  8 */	4,
-	/*  9 */	2,
+	/*  7 */	0,		/* ct */
+	/*  8 */	4,		/* sd */
+	/*  9 */	2,		/* hd */
 	/* 10 */	NODEV,
 	/* 11 */	NODEV,
 	/* 12 */	NODEV,
 	/* 13 */	NODEV,
 	/* 14 */	NODEV,
 	/* 15 */	NODEV,
-	/* 16 */	NODEV,
-	/* 17 */	5,
-	/* 18 */	9,
-	/* 19 */	6,
-	/* 20 */	7,
+	/* 16 */	1,		/* mt */
+	/* 17 */	5,		/* ccd */
+	/* 18 */	9,		/* cd */
+	/* 19 */	6,		/* vnd */
+	/* 20 */	7,		/* st */
 	/* 21 */	NODEV,
 	/* 22 */	NODEV,
 	/* 23 */	NODEV,
@@ -255,7 +255,7 @@ int chrtoblktbl[] = {
 	/* 31 */	NODEV,
 	/* 32 */	NODEV,
 	/* 33 */	NODEV,
-	/* 34 */	8,
+	/* 34 */	8,		/* rd */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 1e5e15eafd5..e426108bcad 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.42 2008/04/08 14:31:54 claudio Exp $	*/
+/*	$OpenBSD: conf.c,v 1.43 2008/05/14 20:49:48 miod Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -213,12 +213,12 @@ int chrtoblktbl[] = {
 	/*  4 */	NODEV,
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
-	/*  7 */	1,
-	/*  8 */	2,
-	/*  9 */	3,
-	/* 10 */	4,
-	/* 11 */	5,
-	/* 12 */	6,
+	/*  7 */	1,		/* ccd */
+	/*  8 */	2,		/* vnd */
+	/*  9 */	3,		/* rd */
+	/* 10 */	4,		/* sd */
+	/* 11 */	5,		/* st */
+	/* 12 */	6,		/* cd */
 	/* 13 */	NODEV,
 	/* 14 */	NODEV,
 	/* 15 */	NODEV,
@@ -230,7 +230,7 @@ int chrtoblktbl[] = {
 	/* 21 */	NODEV,
 	/* 22 */	NODEV,
 	/* 23 */	NODEV,
-	/* 24 */	7,
+	/* 24 */	7,		/* fd */
 	/* 25 */	NODEV,
 	/* 26 */	NODEV,
 	/* 27 */	NODEV,
@@ -245,14 +245,7 @@ int chrtoblktbl[] = {
 	/* 36 */	NODEV,
 	/* 37 */	NODEV,
 	/* 38 */	NODEV,
-	/* 39 */	NODEV,
-	/* 40 */	NODEV,
-	/* 41 */	NODEV,
-	/* 42 */	NODEV,
-	/* 43 */	NODEV,
-	/* 44 */	NODEV,
-	/* 45 */	NODEV,
-	/* 46 */	NODEV
+	/* 39 */	8,		/* wd */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c
index 75646ee54c9..f048e474a2d 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.8 2008/04/20 16:47:17 kettenis Exp $	*/
+/*	$OpenBSD: conf.c,v 1.9 2008/05/14 20:49:48 miod Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -197,12 +197,12 @@ int chrtoblktbl[] = {
 	/*  4 */	NODEV,
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
-	/*  7 */	1,
-	/*  8 */	2,
-	/*  9 */	3,
-	/* 10 */	4,
-	/* 11 */	5,
-	/* 12 */	6,
+	/*  7 */	1,		/* ccd */
+	/*  8 */	2,		/* vnd */
+	/*  9 */	3,		/* rd */
+	/* 10 */	4,		/* sd */
+	/* 11 */	5,		/* st */
+	/* 12 */	6,		/* cd */
 	/* 13 */	NODEV,
 	/* 14 */	NODEV,
 	/* 15 */	NODEV,
@@ -214,7 +214,7 @@ int chrtoblktbl[] = {
 	/* 21 */	NODEV,
 	/* 22 */	NODEV,
 	/* 23 */	NODEV,
-	/* 24 */	7,
+	/* 24 */	7,		/* fd */
 	/* 25 */	NODEV,
 	/* 26 */	NODEV,
 	/* 27 */	NODEV,
@@ -229,7 +229,7 @@ int chrtoblktbl[] = {
 	/* 36 */	NODEV,
 	/* 37 */	NODEV,
 	/* 38 */	NODEV,
-	/* 39 */	NODEV,
+	/* 39 */	8,		/* wd */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 28722f5eeac..67fc3068e68 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.123 2008/04/08 14:31:54 claudio Exp $	*/
+/*	$OpenBSD: conf.c,v 1.124 2008/05/14 20:49:48 miod Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -359,28 +359,28 @@ int chrtoblktbl[] = {
 	/*  0 */	NODEV,
 	/*  1 */	NODEV,
 	/*  2 */	NODEV,
-	/*  3 */	0,
+	/*  3 */	0,		/* wd */
 	/*  4 */	NODEV,
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
 	/*  7 */	NODEV,
 	/*  8 */	NODEV,
-	/*  9 */	2,
+	/*  9 */	2,		/* fd */
 	/* 10 */	3,
-	/* 11 */	15,
+	/* 11 */	NODEV,
 	/* 12 */	NODEV,
-	/* 13 */	4,
-	/* 14 */	5,
-	/* 15 */	6,
+	/* 13 */	4,		/* sd */
+	/* 14 */	5,		/* st */
+	/* 15 */	6,		/* cd */
 	/* 16 */	NODEV,
 	/* 17 */	NODEV,
-	/* 18 */	16,
+	/* 18 */	16,		/* ccd */
 	/* 19 */	NODEV,
 	/* 20 */	NODEV,
 	/* 21 */	NODEV,
 	/* 22 */	NODEV,
 	/* 23 */	NODEV,
-	/* 24 */	18,
+	/* 24 */	NODEV,
 	/* 25 */	NODEV,
 	/* 26 */	NODEV,
 	/* 27 */	NODEV,
@@ -395,22 +395,22 @@ int chrtoblktbl[] = {
 	/* 36 */	NODEV,
 	/* 37 */	NODEV,
 	/* 38 */	NODEV,
-	/* 39 */	7,
+	/* 39 */	7,		/* mcd */
 	/* 40 */	NODEV,
-	/* 41 */	14,
+	/* 41 */	14,		/* vnd */
 	/* 42 */	NODEV,
 	/* 43 */	NODEV,
 	/* 44 */	NODEV,
 	/* 45 */	NODEV,
 	/* 46 */	NODEV,
-	/* 47 */	17,
+	/* 47 */	17,		/* rd */
 	/* 48 */	NODEV,
 	/* 49 */	NODEV,
 	/* 50 */	NODEV,
 	/* 51 */	NODEV,
 	/* 52 */	NODEV,
 	/* 53 */	NODEV,
-	/* 54 */	19,
+	/* 54 */	19,		/* raid */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index a4040816ea9..fd0500d8361 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.7 2008/04/08 14:31:54 claudio Exp $	*/
+/*	$OpenBSD: conf.c,v 1.8 2008/05/14 20:49:48 miod Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -430,7 +430,7 @@ int chrtoblktbl[] = {
 /* XXXX This needs to be dynamic for LKMs. */
     /*VCHR*/        /*VBLK*/
     /*  0 */        NODEV,
-    /*  1 */        1,
+    /*  1 */        NODEV,
     /*  2 */        NODEV,
     /*  3 */        NODEV,
     /*  4 */        NODEV,
@@ -445,17 +445,17 @@ int chrtoblktbl[] = {
     /* 13 */        NODEV,
     /* 14 */        NODEV,
     /* 15 */        NODEV,
-    /* 16 */        16,
-    /* 17 */        17,
-    /* 18 */        18,
-    /* 19 */        19,
+    /* 16 */        16,			/* wd */
+    /* 17 */        NODEV,
+    /* 18 */        18,			/* rd */
+    /* 19 */        19,			/* vnd */
     /* 20 */        NODEV,
-    /* 21 */        21,
+    /* 21 */        21,			/* ccd */
     /* 22 */        NODEV,
     /* 23 */        NODEV,
-    /* 24 */        24,
-    /* 25 */        25,
-    /* 26 */        26,
+    /* 24 */        24,			/* sd */
+    /* 25 */        25,			/* st */
+    /* 26 */        26,			/* cd */
     /* 27 */        NODEV,
     /* 28 */        NODEV,
     /* 29 */        NODEV,
@@ -500,33 +500,7 @@ int chrtoblktbl[] = {
     /* 68 */	    NODEV,
     /* 69 */	    NODEV,
     /* 70 */	    NODEV,
-    /* 71 */	    71,
-    /* 72 */	    NODEV,
-    /* 73 */	    NODEV,
-    /* 74 */	    NODEV,
-    /* 75 */	    NODEV,
-    /* 76 */	    NODEV,
-    /* 77 */	    NODEV,
-    /* 78 */	    NODEV,
-    /* 79 */	    NODEV,
-    /* 80 */	    NODEV,
-    /* 81 */	    NODEV,
-    /* 82 */	    NODEV,
-    /* 83 */	    NODEV,
-    /* 84 */	    NODEV,
-    /* 85 */	    NODEV,
-    /* 86 */	    NODEV,
-    /* 87 */	    NODEV,
-    /* 88 */	    NODEV,
-    /* 89 */	    NODEV,
-    /* 90 */	    NODEV,
-    /* 91 */	    NODEV,
-    /* 92 */	    92,
-    /* 93 */	    NODEV,
-    /* 94 */	    NODEV,
-    /* 95 */	    NODEV,
-    /* 96 */	    NODEV,
-    /* 97 */	    NODEV,
+    /* 71 */	    71,			/* raid */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c
index 5eca138aeca..9a3a3671afb 100644
--- a/sys/arch/luna88k/luna88k/conf.c
+++ b/sys/arch/luna88k/luna88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.8 2008/04/08 14:31:54 claudio Exp $	*/
+/*	$OpenBSD: conf.c,v 1.9 2008/05/14 20:49:48 miod Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -211,8 +211,8 @@ int chrtoblktbl[] = {
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
 	/*  7 */	NODEV,
-	/*  8 */	4,	/* SCSI disk */
-	/*  9 */	6,	/* SCSI CD-ROM */
+	/*  8 */	4,	/* sd */
+	/*  9 */	6,	/* cd */
 	/* 10 */	NODEV,
 	/* 11 */	NODEV,
 	/* 12 */	NODEV,
@@ -220,8 +220,9 @@ int chrtoblktbl[] = {
 	/* 14 */	NODEV,
 	/* 15 */	NODEV,
 	/* 16 */	NODEV,
-	/* 17 */	NODEV,
-	/* 18 */	7,	/* ram disk */
-	/* 19 */	8,	/* vnode disk */
+	/* 17 */	9,	/* ccd */
+	/* 18 */	7,	/* rd */
+	/* 19 */	8,	/* vnd */
+	/* 20 */	5,	/* st */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index 23b10b77762..1412242268e 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.40 2008/04/08 14:31:54 claudio Exp $	*/
+/*	$OpenBSD: conf.c,v 1.41 2008/05/14 20:49:48 miod Exp $	*/
 /*	$NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $	*/
 
 /*
@@ -215,7 +215,7 @@ int chrtoblktbl[] = {
 	/*  0 */	NODEV,
 	/*  1 */	NODEV,
 	/*  2 */	NODEV,
-	/*  3 */	3,
+	/*  3 */	NODEV,
 	/*  4 */	NODEV,
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
@@ -225,14 +225,14 @@ int chrtoblktbl[] = {
 	/* 10 */	NODEV,
 	/* 11 */	NODEV,
 	/* 12 */	NODEV,
-	/* 13 */	4,
-	/* 14 */	5,
-	/* 15 */	6,
+	/* 13 */	4,		/* sd */
+	/* 14 */	5,		/* st */
+	/* 15 */	6,		/* cd */
 	/* 16 */	NODEV,
 	/* 17 */	NODEV,
-	/* 18 */	13,
-	/* 19 */	8,
-	/* 20 */	9,
+	/* 18 */	13,		/* rd */
+	/* 19 */	8,		/* vnd */
+	/* 20 */	9,		/* ccd */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 7504f0a5435..13a557e1da2 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.35 2008/05/13 21:55:16 miod Exp $ */
+/*	$OpenBSD: conf.c,v 1.36 2008/05/14 20:49:48 miod Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -61,7 +61,7 @@ struct bdevsw bdevsw[] = {
 	bdev_disk_init(NSD,sd),		/* 2 SCSI Disk */
 	bdev_disk_init(NCD,cd),		/* 3 SCSI CD-ROM */
 	bdev_notdef(),			/* 4 unknown*/
-	bdev_notdef(),			/* 5 unknown*/
+	bdev_tape_init(NST,st),		/* 5 SCSI tape */
 	bdev_notdef(),			/* 6 unknown*/
 	bdev_notdef(),			/* 7 unknown*/
 	bdev_lkm_dummy(),		/* 8 */
@@ -283,19 +283,19 @@ int chrtoblktbl[] = {
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
 	/*  7 */	NODEV,
-	/*  8 */	2,
-	/*  9 */	3,
+	/*  8 */	2,		/* sd */
+	/*  9 */	3,		/* cd */
 	/* 10 */	NODEV,
-	/* 11 */	0,
+	/* 11 */	0,		/* wd */
 	/* 12 */	NODEV,
 	/* 13 */	NODEV,
 	/* 14 */	NODEV,
 	/* 15 */	NODEV,
 	/* 16 */	NODEV,
-	/* 17 */	17,
-	/* 18 */	16,
-	/* 19 */	14,
-	/* 20 */	NODEV,
+	/* 17 */	17,		/* rd */
+	/* 18 */	16,		/* ccd */
+	/* 19 */	14,		/* vnd */
+	/* 20 */	5,		/* st */
 	/* 21 */	NODEV,
 	/* 22 */	NODEV,
 	/* 23 */	NODEV,
@@ -329,7 +329,7 @@ int chrtoblktbl[] = {
 	/* 51 */	NODEV,
 	/* 52 */	NODEV,
 	/* 53 */	NODEV,
-	/* 54 */	19,
+	/* 54 */	19,		/* raid */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index 8f3dae671a6..a666dcc25d9 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.42 2008/04/08 14:31:54 claudio Exp $ */
+/*	$OpenBSD: conf.c,v 1.43 2008/05/14 20:49:48 miod Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
@@ -270,8 +270,8 @@ int chrtoblktbl[] = {
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
 	/*  7 */	NODEV,
-	/*  8 */	4,		/* SCSI disk */
-	/*  9 */	8,		/* SCSI CD-ROM */
+	/*  8 */	4,		/* sd */
+	/*  9 */	8,		/* cd */
 	/* 10 */	NODEV,
 	/* 11 */	NODEV,
 	/* 12 */	NODEV,
@@ -279,16 +279,16 @@ int chrtoblktbl[] = {
 	/* 14 */	NODEV,
 	/* 15 */	NODEV,
 	/* 16 */	NODEV,
-	/* 17 */	NODEV,
-	/* 18 */	9,
-	/* 19 */	6,		/* vnode disk */
-	/* 20 */	NODEV,
+	/* 17 */	5,		/* ccd */
+	/* 18 */	9,		/* rd */
+	/* 19 */	6,		/* vnd */
+	/* 20 */	7,		/* st */
 	/* 21 */	NODEV,
 	/* 22 */	NODEV,
 	/* 23 */	NODEV,
 	/* 24 */	NODEV,
 	/* 25 */	NODEV,
-	/* 26 */	10,		/* XD disk */
+	/* 26 */	10,		/* xd */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index 3e92fe44f97..03801f35305 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.35 2008/04/08 14:31:54 claudio Exp $	*/
+/*	$OpenBSD: conf.c,v 1.36 2008/05/14 20:49:48 miod Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -256,8 +256,8 @@ int chrtoblktbl[] = {
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
 	/*  7 */	NODEV,
-	/*  8 */	4,	/* SCSI disk */
-	/*  9 */	6,	/* SCSI CD-ROM */
+	/*  8 */	4,	/* sd */
+	/*  9 */	6,	/* cd */
 	/* 10 */	NODEV,
 	/* 11 */	NODEV,
 	/* 12 */	NODEV,
@@ -265,16 +265,16 @@ int chrtoblktbl[] = {
 	/* 14 */	NODEV,
 	/* 15 */	NODEV,
 	/* 16 */	NODEV,
-	/* 17 */	NODEV,
-	/* 18 */	7,	/* ram disk */
-	/* 19 */	8,	/* vnode disk */
-	/* 20 */	NODEV,
+	/* 17 */	9,	/* ccd */
+	/* 18 */	7,	/* rd */
+	/* 19 */	8,	/* vnd */
+	/* 20 */	5,	/* st */
 	/* 21 */	NODEV,
 	/* 22 */	NODEV,
 	/* 23 */	NODEV,
 	/* 24 */	NODEV,
 	/* 25 */	NODEV,
-	/* 26 */	10,	/* XD disk */
+	/* 26 */	10,	/* xd */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c
index 165baf95c67..3d16db4c5a2 100644
--- a/sys/arch/mvmeppc/mvmeppc/conf.c
+++ b/sys/arch/mvmeppc/mvmeppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.22 2008/04/08 14:31:54 claudio Exp $ */
+/*	$OpenBSD: conf.c,v 1.23 2008/05/14 20:49:48 miod Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -62,7 +62,7 @@ struct bdevsw bdevsw[] = {
 	bdev_disk_init(NSD,sd),		/* 2 SCSI Disk */
 	bdev_disk_init(NCD,cd),		/* 3 SCSI CD-ROM */
 	bdev_notdef(),                  /* 4 unknown*/
-	bdev_notdef(),                  /* 5 unknown*/
+	bdev_tape_init(NST,st),		/* 5 SCSI tape */
 	bdev_notdef(),                  /* 6 unknown*/
 	bdev_notdef(),                  /* 7 unknown*/
 	bdev_lkm_dummy(),		/* 8 */
@@ -225,19 +225,19 @@ int chrtoblktbl[] = {
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
 	/*  7 */	NODEV,
-	/*  8 */	2,
-	/*  9 */	NODEV,
+	/*  8 */	2,		/* sd */
+	/*  9 */	3,		/* cd */
 	/* 10 */	NODEV,
-	/* 11 */	0,
+	/* 11 */	0,		/* wd */
 	/* 12 */	NODEV,
-	/* 13 */	4,
+	/* 13 */	NODEV,
 	/* 14 */	NODEV,
 	/* 15 */	NODEV,
 	/* 16 */	NODEV,
-	/* 17 */	17,
-	/* 18 */	NODEV,
-	/* 19 */	NODEV,
-	/* 20 */	NODEV,
+	/* 17 */	17,		/* rd */
+	/* 18 */	16,		/* ccd */
+	/* 19 */	14,		/* vnd */
+	/* 20 */	5,		/* st */
 	/* 21 */	NODEV,
 	/* 22 */	NODEV,
 	/* 23 */	NODEV,
@@ -271,7 +271,7 @@ int chrtoblktbl[] = {
 	/* 51 */	NODEV,
 	/* 52 */	NODEV,
 	/* 53 */	NODEV,
-	/* 54 */	19,
+	/* 54 */	19,		/* raid */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 8e8773b6412..e52432986e9 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.14 2008/04/08 14:31:54 claudio Exp $ */
+/*	$OpenBSD: conf.c,v 1.15 2008/05/14 20:49:48 miod Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -52,6 +52,7 @@
 #include "vnd.h"
 #include "sd.h"
 #include "cd.h"
+#include "st.h"
 #include "wd.h"
 bdev_decl(wd);
 #include "ccd.h"
@@ -69,7 +70,7 @@ struct bdevsw	bdevsw[] =
 	bdev_notdef(),			/* 7:  */
 	bdev_disk_init(NRD,rd),		/* 8: RAM disk (for install) */
 	bdev_notdef(),			/* 9:  */
-	bdev_notdef(),			/* 10:  */
+	bdev_tape_init(NST,st),		/* 10: SCSI tape */
 	bdev_notdef(),			/* 11:  */
 	bdev_notdef(),			/* 12:  */
 	bdev_notdef(),			/* 13:  */
@@ -246,22 +247,22 @@ int chrtoblktbl[] =  {
 	/* 5 */		NODEV,
 	/* 6 */		NODEV,
 	/* 7 */		NODEV,
-	/* 8 */		3,
-	/* 9 */		0,
-	/* 10 */	NODEV,
-	/* 11 */	2,
+	/* 8 */		3,		/* cd */
+	/* 9 */		0,		/* sd */
+	/* 10 */	10,		/* st */
+	/* 11 */	2,		/* vnd */
 	/* 12 */	NODEV,
 	/* 13 */	NODEV,
 	/* 14 */	NODEV,
 	/* 15 */	NODEV,
 	/* 16 */	NODEV,
 	/* 17 */	NODEV,
-	/* 18 */	4,
+	/* 18 */	4,		/* wd */
 	/* 19 */	NODEV,
 	/* 20 */	NODEV,
 	/* 21 */	NODEV,
-	/* 22 */	8,
-	/* 23 */	6
+	/* 22 */	8,		/* rd */
+	/* 23 */	6		/* ccd */
 };
 
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(int);
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index c39f88c0c2c..d94a1e02374 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.2 2008/05/13 21:55:17 miod Exp $ */
+/*	$OpenBSD: conf.c,v 1.3 2008/05/14 20:49:48 miod Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -40,6 +40,7 @@
 #include <machine/conf.h>
 
 #include "sd.h"
+#include "st.h"
 #include "cd.h"
 #include "rd.h"
 #include "wd.h"
@@ -47,6 +48,8 @@ bdev_decl(wd);
 cdev_decl(wd);
 
 #include "vnd.h"
+#include "ccd.h"
+#include "raid.h"
 
 struct bdevsw bdevsw[] = {
 	bdev_disk_init(NWD,wd),		/* 0: ST506/ESDI/IDE disk */
@@ -54,7 +57,7 @@ struct bdevsw bdevsw[] = {
 	bdev_disk_init(NSD,sd),		/* 2 SCSI Disk */
 	bdev_disk_init(NCD,cd),		/* 3 SCSI CD-ROM */
 	bdev_notdef(),			/* 4 unknown*/
-	bdev_notdef(),			/* 5 unknown*/
+	bdev_tape_init(NST,st),		/* 5 SCSI tape */
 	bdev_notdef(),			/* 6 unknown*/
 	bdev_notdef(),			/* 7 unknown*/
 	bdev_lkm_dummy(),		/* 8 */
@@ -65,8 +68,10 @@ struct bdevsw bdevsw[] = {
 	bdev_lkm_dummy(),		/* 13 */
 	bdev_disk_init(NVND,vnd),	/* 14 vnode disk driver*/
 	bdev_notdef(),			/* 15 unknown*/
-	bdev_notdef(),			/* 16 unknown*/
+	bdev_disk_init(NCCD,ccd),	/* 16 concatenated disk driver */
 	bdev_disk_init(NRD,rd),		/* 17 ram disk driver*/
+	bdev_notdef(),			/* 18 unknown*/
+	bdev_disk_init(NRAID,raid),	/* 19 RAIDframe disk driver */
 };
 int nblkdev = sizeof bdevsw / sizeof bdevsw[0];
 
@@ -116,9 +121,9 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),			/* 15 */
 	cdev_notdef(),			/* 16 */
 	cdev_disk_init(NRD,rd),		/* 17 ram disk driver*/
-	cdev_notdef(),			/* 18 */
+	cdev_disk_init(NCCD,ccd),	/* 18 concatenated disk driver */
 	cdev_disk_init(NVND,vnd),	/* 19: vnode disk */
-	cdev_notdef(),			/* 20 */
+	cdev_tape_init(NST,st),		/* 20: SCSI tape */
 	cdev_fd_init(1,filedesc),	/* 21: file descriptor pseudo-dev */
 	cdev_bpf_init(NBPFILTER,bpf),	/* 22: berkeley packet filter */
 	cdev_tun_init(NTUN,tun),	/* 23: network tunnel */
@@ -152,7 +157,7 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),			/* 51 */
 	cdev_notdef(),			/* 52 */
 	cdev_notdef(),			/* 53 */
-	cdev_notdef(),			/* 54 */
+	cdev_disk_init(NRAID,raid),	/* 54: RAIDframe disk driver */
 	cdev_notdef(),			/* 55 */
 	cdev_notdef(),			/* 56 */
 	cdev_notdef(),			/* 57 */
@@ -225,19 +230,19 @@ int chrtoblktbl[] = {
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
 	/*  7 */	NODEV,
-	/*  8 */	2,
-	/*  9 */	3,
+	/*  8 */	2,		/* sd */
+	/*  9 */	3,		/* cd */
 	/* 10 */	NODEV,
-	/* 11 */	0,
+	/* 11 */	0,		/* wd */
 	/* 12 */	NODEV,
 	/* 13 */	NODEV,
 	/* 14 */	NODEV,
 	/* 15 */	NODEV,
 	/* 16 */	NODEV,
-	/* 17 */	17,
-	/* 18 */	NODEV,
-	/* 19 */	14,
-	/* 20 */	NODEV,
+	/* 17 */	17,		/* rd */
+	/* 18 */	16,		/* ccd */
+	/* 19 */	14,		/* vnd */
+	/* 20 */	5,		/* st */
 	/* 21 */	NODEV,
 	/* 22 */	NODEV,
 	/* 23 */	NODEV,
@@ -271,7 +276,7 @@ int chrtoblktbl[] = {
 	/* 51 */	NODEV,
 	/* 52 */	NODEV,
 	/* 53 */	NODEV,
-	/* 54 */	NODEV,
+	/* 54 */	19,		/* raid */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
 
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index f92e3001733..69f4a90c40c 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.53 2008/04/08 14:31:54 claudio Exp $ */
+/*	$OpenBSD: conf.c,v 1.54 2008/05/14 20:49:48 miod Exp $ */
 /*	$NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $	*/
 
 /*-
@@ -459,7 +459,7 @@ int	chrtoblktbl[] = {
 	NODEV,	/* 2 */
 	NODEV,	/* 3 */
 	0,	/* 4 */
-	1,	/* 5 */
+	NODEV,	/* 5 */
 	NODEV,	/* 6 */
 	NODEV,	/* 7 */
 	NODEV,	/* 8 */
@@ -486,7 +486,7 @@ int	chrtoblktbl[] = {
 	NODEV,	/* 29 */
 	12,	/* 30 */
 	NODEV,	/* 31 */
-	14,	/* 32 */
+	NODEV,	/* 32 */
 	NODEV,	/* 33 */
 	NODEV,	/* 34 */
 	NODEV,	/* 35 */
@@ -506,7 +506,7 @@ int	chrtoblktbl[] = {
 	NODEV,	/* 49 */
 	NODEV,	/* 50 */
 	NODEV,	/* 51 */
-	16,	/* 52 */
+	NODEV,	/* 52 */
 	NODEV,	/* 53 */
 	17,	/* 54 */
 	18,	/* 55 */
@@ -525,7 +525,7 @@ int	chrtoblktbl[] = {
 	NODEV,	/* 68 */
 	NODEV,	/* 69 */
 	NODEV,	/* 70 */
-	NODEV,	/* 71 */
+	24,	/* 71 */
 	NODEV,	/* 72 */
 	25,	/* 73 */
 	NODEV,	/* 74 */