summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/conf.c8
-rw-r--r--sys/arch/alpha/conf/GENERIC22
-rw-r--r--sys/arch/alpha/conf/files.alpha10
-rw-r--r--sys/arch/i386/conf/GENERIC23
-rw-r--r--sys/arch/i386/conf/RAMDISK22
5 files changed, 55 insertions, 30 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 85c624258e0..829358eac23 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.18 1998/09/25 09:20:52 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.19 1999/07/25 04:38:25 csapuntz Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -44,7 +44,7 @@
#include <sys/conf.h>
#include <sys/vnode.h>
-#include "wdc.h"
+#include "wd.h"
bdev_decl(wd);
bdev_decl(sw);
#include "st.h"
@@ -61,7 +61,7 @@ bdev_decl(rd);
struct bdevsw bdevsw[] =
{
- bdev_disk_init(NWDC,wd), /* 0: ST506/ESDI/IDE disk */
+ bdev_disk_init(NWD,wd), /* 0: ST506/ESDI/IDE disk */
bdev_swap_init(1,sw), /* 1: swap pseudo-device */
bdev_tape_init(NST,st), /* 2: SCSI tape */
bdev_disk_init(NCD,cd), /* 3: SCSI CD-ROM */
@@ -169,7 +169,7 @@ struct cdevsw cdevsw[] =
cdev_uk_init(NUK,uk), /* 33: SCSI unknown */
cdev_random_init(1,random), /* 34: random data source */
cdev_gen_ipf(NIPF,ipl), /* 35: IP filter log */
- cdev_disk_init(NWDC,wd), /* 36: ST506/ESDI/IDE disk */
+ cdev_disk_init(NWD,wd), /* 36: ST506/ESDI/IDE disk */
cdev_disk_init(NACD,acd), /* 37: ATAPI CD-ROM */
cdev_tty_init(NCY,cy), /* 38: Cyclom serial port */
cdev_ksyms_init(NKSYMS,ksyms), /* 39: Kernel symbols device */
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index cdefb0bf3ce..143326e034c 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.41 1999/06/29 06:06:27 jason Exp $
+# $OpenBSD: GENERIC,v 1.42 1999/07/25 04:38:25 csapuntz Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
@@ -121,8 +121,6 @@ ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards
ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
ep* at isa? port ? irq ? # 3C509 ethernet cards
#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System
-wdc0 at isa? port 0x1f0 irq 14 # ST506, ESDI, and IDE
-wdc1 at isa? port 0x170 irq 15 # controllers
cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card
#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI
# option for using CD1400 handshaking for incoming data
@@ -134,13 +132,17 @@ cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card
fea* at eisa? slot ? # DEC DEFEA FDDI cards
#ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI
-# devices/busses hanging of IDE controllers
-atapibus* at wdc? # Virtual ATAPI bus
-wd* at wdc? drive ? # ST506/ESDI/IDE disks
-
-# ATAPI devices
-acd* at atapibus? drive? # ATAPI CD-ROM
-
+# IDE
+#pciide* at pci ? dev ? function ? flags 0x0000
+#wdc0 at isa? port 0x1f0 irq 14 flags 0x00
+#wdc1 at isa? port 0x170 irq 15 flags 0x00
+#wd* at wdc? channel ? drive ? flags 0x0000
+#wd* at pciide? channel ? drive ? flags 0x0000
+
+#atapiscsi* at wdc? channel ?
+#atapiscsi* at pciide? channel ?
+#scsibus* at atapiscsi?
+
# SCSI bus support
scsibus* at esp?
scsibus* at ncr?
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index c6d2009aa33..f491c942924 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-# $OpenBSD: files.alpha,v 1.24 1999/01/08 03:16:16 niklas Exp $
+# $OpenBSD: files.alpha,v 1.25 1999/07/25 04:38:25 csapuntz Exp $
# $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
#
# alpha-specific configuration info
@@ -118,9 +118,11 @@ file dev/tc/if_le_tc.c le_tc
#
# Machine-independent ATAPI drivers
#
-include "dev/atapi/files.atapi"
-major { acd = 4 }
+#include "dev/atapi/files.atapi"
+#major { acd = 4 }
+include "dev/atapiscsi/files.atapiscsi"
+include "dev/ata/files.ata"
# XXX Dummy bus needed for some multi-homed devices specified in files.isa
define pcmcia {}
@@ -141,7 +143,7 @@ major { wd = 0 }
#device jeisa at ibus: eisabus
file arch/alpha/isa/isa_machdep.c isa
-file arch/alpha/pci/pciide_machdep.c pci
+file arch/alpha/pci/pciide_machdep.c pci
device pckbc { }
attach pckbc at isa
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 1221345a45e..0241386e034 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.115 1999/07/24 22:33:24 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.116 1999/07/25 04:38:26 csapuntz Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -149,15 +149,26 @@ fd* at fdc? drive ?
#mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives
-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?
+wdc0 at isa? port 0x1f0 irq 14 flags 0x00
+wdc1 at isa? port 0x170 irq 15 flags 0x00
+wdc* at pcmcia? function ?
+wdc* at isapnp?
+
+# IDE hard drives
+wd* at wdc? channel ? drive ? flags 0x0000
+wd* at pciide? channel ? drive ? flags 0x0000
+
+# ATAPI<->SCSI
+atapiscsi* at wdc? channel ?
+atapiscsi* at pciide? channel ?
+scsibus* at atapiscsi?
wt0 at isa? port 0x308 irq 5 drq 1 # Archive and Wangtek QIC tape drives
+# Networking devices
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10 #
we* at isapnp?
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 659146d4028..d5c1f8ab611 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.64 1999/05/23 20:49:39 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.65 1999/07/25 04:38:26 csapuntz Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -151,12 +151,22 @@ fd* at fdc? drive ?
#mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives
-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?
+wdc0 at isa? port 0x1f0 irq 14 flags 0x00
+wdc1 at isa? port 0x170 irq 15 flags 0x00
+wdc* at pcmcia? function ?
+wdc* at isapnp?
+
+# IDE hard drives
+wd* at wdc? channel ? drive ? flags 0x0000
+wd* at pciide? channel ? drive ? flags 0x0000
+
+# ATAPI<->SCSI
+atapiscsi* at wdc? channel ?
+atapiscsi* at pciide? channel ?
+scsibus* at atapiscsi?
#wt0 at isa? port 0x308 irq 5 drq 1 # Archive/Wangtek QIC tapes
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 01:44:21 +0000