From afd99dc0b2c0f59305ca151644025bdda2db7320 Mon Sep 17 00:00:00 2001 From: nonaka Date: Sun, 24 Jun 2001 17:40:07 +0000 Subject: [PATCH] Add ahc(4), fxp(4), rtk(4) --- sys/arch/prep/conf/GENERIC | 15 +++++++++------ sys/arch/prep/conf/INSTALL | 14 ++++++++++++-- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/sys/arch/prep/conf/GENERIC b/sys/arch/prep/conf/GENERIC index 9ad3308e0a1e..ba5432a30a4d 100644 --- a/sys/arch/prep/conf/GENERIC +++ b/sys/arch/prep/conf/GENERIC @@ -1,11 +1,11 @@ -# $NetBSD: GENERIC,v 1.22 2001/06/23 03:09:20 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.23 2001/06/24 17:40:07 nonaka Exp $ # # GENERIC -- everything that's currently supported # include "arch/prep/conf/std.prep" -#ident "GENERIC-$Revision: 1.22 $" +#ident "GENERIC-$Revision: 1.23 $" maxusers 32 @@ -204,6 +204,7 @@ lpt0 at isa? port 0x3bc irq 7 # standard PC parallel ports # SCSI Controllers and Devices # PCI SCSI controllers +ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI siop* at pci? dev ? function ? # Symbios 53c8xx SCSI @@ -212,6 +213,7 @@ siop* at pci? dev ? function ? # Symbios 53c8xx SCSI aic* at pcmcia? function ? # Adaptec APA-1460 SCSI # SCSI bus support +scsibus* at ahc? scsibus* at aic? scsibus* at iha? scsibus* at pcscp? @@ -259,8 +261,10 @@ uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown # PCI network interfaces de* at pci? dev ? function ? # DEC 21x4x-based Ethernet ep* at pci? dev ? function ? # 3Com 3c59x +fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B #le* at pci? dev ? function ? # PCnet-PCI Ethernet ne* at pci? dev ? function ? # NE2000-compatible Ethernet +rtk* at pci? dev ? function ? # Realtek 8129/8139 vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet # ISA network interfaces @@ -370,11 +374,11 @@ ukphy* at mii? phy ? # generic unknown PHYs # Audio device # ISA Plug-and-Play audio devices -#wss* at isapnp? # CS4232 +#wss* at isapnp? # CS4232 # Audio support -#audio* at wss? #audio* at uaudio? +#audio* at wss? # MIDI support midi* at pcppi? # MIDI interface to the PC speaker @@ -382,7 +386,6 @@ midi* at pcppi? # MIDI interface to the PC speaker # The spkr driver provides a simple tone interface to the built in speaker. spkr0 at pcppi? # PC speaker - # Joysticks # ISA joysticks. Probe is a little strange; add only if you have one. @@ -393,7 +396,7 @@ joy0 at isa? port 0x201 # disk/mass storage pseudo-devices pseudo-device ccd 4 # concatenated/striped disk devices -pseudo-device raid 4 # RAIDframe disk driver +#pseudo-device raid 4 # RAIDframe disk driver #options RAID_AUTOCONFIG # auto-configuration of RAID components pseudo-device md 1 # memory disk device (ramdisk) pseudo-device vnd 4 # disk-like interface to files diff --git a/sys/arch/prep/conf/INSTALL b/sys/arch/prep/conf/INSTALL index f8c347dcb28a..4f0e8e934cea 100644 --- a/sys/arch/prep/conf/INSTALL +++ b/sys/arch/prep/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.4 2001/06/23 03:09:20 tsutsui Exp $ +# $NetBSD: INSTALL,v 1.5 2001/06/24 17:40:08 nonaka Exp $ # # INSTALL -- Installation kernel # @@ -107,6 +107,7 @@ lpt0 at isa? port 0x3bc irq 7 # standard PC parallel ports # SCSI Controllers and Devices # PCI SCSI controllers +ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI siop* at pci? dev ? function ? # Symbios 53c8xx SCSI @@ -115,6 +116,7 @@ siop* at pci? dev ? function ? # Symbios 53c8xx SCSI aic* at pcmcia? function ? # Adaptec APA-1460 SCSI # SCSI bus support +scsibus* at ahc? scsibus* at aic? scsibus* at iha? scsibus* at pcscp? @@ -163,18 +165,26 @@ fd* at fdc? drive ? # PCI network interfaces de* at pci? dev ? function ? # DEC 21x4x-based Ethernet ep* at pci? dev ? function ? # 3Com 3c59x -le* at pci? dev ? function ? # PCnet-PCI Ethernet +fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B +#le* at pci? dev ? function ? # PCnet-PCI Ethernet ne* at pci? dev ? function ? # NE2000-compatible Ethernet +rtk* at pci? dev ? function ? # Realtek 8129/8139 vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet +# ISA network interfaces +ep* at isa? port ? irq ? # 3Com 3c509 Ethernet + # ISA Plug-and-Play network intefaces ep* at isapnp? # 3Com 3c509 Ethernet +ne* at isapnp? # NE2000-compatible Ethernet # PCMCIA network interfaces ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet ne* at pcmcia? function ? # NE2000-compatible Ethernet # MII/PHY support +inphy* at mii? phy ? # Intel 82555 PHYs +nsphy* at mii? phy ? # NS83840 PHYs ukphy* at mii? phy ? # generic unknown PHYs