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

sgi.

1 files changed, 11 insertions, 38 deletions

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()
 {