[src/sommerfeld_i386mp_1]: src/sys/arch/i386 yet another merge-up

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

details:   https://anonhg.NetBSD.org/src/rev/1a3e239dbffc
branches:  sommerfeld_i386mp_1
changeset: 482391:1a3e239dbffc
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Mon May 07 17:07:21 2001 +0000

description:
yet another merge-up

diffstat:

 sys/arch/i386/conf/GENERIC    |   7 ++++---
 sys/arch/i386/conf/INSTALL    |   5 +++--
 sys/arch/i386/i386/autoconf.c |  13 ++++++++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diffs (98 lines):

diff -r c523e515f339 -r 1a3e239dbffc sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Mon May 07 16:51:46 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC        Mon May 07 17:07:21 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.300.2.14 2001/04/30 16:23:08 sommerfeld Exp $
+#      $NetBSD: GENERIC,v 1.300.2.15 2001/05/07 17:07:21 sommerfeld Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.300.2.14 $"
+#ident                 "GENERIC-$Revision: 1.300.2.15 $"
 
 maxusers       32              # estimated number of users
 
@@ -471,9 +471,10 @@
 
 
 # RAID controllers and devices
-cac*   at eisa?                        # Compaq EISA array controllers
+cac*   at eisa? slot ?                 # Compaq EISA array controllers
 cac*   at pci? dev ? function ?        # Compaq PCI array controllers
 mlx*   at pci? dev ? function ?        # Mylex DAC960 & DEC SWXCR family
+mlx*   at eisa? slot ?                 # Mylex DAC960 & DEC SWXCR family
 twe*   at pci? dev ? function ?        # 3ware Escalade RAID controllers
 
 ld*    at cac? unit ?                  # logical disk devices
diff -r c523e515f339 -r 1a3e239dbffc sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL        Mon May 07 16:51:46 2001 +0000
+++ b/sys/arch/i386/conf/INSTALL        Mon May 07 17:07:21 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.135.2.9 2001/04/30 16:23:08 sommerfeld Exp $
+#      $NetBSD: INSTALL,v 1.135.2.10 2001/05/07 17:07:22 sommerfeld Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -367,9 +367,10 @@
 
 
 # RAID controllers and devices
-cac*   at eisa?                        # Compaq EISA array controllers
+cac*   at eisa? slot ?                 # Compaq EISA array controllers
 cac*   at pci? dev ? function ?        # Compaq PCI array controllers
 mlx*   at pci? dev ? function ?        # Mylex DAC960 & DEC SWXCR family
+mlx*   at eisa? slot ?                 # Mylex DAC960 & DEC SWXCR family
 twe*   at pci? dev ? function ?        # 3ware Escalade RAID controllers
 
 ld*    at cac? unit ?                  # logical disk devices
diff -r c523e515f339 -r 1a3e239dbffc sys/arch/i386/i386/autoconf.c
--- a/sys/arch/i386/i386/autoconf.c     Mon May 07 16:51:46 2001 +0000
+++ b/sys/arch/i386/i386/autoconf.c     Mon May 07 17:07:21 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.45.2.7 2001/01/07 22:59:23 sommerfeld Exp $     */
+/*     $NetBSD: autoconf.c,v 1.45.2.8 2001/05/07 17:07:23 sommerfeld Exp $     */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -178,7 +178,8 @@
                if (dv->dv_class == DV_DISK &&
                    (!strcmp(dv->dv_cfdata->cf_driver->cd_name, "sd") ||
                     !strcmp(dv->dv_cfdata->cf_driver->cd_name, "wd") ||
-                    !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ld")))
+                    !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ld") ||
+                    !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ed")))
                        i386_ndisks++;
 
        if (i386_ndisks == 0)
@@ -215,7 +216,8 @@
 #endif
                if (!strcmp(dv->dv_cfdata->cf_driver->cd_name, "sd") ||
                    !strcmp(dv->dv_cfdata->cf_driver->cd_name, "wd") ||
-                   !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ld")) {
+                   !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ld") ||
+                   !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ed")) {
                        n++;
                        sprintf(i386_alldisks->dl_nativedisks[n].ni_devname,
                            "%s%d", dv->dv_cfdata->cf_driver->cd_name,
@@ -415,7 +417,8 @@
 
                        if (!strcmp(dv->dv_cfdata->cf_driver->cd_name, "sd") ||
                            !strcmp(dv->dv_cfdata->cf_driver->cd_name, "wd") ||
-                           !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ld")) {
+                           !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ld") ||
+                           !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ed")) {
                                /*
                                 * Don't trust BIOS device numbers, try
                                 * to match the information passed by the
@@ -428,7 +431,7 @@
                                goto found;
                        }
 
-                       /* no "fd", "wd", "sd", "ld" */
+                       /* no "fd", "wd", "sd", "ld", "ed" */
                        continue;
 
 found: