[src/trunk]: src/sys/arch/pmax/pmax - Use dev_name2blk[] array prepared by co...

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

details:   https://anonhg.NetBSD.org/src/rev/848adfb8356c
branches:  trunk
changeset: 473216:848adfb8356c
user:      nisimura <nisimura%NetBSD.org@localhost>
date:      Tue May 25 09:32:27 1999 +0000

description:
- Use dev_name2blk[] array prepared by config(8) instead of handcrafting
local data.

diffstat:

 sys/arch/pmax/pmax/autoconf.c |  37 ++++++++++++++++---------------------
 1 files changed, 16 insertions(+), 21 deletions(-)

diffs (95 lines):

diff -r 336556994709 -r 848adfb8356c sys/arch/pmax/pmax/autoconf.c
--- a/sys/arch/pmax/pmax/autoconf.c     Tue May 25 07:37:08 1999 +0000
+++ b/sys/arch/pmax/pmax/autoconf.c     Tue May 25 09:32:27 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.33 1999/04/24 08:01:10 simonb Exp $     */
+/*     $NetBSD: autoconf.c,v 1.34 1999/05/25 09:32:27 nisimura Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.33 1999/04/24 08:01:10 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.34 1999/05/25 09:32:27 nisimura Exp $");
 
 /*
  * Setup the system to run on the current machine.
@@ -88,14 +88,9 @@
 
 void configure_scsi __P((void));
 
-void   findroot __P((struct device **, int *));
+void findroot __P((struct device **, int *));
 
-struct devnametobdevmaj pmax_nam2blk[] = {
-       { "rz",         21 },
-       { "md",         17 },
-       { NULL,         0 },
-};
-
+extern struct devnametobdevmaj dev_name2blk[];
 
 /*
  * Determine mass storage and memory configuration for a machine.
@@ -147,7 +142,7 @@
        printf("boot device: %s\n",
            booted_device ? booted_device->dv_xname : "<unknown>");
 
-       setroot(booted_device, booted_partition, pmax_nam2blk);
+       setroot(booted_device, booted_partition, dev_name2blk);
 }
 
 u_long bootdev = 0;            /* should be dev_t, but not until 32 bits */
@@ -175,9 +170,9 @@
                return;
 
        majdev = B_TYPE(bootdev);
-       for (i = 0; pmax_nam2blk[i].d_name != NULL; i++) {
-               if (majdev == pmax_nam2blk[i].d_maj) {
-                       bootdv_name = pmax_nam2blk[i].d_name;
+       for (i = 0; dev_name2blk[i].d_name != NULL; i++) {
+               if (majdev == dev_name2blk[i].d_maj) {
+                       bootdv_name = dev_name2blk[i].d_name;
                        break;
                }
        }
@@ -228,21 +223,21 @@
                else
                        part = 0;
                cp += 2;
-               for (majdev = 0; pmax_nam2blk[majdev].d_name != NULL;
+               for (majdev = 0; dev_name2blk[majdev].d_name != NULL;
                    majdev++) {
-                       if (cp[0] == pmax_nam2blk[majdev].d_name[0] &&
-                           cp[1] == pmax_nam2blk[majdev].d_name[1]) {
+                       if (cp[0] == dev_name2blk[majdev].d_name[0] &&
+                           cp[1] == dev_name2blk[majdev].d_name[1]) {
                                bootdev = MAKEBOOTDEV(
-                                   pmax_nam2blk[majdev].d_maj, 0, 0,
+                                   dev_name2blk[majdev].d_maj, 0, 0,
                                    unit, part);
                                return;
                        }
                }
                goto defdev;
        }
-       for (majdev = 0; pmax_nam2blk[majdev].d_name != NULL; majdev++)
-               if (cp[0] == pmax_nam2blk[majdev].d_name[0] &&
-                   cp[1] == pmax_nam2blk[majdev].d_name[1] &&
+       for (majdev = 0; dev_name2blk[majdev].d_name != NULL; majdev++)
+               if (cp[0] == dev_name2blk[majdev].d_name[0] &&
+                   cp[1] == dev_name2blk[majdev].d_name[1] &&
                    cp[2] == '(')
                        goto fndmaj;
 defdev:
@@ -250,7 +245,7 @@
        return;
 
 fndmaj:
-       majdev = pmax_nam2blk[majdev].d_maj;
+       majdev = dev_name2blk[majdev].d_maj;
        for (ctrl = 0, cp += 3; *cp >= '0' && *cp <= '9'; )
                ctrl = ctrl * 10 + *cp++ - '0';
        if (*cp == ',')