summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1999-08-15 00:05:34 +0000
committerkstailey <kstailey@cvs.openbsd.org>1999-08-15 00:05:34 +0000
commitb86eb5de306245f061a048067fa6064d87297139 (patch)
tree64d032b109d1a3744677c4d7702f7f8bc2eb3f77 /sys/arch/i386/conf
parent2f45aceeadcc0240cfa9a8843cdc97c0f6890e02 (diff)
pciide & atapiscsi
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/HERMES21
1 files changed, 12 insertions, 9 deletions
diff --git a/sys/arch/i386/conf/HERMES b/sys/arch/i386/conf/HERMES
index 3f6035f7164..11b09b3daae 100644
--- a/sys/arch/i386/conf/HERMES
+++ b/sys/arch/i386/conf/HERMES
@@ -1,4 +1,4 @@
-# $OpenBSD: HERMES,v 1.17 1999/02/28 15:54:31 kstailey Exp $
+# $OpenBSD: HERMES,v 1.18 1999/08/15 00:05:33 kstailey Exp $
#
# HERMES -- 450MHz Pentium II PCI, APM, PnP
#
@@ -18,7 +18,7 @@ option COLOR_KERNEL_FG="FG_GREEN"
option COLOR_KERNEL_BG="BG_BLACK"
option TIMEZONE=300 # time zone to adjust RTC time by
-option DST=0 # daylight savings time used by RTC
+option DST=1 # daylight savings time used by RTC
option NTP # High precision timekeeping support
option SWAPPAGER # paging; REQUIRED
@@ -113,12 +113,15 @@ lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports
fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers
fd* at fdc? drive ?
-wdc0 at isa? port 0x1f0 irq 14 # ST506, ESDI, and IDE controllers
-wdc1 at isa? port 0x170 irq 15
-wd* at wdc? drive ?
+# IDE controllers
+pciide* at pci ? dev ? function ? flags 0x0000
-atapibus* at wdc?
-acd* at atapibus? drive?
+# IDE hard drives
+wd* at pciide? channel ? drive ? flags 0x0000
+
+# ATAPI<->SCSI
+atapiscsi* at pciide? channel ?
+scsibus* at atapiscsi?
joy* at isapnp?
@@ -141,9 +144,9 @@ scsibus* at adv?
sd* at scsibus? target ? lun ? # SCSI disk drives
st* at scsibus? target ? lun ? # SCSI tape drives
-#ss* at scsibus? target ? lun ? # SCSI scanners
+ss* at scsibus? target ? lun ? # SCSI scanners
#uk* at scsibus? target ? lun ? # unknown SCSI
-#cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
+cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
#ch* at scsibus? target ? lun ? # SCSI autochangers
pseudo-device loop 1 # network loopback