From 86adfd8033f28b6711bb4461f82e613efaf81bba Mon Sep 17 00:00:00 2001 From: thorpej Date: Thu, 15 Jan 1998 07:17:19 +0000 Subject: [PATCH] Switch to MI IDE drivers, add ATAPI devices. --- sys/arch/alpha/conf/ALPHA | 15 +++++++++++---- sys/arch/alpha/conf/GENERIC | 15 +++++++++++---- sys/arch/alpha/conf/INSTALL | 15 +++++++++++---- sys/arch/alpha/conf/INSTALL-FLOPPY | 15 +++++++++++---- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA index 8aab4dd62e36..1d41a3228d24 100644 --- a/sys/arch/alpha/conf/ALPHA +++ b/sys/arch/alpha/conf/ALPHA @@ -1,4 +1,4 @@ -# $NetBSD: ALPHA,v 1.65 1997/11/30 23:18:59 mjacob Exp $ +# $NetBSD: ALPHA,v 1.66 1998/01/15 07:17:19 thorpej Exp $ # # Alpha kernel with all the options you'd want, and more. @@ -192,8 +192,8 @@ lc* at isa? port ? iomem ? irq ? # DEC EtherWORKS III (LEMAC) #le* at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, DEPCA (unt.) lpt* at isa? port 0x3bc irq 7 # standard parallel port vga* at isa? # ISA (EISA: XXX) VGA -awdc0 at isa? port 0x1f0 irq 14 # ST506/ESDI/IDE controllers -awdc1 at isa? port 0x170 irq 15 +wdc0 at isa? port 0x1f0 irq 14 # ST506/ESDI/IDE controllers +wdc1 at isa? port 0x170 irq 15 #wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System #audio* at wss? aha* at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI @@ -232,7 +232,14 @@ st* at scsibus? target ? lun ? # SCSI tape drives uk* at scsibus? target ? lun ? # SCSI unknown # ST506/ESDI/IDE devices -awd* at awdc? drive ? +wd* at wdc? drive ? + +# ATAPI bus support +atapibus* at wdc? + +# ATAPI devices +sd* at atapibus? drive ? # ATAPI disk devices +cd* at atapibus? drive ? # ATAPI CD-ROM devices # Workstation Console attachments #wscons* at cfb? diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index aa7762544c37..91ac8fce2be5 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.73 1998/01/09 17:10:16 drochner Exp $ +# $NetBSD: GENERIC,v 1.74 1998/01/15 07:17:20 thorpej Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -164,8 +164,8 @@ lc* at isa? port ? iomem ? irq ? # DEC EtherWORKS III (LEMAC) #le* at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, DEPCA (unt.) lpt* at isa? port 0x3bc irq 7 # standard parallel port vga* at isa? # ISA (EISA: XXX) VGA -awdc0 at isa? port 0x1f0 irq 14 # ST506/ESDI/IDE controllers -awdc1 at isa? port 0x170 irq 15 +wdc0 at isa? port 0x1f0 irq 14 # ST506/ESDI/IDE controllers +wdc1 at isa? port 0x170 irq 15 #wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System #audio* at wss? aha* at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI @@ -199,7 +199,14 @@ sd* at scsibus? target ? lun ? # SCSI disk drives st* at scsibus? target ? lun ? # SCSI tape drives # ST506/ESDI/IDE devices -awd* at awdc? drive ? +wd* at wdc? drive ? + +# ATAPI bus support +atapibus* at wdc? + +# ATAPI devices +sd* at atapibus? drive ? # ATAPI disk devices +cd* at atapibus? drive ? # ATAPI CD-ROM devices # Workstation Console attachments #wscons* at cfb? diff --git a/sys/arch/alpha/conf/INSTALL b/sys/arch/alpha/conf/INSTALL index 05d6ab03a571..ce9d4462b747 100644 --- a/sys/arch/alpha/conf/INSTALL +++ b/sys/arch/alpha/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.4 1998/01/13 23:49:31 cjs Exp $ +# $NetBSD: INSTALL,v 1.5 1998/01/15 07:17:21 thorpej Exp $ # # Alpha INSTALL kernel. @@ -137,8 +137,8 @@ lc* at isa? port ? iomem ? irq ? # DEC EtherWORKS III (LEMAC) le* at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, DEPCA (unt.) lpt* at isa? port 0x3bc irq 7 # standard parallel port vga* at isa? # ISA (EISA: XXX) VGA -awdc0 at isa? port 0x1f0 irq 14 # ST506/ESDI/IDE controllers -awdc1 at isa? port 0x170 irq 15 +wdc0 at isa? port 0x1f0 irq 14 # ST506/ESDI/IDE controllers +wdc1 at isa? port 0x170 irq 15 # EISA devices ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI @@ -159,7 +159,14 @@ sd* at scsibus? target ? lun ? # SCSI disk drives st* at scsibus? target ? lun ? # SCSI tape drives # ST506/ESDI/IDE devices -awd* at awdc? drive ? +wd* at wdc? drive ? + +# ATAPI bus support +atapibus* at wdc? + +# ATAPI devices +sd* at atapibus? drive ? # ATAPI disk devices +cd* at atapibus? drive ? # ATAPI CD-ROM devices # Workstation Console attachments wscons* at vga? diff --git a/sys/arch/alpha/conf/INSTALL-FLOPPY b/sys/arch/alpha/conf/INSTALL-FLOPPY index a1528fdfacb3..d49425f29903 100644 --- a/sys/arch/alpha/conf/INSTALL-FLOPPY +++ b/sys/arch/alpha/conf/INSTALL-FLOPPY @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL-FLOPPY,v 1.1 1998/01/13 23:49:32 cjs Exp $ +# $NetBSD: INSTALL-FLOPPY,v 1.2 1998/01/15 07:17:22 thorpej Exp $ # # Alpha INSTALL kernel. @@ -124,8 +124,8 @@ lc* at isa? port ? iomem ? irq ? # DEC EtherWORKS III (LEMAC) #le* at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, DEPCA (unt.) lpt* at isa? port 0x3bc irq 7 # standard parallel port vga* at isa? # ISA (EISA: XXX) VGA -awdc0 at isa? port 0x1f0 irq 14 # ST506/ESDI/IDE controllers -awdc1 at isa? port 0x170 irq 15 +wdc0 at isa? port 0x1f0 irq 14 # ST506/ESDI/IDE controllers +wdc1 at isa? port 0x170 irq 15 # EISA devices ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI @@ -145,7 +145,14 @@ sd* at scsibus? target ? lun ? # SCSI disk drives st* at scsibus? target ? lun ? # SCSI tape drives # ST506/ESDI/IDE devices -awd* at awdc? drive ? +wd* at wdc? drive ? + +# ATAPI bus support +atapibus* at wdc? + +# ATAPI devices +sd* at atapibus? drive ? # ATAPI disk devices +cd* at atapibus? drive ? # ATAPI CD-ROM devices # Workstation Console attachments wscons* at vga?