[src/trunk]: src/sys/arch/i386/conf Change all instances of "[e]isa* at foo?"...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/i386/conf Change all instances of "[e]isa* at foo?"...
From: nathanw <nathanw%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 09:44:29 +0000
details:   https://anonhg.NetBSD.org/src/rev/02c52b18c9d8
branches:  trunk
changeset: 514958:02c52b18c9d8
user:      nathanw <nathanw%NetBSD.org@localhost>
date:      Fri Sep 14 21:44:21 2001 +0000

description:
Change all instances of "[e]isa* at foo?" to "[e]isa0 at foo?".

This prevents attaching multiple [E]ISA buses, which we don't support
(Is there any such thing to support? I'm skeptical) and avoids the
"panic: isaattach: ISA bus already seen" that occurs on some laptops
with docking stations and EISA boxes. Since there is only one [E]ISA bus,
logically, the ISA device probe will still find devices on the
docking station.

This does not address the problem of inserting or removing the docking station
at runtime.

Relevant PRs: kern/6544, port-i386/10392, kern/11627, kern/13557,
install/13865.

diffstat:

 sys/arch/i386/conf/CARDBUS        |  10 +++++-----
 sys/arch/i386/conf/DISKLESS       |   6 +++---
 sys/arch/i386/conf/GENERIC        |  14 +++++++-------
 sys/arch/i386/conf/GENERIC_LAPTOP |   8 ++++----
 sys/arch/i386/conf/GENERIC_TINY   |  12 ++++++------
 sys/arch/i386/conf/INSTALL        |  12 ++++++------
 sys/arch/i386/conf/INSTALL_LAPTOP |   6 +++---
 sys/arch/i386/conf/INSTALL_SMALL  |  12 ++++++------
 sys/arch/i386/conf/INSTALL_TINY   |  12 ++++++------
 9 files changed, 46 insertions(+), 46 deletions(-)

diffs (248 lines):

diff -r 5136ff0abf43 -r 02c52b18c9d8 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS        Fri Sep 14 21:42:54 2001 +0000
+++ b/sys/arch/i386/conf/CARDBUS        Fri Sep 14 21:44:21 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CARDBUS,v 1.38 2001/08/22 15:39:05 hubertf Exp $
+#      $NetBSD: CARDBUS,v 1.39 2001/09/14 21:44:21 nathanw Exp $
 #
 #      CARDBUS: GENERIC + CardBus support.  Additionally, some
 #      things typically not found on laptops have been commented out.
@@ -8,7 +8,7 @@
 
 include "arch/i386/conf/std.i386"
 
-#ident         "CARDBUS-$Revision: 1.38 $"
+#ident         "CARDBUS-$Revision: 1.39 $"
 
 maxusers       32              # estimated number of users
 
@@ -254,9 +254,9 @@
 #eisa* at pceb?
 
 # ISA bus support
-isa*   at mainbus?
-isa*   at pceb?
-isa*   at pcib?
+isa0   at mainbus?
+isa0   at pceb?
+isa0   at pcib?
 
 # PCMCIA bus support
 #pcmcia*       at pcic? controller ? socket ?
diff -r 5136ff0abf43 -r 02c52b18c9d8 sys/arch/i386/conf/DISKLESS
--- a/sys/arch/i386/conf/DISKLESS       Fri Sep 14 21:42:54 2001 +0000
+++ b/sys/arch/i386/conf/DISKLESS       Fri Sep 14 21:44:21 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: DISKLESS,v 1.77 2001/07/08 16:32:18 abs Exp $
+#      $NetBSD: DISKLESS,v 1.78 2001/09/14 21:44:21 nathanw Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
 # This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@@ -114,8 +114,8 @@
 pci*   at pchb?
 pcib*  at pci? dev ? function ?        # PCI-ISA bridges
 
-isa*   at pcib?                        # ISA on PCI-ISA bridge
-isa*   at mainbus0                     # all other ISA
+isa0   at pcib?                        # ISA on PCI-ISA bridge
+isa0   at mainbus0                     # all other ISA
 #isapnp0       at isa?                         # ISA Plug-and-Play
 
 #apm0  at mainbus0                     # Advanced power management
diff -r 5136ff0abf43 -r 02c52b18c9d8 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Fri Sep 14 21:42:54 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC        Fri Sep 14 21:44:21 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.425 2001/09/10 10:19:12 fvdl Exp $
+#      $NetBSD: GENERIC,v 1.426 2001/09/14 21:44:21 nathanw Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.425 $"
+#ident                 "GENERIC-$Revision: 1.426 $"
 
 maxusers       32              # estimated number of users
 
@@ -259,13 +259,13 @@
 #agp*  at pchb?
 
 # EISA bus support
-eisa*  at mainbus?
-eisa*  at pceb?
+eisa0  at mainbus?
+eisa0  at pceb?
 
 # ISA bus support
-isa*   at mainbus?
-isa*   at pceb?
-isa*   at pcib?
+isa0   at mainbus?
+isa0   at pceb?
+isa0   at pcib?
 
 # PCMCIA bus support
 pcmcia*        at pcic? controller ? socket ?
diff -r 5136ff0abf43 -r 02c52b18c9d8 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Fri Sep 14 21:42:54 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Fri Sep 14 21:44:21 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC_LAPTOP,v 1.23 2001/09/10 10:19:12 fvdl Exp $
+#      $NetBSD: GENERIC_LAPTOP,v 1.24 2001/09/14 21:44:21 nathanw Exp $
 #      From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
 #
 #      GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -6,7 +6,7 @@
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.23 $"
+#ident                 "GENERIC-$Revision: 1.24 $"
 
 maxusers       32              # estimated number of users
 
@@ -255,8 +255,8 @@
 #agp*  at pchb?
 
 # ISA bus support
-isa*   at mainbus?
-isa*   at pcib?
+isa0   at mainbus?
+isa0   at pcib?
 
 # PCMCIA bus support
 pcmcia*        at pcic? controller ? socket ?
diff -r 5136ff0abf43 -r 02c52b18c9d8 sys/arch/i386/conf/GENERIC_TINY
--- a/sys/arch/i386/conf/GENERIC_TINY   Fri Sep 14 21:42:54 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC_TINY   Fri Sep 14 21:44:21 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC_TINY,v 1.28 2001/09/01 21:52:27 atatat Exp $
+#      $NetBSD: GENERIC_TINY,v 1.29 2001/09/14 21:44:21 nathanw Exp $
 #
 #      GENERIC_TINY -- suitable default for 4M machines
 #                      No EISA, PCI, or SCSI.
@@ -187,13 +187,13 @@
 #puc*  at pci? dev ? function ?        # PCI "universal" comm. cards
 
 # EISA bus support
-#eisa* at mainbus?
-#eisa* at pceb?
+#eisa0 at mainbus?
+#eisa0 at pceb?
 
 # ISA bus support
-isa*   at mainbus?
-#isa*  at pceb?
-#isa*  at pcib?
+isa0   at mainbus?
+#isa0  at pceb?
+#isa0  at pcib?
 
 # PCMCIA bus support
 pcmcia*        at pcic? controller ? socket ?
diff -r 5136ff0abf43 -r 02c52b18c9d8 sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL        Fri Sep 14 21:42:54 2001 +0000
+++ b/sys/arch/i386/conf/INSTALL        Fri Sep 14 21:44:21 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.171 2001/08/22 15:28:57 hubertf Exp $
+#      $NetBSD: INSTALL,v 1.172 2001/09/14 21:44:21 nathanw Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -180,13 +180,13 @@
 puc*   at pci? dev ? function ?        # PCI "universal" comm. cards
 
 # EISA bus support
-eisa*  at mainbus?
-eisa*  at pceb?
+eisa0  at mainbus?
+eisa0  at pceb?
 
 # ISA bus support
-isa*   at mainbus?
-isa*   at pceb?
-isa*   at pcib?
+isa0   at mainbus?
+isa0   at pceb?
+isa0   at pcib?
 
 # PCMCIA bus support
 pcmcia*        at pcic? controller ? socket ?
diff -r 5136ff0abf43 -r 02c52b18c9d8 sys/arch/i386/conf/INSTALL_LAPTOP
--- a/sys/arch/i386/conf/INSTALL_LAPTOP Fri Sep 14 21:42:54 2001 +0000
+++ b/sys/arch/i386/conf/INSTALL_LAPTOP Fri Sep 14 21:44:21 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL_LAPTOP,v 1.10 2001/08/22 15:28:57 hubertf Exp $
+#      $NetBSD: INSTALL_LAPTOP,v 1.11 2001/09/14 21:44:22 nathanw Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -184,8 +184,8 @@
 ppb*   at pci? dev ? function ?        # PCI-PCI bridges
 
 # ISA bus support
-isa*   at mainbus?
-isa*   at pcib?
+isa0   at mainbus?
+isa0   at pcib?
 
 # PCMCIA bus support
 pcmcia*        at pcic? controller ? socket ?
diff -r 5136ff0abf43 -r 02c52b18c9d8 sys/arch/i386/conf/INSTALL_SMALL
--- a/sys/arch/i386/conf/INSTALL_SMALL  Fri Sep 14 21:42:54 2001 +0000
+++ b/sys/arch/i386/conf/INSTALL_SMALL  Fri Sep 14 21:44:21 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL_SMALL,v 1.69 2001/07/30 19:59:06 ad Exp $
+#      $NetBSD: INSTALL_SMALL,v 1.70 2001/09/14 21:44:22 nathanw Exp $
 #
 #      INSTALL_SMALL - Small Installation kernel.
 #
@@ -174,13 +174,13 @@
 #puc*  at pci? dev ? function ?        # PCI "universal" comm. cards
 
 # EISA bus support
-eisa*  at mainbus?
-#eisa* at pceb?
+eisa0  at mainbus?
+#eisa0 at pceb?
 
 # ISA bus support
-isa*   at mainbus?
-#eisa* at pceb?
-#isa*  at pcib?
+isa0   at mainbus?
+#isa0  at pceb?
+#isa0  at pcib?
 
 # PCMCIA bus support
 #pcmcia*       at pcic? controller ? socket ?
diff -r 5136ff0abf43 -r 02c52b18c9d8 sys/arch/i386/conf/INSTALL_TINY
--- a/sys/arch/i386/conf/INSTALL_TINY   Fri Sep 14 21:42:54 2001 +0000
+++ b/sys/arch/i386/conf/INSTALL_TINY   Fri Sep 14 21:44:21 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL_TINY,v 1.38 2001/07/30 19:59:06 ad Exp $
+#      $NetBSD: INSTALL_TINY,v 1.39 2001/09/14 21:44:22 nathanw Exp $
 #
 #      INSTALL_TINY - Tiny Installation kernel, suitable for 4M machines.
 #
@@ -188,13 +188,13 @@
 pcic1   at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
 
 # EISA bus support
-#eisa* at mainbus?
-#eisa* at pceb?
+#eisa0 at mainbus?
+#eisa0 at pceb?
 
 # ISA bus support
-isa*   at mainbus?
-#eisa* at pceb?
-#isa*  at pcib?
+isa0   at mainbus?
+#isa0  at pceb?
+#isa0  at pcib?
 
 # ISA Plug-and-Play bus support
 #isapnp0       at isa?
Prev by Date: [src/trunk]: src/sys/arch/dreamcast/dev/maple Indent.
Next by Date: [src/trunk]: src/sys/arch/mipsco/include spllpt() for ISA Bus printer support
Previous by Thread: [src/trunk]: src/sys/arch/dreamcast/dev/maple Indent.
Next by Thread: [src/trunk]: src/sys/arch/mipsco/include spllpt() for ISA Bus printer support
Indexes:
Home | Main Index | Thread Index | Old Index