[src/trunk]: src/sys/arch/i386/conf - Attach dpt0 to the isa bus. Commented o...

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

details:   https://anonhg.NetBSD.org/src/rev/a78db3b41ca7
branches:  trunk
changeset: 482883:a78db3b41ca7
user:      ad <ad%NetBSD.org@localhost>
date:      Thu Feb 24 18:49:40 2000 +0000

description:
- Attach dpt0 to the isa bus. Commented out since (a) at any valid address it
  conflicts with too much other stuff (b) if I UTSLed correctly, EISA boards
  may be picked up at an "ISA address and an EISA address" - I don't have
  enough info on this yet to fix it (c) a DPT HBA at an address usually
  assigned to wdc0/1 may get detected as a WD100x controller. Some of them can
  emulate a WD100x controller, but the one I tested with doesn't.
- Sync with GENERIC just a little.

diffstat:

 sys/arch/i386/conf/GENERIC       |  7 ++++---
 sys/arch/i386/conf/INSTALL       |  5 +++--
 sys/arch/i386/conf/INSTALL_SMALL |  7 ++++++-
 sys/arch/i386/conf/INSTALL_TINY  |  7 ++++++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diffs (102 lines):

diff -r a6a5e9da74bd -r a78db3b41ca7 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Thu Feb 24 18:49:06 2000 +0000
+++ b/sys/arch/i386/conf/GENERIC        Thu Feb 24 18:49:40 2000 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.300 2000/02/15 17:14:50 nathanw Exp $
+#      $NetBSD: GENERIC,v 1.301 2000/02/24 18:49:40 ad Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.300 $"
+#ident                 "GENERIC-$Revision: 1.301 $"
 
 maxusers       32              # estimated number of users
 
@@ -370,7 +370,8 @@
 aic0   at isa? port 0x340 irq 11       # Adaptec 152[02] SCSI
 bha0   at isa? port 0x330 irq ? drq ?  # BusLogic [457]4X SCSI
 bha1   at isa? port 0x334 irq ? drq ?
-# The "nca" probe might give false hits or hang your machine.
+# The "nca" and "dpt" probes might give false hits or hang your machine.
+#dpt0  at isa? port 0x170 irq ? drq ?  # DPT SmartCache/SmartRAID
 #nca0  at isa? port 0x360 irq 15       # Port-mapped NCR 53C80 contoller
 #nca1  at isa? iomem 0xd8000 irq 5     # Memory-mapped controller (T128, etc.)
 sea0   at isa? iomem 0xc8000 irq 5     # Seagate/Future Domain SCSI
diff -r a6a5e9da74bd -r a78db3b41ca7 sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL        Thu Feb 24 18:49:06 2000 +0000
+++ b/sys/arch/i386/conf/INSTALL        Thu Feb 24 18:49:40 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.135 2000/01/13 19:10:22 ad Exp $
+#      $NetBSD: INSTALL,v 1.136 2000/02/24 18:49:40 ad Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -319,7 +319,8 @@
 aic0   at isa? port 0x340 irq 11       # Adaptec 152[02] SCSI
 bha0   at isa? port 0x330 irq ? drq ?  # BusLogic [457]4X SCSI
 bha1   at isa? port 0x334 irq ? drq ?
-# The "nca" probe might give false hits or hang your machine.
+# The "nca" and "dpt" probes might give false hits or hang your machine.
+#dpt0  at isa? port 0x170 irq ? drq ?  # DPT SmartCache/SmartRAID
 #nca0  at isa? port 0x360 irq 15       # Port-mapped NCR 53C80 contoller
 #nca1  at isa? iomem 0xd8000 irq 5     # Memory-mapped controller (T128, etc.)
 sea0   at isa? iomem 0xc8000 irq 5     # Seagate/Future Domain SCSI
diff -r a6a5e9da74bd -r a78db3b41ca7 sys/arch/i386/conf/INSTALL_SMALL
--- a/sys/arch/i386/conf/INSTALL_SMALL  Thu Feb 24 18:49:06 2000 +0000
+++ b/sys/arch/i386/conf/INSTALL_SMALL  Thu Feb 24 18:49:40 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL_SMALL,v 1.44 2000/01/13 19:10:22 ad Exp $
+#      $NetBSD: INSTALL_SMALL,v 1.45 2000/02/24 18:49:40 ad Exp $
 #
 #      INSTALL_SMALL - Small Installation kernel.
 #
@@ -279,6 +279,10 @@
 aic0   at isa? port 0x340 irq 11       # Adaptec 152[02] SCSI
 bha0   at isa? port 0x330 irq ? drq ?  # BusLogic [457]4X SCSI
 bha1   at isa? port 0x334 irq ? drq ?
+# The "nca" and "dpt" probes might give false hits or hang your machine.
+#dpt0  at isa? port 0x170 irq ? drq ?  # DPT SmartCache/SmartRAID
+#nca0  at isa? port 0x360 irq 15       # Port-mapped NCR 53C80 contoller
+#nca1  at isa? iomem 0xd8000 irq 5     # Memory-mapped controller (T128, etc.)
 sea0   at isa? iomem 0xc8000 irq 5     # Seagate/Future Domain SCSI
 uha0   at isa? port 0x330 irq ? drq ?  # UltraStor [13]4f SCSI
 uha1   at isa? port 0x340 irq ? drq ?
@@ -293,6 +297,7 @@
 scsibus* at bha?
 #scsibus* at dpt?
 #scsibus* at isp?
+#scsibus* at nca?
 #scsibus* at ncr?
 scsibus* at sea?
 scsibus* at uha?
diff -r a6a5e9da74bd -r a78db3b41ca7 sys/arch/i386/conf/INSTALL_TINY
--- a/sys/arch/i386/conf/INSTALL_TINY   Thu Feb 24 18:49:06 2000 +0000
+++ b/sys/arch/i386/conf/INSTALL_TINY   Thu Feb 24 18:49:40 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL_TINY,v 1.13 2000/01/13 19:10:22 ad Exp $
+#      $NetBSD: INSTALL_TINY,v 1.14 2000/02/24 18:49:40 ad Exp $
 #
 #      INSTALL_TINY - Tiny Installation kernel, suitable for 4M machines.
 #
@@ -278,6 +278,10 @@
 #aic0  at isa? port 0x340 irq 11       # Adaptec 152[02] SCSI
 #bha0  at isa? port 0x330 irq ? drq ?  # BusLogic [457]4X SCSI
 #bha1  at isa? port 0x334 irq ? drq ?
+# The "nca" and "dpt" probes might give false hits or hang your machine.
+#dpt0  at isa? port 0x170 irq ? drq ?  # DPT SmartCache/SmartRAID
+#nca0  at isa? port 0x360 irq 15       # Port-mapped NCR 53C80 contoller
+#nca1  at isa? iomem 0xd8000 irq 5     # Memory-mapped controller (T128, etc.)
 #sea0  at isa? iomem 0xc8000 irq 5     # Seagate/Future Domain SCSI
 #uha0  at isa? port 0x330 irq ? drq ?  # UltraStor [13]4f SCSI
 #uha1  at isa? port 0x340 irq ? drq ?
@@ -292,6 +296,7 @@
 #scsibus* at bha?
 #scsibus* at dpt?
 #scsibus* at isp?
+#scsibus* at nca?
 #scsibus* at ncr?
 #scsibus* at sea?
 #scsibus* at uha?